From f4ec62be67ca7c839ef6cdbc7b4de72196545f03 Mon Sep 17 00:00:00 2001 From: "Liguros - Gitlab CI/CD [develop]" Date: Sat, 10 Apr 2021 13:45:26 +0000 Subject: Adding metadata --- dev-java/jakarta-oro/jakarta-oro-2.0.8-r5.ebuild | 2 +- dev-java/slf4j-api/metadata.xml | 2 + dev-java/slf4j-api/slf4j-api-1.7.30-r1.ebuild | 55 ++++++++++++++++ dev-java/slf4j-api/slf4j-api-1.7.30.ebuild | 50 --------------- .../slf4j-simple/slf4j-simple-1.7.30-r1.ebuild | 74 ++++++++++++++++++++++ dev-java/slf4j-simple/slf4j-simple-1.7.30.ebuild | 71 --------------------- 6 files changed, 132 insertions(+), 122 deletions(-) create mode 100644 dev-java/slf4j-api/slf4j-api-1.7.30-r1.ebuild delete mode 100644 dev-java/slf4j-api/slf4j-api-1.7.30.ebuild create mode 100644 dev-java/slf4j-simple/slf4j-simple-1.7.30-r1.ebuild delete mode 100644 dev-java/slf4j-simple/slf4j-simple-1.7.30.ebuild (limited to 'dev-java') diff --git a/dev-java/jakarta-oro/jakarta-oro-2.0.8-r5.ebuild b/dev-java/jakarta-oro/jakarta-oro-2.0.8-r5.ebuild index 5e1c153372fe..2659db65179d 100644 --- a/dev-java/jakarta-oro/jakarta-oro-2.0.8-r5.ebuild +++ b/dev-java/jakarta-oro/jakarta-oro-2.0.8-r5.ebuild @@ -16,7 +16,7 @@ SRC_URI="https://archive.apache.org/dist/${MY_J}/${MY_O}/${P}.tar.gz" LICENSE="Apache-1.1" SLOT="2.0" -KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~amd64 ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" DEPEND=">=virtual/jdk-1.8:*" RDEPEND=">=virtual/jre-1.8:*" diff --git a/dev-java/slf4j-api/metadata.xml b/dev-java/slf4j-api/metadata.xml index 386d48d3746f..fc147d3a4dd2 100644 --- a/dev-java/slf4j-api/metadata.xml +++ b/dev-java/slf4j-api/metadata.xml @@ -7,6 +7,8 @@ cpe:/a:qos:slf4j + http://www.slf4j.org/bug-reporting.html + http://www.slf4j.org/docs.html gentoo-staging \ No newline at end of file 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 new file mode 100644 index 000000000000..1bd87893b1d4 --- /dev/null +++ b/dev-java/slf4j-api/slf4j-api-1.7.30-r1.ebuild @@ -0,0 +1,55 @@ +# 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 ~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.30.ebuild b/dev-java/slf4j-api/slf4j-api-1.7.30.ebuild deleted file mode 100644 index 6a7a281f5595..000000000000 --- a/dev-java/slf4j-api/slf4j-api-1.7.30.ebuild +++ /dev/null @@ -1,50 +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 ~arm64 ~ppc64 ~x86" - -DEPEND=" - >=virtual/jdk-1.8:* -" - -RDEPEND=" - >=virtual/jre-1.8:* -" - -S="${WORKDIR}" - -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=( - # This code should have never made it into slf4j-api.jar - "org.slf4j.NoBindingTest" - # java.lang.InstantiationException - "org.slf4j.helpers.MultithreadedInitializationTest" -) - -src_prepare() { - default - java-pkg_clean -} 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 new file mode 100644 index 000000000000..3313f9adff17 --- /dev/null +++ b/dev-java/slf4j-simple/slf4j-simple-1.7.30-r1.ebuild @@ -0,0 +1,74 @@ +# 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 ~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.30.ebuild b/dev-java/slf4j-simple/slf4j-simple-1.7.30.ebuild deleted file mode 100644 index 4fabf53201d2..000000000000 --- a/dev-java/slf4j-simple/slf4j-simple-1.7.30.ebuild +++ /dev/null @@ -1,71 +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 ~arm64 ~ppc64 ~x86" - -# slf4j-v_1.7.30/slf4j-simple/src/test/java/org/slf4j/helpers/SimpleLoggerMultithreadedInitializationTest.java:37: error: cannot find symbol -# public class SimpleLoggerMultithreadedInitializationTest extends MultithreadedInitializationTest { -# ^ -# symbol: class MultithreadedInitializationTest -RESTRICT="test" - -# 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}" - -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,slf4j-api" -JAVA_TEST_SRC_DIR="slf4j-v_${PV}/${PN}/src/test/java" -JAVA_TEST_RESOURCE_DIRS=( - "slf4j-v_${PV}/${PN}/src/test/resources" -) - -src_prepare() { - default - java-pkg_clean -} -- cgit v1.3