Gentoo Archives: gentoo-commits

From: James Le Cuirot <chewi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/java:master commit in: dev-java/excalibur-testcase/, dev-java/excalibur-thread/, ...
Date: Fri, 31 Jul 2015 12:46:02
Message-Id: 1438276866.d2251848b71fe8858add7b1db493997e46cfe383.chewi@gentoo
1 commit: d2251848b71fe8858add7b1db493997e46cfe383
2 Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
3 AuthorDate: Thu Jul 30 15:50:44 2015 +0000
4 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
5 CommitDate: Thu Jul 30 17:21:06 2015 +0000
6 URL: https://gitweb.gentoo.org/proj/java.git/commit/?id=d2251848
7
8 [dev-java/excalibur-*] Apache Excalibur has been retired as of 2010-12-15
9
10 dev-java/excalibur-component/ChangeLog | 12 -----
11 dev-java/excalibur-component/Manifest | 1 -
12 .../excalibur-component-2.1.ebuild | 32 ------------
13 dev-java/excalibur-component/metadata.xml | 6 ---
14 dev-java/excalibur-datasource/ChangeLog | 8 ---
15 dev-java/excalibur-datasource/Manifest | 1 -
16 .../excalibur-datasource-2.1.ebuild | 36 --------------
17 dev-java/excalibur-datasource/metadata.xml | 6 ---
18 dev-java/excalibur-instrument/ChangeLog | 16 ------
19 dev-java/excalibur-instrument/Manifest | 5 --
20 .../excalibur-instrument-2.1.ebuild | 26 ----------
21 dev-java/excalibur-instrument/metadata.xml | 6 ---
22 dev-java/excalibur-pool-api/ChangeLog | 7 ---
23 dev-java/excalibur-pool-api/Manifest | 1 -
24 .../excalibur-pool-api-2.1.ebuild | 34 -------------
25 .../files/2.1-build.xml-javadoc.patch | 18 -------
26 dev-java/excalibur-pool-api/metadata.xml | 6 ---
27 dev-java/excalibur-pool-impl/ChangeLog | 7 ---
28 dev-java/excalibur-pool-impl/Manifest | 1 -
29 .../excalibur-pool-impl-2.1.ebuild | 58 ----------------------
30 .../files/2.1-build.xml-javadoc.patch | 18 -------
31 dev-java/excalibur-pool-impl/metadata.xml | 6 ---
32 dev-java/excalibur-pool/ChangeLog | 16 ------
33 dev-java/excalibur-pool/Manifest | 3 --
34 dev-java/excalibur-pool/excalibur-pool-2.1.ebuild | 44 ----------------
35 .../files/2.1-build.xml-javadoc.patch | 18 -------
36 dev-java/excalibur-pool/metadata.xml | 6 ---
37 dev-java/excalibur-testcase/ChangeLog | 8 ---
38 dev-java/excalibur-testcase/Manifest | 1 -
39 .../excalibur-testcase-2.1.ebuild | 27 ----------
40 dev-java/excalibur-testcase/metadata.xml | 6 ---
41 dev-java/excalibur-thread/ChangeLog | 19 -------
42 dev-java/excalibur-thread/Manifest | 3 --
43 .../excalibur-thread/excalibur-thread-2.1.ebuild | 41 ---------------
44 dev-java/excalibur-thread/metadata.xml | 5 --
45 35 files changed, 508 deletions(-)
46
47 diff --git a/dev-java/excalibur-component/ChangeLog b/dev-java/excalibur-component/ChangeLog
48 deleted file mode 100644
49 index c4fb4c0..0000000
50 --- a/dev-java/excalibur-component/ChangeLog
51 +++ /dev/null
52 @@ -1,12 +0,0 @@
53 -# ChangeLog for dev-java/excalibur-component
54 -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
55 -# $Header: $
56 -
57 - 22 Jan 2009; Alistair Bush <ali_bush@g.o> +metadata.xml,
58 - excalibur-component-2.1.ebuild:
59 - QA Fixes.
60 -
61 - 09 Mar 2008; Alistair Bush <ali_bush@g.o>
62 - excalibur-component-2.1.ebuild:
63 - Keyword ~amd64
64 -
65
66 diff --git a/dev-java/excalibur-component/Manifest b/dev-java/excalibur-component/Manifest
67 deleted file mode 100644
68 index af72dbc..0000000
69 --- a/dev-java/excalibur-component/Manifest
70 +++ /dev/null
71 @@ -1 +0,0 @@
72 -DIST excalibur-component-2.1-src.tar.gz 45370 SHA256 f80fbbf472b9161e928573aa4de52835438416cdfdda65ce6d055c456d4ac63e
73
74 diff --git a/dev-java/excalibur-component/excalibur-component-2.1.ebuild b/dev-java/excalibur-component/excalibur-component-2.1.ebuild
75 deleted file mode 100644
76 index adf2a7d..0000000
77 --- a/dev-java/excalibur-component/excalibur-component-2.1.ebuild
78 +++ /dev/null
79 @@ -1,32 +0,0 @@
80 -# Copyright 1999-2009 Gentoo Foundation
81 -# Distributed under the terms of the GNU General Public License v2
82 -# $Header: $
83 -
84 -EAPI=1
85 -EXCALIBUR_TEST=true
86 -
87 -inherit excalibur
88 -
89 -SRC_URI="mirror://apache/excalibur/excalibur-testcase/source/${P}-src.tar.gz"
90 -
91 -SLOT="0"
92 -KEYWORDS="~amd64 ~x86"
93 -IUSE=""
94 -
95 -DEPEND="
96 - =dev-java/avalon-framework-4.2*
97 - =dev-java/avalon-logkit-2*
98 - dev-java/excalibur-pool
99 - dev-java/excalibur-instrument
100 - dev-java/excalibur-logger
101 - =dev-java/servletapi-2.4*"
102 -RDEPEND="${DEPEND}"
103 -
104 -EXCALIBUR_JAR_FROM="
105 - avalon-framework-4.2
106 - avalon-logkit-2.0
107 - excalibur-pool
108 - excalibur-instrument
109 - excalibur-logger
110 - servletapi-2.4"
111 -
112
113 diff --git a/dev-java/excalibur-component/metadata.xml b/dev-java/excalibur-component/metadata.xml
114 deleted file mode 100644
115 index 604e0a4..0000000
116 --- a/dev-java/excalibur-component/metadata.xml
117 +++ /dev/null
118 @@ -1,6 +0,0 @@
119 -<?xml version="1.0" encoding="UTF-8"?>
120 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
121 -<pkgmetadata>
122 - <herd>java</herd>
123 -</pkgmetadata>
124 -
125
126 diff --git a/dev-java/excalibur-datasource/ChangeLog b/dev-java/excalibur-datasource/ChangeLog
127 deleted file mode 100644
128 index 9a541c5..0000000
129 --- a/dev-java/excalibur-datasource/ChangeLog
130 +++ /dev/null
131 @@ -1,8 +0,0 @@
132 -# ChangeLog for dev-java/excalibur-datasource
133 -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
134 -# $Header: $
135 -
136 - 22 Jan 2009; Alistair Bush <ali_bush@g.o> +metadata.xml,
137 - excalibur-datasource-2.1.ebuild:
138 - QA Fixes.
139 -
140
141 diff --git a/dev-java/excalibur-datasource/Manifest b/dev-java/excalibur-datasource/Manifest
142 deleted file mode 100644
143 index 9d3a642..0000000
144 --- a/dev-java/excalibur-datasource/Manifest
145 +++ /dev/null
146 @@ -1 +0,0 @@
147 -DIST excalibur-datasource-2.1-src.tar.gz 42147 SHA256 e89813005b93cb116302a2125ebb15afa7de65b9508b29df7d7619da5c8071c2
148
149 diff --git a/dev-java/excalibur-datasource/excalibur-datasource-2.1.ebuild b/dev-java/excalibur-datasource/excalibur-datasource-2.1.ebuild
150 deleted file mode 100644
151 index 6dbc3c0..0000000
152 --- a/dev-java/excalibur-datasource/excalibur-datasource-2.1.ebuild
153 +++ /dev/null
154 @@ -1,36 +0,0 @@
155 -# Copyright 1999-2009 Gentoo Foundation
156 -# Distributed under the terms of the GNU General Public License v2
157 -# $Header: $
158 -
159 -EXCALIBUR_TESTS="true"
160 -
161 -inherit excalibur
162 -
163 -SLOT="0"
164 -KEYWORDS="~x86"
165 -IUSE=""
166 -
167 -RDEPEND="
168 - =dev-java/avalon-framework-4.2*
169 - dev-java/excalibur-pool
170 - dev-java/excalibur-instrument
171 - "
172 -
173 -DEPEND="${RDEPEND}
174 - test? (
175 - dev-java/excalibur-testcase
176 - dev-java/concurrent-util
177 - )"
178 -
179 -IUSE=""
180 -
181 -EXCALIBUR_JAR_FROM="
182 - avalon-framework-4.2
183 - excalibur-pool
184 - excalibur-instrument"
185 -
186 -# Needs jdbc driver from hsqldb
187 -EXCALIBUR_TEST_JAR_FROM="
188 - excalibur-testcase
189 - concurrent-util
190 - hsqldb"
191
192 diff --git a/dev-java/excalibur-datasource/metadata.xml b/dev-java/excalibur-datasource/metadata.xml
193 deleted file mode 100644
194 index 604e0a4..0000000
195 --- a/dev-java/excalibur-datasource/metadata.xml
196 +++ /dev/null
197 @@ -1,6 +0,0 @@
198 -<?xml version="1.0" encoding="UTF-8"?>
199 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
200 -<pkgmetadata>
201 - <herd>java</herd>
202 -</pkgmetadata>
203 -
204
205 diff --git a/dev-java/excalibur-instrument/ChangeLog b/dev-java/excalibur-instrument/ChangeLog
206 deleted file mode 100644
207 index e6f6a6b..0000000
208 --- a/dev-java/excalibur-instrument/ChangeLog
209 +++ /dev/null
210 @@ -1,16 +0,0 @@
211 -# ChangeLog for dev-java/excalibur-instrument
212 -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
213 -# $Header: $
214 -
215 - 22 Jan 2009; Alistair Bush <ali_bush@g.o> +metadata.xml,
216 - excalibur-instrument-2.1.ebuild:
217 - QA Fixes.
218 -
219 - 09 Mar 2008; Alistair Bush <ali_bush@g.o>
220 - excalibur-instrument-2.1.ebuild:
221 - Keyword ~amd64
222 -
223 - 27 Apr 2007; Petteri Räty <betelgeuse@g.o>
224 - excalibur-instrument-2.1.ebuild:
225 - Fix RDEPEND typo.
226 -
227
228 diff --git a/dev-java/excalibur-instrument/Manifest b/dev-java/excalibur-instrument/Manifest
229 deleted file mode 100644
230 index b5b231a..0000000
231 --- a/dev-java/excalibur-instrument/Manifest
232 +++ /dev/null
233 @@ -1,5 +0,0 @@
234 -DIST excalibur-instrument-api-2.1-src.tar.gz 13572 SHA256 4640397118bd5d617250fd8ad64ad517ce197dbfadbecd58082d3d9d396971d2
235 -DIST excalibur-instrument-client-2.1-src.tar.gz 85615 SHA256 0b8cda0036e933ddc59455245e2a3f04048cb2bed85deec69a3acc8502413f38
236 -DIST excalibur-instrument-mgr-api-2.1-src.tar.gz 12087 SHA256 6384b1b8d105d3018fa06033bb0408429c9a34f5daa6731df06679c4e4656ca4
237 -DIST excalibur-instrument-mgr-http-2.1-src.tar.gz 75480 SHA256 8d176a70531b4aaf3d5ac1be36d13bb07b2d85cdc3ff2fedad64fd2ef9bf604a
238 -DIST excalibur-instrument-mgr-impl-2.1-src.tar.gz 44793 SHA256 7ff48fc5f0e6f0317f610277fafeda43ccd3401c6809989a8f8197f5d2ba4ff8
239
240 diff --git a/dev-java/excalibur-instrument/excalibur-instrument-2.1.ebuild b/dev-java/excalibur-instrument/excalibur-instrument-2.1.ebuild
241 deleted file mode 100644
242 index 16ee1cf..0000000
243 --- a/dev-java/excalibur-instrument/excalibur-instrument-2.1.ebuild
244 +++ /dev/null
245 @@ -1,26 +0,0 @@
246 -# Copyright 1999-2009 Gentoo Foundation
247 -# Distributed under the terms of the GNU General Public License v2
248 -# $Header: $
249 -
250 -EXCALIBUR_MODULES="
251 - ${PN}-api-${PV}
252 - ${PN}-client-${PV}
253 - ${PN}-mgr-api-${PV}
254 - ${PN}-mgr-http-${PV}
255 - ${PN}-mgr-impl-${PV}"
256 -
257 -EXCALIBUR_TESTS="true"
258 -
259 -inherit excalibur-multi
260 -
261 -SLOT="0"
262 -KEYWORDS="~amd64 ~x86"
263 -IUSE=""
264 -
265 -RDEPEND="=dev-java/avalon-framework-4.2*"
266 -DEPEND="${RDEPEND}"
267 -
268 -S="${WORKDIR}"
269 -
270 -EXCALIBUR_JAR_FROM="avalon-framework-4.2"
271 -
272
273 diff --git a/dev-java/excalibur-instrument/metadata.xml b/dev-java/excalibur-instrument/metadata.xml
274 deleted file mode 100644
275 index 604e0a4..0000000
276 --- a/dev-java/excalibur-instrument/metadata.xml
277 +++ /dev/null
278 @@ -1,6 +0,0 @@
279 -<?xml version="1.0" encoding="UTF-8"?>
280 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
281 -<pkgmetadata>
282 - <herd>java</herd>
283 -</pkgmetadata>
284 -
285
286 diff --git a/dev-java/excalibur-pool-api/ChangeLog b/dev-java/excalibur-pool-api/ChangeLog
287 deleted file mode 100644
288 index 4bff81a..0000000
289 --- a/dev-java/excalibur-pool-api/ChangeLog
290 +++ /dev/null
291 @@ -1,7 +0,0 @@
292 -# ChangeLog for dev-java/excalibur-pool-api
293 -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
294 -# $Header: $
295 -
296 - 22 Jan 2009; Alistair Bush <ali_bush@g.o> ChangeLog:
297 - Add ChangeLog for QA.
298 -
299
300 diff --git a/dev-java/excalibur-pool-api/Manifest b/dev-java/excalibur-pool-api/Manifest
301 deleted file mode 100644
302 index c10a651..0000000
303 --- a/dev-java/excalibur-pool-api/Manifest
304 +++ /dev/null
305 @@ -1 +0,0 @@
306 -DIST excalibur-pool-api-2.1-src.tar.gz 7914 SHA256 4681bf6772fbe29e9c266372b2686e0de93fd9d0f7ea5a69a65bb2cbfecefa15
307
308 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
309 deleted file mode 100644
310 index c80ef36..0000000
311 --- a/dev-java/excalibur-pool-api/excalibur-pool-api-2.1.ebuild
312 +++ /dev/null
313 @@ -1,34 +0,0 @@
314 -# Copyright 1999-2006 Gentoo Foundation
315 -# Distributed under the terms of the GNU General Public License v2
316 -# $Header: /var/cvsroot/gentoo-x86/dev-java/excalibur-logger/excalibur-logger-2.1.ebuild,v 1.2 2006/12/22 18:12:09 betelgeuse Exp $
317 -
318 -inherit base java-pkg-2 java-ant-2
319 -
320 -DESCRIPTION="Pool from the Excalibur containerkit"
321 -HOMEPAGE="http://excalibur.apache.org/component-list.html"
322 -SRC_URI="mirror://apache/excalibur/${PN/-api}/source/${P}-src.tar.gz"
323 -
324 -LICENSE="Apache-2.0"
325 -SLOT="0"
326 -KEYWORDS="~x86"
327 -
328 -IUSE="doc source"
329 -
330 -RDEPEND=">=virtual/jre-1.4"
331 -
332 -DEPEND=">=virtual/jdk-1.4
333 - dev-java/ant-core
334 - source? ( app-arch/zip )"
335 -
336 -S=${WORKDIR}/${PN}
337 -
338 -PATCHES="${FILESDIR}/2.1-build.xml-javadoc.patch"
339 -
340 -# has test target but there are no junit tests (maven generated?)
341 -
342 -src_install() {
343 - java-pkg_newjar target/${P}.jar
344 - dodoc NOTICE.txt
345 - use doc && java-pkg_dojavadoc dist/docs/api
346 - use source && java-pkg_dosrc src/java/*
347 -}
348
349 diff --git a/dev-java/excalibur-pool-api/files/2.1-build.xml-javadoc.patch b/dev-java/excalibur-pool-api/files/2.1-build.xml-javadoc.patch
350 deleted file mode 100644
351 index 9eb1232..0000000
352 --- a/dev-java/excalibur-pool-api/files/2.1-build.xml-javadoc.patch
353 +++ /dev/null
354 @@ -1,18 +0,0 @@
355 ---- build.xml.orig 2007-01-13 22:21:35.000000000 +0200
356 -+++ build.xml 2007-01-13 22:22:11.000000000 +0200
357 -@@ -134,7 +134,7 @@
358 - </property>
359 - <property name="title" value="Excalibur Pool API 2.1 API">
360 - </property>
361 -- <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/java" packagenames="org.apache.excalibur.pool.*">
362 -+ <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/java" packagenames="org.apache.avalon.excalibur.pool.*">
363 - <classpath>
364 - <path refid="build.classpath">
365 - </path>
366 -@@ -155,4 +155,4 @@
367 - <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
368 - </unjar>
369 - </target>
370 --</project>
371 -\ No newline at end of file
372 -+</project>
373
374 diff --git a/dev-java/excalibur-pool-api/metadata.xml b/dev-java/excalibur-pool-api/metadata.xml
375 deleted file mode 100644
376 index 604e0a4..0000000
377 --- a/dev-java/excalibur-pool-api/metadata.xml
378 +++ /dev/null
379 @@ -1,6 +0,0 @@
380 -<?xml version="1.0" encoding="UTF-8"?>
381 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
382 -<pkgmetadata>
383 - <herd>java</herd>
384 -</pkgmetadata>
385 -
386
387 diff --git a/dev-java/excalibur-pool-impl/ChangeLog b/dev-java/excalibur-pool-impl/ChangeLog
388 deleted file mode 100644
389 index fbc456a..0000000
390 --- a/dev-java/excalibur-pool-impl/ChangeLog
391 +++ /dev/null
392 @@ -1,7 +0,0 @@
393 -# ChangeLog for dev-java/excalibur-pool-impl
394 -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
395 -# $Header: $
396 -
397 - 22 Jan 2009; Alistair Bush <ali_bush@g.o> ChangeLog:
398 - Add ChangeLog for QA.
399 -
400
401 diff --git a/dev-java/excalibur-pool-impl/Manifest b/dev-java/excalibur-pool-impl/Manifest
402 deleted file mode 100644
403 index afa3a9c..0000000
404 --- a/dev-java/excalibur-pool-impl/Manifest
405 +++ /dev/null
406 @@ -1 +0,0 @@
407 -DIST excalibur-pool-impl-2.1-src.tar.gz 28219 SHA256 4b1b34f9861bf59eb45c32e8a5c5e3337a6fff0ba369ad090066b94f6e5b1593
408
409 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
410 deleted file mode 100644
411 index b0fd7df..0000000
412 --- a/dev-java/excalibur-pool-impl/excalibur-pool-impl-2.1.ebuild
413 +++ /dev/null
414 @@ -1,58 +0,0 @@
415 -# Copyright 1999-2006 Gentoo Foundation
416 -# Distributed under the terms of the GNU General Public License v2
417 -# $Header: /var/cvsroot/gentoo-x86/dev-java/excalibur-logger/excalibur-logger-2.1.ebuild,v 1.2 2006/12/22 18:12:09 betelgeuse Exp $
418 -
419 -inherit java-pkg-2 java-ant-2
420 -
421 -DESCRIPTION="Pool from the Excalibur containerkit"
422 -HOMEPAGE="http://excalibur.apache.org/component-list.html"
423 -SRC_URI="mirror://apache/excalibur/${PN/-impl}/source/${P}-src.tar.gz"
424 -
425 -LICENSE="Apache-2.0"
426 -SLOT="0"
427 -KEYWORDS="~x86"
428 -
429 -IUSE="doc source"
430 -
431 -RDEPEND=">=virtual/jre-1.4"
432 -
433 -DEPEND=">=virtual/jdk-1.4
434 - dev-java/ant-core
435 - source? ( app-arch/zip )
436 - test? (
437 - dev-java/junit
438 - dev-java/junitperf
439 - dev-java/ant-tasks
440 - )"
441 -
442 -S=${WORKDIR}/${PN}
443 -
444 -
445 -src_unpack() {
446 - unpack ${A}
447 - cd "${S}"
448 - epatch "${FILESDIR}/2.1-build.xml-javadoc.patch"
449 -
450 - java-ant_ignore-system-classes
451 - mkdir -p target/lib
452 - cd target/lib || die
453 - java-pkg_jar-from avalon-framework-4.2
454 - java-pkg_jar-from commons-collections
455 - java-pkg_jar-from concurrent-util
456 - java-pkg_jar-from excalibur-pool-api
457 -}
458 -
459 -src_test() {
460 - cd target/lib
461 - java-pkg_jar-from --build-only junit
462 - java-pkg_jar-from --build-only junitperf
463 - cd "${S}"
464 - eant test -DJunit.present=true
465 -}
466 -
467 -src_install() {
468 - java-pkg_newjar target/${P}.jar
469 - dodoc NOTICE.txt
470 - use doc && java-pkg_dojavadoc dist/docs/api
471 - use source && java-pkg_dosrc src/java/*
472 -}
473
474 diff --git a/dev-java/excalibur-pool-impl/files/2.1-build.xml-javadoc.patch b/dev-java/excalibur-pool-impl/files/2.1-build.xml-javadoc.patch
475 deleted file mode 100644
476 index 9eb1232..0000000
477 --- a/dev-java/excalibur-pool-impl/files/2.1-build.xml-javadoc.patch
478 +++ /dev/null
479 @@ -1,18 +0,0 @@
480 ---- build.xml.orig 2007-01-13 22:21:35.000000000 +0200
481 -+++ build.xml 2007-01-13 22:22:11.000000000 +0200
482 -@@ -134,7 +134,7 @@
483 - </property>
484 - <property name="title" value="Excalibur Pool API 2.1 API">
485 - </property>
486 -- <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/java" packagenames="org.apache.excalibur.pool.*">
487 -+ <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/java" packagenames="org.apache.avalon.excalibur.pool.*">
488 - <classpath>
489 - <path refid="build.classpath">
490 - </path>
491 -@@ -155,4 +155,4 @@
492 - <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
493 - </unjar>
494 - </target>
495 --</project>
496 -\ No newline at end of file
497 -+</project>
498
499 diff --git a/dev-java/excalibur-pool-impl/metadata.xml b/dev-java/excalibur-pool-impl/metadata.xml
500 deleted file mode 100644
501 index 604e0a4..0000000
502 --- a/dev-java/excalibur-pool-impl/metadata.xml
503 +++ /dev/null
504 @@ -1,6 +0,0 @@
505 -<?xml version="1.0" encoding="UTF-8"?>
506 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
507 -<pkgmetadata>
508 - <herd>java</herd>
509 -</pkgmetadata>
510 -
511
512 diff --git a/dev-java/excalibur-pool/ChangeLog b/dev-java/excalibur-pool/ChangeLog
513 deleted file mode 100644
514 index 25ea9cf..0000000
515 --- a/dev-java/excalibur-pool/ChangeLog
516 +++ /dev/null
517 @@ -1,16 +0,0 @@
518 -# ChangeLog for dev-java/excalibur-pool
519 -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
520 -# $Header: $
521 -
522 - 22 Jan 2009; Alistair Bush <ali_bush@g.o> +metadata.xml,
523 - excalibur-pool-2.1.ebuild:
524 - QA Fixes.
525 -
526 - 09 Mar 2008; Alistair Bush <ali_bush@g.o>
527 - excalibur-pool-2.1.ebuild:
528 - Keyworded ~amd64. Fixed javadoc building. Need to fix javadoc install.
529 -
530 - 27 Apr 2007; Petteri Räty <betelgeuse@g.o>
531 - excalibur-pool-2.1.ebuild:
532 - Fix dependencies.
533 -
534
535 diff --git a/dev-java/excalibur-pool/Manifest b/dev-java/excalibur-pool/Manifest
536 deleted file mode 100644
537 index de5f0a0..0000000
538 --- a/dev-java/excalibur-pool/Manifest
539 +++ /dev/null
540 @@ -1,3 +0,0 @@
541 -DIST excalibur-pool-api-2.1-src.tar.gz 7914 SHA256 4681bf6772fbe29e9c266372b2686e0de93fd9d0f7ea5a69a65bb2cbfecefa15
542 -DIST excalibur-pool-impl-2.1-src.tar.gz 28219 SHA256 4b1b34f9861bf59eb45c32e8a5c5e3337a6fff0ba369ad090066b94f6e5b1593
543 -DIST excalibur-pool-instrumented-2.1-src.tar.gz 13756 SHA256 1af5614fd871a58c2178d5a6902c6777a292774ca76da3e23907d7b431cd9efa
544
545 diff --git a/dev-java/excalibur-pool/excalibur-pool-2.1.ebuild b/dev-java/excalibur-pool/excalibur-pool-2.1.ebuild
546 deleted file mode 100644
547 index ca7851a..0000000
548 --- a/dev-java/excalibur-pool/excalibur-pool-2.1.ebuild
549 +++ /dev/null
550 @@ -1,44 +0,0 @@
551 -# Copyright 1999-2009 Gentoo Foundation
552 -# Distributed under the terms of the GNU General Public License v2
553 -# $Header: $
554 -
555 -EXCALIBUR_MODULES="
556 - ${PN}-api
557 - ${PN}-impl
558 - ${PN}-instrumented"
559 -
560 -EXCALIBUR_MODULE_USES_PV="false"
561 -
562 -EXCALIBUR_TESTS="true"
563 -
564 -inherit excalibur-multi
565 -
566 -SLOT="0"
567 -KEYWORDS="~amd64 ~x86"
568 -IUSE=""
569 -
570 -RDEPEND="
571 - =dev-java/avalon-framework-4.2*
572 - dev-java/commons-collections
573 - dev-java/concurrent-util
574 - dev-java/excalibur-instrument"
575 -DEPEND="${RDEPEND}
576 - test? ( dev-java/junitperf )"
577 -
578 -S="${WORKDIR}"
579 -
580 -EXCALIBUR_JAR_FROM="
581 - avalon-framework-4.2
582 - commons-collections
583 - concurrent-util
584 - excalibur-instrument"
585 -
586 -EXCALIBUR_TEST_JAR_FROM="junit junitperf"
587 -
588 -src_unpack() {
589 - excalibur-multi_src_unpack
590 - cd "${S}"
591 - sed -i -e 's/org.apache.excalibur/org.apache.avalon.excalibur/' \
592 - excalibur-pool-api/build.xml excalibur-pool-impl/build.xml \
593 - excalibur-pool-instrumented/build.xml
594 -}
595
596 diff --git a/dev-java/excalibur-pool/files/2.1-build.xml-javadoc.patch b/dev-java/excalibur-pool/files/2.1-build.xml-javadoc.patch
597 deleted file mode 100644
598 index 9eb1232..0000000
599 --- a/dev-java/excalibur-pool/files/2.1-build.xml-javadoc.patch
600 +++ /dev/null
601 @@ -1,18 +0,0 @@
602 ---- build.xml.orig 2007-01-13 22:21:35.000000000 +0200
603 -+++ build.xml 2007-01-13 22:22:11.000000000 +0200
604 -@@ -134,7 +134,7 @@
605 - </property>
606 - <property name="title" value="Excalibur Pool API 2.1 API">
607 - </property>
608 -- <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/java" packagenames="org.apache.excalibur.pool.*">
609 -+ <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/java" packagenames="org.apache.avalon.excalibur.pool.*">
610 - <classpath>
611 - <path refid="build.classpath">
612 - </path>
613 -@@ -155,4 +155,4 @@
614 - <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
615 - </unjar>
616 - </target>
617 --</project>
618 -\ No newline at end of file
619 -+</project>
620
621 diff --git a/dev-java/excalibur-pool/metadata.xml b/dev-java/excalibur-pool/metadata.xml
622 deleted file mode 100644
623 index 604e0a4..0000000
624 --- a/dev-java/excalibur-pool/metadata.xml
625 +++ /dev/null
626 @@ -1,6 +0,0 @@
627 -<?xml version="1.0" encoding="UTF-8"?>
628 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
629 -<pkgmetadata>
630 - <herd>java</herd>
631 -</pkgmetadata>
632 -
633
634 diff --git a/dev-java/excalibur-testcase/ChangeLog b/dev-java/excalibur-testcase/ChangeLog
635 deleted file mode 100644
636 index c3f1714..0000000
637 --- a/dev-java/excalibur-testcase/ChangeLog
638 +++ /dev/null
639 @@ -1,8 +0,0 @@
640 -# ChangeLog for dev-java/excalibur-testcase
641 -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
642 -# $Header: $
643 -
644 - 22 Jan 2009; Alistair Bush <ali_bush@g.o> +metadata.xml,
645 - excalibur-testcase-2.1.ebuild:
646 - QA Fixes.
647 -
648
649 diff --git a/dev-java/excalibur-testcase/Manifest b/dev-java/excalibur-testcase/Manifest
650 deleted file mode 100644
651 index e1e7556..0000000
652 --- a/dev-java/excalibur-testcase/Manifest
653 +++ /dev/null
654 @@ -1 +0,0 @@
655 -DIST excalibur-testcase-2.1-src.tar.gz 18653 SHA256 958a027a389e1d60c5f30bf6bed9f18977dc9bb862b67bea751b0f17dff0ef82
656
657 diff --git a/dev-java/excalibur-testcase/excalibur-testcase-2.1.ebuild b/dev-java/excalibur-testcase/excalibur-testcase-2.1.ebuild
658 deleted file mode 100644
659 index 5b95c66..0000000
660 --- a/dev-java/excalibur-testcase/excalibur-testcase-2.1.ebuild
661 +++ /dev/null
662 @@ -1,27 +0,0 @@
663 -# Copyright 1999-2009 Gentoo Foundation
664 -# Distributed under the terms of the GNU General Public License v2
665 -# $Header: $
666 -
667 -inherit excalibur
668 -
669 -SRC_URI="mirror://apache/excalibur/${PN}/source/${P}-src.tar.gz"
670 -
671 -SLOT="0"
672 -KEYWORDS="~x86"
673 -IUSE=""
674 -
675 -DEPEND="
676 - =dev-java/avalon-framework-4.2*
677 - =dev-java/avalon-logkit-2*
678 - dev-java/excalibur-component
679 - dev-java/excalibur-logger
680 - dev-java/junit"
681 -RDEPEND="${DEPEND}"
682 -
683 -EXCALIBUR_JAR_FROM="
684 - avalon-framework-4.2
685 - avalon-logkit-2.0
686 - excalibur-component
687 - excalibur-logger
688 - junit"
689 -
690
691 diff --git a/dev-java/excalibur-testcase/metadata.xml b/dev-java/excalibur-testcase/metadata.xml
692 deleted file mode 100644
693 index 604e0a4..0000000
694 --- a/dev-java/excalibur-testcase/metadata.xml
695 +++ /dev/null
696 @@ -1,6 +0,0 @@
697 -<?xml version="1.0" encoding="UTF-8"?>
698 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
699 -<pkgmetadata>
700 - <herd>java</herd>
701 -</pkgmetadata>
702 -
703
704 diff --git a/dev-java/excalibur-thread/ChangeLog b/dev-java/excalibur-thread/ChangeLog
705 deleted file mode 100644
706 index 0f1a75e..0000000
707 --- a/dev-java/excalibur-thread/ChangeLog
708 +++ /dev/null
709 @@ -1,19 +0,0 @@
710 -# ChangeLog for dev-java/excalibur-thread
711 -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
712 -# $Header: $
713 -
714 - 22 Jan 2009; Alistair Bush <ali_bush@g.o>
715 - excalibur-thread-2.1.ebuild:
716 - QA Fixes.
717 -
718 - 26 May 2007; kiorky <kiorky@××××××××××.net> excalibur-thread-2.1.ebuild:
719 - fix DEPEND
720 -
721 - 26 May 2007; Vlastimil Babka <caster@g.o>
722 - excalibur-thread-2.1.ebuild:
723 - Fix typo in RDEPEND.
724 -
725 - 24 Apr 2007; kiorky <kiorky@××××××××××.net> +excalibur-thread-2.1.ebuild:
726 - added to the java-experimental overlay as a maven dependency.see #175836
727 -
728 -
729
730 diff --git a/dev-java/excalibur-thread/Manifest b/dev-java/excalibur-thread/Manifest
731 deleted file mode 100644
732 index 4cd1a50..0000000
733 --- a/dev-java/excalibur-thread/Manifest
734 +++ /dev/null
735 @@ -1,3 +0,0 @@
736 -DIST excalibur-thread-api-2.1-src.tar.gz 6985 SHA256 e67cecd79f31a1a4bd484a75a279e12ee6edd0731fc51af13e490123cc1dbdda
737 -DIST excalibur-thread-impl-2.1-src.tar.gz 16155 SHA256 68c3a05c55eedf570e41c9af7e8ff7e9fb2941973d55bd35cd3c7dc79d773fa8
738 -DIST excalibur-thread-instrumented-2.1-src.tar.gz 8753 SHA256 1b3b27b83e5ecd4cb3d82d017adfeb8c24b364fd488a8e408564cd8c69b77cce
739
740 diff --git a/dev-java/excalibur-thread/excalibur-thread-2.1.ebuild b/dev-java/excalibur-thread/excalibur-thread-2.1.ebuild
741 deleted file mode 100644
742 index a039a49..0000000
743 --- a/dev-java/excalibur-thread/excalibur-thread-2.1.ebuild
744 +++ /dev/null
745 @@ -1,41 +0,0 @@
746 -# Copyright 1999-2009 Gentoo Foundation
747 -# Distributed under the terms of the GNU General Public License v2
748 -# $Header: $
749 -
750 -EXCALIBUR_MODULES="
751 -${PN}-api
752 -${PN}-impl
753 -${PN}-instrumented"
754 -
755 -EXCALIBUR_MODULE_USES_PV="false"
756 -
757 -EXCALIBUR_TESTS="true"
758 -
759 -inherit excalibur-multi
760 -
761 -SLOT="0"
762 -KEYWORDS="~x86"
763 -
764 -RDEPEND="
765 -=dev-java/avalon-framework-4.2*
766 -dev-java/junit
767 -dev-java/junitperf
768 -dev-java/commons-collections
769 -dev-java/concurrent-util
770 -dev-java/excalibur-pool
771 -dev-java/excalibur-instrument"
772 -DEPEND="${RDEPEND}"
773 -
774 -IUSE=""
775 -
776 -S=${WORKDIR}
777 -
778 -EXCALIBUR_JAR_FROM="
779 -avalon-framework-4.2
780 -commons-collections
781 -concurrent-util
782 -excalibur-pool
783 -excalibur-instrument"
784 -
785 -EXCALIBUR_TEST_JAR_FROM="junit junitperf"
786 -
787
788 diff --git a/dev-java/excalibur-thread/metadata.xml b/dev-java/excalibur-thread/metadata.xml
789 deleted file mode 100644
790 index 838c00a..0000000
791 --- a/dev-java/excalibur-thread/metadata.xml
792 +++ /dev/null
793 @@ -1,5 +0,0 @@
794 -<?xml version="1.0" encoding="UTF-8"?>
795 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
796 -<pkgmetadata>
797 -<herd>java</herd>
798 -</pkgmetadata>