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

(Portage version: 2.2_rc28/cvs/Linux x86_64)

3 files changed, 76 insertions, 3 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/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 ; \