1 |
commit: 623800f098af0dbdc4df647b58863a6393bcbc30 |
2 |
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Apr 29 12:28:00 2016 +0000 |
4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Apr 30 11:14:33 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=623800f0 |
7 |
|
8 |
dev-java/commons-discovery: Clean up old. |
9 |
|
10 |
Package-Manager: portage-2.2.26 |
11 |
|
12 |
dev-java/commons-discovery/Manifest | 1 - |
13 |
.../commons-discovery/commons-discovery-0.4.ebuild | 52 ---------------------- |
14 |
.../commons-discovery/files/0.4-jar-target.patch | 41 ----------------- |
15 |
.../files/commons-discovery-0.2-gentoo.diff | 51 --------------------- |
16 |
4 files changed, 145 deletions(-) |
17 |
|
18 |
diff --git a/dev-java/commons-discovery/Manifest b/dev-java/commons-discovery/Manifest |
19 |
index 52731a0..43c8968 100644 |
20 |
--- a/dev-java/commons-discovery/Manifest |
21 |
+++ b/dev-java/commons-discovery/Manifest |
22 |
@@ -1,2 +1 @@ |
23 |
-DIST commons-discovery-0.4-src.tar.gz 78453 SHA256 596242302be4f0502073f5a934c608289bba6221591e7dbea53ce629f67498a3 SHA512 337db71167534785471b540bd89107a16e146bee4094ed746feb68fd1efa7697c0f629f24e63fb760f6c664d98f35d97ee71ca114a26d17ae078bf27459b1705 WHIRLPOOL 7608a0d99955c464b7a62fab615a6ec5b8a782c59c2dacb2440d2a5f6e681ec998583ffa4af51bdbb08a88c4f66bc4ecf736969a67ca7ff53da3eae6b482031e |
24 |
DIST commons-discovery-0.5.jar 81725 SHA256 c7ff18e5004b7e2bd12f5d1987481849a54188f911ec465c47c32e08580b6d7a SHA512 348e42df5e4e34fdaa49d638018e654119a9d4e2aad967ed2a6f2706e89ffb2ea5daa9ac86747fa1f6d7b245759fac1a80090c571a057be1cdf8cea3514936f3 WHIRLPOOL 6ecf2367a6e71c14acd11a421dccf16239e3c54769fcdf00fed5f8ea5ea922e289acb663549aa5d845833e9b4ddfb29353cee092b1a9dad992e6b92bf957e0d1 |
25 |
|
26 |
diff --git a/dev-java/commons-discovery/commons-discovery-0.4.ebuild b/dev-java/commons-discovery/commons-discovery-0.4.ebuild |
27 |
deleted file mode 100644 |
28 |
index f0585c7..0000000 |
29 |
--- a/dev-java/commons-discovery/commons-discovery-0.4.ebuild |
30 |
+++ /dev/null |
31 |
@@ -1,52 +0,0 @@ |
32 |
-# Copyright 1999-2016 Gentoo Foundation |
33 |
-# Distributed under the terms of the GNU General Public License v2 |
34 |
-# $Id$ |
35 |
- |
36 |
-inherit eutils java-pkg-2 java-ant-2 |
37 |
- |
38 |
-DESCRIPTION="Commons Discovery: Service Discovery component" |
39 |
-HOMEPAGE="http://commons.apache.org/discovery/" |
40 |
-SRC_URI="mirror://apache/jakarta/commons/discovery/source/${P}-src.tar.gz" |
41 |
- |
42 |
-LICENSE="Apache-2.0" |
43 |
-SLOT="0" |
44 |
-KEYWORDS="amd64 x86" |
45 |
-IUSE="doc source test" |
46 |
- |
47 |
-RDEPEND=">=virtual/jre-1.4 |
48 |
- dev-java/commons-logging" |
49 |
- |
50 |
-DEPEND=">=virtual/jdk-1.4 |
51 |
- ${RDEPEND} |
52 |
- dev-java/ant-core |
53 |
- source? ( app-arch/zip ) |
54 |
- test? ( =dev-java/junit-3* )" |
55 |
- |
56 |
-S="${WORKDIR}/${P}-src/" |
57 |
- |
58 |
-src_unpack() { |
59 |
- unpack ${A} |
60 |
- cd "${S}" |
61 |
- # https://issues.apache.org/jira/browse/DISCOVERY-10 |
62 |
- epatch "${FILESDIR}/0.4-jar-target.patch" |
63 |
-} |
64 |
- |
65 |
-src_compile() { |
66 |
- java-pkg-2_src_compile \ |
67 |
- -Dlogger.jar="$(java-pkg_getjar commons-logging commons-logging.jar)" |
68 |
-} |
69 |
- |
70 |
-src_test() { |
71 |
- eant test.discovery \ |
72 |
- -Djunit.jar="$(java-pkg_getjar --build-only junit junit.jar)" \ |
73 |
- -Dlogger.jar="$(java-pkg_getjar commons-logging commons-logging.jar)" |
74 |
-} |
75 |
- |
76 |
-src_install() { |
77 |
- java-pkg_dojar dist/${PN}.jar |
78 |
- |
79 |
- dodoc NOTICE.txt RELEASE-NOTES.txt || die |
80 |
- |
81 |
- use doc && java-pkg_dojavadoc dist/docs/api |
82 |
- use source && java-pkg_dosrc src/java/* |
83 |
-} |
84 |
|
85 |
diff --git a/dev-java/commons-discovery/files/0.4-jar-target.patch b/dev-java/commons-discovery/files/0.4-jar-target.patch |
86 |
deleted file mode 100644 |
87 |
index 7cc3c98..0000000 |
88 |
--- a/dev-java/commons-discovery/files/0.4-jar-target.patch |
89 |
+++ /dev/null |
90 |
@@ -1,41 +0,0 @@ |
91 |
-Index: build.xml |
92 |
-=================================================================== |
93 |
---- build.xml (revision 498103) |
94 |
-+++ build.xml (working copy) |
95 |
-@@ -175,23 +175,26 @@ |
96 |
- </javadoc> |
97 |
- </target> |
98 |
- |
99 |
-+ <target name="jar" depends="compile" |
100 |
-+ description="Create the jar file"> |
101 |
-+ <mkdir dir="${build.home}/classes/META-INF"/> |
102 |
-+ <copy file="LICENSE.txt" |
103 |
-+ tofile="${build.home}/classes/META-INF/LICENSE.txt"/> |
104 |
-+ <copy file="NOTICE.txt" |
105 |
-+ tofile="${build.home}/classes/META-INF/NOTICE.txt"/> |
106 |
-+ <mkdir dir="${dist.home}"/> |
107 |
-+ <jar jarfile="${dist.home}/${component.name}.jar" |
108 |
-+ basedir="${build.home}/classes" |
109 |
-+ manifest="${build.home}/conf/MANIFEST.MF"/> |
110 |
-+ </target> |
111 |
- |
112 |
-- <target name="dist" depends="compile,javadoc" |
113 |
-+ <target name="dist" depends="jar,javadoc" |
114 |
- description="Create binary distribution"> |
115 |
- <!-- TODO: top level files like LICENSE and README --> |
116 |
-- <mkdir dir="${dist.home}"/> |
117 |
- <copy file="LICENSE.txt" |
118 |
- todir="${dist.home}"/> |
119 |
- <copy file="NOTICE.txt" |
120 |
- todir="${dist.home}"/> |
121 |
-- <mkdir dir="${build.home}/classes/META-INF"/> |
122 |
-- <copy file="LICENSE.txt" |
123 |
-- tofile="${build.home}/classes/META-INF/LICENSE.txt"/> |
124 |
-- <copy file="NOTICE.txt" |
125 |
-- tofile="${build.home}/classes/META-INF/NOTICE.txt"/> |
126 |
-- <jar jarfile="${dist.home}/${component.name}.jar" |
127 |
-- basedir="${build.home}/classes" |
128 |
-- manifest="${build.home}/conf/MANIFEST.MF"/> |
129 |
- </target> |
130 |
- |
131 |
- <!-- ========== Testing section ======================================== --> |
132 |
|
133 |
diff --git a/dev-java/commons-discovery/files/commons-discovery-0.2-gentoo.diff b/dev-java/commons-discovery/files/commons-discovery-0.2-gentoo.diff |
134 |
deleted file mode 100644 |
135 |
index b55e10f..0000000 |
136 |
--- a/dev-java/commons-discovery/files/commons-discovery-0.2-gentoo.diff |
137 |
+++ /dev/null |
138 |
@@ -1,51 +0,0 @@ |
139 |
---- build.xml.orig 2005-04-17 16:14:52.000000000 +0200 |
140 |
-+++ build.xml 2005-04-17 16:14:57.000000000 +0200 |
141 |
-@@ -14,13 +14,15 @@ |
142 |
- <property file="../build.properties"/> <!-- Commons local --> |
143 |
- <property file="${user.home}/build.properties"/> <!-- User local --> |
144 |
- |
145 |
-+ <!-- The base directory for compilation targets --> |
146 |
-+ <property name="build.home" value="target"/> |
147 |
- |
148 |
- <!-- ========== External Dependencies ===================================== --> |
149 |
- |
150 |
- |
151 |
- <!-- The directories corresponding to your necessary dependencies --> |
152 |
-- <property name="junit.jar" value="../../junit3.7/junit.jar"/> |
153 |
-- <property name="logger.jar" value="../../jakarta-commons/logging/target/commons-logging.jar"/> |
154 |
-+ <property name="junit.jar" value="${build.home}/lib/junit.jar"/> |
155 |
-+ <property name="logger.jar" value="${build.home}/lib/commons-logging.jar"/> |
156 |
- |
157 |
- |
158 |
- <!-- ========== Component Declarations ==================================== --> |
159 |
-@@ -38,8 +40,6 @@ |
160 |
- <!-- The current version number of this component --> |
161 |
- <property name="component.version" value="0.2"/> |
162 |
- |
163 |
-- <!-- The base directory for compilation targets --> |
164 |
-- <property name="build.home" value="target"/> |
165 |
- |
166 |
- <!-- The base directory for component configuration files --> |
167 |
- <property name="conf.home" value="src/conf"/> |
168 |
-@@ -116,6 +116,7 @@ |
169 |
- |
170 |
- |
171 |
- <target name="compile" depends="prepare" description="Compile shareable components"> |
172 |
-+ |
173 |
- <javac srcdir="${source.home}" |
174 |
- destdir="${build.home}/classes" |
175 |
- debug="${compile.debug}" |
176 |
-@@ -163,10 +164,10 @@ |
177 |
- description="Create binary distribution"> |
178 |
- <!-- TODO: top level files like LICENSE and README --> |
179 |
- <mkdir dir="${dist.home}"/> |
180 |
-- <copy file="../LICENSE" |
181 |
-- todir="${dist.home}"/> |
182 |
-+ <!--<copy file="LICENSE" |
183 |
-+ todir="${dist.home}"/>--> |
184 |
- <mkdir dir="${build.home}/classes/META-INF"/> |
185 |
-- <copy file="../LICENSE" |
186 |
-+ <copy file="LICENSE.txt" |
187 |
- tofile="${build.home}/classes/META-INF/LICENSE.txt"/> |
188 |
- <jar jarfile="${dist.home}/commons-${component.name}.jar" |
189 |
- basedir="${build.home}/classes" |