gentoo resync : 20.03.2022

3 files changed, 3 insertions, 52 deletions

diff --git a/dev-java/jackson-annotations/Manifest b/dev-java/jackson-annotations/Manifest
index f3bff0170201..8aaadf739044 100644
--- a/dev-java/jackson-annotations/Manifest
+++ b/dev-java/jackson-annotations/Manifest
@@ -1,5 +1,3 @@
 DIST jackson-annotations-2.13.0.tar.gz 1819614 BLAKE2B edb0a0e7586033a61722fda22bbb13f1ed119bd6af63931572396a4ee3f19f66fb20d750742b53d68a4159d11863b612d8e802b42b0359d90700dc6c03c8793e SHA512 e24fd9dfd6b7e3a7ee37cd41c30a073ec9b2d64dacfa47f7418643615b0ed145f8b1ac3e889b0f411412b74661b36ed352d89a62edebc8f2e07aeeed5d283c2f
-DIST jackson-annotations-2.9.10.tar.gz 57322 BLAKE2B 85e3ac040e3adc986fa7b2a1892bb536ff2b46415af9390a6ec4e59bc9770b2bced4fd80edffc7b2083853b0b1bb5022dde137fda7e9920ec27e3fa54858e5fc SHA512 27c28e9453570aab4758031d406bfc8b8ba0eb443dcd0a884d6098840e5b577b2628288daf10e9de6ce5d1e4da2f4b8e4ec36a6559233e012725a906c4da21b9
-EBUILD jackson-annotations-2.13.0.ebuild 1435 BLAKE2B 5410d036b1abc6470deff38a922d4fb93692e9bde7901282cc81a362fb38f96844c68f9d19d354e6545324335de8525736e748cf313fd2b5d82366a1a9214d1a SHA512 1ce5ef124e378286e1a8f73c05766dcc2eca6221dc8d0e0b335152fba11aaf6d3459f854a0f72b405589e5fefe960880d2bfdcbb8110655250a55556fe30bc69
-EBUILD jackson-annotations-2.9.10.ebuild 1063 BLAKE2B de11416bbf9be0341af53dcf611353c2b51ee5ac73ce7549ab5ab28e6e17385028bc4fcc617e7f9c5dc24d22edf8a984f275fd65131d24ddd610231ab6a48c7a SHA512 05165dd349526129b1619d4f54bf1641b68a9573a2978161e1ee99fc49462616d7d06b1d5c25f58fcd59c3e93868ab6969f2c63b7e5107c0f10b3f286e44b50e
+EBUILD jackson-annotations-2.13.0.ebuild 1431 BLAKE2B 2274e9b3b19c510f1b4a0187b5453ce8eb00558cc8196ac71de6336218558b0e778ba96a042b7aff0fe4736efffd93b7252f799aede9af53e89bd3a4d6ccdcfd SHA512 a487c150a3c9df585feba859a2b8aa536fbeb811ae3493807859ffa8269a44e50ce3c5cef45b2e592b857a3c04607516e17229d242cd119582b878be3c5453ad
 MISC metadata.xml 341 BLAKE2B 1a6bf9fc13afb0c6d95cb0752f40474fff4135031e2771f3c0555cd7961e23ea7c026d6cf905acb505ceb2aa4fad01ea5dfac310004b51828b1383dd9a44f9bb SHA512 51655fad0847b2bbc92ed31310c155f26edf6dc41da35cbe239c99eea205a054f6bf7a7839201b8f8fb397110b50935d7c069f3baa7650970580a0c9ef156f12
diff --git a/dev-java/jackson-annotations/jackson-annotations-2.13.0.ebuild b/dev-java/jackson-annotations/jackson-annotations-2.13.0.ebuild
index 91338cc24cc9..04d11cb62cce 100644
--- a/dev-java/jackson-annotations/jackson-annotations-2.13.0.ebuild
+++ b/dev-java/jackson-annotations/jackson-annotations-2.13.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Skeleton command:
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/FasterXML/${PN}/archive/refs/tags/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/jackson-annotations/jackson-annotations-2.9.10.ebuild b/dev-java/jackson-annotations/jackson-annotations-2.9.10.ebuild
deleted file mode 100644
index 5f6b0bc2fef8..000000000000
--- a/dev-java/jackson-annotations/jackson-annotations-2.9.10.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Annotations for the Java Jackson data processor"
-HOMEPAGE="https://github.com/FasterXML/jackson-annotations"
-SRC_URI="https://github.com/FasterXML/${PN}/archive/${PN}-${PV}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=virtual/jre-1.7"
-
-DEPEND=">=virtual/jdk-1.7
-	test? ( dev-java/junit:4 )"
-
-S="${WORKDIR}/${PN}-${P}"
-JAVA_SRC_DIR="src/main/java"
-
-src_install() {
-	java-pkg-simple_src_install
-	dodoc README.md release-notes/VERSION
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-	java-pkg_addres ${PN}.jar src/main/resources
-}
-
-src_test() {
-	cd src/test/java || die
-
-	local CP=".:${S}/${PN}.jar:$(java-pkg_getjars junit-4)"
-	local TESTS=$(find * -name "*Test.java")
-	TESTS="${TESTS//.java}"
-	TESTS="${TESTS//\//.}"
-
-	ejavac -cp "${CP}" -d . $(find * -name "*.java")
-	ejunit4 -classpath "${CP}" ${TESTS}
-}