| 1 |
monsieurp 15/07/07 09:41:01 |
| 2 |
|
| 3 |
Modified: gnu-crypto-2.0.1-r3.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Install gnu-crypto-test.jar only when tests are enabled. Fix bug 554128. |
| 6 |
|
| 7 |
Signed-off-by: Patrice Clement <monsieurp@g.o> |
| 8 |
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 93491BB8) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.2 dev-java/gnu-crypto/gnu-crypto-2.0.1-r3.ebuild |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/gnu-crypto/gnu-crypto-2.0.1-r3.ebuild?rev=1.2&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/gnu-crypto/gnu-crypto-2.0.1-r3.ebuild?rev=1.2&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/gnu-crypto/gnu-crypto-2.0.1-r3.ebuild?r1=1.1&r2=1.2 |
| 16 |
|
| 17 |
Index: gnu-crypto-2.0.1-r3.ebuild |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/gnu-crypto/gnu-crypto-2.0.1-r3.ebuild,v |
| 20 |
retrieving revision 1.1 |
| 21 |
retrieving revision 1.2 |
| 22 |
diff -u -r1.1 -r1.2 |
| 23 |
--- gnu-crypto-2.0.1-r3.ebuild 6 Jul 2015 20:10:43 -0000 1.1 |
| 24 |
+++ gnu-crypto-2.0.1-r3.ebuild 7 Jul 2015 09:41:01 -0000 1.2 |
| 25 |
@@ -1,10 +1,10 @@ |
| 26 |
# Copyright 1999-2015 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $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 $ |
| 29 |
+# $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 $ |
| 30 |
|
| 31 |
EAPI=5 |
| 32 |
|
| 33 |
-JAVA_PKG_IUSE="doc source" |
| 34 |
+JAVA_PKG_IUSE="doc source test" |
| 35 |
|
| 36 |
inherit java-pkg-2 java-ant-2 |
| 37 |
|
| 38 |
@@ -33,26 +33,29 @@ |
| 39 |
java-pkg-2_src_compile |
| 40 |
} |
| 41 |
|
| 42 |
-TEST_TARGETS=( |
| 43 |
- check |
| 44 |
- ent |
| 45 |
-) |
| 46 |
- |
| 47 |
src_test() { |
| 48 |
+ local TEST_TARGETS=( |
| 49 |
+ check |
| 50 |
+ ent |
| 51 |
+ ) |
| 52 |
+ |
| 53 |
for target in ${TEST_TARGETS[@]}; do |
| 54 |
EANT_TEST_TARGET=${target} \ |
| 55 |
java-pkg-2_src_test |
| 56 |
done |
| 57 |
} |
| 58 |
|
| 59 |
-GNU_CRYPTO_JARS=( |
| 60 |
- "${PN}" |
| 61 |
- "${PN}-test" |
| 62 |
- javax-crypto |
| 63 |
- javax-security |
| 64 |
-) |
| 65 |
- |
| 66 |
src_install() { |
| 67 |
+ local GNU_CRYPTO_JARS=( |
| 68 |
+ "${PN}" |
| 69 |
+ javax-crypto |
| 70 |
+ javax-security |
| 71 |
+ ) |
| 72 |
+ |
| 73 |
+ if use test; then |
| 74 |
+ GNU_CRYPTO_JARS=(${GNU_CRYPTO_JARS[@]} "${PN}-test") |
| 75 |
+ fi |
| 76 |
+ |
| 77 |
for jar in ${GNU_CRYPTO_JARS[@]}; do |
| 78 |
java-pkg_dojar "lib/${jar}.jar" |
| 79 |
done |
| 80 |
|
| 81 |
|
| 82 |
|
| 83 |
1.31 dev-java/gnu-crypto/ChangeLog |
| 84 |
|
| 85 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/gnu-crypto/ChangeLog?rev=1.31&view=markup |
| 86 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/gnu-crypto/ChangeLog?rev=1.31&content-type=text/plain |
| 87 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/gnu-crypto/ChangeLog?r1=1.30&r2=1.31 |
| 88 |
|
| 89 |
Index: ChangeLog |
| 90 |
=================================================================== |
| 91 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/gnu-crypto/ChangeLog,v |
| 92 |
retrieving revision 1.30 |
| 93 |
retrieving revision 1.31 |
| 94 |
diff -u -r1.30 -r1.31 |
| 95 |
--- ChangeLog 6 Jul 2015 20:10:43 -0000 1.30 |
| 96 |
+++ ChangeLog 7 Jul 2015 09:41:01 -0000 1.31 |
| 97 |
@@ -1,6 +1,10 @@ |
| 98 |
# ChangeLog for dev-java/gnu-crypto |
| 99 |
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
| 100 |
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-crypto/ChangeLog,v 1.30 2015/07/06 20:10:43 monsieurp Exp $ |
| 101 |
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-crypto/ChangeLog,v 1.31 2015/07/07 09:41:01 monsieurp Exp $ |
| 102 |
+ |
| 103 |
+ 07 Jul 2015; Patrice Clement <monsieurp@g.o> |
| 104 |
+ gnu-crypto-2.0.1-r3.ebuild: |
| 105 |
+ Install gnu-crypto-test.jar only when tests are enabled. Fix bug 554128. |
| 106 |
|
| 107 |
*gnu-crypto-2.0.1-r3 (06 Jul 2015) |
Archives