added prefix support (bug #435468)

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

3 files changed, 35 insertions, 16 deletions

diff --git a/dev-java/gnu-crypto/ChangeLog b/dev-java/gnu-crypto/ChangeLog
index 7f26f160a891..fc11fa7a515f 100644
--- a/dev-java/gnu-crypto/ChangeLog
+++ b/dev-java/gnu-crypto/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/gnu-crypto
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-crypto/ChangeLog,v 1.28 2012/01/01 18:05:56 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-crypto/ChangeLog,v 1.29 2012/10/18 12:47:00 ottxor Exp $
+
+  18 Oct 2012; Christoph Junghans <ottxor@gentoo.org>
+  gnu-crypto-2.0.1-r2.ebuild:
+  added prefix support (bug #435468)
 
   01 Jan 2012; Ralph Sennhauser <sera@gentoo.org> gnu-crypto-2.0.1-r2.ebuild:
   Drop ia64 support #345433
diff --git a/dev-java/gnu-crypto/Manifest b/dev-java/gnu-crypto/Manifest
index d67f959995f2..4e9734eb0e1e 100644
--- a/dev-java/gnu-crypto/Manifest
+++ b/dev-java/gnu-crypto/Manifest
@@ -1,5 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX gnu-crypto-2.0.1-jdk15.patch 1551 SHA256 c28719ef7001e22fed5320a0d84cff5755c4f74413fae1a659cb23880aaa0966 SHA512 f30f33e29bf400eb8bdd465ffd649fd2aec03ab6d3a315c5da2a8b6375524f1cc20f6ec3f813a9940fbdecf4364c8985bed946ada633d73bda9508c0dc198923 WHIRLPOOL 492bdad73b2effc14daf1c2faba213c58deec836fbdbaed93d858f1101d2ec9268f60f0458fc081278df4978b38a0d2f9e71270ea60340345bd9281a19af4039
 DIST gnu-crypto-2.0.1.tar.bz2 3895714 SHA256 a7398758a5dd62f2a30bd083c3646092006d51a63b7a91ab608dc2c80d569d2c SHA512 c14aa73fb23663559195e8fc7f85a220b25078fa8ab4e7cf43b84febe96599d990ccf52fcf1f6f66f2b547d9b644bbc99b3d44dc4a777dcb72530e58c8509015 WHIRLPOOL 1ce73d64e763ef04157915938e661999bdc7861940f5d9bfbea35601b9345b05baf5ba60dbcce17d2892a1cae3d31fead53363c44306cbd4951dbce9bcefa3e2
-EBUILD gnu-crypto-2.0.1-r2.ebuild 1251 SHA256 b6fa0256799ec05c8c0925c13808b6e29bd147dd79a67bd03a98f56421321330 SHA512 819fa518f40f23fec77253a2d754009e6798a5bea657162595209463b568e95819dc53b7060a99c7bd0fa4d690187ea5d4803c4ce83b1a17f9225be05ed58e35 WHIRLPOOL 9c8def99da9b139032b24000c7810c4f1d5ac836fc2b866756d92a008395e299516c3253dae699ab120fe8bcea68e2bd57d3947b5a0df4d3b34e7b077a702336
-MISC ChangeLog 3348 SHA256 1ebd917f3582b973915bd8483639501b76e8936f89c56825e155aefc2583f754 SHA512 d998471211e1aa23434c096d7e089243af2c69fb21773740573d514d6190aa06f8ee4b276b4f3b2cf2976656cbd5eb3a76a1e5821d07a9438f61e897401895aa WHIRLPOOL 7d0c9d55898adc5c95b97b14aa7969eba545a13a67a5f577300df789f503161d7b42277ac7c9572e080e784eeecaf70fae4fa18dfb0a86ac40f9e1304fc27092
+EBUILD gnu-crypto-2.0.1-r2.ebuild 1282 SHA256 4d849cb7120107ec6d0280ac92950bd20f654e09bb98ccd96cb38dbef579dec1 SHA512 346446554f8e51e4154bfb280da5bb9c33c5e7b7450a06fdc30dd2f831d04b6abce912995229de9520ad01fc919fc37acf7f3e5050bef2b45336ee2c3527b124 WHIRLPOOL 1a52a06c20b8a3f79c63fbf8084f808f053f6ab0998b48c56e55eb0478b90bc336fb5c636e6f058866628461ed23bb64eb7e0250a4f5ec9536bf31235fe2d7f9
+MISC ChangeLog 3472 SHA256 f0ad752ed310d803508adeae1a2c1e5dfbedeaf6c8b10887d77639d6b2515f59 SHA512 f471fc3628a02b449d1766be469d8f92fec7b0ab99f1d2ff7a8c37eb7d379c093cc0bba4114eaa911d995ee52aad3fe9b67c75ce323f1c9fd8f827f987410489 WHIRLPOOL 31306c447680a579bc83c578c161ae2b30bee733668dee882b3582b23eb3743e0ec5f7e193d36c7613f6957052115e25c29fb528bab1b221bf9782f36e6ca492
 MISC metadata.xml 461 SHA256 99ca8bf6faf15430ec45eb698e0f782d5e255c153f6925ef936d3356c81758b9 SHA512 e812e333f7c1f602dc896b3c6f92bad32ebc7c321456acebb74818b83f50f67a8731db1692b072b030478f1429b973186bdaf37166fb10f25e3053359e9fa066 WHIRLPOOL 12d62ee6afdedaff2147349d9b3e3dd0af3b5c8f2ae6f12fd6f3477dccfad8410987f8618d1ef899ca69ac112a5491378978d371f5fae10748d8e809b9e3b589
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQf/pFAAoJEOeBhlrCAAWGe28IAKZNuxVficYfpc39QMWgVys/
+Q2ygu7+FHdhH8CZ7CxhnfXJyPZwwIKyxIXCM5B34Xd4ynLVFfm8r9yD5qapCrraE
+kXCAsc2M0M7aDi/2PG38JXc26666yBrBuE7i79tbHVzH+i9ABT4dlDuRXhmYH8kD
+MmOGA628aNBi/UOK9qthpP+DWGGtPD3d2mr9iJvR+Nj8VnmCJSayqMozfn9tFrrc
+X5VlPXf/VVyh1cA/7RBfVMkIyM7gvpx6ptlPF0R+AhSQHWDrw1HWg2MsdJOyrpAv
+zWtWl4xVswh+fGo+kx2q0ud71wvwOSxHyd6M6X5AUL/Q0LAi1gC/2ip1/1C6fIw=
+=fsrk
+-----END PGP SIGNATURE-----
diff --git a/dev-java/gnu-crypto/gnu-crypto-2.0.1-r2.ebuild b/dev-java/gnu-crypto/gnu-crypto-2.0.1-r2.ebuild
index b127c51efd4e..02a9a40bd79e 100644
--- a/dev-java/gnu-crypto/gnu-crypto-2.0.1-r2.ebuild
+++ b/dev-java/gnu-crypto/gnu-crypto-2.0.1-r2.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-crypto/gnu-crypto-2.0.1-r2.ebuild,v 1.12 2012/01/01 18:05:56 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-crypto/gnu-crypto-2.0.1-r2.ebuild,v 1.13 2012/10/18 12:47:00 ottxor Exp $
 
+EAPI=4
 JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 eutils
@@ -12,7 +13,7 @@ SRC_URI="ftp://ftp.gnupg.org/GnuPG/gnu-crypto/gnu-crypto-2.0.1.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.3"
@@ -20,25 +21,25 @@ RDEPEND=">=virtual/jre-1.3"
 
 RESTRICT="test"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	epatch "${FILESDIR}/${P}-jdk15.patch"
 }
 
-src_compile() {
+src_configure() {
 	# jikes support disabled, doesnt work: #86655
-	econf JAVAC="javac" JAVACFLAGS="$(java-pkg_javac-args)" --with-jce=yes --with-sasl=yes || die
-	emake -j1 || die
+	econf JAVAC="javac" JAVACFLAGS="$(java-pkg_javac-args)" --with-jce=yes --with-sasl=yes
+}
+
+src_compile() {
+	emake -j1
 	if use doc ; then
-		emake -j1 javadoc || die
+		emake -j1 javadoc
 	fi
 }
 
 src_install() {
-	einstall || die
-	rm "${D}"/usr/share/*.jar
+	einstall
+	rm "${ED}"/usr/share/*.jar
 
 	java-pkg_dojar source/gnu-crypto.jar
 	java-pkg_dojar jce/javax-crypto.jar
@@ -47,5 +48,5 @@ src_install() {
 	use doc && java-pkg_dojavadoc api
 	use source && java-pkg_dosrc source/* jce/* security/*
 
-	dodoc AUTHORS ChangeLog NEWS README THANKS || die
+	dodoc AUTHORS ChangeLog NEWS README THANKS
 }