Fix bug #256880. Thanks to Diego E. Pettenò <flameeyes@gentoo.org> for help.

Package-Manager: portage-2.2_rc28/cvs/Linux x86_64

4 files changed, 83 insertions, 9 deletions

diff --git a/dev-java/antlr/ChangeLog b/dev-java/antlr/ChangeLog
index 36019dc41f08..7c3869ff6d3b 100644
--- a/dev-java/antlr/ChangeLog
+++ b/dev-java/antlr/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/antlr
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/ChangeLog,v 1.69 2009/03/29 21:59:29 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/ChangeLog,v 1.70 2009/03/29 23:29:15 serkan Exp $
+
+  29 Mar 2009; Serkan Kaba <serkan@gentoo.org> +files/2.7.7-makefixes.patch,
+  antlr-2.7.7:
+  Fix bug #256880. Thanks to Diego E. Pettenò <flameeyes@gentoo.org> for
+  help.
 
   29 Mar 2009; Petteri Räty <betelgeuse@gentoo.org>
   +files/2.7.7-gcc-4.4.patch, antlr-2.7.7.ebuild:
diff --git a/dev-java/antlr/Manifest b/dev-java/antlr/Manifest
index 64c6c808b750..7df7f7c31ae1 100644
--- a/dev-java/antlr/Manifest
+++ b/dev-java/antlr/Manifest
@@ -3,18 +3,19 @@ Hash: SHA1
 
 AUX 2.7.7-gcc-4.3.patch 383 RMD160 b07b999bd1fe9ed4e90c2c4240c6b8dcececa460 SHA1 9561c692ccfad5f320739897da0ce985d8c804d7 SHA256 de68d3a12a03d7bcdbd3e1cf5ab7d773123a55b4d9e8bb9f3a873fa2c2be84e2
 AUX 2.7.7-gcc-4.4.patch 257 RMD160 b1b2058707e6132e4db8d4f7dbd7648c8d3799eb SHA1 b618b5a3f603a3cb07acda07e85ab022cfb3cdef SHA256 4d1c713424893be36f5b29f73a9e7f491274abe6535af31c26bf0aa8dbf00256
+AUX 2.7.7-makefixes.patch 3151 RMD160 260811a8fd616fa2acd8ee92b57e004bef1af2d7 SHA1 81eedd78cb7f71e783ee4450c9eda72411ffbdc8 SHA256 04c15e4c6054c3504e21ed5ef00bfb011f5345146e5c044f607e14a30fda1360
 AUX antlr.pc.in 155 RMD160 9e65e2d813b035fceba2893da2b14e21b579ff22 SHA1 008e6316a5f75884749bd88925a888fa0f7de78e SHA256 31bf717831c33e3088958712f2c6629427a505ee0a48030e65b4f733e0bf277f
 DIST antlr-2.7.7.tar.gz 1816180 RMD160 0b7951a28b748e912721fe0f6de4095d9f8da57d SHA1 802655c343cc7806aaf1ec2177a0e663ff209de1 SHA256 853aeb021aef7586bda29e74a6b03006bcb565a755c86b66032d8ec31b67dbb9
 DIST antlr-3.1.3-generated.tar.bz2 47167 RMD160 9ea64a67aba65bf27e8abbdfbd1a28a0ea2b7698 SHA1 21addec96267b43742e2b2bbd6c7e245db644c38 SHA256 ed326de0f1f92dd72e8d9644e8eaf59d02b9725b4b5218f5c54e12100f8d05f4
 DIST antlr-3.1.3.tar.gz 10743515 RMD160 e772197a8a89783ec7cb3e0005913e0396a0ca4c SHA1 2558d373c1d94d8fdd9d26a5be390316aa6b5350 SHA256 1fca0fc7304140807e64ec263a58d93ef1b380cfb6407084e6909f8220bc1039
-EBUILD antlr-2.7.7.ebuild 2679 RMD160 f235974a761859ff8542ed0ce6da6116da3c6dc2 SHA1 c403b9c7fe481932574ccaac6b3f962d4a570cd5 SHA256 f814ec2816f9611c3f3934cebcf023604a71ddb7c9153cf4f92360aa9bbfd5e2
+EBUILD antlr-2.7.7.ebuild 2711 RMD160 b7df22d5bfe750a472bd9701a23f796530105e8d SHA1 39d835d846d2dacd5743229ae23c12947d59cd7f SHA256 93088d371829497991c530104ca4ff2d6236b6a37c85e79c299612f3f86baf9a
 EBUILD antlr-3.1.3.ebuild 2624 RMD160 c5644afc28b9045480c8f033afe6f99c6a5d72a7 SHA1 186e3a6f8eb12ded0f1514a07a02354738d3820a SHA256 5db7dd54ce52413a5e3699264eaea8a493f62849bd42c1acaef292f88637f7ac
-MISC ChangeLog 9667 RMD160 be52abdcca6b12450aa2da31f22c5743eabb6fd4 SHA1 d8fec4765dc18b0070d0d3189db95aef86c9fbe0 SHA256 ba74f99428da0f6f5c6be81ec80244db3792327d8159a61976ce515cac1a7ac8
+MISC ChangeLog 9838 RMD160 7eea1e92b3eeaa866c0ed937e568b4763de69a3f SHA1 8bbdb2b6c5817bdbd1ccb94ffca945e65eb2db27 SHA256 98b1a0ae9e621177f4d9721878e0881c4279af5512f74cf187082909abafea92
 MISC metadata.xml 237 RMD160 3f4bc2addb977798173b802ed139eddc82935279 SHA1 19099efa23f7059bcd4a2b0c792e67c9dd90413b SHA256 f200b3d23c03ca390b7fa6f7d3ef4d67af8c3ea2584ba063bb47fefa06a0870e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEYEARECAAYFAknP70sACgkQcxLzpIGCsLRtKQCfdxXxvyGU/3USMX9f44xtBrDM
-EVcAoIRyemWrxDrEbHmMSbG5aVgU+jGT
-=u+T+
+iEYEARECAAYFAknQBFYACgkQRh6X64ivZaKGogCeIVYdYsGtm2iCpypO3qAePIi2
+PSgAnikPaekGak6uhDD0jzRqSyfQNmc3
+=OHx7
 -----END PGP SIGNATURE-----
diff --git a/dev-java/antlr/antlr-2.7.7.ebuild b/dev-java/antlr/antlr-2.7.7.ebuild
index 2f660e58023c..e3684946eb0a 100644
--- a/dev-java/antlr/antlr-2.7.7.ebuild
+++ b/dev-java/antlr/antlr-2.7.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-2.7.7.ebuild,v 1.15 2009/03/29 21:59:29 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-2.7.7.ebuild,v 1.16 2009/03/29 23:29:15 serkan Exp $
 
 EAPI=1
 
@@ -23,7 +23,7 @@ DEPEND="${RDEPEND}
 	script? ( !dev-util/pccts )
 	source? ( app-arch/zip )"
 
-PATCHES=( "${FILESDIR}/2.7.7-gcc-4.3.patch" "${FILESDIR}/2.7.7-gcc-4.4.patch" )
+PATCHES=( "${FILESDIR}/2.7.7-gcc-4.3.patch" "${FILESDIR}/2.7.7-gcc-4.4.patch" "${FILESDIR}/2.7.7-makefixes.patch" )
 
 src_unpack() {
 	base_src_unpack
diff --git a/dev-java/antlr/files/2.7.7-makefixes.patch b/dev-java/antlr/files/2.7.7-makefixes.patch
new file mode 100644
index 000000000000..cb12752189a7
--- /dev/null
+++ b/dev-java/antlr/files/2.7.7-makefixes.patch
@@ -0,0 +1,68 @@
+diff -Nur antlr-2.7.7/examples/cpp/inherit.tinyc/Makefile.in antlr-2.7.7_patched/examples/cpp/inherit.tinyc/Makefile.in
+--- antlr-2.7.7/examples/cpp/inherit.tinyc/Makefile.in	2006-11-01 23:37:17.000000000 +0200
++++ antlr-2.7.7_patched/examples/cpp/inherit.tinyc/Makefile.in	2009-03-30 02:09:28.000000000 +0300
+@@ -143,7 +143,7 @@
+ @abs_this_builddir@/examples/cpp/tinyc/TinyCLexer.cpp \
+ @abs_this_builddir@/examples/cpp/tinyc/TinyCLexer.hpp \
+ 	:
+-	@ @MAKE@ -C @abs_this_builddir@/examples/cpp/tinyc
++	@ $(MAKE) -C @abs_this_builddir@/examples/cpp/tinyc
+ 
+ $(objdir)/.subc.g : $(srcdir)/subc.g $(objdir)/TinyCParserTokenTypes.txt @ANTLR_JAR@
+ 	@ANTLRFLAGS="-glib `@CYGPATH_W@ $(_srcdir)/../tinyc/tinyc.g` -o `@CYGPATH_W@ $(thisdir)`" @ANTLR_COMPILE_CMD@ $(srcdir)/subc.g
+diff -Nur antlr-2.7.7/examples/java/inherit.tinyc/Makefile.in antlr-2.7.7_patched/examples/java/inherit.tinyc/Makefile.in
+--- antlr-2.7.7/examples/java/inherit.tinyc/Makefile.in	2006-11-01 23:37:17.000000000 +0200
++++ antlr-2.7.7_patched/examples/java/inherit.tinyc/Makefile.in	2009-03-30 02:07:25.000000000 +0300
+@@ -77,7 +77,7 @@
+ 	@ @CP@ $< $@
+ 
+ @abs_this_builddir@/examples/java/tinyc/TinyCParserTokenTypes.txt	:
+-	@ @MAKE@ -C @abs_this_builddir@/examples/java/tinyc test
++	@ $(MAKE) -C @abs_this_builddir@/examples/java/tinyc test
+ 
+ 
+ ## How to generated *.java ..
+diff -Nur antlr-2.7.7/examples/python/inherit.tinyc/Makefile.in antlr-2.7.7_patched/examples/python/inherit.tinyc/Makefile.in
+--- antlr-2.7.7/examples/python/inherit.tinyc/Makefile.in	2006-11-01 23:37:18.000000000 +0200
++++ antlr-2.7.7_patched/examples/python/inherit.tinyc/Makefile.in	2009-03-30 02:09:07.000000000 +0300
+@@ -61,11 +61,11 @@
+ ## file resides. Therefore we are going to "make" the base
+ ## grammar first and then copy required vocabulary over ..
+ TinyCTokenTypes.txt : 
+-	@MAKE@ -C ../tinyc
++	$(MAKE) -C ../tinyc
+ 	@CP@ ../tinyc/$@ $@
+ 
+ @abs_this_builddir@/examples/python/tinyc/%.py :
+-	@MAKE@ -C ../tinyc
++	$(MAKE) -C ../tinyc
+ 
+ test :: test1
+ 
+diff -Nur antlr-2.7.7/Makefile.in antlr-2.7.7_patched/Makefile.in
+--- antlr-2.7.7/Makefile.in	2006-11-01 23:37:18.000000000 +0200
++++ antlr-2.7.7_patched/Makefile.in	2009-03-30 02:05:41.000000000 +0300
+@@ -31,7 +31,7 @@
+ 
+ test clean distclean install ::
+ 	@ if test -f examples/Makefile ; then \
+-		@MAKE@ -C examples $@ ; \
++		$(MAKE) -C examples $@ ; \
+ 	fi
+ 
+ # Rule  to  remove  all objects, cores, ANTLR generated,
+diff -Nur antlr-2.7.7/scripts/config.make.in antlr-2.7.7_patched/scripts/config.make.in
+--- antlr-2.7.7/scripts/config.make.in	2006-11-01 23:37:18.000000000 +0200
++++ antlr-2.7.7_patched/scripts/config.make.in	2009-03-30 02:04:54.000000000 +0300
+@@ -47,9 +47,9 @@
+ 		*) \
+ 		if test -f "$${d}/Makefile" ; then \
+ 		  echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>" ; \
+-		  echo ">> @MAKE@ -C $(subdir)/$${d} $@                          " ; \
++		  echo ">> $(MAKE) -C $(subdir)/$${d} $@                          " ; \
+ 			echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>" ; \
+-			@MAKE@ -C "$$d" $@ || exit 1 ;\
++			$(MAKE) -C "$$d" $@ || exit 1 ;\
+ 		fi ; \
+ 		;; \
+ 		esac ; \