fix build time dependencies for +doc; remove obsolete patch files; update metadata.xml

Package-Manager: portage-2.2.8-r2/cvs/Linux x86_64

7 files changed, 19 insertions, 103 deletions

diff --git a/dev-lang/mmix/ChangeLog b/dev-lang/mmix/ChangeLog
index 8cbb5d064a14..0b2667f3efec 100644
--- a/dev-lang/mmix/ChangeLog
+++ b/dev-lang/mmix/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/mmix
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mmix/ChangeLog,v 1.24 2014/08/10 20:29:23 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mmix/ChangeLog,v 1.25 2014/10/13 20:56:41 tamiko Exp $
+
+  13 Oct 2014; Matthias Maier <tamiko@gentoo.org>
+  -files/mmix-20060324-includes.patch, -files/mmix-20060324-makefile.patch,
+  metadata.xml, mmix-20110605.ebuild, mmix-20131017.ebuild:
+  fix build time dependencies for +doc; remove obsolete patch files; update
+  metadata.xml
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> mmix-20110605.ebuild,
   mmix-20131017.ebuild:
diff --git a/dev-lang/mmix/Manifest b/dev-lang/mmix/Manifest
index 93951302e87e..3ffb639bb13e 100644
--- a/dev-lang/mmix/Manifest
+++ b/dev-lang/mmix/Manifest
@@ -1,19 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX mmix-20060324-includes.patch 284 SHA256 f241f64f244a51e98badda515015644b0daca0e22fb4344343d263fc156a4ae4 SHA512 6184ad967c3c7ac021255761f420b4125418a3508889e0fbf6119c20fe4a8028d4b80713f1cdf68b9b8195bbd182e76c9404050b7bb37c0911a4c78e0c1877b0 WHIRLPOOL 2b1e28b00e9bb153db2efbc7a957e4a4987035c7ab5e7882ea4380798be772253aaf23994f4d15f0e0bd0376c0747782e4c04b42cf9abf979b7cd456e3f18539
-AUX mmix-20060324-makefile.patch 1598 SHA256 44f2c773155d05d2765d38519c17e2d65595f9bf81bb062d3c9aabe42ab7db2f SHA512 d6690b691d56a6528f8aea9825ce9f2efeb53d98c5a99a02ab1bcde61bc35513c5aa76bd70a9cc54c4c7a4b691b6b9d797579b67f8e2c8c5f4e8a6f138c93ff7 WHIRLPOOL d696e548f22883ba65f2610fe1eb1001c0f8454bc36335e27472f506757154e987c8dea194a626a5f0007344ebacabce8428119a650da88131821fa0116ba75c
 AUX mmix-20110420-makefile.patch 1632 SHA256 c9ffb016c6fd6fcaba0a421ffd1aacf227400b219f95dd5e4d68df7a6cc11615 SHA512 66f62ce97152a2b9fa37a0c2a753a183e98eac6aa95eea238d455fbca2cfab5b4fb42d25239beebbb30eb73133adba906cf457fea9d2e6d98b9d0c0bc694e77d WHIRLPOOL 63335c57a4e7cf01f23b95f4a38939ed00e881e63a41031281de7e13e42ed9473db728378495a53a1287c1d79f392f444410cf63b96e3b55b94c5782b1337728
 DIST mmix-20110605.tar.gz 306461 SHA256 55896f8ee9c7c40b143fbc64ca097bc2659ed10c14a685cfd01521a4518ba163 SHA512 9b8e6fe1a745f8d179160127aebe639b5c9f3c97411cb1378659a62de7aabc0ddb9172617222609ea17715a2fa341fd8dafebcbb7f70fe5fe60e39c18920500c WHIRLPOOL fa42c5e75736b0b077c1f9cf6937cb67312a7b599b9f9ef11cd9f45c82d908299421406658757708e4094c2db6523979405d376f9869e4b5272af6b5505c2e48
 DIST mmix-20131017.tgz 308016 SHA256 aa64c4b9dc3cf51f07b330791f8ce542b0ae8a1132e098fa95a19b31350050b4 SHA512 e816b1ee9205b9f4a2e25ff183c48736ea66e63721a49f0b574850c5872ae85a6e847d802a01b5aa120ac969638d5d05e9b3135512d9362a4d672564f1228922 WHIRLPOOL e93f29e0a640e219ee2ded0034cbf300e9f6deed2bf9ed04081406cdfaaa952e0b3566525b86e35dfb480288e0ceef1744fefdc533ad0126952603cd698bbb6a
-EBUILD mmix-20110605.ebuild 963 SHA256 48ac22ba41f8df8113faac0de6407906f36bc1f4cf57e98d8aec5e53420938d0 SHA512 4a4b1df5486ec5d07cb24333dbf9f6e34b5d50ddc540a6beaa1fe9629343a7ed2a9b563882a398c1f1822672285ef8a625602410ca6ffc68390e49022271507b WHIRLPOOL 1c07f333a089fe8f04064d207f7e25f86279b9652f2bbf648a0e690f26c630548c0949a7179088c68af90e7c384cb27e4df38679b26c42ffff18fe6afad521d0
-EBUILD mmix-20131017.ebuild 923 SHA256 4e63c0bca18f557c2d237ca8b2411325678cb562de2e65cb0b54e3f539481a66 SHA512 ffc792216c231e69f42ec54cd48650b56bf5e2407a6f6fbc69a52aa92f180a00ef4c071c82cf06b219683c573267d9b0001ab16f1d7ee5d781815f65754d2ca6 WHIRLPOOL 0d7ff8a836006cc2656a9147dad35006958f9c9f73feb99cf83503de4f84c14a3c04dddf61622088606b22671a293779133a1a99bf24b2f03b72d3daa6ac9cff
-MISC ChangeLog 3927 SHA256 5be05eb77125e90eeb8b1733c755d3161d087b564d0584dcfc61739fa0810cb6 SHA512 54fb223911f58955abc3f97d5384627d2b1cb608929d4bdfceea5d6f7b11ec819f28026d79c071a1d17af7b5995ef2acdbafc0e57078ebcee85b7743e6e7d2d0 WHIRLPOOL ac582adedac517ada350ffca33ae5b883d47ea05612c72c2b02d07f25fad1d2790638f4d23f32aef0eea3d27ec8411bb517013835b048a7ef67d58a5529d3c74
-MISC metadata.xml 276 SHA256 d3e4a51ad38ee2ffc6669ce8b74bcff901db9df0d1137d57e8b1d93e8deba3ed SHA512 665aa48a1a243beee2fdab1b5cdae032af2f667e2b18e0b41ef00ebb25c0cc0f7d53c1ad5c60fbc251a61967fc0ad3268613af3b7c0a309469cb0ad4f4dd6b04 WHIRLPOOL dcfe2c4643728078d6ddab9a297b80b8eb26c70ec22cd1d35c47777b229bb321bd784c6e734d2a6baf6913176bd3d01f2489f1ab15bcc8a86076fae1936e87c5
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iEYEAREIAAYFAlPn1iQACgkQcaHudmEf86pt4gCfYkR553ufc2Bw/xtp/GY7iYyX
-9qkAn30gjok+l0svh7+zH84rHljPoG8l
-=dtIM
------END PGP SIGNATURE-----
+EBUILD mmix-20110605.ebuild 984 SHA256 fa4cf6434d73822ae0a8e72ed47cdab70ffe838d426fc66a7b4cbfeddec9ae48 SHA512 1546f52056b802518c70b3f59f36d68f5df80e7b31218cb8c1f048d16ba50d02b3a430219aab83a9cb67ae19fcafee51f112142982ca4e8aa6f17817c7729adc WHIRLPOOL eb90acd91e3ba1536cce9d3e2bcbb8d9bc6f2b9bee91d3d1cfe8f8e6ce3626e09e6433a86c42f9a02dfccb74e8a291fa9691db06f6921aae978584a4984bd335
+EBUILD mmix-20131017.ebuild 948 SHA256 145b35465f253dd9bd45562e675331b2dc792cfbbd845e49fe3aff1fdb68c18d SHA512 4306e31171ddc788bba4de269663be21ddd8e5366fc5bb3dc2a3251db35a257aa3821bc3c439e9c82c82ea9c88310051aee8e4994fdf8116297be5c9d4b686eb WHIRLPOOL 14ae9844438b3e628cf74ea81499fc495f953b9d18457ab54ad4d39be7817ff4907c1b887e61a328cf46acff2008d0886ddb3e078f5b4a79d0075b69c597ccaf
+MISC ChangeLog 4205 SHA256 a683277f7f290b94da781184a41935e713cd46d51a66d45d00a98e7118977d38 SHA512 ae3ebcc6a21c3ab2ccc48df0089ab81c72d0030ba2808ed9aeb81d236c0c556715cd15eb7e8a3eab031a50f8be888a3a3170e575677cd295a22cb63ccd34beca WHIRLPOOL f0e2dbf24086706b8d5bf9734ac6f696d728d29d244517c5ada816cb53bc7cd8f84ddde956f5c385e09294ddcf4a73b96718dc174119dca0ee49be6a036981dc
+MISC metadata.xml 233 SHA256 d64cebfa2fb894c77a0c67db5c7cbcc88258adac7794d011e229cb11f7d7f03f SHA512 7610bd96a337bf75ed3b59df584cd646ad93ff2c5f4829cf2775a5d09a6d19f573492de2308552f454846f02d35420242906a1357a4b19550ea7028d995fba52 WHIRLPOOL cd1155f0cc26bd5f117666c7920ddf31105f84aec93b0b6e8015e6c659b8ec91910199bb0fa9718f551c5bcf1f15f708011b8f9f7095a2d4e44389cce7cbb543
diff --git a/dev-lang/mmix/files/mmix-20060324-includes.patch b/dev-lang/mmix/files/mmix-20060324-includes.patch
deleted file mode 100644
index a48c56a80198..000000000000
--- a/dev-lang/mmix/files/mmix-20060324-includes.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/mmmix.w	2004-07-11 02:39:28.000000000 +0200
-+++ b/mmmix.w	2010-09-18 03:16:39.000000000 +0200
-@@ -34,6 +34,8 @@
- 
- @c
- #include <stdio.h>
-+#include <stdlib.h> /* exit() */
-+#include <string.h> /* strlen() */
- #include "mmix-pipe.h"
- @#
- char *config_file_name, *prog_file_name;
diff --git a/dev-lang/mmix/files/mmix-20060324-makefile.patch b/dev-lang/mmix/files/mmix-20060324-makefile.patch
deleted file mode 100644
index 9dc65ddc37ba..000000000000
--- a/dev-lang/mmix/files/mmix-20060324-makefile.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- Makefile.orig	2005-05-19 04:53:25.000000000 +0200
-+++ Makefile	2010-09-18 03:33:21.000000000 +0200
-@@ -27,23 +27,23 @@
- 	if test -r $*.ch; then cweave $*.w $*.ch; else cweave $*.w; fi
- 
- .w.o:
--	make $*.c
--	make $*.o
-+	$(MAKE) $*.c
-+	$(MAKE) $*.o
- 
- .w:
--	make $*.c
--	make $*
-+	$(MAKE) $*.c
-+	$(MAKE) $*
- 
- .w.dvi:
--	make $*.tex
--	make $*.dvi
-+	$(MAKE) $*.tex
-+	$(MAKE) $*.dvi
- 
- .w.ps:
--	make $*.dvi
--	make $*.ps
-+	$(MAKE) $*.dvi
-+	$(MAKE) $*.ps
- 
- .w.pdf:
--	make $*.tex
-+	$(MAKE) $*.tex
- 	case "$(PDFTEX)" in \
- 	 dvipdfm ) tex "\let\pdf+ \input $*"; dvipdfm $* ;; \
- 	 pdftex ) pdftex $* ;; \
-@@ -73,24 +73,23 @@
- clean:
- 	rm -f *~ *.o *.c *.h *.tex *.log *.dvi *.toc *.idx *.scn *.ps core
- 
--mmix-pipe.o: mmix-pipe.c abstime
-+abstime.h: abstime
- 	./abstime > abstime.h
-+
-+mmix-pipe.o: mmix-pipe.c abstime abstime.h
- 	$(CC) $(CFLAGS) -c mmix-pipe.c
--	rm abstime.h
- 
- mmix-config.o: mmix-pipe.o
- 
- mmmix:  mmix-arith.o mmix-pipe.o mmix-config.o mmix-mem.o mmix-io.o mmmix.c
--	$(CC) $(CFLAGS) mmmix.c \
-+	$(CC) $(CFLAGS) $(LDFLAGS) mmmix.c \
- 	  mmix-arith.o mmix-pipe.o mmix-config.o mmix-mem.o mmix-io.o -o mmmix
- 
- mmixal: mmix-arith.o mmixal.c
--	$(CC) $(CFLAGS) mmixal.c mmix-arith.o -o mmixal
-+	$(CC) $(CFLAGS) $(LDFLAGS) mmixal.c mmix-arith.o -o mmixal
- 
--mmix:   mmix-arith.o mmix-io.o mmix-sim.c abstime
--	./abstime > abstime.h
--	$(CC) $(CFLAGS) mmix-sim.c mmix-arith.o mmix-io.o -o mmix
--	rm abstime.h
-+mmix:   mmix-arith.o mmix-io.o mmix-sim.c abstime abstime.h
-+	$(CC) $(CFLAGS) $(LDFLAGS) mmix-sim.c mmix-arith.o mmix-io.o -o mmix
- 
- tarfile: $(ALL)
- 	tar cvf /tmp/mmix.tar $(ALL)
diff --git a/dev-lang/mmix/metadata.xml b/dev-lang/mmix/metadata.xml
index 5c1da0c6e553..2702f26660bf 100644
--- a/dev-lang/mmix/metadata.xml
+++ b/dev-lang/mmix/metadata.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
-		<email>tamiko+GENTOO@kyomu.43-1.org</email>
+		<email>tamiko@gentoo.org</email>
 		<name>Matthias Maier</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/dev-lang/mmix/mmix-20110605.ebuild b/dev-lang/mmix/mmix-20110605.ebuild
index b4587651a29d..9226ac8fd616 100644
--- a/dev-lang/mmix/mmix-20110605.ebuild
+++ b/dev-lang/mmix/mmix-20110605.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mmix/mmix-20110605.ebuild,v 1.4 2014/08/10 20:29:23 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mmix/mmix-20110605.ebuild,v 1.5 2014/10/13 20:56:41 tamiko Exp $
 
 EAPI="2"
 
@@ -10,7 +10,8 @@ DESCRIPTION="Donald Knuth's MMIX Assembler and Simulator"
 HOMEPAGE="http://www-cs-faculty.stanford.edu/~knuth/mmix.html"
 SRC_URI="http://www-cs-faculty.stanford.edu/~knuth/programs/${P}.tar.gz"
 
-DEPEND="|| ( >=dev-util/cweb-3.63 virtual/tex-base )"
+DEPEND="virtual/tex-base
+	doc? ( dev-texlive/texlive-genericrecommended )"
 RDEPEND=""
 
 SLOT="0"
diff --git a/dev-lang/mmix/mmix-20131017.ebuild b/dev-lang/mmix/mmix-20131017.ebuild
index 863dfe4edd81..31f2bea4d43e 100644
--- a/dev-lang/mmix/mmix-20131017.ebuild
+++ b/dev-lang/mmix/mmix-20131017.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mmix/mmix-20131017.ebuild,v 1.2 2014/08/10 20:29:23 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mmix/mmix-20131017.ebuild,v 1.3 2014/10/13 20:56:41 tamiko Exp $
 
 EAPI="5"
 
@@ -10,13 +10,13 @@ DESCRIPTION="Donald Knuth's MMIX Assembler and Simulator"
 HOMEPAGE="http://www-cs-faculty.stanford.edu/~knuth/mmix.html"
 SRC_URI="http://www-cs-faculty.stanford.edu/~knuth/programs/${P}.tgz"
 
-DEPEND="|| ( >=dev-util/cweb-3.63
-	virtual/tex-base )"
+DEPEND="virtual/tex-base
+	doc? ( dev-texlive/texlive-genericrecommended )"
 RDEPEND=""
 
 SLOT="0"
 LICENSE="${PN}"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
 S="${WORKDIR}"