diff options
author | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-07-22 22:58:59 +0000 |
---|---|---|
committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-07-22 22:58:59 +0000 |
commit | 54f3b177c393e1c77febd5607496345077d0bfbc (patch) | |
tree | 47b63092b102d2a13876d32c0d78ea86d0253d91 /dev-java/javatoolkit | |
parent | Migrated to Generation 2. (diff) | |
download | gentoo-2-54f3b177c393e1c77febd5607496345077d0bfbc.tar.gz gentoo-2-54f3b177c393e1c77febd5607496345077d0bfbc.tar.bz2 gentoo-2-54f3b177c393e1c77febd5607496345077d0bfbc.zip |
Add patch to respect $(MAKE), see bug #141420.
(Portage version: 2.1.1_pre3-r3)
Diffstat (limited to 'dev-java/javatoolkit')
-rw-r--r-- | dev-java/javatoolkit/ChangeLog | 6 | ||||
-rw-r--r-- | dev-java/javatoolkit/files/javatoolkit-0.1.9-make.patch | 29 | ||||
-rw-r--r-- | dev-java/javatoolkit/javatoolkit-0.1.9.ebuild | 11 |
3 files changed, 43 insertions, 3 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/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 } |