gentoo auto-resync : 02:12:2022 - 20:57:16

3 files changed, 2 insertions, 65 deletions

diff --git a/dev-java/slf4j-api/Manifest b/dev-java/slf4j-api/Manifest
index 098b0c073923..760d54107f63 100644
--- a/dev-java/slf4j-api/Manifest
+++ b/dev-java/slf4j-api/Manifest
@@ -1,6 +1,5 @@
 DIST slf4j-1.7.36.tar.gz 2276203 BLAKE2B 930de76047c694b4e566ba743ee90a2efb062358b03209137f686c4bf4ead122aa84c18b79615e5a67f1a890abdc1b8f70f62b7803f7b8e45c766ff8254836d4 SHA512 1384c771aa04d9d351854cf8ddeef66ee9f43df53890a05413c48c14cf1cb78a457bb4b2a6e2f064f1c1ab68b2eaa1d326fc03bb6b7c145915660a2c873692d0
 DIST slf4j-2.0.3.tar.gz 1435478 BLAKE2B fec1a47882d3bbf508f4faed9cbf9448a23e9749c6c41f241c7e80654e0ce55211cec9228fcf0e666c997a4f24c5b96ad57dc076910e7f05704b02d0cf7db709 SHA512 0fb295f7942c2af8aebe2ecf544ef8326b8cc88de397ee6b37a10249b38150a506f62dcec614eee13519a299b30c6d2481dec3ea235d4b3e6a5241d12639bca6
 EBUILD slf4j-api-1.7.36-r1.ebuild 1447 BLAKE2B c98a974f8b80dd9c1f202c3ccfc4be9186fdc67f62ff5410e28f4752e208875682ec25a5d9f7b81c3dcf0456b7833df2f17477173f0acb02ccdf817c4d305a73 SHA512 31546f48158c501ae3acb3a6fdad166d0e585ba2dfb493cb16a50e1060e062ab863570d1f9faab7b6dcfb3ff83f0789a70b79be378b4706e65eb31bba1468dd2
-EBUILD slf4j-api-1.7.36.ebuild 1447 BLAKE2B 2c0aba11678aa3a33b53580825da11dc3d45e27771fce1c57342d40047fd264d3b23b66ac3b31c681e4800a385c1c7d51500be269057f00f39c5652987f6cd8a SHA512 2255a6b81d7359000ecae352d6c03e4b6bc178c9b865d42ed74946fc483312e7738d7851d951f6b3b4d5099a10dc9f4cff4dab42e1151ac5d2d5ab90bb0c1ad3
-EBUILD slf4j-api-2.0.3.ebuild 1144 BLAKE2B 7aa6df6010d21d816e5b2550cbaad743aa441bb2ff84f21dd5da2678ae0e0909c5a11785304c0f5638d1c6ffe7fbd41c91952552129808f4f4dd7a091a83feb6 SHA512 c2ba9064ac2e1b1ad57ee7ddf3ae62c0e94c4dd9045562e4ea4b3f7fceccdc7b298196e5187775daf9533b583f864b53acc2be7d1966a2ba0bcad9001a8d137f
+EBUILD slf4j-api-2.0.3.ebuild 1143 BLAKE2B 9efb53125e882873ecc2b8dd6c02082ed43705b47ad436616416ae205ca93ed278e87de8c67aa8d922789cf2c2158859e02103a6a588d939d7a8aa37bd196402 SHA512 fa52b1b7337b7b8bb8afeb65a80dd6db3c78f9e565f4d1b455b3de5feffa26c9317ba4c5bca1f34c0254cbb22aac3a2caf974f1c1f6fb7e8b50cff41a4c553f1
 MISC metadata.xml 369 BLAKE2B 9192191ce858eb2aae3d3600cf8214bcff21f386895b1a554c688d2e0e5d2632daec9e853afee31383819df09915f29bd6a5458aa888672c77a2c683258d1b94 SHA512 80db3e0ebb417b64355f1d8c72de25dceda46fe80d5614e255b6e59c0d5751207e9ade961dbe1f065e3cf162ca402e67d2b8ce597e0a4253a7eedfc27d35ae00
diff --git a/dev-java/slf4j-api/slf4j-api-1.7.36.ebuild b/dev-java/slf4j-api/slf4j-api-1.7.36.ebuild
deleted file mode 100644
index 06699464f97d..000000000000
--- a/dev-java/slf4j-api/slf4j-api-1.7.36.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/v_1.7.36.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild slf4j-api-1.7.36.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.slf4j:slf4j-api:1.7.36"
-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/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-2.0.3.ebuild b/dev-java/slf4j-api/slf4j-api-2.0.3.ebuild
index c3c40616757b..db91290c8a95 100644
--- a/dev-java/slf4j-api/slf4j-api-2.0.3.ebuild
+++ b/dev-java/slf4j-api/slf4j-api-2.0.3.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-11:*"
 RDEPEND=">=virtual/jre-1.8:*"