4 files changed, 81 insertions, 78 deletions
diff --git a/dev-java/slf4j-simple/Manifest b/dev-java/slf4j-simple/Manifest
index 4ba1d3b6611d..9c0c5b0b0424 100644
--- a/dev-java/slf4j-simple/Manifest
+++ b/dev-java/slf4j-simple/Manifest
@@ -1,5 +1,5 @@
-DIST slf4j-1.7.30-sources.tar.gz 2272772 BLAKE2B c6692a20406983fa333bdb27bf8da599140d7d37fe55da6dfa2c2aff1825ee57c9d6b7bf0015e4b41b3c15ac0971559b3dd4bb5244e5393cd209ee26fac5e93d SHA512 4f05c996532560b16f22d78fcd47f8c4ba14691ce218a51ee6d50b283a51f8e40475a3a47f1117c1898a7be922e3f85806c4a7eb526759f0e7ea8426b5c6035f
 DIST slf4j-1.7.32.tar.gz 2277207 BLAKE2B d16c93ddc4667700a868d872a58b64248c8594fafa37e05ed300a71061c58ec2b3f1e0036326ff42ebdd57d5df3576e8ec2d8ae6090439b5d8e6f1fa0c555332 SHA512 512c33cb812058a7419eb717e55ad9a0522e602339f088e7295bb0bfb3cf39972412a74479896c14e8c48124d8c2adc4c4d78735f4747b4fa9742ddac2ae07fa
-EBUILD slf4j-simple-1.7.30-r1.ebuild 2034 BLAKE2B 148495626c3660c22e6b531a77a6284e9c9a5b27a2d34559ceb910221be7d79e7b6929cc5884eaa326f71162921ba02ce4118014b6905701a371ffe761e39e5c SHA512 4a7e43a61501da86e90830dcc298a21ff9e408238678dc9a85fc6c935853dee0f9303e2979346b4f9dee6755e92d2612ae385ae688ed9bb52823302ad5d6c269
-EBUILD slf4j-simple-1.7.32.ebuild 2074 BLAKE2B 958c5c3d66231934fbde4def1dbbef3853e1f7979905a26a1592d9aad3737ed58856dc1fc850547b73cb5c0d9615dd7919942eaec83e86c282dc4cfaf6773b9a SHA512 06bd156f6abce57ae27919ef4a62a6d87aff65b868bf18f204175b11482e57637428427e3e546d97cc51486f8b5a3e803a4e1ffa9f53cba8ead304cfe2b73cf5
+DIST slf4j-1.7.36.tar.gz 2276203 BLAKE2B 930de76047c694b4e566ba743ee90a2efb062358b03209137f686c4bf4ead122aa84c18b79615e5a67f1a890abdc1b8f70f62b7803f7b8e45c766ff8254836d4 SHA512 1384c771aa04d9d351854cf8ddeef66ee9f43df53890a05413c48c14cf1cb78a457bb4b2a6e2f064f1c1ab68b2eaa1d326fc03bb6b7c145915660a2c873692d0
+EBUILD slf4j-simple-1.7.32.ebuild 2070 BLAKE2B 667450fd16ceadd7db4f9e36554f6b04f6c9af3789c70d43a47dd854557c479f445c082403305a46aac48c68ea40af0851a538a2bcf934a2ce430803321d643b SHA512 a25934419b0a2d871540ee12d014affaf1d1bb470d0329b4bc88cbbc01f1d9f2c4a56277f7f1841b53d8a4c298f2d72af867058c81b8683bd8297ba4ec2e6d98
+EBUILD slf4j-simple-1.7.36.ebuild 1960 BLAKE2B 36fa684f82aa54402087b117f10576bbacf8344cd3fef736fef68d7aa19820afd86842b524923b1917cc08a7af321b4ee98f5b89b57336fa83daf7646f233aab SHA512 5c447b402760cf02c93d8f7db41a4dd6ccab015fdfb896341de27ef95adc6f3a008c6b5c79d2e935f521f7e31d465818554976a108e3e5ef5c6a85a32cee36e9
 MISC metadata.xml 367 BLAKE2B 086e22a444bd6a3dfab4f0a74e4900ed1f1a7be81b47932e192ebe4d6d1e8d65b63f064848e5cd3f0ad03a40c54e863d48acad905e09b918b9f24fe255820883 SHA512 d80fd3fc9ad1da46807f41251cf2a9bc384ef6566c24627482b4d7d5d3c46c672dcdd19037fd80a482079af86662fd07d35cb33b34c2e14911de7f3fc6b5e3a4
diff --git a/dev-java/slf4j-simple/slf4j-simple-1.7.30-r1.ebuild b/dev-java/slf4j-simple/slf4j-simple-1.7.30-r1.ebuild
deleted file mode 100644
index 1cea0263a4b9..000000000000
--- a/dev-java/slf4j-simple/slf4j-simple-1.7.30-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom slf4j-v_1.7.30/slf4j-simple/pom.xml --download-uri https://github.com/qos-ch/slf4j/archive/refs/tags/v_1.7.30.tar.gz --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild slf4j-simple-1.7.30.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.slf4j:slf4j-simple:1.7.30"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="SLF4J Simple binding"
-HOMEPAGE="https://www.slf4j.org"
-SRC_URI="https://github.com/qos-ch/slf4j/archive/refs/tags/v_${PV}.tar.gz -> slf4j-${PV}-sources.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# Common dependencies
-# POM: slf4j-v_${PV}/${PN}/pom.xml
-# org.slf4j:slf4j-api:1.7.30 -> >=dev-java/slf4j-api-1.7.30:0
-
-CDEPEND="
-	>=dev-java/slf4j-api-1.7.30:0
-"
-
-# Compile dependencies
-# POM: slf4j-v_${PV}/${PN}/pom.xml
-# test? junit:junit:4.12 -> >=dev-java/junit-4.12:4
-# test? org.slf4j:slf4j-api:1.7.30 -> >=dev-java/slf4j-api-1.7.30:0
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	${CDEPEND}
-	test? (
-		>=dev-java/slf4j-api-1.7.30:0
-	)
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CDEPEND}
-"
-
-S="${WORKDIR}/slf4j-v_${PV}/${PN}"
-
-JAVA_GENTOO_CLASSPATH="slf4j-api"
-JAVA_SRC_DIR="src/main/java"
-JAVA_RESOURCE_DIRS="src/main/resources"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4,slf4j-api"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-
-JAVA_TEST_EXCLUDES=(
-	# java.lang.InstantiationException
-	"org.slf4j.helpers.MultithreadedInitializationTest"
-
-	# java.lang.AssertionError: 1284 < 1263+16
-	"org.slf4j.helpers.SimpleLoggerMultithreadedInitializationTest"
-)
-
-src_prepare() {
-	default
-	java-pkg_clean
-	cp "../slf4j-api/src/test/java/org/slf4j/helpers/MultithreadedInitializationTest.java" \
-		"${JAVA_TEST_SRC_DIR}/org/slf4j/helpers/" || die
-	cp "../slf4j-api/src/test/java/org/slf4j/LoggerAccessingThread.java" \
-		"${JAVA_TEST_SRC_DIR}/org/slf4j/" || die
-}
diff --git a/dev-java/slf4j-simple/slf4j-simple-1.7.32.ebuild b/dev-java/slf4j-simple/slf4j-simple-1.7.32.ebuild
index c0eeacfedb10..a98ef1a0d287 100644
--- a/dev-java/slf4j-simple/slf4j-simple-1.7.32.ebuild
+++ b/dev-java/slf4j-simple/slf4j-simple-1.7.32.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/qos-ch/slf4j/archive/refs/tags/v_${PV}.tar.gz -> slf
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/slf4j-simple/slf4j-simple-1.7.36.ebuild b/dev-java/slf4j-simple/slf4j-simple-1.7.36.ebuild
new file mode 100644
index 000000000000..03237365c3cc
--- /dev/null
+++ b/dev-java/slf4j-simple/slf4j-simple-1.7.36.ebuild
@@ -0,0 +1,77 @@
+# 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-simple-1.7.36.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.slf4j:slf4j-simple:1.7.36"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="SLF4J Simple binding"
+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"
+
+# Common dependencies
+# POM: pom.xml
+# org.slf4j:slf4j-api:1.7.36 -> >=dev-java/slf4j-api-1.7.36:0
+
+CP_DEPEND="
+	~dev-java/slf4j-api-${PV}:0
+"
+
+# Compile dependencies
+# POM: pom.xml
+# test? junit:junit:4.13 -> >=dev-java/junit-4.13.2:4
+# test? org.slf4j:slf4j-api:1.7.36 -> >=dev-java/slf4j-api-1.7.36:0
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CP_DEPEND}
+	test? (
+		~dev-java/slf4j-api-${PV}:0
+	)
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}"
+
+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,slf4j-api"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+JAVA_TEST_EXCLUDES=(
+	# java.lang.InstantiationException
+	"org.slf4j.helpers.MultithreadedInitializationTest"
+
+	# java.lang.AssertionError: 1284 < 1263+16
+	"org.slf4j.helpers.SimpleLoggerMultithreadedInitializationTest"
+)
+
+src_prepare() {
+	default
+	java-pkg_clean
+	cp {../slf4j-api/,}src/test/java/org/slf4j/helpers/MultithreadedInitializationTest.java || die
+	cp {../slf4j-api/,}src/test/java/org/slf4j/LoggerAccessingThread.java  || die
+}
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}