gentoo resync : 20.03.2022

3 files changed, 2 insertions, 64 deletions

diff --git a/dev-java/bcmail/Manifest b/dev-java/bcmail/Manifest
index 3b4bba8c7e51..75e46c9865ad 100644
--- a/dev-java/bcmail/Manifest
+++ b/dev-java/bcmail/Manifest
@@ -1,4 +1,3 @@
 DIST bc-java-r1rv69.tar.gz 56587177 BLAKE2B be5321f48911840de70d3201c0436cf4147a25999abb605dc4c176ea9292796ca25633635d66dccab685a4bb162258c4495ccc764782119a0750ec1b7456a7db SHA512 5224f424faf549e8e3f2db1134e74647b09bebb654ed23bb0bcd493f065fdb3f2b4f2815be0137ebcc9d62b25a6725b7a26b76d55eb3ad014ad0ce92961126de
-EBUILD bcmail-1.69-r1.ebuild 1482 BLAKE2B f93ee55d305b3c6b865a49d0b67c988bbe99be8cdb019969b3c4805620d978c576538eb2f098e38b0c33af8d3f42fdc994f525aea43adac85f01e357749e44ba SHA512 e50df18b18f8c933d619fcb1eb2ad2de3dc29a506b70d42b54d828fa54b77c3ff1b7c4a547a2113e3938d5d8e2e482e7845aa6079d4b40f729cb110a48811242
-EBUILD bcmail-1.69.ebuild 1488 BLAKE2B e82deb8acd2b93c38e56a259df2f16748944ccc15baa196d192cdbc3659e7deb3b0d93073bd595ae02642c82efd8e80f6dd212279958a10f0be8f4ab5386b6d0 SHA512 7b4e3031902879a51d84df5b7c0a07d97fb408a1ebeed2fc857c85eb1520eb4824bb6e1e630f87c20fba37d9ec3434f70958e5d99bc260b2ce9c528aee11c8c3
+EBUILD bcmail-1.69-r1.ebuild 1478 BLAKE2B c3a707b73c57d7528cd86c5621fe14fd65e1d412b6735884a95c3f868f72cedaf4a8edacaf915c4f992ed0bd6c1089a949198f0f1893fefffa7b22b6fbdbbb11 SHA512 e845293b7b79c796d5c433971e2a4dbb185b3930fc048915ae84e2f2631af396454b3b8b2029d04289dba96f2db6c2460dcc1d943dc8db8ddea4219313e31da7
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/bcmail/bcmail-1.69-r1.ebuild b/dev-java/bcmail/bcmail-1.69-r1.ebuild
index 0eabcf7e3584..3c07eddb70b3 100644
--- a/dev-java/bcmail/bcmail-1.69-r1.ebuild
+++ b/dev-java/bcmail/bcmail-1.69-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/bcgit/bc-java/archive/refs/tags/r${PV/./rv}.tar.gz -
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 
 CDEPEND="
 	~dev-java/bcpkix-${PV}:0
diff --git a/dev-java/bcmail/bcmail-1.69.ebuild b/dev-java/bcmail/bcmail-1.69.ebuild
deleted file mode 100644
index 25ae15aa892a..000000000000
--- a/dev-java/bcmail/bcmail-1.69.ebuild
+++ /dev/null
@@ -1,61 +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:bcmail-jdk15on:1.69"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="The Bouncy Castle Java S/MIME APIs for handling S/MIME protocols"
-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/bcpkix-${PV}:0
-	~dev-java/bcprov-${PV}:0
-	~dev-java/bcutil-${PV}:0
-	dev-java/jakarta-activation:1
-	dev-java/oracle-javamail: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}/mail"
-
-JAVA_GENTOO_CLASSPATH="bcpkix,bcprov,bcutil,jakarta-activation-1,oracle-javamail"
-JAVA_SRC_DIR=(
-	"src/main/java"
-	"src/main/jdk1.9"	# https://bugs.gentoo.org/797634
-)
-JAVA_RESOURCE_DIRS="src/main/resources"
-
-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.mail.smime.test.AllTests"	# OK (106 tests)
-
-src_prepare() {
-	default
-	cd ../ || die
-	java-pkg_clean
-}
-
-src_install() {
-	default
-	einstalldocs
-	docinto html
-	dodoc -r ../docs
-	java-pkg-simple_src_install
-}