| 1 |
commit: e55b6f037bdb41eae1559ecb953865d39a71105e |
| 2 |
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed May 4 08:11:29 2022 +0000 |
| 4 |
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed May 4 08:13:46 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e55b6f03 |
| 7 |
|
| 8 |
dev-java/log4j: treeclean |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/828657 |
| 11 |
Bug: https://bugs.gentoo.org/719146 |
| 12 |
Bug: https://bugs.gentoo.org/829192 |
| 13 |
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org> |
| 14 |
|
| 15 |
dev-java/log4j/Manifest | 1 - |
| 16 |
dev-java/log4j/log4j-1.2.17-r3.ebuild | 70 ----------------------------------- |
| 17 |
dev-java/log4j/metadata.xml | 12 ------ |
| 18 |
profiles/package.mask | 6 --- |
| 19 |
4 files changed, 89 deletions(-) |
| 20 |
|
| 21 |
diff --git a/dev-java/log4j/Manifest b/dev-java/log4j/Manifest |
| 22 |
deleted file mode 100644 |
| 23 |
index a0ee5600d166..000000000000 |
| 24 |
--- a/dev-java/log4j/Manifest |
| 25 |
+++ /dev/null |
| 26 |
@@ -1 +0,0 @@ |
| 27 |
-DIST log4j-1.2.17.tar.gz 2864448 BLAKE2B 233763dbe53f92b5408d3e278b291dff8a7d74657f367ec8b7c7ae1e685ddc0170783c8a5e4b48ec2590b6dda13f45e91bd66066f2c6b515e5d692caca31660b SHA512 7df8dca721f960b9fd22dd5f642dbe7d89167f167aa11604c5f9fe54d649a26dd05af88d7188b47abfb91d501535a4b3665dd84d7e0058ef77159713a10b5af8 |
| 28 |
|
| 29 |
diff --git a/dev-java/log4j/log4j-1.2.17-r3.ebuild b/dev-java/log4j/log4j-1.2.17-r3.ebuild |
| 30 |
deleted file mode 100644 |
| 31 |
index ee8247958b42..000000000000 |
| 32 |
--- a/dev-java/log4j/log4j-1.2.17-r3.ebuild |
| 33 |
+++ /dev/null |
| 34 |
@@ -1,70 +0,0 @@ |
| 35 |
-# Copyright 1999-2021 Gentoo Authors |
| 36 |
-# Distributed under the terms of the GNU General Public License v2 |
| 37 |
- |
| 38 |
-EAPI=5 |
| 39 |
- |
| 40 |
-JAVA_PKG_IUSE="doc source" |
| 41 |
-MAVEN_ID="log4j:log4j:1.2.17" |
| 42 |
- |
| 43 |
-inherit java-pkg-2 java-ant-2 |
| 44 |
- |
| 45 |
-DESCRIPTION="A low-overhead robust logging package for Java" |
| 46 |
-SRC_URI="mirror://apache/logging/${PN}/${PV}/${P}.tar.gz" |
| 47 |
-HOMEPAGE="http://logging.apache.org/log4j/" |
| 48 |
-LICENSE="Apache-2.0" |
| 49 |
-SLOT="0" |
| 50 |
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux" |
| 51 |
-IUSE="javamail jms" |
| 52 |
- |
| 53 |
-CDEPEND=" |
| 54 |
- javamail? ( dev-java/oracle-javamail:0 ) |
| 55 |
- jms? ( java-virtuals/jms:0 )" |
| 56 |
- |
| 57 |
-RDEPEND=" |
| 58 |
- ${CDEPEND} |
| 59 |
- >=virtual/jre-1.6" |
| 60 |
- |
| 61 |
-DEPEND=" |
| 62 |
- ${CDEPEND} |
| 63 |
- >=virtual/jdk-1.6" |
| 64 |
- |
| 65 |
-MY_P="apache-${P}" |
| 66 |
-S="${WORKDIR}/${MY_P}" |
| 67 |
- |
| 68 |
-src_prepare() { |
| 69 |
- default |
| 70 |
- java-pkg_clean |
| 71 |
-} |
| 72 |
- |
| 73 |
-JAVA_ANT_REWRITE_CLASSPATH="true" |
| 74 |
-JAVA_ANT_IGNORE_SYSTEM_CLASSES="true" |
| 75 |
-EANT_BUILD_TARGET="log4j.jar" |
| 76 |
-EANT_EXTRA_ARGS="-Djaxp-present=true -Djmx-present=true" |
| 77 |
-EANT_DOC_TARGET="" |
| 78 |
- |
| 79 |
-src_compile() { |
| 80 |
- if use javamail; then |
| 81 |
- EANT_GENTOO_CLASSPATH+="oracle-javamail" |
| 82 |
- EANT_EXTRA_ARGS+=" -Djavamail-present=true" |
| 83 |
- fi |
| 84 |
- |
| 85 |
- if use jms; then |
| 86 |
- EANT_EXTRA_ARGS+=" -Djms-present=true -Djms.jar=$(java-pkg_getjars jms)" |
| 87 |
- fi |
| 88 |
- |
| 89 |
- java-pkg-2_src_compile |
| 90 |
-} |
| 91 |
- |
| 92 |
-src_install() { |
| 93 |
- java-pkg_newjar dist/lib/${PN}-1.2.17.jar ${PN}.jar |
| 94 |
- |
| 95 |
- if use doc; then |
| 96 |
- java-pkg_dohtml -r site/* |
| 97 |
- rm -fr "${ED}/usr/share/doc/${PF}/html/apidocs" |
| 98 |
- java-pkg_dojavadoc --symlink apidocs site/apidocs |
| 99 |
- fi |
| 100 |
- |
| 101 |
- if use source; then |
| 102 |
- java-pkg_dosrc src/main/java/* |
| 103 |
- fi |
| 104 |
-} |
| 105 |
|
| 106 |
diff --git a/dev-java/log4j/metadata.xml b/dev-java/log4j/metadata.xml |
| 107 |
deleted file mode 100644 |
| 108 |
index 4b4a9d327361..000000000000 |
| 109 |
--- a/dev-java/log4j/metadata.xml |
| 110 |
+++ /dev/null |
| 111 |
@@ -1,12 +0,0 @@ |
| 112 |
-<?xml version="1.0" encoding="UTF-8"?> |
| 113 |
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> |
| 114 |
-<pkgmetadata> |
| 115 |
- <maintainer type="project"> |
| 116 |
- <email>java@g.o</email> |
| 117 |
- <name>Java</name> |
| 118 |
- </maintainer> |
| 119 |
- <use> |
| 120 |
- <flag name="javamail">Build the SMTPAppender</flag> |
| 121 |
- <flag name="jms">Build the JMSAppender</flag> |
| 122 |
- </use> |
| 123 |
-</pkgmetadata> |
| 124 |
|
| 125 |
diff --git a/profiles/package.mask b/profiles/package.mask |
| 126 |
index 64d0796ffda5..ce8c1c356fa9 100644 |
| 127 |
--- a/profiles/package.mask |
| 128 |
+++ b/profiles/package.mask |
| 129 |
@@ -364,12 +364,6 @@ app-misc/ttysnoop |
| 130 |
# Removal in 30 days. |
| 131 |
net-misc/jrdesktop |
| 132 |
|
| 133 |
-# Volkmar W. Pogatzki <gentoo@××××××××.net> (2022-04-03) |
| 134 |
-# Java library without consumers. |
| 135 |
-# Multiple vulnerabilities (bug #719146). |
| 136 |
-# Removal in 30 days. |
| 137 |
-dev-java/log4j |
| 138 |
- |
| 139 |
# David Seifert <soap@g.o> (2022-03-20) |
| 140 |
# Mask gcc-8 branch (ended upstream support). Please switch |
| 141 |
# to a fresher gcc branch. |
Archives