Gentoo Archives: gentoo-commits

From: "Miroslav Šulc" <fordfrog@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/commons-logging/
Date: Wed, 21 Apr 2021 10:00:52
Message-Id: 1618999241.097ceebc70ffed974f1e862b3c7dc85c637a9501.fordfrog@gentoo
1 commit: 097ceebc70ffed974f1e862b3c7dc85c637a9501
2 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
3 AuthorDate: Wed Apr 21 09:45:30 2021 +0000
4 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
5 CommitDate: Wed Apr 21 10:00:41 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=097ceebc
7
8 dev-java/commons-logging: remove obsolete
9
10 Bug: https://bugs.gentoo.org/784767
11 Package-Manager: Portage-3.0.17, Repoman-3.0.2
12 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
13 Closes: https://github.com/gentoo/gentoo/pull/20485
14 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
15
16 .../commons-logging/commons-logging-1.2-r2.ebuild | 82 ----------------------
17 1 file changed, 82 deletions(-)
18
19 diff --git a/dev-java/commons-logging/commons-logging-1.2-r2.ebuild b/dev-java/commons-logging/commons-logging-1.2-r2.ebuild
20 deleted file mode 100644
21 index 3c903e12ee7..00000000000
22 --- a/dev-java/commons-logging/commons-logging-1.2-r2.ebuild
23 +++ /dev/null
24 @@ -1,82 +0,0 @@
25 -# Copyright 1999-2021 Gentoo Authors
26 -# Distributed under the terms of the GNU General Public License v2
27 -
28 -EAPI=6
29 -
30 -JAVA_PKG_IUSE="doc source"
31 -MAVEN_ID="commons-logging:commons-logging:1.2"
32 -
33 -inherit java-pkg-2 java-ant-2 java-osgi
34 -
35 -DESCRIPTION="An ultra-thin bridge between different Java logging libraries"
36 -HOMEPAGE="https://commons.apache.org/logging/"
37 -SRC_URI="mirror://apache/commons/logging/source/${P}-src.tar.gz"
38 -
39 -LICENSE="Apache-2.0"
40 -SLOT="0"
41 -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
42 -IUSE="avalon-framework avalon-logkit log4j servletapi test"
43 -RESTRICT="!test? ( test ) !servletapi? ( test )"
44 -
45 -CDEPEND="
46 - log4j? ( dev-java/log4j:0 )
47 - servletapi? ( java-virtuals/servlet-api:3.1 )
48 - avalon-logkit? ( dev-java/avalon-logkit:2.0 )
49 - avalon-framework? ( dev-java/avalon-framework:4.2 )"
50 -
51 -RDEPEND="
52 - ${CDEPEND}
53 - >=virtual/jre-1.6"
54 -
55 -DEPEND="
56 - ${CDEPEND}
57 - >=virtual/jdk-1.6
58 - test? ( dev-java/ant-junit:0 )"
59 -
60 -S="${WORKDIR}/${P}-src"
61 -
62 -EANT_BUILD_TARGET="compile"
63 -JAVA_ANT_REWRITE_CLASSPATH="yes"
64 -JAVA_ANT_IGNORE_SYSTEM_CLASSES="yes"
65 -
66 -DOCS=( RELEASE-NOTES.txt PROPOSAL.html )
67 -
68 -src_prepare() {
69 - default
70 -
71 - eapply "${FILESDIR}/${P}-gentoo.patch"
72 - # patch to make the build.xml respect no servletapi
73 - eapply "${FILESDIR}/${P}-servletapi.patch"
74 -
75 - # bug #208098
76 - echo "jdk.1.4.present=true" > build.properties || die
77 -
78 - if use avalon-framework; then
79 - echo "avalon-framework.jar=$(java-pkg_getjars avalon-framework-4.2)" >> build.properties || die
80 - fi
81 - if use avalon-logkit; then
82 - echo "logkit.jar=$(java-pkg_getjars avalon-logkit-2.0)" >> build.properties || die
83 - fi
84 - if use log4j; then
85 - echo "log4j12.jar=$(java-pkg_getjars log4j)" >> build.properties || die
86 - fi
87 -
88 - if use servletapi; then
89 - echo "servletapi.jar=$(java-pkg_getjar --virtual servlet-api-3.1 servlet-api.jar)" >> build.properties || die
90 - fi
91 -}
92 -
93 -src_install() {
94 - local pkg=org.apache.commons.logging
95 - java-osgi_newjar "target/${P}.jar" "${pkg}" "Apache Commons Logging" "${pkg};version=\"${PV}\", ${pkg}.impl;version=\"${PV}\""
96 - java-pkg_newjar target/${PN}-api-${PV}.jar ${PN}-api.jar
97 - java-pkg_newjar target/${PN}-adapters-${PV}.jar ${PN}-adapters.jar
98 -
99 - einstalldocs
100 - use doc && java-pkg_dojavadoc target/docs/
101 - use source && java-pkg_dosrc src/main/java/org
102 -}
103 -
104 -src_test() {
105 - java-pkg-2_src_test
106 -}