Gentoo Archives: gentoo-commits

From: Arthur Zamarin <arthurzam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/commons-logging/
Date: Thu, 31 Mar 2022 18:58:18
Message-Id: 1648753080.eb4d2ad987eae9741590ec2de985da00c887c776.arthurzam@gentoo
1 commit: eb4d2ad987eae9741590ec2de985da00c887c776
2 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
3 AuthorDate: Thu Mar 31 17:19:31 2022 +0000
4 Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
5 CommitDate: Thu Mar 31 18:58:00 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb4d2ad9
7
8 dev-java/commons-logging: Drop 1.2-r3
9
10 Package-Manager: Portage-3.0.30, Repoman-3.0.3
11 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
12 Closes: https://github.com/gentoo/gentoo/pull/24834
13 Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
14
15 .../commons-logging/commons-logging-1.2-r3.ebuild | 83 ----------------------
16 1 file changed, 83 deletions(-)
17
18 diff --git a/dev-java/commons-logging/commons-logging-1.2-r3.ebuild b/dev-java/commons-logging/commons-logging-1.2-r3.ebuild
19 deleted file mode 100644
20 index 4635bb99ffe2..000000000000
21 --- a/dev-java/commons-logging/commons-logging-1.2-r3.ebuild
22 +++ /dev/null
23 @@ -1,83 +0,0 @@
24 -# Copyright 1999-2022 Gentoo Authors
25 -# Distributed under the terms of the GNU General Public License v2
26 -
27 -EAPI=7
28 -
29 -JAVA_PKG_IUSE="doc source"
30 -MAVEN_ID="commons-logging:commons-logging:1.2"
31 -
32 -inherit java-pkg-2 java-ant-2 java-osgi
33 -
34 -DESCRIPTION="An ultra-thin bridge between different Java logging libraries"
35 -HOMEPAGE="https://commons.apache.org/logging/"
36 -SRC_URI="mirror://apache/commons/logging/source/${P}-src.tar.gz"
37 -
38 -LICENSE="Apache-2.0"
39 -SLOT="0"
40 -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
41 -IUSE="avalon-framework avalon-logkit log4j servletapi test"
42 -REQUIRED_USE="doc? ( avalon-framework avalon-logkit log4j servletapi )"
43 -RESTRICT="!test? ( test ) !servletapi? ( test )"
44 -
45 -CDEPEND="
46 - avalon-logkit? ( dev-java/avalon-logkit:2.0 )
47 - avalon-framework? ( dev-java/avalon-framework:4.2 )
48 - log4j? ( dev-java/log4j:0 )
49 - servletapi? ( dev-java/tomcat-servlet-api:4.0 )"
50 -
51 -RDEPEND="
52 - ${CDEPEND}
53 - >=virtual/jre-1.8:*"
54 -
55 -DEPEND="
56 - ${CDEPEND}
57 - >=virtual/jdk-1.8:*
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 tomcat-servlet-api-4.0 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 -}