gentoo resync : 12.05.2022

3 files changed, 21 insertions, 20 deletions

diff --git a/dev-java/jackson-dataformat-yaml/Manifest b/dev-java/jackson-dataformat-yaml/Manifest
index 1f0557ef29be..8a7f9a17babc 100644
--- a/dev-java/jackson-dataformat-yaml/Manifest
+++ b/dev-java/jackson-dataformat-yaml/Manifest
@@ -1,5 +1,4 @@
-DIST jackson-dataformat-yaml-2.13.0.tar.gz 3125487 BLAKE2B 84ad1a6c041df324be312161b944435063c11c4e572532d3b0a50a207ad4babff59d90aad112e9d46f2c35f6be4732e3e2d8426e42f3bccb1dfcbe4c083056b4 SHA512 9dc9a683f5cc943711221ac1a4ec862681ae49c8003f08a4a29f15ff77893de3936b37e28fadc433db5a9f498fb70c78eaa4dc0fc6b0875d773999c78f74365a
 DIST jackson-dataformats-text-2.13.2.tar.gz 3528945 BLAKE2B 5dc38706b714121478e82b2f4bc0b3831fa84708b708c08c20d4744c4fc7130149d8dace5c20437514ce9431b1c39183f4d283717f4ad5876fac3651c53ea096 SHA512 1101aabc4b3b652ff90c23186fada6391db9cb4cb5ec6ba9ff78cd91b73ef3b632f38027e192d739d8e47f7ed2726ac03d8c3a1d20d416dfaac3b50ca11abb67
-EBUILD jackson-dataformat-yaml-2.13.0.ebuild 2726 BLAKE2B 835171fa0cbb9f2b1a554cf465e9c62a79429202cae8e7fc8a5c4a3c8035fe3ae1e9ce6d0c2dfdf7d9bc7ee5a4f28b1bb724bd3a7dbc75588287f66c2a11579e SHA512 ea0587ee2732acdf3dfd11d6c7ec66dd1d678e1a568b73034fd7183788400c531437cf8a20722fa0942ff4d409d4e81ad736eb2aa82f28c9c28ab9f703e89110
-EBUILD jackson-dataformat-yaml-2.13.2.ebuild 2667 BLAKE2B ecf5bac5e9404462818cb1b89166ae439e2ae9ae645335f7271d43db2766d5642bccecaa6e40d16846a5b4be146e2ee1bb2c59741633369c572fb78b7d43f3a9 SHA512 cc55652f04adba9146d5a6b8023d018bdfd34cbea4d6a4cf4f3c0810e6bb48dd7daa66bf8a52d665a933fe270951a80c4a4d9365abdf451b0378292da4238902
+EBUILD jackson-dataformat-yaml-2.13.2-r1.ebuild 2668 BLAKE2B f4cffdc70c4a401f57fe2b46c10c8de15440508eff222ff9979354ff93a7fb4753941cad626efd14478f94a70ab467fa814102a98dd8f08f25908a02c47d9820 SHA512 819c502af6462c4012e3d6d6309e6e0188ceb822d03fa32446a2b65e3a897b1639931e1a4e26d174cdd39146c633649abb63af4f4354553cdb2a8e956273075d
+EBUILD jackson-dataformat-yaml-2.13.2.ebuild 2663 BLAKE2B d1efad7633939422a69e409d9c36f360a9b20122d744ac21a0c7cafb189857f465f85d9757a9be0c0583cb5c4aadb878d581c05bf62e25634998124a956afa52 SHA512 d76652d58f9192458cf5684801cb34d3dacc124a233184d81d9c3170e74c29f4a058dc246c6cf7703640d19ceb8344834ba057659c6c6ad89417b9b3d41d946b
 MISC metadata.xml 342 BLAKE2B 4d57f5b5bc0e926e2c359501044c45f3c8223639349286adf9e979cc0cf2bc02070999b1fae29b1da8e14b0348a0aa95dac24006b138f7a60fb7d2d9127fea1f SHA512 7ec10474b90f26e90dfd0d4039901582620a8f84d1a859283522c14aac5a11677d624a3cb773245add8d9fb5704ae94f8a825e68cd4299bf93d4678894561742
diff --git a/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.0.ebuild b/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.2-r1.ebuild
index e90213a12e8c..139c808cdee6 100644
--- a/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.0.ebuild
+++ b/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.2-r1.ebuild
@@ -2,41 +2,44 @@
 # 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-dataformats-text/archive/refs/tags/jackson-dataformats-text-2.13.0.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-dataformat-yaml-2.13.0.ebuild
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/FasterXML/jackson-dataformats-text/archive/jackson-dataformats-text-2.13.2.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-dataformat-yaml-2.13.2.ebuild
 
 EAPI=8
 
 JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.0"
+MAVEN_ID="com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.2"
 JAVA_TESTING_FRAMEWORKS="junit-4"
 
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Support for reading and writing YAML-encoded data via Jackson abstractions"
 HOMEPAGE="https://github.com/FasterXML/jackson-dataformats-text"
-SRC_URI="https://github.com/FasterXML/jackson-dataformats-text/archive/refs/tags/jackson-dataformats-text-${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/FasterXML/jackson-dataformats-text/archive/jackson-dataformats-text-${PV}.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
-# com.fasterxml.jackson.core:jackson-core:2.13.0 -> >=dev-java/jackson-core-2.13.0:0
-# com.fasterxml.jackson.core:jackson-databind:2.13.0 -> >=dev-java/jackson-databind-2.13.0:0
-# org.yaml:snakeyaml:1.28 -> >=dev-java/snakeyaml-1.28:0
+# 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
+# org.yaml:snakeyaml:1.30 -> >=dev-java/snakeyaml-1.30:0
 
 CP_DEPEND="
-	dev-java/jackson-core:0
-	dev-java/jackson-databind:0
+	~dev-java/jackson-core-${PV}:0
+	~dev-java/jackson-databind-${PV}.2:0
 	dev-java/snakeyaml:0
 "
 
-DEPEND="${CP_DEPEND}
-	>=virtual/jdk-1.8:*"
+DEPEND="
+	>=virtual/jdk-11:*
+	${CP_DEPEND}
+"
 
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.8:*"
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}"
 
 DOCS=( README.md release-notes/{CREDITS,VERSION} )
 
@@ -49,8 +52,7 @@ JAVA_TEST_GENTOO_CLASSPATH="junit-4"
 JAVA_TEST_SRC_DIR="src/test/java"
 JAVA_TEST_RESOURCE_DIRS="src/test/resources"
 JAVA_TEST_EXCLUDES=(
-	# Upstream doesn't run these tests and gets
-	# »Tests run: 121, Failures: 0, Errors: 0, Skipped: 0«
+	# Upstream's usual exclude pattern: "**/failing**/*.java"
 	com.fasterxml.jackson.dataformat.yaml.failing.ObjectIdWithTree2Test
 	com.fasterxml.jackson.dataformat.yaml.failing.PolymorphicWithObjectId25Test
 	com.fasterxml.jackson.dataformat.yaml.failing.SimpleGeneration215Test
@@ -67,7 +69,7 @@ src_prepare() {
 		"${JAVA_SRC_DIR}/com/fasterxml/jackson/dataformat/yaml/PackageVersion.java.in" \
 		> "${JAVA_SRC_DIR}/com/fasterxml/jackson/dataformat/yaml/PackageVersion.java" || die
 
-	# dev-java/snakeyaml-1.28-r1 does not provide module-info
+	# dev-java/snakeyaml-1.30 does not provide module-info
 	sed -e '/snakeyaml;/d' -i src/moditect/module-info.java || die
 }
 
diff --git a/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.2.ebuild b/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.2.ebuild
index c444dc69b4f7..a324875e0e97 100644
--- a/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.2.ebuild
+++ b/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/FasterXML/jackson-dataformats-text/archive/jackson-d
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml