From 3b682d55226ac89ae26ab77237f8e3d47ba291d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20F=C3=B6rster?= Date: Sun, 11 Apr 2021 15:18:55 +0200 Subject: [PATCH] [dev-java] clean up uneeded (javaassist) and in-tree (slf4-{api,log4j12,nop,simple}) --- dev-java/javassist/Manifest | 1 - dev-java/javassist/javassist-3.21.0.ebuild | 46 ---- dev-java/javassist/metadata.xml | 12 - dev-java/slf4j-api/Manifest | 1 - dev-java/slf4j-api/files/1.7.30-build.xml | 212 ---------------- dev-java/slf4j-api/metadata.xml | 8 - dev-java/slf4j-api/slf4j-api-1.7.30.ebuild | 47 ---- dev-java/slf4j-log4j12/Manifest | 1 - dev-java/slf4j-log4j12/files/1.7.30-build.xml | 228 ------------------ dev-java/slf4j-log4j12/metadata.xml | 8 - .../slf4j-log4j12/slf4j-log4j12-1.7.30.ebuild | 53 ---- dev-java/slf4j-nop/Manifest | 1 - dev-java/slf4j-nop/files/1.7.30-build.xml | 222 ----------------- dev-java/slf4j-nop/metadata.xml | 8 - dev-java/slf4j-nop/slf4j-nop-1.7.30.ebuild | 51 ---- dev-java/slf4j-simple/Manifest | 1 - dev-java/slf4j-simple/files/1.7.30-build.xml | 226 ----------------- dev-java/slf4j-simple/metadata.xml | 8 - .../slf4j-simple/slf4j-simple-1.7.30.ebuild | 51 ---- 19 files changed, 1185 deletions(-) delete mode 100644 dev-java/javassist/Manifest delete mode 100644 dev-java/javassist/javassist-3.21.0.ebuild delete mode 100644 dev-java/javassist/metadata.xml delete mode 100644 dev-java/slf4j-api/Manifest delete mode 100644 dev-java/slf4j-api/files/1.7.30-build.xml delete mode 100644 dev-java/slf4j-api/metadata.xml delete mode 100644 dev-java/slf4j-api/slf4j-api-1.7.30.ebuild delete mode 100644 dev-java/slf4j-log4j12/Manifest delete mode 100644 dev-java/slf4j-log4j12/files/1.7.30-build.xml delete mode 100644 dev-java/slf4j-log4j12/metadata.xml delete mode 100644 dev-java/slf4j-log4j12/slf4j-log4j12-1.7.30.ebuild delete mode 100644 dev-java/slf4j-nop/Manifest delete mode 100644 dev-java/slf4j-nop/files/1.7.30-build.xml delete mode 100644 dev-java/slf4j-nop/metadata.xml delete mode 100644 dev-java/slf4j-nop/slf4j-nop-1.7.30.ebuild delete mode 100644 dev-java/slf4j-simple/Manifest delete mode 100644 dev-java/slf4j-simple/files/1.7.30-build.xml delete mode 100644 dev-java/slf4j-simple/metadata.xml delete mode 100644 dev-java/slf4j-simple/slf4j-simple-1.7.30.ebuild diff --git a/dev-java/javassist/Manifest b/dev-java/javassist/Manifest deleted file mode 100644 index de9f5b6..0000000 --- a/dev-java/javassist/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST javassist-3.21.0.tar.gz 1208816 BLAKE2B 38d576e15927925d651de6be19d219da4fbddd0f027e0360ee8caf69c1112afd792d7909e2827b4998054d6050db9a433276b055c99d061bb2c4bdcd298843e2 SHA512 5dd855be18629306348f5a3a2d738880e6b79ac7a570ff16ddd22a5b3d23581fea1bf54b099d88c543b7045e9ff69d1e5e8fc6a323faa3dc1aa2076b164e5323 diff --git a/dev-java/javassist/javassist-3.21.0.ebuild b/dev-java/javassist/javassist-3.21.0.ebuild deleted file mode 100644 index d5108bc..0000000 --- a/dev-java/javassist/javassist-3.21.0.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -JAVA_PKG_IUSE="doc source examples" - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="Javassist makes Java bytecode manipulation simple" -HOMEPAGE="https://www.javassist.org" -SRC_URI="https://github.com/jboss-javassist/javassist/archive/rel_${PV//./_}_ga.tar.gz -> ${P}.tar.gz" - -LICENSE="MPL-1.1" -SLOT="3" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" -IUSE="" - -RDEPEND=">=virtual/jre-1.8" -DEPEND=">=virtual/jdk-1.8 - app-arch/unzip" - -S="${WORKDIR}/${PN}-rel_${PV//./_}_ga" - -HTML_DOCS=( Readme.html ) - -EANT_DOC_TARGET="javadocs" -JAVA_ANT_REWRITE_CLASSPATH=y -EANT_NEEDS_TOOLS="yes" - -src_prepare() { - default - find -name "*.jar" -delete || die -} - -src_install() { - java-pkg_dojar ${PN}.jar - - if use doc; then - einstalldocs - java-pkg_dojavadoc html - fi - - use source && java-pkg_dosrc src/main/javassist - use examples && java-pkg_doexamples sample/* -} diff --git a/dev-java/javassist/metadata.xml b/dev-java/javassist/metadata.xml deleted file mode 100644 index 4369baa..0000000 --- a/dev-java/javassist/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - java@gentoo.org - Java - - - jboss - jboss-javassist/javassist - - diff --git a/dev-java/slf4j-api/Manifest b/dev-java/slf4j-api/Manifest deleted file mode 100644 index b0afcf9..0000000 --- a/dev-java/slf4j-api/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST slf4j-1.7.30.tar.gz 2272772 BLAKE2B c6692a20406983fa333bdb27bf8da599140d7d37fe55da6dfa2c2aff1825ee57c9d6b7bf0015e4b41b3c15ac0971559b3dd4bb5244e5393cd209ee26fac5e93d SHA512 4f05c996532560b16f22d78fcd47f8c4ba14691ce218a51ee6d50b283a51f8e40475a3a47f1117c1898a7be922e3f85806c4a7eb526759f0e7ea8426b5c6035f diff --git a/dev-java/slf4j-api/files/1.7.30-build.xml b/dev-java/slf4j-api/files/1.7.30-build.xml deleted file mode 100644 index 69989f1..0000000 --- a/dev-java/slf4j-api/files/1.7.30-build.xml +++ /dev/null @@ -1,212 +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-api/metadata.xml b/dev-java/slf4j-api/metadata.xml deleted file mode 100644 index 37998bf..0000000 --- a/dev-java/slf4j-api/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - java@gentoo.org - Java - - 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 454a67c..0000000 --- a/dev-java/slf4j-api/slf4j-api-1.7.30.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -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="https://github.com/qos-ch/slf4j/archive/v_${PV}.tar.gz -> ${P/-api/}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=">=virtual/jre-1.8" -DEPEND=">=virtual/jdk-1.8 - app-arch/unzip - test? ( - dev-java/junit:4 - dev-java/ant-junit:0 - )" - -S="${WORKDIR}/${PN/-api/}-v_${PV}/${PN}" - -JAVA_ANT_REWRITE_CLASSPATH="yes" -EANT_TEST_GENTOO_CLASSPATH="junit-4" -EANT_TEST_ANT_TASKS="ant-junit" -EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}" - -src_prepare() { - cp "${FILESDIR}"/"${PV}"-build.xml build.xml || die - java-pkg-2_src_prepare -} - -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 -} diff --git a/dev-java/slf4j-log4j12/Manifest b/dev-java/slf4j-log4j12/Manifest deleted file mode 100644 index b0afcf9..0000000 --- a/dev-java/slf4j-log4j12/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST slf4j-1.7.30.tar.gz 2272772 BLAKE2B c6692a20406983fa333bdb27bf8da599140d7d37fe55da6dfa2c2aff1825ee57c9d6b7bf0015e4b41b3c15ac0971559b3dd4bb5244e5393cd209ee26fac5e93d SHA512 4f05c996532560b16f22d78fcd47f8c4ba14691ce218a51ee6d50b283a51f8e40475a3a47f1117c1898a7be922e3f85806c4a7eb526759f0e7ea8426b5c6035f diff --git a/dev-java/slf4j-log4j12/files/1.7.30-build.xml b/dev-java/slf4j-log4j12/files/1.7.30-build.xml deleted file mode 100644 index 3724a68..0000000 --- a/dev-java/slf4j-log4j12/files/1.7.30-build.xml +++ /dev/null @@ -1,228 +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-log4j12/metadata.xml b/dev-java/slf4j-log4j12/metadata.xml deleted file mode 100644 index 2444066..0000000 --- a/dev-java/slf4j-log4j12/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - java@gentoo.org - Java - - diff --git a/dev-java/slf4j-log4j12/slf4j-log4j12-1.7.30.ebuild b/dev-java/slf4j-log4j12/slf4j-log4j12-1.7.30.ebuild deleted file mode 100644 index a8845ff..0000000 --- a/dev-java/slf4j-log4j12/slf4j-log4j12-1.7.30.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -JAVA_PKG_IUSE="doc source" - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="Simple Logging Facade for Java (SLF4J) log4j bindings" -HOMEPAGE="http://www.slf4j.org/" -SRC_URI="https://github.com/qos-ch/slf4j/archive/v_${PV}.tar.gz -> ${P/-log4j12/}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="test" -RESTRICT="!test? ( test )" - -COMMON_DEPEND=" - dev-java/log4j:0 - dev-java/slf4j-api:0" - -RDEPEND="${COMMON_DEPEND} - >=virtual/jre-1.8" -DEPEND="${COMMON_DEPEND} - >=virtual/jdk-1.8 - test? ( - dev-java/hamcrest-core:0 - dev-java/junit:4 - dev-java/ant-junit4:0 - )" - -S="${WORKDIR}/${PN/-log4j12/}-v_${PV}/${PN}" - -EANT_GENTOO_CLASSPATH="log4j,slf4j-api" -EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},hamcrest-core,junit-4" -JAVA_ANT_REWRITE_CLASSPATH="true" -EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}" - -src_prepare() { - cp "${FILESDIR}"/${PV}-build.xml build.xml || die - java-pkg-2_src_prepare -} - -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 -} diff --git a/dev-java/slf4j-nop/Manifest b/dev-java/slf4j-nop/Manifest deleted file mode 100644 index b0afcf9..0000000 --- a/dev-java/slf4j-nop/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST slf4j-1.7.30.tar.gz 2272772 BLAKE2B c6692a20406983fa333bdb27bf8da599140d7d37fe55da6dfa2c2aff1825ee57c9d6b7bf0015e4b41b3c15ac0971559b3dd4bb5244e5393cd209ee26fac5e93d SHA512 4f05c996532560b16f22d78fcd47f8c4ba14691ce218a51ee6d50b283a51f8e40475a3a47f1117c1898a7be922e3f85806c4a7eb526759f0e7ea8426b5c6035f diff --git a/dev-java/slf4j-nop/files/1.7.30-build.xml b/dev-java/slf4j-nop/files/1.7.30-build.xml deleted file mode 100644 index f3e284d..0000000 --- a/dev-java/slf4j-nop/files/1.7.30-build.xml +++ /dev/null @@ -1,222 +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-nop/metadata.xml b/dev-java/slf4j-nop/metadata.xml deleted file mode 100644 index 37998bf..0000000 --- a/dev-java/slf4j-nop/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - java@gentoo.org - Java - - diff --git a/dev-java/slf4j-nop/slf4j-nop-1.7.30.ebuild b/dev-java/slf4j-nop/slf4j-nop-1.7.30.ebuild deleted file mode 100644 index 25debe9..0000000 --- a/dev-java/slf4j-nop/slf4j-nop-1.7.30.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -JAVA_PKG_IUSE="doc source test" - -inherit java-pkg-2 java-ant-2 - -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/-nop/}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~ppc64 ~x86" -IUSE="" - -CDEPEND="dev-java/slf4j-api:0" -RDEPEND=">=virtual/jre-1.8 - ${CDEPEND}" -DEPEND=">=virtual/jdk-1.8 - app-arch/unzip - test? ( - dev-java/ant-junit:0 - dev-java/junit:4 - ) - ${CDEPEND}" - -S="${WORKDIR}/${PN/-nop/}-v_${PV}/${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}" - -src_prepare() { - cp -v "${FILESDIR}"/${PV}-build.xml "${S}"/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 -} - -src_test() { - java-pkg-2_src_test -} diff --git a/dev-java/slf4j-simple/Manifest b/dev-java/slf4j-simple/Manifest deleted file mode 100644 index b0afcf9..0000000 --- a/dev-java/slf4j-simple/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST slf4j-1.7.30.tar.gz 2272772 BLAKE2B c6692a20406983fa333bdb27bf8da599140d7d37fe55da6dfa2c2aff1825ee57c9d6b7bf0015e4b41b3c15ac0971559b3dd4bb5244e5393cd209ee26fac5e93d SHA512 4f05c996532560b16f22d78fcd47f8c4ba14691ce218a51ee6d50b283a51f8e40475a3a47f1117c1898a7be922e3f85806c4a7eb526759f0e7ea8426b5c6035f diff --git a/dev-java/slf4j-simple/files/1.7.30-build.xml b/dev-java/slf4j-simple/files/1.7.30-build.xml deleted file mode 100644 index dc2d4dc..0000000 --- a/dev-java/slf4j-simple/files/1.7.30-build.xml +++ /dev/null @@ -1,226 +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-simple/metadata.xml b/dev-java/slf4j-simple/metadata.xml deleted file mode 100644 index 37998bf..0000000 --- a/dev-java/slf4j-simple/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - java@gentoo.org - Java - - 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 8b6da56..0000000 --- a/dev-java/slf4j-simple/slf4j-simple-1.7.30.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -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="https://github.com/qos-ch/slf4j/archive/v_${PV}.tar.gz -> ${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.8 - ${CDEPEND}" -DEPEND=">=virtual/jdk-1.8 - ${CDEPEND} - test? ( - dev-java/junit:4 - dev-java/ant-junit:0 - )" - -S="${WORKDIR}/${PN/-simple/}-v_${PV}/${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}" - -src_prepare() { - cp "${FILESDIR}"/"${PV}"-build.xml build.xml || die - java-pkg-2_src_prepare -} - -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 -}