gentoo resync : 09.07.2022

3 files changed, 2 insertions, 62 deletions

diff --git a/dev-java/bcutil/Manifest b/dev-java/bcutil/Manifest
index 75a19d0bf582..3bcb3678702f 100644
--- a/dev-java/bcutil/Manifest
+++ b/dev-java/bcutil/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 bcutil-1.69.ebuild 1344 BLAKE2B 58f67dc29b82749f8aa3177184704216626b9e68105555783a3bbb82f24a1e7bd913ca97a9291e076a68dd96078462e9e1757d1d7d2b81dae03473fda1ac616f SHA512 59eec044a0a16d9899a1d472184f98afd131c879251910f8130f2446123d531140f9ee6a2cfdab22f7cc7fab69e6b4f91456f91f27cd693c6c91a8382290b984
-EBUILD bcutil-1.71.ebuild 1296 BLAKE2B 4dbf5689690c86d8423eccb85a2dff565d6248ca235eeb79b6e414b49129f96ff7a9f5b95cb8e733fe719e8776886911d253f6ec69b1cb96b18f9d3cbccc9922 SHA512 df9eeafbc192dd8a948d67662c7724c17e8bae50fb48144a126a0ea98ff0874e1c69618d57a1e1a811a34d77e7935e23c0460057b99a3f5097a178eea29b2330
+EBUILD bcutil-1.71.ebuild 1292 BLAKE2B d7d4b54f874eef8c4af2230f40003c147ed08052ab64eb793a3900d428500fb4d7edcb15772f54490682ef564394ba0115623a3fef017e3b91a581c94eacadf0 SHA512 cf04d5ce377fa1c99078362efbb9ef74946ae2f7cfa333bd66d79c5d06dfd905b2e08914e7c47319971e162c415d0b2a5bec788a0aca8a3651377107144909be
 MISC metadata.xml 400 BLAKE2B 7b3239d613e5793ddd738c087d43a9d6f5b0744acf64103234e0f6628aa2296c6a5f86c9af1b980b715a5c58bdb11187a19e48a0cfbfa4f9f63231ee3396e01c SHA512 5754fab7fa105fad0b55babb33cda5e5b309f047bb6da3b7760bd8a3fab219209aa52a3078c43b194fe7a02cff8e5d8ead3e2ba9c74837ce0e604574b344ed16
diff --git a/dev-java/bcutil/bcutil-1.69.ebuild b/dev-java/bcutil/bcutil-1.69.ebuild
deleted file mode 100644
index 69a1a2711924..000000000000
--- a/dev-java/bcutil/bcutil-1.69.ebuild
+++ /dev/null
@@ -1,58 +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:bcutil-jdk15on:1.69"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Java APIs for ASN.1 extension and utility APIs used to support bcpkix and bctls"
-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"
-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}/util"
-
-JAVA_GENTOO_CLASSPATH="bcprov"
-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_RUN_ONLY=(
-	"org.bouncycastle.asn1.util.test.AllTests"
-)
-
-src_prepare() {
-	default
-	cd ../ || die
-	java-pkg_clean
-}
-
-src_install() {
-	default
-	einstalldocs
-	docinto html
-	dodoc -r ../docs
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/bcutil/bcutil-1.71.ebuild b/dev-java/bcutil/bcutil-1.71.ebuild
index 7332092ef843..df97d23f0e69 100644
--- a/dev-java/bcutil/bcutil-1.71.ebuild
+++ b/dev-java/bcutil/bcutil-1.71.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"
 
 CDEPEND="~dev-java/bcprov-${PV}:0"
 DEPEND="${CDEPEND}