Fixed junit dependency to be in DEPEND and tests to only be present when the user or reverse dependencies force it by USE flag, removed old revisions.

Package-Manager: portage-2.1.12.2/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

3 files changed, 36 insertions, 17 deletions

diff --git a/dev-java/bcpkix/ChangeLog b/dev-java/bcpkix/ChangeLog
index 5c24f11dee96..66d9123fd097 100644
--- a/dev-java/bcpkix/ChangeLog
+++ b/dev-java/bcpkix/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/bcpkix
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/bcpkix/ChangeLog,v 1.1 2013/06/01 15:09:20 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bcpkix/ChangeLog,v 1.2 2013/06/01 15:33:25 tomwij Exp $
+
+*bcpkix-1.49-r1 (01 Jun 2013)
+
+  01 Jun 2013; Tom Wijsman <TomWij@gentoo.org> +bcpkix-1.49-r1.ebuild,
+  -bcpkix-1.49.ebuild:
+  Fixed junit dependency to be in DEPEND and tests to only be present when the
+  user or reverse dependencies force it by USE flag, removed old revisions.
 
 *bcpkix-1.49 (01 Jun 2013)
 
diff --git a/dev-java/bcpkix/Manifest b/dev-java/bcpkix/Manifest
index 7ed4bbd7cf2d..c17c7d57d804 100644
--- a/dev-java/bcpkix/Manifest
+++ b/dev-java/bcpkix/Manifest
@@ -2,17 +2,17 @@
 Hash: SHA256
 
 DIST bcpkix-jdk15on-149.tar.gz 1212204 SHA256 8adcc21c2f848e449d6a15daec96adf73174c93015ddf0f4eb8bb6f964500f8a SHA512 be70da827c8edf5c4a4960aa78b16bdde62932e140ae1294a011402b1ec0914bcee246bd69fe6fde6c7c5d637c33fa68c7c6b791341cad9d12ad52ccee9ca2c6 WHIRLPOOL f4786f609833ca43dce0eefb5ccea5f9aaa7d53ad574bae3b069b95fba1678839140ef1e98f5924bc8703a22a4f446d22819cabb4161401dd71560c35d0af9fc
-EBUILD bcpkix-1.49.ebuild 2303 SHA256 5f99d25ad8f09ac8b3ad64744ddc262a277ccaec60ecfbf157f335db88c1608f SHA512 e64188084c9605d2a19e5dbd3cf11f8d74bec995c90b167905f7557ada0221897eca7cba905366a29aa74fc3a2fdf996fc0d22457ef32cb894f40a6655d4a063 WHIRLPOOL 9c92dda3dba0313ff116ef1e3c434b8d2474d8009c5c13cb9d9c3170656a4b3cf719b149372ac842a64698b20125e17754674573dc989292ce923c06c3b0e310
-MISC ChangeLog 560 SHA256 3ba1af32c594285eb3b6c137ecc493ca7c17e4e7db602f0a37155f1267ea4ad1 SHA512 daa5907c995c7af8a4a9ab81fdf80f44f1eea5f0003956bbcb5bb416684dc620fffcd0bf50f165aeb1d19e36259f5b08840b7e9f65e6e45227bea43a54ad7606 WHIRLPOOL 3632146c37ae1d35722f844e11b4529f143523f56511bf1e659e35e353ff8046f8d8c1efe698edb0282bad6bb9f326b6eb3b156fea388a934bc2152c06dd8125
+EBUILD bcpkix-1.49-r1.ebuild 2470 SHA256 a45634b06b028ac966cb978cc23a36dd0307015166c735b620b10d5002b3255e SHA512 c373b599833e6e247d27b54e87b12350538c77c4f5612146b9945e4e9a5aecfcf1e35346fab0d55c00c55fb71d919ae2afb9203985d3291f65d6d3156f8f04ab WHIRLPOOL 83c7bfd87e7bf11cdb0c148218cfeb9dc776080a3ea6138c67fddcb1c8cc1973cd5eca531bf6a4038632e302cefa9b53a650ced516dcce3a253973b61696c27a
+MISC ChangeLog 841 SHA256 a49338c86adecfa80346b33c4fe1380ced5c97891650db3bb958dc9f4a324ad9 SHA512 26f05abd237436ac36fb38ecffc7866c822b14b65aaac53f9cdf97edca571c062e3e04183ab2d52b4e02b478dd906d052172e7c9e3f570ab36551c4ca566d073 WHIRLPOOL d26e1da7e14964fe9a3be8a7bc8814b6e41c7c65d1d2c5ea690274192a149c2ac3549cdf88f940048fd91fb9c38f2f0fac3d1f185f6507d08374549865ff82e6
 MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRqg4kAAoJEJWyH81tNOV9+C4H/290YvE3/TDlTuoUYmeQSff2
-CAotG+0eyGrsFdvApcRPiX+qcAlqBP4puMmpgSCOSlCdOdRERjhGD2glPgD3LjSA
-t/nt3Hp+a+O6KizM+28FbehsIZFYt518su+J2zJJiFS3p5q1zTeVXkeYrRqe347f
-KQ8lYKQOhdlmodxi1Yfv1xVHpb4q820ks21IeZlkdg2D+mN3LKtZE02QJpmGYIq7
-+dbJooffK5Mkbz2KImC+RweT8gauNYaTTUjsDSx6DAX2WbSXGDMmRH2gdxgzZ+Gi
-en+i8Mw7G/hT48o2h85R2J2tYssWDKvPQJKp/vgjqElpha8HhupZAZef250IlqA=
-=GanE
+iQEcBAEBCAAGBQJRqhPKAAoJEJWyH81tNOV9Y7IH/1ZMRuhomYxrd1PeX5fw8+Xy
+5lRjsXTK/sHhNqAUwegHijKRfqb62B7Qcy35QsnSj669NVyQtiM6SKeZKq4Ey2O3
+YXzmag1NFKB+1654BV703SMewlaB/lAjk1ViLzEW1E8fdhxFG/tGVlhQULfYaOBD
+42wel509jh8gTxukDOLS4TyXN88gFHvrdOUfuHuVmEzUDIfuYEet+/PAg1Hk52A/
+0GkEWhHMtkVJtowTylWQbOeEdkh52Cr3WElklwFaSW8xJkLQqFXmjWrJ7u1a9E86
+wp68n0VqAAQQrRYMhUrFEIX7IUHSH7CK9CzM3s3iQ2c8vai4bGDDFm35sqcPSlE=
+=uWvh
 -----END PGP SIGNATURE-----
diff --git a/dev-java/bcpkix/bcpkix-1.49.ebuild b/dev-java/bcpkix/bcpkix-1.49-r1.ebuild
index 9ccaea91b7d1..0ecf6ce8f6fe 100644
--- a/dev-java/bcpkix/bcpkix-1.49.ebuild
+++ b/dev-java/bcpkix/bcpkix-1.49-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/bcpkix/bcpkix-1.49.ebuild,v 1.1 2013/06/01 15:09:20 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bcpkix/bcpkix-1.49-r1.ebuild,v 1.1 2013/06/01 15:33:25 tomwij Exp $
 
 EAPI="5"
 
@@ -23,11 +23,11 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
 RESTRICT="test"
 
 COMMON_DEPEND="
-	=dev-java/bcprov-${PV}-r1:0
-	test? ( dev-java/junit:0 )"
+	~dev-java/bcprov-${PV}-r2:0[test?]"
 
 DEPEND=">=virtual/jdk-1.5
 	app-arch/unzip
+	test? ( dev-java/junit:0 )
 	${COMMON_DEPEND}"
 
 RDEPEND=">=virtual/jre-1.5
@@ -44,16 +44,28 @@ src_unpack() {
 java_prepare() {
 	mkdir "${S}"/classes
 
-	java-pkg_jar-from --build-only junit
+	if use test ; then
+		java-pkg_jar-from --build-only junit
+	fi
+
 	java-pkg_jar-from bcprov
 }
 
 src_compile() {
 	find org -name "*.java" > "${T}"/src.list
-	ejavac -d "${S}"/classes -classpath $(java-pkg_getjars bcprov,junit) "@${T}"/src.list
 
-	cd "${S}"/classes
-	jar -cf "${S}"/${PN}.jar * || die "failed to create jar"
+	local cp="bcprov.jar"
+	if use test ; then
+		cp="${cp}:junit.jar"
+	else
+		sed -i '/\/test\//d' "${T}"/src.list || die "Failed to remove test classes"
+	fi
+
+	ejavac -d "${S}"/classes -cp ${cp} "@${T}"/src.list
+
+	cd "${S}"/classes || die
+
+	jar -cf "${S}"/${PN}.jar * || die "Failed to create jar."
 }
 
 src_test() {