[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-codec/

[Miroslav Šulc]

commit:     0325d58168f7924895881e1284210b0380cc5f8b
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 20 12:43:15 2021 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Apr 20 12:43:15 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0325d581

dev-java/commons-codec: fixed tests in 1.15 + added dropped arches

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/commons-codec/commons-codec-1.15.ebuild | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/dev-java/commons-codec/commons-codec-1.15.ebuild b/dev-java/commons-codec/commons-codec-1.15.ebuild
index c053b0fec15..f67de5d44ad 100644
--- a/dev-java/commons-codec/commons-codec-1.15.ebuild
+++ b/dev-java/commons-codec/commons-codec-1.15.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/commons/codec/source/${P}-src.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 
 # Compile dependencies
 # POM: ${P}-src/pom.xml
@@ -36,21 +36,15 @@ RDEPEND="
 	>=virtual/jre-1.8:*
 "
 
-S="${WORKDIR}"
+S="${WORKDIR}/${P}-src"
 
-JAVA_SRC_DIR="${P}-src/src/main/java"
+JAVA_SRC_DIR="src/main/java"
 JAVA_RESOURCE_DIRS=(
-	"${P}-src/src/main/resources"
-	"${P}-src"
+	"src/main/resources"
 )
 
 JAVA_TEST_GENTOO_CLASSPATH="junit-4,commons-lang-3.6"
-JAVA_TEST_SRC_DIR="${P}-src/src/test/java"
+JAVA_TEST_SRC_DIR="src/test/java"
 JAVA_TEST_RESOURCE_DIRS=(
-	"${P}-src/src/test/resources"
-	"${P}-src"
+	"src/test/resources"
 )
-
-# testSha224_PathAsHex(org.apache.commons.codec.digest.DigestUtilsTest)
-# java.nio.file.NoSuchFileException: src/test/resources/org/apache/commons/codec/empty.bin
-JAVA_TEST_EXCLUDES="org.apache.commons.codec.digest.DigestUtilsTest"