diff options
Diffstat (limited to 'dev-java/bcpkix')
| -rw-r--r-- | dev-java/bcpkix/Manifest | 4 | ||||
| -rw-r--r-- | dev-java/bcpkix/bcpkix-1.82.ebuild | 2 | ||||
| -rw-r--r-- | dev-java/bcpkix/bcpkix-1.83.ebuild (renamed from dev-java/bcpkix/bcpkix-1.80.ebuild) | 36 |
3 files changed, 14 insertions, 28 deletions
diff --git a/dev-java/bcpkix/Manifest b/dev-java/bcpkix/Manifest index 2e84c5acf679..5795ab39f84d 100644 --- a/dev-java/bcpkix/Manifest +++ b/dev-java/bcpkix/Manifest @@ -1,4 +1,4 @@ -DIST bc-java-r1rv80.tar.gz 47815270 BLAKE2B 791a81cdcc101caf6a03b96aa00313ee74f3d9fde18fed0f88b2ad4a41ebf3bf539d6fed65c88328023ac8201f2e4299d284e49a17bfce65cf6a5791126c7db7 SHA512 3ae49559a922c650a4024e99db23117db04119a504f1c947175548ab30bebd03d68f9b5f09c4f900851a405ab48a8b3609ae2f7c66aca810354dc0d446620db5 DIST bc-java-r1rv82.tar.gz 47632447 BLAKE2B 5ff178d2ad7dbd13d830656d4c430e3178a63af3691f9b0ec75af57cc55ed278f2f7513e3677b662e418b5de15bb93d4094797d7583860ee667b3019d96d7860 SHA512 754815ae3d1bf2c4b4789db832e1c8ebf752f06349e43c13d9472ba4ff91160d1075ad229a8f24e12fbc2f55cb2efa3765e50e533d95b742e07718fcb1c92123 -DIST bc-test-data-r1rv80.tar.gz 2191941682 BLAKE2B 5c21214c1be6961e181650c2a7a681c1a53ad01fd5fce1f38d672c495624eb289c3f6845b7cc8051be5d5a7508b531792d8fea905a35dd55d043903b73015756 SHA512 3013869d0c9a74e96f7bb3f70a0aacb1d8e825b044c8ed75825688a9bd994c56dafa4cdbf37129415d8890065af0faf243f45d43ebfeb969a9c9e9e789a2874f +DIST bc-java-r1rv83.tar.gz 47658743 BLAKE2B 3b223d49120d54d22276d6f4d7457f1887577640e7a572aff6ceb322adc7da2c541e0090d16763b22745695ff1d6ae13aae2d91ea3f89b186e1cd0c3027ef1ca SHA512 f9d99538c38a65ef6cb3db0eda3a293b91e370d27210e71ef17e63ecd91fd3c5b01d09385c18fc237e686775649306b9a2fe1d8250a0a304fb0d6079f74e4926 DIST bc-test-data-r1rv82.tar.gz 2928046893 BLAKE2B 37d5082063545e6654c0a7bfa0e7503029b8290826ce38327de45021fb9a0f64677e05a1173f6bb6726769fe9b933550939e0a7ea9b88ed24862a3cd8a4872e0 SHA512 b15396020dde7aee1ab9fd83f0d1cee8db9f3b3402608fb079700d3826c42a1ae592e641545ca465c1b1b23a0e80cbe9dd8c6ae855f4e09905b38a5c92fc1c2b +DIST bc-test-data-r1rv83.tar.gz 2930411569 BLAKE2B dfe6cd87134ee728fd49d723ad320576a670c9eff22b1d05b4fc3b650a79ab35b8d67225cdf6e9667057afc51b89ea213435a265e36f574d36e212ca1038b389 SHA512 398ca8159225d58247404ae476a01197c617b2f3bcffc4a8c581d8abad869ddec2eef7f3380b162a20fa3786998d39e34c2db8b8cbfe14f683064ad619d310e8 diff --git a/dev-java/bcpkix/bcpkix-1.82.ebuild b/dev-java/bcpkix/bcpkix-1.82.ebuild index 179c94d786e2..b855873434eb 100644 --- a/dev-java/bcpkix/bcpkix-1.82.ebuild +++ b/dev-java/bcpkix/bcpkix-1.82.ebuild @@ -18,7 +18,7 @@ S="${WORKDIR}/bc-java-${MY_PV}/pkix" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 arm64 ~ppc64" +KEYWORDS="amd64 arm64 ppc64" CP_DEPEND=" ~dev-java/bcprov-${PV}:0 diff --git a/dev-java/bcpkix/bcpkix-1.80.ebuild b/dev-java/bcpkix/bcpkix-1.83.ebuild index b1b739cc3f80..2ef21203e54c 100644 --- a/dev-java/bcpkix/bcpkix-1.80.ebuild +++ b/dev-java/bcpkix/bcpkix-1.83.ebuild @@ -4,8 +4,8 @@ EAPI=8 JAVA_PKG_IUSE="doc source test" -MAVEN_ID="org.bouncycastle:bcpkix-jdk18on:${PV}" JAVA_TESTING_FRAMEWORKS="junit-4" +MAVEN_ID="org.bouncycastle:bcpkix-jdk18on:${PV}" inherit java-pkg-2 java-pkg-simple check-reqs @@ -18,25 +18,20 @@ S="${WORKDIR}/bc-java-${MY_PV}/pkix" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 arm64 ppc64" - -# 1) testSANMismatchIP(org.bouncycastle.est.test.TestHostNameAuthorizer) -# org.bouncycastle.est.ESTException: localhost.me: Temporary failure in name resolution HTTP Status Code: 0 -PROPERTIES="test_network" -RESTRICT="test" +KEYWORDS="~amd64 ~arm64 ~ppc64" -CDEPEND=" +CP_DEPEND=" ~dev-java/bcprov-${PV}:0 ~dev-java/bcutil-${PV}:0 " DEPEND=" - ${CDEPEND} + ${CP_DEPEND} >=virtual/jdk-11:* " RDEPEND=" - ${CDEPEND} + ${CP_DEPEND} >=virtual/jre-1.8:* " @@ -44,12 +39,7 @@ DOCS=( ../{README,SECURITY}.md ) HTML_DOCS=( ../{CONTRIBUTORS,index}.html ) JAVA_AUTOMATIC_MODULE_NAME="org.bouncycastle.pkix" -JAVA_GENTOO_CLASSPATH="bcprov,bcutil" -JAVA_SRC_DIR=( - "src/main/java" - "src/main/jdk1.9" -) - +JAVA_SRC_DIR=( src/main/{java,jdk1.9} ) JAVA_TEST_EXTRA_ARGS="-Dbc.test.data.home=${S}/../core/src/test/data" JAVA_TEST_GENTOO_CLASSPATH="junit-4" JAVA_TEST_RESOURCE_DIRS=( src/{main,test}/resources ) @@ -85,19 +75,15 @@ src_prepare() { java-pkg_clean .. } -# https://bugs.gentoo.org/823347 src_test() { mv ../../bc-test-data-${MY_PV} bc-test-data || die "cannot move bc-test-data" + # https://bugs.gentoo.org/823347 JAVA_TEST_EXTRA_ARGS+=" -Xmx${CHECKREQS_MEMORY}" - pushd src/test/java || die - local JAVA_TEST_RUN_ONLY=$(find * \ - -name "AllTests.java" \ - ) - popd - einfo "${JAVA_TEST_RUN_ONLY}" - JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}" - JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}" + + local TESTS=$(find src/test/java -name 'AllTests.java' -printf '%P\n' ) + TESTS="${TESTS//.java}" + JAVA_TEST_RUN_ONLY="${TESTS//\//.}" java-pkg-simple_src_test } |