diff options
| author |   Patrice Clement <monsieurp@gentoo.org> | 2015-07-07 09:41:16 +0000 |
|---|---|---|
| committer | Patrice Clement <monsieurp@gentoo.org> | 2015-07-07 09:41:16 +0000 |
| commit | 65710354ef55510c84c7409107f95501ef0a284f (patch) | |
| tree | 197c207e04d7346bf09f960e896fc99f7f14772f /dev-java | |
| parent | Bump (diff) | |
| download | historical-65710354ef55510c84c7409107f95501ef0a284f.tar.gz historical-65710354ef55510c84c7409107f95501ef0a284f.tar.bz2 historical-65710354ef55510c84c7409107f95501ef0a284f.zip | |
Install gnu-crypto-test.jar only when tests are enabled. Fix bug 554128.
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x93491BB8
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/gnu-crypto/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-java/gnu-crypto/Manifest | 18 | ||||
| -rw-r--r-- | dev-java/gnu-crypto/gnu-crypto-2.0.1-r3.ebuild | 31 |
3 files changed, 31 insertions, 24 deletions
diff --git a/dev-java/gnu-crypto/ChangeLog b/dev-java/gnu-crypto/ChangeLog index ce58bb4794e1..9f26a0cfe9bb 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-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-crypto/ChangeLog,v 1.30 2015/07/06 20:10:43 monsieurp Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-crypto/ChangeLog,v 1.31 2015/07/07 09:41:01 monsieurp Exp $ + + 07 Jul 2015; Patrice Clement <monsieurp@gentoo.org> + gnu-crypto-2.0.1-r3.ebuild: + Install gnu-crypto-test.jar only when tests are enabled. Fix bug 554128. *gnu-crypto-2.0.1-r3 (06 Jul 2015) diff --git a/dev-java/gnu-crypto/Manifest b/dev-java/gnu-crypto/Manifest index 71eb4ad4a368..a02e818b0568 100644 --- a/dev-java/gnu-crypto/Manifest +++ b/dev-java/gnu-crypto/Manifest @@ -4,17 +4,17 @@ 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 1282 SHA256 4d849cb7120107ec6d0280ac92950bd20f654e09bb98ccd96cb38dbef579dec1 SHA512 346446554f8e51e4154bfb280da5bb9c33c5e7b7450a06fdc30dd2f831d04b6abce912995229de9520ad01fc919fc37acf7f3e5050bef2b45336ee2c3527b124 WHIRLPOOL 1a52a06c20b8a3f79c63fbf8084f808f053f6ab0998b48c56e55eb0478b90bc336fb5c636e6f058866628461ed23bb64eb7e0250a4f5ec9536bf31235fe2d7f9 -EBUILD gnu-crypto-2.0.1-r3.ebuild 1301 SHA256 91497a03d12455408095643c57e7b7c38fd89fdc23e6ff822475a5ab7f8c4e9a SHA512 da502f780e58a3a9b9454c0b21df6ad26e8c3e7b5891e8253c05d57692f83dcfad26e0e8b6b99e9b73f75b1fe4797705e0c7ca9da8cb39f2adca9b20e44f4c6d WHIRLPOOL ba500ee69bea8c8a45869ad07e00b93238d33a7789a0ae39548fe347c5d1d49e55d632e81ce407e0dfa9ab26d6d72a360f0cd25ec964119f253224270c368f32 -MISC ChangeLog 3690 SHA256 eeac3de0a261389df2ab54bb154b7087d5f9364351bc6be2e077579315c3bdc9 SHA512 68af5bcf774c417617df421648a3e0212e087ec168c096bdf9c7eef41630d70822a07c8c27149fe3289047ef0631b35ebe0a2bdb027e9908a3bf855707c05b0c WHIRLPOOL 4b04283c20e59a284fac7751bc2d45fbb6c99d572979770710028376aefbb0c8c2e362a5d75b343b441920050aa06767500dd5828eb724a04728d34acc1f64b4 +EBUILD gnu-crypto-2.0.1-r3.ebuild 1392 SHA256 7dc1054686df2175882f47455b7100f36388983b1793c67a96040360de6efb2d SHA512 44c2993b2b2bf687da0fcd4ddc8e6f742d7effd820531ddf99895cf043a6381242f7d8e35073e22093bebd29fbfc39eff93a201f2cadc495f81f99aa64e4e8a7 WHIRLPOOL 19d154a221db586f4855eb0c5a135513bfced9f82a84fe4424e04ac4b5fef1e25b0b5cf34332c98770f6ad7a2fa4e3a3badd50e922e3f4cb9376a36daeec8902 +MISC ChangeLog 3850 SHA256 6abd1dd0cdafc538a9c5ae6854ed441fdb4490474bb092861de8a9af42c47f78 SHA512 5f45dfc4239cb87fb0a245c94d8839e8d858b89841472068f5f496aa0b8ad09571cd1deef2ca09806ee2674d6496982df480f0f86c7888293bc4c4f35f90181f WHIRLPOOL b21f2d4d3f54fafe89a982d8bbc9b4bbd31b1f8eeaccaa751691acb37c8cc9105e105453b030f07331e8df6e41172f0899a6cbd6ce836a05d61019e828978004 MISC metadata.xml 461 SHA256 99ca8bf6faf15430ec45eb698e0f782d5e255c153f6925ef936d3356c81758b9 SHA512 e812e333f7c1f602dc896b3c6f92bad32ebc7c321456acebb74818b83f50f67a8731db1692b072b030478f1429b973186bdaf37166fb10f25e3053359e9fa066 WHIRLPOOL 12d62ee6afdedaff2147349d9b3e3dd0af3b5c8f2ae6f12fd6f3477dccfad8410987f8618d1ef899ca69ac112a5491378978d371f5fae10748d8e809b9e3b589 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQEcBAEBCAAGBQJVmu8kAAoJEJGRpfGTSRu46ewH/iMieHtHiJ/obC6agegYHXNp -UQ09GCEUCjaxkJ+NY4gsFQ+ZEti8hp3KEdPeRI9hySs2+PKd3DOg0SvPs7M/o0mk -48lW08O32J/L0Ao4Dk3qWLlx9RQSN7SrboWMQijE1p7S8Yi56D3DwFrQ/jXrEqKB -s473Ez9oC0bCu+PIFJCJ+k88cvg3KxI0GKboCN7I+EHwx4+J9jnUNlkZVC0uPw17 -7UJPYd6t65ouZt28CZ+YnRk1Azak+tFTe+TknAtQgZhe0vqtb55BP4zVjbC008nl -/hT2sWKnvfUySBxxZ5tYU2COUVcGWT+xwGrZ9wpbTZoErP9BTH4ChY1ErhUdABs= -=rkzS +iQEcBAEBCAAGBQJVm60WAAoJEJGRpfGTSRu4IikH/37XQtA6WvAKbVfy3ajAj3MD +tbJ5gAxVErsJ0rFEzepEX7pijIfNCW8Fgt5NJ2tHnfbgV6vytXT6fD+yu9RFY9fz +6ooW1n03/KlttZi1T+mk9uekK7UkwE/j1+5Jf087QEzZAeiB8cKbeKanHPJ3V+k0 +kUhldYEhQ1SPEHNmhLMni80hVnDAgXCbSFZVj5DyCAZ5FVu6ophtI/i816th/07b +e16O99S9K7VG+0tojN8fleUnSd50NWhVr0XRfTnU/piJZE/GiwoAlM/X6atcuyJ8 +I7WtCKj5D8aJ3D5/FOI/hRZm0RyRRxuyUmMYqjb9K3HILP4c/D+VSD4s3bZrCX8= +=VlDE -----END PGP SIGNATURE----- diff --git a/dev-java/gnu-crypto/gnu-crypto-2.0.1-r3.ebuild b/dev-java/gnu-crypto/gnu-crypto-2.0.1-r3.ebuild index e7020f3e8126..6e5c7b702084 100644 --- a/dev-java/gnu-crypto/gnu-crypto-2.0.1-r3.ebuild +++ b/dev-java/gnu-crypto/gnu-crypto-2.0.1-r3.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2015 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-r3.ebuild,v 1.1 2015/07/06 20:10:43 monsieurp Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-crypto/gnu-crypto-2.0.1-r3.ebuild,v 1.2 2015/07/07 09:41:01 monsieurp Exp $ EAPI=5 -JAVA_PKG_IUSE="doc source" +JAVA_PKG_IUSE="doc source test" inherit java-pkg-2 java-ant-2 @@ -33,26 +33,29 @@ src_compile() { java-pkg-2_src_compile } -TEST_TARGETS=( - check - ent -) - src_test() { + local TEST_TARGETS=( + check + ent + ) + for target in ${TEST_TARGETS[@]}; do EANT_TEST_TARGET=${target} \ java-pkg-2_src_test done } -GNU_CRYPTO_JARS=( - "${PN}" - "${PN}-test" - javax-crypto - javax-security -) - src_install() { + local GNU_CRYPTO_JARS=( + "${PN}" + javax-crypto + javax-security + ) + + if use test; then + GNU_CRYPTO_JARS=(${GNU_CRYPTO_JARS[@]} "${PN}-test") + fi + for jar in ${GNU_CRYPTO_JARS[@]}; do java-pkg_dojar "lib/${jar}.jar" done |