1 |
commit: 9896cd35982aa26d94a7f2949e399f714dae8930 |
2 |
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> |
3 |
AuthorDate: Mon Jan 3 10:58:44 2022 +0000 |
4 |
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jan 5 20:49:32 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9896cd35 |
7 |
|
8 |
dev-java/bcpg: Remove unneeded slot |
9 |
|
10 |
Bug: https://bugs.gentoo.org/799749 |
11 |
Package-Manager: Portage-3.0.28, Repoman-3.0.3 |
12 |
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> |
13 |
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org> |
14 |
|
15 |
dev-java/bcpg/Manifest | 1 - |
16 |
dev-java/bcpg/bcpg-1.50-r1.ebuild | 70 ------------------------------------- |
17 |
dev-java/bcpg/bcpg-1.50-r2.ebuild | 73 --------------------------------------- |
18 |
3 files changed, 144 deletions(-) |
19 |
|
20 |
diff --git a/dev-java/bcpg/Manifest b/dev-java/bcpg/Manifest |
21 |
index 94094e36d49a..b7586bb46675 100644 |
22 |
--- a/dev-java/bcpg/Manifest |
23 |
+++ b/dev-java/bcpg/Manifest |
24 |
@@ -1,2 +1 @@ |
25 |
DIST bc-java-r1rv69.tar.gz 56587177 BLAKE2B be5321f48911840de70d3201c0436cf4147a25999abb605dc4c176ea9292796ca25633635d66dccab685a4bb162258c4495ccc764782119a0750ec1b7456a7db SHA512 5224f424faf549e8e3f2db1134e74647b09bebb654ed23bb0bcd493f065fdb3f2b4f2815be0137ebcc9d62b25a6725b7a26b76d55eb3ad014ad0ce92961126de |
26 |
-DIST bcpg-jdk15on-150.tar.gz 691012 BLAKE2B ee566fb6deb44177e31bfe80b6bd1f13d39d6820cffe3693bd85314ccfd65c4805275b3925d52a6bda6b1ad7e3ea267f1f0bed3926420b5920e5f300020ecd9a SHA512 763d253b9bb45b7e7fab75d557daa784c3d4a503ced979adc986e5688c3939db248853c864a2f4bec6d5b1dd9ed668d5f278c91b5607774fc703971d0b330fe6 |
27 |
|
28 |
diff --git a/dev-java/bcpg/bcpg-1.50-r1.ebuild b/dev-java/bcpg/bcpg-1.50-r1.ebuild |
29 |
deleted file mode 100644 |
30 |
index b895d1674885..000000000000 |
31 |
--- a/dev-java/bcpg/bcpg-1.50-r1.ebuild |
32 |
+++ /dev/null |
33 |
@@ -1,70 +0,0 @@ |
34 |
-# Copyright 1999-2018 Gentoo Foundation |
35 |
-# Distributed under the terms of the GNU General Public License v2 |
36 |
- |
37 |
-EAPI="5" |
38 |
- |
39 |
-JAVA_PKG_IUSE="doc source test" |
40 |
- |
41 |
-inherit java-pkg-2 java-pkg-simple |
42 |
- |
43 |
-MY_P="${PN}-jdk15on-${PV/./}" |
44 |
- |
45 |
-DESCRIPTION="Java cryptography APIs" |
46 |
-HOMEPAGE="http://www.bouncycastle.org/java.html" |
47 |
-SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz" |
48 |
- |
49 |
-LICENSE="BSD" |
50 |
-SLOT="1.50" |
51 |
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos" |
52 |
- |
53 |
-# Tests are currently broken. Appears to need older version of bcprov; but since bcprov is not slotted, this can cause conflicts. |
54 |
-# Needs further investigation; though, only a small part has tests and there are no tests for bcpg itself. |
55 |
-RESTRICT="test" |
56 |
- |
57 |
-CDEPEND="dev-java/bcprov:${SLOT}" |
58 |
- |
59 |
-DEPEND=">=virtual/jdk-1.6 |
60 |
- app-arch/unzip |
61 |
- test? ( |
62 |
- dev-java/ant-junit:0 |
63 |
- ) |
64 |
- ${CDEPEND}" |
65 |
- |
66 |
-RDEPEND=">=virtual/jre-1.6 |
67 |
- ${CDEPEND}" |
68 |
- |
69 |
-S="${WORKDIR}/${MY_P}" |
70 |
- |
71 |
-JAVA_GENTOO_CLASSPATH="bcprov-${SLOT}" |
72 |
- |
73 |
-src_unpack() { |
74 |
- default |
75 |
- cd "${S}" |
76 |
- unpack ./src.zip |
77 |
-} |
78 |
- |
79 |
-java_prepare() { |
80 |
- if ! use test; then |
81 |
- local RM_TEST_FILES=( |
82 |
- org/bouncycastle/openpgp/test |
83 |
- org/bouncycastle/openpgp/examples/test |
84 |
- ) |
85 |
- rm -rf "${RM_TEST_FILES[@]}" || die |
86 |
- fi |
87 |
-} |
88 |
- |
89 |
-src_compile() { |
90 |
- java-pkg-simple_src_compile |
91 |
-} |
92 |
- |
93 |
-src_test() { |
94 |
- local cp="${PN}.jar:bcprov.jar:junit.jar" |
95 |
- local pkg="org.bouncycastle" |
96 |
- java -cp ${cp} ${pkg}.openpgp.test.AllTests | tee openpgp.tests |
97 |
- grep -q FAILURES *.tests && die "Tests failed." |
98 |
-} |
99 |
- |
100 |
-src_install() { |
101 |
- java-pkg-simple_src_install |
102 |
- use source && java-pkg_dosrc org |
103 |
-} |
104 |
|
105 |
diff --git a/dev-java/bcpg/bcpg-1.50-r2.ebuild b/dev-java/bcpg/bcpg-1.50-r2.ebuild |
106 |
deleted file mode 100644 |
107 |
index 6a89f6e93494..000000000000 |
108 |
--- a/dev-java/bcpg/bcpg-1.50-r2.ebuild |
109 |
+++ /dev/null |
110 |
@@ -1,73 +0,0 @@ |
111 |
-# Copyright 1999-2018 Gentoo Foundation |
112 |
-# Distributed under the terms of the GNU General Public License v2 |
113 |
- |
114 |
-EAPI=6 |
115 |
- |
116 |
-JAVA_PKG_IUSE="doc source test" |
117 |
- |
118 |
-inherit java-pkg-2 java-pkg-simple |
119 |
- |
120 |
-MY_P="${PN}-jdk15on-${PV/./}" |
121 |
- |
122 |
-DESCRIPTION="Java cryptography APIs" |
123 |
-HOMEPAGE="http://www.bouncycastle.org/java.html" |
124 |
-SRC_URI="http://polydistortion.net/bc/download/${MY_P}.tar.gz" |
125 |
- |
126 |
-LICENSE="BSD" |
127 |
-SLOT="1.50" |
128 |
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos" |
129 |
- |
130 |
-# Tests are currently broken. Appears to need older version of bcprov; but |
131 |
-# since bcprov is not slotted, this can cause conflicts. Needs further |
132 |
-# investigation; though, only a small part has tests and there are no tests for |
133 |
-# bcpg itself. |
134 |
-RESTRICT="test" |
135 |
- |
136 |
-CDEPEND="dev-java/bcprov:${SLOT}" |
137 |
- |
138 |
-DEPEND=" |
139 |
- ${CDEPEND} |
140 |
- >=virtual/jdk-1.6 |
141 |
- test? ( dev-java/ant-junit:0 )" |
142 |
- |
143 |
-RDEPEND=" |
144 |
- ${CDEPEND} |
145 |
- >=virtual/jre-1.6" |
146 |
- |
147 |
-S="${WORKDIR}/${MY_P}" |
148 |
- |
149 |
-JAVA_GENTOO_CLASSPATH="bcprov-${SLOT}" |
150 |
- |
151 |
-src_unpack() { |
152 |
- default |
153 |
- cd "${S}" || die |
154 |
- unpack ./src.zip |
155 |
-} |
156 |
- |
157 |
-src_prepare() { |
158 |
- default |
159 |
- if ! use test; then |
160 |
- local RM_TEST_FILES=( |
161 |
- org/bouncycastle/openpgp/test |
162 |
- org/bouncycastle/openpgp/examples/test |
163 |
- ) |
164 |
- rm -rv "${RM_TEST_FILES[@]}" || die |
165 |
- fi |
166 |
-} |
167 |
- |
168 |
-src_compile() { |
169 |
- java-pkg-simple_src_compile |
170 |
-} |
171 |
- |
172 |
-src_test() { |
173 |
- local cp="${PN}.jar:bcprov.jar:junit.jar" |
174 |
- local pkg="org.bouncycastle" |
175 |
- java -cp ${cp} ${pkg}.openpgp.test.AllTests | tee openpgp.tests |
176 |
- grep -q FAILURES *.tests && die "Tests failed." |
177 |
-} |
178 |
- |
179 |
-src_install() { |
180 |
- einstalldocs |
181 |
- java-pkg-simple_src_install |
182 |
- use source && java-pkg_dosrc org |
183 |
-} |