added prefix support (bug #435378)

Package-Manager: portage-2.2.0_alpha140/cvs/Linux i686
Manifest-Sign-Key: 0xC2000586

3 files changed, 32 insertions, 16 deletions

diff --git a/dev-java/gnu-classpath/ChangeLog b/dev-java/gnu-classpath/ChangeLog
index 33b9abfae3ae..c577a0300bbf 100644
--- a/dev-java/gnu-classpath/ChangeLog
+++ b/dev-java/gnu-classpath/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/gnu-classpath
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/ChangeLog,v 1.116 2011/03/29 09:13:40 caster Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/ChangeLog,v 1.117 2012/10/18 08:44:11 ottxor Exp $
+
+  18 Oct 2012; Christoph Junghans <ottxor@gentoo.org>
+  gnu-classpath-0.98-r3.ebuild:
+  added prefix support (bug #435378)
 
   29 Mar 2011; Vlastimil Babka <caster@gentoo.org>
   -gnu-classpath-0.98-r2.ebuild, gnu-classpath-0.98-r3.ebuild:
@@ -500,4 +504,3 @@
   09 Mar 2004; Chris Aniszczyk <zx@gentoo.org> gnu-classpath-0.06.ebuild,
   metadata.xml:
   Initial Import. Closes #43926
-
diff --git a/dev-java/gnu-classpath/Manifest b/dev-java/gnu-classpath/Manifest
index 5326c48480c1..464fca4baade 100644
--- a/dev-java/gnu-classpath/Manifest
+++ b/dev-java/gnu-classpath/Manifest
@@ -1,4 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST classpath-0.98.tar.gz 11021342 SHA256 501b5acd4dff79b6100da22cef15080f31071821ce3cea6f1b739bc1b56fac3f SHA512 0d98f87cd78c166d566ecd8d0372f2d6cdf422e8c4c806ca01d3a77dafbdd80ee936de78a2c5d4226174027efdc053fe92669514bdd8acb3290a7b3ec002d31f WHIRLPOOL 1248288af3821fedae226852da41b1a176e0c03f83f95b7e7a123655e3b588f4b1716274aebd1b728b11a63e35c820994bce0293b4bed6ea8837dabb0bf90c7e
-EBUILD gnu-classpath-0.98-r3.ebuild 3295 SHA256 5326de7584ebc984cb0109adedf040c3af2f695a8865553d1e1165b832c966bf SHA512 404af05ac61ab7f37fb0e370cdc91bf8f86b793c42f73eb89e863f2ff9394ff4fa99638fb2b2164ef1fd969db14abcb1e4f22d4f7bee1e35c1edcfef52668399 WHIRLPOOL 42d59bd4a179b3b6018a169e9f6b9ad2c37c1a4c9632547aaea444882a95a2a65f0cdcd4a91bf45902f1e20d5247a55f553762931dfb82652860d70eede3413b
-MISC ChangeLog 17916 SHA256 bf0e2a6885a31d0ca82bba0da42a17864ee571bf98d62033a3124d2e007cce6d SHA512 4b2a381d92ea00bae4bd73d3833e26ee809ced288f2aaef87c906b4f35a2311312f2387883f96bd285eeb1708d1d2e9fe812b77684fb2d34a0009b26ee635e34 WHIRLPOOL 4831fb20800dbc768bd663bdca6ffa9e7212ad726dffe229b722b13c9519f6100cfa81a926b15e6e2a5ede8f8401fc9260b6b30f40087a11d1df221aea1aad19
+EBUILD gnu-classpath-0.98-r3.ebuild 3295 SHA256 6bb492e0d125b1ac73780464092338da230df8e10e24cd4eaa27a5fe365ab941 SHA512 5c9b76790f004c00a37b49eddb8c8c34a7f6ba5bc299482a95caa0b0c7a70d3c1943507c5d316b66d223b6133e72ceac4803d0a0e0ea3de461e71c163e3bee10 WHIRLPOOL 63325f6d3e58c0ea132e99439eaa54bfe05144c7015c62dd605d848a99b9dc14fd6d1c828eb64bfeba36d0bc8565c230a193b5ac9c937cbd20435378de4e7536
+MISC ChangeLog 18039 SHA256 1108254c3be615cd0147445f587df32415429d07559d98a08236e9f1fa398f10 SHA512 ab93e3b825910dd79c81f2b5452ab8e3ee4f5461f7d3a39745103e5e33ba7a9fc223096ddd0701c4f645dc11594c54aac1ba3d4daf38c07d2a1a0bc127142903 WHIRLPOOL a9fcdedf3ef76d18b09bd3c35669a76707dc8f1f58464a4182c12198d435a9fa7cdaadf9542f4e295497a36e5deca8e00728741a54f5eadc583c472163fedcc9
 MISC metadata.xml 759 SHA256 24e294a08d57473d495a67acdcc44c0f32747187531feeb72dfa678731cd51d2 SHA512 6539bdca43514371ed19072b06cb70fc097a8178f4066e832037836b3d5c4b778d23365b52dd53534503fcef8a4a9680d98f898c43382e6050d766ad958d2d16 WHIRLPOOL 59e6761a2c2c354cf81bc9d93a356f028402a0273e52b449e8df06d371c20518051c0c0c4a3c9b6ad7586ddaec0ab510d47e5b714d69126b59fb256c8b05d67d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQf8FbAAoJEOeBhlrCAAWGGawH/1MikJpj2IsrQ4Jsyo8NWY7Y
+WGzN6pQVIxLl2Yzaaq/JAwJDzgQSRk5UtHf/oEi4hN1QkxJlI0MSAgBv3cTxmQiO
+MxA3MhBj++WY4VyZoavTw3a/evAVdtoZHF0+szs1MBDW6hhUIZqGAwaOCtST/yu4
+aotBtMiQkUnGG6uaUocHYXJxulvsnw07TWV8UbuFeZI7+bSslPGJH7R8Bx3ZWCxG
+5xHQncsFm13bsDoWAz1iE7JQyFFymgpe2ldAChFEJG9OC/REShm8KyCj9O/3NbIa
+UxwYAHAcUEIQ7+JqX9+RqTlTVgD8XYRjAosEdJ1Zhm4emUPyAlSUQUAvGTWR4B0=
+=f+55
+-----END PGP SIGNATURE-----
diff --git a/dev-java/gnu-classpath/gnu-classpath-0.98-r3.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.98-r3.ebuild
index e41e5d9ce92a..fbf77a2ef911 100644
--- a/dev-java/gnu-classpath/gnu-classpath-0.98-r3.ebuild
+++ b/dev-java/gnu-classpath/gnu-classpath-0.98-r3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/gnu-classpath-0.98-r3.ebuild,v 1.6 2011/03/29 09:13:40 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/gnu-classpath-0.98-r3.ebuild,v 1.7 2012/10/18 08:44:11 ottxor Exp $
 
-EAPI=2
+EAPI=4
 
 inherit eutils java-pkg-2 base multilib
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.gnu.org/software/classpath"
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0.98"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
 
 IUSE="alsa debug doc dssi examples gconf gjdoc gmp gtk gstreamer qt4 xml"
 
@@ -65,8 +65,8 @@ S=${WORKDIR}/${MY_P}
 
 src_configure() {
 	# We require ecj anyway, so force it to avoid problems with bad versions of javac
-	export JAVAC="/usr/bin/ecj"
-	export JAVA="/usr/bin/java"
+	export JAVAC="${EPREFIX}/usr/bin/ecj"
+	export JAVA="${EPREFIX}/usr/bin/java"
 	# build takes care of them itself, duplicate -source -target kills ecj
 	export JAVACFLAGS="-nowarn"
 	# build system is passing -J-Xmx768M which ecj however ignores
@@ -98,15 +98,14 @@ src_configure() {
 		--disable-dependency-tracking \
 		--disable-plugin \
 		--host=${CHOST} \
-		--prefix=/usr/${PN}-${SLOT} \
+		--prefix="${EPREFIX}"/usr/${PN}-${SLOT} \
 		--with-ecj-jar=$(java-pkg_getjar --build-only eclipse-ecj-* ecj.jar) \
 		--disable-Werror \
-		${myconf} \
-		|| die "configure failed"
+		${myconf}
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS BUGS ChangeLog* HACKING NEWS README THANKYOU TODO || die
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS BUGS ChangeLog* HACKING NEWS README THANKYOU TODO
 	java-pkg_regjar /usr/${P}/share/classpath/glibj.zip
 }