gentoo resync : 12.07.2021

4 files changed, 86 insertions, 3 deletions

diff --git a/dev-java/bcprov/Manifest b/dev-java/bcprov/Manifest
index 9584c76980b0..fbc0262ce8d7 100644
--- a/dev-java/bcprov/Manifest
+++ b/dev-java/bcprov/Manifest
@@ -1,3 +1,4 @@
+DIST bc-java-r1rv69.tar.gz 56587177 BLAKE2B be5321f48911840de70d3201c0436cf4147a25999abb605dc4c176ea9292796ca25633635d66dccab685a4bb162258c4495ccc764782119a0750ec1b7456a7db SHA512 5224f424faf549e8e3f2db1134e74647b09bebb654ed23bb0bcd493f065fdb3f2b4f2815be0137ebcc9d62b25a6725b7a26b76d55eb3ad014ad0ce92961126de
 DIST bcprov-jdk15on-150.tar.gz 4629743 BLAKE2B 7ab18e83f90db38b9af9530246806b4d413718531ce4b34b7aefa7189e28ade8a2afd5d3b3dc25c8cb2d5ef23a8c7f8157ac947ae7d0a46356b00ea7dd6d5f76 SHA512 95400c338a65cbb7d1e80c776de41d3d372b4237aee91526a06774c3d4beb735dcfb4c1ed182a12f2ccac8204b9c546863d79eb99723394d48c415fa32b6ee0e
 DIST bcprov-jdk15on-152.tar.gz 6334971 BLAKE2B 5ef7db891c29147ac48689a1f15e907f4a91d15ac63e8f6a031847d92ddad22cef3dff791d4036b74cd39550e9b48b1926033449beca240db2d7ac78510c22c7 SHA512 df769d2647c1c0b535b1f6922df3f02ed7e13c941f8d954256fddb2ff31d5682924fedf2f2908bc09ebd20058413f40a4c2d62190b63542aa7840b860aeab07c
 DIST bcprov-jdk15on-168.tar.gz 9716574 BLAKE2B 54c4fec3d614bfe6449a10789bf7fd8d01d8d03f0a133dfd01bb7a30d3545d4dda3bbd2b2543a3827ac8988d9c9000cf7c0ebe7d5d462c6f9145c467d3f53ddb SHA512 3cdb6e486f6d1afb8c98c08809d142430191feeb757608f4abf27640fc706decf3975e3bf3f36c2a00bbc77ad2564ff9652bdc5e13662638c66a87bd250302db
@@ -6,5 +7,6 @@ EBUILD bcprov-1.45-r2.ebuild 1341 BLAKE2B 7012f9298f272a44572585ea8c66a8cc61b79e
 EBUILD bcprov-1.50-r2.ebuild 1345 BLAKE2B 6e0103ebcfa6a52bdba02bb40f7085d0361b988e0087ae2d07be9980c2d28825b0014595151cfa23bb24e8f6af2af55b518c64c349b0c6539b97ee3b8a9117b5 SHA512 ad7a4d8cb6ee19336768ffb8eed5ed9f44110fccc0dcd3768ea06419cbbad05de344f2a832333f686f2f00ffaed1f33e1cca9b948be87883208434d77bc5e286
 EBUILD bcprov-1.50-r4.ebuild 1326 BLAKE2B dbd3892976d4eaff7e3af566e13c5f38d5b74bf27cbb3290f3846d560dd0393156c41e6fd92f435ca6bf6609692c195c75743f6c87698bf99cb843369ad7ee92 SHA512 7dfed9b2cae7ea3914278b7be298e517796d8623a33109dbb62ddc87b6d284bcaadf4f4b88d890a1bb8d9447c3b6dfdc80239bdf0b3d5b74e3b96bf99a9485f2
 EBUILD bcprov-1.52-r2.ebuild 1350 BLAKE2B 145f54219d8596d18127ceb1b626bae03bd4cceec442a1e04c5f8f64ce53017ddeb78e2dc33e9d781123e8392dbd249914cd9614f6da6c010665950b8fb1f6a1 SHA512 cd874722a978e52fda5ee92424cd8a0b430c9b9e4c6ab797fa1b0bd63cea199e0f40d4cb4ae1a62d2eb22921665e6580cebe7ec7f5c681ffc349f73b4d9cd334
-EBUILD bcprov-1.68-r2.ebuild 1167 BLAKE2B 507893e4ca2f6d15e4cb4b8bbd637a7af71f6e70fc7f678f153991a685093596373e8b3fdef971780ef80d343e28b1a2f6c1904f8dc581ed8c9aacd2d5257b53 SHA512 38097266a95b0c9bc3b922da84ce8b9f3c87dd266b869a3a7fc80688b53f9f6925acf9db02a25248bad7116d818437d676e95155ffed2907be4c9cd919639b7e
-MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
+EBUILD bcprov-1.68-r2.ebuild 1166 BLAKE2B f8ffaf33eaa23a1ce5938a6b5f6412d605826536551735d919fe091aab221e6a4e70b1e23fa117098c3d6c2d316ea85061c86b373911e87a502a16a86d42dacf SHA512 3f992af0e197f0a020606b7023ea44354ffeffde3856cf1fc5711ee9c313cc129351134f92f666849110f164fe77405c1a2e58acc6279310374ef4dad9abf341
+EBUILD bcprov-1.69.ebuild 2471 BLAKE2B 006b71d25b7f8245b8b04c29251719fc4369a5625b030d5864ef39d7057e7c01cfd3d21dc72452b2c98e8328c8084a4dd4a512e86c2f5eaff6059de7417e249b SHA512 1345a8cefbef03b7cd379c76f9c63055ee5389d5d6b8835d5ed8e016371ce3a13353ad61ceb6ab8d3da2ad0eeaa6994f5d440db7776035b8cb8d5c03f9c077a0
+MISC metadata.xml 481 BLAKE2B 28abdd8dda620f2fe86c83ba5912c0e560ec40332ee443db8235ddcb3632327475e84fdc6311d9892a7f24fa07ef40b902c510fd7a5611b6ae997a801745003a SHA512 3b414b3faf0ca03ab0f06ab850332f72a554ddf0a1b548827619df018cd6e3a6c1bbac6704fe9a578baab843cdde81c76b9dd0d8bcd82b27af4fd488541e5116
diff --git a/dev-java/bcprov/bcprov-1.68-r2.ebuild b/dev-java/bcprov/bcprov-1.68-r2.ebuild
index d444f124b7cc..d1c8bd9d9e62 100644
--- a/dev-java/bcprov/bcprov-1.68-r2.ebuild
+++ b/dev-java/bcprov/bcprov-1.68-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.bouncycastle.org/download/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/bcprov/bcprov-1.69.ebuild b/dev-java/bcprov/bcprov-1.69.ebuild
new file mode 100644
index 000000000000..c0ba00351a41
--- /dev/null
+++ b/dev-java/bcprov/bcprov-1.69.ebuild
@@ -0,0 +1,78 @@
+# 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:bcprov-jdk15on:1.69"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java cryptography APIs"
+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"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+BDEPEND="app-arch/zip"
+
+DOCS=( ../{README,SECURITY}.md )
+HTML_DOCS=( ../{CONTRIBUTORS,index,LICENSE}.html )
+
+S="${WORKDIR}/bc-java-r${PV/./rv}/prov"
+
+JAVA_SRC_DIR=(
+	"src/main/java"
+	"../core/src/main/java"	# package org.bouncycastle.asn1 does not exist
+	"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" "../core/src/test/java" )
+JAVA_TEST_RESOURCE_DIRS=( "src/test/resources" "../core/src/test/resources" )
+
+JAVA_TEST_EXTRA_ARGS="-Dbc.test.data.home=${S}/../core/src/test/data"
+
+JAVA_TEST_RUN_ONLY=(
+	"org.bouncycastle.asn1.test.AllTests"	# OK (18 tests)
+	"org.bouncycastle.crypto.agreement.test.AllTests"	# OK (14 tests)
+	"org.bouncycastle.crypto.ec.test.AllTests"	# OK (1 test)
+	"org.bouncycastle.crypto.prng.test.AllTests" # OK (1 test)
+	"org.bouncycastle.crypto.test.AllTests"	# Time: 126.95 OK (6 tests)
+	"org.bouncycastle.jcajce.provider.test.AllTests"	# OK (29 tests)
+	"org.bouncycastle.jce.provider.test.AllTests"	# OK (1 test)
+	"org.bouncycastle.jce.provider.test.nist.AllTests"	# OK (283 tests)
+	"org.bouncycastle.jce.provider.test.rsa3.AllTests"	# OK (11 tests)
+	"org.bouncycastle.pqc.crypto.lms.AllTests"	# OK (17 tests)
+	"org.bouncycastle.pqc.crypto.test.AllTests"	# OK (81 tests)
+	"org.bouncycastle.pqc.jcajce.provider.test.AllTests"	# OK (89 tests)
+	"org.bouncycastle.util.encoders.test.AllTests"	# OK (15 tests)
+)
+
+src_prepare() {
+	default
+	cd ../ || die
+	java-pkg_clean
+}
+
+src_install() {
+	default
+	einstalldocs
+	docinto html
+	dodoc -r ../docs
+
+	# These files are not present in the upstream jar but are used for tests
+	# Removing them from the jar file after testing
+	zip --delete "${S}"/bcprov.jar \
+		"org/bouncycastle/pqc/crypto/ntru/*" \
+		"org/bouncycastle/pqc/math/ntru/*" \
+		|| die "cleaning after tests failed"
+
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/bcprov/metadata.xml b/dev-java/bcprov/metadata.xml
index 952a4b9b605c..956cd381f68c 100644
--- a/dev-java/bcprov/metadata.xml
+++ b/dev-java/bcprov/metadata.xml
@@ -5,4 +5,7 @@
 		<email>java@gentoo.org</email>
 		<name>Java</name>
 	</maintainer>
+	<longdescription>
+		"The Bouncy Castle Crypto package is a Java implementation of cryptographic algorithms. This jar contains JCE provider and lightweight API for the Bouncy Castle Cryptography APIs for JDK 1.5 to JDK 1.8."
+	</longdescription>
 </pkgmetadata>