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

(Portage version: 2.2.8-r2/cvs/Linux x86_64, signed Manifest commit with key )

6 files changed, 15 insertions, 87 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/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}"