gentoo resync : 16.04.2022

3 files changed, 2 insertions, 66 deletions

diff --git a/dev-java/slf4j-api/Manifest b/dev-java/slf4j-api/Manifest
index 41bd57897343..383bf2e9190b 100644
--- a/dev-java/slf4j-api/Manifest
+++ b/dev-java/slf4j-api/Manifest
@@ -1,5 +1,3 @@
-DIST slf4j-1.7.32.tar.gz 2277207 BLAKE2B d16c93ddc4667700a868d872a58b64248c8594fafa37e05ed300a71061c58ec2b3f1e0036326ff42ebdd57d5df3576e8ec2d8ae6090439b5d8e6f1fa0c555332 SHA512 512c33cb812058a7419eb717e55ad9a0522e602339f088e7295bb0bfb3cf39972412a74479896c14e8c48124d8c2adc4c4d78735f4747b4fa9742ddac2ae07fa
 DIST slf4j-1.7.36.tar.gz 2276203 BLAKE2B 930de76047c694b4e566ba743ee90a2efb062358b03209137f686c4bf4ead122aa84c18b79615e5a67f1a890abdc1b8f70f62b7803f7b8e45c766ff8254836d4 SHA512 1384c771aa04d9d351854cf8ddeef66ee9f43df53890a05413c48c14cf1cb78a457bb4b2a6e2f064f1c1ab68b2eaa1d326fc03bb6b7c145915660a2c873692d0
-EBUILD slf4j-api-1.7.32.ebuild 1467 BLAKE2B 8cfde573d5913ad88f7cff6bcbb226673f23409cad31f95d9efe0623f7ab3b3bfa4b874aa3ebc73e2a574fd173a6bf6cf58cb4067d7d6aab444f972bafb6d7a3 SHA512 fbc3751468b574e01f974b682f3f0938161d144b0320ed28efcfb5356ea9e7218275d42bb3c29f4ffa84a6ed76d7399aa9b1277c36be2d470852b414f0dd924d
-EBUILD slf4j-api-1.7.36.ebuild 1451 BLAKE2B 3e1f960f76250d6d306ccb3011f9662cb2c7010fc500e34dbdb2be4abd5a99b69bf2aaebbcf499e80f7b830b2f4abdc46aabfe2bae8c1f2e98b5a428bd528c44 SHA512 3d6e6b4376ee020f65111532826dd9b8fd5b7853b533e39f780abcce1338feb95000dab61fcaf6669ee6ccfb618770fdb32184b313c1ecf93cdec14c93624967
+EBUILD slf4j-api-1.7.36.ebuild 1447 BLAKE2B 2c0aba11678aa3a33b53580825da11dc3d45e27771fce1c57342d40047fd264d3b23b66ac3b31c681e4800a385c1c7d51500be269057f00f39c5652987f6cd8a SHA512 2255a6b81d7359000ecae352d6c03e4b6bc178c9b865d42ed74946fc483312e7738d7851d951f6b3b4d5099a10dc9f4cff4dab42e1151ac5d2d5ab90bb0c1ad3
 MISC metadata.xml 367 BLAKE2B 086e22a444bd6a3dfab4f0a74e4900ed1f1a7be81b47932e192ebe4d6d1e8d65b63f064848e5cd3f0ad03a40c54e863d48acad905e09b918b9f24fe255820883 SHA512 d80fd3fc9ad1da46807f41251cf2a9bc384ef6566c24627482b4d7d5d3c46c672dcdd19037fd80a482079af86662fd07d35cb33b34c2e14911de7f3fc6b5e3a4
diff --git a/dev-java/slf4j-api/slf4j-api-1.7.32.ebuild b/dev-java/slf4j-api/slf4j-api-1.7.32.ebuild
deleted file mode 100644
index bf1ff2d20242..000000000000
--- a/dev-java/slf4j-api/slf4j-api-1.7.32.ebuild
+++ /dev/null
@@ -1,62 +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/qos-ch/slf4j/archive/refs/tags/v_1.7.32.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild slf4j-api-1.7.32.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.slf4j:slf4j-api:1.7.32"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="The slf4j API"
-HOMEPAGE="https://www.slf4j.org"
-SRC_URI="https://github.com/qos-ch/slf4j/archive/refs/tags/v_${PV}.tar.gz -> slf4j-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-"
-BDEPEND="app-arch/zip"
-
-DOCS=( LICENSE.txt ../README.md )
-
-S="${WORKDIR}/slf4j-v_${PV}/${PN}"
-
-JAVA_SRC_DIR="src/main/java"
-JAVA_RESOURCE_DIRS="src/main/resources"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="src/test/java"
-
-JAVA_TEST_EXCLUDES=(
-	# java.lang.InstantiationException - not run by upstream anyway
-	"org.slf4j.helpers.MultithreadedInitializationTest"
-)
-
-src_prepare() {
-	default
-	java-pkg_clean
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-
-	# remove org/slf4j/impl/ from the jar file
-	zip -d ${PN}.jar org/slf4j/impl/\* || die "Failed to remove impl files"
-}
-
-src_install() {
-	default # https://bugs.gentoo.org/789582
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/slf4j-api/slf4j-api-1.7.36.ebuild b/dev-java/slf4j-api/slf4j-api-1.7.36.ebuild
index 7644bfeebf50..06699464f97d 100644
--- a/dev-java/slf4j-api/slf4j-api-1.7.36.ebuild
+++ b/dev-java/slf4j-api/slf4j-api-1.7.36.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/qos-ch/slf4j/archive/v_${PV}.tar.gz -> slf4j-${PV}.t
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND="
 	>=virtual/jdk-1.8:*