gentoo resync : 09.07.2022

3 files changed, 2 insertions, 106 deletions

diff --git a/dev-java/bcpkix/Manifest b/dev-java/bcpkix/Manifest
index cfeba047df3b..b4c2a3b42ff6 100644
--- a/dev-java/bcpkix/Manifest
+++ b/dev-java/bcpkix/Manifest
@@ -1,5 +1,3 @@
-DIST bc-java-r1rv69.tar.gz 56587177 BLAKE2B be5321f48911840de70d3201c0436cf4147a25999abb605dc4c176ea9292796ca25633635d66dccab685a4bb162258c4495ccc764782119a0750ec1b7456a7db SHA512 5224f424faf549e8e3f2db1134e74647b09bebb654ed23bb0bcd493f065fdb3f2b4f2815be0137ebcc9d62b25a6725b7a26b76d55eb3ad014ad0ce92961126de
 DIST bc-java-r1rv71.tar.gz 117684695 BLAKE2B db0a1b2576a55592e0447aa8734e8ecb6fe8452d08dabf010070f3c6b5a3b4caa7a5929baaa52796fed0ef397e18fe58fdb91dfef6da75af8f28efb627d2b808 SHA512 c9a095a034863a46027e28754ae96d9750162120bc1af124fa700ad05d23716a606633b674e2e8490bda658d30d30e93f42ba00dcc1ac13596a24f8aa43a666d
-EBUILD bcpkix-1.69.ebuild 2556 BLAKE2B 842dfda2673810899cc1a164924b97f142214ab7f34164a87bfc2b16360e688a082a5bc09aca36765086d2b42b0f6e499fd10c2f31e8a63d72742a4afeb7859a SHA512 fdff8b61adafbf1eff91ff020c8042c0f332f53e66be300e73eadb9efe30cf57f28468a64a9a9b13842305db4219757a9d6349e2fae26b98dd9611ed7ba7f89e
-EBUILD bcpkix-1.71-r1.ebuild 3078 BLAKE2B ee7b23d5ba7f18ab15201d3b308d0a02507869e28fd1f77c71d400da9681988438deb90a977adfaed99d38eb9d54d82cb17eea5166d442920f73716d4c0c33b2 SHA512 ba7e8f697f2b4b793d47ea81b92af29526e2643719a97ba9afdc41b80f2e70cc3de968cf04239618d809a7e16460de3b2cf45173c3c1ffcee41fd1b7049fd907
+EBUILD bcpkix-1.71-r1.ebuild 3074 BLAKE2B 901a79ffdb3d3600548dbf009fc22a7f1792089a0854aa7853c5fce74563c6e82973946a5ab47fd8528b3e775b4fe3b6738fcee8b49273e78fe7404186c4da39 SHA512 e89367553ec992250775fb0006e8438348f89e4abe2e2cb8e640b6956277bda752dbd6e3821f0c9f1dff1b89d7d65b08cca20bc7cad24b6649231faa444f7f6e
 MISC metadata.xml 546 BLAKE2B 3e07f58b65f0148062a3f1b20c06d71ce1925cf7b91d167a07d21028f541cfbc69b8a78e914ea6b86598afb3f3ae7f841defa6e1b691fac5293f2cb6746c1f0c SHA512 137f6f4d3d26d90109102fa49e37a42ea3628104adaf65e0b93ca652abd1aa6392e3f76dbf342aa70706b734d8b7f262f2b826e3ce33ae35fa60c40e548bf89b
diff --git a/dev-java/bcpkix/bcpkix-1.69.ebuild b/dev-java/bcpkix/bcpkix-1.69.ebuild
deleted file mode 100644
index f719172983a9..000000000000
--- a/dev-java/bcpkix/bcpkix-1.69.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.bouncycastle:bcpkix-jdk15on:1.69"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple check-reqs
-
-DESCRIPTION="Java APIs for CMS, PKCS, EAC, TSP, CMP, CRMF, OCSP, and certificate generation"
-HOMEPAGE="https://www.bouncycastle.org/java.html"
-SRC_URI="https://github.com/bcgit/bc-java/archive/refs/tags/r${PV/./rv}.tar.gz -> bc-java-r${PV/./rv}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
-
-CDEPEND="
-	~dev-java/bcprov-${PV}:0
-	~dev-java/bcutil-${PV}:0
-	"
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.8:*"
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.8:*"
-
-DOCS=( ../{README,SECURITY}.md )
-HTML_DOCS=( ../{CONTRIBUTORS,index,LICENSE}.html )
-
-S="${WORKDIR}/bc-java-r${PV/./rv}/pkix"
-
-JAVA_GENTOO_CLASSPATH="bcprov,bcutil"
-JAVA_SRC_DIR=(
-	"src/main/java"
-	"src/main/jdk1.9"	# https://bugs.gentoo.org/797634
-)
-#	JAVA_RESOURCE_DIRS="src/main/resources"	# Does not exist
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-
-JAVA_TEST_EXTRA_ARGS="-Dbc.test.data.home=${S}/../core/src/test/data"
-
-JAVA_TEST_RUN_ONLY=(
-	"org.bouncycastle.cert.cmp.test.AllTests"
-	"org.bouncycastle.cert.crmf.test.AllTests"
-	"org.bouncycastle.cert.ocsp.test.AllTests"
-	"org.bouncycastle.cert.path.test.AllTests"
-	"org.bouncycastle.cert.test.AllTests"
-	"org.bouncycastle.cms.test.AllTests"
-	"org.bouncycastle.dvcs.test.AllTests"
-	"org.bouncycastle.eac.test.AllTests"
-#	"org.bouncycastle.est.test.AllTests" # (16 tests) org.bouncycastle.est.ESTException: localhost.me: Temporary failure in name resolution HTTP Status Code: 0
-	"org.bouncycastle.mime.test.AllTests"
-	"org.bouncycastle.mozilla.test.AllTests"
-	"org.bouncycastle.openssl.test.AllTests"
-	"org.bouncycastle.operator.test.AllTests"
-	"org.bouncycastle.pkcs.test.AllTests"
-	"org.bouncycastle.tsp.test.AllTests"
-)
-
-# https://bugs.gentoo.org/823347
-check_env() {
-	if use test; then
-		# this is needed only for tests
-		CHECKREQS_MEMORY="2048M"
-		check-reqs_pkg_pretend
-	fi
-}
-
-# https://bugs.gentoo.org/823347
-pkg_pretend() {
-	check_env
-}
-
-# https://bugs.gentoo.org/823347
-pkg_setup() {
-	check_env
-}
-
-src_prepare() {
-	default
-	cd ../ || die
-	java-pkg_clean
-}
-
-# https://bugs.gentoo.org/823347
-src_test() {
-	JAVA_TEST_EXTRA_ARGS+=" -Xmx${CHECKREQS_MEMORY}"
-	java-pkg-simple_src_test
-}
-
-src_install() {
-	default
-	einstalldocs
-	docinto html
-	dodoc -r ../docs
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/bcpkix/bcpkix-1.71-r1.ebuild b/dev-java/bcpkix/bcpkix-1.71-r1.ebuild
index 208e40ffb41e..bcf70c8d215a 100644
--- a/dev-java/bcpkix/bcpkix-1.71-r1.ebuild
+++ b/dev-java/bcpkix/bcpkix-1.71-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/bcgit/bc-java/archive/r${PV/./rv}.tar.gz -> bc-java-
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 
 # 1) testSANMismatchIP(org.bouncycastle.est.test.TestHostNameAuthorizer)
 # org.bouncycastle.est.ESTException: localhost.me: Temporary failure in name resolution HTTP Status Code: 0