Add patch to respect $(MAKE), see bug #141420.

Package-Manager: portage-2.1.1_pre3-r3

4 files changed, 65 insertions, 11 deletions

diff --git a/dev-java/javatoolkit/ChangeLog b/dev-java/javatoolkit/ChangeLog
index 1726f634ec13..d226bcb2fb3d 100644
--- a/dev-java/javatoolkit/ChangeLog
+++ b/dev-java/javatoolkit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/javatoolkit
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/javatoolkit/ChangeLog,v 1.7 2006/07/09 09:15:21 killerfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/javatoolkit/ChangeLog,v 1.8 2006/07/22 22:58:59 flameeyes Exp $
+
+  22 Jul 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/javatoolkit-0.1.9-make.patch, javatoolkit-0.1.9.ebuild:
+  Add patch to respect $(MAKE), see bug #141420.
 
   09 Jul 2006; Rene Nussbaumer <killerfox@gentoo.org>
   javatoolkit-0.1.9.ebuild:
diff --git a/dev-java/javatoolkit/Manifest b/dev-java/javatoolkit/Manifest
index fb51cbc69ff6..a3b8b871712c 100644
--- a/dev-java/javatoolkit/Manifest
+++ b/dev-java/javatoolkit/Manifest
@@ -1,17 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX javatoolkit-0.1.9-make.patch 1168 RMD160 9a7fe61e8820d71a60d7a0b7fa472e26ee9154fa SHA1 c49b14cc15753da2fac6d37ffb365808da03caa9 SHA256 d488bec2b639a668eb58ba8ad64f9de81fb68a68db85eb75523b24ae7f53991e
+MD5 16d95a92cdc3ba0a23b07965aff309ef files/javatoolkit-0.1.9-make.patch 1168
+RMD160 9a7fe61e8820d71a60d7a0b7fa472e26ee9154fa files/javatoolkit-0.1.9-make.patch 1168
+SHA256 d488bec2b639a668eb58ba8ad64f9de81fb68a68db85eb75523b24ae7f53991e files/javatoolkit-0.1.9-make.patch 1168
 DIST javatoolkit-0.1.0.tar.gz 11227
 DIST javatoolkit-0.1.9.tar.bz2 20510 RMD160 0f9ef7f39ca7ad837e99b6418881d16d5def4a1b SHA1 8973c7bc5bc09224badb2a43b22438321b8ac0c2 SHA256 68d3a135f581ae3421fd334eefb1a6ad9359dbdd93d925cfdc56383971bb3fa8
 EBUILD javatoolkit-0.1.0.ebuild 559 RMD160 aeaecefebcd4478c75768109750005bb46404258 SHA1 21b40a42ff708eb88ee080daa83d6869c078cc02 SHA256 4a04ab24bec41f98a0116cfcdb1b9c898c5cc34d2ba68a6b9946695c20628f6c
 MD5 7a88a33e58bd368ef5f52b083bb78770 javatoolkit-0.1.0.ebuild 559
 RMD160 aeaecefebcd4478c75768109750005bb46404258 javatoolkit-0.1.0.ebuild 559
 SHA256 4a04ab24bec41f98a0116cfcdb1b9c898c5cc34d2ba68a6b9946695c20628f6c javatoolkit-0.1.0.ebuild 559
-EBUILD javatoolkit-0.1.9.ebuild 708 RMD160 e8e267c9735f985a64bfe04d6963c891465c2bec SHA1 fc4e5869bac2afe64242069a7225defbc8ebb5d6 SHA256 2373b03a110368ca673910daa73259b1bdc1648e39f8625356ec107c1968ee5e
-MD5 9fc2c3f62548da3abde6171fa4a24bfa javatoolkit-0.1.9.ebuild 708
-RMD160 e8e267c9735f985a64bfe04d6963c891465c2bec javatoolkit-0.1.9.ebuild 708
-SHA256 2373b03a110368ca673910daa73259b1bdc1648e39f8625356ec107c1968ee5e javatoolkit-0.1.9.ebuild 708
-MISC ChangeLog 886 RMD160 345ed30c095a3e04db0018acfe7b890c05afd7fe SHA1 420d7c6788d0ea111662d73df7996ffc6df00523 SHA256 61bc17cd4359a016f1269cac4a688cf3e18ec4882d276661ae46129f9f1c9790
-MD5 b8f017439a5152b2ff8dce6a7b0dc590 ChangeLog 886
-RMD160 345ed30c095a3e04db0018acfe7b890c05afd7fe ChangeLog 886
-SHA256 61bc17cd4359a016f1269cac4a688cf3e18ec4882d276661ae46129f9f1c9790 ChangeLog 886
+EBUILD javatoolkit-0.1.9.ebuild 796 RMD160 7646884caf93835b850faeff3580736b43e08152 SHA1 e2f366ee53d99dc1df3bc71ec31438a27e07aabb SHA256 af3712acf69a7fc3d454bf27c4d73e91d05ed42ee816de7800cf68d86d2203ef
+MD5 70e77d42d8058e93ab04d8e9391c6686 javatoolkit-0.1.9.ebuild 796
+RMD160 7646884caf93835b850faeff3580736b43e08152 javatoolkit-0.1.9.ebuild 796
+SHA256 af3712acf69a7fc3d454bf27c4d73e91d05ed42ee816de7800cf68d86d2203ef javatoolkit-0.1.9.ebuild 796
+MISC ChangeLog 1054 RMD160 8674dea4cc251d0f24b0dc9fbd10adc84724a9af SHA1 39c6bad862c72424bb65115aecfcfeaa090a2f3f SHA256 9e95c904a89a0a5019237a69cdcbee777a25264f353381179c3fd86b3517a5b1
+MD5 9b0aa1b1f7e6e50da529aa9745b636fd ChangeLog 1054
+RMD160 8674dea4cc251d0f24b0dc9fbd10adc84724a9af ChangeLog 1054
+SHA256 9e95c904a89a0a5019237a69cdcbee777a25264f353381179c3fd86b3517a5b1 ChangeLog 1054
 MISC metadata.xml 310 RMD160 79634158ef2e5e77b9f14d5b1cb49901847a6885 SHA1 63647b198b681b9281d5b8efded393bf9ed3a803 SHA256 161c2d33fe14b517fdf8b2ba46ec358da1301aef26adf8552dc87191b7e9f73e
 MD5 0637a933ecb6e8cedfc4ddfcf3491728 metadata.xml 310
 RMD160 79634158ef2e5e77b9f14d5b1cb49901847a6885 metadata.xml 310
@@ -22,3 +29,10 @@ SHA256 caf83f0176eb5028ebdc965e131da41e009bb845b5d1208a15ac3cac4163e28c files/di
 MD5 95afd967fc6cd93fad084c28c7fc4562 files/digest-javatoolkit-0.1.9 253
 RMD160 16da1ceafa564c96db2756ac396172ef783d6a6e files/digest-javatoolkit-0.1.9 253
 SHA256 d06f1db3fb0ad5dc2d408c8890bea56e72dda47640572ce65033149ee741a4c3 files/digest-javatoolkit-0.1.9 253
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.4 (GNU/Linux)
+
+iD8DBQFEwq3DAiZjviIA2XgRApvvAJ0aOSRv235a9tFwihjnK4iuuc2vpQCfc5JH
+lGGub1y756biCSgTkCAJFSo=
+=rmGD
+-----END PGP SIGNATURE-----
diff --git a/dev-java/javatoolkit/files/javatoolkit-0.1.9-make.patch b/dev-java/javatoolkit/files/javatoolkit-0.1.9-make.patch
new file mode 100644
index 000000000000..e85584769f9c
--- /dev/null
+++ b/dev-java/javatoolkit/files/javatoolkit-0.1.9-make.patch
@@ -0,0 +1,29 @@
+Index: javatoolkit-0.1.9/Makefile
+===================================================================
+--- javatoolkit-0.1.9.orig/Makefile
++++ javatoolkit-0.1.9/Makefile
+@@ -15,7 +15,7 @@ all:
+ 	echo $(sbindir)
+ 	echo $(mandir)
+ 	for x in bsfix; do \
+-		( cd src/$$x; make all ) \
++		( cd src/$$x; $(MAKE) all ) \
+ 	done
+ 
+ dist: dist-javatoolkit
+@@ -24,7 +24,7 @@ dist-javatoolkit:
+ 	mkdir -p release/javatoolkit-$(VERSION)$(RELEASE_TAG)
+ 	rm -rf release/javatoolkit-$(VERSION)$(RELEASE_TAG)/
+ 	for x in sun-fetch findclass bsfix buildparser javatoolkit ; do \
+-		( cd src/$$x ; make distdir=release/javatoolkit-$(VERSION)$(RELEASE_TAG) dist ) \
++		( cd src/$$x ; $(MAKE) distdir=release/javatoolkit-$(VERSION)$(RELEASE_TAG) dist ) \
+ 	done
+ 	cp Makefile AUTHORS README TODO COPYING NEWS ChangeLog release/javatoolkit-$(VERSION)$(RELEASE_TAG)/
+ 	cat makedefs.mak | \
+@@ -45,5 +45,5 @@ install-javatoolkit:
+ 	install -m 0644 AUTHORS ChangeLog COPYING NEWS README TODO $(docdir)/
+ 
+ 	for x in sun-fetch findclass bsfix buildparser javatoolkit ; do \
+-		( cd src/$$x ; make DESTDIR=$(DESTDIR) install )  \
++		( cd src/$$x ; $(MAKE) DESTDIR=$(DESTDIR) install )  \
+ 	done
diff --git a/dev-java/javatoolkit/javatoolkit-0.1.9.ebuild b/dev-java/javatoolkit/javatoolkit-0.1.9.ebuild
index 5e00d21eb2e2..d351fd603efa 100644
--- a/dev-java/javatoolkit/javatoolkit-0.1.9.ebuild
+++ b/dev-java/javatoolkit/javatoolkit-0.1.9.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/javatoolkit/javatoolkit-0.1.9.ebuild,v 1.3 2006/07/09 09:15:21 killerfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/javatoolkit/javatoolkit-0.1.9.ebuild,v 1.4 2006/07/22 22:58:59 flameeyes Exp $
 
-inherit python
+inherit eutils python
 
 DESCRIPTION="Collection of Gentoo-specific tools for Java"
 HOMEPAGE="http://dev.gentoo.org/proj/en/java/"
@@ -16,6 +16,13 @@ IUSE=""
 DEPEND=">=virtual/jdk-1.4"
 RDEPEND=">=virtual/jre-1.4"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-make.patch"
+}
+
 src_install() {
 	make DESTDIR=${D} install || die
 }