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

7 files changed, 66 insertions, 114 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() {
diff --git a/dev-java/bcprov/ChangeLog b/dev-java/bcprov/ChangeLog
index 71cc520d6e8c..9f8717e0d346 100644
--- a/dev-java/bcprov/ChangeLog
+++ b/dev-java/bcprov/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/bcprov
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/bcprov/ChangeLog,v 1.46 2013/06/01 14:51:29 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bcprov/ChangeLog,v 1.47 2013/06/01 15:33:22 tomwij Exp $
+
+*bcprov-1.49-r2 (01 Jun 2013)
+
+  01 Jun 2013; Tom Wijsman <TomWij@gentoo.org> +bcprov-1.49-r2.ebuild,
+  -bcprov-1.49-r1.ebuild, -bcprov-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.
 
 *bcprov-1.49-r1 (01 Jun 2013)
 
diff --git a/dev-java/bcprov/Manifest b/dev-java/bcprov/Manifest
index 76e25411c8be..352242e82330 100644
--- a/dev-java/bcprov/Manifest
+++ b/dev-java/bcprov/Manifest
@@ -11,18 +11,17 @@ EBUILD bcprov-1.38-r2.ebuild 1452 SHA256 8735872701829cb2196d785bf055c4a4775d8c2
 EBUILD bcprov-1.40.ebuild 1454 SHA256 1544c0cc3176805b20350368e80ee8f952567f31f82513e993f074b0f1e2a20c SHA512 f67125956dda113ba94310a31bff2ae11e0e5f1a0445da3541cadd2c4a9caa1a509a892854023209478e4474dbc92ee44de628a2e370082d5a280527d8b0f24c WHIRLPOOL 75f532f19fbcf5b2074239df10319c84705d483c03b31901860cb429c6e28e8519774b2d957e5620cfeed741d1a446bc222e67c1d6ebc809e159822e7fcbf47e
 EBUILD bcprov-1.45.ebuild 1478 SHA256 b3ba2820f5a40671aa8cc10dbac6557acaaa64baf44ec39534f5483d723615d7 SHA512 df78fd1da9a616dbd1c9314cbf24b00595ef5092acb6fae78c90b8858c252d10e3210454932e7d3ceda9504f8a08e7f36fc28ea98ed8860d6d2963fec9469db2 WHIRLPOOL 81ad18a44130c98b2396451c0a4a9e5746a5a77e0c6ccaf43eb5451608110b973dad8ca95ecabe055263b2431cd75fb9f9befab0199b716e9f647dd613193b3b
 EBUILD bcprov-1.48.ebuild 1615 SHA256 793a91ae2403c02c482a5bbb0f725b2efda4753c4fcc66e062397b9561090b94 SHA512 7c3d628dc54e66b11b79022a28ccd98103a416bc8ea2fb76e35159fb44446134d29a2cea0ac01e11920efaf29a9df1005750f90641170517f6fa3e52c5c4d7b7 WHIRLPOOL cda75815ed42415f0861971be595952020ff9218ceb9d04abaf1bfe499604c5c42bb4e08d90293dbd2947530ad1107624d0839247f5c5c8b8e07ccd7a87a2ff7
-EBUILD bcprov-1.49-r1.ebuild 1878 SHA256 79fee6705eedf5931de6410fbe457ab59aee6b9507448ef1bb4b424a5e1243bd SHA512 188e8f0db2e883e8f96c8c4b4c117a1d49dd299b9c501e70b1107ee17763115f93f7110cd1589fef52645f5b6f20cd5c0e9444b8f4965283520e079b5da55ef4 WHIRLPOOL 0bd70fa66769b61038ebdf2f12e2f428c45282519187db0502e653e1050a5a36885b8f4de362ae58542381b36c286e6334eb36131d8f7532c4a717259713c1c5
-EBUILD bcprov-1.49.ebuild 2176 SHA256 c219425e01b78c08c6d303d2b5a1605c5fb91788998c45fc8e470f800aa15af1 SHA512 eb9b8aedc9059a7addd6f95102a8b663b108a0ed0200a538625228e4191d219d1d2439391d993633b899531cdd87c5ac736a75cf084c1f0dacca80854f95e577 WHIRLPOOL 05229aa94438d23c3770236c432b13a18a91c1144a4a28d8cfbdedca622a0b1f0fcbcab4a6932dec5bc53fe2ceaaca1eab0a1adc772ea7c64416db0e09bc0999
-MISC ChangeLog 6423 SHA256 b18ffd252252656255b9c3f097d75f3f14e277f0e662b174773d02841ed43676 SHA512 fc3419011d3001dd02ee6f24572e01c8726c681dacbca33cd5a1dc7c50ba19543e54cb9f4b2e2e2578018cee720865fcebbd21eca031b0e9ca7f9ccc9287e5f6 WHIRLPOOL 0d55f5785a325c9eae5aef18394805f3080d7b0a760391d56a50326285146a598abffcb8614cf86ac60fc2fe59a5efe03d281f5e5ebf84a149aa494fffa43f91
+EBUILD bcprov-1.49-r2.ebuild 2035 SHA256 845476c396e28d2386a89ff07b983878f6575d9235c35d9356853e23c32ab901 SHA512 033f9fb3eb53df115ef0594bae4ea316e3d93002406e7d47cf0ecc6cae03d2243b0235f22b034f3af82d1aa929ca64dac004ef9c2c6ed729c195836c7582e380 WHIRLPOOL 14b8284b1ec106cae1d91ac0be7089be2bc9db6fe33b4dd1b7042c33d5da1880c88a6ccb7b11f0dc761f86a28130dc9c6fc2c7a9d0ee6666cec54a08e0bacdc2
+MISC ChangeLog 6728 SHA256 72267308a95f2e2da71d8939861b8efa95fb19507dc4f47dc9f21cd706457fe2 SHA512 bd9a198371605a524f98ccabf396014b8685ba572e9375a2e476ee06239d692da7ee1f00eadc56bb034495618f6c6e9116e32c105b7b0225fe9b9dccc6e4f000 WHIRLPOOL d1a393c69435f99e6fc87498b774e32fae942428439a57440785983ac7f601ad74c471fe1eaf2be8187011e11830e02ae464cb18a1ddd7484d457447c451c330
 MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRqgn1AAoJEJWyH81tNOV9O1kIAMWzAoNn4W0rBg33KI/0Bt8R
-jI9TiLm+5cyROiOHTa22pzhHcp9did0Fb/htf85gixuQmX0dJE+OAxdKLXmLmJ5/
-8JblcDge/hgt1YJCmFG0oreeym7YGQY4zzJSLDk7rZS8n4FdnbisV8BdoYNWf/+A
-me30zevT62AyzD+z4Gx8wsoN+WkbQ0v9cL9sq1FgjVSQAAe1UYVf/4aRH2cVgCWY
-qKiDxajvDKwF66e1WJrptyEwaXM890wpc3KaG/NAxcuVNXDKCOpQQLNaV65rWYz0
-9qdYNMIXjDbNVFzulULbmzRj3MMdQD5eMOhKxzIhPcfyMpNeoqfJ6h0Y0tjYQDk=
-=bNI4
+iQEcBAEBCAAGBQJRqhPNAAoJEJWyH81tNOV95ccH/3anYt0X86tDU/zmn6ZSpz8+
+gkpEviqZ5T4Cc32IJw9O7U/yFS0uYUnWZKP/8PFuW7nydJrB9RbZcFm0QoTfpUsB
+OO20yJ3PCb7tGkrnK4+7C1kRPZfyu6X48+rOmOr2tuxJGhyGVwn01TTKKM3ahqPZ
+rhxaYT7DP8UmhNVYamp2Y46+xmHQWQBGIKI8+ZpO7/lZT3PBPkGxTDMUhUksakW+
+UpvHbnBuEvmSrw0o+Xo0rWM1q2YBXQLwyx2dVbL0IJp9wz2L1dZxXR5vLhFU+5+i
+g10WE4a3StCR4F9AJvZn1RAbUkl5vHMlKJ7zXAyDFuN34Cc9qR2+hDtQCIOD1Ec=
+=WRUX
 -----END PGP SIGNATURE-----
diff --git a/dev-java/bcprov/bcprov-1.49-r1.ebuild b/dev-java/bcprov/bcprov-1.49-r2.ebuild
index 3dafafd1ecdb..e0620e560b35 100644
--- a/dev-java/bcprov/bcprov-1.49-r1.ebuild
+++ b/dev-java/bcprov/bcprov-1.49-r2.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/bcprov/bcprov-1.49-r1.ebuild,v 1.1 2013/06/01 14:51:29 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bcprov/bcprov-1.49-r2.ebuild,v 1.1 2013/06/01 15:33:22 tomwij Exp $
 
 EAPI="5"
 
@@ -43,12 +43,22 @@ src_unpack() {
 java_prepare() {
 	mkdir "${S}"/classes || die
 
-	java-pkg_jar-from --build-only junit-4
+	if use test ; then
+		java-pkg_jar-from --build-only junit-4
+	fi
 }
 
 src_compile() {
 	find . -name "*.java" > "${T}"/src.list
-	ejavac -cp junit.jar -encoding ISO-8859-1 -d "${S}"/classes "@${T}"/src.list
+
+	local cp
+	if use test ; then
+		cp="-cp junit.jar"
+	else
+		sed -i '/\/test\//d' "${T}"/src.list || die "Failed to remove test classes"
+	fi
+	
+	ejavac $cp -encoding ISO-8859-1 -d "${S}"/classes "@${T}"/src.list
 
 	cd "${S}"/classes || die
 
diff --git a/dev-java/bcprov/bcprov-1.49.ebuild b/dev-java/bcprov/bcprov-1.49.ebuild
deleted file mode 100644
index c30908286448..000000000000
--- a/dev-java/bcprov/bcprov-1.49.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/bcprov/bcprov-1.49.ebuild,v 1.1 2013/06/01 14:09:07 tomwij Exp $
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-MY_P="${PN}-jdk15on-${PV/./}"
-DESCRIPTION="Java cryptography APIs"
-HOMEPAGE="http://www.bouncycastle.org/java.html"
-SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos"
-
-# Tests are currently broken. Needs further investigation.
-# java.security.NoSuchAlgorithmException: Cannot find any provider supporting McElieceFujisakiWithSHA256
-RESTRICT="test"
-
-# The src_unpack find needs a new find
-# https://bugs.gentoo.org/show_bug.cgi?id=182276
-DEPEND=">=virtual/jdk-1.5
-	userland_GNU? ( >=sys-apps/findutils-4.3 )
-	app-arch/unzip
-	test? ( dev-java/junit:4 )"
-RDEPEND=">=virtual/jre-1.5"
-
-IUSE="userland_GNU"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	default
-
-	cd "${S}" || die
-	unpack ./src.zip
-}
-
-java_prepare() {
-	mkdir "${S}"/classes || die
-
-	java-pkg_jar-from --build-only junit-4
-}
-
-src_compile() {
-	local cp
-	if use test ; then
-		cp="-cp junit.jar"
-		find . -name "*.java" > "${T}"/src.list
-	else
-		find . -name "*.java" ! -path "*/test/*" > "${T}"/src.list
-	fi
-
-	ejavac $cp -encoding ISO-8859-1 -d "${S}"/classes "@${T}"/src.list
-
-	cd "${S}"/classes || die
-
-	if use test ; then
-		jar -cf "${S}"/${PN}-tests.jar * || die "Failed to create tests jar."
-		find . -path '*/test/*' -delete || die "Failed to remove tests files"
-	fi
-
-	jar -cf "${S}"/${PN}.jar * || die "Failed to create jar."
-}
-
-src_test() {
-	java -cp ${PN}-tests.jar:junit.jar org.bouncycastle.pqc.jcajce.provider.test.AllTests | tee pqc.tests
-	java -cp ${PN}-tests.jar:junit.jar org.bouncycastle.ocsp.test.AllTests | tee oscp.tests
-	java -cp ${PN}-tests.jar:junit.jar org.bouncycastle.jce.provider.test.AllTests | tee jce.tests
-
-	grep -q FAILURES *.tests && die "Tests failed."
-}
-
-src_install() {
-	java-pkg_dojar ${PN}.jar
-
-	use source && java-pkg_dosrc org
-	use doc && java-pkg_dojavadoc docs
-}