[gentoo-commits] repo/gentoo:master commit in: dev-java/log4j/, profiles/

[gentoo-commits] repo/gentoo:master commit in: dev-java/log4j/, profiles/

[Jakov Smolić]

commit:     e55b6f037bdb41eae1559ecb953865d39a71105e
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Wed May  4 08:11:29 2022 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Wed May  4 08:13:46 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e55b6f03

dev-java/log4j: treeclean

Bug: https://bugs.gentoo.org/828657
Bug: https://bugs.gentoo.org/719146
Bug: https://bugs.gentoo.org/829192
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 dev-java/log4j/Manifest               |  1 -
 dev-java/log4j/log4j-1.2.17-r3.ebuild | 70 -----------------------------------
 dev-java/log4j/metadata.xml           | 12 ------
 profiles/package.mask                 |  6 ---
 4 files changed, 89 deletions(-)

diff --git a/dev-java/log4j/Manifest b/dev-java/log4j/Manifest
deleted file mode 100644
index a0ee5600d166..000000000000
--- a/dev-java/log4j/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST log4j-1.2.17.tar.gz 2864448 BLAKE2B 233763dbe53f92b5408d3e278b291dff8a7d74657f367ec8b7c7ae1e685ddc0170783c8a5e4b48ec2590b6dda13f45e91bd66066f2c6b515e5d692caca31660b SHA512 7df8dca721f960b9fd22dd5f642dbe7d89167f167aa11604c5f9fe54d649a26dd05af88d7188b47abfb91d501535a4b3665dd84d7e0058ef77159713a10b5af8

diff --git a/dev-java/log4j/log4j-1.2.17-r3.ebuild b/dev-java/log4j/log4j-1.2.17-r3.ebuild
deleted file mode 100644
index ee8247958b42..000000000000
--- a/dev-java/log4j/log4j-1.2.17-r3.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="log4j:log4j:1.2.17"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A low-overhead robust logging package for Java"
-SRC_URI="mirror://apache/logging/${PN}/${PV}/${P}.tar.gz"
-HOMEPAGE="http://logging.apache.org/log4j/"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux"
-IUSE="javamail jms"
-
-CDEPEND="
-	javamail? ( dev-java/oracle-javamail:0 )
-	jms? ( java-virtuals/jms:0 )"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.6"
-
-MY_P="apache-${P}"
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	java-pkg_clean
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-JAVA_ANT_IGNORE_SYSTEM_CLASSES="true"
-EANT_BUILD_TARGET="log4j.jar"
-EANT_EXTRA_ARGS="-Djaxp-present=true -Djmx-present=true"
-EANT_DOC_TARGET=""
-
-src_compile() {
-	if use javamail; then
-		EANT_GENTOO_CLASSPATH+="oracle-javamail"
-		EANT_EXTRA_ARGS+=" -Djavamail-present=true"
-	fi
-
-	if use jms; then
-		EANT_EXTRA_ARGS+=" -Djms-present=true -Djms.jar=$(java-pkg_getjars jms)"
-	fi
-
-	java-pkg-2_src_compile
-}
-
-src_install() {
-	java-pkg_newjar dist/lib/${PN}-1.2.17.jar ${PN}.jar
-
-	if use doc; then
-		java-pkg_dohtml -r site/*
-		rm -fr "${ED}/usr/share/doc/${PF}/html/apidocs"
-		java-pkg_dojavadoc --symlink apidocs site/apidocs
-	fi
-
-	if use source; then
-		java-pkg_dosrc src/main/java/*
-	fi
-}

diff --git a/dev-java/log4j/metadata.xml b/dev-java/log4j/metadata.xml
deleted file mode 100644
index 4b4a9d327361..000000000000
--- a/dev-java/log4j/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>java@gentoo.org</email>
-    <name>Java</name>
-  </maintainer>
-  <use>
-    <flag name="javamail">Build the SMTPAppender</flag>
-    <flag name="jms">Build the JMSAppender</flag>
-  </use>
-</pkgmetadata>

diff --git a/profiles/package.mask b/profiles/package.mask
index 64d0796ffda5..ce8c1c356fa9 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -364,12 +364,6 @@ app-misc/ttysnoop
 # Removal in 30 days.
 net-misc/jrdesktop
 
-# Volkmar W. Pogatzki <gentoo@pogatzki.net> (2022-04-03)
-# Java library without consumers.
-# Multiple vulnerabilities (bug #719146).
-# Removal in 30 days.
-dev-java/log4j
-
 # David Seifert <soap@gentoo.org> (2022-03-20)
 # Mask gcc-8 branch (ended upstream support). Please switch
 # to a fresher gcc branch.