From 4cbcc855382a06088e2f016f62cafdbcb7e40665 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 20 Mar 2022 00:40:44 +0000 Subject: gentoo resync : 20.03.2022 --- dev-java/slf4j-api/Manifest | 6 +-- dev-java/slf4j-api/slf4j-api-1.7.30-r1.ebuild | 55 ------------------------ dev-java/slf4j-api/slf4j-api-1.7.32.ebuild | 4 +- dev-java/slf4j-api/slf4j-api-1.7.36.ebuild | 62 +++++++++++++++++++++++++++ 4 files changed, 67 insertions(+), 60 deletions(-) delete mode 100644 dev-java/slf4j-api/slf4j-api-1.7.30-r1.ebuild create mode 100644 dev-java/slf4j-api/slf4j-api-1.7.36.ebuild (limited to 'dev-java/slf4j-api') diff --git a/dev-java/slf4j-api/Manifest b/dev-java/slf4j-api/Manifest index 247c43622f1f..41bd57897343 100644 --- a/dev-java/slf4j-api/Manifest +++ b/dev-java/slf4j-api/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-api-1.7.30-r1.ebuild 1370 BLAKE2B 1f3f7b0777335c12c72a2b6cc7b2f86755350d973db339d269fe352317e70ad8b36d0024d08818c959d0f61f2df02ee11ce32c15e7f3818a9b4d972a33bc4d16 SHA512 c505fdcb9b95845e745ab22246728386872a19a26e2b4ba906a1542bc6ebbe50a0f038922494fcec06ed9f7fdc547ae21269fe7270e01830c9d73402a1a5b395 -EBUILD slf4j-api-1.7.32.ebuild 1471 BLAKE2B 955a2641968b81f58383aff9e9ff7337cf26b3845bef655cfaf2beed1a6f3d2ff07d8fcad79a479b717fc40bf6858c810e645a228138dc27a4fecff64b0ebd40 SHA512 9b15a88bd161b70ea887e1b4c080464cac4722a9abb0d59fd0cf0f18e58fa6cdb428e90b03b1e44cecb809d1a2f8bb70d821a9ebcd25237a79a7dc30377073b8 +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 MISC metadata.xml 367 BLAKE2B 086e22a444bd6a3dfab4f0a74e4900ed1f1a7be81b47932e192ebe4d6d1e8d65b63f064848e5cd3f0ad03a40c54e863d48acad905e09b918b9f24fe255820883 SHA512 d80fd3fc9ad1da46807f41251cf2a9bc384ef6566c24627482b4d7d5d3c46c672dcdd19037fd80a482079af86662fd07d35cb33b34c2e14911de7f3fc6b5e3a4 diff --git a/dev-java/slf4j-api/slf4j-api-1.7.30-r1.ebuild b/dev-java/slf4j-api/slf4j-api-1.7.30-r1.ebuild deleted file mode 100644 index 2acf963a0925..000000000000 --- a/dev-java/slf4j-api/slf4j-api-1.7.30-r1.ebuild +++ /dev/null @@ -1,55 +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-api/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-api-1.7.30.ebuild - -EAPI=7 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="org.slf4j:slf4j-api:1.7.30" -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}-sources.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" - -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" -} diff --git a/dev-java/slf4j-api/slf4j-api-1.7.32.ebuild b/dev-java/slf4j-api/slf4j-api-1.7.32.ebuild index 40f19bf19cb4..bf1ff2d20242 100644 --- a/dev-java/slf4j-api/slf4j-api-1.7.32.ebuild +++ b/dev-java/slf4j-api/slf4j-api-1.7.32.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/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" DEPEND=" >=virtual/jdk-1.8:* diff --git a/dev-java/slf4j-api/slf4j-api-1.7.36.ebuild b/dev-java/slf4j-api/slf4j-api-1.7.36.ebuild new file mode 100644 index 000000000000..7644bfeebf50 --- /dev/null +++ b/dev-java/slf4j-api/slf4j-api-1.7.36.ebuild @@ -0,0 +1,62 @@ +# 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 +} -- cgit v1.2.3