gentoo resync : 09.07.2022

3 files changed, 2 insertions, 114 deletions

diff --git a/dev-java/jackson-dataformat-xml/Manifest b/dev-java/jackson-dataformat-xml/Manifest
index f00f3deea55e..ef4508acf7e6 100644
--- a/dev-java/jackson-dataformat-xml/Manifest
+++ b/dev-java/jackson-dataformat-xml/Manifest
@@ -1,6 +1,4 @@
-DIST jackson-dataformat-xml-2.13.2.tar.gz 3201222 BLAKE2B c4db7ae5f3f3fc41bb3890337cc2cf6f1fe4dd65e96bff336d0c21e19758ca797497affbd189b731518a164fa8ad7f40c07e1c64ab3250ac438f1d4bf122a6ce SHA512 048550c465a83e0e5b72313d601eace9d817572a7d331d37ac48af51d5e0ef8d52cccadb1412c27d4ebd28b222b7707a0bfba114e10168d233e4c4e9f8d2fd1f
 DIST jackson-dataformat-xml-2.13.3.tar.gz 3201473 BLAKE2B 90f6b98325e3ae43e7ba560b077ee8fc8e5ad5004fd23b7c10a2c2a3ec7a674b700b80766690d2442820f87698fa5e33c440c2aa12cd521b7566e78eca50bbaa SHA512 52e26e1a398d90f75ef61d074ed1d149b9f13555f1878703b3148ed008f29f8802586a6020f3c1427a748a73b9a4ca56d86ffd769cf6cb7317a69e039345eefa
-EBUILD jackson-dataformat-xml-2.13.2-r1.ebuild 3894 BLAKE2B 4f434f5e3d3ae85ed54c775973c6cb5f5767c2a9e5bc33918af5212fb970eee445902845c0b32ff73f80bfc8ddd58820ce994fb7c8cd6a9f214fe5b776dc97ee SHA512 6f74638693506f4e76c4f91c8adefe8eb8e239c7480b6408d06a267ede82cb703184a1256339a2042bfc8aae01b4a74413c1c7e5091358fc1830724e9e08feb7
 EBUILD jackson-dataformat-xml-2.13.3-r1.ebuild 3896 BLAKE2B e1302ea9708b24ddd1d7a37adb4a09c736940dd7be95f74a10a7f9c1442ee505e2398e491919a468097c4c46be9d5c86c09a27de9ac89a7cedf0e41811e54fa0 SHA512 7b2e0e3ccae805a68c9cc2ee88cb8413929e8c6d4ef238533adcef6568fc9bfe2f8b2cd1aa795ba1b9035093ff28f40707cd1dcfac7609ce647fbe76cce41418
-EBUILD jackson-dataformat-xml-2.13.3.ebuild 3894 BLAKE2B fd9c43e80882a30d7adfed83ca121d9cb540b98a142e0b44859f0a5216f330ef0240c6d3bd5d8c67d308b2888c9ae2646e81469bac12356f4bbd21fc12664fdb SHA512 852056549ed81f58dd3860758f12cf2aecce63b87b88e13b5cdaf71c64cb759fa45e5d416626055a44f13e55f2c7c253e3ee4f4e450930b6767a6d2647ab35ae
+EBUILD jackson-dataformat-xml-2.13.3.ebuild 3892 BLAKE2B 46afcafa1c09722bd77b5c7bbc33c586deb219c9f35c561efe50067a6fac3e580c3c0c5f6678dd3052b2e3048055fd55e4e062b1b44beacc9a0a05e9cb33f060 SHA512 56f33b35d344dace59ceefbb25a14059f5dfe90723695066b300b0cb1b997a6d86258b3d869238a604a6f1d352aecdbdc9fec6b6b3c742b9e48070f55b44839d
 MISC metadata.xml 487 BLAKE2B 0e5e73be66b890aab37fce8ccd162c168c7cff415c418a30f5cdcc76624499633abfd366f86ece75de208b981a03364566659e37c2b3a34ad90a01f3577a707a SHA512 b920c1d3b8d8f6023df6c100ba4b36282c7cbfdad4a4690055d70cd3dac8d0da91f236a38565bee798342dd94c49cf2c9ce125282a7e5fd818321e28d288b3f1
diff --git a/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.2-r1.ebuild b/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.2-r1.ebuild
deleted file mode 100644
index fc200932a64b..000000000000
--- a/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.2-r1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# 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/FasterXML/jackson-dataformat-xml/archive/jackson-dataformat-xml-2.13.2.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-dataformat-xml-2.13.2.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.13.2"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Data format extension for Jackson"
-HOMEPAGE="https://github.com/FasterXML/jackson-dataformat-xml"
-SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# Common dependencies
-# POM: pom.xml
-# com.fasterxml.jackson.core:jackson-annotations:2.13.2 -> >=dev-java/jackson-annotations-2.13.2:2
-# com.fasterxml.jackson.core:jackson-core:2.13.2 -> >=dev-java/jackson-core-2.13.2:0
-# com.fasterxml.jackson.core:jackson-databind:2.13.2 -> >=dev-java/jackson-databind-2.13.2:0
-# com.fasterxml.woodstox:woodstox-core:6.2.7 -> >=dev-java/woodstox-core-6.2.7:0
-# org.codehaus.woodstox:stax2-api:4.2.1 -> >=dev-java/stax2-api-4.2.1:0
-
-CP_DEPEND="
-	~dev-java/jackson-annotations-${PV}:2
-	~dev-java/jackson-core-${PV}:0
-	~dev-java/jackson-databind-${PV}.2:0
-	>=dev-java/stax2-api-4.2.1-r1:0
-	dev-java/woodstox-core:0
-"
-
-# Compile dependencies
-# POM: pom.xml
-# test? com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.13.2 -> >=dev-java/jackson-module-jakarta-xmlbind-2.13.2:0
-# test? com.sun.xml.stream:sjsxp:1.0.2 -> >=dev-java/sjsxp-1.0.2:0
-# test? jakarta.xml.bind:jakarta.xml.bind-api:3.0.1 -> >=dev-java/jaxb-api-3.0.1:3
-# test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.2:4
-
-DEPEND="
-	>=virtual/jdk-11:*
-	${CP_DEPEND}
-	test? (
-		~dev-java/jackson-module-jakarta-xmlbind-${PV}:0
-		dev-java/jaxb-api:3
-		dev-java/sjsxp:0
-	)
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CP_DEPEND}"
-
-DOCS=( README.md release-notes/{CREDITS,VERSION}-2.x )
-
-S="${WORKDIR}/${PN}-${P}"
-
-JAVA_SRC_DIR=( "src/main/java" "src/moditect" )
-JAVA_RESOURCE_DIRS="src/main/resources"
-
-JAVA_TEST_GENTOO_CLASSPATH="jackson-module-jakarta-xmlbind,sjsxp,jaxb-api-3,junit-4"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-
-src_prepare() {
-	java-pkg-2_src_prepare
-
-	sed -e 's:@package@:com.fasterxml.jackson.dataformat.xml:g' \
-		-e "s:@projectversion@:${PV}:g" \
-		-e 's:@projectgroupid@:com.fasterxml.jackson.dataformat:g' \
-		-e "s:@projectartifactid@:${PN}:g" \
-		"${JAVA_SRC_DIR}/com/fasterxml/jackson/dataformat/xml/PackageVersion.java.in" \
-		> "${JAVA_SRC_DIR}/com/fasterxml/jackson/dataformat/xml/PackageVersion.java" || die
-}
-
-src_test() {
-	pushd src/test/java || die
-		local JAVA_TEST_RUN_ONLY=$(find * -name "*Test*.java" \
-			! -wholename "**/failing**/*.java" \
-			! -name "*TestBase.java" )
-	popd
-
-	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
-	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
-
-	# The same failure under openjdk-17 occurs upstream (running 'mvn test')
-
-	# 1) testCollection(com.fasterxml.jackson.dataformat.xml.lists.ListAsObjectTest)
-	# com.fasterxml.jackson.databind.exc.InvalidDefinitionException: Failed to call `setAccess()` on Field 'first' due to
-	# `java.lang.reflect.InaccessibleObjectException`, problem: Unable to make field transient java.util.LinkedList$Node
-	# java.util.LinkedList.first accessible: module java.base does not "opens java.util" to unnamed module @42bb2aee
-
-	local vm_version="$(java-config -g PROVIDES_VERSION)"
-	if ver_test "${vm_version}" -ge "17" ; then
-		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.util=ALL-UNNAMED )
-	fi
-
-	java-pkg-simple_src_test
-}
-
-src_install() {
-	default # https://bugs.gentoo.org/789582
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.3.ebuild b/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.3.ebuild
index 2c613fbdaa52..4cf94ba87a41 100644
--- a/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.3.ebuild
+++ b/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml