diff options
Diffstat (limited to 'dev-java/slf4j-simple')
-rw-r--r-- | dev-java/slf4j-simple/Manifest | 7 | ||||
-rw-r--r-- | dev-java/slf4j-simple/files/1.7.7-build.xml | 208 | ||||
-rw-r--r-- | dev-java/slf4j-simple/metadata.xml | 12 | ||||
-rw-r--r-- | dev-java/slf4j-simple/slf4j-simple-1.7.30-r1.ebuild | 74 | ||||
-rw-r--r-- | dev-java/slf4j-simple/slf4j-simple-1.7.7.ebuild | 52 |
5 files changed, 85 insertions, 268 deletions
diff --git a/dev-java/slf4j-simple/Manifest b/dev-java/slf4j-simple/Manifest index 6f2f42baac24..52486715be4a 100644 --- a/dev-java/slf4j-simple/Manifest +++ b/dev-java/slf4j-simple/Manifest @@ -1,4 +1,3 @@ -AUX 1.7.7-build.xml 8491 BLAKE2B 585e41d7760e2d05fee17fb4c35de203eced8f9298bfd880d5f2e4a698cd78f8e00488227dad96dba805ce646f2d2fd1444fb87e29f929fc2cb96d919efd5c1d SHA512 8961b303c86000433af761d448c016c13d105d99547e67ace24bdb2f9f95427bdf4a0d4e02fdaefced1a574d2968f9af7e4429e33fb85d1ceb8439036c888917 -DIST slf4j-1.7.7.tar.gz 3031017 BLAKE2B 55020b493f9f0df534d199d86e8d312dcd64831155f6d18d5f2de6f5157ecb20853cc96689e25ded8c7f4f858481567eb67a21a1cf96a7c3a33ed1ddf9aa47eb SHA512 aefefe049ed36e8ec938469067be8d73d2c7a28189f54cf434606fecab1d380f00fdf8349a23ed99d574067d9a613b0aec48b913705cd27524af5a4a5d887418 -EBUILD slf4j-simple-1.7.7.ebuild 1120 BLAKE2B 5a068ac3357e5d18ae85f2d210ba2f83a68d05395e176b6ab1a5d8a4851534051a631bbd2d5b97f5ca38f36073a901035c64e4d60390eb42e1f05ca119a8d67c SHA512 06e6dfdb72ad88e9eb69fb97e093b479cf2cfc2d2168ad37573c430f2edd92677473f97a8a8444430e7acfdfd4e38e15fd05e037b342e2a6070357fb00e15786 -MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f +DIST slf4j-1.7.30-sources.tar.gz 2272772 BLAKE2B c6692a20406983fa333bdb27bf8da599140d7d37fe55da6dfa2c2aff1825ee57c9d6b7bf0015e4b41b3c15ac0971559b3dd4bb5244e5393cd209ee26fac5e93d SHA512 4f05c996532560b16f22d78fcd47f8c4ba14691ce218a51ee6d50b283a51f8e40475a3a47f1117c1898a7be922e3f85806c4a7eb526759f0e7ea8426b5c6035f +EBUILD slf4j-simple-1.7.30-r1.ebuild 2030 BLAKE2B 4eabd1b02aa23d49ed2d11e4caf1eab79abee7f8548451fa1a902d34cdb2ae620fbcec570456374270fbb948ade6b429c10c6e9981c416b320582a142918bee1 SHA512 f01fccb8e116c8e8ee5c08334ca9165404dab6585ce8297f8a2494b30ca33849804d58e6318fec2a3e16c66d316f1add6820b41469223e66020e8ca47fa8db6f +MISC metadata.xml 366 BLAKE2B fcc9f77c9b83f1d612815cd6e9e8814ba364c8407422ec822f0c60ccc2176dc724e826ce9fdbdd7fb1290f669fd332b93a74650628840d30d1dd2d68184d9893 SHA512 628c4e1ed007e31d4b8a3769fb2f4bd5c4f8041d99ef656508927302345a16573713abe0da228546f8a976d8e3e5de4538f838437623149c7f5b14bfee12abd1 diff --git a/dev-java/slf4j-simple/files/1.7.7-build.xml b/dev-java/slf4j-simple/files/1.7.7-build.xml deleted file mode 100644 index f91d565e170a..000000000000 --- a/dev-java/slf4j-simple/files/1.7.7-build.xml +++ /dev/null @@ -1,208 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<project name="slf4j-simple-from-maven" default="package" basedir="."> - <property file="${user.home}/.m2/maven.properties"/> - <property file="maven-build.properties"/> - - <property name="maven.build.finalName" value="slf4j-simple-1.7.6"/> - <property name="maven.build.dir" value="target"/> - <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/> - <property name="maven.build.srcDir.0" value="src/main/java"/> - <property name="maven.build.resourceDir.0" value="src/main/resources"/> - <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/> - <property name="maven.build.testDir.0" value="src/test/java"/> - <property name="maven.build.testResourceDir.0" value="src/test/resources"/> - <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/> - <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/> - - <property name="maven.repo.local" value="${user.home}/.m2/repository"/> - <property name="maven.settings.offline" value="false"/> - <property name="maven.settings.interactiveMode" value="true"/> - - <!-- ====================================================================== --> - <!-- Defining classpaths --> - <!-- ====================================================================== --> - - <path id="build.classpath"> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.6/slf4j-api-1.7.6.jar"/> - </path> - <path id="build.test.classpath"> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.6/slf4j-api-1.7.6.jar"/> - <pathelement location="${maven.repo.local}/junit/junit/4.10/junit-4.10.jar"/> - </path> - - <!-- ====================================================================== --> - <!-- Cleaning up target --> - <!-- ====================================================================== --> - - <target name="clean" description="Clean the output directory"> - <delete dir="${maven.build.dir}"/> - </target> - - <!-- ====================================================================== --> - <!-- Compilation target --> - <!-- ====================================================================== --> - - <target name="compile" description="Compile the code"> - <mkdir dir="${maven.build.outputDir}"/> - <javac destdir="${maven.build.outputDir}" - nowarn="false" - debug="true" - optimize="false" - deprecation="true" - target="1.5" - verbose="false" - fork="false" - source="1.5"> - <src> - <pathelement location="${maven.build.srcDir.0}"/> - </src> - <classpath refid="build.classpath"/> - </javac> - <copy todir="${maven.build.outputDir}"> - <fileset dir="${maven.build.resourceDir.0}"/> - </copy> - </target> - - <!-- ====================================================================== --> - <!-- Test-compilation target --> - <!-- ====================================================================== --> - - <target name="compile-tests" - depends="compile" - description="Compile the test code" - unless="maven.test.skip"> - <mkdir dir="${maven.build.testOutputDir}"/> - <javac destdir="${maven.build.testOutputDir}" - nowarn="false" - debug="true" - optimize="false" - deprecation="true" - target="1.5" - verbose="false" - fork="false" - source="1.5"> - <src> - <pathelement location="${maven.build.testDir.0}"/> - </src> - <classpath> - <path refid="build.test.classpath"/> - <pathelement location="${maven.build.outputDir}"/> - </classpath> - </javac> - <copy todir="${maven.build.testOutputDir}"> - <fileset dir="${maven.build.testResourceDir.0}"/> - </copy> - </target> - - <!-- ====================================================================== --> - <!-- Run all tests --> - <!-- ====================================================================== --> - - <target name="test" - depends="compile-tests, junit-missing" - unless="junit.skipped" - description="Run the test cases"> - <mkdir dir="${maven.test.reports}"/> - <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir="."> - <sysproperty key="basedir" value="."/> - <formatter type="xml"/> - <formatter type="plain" usefile="false"/> - <classpath> - <path refid="build.test.classpath"/> - <pathelement location="${maven.build.outputDir}"/> - <pathelement location="${maven.build.testOutputDir}"/> - </classpath> - <batchtest todir="${maven.test.reports}" unless="test"> - <fileset dir="${maven.build.testDir.0}"> - <include name="**/Test*.java"/> - <include name="**/*Test.java"/> - <include name="**/*TestCase.java"/> - <exclude name="**/AllTest.java"/> - <exclude name="**/PackageTest.java"/> - </fileset> - </batchtest> - <batchtest todir="${maven.test.reports}" if="test"> - <fileset dir="${maven.build.testDir.0}"> - <include name="**/${test}.java"/> - <exclude name="**/AllTest.java"/> - <exclude name="**/PackageTest.java"/> - </fileset> - </batchtest> - </junit> - </target> - - <target name="test-junit-present"> - <available classname="junit.framework.Test" property="junit.present"/> - </target> - - <target name="test-junit-status" - depends="test-junit-present"> - <condition property="junit.missing"> - <and> - <isfalse value="${junit.present}"/> - <isfalse value="${maven.test.skip}"/> - </and> - </condition> - <condition property="junit.skipped"> - <or> - <isfalse value="${junit.present}"/> - <istrue value="${maven.test.skip}"/> - </or> - </condition> - </target> - - <target name="junit-missing" - depends="test-junit-status" - if="junit.missing"> - <echo>=================================== WARNING ===================================</echo> - <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo> - <echo>===============================================================================</echo> - </target> - - <!-- ====================================================================== --> - <!-- Javadoc target --> - <!-- ====================================================================== --> - - <target name="javadoc" description="Generates the Javadoc of the application"> - <javadoc sourcepath="${maven.build.srcDir.0}" - packagenames="*" - destdir="${maven.reporting.outputDirectory}/apidocs" - access="protected" - old="false" - verbose="false" - version="true" - use="true" - author="true" - splitindex="false" - nodeprecated="false" - nodeprecatedlist="false" - notree="false" - noindex="false" - nohelp="false" - nonavbar="false" - serialwarn="false" - charset="ISO-8859-1" - linksource="false" - breakiterator="false"/> - </target> - - <!-- ====================================================================== --> - <!-- Package target --> - <!-- ====================================================================== --> - - <target name="package" depends="compile,test" description="Package the application"> - <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" - compress="true" - index="false" - manifest="${maven.build.resourceDir.0}/META-INF/MANIFEST.MF" - basedir="${maven.build.outputDir}" - excludes="**/package.html"/> - </target> - - <!-- ====================================================================== --> - <!-- A dummy target for the package named after the type it creates --> - <!-- ====================================================================== --> - - <target name="jar" depends="package" description="Builds the jar for the application"/> -</project> diff --git a/dev-java/slf4j-simple/metadata.xml b/dev-java/slf4j-simple/metadata.xml index 37998bf40746..801406cdb66a 100644 --- a/dev-java/slf4j-simple/metadata.xml +++ b/dev-java/slf4j-simple/metadata.xml @@ -1,8 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>java@gentoo.org</email> - <name>Java</name> - </maintainer> + <maintainer type="project"> + <email>java@gentoo.org</email> + <name>Java</name> + </maintainer> + <upstream> + <doc>http://www.slf4j.org/docs.html</doc> + <bugs-to>http://www.slf4j.org/bug-reporting.html</bugs-to> + </upstream> </pkgmetadata> 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..2bbc08d8cc79 --- /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.7.ebuild b/dev-java/slf4j-simple/slf4j-simple-1.7.7.ebuild deleted file mode 100644 index 792d3f30f513..000000000000 --- a/dev-java/slf4j-simple/slf4j-simple-1.7.7.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -JAVA_PKG_IUSE="doc source" - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="Simple Logging Facade for Java" -HOMEPAGE="http://www.slf4j.org/" -SRC_URI="http://www.slf4j.org/dist/${P/-simple/}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 ~arm64 ppc64 x86" -IUSE="test" -RESTRICT="!test? ( test )" - -CDEPEND=" - dev-java/slf4j-api:0" -RDEPEND=">=virtual/jre-1.6 - ${CDEPEND}" -DEPEND=">=virtual/jdk-1.6 - ${CDEPEND} - test? ( - dev-java/junit:4 - dev-java/ant-junit:0 - )" - -S="${WORKDIR}/${P/-simple/}/${PN}" - -JAVA_ANT_REWRITE_CLASSPATH="yes" -EANT_GENTOO_CLASSPATH="slf4j-api" -EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4" -EANT_TEST_ANT_TASKS="ant-junit" -EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}" - -java_prepare() { - cp "${FILESDIR}"/"${PV}"-build.xml build.xml || die - find "${S}" -name "*.jar" -delete || die -} - -src_test() { - java-pkg-2_src_test -} - -src_install() { - java-pkg_dojar target/${PN}.jar - use doc && java-pkg_dojavadoc target/site/apidocs - use source && java-pkg_dosrc src/main/java/org -} |