diff options
Diffstat (limited to 'dev-java')
27 files changed, 18 insertions, 366 deletions
diff --git a/dev-java/commons-compress/Manifest b/dev-java/commons-compress/Manifest index b829aa5af451..e433074b748e 100644 --- a/dev-java/commons-compress/Manifest +++ b/dev-java/commons-compress/Manifest @@ -1,2 +1 @@ -DIST commons-compress-1.21-sources.tar.gz 15165800 BLAKE2B 3fed32af039860c6b434c485f0c78939ed810a224a12680ddf1d9d6ed540f4e74530edd0e0077fd41af31404c296a607db912465cfd725c31446bc6fa7b8df8a SHA512 8041371b491057435ca62390e70b30031e4d21e80c37d9cb922fdffa794b56aee3b5d60d8241e4db0cecc28c82dfdaafbe52b2175e26062da169fec8efbb17e1 DIST commons-compress-1.21-src.tar.gz 15165800 BLAKE2B 3fed32af039860c6b434c485f0c78939ed810a224a12680ddf1d9d6ed540f4e74530edd0e0077fd41af31404c296a607db912465cfd725c31446bc6fa7b8df8a SHA512 8041371b491057435ca62390e70b30031e4d21e80c37d9cb922fdffa794b56aee3b5d60d8241e4db0cecc28c82dfdaafbe52b2175e26062da169fec8efbb17e1 diff --git a/dev-java/commons-compress/commons-compress-1.21-r1.ebuild b/dev-java/commons-compress/commons-compress-1.21-r1.ebuild index aa3811672d98..40cf830dd60a 100644 --- a/dev-java/commons-compress/commons-compress-1.21-r1.ebuild +++ b/dev-java/commons-compress/commons-compress-1.21-r1.ebuild @@ -18,7 +18,7 @@ SRC_URI="mirror://apache/commons/compress/source/${P}-src.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" # Common dependencies # POM: pom.xml diff --git a/dev-java/commons-compress/commons-compress-1.21.ebuild b/dev-java/commons-compress/commons-compress-1.21.ebuild deleted file mode 100644 index c011b4bda384..000000000000 --- a/dev-java/commons-compress/commons-compress-1.21.ebuild +++ /dev/null @@ -1,73 +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 pom.xml --download-uri https://apache.miloslavbrada.cz//commons/compress/source/commons-compress-1.21-src.tar.gz --slot 0 --keywords "~amd64 ~arm64 ~x86" --ebuild commons-compress-1.21.ebuild - -EAPI=7 - -JAVA_PKG_IUSE="doc source" -MAVEN_ID="org.apache.commons:commons-compress:1.21" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="Java API for working with archive files" -HOMEPAGE="https://commons.apache.org/proper/commons-compress/" -SRC_URI="mirror://apache/commons/compress/source/${P}-src.tar.gz -> ${P}-sources.tar.gz" -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" - -# Common dependencies -# POM: pom.xml -# asm:asm:3.2 -> !!!groupId-not-found!!! -# com.github.luben:zstd-jni:1.5.0-2 -> >=dev-java/zstd-jni-1.5.0.4:0 -# org.brotli:dec:0.1.2 -> >=dev-java/brotli-dec-0.1.2:0 -# org.tukaani:xz:1.9 -> >=dev-java/xz-java-1.9:0 - -CDEPEND=" - dev-java/asm:9 - >=dev-java/brotli-dec-0.1.2:0 - >=dev-java/xz-java-1.9:0 - >=dev-java/zstd-jni-1.5.0.4:0 -" - -# Compile dependencies -# POM: pom.xml -# org.osgi:org.osgi.core:6.0.0 -> !!!artifactId-not-found!!! -# POM: pom.xml -# test? com.github.marschall:memoryfilesystem:2.1.0 -> !!!groupId-not-found!!! -# test? javax.inject:javax.inject:1 -> !!!groupId-not-found!!! -# test? junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4 -# test? org.apache.felix:org.apache.felix.framework:7.0.0 -> !!!groupId-not-found!!! -# test? org.hamcrest:hamcrest:2.2 -> !!!artifactId-not-found!!! -# test? org.mockito:mockito-core:3.11.1 -> !!!suitable-mavenVersion-not-found!!! -# test? org.ops4j.pax.exam:pax-exam-cm:4.13.1 -> !!!groupId-not-found!!! -# test? org.ops4j.pax.exam:pax-exam-container-native:4.13.1 -> !!!groupId-not-found!!! -# test? org.ops4j.pax.exam:pax-exam-junit4:4.13.1 -> !!!groupId-not-found!!! -# test? org.ops4j.pax.exam:pax-exam-link-mvn:4.13.1 -> !!!groupId-not-found!!! -# test? org.slf4j:slf4j-api:1.7.30 -> >=dev-java/slf4j-api-1.7.30:0 - -DEPEND=" - >=virtual/jdk-1.8:* - ${CDEPEND} -" - -RDEPEND=" - >=virtual/jre-1.8:* - ${CDEPEND}" - -S="${WORKDIR}/${P}-src" - -PATCHES=( - "${FILESDIR}/${P}-asm7+.patch" -) - -JAVA_ENCODING="iso-8859-1" - -JAVA_GENTOO_CLASSPATH="asm-9,zstd-jni,brotli-dec,xz-java" -JAVA_SRC_DIR="src/main/java" - -src_prepare() { - default -} diff --git a/dev-java/easymock/easymock-2.5.2.ebuild b/dev-java/easymock/easymock-2.5.2.ebuild index cbc09bfd69ea..30cfb883f7a9 100644 --- a/dev-java/easymock/easymock-2.5.2.ebuild +++ b/dev-java/easymock/easymock-2.5.2.ebuild @@ -18,7 +18,7 @@ SRC_URI="https://github.com/easymock/easymock/archive/${P}.tar.gz" LICENSE="Apache-2.0" SLOT="2.5" -KEYWORDS="amd64 ~arm arm64 ppc64" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" DEPEND=">=virtual/jdk-1.8:*" RDEPEND=">=virtual/jre-1.8:*" diff --git a/dev-java/felix-framework/felix-framework-7.0.5.ebuild b/dev-java/felix-framework/felix-framework-7.0.5.ebuild index f0ae43bbeb99..df163b2381bb 100644 --- a/dev-java/felix-framework/felix-framework-7.0.5.ebuild +++ b/dev-java/felix-framework/felix-framework-7.0.5.ebuild @@ -18,7 +18,7 @@ SRC_URI="mirror://apache/felix/org.apache.${PN//-/.}-${PV}-source-release.tar.gz LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" # Common dependencies # POM: pom.xml diff --git a/dev-java/felix-main/felix-main-7.0.5-r1.ebuild b/dev-java/felix-main/felix-main-7.0.5-r1.ebuild index ca1c21d824a8..bdd2226d3731 100644 --- a/dev-java/felix-main/felix-main-7.0.5-r1.ebuild +++ b/dev-java/felix-main/felix-main-7.0.5-r1.ebuild @@ -17,7 +17,7 @@ SRC_URI="mirror://apache/felix/org.apache.${PN//-/.}-${PV}-source-release.tar.gz LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64" +KEYWORDS="~amd64 ~arm arm64 ppc64" # Common dependencies # POM: pom.xml diff --git a/dev-java/felix-resolver/felix-resolver-2.0.4.ebuild b/dev-java/felix-resolver/felix-resolver-2.0.4.ebuild index ef879a1a1645..e70076614ec8 100644 --- a/dev-java/felix-resolver/felix-resolver-2.0.4.ebuild +++ b/dev-java/felix-resolver/felix-resolver-2.0.4.ebuild @@ -18,7 +18,7 @@ SRC_URI="mirror://apache/felix/org.apache.${PN//-/.}-${PV}-source-release.tar.gz LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" # Common dependencies # POM: pom.xml diff --git a/dev-java/felix-utils/felix-utils-1.11.8.ebuild b/dev-java/felix-utils/felix-utils-1.11.8.ebuild index 6dae3adfc641..9c7ef0ca3fcd 100644 --- a/dev-java/felix-utils/felix-utils-1.11.8.ebuild +++ b/dev-java/felix-utils/felix-utils-1.11.8.ebuild @@ -18,7 +18,7 @@ SRC_URI="mirror://apache/felix/org.apache.felix.utils-${PV}-source-release.tar.g LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" # Compile dependencies # POM: pom.xml diff --git a/dev-java/greenmail/greenmail-2.0.0_alpha2.ebuild b/dev-java/greenmail/greenmail-2.0.0_alpha2.ebuild index 633fb4a1b397..cf19ce7e617a 100644 --- a/dev-java/greenmail/greenmail-2.0.0_alpha2.ebuild +++ b/dev-java/greenmail/greenmail-2.0.0_alpha2.ebuild @@ -19,7 +19,7 @@ SRC_URI="https://github.com/greenmail-mail-test/greenmail/archive/release-${PV/_ LICENSE="Apache-2.0" SLOT="2" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64" +KEYWORDS="~amd64 ~arm arm64 ppc64" # Common dependencies # POM: pom.xml diff --git a/dev-java/jakarta-mail/jakarta-mail-2.0.1.ebuild b/dev-java/jakarta-mail/jakarta-mail-2.0.1.ebuild index 2b2610a2eff5..ab3341a5a764 100644 --- a/dev-java/jakarta-mail/jakarta-mail-2.0.1.ebuild +++ b/dev-java/jakarta-mail/jakarta-mail-2.0.1.ebuild @@ -18,7 +18,7 @@ SRC_URI="https://github.com/jakartaee/mail-api/archive/${PV}.tar.gz -> ${P}.tar. LICENSE="EPL-1.0 EPL-2.0 GPL-2-with-classpath-exception" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64" +KEYWORDS="~amd64 ~arm arm64 ppc64" # Common dependencies # POM: pom.xml diff --git a/dev-java/jul-to-slf4j/jul-to-slf4j-2.0.3.ebuild b/dev-java/jul-to-slf4j/jul-to-slf4j-2.0.3.ebuild index 7645e3ae5e6d..cf9d0c136c29 100644 --- a/dev-java/jul-to-slf4j/jul-to-slf4j-2.0.3.ebuild +++ b/dev-java/jul-to-slf4j/jul-to-slf4j-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" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" # Common dependencies # POM: pom.xml diff --git a/dev-java/log4j-over-slf4j/log4j-over-slf4j-2.0.3.ebuild b/dev-java/log4j-over-slf4j/log4j-over-slf4j-2.0.3.ebuild index adcf47826a9d..d71e64f91321 100644 --- a/dev-java/log4j-over-slf4j/log4j-over-slf4j-2.0.3.ebuild +++ b/dev-java/log4j-over-slf4j/log4j-over-slf4j-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" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" # Common dependencies # POM: pom.xml diff --git a/dev-java/logback-classic/logback-classic-1.4.1.ebuild b/dev-java/logback-classic/logback-classic-1.4.1.ebuild index 852dbf04162f..c75f3b96c448 100644 --- a/dev-java/logback-classic/logback-classic-1.4.1.ebuild +++ b/dev-java/logback-classic/logback-classic-1.4.1.ebuild @@ -18,7 +18,7 @@ SRC_URI="https://github.com/qos-ch/logback/archive/v_${PV}.tar.gz -> logback-${P LICENSE="EPL-1.0 LGPL-3" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64" +KEYWORDS="~amd64 ~arm arm64 ppc64" # Common dependencies # POM: ${PN}/pom.xml diff --git a/dev-java/logback-core/logback-core-1.4.1.ebuild b/dev-java/logback-core/logback-core-1.4.1.ebuild index d0c035454c3c..4437b0fb3bb6 100644 --- a/dev-java/logback-core/logback-core-1.4.1.ebuild +++ b/dev-java/logback-core/logback-core-1.4.1.ebuild @@ -18,7 +18,7 @@ SRC_URI="https://github.com/qos-ch/logback/archive/v_${PV}.tar.gz -> logback-${P LICENSE="EPL-1.0 LGPL-3" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64" +KEYWORDS="~amd64 ~arm arm64 ppc64" # Common dependencies # POM: ${PN}/pom.xml diff --git a/dev-java/reload4j/reload4j-1.2.22.ebuild b/dev-java/reload4j/reload4j-1.2.22.ebuild index 18e1a14ad3f0..d4ca0f965bc3 100644 --- a/dev-java/reload4j/reload4j-1.2.22.ebuild +++ b/dev-java/reload4j/reload4j-1.2.22.ebuild @@ -18,7 +18,7 @@ SRC_URI="https://github.com/qos-ch/reload4j/archive/v_${PV}.tar.gz -> ${P}.tar.g LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" # There are unresolved test failures RESTRICT="test" 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:*" diff --git a/dev-java/slf4j-ext/Manifest b/dev-java/slf4j-ext/Manifest index c8a1f55201cb..502a0b5b52a6 100644 --- a/dev-java/slf4j-ext/Manifest +++ b/dev-java/slf4j-ext/Manifest @@ -1,2 +1 @@ -DIST slf4j-1.7.36.tar.gz 2276203 BLAKE2B 930de76047c694b4e566ba743ee90a2efb062358b03209137f686c4bf4ead122aa84c18b79615e5a67f1a890abdc1b8f70f62b7803f7b8e45c766ff8254836d4 SHA512 1384c771aa04d9d351854cf8ddeef66ee9f43df53890a05413c48c14cf1cb78a457bb4b2a6e2f064f1c1ab68b2eaa1d326fc03bb6b7c145915660a2c873692d0 DIST slf4j-2.0.3.tar.gz 1435478 BLAKE2B fec1a47882d3bbf508f4faed9cbf9448a23e9749c6c41f241c7e80654e0ce55211cec9228fcf0e666c997a4f24c5b96ad57dc076910e7f05704b02d0cf7db709 SHA512 0fb295f7942c2af8aebe2ecf544ef8326b8cc88de397ee6b37a10249b38150a506f62dcec614eee13519a299b30c6d2481dec3ea235d4b3e6a5241d12639bca6 diff --git a/dev-java/slf4j-ext/slf4j-ext-1.7.36.ebuild b/dev-java/slf4j-ext/slf4j-ext-1.7.36.ebuild deleted file mode 100644 index 9f498c036e19..000000000000 --- a/dev-java/slf4j-ext/slf4j-ext-1.7.36.ebuild +++ /dev/null @@ -1,74 +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 ~arm64 ~ppc64 ~x86" --ebuild slf4j-ext-1.7.36.ebuild - -EAPI=8 - -JAVA_PKG_IUSE="doc source" -MAVEN_ID="org.slf4j:slf4j-ext:1.7.36" -# JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="Extensions to 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" - -# Common dependencies -# POM: pom.xml -# ch.qos.cal10n:cal10n-api:0.8.1 -> >=dev-java/cal10n-0.8.1:0 -# commons-lang:commons-lang:2.4 -> >=dev-java/commons-lang-2.6:2.1 -# javassist:javassist:3.4.GA -> >=dev-java/javassist-3.18.2:3 -# org.slf4j:slf4j-api:1.7.36 -> >=dev-java/slf4j-api-1.7.36:0 - -CP_DEPEND=" - dev-java/cal10n:0 - dev-java/commons-lang:2.1 - dev-java/javassist:3 - ~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-reload4j:1.7.36 -> !!!artifactId-not-found!!! - -# slf4j-reload4j has further dependencies which are not available in ::gentoo. - -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,!!!artifactId-not-found!!!" -# JAVA_TEST_SRC_DIR="src/test/java" -# JAVA_TEST_RESOURCE_DIRS=( -# "src/test/resources" -# ) - -src_prepare() { - default - java-pkg_clean -} - -src_install() { - default # https://bugs.gentoo.org/789582 - java-pkg-simple_src_install -} diff --git a/dev-java/slf4j-ext/slf4j-ext-2.0.3.ebuild b/dev-java/slf4j-ext/slf4j-ext-2.0.3.ebuild index dbc7e9961412..103d621e2584 100644 --- a/dev-java/slf4j-ext/slf4j-ext-2.0.3.ebuild +++ b/dev-java/slf4j-ext/slf4j-ext-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" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" # Common dependencies # POM: pom.xml diff --git a/dev-java/slf4j-nop/Manifest b/dev-java/slf4j-nop/Manifest index c8a1f55201cb..502a0b5b52a6 100644 --- a/dev-java/slf4j-nop/Manifest +++ b/dev-java/slf4j-nop/Manifest @@ -1,2 +1 @@ -DIST slf4j-1.7.36.tar.gz 2276203 BLAKE2B 930de76047c694b4e566ba743ee90a2efb062358b03209137f686c4bf4ead122aa84c18b79615e5a67f1a890abdc1b8f70f62b7803f7b8e45c766ff8254836d4 SHA512 1384c771aa04d9d351854cf8ddeef66ee9f43df53890a05413c48c14cf1cb78a457bb4b2a6e2f064f1c1ab68b2eaa1d326fc03bb6b7c145915660a2c873692d0 DIST slf4j-2.0.3.tar.gz 1435478 BLAKE2B fec1a47882d3bbf508f4faed9cbf9448a23e9749c6c41f241c7e80654e0ce55211cec9228fcf0e666c997a4f24c5b96ad57dc076910e7f05704b02d0cf7db709 SHA512 0fb295f7942c2af8aebe2ecf544ef8326b8cc88de397ee6b37a10249b38150a506f62dcec614eee13519a299b30c6d2481dec3ea235d4b3e6a5241d12639bca6 diff --git a/dev-java/slf4j-nop/slf4j-nop-1.7.36.ebuild b/dev-java/slf4j-nop/slf4j-nop-1.7.36.ebuild deleted file mode 100644 index 967f7b6557b8..000000000000 --- a/dev-java/slf4j-nop/slf4j-nop-1.7.36.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 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 -} diff --git a/dev-java/slf4j-nop/slf4j-nop-2.0.3.ebuild b/dev-java/slf4j-nop/slf4j-nop-2.0.3.ebuild index dc1dbd5e3cf4..26720b1c7adf 100644 --- a/dev-java/slf4j-nop/slf4j-nop-2.0.3.ebuild +++ b/dev-java/slf4j-nop/slf4j-nop-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" # Common dependencies # POM: pom.xml diff --git a/dev-java/slf4j-reload4j/slf4j-reload4j-2.0.3.ebuild b/dev-java/slf4j-reload4j/slf4j-reload4j-2.0.3.ebuild index e1d1af7da79c..088248c1ea08 100644 --- a/dev-java/slf4j-reload4j/slf4j-reload4j-2.0.3.ebuild +++ b/dev-java/slf4j-reload4j/slf4j-reload4j-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" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" # Common dependencies # POM: pom.xml diff --git a/dev-java/slf4j-simple/Manifest b/dev-java/slf4j-simple/Manifest index c8a1f55201cb..502a0b5b52a6 100644 --- a/dev-java/slf4j-simple/Manifest +++ b/dev-java/slf4j-simple/Manifest @@ -1,2 +1 @@ -DIST slf4j-1.7.36.tar.gz 2276203 BLAKE2B 930de76047c694b4e566ba743ee90a2efb062358b03209137f686c4bf4ead122aa84c18b79615e5a67f1a890abdc1b8f70f62b7803f7b8e45c766ff8254836d4 SHA512 1384c771aa04d9d351854cf8ddeef66ee9f43df53890a05413c48c14cf1cb78a457bb4b2a6e2f064f1c1ab68b2eaa1d326fc03bb6b7c145915660a2c873692d0 DIST slf4j-2.0.3.tar.gz 1435478 BLAKE2B fec1a47882d3bbf508f4faed9cbf9448a23e9749c6c41f241c7e80654e0ce55211cec9228fcf0e666c997a4f24c5b96ad57dc076910e7f05704b02d0cf7db709 SHA512 0fb295f7942c2af8aebe2ecf544ef8326b8cc88de397ee6b37a10249b38150a506f62dcec614eee13519a299b30c6d2481dec3ea235d4b3e6a5241d12639bca6 diff --git a/dev-java/slf4j-simple/slf4j-simple-1.7.36.ebuild b/dev-java/slf4j-simple/slf4j-simple-1.7.36.ebuild deleted file mode 100644 index 7be81d79f166..000000000000 --- a/dev-java/slf4j-simple/slf4j-simple-1.7.36.ebuild +++ /dev/null @@ -1,77 +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-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 -} diff --git a/dev-java/slf4j-simple/slf4j-simple-2.0.3.ebuild b/dev-java/slf4j-simple/slf4j-simple-2.0.3.ebuild index 27a4d59a5ec5..09826fff2c44 100644 --- a/dev-java/slf4j-simple/slf4j-simple-2.0.3.ebuild +++ b/dev-java/slf4j-simple/slf4j-simple-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" # Common dependencies # POM: pom.xml |