1 |
commit: 07149d583f446ab4f7285b0770460e6ee2fa27e1 |
2 |
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Aug 30 19:32:57 2015 +0000 |
4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Aug 30 19:33:34 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07149d58 |
7 |
|
8 |
dev-java/commons-logging: Remove old. |
9 |
|
10 |
Package-Manager: portage-2.2.18 |
11 |
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org> |
12 |
|
13 |
dev-java/commons-logging/Manifest | 1 - |
14 |
.../commons-logging/commons-logging-1.1.1.ebuild | 74 ---------------------- |
15 |
2 files changed, 75 deletions(-) |
16 |
|
17 |
diff --git a/dev-java/commons-logging/Manifest b/dev-java/commons-logging/Manifest |
18 |
index 69ad80a..7a11d85 100644 |
19 |
--- a/dev-java/commons-logging/Manifest |
20 |
+++ b/dev-java/commons-logging/Manifest |
21 |
@@ -1,2 +1 @@ |
22 |
-DIST commons-logging-1.1.1-src.tar.gz 190670 SHA256 b49a79fa78ebfae15dc46ae6f0144fee6b94ab608a25518c54609d3419909eb2 SHA512 ccba6cb8078807219dfe4a771c2e6f5569190b52ca00a605a0445b53697d9162c62237fc34ead2960146603b018769f406fe9e47b2eefe0d0fb6ad993c669974 WHIRLPOOL b28ad3dcad851ccbe7fffe9968426b67fb3b6a372de85aa6adb055db5f3eaf621d63f81b9bf74dd6d4958fd681b29272898fc6907b5681a431af0772f876ec16 |
23 |
DIST commons-logging-1.2-src.tar.gz 188536 SHA256 49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81 SHA512 9f3761184950f2f13e85d8bc447709ab8be631dfd231b4f053f8147468db1bf71fb116ddba95e39f4afc4cf28c742e07d40c7a637f28004a60dc13935f9609f9 WHIRLPOOL fe31832404d9071d73fba940021ab664998ffa9867a88c2078918547cc6a23a06339f33f5d74f8b6ea5aaeeb86cd94c0aef6c6195e454a651b8fc492a1a6b5f8 |
24 |
|
25 |
diff --git a/dev-java/commons-logging/commons-logging-1.1.1.ebuild b/dev-java/commons-logging/commons-logging-1.1.1.ebuild |
26 |
deleted file mode 100644 |
27 |
index d7ce033..0000000 |
28 |
--- a/dev-java/commons-logging/commons-logging-1.1.1.ebuild |
29 |
+++ /dev/null |
30 |
@@ -1,74 +0,0 @@ |
31 |
-# Copyright 1999-2015 Gentoo Foundation |
32 |
-# Distributed under the terms of the GNU General Public License v2 |
33 |
-# $Id$ |
34 |
- |
35 |
-EAPI="1" |
36 |
-JAVA_PKG_IUSE="doc source test" |
37 |
- |
38 |
-inherit java-pkg-2 java-ant-2 java-osgi |
39 |
- |
40 |
-DESCRIPTION="The Jakarta-Commons Logging package is an ultra-thin bridge between different logging libraries" |
41 |
-HOMEPAGE="http://commons.apache.org/logging/" |
42 |
-SRC_URI="mirror://apache/commons/logging/source/${P}-src.tar.gz" |
43 |
- |
44 |
-LICENSE="Apache-2.0" |
45 |
-SLOT="0" |
46 |
-KEYWORDS="amd64 ppc 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" |
47 |
-IUSE="avalon-logkit log4j servletapi avalon-framework" |
48 |
- |
49 |
-COMMON_DEP=" |
50 |
- avalon-logkit? ( dev-java/avalon-logkit:1.2 ) |
51 |
- log4j? ( dev-java/log4j:0 ) |
52 |
- servletapi? ( java-virtuals/servlet-api:2.3 ) |
53 |
- avalon-framework? ( dev-java/avalon-framework:4.2 )" |
54 |
-# ATTENTION: Add this when log4j-1.3 is out |
55 |
-# =dev-java/log4j-1.3* |
56 |
-RDEPEND=">=virtual/jre-1.4 |
57 |
- ${COMMON_DEP}" |
58 |
-DEPEND=">=virtual/jdk-1.4 |
59 |
- ${COMMON_DEP} |
60 |
- test? ( dev-java/ant-junit:0 )" |
61 |
- |
62 |
-S="${WORKDIR}/${P}-src/" |
63 |
- |
64 |
-RESTRICT="!servletapi? ( test )" |
65 |
- |
66 |
-src_unpack() { |
67 |
- unpack ${A} |
68 |
- cd "${S}" |
69 |
- |
70 |
- epatch "${FILESDIR}/${P}-gentoo.patch" |
71 |
- # patch to make the build.xml respect no servletapi |
72 |
- # TODO file upstream -nichoj |
73 |
- epatch "${FILESDIR}/${P}-servletapi.patch" |
74 |
- |
75 |
- # bug 200918 |
76 |
- java-ant_ignore-system-classes |
77 |
- |
78 |
- # bug #208098 |
79 |
- echo "jdk.1.4.present=true" > build.properties |
80 |
- use log4j && echo "log4j12.jar=$(java-pkg_getjars log4j)" >> build.properties |
81 |
- # ATTENTION: Add this when log4j-1.3 is out (check the SLOT) |
82 |
- #echo "log4j13.jar=$(java-pkg_getjars log4j-1.3)" > build.properties |
83 |
- use avalon-logkit && echo "logkit.jar=$(java-pkg_getjars avalon-logkit-1.2)" >> build.properties |
84 |
- use servletapi && echo "servletapi.jar=$(java-pkg_getjar --virtual servlet-api-2.3 servlet.jar)" >> build.properties |
85 |
- use avalon-framework && echo "avalon-framework.jar=$(java-pkg_getjars avalon-framework-4.2)" >> build.properties |
86 |
- java-pkg_filter-compiler jikes ecj-3.2 |
87 |
- |
88 |
- if use test && ! use servletapi; then |
89 |
- eerror "Tests need use servletapi, tests not executed" |
90 |
- fi |
91 |
-} |
92 |
- |
93 |
-EANT_BUILD_TARGET="compile" |
94 |
- |
95 |
-src_install() { |
96 |
- java-osgi_newjar-fromfile "target/${P}-SNAPSHOT.jar" "${FILESDIR}/${P}-manifest" "Apache Commons Logging" |
97 |
- java-pkg_newjar target/${PN}-api-${PV}-SNAPSHOT.jar ${PN}-api.jar |
98 |
- java-pkg_newjar target/${PN}-adapters-${PV}-SNAPSHOT.jar ${PN}-adapters.jar |
99 |
- |
100 |
- dodoc RELEASE-NOTES.txt || die |
101 |
- dohtml PROPOSAL.html STATUS.html || die |
102 |
- use doc && java-pkg_dojavadoc target/docs/ |
103 |
- use source && java-pkg_dosrc src/java/org |
104 |
-} |