diff --git a/dev-java/slf4j-jdk14/Manifest b/dev-java/slf4j-jdk14/Manifest index b0afcf9..e9ef31c 100644 --- a/dev-java/slf4j-jdk14/Manifest +++ b/dev-java/slf4j-jdk14/Manifest @@ -1 +1 @@ -DIST slf4j-1.7.30.tar.gz 2272772 BLAKE2B c6692a20406983fa333bdb27bf8da599140d7d37fe55da6dfa2c2aff1825ee57c9d6b7bf0015e4b41b3c15ac0971559b3dd4bb5244e5393cd209ee26fac5e93d SHA512 4f05c996532560b16f22d78fcd47f8c4ba14691ce218a51ee6d50b283a51f8e40475a3a47f1117c1898a7be922e3f85806c4a7eb526759f0e7ea8426b5c6035f +DIST slf4j-jdk14-1.7.30-sources.tar.gz 2272772 BLAKE2B c6692a20406983fa333bdb27bf8da599140d7d37fe55da6dfa2c2aff1825ee57c9d6b7bf0015e4b41b3c15ac0971559b3dd4bb5244e5393cd209ee26fac5e93d SHA512 4f05c996532560b16f22d78fcd47f8c4ba14691ce218a51ee6d50b283a51f8e40475a3a47f1117c1898a7be922e3f85806c4a7eb526759f0e7ea8426b5c6035f diff --git a/dev-java/slf4j-jdk14/files/1.7.30-build.xml b/dev-java/slf4j-jdk14/files/1.7.30-build.xml deleted file mode 100644 index 9eaf832..0000000 --- a/dev-java/slf4j-jdk14/files/1.7.30-build.xml +++ /dev/null @@ -1,223 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - =================================== WARNING =================================== - JUnit is not present in the test classpath or your $ANT_HOME/lib directory. Tests not executed. - =============================================================================== - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/dev-java/slf4j-jdk14/metadata.xml b/dev-java/slf4j-jdk14/metadata.xml index 37998bf..801406c 100644 --- a/dev-java/slf4j-jdk14/metadata.xml +++ b/dev-java/slf4j-jdk14/metadata.xml @@ -1,8 +1,12 @@ - - java@gentoo.org - Java - + + java@gentoo.org + Java + + + http://www.slf4j.org/docs.html + http://www.slf4j.org/bug-reporting.html + diff --git a/dev-java/slf4j-jdk14/slf4j-jdk14-1.7.30.ebuild b/dev-java/slf4j-jdk14/slf4j-jdk14-1.7.30.ebuild index f5996cd..d564734 100644 --- a/dev-java/slf4j-jdk14/slf4j-jdk14-1.7.30.ebuild +++ b/dev-java/slf4j-jdk14/slf4j-jdk14-1.7.30.ebuild @@ -1,41 +1,64 @@ -# Copyright 1999-2020 Gentoo Authors +# 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-jdk14/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-jdk14-1.7.30.ebuild + EAPI=7 -JAVA_PKG_IUSE="doc source" -inherit java-pkg-2 java-ant-2 +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="org.slf4j:slf4j-jdk14:1.7.30" +JAVA_TESTING_FRAMEWORKS="junit-4" -DESCRIPTION="Simple Logging Facade for Java" -HOMEPAGE="http://www.slf4j.org/" -SRC_URI="https://github.com/qos-ch/slf4j/archive/v_${PV}.tar.gz -> ${P/-jdk14/}.tar.gz" +inherit java-pkg-2 java-pkg-simple +DESCRIPTION="SLF4J JDK14 Binding" +HOMEPAGE="http://www.slf4j.org" +SRC_URI="https://github.com/qos-ch/slf4j/archive/refs/tags/v_${PV}.tar.gz -> ${P}-sources.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~ppc64 ~x86" -IUSE="" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" -RDEPEND=">=virtual/jre-1.8 - dev-java/slf4j-api:0" -DEPEND=">=virtual/jdk-1.8 - app-arch/unzip - dev-java/slf4j-api:0" +# Common dependencies +# POM: slf4j-v_${PV}/${PN}/pom.xml +# org.slf4j:slf4j-api:1.7.30 -> >=dev-java/slf4j-api-1.7.30:0 -S="${WORKDIR}/${PN/-jdk14/}-v_${PV}/${PN}" +CDEPEND=" + >=dev-java/slf4j-api-1.7.30:0 +" -RESTRICT="test" +# 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 -JAVA_ANT_REWRITE_CLASSPATH="yes" -EANT_GENTOO_CLASSPATH="slf4j-api" -EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}" +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() { - cp -v "${FILESDIR}"/${PV}-build.xml build.xml || die - java-pkg-2_src_prepare -} - -src_install() { - java-pkg_dojar "${S}"/target/${PN}.jar - use doc && java-pkg_dojavadoc "${S}"/target/site/apidocs - use source && java-pkg_dosrc "${S}"/src/main/java/org + default + java-pkg_clean }