Remove old.

Package-Manager: portage-HEAD/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

21 files changed, 79 insertions, 502 deletions

diff --git a/dev-java/ant-apache-bcel/ChangeLog b/dev-java/ant-apache-bcel/ChangeLog
index 8769a6a30042..86979dde9ae6 100644
--- a/dev-java/ant-apache-bcel/ChangeLog
+++ b/dev-java/ant-apache-bcel/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/ant-apache-bcel
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-bcel/ChangeLog,v 1.40 2013/10/20 16:31:08 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-bcel/ChangeLog,v 1.41 2014/03/08 16:23:40 tomwij Exp $
+
+  08 Mar 2014; Tom Wijsman <TomWij@gentoo.org> -ant-apache-bcel-1.7.1.ebuild,
+  -ant-apache-bcel-1.8.0.ebuild, -ant-apache-bcel-1.8.1.ebuild:
+  Remove old.
 
   20 Oct 2013; Agostino Sarubbo <ago@gentoo.org> ant-apache-bcel-1.9.2.ebuild:
   Stable for ppc64, wrt bug #476958
diff --git a/dev-java/ant-apache-bcel/Manifest b/dev-java/ant-apache-bcel/Manifest
index 72a9bb4918db..a64672fd5c35 100644
--- a/dev-java/ant-apache-bcel/Manifest
+++ b/dev-java/ant-apache-bcel/Manifest
@@ -1,43 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-DIST ant-1.7.1-gentoo.tar.bz2 11836 SHA256 4bacd711cc4981272b8377335dafcb8841dd1fac177c0c349f3faf78b0354fe5 SHA512 7f397605223002e6e31589350dd5933743d64c626b7578c4be8bf4068403ad4ad987b6fe6605af142609b447a1f2d9333909d0117284ab508257547fe2da3448 WHIRLPOOL 5ad8c39e396ce7220ee3152286459de3d3ddeaec2d3196b6d700b04b31be337e711964db049fccf4077e55cebb83b56b2de590fd1801e4d64d94c75fa277404e
-DIST ant-1.8.0-gentoo.tar.bz2 13993 SHA256 12edd6ccfe9f4add90024e82ba1fc6dda141a04d97d800b860347c3d21007acb SHA512 4bc81ba7a99014a25263bbaeaf6b27791327b9ff6c54b25bbf8feaef619ac3eefdb6542559ecc2134959486e794c49ddbd92c044b287190c95960efa6154b3e0 WHIRLPOOL c5e13d1ae5506b1f8b9176b740dd486cd8a685cf59b920b745ca7c8b406e765206f30ebc0030252ef21d6d45ae54f9e0cdc2a804dbc1da9d2bfb9e9c77c52757
-DIST ant-1.8.1-gentoo.tar.bz2 14979 SHA256 1a2230ba44b1eadc4ca3367b56bb287271d76ade9c828a4ac64556f0f4d2e340 SHA512 35943d111f32f0c88146892da390112a1d6133ad5044b89b8302a543721753b584f5069f7f082f011dc4a3d1feb8d400a955b83a2dae9c9d4012de91584c4f0b WHIRLPOOL 6752b3647dfa30133d6c7de871082f9f8232b2ca90a702093c7b42bd7b49117d5fe26ffdab9ae6c14d166eb9c0fa26a15c821f947de2c3218b17759fd9ea5668
 DIST ant-1.8.2-gentoo.tar.bz2 14626 SHA256 48478e9a93402bebe92f5612ab61e2c694ad17b47da9e45e382717fd9a7f140b SHA512 8024d5716861b33ec6d6dd95f95c5e2f0e7e23d223a6089833f1546a84b84b40edbe806ecca9a53b51c0dd98f647823ac859d7b297782d3be5a24cb3f5d144e7 WHIRLPOOL ad9728920298feb79ef7d6ad303bd4d2266adb5ffbc450b3e51364b9a2df8747de867f6f2ebeca79c58eb55e0f5ceb2f3b415f76f067564d2da45f77320f55a6
 DIST ant-1.8.4-gentoo.tar.bz2 14894 SHA256 1b40d038ad17be9493384af68f1c18ea326742297cb93b8ddfb585722f36e1eb SHA512 5870d5a08be26d254c79a5e2ad2ab920cf16d1ea8937ae33b4189801ac02c5da0bd4559643e1aaba17a3b89420555cd0bd6875a50aa16c1ac2cf74320c70aa01 WHIRLPOOL a79ddf6e1aecd20e9b343a0fa9a68c2f3b774589ab53fca7304cc950ba03249922fd8f6a5b6f4d41ee124a1a4845ef2be2963adefdc623e65db7a8b830e2f206
 DIST ant-1.9.1-gentoo.tar.bz2 14884 SHA256 0e2b1888b1f5d840db6d13da833b5289df96076c1d2d6b5497840e74b6cb4bdc SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f WHIRLPOOL d91b2c3bbc30a2b395a182a8248785edea8ce9e6734fcaedd715e3a64e967de494ed78370c70d549f8de96e70e61c67fe1f22b56842cfdbfd66a723d2c8f62f8
 DIST ant-1.9.2-gentoo.tar.bz2 14884 SHA256 0e2b1888b1f5d840db6d13da833b5289df96076c1d2d6b5497840e74b6cb4bdc SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f WHIRLPOOL d91b2c3bbc30a2b395a182a8248785edea8ce9e6734fcaedd715e3a64e967de494ed78370c70d549f8de96e70e61c67fe1f22b56842cfdbfd66a723d2c8f62f8
-DIST apache-ant-1.7.1-src.tar.bz2 6979386 SHA256 4dc49a7260ef90a6dc6611b7e96b9f047d507589736d4a2ad6efbe3edfc6fba6 SHA512 bb627d0c5d491d5505a71c5ef1cc6b748c6eab6b94b44fd582557585bd0472d0b110d3709a8a355c2480b0c000e57327925a467afbe50cd786f1898ad4b67cfc WHIRLPOOL e463dfe8e9893a487e29f58f366f2a531dd3b8c1bde1416566235b59845539e4023be21a55e7043770ce789c12e4a37d57f1cc4d119059515ea69fceae04a962
-DIST apache-ant-1.8.0-src.tar.bz2 7122981 SHA256 b1da647175784c9e0113b8e76643c89123396b5f1d0ad54417390a92e02e6786 SHA512 063cc180f02042670dec344376164620f9cf3b47411dd7f710ddf0df8c6c00901bef0a6a30dda6a6931d1e650a6dd1faf810efae6029b46dfb9fa7af13f7b6bf WHIRLPOOL 741a22d5294d3780b9c06d2760fe8dde7e011d38b0051abf9903f35339a79cfb337174bb1b921188445f6bce75e280f5448a8150831fb3ba103b5763284bddb4
-DIST apache-ant-1.8.1-src.tar.bz2 5861907 SHA256 02b24c7354f19879e136c8258d75672ec9a7379622aeaea9f7a485210b193700 SHA512 4afd0d24929fc840659b2f7860dbb61976dd5d6b9c4627e68aa34182012366ab2726d20d77b0f0b793cb1b7cbfb6fc8b3511cd412ab7cf5d2c2c69839b44ac93 WHIRLPOOL a7f1836000e1892793a4fbf2fc7dc8ed89ea6790ccfe39cfabb00d727470d8f5a89a84590466d22f6e327f10d7b25cceae0880c5fc8e04b5ecc21cc4813b343f
 DIST apache-ant-1.8.2-src.tar.bz2 5894278 SHA256 30ac9766d0e2c125d39c9871178f35084d4b75b08f628a4eb1dbae15ed89ce53 SHA512 d3ac33842746aea5a9768d2f771ad622da1fd0c65cfb4f70111a119c0ceb4d5fe10bb9766df879179a16fb3d38c67b41934d5b5428ccfe4c4d57b669a1bbf47c WHIRLPOOL 108ffc2c1dc91d3c711fbd28ff0c7763ac81edfe8e943b43467eafa424c0457d823bb61981cd37a77e509f159a02ffacbf99cac70ef2f9fc227bae8594a336b2
 DIST apache-ant-1.8.4-src.tar.bz2 3385365 SHA256 5de65f7ba3f67e436ffffcdc0a73f591d1006e9fb41af8632c1f1f84d4a3e0b1 SHA512 7dbbdcd31f5fd498cbbe7f125451899320e5e9c2396b80f1f90d18943f8ef066a75198edfdba0edf96b1e0b5b84cb049b5281403180a7a6924ebfb077930e307 WHIRLPOOL 8e38dae80ceba637c65fe32fc9fd04590df44d7ed141de026d0d38eec047b6f49027020b1b80ce803e33d4d794e7c7c536e1bc5b7dca51d3038a7d4a05b46e08
 DIST apache-ant-1.9.1-src.tar.bz2 3401450 SHA256 550473e1a64b99e6cfa9ba6b9c142318bd1ea0d902e7ba7b33389528a0c1d113 SHA512 82862fbc503f09e92f3936a410536385c101ca00315d4468fa90584d2d8fbd70b26845e64ee5220f38bcd71ba72a3f455a73279d0316452382f489706cdead72 WHIRLPOOL 94dea1ffc68ca5cc743648413112763a52a51829fa76e6a80e9cc7e3df0460ade586430f55b75508578f4dd56667945ab8daef110ee03edacc6b5cdc34155152
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 SHA256 cf95317f683f28ae3d263327447abbebd30a6c910cfa069a05c5ee39aa5ad0e3 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629 WHIRLPOOL 94fa5f5f3f2d52ed37efea5b6e6da9ace7a6ddb9e0e9377fd655fe2ead58f707c9a9e461ac4069138bf8af728b9c5c320ac5f969e655f2004dc92ebd62e4ed9d
-EBUILD ant-apache-bcel-1.7.1.ebuild 609 SHA256 6b365346141449497c513028e09d43924da7cc1ed6b1719827fc782907e969c0 SHA512 0863defe81d24ca4adb1b9ed3a30051ac4104e61d2e3dea0a6b0f1f381da86305c8c45b5ae9215b0f8d986f902da11bb1ae00fc431e05e1af0a6c5db67ce9862 WHIRLPOOL c5283c57a6d5ef7e681e9f68ae2c096d44296ef99dfb099d5973d5d9ff8c7233d9c540bd8bc44f8c28f7beb3f878b282801973311f9f2686eb2659f343a8d6d7
-EBUILD ant-apache-bcel-1.8.0.ebuild 613 SHA256 83900b6bde27dd696c2194ed29bd83edb8ad6c5941a92b11f3f8ca15b777b717 SHA512 922e13ddabfeab528f9af2c440ba84c09de3f7ec6224f07b52abd3282fb1b86cd92ab8e3a61b6b8070388a30f72f079d790ea68294d60ebb6e0d240b29dacaf5 WHIRLPOOL 978f173f5b6742c1ccf8e047c32bb7b982cdecb102c1107ddc92ebe5d92da04e7ccad98952fb476843884906bb4e8c0f31ec7c52327b79679673ebafeb4f6ece
-EBUILD ant-apache-bcel-1.8.1.ebuild 633 SHA256 673518168008f69969902dbb1ef902c3f92205529f8f0c569d82f11c384059de SHA512 32086d5a9efd1b99126cddee711db3efd3eb5eb5e33b57621907d2e19c1f49efb33feaeabe9873037be45fe41854d99d67b77b7f406bfc29031b0f48c88cbad5 WHIRLPOOL 7ac921a1b4a04aca41e663d10975966f8f341c9a125b3402fd69ff0d3bea1568f823749fc0f88efcd323272c816f018f8d7716e164c2dc64a56a09c7bd3ab2c8
 EBUILD ant-apache-bcel-1.8.2.ebuild 534 SHA256 20b556013a3f903c049cd78c923cffe5830751d0f4d941590399fa2589a30867 SHA512 6d779c5baac0061196b3fb43d88666c533fe62abf3aeba988c7759518abc17cb8eae85c84ed18760281867ae689fc29bc0f77f3e4138245a63b27204a98a8368 WHIRLPOOL 5fb0e8761ee90e27597655776a70cb949fc057e6d36e0c1a266cdcc25f0cfe82cdb3496ae9435b2f5f604daf76f8ea888eb3aa89125ca04237df6fc29e722ab7
 EBUILD ant-apache-bcel-1.8.4.ebuild 532 SHA256 83736c1004d687e4e079fcf92af654714ecaaa26ee28e8a619847413e9c7cbce SHA512 964356940614ba4c19f65a2cbffdcd7835c6c94ffe05aff0541776d27f1efae861ea7eeac5297a160e6043db66cfebe4ade4f90a9b65671e752b47c5558501d0 WHIRLPOOL 12ef27157e6594a2f8fbee503ed0965dc086b476f87cfb85586fd94101e8e612724d4cebf7d7b5cdba4818054194096e229b4e8ebc5af16bcbb335e04accdc26
 EBUILD ant-apache-bcel-1.9.1.ebuild 537 SHA256 9a12f1de567c051faa8693f3fbec6cda3dcdd05ce20f1051dc2f6ef8f876b37d SHA512 cdf23664e07aef39fcc197ba9e24f0d83f6040c0eda829793e74764dc3319f7d07c28c16e7655bac9d7e0ba05ebd0fc57e01529eb0a08307801d1396b59d7cd1 WHIRLPOOL b9987eade986aec6f67e52973b9b7fc1c8a2e9c80d15358f5b9e6720aad937b212efb60354d83a1c03ffba058f2412686036a7e5571ac58a76d10e16ecb5ad8b
 EBUILD ant-apache-bcel-1.9.2.ebuild 524 SHA256 1218f4723f054beb65c8f84e7598c7dd7bbad7075a327430e533d898a73cd494 SHA512 e1cfa9da0661d5611a762ebfa918ab3db64b46bba85006fa5aeb281a35860652f92a56c3eb281080f0c64ea1bd40dc73757ba0e474f85b3699f5f89753ab4f1f WHIRLPOOL 9d92422f175ef2306ac2b7bf1d2bdbbfb769cf4bb320adb02cc221fbdd58cfe6bfaa3290b75846b7a0c7bdc5d78c74db9b827c2cb4a1afe18cb414a748eebedc
-MISC ChangeLog 5141 SHA256 7435c4dc975ef1896d8018cdd9525ef9f7f7548c788e178f986a54d848d97314 SHA512 dadc2e6437a757d849864f3510d2e6e38cb1b70de5477a89d3943ed4bbece4e83492193070db944bdd30743e60990183ba14fe2af4012ec34a26a69959f679a2 WHIRLPOOL 5f4eee88b3f8e0516cb02faca82b4edc68d7be2aa14ff4f69ac713f2b894a4eb4b7e15bd0d310f1e8c5c391c87e409556ba51b926ed0ddf8e4a17508bdbe1fc2
+MISC ChangeLog 5301 SHA256 f2d6e47ff7b930c96c5430bf4b2b807e0ea4e1fdcfe3dff7cb22457dad725822 SHA512 eb33cfee11ab92eb18088db27ae8066648be74492e0709fa3e252e76b2ec6297591215e02af78eef93860b60d82f00a3d5927a6e704ccfc55295d407596b5ec4 WHIRLPOOL 3db43da6dfa316f6637f4f61c3380b62fa5776dac0dac0d87a3e88229a6c095685daa8b7dbf2dfcf3332a08707ce2b11e14556493fc33c19b8d00691326113ad
 MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSZAVKAAoJELp701BxlEWfwUYP/13cAwZ07UqGmUVJLiNacOr7
-KhSj1FZNfiaQn+HT27aZQNvG7jiZveEFK/m4usIB1psMTdUsdWNymPYSGWe4TvYH
-1kkHhhUT5JX+wsD8Il9Jd+mXuJw9p8VrEsTO+TaDKzA7Bsn6SP9zcuSgjnNgxP0C
-Fphy0bJyrWdjYVHx5N7YA9aaUfSiv/IVXM9CikRH9AWanPQU01e/Uo3ZR+2M787o
-P+XLbsvhzESRc9TDmBtkhn6WYDaN0itvmEihIPjJQcrYBVIBpc4O1lIPio/taZEh
-JQUANy6Mk4afY+N0cFA1YKXpvf7aNQZxty0yS6i+pyp7SfZlgCbIDLGUHYziNvMN
-DDuaDELtAsl5XQhnCWuD5dCGBcRmBGF4/6ndAKUJm+Nfszea6xUlLh2Yr1zQOlYj
-+0cRO0yQmc5IseHnnWUztaLOl6HfW2cOLN7+lv7RFDO0wVL9xdkrRuPXZZiLgnIY
-ZZqEhkFCoeWy4s50CxzDxEfDxjhr+MCRlcxZi3yJmTH9zWiUE3rrNwYwTTtC9ul+
-Fx/dETCwcKZOf3tTfELFKn/tNiedRJc0Oaov8bKTEqISx4i23fpuIZt39hAAcZdW
-jTewbi/P8qOrNAmLf9ltkBQdwyWxI2TWtifvQ1hARu+fx9FnAaqGcUVuWo/aJKLi
-V5YhK+RUE+tAxQXdT5nJ
-=exz2
+iQEcBAEBCAAGBQJTG0PrAAoJEJWyH81tNOV9YcUH/iEalVW7EmgfkwH4eK3WrGZV
+LQW9JYdGIFrKZ2VYVjpr4KM2or1njDJtU+Sr7Cai3PhHtzSJ9hh3Dkbmu2Ar857u
+058Kmcmaj1LHjuOwGlCv5toRB697Mpfz7V+AXSNWS7kKpyzgLBUIDxi4ItrNT+Ok
+RHJnHtFRCjsxXVOuserYLhx6u7AhrsirtW7keteGAgtWoT02LtaKPTyX03CHsLUa
+qO5qN6005mrVBXltA3Vs+PXVwJSB//2Dyirg3wTp9h04CCkACoBIV8V+Re1MNo7V
+wkx2twieQTUo8JkI0EbwiI5qsBJx82BPFRCHEkecfptCBDCdioQiB9lf6emsZkY=
+=NmOx
 -----END PGP SIGNATURE-----
diff --git a/dev-java/ant-apache-bcel/ant-apache-bcel-1.7.1.ebuild b/dev-java/ant-apache-bcel/ant-apache-bcel-1.7.1.ebuild
deleted file mode 100644
index 9d9dcee42a0d..000000000000
--- a/dev-java/ant-apache-bcel/ant-apache-bcel-1.7.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-bcel/ant-apache-bcel-1.7.1.ebuild,v 1.8 2011/12/31 10:07:31 sera Exp $
-
-EAPI=1
-
-ANT_TASK_DEPNAME="bcel"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="~dev-java/ant-nodeps-${PV}
-	>=dev-java/bcel-5.1-r3:0"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	ant-tasks_src_unpack all
-	java-pkg_jar-from ant-nodeps
-}
diff --git a/dev-java/ant-apache-bcel/ant-apache-bcel-1.8.0.ebuild b/dev-java/ant-apache-bcel/ant-apache-bcel-1.8.0.ebuild
deleted file mode 100644
index f5ce217e5c63..000000000000
--- a/dev-java/ant-apache-bcel/ant-apache-bcel-1.8.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-bcel/ant-apache-bcel-1.8.0.ebuild,v 1.2 2011/12/31 10:07:31 sera Exp $
-
-EAPI=1
-
-ANT_TASK_DEPNAME="bcel"
-
-inherit ant-tasks
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="~dev-java/ant-nodeps-${PV}
-	>=dev-java/bcel-5.1-r3:0"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	ant-tasks_src_unpack all
-	java-pkg_jar-from ant-nodeps
-}
diff --git a/dev-java/ant-apache-bcel/ant-apache-bcel-1.8.1.ebuild b/dev-java/ant-apache-bcel/ant-apache-bcel-1.8.1.ebuild
deleted file mode 100644
index 3fe014a261e1..000000000000
--- a/dev-java/ant-apache-bcel/ant-apache-bcel-1.8.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-bcel/ant-apache-bcel-1.8.1.ebuild,v 1.8 2011/12/31 10:07:31 sera Exp $
-
-EAPI=1
-
-ANT_TASK_DEPNAME="bcel"
-
-inherit ant-tasks
-
-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"
-IUSE=""
-
-DEPEND="~dev-java/ant-nodeps-${PV}
-	>=dev-java/bcel-5.1-r3:0"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	ant-tasks_src_unpack all
-	java-pkg_jar-from ant-nodeps
-}
diff --git a/dev-java/ant-apache-log4j/ChangeLog b/dev-java/ant-apache-log4j/ChangeLog
index 2328aeabb871..86a315a54d33 100644
--- a/dev-java/ant-apache-log4j/ChangeLog
+++ b/dev-java/ant-apache-log4j/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/ant-apache-log4j
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-log4j/ChangeLog,v 1.40 2013/10/20 16:31:15 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-log4j/ChangeLog,v 1.41 2014/03/08 16:24:43 tomwij Exp $
+
+  08 Mar 2014; Tom Wijsman <TomWij@gentoo.org> -ant-apache-log4j-1.7.1.ebuild,
+  -ant-apache-log4j-1.8.0.ebuild, -ant-apache-log4j-1.8.1.ebuild:
+  Remove old.
 
   20 Oct 2013; Agostino Sarubbo <ago@gentoo.org> ant-apache-log4j-1.9.2.ebuild:
   Stable for ppc64, wrt bug #476958
diff --git a/dev-java/ant-apache-log4j/Manifest b/dev-java/ant-apache-log4j/Manifest
index f4ea019ab03e..04041a383f81 100644
--- a/dev-java/ant-apache-log4j/Manifest
+++ b/dev-java/ant-apache-log4j/Manifest
@@ -1,43 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-DIST ant-1.7.1-gentoo.tar.bz2 11836 SHA256 4bacd711cc4981272b8377335dafcb8841dd1fac177c0c349f3faf78b0354fe5 SHA512 7f397605223002e6e31589350dd5933743d64c626b7578c4be8bf4068403ad4ad987b6fe6605af142609b447a1f2d9333909d0117284ab508257547fe2da3448 WHIRLPOOL 5ad8c39e396ce7220ee3152286459de3d3ddeaec2d3196b6d700b04b31be337e711964db049fccf4077e55cebb83b56b2de590fd1801e4d64d94c75fa277404e
-DIST ant-1.8.0-gentoo.tar.bz2 13993 SHA256 12edd6ccfe9f4add90024e82ba1fc6dda141a04d97d800b860347c3d21007acb SHA512 4bc81ba7a99014a25263bbaeaf6b27791327b9ff6c54b25bbf8feaef619ac3eefdb6542559ecc2134959486e794c49ddbd92c044b287190c95960efa6154b3e0 WHIRLPOOL c5e13d1ae5506b1f8b9176b740dd486cd8a685cf59b920b745ca7c8b406e765206f30ebc0030252ef21d6d45ae54f9e0cdc2a804dbc1da9d2bfb9e9c77c52757
-DIST ant-1.8.1-gentoo.tar.bz2 14979 SHA256 1a2230ba44b1eadc4ca3367b56bb287271d76ade9c828a4ac64556f0f4d2e340 SHA512 35943d111f32f0c88146892da390112a1d6133ad5044b89b8302a543721753b584f5069f7f082f011dc4a3d1feb8d400a955b83a2dae9c9d4012de91584c4f0b WHIRLPOOL 6752b3647dfa30133d6c7de871082f9f8232b2ca90a702093c7b42bd7b49117d5fe26ffdab9ae6c14d166eb9c0fa26a15c821f947de2c3218b17759fd9ea5668
 DIST ant-1.8.2-gentoo.tar.bz2 14626 SHA256 48478e9a93402bebe92f5612ab61e2c694ad17b47da9e45e382717fd9a7f140b SHA512 8024d5716861b33ec6d6dd95f95c5e2f0e7e23d223a6089833f1546a84b84b40edbe806ecca9a53b51c0dd98f647823ac859d7b297782d3be5a24cb3f5d144e7 WHIRLPOOL ad9728920298feb79ef7d6ad303bd4d2266adb5ffbc450b3e51364b9a2df8747de867f6f2ebeca79c58eb55e0f5ceb2f3b415f76f067564d2da45f77320f55a6
 DIST ant-1.8.4-gentoo.tar.bz2 14894 SHA256 1b40d038ad17be9493384af68f1c18ea326742297cb93b8ddfb585722f36e1eb SHA512 5870d5a08be26d254c79a5e2ad2ab920cf16d1ea8937ae33b4189801ac02c5da0bd4559643e1aaba17a3b89420555cd0bd6875a50aa16c1ac2cf74320c70aa01 WHIRLPOOL a79ddf6e1aecd20e9b343a0fa9a68c2f3b774589ab53fca7304cc950ba03249922fd8f6a5b6f4d41ee124a1a4845ef2be2963adefdc623e65db7a8b830e2f206
 DIST ant-1.9.1-gentoo.tar.bz2 14884 SHA256 0e2b1888b1f5d840db6d13da833b5289df96076c1d2d6b5497840e74b6cb4bdc SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f WHIRLPOOL d91b2c3bbc30a2b395a182a8248785edea8ce9e6734fcaedd715e3a64e967de494ed78370c70d549f8de96e70e61c67fe1f22b56842cfdbfd66a723d2c8f62f8
 DIST ant-1.9.2-gentoo.tar.bz2 14884 SHA256 0e2b1888b1f5d840db6d13da833b5289df96076c1d2d6b5497840e74b6cb4bdc SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f WHIRLPOOL d91b2c3bbc30a2b395a182a8248785edea8ce9e6734fcaedd715e3a64e967de494ed78370c70d549f8de96e70e61c67fe1f22b56842cfdbfd66a723d2c8f62f8
-DIST apache-ant-1.7.1-src.tar.bz2 6979386 SHA256 4dc49a7260ef90a6dc6611b7e96b9f047d507589736d4a2ad6efbe3edfc6fba6 SHA512 bb627d0c5d491d5505a71c5ef1cc6b748c6eab6b94b44fd582557585bd0472d0b110d3709a8a355c2480b0c000e57327925a467afbe50cd786f1898ad4b67cfc WHIRLPOOL e463dfe8e9893a487e29f58f366f2a531dd3b8c1bde1416566235b59845539e4023be21a55e7043770ce789c12e4a37d57f1cc4d119059515ea69fceae04a962
-DIST apache-ant-1.8.0-src.tar.bz2 7122981 SHA256 b1da647175784c9e0113b8e76643c89123396b5f1d0ad54417390a92e02e6786 SHA512 063cc180f02042670dec344376164620f9cf3b47411dd7f710ddf0df8c6c00901bef0a6a30dda6a6931d1e650a6dd1faf810efae6029b46dfb9fa7af13f7b6bf WHIRLPOOL 741a22d5294d3780b9c06d2760fe8dde7e011d38b0051abf9903f35339a79cfb337174bb1b921188445f6bce75e280f5448a8150831fb3ba103b5763284bddb4
-DIST apache-ant-1.8.1-src.tar.bz2 5861907 SHA256 02b24c7354f19879e136c8258d75672ec9a7379622aeaea9f7a485210b193700 SHA512 4afd0d24929fc840659b2f7860dbb61976dd5d6b9c4627e68aa34182012366ab2726d20d77b0f0b793cb1b7cbfb6fc8b3511cd412ab7cf5d2c2c69839b44ac93 WHIRLPOOL a7f1836000e1892793a4fbf2fc7dc8ed89ea6790ccfe39cfabb00d727470d8f5a89a84590466d22f6e327f10d7b25cceae0880c5fc8e04b5ecc21cc4813b343f
 DIST apache-ant-1.8.2-src.tar.bz2 5894278 SHA256 30ac9766d0e2c125d39c9871178f35084d4b75b08f628a4eb1dbae15ed89ce53 SHA512 d3ac33842746aea5a9768d2f771ad622da1fd0c65cfb4f70111a119c0ceb4d5fe10bb9766df879179a16fb3d38c67b41934d5b5428ccfe4c4d57b669a1bbf47c WHIRLPOOL 108ffc2c1dc91d3c711fbd28ff0c7763ac81edfe8e943b43467eafa424c0457d823bb61981cd37a77e509f159a02ffacbf99cac70ef2f9fc227bae8594a336b2
 DIST apache-ant-1.8.4-src.tar.bz2 3385365 SHA256 5de65f7ba3f67e436ffffcdc0a73f591d1006e9fb41af8632c1f1f84d4a3e0b1 SHA512 7dbbdcd31f5fd498cbbe7f125451899320e5e9c2396b80f1f90d18943f8ef066a75198edfdba0edf96b1e0b5b84cb049b5281403180a7a6924ebfb077930e307 WHIRLPOOL 8e38dae80ceba637c65fe32fc9fd04590df44d7ed141de026d0d38eec047b6f49027020b1b80ce803e33d4d794e7c7c536e1bc5b7dca51d3038a7d4a05b46e08
 DIST apache-ant-1.9.1-src.tar.bz2 3401450 SHA256 550473e1a64b99e6cfa9ba6b9c142318bd1ea0d902e7ba7b33389528a0c1d113 SHA512 82862fbc503f09e92f3936a410536385c101ca00315d4468fa90584d2d8fbd70b26845e64ee5220f38bcd71ba72a3f455a73279d0316452382f489706cdead72 WHIRLPOOL 94dea1ffc68ca5cc743648413112763a52a51829fa76e6a80e9cc7e3df0460ade586430f55b75508578f4dd56667945ab8daef110ee03edacc6b5cdc34155152
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 SHA256 cf95317f683f28ae3d263327447abbebd30a6c910cfa069a05c5ee39aa5ad0e3 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629 WHIRLPOOL 94fa5f5f3f2d52ed37efea5b6e6da9ace7a6ddb9e0e9377fd655fe2ead58f707c9a9e461ac4069138bf8af728b9c5c320ac5f969e655f2004dc92ebd62e4ed9d
-EBUILD ant-apache-log4j-1.7.1.ebuild 514 SHA256 121d2ca75b8651b566777286b9be43bad0bf7ab796528c7f27bc450df43e13b5 SHA512 0131943893f3d965ffce4563ccc7ae6492824c37e55f96e4c3e7da9b77a90f2443a9cd44e0a4073cca5af183ad9162401f10e2717138487b2a1f01521ae8abf4 WHIRLPOOL 7ac6412a1c5bf214220060a4e9752da3f18c024ba58a2f25cdc059901a348f6dc9e767bea3b09a1447998159b5057b4fb6ba9ba79ec46d7672bafc6987be6518
-EBUILD ant-apache-log4j-1.8.0.ebuild 518 SHA256 c1dcaf941fb3be82caf7ee24a8f941cb8df45627ce6b76b875c244d9e2d9a788 SHA512 f13cff8f929c931430d1032d1be9c4222c2985c142efde1db16e19fea9d40a96613cbc98cb5f725ea899422c9aa6ddcbd589d77f8f5a943792b58dd0f6d7a09e WHIRLPOOL f2bf7d21f783479d8c32fda760fcd2f06e0c1e70c1c1359e1dfcd9073c591a58f54ba4a99db5126732acd0f622f7e2d094de4172d011451b6c86428062ffbd5e
-EBUILD ant-apache-log4j-1.8.1.ebuild 538 SHA256 77b13e1ef6092f11420b88028d75237d16b4e57ce4c1344765d3e617967659e2 SHA512 bf6243be02bcf744dd9fb47b663d113184c335bcd1cba0ad9805b93533b40fa68192dcdfb2f8d1e9902125fb487c213fabe2437323d880698d0877cffe63b3ac WHIRLPOOL 4a18444ca4c7f7d53188be70ab295c38fa0ffecda41f9462cfd03b5771814774c345385ef2ec3ad652b3c777ccc4f0ed62cd2cac51c61ec4fd79945072d89444
 EBUILD ant-apache-log4j-1.8.2.ebuild 541 SHA256 129ec04167422260aa89d608158260d735b94f5a51d2179f78726c02032b1924 SHA512 9fc58c91ab159a4c2b7978e16690db6c228f80759f0579d8eec380f8217b59072eeaa6ca93dd22638c6379534c1f4a38fab1a38ef685b29670b68f8837b6d717 WHIRLPOOL 89085b4763f43296fca67720f4bddc223b9cd1aeaa3869ce81b630d6a43471ad2a8e53c1e8be212ca717988e879a60194d245ac6e1506d5818d71f07fb010861
 EBUILD ant-apache-log4j-1.8.4.ebuild 539 SHA256 e4acc3a6bfa255ab5629f963cafa6905e79223fc963811d38fda0275f6d91e70 SHA512 e758afc6b1150d1016987215375b85799de64755fdb3b438d977fc9633189c2b15fab2233aca84fe0fd976e3b90b0bb787f87960cd58bd0458ff7a744cfc69ed WHIRLPOOL c1d291aca5f9fa01a284b53e3057f5bf993f44ce27a3249a62a880111d294e9633f39f8e75fce275ff662a25d501fe6117c37f830d9913e4b96a4c9185bc7a1f
 EBUILD ant-apache-log4j-1.9.1.ebuild 544 SHA256 a4f1cd4054d99b37b068823f48be96420c1bd69e0b4da1d2bba6d9a0328f8028 SHA512 d0d601a7265119bd23d4480c8a6528d6ea6bcb597040becac59a689ba34785c7fae78888999fc01e6b2b00f0873429577f639881206410464f5d4a8d083b6303 WHIRLPOOL 76baa6cc03dbbb0bbd5a06a75c16b21175b4b3c4a9dba0f1e15c3d84a13d995a77ffce8f403ba4ed22f6053651b6e145fadc149c4fb070fb7d335321500d896c
 EBUILD ant-apache-log4j-1.9.2.ebuild 531 SHA256 045d4febc8577b8241d51a385e4d9a9c9e0027bf6e3b2713b44d4542254785a2 SHA512 07ba7724486132701e1d5ee175b651d19ec786bfe8e430b3c3fd266fe8b680453b4b37e6f41efdf81f602a360014273f241051f36bf1d5936a8ddb9627858939 WHIRLPOOL 4b2aed8c5d136846492373e7c412fc2151f1cfb3cfe950797136c1b5e6ba2ff369deede4b3facf0c08d3475c5dea19e1d8035483c4185dec6ef44836fb52a91c
-MISC ChangeLog 5196 SHA256 fabfd441b3727072bee9072f3a5d2c39e23c2b6510a84c8d5fb4d1bb774d2ec0 SHA512 3f2a0aadfa4f7bb266420683144f9c7f51801c8203b3f0cad1ec8566e55fe13025925e6b18a4b7ed360137739c99de2936ac3e7d65357a2070672e242935b1e5 WHIRLPOOL 0e5a09b44142c1874e4a2297ac83d84c807330976910331a7f168bb4b97a77042dd371bb4fe03e1b3360f27c9f9e75f78792087747dd511eeca70160369e5a3e
+MISC ChangeLog 5359 SHA256 093040c34c25e14338154e33fc4c7d02ff77d401de639f13b8b1a8e92c00a581 SHA512 c8497c3d436aaad619036686f17ef8ce62101812aecadbfad5b0587b70ce5650a80a44019e952bebec332e20d6e4326933697df84f7def4c77741d5777b659cc WHIRLPOOL a4002f9ebd952fc7a2df7794dcff90bad806630f5ac600ee83eec4cd86632e41385423b2a5c3ef950fdbb5d2f42d0f058c63285f5c30bf339e2cf0c429bdc1a0
 MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSZAVRAAoJELp701BxlEWfNxwQAKn8tH6yi3vZeM+orQzUwJZJ
-LZFYMbjdObNtLkTVHoQN4wYfdkhdr8TUlwwX81HTNguxCSPB0BZcsrDKxjnNrMMA
-EAoHxMNWagWvPcNWj3r8x36c5my+vKCnvf/nb29G4q+eJLsUv0R+lxo8x0YbOYlP
-BiCSk1PZVQv1ZuL1/f3sfEW9V0W2VrPnbJHprbaZqfg6LOxOf9idvvlnTcnlnHaZ
-LmY/0ug6GCN37S4vLL6vPZmSvtNv3lMDKZZ1NJuTFw2LJvsf3y919Dtx2YGblQkP
-tMrOiFRDlDfW2FpdQg5V75dsVeuusd9Lz8pNzgMoDZcybFhFGUQrEkR84P6aDRh0
-uhD3ZS4JN5VXiLyW4fVVeq8EBsbyCjq3RkyBd6+3kq/OBo5MjQJolKW1vqkydcJ5
-yZx7PG3IkpkA62FWPjAT9IO+SvdRY0Zp7O/hi8u9XF5T9z2e9Ga4TX0x7k8bIAjv
-F+C25NYtjTSfEuTp54/Wjyq6E1ifxMtTdp3HXcU21gcJFVlopXKb6MRUANzr8sbd
-elDSD/1odeUrUYqVQnOAB2BbXI/zsXu1okifhxa4VREjo1fxQTzTU4e82Dn1Z36U
-ALm/3d0U1zS1iGWi8E5jbAWuIRyxbae2sKNqcOtnXj1Tg1a+2GTLK12tlEXakUQb
-PjY2pvODyhOa5P/sOO0Z
-=E+7l
+iQEcBAEBCAAGBQJTG0QrAAoJEJWyH81tNOV9+YIH/iCZdAdGArfemdneI8kXALR5
+vvx1jtYgGJgAkXdDsqAo1jLOq3ihJ8QjdA7EvMYdr+Q0HutIYyliNweGXYxVqiuQ
+1bH1XmVhO23FNZq71JbZjOZNGunBdZGVjIbSetQQeLhJH1KVzfMrWx+nCKW9DhyA
+aFwNX9KA8GiQjwCBzZT6oR/RMHJOpzDWkvxwJqA5W6NGKExn5PfBydVai/p9UU//
+D0ZVOMWs+WjFMt0XCnu1Ill0+fQep11wDLhvpYjlkqlUI/jMEBg7uVl0gE7lXAzP
+KbNnUiMdUxLi47CqF8oRkxgB1oFarl5ABSyRmVPhI+1gAbkemWw+z9xn4Q5lSzE=
+=5JZF
 -----END PGP SIGNATURE-----
diff --git a/dev-java/ant-apache-log4j/ant-apache-log4j-1.7.1.ebuild b/dev-java/ant-apache-log4j/ant-apache-log4j-1.7.1.ebuild
deleted file mode 100644
index a0e0815725a1..000000000000
--- a/dev-java/ant-apache-log4j/ant-apache-log4j-1.7.1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-log4j/ant-apache-log4j-1.7.1.ebuild,v 1.8 2011/12/31 11:45:19 sera Exp $
-
-EAPI=1
-
-ANT_TASK_DEPNAME="log4j"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=dev-java/log4j-1.2.13-r2:0"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-log4j/ant-apache-log4j-1.8.0.ebuild b/dev-java/ant-apache-log4j/ant-apache-log4j-1.8.0.ebuild
deleted file mode 100644
index 85303a3da6ea..000000000000
--- a/dev-java/ant-apache-log4j/ant-apache-log4j-1.8.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-log4j/ant-apache-log4j-1.8.0.ebuild,v 1.2 2011/12/31 11:45:19 sera Exp $
-
-EAPI=1
-
-ANT_TASK_DEPNAME="log4j"
-
-inherit ant-tasks
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=dev-java/log4j-1.2.13-r2:0"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-log4j/ant-apache-log4j-1.8.1.ebuild b/dev-java/ant-apache-log4j/ant-apache-log4j-1.8.1.ebuild
deleted file mode 100644
index f7d46acd89c5..000000000000
--- a/dev-java/ant-apache-log4j/ant-apache-log4j-1.8.1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-log4j/ant-apache-log4j-1.8.1.ebuild,v 1.8 2011/12/31 11:45:19 sera Exp $
-
-EAPI=1
-
-ANT_TASK_DEPNAME="log4j"
-
-inherit ant-tasks
-
-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"
-IUSE=""
-
-DEPEND=">=dev-java/log4j-1.2.13-r2:0"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-testutil/ChangeLog b/dev-java/ant-testutil/ChangeLog
index e86e93bbaee6..0feba0a3aeb8 100644
--- a/dev-java/ant-testutil/ChangeLog
+++ b/dev-java/ant-testutil/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/ant-testutil
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-testutil/ChangeLog,v 1.24 2013/10/20 16:32:22 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-testutil/ChangeLog,v 1.25 2014/03/08 16:27:31 tomwij Exp $
+
+  08 Mar 2014; Tom Wijsman <TomWij@gentoo.org> -ant-testutil-1.8.0.ebuild,
+  -ant-testutil-1.8.1.ebuild:
+  Remove old.
 
   20 Oct 2013; Agostino Sarubbo <ago@gentoo.org> ant-testutil-1.9.2.ebuild:
   Stable for ppc64, wrt bug #476958
diff --git a/dev-java/ant-testutil/Manifest b/dev-java/ant-testutil/Manifest
index f5c87c68136a..cbb2ef245f69 100644
--- a/dev-java/ant-testutil/Manifest
+++ b/dev-java/ant-testutil/Manifest
@@ -1,40 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-DIST ant-1.8.0-gentoo.tar.bz2 13993 SHA256 12edd6ccfe9f4add90024e82ba1fc6dda141a04d97d800b860347c3d21007acb SHA512 4bc81ba7a99014a25263bbaeaf6b27791327b9ff6c54b25bbf8feaef619ac3eefdb6542559ecc2134959486e794c49ddbd92c044b287190c95960efa6154b3e0 WHIRLPOOL c5e13d1ae5506b1f8b9176b740dd486cd8a685cf59b920b745ca7c8b406e765206f30ebc0030252ef21d6d45ae54f9e0cdc2a804dbc1da9d2bfb9e9c77c52757
-DIST ant-1.8.1-gentoo.tar.bz2 14979 SHA256 1a2230ba44b1eadc4ca3367b56bb287271d76ade9c828a4ac64556f0f4d2e340 SHA512 35943d111f32f0c88146892da390112a1d6133ad5044b89b8302a543721753b584f5069f7f082f011dc4a3d1feb8d400a955b83a2dae9c9d4012de91584c4f0b WHIRLPOOL 6752b3647dfa30133d6c7de871082f9f8232b2ca90a702093c7b42bd7b49117d5fe26ffdab9ae6c14d166eb9c0fa26a15c821f947de2c3218b17759fd9ea5668
 DIST ant-1.8.2-gentoo.tar.bz2 14626 SHA256 48478e9a93402bebe92f5612ab61e2c694ad17b47da9e45e382717fd9a7f140b SHA512 8024d5716861b33ec6d6dd95f95c5e2f0e7e23d223a6089833f1546a84b84b40edbe806ecca9a53b51c0dd98f647823ac859d7b297782d3be5a24cb3f5d144e7 WHIRLPOOL ad9728920298feb79ef7d6ad303bd4d2266adb5ffbc450b3e51364b9a2df8747de867f6f2ebeca79c58eb55e0f5ceb2f3b415f76f067564d2da45f77320f55a6
 DIST ant-1.8.4-gentoo.tar.bz2 14894 SHA256 1b40d038ad17be9493384af68f1c18ea326742297cb93b8ddfb585722f36e1eb SHA512 5870d5a08be26d254c79a5e2ad2ab920cf16d1ea8937ae33b4189801ac02c5da0bd4559643e1aaba17a3b89420555cd0bd6875a50aa16c1ac2cf74320c70aa01 WHIRLPOOL a79ddf6e1aecd20e9b343a0fa9a68c2f3b774589ab53fca7304cc950ba03249922fd8f6a5b6f4d41ee124a1a4845ef2be2963adefdc623e65db7a8b830e2f206
 DIST ant-1.9.1-gentoo.tar.bz2 14884 SHA256 0e2b1888b1f5d840db6d13da833b5289df96076c1d2d6b5497840e74b6cb4bdc SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f WHIRLPOOL d91b2c3bbc30a2b395a182a8248785edea8ce9e6734fcaedd715e3a64e967de494ed78370c70d549f8de96e70e61c67fe1f22b56842cfdbfd66a723d2c8f62f8
 DIST ant-1.9.2-gentoo.tar.bz2 14884 SHA256 0e2b1888b1f5d840db6d13da833b5289df96076c1d2d6b5497840e74b6cb4bdc SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f WHIRLPOOL d91b2c3bbc30a2b395a182a8248785edea8ce9e6734fcaedd715e3a64e967de494ed78370c70d549f8de96e70e61c67fe1f22b56842cfdbfd66a723d2c8f62f8
-DIST apache-ant-1.8.0-src.tar.bz2 7122981 SHA256 b1da647175784c9e0113b8e76643c89123396b5f1d0ad54417390a92e02e6786 SHA512 063cc180f02042670dec344376164620f9cf3b47411dd7f710ddf0df8c6c00901bef0a6a30dda6a6931d1e650a6dd1faf810efae6029b46dfb9fa7af13f7b6bf WHIRLPOOL 741a22d5294d3780b9c06d2760fe8dde7e011d38b0051abf9903f35339a79cfb337174bb1b921188445f6bce75e280f5448a8150831fb3ba103b5763284bddb4
-DIST apache-ant-1.8.1-src.tar.bz2 5861907 SHA256 02b24c7354f19879e136c8258d75672ec9a7379622aeaea9f7a485210b193700 SHA512 4afd0d24929fc840659b2f7860dbb61976dd5d6b9c4627e68aa34182012366ab2726d20d77b0f0b793cb1b7cbfb6fc8b3511cd412ab7cf5d2c2c69839b44ac93 WHIRLPOOL a7f1836000e1892793a4fbf2fc7dc8ed89ea6790ccfe39cfabb00d727470d8f5a89a84590466d22f6e327f10d7b25cceae0880c5fc8e04b5ecc21cc4813b343f
 DIST apache-ant-1.8.2-src.tar.bz2 5894278 SHA256 30ac9766d0e2c125d39c9871178f35084d4b75b08f628a4eb1dbae15ed89ce53 SHA512 d3ac33842746aea5a9768d2f771ad622da1fd0c65cfb4f70111a119c0ceb4d5fe10bb9766df879179a16fb3d38c67b41934d5b5428ccfe4c4d57b669a1bbf47c WHIRLPOOL 108ffc2c1dc91d3c711fbd28ff0c7763ac81edfe8e943b43467eafa424c0457d823bb61981cd37a77e509f159a02ffacbf99cac70ef2f9fc227bae8594a336b2
 DIST apache-ant-1.8.4-src.tar.bz2 3385365 SHA256 5de65f7ba3f67e436ffffcdc0a73f591d1006e9fb41af8632c1f1f84d4a3e0b1 SHA512 7dbbdcd31f5fd498cbbe7f125451899320e5e9c2396b80f1f90d18943f8ef066a75198edfdba0edf96b1e0b5b84cb049b5281403180a7a6924ebfb077930e307 WHIRLPOOL 8e38dae80ceba637c65fe32fc9fd04590df44d7ed141de026d0d38eec047b6f49027020b1b80ce803e33d4d794e7c7c536e1bc5b7dca51d3038a7d4a05b46e08
 DIST apache-ant-1.9.1-src.tar.bz2 3401450 SHA256 550473e1a64b99e6cfa9ba6b9c142318bd1ea0d902e7ba7b33389528a0c1d113 SHA512 82862fbc503f09e92f3936a410536385c101ca00315d4468fa90584d2d8fbd70b26845e64ee5220f38bcd71ba72a3f455a73279d0316452382f489706cdead72 WHIRLPOOL 94dea1ffc68ca5cc743648413112763a52a51829fa76e6a80e9cc7e3df0460ade586430f55b75508578f4dd56667945ab8daef110ee03edacc6b5cdc34155152
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 SHA256 cf95317f683f28ae3d263327447abbebd30a6c910cfa069a05c5ee39aa5ad0e3 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629 WHIRLPOOL 94fa5f5f3f2d52ed37efea5b6e6da9ace7a6ddb9e0e9377fd655fe2ead58f707c9a9e461ac4069138bf8af728b9c5c320ac5f969e655f2004dc92ebd62e4ed9d
-EBUILD ant-testutil-1.8.0.ebuild 1009 SHA256 bfdc900e2b5675ba33a5f8707be3bce1a696c2f3acb0ce2c7a3bf32f817a2fb3 SHA512 9756487288d67ac0a59dfb4c8b3c438b22240975e70b5af33ef33107f1d1f64dc79d4e20f19a38c9633b62ff5fa9a4e6b92fa0d37ea50471eec5419cc024c917 WHIRLPOOL 400616782e5f3e8ceb3cc874d183c1a44dcb682aa36461a5cb9b08deb7ef4f5a263e1b0c7da99f2ca57683c54c71b7746a6356d5340bf23eeb7257fd9237c27b
-EBUILD ant-testutil-1.8.1.ebuild 1026 SHA256 19713c95a247616d15c1ca15d00868b0d10554bae55ed0e42c14c0565172dfef SHA512 5d02f92704a0634860cf871db98e130f23d50ae0beba500c84254ccd037ba7dd05188cd60a1ed465ef9dc67b71e760af3caa2f772d49da504675bff13e5ba1b1 WHIRLPOOL 2c540b404abecb69714d9954aeb53a2f6e6c2a6682bbf64dff4c35de56f1a03666df6ddb13e78e5beb64cddafb5842a8a6da3c20a7df6559b26a5168a7e9d7ba
 EBUILD ant-testutil-1.8.2.ebuild 953 SHA256 f5c0309069c6142568aaabce60c2c7eb4e44627d64194eb67a083f6771f4736e SHA512 349e5bffa27a40dd6da59ad9737062859cd29babb71e3c7c219bd1a3fbc3c60bad1678e84311753549406a3c1e551c2e3779ae7825c1a0a95bf91b6c33017325 WHIRLPOOL adb6f1734afbf942e169f835f7eef8dac77fe0022fe26183139b6c2f57ee4fea9a991373e6570c33e48c98cd4d4bc10d4304beeb8b174cc20f6312f1ac10140f
 EBUILD ant-testutil-1.8.4.ebuild 951 SHA256 6ebd03ec7bea438865a3c82973ccaa841f9cd68498016186d62b6044726fedc9 SHA512 f66541f5be1457b94b05f4762cb6a9e5895b528d892a48586e38ead63c372aca9c442a98caa39f274bdea71270180782f642afe3d0b810f4af67262482b34576 WHIRLPOOL a4e5f93e2de989a900a9ede06ed5417263872600a3892d4a8277cdfcfccaeeb3624b1036c67d11d03aa61ef0e2fd76cb30eebf75be954a0017fd77cd15dbde71
 EBUILD ant-testutil-1.9.1.ebuild 1031 SHA256 d8e620cb09dcb73d365cf0143773bdb006b61186f5744e2f5a9c3f9baa59e0a2 SHA512 80d12819e3a45035bd0e8461fb95b5cd2f4cef7fc248024fac2d0ad9cbda88cf691235d7e28150b51e79c95a17eb080d56abdba81687b50b99f1c84e6cdc7157 WHIRLPOOL 6bfe110f486b4738fab4c0399b54bfd4579ee2c357eb827d8b6563a50b1bb530332bad9258c74d44469ec4ef385675a07eb98fd3ec084ca773c79c8428b0fa01
 EBUILD ant-testutil-1.9.2.ebuild 1025 SHA256 33f35dd0d87388cc061cdff47538b3fb38397c955acf73654595b01621956b85 SHA512 09b46a8005175edb44629aca91265a07333026ea5f567dc6ca85cd51f6bf071df3e4f38bd22a3f6b889b78a2863f02bdc8365ac1e614c2682a25c855146c936b WHIRLPOOL 869c8dcdf6871c498d2237d9c85669f907c522b160d8f302c180be2e5ea2c755a0322043e9ca41e692dcbfec5289a82111164f7fda8bed511164c5d6555071c6
-MISC ChangeLog 3286 SHA256 86b45a540c88066b6f661c8a5f39d2d17d44e74c4a3c7b9dd714a92eb15ba7d5 SHA512 eecc8d5b6990ade7465303dc30c335a387f764b1cfa79803a62070c66cd5c6ef5c3642b9124448c84cf18a8351ce87bd0efecf13197e96ad9a6d0c91976f830f WHIRLPOOL 68cc039d89c6a01ca26e6729fa00143381686493b468cfa9ad0126e7a386f0591024da1caf12d1432e2be4a49194551d4a76eacecc39da9017cfa8c8726ae4cc
+MISC ChangeLog 3409 SHA256 526ef351a55f06198a3ff40b761478960103222b54c34d2e68f49f1e45d30c7e SHA512 4cb27acc22ccd4c3e6a4f941c578d92762a8fea43f02a1801db4b558245db7a1116e74186c1e5d9c407e8afee592939e5a8a3f9e933fc040aab13d122cce6744 WHIRLPOOL 11e07bde4b06f4b8d4934d0123b233f5b976d645848cf5459bb4cd81eed5dfeedc427f5ab6ebab1160d2411ec570ad58e1aba924025fcf59e38591eee41b2b94
 MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSZAWVAAoJELp701BxlEWfwhIQAMLz7txsjgxar1Fx06z5yBOR
-jX1vNqULkwx/vQYPIVL8GJ89HF4mqc1Ud/fJgz/P/w/tjb67o2HEIzY5at+c0H1L
-QRzC8++v0wy8WCuY2rffBdbD395276dxYNW0sTuokbG4PCVi/dEmeNeVagU6BuKG
-NrEeB+vscgDImQdrg3/Vhax0Z8N11E0lbcLxR4UmTk4I0VLmX1S1+xnNeGfunQNP
-5RZ4NA5p1bJ77x5UsnE5geLbV9nvpJv3gpOTn8e9phQcgzF/XxlRRYwGbb+o6Wlc
-LXxTNBfyinKRiOznHmdfE0mbo+QPI9kNjVnNlHWbNbelKhn3pxnYb1x20ZZp8EP7
-OWdiZUNMRdafb5pGLlsr4DDmRNXsi33AzTJt1o/AmFvULzTrmZi/18nL7Sd+aJro
-gfnhe96/KZ9E3PYIAdlGcpv9YKM3QzbiNCVus39BnNrYFBd9RCt+Y9xLDmfRFQK8
-+6fbyZaO0QQoLKnGIa3DmvJquAFZvmcvSLso6B60dys3gNNkO6uyduHJEb3YAC8S
-fxGIk9O/SF5/Q3+d2hZfbemLWGeKarn0uPUFVR8T+s4EuKGdMWX7GgmyOqAecT0L
-wBQ6ti+tjeE9JRxTelipj3Bo1sjAFbKfR05QV/DLZdDY2ZQaq7O8sin+HYsY0jRv
-CT/NtmYgXujRt7OXpWb3
-=iJMC
+iQEcBAEBCAAGBQJTG0TSAAoJEJWyH81tNOV9hmAH/0a5spDOk10Wgb/yYqgclNjB
+Du70VsDBD7UtDCymXa9Zw2OT0sESK4RINF7iopVhZPxXq/4mn8jYudTSDVdul8F7
+lAsVeIkKZPpoGiK1S6t7DvaHN12px0lGXqSJC5sMWmACvwJQ0f60BVVQ0KvsdWa3
+3HK5RT8wXwiHD455q5XfpghybbDZ0JTw7YQL9nMj9LF6dPoEj7PurJyQYx4DyUSf
+wuXDoPAvFl4uu1SZ++R2YkWFHrWYcWRZyOQSPaZlPymal8wvPhh6ezH5oSbptN2I
+AjBBAR5xF7uJ00s8/7QZy9BeOpdSusq/u9qD9N3sba1+JUzHfuzH7wNjar0HgcY=
+=6KgZ
 -----END PGP SIGNATURE-----
diff --git a/dev-java/ant-testutil/ant-testutil-1.8.0.ebuild b/dev-java/ant-testutil/ant-testutil-1.8.0.ebuild
deleted file mode 100644
index 7754ca2d9994..000000000000
--- a/dev-java/ant-testutil/ant-testutil-1.8.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-testutil/ant-testutil-1.8.0.ebuild,v 1.4 2011/12/31 11:23:53 sera Exp $
-
-EAPI="1"
-
-inherit ant-tasks
-
-DESCRIPTION="Apache Ant's optional test utility classes"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND="dev-java/junit:0
-	~dev-java/ant-nodeps-${PV}
-	~dev-java/ant-swing-${PV}
-	~dev-java/ant-trax-${PV}
-	~dev-java/ant-junit-${PV}"
-RDEPEND=""
-
-IUSE=""
-
-# the build system builds much more than it actually packages, so there are many
-# build-only deps, but since those are quite common, it wasn't worth to patch it
-
-src_unpack() {
-	ant-tasks_src_unpack base
-	java-pkg_jar-from --build-only junit,ant-nodeps,ant-junit,ant-swing,ant-trax
-	java-pkg_jar-from --build-only ant-core ant-launcher.jar
-}
-
-src_compile() {
-	eant test-jar
-}
diff --git a/dev-java/ant-testutil/ant-testutil-1.8.1.ebuild b/dev-java/ant-testutil/ant-testutil-1.8.1.ebuild
deleted file mode 100644
index 514797345c5a..000000000000
--- a/dev-java/ant-testutil/ant-testutil-1.8.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-testutil/ant-testutil-1.8.1.ebuild,v 1.6 2011/12/25 22:35:20 fordfrog Exp $
-
-EAPI="1"
-
-inherit ant-tasks
-
-DESCRIPTION="Apache Ant's optional test utility classes"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND="virtual/jdk:1.6
-	dev-java/junit:0
-	~dev-java/ant-nodeps-${PV}
-	~dev-java/ant-swing-${PV}
-	~dev-java/ant-trax-${PV}
-	~dev-java/ant-junit-${PV}"
-RDEPEND=""
-
-IUSE=""
-
-# the build system builds much more than it actually packages, so there are many
-# build-only deps, but since those are quite common, it wasn't worth to patch it
-
-src_unpack() {
-	ant-tasks_src_unpack base
-	java-pkg_jar-from --build-only junit,ant-nodeps,ant-junit,ant-swing,ant-trax
-	java-pkg_jar-from --build-only ant-core ant-launcher.jar
-}
-
-src_compile() {
-	eant test-jar
-}
diff --git a/dev-java/dom4j/ChangeLog b/dev-java/dom4j/ChangeLog
index 5c737b1f4690..787efdeb1c17 100644
--- a/dev-java/dom4j/ChangeLog
+++ b/dev-java/dom4j/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/dom4j
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/dom4j/ChangeLog,v 1.65 2013/11/30 08:16:14 tomwij Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/dom4j/ChangeLog,v 1.66 2014/03/08 16:22:42 tomwij Exp $
+
+  08 Mar 2014; Tom Wijsman <TomWij@gentoo.org> -dom4j-1.6.1-r2.ebuild,
+  -dom4j-1.6.1-r3.ebuild:
+  Remove old.
 
   30 Nov 2013; Tom Wijsman <TomWij@gentoo.org> dom4j-1.6.1-r2.ebuild:
   Quoted multiple S variables.
diff --git a/dev-java/dom4j/Manifest b/dev-java/dom4j/Manifest
index a4dd41819ea0..be4c9a31cc25 100644
--- a/dev-java/dom4j/Manifest
+++ b/dev-java/dom4j/Manifest
@@ -3,19 +3,17 @@ Hash: SHA256
 
 DIST dom4j-1.6.1-java5.patch.bz2 2900 SHA256 5e7361eac5332c3380420bd88c2d3a2d4dde30984486c6d4f7e4621940abb42d SHA512 38da606d77b62976366cd089e5194a922e348ec396e7b9af4dceb0a536c47f66e0900cfa59c91df04aade6076630077a8f88c713b9c20224d69316109b293a96 WHIRLPOOL c3e56098f9a75340243e554f11e8cddbbf3e56cd13f0dc9650151ed5ec2b3914e33921174ad275f089188033f95d33386cd4642196bdc7cc6d9bce980c0251c8
 DIST dom4j-1.6.1.tar.gz 9687211 SHA256 01b4abf86bce337a2a900bf121b3107320ba63b4c0f352e1922fbec6e0736c6f SHA512 95c5a7105a81734f77b4bf27f8bb0af116bf43d8ad5297a0902a6687a54109a87dffe2953cf430d14947cdaa590aa0fdf083b46a91d1d98d48431cfae4459d94 WHIRLPOOL 3edd7c8f629465add6fcbb944eadd75b1e8fd84120c1adf2fa24d43ae04856162d18652892697a2605c1006f1e7d3e5837e30a13e01ab7d1a101614b6dc4f8d0
-EBUILD dom4j-1.6.1-r2.ebuild 2119 SHA256 8270c90e37b8e6ebb872c452c025d7baafe04a62cc36dea6363a1c5cc7aa7332 SHA512 5abe483338ba069c09bf8354cc25aad0dee57397c2b0182c3f381c774728ff9393e1d00c575829a6928291a2c450780c44c86e4b8b394e10b8ab1e376f73ca0e WHIRLPOOL 7d7fc24f86939d30683b29e523db016420589ac1c7dd687ed21ef19cf997cda2ee5941aa9e28b367973d344a023dfb860094bd120be3facda3fbe7e8322cda4a
-EBUILD dom4j-1.6.1-r3.ebuild 2131 SHA256 cb324c8cd6f5ced597ad00702e963610e6cc5815d6bb7e94faed8c9fce878c9b SHA512 87d4337ebe2089659f3799fd63e948988e823431dcb204eb4489592ce25770638220ed5f134821d599e5928cc35413681c487ac3bd803d8a4f7b80bb6adc2e7f WHIRLPOOL 1df0879a76e44d3f6175c026631bc02e9d5a1ee927954e7bbcf97f8b7cba44509ba93b0b95f070301d1670cd3bd04ef6b3eaa00022f3efdca0ad7ebd49d1608f
 EBUILD dom4j-1.6.1-r4.ebuild 1949 SHA256 3f832d0a1a890bc515c20827830122f85afc9fd9cefb513a89e668eeccc7272d SHA512 3acee17f45f8b47b8445265aa0a5af817f3a2d12052ab056c3d0a759e54c900c8c1bf1ad4381dd0de8017917fce64f51159ff77ecd61d92d6c81746c5879ac2e WHIRLPOOL 11347ef9caa81abaf8ba8a38a0c43b2c8c87e06a93a9b26fef1d6ee9e5b132bfeeb8c09b42fa8d54fb45b31bf78b6fedc7f1be6d27de5cee9f4c9bbadb6e37d4
-MISC ChangeLog 7891 SHA256 993da288a711cd4acc48a981104a743a82c51d2866ea680beace9617a8fb6afc SHA512 e0069014af5f5ada7c7336bb3884271c3f1f49cb5f7fd6b232b511383908decb2003e11e17eff21afd3c9b0c18b767b842afa66274fd3c350272368089eeb75c WHIRLPOOL 817d3698f9d8a3510b64ebe29857784f9974c3d2ed166abd2bf8d87762426a76fb8ce1dbcdf6065e4efdf1aceb254705a42aed5d41e1ec257e3c9afff46604fe
+MISC ChangeLog 8003 SHA256 e5d4f280de971857299366d2579fa7192764402ba2acae79df0c004114b1ea41 SHA512 0bbed4ebbd4691fdf16449b87d274d70f4d893e64eeda1ff39facf296eaf75faf094382730b13c8ceda300f218c43cfc4f1d4e5ca9fbfcf6bd6e3245225a741b WHIRLPOOL 2d11726ef16f8fd170983e407534bd11a2934515d1e35eea7c49108e60d0ab7c087a9ea04f0301aa066fa40cd08c2d84f490e9d1db3570b9d98d1179ef846a28
 MISC metadata.xml 376 SHA256 1b7f4f99476e5a8b0f24104d0bd3d6c717ee3a32011851d32a8d3f5674e5d2c4 SHA512 d3115c3fd4ad28050a46e304c5de5a7499cb35c499cdd73166974f0d74fc3e878d89c6b471840cba6444d6bb58a79e6b43aeb3a14bc4eada349cabbb9334ddab WHIRLPOOL 7c0d514c9a61ca80a37066cf02ee96ce921a4b038aa5666fefc191439e17e2632a854f9d264ae8c9dd9bb4e64656b6f45ebbf65a2f01b15bd98ecefae36d2964
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSmZ6GAAoJEJWyH81tNOV9Kk4H/3jdmUmmD6MKZh+e4x8LdFxK
-KCPUlHcsziB8IQj6bcFPCkinshyaOCU6vA2T2yofYreEnZPaOiUolWH6UD/ySNyt
-ba8XeWnRwutO0EQsKG+izpN+GPn59lhZsVeDz3bRUSlQakqJfQsXSGj4ENkNlnHg
-T7LVzGyXmJa1P01GlfoV2v72Zsr5/O5bZorrVclD8n/g0rRUcxCQNxHazhzKLQq5
-BaSl3Y55VBEnJ6cR0uJqNzGLh88ju5FRU2/OvyWSeTjGCg9KcoUrJcwBWJMZRI8x
-IYVqNNxcz9/iIFiJ3keIp+2zWsi6SEkdvL+Fb7e3M9uwPMSXuztfVWH834EsKsA=
-=antG
+iQEcBAEBCAAGBQJTG0OxAAoJEJWyH81tNOV9WogH/Rwm9/WEVhlVWth+41uagJ+f
+2DylTTnNQTYOYUcdFCWNhUHWWnEYPpOUvxKQ5+vSPDHs229nnEyXejDY1EnSCWK7
+jlhkD5hl+GNYOrMPYEkBFnq54lH3cucoekU892TLFYuCc6vlHRDouWHYIsMInZuM
+Y0QbxIYINPPDtzbI+CAuQ6h+zfK2HbnFq4YP0cLs7NqVWdQVYeB83PW5lYPidLdG
+mJT6a4PpqXzXmOECOjmuGVHHRLCblG6PYZOGVc+/bTGu510EU0cfmtr6xviN5OY7
+G/XSxByALbrcTRYCNqxSSKRhmWPDB5qjCueoTw0cdrySIcrmQhMmPznmqdWwU1A=
+=CRmN
 -----END PGP SIGNATURE-----
diff --git a/dev-java/dom4j/dom4j-1.6.1-r2.ebuild b/dev-java/dom4j/dom4j-1.6.1-r2.ebuild
deleted file mode 100644
index 4ec09d02563a..000000000000
--- a/dev-java/dom4j/dom4j-1.6.1-r2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/dom4j/dom4j-1.6.1-r2.ebuild,v 1.13 2013/11/30 08:16:14 tomwij Exp $
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Java library for working with XML"
-HOMEPAGE="http://dom4j.sourceforge.net/"
-SRC_URI="mirror://sourceforge/dom4j/${P}.tar.gz
-	mirror://gentoo/${P}-java5.patch.bz2"
-LICENSE="dom4j"
-SLOT="1"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
-IUSE=""
-RDEPEND=">=virtual/jre-1.3
-	dev-java/jaxme
-	dev-java/jsr173
-	dev-java/msv
-	dev-java/xpp2
-	dev-java/xpp3
-	dev-java/relaxng-datatype
-	>=dev-java/xerces-2.7
-	dev-java/xsdlib"
-DEPEND=">=virtual/jdk-1.3
-	dev-java/ant-core
-	${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# Add missing methods to compile on Java 5
-	# see bug #137970
-	epatch "${WORKDIR}/${P}-java5.patch"
-
-	cd "${S}"/lib
-	#circular deps with jaxen
-	rm -f $(echo *.jar | sed 's/jaxen[^ ]\+//')
-	java-pkg_jar-from jaxme
-	java-pkg_jar-from jsr173
-	java-pkg_jar-from msv
-	java-pkg_jar-from xpp2
-	java-pkg_jar-from xpp3
-	java-pkg_jar-from relaxng-datatype
-	java-pkg_jar-from xsdlib
-
-	cd "${S}"/lib/endorsed
-	rm -f *.jar
-	java-pkg_jar-from xerces-2 || die
-
-	rm -r "${S}"/lib/test
-	# we don't really to fix any of these if we're not doing testing
-#	# TODO: replace jsr173_1.0_ri.jar
-#	java-pkg_jar-from ${JUNITPERF} || die
-
-	# We don't need the stuff in tools
-	rm -r "${S}"/lib/tools
-#	cd ${S}/lib/tools
-#	# apparently we don't really need clover's jar
-#	rm clover*
-#	java-pkg_jar-from ${ISORELAX} || die
-#	# TODO: replace jaxme-0.3.jar
-#	# TODO: replace jaxme-js-0.3.jar
-#	# TODO: replace jaxme-xs-0.3.jar
-#	java-pkg_jar-from ${TIDY} || die
-#	java-pkg_jar-from ${XALAN} || die
-#	java-pkg_jar-from ${XERCES_IMPL} || die
-}
-
-src_compile() {
-	local antflags="clean package"
-	use doc && antflags="${antflags} -Dbuild.javadocs=build/doc/api javadoc"
-
-	eant ${antflags} || die "Compilation failed"
-}
-
-src_install() {
-	java-pkg_dojar build/${PN}.jar
-	use doc && java-pkg_dohtml -r build/doc/api
-	use source && java-pkg_dosrc src/java/*
-}
diff --git a/dev-java/dom4j/dom4j-1.6.1-r3.ebuild b/dev-java/dom4j/dom4j-1.6.1-r3.ebuild
deleted file mode 100644
index 7867a5a3e10b..000000000000
--- a/dev-java/dom4j/dom4j-1.6.1-r3.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/dom4j/dom4j-1.6.1-r3.ebuild,v 1.13 2012/04/15 18:47:52 vapier Exp $
-
-EAPI=1
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Java library for working with XML"
-HOMEPAGE="http://dom4j.sourceforge.net/"
-SRC_URI="mirror://sourceforge/dom4j/${P}.tar.gz
-	mirror://gentoo/${P}-java5.patch.bz2"
-LICENSE="dom4j"
-SLOT="1"
-KEYWORDS="amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-RDEPEND=">=virtual/jre-1.4
-	dev-java/jaxme:0
-	dev-java/jsr173:0
-	>=dev-java/msv-20050627-r2:0
-	dev-java/xpp2:0
-	dev-java/xpp3:0
-	dev-java/relaxng-datatype:0
-	dev-java/xerces:2
-	>=dev-java/xsdlib-20050627-r2:0
-	dev-java/xml-commons-external:1.3"
-DEPEND="
-	>=virtual/jdk-1.4
-	test? (
-		dev-java/ant-junit:0
-		dev-java/xalan:0
-		dev-java/junitperf:0
-	)
-	${RDEPEND}"
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# Add missing methods to compile on Java 5
-	# see bug #137970
-	epatch "${WORKDIR}/${P}-java5.patch"
-
-	# Needs X11
-	rm -v ./src/test/org/dom4j/bean/BeansTest.java || die
-	# fails with a 1.6 JDK for some reason
-	rm -v src/test/org/dom4j/io/StaxTest.java || die
-	rm -v *.jar || die
-	cd "${S}/lib"
-	#circular deps with jaxen
-	rm -f $(echo *.jar | sed 's/jaxen[^ ]\+//')
-	java-pkg_jar-from jaxme
-	java-pkg_jar-from jsr173
-	java-pkg_jar-from msv
-	java-pkg_jar-from xpp2
-	java-pkg_jar-from xpp3
-	java-pkg_jar-from relaxng-datatype
-	java-pkg_jar-from xsdlib
-	java-pkg_jar-from xml-commons-external-1.3
-
-	cd "${S}/lib/endorsed"
-	rm -v *.jar || die
-	java-pkg_jar-from xerces-2 || die
-
-	rm -vr "${S}"/lib/test/* || die
-	if use test; then
-		java-pkg_jar-from --build-only xalan,junitperf,junit
-	fi
-	rm -vr "${S}"/lib/tools/* || die
-}
-
-EANT_BUILD_TARGET="clean package"
-EANT_EXTRA_ARGS="-Dbuild.javadocs=build/doc/api"
-
-src_install() {
-	java-pkg_dojar build/${PN}.jar
-	use doc && java-pkg_dojavadoc build/doc/api
-	use source && java-pkg_dosrc src/java/*
-}
diff --git a/dev-java/oscache/ChangeLog b/dev-java/oscache/ChangeLog
index 551853478b8e..aa455ca209a7 100644
--- a/dev-java/oscache/ChangeLog
+++ b/dev-java/oscache/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/oscache
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/oscache/ChangeLog,v 1.11 2010/01/03 21:26:24 fauli Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oscache/ChangeLog,v 1.12 2014/03/08 16:25:27 tomwij Exp $
+
+  08 Mar 2014; Tom Wijsman <TomWij@gentoo.org> -oscache-2.0.2-r2.ebuild:
+  Remove old.
 
   03 Jan 2010; Christian Faulhammer <fauli@gentoo.org>
   oscache-2.0.2-r3.ebuild:
@@ -49,4 +52,3 @@
   30 Oct 2004; Thomas Matthijs <axxo@gentoo.org> +metadata.xml,
   +oscache-2.0.2.ebuild:
   inital import, ebuild contributed by Dan <dan@intuitivelyobvious.net>
-
diff --git a/dev-java/oscache/Manifest b/dev-java/oscache/Manifest
index 33fa503a1375..882547141ab4 100644
--- a/dev-java/oscache/Manifest
+++ b/dev-java/oscache/Manifest
@@ -1,5 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST oscache-2.0.2-full.zip 2533146 SHA256 d909d10aec024d9f53475030843afbb3c3bd18ee1a77b3e9e486a6f0fb336d52 SHA512 18799280bd81506a610659d8e8fb4a1405ff32d1275a227c6306d5197cf3ba8d907227cbbfec4bb570ab7e9fe6342828fd42702644cf19a51e1c66bba8d11cd3 WHIRLPOOL d35959a4c996d000c28d2f5f28f8c527f3a08283912a2a949d1577768d074e1e2517b6ef7b122aee0366e9d723187dc9572acd6b800cb7f13633a1824b4b4b51
-EBUILD oscache-2.0.2-r2.ebuild 2135 SHA256 9a89b9286db8a0936aaf1610e54ba980ee7f9b73acfe40cc39b1d318af13ed1b SHA512 14324b0c23f147975aa43b1d8f3ffec5b834734350feb622ee26364179f33350436fff113767d19fba8ff0fbd2525b5b4bcc6b15a38483f2fde1bbb5ddbdc31b WHIRLPOOL 329b6e7c1e4514cd6bed911ebdc9b8eb0457ffdc185b78a9a5d7e2bdcefc979f139715eceac8bb8fe1f048bb6d1199e84e2a92f77fc2ebc89ee9d7ec94b23927
 EBUILD oscache-2.0.2-r3.ebuild 2187 SHA256 d06f6dde68b4a9e0389e3e03ff4da2752d698bcf5ea77dd24622a7ae454f62c7 SHA512 0a5cdd74c466f65835376ff7d62e32e49d5e050f1f072aead8dade7dc66ca150035a94e05e1903767f509e34b5dff53b264a7ad5616f8f8d715faa86479c3d9e WHIRLPOOL e932a48659b45249614296e6a62ade20fa828d84a80651f5d570d53f7412911ee5531a04ff8167473687e4da7e771fca598bf9a58a1eae1153ea892fec29683e
-MISC ChangeLog 1749 SHA256 dc52cb005814fd36aea89b156d6bc8675a471d6cf22f93236c132a78d09629c4 SHA512 78671f44062fbad65cafa1b72fa52a07b8efa347af877dc58aab55f7fcfe231a17be5c48b1372fd511fc9a9834e7c7adbb3c2ca9e73a7b83ecab87019baab370 WHIRLPOOL 60ae0af5ba9a873de0115b25fed4ccb25b0c178f869b2b697f5f5e1f037c77ada26ba66cc95c77521d6ad9c5148d8c5c6384fdc54ab4103e6786967e0418d4f8
+MISC ChangeLog 1837 SHA256 3c407edaaf61743424b83d64b64285f2dddf04f439ef9e888eb29eb7057b899e SHA512 65a9b4f460acaa3c1946b416fd366b38efdcdb0f866ab1221b45f9e2336031f87250a9d58a8d5efaac240982f7ec44261564f65141bb2b1504799253d1eec1e2 WHIRLPOOL 9672c67c1e890685ca7c15be1a4225662261f861dbd548891b135d2d48cbc0d67fac749994968dac1284284b4a49ee6c1f944e4d05b78b3ed6c37371301aa6fd
 MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQEcBAEBCAAGBQJTG0RXAAoJEJWyH81tNOV9ynAH/iO3eGxQ3Dj7TsQackNp5HVC
+EL1Ip70GnU/8JEtdseTH2gSWKzEKj8FirvtEwPtxU0R7wGF8McfgSqZsiVhrq4f8
+XoahgOMtUT+OUWMyVQI68B+T3FVvbNQqCC0IFdI9enKuSHaOkilhPaQ1ytims1jo
+DeLjz9kzy3LPjgliQ9AU0ZV5LSUE7IQemD03/ngU9DCAk+QUSQOnRlJW97wdth/k
+nUlECEflE/gHriR4eB/q/YQiZh0QcBSaZJkYL/tmySB0IeuOjiIwT0BXT+VVoBQV
+arIPJZjaKZZUQsWCPW6zVjtTiOohoKcSefWvu9sTtEhtjCv64gxYQcVrYz9kSUU=
+=OJ8w
+-----END PGP SIGNATURE-----
diff --git a/dev-java/oscache/oscache-2.0.2-r2.ebuild b/dev-java/oscache/oscache-2.0.2-r2.ebuild
deleted file mode 100644
index b780db00740c..000000000000
--- a/dev-java/oscache/oscache-2.0.2-r2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/oscache/oscache-2.0.2-r2.ebuild,v 1.1 2008/03/22 21:21:19 wltjr Exp $
-
-EAPI=1
-JAVA_PKG_IUSE="doc"
-
-inherit java-pkg-2
-
-DESCRIPTION="OSCache is a widely used, high performance J2EE caching framework."
-SRC_URI="https://oscache.dev.java.net/files/documents/629/2653/${P}-full.zip"
-HOMEPAGE="http://www.opensymphony.com/oscache/"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-COMMON_DEP="
-		dev-java/commons-collections
-		dev-java/commons-logging
-		java-virtuals/servlet-api:2.3
-		dev-java/sun-jms
-		dev-java/jgroups"
-RDEPEND=">=virtual/jre-1.3
-		${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.3
-		${COMMON_DEP}
-		app-arch/unzip"
-IUSE=""
-
-S=${WORKDIR}
-
-src_unpack() {
-	unpack ${A}
-	rm -v *.jar
-}
-
-src_compile() {
-	local build_dir="${S}"/build
-	local classpath="-classpath $(java-pkg_getjars commons-logging,commons-collections,servlet-api-2.3,sun-jms,jgroups):${build_dir}:."
-	mkdir ${build_dir}
-
-	echo "Building core..."
-	cd "${S}"/src/core/java
-	ejavac ${classpath} -nowarn -d ${build_dir} $(find . -name "*.java") || die
-
-	echo "Building cluster support plugin..."
-	cd "${S}"/src/plugins/clustersupport/java
-	find . -name "*.java" -exec sed -i -e "s/org.javagroups/org.jgroups/g" {} \;
-	ejavac ${classpath} -nowarn -d ${build_dir} $(find . -name "*.java") || die
-
-	echo "Building disk persistence plugin..."
-	cd "${S}"/src/plugins/diskpersistence/java
-	ejavac ${classpath} -nowarn -d ${build_dir} `find . -name "*.java"` || die "compile failed"
-
-	if use doc ; then
-		echo "Building documentation..."
-		mkdir "${S}"/javadoc
-		cd ${build_dir}
-		local sourcepath="${S}/src/core/java:${S}/src/plugins/diskpersistence/java:${S}/src/plugins/clustersupport/java"
-		javadoc ${classpath} -sourcepath ${sourcepath} -d "${S}"/javadoc \
-			$(find com/opensymphony/oscache -type d | tr '/' '.') \
-			|| die "failed to create javadoc"
-	fi
-
-	cd "${S}"
-	jar cf ${PN}.jar -C build . || die "jar failed"
-}
-
-src_install() {
-	java-pkg_dojar *.jar
-	dodoc readme.txt
-	use doc && java-pkg_dojavadoc javadoc
-}