gentoo resync : 09.07.2022

3 files changed, 2 insertions, 73 deletions

diff --git a/dev-java/jackson-core/Manifest b/dev-java/jackson-core/Manifest
index 0bf7cd2ead9c..f7eb6f93e694 100644
--- a/dev-java/jackson-core/Manifest
+++ b/dev-java/jackson-core/Manifest
@@ -1,5 +1,3 @@
-DIST jackson-core-2.13.2.tar.gz 12267420 BLAKE2B 4acaef320fbd08bd3d3ae835eb4a96771b1f25aade7433e4c87beac0f6e365e641eea8c70ed7d3884159bd6990286b80891b57ac967ee292ee639cb2b56b66e1 SHA512 8e424ea255a6cd78c550300b0ff18d5e63945a3608dab2803211da2df5eb99fbd249779b2d051569b421c393e073d88a21b01c02a25b9647bcc8545f2d8cc1ee
 DIST jackson-core-2.13.3.tar.gz 12268319 BLAKE2B 8053988b060cd625670c643d9ba12d9ceae72dffa583bfc78e87044ac723c78bc44dfbdbaca0331098116a43b273dac844721a9e44ba1a536cc457f841d89b56 SHA512 9e7a9ec54073fa6faac36914c496df38bb6c201a37ade2b32306561b71e1b78a0ec4f48b006d4fb10cbde21979a16d117706b59338ada7aedcb593ba5c31ea52
-EBUILD jackson-core-2.13.2-r1.ebuild 2085 BLAKE2B 2b1f0ac60f7e5af2798d3964a0326dcaefb80afe44ffed6d821c71b8987464904af24f79d1a1295d16994bccd01a8ddfd60c8d1d556250704c25b0c4030237b5 SHA512 d2f77b838b807187845c92c5fc5ce0f72fb74cd7177b6dc75db8ce551187b7d8be74a86617c9fb0b9850ed6bf4110330a5ed2c0c1e0300b4575ba36aecf8df31
-EBUILD jackson-core-2.13.3.ebuild 2088 BLAKE2B e2d8f488ce8282c4fe96d8e895bcaf1340cac587eb4be35e6b5af9698802329191e454039e4ef85d61fd1b51cb8ed0746bde20321deb53c723b14cc7e3adc4e7 SHA512 49561fc9962129259afe03022024ded0dfc04193f8684f82fbe1fa1507b7f7c5334d74e4e7afebedcf9d352d9a1cc3882e7dbb66400f9cddd84fc3767cd7cfe3
+EBUILD jackson-core-2.13.3.ebuild 2086 BLAKE2B 1b69c3b0de10a0c8ca84f7a199a326ccfb2740d1e2e7ee454ac1168310623b26b9a70967ff7ea8390707f3402404b9d30044f4a1a75b07e3a09b3bd202404b89 SHA512 f793d30d514a016db0008fd4df7bf1cd02a27d2dc153906625f61a41c611f610b540126f64ef1858b547799f7740e8f43979188cdb086ae3edc07bf4d66b280b
 MISC metadata.xml 312 BLAKE2B b1beb51833c35e3ab2191a3c722768a34ec6cbf3ee240d67381b5137aabc0bb8be862f32638f35c1ba84a75498bb66303223c1d43b7d48c8bfe143ee837d6338 SHA512 b85d17092438f67523cf8c3c861de1183e061f55620342239bd662e5e90058f82fb501ba24bf2c1de6ebbe512ae4559d4b746a575261cbf2feb142e120118372
diff --git a/dev-java/jackson-core/jackson-core-2.13.2-r1.ebuild b/dev-java/jackson-core/jackson-core-2.13.2-r1.ebuild
deleted file mode 100644
index d93bfdb9fb35..000000000000
--- a/dev-java/jackson-core/jackson-core-2.13.2-r1.ebuild
+++ /dev/null
@@ -1,69 +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-core/archive/jackson-core-2.13.2.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-core-2.13.2.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.fasterxml.jackson.core:jackson-core:2.13.2"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Core Jackson processing abstractions (Streaming API), implementation for JSON"
-HOMEPAGE="https://github.com/FasterXML/jackson-core"
-SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-DEPEND=">=virtual/jdk-11:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-DOCS=( README.md release-notes/{CREDITS-2.x,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="junit-4"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-
-src_prepare() {
-	default
-
-	sed -e 's:@package@:com.fasterxml.jackson.core.json:g' \
-		-e "s:@projectversion@:${PV}:g" \
-		-e 's:@projectgroupid@:com.fasterxml.jackson.core:g' \
-		-e 's:@projectartifactid@:jackson-core:g' \
-		"${JAVA_SRC_DIR}/com/fasterxml/jackson/core/json/PackageVersion.java.in" \
-		> "${JAVA_SRC_DIR}/com/fasterxml/jackson/core/json/PackageVersion.java" || die
-
-	java-pkg-2_src_prepare
-}
-
-src_test() {
-	pushd src/test/java || die
-		local JAVA_TEST_RUN_ONLY=$(find * -name "*Test*.java" \
-			! -wholename "**/failing**/*.java" \
-			! -wholename "**/testsupport**/*.java" \
-			! -wholename "perf**/*.java" \
-			! -name "*TestBase.java" \
-			! -name "*BaseTest.java" \
-			)
-	popd
-
-	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
-	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
-	java-pkg-simple_src_test
-}
-
-src_install() {
-	default # https://bugs.gentoo.org/789582
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/jackson-core/jackson-core-2.13.3.ebuild b/dev-java/jackson-core/jackson-core-2.13.3.ebuild
index 657905868708..e25ceed85a1a 100644
--- a/dev-java/jackson-core/jackson-core-2.13.3.ebuild
+++ b/dev-java/jackson-core/jackson-core-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"
 
 DEPEND=">=virtual/jdk-11:*"
 RDEPEND=">=virtual/jre-1.8:*"