Gentoo Archives: gentoo-commits

From: "Jakov Smolić" <jsmolic@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/slf4j-log4j12/, profiles/
Date: Wed, 12 Jan 2022 10:09:17
Message-Id: 1641982116.8055f76407c950e6b2e6e424b7c48d71c4d0ad98.jsmolic@gentoo
1 commit: 8055f76407c950e6b2e6e424b7c48d71c4d0ad98
2 Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jan 12 10:07:31 2022 +0000
4 Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
5 CommitDate: Wed Jan 12 10:08:36 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8055f764
7
8 dev-java/slf4j-log4j12: treeclean
9
10 Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
11
12 dev-java/slf4j-log4j12/Manifest | 1 -
13 dev-java/slf4j-log4j12/metadata.xml | 8 ---
14 dev-java/slf4j-log4j12/slf4j-log4j12-1.7.30.ebuild | 73 ----------------------
15 profiles/package.mask | 5 --
16 4 files changed, 87 deletions(-)
17
18 diff --git a/dev-java/slf4j-log4j12/Manifest b/dev-java/slf4j-log4j12/Manifest
19 deleted file mode 100644
20 index 483c3d5a5aac..000000000000
21 --- a/dev-java/slf4j-log4j12/Manifest
22 +++ /dev/null
23 @@ -1 +0,0 @@
24 -DIST slf4j-1.7.30-sources.tar.gz 2272772 BLAKE2B c6692a20406983fa333bdb27bf8da599140d7d37fe55da6dfa2c2aff1825ee57c9d6b7bf0015e4b41b3c15ac0971559b3dd4bb5244e5393cd209ee26fac5e93d SHA512 4f05c996532560b16f22d78fcd47f8c4ba14691ce218a51ee6d50b283a51f8e40475a3a47f1117c1898a7be922e3f85806c4a7eb526759f0e7ea8426b5c6035f
25
26 diff --git a/dev-java/slf4j-log4j12/metadata.xml b/dev-java/slf4j-log4j12/metadata.xml
27 deleted file mode 100644
28 index 6021501589e0..000000000000
29 --- a/dev-java/slf4j-log4j12/metadata.xml
30 +++ /dev/null
31 @@ -1,8 +0,0 @@
32 -<?xml version="1.0" encoding="UTF-8"?>
33 -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
34 -<pkgmetadata>
35 -<maintainer type="project">
36 - <email>java@g.o</email>
37 - <name>Java</name>
38 -</maintainer>
39 -</pkgmetadata>
40
41 diff --git a/dev-java/slf4j-log4j12/slf4j-log4j12-1.7.30.ebuild b/dev-java/slf4j-log4j12/slf4j-log4j12-1.7.30.ebuild
42 deleted file mode 100644
43 index cd3336b11a69..000000000000
44 --- a/dev-java/slf4j-log4j12/slf4j-log4j12-1.7.30.ebuild
45 +++ /dev/null
46 @@ -1,73 +0,0 @@
47 -# Copyright 1999-2021 Gentoo Authors
48 -# Distributed under the terms of the GNU General Public License v2
49 -
50 -# Skeleton command:
51 -# 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
52 -
53 -EAPI=7
54 -
55 -JAVA_PKG_IUSE="doc source test"
56 -MAVEN_ID="org.slf4j:slf4j-log4j12:1.7.30"
57 -JAVA_TESTING_FRAMEWORKS="junit-4"
58 -
59 -inherit java-pkg-2 java-pkg-simple
60 -
61 -DESCRIPTION="SLF4J LOG4J-12 Binding"
62 -HOMEPAGE="https://www.slf4j.org"
63 -SRC_URI="https://github.com/qos-ch/slf4j/archive/refs/tags/v_${PV}.tar.gz -> slf4j-${PV}-sources.tar.gz"
64 -
65 -LICENSE="MIT"
66 -SLOT="0"
67 -KEYWORDS="amd64 ~arm64 ~ppc64 x86"
68 -
69 -# slf4j-v_1.7.30/slf4j-log4j12/src/test/java/org/slf4j/impl/Log4j12MultithreadedInitializationTest.java:35: error: cannot find symbol
70 -# import org.slf4j.helpers.MultithreadedInitializationTest;
71 -# ^
72 -# symbol: class MultithreadedInitializationTest
73 -RESTRICT="test"
74 -
75 -# Common dependencies
76 -# POM: slf4j-v_${PV}/${PN}/pom.xml
77 -# log4j:log4j:1.2.17 -> >=dev-java/log4j-1.2.17:0
78 -# org.slf4j:slf4j-api:1.7.30 -> >=dev-java/slf4j-api-1.7.30:0
79 -
80 -CDEPEND="
81 - >=dev-java/log4j-1.2.17:0
82 - >=dev-java/slf4j-api-1.7.30:0
83 -"
84 -
85 -# Compile dependencies
86 -# POM: slf4j-v_${PV}/${PN}/pom.xml
87 -# test? junit:junit:4.12 -> >=dev-java/junit-4.12:4
88 -# test? org.slf4j:slf4j-api:1.7.30 -> >=dev-java/slf4j-api-1.7.30:0
89 -
90 -DEPEND="
91 - >=virtual/jdk-1.8:*
92 - ${CDEPEND}
93 - test? (
94 - >=dev-java/slf4j-api-1.7.30:0
95 - )
96 -"
97 -
98 -RDEPEND="
99 - >=virtual/jre-1.8:*
100 - ${CDEPEND}"
101 -
102 -S="${WORKDIR}"
103 -
104 -JAVA_GENTOO_CLASSPATH="log4j,slf4j-api"
105 -JAVA_SRC_DIR="slf4j-v_${PV}/${PN}/src/main/java"
106 -JAVA_RESOURCE_DIRS=(
107 - "slf4j-v_${PV}/${PN}/src/main/resources"
108 -)
109 -
110 -JAVA_TEST_GENTOO_CLASSPATH="junit-4,slf4j-api"
111 -JAVA_TEST_SRC_DIR="slf4j-v_${PV}/${PN}/src/test/java"
112 -JAVA_TEST_RESOURCE_DIRS=(
113 - "slf4j-v_${PV}/${PN}/src/test/resources"
114 -)
115 -
116 -src_prepare() {
117 - default
118 - java-pkg_clean
119 -}
120
121 diff --git a/profiles/package.mask b/profiles/package.mask
122 index 895f02a2eef8..792c7114c697 100644
123 --- a/profiles/package.mask
124 +++ b/profiles/package.mask
125 @@ -234,11 +234,6 @@ net-fs/docker-volume-netshare
126 # Masked for testing
127 ~sci-libs/vtk-9.1.0
128
129 -# Volkmar W. Pogatzki <gentoo@××××××××.net> (2021-12-13)
130 -# Blocks removal of dev-java/log4j:0 bug #828657.
131 -# Java packages with no active consumer. Removal in 30 days.
132 -dev-java/slf4j-log4j12
133 -
134 # Volkmar W. Pogatzki <gentoo@××××××××.net> (2021-12-12)
135 # log4j-2.15.0 depends on masked >=virtual/{jdk,jre}-11
136 >=dev-java/log4j-api-java9-2.15.0