gentoo auto-resync : 19:09:2022 - 17:22:11

6 files changed, 59 insertions, 4 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 74e902436d50..fdc75503f681 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/jackrabbit-webdav/Manifest b/dev-java/jackrabbit-webdav/Manifest
index bba689b3fcff..9e535b05691e 100644
--- a/dev-java/jackrabbit-webdav/Manifest
+++ b/dev-java/jackrabbit-webdav/Manifest
@@ -1,5 +1,5 @@
 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-r2.ebuild 1336 BLAKE2B 29fe4d5a86ec6cbd57037c32cd5dcad29df07d323b7805d373671cfffefaea588cea0d1ca37e166acf9db4d085dff0d11c61b6f8ef15075ddd293cda28aee5a1 SHA512 d64d1b4c323cdc147cc5dc171f06bf674a6fb5035147936177698f63c2ed401d3b53e0d96222aa5a34b724af16fa9732c7d786736c73318b227a64db9033b180
-EBUILD jackrabbit-webdav-2.21.7-r1.ebuild 2087 BLAKE2B 2c4e2a95ab3790d7898312e98b25807d5450537838148208d515514d0ad7ea9b1bb40828f1bc1736494d21dbd1235a0501729ab0cada996db52ce46b852d26cd SHA512 fd00e1cd75320d94d29131f0f405a2df1da981965fdbf161cb49a13ee317133737b18a5375490dcec0a0afce74c554aa2a09854bc8be4563a2321b4de0e5ab27
+EBUILD jackrabbit-webdav-2.10.1-r3.ebuild 1338 BLAKE2B 9c0e4faa7969dbf8fb921c3f3906925f9db2bc25aedaabb8b50bf2e2330cc30576625042bbda6f9b6c7cb05f9ab488e4f00ebbe9beb3a86a49d2d36ca841bf18 SHA512 510c5cf5c93720e64a67ba3b88088429d1ff7ddbc44f616f061a388d6d6f4a2d63195fafefadc12db8f3dd8a9d262db07973f8525b0897cc835942693bef04ec
+EBUILD jackrabbit-webdav-2.21.7-r1.ebuild 2069 BLAKE2B 784996564d2181b4c3cb7b551f16f2a2fb03fdfdc06f860870ba2282959be84d517f2ed48f0d48de712d32a68509dee0a84f8cdaf20ed10ad2d7b5fe2a631a51 SHA512 39f1cbd79bfd4787640f0191685cddcdd722157212fbf586deba7c7884e52041e8292f20fe77a061899252812c1b8427020c43be6d4978f3cac952444aad3107
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1-r2.ebuild b/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1-r3.ebuild
index de5e7d799a3f..bce380ed025c 100644
--- a/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1-r2.ebuild
+++ b/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1-r3.ebuild
@@ -24,7 +24,7 @@ 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"
+	dev-java/tomcat-servlet-api:2.3"
 
 DEPEND=">=virtual/jdk-1.8:*
 	${CP_DEPEND}"
diff --git a/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.21.7-r1.ebuild b/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.21.7-r1.ebuild
index ab072c3b1bd9..378c64394006 100644
--- a/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.21.7-r1.ebuild
+++ b/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.21.7-r1.ebuild
@@ -13,7 +13,7 @@ JAVA_TESTING_FRAMEWORKS="junit-4"
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Generic WebDAV Library"
-HOMEPAGE="http://jackrabbit.apache.org/jackrabbit-webdav/"
+HOMEPAGE="https://jackrabbit.apache.org"
 SRC_URI="mirror://apache/jackrabbit/${PV}/jackrabbit-${PV}-src.zip"
 
 LICENSE="Apache-2.0"
diff --git a/dev-java/xerial-core/Manifest b/dev-java/xerial-core/Manifest
index 80ed6051641e..f2c30f50ccdc 100644
--- a/dev-java/xerial-core/Manifest
+++ b/dev-java/xerial-core/Manifest
@@ -1,3 +1,5 @@
 DIST xerial-core-2.0.1.tar.bz2 519709 BLAKE2B 3d81bda265e3b3b37a50a62061298f23de7c2947a9d50ba6eac336c3ec09fcaaeea84d456e344b0d2ae16710870025a869c2359a17f0956c8dda557804e9d5ff SHA512 39236e8a653301a6899ce80d3240d505e91f0cfc8878fa1a698113d06f3af3fd7adef540d72da1c0e1fb7101542c43e92fb9388243d95c3185a561532c18c6fb
+DIST xerial-core-2.1.tar.gz 20598090 BLAKE2B d93021b1becb90a62aacc7337294fb71b0da769461947e935091c65e3e5fda2e454ebda295b7ad37d3b47993472b535588698a618d50243e00d58d1ea500284b SHA512 c762fda93e3da1efe110c667cf84cace7fd7c9b3ac35a764edd2b5e1996034a16a4a43ff5c3e298ff0b96cfc83d18994463c534301e0fab5a75c91cf03b6f89b
 EBUILD xerial-core-2.0.1-r1.ebuild 1469 BLAKE2B c00a498648c515ba78a4680db4c967d472ab4696435e7c0907d286b4703318571ce8f82400af41129019b09bca576222000432f3e5f1246a5118db280ece45ff SHA512 32cbb09e2e83358641c0cd3d939900d2bfdeac606f918ee23bbebbc7747a307af62ebc6f4de08645d1ec35479cd1f7267cac51b94f53802d51526fcca7a55d5a
+EBUILD xerial-core-2.1.ebuild 1691 BLAKE2B a820fd5dcf67622108a079564144253650d6895ad3891f51b03db133d3168838b9d10994ae84806a80dba59496b2c63a69765ad1f5a64888b4af5f3a48c6d657 SHA512 9842fa00fbf7db297dfd658d92b6c334ea5048f30a92a3f3c0487ec2a88bb2936a8e0bd1ebbde2d6d520ea2a415c0158fbc5d5bfce34800c3622f523852b042f
 MISC metadata.xml 320 BLAKE2B e2b3c6290aa495c539b2b3f7afe9fbbad2011245a00e41dd928649a35256f1882ea2bc0eb95c9b468e041734464f4299c39da87c7727b9f43ad8346a0d68affa SHA512 86ce5a0bed000e534fce286494c981aa6e3d8e7619c549ad666655d51928a62699cfd1638d99dcb66f3a83c5717aacb50211f3e2e3314408c188594e986f7171
diff --git a/dev-java/xerial-core/xerial-core-2.1.ebuild b/dev-java/xerial-core/xerial-core-2.1.ebuild
new file mode 100644
index 000000000000..f0300c6eb27a
--- /dev/null
+++ b/dev-java/xerial-core/xerial-core-2.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri mirror://gentoo/distfiles/4f/xerial-core-2.0.1.tar.bz2 --slot 0 --keywords "~amd64 ~x86" --ebuild xerial-core-2.0.1-r1.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.xerial:xerial-core:2.1"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Core library of the Xerial project."
+HOMEPAGE="https://xerial.org"
+SRC_URI="https://github.com/xerial/xerial-java/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( NOTICE README )
+
+S="${WORKDIR}/xerial-java-${PV}/xerial-core"
+
+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() {
+	# 1) listResoucesInJAR(org.xerial.util.FileResourceTest)
+	# java.lang.AssertionError: at least one resource must be found in org.junit.runner
+	local vm_version="$(java-config -g PROVIDES_VERSION)"
+	if ver_test "${vm_version}" -ge 11; then
+		sed \
+			-e '/import org.junit.Test/a import org.junit.Ignore;' \
+			-e '/listResoucesInJAR/i @Ignore' \
+			-i src/test/java/org/xerial/util/FileResourceTest.java || die
+		sed \
+			-e '/import org.junit.Test/a import org.junit.Ignore;' \
+			-e '/addPackage/i @Ignore' \
+			-e '/recursive/i @Ignore' \
+			-i src/test/java/org/xerial/util/opt/CommandLauncherTest.java || die
+	fi
+	java-pkg-simple_src_test
+}