gentoo auto-resync : 03:10:2022 - 13:14:45

5 files changed, 109 insertions, 24 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index e3f0ece2d8e2..4304e4d3e733 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/joda-time/Manifest b/dev-java/joda-time/Manifest
index d5400d908457..3c6fd9a90d22 100644
--- a/dev-java/joda-time/Manifest
+++ b/dev-java/joda-time/Manifest
@@ -1,6 +1,8 @@
 AUX joda-time-2.11.0-test.patch 577 BLAKE2B 072cb890960ae26fef7297e7e7af18ab36f5f2ed3d94f370e1ba4d873c3625ed291ead37b05ad8ac0b53da04c2bd0bef4e7b2e4039a450f6466d58d1f0fec1a8 SHA512 77430e5d0829b1de0d621956731f896c644fb4529b6f3e0fe741266661c7b027a3a3bbe0747875a74746c18f4bb7e31eff185121b21de9cdd5e2210aab5e673f
 DIST joda-time-2.10.14.tar.gz 1055876 BLAKE2B c70ad0724ad5e6d6f6a158ed05eb9711095cd353bf72a43a3edaa8ce36db1f92e0c18cd2e2b73c34e4126962d0ef97bf83844f9de924df8aadce7d38ffdb7975 SHA512 061c341c35f5187422fe402500384f5933c1eb0c77963f65b5295b8f9b479adf29f944269173d9a93e4a288c583777b21f085afe4c5da6c695f14801636f0fc1
 DIST joda-time-2.11.0.tar.gz 1055531 BLAKE2B 98b64e0419a1b7379d3467d012a1162afedb537048c86f8e9069ef5e21649dfe01d458a8e74ccb5dc052940b6edd2eba73ad86ae25bc20d3e62ec73a7a56a605 SHA512 357c8b3d1cc1cdd164cf2486a55ab9489db43c4243f140da5c21ee84bc3a801f51e2e2c2a257dbe2d2ce41bc33c676854136eddf3606ed7da69dcd3a10b2d010
+DIST joda-time-2.11.2.tar.gz 1055885 BLAKE2B 52281dcb530734dd33d0c01b07c9fbc5e7afd507a97e6926f7ef442dc91907d999d126289bc609e6fabf6af4267e47e5a79452d462a3f0561c405e6cd7f5976f SHA512 ea43deea4ef751fc631c35589adec0c5d9d0a5c836c1a24ada5d994cb9310a55b5af69260afd2647516c64fc84b892a2e25fca4bb38e852982c40f7caa5858b3
 EBUILD joda-time-2.10.14.ebuild 2174 BLAKE2B c4809145324538d170986b0e14884554837175f39f27a871ee740cf9b2a881fdc453389e298744f28c8c93bda53da12cd28a28c3d089f1dab064e9a8d98b1afe SHA512 0eff6cd6eb595eb2026f0531d74eb02cd0bfab85bfa1253e65a00d09cdb04a6a7e86b3d0189e101e2a15c0382ac91d67b02d874d5c05dc64770965ad5a2cf3e9
 EBUILD joda-time-2.11.0.ebuild 2652 BLAKE2B 7021a8b46e3c6a935204f9154d0bd131a641257c5cb1a9de54ee048a9cc994600fd17839da7cbc12730938e9df80d74708bc84ecb6600991879b6c2cb486e3b7 SHA512 87f85c66aa3ae560200bc5a3320c86983796989042f145f79c753d2362cfc4c9b9cd545661880bfcd922acd60d9803bdb104cdffd7c5d0058030d5320ed32cad
+EBUILD joda-time-2.11.2.ebuild 2662 BLAKE2B ac39fe3bcf8cde7f8a262bb8caccc9bdfde5d7cc1092ec9096e5e17dc87e0143622381c989381fec98354d3dd7abf64e8170dae3321d79fd19eb7355c7942d9d SHA512 5e347e9a6a0fadb1673631035101f9d14e184642b5cac9d6af1d73bf6f958448ce05d93256851e2a378a052b760b95c70399995374f061e4d1c8846de6b6f42a
 MISC metadata.xml 497 BLAKE2B 96303e9c4ee30156cb9f6dc9260155270fbc3aece7c8dcfb1fd796e69ed4ee2f3ec91030f016dcdd53f411a5c216c3d41dd68ea45079c036e0ee55d529548fd2 SHA512 9f5a300ca1ee6a68e555393879c61c6898c5ba22f0cdd83d83c1411d3009af7478ddb0e1087bc88d695b2bab162c4cc62952d3fc29b4902a857db95c2fc2f130
diff --git a/dev-java/joda-time/joda-time-2.11.2.ebuild b/dev-java/joda-time/joda-time-2.11.2.ebuild
new file mode 100644
index 000000000000..127dbb0f8733
--- /dev/null
+++ b/dev-java/joda-time/joda-time-2.11.2.ebuild
@@ -0,0 +1,95 @@
+# 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 https://github.com/JodaOrg/joda-time/archive/v2.11..tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" --ebuild joda-time-2.11..ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="joda-time:joda-time:2.11.2"
+JAVA_TESTING_FRAMEWORKS="junit"
+
+inherit edo java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Date and time library to replace JDK date handling"
+HOMEPAGE="https://www.joda.org/joda-time/"
+SRC_URI="https://github.com/JodaOrg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+
+# Common dependencies
+# POM: pom.xml
+# org.joda:joda-convert:1.9.2 -> >=dev-java/joda-convert-2.2.2:0
+
+CP_DEPEND="dev-java/joda-convert:0"
+
+DEPEND=">=virtual/jdk-1.8:*
+	${CP_DEPEND}"
+
+RDEPEND=">=virtual/jre-1.8:*
+	${CP_DEPEND}"
+
+PATCHES=(
+	# Enable tests for jdk-11 in
+	# src/test/java/org/joda/time/TestDateTimeZone.java
+	"${FILESDIR}/joda-time-2.11.0-test.patch"
+)
+
+DOCS=( NOTICE.txt README.md RELEASE-NOTES.txt )
+
+S="${WORKDIR}/${P}"
+
+JAVA_AUTOMATIC_MODULE_NAME="org.joda.time"
+JAVA_RESOURCE_DIRS="src/main/res"
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_RUN_ONLY="org.joda.time.TestAllPackages"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_prepare() {
+	default
+	# move .properties files to JAVA_RESOURCE_DIRS
+	mkdir -p src/main/res
+	cp -r src/main/{java/*,res} || die
+	find src/main/res -type f ! -name '*.properties' -exec rm -rf {} + || die
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+
+	# Generate the missing "org/joda/time/tz/data/ZoneInfoMap"
+	# Arguments from https://github.com/JodaOrg/joda-time/blob/v2.10.10/pom.xml#L413-L427
+	edo "$(java-config -J)" \
+		-cp ${PN}.jar \
+		org.joda.time.tz.ZoneInfoCompiler \
+		-src "${JAVA_SRC_DIR}/org/joda/time/tz/src" \
+		-dst "${P}/src/main/resources/org/joda/time/tz/data" \
+		africa \
+		antarctica \
+		asia \
+		australasia \
+		europe \
+		northamerica \
+		southamerica \
+		etcetera \
+		backward
+
+	java-pkg_addres ${PN}.jar "${P}"/src/main/resources
+}
+
+src_test() {
+	# There are test failures in
+	# src/test/java/org/joda/time/TestDateTimeZone.java
+	# with jdk higher than 11
+	local vm_version="$(java-config -g PROVIDES_VERSION)"
+	if ver_test "${vm_version}" -le 11 ; then
+		java-pkg-simple_src_test
+	else
+		einfo "Tests restricted to <=jdk-11"
+	fi
+}
diff --git a/dev-java/snakeyaml/Manifest b/dev-java/snakeyaml/Manifest
index 8654fb562697..d09c117d0c90 100644
--- a/dev-java/snakeyaml/Manifest
+++ b/dev-java/snakeyaml/Manifest
@@ -1,6 +1,6 @@
 AUX snakeyaml-1.30-fix-test-check.patch 664 BLAKE2B add2f85384f819b30e9ee7af02b73b12ba406c24e63eb7408d9eadcc6f11d532dc635f5d6a3aa73bd09a6975941bb56b69a389c2c1b3edd37dbedcffd83a8bc2 SHA512 5f395fa1f79a9801de11a5e81244799511c88e689bf480e6099357dfbd6666ee8f19bb204adac47c1f6014e92f65476e5f0031b73268f8279cf6253cf6a387b1
 DIST snakeyaml-1.30.tar.gz 402525 BLAKE2B 1d130ce8c5313b302463df11493a0fa845faf3921cd0b0a47f9db8d31f568f266f14a1543e33d77bf9e1b86c462ae4bba8e140339a6245341bdc05d76a1ccf07 SHA512 9ae09163d933e0899cf48ba0c80b5f01423847f1c18306859fa4c4002f0c909611df7096d494e04bb0f8f7d2bc5d1eb4f656e2f322941ddef642b0c23a351908
-DIST snakeyaml-1.31.tar.gz 407514 BLAKE2B 88d600aae5ba7dc5e1877a020082878e20fff7a30d9ff799d358e53e96da01bc8478bd5966c1058de186198d6ef10431480f8b2644d5fdb7e87dca462d9addee SHA512 e5c56cb4ad8ee68e41da63351f39be48ef9ceb50239580d1de1f7a331d66d92fd9aa9b26b4ba6dcb9db6c5acc682c7c2098b3468d32e73bdd2dbf4d07bcc5c55
+DIST snakeyaml-1.33.tar.gz 406196 BLAKE2B 9b7e7d7a5d35d433445737f4b5cc07744e3686a71cc4b9e44ce46153831b76f01da7ef6bc60ea82a7173283a77d0da500bea2bc7ee76bdde4ebda00aa6054aa8 SHA512 ad367d7e7bcb2225094d132df77d91e7401026af02f4ede14a2a4fc5cf78f0cfa1e4400f16f43a669faa2f0e444d36c3745e3c9df3d9114d62fee070c4c99414
 EBUILD snakeyaml-1.30-r1.ebuild 3101 BLAKE2B 1da7c1e114acd0fa56f9f0c6b9870d08ac7fb582cdf31ffb7e82bee10bc90f441c0945ac002b0419ab18c0052b4c1d2622b0d6ecae380c97c0fc58c82ef26822 SHA512 03d2025bf591ef340493e731bb227eb6d0f7fa7de2d1d5897df2aa949c5bbada51b185f9dbbf8ba502125d6cb1cb253cc38a41c5cf77b82a4ea496c9baf7919f
-EBUILD snakeyaml-1.31.ebuild 3368 BLAKE2B 04a03550901ac5360323d0220f8ec1ae794a6112e76f2c32b0d26c45d9ebfbf4bcdc1c6d062afef166cc1400ceb410a47bcd24c737576ec88e41d46c05751b57 SHA512 01da4db489d1828f6327b4ee146d2a9ad543383b16014936b3f48cfecf49a51b666c4292143c6ac048867af168b863177019c96bccc1e0a9a95b71de11a7c1b8
+EBUILD snakeyaml-1.33.ebuild 2343 BLAKE2B d10b52e154e0864e13c87923060eb6ce4d0f1ababe7bbd708511cc20a5d93409fa0129306e80c5c2564be54b2547e0d9146190020594313004c822f7825bc98e SHA512 270df1d5160f79dc5a3d2367a76ea98911de0c0e3398723b23b7513152da2a18350a711d4ade2cfb032b3c945d6c28df5ba64aee2352de38715fd84d5a0abd4d
 MISC metadata.xml 548 BLAKE2B b9d917044a58addef7e75a2714a1a2f70c6ac4db0b30469b93c034b5aca8cd834652c5446b42c99e6785c222667c523b6325341e8f35be342622ad1486411ba6 SHA512 bfb8134a7351f7d0fe4a6433a4655ad8baa207641cb9939591209d05c3caf2d92593891b4b2dced236bb2186d3e410c54ba28682251c5d5f1d5d590e4e94ee61
diff --git a/dev-java/snakeyaml/snakeyaml-1.31.ebuild b/dev-java/snakeyaml/snakeyaml-1.33.ebuild
index 1b37722f47ac..f9978f4168dc 100644
--- a/dev-java/snakeyaml/snakeyaml-1.31.ebuild
+++ b/dev-java/snakeyaml/snakeyaml-1.33.ebuild
@@ -2,12 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 
 # Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://bitbucket.org/snakeyaml/snakeyaml/get/snakeyaml-1.31.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild snakeyaml-1.31.ebuild
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://bitbucket.org/snakeyaml/snakeyaml/get/snakeyaml-1.33.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild snakeyaml-1.33.ebuild
 
 EAPI=8
 
 JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.yaml:snakeyaml:1.31"
+MAVEN_ID="org.yaml:snakeyaml:1.33"
 JAVA_TESTING_FRAMEWORKS="junit-4"
 
 inherit java-pkg-2 java-pkg-simple
@@ -22,10 +22,10 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 # Compile dependencies
 # POM: pom.xml
-# test? joda-time:joda-time:2.10.1 -> >=dev-java/joda-time-2.10.14:0
-# test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.2:4
+# test? joda-time:joda-time:2.11.2 -> >=dev-java/joda-time-2.11.2:0
+# test? junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4
 # test? org.apache.velocity:velocity-engine-core:2.3 -> >=dev-java/velocity-2.3:0
-# test? org.projectlombok:lombok:1.18.22 -> !!!groupId-not-found!!!
+# test? org.projectlombok:lombok:1.18.24 -> !!!groupId-not-found!!!
 
 DEPEND="
 	>=virtual/jdk-1.8:*
@@ -37,14 +37,14 @@ DEPEND="
 
 RDEPEND=">=virtual/jre-1.8:*"
 
-S="${WORKDIR}/snakeyaml-snakeyaml-04401a88fa9b"
+S="${WORKDIR}/snakeyaml-snakeyaml-7f5106920d77"
 
-JAVA_SRC_DIR="src/main/java"
 JAVA_AUTOMATIC_MODULE_NAME="org.yaml.snakeyaml"
+JAVA_SRC_DIR="src/main/java"
 
 JAVA_TEST_GENTOO_CLASSPATH="joda-time,junit-4,velocity"
-JAVA_TEST_SRC_DIR="src/test/java"
 JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_SRC_DIR="src/test/java"
 
 src_test() {
 	export EnvironmentKey1="EnvironmentValue1"
@@ -55,26 +55,14 @@ src_test() {
 	rm src/test/java/org/yaml/snakeyaml/issues/issue387/YamlExecuteProcessContextTest.java || die # Tests run: 1
 	rm src/test/java/org/yaml/snakeyaml/env/ApplicationProperties.java || die # No tests
 
-	# There were 2 failures: - https://bugs.gentoo.org/868681
-	# 1) yamlClassInYAMLCL(org.yaml.snakeyaml.issues.issue318.ContextClassLoaderTest)
-	# java.lang.ClassNotFoundException: org.yaml.snakeyaml.Yaml
-	#         at java.base/java.net.URLClassLoader.findClass(URLClassLoader.java:476)
-	#         at java.base/java.lang.ClassLoader.loadClass(ClassLoader.java:589)
-	#         at java.base/java.lang.ClassLoader.loadClass(ClassLoader.java:522)
-	#         at org.yaml.snakeyaml.issues.issue318.ContextClassLoaderTest.yamlClassInYAMLCL(ContextClassLoaderTest.java:127)
-	# 2) domainInDifferentConstructor(org.yaml.snakeyaml.issues.issue318.ContextClassLoaderTest)
-	# java.lang.ClassNotFoundException: org.yaml.snakeyaml.Yaml
-	#         at java.base/java.net.URLClassLoader.findClass(URLClassLoader.java:476)
-	#         at java.base/java.lang.ClassLoader.loadClass(ClassLoader.java:589)
-	#         at java.base/java.lang.ClassLoader.loadClass(ClassLoader.java:522)
-	#         at org.yaml.snakeyaml.issues.issue318.ContextClassLoaderTest.domainInDifferentConstructor(ContextClassLoaderTest.java:135)
-
+	# https://bugs.gentoo.org/871744
 	pushd src/test/java || die
 		local JAVA_TEST_RUN_ONLY=$(find * -name "*Test.java" \
 			! -name "StressTest.java" \
 			! -name "ParallelTest.java" \
 			! -name "AbstractTest.java" \
 			! -name "PyImportTest.java" \
+			! -name "Fuzzer50355Test.java" \
 			! -name "ContextClassLoaderTest.java" \
 			)
 	popd