gentoo resync : 09.07.2022

3 files changed, 2 insertions, 83 deletions

diff --git a/dev-java/jackson-dataformat-yaml/Manifest b/dev-java/jackson-dataformat-yaml/Manifest
index aca94d91f3f2..379d33ddfbfb 100644
--- a/dev-java/jackson-dataformat-yaml/Manifest
+++ b/dev-java/jackson-dataformat-yaml/Manifest
@@ -1,5 +1,3 @@
-DIST jackson-dataformats-text-2.13.2.tar.gz 3528945 BLAKE2B 5dc38706b714121478e82b2f4bc0b3831fa84708b708c08c20d4744c4fc7130149d8dace5c20437514ce9431b1c39183f4d283717f4ad5876fac3651c53ea096 SHA512 1101aabc4b3b652ff90c23186fada6391db9cb4cb5ec6ba9ff78cd91b73ef3b632f38027e192d739d8e47f7ed2726ac03d8c3a1d20d416dfaac3b50ca11abb67
 DIST jackson-dataformats-text-2.13.3.tar.gz 3528981 BLAKE2B 98593f45e663905c15ab5cb37152c95d69a0121515990fac0c66f640d93af83cd51802e2856a4e8df6b82c0121ac4fcd20774fd6a3841e019e1da56c599ed9a9 SHA512 77fad3e6ab5ad55d3a46ffaee3482e9f0dbfa36ce67d5ad31e0b7cde667536387f1dce5bc8296733a28efb09f423785aca7291d9ba85a67ca2b94ef4c8766d7f
-EBUILD jackson-dataformat-yaml-2.13.2-r1.ebuild 2664 BLAKE2B e7e368a3c5b1cb4b73860121127c57b4f21eee4341de035df8cfa72df952724701958609438439cf464b80d343a0b98383a25a4a6661c684d2402aff6725b420 SHA512 719b514aaa346e42ef0c3833e975025ce5dbb6887a6aa5b031471803d2d68306d5de6972677fe014f0dc2b570738329a1d6bd6904216c5dfece650186cf4ae01
-EBUILD jackson-dataformat-yaml-2.13.3.ebuild 2664 BLAKE2B d3e04f13a436fe73566bc431e47cf40f7bbef077c41a7f6f5475ccd34fc941d42058df1d687283b9ea982f0c32956043465f73e40f9c4fba65eac22a05859aee SHA512 b6df3010b1c2829076e45042509b6216b6b7bfdd6147d49d9a5acf74b558266cdb98cba8eeadbabba936fda57f8096b4c53625d89381d8a135cb600e273b9b54
+EBUILD jackson-dataformat-yaml-2.13.3.ebuild 2662 BLAKE2B 377c33938b5dbb8cefdeb46b5d3bd609cce89cf2e5a140a11087f941085ad97ded9436c7ba30e1680c3edccc79bff51e95e29d71ca664a470e4b8c9bfb8ed0a8 SHA512 f5c29bad8fc54a83f43baee06627b3259d3d0fdcadd1d3a6eebf56cb4905e4e9e1510e853d4c60e3772aaeeffdc5009cf181aad69def21dc7d6d5a4c810e990a
 MISC metadata.xml 398 BLAKE2B 35f92ae137b3d4f6528c3987d1f9a4e8a1492688a687b4fb133b9ac5c02e6dcbde37807569463d8eebf26c078f55199e5848efcd6e11104599e5895044b61d8d SHA512 621d9b0635a22bed22305b4a7724e96beefdb57ff6b2553612f3e4feeeef080d02bc48dd0fcf3cbb3a2f4723c89bf8824f18adff1501fd3876c73e4e85fa20f1
diff --git a/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.2-r1.ebuild b/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.2-r1.ebuild
deleted file mode 100644
index 9c11a644ec61..000000000000
--- a/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.2-r1.ebuild
+++ /dev/null
@@ -1,79 +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-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.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/jackson-dataformats-text-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# Common dependencies
-# POM: pom.xml
-# 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-${PV}:0
-	~dev-java/jackson-databind-${PV}.2:0
-	dev-java/snakeyaml:0
-"
-
-DEPEND="
-	>=virtual/jdk-11:*
-	${CP_DEPEND}
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CP_DEPEND}"
-
-DOCS=( README.md release-notes/{CREDITS,VERSION} )
-
-S="${WORKDIR}/jackson-dataformats-text-jackson-dataformats-text-${PV}/yaml"
-
-JAVA_SRC_DIR=( "src/main/java" "src/moditect" )
-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"
-JAVA_TEST_EXCLUDES=(
-	# 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
-)
-
-src_prepare() {
-	default
-	java-pkg-2_src_prepare
-
-	sed -e 's:@package@:com.fasterxml.jackson.dataformat.yaml: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/yaml/PackageVersion.java.in" \
-		> "${JAVA_SRC_DIR}/com/fasterxml/jackson/dataformat/yaml/PackageVersion.java" || die
-
-	# dev-java/snakeyaml-1.30 does not provide module-info
-	sed -e '/snakeyaml;/d' -i src/moditect/module-info.java || die
-}
-
-src_install() {
-	default # https://bugs.gentoo.org/789582
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.3.ebuild b/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.3.ebuild
index 5e75be3da4be..8dd76fc9caca 100644
--- a/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.3.ebuild
+++ b/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.3.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