gentoo resync : 07.01.2022

6 files changed, 82 insertions, 12 deletions

diff --git a/dev-java/jackrabbit-webdav/Manifest b/dev-java/jackrabbit-webdav/Manifest
index 32c9cdb6f576..5b3089c9e719 100644
--- a/dev-java/jackrabbit-webdav/Manifest
+++ b/dev-java/jackrabbit-webdav/Manifest
@@ -1,8 +1,9 @@
-AUX jackrabbit-webdav-2.10.1-CSRFUtilTest.java.patch 674 BLAKE2B 1d3275a45d9f472f7541a9d8b0d8726b411f633423e546f9f486cf46d3941884dd31c82d1afb14db13bd667d9eedea47f36f6516628dd61a14aee890975e4a30 SHA512 e6b078903c2b50db451a491a48deb515d983537994211d57f16c5259bfb8bda8bd245ceb3a24b355edf430623ff4f38c8e8d2e41580d48de8f5b90f8f328f2be
-AUX jackrabbit-webdav-2.10.1-OutputContextImplTest.java.patch 696 BLAKE2B e888cacb419050b6bf412ecd70df42ea13a11937bcf00d7e716e36e1842003a2a53626179a6e642ab2df7aec84a2c7f9bc660754456e0ba4ad4912ea80dc1ffd SHA512 ab32fefc4f24d422eab5c399355e4188c0f8b7171e0e1ad9cacb5d031e1cee01ff3312d0df47cccc15a949d374e7c07749e5dc020a7e6d1e9fab7a86289d0d19
+AUX jackrabbit-webdav-2.10.1-CSRFUtilTest.java.patch 678 BLAKE2B a240957e24b0e0961d680b4868dafe0fc4b337cb96a6eaed9bd0a23099d4e5d47757a846776abee196941514b329de5b08ef42219edbb8f2ae4b26f210efbd04 SHA512 00e7e1e102f3d518a6c0ed088ba286b84ae5991a73fe01bdc353fe0550289a95b69f7fc69b46b1423f6b42ea51e4b38b02d266bd9abb6663881a53223dd6cb9a
+AUX jackrabbit-webdav-2.10.1-OutputContextImplTest.java.patch 700 BLAKE2B f3c54de43be927bf53c07bf29af744449864b43684e8e32bc8f6e7c40efd4cd5b6cb09b953d83c02147e96dd4548d2b285b3658f7ec3edeaac62c33e49d40f9c SHA512 f7f26b207be3f9fc19a1226ed01e5774de7411fe440a450459dbfc20b19db77e29e40adb3e5e18f72b637c51774baae4a26d024d43ea785715c0c89b91c1c46e
 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.ebuild 1263 BLAKE2B fddbde6b2343b28371d93ccfb6e193b4dfae02505c39ab85de707111a4e4e52bfa00a12debf26e1486a04859a3eecda55c4475bf2658572ffe049ffd2da19ced SHA512 c19c14a0a1fac37995395cb9d84944dcc24491df4e61b5a0c5d14a4d02d3c816f431afdb6b0d86af40b31a5b56ff16189d848e50534c735f8fd39567d5212eac
-EBUILD jackrabbit-webdav-2.21.7.ebuild 2070 BLAKE2B e2a992e5c7968de0a79cdd37dc958f585f0c5aac075680a4f1ebba24362228d5a302cc14ffed547abe0fd7f68e22531bc09e6b6422eb1d8bbf296274b8bd4b9e SHA512 7dbc419a37e14c424396ccd8ce65e180d333d12a97d37e6418d16c5e0ef2d702191774c2e32591db043fcf1ab74d3e83ddd88ec6e1f242cac21d768df9458831
+EBUILD jackrabbit-webdav-2.10.1-r1.ebuild 1286 BLAKE2B baa4addf5b9f6f476cd4188676756df7a5e688e4f0943649bc366550fe7e0f465a32cc69329f7bc02b06d80a4ed69a45a2ff064e14f6ac8326ca7b04cf27be5f SHA512 eddf6393b3ba679a1410b31a88d8bd8ee55fd5aefadff80330b2add888288526a4ce95f285408defc1d1efd64f2e4cda8afe51617ff0b23798ab61c8d960db2f
+EBUILD jackrabbit-webdav-2.10.1.ebuild 1279 BLAKE2B 1d2eb70b66d3ce9f30ab90467af0a78ed6a251559c581a19ce74d4846b8c21eddace72fdb0aba0e1b919563180d040c9b70f16b0c66d7597274fbdcde027f8cf SHA512 09aa64702b82c18b124f7f41eb5de6480dffcfc7e6503877a428c4dbc40ecae72a1d1e41c5b7aeb3cf50185aa918716432128a092929a184af5421253145da00
+EBUILD jackrabbit-webdav-2.21.7.ebuild 2075 BLAKE2B 68e90450e3f9f5ea9e93dcb1bbf93b42e9a12c456b08acbe64b592b9196e69c0a43f18cfe574e8839e1adc0c86180d391f85d45a3467d0ed5b7a671f4060b557 SHA512 11571376f7c2951c783a5c3c7ad5654deaed7501d4b7afc7f7cc6c21f1b5ea9282eeba01e3d77fcc9acd7561ffa1112e174702c8e849c140bb4e1987ca954387
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/jackrabbit-webdav/files/jackrabbit-webdav-2.10.1-CSRFUtilTest.java.patch b/dev-java/jackrabbit-webdav/files/jackrabbit-webdav-2.10.1-CSRFUtilTest.java.patch
index 4c1f286339b8..8417f31cfceb 100644
--- a/dev-java/jackrabbit-webdav/files/jackrabbit-webdav-2.10.1-CSRFUtilTest.java.patch
+++ b/dev-java/jackrabbit-webdav/files/jackrabbit-webdav-2.10.1-CSRFUtilTest.java.patch
@@ -1,5 +1,5 @@
---- src/test/java/org/apache/jackrabbit/webdav/util/CSRFUtilTest.java.orig	2015-07-03 09:36:45.804000000 +0000
-+++ src/test/java/org/apache/jackrabbit/webdav/util/CSRFUtilTest.java	2015-07-03 09:36:59.498000000 +0000
+--- a/src/test/java/org/apache/jackrabbit/webdav/util/CSRFUtilTest.java.orig	2015-07-03 09:36:45.804000000 +0000
++++ b/src/test/java/org/apache/jackrabbit/webdav/util/CSRFUtilTest.java	2015-07-03 09:36:59.498000000 +0000
 @@ -281,6 +281,18 @@
          public void removeAttribute(String name) {
  
diff --git a/dev-java/jackrabbit-webdav/files/jackrabbit-webdav-2.10.1-OutputContextImplTest.java.patch b/dev-java/jackrabbit-webdav/files/jackrabbit-webdav-2.10.1-OutputContextImplTest.java.patch
index d9a2315f19a1..9f132b817a12 100644
--- a/dev-java/jackrabbit-webdav/files/jackrabbit-webdav-2.10.1-OutputContextImplTest.java.patch
+++ b/dev-java/jackrabbit-webdav/files/jackrabbit-webdav-2.10.1-OutputContextImplTest.java.patch
@@ -1,5 +1,5 @@
---- src/test/java/org/apache/jackrabbit/webdav/io/OutputContextImplTest.java.orig	2015-07-03 09:26:48.578000000 +0000
-+++ src/test/java/org/apache/jackrabbit/webdav/io/OutputContextImplTest.java	2015-07-03 09:27:34.109000000 +0000
+--- a/src/test/java/org/apache/jackrabbit/webdav/io/OutputContextImplTest.java.orig	2015-07-03 09:26:48.578000000 +0000
++++ b/src/test/java/org/apache/jackrabbit/webdav/io/OutputContextImplTest.java	2015-07-03 09:27:34.109000000 +0000
 @@ -40,6 +40,13 @@
              public void setHeader(String name, String value) {
                  assertTrue(Long.parseLong(value) > Integer.MAX_VALUE);
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
new file mode 100644
index 000000000000..70c88912c147
--- /dev/null
+++ b/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1-r1.ebuild
@@ -0,0 +1,68 @@
+# 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.ebuild b/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1.ebuild
index 1c182599a97d..2f95946aa570 100644
--- a/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1.ebuild
+++ b/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -25,7 +25,8 @@ CDEPEND="dev-java/bndlib:0
 	dev-java/commons-httpclient:3
 	java-virtuals/servlet-api:2.3"
 
-DEPEND=">=virtual/jdk-1.6
+DEPEND="app-arch/unzip
+	>=virtual/jdk-1.6
 	${CDEPEND}
 	test? ( dev-java/ant-junit:0 )"
 
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 a16fdc022650..327150492a77 100644
--- a/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.21.7.ebuild
+++ b/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.21.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Skeleton command:
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/jackrabbit/${PV}/jackrabbit-${PV}-src.zip"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="amd64 ppc64 x86"
+KEYWORDS="amd64 ~arm ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml