Gentoo Archives: gentoo-commits

From: Patrice Clement <monsieurp@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/java-experimental:master commit in: dev-java/excalibur-pool-api/, dev-java/excalibur-logger/, ...
Date: Sat, 28 Feb 2015 10:47:16
Message-Id: 1425120283.a4ebdb826fb34e0d46864e821ed01ad2931d5dd5.monsieurp@gentoo
1 commit: a4ebdb826fb34e0d46864e821ed01ad2931d5dd5
2 Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
3 AuthorDate: Sat Feb 28 10:44:43 2015 +0000
4 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
5 CommitDate: Sat Feb 28 10:44:43 2015 +0000
6 URL: http://sources.gentoo.org/gitweb/?p=proj/java-experimental.git;a=commit;h=a4ebdb82
7
8 Deprecated/dead project moved into the Attic by the ASF a while ago, see these links:
9
10 http://excalibur.apache.org/
11 http://attic.apache.org/projects/excalibur.html
12
13 Let's kiss Excalibur goodbye.
14
15 ---
16 dev-java/excalibur-compatibility/ChangeLog | 8 ----
17 dev-java/excalibur-compatibility/Manifest | 4 --
18 .../excalibur-compatibility-1.1.ebuild | 48 -------------------
19 dev-java/excalibur-compatibility/metadata.xml | 14 ------
20 dev-java/excalibur-datasource/ChangeLog | 17 -------
21 dev-java/excalibur-datasource/Manifest | 4 --
22 .../excalibur-datasource-1.2.0.ebuild | 42 ----------------
23 dev-java/excalibur-datasource/metadata.xml | 5 --
24 dev-java/excalibur-i18n/ChangeLog | 11 -----
25 dev-java/excalibur-i18n/Manifest | 4 --
26 dev-java/excalibur-i18n/excalibur-i18n-1.1.ebuild | 42 ----------------
27 dev-java/excalibur-i18n/metadata.xml | 5 --
28 dev-java/excalibur-instrument-api/ChangeLog | 10 ----
29 dev-java/excalibur-instrument-api/Manifest | 4 --
30 .../excalibur-instrument-api-2.1.ebuild | 35 --------------
31 dev-java/excalibur-instrument-api/metadata.xml | 5 --
32 dev-java/excalibur-instrument/ChangeLog | 10 ----
33 dev-java/excalibur-instrument/Manifest | 4 --
34 .../excalibur-instrument-1.0.ebuild | 52 --------------------
35 dev-java/excalibur-instrument/metadata.xml | 5 --
36 dev-java/excalibur-logger/ChangeLog | 10 ----
37 dev-java/excalibur-logger/Manifest | 4 --
38 .../excalibur-logger/excalibur-logger-1.1.ebuild | 56 ----------------------
39 dev-java/excalibur-logger/metadata.xml | 5 --
40 dev-java/excalibur-pool-api/ChangeLog | 10 ----
41 dev-java/excalibur-pool-api/Manifest | 4 --
42 .../excalibur-pool-api-2.1.ebuild | 30 ------------
43 dev-java/excalibur-pool-api/metadata.xml | 5 --
44 dev-java/excalibur-pool-impl/ChangeLog | 10 ----
45 dev-java/excalibur-pool-impl/Manifest | 4 --
46 .../excalibur-pool-impl-2.1.ebuild | 41 ----------------
47 dev-java/excalibur-pool-impl/metadata.xml | 5 --
48 dev-java/excalibur-pool-instrumented/ChangeLog | 10 ----
49 dev-java/excalibur-pool-instrumented/Manifest | 4 --
50 .../excalibur-pool-instrumented-2.1.ebuild | 37 --------------
51 dev-java/excalibur-pool-instrumented/metadata.xml | 5 --
52 dev-java/excalibur-pool/ChangeLog | 9 ----
53 dev-java/excalibur-pool/Manifest | 4 --
54 dev-java/excalibur-pool/excalibur-pool-1.2.ebuild | 53 --------------------
55 dev-java/excalibur-pool/metadata.xml | 5 --
56 40 files changed, 640 deletions(-)
57
58 diff --git a/dev-java/excalibur-compatibility/ChangeLog b/dev-java/excalibur-compatibility/ChangeLog
59 deleted file mode 100644
60 index 59fde27..0000000
61 --- a/dev-java/excalibur-compatibility/ChangeLog
62 +++ /dev/null
63 @@ -1,8 +0,0 @@
64 -# ChangeLog for dev-java/excalibur-compatibility
65 -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
66 -# $Header: $
67 -
68 - 08 Mar 2008; Alistair Bush <ali_bush@g.o> +metadata.xml,
69 - +excalibur-compatibility-1.1.ebuild:
70 - Adding excalibur-compatibility.
71 -
72
73 diff --git a/dev-java/excalibur-compatibility/Manifest b/dev-java/excalibur-compatibility/Manifest
74 deleted file mode 100644
75 index 76f7f1f..0000000
76 --- a/dev-java/excalibur-compatibility/Manifest
77 +++ /dev/null
78 @@ -1,4 +0,0 @@
79 -DIST excalibur-compatibility-1.1.zip 413835 RMD160 a1fefccc386b2b45e8e16674ff56fc8cb9eee04a SHA1 98841156c9d4639fff7e66e5928ad5e83c322e99 SHA256 7cafebb5547e94d508a71d40cb1413e32e4510b12ec6a23565e1c1bc7fca8acf
80 -EBUILD excalibur-compatibility-1.1.ebuild 1119 RMD160 7f55429016b1f762b9c8cf34a35b3262163be87a SHA1 e183fb76c2dd287e8fee3f6d79041686da4e8d27 SHA256 85fcc92df0e855599473f61249444cb8b08269d123133a24d23c16a9eb8bbd39
81 -MISC ChangeLog 273 RMD160 fcc6dfdefc9e550704a69b88518d9ea5291b8c0f SHA1 a0b411dd2c4665362616c5d00df5683f3dc4d16a SHA256 47a815c8d4e7da18c61793c63d4209181756bb75d43e49fe5808c65e9933198a
82 -MISC metadata.xml 451 RMD160 261f1d235aa14f357674ce94ca6ef4138d7d719a SHA1 9edb740e0f66dedee66af1fbcafe7bb05d8c280c SHA256 651d5e4ba28898f2b31bf7275ec79af936bc907f907a06cd3cf0ff09c4d83af3
83
84 diff --git a/dev-java/excalibur-compatibility/excalibur-compatibility-1.1.ebuild b/dev-java/excalibur-compatibility/excalibur-compatibility-1.1.ebuild
85 deleted file mode 100644
86 index 7104cfe..0000000
87 --- a/dev-java/excalibur-compatibility/excalibur-compatibility-1.1.ebuild
88 +++ /dev/null
89 @@ -1,48 +0,0 @@
90 -# Copyright 1999-2009 Gentoo Foundation
91 -# Distributed under the terms of the GNU General Public License v2
92 -# $Header: $
93 -
94 -JAVA_PKG_IUSE="doc source"
95 -
96 -inherit java-pkg-2
97 -
98 -DESCRIPTION="Compatibility was a library consisting of several utility classes."
99 -HOMEPAGE="http://excalibur.apache.org/deprecation.html"
100 -SRC_URI="mirror://apache/excalibur/${PN}/source/${P}.zip"
101 -
102 -LICENSE="Apache-1.1"
103 -SLOT="0"
104 -KEYWORDS="~amd64"
105 -
106 -IUSE=""
107 -
108 -
109 -RDEPEND=">=virtual/jre-1.4"
110 -DEPEND=">=virtual/jdk-1.4
111 - app-arch/unzip"
112 -
113 -src_unpack() {
114 - unpack ${A}
115 - cd "${S}"
116 - rm -vrf docs *.jar
117 - unzip -qq src.zip
118 -}
119 -
120 -src_compile() {
121 - mkdir -p classes javadoc || die "Unable to make build dirs"
122 -
123 - ejavac -d classes $(find ${SRC_DIR} -name "*.java") || die "Compilation failed"
124 - jar -cf "${S}/${PN}.jar" -C classes . || die "Could not create jar"
125 - #Generate javadoc
126 - if use doc ; then
127 - javadoc -source "$(java-pkg_get-source)" -d javadoc $(find "org/apache/avalon/excalibur" -type d | tr '/' '.') || die "Could not create javadoc"
128 - fi
129 -
130 -}
131 -
132 -src_install() {
133 - java-pkg_dojar "${PN}.jar"
134 - use doc && java-pkg_dojavadoc javadoc
135 - use source && java-pkg_dosrc org
136 -}
137 -
138
139 diff --git a/dev-java/excalibur-compatibility/metadata.xml b/dev-java/excalibur-compatibility/metadata.xml
140 deleted file mode 100644
141 index 80d5267..0000000
142 --- a/dev-java/excalibur-compatibility/metadata.xml
143 +++ /dev/null
144 @@ -1,14 +0,0 @@
145 -<?xml version="1.0" encoding="UTF-8"?>
146 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
147 -<pkgmetadata>
148 - <herd>java</herd>
149 - <maintainer>
150 - <email>ali_bush@g.o</email>
151 - <name>Alistair Bush</name>
152 - </maintainer>
153 - <longdescription lang="en">
154 - Compatibility was a library consisting of several utility classes that
155 - Excalibur had ceased developing with the aim of focusing on the charter.
156 - </longdescription>
157 -</pkgmetadata>
158 -
159
160 diff --git a/dev-java/excalibur-datasource/ChangeLog b/dev-java/excalibur-datasource/ChangeLog
161 deleted file mode 100644
162 index a878b52..0000000
163 --- a/dev-java/excalibur-datasource/ChangeLog
164 +++ /dev/null
165 @@ -1,17 +0,0 @@
166 -# ChangeLog for dev-java/excalibur-datasource
167 -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
168 -# $Header: $
169 -
170 -*excalibur-datasource-1.2.0 (08 Oct 2011)
171 -
172 - 08 Oct 2011; Ralph Sennhauser <gentoo.sera@×××××××.ch>
173 - -excalibur-datasource-1.1.1.ebuild, +excalibur-datasource-1.2.0.ebuild:
174 - Version bump to the only remaining download for this slot, rewriting ebuild
175 - using java-pkg-simple.
176 -
177 - 14 Aug 2008; Jesse Farinacci <jieryn@×××××.com>
178 - excalibur-datasource-1.1.1.ebuild:
179 - fixing IUSE repoman warnings
180 -
181 - 14 Aug 2008; Jesse Farinacci <jieryn@×××××.com> +ChangeLog:
182 - adding ChangeLog to shut repoman up
183
184 diff --git a/dev-java/excalibur-datasource/Manifest b/dev-java/excalibur-datasource/Manifest
185 deleted file mode 100644
186 index da91498..0000000
187 --- a/dev-java/excalibur-datasource/Manifest
188 +++ /dev/null
189 @@ -1,4 +0,0 @@
190 -MISC ChangeLog 627 RMD160 54aaa73cc0415c9b5339cd0d51a1fa71408f4eba SHA1 6ae67ba522b65b91cc91f4a9fa78d0d200ab4ae2 SHA256 15ca8f8829854bc770fbd42d2711490be0bc268f7c6e2f475307eb338a5655a8
191 -EBUILD excalibur-datasource-1.2.0.ebuild 962 RMD160 6e802dd79449afffd04564c13ec181a32546e9b3 SHA1 25b71dd8c6fd342d831cb218233335806e8df090 SHA256 93b9b1414d6c6098dbbdc040bfe3f51dd4798fad8b839032f54bcee8899328e3
192 -MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
193 -DIST excalibur-datasource-1.2.0-src.tar.gz 39873 RMD160 fc0eda680aa46a52dff0f74ca05388c118350ad9 SHA1 715e9cb9e50127a97a5f4a65c7ac85fbe405cf61 SHA256 c934ea466786d4e00fbdd46e8f967294a2a2f671313d6ba0be0d9d3acb96af5c
194
195 diff --git a/dev-java/excalibur-datasource/excalibur-datasource-1.2.0.ebuild b/dev-java/excalibur-datasource/excalibur-datasource-1.2.0.ebuild
196 deleted file mode 100644
197 index 83a1e58..0000000
198 --- a/dev-java/excalibur-datasource/excalibur-datasource-1.2.0.ebuild
199 +++ /dev/null
200 @@ -1,42 +0,0 @@
201 -# Copyright 1999-2011 Gentoo Foundation
202 -# Distributed under the terms of the GNU General Public License v2
203 -# $Header$
204 -
205 -EAPI="4"
206 -
207 -JAVA_PKG_IUSE="doc source"
208 -
209 -inherit java-pkg-2 java-pkg-simple
210 -
211 -DESCRIPTION="Datasource package from the Excalibur containerkit"
212 -HOMEPAGE="http://excalibur.apache.org"
213 -SRC_URI="http://archive.apache.org/dist/excalibur/${PN}/source/${P}-src.tar.gz"
214 -
215 -LICENSE="Apache-2.0"
216 -SLOT="1"
217 -KEYWORDS="~amd64 ~x86"
218 -IUSE=""
219 -
220 -COMMON_DEP="
221 - dev-java/avalon-framework:4.2
222 - dev-java/excalibur-pool-api:0
223 - dev-java/excalibur-pool-impl:0
224 - dev-java/excalibur-pool-instrumented:0
225 - dev-java/excalibur-instrument-api:0"
226 -RDEPEND="${COMMON_DEP}
227 - >=virtual/jre-1.4"
228 -DEPEND="${COMMON_DEP}
229 - >=virtual/jdk-1.4"
230 -
231 -S="${WORKDIR}"/${P}
232 -
233 -JAVA_SRC_DIR="src/java"
234 -JAVA_GENTOO_CLASSPATH="
235 - avalon-framework-4.2
236 - excalibur-pool-api,excalibur-pool-impl,excalibur-pool-instrumented
237 - excalibur-instrument-api"
238 -
239 -java_prepare() {
240 - # Maven 1 project.
241 - rm -vf build.xml || die
242 -}
243
244 diff --git a/dev-java/excalibur-datasource/metadata.xml b/dev-java/excalibur-datasource/metadata.xml
245 deleted file mode 100644
246 index 838c00a..0000000
247 --- a/dev-java/excalibur-datasource/metadata.xml
248 +++ /dev/null
249 @@ -1,5 +0,0 @@
250 -<?xml version="1.0" encoding="UTF-8"?>
251 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
252 -<pkgmetadata>
253 -<herd>java</herd>
254 -</pkgmetadata>
255
256 diff --git a/dev-java/excalibur-i18n/ChangeLog b/dev-java/excalibur-i18n/ChangeLog
257 deleted file mode 100644
258 index e92efd7..0000000
259 --- a/dev-java/excalibur-i18n/ChangeLog
260 +++ /dev/null
261 @@ -1,11 +0,0 @@
262 -# ChangeLog for dev-java/excalibur-i18n
263 -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
264 -# $Header: $
265 -
266 - 14 Aug 2008; Jesse Farinacci <jieryn@×××××.com> excalibur-i18n-1.1.ebuild:
267 - fixing IUSE repoman warnings
268 -
269 - 05 Mar 2008; Alistair Bush <ali_bush@g.o>
270 - excalibur-i18n-1.1.ebuild:
271 - keyword ~amd64
272 -
273
274 diff --git a/dev-java/excalibur-i18n/Manifest b/dev-java/excalibur-i18n/Manifest
275 deleted file mode 100644
276 index acee6d1..0000000
277 --- a/dev-java/excalibur-i18n/Manifest
278 +++ /dev/null
279 @@ -1,4 +0,0 @@
280 -DIST excalibur-i18n-1.1-src.tar.gz 8528 RMD160 cf12ff11050a07dd2e2cf92edc4f9960055e7ffb SHA1 dcbfd72ba1c624043c86a9061910b12eda747c9b SHA256 b97fcbf2a5b68a8b420713da9ac73bbfd85ab358d1811c70dac570177d76f920
281 -EBUILD excalibur-i18n-1.1.ebuild 1181 RMD160 ee37a977ff43619148f1e89ee84d2e951bb34163 SHA1 1b7d9e51fc978b06bb1b848dcad0873db6d22963 SHA256 64c7fc27212363fffa6f1eff3342ffc03d01388fd25ef29fb99f5b3602439e41
282 -MISC ChangeLog 331 RMD160 f5194247339ac2c3738099d0f9578c80a8fb1ce2 SHA1 e786d83419d562786acec3776402d2862e40b7a1 SHA256 990a20cf3766446129f2f938c7a4e0d7e3bac60fe5e16f790e880d5de5cc14de
283 -MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
284
285 diff --git a/dev-java/excalibur-i18n/excalibur-i18n-1.1.ebuild b/dev-java/excalibur-i18n/excalibur-i18n-1.1.ebuild
286 deleted file mode 100644
287 index 49435a1..0000000
288 --- a/dev-java/excalibur-i18n/excalibur-i18n-1.1.ebuild
289 +++ /dev/null
290 @@ -1,42 +0,0 @@
291 -# Copyright 1999-2009 Gentoo Foundation
292 -# Distributed under the terms of the GNU General Public License v2
293 -# $Header$
294 -JAVA_PKG_IUSE="doc source"
295 -
296 -inherit java-pkg-2
297 -
298 -DESCRIPTION="i18n from the Excalibur containerkit"
299 -HOMEPAGE="http://excalibur.apache.org/"
300 -SRC_URI="mirror://apache/excalibur/${PN}/source/${P}-src.tar.gz"
301 -
302 -LICENSE="Apache-2.0"
303 -SLOT="0"
304 -IUSE=""
305 -KEYWORDS="~amd64 ~x86"
306 -
307 -JAVA_VERSION="1.3"
308 -
309 -RDEPEND=">=virtual/jre-${JAVA_VERSION}"
310 -
311 -DEPEND=">=virtual/jdk-${JAVA_VERSION}"
312 -SRC_DIR="${S}/src/java"
313 -JAVADOC_DIR="${S}/javadoc"
314 -
315 -src_compile() {
316 - mkdir classes || die "Could not create compile output dir"
317 - ejavac -d classes $(find src/java -name "*.java") || die "Compilation failed"
318 - jar -cf "${S}/${PN}.jar" -C classes . || die "Could not create jar"
319 - #Generate javadoc
320 - if use doc ; then
321 - mkdir "${JAVADOC_DIR}" || die "Could not create javadoc dir"
322 - cd ${SRC_DIR}
323 - javadoc -source "${JAVA_VERSION}" -d ${JAVADOC_DIR} $(find "org/apache/avalon/excalibur/i18n" -type d | tr '/' '.') || die "Could not create javadoc"
324 - fi
325 -}
326 -
327 -src_install() {
328 - java-pkg_dojar ${PN}.jar
329 - dodoc README.txt
330 - use doc && java-pkg_dojavadoc ${JAVADOC_DIR}
331 - use source && java-pkg_dosrc src/*
332 -}
333
334 diff --git a/dev-java/excalibur-i18n/metadata.xml b/dev-java/excalibur-i18n/metadata.xml
335 deleted file mode 100644
336 index 838c00a..0000000
337 --- a/dev-java/excalibur-i18n/metadata.xml
338 +++ /dev/null
339 @@ -1,5 +0,0 @@
340 -<?xml version="1.0" encoding="UTF-8"?>
341 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
342 -<pkgmetadata>
343 -<herd>java</herd>
344 -</pkgmetadata>
345
346 diff --git a/dev-java/excalibur-instrument-api/ChangeLog b/dev-java/excalibur-instrument-api/ChangeLog
347 deleted file mode 100644
348 index f672b21..0000000
349 --- a/dev-java/excalibur-instrument-api/ChangeLog
350 +++ /dev/null
351 @@ -1,10 +0,0 @@
352 -# ChangeLog for dev-java/excalibur-instrument-api
353 -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
354 -# $Header: $
355 -
356 -*excalibur-instrument-api-2.1 (08 Oct 2011)
357 -
358 - 08 Oct 2011; Ralph Sennhauser <gentoo.sera@×××××××.ch>
359 - +excalibur-instrument-api-2.1.ebuild, +metadata.xml:
360 - Add package as a indirect dep of jmeter
361 -
362
363 diff --git a/dev-java/excalibur-instrument-api/Manifest b/dev-java/excalibur-instrument-api/Manifest
364 deleted file mode 100644
365 index fdc6496..0000000
366 --- a/dev-java/excalibur-instrument-api/Manifest
367 +++ /dev/null
368 @@ -1,4 +0,0 @@
369 -MISC ChangeLog 334 RMD160 a0af89a2871dc0d8cd551b3650267a9242f5152c SHA1 1d7f76a6cb48381bdc16c7ba0d1423f9f22cd4de SHA256 7584e4025a6b3907e9fa2339a3095b0f3be0172fedcd1a8c1d5cf53eabc2f7bb
370 -EBUILD excalibur-instrument-api-2.1.ebuild 724 RMD160 0addefed4e559f8d4d0a033e63a74a1463c7188d SHA1 adcf3e351ba6a255c02c0cff805ac6f8f31b0c14 SHA256 4ac501a85a8ba7deed59e144f0a1139b8100644656d069bffeb6d8ff278aa011
371 -MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
372 -DIST excalibur-instrument-api-2.1-src.tar.gz 13572 RMD160 3baf684c6411e3b8c0813adf1fcc9a04cc7d6034 SHA1 cdc08dc63dc2d46e7db064fccbea940608360c44 SHA256 4640397118bd5d617250fd8ad64ad517ce197dbfadbecd58082d3d9d396971d2
373
374 diff --git a/dev-java/excalibur-instrument-api/excalibur-instrument-api-2.1.ebuild b/dev-java/excalibur-instrument-api/excalibur-instrument-api-2.1.ebuild
375 deleted file mode 100644
376 index 32ec68b..0000000
377 --- a/dev-java/excalibur-instrument-api/excalibur-instrument-api-2.1.ebuild
378 +++ /dev/null
379 @@ -1,35 +0,0 @@
380 -# Copyright 1999-2011 Gentoo Foundation
381 -# Distributed under the terms of the GNU General Public License v2
382 -# $Header$
383 -
384 -EAPI=4
385 -
386 -JAVA_PKG_IUSE="doc source"
387 -
388 -inherit java-pkg-2 java-pkg-simple
389 -
390 -DESCRIPTION="Interfaces for instrument from Excalibur containerkit"
391 -HOMEPAGE="http://excalibur.apache.org"
392 -SRC_URI="http://archive.apache.org/dist/excalibur/${PN/-api}/source/${P}-src.tar.gz"
393 -
394 -LICENSE="Apache-2.0"
395 -SLOT="0"
396 -IUSE=""
397 -KEYWORDS="~amd64 ~x86"
398 -
399 -COMMON_DEP="
400 - dev-java/avalon-framework:4.2"
401 -RDEPEND="${COMMON_DEP}
402 - >=virtual/jre-1.4"
403 -DEPEND="${COMMON_DEP}
404 - >=virtual/jdk-1.4"
405 -
406 -S="${WORKDIR}"/${P}
407 -
408 -JAVA_SRC_DIR="src/java"
409 -JAVA_GENTOO_CLASSPATH="avalon-framework-4.2"
410 -
411 -java_prepare() {
412 - # Maven 1 project
413 - rm -vf build.xml
414 -}
415
416 diff --git a/dev-java/excalibur-instrument-api/metadata.xml b/dev-java/excalibur-instrument-api/metadata.xml
417 deleted file mode 100644
418 index 838c00a..0000000
419 --- a/dev-java/excalibur-instrument-api/metadata.xml
420 +++ /dev/null
421 @@ -1,5 +0,0 @@
422 -<?xml version="1.0" encoding="UTF-8"?>
423 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
424 -<pkgmetadata>
425 -<herd>java</herd>
426 -</pkgmetadata>
427
428 diff --git a/dev-java/excalibur-instrument/ChangeLog b/dev-java/excalibur-instrument/ChangeLog
429 deleted file mode 100644
430 index 57a2848..0000000
431 --- a/dev-java/excalibur-instrument/ChangeLog
432 +++ /dev/null
433 @@ -1,10 +0,0 @@
434 -# ChangeLog for dev-java/excalibur-instrument
435 -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
436 -# $Header: $
437 -
438 - 14 Aug 2008; Jesse Farinacci <jieryn@×××××.com>
439 - excalibur-instrument-1.0.ebuild:
440 - fixing IUSE repoman warnings
441 -
442 - 14 Aug 2008; Jesse Farinacci <jieryn@×××××.com> +ChangeLog:
443 - adding ChangeLog to shut repoman up
444
445 diff --git a/dev-java/excalibur-instrument/Manifest b/dev-java/excalibur-instrument/Manifest
446 deleted file mode 100644
447 index 8b042ed..0000000
448 --- a/dev-java/excalibur-instrument/Manifest
449 +++ /dev/null
450 @@ -1,4 +0,0 @@
451 -DIST excalibur-instrument-1.0.zip 59082 RMD160 72e193aa5e94828f3a4faeffc96a68dc34a14ec6 SHA1 5318b83e939dceaa4edc82bda60a9cafbacf005e SHA256 73bc1b8d4a689808d505f6fc25dff9c7f434982e8904b16cd8b5900ee38df78f
452 -EBUILD excalibur-instrument-1.0.ebuild 1327 RMD160 4c5c6d61938335498cc705fdc512acfcb17814ce SHA1 6a4bb5edab4574d0ba23920c30874c443c322e48 SHA256 5e67c6f06fc72ea99c0fcd394dcb49a5e171d27a3d8145b8cc9436318d05525c
453 -MISC ChangeLog 347 RMD160 4fa851f6d2f745d401df78b5988cf1d9bca52384 SHA1 63931afa8185086cb553cc1233cb9ca6d1aa7453 SHA256 ab6abbad61cfde979696f45080abdae1a5e47f9eedbfe1743e35a9b87c74c9c4
454 -MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
455
456 diff --git a/dev-java/excalibur-instrument/excalibur-instrument-1.0.ebuild b/dev-java/excalibur-instrument/excalibur-instrument-1.0.ebuild
457 deleted file mode 100644
458 index af6481b..0000000
459 --- a/dev-java/excalibur-instrument/excalibur-instrument-1.0.ebuild
460 +++ /dev/null
461 @@ -1,52 +0,0 @@
462 -# Copyright 1999-2009 Gentoo Foundation
463 -# Distributed under the terms of the GNU General Public License v2
464 -# $Header$
465 -JAVA_PKG_IUSE="doc source"
466 -
467 -inherit java-pkg-2
468 -
469 -HOMEPAGE="http://excalibur.apache.org"
470 -SRC_URI="mirror://apache/avalon/${PN}/source/${P}.zip"
471 -
472 -LICENSE="Apache-2.0"
473 -SLOT="1"
474 -IUSE=""
475 -KEYWORDS="~amd64 ~x86"
476 -
477 -JAVA_VERSION="1.4"
478 -COMMON_DEPEND="
479 - =dev-java/avalon-framework-4.1*"
480 -
481 -RDEPEND=">=virtual/jre-${JAVA_VERSION}
482 - ${COMMON_DEPEND}"
483 -
484 -DEPEND=">=virtual/jdk-${JAVA_VERSION}
485 - app-arch/unzip
486 - ${COMMON_DEPEND}"
487 -SRC_DIR="${S}/src"
488 -JAVADOC_DIR="${S}/javadoc"
489 -
490 -src_unpack() {
491 - unpack ${A}
492 - cd ${S}
493 - unzip src.zip -d src
494 - rm -rf *.jar
495 -}
496 -
497 -src_compile() {
498 - mkdir classes || die "Could not create compile output dir"
499 - ejavac -cp $(java-pkg_getjars avalon-framework-4.1) -d classes $(find ${SRC_DIR} -name "*.java") || die "Compilation failed"
500 - jar -cf "${S}/${PN}.jar" -C classes . || die "Could not create jar"
501 - #Generate javadoc
502 - if use doc ; then
503 - mkdir "${JAVADOC_DIR}" || die "Could not create javadoc dir"
504 - cd ${SRC_DIR}
505 - javadoc -source "${JAVA_VERSION}" -d ${JAVADOC_DIR} $(find "org/apache/excalibur/instrument" -type d | tr '/' '.') || die "Could not create javadoc"
506 - fi
507 -}
508 -
509 -src_install() {
510 - java-pkg_dojar ${PN}.jar
511 - use doc && java-pkg_dojavadoc ${JAVADOC_DIR}
512 - use source && java-pkg_dosrc ${SRC_DIR}/*
513 -}
514
515 diff --git a/dev-java/excalibur-instrument/metadata.xml b/dev-java/excalibur-instrument/metadata.xml
516 deleted file mode 100644
517 index 838c00a..0000000
518 --- a/dev-java/excalibur-instrument/metadata.xml
519 +++ /dev/null
520 @@ -1,5 +0,0 @@
521 -<?xml version="1.0" encoding="UTF-8"?>
522 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
523 -<pkgmetadata>
524 -<herd>java</herd>
525 -</pkgmetadata>
526
527 diff --git a/dev-java/excalibur-logger/ChangeLog b/dev-java/excalibur-logger/ChangeLog
528 deleted file mode 100644
529 index f4591e4..0000000
530 --- a/dev-java/excalibur-logger/ChangeLog
531 +++ /dev/null
532 @@ -1,10 +0,0 @@
533 -# ChangeLog for dev-java/excalibur-logger
534 -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
535 -# $Header: $
536 -
537 - 14 Aug 2008; Jesse Farinacci <jieryn@×××××.com>
538 - excalibur-logger-1.1.ebuild:
539 - fixing IUSE repoman warnings
540 -
541 - 14 Aug 2008; Jesse Farinacci <jieryn@×××××.com> +ChangeLog:
542 - adding ChangeLog to shut repoman up
543
544 diff --git a/dev-java/excalibur-logger/Manifest b/dev-java/excalibur-logger/Manifest
545 deleted file mode 100644
546 index 887b16f..0000000
547 --- a/dev-java/excalibur-logger/Manifest
548 +++ /dev/null
549 @@ -1,4 +0,0 @@
550 -DIST excalibur-logger-1.1.zip 126960 RMD160 904af464bb1d48f352ca8929b684751b68b8a9cd SHA1 4085584d32ab573dc3a70adf53045afd36a7c2b2 SHA256 dbbe68ee8a2a5a99df1826e4b64c89d296fb11e8014f16a411e1d0464ee341c4
551 -EBUILD excalibur-logger-1.1.ebuild 1732 RMD160 fde21441c8ee9103c96d38a367bcfb17893cb7ec SHA1 1654d0fbee1575f468f0cb7183d27117210bc030 SHA256 1b751d9ec669e565c402be8d1e483733f89e0911d46a8dfc4a5b7966ce4ced38
552 -MISC ChangeLog 339 RMD160 46c4bf4228177b04b586bf099e97e129cdd7145d SHA1 b1d737a1a8a6633714d37b8f973c95a9ee064785 SHA256 ff9603576d4d337301084000d269a0c9bafaadaa2b0b39c9f1facd3815212775
553 -MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
554
555 diff --git a/dev-java/excalibur-logger/excalibur-logger-1.1.ebuild b/dev-java/excalibur-logger/excalibur-logger-1.1.ebuild
556 deleted file mode 100644
557 index df09fea..0000000
558 --- a/dev-java/excalibur-logger/excalibur-logger-1.1.ebuild
559 +++ /dev/null
560 @@ -1,56 +0,0 @@
561 -# Copyright 1999-2009 Gentoo Foundation
562 -# Distributed under the terms of the GNU General Public License v2
563 -# $Header$
564 -JAVA_PKG_IUSE="doc source"
565 -
566 -inherit java-pkg-2
567 -
568 -DESCRIPTION="Logger from the Excalibur containerkit"
569 -HOMEPAGE="http://excalibur.apache.org/logger.html"
570 -SRC_URI="mirror://apache/avalon/${PN}/source/${P}.zip"
571 -
572 -LICENSE="Apache-2.0"
573 -SLOT="1"
574 -IUSE=""
575 -KEYWORDS="~amd64 ~x86"
576 -
577 -JAVA_VERSION="1.4"
578 -COMMON_DEPEND="=dev-java/avalon-framework-4.1*
579 - ~dev-java/avalon-logkit-1.2.2
580 - dev-java/log4j
581 - =dev-java/servletapi-2.3*
582 - dev-java/sun-jms
583 - dev-java/sun-javamail
584 - dev-java/excalibur-i18n"
585 -
586 -RDEPEND=">=virtual/jre-${JAVA_VERSION}
587 - ${COMMON_DEPEND}"
588 -
589 -DEPEND=">=virtual/jdk-${JAVA_VERSION}
590 - app-arch/unzip
591 - ${COMMON_DEPEND}"
592 -SRC_DIR="${S}/src/java"
593 -JAVADOC_DIR="${S}/javadoc"
594 -
595 -src_compile() {
596 - built_with_use --hidden dev-java/avalon-logkit javamail jms
597 - local modules="api impl log4j logkit servletlogger"
598 - for module in ${modules}; do
599 - cp -R ${S}/${module}/src/java/* ${SRC_DIR}
600 - done
601 - mkdir classes || die "Could not create compile output dir"
602 - ejavac -cp $(java-pkg_getjars avalon-logkit-1.2,avalon-framework-4.1,log4j,servletapi-2.3,sun-jms,sun-javamail,excalibur-i18n) -d classes $(find ${SRC_DIR} -name "*.java") || die "Compilation failed"
603 - jar -cf "${S}/${PN}.jar" -C classes . || die "Could not create jar"
604 - #Generate javadoc
605 - if use doc ; then
606 - mkdir "${JAVADOC_DIR}" || die "Could not create javadoc dir"
607 - cd ${SRC_DIR}
608 - javadoc -source "${JAVA_VERSION}" -d ${JAVADOC_DIR} $(find "org/apache/avalon/excalibur/logger" -type d | tr '/' '.') || die "Could not create javadoc"
609 - fi
610 -}
611 -
612 -src_install() {
613 - java-pkg_dojar ${PN}.jar
614 - use doc && java-pkg_dojavadoc ${JAVADOC_DIR}
615 - use source && java-pkg_dosrc ${SRC_DIR}/*
616 -}
617
618 diff --git a/dev-java/excalibur-logger/metadata.xml b/dev-java/excalibur-logger/metadata.xml
619 deleted file mode 100644
620 index 838c00a..0000000
621 --- a/dev-java/excalibur-logger/metadata.xml
622 +++ /dev/null
623 @@ -1,5 +0,0 @@
624 -<?xml version="1.0" encoding="UTF-8"?>
625 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
626 -<pkgmetadata>
627 -<herd>java</herd>
628 -</pkgmetadata>
629
630 diff --git a/dev-java/excalibur-pool-api/ChangeLog b/dev-java/excalibur-pool-api/ChangeLog
631 deleted file mode 100644
632 index f66e844..0000000
633 --- a/dev-java/excalibur-pool-api/ChangeLog
634 +++ /dev/null
635 @@ -1,10 +0,0 @@
636 -# ChangeLog for dev-java/excalibur-pool-api
637 -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
638 -# $Header: $
639 -
640 -*excalibur-pool-api-2.1 (08 Oct 2011)
641 -
642 - 08 Oct 2011; Ralph Sennhauser <gentoo.sera@×××××××.ch>
643 - +excalibur-pool-api-2.1.ebuild, +metadata.xml:
644 - Add as a dep of excalibur-datasource and ultimately jmeter
645 -
646
647 diff --git a/dev-java/excalibur-pool-api/Manifest b/dev-java/excalibur-pool-api/Manifest
648 deleted file mode 100644
649 index 3ace966..0000000
650 --- a/dev-java/excalibur-pool-api/Manifest
651 +++ /dev/null
652 @@ -1,4 +0,0 @@
653 -MISC ChangeLog 335 RMD160 65d41091d4b35bfd00a60da371bb21118e829769 SHA1 d60c829e4588c57e3c624fd80a4c3ad96e5b86bc SHA256 850dcbe7130f9da1584f9e506b13cb560f8a95ff54708921f020e94c3e1f658f
654 -EBUILD excalibur-pool-api-2.1.ebuild 599 RMD160 43bd38a16a682cb1e534d8e496f74de50eb19599 SHA1 c16a9494dc8ded921639f3ec5f81d518167d9369 SHA256 3fed2d5b3ef39f8ed1d775b1e27f09cd696145a4b309af53d8102892fca488c5
655 -MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
656 -DIST excalibur-pool-api-2.1-src.tar.gz 7914 RMD160 1b92f11b61d84c827aa3e00cdc10bd23f3f57ed5 SHA1 9c99cfbc877bd140272bb7dfbc39390ff2f1bee5 SHA256 4681bf6772fbe29e9c266372b2686e0de93fd9d0f7ea5a69a65bb2cbfecefa15
657
658 diff --git a/dev-java/excalibur-pool-api/excalibur-pool-api-2.1.ebuild b/dev-java/excalibur-pool-api/excalibur-pool-api-2.1.ebuild
659 deleted file mode 100644
660 index 79958c5..0000000
661 --- a/dev-java/excalibur-pool-api/excalibur-pool-api-2.1.ebuild
662 +++ /dev/null
663 @@ -1,30 +0,0 @@
664 -# Copyright 1999-2011 Gentoo Foundation
665 -# Distributed under the terms of the GNU General Public License v2
666 -# $Header$
667 -
668 -EAPI=4
669 -
670 -JAVA_PKG_IUSE="doc source"
671 -
672 -inherit java-pkg-2 java-pkg-simple
673 -
674 -DESCRIPTION="Interfaces for pool from Excalibur containerkit"
675 -HOMEPAGE="http://excalibur.apache.org"
676 -SRC_URI="http://archive.apache.org/dist/excalibur/${PN/-api}/source/${P}-src.tar.gz"
677 -
678 -LICENSE="Apache-2.0"
679 -SLOT="0"
680 -IUSE=""
681 -KEYWORDS="~amd64 ~x86"
682 -
683 -RDEPEND=">=virtual/jre-1.4"
684 -DEPEND=">=virtual/jdk-1.4"
685 -
686 -S="${WORKDIR}"/${PN}
687 -
688 -JAVA_SRC_DIR="src/java"
689 -
690 -java_prepare() {
691 - # Maven 1 project
692 - rm -vf build.xml
693 -}
694
695 diff --git a/dev-java/excalibur-pool-api/metadata.xml b/dev-java/excalibur-pool-api/metadata.xml
696 deleted file mode 100644
697 index 838c00a..0000000
698 --- a/dev-java/excalibur-pool-api/metadata.xml
699 +++ /dev/null
700 @@ -1,5 +0,0 @@
701 -<?xml version="1.0" encoding="UTF-8"?>
702 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
703 -<pkgmetadata>
704 -<herd>java</herd>
705 -</pkgmetadata>
706
707 diff --git a/dev-java/excalibur-pool-impl/ChangeLog b/dev-java/excalibur-pool-impl/ChangeLog
708 deleted file mode 100644
709 index d6867dd..0000000
710 --- a/dev-java/excalibur-pool-impl/ChangeLog
711 +++ /dev/null
712 @@ -1,10 +0,0 @@
713 -# ChangeLog for dev-java/excalibur-pool-impl
714 -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
715 -# $Header: $
716 -
717 -*excalibur-pool-impl-2.1 (08 Oct 2011)
718 -
719 - 08 Oct 2011; Ralph Sennhauser <gentoo.sera@×××××××.ch>
720 - +excalibur-pool-impl-2.1.ebuild, +metadata.xml:
721 - Add as a dep of excalibur-datasource and ultimately jmeter
722 -
723
724 diff --git a/dev-java/excalibur-pool-impl/Manifest b/dev-java/excalibur-pool-impl/Manifest
725 deleted file mode 100644
726 index 2f00edb..0000000
727 --- a/dev-java/excalibur-pool-impl/Manifest
728 +++ /dev/null
729 @@ -1,4 +0,0 @@
730 -MISC ChangeLog 338 RMD160 da3c60e165503b75fa43a75442800e1044b84d6d SHA1 fefd4ed1dd2a99f424a60c54051a03de3ce09d12 SHA256 fd332c23c6200115e65b4c3e9261bc850d6ee4da469e8ef3b17e65ec26179707
731 -EBUILD excalibur-pool-impl-2.1.ebuild 917 RMD160 a7415be274a05e513a91bf3028b84ef39710c53e SHA1 f7277558e84362b4b73b8d3843d2817178fd9052 SHA256 166bb8cff4d6d0aae29910d93efb82e01d99bfefff4714d18a0c768dea8fe5ed
732 -MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
733 -DIST excalibur-pool-impl-2.1-src.tar.gz 28219 RMD160 cedb4dd0377a768046d1388448f0856495cd9e01 SHA1 3e669828a612b1736048c4c7e21480dcae59bfc5 SHA256 4b1b34f9861bf59eb45c32e8a5c5e3337a6fff0ba369ad090066b94f6e5b1593
734
735 diff --git a/dev-java/excalibur-pool-impl/excalibur-pool-impl-2.1.ebuild b/dev-java/excalibur-pool-impl/excalibur-pool-impl-2.1.ebuild
736 deleted file mode 100644
737 index 6fe09ba..0000000
738 --- a/dev-java/excalibur-pool-impl/excalibur-pool-impl-2.1.ebuild
739 +++ /dev/null
740 @@ -1,41 +0,0 @@
741 -# Copyright 1999-2011 Gentoo Foundation
742 -# Distributed under the terms of the GNU General Public License v2
743 -# $Header$
744 -
745 -EAPI=4
746 -
747 -JAVA_PKG_IUSE="doc source"
748 -
749 -inherit java-pkg-2 java-pkg-simple
750 -
751 -DESCRIPTION="Pool implementation from the Excalibur containerkit"
752 -HOMEPAGE="http://excalibur.apache.org"
753 -SRC_URI="http://archive.apache.org/dist/excalibur/${PN/-impl}/source/${P}-src.tar.gz"
754 -
755 -LICENSE="Apache-2.0"
756 -SLOT="0"
757 -IUSE=""
758 -KEYWORDS="~amd64 ~x86"
759 -
760 -# Add test support to simple.
761 -RESTRICT="test"
762 -
763 -COMMON_DEP="
764 - dev-java/excalibur-pool-api:0
765 - dev-java/avalon-framework:4.2
766 - dev-java/commons-collections:0
767 - dev-java/concurrent-util:0"
768 -RDEPEND="${COMMON_DEP}
769 - >=virtual/jre-1.4"
770 -DEPEND="${COMMON_DEP}
771 - >=virtual/jdk-1.4"
772 -
773 -S="${WORKDIR}"/${PN}
774 -
775 -JAVA_SRC_DIR="src/java"
776 -JAVA_GENTOO_CLASSPATH="avalon-framework-4.2,commons-collections,concurrent-util,excalibur-pool-api"
777 -
778 -java_prepare() {
779 - # Maven 1 project
780 - rm -vf build.xml
781 -}
782
783 diff --git a/dev-java/excalibur-pool-impl/metadata.xml b/dev-java/excalibur-pool-impl/metadata.xml
784 deleted file mode 100644
785 index 838c00a..0000000
786 --- a/dev-java/excalibur-pool-impl/metadata.xml
787 +++ /dev/null
788 @@ -1,5 +0,0 @@
789 -<?xml version="1.0" encoding="UTF-8"?>
790 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
791 -<pkgmetadata>
792 -<herd>java</herd>
793 -</pkgmetadata>
794
795 diff --git a/dev-java/excalibur-pool-instrumented/ChangeLog b/dev-java/excalibur-pool-instrumented/ChangeLog
796 deleted file mode 100644
797 index f04472f..0000000
798 --- a/dev-java/excalibur-pool-instrumented/ChangeLog
799 +++ /dev/null
800 @@ -1,10 +0,0 @@
801 -# ChangeLog for dev-java/excalibur-pool-instrumented
802 -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
803 -# $Header: $
804 -
805 -*excalibur-pool-instrumented-2.1 (08 Oct 2011)
806 -
807 - 08 Oct 2011; Ralph Sennhauser <gentoo.sera@×××××××.ch>
808 - +excalibur-pool-instrumented-2.1.ebuild, +metadata.xml:
809 - Add package as a indirect dep of jmeter
810 -
811
812 diff --git a/dev-java/excalibur-pool-instrumented/Manifest b/dev-java/excalibur-pool-instrumented/Manifest
813 deleted file mode 100644
814 index 7ff109e..0000000
815 --- a/dev-java/excalibur-pool-instrumented/Manifest
816 +++ /dev/null
817 @@ -1,4 +0,0 @@
818 -MISC ChangeLog 343 RMD160 1a959285f678657bd884d5aa11d8bf9ed5db9f25 SHA1 8d8c2f5e691e40c57d16ffd7d547784eb7b0f133 SHA256 11ab22e680ab73610315bb12c0d1bf977589ded51fc6b8e936115362820cbf54
819 -EBUILD excalibur-pool-instrumented-2.1.ebuild 825 RMD160 8817f7c3eb0c3f2ea4f1c9ea8700d185a6cc38f2 SHA1 07e2c99a93cf9d14b7a9cd5122d0796363ab4eda SHA256 1bf3a73934d7d1b19c75f505bf3ea3ebbb1433da0cbbe2ad4eb73380376b7e84
820 -MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
821 -DIST excalibur-pool-instrumented-2.1-src.tar.gz 13756 RMD160 676eba695f1125a751afeafb815f58965b16b839 SHA1 4aa1a18c813beae2bfa42cf71ea1b476e6a4871a SHA256 1af5614fd871a58c2178d5a6902c6777a292774ca76da3e23907d7b431cd9efa
822
823 diff --git a/dev-java/excalibur-pool-instrumented/excalibur-pool-instrumented-2.1.ebuild b/dev-java/excalibur-pool-instrumented/excalibur-pool-instrumented-2.1.ebuild
824 deleted file mode 100644
825 index a146e26..0000000
826 --- a/dev-java/excalibur-pool-instrumented/excalibur-pool-instrumented-2.1.ebuild
827 +++ /dev/null
828 @@ -1,37 +0,0 @@
829 -# Copyright 1999-2011 Gentoo Foundation
830 -# Distributed under the terms of the GNU General Public License v2
831 -# $Header$
832 -
833 -EAPI=4
834 -
835 -JAVA_PKG_IUSE="doc source"
836 -
837 -inherit java-pkg-2 java-pkg-simple
838 -
839 -DESCRIPTION="Pool from Excalibur containerkit"
840 -HOMEPAGE="http://excalibur.apache.org"
841 -SRC_URI="http://archive.apache.org/dist/excalibur/${PN/-instrumented}/source/${P}-src.tar.gz"
842 -
843 -LICENSE="Apache-2.0"
844 -SLOT="0"
845 -IUSE=""
846 -KEYWORDS="~amd64 ~x86"
847 -
848 -COMMON_DEP="
849 - dev-java/avalon-framework:4.2
850 - dev-java/excalibur-instrument-api:0
851 - dev-java/excalibur-pool-api:0"
852 -RDEPEND="${COMMON_DEP}
853 - >=virtual/jre-1.4"
854 -DEPEND="${COMMON_DEP}
855 - >=virtual/jdk-1.4"
856 -
857 -S="${WORKDIR}"/${PN}
858 -
859 -JAVA_SRC_DIR="src/java"
860 -JAVA_GENTOO_CLASSPATH="avalon-framework-4.2,excalibur-instrument-api,excalibur-pool-api"
861 -
862 -java_prepare() {
863 - # Maven 1 project
864 - rm -vf build.xml
865 -}
866
867 diff --git a/dev-java/excalibur-pool-instrumented/metadata.xml b/dev-java/excalibur-pool-instrumented/metadata.xml
868 deleted file mode 100644
869 index 838c00a..0000000
870 --- a/dev-java/excalibur-pool-instrumented/metadata.xml
871 +++ /dev/null
872 @@ -1,5 +0,0 @@
873 -<?xml version="1.0" encoding="UTF-8"?>
874 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
875 -<pkgmetadata>
876 -<herd>java</herd>
877 -</pkgmetadata>
878
879 diff --git a/dev-java/excalibur-pool/ChangeLog b/dev-java/excalibur-pool/ChangeLog
880 deleted file mode 100644
881 index 41da0a5..0000000
882 --- a/dev-java/excalibur-pool/ChangeLog
883 +++ /dev/null
884 @@ -1,9 +0,0 @@
885 -# ChangeLog for dev-java/excalibur-pool
886 -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
887 -# $Header: $
888 -
889 - 14 Aug 2008; Jesse Farinacci <jieryn@×××××.com> excalibur-pool-1.2.ebuild:
890 - fixing IUSE repoman warnings
891 -
892 - 14 Aug 2008; Jesse Farinacci <jieryn@×××××.com> +ChangeLog:
893 - adding ChangeLog to shut repoman up
894
895 diff --git a/dev-java/excalibur-pool/Manifest b/dev-java/excalibur-pool/Manifest
896 deleted file mode 100644
897 index 027537e..0000000
898 --- a/dev-java/excalibur-pool/Manifest
899 +++ /dev/null
900 @@ -1,4 +0,0 @@
901 -DIST excalibur-pool-1.2.zip 143839 RMD160 52ce753b45fdc4b554cbbd008449956debe5eaa4 SHA1 8e2786df167f1b7a8030f992379dea1fed119708 SHA256 5db95d63dbf02c83f726e94918b56eaaacd09eb11b8fa6e21c3f0043ebdeaa5a
902 -EBUILD excalibur-pool-1.2.ebuild 1434 RMD160 3c15a8af4bd614e43c3902b26e66d27afd63103b SHA1 8b1cbdb9b615fa8535eb220311c08ee71fb5c182 SHA256 3c91112003d4914f135d273040eee75ba347c02533cb3c4e525430a8225fea6f
903 -MISC ChangeLog 333 RMD160 516c954070b6bacd8c2df7e9984d215eab8fe0e0 SHA1 9b33f03a9afbd6ef2f2d57a16bbccefebe51b1ce SHA256 626a0c522376a33cf0382f1ad489a1ea32b573f38e36c3f29970ac594f038817
904 -MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
905
906 diff --git a/dev-java/excalibur-pool/excalibur-pool-1.2.ebuild b/dev-java/excalibur-pool/excalibur-pool-1.2.ebuild
907 deleted file mode 100644
908 index 277c0df..0000000
909 --- a/dev-java/excalibur-pool/excalibur-pool-1.2.ebuild
910 +++ /dev/null
911 @@ -1,53 +0,0 @@
912 -# Copyright 1999-2009 Gentoo Foundation
913 -# Distributed under the terms of the GNU General Public License v2
914 -# $Header$
915 -JAVA_PKG_IUSE="doc source"
916 -
917 -inherit java-pkg-2
918 -
919 -HOMEPAGE="http://excalibur.apache.org"
920 -SRC_URI="mirror://apache/avalon/${PN}/source/${P}.zip"
921 -
922 -LICENSE="Apache-2.0"
923 -SLOT="1"
924 -IUSE=""
925 -KEYWORDS="~amd64 ~x86"
926 -
927 -JAVA_VERSION="1.4"
928 -COMMON_DEPEND="dev-java/commons-collections
929 - =dev-java/avalon-framework-4.1*
930 - =dev-java/excalibur-instrument-1*"
931 -
932 -RDEPEND=">=virtual/jre-${JAVA_VERSION}
933 - ${COMMON_DEPEND}"
934 -
935 -DEPEND=">=virtual/jdk-${JAVA_VERSION}
936 - app-arch/unzip
937 - ${COMMON_DEPEND}"
938 -SRC_DIR="${S}/src"
939 -JAVADOC_DIR="${S}/javadoc"
940 -
941 -src_unpack() {
942 - unpack ${A}
943 - cd ${S}
944 - unzip src.zip -d src
945 - rm -rf *.jar
946 -}
947 -
948 -src_compile() {
949 - mkdir classes || die "Could not create compile output dir"
950 - ejavac -cp $(java-pkg_getjars commons-collections,avalon-framework-4.1,excalibur-instrument-1) -d classes $(find ${SRC_DIR} -name "*.java") || die "Compilation failed"
951 - jar -cf "${S}/${PN}.jar" -C classes . || die "Could not create jar"
952 - #Generate javadoc
953 - if use doc ; then
954 - mkdir "${JAVADOC_DIR}" || die "Could not create javadoc dir"
955 - cd ${SRC_DIR}
956 - javadoc -source "${JAVA_VERSION}" -d ${JAVADOC_DIR} $(find "org/apache/avalon/excalibur/pool" -type d | tr '/' '.') || die "Could not create javadoc"
957 - fi
958 -}
959 -
960 -src_install() {
961 - java-pkg_dojar ${PN}.jar
962 - use doc && java-pkg_dojavadoc ${JAVADOC_DIR}
963 - use source && java-pkg_dosrc ${SRC_DIR}/*
964 -}
965
966 diff --git a/dev-java/excalibur-pool/metadata.xml b/dev-java/excalibur-pool/metadata.xml
967 deleted file mode 100644
968 index 838c00a..0000000
969 --- a/dev-java/excalibur-pool/metadata.xml
970 +++ /dev/null
971 @@ -1,5 +0,0 @@
972 -<?xml version="1.0" encoding="UTF-8"?>
973 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
974 -<pkgmetadata>
975 -<herd>java</herd>
976 -</pkgmetadata>