gentoo resync : 16.01.2021

4 files changed, 54 insertions, 71 deletions

diff --git a/dev-java/jackrabbit-webdav/Manifest b/dev-java/jackrabbit-webdav/Manifest
index 5b3089c9e719..42d64f03a3d5 100644
--- a/dev-java/jackrabbit-webdav/Manifest
+++ b/dev-java/jackrabbit-webdav/Manifest
@@ -3,7 +3,7 @@ AUX jackrabbit-webdav-2.10.1-OutputContextImplTest.java.patch 700 BLAKE2B f3c54d
 AUX jackrabbit-webdav-2.10.1-build.xml 17644 BLAKE2B c878975d2f1ffe74752b36873d0625c73605469e5d8a1287568b461fe402e4a91ea0f2c6334514d526a011dbe4311b0b49439d508c9ea99e127cad49abe6ebee SHA512 5b22661e3d36d227edb618b553671964be14f34dd245f1749caf9b6f3c9981fdc9fad11659ae98cdd5fb3b343b6bc450478d3655054b055f7ffb3663378b7a8a
 DIST jackrabbit-2.10.1-src.zip 13437021 BLAKE2B 3542bbe5f7c8ab8feb585fecdaca028a4908eb664d01cb9fb32156c71756973671969b1141e796fbc165f7f6f305db25f74d36657e4d86dac6766e4d79b888dd SHA512 c371ff941054f3a916f43f7020f0aebd8146422835a75ab2ad9f9f716c4ef0a94b3b962f9b6e4fadef87b9e82e8143b4ece27280714a4eb71a6b0a38c47d48e9
 DIST jackrabbit-2.21.7-src.zip 13532529 BLAKE2B ea3ebf687e29b58e75840d6f5665da8abcb474dbaa353c0caf6a8d1cb1de6c6347830cbe0b6c91259fd496eeff834278874b64306da85a7e0c82ab71dd0b1c34 SHA512 254e151ed7e814ff8b4df985814ace12316a9dc56e87f4ba6236986ac2364936d3b15327f50ebc1b9fa7ac9bbed067924148436cc8ac31a7ef91d11faecb4678
-EBUILD jackrabbit-webdav-2.10.1-r1.ebuild 1286 BLAKE2B baa4addf5b9f6f476cd4188676756df7a5e688e4f0943649bc366550fe7e0f465a32cc69329f7bc02b06d80a4ed69a45a2ff064e14f6ac8326ca7b04cf27be5f SHA512 eddf6393b3ba679a1410b31a88d8bd8ee55fd5aefadff80330b2add888288526a4ce95f285408defc1d1efd64f2e4cda8afe51617ff0b23798ab61c8d960db2f
+EBUILD jackrabbit-webdav-2.10.1-r2.ebuild 1340 BLAKE2B 07024d9b55a48a7a57c44f911d1570e188b4968666a000fd336aebf2d7fc2cc846dae4e943d0063c8386c2273b52c5a44a8095d4ed235fe8b3d84e5bdb09deb2 SHA512 5c2d5a1bda66e4e370cf6e7b030c29fff01f2d3d30687d6cdb08ff1b6d2c1069f8adb264d62262053e767039b640804f1bb527b8588c6c99eb862d3b1669a9f1
 EBUILD jackrabbit-webdav-2.10.1.ebuild 1279 BLAKE2B 1d2eb70b66d3ce9f30ab90467af0a78ed6a251559c581a19ce74d4846b8c21eddace72fdb0aba0e1b919563180d040c9b70f16b0c66d7597274fbdcde027f8cf SHA512 09aa64702b82c18b124f7f41eb5de6480dffcfc7e6503877a428c4dbc40ecae72a1d1e41c5b7aeb3cf50185aa918716432128a092929a184af5421253145da00
-EBUILD jackrabbit-webdav-2.21.7.ebuild 2075 BLAKE2B 68e90450e3f9f5ea9e93dcb1bbf93b42e9a12c456b08acbe64b592b9196e69c0a43f18cfe574e8839e1adc0c86180d391f85d45a3467d0ed5b7a671f4060b557 SHA512 11571376f7c2951c783a5c3c7ad5654deaed7501d4b7afc7f7cc6c21f1b5ea9282eeba01e3d77fcc9acd7561ffa1112e174702c8e849c140bb4e1987ca954387
+EBUILD jackrabbit-webdav-2.21.7.ebuild 2082 BLAKE2B 87576a5edaa1ee1a2ba080d5e97663e468425e2be50bae6816eb8a3096f40272541625b805d8d181dd9cdab4101245bd9123cf2ba5c514879fd9ee973e4655d9 SHA512 f6122353276b1f8ef8b754dea98b09dc01b9cf5ddac97c996b2da31dc54329b256972fc29a0cb6534dfb7313d7236b56543b0e3aa0ddd9774ca5042f06a9f2c6
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1-r1.ebuild b/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1-r1.ebuild
deleted file mode 100644
index 70c88912c147..000000000000
--- a/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc test"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PN="${PN/-*/}"
-
-DESCRIPTION="Fully conforming implementation of the JRC API (specified in JSR 170 and 283)"
-HOMEPAGE="http://jackrabbit.apache.org/"
-SRC_URI="mirror://apache/${MY_PN}/${PV}/${MY_PN}-${PV}-src.zip"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-S="${WORKDIR}/${MY_PN}-${PV}/${PN}"
-
-CDEPEND="dev-java/bndlib:0
-	dev-java/slf4j-api:0
-	dev-java/slf4j-nop:0
-	dev-java/commons-httpclient:3
-	java-virtuals/servlet-api:2.3"
-
-DEPEND=">=virtual/jdk-1.8:*
-	${CDEPEND}
-	test? ( dev-java/ant-junit:0 )"
-
-RDEPEND=">=virtual/jre-1.8:*
-	${CDEPEND}"
-
-BDEPEND="app-arch/unzip"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="
-	bndlib
-	commons-httpclient-3
-	servlet-api-2.3
-	slf4j-api
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-OutputContextImplTest.java.patch
-	"${FILESDIR}"/${P}-CSRFUtilTest.java.patch
-)
-
-src_prepare() {
-	default
-
-	cp "${FILESDIR}"/${P}-build.xml build.xml || die
-}
-
-EANT_TEST_GENTOO_CLASSPATH="
-	${EANT_GENTOO_CLASSPATH}
-	slf4j-nop
-"
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_newjar target/${P}.jar
-
-	use doc && java-pkg_dojavadoc target/site/apidocs
-}
diff --git a/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1-r2.ebuild b/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1-r2.ebuild
new file mode 100644
index 000000000000..108db165b5f0
--- /dev/null
+++ b/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1-r2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="${PN/-*/}"
+
+DESCRIPTION="Fully conforming implementation of the JRC API (specified in JSR 170 and 283)"
+HOMEPAGE="https://jackrabbit.apache.org/"
+SRC_URI="mirror://apache/${MY_PN}/${PV}/${MY_PN}-${PV}-src.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+S="${WORKDIR}/${MY_PN}-${PV}/${PN}"
+
+CP_DEPEND="dev-java/bndlib:0
+	dev-java/slf4j-api:0
+	dev-java/slf4j-nop:0
+	dev-java/commons-httpclient:3
+	java-virtuals/servlet-api:2.3"
+
+DEPEND=">=virtual/jdk-1.8:*
+	${CP_DEPEND}"
+
+RDEPEND=">=virtual/jre-1.8:*
+	${CP_DEPEND}"
+
+BDEPEND="app-arch/unzip"
+
+JAVA_SRC_DIR="src/main/java"
+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" )
+
+src_test() {
+	# Run only tests that would be executed by Maven as in ${S}/pom.xml:79
+	JAVA_TEST_RUN_ONLY=$(find "${JAVA_TEST_SRC_DIR}" -name "*TestAll.java" \
+		-exec realpath --relative-to="${JAVA_TEST_SRC_DIR}" {} \;)
+	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
+	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
+	java-pkg-simple_src_test
+}
diff --git a/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.21.7.ebuild b/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.21.7.ebuild
index 327150492a77..76bd9541226d 100644
--- a/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.21.7.ebuild
+++ b/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.21.7.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/jackrabbit/${PV}/jackrabbit-${PV}-src.zip"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="amd64 ~arm ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml