Gentoo Archives: gentoo-commits

From: "Jakov Smolić" <jsmolic@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/gnu-crypto/files/, dev-java/gnu-crypto/, profiles/
Date: Sun, 21 Nov 2021 08:12:20
Message-Id: 1637482265.733165a90d2d466512dbefd17a69eba9c3b61516.jsmolic@gentoo
1 commit: 733165a90d2d466512dbefd17a69eba9c3b61516
2 Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
3 AuthorDate: Sun Nov 21 08:04:27 2021 +0000
4 Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
5 CommitDate: Sun Nov 21 08:11:05 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=733165a9
7
8 dev-java/gnu-crypto: treeclean
9
10 Closes: https://bugs.gentoo.org/102646
11 Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
12
13 dev-java/gnu-crypto/Manifest | 1 -
14 .../gnu-crypto/files/gnu-crypto-2.0.1-jdk15.patch | 30 ----------
15 dev-java/gnu-crypto/gnu-crypto-2.0.1-r3.ebuild | 66 ----------------------
16 dev-java/gnu-crypto/metadata.xml | 15 -----
17 profiles/package.mask | 1 -
18 5 files changed, 113 deletions(-)
19
20 diff --git a/dev-java/gnu-crypto/Manifest b/dev-java/gnu-crypto/Manifest
21 deleted file mode 100644
22 index 3ecf36c11bdc..000000000000
23 --- a/dev-java/gnu-crypto/Manifest
24 +++ /dev/null
25 @@ -1 +0,0 @@
26 -DIST gnu-crypto-2.0.1.tar.bz2 3895714 BLAKE2B 4838f7aa58cbd34d97afb7f503a29b7393ae3085f1b83c8ae65110f20ff7143928351f0aaf2a61a2abb363f764dc67dbd12955fbd0f86dd685dafda550e0e7f1 SHA512 c14aa73fb23663559195e8fc7f85a220b25078fa8ab4e7cf43b84febe96599d990ccf52fcf1f6f66f2b547d9b644bbc99b3d44dc4a777dcb72530e58c8509015
27
28 diff --git a/dev-java/gnu-crypto/files/gnu-crypto-2.0.1-jdk15.patch b/dev-java/gnu-crypto/files/gnu-crypto-2.0.1-jdk15.patch
29 deleted file mode 100644
30 index 47957cc5ec5f..000000000000
31 --- a/dev-java/gnu-crypto/files/gnu-crypto-2.0.1-jdk15.patch
32 +++ /dev/null
33 @@ -1,30 +0,0 @@
34 -diff -Nur gnu-crypto-2.0.1/source/gnu/crypto/sasl/ClientMechanism.java gnu-crypto-2.0.1-new/source/gnu/crypto/sasl/ClientMechanism.java
35 ---- gnu-crypto-2.0.1/source/gnu/crypto/sasl/ClientMechanism.java 2003-11-21 10:22:10.000000000 +0100
36 -+++ gnu-crypto-2.0.1-new/source/gnu/crypto/sasl/ClientMechanism.java 2005-05-24 16:16:37.493727834 +0200
37 -@@ -140,9 +140,9 @@
38 - return mechanism;
39 - }
40 -
41 -- public Object getNegotiatedProperty(final String propName) throws SaslException {
42 -+ public Object getNegotiatedProperty(final String propName) {
43 - if (!isComplete()) {
44 -- throw new IllegalMechanismStateException();
45 -+ throw new IllegalStateException();
46 - }
47 - if (Sasl.QOP.equals(propName)) {
48 - return getNegotiatedQOP();
49 -diff -Nur gnu-crypto-2.0.1/source/gnu/crypto/sasl/ServerMechanism.java gnu-crypto-2.0.1-new/source/gnu/crypto/sasl/ServerMechanism.java
50 ---- gnu-crypto-2.0.1/source/gnu/crypto/sasl/ServerMechanism.java 2003-11-21 10:26:14.000000000 +0100
51 -+++ gnu-crypto-2.0.1-new/source/gnu/crypto/sasl/ServerMechanism.java 2005-05-24 16:16:55.503085024 +0200
52 -@@ -147,9 +147,9 @@
53 - return this.authorizationID;
54 - }
55 -
56 -- public Object getNegotiatedProperty(final String propName) throws SaslException {
57 -+ public Object getNegotiatedProperty(final String propName) {
58 - if (!isComplete()) {
59 -- throw new IllegalMechanismStateException();
60 -+ throw new IllegalStateException();
61 - }
62 - if (Sasl.QOP.equals(propName)) {
63 - return getNegotiatedQOP();
64
65 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
66 deleted file mode 100644
67 index 89c2e86670c5..000000000000
68 --- a/dev-java/gnu-crypto/gnu-crypto-2.0.1-r3.ebuild
69 +++ /dev/null
70 @@ -1,66 +0,0 @@
71 -# Copyright 1999-2021 Gentoo Authors
72 -# Distributed under the terms of the GNU General Public License v2
73 -
74 -EAPI=5
75 -
76 -JAVA_PKG_IUSE="doc source test"
77 -
78 -inherit java-pkg-2 java-ant-2
79 -
80 -DESCRIPTION="GNU Crypto cryptographic primitives for Java"
81 -HOMEPAGE="https://www.gnu.org/software/gnu-crypto/"
82 -SRC_URI="ftp://ftp.gnupg.org/GnuPG/${PN}/${P}.tar.bz2"
83 -
84 -LICENSE="GPL-2"
85 -SLOT="0"
86 -KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
87 -IUSE=""
88 -
89 -DEPEND=">=virtual/jdk-1.6"
90 -RDEPEND=">=virtual/jre-1.6"
91 -
92 -EANT_BUILD_XML="${S}/build.xml"
93 -EANT_BUILD_TARGET="jar"
94 -
95 -EANT_DOC_TARGET="javadoc"
96 -
97 -java_prepare() {
98 - epatch "${FILESDIR}/${P}-jdk15.patch"
99 -}
100 -
101 -src_compile() {
102 - java-pkg-2_src_compile
103 -}
104 -
105 -src_test() {
106 - local TEST_TARGETS=(
107 - check
108 - ent
109 - )
110 -
111 - for target in ${TEST_TARGETS[@]}; do
112 - EANT_TEST_TARGET=${target} \
113 - java-pkg-2_src_test
114 - done
115 -}
116 -
117 -src_install() {
118 - local GNU_CRYPTO_JARS=(
119 - "${PN}"
120 - javax-crypto
121 - javax-security
122 - )
123 -
124 - if use test; then
125 - GNU_CRYPTO_JARS=(${GNU_CRYPTO_JARS[@]} "${PN}-test")
126 - fi
127 -
128 - for jar in ${GNU_CRYPTO_JARS[@]}; do
129 - java-pkg_dojar "lib/${jar}.jar"
130 - done
131 -
132 - use doc && java-pkg_dojavadoc docs/api
133 - use source && java-pkg_dosrc source/* jce/* security/*
134 -
135 - dodoc AUTHORS ChangeLog NEWS README THANKS
136 -}
137
138 diff --git a/dev-java/gnu-crypto/metadata.xml b/dev-java/gnu-crypto/metadata.xml
139 deleted file mode 100644
140 index de8ab699b43e..000000000000
141 --- a/dev-java/gnu-crypto/metadata.xml
142 +++ /dev/null
143 @@ -1,15 +0,0 @@
144 -<?xml version="1.0" encoding="UTF-8"?>
145 -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
146 -<pkgmetadata>
147 -<maintainer type="project">
148 - <email>java@g.o</email>
149 - <name>Java</name>
150 -</maintainer>
151 -
152 -<longdescription>
153 -GNU Crypto, part of the GNU project, released under the aegis of GNU,
154 -aims at providing free, versatile, high-quality, and provably correct
155 -implementations of cryptographic primitives and tools in the Java
156 -programming language for use by programmers and end-users.
157 -</longdescription>
158 -</pkgmetadata>
159
160 diff --git a/profiles/package.mask b/profiles/package.mask
161 index c30cb92f3cd3..eec8c16b692f 100644
162 --- a/profiles/package.mask
163 +++ b/profiles/package.mask
164 @@ -402,7 +402,6 @@ dev-java/freehep-graphicsio-emf
165 dev-java/freehep-graphicsio-svg
166 dev-java/geoip-java
167 dev-java/glassfish-deployment-api
168 -dev-java/gnu-crypto
169
170 # Sergey Popov <pinkbyte@g.o> (2021-10-22)
171 # Upstream support discontinued, see https://bw.org/2019/03/19/bw-whois/