Gentoo Archives: gentoo-commits

From: Florian Schmaus <flow@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/log4j-api/
Date: Wed, 02 Feb 2022 09:12:43
Message-Id: 1643793154.a0d20238cdcf3f754bcfecd452451740d78c9bb0.flow@gentoo
1 commit: a0d20238cdcf3f754bcfecd452451740d78c9bb0
2 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
3 AuthorDate: Wed Dec 29 12:30:52 2021 +0000
4 Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 2 09:12:34 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0d20238
7
8 dev-java/log4j-api: Drop 2.15.0
9
10 Closes: https://bugs.gentoo.org/829065
11 Package-Manager: Portage-3.0.28, Repoman-3.0.3
12 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
13 Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
14
15 dev-java/log4j-api/Manifest | 1 -
16 dev-java/log4j-api/log4j-api-2.15.0.ebuild | 82 ------------------------------
17 2 files changed, 83 deletions(-)
18
19 diff --git a/dev-java/log4j-api/Manifest b/dev-java/log4j-api/Manifest
20 index 06f259dad061..c2ad720f37fa 100644
21 --- a/dev-java/log4j-api/Manifest
22 +++ b/dev-java/log4j-api/Manifest
23 @@ -1,2 +1 @@
24 -DIST apache-log4j-2.15.0-src.tar.gz 11550453 BLAKE2B 3b7a356714fbff0ad81f633750a45f6b3869df933c89c22b28346e49c6dfb83002ecf6374d04b1ae6a45b5486314654c8a660f3aee7a6b30273439e44db2c610 SHA512 61574722ab0a24bd0301fea57504a645f98f0e5913d1e02e49d25b3dcbf2dcbb3153cfca58fdde632087f94edc8e83820951288ba494234954ab4eeeb6b8be6a
25 DIST apache-log4j-2.17.1-src.tar.gz 11602282 BLAKE2B 6e6a69565ee28fc138ddb78258ac30b13a9be3f3baee64c3427b63b059c552d314be3c4a345ea297010d345c4dcb31d154aaea6cd2fc587512c6087c5dfe0745 SHA512 21cdfca54eb0d6af261a5ae89ff98197473d9c0203b0ab530f3aef6c90957bfb95a423983c8a19d7fbab05ec194b6fad8e46628e32270dd8b94ddd194a1cb177
26
27 diff --git a/dev-java/log4j-api/log4j-api-2.15.0.ebuild b/dev-java/log4j-api/log4j-api-2.15.0.ebuild
28 deleted file mode 100644
29 index 10e57a693ca9..000000000000
30 --- a/dev-java/log4j-api/log4j-api-2.15.0.ebuild
31 +++ /dev/null
32 @@ -1,82 +0,0 @@
33 -# Copyright 1999-2021 Gentoo Authors
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -# Skeleton command:
37 -# java-ebuilder --generate-ebuild --workdir . --pom log4j-api/pom.xml --download-uri mirror://apache/logging/log4j/2.15.0/apache-log4j-2.15.0-src.tar.gz --slot 2 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild log4j-api-2.15.0.ebuild
38 -
39 -EAPI=8
40 -
41 -JAVA_PKG_IUSE="doc source test"
42 -MAVEN_ID="org.apache.logging.log4j:log4j-api:2.15.0"
43 -JAVA_TESTING_FRAMEWORKS="junit-vintage junit-jupiter"
44 -
45 -inherit java-pkg-2 java-pkg-simple
46 -
47 -DESCRIPTION="The Apache Log4j API"
48 -HOMEPAGE="https://logging.apache.org/log4j/2.x/"
49 -SRC_URI="mirror://apache/logging/log4j/${PV}/apache-log4j-${PV}-src.tar.gz"
50 -
51 -LICENSE="Apache-2.0"
52 -SLOT="2"
53 -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
54 -
55 -# junit-{jupiter,vintage} is not available in ::gentoo
56 -RESTRICT="test"
57 -
58 -# Compile dependencies
59 -# POM: ${PN}/pom.xml
60 -# org.apache.logging.log4j:log4j-api-java9:2.15.0 -> >=dev-java/log4j-api-java9-2.15.0:2
61 -# org.osgi:org.osgi.core:4.3.1 -> !!!artifactId-not-found!!!
62 -# POM: ${PN}/pom.xml
63 -# test? com.fasterxml.jackson.core:jackson-core:2.12.4 -> !!!groupId-not-found!!!
64 -# test? com.fasterxml.jackson.core:jackson-databind:2.12.4 -> !!!groupId-not-found!!!
65 -# test? org.apache.commons:commons-lang3:3.12.0 -> >=dev-java/commons-lang-3.12.0:3.6
66 -# test? org.apache.felix:org.apache.felix.framework:5.6.12 -> !!!groupId-not-found!!!
67 -# test? org.apache.maven:maven-core:3.6.3 -> !!!groupId-not-found!!!
68 -# test? org.assertj:assertj-core:3.20.2 -> !!!suitable-mavenVersion-not-found!!!
69 -# test? org.eclipse.tycho:org.eclipse.osgi:3.13.0.v20180226-1711 -> !!!groupId-not-found!!!
70 -# test? org.junit.jupiter:junit-jupiter-engine:5.7.2 -> !!!groupId-not-found!!!
71 -# test? org.junit.jupiter:junit-jupiter-migrationsupport:5.7.2 -> !!!groupId-not-found!!!
72 -# test? org.junit.jupiter:junit-jupiter-params:5.7.2 -> !!!groupId-not-found!!!
73 -# test? org.junit.vintage:junit-vintage-engine:5.7.2 -> !!!groupId-not-found!!!
74 -
75 -DEPEND=">=virtual/jdk-11:*
76 - dev-java/osgi-core-api:0
77 - dev-java/log4j-api-java9:2"
78 -# test? (
79 -# !!!groupId-not-found!!!
80 -# !!!suitable-mavenVersion-not-found!!!
81 -# >=dev-java/commons-lang-3.12.0:3.6
82 -# )
83 -#"
84 -
85 -RDEPEND=">=virtual/jre-11:*"
86 -
87 -DOCS=( {CONTRIBUTING,README,RELEASE-NOTES,SECURITY}.md LICENSE.txt )
88 -
89 -S="${WORKDIR}/apache-log4j-${PV}-src"
90 -
91 -JAVA_CLASSPATH_EXTRA="log4j-api-java9-2,osgi-core-api"
92 -JAVA_SRC_DIR="${PN}/src/main/java"
93 -JAVA_RESOURCE_DIRS="${PN}/src/main/resources"
94 -
95 -# JAVA_TEST_GENTOO_CLASSPATH="!!!groupId-not-found!!!,!!!groupId-not-found!!!,commons-lang-3.6,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!suitable-mavenVersion-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!"
96 -# JAVA_TEST_SRC_DIR="${PN}/src/test/java"
97 -# JAVA_TEST_RESOURCE_DIRS=(
98 -# "${PN}/src/test/resources"
99 -# )
100 -
101 -src_prepare() {
102 - default
103 - mkdir -p log4j-api/src/main/resources/META-INF/versions/9 || die
104 - pushd log4j-api/src/main/resources/META-INF/versions/9 || die
105 - jar -xf "$(java-pkg_getjar --build-only log4j-api-java9-2 log4j-api-java9.jar)" \
106 - org/apache/logging/log4j/util module-info.class || die
107 - rm org/apache/logging/log4j/util/{PrivateSecurityManagerStackTraceUtil,PropertySource}.class || die
108 - popd || die
109 -}
110 -
111 -src_install() {
112 - default # https://bugs.gentoo.org/789582
113 - java-pkg-simple_src_install
114 -}