1 |
commit: a5e68f7eff5d7c836a1b977d2c2eab5749870ef7 |
2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Apr 26 21:44:59 2016 +0000 |
4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Apr 26 21:47:44 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5e68f7e |
7 |
|
8 |
dev-java/commons-logging: Use newer deps, fix tests, general tidy up |
9 |
|
10 |
- Use newer avalon-logkit so we can kill 1.2 |
11 |
- Use newer servlet-api because it's very compatible |
12 |
- log4j 1.3 was never actually released |
13 |
- java-pkg-2_src_test isn't called automatically |
14 |
- jikes is dead and we don't really support other compilers anyway |
15 |
|
16 |
Package-Manager: portage-2.2.28 |
17 |
|
18 |
.../commons-logging/commons-logging-1.2-r1.ebuild | 66 ++++++++++++++++++++++ |
19 |
1 file changed, 66 insertions(+) |
20 |
|
21 |
diff --git a/dev-java/commons-logging/commons-logging-1.2-r1.ebuild b/dev-java/commons-logging/commons-logging-1.2-r1.ebuild |
22 |
new file mode 100644 |
23 |
index 0000000..0dc2cc8 |
24 |
--- /dev/null |
25 |
+++ b/dev-java/commons-logging/commons-logging-1.2-r1.ebuild |
26 |
@@ -0,0 +1,66 @@ |
27 |
+# Copyright 1999-2016 Gentoo Foundation |
28 |
+# Distributed under the terms of the GNU General Public License v2 |
29 |
+# $Id$ |
30 |
+ |
31 |
+EAPI="5" |
32 |
+ |
33 |
+JAVA_PKG_IUSE="doc source" |
34 |
+ |
35 |
+inherit java-pkg-2 java-ant-2 java-osgi |
36 |
+ |
37 |
+DESCRIPTION="An ultra-thin bridge between different Java logging libraries" |
38 |
+HOMEPAGE="http://commons.apache.org/logging/" |
39 |
+SRC_URI="mirror://apache/commons/logging/source/${P}-src.tar.gz" |
40 |
+LICENSE="Apache-2.0" |
41 |
+SLOT="0" |
42 |
+KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
43 |
+IUSE="avalon-framework avalon-logkit log4j servletapi test" |
44 |
+RESTRICT="!servletapi? ( test )" |
45 |
+ |
46 |
+CDEPEND="avalon-framework? ( dev-java/avalon-framework:4.2 ) |
47 |
+ avalon-logkit? ( dev-java/avalon-logkit:2.0 ) |
48 |
+ log4j? ( dev-java/log4j:0 ) |
49 |
+ servletapi? ( java-virtuals/servlet-api:3.1 )" |
50 |
+ |
51 |
+RDEPEND="${CDEPEND} |
52 |
+ >=virtual/jre-1.6" |
53 |
+ |
54 |
+DEPEND="${CDEPEND} |
55 |
+ >=virtual/jdk-1.6 |
56 |
+ test? ( dev-java/ant-junit:0 )" |
57 |
+ |
58 |
+S="${WORKDIR}/${P}-src" |
59 |
+ |
60 |
+EANT_BUILD_TARGET="compile" |
61 |
+JAVA_ANT_REWRITE_CLASSPATH="yes" |
62 |
+JAVA_ANT_IGNORE_SYSTEM_CLASSES="yes" |
63 |
+ |
64 |
+java_prepare() { |
65 |
+ epatch "${FILESDIR}/${P}-gentoo.patch" |
66 |
+ # patch to make the build.xml respect no servletapi |
67 |
+ epatch "${FILESDIR}/${P}-servletapi.patch" |
68 |
+ |
69 |
+ # bug #208098 |
70 |
+ echo "jdk.1.4.present=true" > build.properties |
71 |
+ |
72 |
+ use avalon-framework && echo "avalon-framework.jar=$(java-pkg_getjars avalon-framework-4.2)" >> build.properties |
73 |
+ use avalon-logkit && echo "logkit.jar=$(java-pkg_getjars avalon-logkit-2.0)" >> build.properties |
74 |
+ use log4j && echo "log4j12.jar=$(java-pkg_getjars log4j)" >> build.properties |
75 |
+ use servletapi && echo "servletapi.jar=$(java-pkg_getjar --virtual servlet-api-3.1 servlet-api.jar)" >> build.properties |
76 |
+} |
77 |
+ |
78 |
+src_install() { |
79 |
+ local pkg=org.apache.commons.logging |
80 |
+ java-osgi_newjar "target/${P}.jar" "${pkg}" "Apache Commons Logging" "${pkg};version=\"${PV}\", ${pkg}.impl;version=\"${PV}\"" |
81 |
+ java-pkg_newjar target/${PN}-api-${PV}.jar ${PN}-api.jar |
82 |
+ java-pkg_newjar target/${PN}-adapters-${PV}.jar ${PN}-adapters.jar |
83 |
+ |
84 |
+ dodoc RELEASE-NOTES.txt || die |
85 |
+ dohtml PROPOSAL.html || die |
86 |
+ use doc && java-pkg_dojavadoc target/docs/ |
87 |
+ use source && java-pkg_dosrc src/main/java/org |
88 |
+} |
89 |
+ |
90 |
+src_test() { |
91 |
+ java-pkg-2_src_test |
92 |
+} |