diff options
Diffstat (limited to 'dev-java/bcpg')
| -rw-r--r-- | dev-java/bcpg/Manifest | 2 | ||||
| -rw-r--r-- | dev-java/bcpg/bcpg-1.82.ebuild | 2 | ||||
| -rw-r--r-- | dev-java/bcpg/bcpg-1.83.ebuild (renamed from dev-java/bcpg/bcpg-1.80.ebuild) | 19 |
3 files changed, 8 insertions, 15 deletions
diff --git a/dev-java/bcpg/Manifest b/dev-java/bcpg/Manifest index f41b77d2ca35..3f2f08d43821 100644 --- a/dev-java/bcpg/Manifest +++ b/dev-java/bcpg/Manifest @@ -1,2 +1,2 @@ -DIST bc-java-r1rv80.tar.gz 47815270 BLAKE2B 791a81cdcc101caf6a03b96aa00313ee74f3d9fde18fed0f88b2ad4a41ebf3bf539d6fed65c88328023ac8201f2e4299d284e49a17bfce65cf6a5791126c7db7 SHA512 3ae49559a922c650a4024e99db23117db04119a504f1c947175548ab30bebd03d68f9b5f09c4f900851a405ab48a8b3609ae2f7c66aca810354dc0d446620db5 DIST bc-java-r1rv82.tar.gz 47632447 BLAKE2B 5ff178d2ad7dbd13d830656d4c430e3178a63af3691f9b0ec75af57cc55ed278f2f7513e3677b662e418b5de15bb93d4094797d7583860ee667b3019d96d7860 SHA512 754815ae3d1bf2c4b4789db832e1c8ebf752f06349e43c13d9472ba4ff91160d1075ad229a8f24e12fbc2f55cb2efa3765e50e533d95b742e07718fcb1c92123 +DIST bc-java-r1rv83.tar.gz 47658743 BLAKE2B 3b223d49120d54d22276d6f4d7457f1887577640e7a572aff6ceb322adc7da2c541e0090d16763b22745695ff1d6ae13aae2d91ea3f89b186e1cd0c3027ef1ca SHA512 f9d99538c38a65ef6cb3db0eda3a293b91e370d27210e71ef17e63ecd91fd3c5b01d09385c18fc237e686775649306b9a2fe1d8250a0a304fb0d6079f74e4926 diff --git a/dev-java/bcpg/bcpg-1.82.ebuild b/dev-java/bcpg/bcpg-1.82.ebuild index 84aab576c5c3..fcbcab8c5f20 100644 --- a/dev-java/bcpg/bcpg-1.82.ebuild +++ b/dev-java/bcpg/bcpg-1.82.ebuild @@ -17,7 +17,7 @@ S="${WORKDIR}/bc-java-${MY_PV}/pg" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 arm64 ~ppc64" +KEYWORDS="amd64 arm64 ppc64" CP_DEPEND=" ~dev-java/bcprov-${PV}:0 diff --git a/dev-java/bcpg/bcpg-1.80.ebuild b/dev-java/bcpg/bcpg-1.83.ebuild index 3225d780fc6a..89691ac65614 100644 --- a/dev-java/bcpg/bcpg-1.80.ebuild +++ b/dev-java/bcpg/bcpg-1.83.ebuild @@ -4,8 +4,8 @@ EAPI=8 JAVA_PKG_IUSE="doc source test" -MAVEN_ID="org.bouncycastle:bcpg-jdk18on:${PV}" JAVA_TESTING_FRAMEWORKS="junit-4" +MAVEN_ID="org.bouncycastle:bcpg-jdk18on:${PV}" inherit java-pkg-2 java-pkg-simple @@ -17,7 +17,7 @@ S="${WORKDIR}/bc-java-${MY_PV}/pg" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 arm64 ppc64" +KEYWORDS="~amd64 ~arm64 ~ppc64" CP_DEPEND=" ~dev-java/bcprov-${PV}:0 @@ -37,12 +37,8 @@ RDEPEND=" DOCS=( ../{README,SECURITY}.md ) HTML_DOCS=( ../{CONTRIBUTORS,index}.html ) -JAVA_SRC_DIR=( - "src/main/java" - "src/main/jdk1.9" -) - JAVA_AUTOMATIC_MODULE_NAME="org.bouncycastle.pg" +JAVA_SRC_DIR=( src/main/{java,jdk1.9} ) JAVA_TEST_GENTOO_CLASSPATH="junit-4" JAVA_TEST_RESOURCE_DIRS="src/test/resources" JAVA_TEST_SRC_DIR="src/test/java" @@ -53,12 +49,9 @@ src_prepare() { } src_test() { - pushd src/test/java || die - local JAVA_TEST_RUN_ONLY=$(find * \ - -name "AllTests.java" ) - popd || die - 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 } |