commit: 8055f76407c950e6b2e6e424b7c48d71c4d0ad98 Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> AuthorDate: Wed Jan 12 10:07:31 2022 +0000 Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> CommitDate: Wed Jan 12 10:08:36 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8055f764
dev-java/slf4j-log4j12: treeclean Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org> dev-java/slf4j-log4j12/Manifest | 1 - dev-java/slf4j-log4j12/metadata.xml | 8 --- dev-java/slf4j-log4j12/slf4j-log4j12-1.7.30.ebuild | 73 ---------------------- profiles/package.mask | 5 -- 4 files changed, 87 deletions(-) diff --git a/dev-java/slf4j-log4j12/Manifest b/dev-java/slf4j-log4j12/Manifest deleted file mode 100644 index 483c3d5a5aac..000000000000 --- a/dev-java/slf4j-log4j12/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST slf4j-1.7.30-sources.tar.gz 2272772 BLAKE2B c6692a20406983fa333bdb27bf8da599140d7d37fe55da6dfa2c2aff1825ee57c9d6b7bf0015e4b41b3c15ac0971559b3dd4bb5244e5393cd209ee26fac5e93d SHA512 4f05c996532560b16f22d78fcd47f8c4ba14691ce218a51ee6d50b283a51f8e40475a3a47f1117c1898a7be922e3f85806c4a7eb526759f0e7ea8426b5c6035f diff --git a/dev-java/slf4j-log4j12/metadata.xml b/dev-java/slf4j-log4j12/metadata.xml deleted file mode 100644 index 6021501589e0..000000000000 --- a/dev-java/slf4j-log4j12/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> -<maintainer type="project"> - <email>j...@gentoo.org</email> - <name>Java</name> -</maintainer> -</pkgmetadata> 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 cd3336b11a69..000000000000 --- a/dev-java/slf4j-log4j12/slf4j-log4j12-1.7.30.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 slf4j-v_1.7.30/slf4j-log4j12/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-log4j12-1.7.30.ebuild - -EAPI=7 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="org.slf4j:slf4j-log4j12:1.7.30" -JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="SLF4J LOG4J-12 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-log4j12/src/test/java/org/slf4j/impl/Log4j12MultithreadedInitializationTest.java:35: error: cannot find symbol -# import org.slf4j.helpers.MultithreadedInitializationTest; -# ^ -# symbol: class MultithreadedInitializationTest -RESTRICT="test" - -# Common dependencies -# POM: slf4j-v_${PV}/${PN}/pom.xml -# log4j:log4j:1.2.17 -> >=dev-java/log4j-1.2.17:0 -# org.slf4j:slf4j-api:1.7.30 -> >=dev-java/slf4j-api-1.7.30:0 - -CDEPEND=" - >=dev-java/log4j-1.2.17:0 - >=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="log4j,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 -} diff --git a/profiles/package.mask b/profiles/package.mask index 895f02a2eef8..792c7114c697 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -234,11 +234,6 @@ net-fs/docker-volume-netshare # Masked for testing ~sci-libs/vtk-9.1.0 -# Volkmar W. Pogatzki <gen...@pogatzki.net> (2021-12-13) -# Blocks removal of dev-java/log4j:0 bug #828657. -# Java packages with no active consumer. Removal in 30 days. -dev-java/slf4j-log4j12 - # Volkmar W. Pogatzki <gen...@pogatzki.net> (2021-12-12) # log4j-2.15.0 depends on masked >=virtual/{jdk,jre}-11 >=dev-java/log4j-api-java9-2.15.0
