Remove old.

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

25 files changed, 101 insertions, 406 deletions

diff --git a/dev-java/ant-apache-regexp/ChangeLog b/dev-java/ant-apache-regexp/ChangeLog
index dd0ce7563f23..e6baecec977f 100644
--- a/dev-java/ant-apache-regexp/ChangeLog
+++ b/dev-java/ant-apache-regexp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/ant-apache-regexp
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-regexp/ChangeLog,v 1.40 2013/10/20 16:31:22 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-regexp/ChangeLog,v 1.41 2014/03/08 17:33:32 tomwij Exp $
+
+  08 Mar 2014; Tom Wijsman <TomWij@gentoo.org> -ant-apache-regexp-1.7.1.ebuild,
+  -ant-apache-regexp-1.8.0.ebuild, -ant-apache-regexp-1.8.1.ebuild:
+  Remove old.
 
   20 Oct 2013; Agostino Sarubbo <ago@gentoo.org> ant-apache-regexp-1.9.2.ebuild:
   Stable for ppc64, wrt bug #476958
diff --git a/dev-java/ant-apache-regexp/Manifest b/dev-java/ant-apache-regexp/Manifest
index b79b659e543f..470cb664fffb 100644
--- a/dev-java/ant-apache-regexp/Manifest
+++ b/dev-java/ant-apache-regexp/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-regexp-1.7.1.ebuild 537 SHA256 7c2adef1380fc16a0d619cba333ef0d33ce44c6fba2b6593ad831108cea93935 SHA512 c92d377a18b94cd6dcefb764669462e0f808e2efc1b77b7db3355c1bf7234403e1cb30512737b27a417ba0184ce86387af59ad9e2998315a8269a3fa6063297c WHIRLPOOL b07ff3c812412c6eb6fa23b5f0e4f7d4f42029b2b8e5ae24239bbd6f78d63e2c2942f684e9515cb0c173994f3b989e9b52a86b94527246a78be247b653d90662
-EBUILD ant-apache-regexp-1.8.0.ebuild 541 SHA256 799b11be2bd390dfe3c99151310a3183f969ff31ee985e1f1eb060189700d20f SHA512 517913568290fb90fd7960c133604aa89661765af4cfdab511fa967d17f82e6ecc339dd2408aed805cc17c7a21f9f51af9615d3aed9099d46d5783a5b0fe4f5f WHIRLPOOL 49dc90868a1e7d03a1d10a85d65b6195b8214a00d6249f1792643ea9a6e5b9a50c98e106fb98d22a91bd89bee4cdd8aedf3a4072a3aba24fcb1c40578699f681
-EBUILD ant-apache-regexp-1.8.1.ebuild 561 SHA256 811737019fccb88cc735c6d3bc2d7333e26f00aeaf04edbf2adecf2630af9f34 SHA512 84dc7958162085dd479b33f0a14602b3a05f9c458efe88800cafc5ee889eb4f51d6da2a11a9bbb140e42fbfc564ea60f132dcb2b01e20d273dda98811dc198f0 WHIRLPOOL a1365676446a79ddf72c774298afbb1082bf6304e48550c934f83c55be95e920aec2a00a3bd044c72c539482dc1e31d86ea156f261e9271601c7c1a31a3349f1
 EBUILD ant-apache-regexp-1.8.2.ebuild 564 SHA256 018ffcf98d14582fef249ad225b740099d0ab71a76f5bb4ac503198d5b74c52d SHA512 b24f00d386dd65f66119a45c8845ac2ee72d3c796f077af143f48a5b721a27e2f54f3ed47d01044b99f6b2e2e08adda8ab9e2fe283b9b713ed7224456ac3132a WHIRLPOOL 6d53b4ba58c778d826d0f8958740704d219d4b149768ad9a792ff9f19326377b5cb03ada3c01ef905084251989fcae44f58c9ca116afd37533f612c7690858ad
 EBUILD ant-apache-regexp-1.8.4.ebuild 562 SHA256 da5c9488f8b3fe8355dcb454281145d14e259b9f8c9f1b8b047286d0c6a4a481 SHA512 5fe397b3d4aae93bb843caca7d2111965f648375d2fe25f69aeceb3b6f0c8d9ac82a8d654cc180332403974b973d12a9229faf0619a7cd05d9fedd086f6c3cbb WHIRLPOOL af28aac8784de63da6df9d0a33e0e0dce3253e0c991f86f0546f23288d7cf86c3c5f26a52e136ffdb8ea6353466b20737a145fd45889bf70389074cb4348e451
 EBUILD ant-apache-regexp-1.9.1.ebuild 567 SHA256 07c90c1d8b9e83db4c0a3ce720270cb0af73ec394fe5a7c812cfb52009f19dc8 SHA512 7b1cf68c99fa8661a28ac233dfa9fa2885b26c4c018525216bae8b7ed147aea5d1cb914613115ddf3ef48450af7670af8eb872f7ee7b75899afc223f1a3d2d9d WHIRLPOOL b43defe03098808e1adf69ca2dfa43e9c23dd8147dae084f006b23eb2be897b403128d47fcf9a227d23f6a288b512f3a18654c4989e175f259ecbc227ca30336
 EBUILD ant-apache-regexp-1.9.2.ebuild 554 SHA256 3521357dff21ad3a42decdaec7f9283355ec4875c074957e5cf983e19ad61a28 SHA512 24ef132316e99ffc0e5648a3def63ba96aee9a1374724764be35a9fb5779d70bc495e5ff5143fe6aff4719650281bb540039287d9a9f3121b35862bc0a9a3f56 WHIRLPOOL a56dd9985348d7bfc08f2babdf4e56846bf2698b3bf1a1b7133a4b1e2fffa63f58c848740667155030dccb8f78cef0f31427d96991919c9d1a86df989fe10e3d
-MISC ChangeLog 5257 SHA256 c4e9ee7029f9f7c8e47a78f95381886165cbbb910384a839c7145a3c11543e78 SHA512 718012fe5dada9698892c58f5a8c675b8e359eacdd903751e864d3bce4abf0c4a1cc6ab67fcf8fcf925cf69330b2924839f748d6ce01652f070ff2b1f73b24d7 WHIRLPOOL c6116913f8109bce1d82376d96df482be7059c420a746a27378eacdc1b59227b4493ea24220d2f98fd833b3b167a978fe33ef9333304a32e0ceeed397351bfb0
+MISC ChangeLog 5423 SHA256 af5c73a5991ad95cf64fcac54439cb8b21df022451c57b0d1c93e50880bb0679 SHA512 2192b0624e9b733605f01f61e7f5636cc6ec7dd6101376ba72152ac6b6a06c6cc4cffe12749e9608c537448c8805456421e569e6058be4fa2cefa55627a8e785 WHIRLPOOL 0be0a49266687e89719b8c9f7715a6f3e4d3302af3ba90f6e3371c00687bce0aff474e94f3e8f2bb0ee34a2ce2328c99a336efbec1d7e260ff79d1992d4de8f4
 MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSZAVZAAoJELp701BxlEWfgBQP/iAzcQY+eqxErPj/315AqXol
-dywQppN8LkZ2EoiZ98cpCzLI0PoebkNBlB8t/fpXb9mtJfnhkz0rPhrysSZJW/cG
-knurMpiF5pE2FvZfMbO8e39YdP6oSKIPLIpYdt4Y2d1UCacGIQP9NdiFP3bjOxqI
-4aDX99LRAQDTcPBOwX3LeXe4rzhyJPZQAXCW/YhAebxsk7SboMXK5g+WFQOgOhjE
-ZIiqc7/kj/D6Bgf8azHj3N2k3wBrRo//LI+bcfSEnJfrTszLeLq+/UaQ6SfFbRg/
-Rq6mvsfsnWI4ZI16Rf+IcmxwQH8I0WBHPZ0R5bkQnRd2uS1K0i+MyqAFfD1u8RX2
-71MtalgcURfDxUKNws4lz3T7VLWZV72NdH+Zsyn6zK2GTUmRnqdhnaWTK88SOSNa
-1niylTSfLZ9gUadmytrHfbBxNS575N7sDIZPTLmUg0QwxwihlMxATPFz0UwLLoul
-4e/NO0gPqg6CJhD+3J74wKgDPJmgEjdJFsLVpPVqE9RJ5dkhatL4JEpZYbMRGooV
-EWG4W3xJ7dzAhUVcj4P5bt5u/3MUs5cN5lsB+BBkPv0RHLn8CA+20LH/LHcztDXG
-C5bVC2Sr/Y4IODWG9dTe101ag1iH4hytdOx45gynUodfX1wrR4hpCkqszClT9Wiy
-8uks2iZ8QGWM7Ckqua8E
-=KPCu
+iQEcBAEBCAAGBQJTG1RLAAoJEJWyH81tNOV9kUAH/jicwHi57Qv50edjingmuhlY
+9RcrWt2U6QkOaAQDxMZ18stR1GEyFAYfnQFudqkx22N/RmDm4E10mWFQo8bfMED2
+u/0Z1hncPrdVpPYm9DebI/qUe7FWuHgFOWXBHYdb/S4pThpI/R6Tm8p5ABptd6OA
+YTBptd44a+XLIPqdgux+0Ni1j4BWw+2DEzVZ+JJwe8EHM4XQ81EfVkmnw9g3EKg4
+j6gTJUxqvRj2H2TOOZ6EnVVlTmYs8IEpGFJIN/19ebVam/KzbBSpeOaPERDi4Z4N
+uOhjVC0v6C6JOVTlIVtB2NZnwW191FkJPWkJCx+Da0EdG8a7VnvWbfqAEM/J15Y=
+=Zhx6
 -----END PGP SIGNATURE-----
diff --git a/dev-java/ant-apache-regexp/ant-apache-regexp-1.7.1.ebuild b/dev-java/ant-apache-regexp/ant-apache-regexp-1.7.1.ebuild
deleted file mode 100644
index 338b6d48cb20..000000000000
--- a/dev-java/ant-apache-regexp/ant-apache-regexp-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-regexp/ant-apache-regexp-1.7.1.ebuild,v 1.8 2011/12/31 11:49:54 sera Exp $
-
-EAPI=1
-
-ANT_TASK_DEPNAME="jakarta-regexp-1.4"
-
-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/jakarta-regexp-1.4-r1:1.4"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-regexp/ant-apache-regexp-1.8.0.ebuild b/dev-java/ant-apache-regexp/ant-apache-regexp-1.8.0.ebuild
deleted file mode 100644
index 231716c767bd..000000000000
--- a/dev-java/ant-apache-regexp/ant-apache-regexp-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-regexp/ant-apache-regexp-1.8.0.ebuild,v 1.2 2011/12/31 11:49:54 sera Exp $
-
-EAPI=1
-
-ANT_TASK_DEPNAME="jakarta-regexp-1.4"
-
-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/jakarta-regexp-1.4-r1:1.4"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-regexp/ant-apache-regexp-1.8.1.ebuild b/dev-java/ant-apache-regexp/ant-apache-regexp-1.8.1.ebuild
deleted file mode 100644
index 5d5d64fe9436..000000000000
--- a/dev-java/ant-apache-regexp/ant-apache-regexp-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-regexp/ant-apache-regexp-1.8.1.ebuild,v 1.8 2011/12/31 11:49:54 sera Exp $
-
-EAPI=1
-
-ANT_TASK_DEPNAME="jakarta-regexp-1.4"
-
-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/jakarta-regexp-1.4-r1:1.4"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-xalan2/ChangeLog b/dev-java/ant-apache-xalan2/ChangeLog
index 04aa1ab378a7..a16378ef0126 100644
--- a/dev-java/ant-apache-xalan2/ChangeLog
+++ b/dev-java/ant-apache-xalan2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/ant-apache-xalan2
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-xalan2/ChangeLog,v 1.25 2013/10/20 16:31:30 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-xalan2/ChangeLog,v 1.26 2014/03/08 17:24:18 tomwij Exp $
+
+  08 Mar 2014; Tom Wijsman <TomWij@gentoo.org> -ant-apache-xalan2-1.8.0.ebuild,
+  -ant-apache-xalan2-1.8.1.ebuild:
+  Remove old.
 
   20 Oct 2013; Agostino Sarubbo <ago@gentoo.org> ant-apache-xalan2-1.9.2.ebuild:
   Stable for ppc64, wrt bug #476958
diff --git a/dev-java/ant-apache-xalan2/Manifest b/dev-java/ant-apache-xalan2/Manifest
index 5c770dca7122..3d22342d12be 100644
--- a/dev-java/ant-apache-xalan2/Manifest
+++ b/dev-java/ant-apache-xalan2/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-apache-xalan2-1.8.0.ebuild 604 SHA256 5437bab72e68a5bc194c7a423881d45181bbeb0cd14518d20daf260592bcefba SHA512 607f2bb9038469d74e0fe77e1b21119d0a81795a563b2e32de094ed92a33c643794ac4164e549e4fbe1afc578ed0dd909c1207fe8f8fe3ec5cadf903c88ae837 WHIRLPOOL ff00f47103ae873358e6c164ad520e92808c4a83c31e883cb051f7d980b7592d371631ddaf86a1f48a484d7e1dc24e3fabd5228e1170c3df64f83eba9d7863e9
-EBUILD ant-apache-xalan2-1.8.1.ebuild 624 SHA256 0cd29bffd6320fa4ffda6a25292acd974717089b4f1b3ed519c91e1fd5637452 SHA512 e91b3286a61ed5dda2f90252ce9c37271a06b7fe5989f9195e97860855c46e8170bbedc7a9c2e51626b811c0f17dc429a14bdaf6f0148e57e863e8cb3e1c0ef9 WHIRLPOOL b85454636ffb63e7c7007622eba8b703556474bc20792a51f375e7ed25a80c4a4052c75510b12e4f1e2c50eb8431c6e0e75bf47d7b84d4c944887a982281b627
 EBUILD ant-apache-xalan2-1.8.2.ebuild 579 SHA256 2c6d4e0dd5458ace957938ad5ed67d4df76362ce5fbc70ed3f95c4c30096c9c5 SHA512 38accf4eeedeb90da57bea5144559e84b4dacf7fc5bac6f7e6ea9408bfa78724f5d443d39c3078db323a2997540e214a00fa9059dea42e227416c4bfd7008d24 WHIRLPOOL 4eb1fb1515076c7c939fae1d9b9bb0f37cbc20bbce9d85bafc36bd3044b169a09d0838155e4b2e93004248880b4ddbe7d01ff44eba0680b38b9594ec6540270c
 EBUILD ant-apache-xalan2-1.8.4.ebuild 577 SHA256 0dae9ea40dd4fcead6339fcef40fe96719622b5536394e28d750249e6800dba1 SHA512 e5007587f67739b7d70743c076930b4e0a008c4d65789eeda77d9e3709ec1732c3cc4f8e6a09a8345d3c78b58cebbb4d2f7b4d55fa6f6fd4eb8ec3ad0c574c78 WHIRLPOOL 2766b8d599c58e9c6e07b8b06c68d58edc928ee8cf421483eac44ca0d3bb5566136e03ebb0b72c79ae237d154dfb6d3d88f0329a9e1e3fd8937122006d8e99e4
 EBUILD ant-apache-xalan2-1.9.1.ebuild 582 SHA256 7a9355c5ce2a0bb7fc0108c1ede0e3452907c3564726996f18c579559d869f11 SHA512 82cc4959f6f0502f7a5c27daa4c9eb2a764254a188022f8de0b28addd20d8263e9cfb0784d6e0a0c3d27623c6b594f9d293f0d5462e3ae928467c14cf24f0f52 WHIRLPOOL 13a238e365931bc7c52610bfaef0ac4e7a228c8e481223a65d196111a9400e8917ac15fa2cddccb544eef63915f567102bfc2971c9d31f263c6ff276306dfd11
 EBUILD ant-apache-xalan2-1.9.2.ebuild 569 SHA256 36a7c0c7398df4a7f8178d9959b00a2b4060022aaa94c536823d7803c661e4db SHA512 11dd1f75984878b31cab24fa8ed57abb821f4fab4c2709f9081e05f7c88ee5d32c6eec0f322b3363f533b1d733964a1186e967947abab3b488a57a4429e570ef WHIRLPOOL 10920900c13b7fbae89c2d998c9ba401ac5e3f71fd380c1273c54b5a5b15c13620b1eda01d82768b6ccbbe2fb22f73a20ad4c0fb9bb0998de829ff1e7a8ce2f8
-MISC ChangeLog 3436 SHA256 e524a10e1bb002e1602de4c4d3e1a6d76ef24841c8439f891992969984735366 SHA512 f4273976ad916b6a470eae4e91912c4fb222d817a3e00a1df2478d10f11316c6ac7f58f438b32febc90298437b0471988535256bb1f99bd0c31ddfe4cea30253 WHIRLPOOL 730a8352073d38562bfab9a72ec1a029402c2104a84f6803a4173fe1efd1f7223f2bd2f8c6deceb48d7dea5a070f066ed8954f3c96b1c1d58828aa322039ca53
+MISC ChangeLog 3569 SHA256 a98abe1f702c701886fbe12c036218661952bd587782e572b131de97308c7b61 SHA512 4552330228c40a4e490ae5814e97f5b2263cce0d30943034523eca4520f1094b2db661d402715488257bb704804884ac8d9843fddd144237a322396aaedf205a WHIRLPOOL cc02e0188f7f360840490cb3cb1fd911b0ca27c4b974e93dbb69b5dd4d765a014982cd1d4c6f410ea60345219c51527025fc30bce6ef51925af1cc10a050dc0c
 MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSZAVgAAoJELp701BxlEWfJ3AP/ij2UUMs1pI5hRs0suCswqms
-dUxTN0UGWv+nZ77KFUkK7RjW3lzj9TExY0lpGu79gwqeSxCnuVHcU640rDUQ3uSN
-wZsi2+Ws6Sa4QMaJIPtYeuKXieNRqpX1wgeKK1N4rS5OBDFB0YrQF4nsPcafRePW
-cfiTCBv7cTp8KHWf/FJzJpQcgFzwOoiGwxZPKfvYRE89NyB6fwVgdGBW8OlKdcUD
-n0qxJYv3LbUK7xidojyC78vmW9DitoU6TphtaLnykfSYKmT9PLZYjbnwJlPPbo7F
-NhAFReKOuvIwIfwRLSKl6fJhDSIqLunW0RcHd3F1zLO9CMOFmO19/aF7sZCkPgfL
-cLyQabiHkngUP9ZyeIP01BGtZSlkqINqDhpdMUil3ryxuIa9LYF0rRUFqe3ehRb8
-mKRWkP+hpbhexEIjDV32zBgA6NC7+RmAqyBP0500gLOEl/lT/KyPjdlYx74snnvj
-Q2HS6ez7d9KXn70y3YI00R54/cEEZH6lfbF/2NT3woSsH0f42CTRfsK9oiODtU3Q
-m0LfGftoZsgGgG3UpfSVwLNOd7Sf2rbHcqoajJeWTxElx6i322Lyjq/iZHxQh9CD
-PIN14Nf0Xq8c3R/yX1GGorK7xZe1gmBIiegA6pUZ5mQhGpls78gfX9JM9dsTPjZL
-aoIcFjwBBUuE0aBGbL1z
-=hPV4
+iQEcBAEBCAAGBQJTG1IiAAoJEJWyH81tNOV9aE8H/1SFlBBG3QZZT498EnJez05Q
+w1xZaeKR9tYoZuDvDIx+JqjOROWk3KrvjupAo9ssKDXHn49Bz0L9MzcN9jfWPqfZ
+p8rfKc4uhTFhwH20bgNTK69d0L5bSk5K2Fu/Po8tRL8BUBk35o9hKILN8hLN0ffG
+Nu8gjZgw9IxWSvv6XRyx1crOd+x/69xVDyTPtMlSNXwd3Obs9OY5efhxhbkVlFv3
+zBDJ+dmM8Scoy9Etyr7VLXgEa+xhAyBrLW8QR0m+viMV+BzSxkG4d4WT5X4fhtTp
+24rv5PgD0GZNsJiuhHsqh7/R4YyaP/yJY/HZIJYPF90A25CqwO2hVORAwWqIJ8E=
+=VF0H
 -----END PGP SIGNATURE-----
diff --git a/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.8.0.ebuild b/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.8.0.ebuild
deleted file mode 100644
index 3f4c1954f6b1..000000000000
--- a/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.8.0.ebuild
+++ /dev/null
@@ -1,21 +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/ant-apache-xalan2/ant-apache-xalan2-1.8.0.ebuild,v 1.3 2012/01/01 20:56:57 sera Exp $
-
-EAPI=1
-
-ANT_TASK_DEPNAME="xalan"
-
-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/xalan
-	~dev-java/ant-trax-${PV}"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	ant-tasks_src_unpack all
-	java-pkg_jar-from ant-trax
-}
diff --git a/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.8.1.ebuild b/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.8.1.ebuild
deleted file mode 100644
index 825c48854f85..000000000000
--- a/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.8.1.ebuild
+++ /dev/null
@@ -1,21 +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/ant-apache-xalan2/ant-apache-xalan2-1.8.1.ebuild,v 1.8 2012/01/01 20:56:57 sera Exp $
-
-EAPI=1
-
-ANT_TASK_DEPNAME="xalan"
-
-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/xalan
-	~dev-java/ant-trax-${PV}"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	ant-tasks_src_unpack all
-	java-pkg_jar-from ant-trax
-}
diff --git a/dev-java/ant-commons-logging/ChangeLog b/dev-java/ant-commons-logging/ChangeLog
index 5d407f14469d..00c88597df96 100644
--- a/dev-java/ant-commons-logging/ChangeLog
+++ b/dev-java/ant-commons-logging/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/ant-commons-logging
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-commons-logging/ChangeLog,v 1.40 2013/10/20 16:31:34 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-commons-logging/ChangeLog,v 1.41 2014/03/08 17:26:42 tomwij Exp $
+
+  08 Mar 2014; Tom Wijsman <TomWij@gentoo.org>
+  -ant-commons-logging-1.7.1.ebuild, -ant-commons-logging-1.8.0.ebuild,
+  -ant-commons-logging-1.8.1.ebuild:
+  Remove old.
 
   20 Oct 2013; Agostino Sarubbo <ago@gentoo.org>
   ant-commons-logging-1.9.2.ebuild:
diff --git a/dev-java/ant-commons-logging/Manifest b/dev-java/ant-commons-logging/Manifest
index c1299b34e50a..fb60fb66c45a 100644
--- a/dev-java/ant-commons-logging/Manifest
+++ b/dev-java/ant-commons-logging/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-commons-logging-1.7.1.ebuild 503 SHA256 c470d7d9813879923bfc94c556df46bdf417fd7b73a95b3a22b8c3d209ecb83a SHA512 5f29d695a0086ed1ad2a814a0a629bc4215dfa1c655888abcb741e1bf3f4c79ef2fb12bb41131c3a78656905daa3378ab19dd6ea62867f52a0c0afd94ee234ed WHIRLPOOL d204f12793dc4d3e2775bab203ae7345dc2728c5732983770b517c458ae380d00308d51a763a965e7ec6eb6598ba2e0b755e0d45a084ac2c1939a421035c135d
-EBUILD ant-commons-logging-1.8.0.ebuild 507 SHA256 6e016c6920eb1bc73507ae747d49bb3e33e1d9c3f78d05c8ed8932a726440222 SHA512 3532dabe80e1834d1248bdaac61e1793240cced63c9b2f885774130e078e8de336a11d0bc5abbb35560cbfea63dd694eb8731f1b145f7193b0f8c084467f8a62 WHIRLPOOL 51ff2d2d3bb3a4df8db56afd383084647c930e8804dfee728175d8ca3e3ab2ef1a8680974b1a8d5d12d918464880c92f36fb8f57ec1fb102f38d4f97c54b8598
-EBUILD ant-commons-logging-1.8.1.ebuild 527 SHA256 5e70b2178a928fa171f062d3a07b5d763c751c065974cab106efad90fd919568 SHA512 8081e6c651baa547c2fa93a99b7714274635e2fd40d04ee79a1693afc90f0f69655d368b54713d0b6697c295144092e4c51bab52d4ca205152f2528860eabcd5 WHIRLPOOL 24015fd73a9512a3f6f88db5a35ebdc0621f80aca136a4f573b5c280f54898bad0100a73b46f7932f5e973b1831e92b22795b838d48c0b12a5a921f88262fea3
 EBUILD ant-commons-logging-1.8.2.ebuild 530 SHA256 6ab02f14fb5a31e87fed5466eb60affe9d32bc3ac5f2fbc02743487344f9548b SHA512 31876f42cfe31ac3a2b6a09742dfa6034f47735f4de0e7fbb4126efc531d0a32ac776d91f94de2d5b5d1259f4c2425b14ec21e214078d3f4a6d41b6fadb1f2b4 WHIRLPOOL f0d64daf79695c3d801d3805d0ea1a5f28a40d31ba1462d671ab08de2d02cea18c35efc64cf3f25d4685579d6025997ea0ffd9b80838ff23b65ef873f9176d86
 EBUILD ant-commons-logging-1.8.4.ebuild 528 SHA256 9adca4253e9280a246a336e9e4db548a69398aeee1056b22d8562c3a393c7db9 SHA512 35dc6a4190d9ab723b8a4eb479cd00041a5f01310e2079c0d0e8751a0e684ce24fa196f40d897c215cbacab3c4e7ec8c852e6a5f2b2776c32f01a404d462ee89 WHIRLPOOL ee5fd4d7c85bb9aef0db795423d0144f7286b21a16589ab58578f1ad7b9bce4950764f1387a17bbbcb9600b8685389a2cc9ac9b975880d2fb9189fb7ccd2d83e
 EBUILD ant-commons-logging-1.9.1.ebuild 533 SHA256 9008e2fab464fb8182c4ea451a4d2b02d3d18d64c908af01531b2a59747505ea SHA512 433938d64c5df258e7e225c828258e8e48ba4d3f4716aa4219ae4d20b9526b24f094544fae10a4a23dfd9bf42146cade379c5c27a43efc8fafe23cfe913b09c6 WHIRLPOOL 69e5118ff6c5327b518bbe2af1649d17c2d1b18d3b78e568b0ab9ff68932013a4b36bb571ad7799d93a0c318a1402c1e120fc7e3400f80598bfc33c294db3560
 EBUILD ant-commons-logging-1.9.2.ebuild 520 SHA256 60a03227f9391608555a6a7792d3115d12ed1a41d181d6d05d8becbb31a6efd5 SHA512 3e33ad52d97fb76b281654607c01c41200517a0906b6e5fb8a50955929864b32cc6d0f38a9694c7f12ccac775d9ce8f0e30ceb0473dcb8cb975d9a690382a2e2 WHIRLPOOL 2e0c260068bbfb18a866b4e50d06f3874053c579fddd23f3b56670ff27efd70e1089495476af92a8e1c62b6bb2615e17e1ae89be3d8e648a03b00f9b6e7698c4
-MISC ChangeLog 5379 SHA256 f2fac79a11ac8c8fd016a65b47d5dfa78ca05ea2d49e6ae69d1b61662870987c SHA512 02182442c77a8339eeb65d85ed4c4b9b003730ea7a015fd630c0052d2e629542bbf10a2528395cd9d40faad7215df6920ce4eed184087d12647a460f5da58db3 WHIRLPOOL 3742b6b909186bf5c2f5edf8e79ed69fee0308e8ac2d6eae07833e7ed896dcf26c5454d7aa03c7cb6983771cd89344deef7b5219487d83e2655bc9004c85b453
+MISC ChangeLog 5553 SHA256 e546e97e0e0d8f09a8bd39befa6fa136f74cb517c4e62c726ba744cb4e4202ba SHA512 8935463d93fb7ea6050d10c8d4a5f2a10d218bb8e2a7c0ccaad382b432b2f5b13b060cfc2f08613f2662f11733252da165c26f1dbb73767729e930c75d5ab666 WHIRLPOOL 04848e4af287a883243516fa1669cde9cc497a72c63b283a9342b283aa5e54cf97137bcf6882f0514ef725870f9454a9650762412c8f6362cb7baf108ede61c5
 MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSZAVlAAoJELp701BxlEWf650P/34Lp/QqvzymtWiEs0HbDFFU
-WtAMQZ0A68hAPlWWUm5tMgmCPcTyl877Cyyl9yhpq5rZ8S0ylZ/Yt2+5M6ia8H65
-bVl30JMQStDjtU6nFJa9UFFgS1hf0KKzVCtyHVlZOU8a9Fl3lUtb73dHD8YEzegz
-MNM6eCPrxoaXiGSHBDOCAowWlhu4Z02V5lVrnKxaa+mBBYZFz5SSwVUlUV9S3XqX
-Jw6Sy+BpQ2QxT1aZSNmAmAZ7T7vxwaBRDpOMqEdjhbb8x+Klc7BXtYlpQFq5ZLV9
-fPQX6tJh497+Ul+HnBD5MJH11CJqz+YGVJWZzMZdZqlXWMA6nbEQIraCX6WlIJHg
-mOsav5sYvui7rnzVLUmhybZSxuqp0zbtyUz5d0BL8bZnf589+8nUSHxlU7hmwCdP
-I1i4C5aThEpFV+OkewdA0i7IGdXEA0Bt0fizQDVM4QbizvmHiTKoP425oSH1/sZ4
-h4u0o15gHVk69VcKB/SZr9uvpHiZwIW+7DLUEFB4h5gVwFIVE2lym1poUvhUpnct
-urboAGdlCq9QhP3qqlaIQUHR6jT7mMOX00H5pNMWA0mPPzYQVfdg1oHfeyz8XYFa
-cvmaNCT0FFB/bImTYAP6Ms5YdwZ9DIa0SJhLS59WN3P20Hrz8ZZ34euH14OHaVjE
-6iCPbt9BBDGxFx3erlF+
-=bMqq
+iQEcBAEBCAAGBQJTG1KyAAoJEJWyH81tNOV93JAH/2v8HPeCUwCSEyel5ipLx8Kz
+Y6XeYZd/qP7XP+5eVb79M24QksoMmYmvtbjEtXMzGYs2IXORgkEmtQDZPhfRoGve
+lCsDWP/gAvg6vdz9Zrutjbr/hBQYixRoZsIkp3Oz5GHAMytLJmC8i8ehr2k6dDfU
+QttBfBMhbV4CDhQzOqKgX3QleYT/aDdvFcvk0k2syK98GZqp83pEzDtrwA0+xsPs
+uq6TdrV6O+czCMBCU3PqBzq1dII3YHhU+Gin49YYv8eCfKuOjALxjoo58oeJuvGc
+Rg0UV9v9E1JjQ/naQDoLOvZILDVM+7RjSNxVyKRRX+ZmZHWnziYXQdlqPkS3M7M=
+=1gY0
 -----END PGP SIGNATURE-----
diff --git a/dev-java/ant-commons-logging/ant-commons-logging-1.7.1.ebuild b/dev-java/ant-commons-logging/ant-commons-logging-1.7.1.ebuild
deleted file mode 100644
index e2cf9f72f46e..000000000000
--- a/dev-java/ant-commons-logging/ant-commons-logging-1.7.1.ebuild
+++ /dev/null
@@ -1,13 +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-commons-logging/ant-commons-logging-1.7.1.ebuild,v 1.8 2011/12/31 11:54:00 sera Exp $
-
-EAPI=1
-
-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/commons-logging-1.0.4-r2:0"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-commons-logging/ant-commons-logging-1.8.0.ebuild b/dev-java/ant-commons-logging/ant-commons-logging-1.8.0.ebuild
deleted file mode 100644
index f214a000c6f6..000000000000
--- a/dev-java/ant-commons-logging/ant-commons-logging-1.8.0.ebuild
+++ /dev/null
@@ -1,13 +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-commons-logging/ant-commons-logging-1.8.0.ebuild,v 1.2 2011/12/31 11:54:00 sera Exp $
-
-EAPI=1
-
-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/commons-logging-1.0.4-r2:0"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-commons-logging/ant-commons-logging-1.8.1.ebuild b/dev-java/ant-commons-logging/ant-commons-logging-1.8.1.ebuild
deleted file mode 100644
index 005f46887296..000000000000
--- a/dev-java/ant-commons-logging/ant-commons-logging-1.8.1.ebuild
+++ /dev/null
@@ -1,13 +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-commons-logging/ant-commons-logging-1.8.1.ebuild,v 1.8 2011/12/31 11:54:00 sera Exp $
-
-EAPI=1
-
-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/commons-logging-1.0.4-r2:0"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-jsch/ChangeLog b/dev-java/ant-jsch/ChangeLog
index f87d4ffb8aed..3e0a2be1b8ed 100644
--- a/dev-java/ant-jsch/ChangeLog
+++ b/dev-java/ant-jsch/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/ant-jsch
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-jsch/ChangeLog,v 1.44 2013/10/20 16:32:04 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-jsch/ChangeLog,v 1.45 2014/03/08 17:28:03 tomwij Exp $
+
+  08 Mar 2014; Tom Wijsman <TomWij@gentoo.org> -ant-jsch-1.7.1.ebuild,
+  -ant-jsch-1.8.0.ebuild, -ant-jsch-1.8.1.ebuild:
+  Remove old.
 
   20 Oct 2013; Agostino Sarubbo <ago@gentoo.org> ant-jsch-1.9.2.ebuild:
   Stable for ppc64, wrt bug #476958
diff --git a/dev-java/ant-jsch/Manifest b/dev-java/ant-jsch/Manifest
index a78edf5f053f..580ab3b91e0d 100644
--- a/dev-java/ant-jsch/Manifest
+++ b/dev-java/ant-jsch/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-jsch-1.7.1.ebuild 468 SHA256 d98f8d194cc5e0f37c696e607344adf92fcfc57b22cbbadb76b6c790de19acd1 SHA512 2c7b5af66c4f355885c15c0616f340349c4b4f9973fc9e5aeec197ba126ab6dbd7140a81a3eaea443582edd0125f60161b3abd907af7d2568f22584847a115c2 WHIRLPOOL 40ee8e9af7bb263cdcff2454e3354ac7ca507dc2e999862ebc00406025d1e1730154e4c264a591d8c91255cbccf520c9ed0f4513330637d502fe1db0e88b29d0
-EBUILD ant-jsch-1.8.0.ebuild 472 SHA256 3d04f64534042fb8ab71dd08c62e41ec18774325033fef6f1898ccab4c57d093 SHA512 f12d2e227399df5e7e807cec9b135cc588d33e7a190990178bbce07937bdf955903d6b83cb88d70d9592ba3442d59e0cb3840d26f6b553d879aae837f95783f0 WHIRLPOOL fbb25fc637d36ffa8e35fdb517447a0243e9b73a35a1287fcd535b4e25d5a3c21efad97c55edc54497d88dac24b8b0248f9059f57d294d5c7b19e83dbfbc2e79
-EBUILD ant-jsch-1.8.1.ebuild 492 SHA256 ebf0eb14ea56acd820e3630d087dbe67f3332c79577fef152b72e7b4abd3a4f3 SHA512 b170ecf163725fe3d195e5e7df7d7c2fabdc44caedc201aeb9a457e2abea47669c3a8e2128c8796a5928c0149a8d9c16afc24714709190906aa3065b8ef34f57 WHIRLPOOL 1bc102abaa9f30738df5a7c799fca3fb8b1f1fc82c8524d7d9885a98a5a195d6c520528b279b58d0e67c7f9e8c4ccb34ccef03c2578be728fe5c2fdcd3b651d3
 EBUILD ant-jsch-1.8.2.ebuild 495 SHA256 ac1094390a3cbbca2fe9d7918293a46c5281e5a25dcabc10445ae555bbea8e4c SHA512 f59e98e78d32d0da865c8d2ef6f02083cc4034ef7dc97acfa263d224349d02f3d01ff3d578549be1a3bd3473f34ca1b230e68444c69c6c8b667747ba9c2fded9 WHIRLPOOL b8d32e43c3f8067045b26257f4129dd1d2f5b95640c70dcc7a0a9a0e2ba431bd7ed81510e96016d4133d11acd8bc450bfb4a776607aef788a6b34d6fd39f9d19
 EBUILD ant-jsch-1.8.4.ebuild 493 SHA256 e61a42461789b01edcb26138ff5230f7e3da26c7a4d8f96fba94e65d6db00d1b SHA512 c37e4d4af76c2d71ae0514dd19b3b932dc835a03eab5270260467ec03a99e848dea2cdd271d75bcf2cf40eca39960fc0e9980081e5020df059b90716e37816b9 WHIRLPOOL 521f45aed07651e9f287bd7e433f342a2e2f7b70a30e5fa1ff4024c5f1e80f881298e702150f13b57b223b97e9b90b15d1e255f10d537b7809292b1af50f618e
 EBUILD ant-jsch-1.9.1.ebuild 498 SHA256 52d72752369a6fac68b0a6333163138d3f12d5be8e85ba263a70c05d6d38ac6b SHA512 a65a8d9e75350da780cec78e86d3942aa0e2a3f3d3bfa648652849424792183aac5bc6788e72d65476718aa8924f2613ff589e0a21254bdfbfb6ed0905cbc161 WHIRLPOOL c7eb69b7652fba621a56447d1e1e8a8e1b227e184c6d38223ad557ddd2997fae7d323933980400028c4580c839ebb6712a7fab43050dcc1409067d8543e76a78
 EBUILD ant-jsch-1.9.2.ebuild 485 SHA256 d08f5e3090b0ef1504218a01ccb16d073543ad1f6b2bfb3f438b41cdde89a97e SHA512 5868ac5e4d5df4845d12ae064a4fd2002bff766d5410d8fe27d640d8079c2a0470831412831bca5e7387ad05fa33fa5053179fad60c08b4a261a012e4713ee7f WHIRLPOOL b5230fa241d7d7fc67e4f55e59fc0c54b438033f606e14e1abe32360c0de90feb133fed68c1b096e82d6879ad6864e588e79e8ea9b01c9ebd74cad43cea259bf
-MISC ChangeLog 5223 SHA256 bef5f07156648309d0d67a3cef6543fae5df076245d9deb3f91eaad87b0a26a8 SHA512 96362c9bbb514696850917627c10c08e4fa55787e317ecca5f917b27cdb113edbe9a3455f3f574a87c7407143084347e4a6a5787516dca1678949ac66cae6efd WHIRLPOOL c44411fe13ac45e834fbfb8174538d8054854290680774a6bf219620a6b22238f4e301c922166a1dae3001764a37bcc826f074096005713b6534c5e1f8c7ac16
+MISC ChangeLog 5362 SHA256 9be2e27936fff3ef6e8d70a77b14e01d6d5fef1a25dcf681671eb569d2b1d5e8 SHA512 f33fb56793fd3ac56a18163063ac044d23879f3acb0b03ccc7cc8b4817bea80d23b0447795ee35b10b552d3faaf17171640efeddf2e05c8805a8cc50287d0032 WHIRLPOOL b8227fd06a318d1986360d4e04e33a33b8c6ab4b6af76185e9db0cc11d123586d6ba532992232d0d154028d58241c09424b71d89c164b50d1539221fbc2f3cf2
 MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSZAWCAAoJELp701BxlEWfCw0P/3FCanQzHwq4+VCVskotXwq4
-gn48Wo69w1Lk/C4JZRycWIJutZOawjYmEeng2zQzmgYO1T/kjmw0OZxDLBpZl0ob
-F/+oxfZ9d0ri1f0lJIGvMwrrvaiKTzKfrMxbW+PX/sgU8ev44mGiNMbKLsPgkeVy
-774nG2wE01qyacipWYFqJHvjhWP0Rkj56AK0b3gm63IeAshc5F28xS2PkDulhPHp
-iKYiWD3PL7oJr+vhV9q4PUGVdKmKKK1u8VH3MHQ8WJlyQmHqRuGr8o/s74GOdIHP
-UiN2yRKVRZ1gCx21CK5sCOGsTG/A96cP3h7tEoriExYiW3Z6KwicbfcmXLGp4kB5
-EhGXpfUJlRvr7PMMwee7DiW/vyZy4XEIn7aA0Uq2wl53ffXeg9xfKbCc4yNVRAc7
-qEcUWyuf/i/GiG7xI+PjTVrsXTu88px0Ou/nPfW8CjM6uoulZlR6/rABaJRCFEa6
-4vu/9ZaxXyKDlyUOm3B85YmMre/wEX/tP4jXEat9UniqoqPWL66wBeIMREyDOTEv
-YVyqWiDJKKAWc+rJsusXtBy6mdrylBIOU5js/sINvlqv7uZCNVslvvMFSwJ2yRq5
-qpaQw5zSqrKP5ltdYE6iZWY4km71NLYO6AB/RHqC+F2cKFQqsYWF4vp3HINcELvn
-Iof/C4m3pz8FaLXtVPUv
-=KKIR
+iQEcBAEBCAAGBQJTG1MCAAoJEJWyH81tNOV9DFcIAMPsWV4YGQr0WppJe7tIpIHy
+6FhDjv/OzuTegoEnXTRlkRnUPYYO/JKjpSgNs1HMb0baZNIhdAAaf7wppMFOpjhd
+wEodHtkAF4XlYFRyt6E+Yh680hj6sYHRkvFzlimMae1HqTla0urV4h5pFJ97qfdE
+wc6BvE/RLdm5CcCPRqX9/EwPNQbgQ2GoNpYXjfbsxt0MkSl/KfpwsdpewaYDhxiu
+JiEUeEHsX3NwVd7GmqODQbwtcyl1LHTpFDWLuVIURGR97aPeNcoZ8R7O+ivk9mbT
+oaDbYlVSHnNMqwXWm4Gg/b9ygpjaJujm0Wmwv6hshPO/tBQV8Mo7SAr53qlzuSg=
+=0eCg
 -----END PGP SIGNATURE-----
diff --git a/dev-java/ant-jsch/ant-jsch-1.7.1.ebuild b/dev-java/ant-jsch/ant-jsch-1.7.1.ebuild
deleted file mode 100644
index 84df167aa7b6..000000000000
--- a/dev-java/ant-jsch/ant-jsch-1.7.1.ebuild
+++ /dev/null
@@ -1,13 +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-jsch/ant-jsch-1.7.1.ebuild,v 1.8 2011/12/31 12:07:43 sera Exp $
-
-EAPI=1
-
-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/jsch-0.1.37:0"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-jsch/ant-jsch-1.8.0.ebuild b/dev-java/ant-jsch/ant-jsch-1.8.0.ebuild
deleted file mode 100644
index 201806f489d4..000000000000
--- a/dev-java/ant-jsch/ant-jsch-1.8.0.ebuild
+++ /dev/null
@@ -1,13 +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-jsch/ant-jsch-1.8.0.ebuild,v 1.2 2011/12/31 12:07:44 sera Exp $
-
-EAPI=1
-
-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/jsch-0.1.37:0"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-jsch/ant-jsch-1.8.1.ebuild b/dev-java/ant-jsch/ant-jsch-1.8.1.ebuild
deleted file mode 100644
index 1275a87a4e6e..000000000000
--- a/dev-java/ant-jsch/ant-jsch-1.8.1.ebuild
+++ /dev/null
@@ -1,13 +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-jsch/ant-jsch-1.8.1.ebuild,v 1.8 2011/12/31 12:07:44 sera Exp $
-
-EAPI=1
-
-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/jsch-0.1.37:0"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/bsh/ChangeLog b/dev-java/bsh/ChangeLog
index 6b40c23907dd..1750eb8a85fc 100644
--- a/dev-java/bsh/ChangeLog
+++ b/dev-java/bsh/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/bsh
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/bsh/ChangeLog,v 1.60 2012/12/08 15:57:45 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bsh/ChangeLog,v 1.61 2014/03/08 17:31:23 tomwij Exp $
+
+  08 Mar 2014; Tom Wijsman <TomWij@gentoo.org> -bsh-2.0_beta4-r3.ebuild:
+  Remove old.
 
   08 Dec 2012; Agostino Sarubbo <ago@gentoo.org> bsh-2.0_beta4-r4.ebuild:
   Stable for ppc64, wrt bug #436564
@@ -229,4 +232,3 @@
   14 May 2003; Dylan Carlson <absinthe@gentoo.org> bsh-1.2-r7.ebuild,
   files/bsh.Console, files/bsh.Interpreter:
   Initial import.
-
diff --git a/dev-java/bsh/Manifest b/dev-java/bsh/Manifest
index 1656e14ae488..b45946f47c5d 100644
--- a/dev-java/bsh/Manifest
+++ b/dev-java/bsh/Manifest
@@ -1,8 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX bsh2-readline.patch 5428 SHA256 1816ace6e25bcd25940a4dc5213dd24bff9bf0708790a480a12f84a008c1ad47 SHA512 76a49ef383402a911439030a64a179167b3eaf08cf000ed21ddd1b470e6daeacd97367addf7945db62c68d5d71dc330ad44a7adf72b1ce669c05631d9fe70b27 WHIRLPOOL 246387357828edcf1d1f003ca1f51b88fb9bcd821253f542417caf25d972d44fc54ef54e0d4c786b9c4fe7051a53997766e2af1033871dc8eeb93d3e9c19dc72
 AUX bsh2.0b4-build.patch 1645 SHA256 b41a13782900fb8c5b9b847cb945d51fa6574b6634ff6e890549360ed05ab2df SHA512 b2562fe43a582461c61114d78df09fe5e916df34a0dd20219a2fb207279171208e5a0f845515673aac50714c143e0b6d61697b3a5220453118bee5c09efe48ba WHIRLPOOL ad241fc125357c4749511129eb81b0f82d8423d6c3b0c10034e04ee15d591bbb0ce29597c24805578902aeb8e69315500f85e6d6fcb555d1600927eebea603af
 DIST beanshell-icon.png 29784 SHA256 a3df458c6e892ec328e8865f081da8c3f3d9ff4c979ecb701a57fc7cedacdef9 SHA512 731cc0e39e69ef84230e2cea8f9eaf00f80b607c70d83f767d600d8f76fae024516e9b97a988bfcb1ad963da279a6b97ad2559bb8213dc9aaa23c65aa5946d45 WHIRLPOOL 018f8915426bb77bcb62e9f811a51436c6467e01b4d24fc4e2ddb92a3635c18ab1ba7f3154e74fdaccd1621a81b7fc735e53b7cb09caffcd8c103f5462e71e77
 DIST bsh-2.0b4-src.jar 1636723 SHA256 beaa29a8bcbd00db2563a5a9f0fdcfa8ae268e959880baef0a59167ff1729f8e SHA512 867e960420f8ad0f49ffa1c7cb291ddc64e75dc20f91bd33b91151e9ba96033250b94efbf8e3d4b8d4f8c7193017efcb88840536080809ecb45e2ee0fb8e9040 WHIRLPOOL 1dc8f6d3600ca22fbf993ccb6aafa3954b1d2127f0940cbe84468aa8f323ad69b02c2a3619435ee0e6e1024e1784e57e138f781314ac735f01b909629e074109
-EBUILD bsh-2.0_beta4-r3.ebuild 1741 SHA256 d788a1175546a0dea5973c23489545e9e9ae5622ada4ee7b024b30d2f658378c SHA512 b427da4e26fcbb9f54b7fc0535a8a7b6d125eb77556806cd4d581236403417163fe389c35674ff92a71ee61821fe985aeb681851119e92d98ae59954ec80b084 WHIRLPOOL bed45e4e7db03859197c046eb81bd36d165db247b0fa7e2b9359a7ee68a27d6a0e8f64925b4c11baf4095cf7cf8c43f10c17095aa9c1b32122020c4e6563eba1
 EBUILD bsh-2.0_beta4-r4.ebuild 1795 SHA256 22230c69d730ddbbfd96c6a790b281361cd47d7c99c6c910d58064c92f0acb86 SHA512 e23f62dc96507cde4e7713191993b07bbca0db1c35deb6e7be132ef972f6f53522530d551239f65040541b136827f41cc114bfe11227d15fdd56417332b0e8fd WHIRLPOOL 812646428812000c9beff133079d574fb1d37f538588c8ae8886efebdc6d27b705e637b49048b9658c62ad4356adbaa975ccaf918fd8b61aab5d36367b2d3fee
-MISC ChangeLog 7741 SHA256 c960948ed3909cd26243a6de544c91b60548015803dbd1a549b9fbdfba06fe1b SHA512 2309ebabaa1afae9fe6b935c8d18a8216c7ed691abc974fabfe25a387e9eafa90f11176d092fab86243e4554d1a495bbc6365c31000be796c716eaf5d4b9b0d4 WHIRLPOOL 6a85b1f6bd474789d0948b8c74f54d54c448d57941651535e4ae75c4dbff6d9a16ca47563ac3698a0535999f4167db47de0a7e350668c2f54278c4cc1ec97c54
+MISC ChangeLog 7831 SHA256 ef6cbf60b876e339cd35706cf2f595fdcd003aadaf11787d110da5e402bd8a0d SHA512 a5afea7349c59d9da2fce1c6df053eec1be7fc28d990352af40a573e243aa78dd7bc24a6ffeac4038d775b2851195d466cc261f51216d60839bc171d89c634c0 WHIRLPOOL 4a160349fb713f176cc5a9947721e848241543937d7692b9a2f6bbd5f31bb0875b4879d620760e8ea3385893c767891f332e69aa49a4071be7c03a6c262cf68b
 MISC metadata.xml 159 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb SHA512 74dc9ada199a90543b8e1c168c7054f2e973fbfa2551e2b959d67501f2538e269cfb4b2f0905a88a1afa04c20b33961336310ba876f80d47c8e7615b2d7c830a WHIRLPOOL a0ac49efeca233ec4d8f63eb69c8e46e1d4ecbd926693c25b1b8c7415e4c565680936aec46f0c4197116fd7a19a3bb571beee493c18bdae1e5e978e3db84f17a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQEcBAEBCAAGBQJTG1PKAAoJEJWyH81tNOV9k/cIAJXkI2elYKMLHqw5UcbcjwSl
+TYd74B0A2RE3DGU3q0eaRJWpV3ZOiEVb3rtFY5UnwVYckF0/0kKR1MopfOPEMNzq
+lm369sn3SGICUprQ+VqHV7+6zOZE9fVHH9mEjrj8buTEeyrfo8sCYzphDQfz95Jz
+/sfDUwq5SQsVjbqapTZWvJm3n6FqyKebm5HfVR6OOIRYuF2jLBeZPROndqtxKb15
+rYg9jJAV+hnfS/NuPdDdoBadUEgvTW0xF0EtBCIcE9mdah4Ory3++YnGDXLkD6W3
+rRdlORMPfsYHSuPikT90wEuXiPKNvu6SUZWOVFdzLR7JiTRWpuUpWJRSpqUrg+8=
+=t3EP
+-----END PGP SIGNATURE-----
diff --git a/dev-java/bsh/bsh-2.0_beta4-r3.ebuild b/dev-java/bsh/bsh-2.0_beta4-r3.ebuild
deleted file mode 100644
index b9e3341f45dc..000000000000
--- a/dev-java/bsh/bsh-2.0_beta4-r3.ebuild
+++ /dev/null
@@ -1,67 +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/bsh/bsh-2.0_beta4-r3.ebuild,v 1.9 2011/12/31 12:24:44 sera Exp $
-
-EAPI=1
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 eutils java-ant-2
-
-MY_PV=${PV/_beta/b}
-MY_DIST=${PN}-${MY_PV}-src.jar
-
-DESCRIPTION="BeanShell: A small embeddable Java source interpreter"
-HOMEPAGE="http://www.beanshell.org"
-SRC_URI="http://www.beanshell.org/${MY_DIST} mirror://gentoo/beanshell-icon.png"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="bsf readline"
-# some tests fail but ant doesn't fail
-RESTRICT="test"
-
-RDEPEND=">=virtual/jdk-1.4
-	dev-java/servletapi:2.4
-	readline? ( dev-java/libreadline-java:0 )"
-DEPEND="${RDEPEND}
-	bsf? ( dev-java/bsf:2.3 )"
-
-S=${WORKDIR}/BeanShell-${MY_PV}
-
-src_unpack() {
-	jar xf "${DISTDIR}"/${MY_DIST} || die "failed to unpack"
-	cd "${S}" || die
-
-	epatch "${FILESDIR}/bsh${MY_PV}-build.patch"
-
-	use readline && epatch "${FILESDIR}/bsh2-readline.patch"
-
-	cd lib || die
-	rm -v *.jar || die
-	java-pkg_jar-from servletapi-2.4
-	use readline && java-pkg_jar-from libreadline-java
-	use bsf && java-pkg_jar-from --build-only bsf-2.3
-}
-
-src_compile() {
-	eant $(use bsf && echo -Dexclude-bsf=) jarall $(use_doc)
-}
-
-src_test() {
-	eant test
-}
-
-src_install() {
-	java-pkg_newjar dist/${P/_beta/b}.jar
-
-	java-pkg_dolauncher bsh-console --main bsh.Console
-	java-pkg_dolauncher bsh-interpreter --main bsh.Interpreter
-
-	use doc && java-pkg_dojavadoc javadoc
-	use source && java-pkg_dosrc src/bsh
-
-	newicon "${DISTDIR}"/beanshell-icon.png beanshell.png
-
-	make_desktop_entry bsh-console "BeanShell Prompt" beanshell
-}
diff --git a/dev-java/jcharts/ChangeLog b/dev-java/jcharts/ChangeLog
index a7749e1b0d20..75109d329751 100644
--- a/dev-java/jcharts/ChangeLog
+++ b/dev-java/jcharts/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/jcharts
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jcharts/ChangeLog,v 1.12 2013/11/11 23:16:12 mr_bones_ Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jcharts/ChangeLog,v 1.13 2014/03/08 17:32:07 tomwij Exp $
+
+  08 Mar 2014; Tom Wijsman <TomWij@gentoo.org> -jcharts-0.7.5-r1.ebuild:
+  Remove old.
 
   11 Nov 2013; Michael Sterrett <mr_bones_@gentoo.org> jcharts-0.7.5-r2.ebuild:
   remove mention of really old slot 1.4
diff --git a/dev-java/jcharts/Manifest b/dev-java/jcharts/Manifest
index acae87c66006..beb9a7da8055 100644
--- a/dev-java/jcharts/Manifest
+++ b/dev-java/jcharts/Manifest
@@ -1,5 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST jCharts-0.7.5.zip 2499046 SHA256 add40a61a022f353421bfc578537871b7d716750896d689ada8ac294334956d6 SHA512 6b3da4f24cf6481d978a2ddda6db723b93c4fa966b536604ed2e9a6f238925c510eae59bb2cf1c11ea66cebf38292c880655aab4e09f6c8af3fcb4fbbbad92c1 WHIRLPOOL 26d00c4852ae00f4e605061b4c50f911a81856a198ab50af4547af12b73972ba8e23424d252fbcb65343f40e42b4c8b26cfec863442c66c372d21fb3a7db0bc4
-EBUILD jcharts-0.7.5-r1.ebuild 1352 SHA256 9964e3990fa8e5f9c690b89093e26d4326e493907680f10ae64a336d0c10943c SHA512 fe4b9ea7877d2056397512f8ddce219ba6de624d4d68e5c648f6b9e38f8df2725c6c2b8497eda51afbc3ee98e6b56e3ea051a077b83cdbe692dc93489979b626 WHIRLPOOL 55ed84267a243c8d5b2848c5269b21bba0c12f2c9bf15185dbcb15932b167e1457a7952c44415babb6d601791988cd20882ea4c6b6aa8a385ea022a45f85971d
 EBUILD jcharts-0.7.5-r2.ebuild 1392 SHA256 5bd96b446820f002c9eb5cdfb2c7825c0f616bb87c3afb5642a2851a233ddcf9 SHA512 16308d899d29c18982a13cc0fab24c2e48d910ecf73b982310faadb3c6c5cb2b26eb3c9fd3c826ed1f586bc2a74b8ac73ed146c135a9b9f45d96924d8aa31ef2 WHIRLPOOL 83a97853d05c8bc915b02821846ddbaa7896301d854798f5c08db071da4618ca2c4a056ab56c2a9b44d2b8086799c6b49f55bd99eb6849942834fc1362046740
-MISC ChangeLog 1694 SHA256 c9ed2342dd0e2664ff0ae2c498597bab5e317685f09ed127f3b51e03e3f8858d SHA512 31db63beeaf6e920600c173245d4613c388e4baa76d9957da58d485ef08669f5573ee2cc3265389621733ddc931bf76518dee7c9862470d000b812b4b8e1bd19 WHIRLPOOL 1617ae8478ce7dbd41052266dab040125fd92600cb1f03aff397b327e155652582f82c8e74453873cee0d90c3db04b6d4f61834f5e78045a2f9d3d483c74aeef
+MISC ChangeLog 1779 SHA256 c72e22bea4e17271df61b98306baa78432326016fb72f070cd730d4d5cd2044e SHA512 3b6d493e71801968eedfe2c3e4317b37e871fe291d3cd3474b7dc687b6c36146822803f2921210dc0038ca2c57c1c6240addd3a3eeeab538d8bc335245281ad8 WHIRLPOOL 5984fb0d78d3c7ff6ca76f3b6ccbe1fc6fc71a379fa43aa32066f0eb1795c506b4b539682dbf1291152f1440b4a6899607321f0fe745edd0f2a95ec895ae0fd7
 MISC metadata.xml 455 SHA256 148ca08bf90898d798fd8c6f047115ecd696909c3950f965d1d76f2b3c5a435b SHA512 04b01a3238673efa15fc1b3ca5d0923481e5f4cdcbd45416ee99002cfb0e296d2c893c1b05ab9a038e37b2324499bb536eff7d730b09ed3bbf5732dc1ba0c6d2 WHIRLPOOL a4b34f8245fcd12ff46fe1c231d0fcbd663fe0462128aec80e3a014db653dcb0d36deb2f5e99890b57873702f970d8c71fed89cf24e50f65332053016aa3097d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQEcBAEBCAAGBQJTG1P2AAoJEJWyH81tNOV9Ci0IAJruDuZOIxYq4g5PwCxt+uKu
+9VPNf9BtR9z4ELwDJHVD7KDpku/qyCxC2CHSWI2WnqFvAm3A2kVfB0QUi+45cruL
+IjGSSMaWp5aphFmNcHSQwuo8FfOHfZYilijSA9WuzqD9J2Crjc/tDwYhpUu0ivkz
+KaTAUKUsotUFG4O4oOkT0IhhN+JxpFEj4ikjsB+CuNbv4TS626/P0Ld/YKvJ5qlL
+kuyUx0b0KnhiK+4hDcfzmcpb+5kPMm9Mj72rAq+WxVGdg5t2328BZL93Rq7iG9Y+
++mH6wdElXv1cyYw7OxxyFVQ66BoBorbz0fIpFrhKjTMFJkMCPMq4JaIvI6B+J6w=
+=0f91
+-----END PGP SIGNATURE-----
diff --git a/dev-java/jcharts/jcharts-0.7.5-r1.ebuild b/dev-java/jcharts/jcharts-0.7.5-r1.ebuild
deleted file mode 100644
index 5625f3bdf2bc..000000000000
--- a/dev-java/jcharts/jcharts-0.7.5-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jcharts/jcharts-0.7.5-r1.ebuild,v 1.3 2009/09/05 22:26:05 maekke Exp $
-
-EAPI="1"
-JAVA_PKG_IUSE="doc examples source"
-
-inherit java-pkg-2 java-ant-2
-
-MY_P="jCharts-${PV}"
-DESCRIPTION="jCharts is a 100% Java based charting utility that outputs a variety of charts"
-HOMEPAGE="http://jcharts.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE=""
-
-COMMON_DEP="dev-java/batik:1.7
-			dev-java/servletapi:2.4"
-
-RDEPEND=">=virtual/jre-1.4
-		${COMMON_DEP}"
-
-DEPEND=">=virtual/jdk-1.4
-		${COMMON_DEP}
-		app-arch/unzip"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	rm -v *.{jar,war} lib/*.jar
-}
-
-_eant() {
-	cd build
-	local servletcp="$(java-pkg_getjars servletapi-2.4)"
-	eant ${1} \
-		-Dbatik.classpath="$(java-pkg_getjars batik-1.7):${servletcp}"
-}
-
-src_compile() {
-	# zip file includes javadocs and 1.6 fails to generate them so we just use
-	# the bundled ones
-	_eant jar
-}
-
-RESTRICT=test
-# tests need X11
-#src_test() {
-#	_eant test
-#}
-
-src_install() {
-	java-pkg_newjar build/*.jar
-	dohtml docs/*.html
-	use doc && java-pkg_dojavadoc javadocs
-	use source && java-pkg_dosrc src/org
-	use examples && java-pkg_doexamples demo
-}