gentoo resync : 20.03.2022

4 files changed, 62 insertions, 62 deletions

diff --git a/dev-java/slf4j-nop/Manifest b/dev-java/slf4j-nop/Manifest
index f309d4675ef0..5d5c3f99eaaf 100644
--- a/dev-java/slf4j-nop/Manifest
+++ b/dev-java/slf4j-nop/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-nop-1.7.30.ebuild 1437 BLAKE2B 653e4cf4692273839bef1fd7660d7e34250f3425ecaf710ecfc479f52df8b8b3cc360af22ca5551ebbf4f7a291135b224791fa0c19b35372cb8308d4bab81c93 SHA512 ae23fec76971365baf682fcef61c508e5cc29f1887e56d3fe5c49dd46debc29fb462bf24caaaf2ff2d4c1a39c6e794f07d70571522087126bf9b3d91dc535ff5
-EBUILD slf4j-nop-1.7.32.ebuild 1300 BLAKE2B bc3efc15a5ad22c8641f65f1aaef45201e424687deeb1710804f2ff4e0ba038acf4a3117dea4191402a47014bd7e906d2f6845747f46502f900c2daf7cba3919 SHA512 2ec7a8c5a9004995006f4d66f0125c90fea9b94382fe401acc5738db5714c0dcb519ac735c294bfb6e46f0883a8e0b15789be3f6554634a9f55863d81c935a7a
+DIST slf4j-1.7.36.tar.gz 2276203 BLAKE2B 930de76047c694b4e566ba743ee90a2efb062358b03209137f686c4bf4ead122aa84c18b79615e5a67f1a890abdc1b8f70f62b7803f7b8e45c766ff8254836d4 SHA512 1384c771aa04d9d351854cf8ddeef66ee9f43df53890a05413c48c14cf1cb78a457bb4b2a6e2f064f1c1ab68b2eaa1d326fc03bb6b7c145915660a2c873692d0
+EBUILD slf4j-nop-1.7.32.ebuild 1301 BLAKE2B 9924a22bb70803bc12abecd59a408cd17b1c0792a025bbf09b0ec2053ad3fe6536e8d880d4001c9a17d17f5e901a48594a3a5a6d2f790a8f1a57279255d119a0 SHA512 421482239d512d1cb830ffbb3a6c3001c7ad8a2a10062950bdee585b2488d8b8b60c2a76f8bdd1a570c463ad3787fd024f775e74a8e7bf460587a14054e1018f
+EBUILD slf4j-nop-1.7.36.ebuild 1290 BLAKE2B e4b8b9deeecfe0e40495d98809ab65bae779ee3dc2e2373ab780a9dbb2a61630ce17234665e14dda9e0ad09d6b8ae0ea384d4f04ed10d13bc44555fe07d6a588 SHA512 7a7edbb2e786d9479d1f393da17c5aba55c0466f93e49a285c3564a261cea3cf6eac067eb0056f6f7889d3f86445f18982f403e5fea67eaee50082fafaa0f94c
 MISC metadata.xml 243 BLAKE2B d1937cd00ce74d225075f1cf0e2584ce3f3d04b4ab3bd4ce636326ef8ed6ccaa54535a1c126025464e48a272959a579e08ceb008b8bacb2160f8f623fea5b6b3 SHA512 5431123c80f2e11811efde927819546af19c9ca93c9810399fe784c77ad2201696a081ed146df5b59fbf78ffb39cf8633cd6805e16ca82244aa8458c2ab8c4fd
diff --git a/dev-java/slf4j-nop/slf4j-nop-1.7.30.ebuild b/dev-java/slf4j-nop/slf4j-nop-1.7.30.ebuild
deleted file mode 100644
index d20cb0d8c7b6..000000000000
--- a/dev-java/slf4j-nop/slf4j-nop-1.7.30.ebuild
+++ /dev/null
@@ -1,58 +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 slf4j-v_1.7.30/slf4j-nop/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-nop-1.7.30.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.slf4j:slf4j-nop:1.7.30"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="SLF4J NOP 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
-"
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	${CDEPEND}
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CDEPEND}"
-
-S="${WORKDIR}"
-
-JAVA_GENTOO_CLASSPATH="slf4j-api"
-JAVA_SRC_DIR="slf4j-v_${PV}/${PN}/src/main/java"
-JAVA_RESOURCE_DIRS=(
-	"slf4j-v_${PV}/${PN}/src/main/resources"
-)
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="slf4j-v_${PV}/${PN}/src/test/java"
-JAVA_TEST_EXCLUDES=(
-	# java.lang.AssertionError: expected:<0> but was:<5>
-	"org.slf4j.impl.MultithreadedInitializationTest"
-)
-
-src_prepare() {
-	default
-	java-pkg_clean
-}
diff --git a/dev-java/slf4j-nop/slf4j-nop-1.7.32.ebuild b/dev-java/slf4j-nop/slf4j-nop-1.7.32.ebuild
index e480511feede..db043c55fe30 100644
--- a/dev-java/slf4j-nop/slf4j-nop-1.7.32.ebuild
+++ b/dev-java/slf4j-nop/slf4j-nop-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 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/slf4j-nop/slf4j-nop-1.7.36.ebuild b/dev-java/slf4j-nop/slf4j-nop-1.7.36.ebuild
new file mode 100644
index 000000000000..2a1d4df2e424
--- /dev/null
+++ b/dev-java/slf4j-nop/slf4j-nop-1.7.36.ebuild
@@ -0,0 +1,58 @@
+# 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 ~arm64 ~ppc64 ~x86" --ebuild slf4j-nop-1.7.36.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.slf4j:slf4j-nop:1.7.36"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="SLF4J NOP 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
+"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CP_DEPEND}
+"
+
+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"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_prepare() {
+	default
+	java-pkg_clean
+}
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}