Update xerces dep for upcoming 2.6 slotmove.

Package-Manager: portage-2.1.2_rc2-r3

47 files changed, 383 insertions, 1558 deletions

diff --git a/dev-java/adaptx/Manifest b/dev-java/adaptx/Manifest
index 96b291126e5f..c9c75af419f7 100644
--- a/dev-java/adaptx/Manifest
+++ b/dev-java/adaptx/Manifest
@@ -1,19 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST adaptx-20041105.gentoo.tar.bz2 332828 RMD160 e17a4d70d0296ac6781a80cc467ea3188eb74062 SHA1 cf6fcff1ae122171a7491ed830de4bf15fa2eb5d SHA256 f02c8d56c19e3e89608337a7bc210942b04788d213989ab55ebe1010d02cb53f
-EBUILD adaptx-0.9.13_p20041105-r1.ebuild 1313 RMD160 bffd4d82c5858022e8aab35b461ab1fc8f2bb4a3 SHA1 b56f02c741acafd24a7ce6b4ef1b1760bb24687b SHA256 b6dab3907b928ab582dadc28ad10a2f58e7687304509f37093583babb4f61659
-MD5 dfd987c0f9574a2ba4b54cc142c068f6 adaptx-0.9.13_p20041105-r1.ebuild 1313
-RMD160 bffd4d82c5858022e8aab35b461ab1fc8f2bb4a3 adaptx-0.9.13_p20041105-r1.ebuild 1313
-SHA256 b6dab3907b928ab582dadc28ad10a2f58e7687304509f37093583babb4f61659 adaptx-0.9.13_p20041105-r1.ebuild 1313
-EBUILD adaptx-0.9.13_p20041105-r2.ebuild 1372 RMD160 a74c47022580ad1dce2d23fa8a85b95e8cd39e3f SHA1 3f2f16e39963e57f33239fe2acbc9c7e1ee352c5 SHA256 c68c9f48f75b6a458b5331a944d0e2dd7df698ac058c2434b44e44c1b9a45a68
-MD5 2c8f3fc23b256d6a17bdd9d1a4633090 adaptx-0.9.13_p20041105-r2.ebuild 1372
-RMD160 a74c47022580ad1dce2d23fa8a85b95e8cd39e3f adaptx-0.9.13_p20041105-r2.ebuild 1372
-SHA256 c68c9f48f75b6a458b5331a944d0e2dd7df698ac058c2434b44e44c1b9a45a68 adaptx-0.9.13_p20041105-r2.ebuild 1372
-MISC ChangeLog 3045 RMD160 75f0adef0fcd96c85f57718690215aeb43da393c SHA1 f48df39118d0868c12b7bcb1b3baeb9e06fcd85b SHA256 4fc937a601d5bc3737392ae812cec391adb30fa498c1d024dbe35b382878144f
-MD5 a1deb768f006ac31edd3872eb3bdcf19 ChangeLog 3045
-RMD160 75f0adef0fcd96c85f57718690215aeb43da393c ChangeLog 3045
-SHA256 4fc937a601d5bc3737392ae812cec391adb30fa498c1d024dbe35b382878144f ChangeLog 3045
+EBUILD adaptx-0.9.13_p20041105-r1.ebuild 1311 RMD160 9b8a5352e8682625915f804c54fd3efb17c24809 SHA1 b7f176b00b6f031f904260efc24dd0959ae9d94c SHA256 bfe886507d0f079215174fc60b19670abfddb511df9e8774aabc098503ef0fa9
+MD5 10254a9c6d1592a13271b93be4a76cc4 adaptx-0.9.13_p20041105-r1.ebuild 1311
+RMD160 9b8a5352e8682625915f804c54fd3efb17c24809 adaptx-0.9.13_p20041105-r1.ebuild 1311
+SHA256 bfe886507d0f079215174fc60b19670abfddb511df9e8774aabc098503ef0fa9 adaptx-0.9.13_p20041105-r1.ebuild 1311
+EBUILD adaptx-0.9.13_p20041105-r2.ebuild 1370 RMD160 e3c284cf75f31df66bf02b1205115f56dcb79eb8 SHA1 247a32e2577c21f60b959f040f2f603e6e73f613 SHA256 4974934c4340a18280dd974c29d23aa33889f4192b3bd39ff69be792106e520b
+MD5 5d3859fe5561fcfc81a696c5da306bb7 adaptx-0.9.13_p20041105-r2.ebuild 1370
+RMD160 e3c284cf75f31df66bf02b1205115f56dcb79eb8 adaptx-0.9.13_p20041105-r2.ebuild 1370
+SHA256 4974934c4340a18280dd974c29d23aa33889f4192b3bd39ff69be792106e520b adaptx-0.9.13_p20041105-r2.ebuild 1370
+MISC ChangeLog 3214 RMD160 42dc2f9fa5ba9d86cdbe355ee11270a67f2bff96 SHA1 b70e62b1e27e8bfc51a1d67d427314b1f72cb143 SHA256 1e15260aeb758e3fecab11ec71ec63303d5bafda4b41823aeb80cdee84014e91
+MD5 5bca21ae3ad828f562d2feed712f215b ChangeLog 3214
+RMD160 42dc2f9fa5ba9d86cdbe355ee11270a67f2bff96 ChangeLog 3214
+SHA256 1e15260aeb758e3fecab11ec71ec63303d5bafda4b41823aeb80cdee84014e91 ChangeLog 3214
 MISC metadata.xml 309 RMD160 91f0a1c3b58ae951dfaa8444a6f1131df3fe792a SHA1 dbdf387a05d7b10a0eaf402e50eba9e540a20aaf SHA256 a070a1cd1fae94931b702a04c798598ea6ff216b5fe6cdd8efe3e729c40557b0
 MD5 df6f8fd3ce326006c25a07d492d95c37 metadata.xml 309
 RMD160 91f0a1c3b58ae951dfaa8444a6f1131df3fe792a metadata.xml 309
@@ -24,10 +21,3 @@ SHA256 02fa22c3a7b994071220cd69b65cd7665b91919529402994652f7ff3fd7db63d files/di
 MD5 9334e3bfc71a98ae16e88bb4367abcbc files/digest-adaptx-0.9.13_p20041105-r2 271
 RMD160 e3081e5113549377622b0ed6471817d1d1ad221a files/digest-adaptx-0.9.13_p20041105-r2 271
 SHA256 02fa22c3a7b994071220cd69b65cd7665b91919529402994652f7ff3fd7db63d files/digest-adaptx-0.9.13_p20041105-r2 271
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFFJR69KRy60XGEcJIRAqeaAJ9v6sWn+MYq1i3qbRtv6ZRE6AX1RACfZ7Iy
-qZT1MBaTD+YpcqSazlhggwI=
-=2/hr
------END PGP SIGNATURE-----
diff --git a/dev-java/ant-contrib/Manifest b/dev-java/ant-contrib/Manifest
index 02759e476747..c583adb80ef9 100644
--- a/dev-java/ant-contrib/Manifest
+++ b/dev-java/ant-contrib/Manifest
@@ -1,19 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST ant-contrib-1.0b2-src.tar.bz2 118216 RMD160 75a47ea59e6af1df723e48899b8e5cc124597573 SHA1 b93f62923922d9ec718239e4ecb3c1677c14a125 SHA256 29bdd00ee0df1d7b24e55b08bfff5641edf3f805e45a278641d42c0bf0ce9269
-EBUILD ant-contrib-1.0_beta2-r1.ebuild 1283 RMD160 b267b3e97c556d32ffb643a3de964e9c5135faed SHA1 907de9aa3b8ccd3c704f2df6330c4b66d7efcdd6 SHA256 e68a5cda05881d06bfc19ed216fbd9a8d539d8e589048987f55b02b8dc66e920
-MD5 700195ed75e4c2f14f2db73e9d464fe8 ant-contrib-1.0_beta2-r1.ebuild 1283
-RMD160 b267b3e97c556d32ffb643a3de964e9c5135faed ant-contrib-1.0_beta2-r1.ebuild 1283
-SHA256 e68a5cda05881d06bfc19ed216fbd9a8d539d8e589048987f55b02b8dc66e920 ant-contrib-1.0_beta2-r1.ebuild 1283
-EBUILD ant-contrib-1.0_beta2.ebuild 1317 RMD160 fbb498f5da97f8c275f7bc61c6c06137c51bd5ff SHA1 5209bce69044fe8892c2ca7a328af740341d7e59 SHA256 cc9a543bfc12d79982e47942dac6960b86d235a0a6c2fcc750efcf38284adf8e
-MD5 8decc711157f723f3322f313ccf7c430 ant-contrib-1.0_beta2.ebuild 1317
-RMD160 fbb498f5da97f8c275f7bc61c6c06137c51bd5ff ant-contrib-1.0_beta2.ebuild 1317
-SHA256 cc9a543bfc12d79982e47942dac6960b86d235a0a6c2fcc750efcf38284adf8e ant-contrib-1.0_beta2.ebuild 1317
-MISC ChangeLog 1897 RMD160 0c7298897f738b3f8126a07c1ac3472b47b560a4 SHA1 b79484c0df732b22f3c5597060c259443a43ee1c SHA256 5eb9297325976a83ac0abed8931a6b84b256dcd3008d3749b38741d3c8e49f79
-MD5 b3fe7b5b61aa71ec324630bcfb84d3e6 ChangeLog 1897
-RMD160 0c7298897f738b3f8126a07c1ac3472b47b560a4 ChangeLog 1897
-SHA256 5eb9297325976a83ac0abed8931a6b84b256dcd3008d3749b38741d3c8e49f79 ChangeLog 1897
+EBUILD ant-contrib-1.0_beta2-r1.ebuild 1279 RMD160 2a0e45429cd9fd1498fbc7013cb7d5adfbe418ff SHA1 34c1bb770ab42203c5e2aab18e3e01e6bda1a9ff SHA256 d2dfd4f61584aa0d4799083f3af6e02863e3b9c1513c015fd1bbb85a2b1c54b7
+MD5 09a2f3635269eaa5a45c7bd5c21e9386 ant-contrib-1.0_beta2-r1.ebuild 1279
+RMD160 2a0e45429cd9fd1498fbc7013cb7d5adfbe418ff ant-contrib-1.0_beta2-r1.ebuild 1279
+SHA256 d2dfd4f61584aa0d4799083f3af6e02863e3b9c1513c015fd1bbb85a2b1c54b7 ant-contrib-1.0_beta2-r1.ebuild 1279
+EBUILD ant-contrib-1.0_beta2.ebuild 1311 RMD160 0a784067f749cc4c5cc214caf2c5f22ec67ddf83 SHA1 8309a73b148fd065e947d22f8d2a208f4e0c7983 SHA256 9469e6d6844245aeba20c844e840f9812d00273083fbe38dc13459d51dde0014
+MD5 ba488fa93be822e473b4bd214f46751f ant-contrib-1.0_beta2.ebuild 1311
+RMD160 0a784067f749cc4c5cc214caf2c5f22ec67ddf83 ant-contrib-1.0_beta2.ebuild 1311
+SHA256 9469e6d6844245aeba20c844e840f9812d00273083fbe38dc13459d51dde0014 ant-contrib-1.0_beta2.ebuild 1311
+MISC ChangeLog 2059 RMD160 270f10df139ec97ddbb4b9115e53dbd2f20dfbc3 SHA1 e99ff2df60ca78241b00b0e4c596f6b992862fc7 SHA256 d05f32ae1702b08fcbab78b4fe639c361ea9337643e7dbbe5a53a7cf465a5c49
+MD5 d224c80eced1c11d8b93cb345ae8661c ChangeLog 2059
+RMD160 270f10df139ec97ddbb4b9115e53dbd2f20dfbc3 ChangeLog 2059
+SHA256 d05f32ae1702b08fcbab78b4fe639c361ea9337643e7dbbe5a53a7cf465a5c49 ChangeLog 2059
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
@@ -24,10 +21,3 @@ SHA256 bcea7aa4dc2e733d733b03643cc2955c7e91f761e8ee82c56e55dd8c49a209c4 files/di
 MD5 a1efe17f9c88aa58d63072ac53c0f94c files/digest-ant-contrib-1.0_beta2-r1 268
 RMD160 51de18e8f2ce7da67489214bd131f0ebee6d7495 files/digest-ant-contrib-1.0_beta2-r1 268
 SHA256 bcea7aa4dc2e733d733b03643cc2955c7e91f761e8ee82c56e55dd8c49a209c4 files/digest-ant-contrib-1.0_beta2-r1 268
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFBCvrgo/w9rxVVVERAh6MAJ9CBRgYeEmYTZUy0nmxcCIs1m3a4gCfan/o
-sv6oDd0+qMbnBVse0xracIg=
-=g6S+
------END PGP SIGNATURE-----
diff --git a/dev-java/aspectj/Manifest b/dev-java/aspectj/Manifest
index bd4209f75079..c8fdab1f34fd 100644
--- a/dev-java/aspectj/Manifest
+++ b/dev-java/aspectj/Manifest
@@ -32,22 +32,22 @@ EBUILD aspectj-1.1.1.ebuild 2358 RMD160 2311f0ca250e69acfd2695e1b9cb50b12e9d2c8c
 MD5 7e80d3b8d68ab9162097a68b797aacd3 aspectj-1.1.1.ebuild 2358
 RMD160 2311f0ca250e69acfd2695e1b9cb50b12e9d2c8c aspectj-1.1.1.ebuild 2358
 SHA256 e283c6c1b52d2e1ae6dc81dffe1977bb1c41b2ae3bcc881e965e8203f05dba3a aspectj-1.1.1.ebuild 2358
-EBUILD aspectj-1.2-r1.ebuild 3057 RMD160 097b9a70a7a8576155f2eee7ab7171f73e3664cc SHA1 a5f2881127763403bcd1d2fa79e53bf3285e5bea SHA256 46093cb210bbfb1dd104d88fe9e2e56315636e1186858d3070add44d9596daab
-MD5 f94e65d3ae725739cb4a367d87304057 aspectj-1.2-r1.ebuild 3057
-RMD160 097b9a70a7a8576155f2eee7ab7171f73e3664cc aspectj-1.2-r1.ebuild 3057
-SHA256 46093cb210bbfb1dd104d88fe9e2e56315636e1186858d3070add44d9596daab aspectj-1.2-r1.ebuild 3057
-EBUILD aspectj-1.2-r2.ebuild 3031 RMD160 0e18697b9a49e1b662b476a39cad791deac55f4c SHA1 592132bbc9989c8af54ab4934f328b5612a59f52 SHA256 67d2c8cafbc3ee5078e3519b656401cc4528d20073eb463b5b8d5a16d4117775
-MD5 0d447e06e894ab79ef4bbcca030f8d17 aspectj-1.2-r2.ebuild 3031
-RMD160 0e18697b9a49e1b662b476a39cad791deac55f4c aspectj-1.2-r2.ebuild 3031
-SHA256 67d2c8cafbc3ee5078e3519b656401cc4528d20073eb463b5b8d5a16d4117775 aspectj-1.2-r2.ebuild 3031
+EBUILD aspectj-1.2-r1.ebuild 3058 RMD160 656f498892532be95f8da6315b885241bc4ac76f SHA1 641407a8a08efe3dfd3c8218d85619dc2f0b0f5a SHA256 1b5e1f3bf250a12e35651a72a39574feb3f1d32c715cbe38ecce7e4443cb4546
+MD5 f64c17a29628346a22447a600482e417 aspectj-1.2-r1.ebuild 3058
+RMD160 656f498892532be95f8da6315b885241bc4ac76f aspectj-1.2-r1.ebuild 3058
+SHA256 1b5e1f3bf250a12e35651a72a39574feb3f1d32c715cbe38ecce7e4443cb4546 aspectj-1.2-r1.ebuild 3058
+EBUILD aspectj-1.2-r2.ebuild 3033 RMD160 358d92af2d38b25e1d0eba11020335016c876b51 SHA1 1b37091717e38db9f07bdcff501b19da78dac227 SHA256 8bcfd2ed109c3ded5d76eb6ed7ba9e0ff6a1ba1b9cd64264a8f82e36da8e6619
+MD5 c45fa974b4a72d9a52e2b77f5cb273d1 aspectj-1.2-r2.ebuild 3033
+RMD160 358d92af2d38b25e1d0eba11020335016c876b51 aspectj-1.2-r2.ebuild 3033
+SHA256 8bcfd2ed109c3ded5d76eb6ed7ba9e0ff6a1ba1b9cd64264a8f82e36da8e6619 aspectj-1.2-r2.ebuild 3033
 EBUILD aspectj-1.2.ebuild 2383 RMD160 bef8b1d57c0b9e36d4f60d94de6c0cef8e68e028 SHA1 cc2a53112acf2a0577546ce6ebe3ee8811700041 SHA256 796a565d5b5cd3f10bbef89f4498474010183f7173da90d8d2691cffd139001e
 MD5 5f80accb3c4baa44ed55ccfa8c0f08f3 aspectj-1.2.ebuild 2383
 RMD160 bef8b1d57c0b9e36d4f60d94de6c0cef8e68e028 aspectj-1.2.ebuild 2383
 SHA256 796a565d5b5cd3f10bbef89f4498474010183f7173da90d8d2691cffd139001e aspectj-1.2.ebuild 2383
-MISC ChangeLog 2172 RMD160 8690bd696d704996d28d39e8b34e63be048c744e SHA1 7021ce840a23c5414217a3ec81f5ac79070449a7 SHA256 c91cfebb65e8c3a5b0602aba30d4b0a5191e2da95b0543ea343371b4e60be520
-MD5 cd0adb2e99cc1e1c23f2fc52891880a4 ChangeLog 2172
-RMD160 8690bd696d704996d28d39e8b34e63be048c744e ChangeLog 2172
-SHA256 c91cfebb65e8c3a5b0602aba30d4b0a5191e2da95b0543ea343371b4e60be520 ChangeLog 2172
+MISC ChangeLog 2319 RMD160 ef9307524d652a08efb18aa2ca075f8ce5284c86 SHA1 22509d6f53835b7aa931dc302a22f52fb08c59a7 SHA256 b6709d40cf00e7a7a328c40578e21e57157a8e08a0b401c428f51ad3953a8a87
+MD5 c4883e28451af2a9bc57d839f24f1dea ChangeLog 2319
+RMD160 ef9307524d652a08efb18aa2ca075f8ce5284c86 ChangeLog 2319
+SHA256 b6709d40cf00e7a7a328c40578e21e57157a8e08a0b401c428f51ad3953a8a87 ChangeLog 2319
 MISC metadata.xml 663 RMD160 770e21ab0069ea0f04dc4aa3b6a0746362d12c03 SHA1 f473d1fee9dec03ef5360ff45ad0ddb1de1db4c8 SHA256 3365a2c3312e74be120776989cd689f04ab7e2bc7dbc8bf759fb42e7f1d197b8
 MD5 72ba0dd87abe126d73774a74b1b4cbb1 metadata.xml 663
 RMD160 770e21ab0069ea0f04dc4aa3b6a0746362d12c03 metadata.xml 663
diff --git a/dev-java/classworlds/Manifest b/dev-java/classworlds/Manifest
index 2f89053328d6..b76ddc5da1a3 100644
--- a/dev-java/classworlds/Manifest
+++ b/dev-java/classworlds/Manifest
@@ -1,15 +1,20 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 3ce4edd31e6f8be6133582ed93fdbbb7 ChangeLog 1668
-MD5 443d1785fe21d3269259206558d11a59 classworlds-1.0-r2.ebuild 1189
+AUX build-1.0.xml 5852 RMD160 4afd1d3c17273fee4a128b9b0a7ce44bcd365cff SHA1 ffab965853d6d3d10f6f29ab1b41e1f7a8ef7cd1 SHA256 4fe5cdb8c13fb1bb8c410ab9b1b943e677f7a4279ce972337699fe32e90bc53f
 MD5 c8530f78dd3e23e4967723a10415c7b8 files/build-1.0.xml 5852
-MD5 65ee55fedb5b26dee5df9c665d297a12 files/digest-classworlds-1.0-r2 70
+RMD160 4afd1d3c17273fee4a128b9b0a7ce44bcd365cff files/build-1.0.xml 5852
+SHA256 4fe5cdb8c13fb1bb8c410ab9b1b943e677f7a4279ce972337699fe32e90bc53f files/build-1.0.xml 5852
+DIST classworlds-1.0-src.tar.gz 32611
+EBUILD classworlds-1.0-r2.ebuild 1189 RMD160 ed4d95ed91732147c70165bacadc9fe15ec9bdc5 SHA1 e601b9f4af4475a61de73a94211dcb19190c8ac8 SHA256 2774621d8b2df960250746c9f6ffa19761d41f774b69ca8811adb05b0d4e4a93
+MD5 2885689b658a287a5aa02b293bb091f1 classworlds-1.0-r2.ebuild 1189
+RMD160 ed4d95ed91732147c70165bacadc9fe15ec9bdc5 classworlds-1.0-r2.ebuild 1189
+SHA256 2774621d8b2df960250746c9f6ffa19761d41f774b69ca8811adb05b0d4e4a93 classworlds-1.0-r2.ebuild 1189
+MISC ChangeLog 1796 RMD160 c52fefb51a2adbfab5f131f42d7ec47b2b417f1f SHA1 fbd40cc665c762c949cb85ac6cc137761ce11357 SHA256 af9b91699d2a2170724438e77003211eb22c6b80bcd40dbb3230c0cd1cfce394
+MD5 44793dac701739a28c4d4b43821b6075 ChangeLog 1796
+RMD160 c52fefb51a2adbfab5f131f42d7ec47b2b417f1f ChangeLog 1796
+SHA256 af9b91699d2a2170724438e77003211eb22c6b80bcd40dbb3230c0cd1cfce394 ChangeLog 1796
+MISC metadata.xml 1546 RMD160 390d9ba89b8da6918ac1faf13509fd3ce6011e0e SHA1 3892e02eff4589807d7e9727ffd1155069450b7d SHA256 cae22b520ce9c4f505844891c1cbfac80e7abf4e0337ce54df2f0dc18acaaf64
 MD5 dc6ad4755e0695dd9a2a898624e16b7c metadata.xml 1546
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDnICsndWRXhKOboURAk/EAJ4imWbyFXHSTrU01Pmmis0szrVMTACgwLFq
-jl0FWfQeXurJyWEvED4WlVc=
-=p0E3
------END PGP SIGNATURE-----
+RMD160 390d9ba89b8da6918ac1faf13509fd3ce6011e0e metadata.xml 1546
+SHA256 cae22b520ce9c4f505844891c1cbfac80e7abf4e0337ce54df2f0dc18acaaf64 metadata.xml 1546
+MD5 65ee55fedb5b26dee5df9c665d297a12 files/digest-classworlds-1.0-r2 70
+RMD160 38c8de1bd01683ea31b44bbefcccf65a83b69d3d files/digest-classworlds-1.0-r2 70
+SHA256 63624754a841eea3cbadf5786f4ed6529f18c664e1dde652834684228ba7e117 files/digest-classworlds-1.0-r2 70
diff --git a/dev-java/commons-betwixt/Manifest b/dev-java/commons-betwixt/Manifest
index 8571744d66e2..5f42437aaaa1 100644
--- a/dev-java/commons-betwixt/Manifest
+++ b/dev-java/commons-betwixt/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX commons-betwixt-0.6-noget.patch 980 RMD160 4949187d6428dfc3798c8638cb709c8be99a15cc SHA1 1d9c0e791998da306470cc2778d397d3830bd313 SHA256 57a9424247b285e281bbf8a9db29899b75f5053c36dd07a73edcdc8df10a86fc
 MD5 3b892742ca91101232da276492fa254c files/commons-betwixt-0.6-noget.patch 980
 RMD160 4949187d6428dfc3798c8638cb709c8be99a15cc files/commons-betwixt-0.6-noget.patch 980
@@ -19,18 +16,14 @@ EBUILD commons-betwixt-0.6-r2.ebuild 1328 RMD160 35bcd3dd86eff49b26a1e28be55f025
 MD5 3401f35169ea73b5b0458dc583ed3877 commons-betwixt-0.6-r2.ebuild 1328
 RMD160 35bcd3dd86eff49b26a1e28be55f025350efe7df commons-betwixt-0.6-r2.ebuild 1328
 SHA256 772caff348e00b0a534b397366a3c89e190aed09d3b01fcbfeafd37dd99407f5 commons-betwixt-0.6-r2.ebuild 1328
-EBUILD commons-betwixt-0.7-r1.ebuild 1659 RMD160 4dd6814585599860d0adfb973a7aa79d91f16776 SHA1 7798a21ce75fcc5caec10442dab349b2035e3b54 SHA256 b9466e4d87ecbb9abddf380fc0e71b274b090be28f8009a52bb00dd4c487db51
-MD5 0f28f22ef3f8beb3da6c3423f7c1696d commons-betwixt-0.7-r1.ebuild 1659
-RMD160 4dd6814585599860d0adfb973a7aa79d91f16776 commons-betwixt-0.7-r1.ebuild 1659
-SHA256 b9466e4d87ecbb9abddf380fc0e71b274b090be28f8009a52bb00dd4c487db51 commons-betwixt-0.7-r1.ebuild 1659
-EBUILD commons-betwixt-0.7.ebuild 1815 RMD160 81903cff3252aaded4aa6dd915099616f274aa0d SHA1 4751e43ced94d6f4d931c100b560f389dc2deff2 SHA256 f533fc48d81e4699f8ffc79f696784e8704e45180a29d660c29ccdda6ef86284
-MD5 99bc76040f49977d74d5afc8786d4bdf commons-betwixt-0.7.ebuild 1815
-RMD160 81903cff3252aaded4aa6dd915099616f274aa0d commons-betwixt-0.7.ebuild 1815
-SHA256 f533fc48d81e4699f8ffc79f696784e8704e45180a29d660c29ccdda6ef86284 commons-betwixt-0.7.ebuild 1815
-MISC ChangeLog 1546 RMD160 ee00df8954e9b151fb7be6b981838d57cd2d6cb1 SHA1 09dfa7de55482cab709c4dbd97fdc694d6ed642a SHA256 ba2e441526f36e3fcf0946da01c5fa53ae2b56a2749a88f1f5532cf94fe6fb77
-MD5 ffa74897d88b82543405f4e89d9e5f1c ChangeLog 1546
-RMD160 ee00df8954e9b151fb7be6b981838d57cd2d6cb1 ChangeLog 1546
-SHA256 ba2e441526f36e3fcf0946da01c5fa53ae2b56a2749a88f1f5532cf94fe6fb77 ChangeLog 1546
+EBUILD commons-betwixt-0.7-r1.ebuild 1667 RMD160 fab6d6a1a3cb6995bf4982989e1e43a06ccd985f SHA1 bd5cdcecfdfe4a826a5d81deca802f8e780a27d0 SHA256 40013fc88e8ba45dcb32a9c89e9b02d2c92bd7d86c55c2af033a0d11fe16ad33
+MD5 d2ac1b24433c8b0760059c334417afa8 commons-betwixt-0.7-r1.ebuild 1667
+RMD160 fab6d6a1a3cb6995bf4982989e1e43a06ccd985f commons-betwixt-0.7-r1.ebuild 1667
+SHA256 40013fc88e8ba45dcb32a9c89e9b02d2c92bd7d86c55c2af033a0d11fe16ad33 commons-betwixt-0.7-r1.ebuild 1667
+MISC ChangeLog 1705 RMD160 caebeac5c92f11cdca17cbaac192603e37d4247c SHA1 2f74ab993ac83c695e88a26c60fd17387b062708 SHA256 4b8ba4067749ea5a4638827d4dfef74339ff74ec587a60ca810bbe88971bd907
+MD5 13aff80705f810cfc3d1fb3e0a2b3081 ChangeLog 1705
+RMD160 caebeac5c92f11cdca17cbaac192603e37d4247c ChangeLog 1705
+SHA256 4b8ba4067749ea5a4638827d4dfef74339ff74ec587a60ca810bbe88971bd907 ChangeLog 1705
 MISC metadata.xml 739 RMD160 edcd9c21a2f7c3e48b4034dd1ea6e7ec5c9cdfe1 SHA1 9f1dcc20b346cb18d0f227369950afd9e09bdd90 SHA256 e3cb2eb0555c443124a02abcdc02dc70d5e83d1c0832c4c74b0c2bc2c146d8fc
 MD5 1eb638c237e8835b9fe6b49a60e42d9d metadata.xml 739
 RMD160 edcd9c21a2f7c3e48b4034dd1ea6e7ec5c9cdfe1 metadata.xml 739
@@ -41,16 +34,6 @@ SHA256 b60755478baf45b6023875a01cbbcd393978f7adea964c82413a94184b35afc3 files/di
 MD5 93a42860da538facd3680c14c7aea8c1 files/digest-commons-betwixt-0.6-r2 271
 RMD160 ef7439668e2c2f6a2171ed282a83550c160a5ac2 files/digest-commons-betwixt-0.6-r2 271
 SHA256 b60755478baf45b6023875a01cbbcd393978f7adea964c82413a94184b35afc3 files/digest-commons-betwixt-0.6-r2 271
-MD5 6a72c000879b0ae6767c6f2bdbd0d0fc files/digest-commons-betwixt-0.7 271
-RMD160 622a3f55fef0e4cf5ff209c03cd4ee327d644f63 files/digest-commons-betwixt-0.7 271
-SHA256 1b94a3f2d5b3c9267c125c5bd1d2845d61ff6144c6ee537695e20b2f29b9c6a6 files/digest-commons-betwixt-0.7 271
 MD5 6a72c000879b0ae6767c6f2bdbd0d0fc files/digest-commons-betwixt-0.7-r1 271
 RMD160 622a3f55fef0e4cf5ff209c03cd4ee327d644f63 files/digest-commons-betwixt-0.7-r1 271
 SHA256 1b94a3f2d5b3c9267c125c5bd1d2845d61ff6144c6ee537695e20b2f29b9c6a6 files/digest-commons-betwixt-0.7-r1 271
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
-
-iD8DBQFEwpqPgo/w9rxVVVERAkMRAJ9wuifflAFKO/J3wD7A0eOQYxgLTACdEfqn
-V/RPo21N//M6FqCbldJZfvg=
-=wSv2
------END PGP SIGNATURE-----
diff --git a/dev-java/commons-betwixt/commons-betwixt-0.7.ebuild b/dev-java/commons-betwixt/commons-betwixt-0.7.ebuild
deleted file mode 100644
index 184fee6e11f0..000000000000
--- a/dev-java/commons-betwixt/commons-betwixt-0.7.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-betwixt/commons-betwixt-0.7.ebuild,v 1.1 2005/12/15 05:20:14 nichoj Exp $
-
-inherit java-pkg eutils
-
-DESCRIPTION="Introspective Bean to XML mapper"
-HOMEPAGE="http://jakarta.apache.org/commons/betwixt/"
-SRC_URI="mirror://apache/jakarta/commons/betwixt/source/${P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0.7"
-KEYWORDS="~amd64 ~x86 ~ppc"
-IUSE="doc jikes test source"
-
-RDEPEND=">=virtual/jre-1.3
-	>=dev-java/commons-logging-1.0.2
-	=dev-java/commons-beanutils-1.7*
-	>=dev-java/commons-digester-1.6"
-DEPEND=">=virtual/jdk-1.3
-	${RDEPEND}
-	dev-java/ant-core
-	jikes? ( >=dev-java/jikes-1.21 )
-	test? ( dev-java/ant-tasks >=dev-java/xerces-2.6 )
-	source? ( app-arch/zip )"
-
-S="${WORKDIR}/${P}-src/"
-
-src_unpack() {
-	unpack ${A}
-
-	epatch ${FILESDIR}/${P}-notests.patch
-
-	cd ${S}
-	mkdir -p ${S}/target/lib && cd ${S}/target/lib
-	java-pkg_jar-from commons-beanutils-1.7
-	java-pkg_jar-from commons-digester
-	java-pkg_jar-from commons-logging
-	use test && java-pkg_jar-from xerces-2
-}
-
-src_compile() {
-	local antflags="init jar -Dnoget=true -Dnotest=true"
-	use doc && antflags="${antflags} javadoc"
-	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-	ant ${antflags} || die "compile failed"
-}
-
-src_install() {
-	java-pkg_newjar target/${PN}*.jar ${PN}.jar
-
-	dodoc RELEASE-NOTES.txt README.txt
-	if use doc; then
-		java-pkg_dohtml PROPOSAL.html STATUS.html userguide.html
-		java-pkg_dohtml -r dist/docs/
-	fi
-	use source && java-pkg_dosrc src/java/*
-}
-
-src_test() {
-	if ! use test; then
-		ewarn "You must USE=test in order to get the dependencies needed"
-		ewarn "to run tests"
-		ewarn "Skipping the tests"
-	else
-		ant test -Dnoget=true || die "tests failed"
-	fi
-}
diff --git a/dev-java/commons-betwixt/files/digest-commons-betwixt-0.7 b/dev-java/commons-betwixt/files/digest-commons-betwixt-0.7
deleted file mode 100644
index 861939cd0330..000000000000
--- a/dev-java/commons-betwixt/files/digest-commons-betwixt-0.7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 fcaa0e85a10f395128093095e778a3f2 commons-betwixt-0.7-src.tar.gz 278140
-RMD160 f101052ed9851ab5284751ed76d8f2cc7f929185 commons-betwixt-0.7-src.tar.gz 278140
-SHA256 6b1adcfb0f573fe29b2440e87733ef176c07c0193f3f69587481772b3af148e4 commons-betwixt-0.7-src.tar.gz 278140
diff --git a/dev-java/commons-jelly/Manifest b/dev-java/commons-jelly/Manifest
index 91ddbab3a0b3..c4011ccf6af0 100644
--- a/dev-java/commons-jelly/Manifest
+++ b/dev-java/commons-jelly/Manifest
@@ -1,37 +1,20 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX commons-jelly-1.0-gentoo.patch 2224 RMD160 ab9179ac39196b1dbe6fc8f9bffdc498ad363697 SHA1 9509b52e2841561c7ee50ff2bc96884764a4d55b SHA256 0e064c87ae4a2a91f7c98c546e0f3bf9f9ff4caf877e0c2f28a6b3443e6f3533
 MD5 54a1c7c1840da66a583e5ec54ddb94c1 files/commons-jelly-1.0-gentoo.patch 2224
 RMD160 ab9179ac39196b1dbe6fc8f9bffdc498ad363697 files/commons-jelly-1.0-gentoo.patch 2224
 SHA256 0e064c87ae4a2a91f7c98c546e0f3bf9f9ff4caf877e0c2f28a6b3443e6f3533 files/commons-jelly-1.0-gentoo.patch 2224
 DIST commons-jelly-1.0-src.tar.gz 174769 RMD160 c273e80fb10327a833d192e89500a08302d68c58 SHA1 a0aedfa7ce69288277cc3c06b1d832a7a97affe5 SHA256 113d606361845d08dab69f187690bf5dcfb5e9ca8fab780135898eb6d0a8d7d1
-EBUILD commons-jelly-1.0-r1.ebuild 1898 RMD160 43ee480517abbcae4bdc1da60a065c8b8366e662 SHA1 6558aa8ebe3e2ca5c511469b6dee2320eacdc58d SHA256 3dbf881a75758003559babde9060ab582937b91be67709acd7a1ab523027d861
-MD5 b63a09b1927b5d236335860853a4446d commons-jelly-1.0-r1.ebuild 1898
-RMD160 43ee480517abbcae4bdc1da60a065c8b8366e662 commons-jelly-1.0-r1.ebuild 1898
-SHA256 3dbf881a75758003559babde9060ab582937b91be67709acd7a1ab523027d861 commons-jelly-1.0-r1.ebuild 1898
-EBUILD commons-jelly-1.0.ebuild 1912 RMD160 fb49e4b0ddfd39a1b294740aa53df8f6235375d3 SHA1 c51e2c5b16b40014ac76474d5862566e2092a5f6 SHA256 0b4f435990a4042921b0bed0c5e53bd14fe2fd19a862e0421999e2fb2887411c
-MD5 25f1e32b94f4ec1da6e6a66f55a4dc55 commons-jelly-1.0.ebuild 1912
-RMD160 fb49e4b0ddfd39a1b294740aa53df8f6235375d3 commons-jelly-1.0.ebuild 1912
-SHA256 0b4f435990a4042921b0bed0c5e53bd14fe2fd19a862e0421999e2fb2887411c commons-jelly-1.0.ebuild 1912
-MISC ChangeLog 684 RMD160 5bc507e4e478b839cca6e641979c9922c7053ffd SHA1 7c5012f0579bcd4fd4190e840ed904a050852860 SHA256 6b421ba4a2f6a2532ef9e30a91224f98f4206bc502c62c5f43817093cf0aca59
-MD5 5301aa68933584fb410d7bd079d55d13 ChangeLog 684
-RMD160 5bc507e4e478b839cca6e641979c9922c7053ffd ChangeLog 684
-SHA256 6b421ba4a2f6a2532ef9e30a91224f98f4206bc502c62c5f43817093cf0aca59 ChangeLog 684
+EBUILD commons-jelly-1.0-r1.ebuild 1898 RMD160 f692169d675ffb1be0dbb35ce5db62638c277afe SHA1 857cc351ce5b568e5f6039db9a76f6df6c681b63 SHA256 0586c7ef99e7210861e23ef0c69c9facb3926f61f89837f45c5e7fdd183e1c66
+MD5 64a0edee5788d4145655c8e0c49a63d5 commons-jelly-1.0-r1.ebuild 1898
+RMD160 f692169d675ffb1be0dbb35ce5db62638c277afe commons-jelly-1.0-r1.ebuild 1898
+SHA256 0586c7ef99e7210861e23ef0c69c9facb3926f61f89837f45c5e7fdd183e1c66 commons-jelly-1.0-r1.ebuild 1898
+MISC ChangeLog 839 RMD160 6c55b312c2bd38e6f68bd4706cde0eec7d6fc112 SHA1 acdd17e857c1042d2ce775641dd368385f1f9aea SHA256 bd5d1faeabdbc743a642dcaa232a376e3202eeea5d0ff4f7cdc7dc5eb9e8f489
+MD5 13cb44dd2d28f933b99c6a750b0f7d1b ChangeLog 839
+RMD160 6c55b312c2bd38e6f68bd4706cde0eec7d6fc112 ChangeLog 839
+SHA256 bd5d1faeabdbc743a642dcaa232a376e3202eeea5d0ff4f7cdc7dc5eb9e8f489 ChangeLog 839
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 metadata.xml 157
-MD5 3744be2052ab79799a9e41563ba89d34 files/digest-commons-jelly-1.0 265
-RMD160 038eb778e7c03b78590531801634d23690eaa86d files/digest-commons-jelly-1.0 265
-SHA256 f60bf1dba04b835d8f1c15d2a3ca7034489e1364e604ee8f0df384485808529c files/digest-commons-jelly-1.0 265
 MD5 3744be2052ab79799a9e41563ba89d34 files/digest-commons-jelly-1.0-r1 265
 RMD160 038eb778e7c03b78590531801634d23690eaa86d files/digest-commons-jelly-1.0-r1 265
 SHA256 f60bf1dba04b835d8f1c15d2a3ca7034489e1364e604ee8f0df384485808529c files/digest-commons-jelly-1.0-r1 265
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
-
-iD8DBQFEwqzMgo/w9rxVVVERAjWWAJsFcq4oCJ8Oj7Vg0ExRhErM6NGfuACcDVWq
-TeX5SdeAPdExuph+se06WPY=
-=xBW6
------END PGP SIGNATURE-----
diff --git a/dev-java/commons-jelly/commons-jelly-1.0.ebuild b/dev-java/commons-jelly/commons-jelly-1.0.ebuild
deleted file mode 100644
index f1830c19ced8..000000000000
--- a/dev-java/commons-jelly/commons-jelly-1.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jelly/commons-jelly-1.0.ebuild,v 1.3 2006/06/07 18:49:09 nichoj Exp $
-
-inherit java-pkg eutils
-
-MY_P="${P}-src"
-DESCRIPTION="A Java and XML based scripting and processing engine"
-HOMEPAGE="http://jakarta.apache.org/commons/jelly/"
-SRC_URI="mirror://apache/jakarta/commons/jelly/source/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="~x86"
-IUSE="doc jikes test source"
-
-RDEPEND=">=virtual/jre-1.4
-	~dev-java/servletapi-2.3
-	=dev-java/commons-cli-1*
-	dev-java/commons-lang
-	dev-java/commons-discovery
-	dev-java/forehead
-	dev-java/jakarta-jstl
-	=dev-java/commons-jexl-1.0*
-	=dev-java/commons-beanutils-1.6*
-	dev-java/commons-collections
-	=dev-java/dom4j-1*
-	=dev-java/jaxen-1.1*
-	=dev-java/xerces-2*"
-
-DEPEND=">=virtual/jdk-1.4
-	dev-java/ant-core
-	jikes? ( dev-java/jikes )
-	test? (
-		dev-java/junit
-		dev-java/ant-tasks
-		dev-java/commons-logging
-	)
-	${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	# disables dependency fetching, and remove tests as a dependency of jar
-	epatch ${FILESDIR}/${P}-gentoo.patch
-
-	mkdir -p ${S}/lib
-	cd ${S}/lib
-	java-pkg_jar-from servletapi-2.3,commons-cli-1,commons-lang
-	java-pkg_jar-from commons-discovery,forehead,jakarta-jstl,commons-jexl-1.0
-	java-pkg_jar-from commons-beanutils-1.6,commons-collections
-	java-pkg_jar-from dom4j-1,jaxen-1.1,xerces-2
-
-	if use test; then
-		java-pkg_jar-from commons-logging
-	fi
-}
-
-src_compile() {
-	local antflags="-Dlibdir=lib jar"
-	use doc && antflags="${antflags} javadoc"
-	use test && antflags="${antflags} test"
-
-	ant ${antflags} || die "Ant failed"
-}
-
-src_install() {
-	java-pkg_newjar target/${P}.jar ${PN}.jar
-
-	dodoc NOTICE.txt README.txt RELEASE-NOTES.txt
-
-	use doc && java-pkg_dohtml -r dist/docs/api
-	use source && java-pkg_dosrc src/java/*
-}
diff --git a/dev-java/commons-jelly/files/digest-commons-jelly-1.0 b/dev-java/commons-jelly/files/digest-commons-jelly-1.0
deleted file mode 100644
index c5964f16afb6..000000000000
--- a/dev-java/commons-jelly/files/digest-commons-jelly-1.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d8c62cf844ca7ad8b6f34366eb2233c1 commons-jelly-1.0-src.tar.gz 174769
-RMD160 c273e80fb10327a833d192e89500a08302d68c58 commons-jelly-1.0-src.tar.gz 174769
-SHA256 113d606361845d08dab69f187690bf5dcfb5e9ca8fab780135898eb6d0a8d7d1 commons-jelly-1.0-src.tar.gz 174769
diff --git a/dev-java/commons-validator/Manifest b/dev-java/commons-validator/Manifest
index a94d8e32f879..91e2c2f6742a 100644
--- a/dev-java/commons-validator/Manifest
+++ b/dev-java/commons-validator/Manifest
@@ -2,18 +2,18 @@ DIST commons-validator-1.1.3-gentoo-missingfiles.tar.bz2 4161
 DIST commons-validator-1.1.3-src.tar.gz 180203
 DIST commons-validator-1.1.4-gentoo-missingfiles.tar.bz2 4161 RMD160 cde4c6187078fbae86d0d05ccd2d15561efcf55c SHA1 c50c5e0c6c864e9c21a75e3553449a513098014a SHA256 40e6ec6f1856e2340bf86f331d4a628c0045f025645ba79dc2ce660132fab1bc
 DIST commons-validator-1.1.4-src.tar.gz 181446 RMD160 d9067980087e963083f96506319fb5f1a53549dd SHA1 1f8230619d30afe7c03e9fbd19eb0e9f2dfe1003 SHA256 02a46f9f3cd654d68471a62094b3bf1edc26f43e7fd4a2174fbcd30d49676844
-EBUILD commons-validator-1.1.3-r1.ebuild 2251 RMD160 678b74af3f6220c73ffbd44dec8a27bd776deb83 SHA1 bb4723373fa3b18d79633884f53f86708bf5f12a SHA256 15bd9424dae0fe643420280799012d399dcb175c7a08fcd38595f406534b8662
-MD5 5af8501933c7006bbccf1685bf87fcea commons-validator-1.1.3-r1.ebuild 2251
-RMD160 678b74af3f6220c73ffbd44dec8a27bd776deb83 commons-validator-1.1.3-r1.ebuild 2251
-SHA256 15bd9424dae0fe643420280799012d399dcb175c7a08fcd38595f406534b8662 commons-validator-1.1.3-r1.ebuild 2251
+EBUILD commons-validator-1.1.3-r1.ebuild 2244 RMD160 1ca67a3071fdfeb45a2b179fc6cfdec8b681596d SHA1 1cfba8e4f8b7692bd3f4472a3aa7b4ee8ad85e0b SHA256 869763eca03e945bd2ec71bab9c36b61d25a38beda4c9090cc9c086ec310d728
+MD5 630c0597daf4b01512165c81cd67dde3 commons-validator-1.1.3-r1.ebuild 2244
+RMD160 1ca67a3071fdfeb45a2b179fc6cfdec8b681596d commons-validator-1.1.3-r1.ebuild 2244
+SHA256 869763eca03e945bd2ec71bab9c36b61d25a38beda4c9090cc9c086ec310d728 commons-validator-1.1.3-r1.ebuild 2244
 EBUILD commons-validator-1.1.4-r1.ebuild 2384 RMD160 f8a1950ff00741bcf73f6f32bae55876d753de3b SHA1 ff7d066c26f6dbe97bcb0e6e55fa9a87d271dd1b SHA256 d4c56cbdae3fda17c95782a4cde034afa3a82e4e6e3f5cc4bfa9e154f195cefa
 MD5 595991ec2ee79264bc8eda936a589e59 commons-validator-1.1.4-r1.ebuild 2384
 RMD160 f8a1950ff00741bcf73f6f32bae55876d753de3b commons-validator-1.1.4-r1.ebuild 2384
 SHA256 d4c56cbdae3fda17c95782a4cde034afa3a82e4e6e3f5cc4bfa9e154f195cefa commons-validator-1.1.4-r1.ebuild 2384
-MISC ChangeLog 5680 RMD160 ae3ac8a247b85733f05cf73ac669e92b86124667 SHA1 98560d1e657a5c63dcdef5e7365ced67c5c1ecee SHA256 7831aca5a34c519330486a7c25ad7cf6563fb95a5f88dccbbe0c8e4f23490d90
-MD5 8f28072ebc9d326c11241620a6623551 ChangeLog 5680
-RMD160 ae3ac8a247b85733f05cf73ac669e92b86124667 ChangeLog 5680
-SHA256 7831aca5a34c519330486a7c25ad7cf6563fb95a5f88dccbbe0c8e4f23490d90 ChangeLog 5680
+MISC ChangeLog 5816 RMD160 51fd092bf5c6cb2822128d2271e94523be4d6152 SHA1 01324405c0ae46c05a915092628800365185568d SHA256 98cdba907e05fe78833e54a2fb1cabefc9cf510abb3e58a3b0205391d00222b0
+MD5 20004c85b024c93b9f2071fb0fa2101b ChangeLog 5816
+RMD160 51fd092bf5c6cb2822128d2271e94523be4d6152 ChangeLog 5816
+SHA256 98cdba907e05fe78833e54a2fb1cabefc9cf510abb3e58a3b0205391d00222b0 ChangeLog 5816
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
diff --git a/dev-java/cpptasks/Manifest b/dev-java/cpptasks/Manifest
index dfc8d93db87d..a0dd78118c5d 100644
--- a/dev-java/cpptasks/Manifest
+++ b/dev-java/cpptasks/Manifest
@@ -1,15 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST cpptasks-1.0b4.tar.gz 879715 RMD160 bfd90f71412ead94023da3b0a4156309dd4f6f4a SHA1 32c46e752cdac576d4b59d5f1d3324a75295c4ad SHA256 3472af7389c5a7daaff48a054c2b9f10994b55352025b8a2249a7dfcebca14c8
-EBUILD cpptasks-1.0_beta4.ebuild 1300 RMD160 e9332d08ecbfa39836440a85b888d04d7e34ab6c SHA1 639d818d6f37047be5557e56ba86bc20b04671bd SHA256 361c6915c9dec48ae1f3368bbe35b6fe71bd2d24a6c705d0d4398f52fbfafdd3
-MD5 917621062ac8154206ff4823d9c71e19 cpptasks-1.0_beta4.ebuild 1300
-RMD160 e9332d08ecbfa39836440a85b888d04d7e34ab6c cpptasks-1.0_beta4.ebuild 1300
-SHA256 361c6915c9dec48ae1f3368bbe35b6fe71bd2d24a6c705d0d4398f52fbfafdd3 cpptasks-1.0_beta4.ebuild 1300
-MISC ChangeLog 868 RMD160 78f0ffcfead78ce3c4609211af3cf57a873341c5 SHA1 fd42dd1c4cff0618b87d62249e12fab02e9d592e SHA256 188c186af9e32f016933a66b8fa77e04ea8266e2c2873f240973088145636c77
-MD5 9daad552b4f6ce8af2fc251d4a68aa4f ChangeLog 868
-RMD160 78f0ffcfead78ce3c4609211af3cf57a873341c5 ChangeLog 868
-SHA256 188c186af9e32f016933a66b8fa77e04ea8266e2c2873f240973088145636c77 ChangeLog 868
+EBUILD cpptasks-1.0_beta4.ebuild 1304 RMD160 ff0d5f0e645cff9dedd87919cd05dca5834cc361 SHA1 cb6a4ffc90c3ee92ac72f73f3126bc2835fdb4b0 SHA256 8caa451f52448e05e15b2602149fd999ae62e512726c8c45096591462c573d9d
+MD5 843aa319416f7ddcf29079a3fbcdbc1f cpptasks-1.0_beta4.ebuild 1304
+RMD160 ff0d5f0e645cff9dedd87919cd05dca5834cc361 cpptasks-1.0_beta4.ebuild 1304
+SHA256 8caa451f52448e05e15b2602149fd999ae62e512726c8c45096591462c573d9d cpptasks-1.0_beta4.ebuild 1304
+MISC ChangeLog 998 RMD160 c902f37088f9608ac059e82f0b73bd4a6bc2370b SHA1 99c7e0589830f2c594f59f5b814955184fa22c73 SHA256 423858330c76cc0d72a1d1d74f3eb7ecd374eaea9d8138fe127e9cc8bb1f3ec1
+MD5 bfd7f7a8a09cd591b33af6a6c1a4d976 ChangeLog 998
+RMD160 c902f37088f9608ac059e82f0b73bd4a6bc2370b ChangeLog 998
+SHA256 423858330c76cc0d72a1d1d74f3eb7ecd374eaea9d8138fe127e9cc8bb1f3ec1 ChangeLog 998
 MISC metadata.xml 159 RMD160 7da5c733c224383ffe350605bc36721a3ff2536f SHA1 99c2655c7bbee2cbc8c79edb2d00d481d62faf95 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb
 MD5 9f455923f62e1ecb14ebb7f29636850a metadata.xml 159
 RMD160 7da5c733c224383ffe350605bc36721a3ff2536f metadata.xml 159
@@ -17,10 +14,3 @@ SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb metadata
 MD5 bc0a738dea504b6dbf0d546edf1e90c5 files/digest-cpptasks-1.0_beta4 244
 RMD160 5620be26c5dde5c9b827f2c43539de3112308583 files/digest-cpptasks-1.0_beta4 244
 SHA256 e50f0e29de3ef5aebde002e8c97db224c8497aaaf5915a43d354e5c0ab536362 files/digest-cpptasks-1.0_beta4 244
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFFTjjlomPajV0RnrERAo95AJ43trDdb9REFg9eL4q537EhBGt5yQCeOW5e
-Kb10h7R/Gv6U9RXdYH8GIAQ=
-=QnUq
------END PGP SIGNATURE-----
diff --git a/dev-java/dom4j/Manifest b/dev-java/dom4j/Manifest
index da7097c4653a..d2237b318dbe 100644
--- a/dev-java/dom4j/Manifest
+++ b/dev-java/dom4j/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX dom4j-1.6.1-java5.patch 44163 RMD160 e0bf3dcc8409b8786301fc8d4850dec7384d59ba SHA1 670abc8ae563ff23705cd79d38383bdae51ca703 SHA256 d1f1fc6f3d91efc45c9cd6ea5d31d00ff2da840d9915238d83a5c651965435cc
 MD5 9cd18838b3294484e6d9ac81a9726995 files/dom4j-1.6.1-java5.patch 44163
 RMD160 e0bf3dcc8409b8786301fc8d4850dec7384d59ba files/dom4j-1.6.1-java5.patch 44163
@@ -16,22 +13,18 @@ EBUILD dom4j-1.5.ebuild 974 RMD160 146f70d8293ccc54965da59b587c024a14981153 SHA1
 MD5 3c9e4ccedbb9d62b79cce3801fa9be77 dom4j-1.5.ebuild 974
 RMD160 146f70d8293ccc54965da59b587c024a14981153 dom4j-1.5.ebuild 974
 SHA256 51038944a3f135927999d1990d6634253592f20d3914ffaf1667f8cb13a5896e dom4j-1.5.ebuild 974
-EBUILD dom4j-1.6.1-r1.ebuild 2124 RMD160 f49a61ad8d0035243df147309440cb7fd7818781 SHA1 939d53d2ea313009f91d3ff1929374ff8e19d25a SHA256 b241e362f4ebd9aa45b1e5c32e32e28d8ffaf970d6548695479595465db75023
-MD5 5236bc1841057eaf1109969b403fe5fe dom4j-1.6.1-r1.ebuild 2124
-RMD160 f49a61ad8d0035243df147309440cb7fd7818781 dom4j-1.6.1-r1.ebuild 2124
-SHA256 b241e362f4ebd9aa45b1e5c32e32e28d8ffaf970d6548695479595465db75023 dom4j-1.6.1-r1.ebuild 2124
-EBUILD dom4j-1.6.1-r2.ebuild 2187 RMD160 0a78c0de6320e5cd6df2816c472caf66f1d6973f SHA1 faea38832077756c8672753af8ff7735dbf25a9c SHA256 d764297123e537baf55341085f0764dd5da84a3b563cbbe1615febdfa8375321
-MD5 5b9feae10bc358cf41a97051b6a33b0f dom4j-1.6.1-r2.ebuild 2187
-RMD160 0a78c0de6320e5cd6df2816c472caf66f1d6973f dom4j-1.6.1-r2.ebuild 2187
-SHA256 d764297123e537baf55341085f0764dd5da84a3b563cbbe1615febdfa8375321 dom4j-1.6.1-r2.ebuild 2187
-EBUILD dom4j-1.6.1.ebuild 2138 RMD160 dd0e038028b880ea9b0378fbc54a970f97feb3d5 SHA1 22733f81ad4d684a910d907f6e1d7d79b63bc96f SHA256 51bf9b921381b39eab721c498dbc42ac9fd34239f613c36fa90fede4a282b420
-MD5 47f5336b2f0501e46253c5df51ce6eef dom4j-1.6.1.ebuild 2138
-RMD160 dd0e038028b880ea9b0378fbc54a970f97feb3d5 dom4j-1.6.1.ebuild 2138
-SHA256 51bf9b921381b39eab721c498dbc42ac9fd34239f613c36fa90fede4a282b420 dom4j-1.6.1.ebuild 2138
-MISC ChangeLog 3635 RMD160 a356c53394787e5bfc50ea605402ff193004be44 SHA1 37f9a016d445d3f1125384702b1b03702308db8f SHA256 1e690bcaa3dc0303433e68eec5056ab73545bc89ba771ccf26d65a1275a8977d
-MD5 48ce11fe39208aa3a4dfb65e391f2246 ChangeLog 3635
-RMD160 a356c53394787e5bfc50ea605402ff193004be44 ChangeLog 3635
-SHA256 1e690bcaa3dc0303433e68eec5056ab73545bc89ba771ccf26d65a1275a8977d ChangeLog 3635
+EBUILD dom4j-1.6.1-r2.ebuild 2189 RMD160 22b50d570743ad5dea92a41ffa43781789b23263 SHA1 b0c5aa2114e3d870303c73b4d4a6e8b7417ff375 SHA256 2bd5ee4a4a25c21312a2755c21e901a7555723bb4c878f2fe8f28977ef5b7855
+MD5 add8a080e7b2278265445dcf0094fb2f dom4j-1.6.1-r2.ebuild 2189
+RMD160 22b50d570743ad5dea92a41ffa43781789b23263 dom4j-1.6.1-r2.ebuild 2189
+SHA256 2bd5ee4a4a25c21312a2755c21e901a7555723bb4c878f2fe8f28977ef5b7855 dom4j-1.6.1-r2.ebuild 2189
+EBUILD dom4j-1.6.1.ebuild 2140 RMD160 107595bf567c58b5d26b90261e844f5d019507f7 SHA1 f71b4f7a78b8258198fc41f2797f538802845f21 SHA256 44a2159d1fabe6f58a2d40a1b1f8766420492e8d78d42a593f80d583bf8a8b11
+MD5 7af863d6a3bcbe96dcb74c872201a456 dom4j-1.6.1.ebuild 2140
+RMD160 107595bf567c58b5d26b90261e844f5d019507f7 dom4j-1.6.1.ebuild 2140
+SHA256 44a2159d1fabe6f58a2d40a1b1f8766420492e8d78d42a593f80d583bf8a8b11 dom4j-1.6.1.ebuild 2140
+MISC ChangeLog 3801 RMD160 d7a99b0b2edd11a6f2df5e25d4cd9e8e1d2d9bcf SHA1 50badf9ce9deb1188b6bd58cc247a1a13bd89c66 SHA256 92aa755bfdd441fb5d2719a13aa45802a0034dc940e0d4dcf02d93bbe1a59a67
+MD5 7482cb800577ff387a8fbc66a4f79ab5 ChangeLog 3801
+RMD160 d7a99b0b2edd11a6f2df5e25d4cd9e8e1d2d9bcf ChangeLog 3801
+SHA256 92aa755bfdd441fb5d2719a13aa45802a0034dc940e0d4dcf02d93bbe1a59a67 ChangeLog 3801
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -45,16 +38,6 @@ SHA256 6dd5cf79a85b70a0125d03177738b8fb8e5e98fb58d1100565131280e0d5dd57 files/di
 MD5 291103053d94d006784aef1a70e0646c files/digest-dom4j-1.6.1 238
 RMD160 7a662cd4dad9c553d19f19d8df9ba19e44d4a3d2 files/digest-dom4j-1.6.1 238
 SHA256 daabc0a357c3f9f0cde1148c4a509c4fc7abdac6254085dd272a5c89c2671b77 files/digest-dom4j-1.6.1 238
-MD5 291103053d94d006784aef1a70e0646c files/digest-dom4j-1.6.1-r1 238
-RMD160 7a662cd4dad9c553d19f19d8df9ba19e44d4a3d2 files/digest-dom4j-1.6.1-r1 238
-SHA256 daabc0a357c3f9f0cde1148c4a509c4fc7abdac6254085dd272a5c89c2671b77 files/digest-dom4j-1.6.1-r1 238
 MD5 291103053d94d006784aef1a70e0646c files/digest-dom4j-1.6.1-r2 238
 RMD160 7a662cd4dad9c553d19f19d8df9ba19e44d4a3d2 files/digest-dom4j-1.6.1-r2 238
 SHA256 daabc0a357c3f9f0cde1148c4a509c4fc7abdac6254085dd272a5c89c2671b77 files/digest-dom4j-1.6.1-r2 238
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFFJSbHKRy60XGEcJIRAh9NAJ9DZtvypVtnM4Zdn+ak/g6BNrRUkACgpfzs
-3GXV3kFQEJgWaDx2ZrVnHig=
-=ki7t
------END PGP SIGNATURE-----
diff --git a/dev-java/dom4j/dom4j-1.6.1-r1.ebuild b/dev-java/dom4j/dom4j-1.6.1-r1.ebuild
deleted file mode 100644
index 267bee45e895..000000000000
--- a/dev-java/dom4j/dom4j-1.6.1-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2006 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-r1.ebuild,v 1.1 2006/07/27 20:23:43 nelchael Exp $
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Easy to use, open source library for working with XML, XPath and XSLT on the Java platform using the Java Collections Framework and with full support for DOM, SAX and JAXP."
-HOMEPAGE="http://dom4j.sourceforge.net/"
-SRC_URI="mirror://sourceforge/dom4j/${P}.tar.gz"
-LICENSE="Apache-1.1"
-SLOT="1"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc source"
-RDEPEND="|| ( =virtual/jre-1.4* =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*
-	dev-java/xsdlib"
-DEPEND="|| (  =virtual/jdk-1.4* =virtual/jdk-1.3* )
-	dev-java/ant-core
-	${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-
-	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/files/digest-dom4j-1.6.1-r1 b/dev-java/dom4j/files/digest-dom4j-1.6.1-r1
deleted file mode 100644
index d8185ba880ea..000000000000
--- a/dev-java/dom4j/files/digest-dom4j-1.6.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1e7ef6d20939315714de4a8502f27b2d dom4j-1.6.1.tar.gz 9687211
-RMD160 d990d712a6b58c799366c526b32eb6c84a81e29c dom4j-1.6.1.tar.gz 9687211
-SHA256 01b4abf86bce337a2a900bf121b3107320ba63b4c0f352e1922fbec6e0736c6f dom4j-1.6.1.tar.gz 9687211
diff --git a/dev-java/ecs/Manifest b/dev-java/ecs/Manifest
index 85b9c0d4c05b..0f557c211953 100644
--- a/dev-java/ecs/Manifest
+++ b/dev-java/ecs/Manifest
@@ -1,16 +1,24 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 17114c681143589816dd47cab43c11f5 ChangeLog 1598
-MD5 715680c5f4d7eb25155fb75cdf997d18 ecs-1.4.1-r1.ebuild 1273
-MD5 a6084df13634cb3c220ebdd5206798a3 ecs-1.4.2.ebuild 1273
+DIST ecs-1.4.1.tar.gz 3138819
+DIST ecs-1.4.2-src.tar.gz 3435157
+EBUILD ecs-1.4.1-r1.ebuild 1274 RMD160 3391155efa635dc50704aa2d0adf77e17196a6a9 SHA1 e63c329c2c7ab4eb308b5c9bdb6f098edc63f9ec SHA256 5b6d14d967362b23b72f9273982330d9a16f82ce70ad8507b3878b69f1c1e814
+MD5 461564751fd8c2cf80c178154db0e371 ecs-1.4.1-r1.ebuild 1274
+RMD160 3391155efa635dc50704aa2d0adf77e17196a6a9 ecs-1.4.1-r1.ebuild 1274
+SHA256 5b6d14d967362b23b72f9273982330d9a16f82ce70ad8507b3878b69f1c1e814 ecs-1.4.1-r1.ebuild 1274
+EBUILD ecs-1.4.2.ebuild 1273 RMD160 9dc69543f072bf7559d42cfdeee0bdd67285b861 SHA1 6f382998b6c1dd8ef381c1cb4a561caf6451ef6f SHA256 b8e260bafaac987028639b8d5173c019e15deebd3a08a4da6ded8023501c46a3
+MD5 5b2e7456eab9921009db7c61c1b7eb99 ecs-1.4.2.ebuild 1273
+RMD160 9dc69543f072bf7559d42cfdeee0bdd67285b861 ecs-1.4.2.ebuild 1273
+SHA256 b8e260bafaac987028639b8d5173c019e15deebd3a08a4da6ded8023501c46a3 ecs-1.4.2.ebuild 1273
+MISC ChangeLog 1738 RMD160 3ede354e46d1afb29288b4ad68e3c4e43df48531 SHA1 280887520f4e34464bdc38966afa70e099370c2d SHA256 61c89793c34ab6710a65aefb8e79eb9ec431c580743323ee17bf4e29f6c8da28
+MD5 e880c9197535059fd61ad8876d48f088 ChangeLog 1738
+RMD160 3ede354e46d1afb29288b4ad68e3c4e43df48531 ChangeLog 1738
+SHA256 61c89793c34ab6710a65aefb8e79eb9ec431c580743323ee17bf4e29f6c8da28 ChangeLog 1738
+MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
+MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
+RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
+SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 metadata.xml 157
 MD5 a9060f0311fe1863e9b4060dfda897f8 files/digest-ecs-1.4.1-r1 62
+RMD160 9bb30c79417d3a0ee32629de2a489e9a854c38b8 files/digest-ecs-1.4.1-r1 62
+SHA256 6886fb9dbd8154f26d88d807095b7cdaaba162ebc2ed5c5be958fda93c0d43da files/digest-ecs-1.4.1-r1 62
 MD5 df482eb2495f04b61ed8242919fb8607 files/digest-ecs-1.4.2 66
-MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDnGsBndWRXhKOboURAjK6AKD00uriH2Pez6sGuZvswzsocmQmwQCgze+l
-e62BackynfVt2g9JkxLg1oY=
-=1+aO
------END PGP SIGNATURE-----
+RMD160 4ff7d26d30f850d012ad5d31f362aa09e8d13c35 files/digest-ecs-1.4.2 66
+SHA256 21c317a753d7a4da111461cc7591926347f6a014c7d3609e9d844de66543dc19 files/digest-ecs-1.4.2 66
diff --git a/dev-java/fop/Manifest b/dev-java/fop/Manifest
index 47300478cd8b..b1f80994f0e8 100644
--- a/dev-java/fop/Manifest
+++ b/dev-java/fop/Manifest
@@ -11,18 +11,18 @@ MD5 656bb7d30e63d5e57f79489637c243ce files/0.20.5-startscript.patch 2435
 RMD160 c0f245edc7007e7fce5faba4adcc1f4baa214bc0 files/0.20.5-startscript.patch 2435
 SHA256 fcdfe5a333fef2ce56813b48ac42b61b98db88664ab8b7c7d0a529bbf338fb35 files/0.20.5-startscript.patch 2435
 DIST fop-0.20.5-src.tar.gz 7885256 RMD160 c4b776b2b406710548bb343ca2f3dcf03af1a68b SHA1 c0971a8091e38635d07016beb9b66182a45e0a32 SHA256 0c3db9596520ae91747f55984f13d5474e195182c2c274a7556e509864a9ac88
-EBUILD fop-0.20.5-r3.ebuild 1649 RMD160 d9afde47a23a1f72efb9be3878ccab75b7d624f4 SHA1 7eb641b21f1cf35e2293e0d5bb1b073c67359c3b SHA256 5fb3adec0ac6f61da9fe868cf3ca41bcb4e606f84b96731f120d18fdab3f20ef
-MD5 ae622af96cf7f3f2ebb52bf682848c49 fop-0.20.5-r3.ebuild 1649
-RMD160 d9afde47a23a1f72efb9be3878ccab75b7d624f4 fop-0.20.5-r3.ebuild 1649
-SHA256 5fb3adec0ac6f61da9fe868cf3ca41bcb4e606f84b96731f120d18fdab3f20ef fop-0.20.5-r3.ebuild 1649
-EBUILD fop-0.20.5-r7.ebuild 1875 RMD160 4036726e7c2cfdcb419a531c4878375017a22a73 SHA1 705bde0f6ab88597cdd9a608afa1cf3f5c0528ba SHA256 f1fd38db41c0dff25aa6320ab81547d5624bdb27d5f0c22ded7817cfcfa034e5
-MD5 e5155c062646c0fb3190182b359b88d5 fop-0.20.5-r7.ebuild 1875
-RMD160 4036726e7c2cfdcb419a531c4878375017a22a73 fop-0.20.5-r7.ebuild 1875
-SHA256 f1fd38db41c0dff25aa6320ab81547d5624bdb27d5f0c22ded7817cfcfa034e5 fop-0.20.5-r7.ebuild 1875
-MISC ChangeLog 4084 RMD160 009f71e313a4654adac32a370fb871bf2c36491b SHA1 7e7ae9ca3a039e28fed2a65197c50f35c2bea6a0 SHA256 c6e98840099e706be3e59d3e859444d2496c66d657473024410e83c9e5c86ea3
-MD5 40d77f1312b30db0ec5accb48e261e40 ChangeLog 4084
-RMD160 009f71e313a4654adac32a370fb871bf2c36491b ChangeLog 4084
-SHA256 c6e98840099e706be3e59d3e859444d2496c66d657473024410e83c9e5c86ea3 ChangeLog 4084
+EBUILD fop-0.20.5-r3.ebuild 1647 RMD160 5d7dfd46f6156a40fef92fef37176a6dbe3fd831 SHA1 4ed8e4efc75655b17745e44f91c32c74d06a66b3 SHA256 18fc547bfa28db34d8deaf2ec668a6fc8a4c01fa45f34b5d5e9e22f77c4a1e94
+MD5 7d2783d8bcb05078de21abcf06d4a7c0 fop-0.20.5-r3.ebuild 1647
+RMD160 5d7dfd46f6156a40fef92fef37176a6dbe3fd831 fop-0.20.5-r3.ebuild 1647
+SHA256 18fc547bfa28db34d8deaf2ec668a6fc8a4c01fa45f34b5d5e9e22f77c4a1e94 fop-0.20.5-r3.ebuild 1647
+EBUILD fop-0.20.5-r7.ebuild 1873 RMD160 def7c75ad85bcf7e8726261060b0eeb806202d89 SHA1 0785fac49be69364037eca8db41c1ea63c2bdf9e SHA256 a34dfdc246400d4d45307e41dd159ef8a84f0b00a43e96e0424872f43f3da512
+MD5 0ea1e19674427919cfb3734e3634fb1c fop-0.20.5-r7.ebuild 1873
+RMD160 def7c75ad85bcf7e8726261060b0eeb806202d89 fop-0.20.5-r7.ebuild 1873
+SHA256 a34dfdc246400d4d45307e41dd159ef8a84f0b00a43e96e0424872f43f3da512 fop-0.20.5-r7.ebuild 1873
+MISC ChangeLog 4229 RMD160 ba89175f154d7c33ea1f45602970c3c89ab4e190 SHA1 01facd36961ff9a74ec09a20eccd9185e8f29f1e SHA256 b4bbc9e90fa52c17cefd04172a793cdbecae596134bc67ab969077f2de275e5a
+MD5 4ef1d5c862b8fca80c424db005ebafdf ChangeLog 4229
+RMD160 ba89175f154d7c33ea1f45602970c3c89ab4e190 ChangeLog 4229
+SHA256 b4bbc9e90fa52c17cefd04172a793cdbecae596134bc67ab969077f2de275e5a ChangeLog 4229
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
diff --git a/dev-java/groovy/Manifest b/dev-java/groovy/Manifest
index 3e14dfe283e1..3df29f40d3fd 100644
--- a/dev-java/groovy/Manifest
+++ b/dev-java/groovy/Manifest
@@ -1,37 +1,20 @@
-AUX basescript-1.0_beta4 3226 RMD160 65325524aa6b3a2fb0742887114009de9a5abeac SHA1 1dbf419100cf9e38c2ba8697bd3e185dd490743a SHA256 dc4f4ebaf4caaec1dcb147ec4120ad04c4b07d01f806af62a371284dd69a2364
-MD5 a96c05c052b1b1fdf35e81d3f499afc0 files/basescript-1.0_beta4 3226
-RMD160 65325524aa6b3a2fb0742887114009de9a5abeac files/basescript-1.0_beta4 3226
-SHA256 dc4f4ebaf4caaec1dcb147ec4120ad04c4b07d01f806af62a371284dd69a2364 files/basescript-1.0_beta4 3226
 AUX build.xml-1.0.06 11631 RMD160 08c909da44f03fa95ec79f0aa3f7b0cf78e5aa61 SHA1 d587d5eace573ff49f6177bb0b3f68de299aa9d3 SHA256 178d0fcf6a05db90c5c28baa1df09a7901e30acb32d12c22727f5f64e7bbeaa6
 MD5 aa692c2c93648100bdcbad2e9213525b files/build.xml-1.0.06 11631
 RMD160 08c909da44f03fa95ec79f0aa3f7b0cf78e5aa61 files/build.xml-1.0.06 11631
 SHA256 178d0fcf6a05db90c5c28baa1df09a7901e30acb32d12c22727f5f64e7bbeaa6 files/build.xml-1.0.06 11631
-AUX build.xml-1.0_beta4 5427 RMD160 f7231691d933eb50ce5d94ce75b87a1bf49be5fe SHA1 dd1b926adaa5be34c48f35bb02826d7dea35412b SHA256 b839f8bd8714d8e65658759141b82ed32eb1dccf3e20efa0590e5c0bfa5f3d59
-MD5 7481ca6b947624d4f94dcddc9d04e25b files/build.xml-1.0_beta4 5427
-RMD160 f7231691d933eb50ce5d94ce75b87a1bf49be5fe files/build.xml-1.0_beta4 5427
-SHA256 b839f8bd8714d8e65658759141b82ed32eb1dccf3e20efa0590e5c0bfa5f3d59 files/build.xml-1.0_beta4 5427
 AUX groovy-1.0.06-compiler-exit-code.patch 1391 RMD160 f59efe245caba5be33bd1f98855999bd12b46f9c SHA1 fb86146718d40ffb843a39c4888b2a06b7d33b90 SHA256 af35fea287ef6b13e1f7ea9a44a7e01b09362c7f7eb36ec067e6603d6dd460f5
 MD5 fa11cfef466f02d0fe5b0c264942b41b files/groovy-1.0.06-compiler-exit-code.patch 1391
 RMD160 f59efe245caba5be33bd1f98855999bd12b46f9c files/groovy-1.0.06-compiler-exit-code.patch 1391
 SHA256 af35fea287ef6b13e1f7ea9a44a7e01b09362c7f7eb36ec067e6603d6dd460f5 files/groovy-1.0.06-compiler-exit-code.patch 1391
-DIST groovy-1.0-beta-4-src.tar.gz 349710 RMD160 e7e20665686efebe6ed2835a6a7941220152ca1c SHA1 566120749da68a7930aa38aceef4437dad2acd05 SHA256 fc16950ec02a2ba8678e34905bc954bda5318e6be373d0165f461b88d8adbf37
 DIST groovy-1.0-jsr-06-src.tar.gz 915850 RMD160 ff355f9abd85b051e444a914f30712fd9dd610c5 SHA1 4e2b7577af9e573d845e2fc5af651dec257a8a61 SHA256 b64ef8f6c3c2f8e628a0ecc4a4983d3422b0241900eae2bc93deb0a467d64e51
-EBUILD groovy-1.0.06.ebuild 2700 RMD160 d1be98f8915edd6be3cb567071da34f57e28e67a SHA1 00e17c8a0f41fe5bfe05a2895bce1999cb4fcfde SHA256 b5388b8a658c77c90807dde2d31f983ec74c99ca63af68da5a4a7a1089fc1703
-MD5 8e6a861b5091e4b230bf16e369d9dc99 groovy-1.0.06.ebuild 2700
-RMD160 d1be98f8915edd6be3cb567071da34f57e28e67a groovy-1.0.06.ebuild 2700
-SHA256 b5388b8a658c77c90807dde2d31f983ec74c99ca63af68da5a4a7a1089fc1703 groovy-1.0.06.ebuild 2700
-EBUILD groovy-1.0_beta4-r1.ebuild 3846 RMD160 d8876fbb72d577a5661dd6787cc8320f9aab7e9d SHA1 4a4201e7cb409e69c1aa074e61182ea3f7eee1c4 SHA256 5fc2cd6f19ee74aa88a76403c35274c81e83c890b4a9a55f5b7ac2a4e24f02e8
-MD5 1c7ee5485d5395958598d82b3c11d33b groovy-1.0_beta4-r1.ebuild 3846
-RMD160 d8876fbb72d577a5661dd6787cc8320f9aab7e9d groovy-1.0_beta4-r1.ebuild 3846
-SHA256 5fc2cd6f19ee74aa88a76403c35274c81e83c890b4a9a55f5b7ac2a4e24f02e8 groovy-1.0_beta4-r1.ebuild 3846
-EBUILD groovy-1.0_beta4-r2.ebuild 4036 RMD160 b4fdc7a13f3c5ef41088e9924496850bb07d3443 SHA1 68c4d3fe3230ace686cb21c04c64e07b42c22b3d SHA256 1190895bb0af4ce0ca48da98340b5937871f9fb8eb678917a1d76d6525db2056
-MD5 0815858e58c2125866f16387be28478e groovy-1.0_beta4-r2.ebuild 4036
-RMD160 b4fdc7a13f3c5ef41088e9924496850bb07d3443 groovy-1.0_beta4-r2.ebuild 4036
-SHA256 1190895bb0af4ce0ca48da98340b5937871f9fb8eb678917a1d76d6525db2056 groovy-1.0_beta4-r2.ebuild 4036
-MISC ChangeLog 2596 RMD160 04a4982d3a0a149691b9003cd19b2a75bad68bc8 SHA1 c6344b871105d6afeb8a9e169358bd49de324bb1 SHA256 0a7390e07b14867bf41ba51bdb2b29162a6895b31d8d669efd85bd2e1a1352c5
-MD5 8f56584dc1839fc80aea919e3d310ac6 ChangeLog 2596
-RMD160 04a4982d3a0a149691b9003cd19b2a75bad68bc8 ChangeLog 2596
-SHA256 0a7390e07b14867bf41ba51bdb2b29162a6895b31d8d669efd85bd2e1a1352c5 ChangeLog 2596
+EBUILD groovy-1.0.06.ebuild 2700 RMD160 d250ac9d6daf92ac4c5290d57a87803dfd9a1762 SHA1 e61a5103a3eda7812a19f9211f6ed662e1137d27 SHA256 7563185ba1ea9067b108c06955542339793b48070fdc7a752e4062b767c45b61
+MD5 7ca829ccb598f88aa8eaa7fc50707f89 groovy-1.0.06.ebuild 2700
+RMD160 d250ac9d6daf92ac4c5290d57a87803dfd9a1762 groovy-1.0.06.ebuild 2700
+SHA256 7563185ba1ea9067b108c06955542339793b48070fdc7a752e4062b767c45b61 groovy-1.0.06.ebuild 2700
+MISC ChangeLog 2838 RMD160 b180d2eaf7e2963b8579199f295075e4af4fed10 SHA1 a90c5140ac3696fb8ce105791c99c33c4ce1a1b6 SHA256 0383e5a67ed5b50f378b19bc99d4c64e6eb3e862c02596d897ab4f3e84e9f686
+MD5 6e25fc378405aaaeb30a5b3a455919bc ChangeLog 2838
+RMD160 b180d2eaf7e2963b8579199f295075e4af4fed10 ChangeLog 2838
+SHA256 0383e5a67ed5b50f378b19bc99d4c64e6eb3e862c02596d897ab4f3e84e9f686 ChangeLog 2838
 MISC metadata.xml 831 RMD160 9f135737c19a6ec3f5a22cc6f05f4244f3f1dea4 SHA1 349f041d840aa74e16833a0ac37850f570cec27a SHA256 2f53542578ff9fd27149090937adf62898535640ab889582ada8e49eb4748018
 MD5 d24f57f20f31e6a9a7181d82f4cfc9b9 metadata.xml 831
 RMD160 9f135737c19a6ec3f5a22cc6f05f4244f3f1dea4 metadata.xml 831
@@ -39,9 +22,3 @@ SHA256 2f53542578ff9fd27149090937adf62898535640ab889582ada8e49eb4748018 metadata
 MD5 d4c45682ca6e69259f7902fd596476d1 files/digest-groovy-1.0.06 265
 RMD160 6b476984307ce0f512d8cd17b30b8673274def7f files/digest-groovy-1.0.06 265
 SHA256 b7b882b275d94fddf90deeb579859863f04a24f61cc9314f72d0b439b91da663 files/digest-groovy-1.0.06 265
-MD5 23ac722fba90c8b958011f3015836fe1 files/digest-groovy-1.0_beta4-r1 265
-RMD160 f88f71f7f4d8ea15f97ba00ce94940e280b0e029 files/digest-groovy-1.0_beta4-r1 265
-SHA256 13dfe562d17c64f8855a6c7812cfb362ad3d63906b6f0027661063755af033cd files/digest-groovy-1.0_beta4-r1 265
-MD5 23ac722fba90c8b958011f3015836fe1 files/digest-groovy-1.0_beta4-r2 265
-RMD160 f88f71f7f4d8ea15f97ba00ce94940e280b0e029 files/digest-groovy-1.0_beta4-r2 265
-SHA256 13dfe562d17c64f8855a6c7812cfb362ad3d63906b6f0027661063755af033cd files/digest-groovy-1.0_beta4-r2 265
diff --git a/dev-java/groovy/files/basescript-1.0_beta4 b/dev-java/groovy/files/basescript-1.0_beta4
deleted file mode 100644
index 3d4f402d8b46..000000000000
--- a/dev-java/groovy/files/basescript-1.0_beta4
+++ /dev/null
@@ -1,110 +0,0 @@
-#!/bin/sh
-##############################################################################
-##                                                                          ##
-##  Groovy JVM Bootstrap for UN*X                                           ##
-##                                                                          ##
-##############################################################################
-
-##
-## $Header: /var/cvsroot/gentoo-x86/dev-java/groovy/files/basescript-1.0_beta4,v 1.3 2005/10/18 08:28:01 axxo Exp $
-##
-## Modified for Gentoo by Karl Trygve Kalleberg <karltk@gentoo.org>
-##
-
-PROGNAME=`basename "$0"`
-DIRNAME=`dirname "$0"`
-
-# Use the maximum available, or set MAX_FD != -1 to use that
-MAX_FD="maximum"
-
-# External dependencies
-asm_classpath="@asm_classpath@"
-bsf_classpath="@bsf_classpath@"
-classworlds_classpath="@classworlds_classpath@"
-commons_cli_classpath="@commons_cli_classpath@"
-mockobjects_classpath="@mockobjects_classpath@"
-xerces_classpath="@xerces_classpath@"
-xmojo_classpath="@xmojo_classpath@"
-extra_classpath="@extra_classpath@"
-
-final_classpath="${asm_classpath}:${bsf_classpath}:${classworlds_classpath}:${commons_cli_classpath}:${mockobjects_classpath}:${xerces_classpath}:${xmojo_classpath}${extra_classpath}"
-
-GROOVY_HOME="@groovy-home@"
-
-warn() {
-    echo "${PROGNAME}: $*"
-}
-
-die() {
-    warn "$*"
-    exit 1
-}
-
-# Use default grok-classworlds config
-if [ -z "$CLASSWORLDS_CONF" ]; then
-    CLASSWORLDS_CONF="$GROOVY_HOME/conf/@scriptname@-classworlds.conf"
-fi
-
-# Determine the Java command to use to start the JVM
-if [ -z "$JAVACMD" ]; then
-    if [ -n "$JAVA_HOME" ]; then
-        if [ -x "$JAVA_HOME/jre/sh/java" ]; then
-            # IBM's JDK on AIX uses strange locations for the executables
-            JAVACMD="$JAVA_HOME/jre/sh/java"
-        else
-            JAVACMD="$JAVA_HOME/bin/java"
-        fi
-    else
-        JAVACMD="java"
-    fi
-fi
-if [ ! -x "$JAVACMD" ]; then
-    die "JAVA_HOME is not defined correctly; can not execute: $JAVACMD"
-fi
-if [ -z "$JAVA_HOME" ] ; then
-    warn "JAVA_HOME environment variable is not set"
-fi
-
-# Increase the maximum file descriptors if we can
-if [ "$cygwin" = "false" ]; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ]; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ]; then
-            # use the system max
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ]; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query system maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# Setup Profiler
-useprofiler=false
-if [ "x$PROFILER" != "x" ]; then
-    if [ -r "$PROFILER" ]; then
-        . $PROFILER
-        useprofiler=true
-    else
-        die "Profiler file not found: $PROFILER"
-    fi
-fi
-
-TOOLS_JAR="$JAVA_HOME/lib/tools.jar"
-
-# Start the Profiler or the JVM
-if $useprofiler; then
-    runProfiler
-else
-    exec $JAVACMD $JAVA_OPTS \
-        -classpath "${final_classpath}" \
-        -Dprogram.name="$PROGNAME" \
-        -Dclassworlds.conf="$CLASSWORLDS_CONF" \
-        -Dgroovy.home="$GROOVY_HOME" \
-        -Dtools.jar="$TOOLS_JAR" \
-        org.codehaus.classworlds.Launcher "$@"
-fi
diff --git a/dev-java/groovy/files/build.xml-1.0_beta4 b/dev-java/groovy/files/build.xml-1.0_beta4
deleted file mode 100644
index be7639ede75c..000000000000
--- a/dev-java/groovy/files/build.xml-1.0_beta4
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--build.xml generated by maven from project.xml version 1.0-beta-4
-  on date December 23 2003, time 1605-->
-
-<project default="jar" name="groovy" basedir=".">
-  <property name="defaulttargetdir" value="target">
-  </property>
-  <property name="libdir" value="target/lib">
-  </property>
-  <property name="classesdir" value="target/classes">
-  </property>
-  <property name="testclassesdir" value="target/test-classes">
-  </property>
-  <property name="testreportdir" value="target/test-reports">
-  </property>
-  <property name="distdir" value="dist">
-  </property>
-  <property name="javadocdir" value="dist/docs/api">
-  </property>
-  <property name="final.name" value="groovy-1.0-beta-4">
-  </property>
-  <target name="init" description="o Initializes some properties">
-    <mkdir dir="${libdir}">
-    </mkdir>
-    <condition property="noget">
-      <equals arg2="only" arg1="${build.sysclasspath}">
-      </equals>
-    </condition>
-  </target>
-  <target name="compile" description="o Compile the code" depends="">
-    <mkdir dir="${classesdir}">
-    </mkdir>
-    <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
-      <src>
-        <pathelement location="src/main">
-        </pathelement>
-      </src>
-      <classpath>
-        <fileset dir="${libdir}">
-          <include name="*.jar">
-          </include>
-        </fileset>
-      </classpath>
-    </javac>
-    <copy todir="${classesdir}">
-      <fileset dir="src/main">
-        <include name="**/*.properties">
-        </include>
-        <include name="**/*.xml">
-        </include>
-      </fileset>
-    </copy>
-    <copy todir="${testclassesdir}">
-      <fileset dir="src/test">
-        <include name="**/*.properties">
-        </include>
-        <include name="**/*.xml">
-        </include>
-        <include name="**/*.xsd">
-        </include>
-      </fileset>
-    </copy>
-  </target>
-  <target name="jar" description="o Create the jar" depends="compile">
-    <jar jarfile="target/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}">
-    </jar>
-  </target>
-  <target name="clean" description="o Clean up the generated directories">
-    <delete dir="${defaulttargetdir}">
-    </delete>
-    <delete dir="${distdir}">
-    </delete>
-  </target>
-  <target name="dist" description="o Create a distribution" depends="jar, javadoc">
-    <mkdir dir="dist">
-    </mkdir>
-    <copy todir="dist">
-      <fileset dir="${defaulttargetdir}" includes="*.jar">
-      </fileset>
-      <fileset dir="${basedir}" includes="LICENSE*, README*">
-      </fileset>
-    </copy>
-  </target>
-  <target name="test" description="o Run the test cases" if="test.failure" depends="internal-test">
-    <fail message="There were test failures.">
-    </fail>
-  </target>
-  <target name="internal-test" depends="compile-tests">
-    <mkdir dir="${testreportdir}">
-    </mkdir>
-    <junit dir="./" failureproperty="test.failure" printSummary="yes" fork="true" haltonerror="true">
-      <sysproperty key="basedir" value=".">
-      </sysproperty>
-      <formatter type="xml">
-      </formatter>
-      <formatter usefile="false" type="plain">
-      </formatter>
-      <classpath>
-        <fileset dir="${libdir}">
-          <include name="*.jar">
-          </include>
-        </fileset>
-        <pathelement path="${testclassesdir}">
-        </pathelement>
-        <pathelement path="${classesdir}">
-        </pathelement>
-      </classpath>
-      <batchtest todir="${testreportdir}">
-        <fileset dir="src/test">
-          <include name="**/*Test.*">
-          </include>
-          <include name="**/*Bug.*">
-          </include>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-  <target name="compile-tests" depends="compile">
-    <mkdir dir="${testclassesdir}">
-    </mkdir>
-    <javac destdir="${testclassesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
-      <src>
-        <pathelement location="src/test">
-        </pathelement>
-      </src>
-      <classpath>
-        <fileset dir="${libdir}">
-          <include name="*.jar">
-          </include>
-        </fileset>
-        <pathelement path="${classesdir}">
-        </pathelement>
-      </classpath>
-    </javac>
-  </target>
-  <target name="javadoc" description="o Generate javadoc" depends="jar">
-    <mkdir dir="${javadocdir}">
-    </mkdir>
-    <tstamp>
-      <format pattern="2003-yyyy" property="year">
-      </format>
-    </tstamp>
-    <property name="copyright" value="Copyright &amp;copy; 2003 The Codehaus. All Rights Reserved.">
-    </property>
-    <property name="title" value="groovy 1.0-beta-4 API">
-    </property>
-    <javadoc bottom="Copyright &amp;copy; 2003 The Codehaus. All Rights Reserved." use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/main" packagenames="groovy,org.codehaus.groovy.*">
-      <classpath>
-        <fileset dir="${libdir}">
-          <include name="*.jar">
-          </include>
-        </fileset>
-        <pathelement location="target/${final.name}.jar">
-        </pathelement>
-      </classpath>
-    </javadoc>
-  </target>
-  <target name="install-maven">
-    <get dest="${user.home}/maven-install-latest.jar" usetimestamp="true" src="${repo}/maven/maven-install-latest.jar">
-    </get>
-    <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
-    </unjar>
-  </target>
-</project>
diff --git a/dev-java/groovy/files/digest-groovy-1.0_beta4-r1 b/dev-java/groovy/files/digest-groovy-1.0_beta4-r1
deleted file mode 100644
index dbf66fc382c1..000000000000
--- a/dev-java/groovy/files/digest-groovy-1.0_beta4-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 9aac05cd0bfca996e34f079a90f4147c groovy-1.0-beta-4-src.tar.gz 349710
-RMD160 e7e20665686efebe6ed2835a6a7941220152ca1c groovy-1.0-beta-4-src.tar.gz 349710
-SHA256 fc16950ec02a2ba8678e34905bc954bda5318e6be373d0165f461b88d8adbf37 groovy-1.0-beta-4-src.tar.gz 349710
diff --git a/dev-java/groovy/files/digest-groovy-1.0_beta4-r2 b/dev-java/groovy/files/digest-groovy-1.0_beta4-r2
deleted file mode 100644
index dbf66fc382c1..000000000000
--- a/dev-java/groovy/files/digest-groovy-1.0_beta4-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 9aac05cd0bfca996e34f079a90f4147c groovy-1.0-beta-4-src.tar.gz 349710
-RMD160 e7e20665686efebe6ed2835a6a7941220152ca1c groovy-1.0-beta-4-src.tar.gz 349710
-SHA256 fc16950ec02a2ba8678e34905bc954bda5318e6be373d0165f461b88d8adbf37 groovy-1.0-beta-4-src.tar.gz 349710
diff --git a/dev-java/groovy/groovy-1.0_beta4-r1.ebuild b/dev-java/groovy/groovy-1.0_beta4-r1.ebuild
deleted file mode 100644
index 339ebdfb89a7..000000000000
--- a/dev-java/groovy/groovy-1.0_beta4-r1.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/groovy/groovy-1.0_beta4-r1.ebuild,v 1.10 2005/12/11 20:31:53 nichoj Exp $
-
-inherit java-pkg
-
-DESCRIPTION="Groovy is a high-level dynamic language for the JVM"
-HOMEPAGE="http://groovy.codehaus.org/"
-SRC_URI="http://dist.codehaus.org/groovy/distributions/${PN}-1.0-beta-4-src.tar.gz"
-LICENSE="codehaus-groovy"
-SLOT="1"
-KEYWORDS="~x86 ~amd64"
-IUSE="doc jikes"
-DEPEND=">=dev-java/xerces-2.6
-	>=dev-java/commons-cli-1.0-r3
-	>=dev-java/ant-1.5
-	=dev-java/junit-3.8*
-	=dev-java/asm-1.4.1*
-	>=dev-java/classworlds-1.0-r2
-	=dev-java/mockobjects-0.0*
-	=dev-java/bsf-2.3*
-	=dev-java/servletapi-2.4*
-	=dev-java/xmojo-bin-5.0*
-	jikes? ( dev-java/jikes )"
-# karltk:
-# xmojo-bin is a JMX provider, we should add a list of alternatives
-
-
-S=${WORKDIR}/${PN}-1.0-beta-4
-
-src_unpack() {
-	unpack ${A}
-
-	mkdir -p ${S}/target/lib
-
-	cd ${S}/target/lib
-	java-pkg_jar-from xerces-2
-	java-pkg_jar-from junit
-	java-pkg_jar-from asm-1.4.1
-	java-pkg_jar-from commons-cli-1
-	java-pkg_jar-from classworlds-1
-	java-pkg_jar-from bsf-2.3
-	java-pkg_jar-from mockobjects
-	java-pkg_jar-from xmojo-bin-5.0
-	java-pkg_jar-from servletapi-2.4 servlet-api.jar
-
-	cd ${S}
-
-	# The original build.xml will only build on a MacOSX machine when you're
-	# logged in as jstrachan. I don't reckon many Gentoo users are...
-	cp ${FILESDIR}/build.xml-${PV} ${S}/build.xml || die "Failed to update build.xml"
-
-	# This won't compile without an incestuous relationship with radeox.
-	rm -rf ${S}/src/main/org/codehaus/groovy/wiki
-}
-
-src_compile() {
-	local myconf
-	use jikes && myconf="${myconf} -Dbuild.compiler=jikes"
-
-	ant ${myconf} jar || die "Failed to compile jar"
-	if use doc ; then
-		ant javadoc || die "Failed to generate docs"
-	fi
-
-	# Generate command-line scripts
-	for x in grok groovy groovyc groovysh groovyConsole ; do
-		generate_script "$x" "${S}/src" ":${S}/target/classes"
-	done
-
-	mkdir src/lib
-	cd src/main
-	sh ${S}/groovyc groovy/ui/Console.groovy || die "Failed to invoke groovyc"
-
-	jar uf ../../target/groovy-1.0-beta-4.jar groovy/ui/Console*.class || die "Failed to backpatch Console*.class"
-}
-
-generate_script() {
-	scriptname="${1}"
-	classworlds_classpath="$(java-config -p classworlds-1)"
-	asm_classpath="$(java-config -p asm-1.4.1)"
-	bsf_classpath="$(java-config -p bsf-2.3)"
-	classworlds_classpath="$(java-config -p classworlds-1)"
-	commons_cli_classpath="$(java-config -p commons-cli-1)"
-	mockobjects_classpath="$(java-config -p mockobjects)"
-	xerces_classpath="$(java-config -p xerces-2)"
-	xmojo_classpath="$(java-config -p xmojo-bin-5.0)"
-
-	if [[ -n ${2} ]]; then
-		local groovy_home="${2}"
-	else
-		local groovy_home="/usr/share/groovy-${SLOT}"
-	fi
-	sed -e "s;@scriptname@;${scriptname};" \
-		-e "s;@groovy-home@;${groovy_home};" \
-		-e "s;@classworlds_classpath@;${classworlds_classpath};" \
-		-e "s;@asm_classpath@;${asm_classpath};" \
-		-e "s;@bsf_classpath@;${bsf_classpath};" \
-		-e "s;@commons_cli_classpath@;${commons_cli_classpath};" \
-		-e "s;@mockobjects_classpath@;${mockobjects_classpath};" \
-		-e "s;@xerces_classpath@;${xerces_classpath};" \
-		-e "s;@xmojo_classpath@;${xmojo_classpath};" \
-		-e "s;@extra_classpath@;${3};" \
-		< ${FILESDIR}/basescript-${PV} \
-		> ${scriptname} || die "Failed to generate ${scriptname}"
-}
-
-src_install() {
-	java-pkg_dojar target/groovy-1.0-beta-4.jar
-
-	use doc && java-pkg_dohtml -r dist/docs/api
-
-	# Install configuration files
-	confdir=/usr/share/groovy-${SLOT}/conf
-	dodir ${confdir}
-	insinto ${confdir}
-	doins src/conf/{groovy,groovyc,groovysh,groovyConsole,grok}-classworlds.conf
-
-	# Install command-line scripts
-	exeinto /usr/bin
-
-	for x in grok groovy groovyc groovysh groovyConsole ; do
-		rm -f $x
-		generate_script $x
-		doexe $x || die "Failed to install ${x}"
-	done
-}
diff --git a/dev-java/groovy/groovy-1.0_beta4-r2.ebuild b/dev-java/groovy/groovy-1.0_beta4-r2.ebuild
deleted file mode 100644
index 2a869437f3d3..000000000000
--- a/dev-java/groovy/groovy-1.0_beta4-r2.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/groovy/groovy-1.0_beta4-r2.ebuild,v 1.1 2006/08/26 14:52:56 betelgeuse Exp $
-
-inherit java-pkg-2 java-ant-2
-
-
-MY_PV=${PV/_beta/-beta-}
-
-DESCRIPTION="Groovy is a high-level dynamic language for the JVM"
-HOMEPAGE="http://groovy.codehaus.org/"
-SRC_URI="http://dist.codehaus.org/groovy/distributions/${PN}-${MY_PV}-src.tar.gz"
-LICENSE="codehaus-groovy"
-SLOT="1"
-KEYWORDS="~x86 ~amd64"
-IUSE="doc"
-
-# karltk:
-# xmojo-bin is a JMX provider, we should add a list of alternatives
-
-# betelgeuse:
-# Looking at the project.xml, the deps could use some improvement
-COMMON_DEP="
-	=dev-java/asm-1.4.1*
-	=dev-java/bsf-2.3*
-	>=dev-java/commons-cli-1.0-r3
-	=dev-java/junit-3.8*
-	=dev-java/mockobjects-0.0*
-	=dev-java/servletapi-2.4*
-	>=dev-java/xerces-2.6
-	>=dev-java/classworlds-1.0-r2
-	=dev-java/xmojo-bin-5.0*
-"
-#	>=dev-java/xerces-2.6
-#	>=dev-java/classworlds-1.0-r2
-#	=dev-java/xmojo-bin-5.0*
-
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.4
-	${COMMON_DEP}
-	>=dev-java/ant-core-1.6.2"
-
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-src_unpack() {
-	unpack ${A}
-
-	mkdir -p ${S}/target/lib
-
-	cd ${S}/target/lib
-#	java-pkg_jar-from xerces-2
-	java-pkg_jar-from junit
-	java-pkg_jar-from asm-1.4.1
-	java-pkg_jar-from commons-cli-1
-#	java-pkg_jar-from classworlds-1
-	java-pkg_jar-from bsf-2.3
-	java-pkg_jar-from mockobjects
-#	java-pkg_jar-from xmojo-bin-5.0
-	java-pkg_jar-from ant-core
-	java-pkg_jar-from servletapi-2.4 servlet-api.jar
-
-	cd ${S}
-
-	# The original build.xml will only build on a MacOSX machine when you're
-	# logged in as jstrachan. I don't reckon many Gentoo users are...
-	cp ${FILESDIR}/build.xml-${PV} ${S}/build.xml || die "Failed to update build.xml"
-
-	# This won't compile without an incestuous relationship with radeox.
-	rm -rf ${S}/src/main/org/codehaus/groovy/wiki
-}
-
-src_compile() {
-	eant $(use_doc) jar || die "Failed to compile jar"
-
-	# Generate command-line scripts
-	for x in grok groovy groovyc groovysh groovyConsole ; do
-		generate_script "$x" "${S}/src" ":${S}/target/classes"
-	done
-
-	mkdir src/lib
-	cd src/main
-	sh ${S}/groovyc groovy/ui/Console.groovy || die "Failed to invoke groovyc"
-
-	jar uf ../../target/${PN}-${MY_PV}.jar groovy/ui/Console*.class || die "Failed to backpatch Console*.class"
-}
-
-
-# Should migrate to dolauncher
-generate_script() {
-	scriptname="${1}"
-	classworlds_classpath="$(java-config -p classworlds-1)"
-	asm_classpath="$(java-config -p asm-1.4.1)"
-	bsf_classpath="$(java-config -p bsf-2.3)"
-	classworlds_classpath="$(java-config -p classworlds-1)"
-	commons_cli_classpath="$(java-config -p commons-cli-1)"
-	mockobjects_classpath="$(java-config -p mockobjects)"
-	xerces_classpath="$(java-config -p xerces-2)"
-	xmojo_classpath="$(java-config -p xmojo-bin-5.0)"
-
-	if [[ -n ${2} ]]; then
-		local groovy_home="${2}"
-	else
-		local groovy_home="/usr/share/groovy-${SLOT}"
-	fi
-	sed -e "s;@scriptname@;${scriptname};" \
-		-e "s;@groovy-home@;${groovy_home};" \
-		-e "s;@classworlds_classpath@;${classworlds_classpath};" \
-		-e "s;@asm_classpath@;${asm_classpath};" \
-		-e "s;@bsf_classpath@;${bsf_classpath};" \
-		-e "s;@commons_cli_classpath@;${commons_cli_classpath};" \
-		-e "s;@mockobjects_classpath@;${mockobjects_classpath};" \
-		-e "s;@xerces_classpath@;${xerces_classpath};" \
-		-e "s;@xmojo_classpath@;${xmojo_classpath};" \
-		-e "s;@extra_classpath@;${3};" \
-		< ${FILESDIR}/basescript-${PV} \
-		> ${scriptname} || die "Failed to generate ${scriptname}"
-}
-
-src_install() {
-	java-pkg_newjar target/${PN}-${MY_PV}.jar
-
-	use doc && java-pkg_dohtml -r dist/docs/api
-
-	# Install configuration files
-	confdir=/usr/share/groovy-${SLOT}/conf
-	dodir ${confdir}
-	insinto ${confdir}
-	doins src/conf/{groovy,groovyc,groovysh,groovyConsole,grok}-classworlds.conf
-
-	# Install command-line scripts
-	exeinto /usr/bin
-
-	for x in grok groovy groovyc groovysh groovyConsole ; do
-		rm -f $x
-		generate_script $x
-		doexe $x || die "Failed to install ${x}"
-	done
-}
diff --git a/dev-java/j2ssh/Manifest b/dev-java/j2ssh/Manifest
index d88d0adfab0c..0d48e1ff2971 100644
--- a/dev-java/j2ssh/Manifest
+++ b/dev-java/j2ssh/Manifest
@@ -1,14 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 9db8702d436973ace47b7d48445772e7 ChangeLog 1506
-MD5 c0c163f1e4dcccc73192bfc69ba092a3 files/digest-j2ssh-0.2.7-r1 68
-MD5 fa08eac1979fca8c7b447f51a96cbc09 j2ssh-0.2.7-r1.ebuild 1369
+DIST j2ssh-0.2.7-src.tar.gz 2188240
+EBUILD j2ssh-0.2.7-r1.ebuild 1370 RMD160 fc29132dc5f157153ef2e5ab66e7f86d00e36e2f SHA1 d8a95195d3f9105df9398fedcfb66a5cd2fe3af6 SHA256 5169bd04a06d36f3647e4c56c055989d442d8fd1077f9f8cf82e13578dfd31eb
+MD5 1600f8886b87b5fc047f743b151c252c j2ssh-0.2.7-r1.ebuild 1370
+RMD160 fc29132dc5f157153ef2e5ab66e7f86d00e36e2f j2ssh-0.2.7-r1.ebuild 1370
+SHA256 5169bd04a06d36f3647e4c56c055989d442d8fd1077f9f8cf82e13578dfd31eb j2ssh-0.2.7-r1.ebuild 1370
+MISC ChangeLog 1628 RMD160 a9026a27b9c20b2744b18f4422227ea559253412 SHA1 7fe4bd8158150144331c49c582a8d0697c477a27 SHA256 c33a157e3550ce3de79d1d909f5e66da9cc23fa0babff4ca9f1d1b460bd37834
+MD5 96778931fb6f65bd3b2dc80a69f27c53 ChangeLog 1628
+RMD160 a9026a27b9c20b2744b18f4422227ea559253412 ChangeLog 1628
+SHA256 c33a157e3550ce3de79d1d909f5e66da9cc23fa0babff4ca9f1d1b460bd37834 ChangeLog 1628
+MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDnHySndWRXhKOboURAgNjAJoDc5SoNZkzOsa2qq/tuhwjdLaqFwCg6HwQ
-1d64oVpV2KHI4aKnfOxfJh8=
-=XYw+
------END PGP SIGNATURE-----
+RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
+SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 metadata.xml 157
+MD5 c0c163f1e4dcccc73192bfc69ba092a3 files/digest-j2ssh-0.2.7-r1 68
+RMD160 34297e34f109e6f2dc335b88137303c4092c3e9c files/digest-j2ssh-0.2.7-r1 68
+SHA256 c7114050a5e3b6808a918a32d640efd952043d2796229078d745a5d66c8c7f46 files/digest-j2ssh-0.2.7-r1 68
diff --git a/dev-java/jakarta-tomcat-jasper/Manifest b/dev-java/jakarta-tomcat-jasper/Manifest
index 5d989beb5dfb..cd561c547fb8 100644
--- a/dev-java/jakarta-tomcat-jasper/Manifest
+++ b/dev-java/jakarta-tomcat-jasper/Manifest
@@ -1,14 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 c7cdbb1278aed43a600c2d1350f183fd ChangeLog 752
-MD5 af26ca4772989a2090085a6e24b71628 files/digest-jakarta-tomcat-jasper-2 78
-MD5 3af0f6ebd5a1a367960e0107270a13f3 jakarta-tomcat-jasper-2.ebuild 2426
+DIST jakarta-tomcat-5.0.28-src.tar.gz 3565766
+EBUILD jakarta-tomcat-jasper-2.ebuild 2426 RMD160 896eeffe36f0689af51d6e579a9fe74fc2e7c01d SHA1 cc3651934c1681c5a8d1e5c87a47fc409cb49241 SHA256 9bec04f9f84498305d0aa6588223ca89c669167c5f171a5716970b92e7c72067
+MD5 71826757d52711484310eaa26ff6a7e4 jakarta-tomcat-jasper-2.ebuild 2426
+RMD160 896eeffe36f0689af51d6e579a9fe74fc2e7c01d jakarta-tomcat-jasper-2.ebuild 2426
+SHA256 9bec04f9f84498305d0aa6588223ca89c669167c5f171a5716970b92e7c72067 jakarta-tomcat-jasper-2.ebuild 2426
+MISC ChangeLog 885 RMD160 5253c6d775ae42aa11de26e6af97360edd54cc2b SHA1 a45bf3aa77ce40732a3757228fd3bc07a4ffbb2a SHA256 943b3fc94d5b7a9142d3b552097a34b30de4e217afb875d9fff81edbe445a92f
+MD5 58e27ab3af32a6809d4b82fbee5e9fe5 ChangeLog 885
+RMD160 5253c6d775ae42aa11de26e6af97360edd54cc2b ChangeLog 885
+SHA256 943b3fc94d5b7a9142d3b552097a34b30de4e217afb875d9fff81edbe445a92f ChangeLog 885
+MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDnPQ1ndWRXhKOboURAtC7AJ9YjgenS1wAVjGH8e22nQjLSvCF9ACePebz
-tMBjsZPqK/iAD7Ish7fIdMc=
-=QaMe
------END PGP SIGNATURE-----
+RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
+SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 metadata.xml 157
+MD5 af26ca4772989a2090085a6e24b71628 files/digest-jakarta-tomcat-jasper-2 78
+RMD160 86c227b07b6a1bd09b18bebe86f675bd9f602c5e files/digest-jakarta-tomcat-jasper-2 78
+SHA256 381352960bb01a46b97c4feb79994745d425e647e8eb4068ad2f8fddff3b0fe3 files/digest-jakarta-tomcat-jasper-2 78
diff --git a/dev-java/jaxen/Manifest b/dev-java/jaxen/Manifest
index f917742b5c6b..ec90c1438d9a 100644
--- a/dev-java/jaxen/Manifest
+++ b/dev-java/jaxen/Manifest
@@ -16,41 +16,27 @@ RMD160 cdf9573e0e767ed85705499df3d0a3f658bb2ff3 files/jaxen-1.1_beta2-gentoo.dif
 SHA256 0c97dd1c0a1605479882f5327f165aa5f939e32fe313d1b6691527b2f1683a25 files/jaxen-1.1_beta2-gentoo.diff 1254
 DIST jaxen-1.0-FCS.tar.gz 3195819 RMD160 896f838c383b6a5d60c4c2fa1271a735992aaa4e SHA1 be658764988717d79b70ccafdd7955ccfba8a25f SHA256 ceb6997465e9de4efe6b4e8f0c421c12bd115b764f9633b9c8b80b95e3b76377
 DIST jaxen-1.1-beta-11-src.tar.gz 278622 RMD160 3affa87f175733722ab0bacbae9eb94ca0963daf SHA1 982ff22992da95a19f9a40defea1feb63ee897cb SHA256 4bb00f3317cdc20779d9c08618ca82eb8eb44c7be7fb3811dc6d7f300e52bf67
-DIST jaxen-1.1-beta-2-src.tar.gz 697184
-DIST jaxen-1.1-beta-6-src.tar.gz 243584
-DIST jaxen-1.1-beta-7-src.tar.gz 274435 RMD160 269b2503d0ea243e578b49ec64ae1b73e004ea60 SHA1 94aee495276c935d74b1b3d28142cd86b5f43e61 SHA256 df6ea55b4dc0ce009c6465e52cd762ba3fdc7a36d861ed78a86ea2db0386e3b5
-EBUILD jaxen-1.0-r1.ebuild 1459 RMD160 4e9af9c9b653fd24c1638403d76f6ca42a4e34a5 SHA1 51ec922c2da660d527fc0c3fc70d9b4ce3393920 SHA256 8b9cc5663f872fb58acb56421542b1b476f063f458d887ae6c85925acb5422ee
-MD5 3b2ae2790c06ff2fe436e8961bd275dc jaxen-1.0-r1.ebuild 1459
-RMD160 4e9af9c9b653fd24c1638403d76f6ca42a4e34a5 jaxen-1.0-r1.ebuild 1459
-SHA256 8b9cc5663f872fb58acb56421542b1b476f063f458d887ae6c85925acb5422ee jaxen-1.0-r1.ebuild 1459
-EBUILD jaxen-1.0.ebuild 1390 RMD160 e649d896c880e060f97deb2454c147cd891fe356 SHA1 0c12dd4ffe4c1b1fc84ef9a22c6bd1d9d9e7fbc8 SHA256 75974f2dc2b6dd4b89e41820150887989adedd715d7f68d7de97867f7a4822c6
-MD5 111672d1f03d423782351ec1c5bdca82 jaxen-1.0.ebuild 1390
-RMD160 e649d896c880e060f97deb2454c147cd891fe356 jaxen-1.0.ebuild 1390
-SHA256 75974f2dc2b6dd4b89e41820150887989adedd715d7f68d7de97867f7a4822c6 jaxen-1.0.ebuild 1390
-EBUILD jaxen-1.1_beta11.ebuild 1595 RMD160 219fe0969236ae1d730a07b8f1ebbc3ccddc9b7b SHA1 55116fe928259429967b86ba4501b64e172752fc SHA256 54ee9a6b8ffc649201c0c1f41484535ebebb306cad014cce5ebfde26fd88fa8b
-MD5 9a7e480c093fcd3be389146f40c02947 jaxen-1.1_beta11.ebuild 1595
-RMD160 219fe0969236ae1d730a07b8f1ebbc3ccddc9b7b jaxen-1.1_beta11.ebuild 1595
-SHA256 54ee9a6b8ffc649201c0c1f41484535ebebb306cad014cce5ebfde26fd88fa8b jaxen-1.1_beta11.ebuild 1595
-EBUILD jaxen-1.1_beta2-r1.ebuild 1370 RMD160 dba343dc219e9d04b4e300ff9ea9a5e85d31fb7e SHA1 88762cbf857e4de27885ad26a725c0545ee7dbb0 SHA256 4f2e17e259805ba890dc23e78b1d7d150abf5619ca9c151c2331ca98d01ce7fd
-MD5 17801590037e01f8fd3944ec7a621b78 jaxen-1.1_beta2-r1.ebuild 1370
-RMD160 dba343dc219e9d04b4e300ff9ea9a5e85d31fb7e jaxen-1.1_beta2-r1.ebuild 1370
-SHA256 4f2e17e259805ba890dc23e78b1d7d150abf5619ca9c151c2331ca98d01ce7fd jaxen-1.1_beta2-r1.ebuild 1370
-EBUILD jaxen-1.1_beta6.ebuild 1383 RMD160 23466ce7b450bd6cc50a3ef6e4c30f4904ea74d2 SHA1 9702cf0333f4f4b8f33c314fd652e4fc90a4e8dc SHA256 e4f8aa662c3a961b360dc3fc917c66ce4d67538c22d58732c3e77c4383de5bc6
-MD5 eb7dc4ef224c88b3e03aeae202e62065 jaxen-1.1_beta6.ebuild 1383
-RMD160 23466ce7b450bd6cc50a3ef6e4c30f4904ea74d2 jaxen-1.1_beta6.ebuild 1383
-SHA256 e4f8aa662c3a961b360dc3fc917c66ce4d67538c22d58732c3e77c4383de5bc6 jaxen-1.1_beta6.ebuild 1383
-EBUILD jaxen-1.1_beta7-r2.ebuild 1504 RMD160 a0f18a1abbf1642726dc34aeee1430da8fe671ef SHA1 d2111bb4c805bb936562e3a0efbbbdc4ef99be9d SHA256 85ba04d5cc91056e46ba9def71470c34adb48217a0abaa915265af15f64fa1ef
-MD5 eeddad8135053dca56adfc77da9d6eb1 jaxen-1.1_beta7-r2.ebuild 1504
-RMD160 a0f18a1abbf1642726dc34aeee1430da8fe671ef jaxen-1.1_beta7-r2.ebuild 1504
-SHA256 85ba04d5cc91056e46ba9def71470c34adb48217a0abaa915265af15f64fa1ef jaxen-1.1_beta7-r2.ebuild 1504
-EBUILD jaxen-1.1_beta7.ebuild 1659 RMD160 6d471421fe596e495174889fb1ef2355adde2286 SHA1 fd551dbda4b7a64237620e4a3b35ff07132ea750 SHA256 88423c996c11879fd443b99f2e40ca3ee1910fd30f793af00b80b34f1e1c0287
-MD5 d90d457711b37f8bbb6e4c44ee02250b jaxen-1.1_beta7.ebuild 1659
-RMD160 6d471421fe596e495174889fb1ef2355adde2286 jaxen-1.1_beta7.ebuild 1659
-SHA256 88423c996c11879fd443b99f2e40ca3ee1910fd30f793af00b80b34f1e1c0287 jaxen-1.1_beta7.ebuild 1659
-MISC ChangeLog 4538 RMD160 84f1741542873e10f5da392c50c11cf799223dbf SHA1 5ad777134dfeccff8ee3c36552862bd1bbd05de6 SHA256 d64b0bdafdb86772a34fe66b8c1ea05bdeb27f0cbb7e617c52f61c2caf6704f8
-MD5 0887560ff558b5a8e93be1745d07d969 ChangeLog 4538
-RMD160 84f1741542873e10f5da392c50c11cf799223dbf ChangeLog 4538
-SHA256 d64b0bdafdb86772a34fe66b8c1ea05bdeb27f0cbb7e617c52f61c2caf6704f8 ChangeLog 4538
+DIST jaxen-1.1-beta-2-src.tar.gz 697184 RMD160 23594b3ec65a306826fe8b38bd16ee62c298764b SHA1 6af72689a97a2e0108633767cfee4cbd9a9b4e3d SHA256 47d299f88cc7df0aedfd678f524de9c1028d727dc1aea1d663bce0ca38c76805
+EBUILD jaxen-1.0-r1.ebuild 1452 RMD160 3b8bb72397c622cd59a1a8ac35fb1921b04928ef SHA1 4a6e2a65a26b2c686cf0bc5933ba45349b1ab557 SHA256 dba3cacf4aec354c9ae3772bffa1e076a55a2df6af39b43c8192de9e54635def
+MD5 be8e679bbc29adaea89123695f5459e9 jaxen-1.0-r1.ebuild 1452
+RMD160 3b8bb72397c622cd59a1a8ac35fb1921b04928ef jaxen-1.0-r1.ebuild 1452
+SHA256 dba3cacf4aec354c9ae3772bffa1e076a55a2df6af39b43c8192de9e54635def jaxen-1.0-r1.ebuild 1452
+EBUILD jaxen-1.0.ebuild 1385 RMD160 570a99688c1c21df6e0189fd33286073f441f952 SHA1 76101a9f3dbe1e0a8c4a111c860085dfdc9eff69 SHA256 de0ae3caae519f1bd096127c47189d0e7505cca967bf5f4c0b2ee7049aaef058
+MD5 bc29a0197dc64de2d5fec67231cbe25a jaxen-1.0.ebuild 1385
+RMD160 570a99688c1c21df6e0189fd33286073f441f952 jaxen-1.0.ebuild 1385
+SHA256 de0ae3caae519f1bd096127c47189d0e7505cca967bf5f4c0b2ee7049aaef058 jaxen-1.0.ebuild 1385
+EBUILD jaxen-1.1_beta11.ebuild 1595 RMD160 f08b9c80d20ba961d09b3597be4256dabea47fb2 SHA1 bc9cca5adc2a911ce900919d42de33828d90dca3 SHA256 a3932470a310ce8cc3308042f5a753413f4d641fff895cbd3c47a771285a7529
+MD5 36377c0a6211b0f2b260db242d14a8f9 jaxen-1.1_beta11.ebuild 1595
+RMD160 f08b9c80d20ba961d09b3597be4256dabea47fb2 jaxen-1.1_beta11.ebuild 1595
+SHA256 a3932470a310ce8cc3308042f5a753413f4d641fff895cbd3c47a771285a7529 jaxen-1.1_beta11.ebuild 1595
+EBUILD jaxen-1.1_beta2-r1.ebuild 1363 RMD160 c6c8cdb101314e55efe622abb9dc12268f9a6982 SHA1 ea95d08319a928938b885346f88f6b6b0fe6a742 SHA256 4825dfa4c77c61e6b9673a2b36e837d1b5276ccf94b587a59248b42feef60e2c
+MD5 1ccc55bcd164ce25f674d33327bd26bc jaxen-1.1_beta2-r1.ebuild 1363
+RMD160 c6c8cdb101314e55efe622abb9dc12268f9a6982 jaxen-1.1_beta2-r1.ebuild 1363
+SHA256 4825dfa4c77c61e6b9673a2b36e837d1b5276ccf94b587a59248b42feef60e2c jaxen-1.1_beta2-r1.ebuild 1363
+MISC ChangeLog 4812 RMD160 8376149394c99c3e6e43be48c35fb06c1fedf708 SHA1 96163b912c589d1d0bcbf5450ef0e28d26ab9584 SHA256 1d30137717c1e803067df0425085e59ff57887ec6ff5db699efef2f904964142
+MD5 ba0306ed515b57038737a54027cb641e ChangeLog 4812
+RMD160 8376149394c99c3e6e43be48c35fb06c1fedf708 ChangeLog 4812
+SHA256 1d30137717c1e803067df0425085e59ff57887ec6ff5db699efef2f904964142 ChangeLog 4812
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
@@ -64,15 +50,6 @@ SHA256 795494b6d600e313c902d66354a0c912edf141aad66bc1ea1cd1b79226d8dc2c files/di
 MD5 7adbf7607e0cfcb289c1bbb8bebd209c files/digest-jaxen-1.1_beta11 265
 RMD160 09ab1ae7755f945d46716b8ecf32f72990bad37e files/digest-jaxen-1.1_beta11 265
 SHA256 f6008e1c28fe45f964cbad161762be82e4e19dd7f7cf4395e9fb2e87044a90eb files/digest-jaxen-1.1_beta11 265
-MD5 7155bee4486dae1d29f03ce768a5a36e files/digest-jaxen-1.1_beta2-r1 72
-RMD160 d1a5f2f1a56f7e84c22bec2d4b84d680ef1f78a6 files/digest-jaxen-1.1_beta2-r1 72
-SHA256 7dfd0ad3cdb89340711e7daa354eafed3a6e5054798645ba498560444bd6cda8 files/digest-jaxen-1.1_beta2-r1 72
-MD5 a6ab57e343fb58a0af99d74124df491d files/digest-jaxen-1.1_beta6 72
-RMD160 159e14619fcd1b3046f8f45f5b0fd2105b9a1075 files/digest-jaxen-1.1_beta6 72
-SHA256 5191f2b0724275382cc02c601cd436ea2d7cb83c0015b6c7457007456d795a12 files/digest-jaxen-1.1_beta6 72
-MD5 d2a450356a590d9faf42b0dc513039b6 files/digest-jaxen-1.1_beta7 262
-RMD160 9de7cd1a94ff911c0f08329daa54c34b2db6f706 files/digest-jaxen-1.1_beta7 262
-SHA256 da127b213944d1a75ee7891c77879bd4f46e3acbb71173aa50c0bdc5defb9420 files/digest-jaxen-1.1_beta7 262
-MD5 d2a450356a590d9faf42b0dc513039b6 files/digest-jaxen-1.1_beta7-r2 262
-RMD160 9de7cd1a94ff911c0f08329daa54c34b2db6f706 files/digest-jaxen-1.1_beta7-r2 262
-SHA256 da127b213944d1a75ee7891c77879bd4f46e3acbb71173aa50c0bdc5defb9420 files/digest-jaxen-1.1_beta7-r2 262
+MD5 4e65d8e93483879da1007077ec7acac1 files/digest-jaxen-1.1_beta2-r1 262
+RMD160 aa35942e46fe4342f0530586a3faf5d7614196d7 files/digest-jaxen-1.1_beta2-r1 262
+SHA256 4b616dbf43a845e16be018a27094e1924e80c447de218f0f90a23e52e918dc77 files/digest-jaxen-1.1_beta2-r1 262
diff --git a/dev-java/jaxen/files/digest-jaxen-1.1_beta6 b/dev-java/jaxen/files/digest-jaxen-1.1_beta6
deleted file mode 100644
index 1aa8b10b96b6..000000000000
--- a/dev-java/jaxen/files/digest-jaxen-1.1_beta6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8691d0ee0ea86e08ab3a264730d051f8 jaxen-1.1-beta-6-src.tar.gz 243584
diff --git a/dev-java/jaxen/files/digest-jaxen-1.1_beta7 b/dev-java/jaxen/files/digest-jaxen-1.1_beta7
deleted file mode 100644
index a562287121e5..000000000000
--- a/dev-java/jaxen/files/digest-jaxen-1.1_beta7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2e90bb426e52984f4dc942427015a757 jaxen-1.1-beta-7-src.tar.gz 274435
-RMD160 269b2503d0ea243e578b49ec64ae1b73e004ea60 jaxen-1.1-beta-7-src.tar.gz 274435
-SHA256 df6ea55b4dc0ce009c6465e52cd762ba3fdc7a36d861ed78a86ea2db0386e3b5 jaxen-1.1-beta-7-src.tar.gz 274435
diff --git a/dev-java/jaxen/files/digest-jaxen-1.1_beta7-r2 b/dev-java/jaxen/files/digest-jaxen-1.1_beta7-r2
deleted file mode 100644
index a562287121e5..000000000000
--- a/dev-java/jaxen/files/digest-jaxen-1.1_beta7-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2e90bb426e52984f4dc942427015a757 jaxen-1.1-beta-7-src.tar.gz 274435
-RMD160 269b2503d0ea243e578b49ec64ae1b73e004ea60 jaxen-1.1-beta-7-src.tar.gz 274435
-SHA256 df6ea55b4dc0ce009c6465e52cd762ba3fdc7a36d861ed78a86ea2db0386e3b5 jaxen-1.1-beta-7-src.tar.gz 274435
diff --git a/dev-java/jaxen/jaxen-1.1_beta6.ebuild b/dev-java/jaxen/jaxen-1.1_beta6.ebuild
deleted file mode 100644
index afefbc255b5a..000000000000
--- a/dev-java/jaxen/jaxen-1.1_beta6.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxen/jaxen-1.1_beta6.ebuild,v 1.5 2006/10/05 17:23:40 gustavoz Exp $
-
-inherit java-pkg eutils
-
-DESCRIPTION="A Java XPath Engine"
-HOMEPAGE="http://jaxen.org/"
-SRC_URI="http://dist.codehaus.org/${PN}/distributions/${P/_beta6/-beta-6}-src.tar.gz"
-
-LICENSE="jaxen"
-SLOT="1.1"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc jikes source"
-
-RDEPEND="|| ( =virtual/jre-1.3* =virtual/jre-1.4* )
-	~dev-java/jdom-1.0_beta9
-	=dev-java/dom4j-1*
-	>=dev-java/xerces-2.6
-	dev-java/xom"
-
-DEPEND="|| ( =virtual/jdk-1.3* =virtual/jdk-1.4* )
-	dev-java/ant-core
-	jikes? ( dev-java/jikes )
-	source? ( app-arch/zip )
-	${RDEPEND}"
-
-
-S=${WORKDIR}/${PN}-1.1-beta-6
-
-src_unpack() {
-	unpack ${A}
-
-	mkdir -p ${S}/target/lib
-	cd ${S}/target/lib
-	java-pkg_jar-from xerces-2
-	java-pkg_jar-from dom4j-1
-	java-pkg_jar-from jdom-1.0_beta9
-	java-pkg_jar-from xom
-
-	cd ${S}
-	sed -i 's/depends="compile,test"/depends="compile"/' build.xml
-}
-
-src_compile() {
-	local antops="jar -Dnoget=1"
-	use doc && antops="${antops} javadoc"
-	use jikes && antops="${antops} -Dbuild.compiler=jikes"
-	ant ${antops} || die "compile failed"
-}
-
-src_install() {
-	java-pkg_newjar target/jaxen*.jar ${PN}.jar
-
-	use doc && java-pkg_dohtml -r dist/docs/*
-	use source && java-pkg_dosrc src/java/main/*
-}
diff --git a/dev-java/jaxen/jaxen-1.1_beta7-r2.ebuild b/dev-java/jaxen/jaxen-1.1_beta7-r2.ebuild
deleted file mode 100644
index 2b230928f0e5..000000000000
--- a/dev-java/jaxen/jaxen-1.1_beta7-r2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxen/jaxen-1.1_beta7-r2.ebuild,v 1.2 2006/10/05 17:23:40 gustavoz Exp $
-
-inherit java-pkg-2 eutils java-ant-2
-
-MY_P=${P/_beta/-beta-}
-DESCRIPTION="A Java XPath Engine"
-HOMEPAGE="http://jaxen.org/"
-SRC_URI="http://dist.codehaus.org/${PN}/distributions/${MY_P}-src.tar.gz"
-
-LICENSE="jaxen"
-SLOT="1.1"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc source test"
-
-RDEPEND="|| ( =virtual/jre-1.3* =virtual/jre-1.4* )
-	~dev-java/jdom-1.0
-	=dev-java/dom4j-1*
-	>=dev-java/xerces-2.6
-	dev-java/xom"
-
-DEPEND="|| ( =virtual/jdk-1.3* =virtual/jdk-1.4* )
-	dev-java/ant-core
-	test? ( dev-java/ant-tasks )
-	source? ( app-arch/zip )
-	${RDEPEND}"
-
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-
-	mkdir -p ${S}/target/lib
-	cd ${S}/target/lib
-	java-pkg_jar-from xerces-2
-	java-pkg_jar-from dom4j-1
-	java-pkg_jar-from jdom-1.0
-	java-pkg_jar-from xom
-
-	cd ${S}
-	# Make tests non-compuslatory
-	sed -i 's/depends="compile,test"/depends="compile"/' build.xml
-}
-
-src_compile() {
-	eant jar -Dnoget=1 $(use_doc)
-}
-
-src_install() {
-	java-pkg_newjar target/${MY_P}-SNAPSHOT.jar ${PN}.jar
-
-	use doc && java-pkg_dohtml -r dist/docs/*
-	use source && java-pkg_dosrc src/java/main/*
-}
-
-src_test() {
-	if ! use test; then
-		ewarn "You must be using the 'test' USE flag in order to"
-		ewarn "get the dependencies to run tests."
-		ewarn "Skipping tests..."
-	else
-		eant test -Dnoget=true
-	fi
-}
diff --git a/dev-java/jaxen/jaxen-1.1_beta7.ebuild b/dev-java/jaxen/jaxen-1.1_beta7.ebuild
deleted file mode 100644
index 052ca1455f28..000000000000
--- a/dev-java/jaxen/jaxen-1.1_beta7.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxen/jaxen-1.1_beta7.ebuild,v 1.4 2006/10/05 17:23:40 gustavoz Exp $
-
-inherit java-pkg eutils
-
-MY_P=${P/_beta/-beta-}
-DESCRIPTION="A Java XPath Engine"
-HOMEPAGE="http://jaxen.org/"
-SRC_URI="http://dist.codehaus.org/${PN}/distributions/${MY_P}-src.tar.gz"
-
-LICENSE="jaxen"
-SLOT="1.1"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc jikes source test"
-
-RDEPEND=">=virtual/jre-1.3
-	~dev-java/jdom-1.0
-	=dev-java/dom4j-1*
-	>=dev-java/xerces-2.6
-	dev-java/xom"
-
-DEPEND=">=virtual/jdk-1.3
-	dev-java/ant-core
-	jikes? ( dev-java/jikes )
-	test? ( dev-java/ant-tasks )
-	source? ( app-arch/zip )
-	${RDEPEND}"
-
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-
-	mkdir -p ${S}/target/lib
-	cd ${S}/target/lib
-	java-pkg_jar-from xerces-2
-	java-pkg_jar-from dom4j-1
-	java-pkg_jar-from jdom-1.0
-	java-pkg_jar-from xom
-
-	cd ${S}
-	# Make tests non-compuslatory
-	sed -i 's/depends="compile,test"/depends="compile"/' build.xml
-}
-
-src_compile() {
-	local antops="jar -Dnoget=true"
-	use doc && antops="${antops} javadoc"
-	use jikes && antops="${antops} -Dbuild.compiler=jikes"
-	ant ${antops} || die "compile failed"
-}
-
-src_install() {
-	java-pkg_newjar target/${MY_P}-SNAPSHOT.jar ${PN}.jar
-
-	use doc && java-pkg_dohtml -r dist/docs/*
-	use source && java-pkg_dosrc src/java/main/*
-}
-
-src_test() {
-	if ! use test; then
-		ewarn "You must be using the 'test' USE flag in order to"
-		ewarn "get the dependencies to run tests."
-		ewarn "Skipping tests..."
-	else
-		local antflags="test -Dnoget=true"
-		ant ${antflags} || die "tests failed"
-	fi
-}
diff --git a/dev-java/jdom/Manifest b/dev-java/jdom/Manifest
index 06bffab680b0..ac1f43847004 100644
--- a/dev-java/jdom/Manifest
+++ b/dev-java/jdom/Manifest
@@ -1,46 +1,43 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST jdom-1.0.tar.gz 3571788 RMD160 3b72316f3282a25bca8e0b03e7a5ac07da2d38e9 SHA1 d3499d71b180cdeeb6b9537bb197751aa7f8e974 SHA256 fdb77a2c9f8f91a9bd898a0d99b941b79137b5ab692e35ca17dcb73a58b15f77
 DIST jdom-b10.tar.gz 3565663 RMD160 9c15b2165180cee7a61b0086c283463dd000d9d9 SHA1 c1be10849432fc766aef7af8cdf90d747f768938 SHA256 be6771052ec6d33a192416a9acd0694f1ee2bb5a8eaf506f927a74f56d648a66
 DIST jdom-b6.tar.gz 1045817 RMD160 86d10cdd3ac6a6a89a87c4af9329539e60cb3997 SHA1 6a9b320dd52078a415e282b780ceb45110f93c6b SHA256 d290c70220f8281471ac2d9bcfd8bf29789553efb9974b0524e121cf80c83a95
 DIST jdom-b9.tar.gz 3417274 RMD160 af44cb104946cc05e1a55a23951c364d08c4cc89 SHA1 f28f676809e3333254e6041e342f2d4e314b4908 SHA256 00c4ddf640b17768582bba0e8b8a2584fe42b2540a98d1bfa276fa43bef1a676
-EBUILD jdom-1.0-r1.ebuild 1478 RMD160 8ed9c64222e41daa2e022d2fdf3c7730a8873974 SHA1 10edf19f6068d815b1e1d643819e0ca0532d2660 SHA256 015a4d73f56d794ed13d3d1997b7019f9553be521ea90ec567edd9a0ee3a2cea
-MD5 6cf57ebf3a93e41b6276948f3dbd86e4 jdom-1.0-r1.ebuild 1478
-RMD160 8ed9c64222e41daa2e022d2fdf3c7730a8873974 jdom-1.0-r1.ebuild 1478
-SHA256 015a4d73f56d794ed13d3d1997b7019f9553be521ea90ec567edd9a0ee3a2cea jdom-1.0-r1.ebuild 1478
-EBUILD jdom-1.0.ebuild 1588 RMD160 f50e6b1201705da4daf59f867ed0db5925842716 SHA1 ec76c3d8b26a06230a059adc273a9be7994d89fe SHA256 d78147b5023e26d1c8e3c9976e068d68d8f9c819e7664f8288919eec60a332fe
-MD5 d25886c1326b56bd08a00771a43354be jdom-1.0.ebuild 1588
-RMD160 f50e6b1201705da4daf59f867ed0db5925842716 jdom-1.0.ebuild 1588
-SHA256 d78147b5023e26d1c8e3c9976e068d68d8f9c819e7664f8288919eec60a332fe jdom-1.0.ebuild 1588
-EBUILD jdom-1.0_beta10-r3.ebuild 1598 RMD160 7e57d252edff4c75ecaecb89961c38ed02fd6d0f SHA1 d911865e34be436b1dc20bb818b136077be93073 SHA256 81e65e5a36e2643b562938fa427636ee2a58a4b2ba5c70d1e89747b11c0baf4b
-MD5 72749e20410e44b9d95ad54bafef8ba0 jdom-1.0_beta10-r3.ebuild 1598
-RMD160 7e57d252edff4c75ecaecb89961c38ed02fd6d0f jdom-1.0_beta10-r3.ebuild 1598
-SHA256 81e65e5a36e2643b562938fa427636ee2a58a4b2ba5c70d1e89747b11c0baf4b jdom-1.0_beta10-r3.ebuild 1598
-EBUILD jdom-1.0_beta10-r4.ebuild 1484 RMD160 822d0c1864b5727e2da0ae5547ed8c59012ff5fb SHA1 f7334487b2144f5f38e9e5920854a263fdf2037d SHA256 deb240db3977f777cac78e39ecda8508ac4c82787d7e2de54607fb81226bbf03
-MD5 301c4347626061074c83cb369933cca4 jdom-1.0_beta10-r4.ebuild 1484
-RMD160 822d0c1864b5727e2da0ae5547ed8c59012ff5fb jdom-1.0_beta10-r4.ebuild 1484
-SHA256 deb240db3977f777cac78e39ecda8508ac4c82787d7e2de54607fb81226bbf03 jdom-1.0_beta10-r4.ebuild 1484
-EBUILD jdom-1.0_beta6-r1.ebuild 1480 RMD160 4a2aba23278114bbae3d35150baf95af97a762e3 SHA1 42ff43bea45f29c4d34e8d3268013d6403ec436d SHA256 2b7b07864c32e71e57fd260caf96485c38fda9ba550345ad5f3d02825e6c80d2
-MD5 d2a01a542e040937ead80903b9a23462 jdom-1.0_beta6-r1.ebuild 1480
-RMD160 4a2aba23278114bbae3d35150baf95af97a762e3 jdom-1.0_beta6-r1.ebuild 1480
-SHA256 2b7b07864c32e71e57fd260caf96485c38fda9ba550345ad5f3d02825e6c80d2 jdom-1.0_beta6-r1.ebuild 1480
-EBUILD jdom-1.0_beta6.ebuild 1591 RMD160 948a2ad2bb503391de83255b6ab29c3aeb5be519 SHA1 9b9e53da196d6f9a05f661161a9da8fe40a34634 SHA256 4a2576c053bce3a9083cec473758d19957821b4a7f57883a3be9280950ff4beb
-MD5 e18b87bd04e6dc2dd55e00c29584986c jdom-1.0_beta6.ebuild 1591
-RMD160 948a2ad2bb503391de83255b6ab29c3aeb5be519 jdom-1.0_beta6.ebuild 1591
-SHA256 4a2576c053bce3a9083cec473758d19957821b4a7f57883a3be9280950ff4beb jdom-1.0_beta6.ebuild 1591
-EBUILD jdom-1.0_beta9-r1.ebuild 1603 RMD160 e093f1cb58a1a8a7966e066bae7f50085a356371 SHA1 c5550bd99d52c7c6f9e82406ca3422197d7bb2e8 SHA256 75a8a8ed75c90d61d462f5761f5d27a0a082496d6adb61e98192486f80647e9b
-MD5 b3fc87d457fbf4d7ec45e85ecd8b1300 jdom-1.0_beta9-r1.ebuild 1603
-RMD160 e093f1cb58a1a8a7966e066bae7f50085a356371 jdom-1.0_beta9-r1.ebuild 1603
-SHA256 75a8a8ed75c90d61d462f5761f5d27a0a082496d6adb61e98192486f80647e9b jdom-1.0_beta9-r1.ebuild 1603
-EBUILD jdom-1.0_beta9-r2.ebuild 1491 RMD160 bb9bd6196170c0db6b055f2a8dfd2d3ca4f1874b SHA1 0ee5bc2b294e2a64de54e998bdb0c3b0a8086322 SHA256 8f7c71ba6b11ddb797079947b88ea2955abf6ecbd9dadcfd931b3a3f97bae41a
-MD5 97c83df43b7fa02b7d2d570e5fac95fe jdom-1.0_beta9-r2.ebuild 1491
-RMD160 bb9bd6196170c0db6b055f2a8dfd2d3ca4f1874b jdom-1.0_beta9-r2.ebuild 1491
-SHA256 8f7c71ba6b11ddb797079947b88ea2955abf6ecbd9dadcfd931b3a3f97bae41a jdom-1.0_beta9-r2.ebuild 1491
-MISC ChangeLog 5693 RMD160 62131249b1e57f1175bc55544a7d0139c0511560 SHA1 ec12625b6a7f6227bb975e07a5a08e8feaedeb5e SHA256 741b57fd9b02aadb178d8945b23f9aa95699648052d7f40200629ca24f7d402d
-MD5 4cadc215f7cc18655528800b0872068c ChangeLog 5693
-RMD160 62131249b1e57f1175bc55544a7d0139c0511560 ChangeLog 5693
-SHA256 741b57fd9b02aadb178d8945b23f9aa95699648052d7f40200629ca24f7d402d ChangeLog 5693
+EBUILD jdom-1.0-r1.ebuild 1471 RMD160 24a04df9403ca1da57ecc86b4e7929567b4cb232 SHA1 dbf52938df9ffd25e5a67f9ac7625f0e39a95d4a SHA256 9ba919ecb928923258b64aa4321feebe1e8a6a3cb63b0d13e643f54a3cd54130
+MD5 1ab9bf315b0a0e2b05f280f5a446bedb jdom-1.0-r1.ebuild 1471
+RMD160 24a04df9403ca1da57ecc86b4e7929567b4cb232 jdom-1.0-r1.ebuild 1471
+SHA256 9ba919ecb928923258b64aa4321feebe1e8a6a3cb63b0d13e643f54a3cd54130 jdom-1.0-r1.ebuild 1471
+EBUILD jdom-1.0.ebuild 1581 RMD160 f291c1d1a831c932bbc44d40a2142a0d306dcad2 SHA1 47b0fefe042dd96565595687e6020d70d9f08788 SHA256 65a6751dfa8b44c13dcfa04cadf864e747639e2785ade9c9080315f629558a24
+MD5 d02c3f90c6162fb58b8532885545024f jdom-1.0.ebuild 1581
+RMD160 f291c1d1a831c932bbc44d40a2142a0d306dcad2 jdom-1.0.ebuild 1581
+SHA256 65a6751dfa8b44c13dcfa04cadf864e747639e2785ade9c9080315f629558a24 jdom-1.0.ebuild 1581
+EBUILD jdom-1.0_beta10-r3.ebuild 1591 RMD160 fc465e0682cbb5cd12ba25d43a4a917ca6f6feca SHA1 108d415e282767d4ef6356f0d530a2f89311225c SHA256 46f4d35827991d9563dc9d82ee36539140cfea1c412f81d5ec7c42e3b4b91279
+MD5 96d166e605b8d32db9fc2706e7613173 jdom-1.0_beta10-r3.ebuild 1591
+RMD160 fc465e0682cbb5cd12ba25d43a4a917ca6f6feca jdom-1.0_beta10-r3.ebuild 1591
+SHA256 46f4d35827991d9563dc9d82ee36539140cfea1c412f81d5ec7c42e3b4b91279 jdom-1.0_beta10-r3.ebuild 1591
+EBUILD jdom-1.0_beta10-r4.ebuild 1477 RMD160 730e5d7c0d41f4541f54657d9031e4b2a43a7d4f SHA1 c4357653e1001abbc1eed1183a1b74ac35a165db SHA256 97153c94044000a13f5b90358027ef4955b25a22d5c639a7c3a896f70af4cd12
+MD5 349d329d118c6b4a4fae6ac9bce6bbce jdom-1.0_beta10-r4.ebuild 1477
+RMD160 730e5d7c0d41f4541f54657d9031e4b2a43a7d4f jdom-1.0_beta10-r4.ebuild 1477
+SHA256 97153c94044000a13f5b90358027ef4955b25a22d5c639a7c3a896f70af4cd12 jdom-1.0_beta10-r4.ebuild 1477
+EBUILD jdom-1.0_beta6-r1.ebuild 1473 RMD160 c8f9544535ef11b8d6f618d096e5046663f5ae33 SHA1 b6f273892e8c2c4520a3a5b81b2d65e39bbaaaa3 SHA256 6efd36541e49ab4b5f3968f7a145660589b668dabe43a02c591a2a25fad88762
+MD5 18dcba52d1b77da638def714cf07dc75 jdom-1.0_beta6-r1.ebuild 1473
+RMD160 c8f9544535ef11b8d6f618d096e5046663f5ae33 jdom-1.0_beta6-r1.ebuild 1473
+SHA256 6efd36541e49ab4b5f3968f7a145660589b668dabe43a02c591a2a25fad88762 jdom-1.0_beta6-r1.ebuild 1473
+EBUILD jdom-1.0_beta6.ebuild 1584 RMD160 67971631414e704201d26865cc786f90a7ca756e SHA1 d4846b394fdfac868473417e35dd38cb5303bd14 SHA256 7f34af6c582b1f092d9aad2c1fc4f9872bf3d41b19660c62cb37454d98d33abf
+MD5 645c6967076e0a5f689ed54092bdc62b jdom-1.0_beta6.ebuild 1584
+RMD160 67971631414e704201d26865cc786f90a7ca756e jdom-1.0_beta6.ebuild 1584
+SHA256 7f34af6c582b1f092d9aad2c1fc4f9872bf3d41b19660c62cb37454d98d33abf jdom-1.0_beta6.ebuild 1584
+EBUILD jdom-1.0_beta9-r1.ebuild 1596 RMD160 27b8e020b941eab33284858dfc9c848fe2c938f7 SHA1 cdb3a88e004f734472ab1f93c9459aba39096ad8 SHA256 69bbacd9fd89c2836c6bf426a7b2d35528dd6d7ecc357d366e619ccec2f1adc0
+MD5 c7d71cd3acad87e1bb50867886fbdbd0 jdom-1.0_beta9-r1.ebuild 1596
+RMD160 27b8e020b941eab33284858dfc9c848fe2c938f7 jdom-1.0_beta9-r1.ebuild 1596
+SHA256 69bbacd9fd89c2836c6bf426a7b2d35528dd6d7ecc357d366e619ccec2f1adc0 jdom-1.0_beta9-r1.ebuild 1596
+EBUILD jdom-1.0_beta9-r2.ebuild 1484 RMD160 d6ff46f0a2c79d7fedc3e7e5f3b7353a080f6b6a SHA1 c8ef8b3b25b3799aed8a9634162f4edc1f4f7933 SHA256 a9f846a0797983a7fcc0ed03ae2ad519e957155b4cb52803b28565ffb376b97c
+MD5 0aa20f8757da73f640658306c3c8bdb1 jdom-1.0_beta9-r2.ebuild 1484
+RMD160 d6ff46f0a2c79d7fedc3e7e5f3b7353a080f6b6a jdom-1.0_beta9-r2.ebuild 1484
+SHA256 a9f846a0797983a7fcc0ed03ae2ad519e957155b4cb52803b28565ffb376b97c jdom-1.0_beta9-r2.ebuild 1484
+MISC ChangeLog 5988 RMD160 6d174e9b51402221ae16ef96971eadb190e808e3 SHA1 1430da2c906aa4494a168544613a38b58331b794 SHA256 63f7757eb73ba8c1ba20d9c8df673899866272a3767498788773b8bc252bfe14
+MD5 4cbc92232de0ff970f696c4d2e898f8e ChangeLog 5988
+RMD160 6d174e9b51402221ae16ef96971eadb190e808e3 ChangeLog 5988
+SHA256 63f7757eb73ba8c1ba20d9c8df673899866272a3767498788773b8bc252bfe14 ChangeLog 5988
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -69,10 +66,3 @@ SHA256 8cd045277ddcccb04c717363116c1db5e6b336863faa5941dd9ee6a33bfc9570 files/di
 MD5 d26a104d6e08295aa1296456a0a9334d files/digest-jdom-1.0_beta9-r2 226
 RMD160 d30ad45a2ed73ca3377629ecb2e6f8268a60d33b files/digest-jdom-1.0_beta9-r2 226
 SHA256 8cd045277ddcccb04c717363116c1db5e6b336863faa5941dd9ee6a33bfc9570 files/digest-jdom-1.0_beta9-r2 226
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFFJULQKRy60XGEcJIRAg8UAJ9/g5LdVp253CKXy3JLajDYutRpQwCdFiEz
-CS9K/5tLKISFe10TfgfNbCA=
-=0caM
------END PGP SIGNATURE-----
diff --git a/dev-java/msv/Manifest b/dev-java/msv/Manifest
index def75d8ce152..78632f57ff49 100644
--- a/dev-java/msv/Manifest
+++ b/dev-java/msv/Manifest
@@ -3,18 +3,18 @@ MD5 c1514eff44a7a2cca3ab0bee30140efd files/build-20050627.xml 1771
 RMD160 934dffe75d649f81af2742989f26d767b36059a7 files/build-20050627.xml 1771
 SHA256 ee9b9ab4882a41ed45be0db9760d229d20ddcaf185080c26b7a912ad48caa2d3 files/build-20050627.xml 1771
 DIST msv.20050627.zip 3791703 RMD160 87cd6badcadce5d4a818180fec51cc6a54b8b9e3 SHA1 eb3c76e0e72c3aa26068b5fd70f4400e4d09d564 SHA256 664759fd048d35ed1eea9dbad15cc04475e3c2c5509050cc85c9cbaf778e7278
-EBUILD msv-20050627-r1.ebuild 1279 RMD160 1f535ebaf2dab1039a40d067e5cb77b2eae1479e SHA1 03d788939e08da1d5e03c5bec421c6151db7498c SHA256 c8245b3e4f59a76ebaef1494ed352633d40b0e41fe118256db1223ff08b0c0ac
-MD5 526619b176ec31ac1ac962572ea96f23 msv-20050627-r1.ebuild 1279
-RMD160 1f535ebaf2dab1039a40d067e5cb77b2eae1479e msv-20050627-r1.ebuild 1279
-SHA256 c8245b3e4f59a76ebaef1494ed352633d40b0e41fe118256db1223ff08b0c0ac msv-20050627-r1.ebuild 1279
-EBUILD msv-20050627.ebuild 1437 RMD160 cbfa95ab6c4bc4f51230387410dd6bcbf987b591 SHA1 982974a82c99967dea832ba87bde8c3fe9d015fb SHA256 2ce6c0e11d67501284e8ca8adece93f5e52e821b51d396952949158882131cb7
-MD5 022a4695ff8e89c96bb15085307364ff msv-20050627.ebuild 1437
-RMD160 cbfa95ab6c4bc4f51230387410dd6bcbf987b591 msv-20050627.ebuild 1437
-SHA256 2ce6c0e11d67501284e8ca8adece93f5e52e821b51d396952949158882131cb7 msv-20050627.ebuild 1437
-MISC ChangeLog 1295 RMD160 13f9cb555f905eec804260e855dbdf67ac392a0a SHA1 be7a9af8679b07fac4442ee145ab38034f139ba4 SHA256 0c0e37ec2dc45f1ac206722ee7637563fe118d9608753cb41a2493566f6ec433
-MD5 147ea2919cfa5c50209b53ed4a3dcdf3 ChangeLog 1295
-RMD160 13f9cb555f905eec804260e855dbdf67ac392a0a ChangeLog 1295
-SHA256 0c0e37ec2dc45f1ac206722ee7637563fe118d9608753cb41a2493566f6ec433 ChangeLog 1295
+EBUILD msv-20050627-r1.ebuild 1281 RMD160 ec99b2f787ca9e0ebf8939a5d7c79f280138e33b SHA1 9578f4a8b5cd6c3518da49e310dc0f6b0983a663 SHA256 d03a0bbe21662d30025c31680775033187bf417bb7699d861cf868b98b1e6f2f
+MD5 647fbb5e2ec81c05ecce6b862be46d5f msv-20050627-r1.ebuild 1281
+RMD160 ec99b2f787ca9e0ebf8939a5d7c79f280138e33b msv-20050627-r1.ebuild 1281
+SHA256 d03a0bbe21662d30025c31680775033187bf417bb7699d861cf868b98b1e6f2f msv-20050627-r1.ebuild 1281
+EBUILD msv-20050627.ebuild 1439 RMD160 58c474046f560985ec28206250ea3cfa098f70fb SHA1 b8d17c31309380a8ae50d854f923dceed10d7f5d SHA256 68605589a3b4109a2e2fe90ec76a435073d4fa63d87c53c42e987af5e7478da8
+MD5 3601292af26335d119921d6917451a01 msv-20050627.ebuild 1439
+RMD160 58c474046f560985ec28206250ea3cfa098f70fb msv-20050627.ebuild 1439
+SHA256 68605589a3b4109a2e2fe90ec76a435073d4fa63d87c53c42e987af5e7478da8 msv-20050627.ebuild 1439
+MISC ChangeLog 1441 RMD160 b5af40c82abe4db524c2bf2c07e0bef97c4b35eb SHA1 36b5a0569866c8ff8e054b8c0f66cf170fe2718a SHA256 5e0476a8bc63fcc97b79e949465f22410fa261015b552b6bb78516063ef4aa8f
+MD5 766e367e79646ba2dac35be7841cfb0f ChangeLog 1441
+RMD160 b5af40c82abe4db524c2bf2c07e0bef97c4b35eb ChangeLog 1441
+SHA256 5e0476a8bc63fcc97b79e949465f22410fa261015b552b6bb78516063ef4aa8f ChangeLog 1441
 MISC metadata.xml 326 RMD160 5c6af77657b31894c4704741c0bee09e68e0f04d SHA1 40ebfeee26b5c9fd608cc906306cd82336fd990e SHA256 b6098c189297e1ca9570a55930366a6d450e5e8b2fba3e2c9373166d85bd9573
 MD5 6eb108401b96024f99afbc03c3911158 metadata.xml 326
 RMD160 5c6af77657b31894c4704741c0bee09e68e0f04d metadata.xml 326
diff --git a/dev-java/nekohtml/Manifest b/dev-java/nekohtml/Manifest
index d5f4be61e625..af0ddc808a86 100644
--- a/dev-java/nekohtml/Manifest
+++ b/dev-java/nekohtml/Manifest
@@ -3,14 +3,14 @@ MD5 06ff0492f939b281c732da21cceb9940 files/nekohtml-0.9.5-xerces.patch 705
 RMD160 bff2753d3870fcd97af13cc7bf2aae1f4e2df389 files/nekohtml-0.9.5-xerces.patch 705
 SHA256 32a7b1e79c9258905aab082237d10583fdf3e0e88a7c50349daac7c6c2222925 files/nekohtml-0.9.5-xerces.patch 705
 DIST nekohtml-0.9.5.tar.gz 395953 RMD160 efaaf6df559de293f36e9debb16813347dc174ad SHA1 75ac445fda645cfa6ca4e96362d5d66f80d6a035 SHA256 028de8cd1776cced829e0fb95763b68ee8d536e493935a8e9c213584dd339d5b
-EBUILD nekohtml-0.9.5.ebuild 1274 RMD160 b204d08dfc81867444c259e05733561ab8c2199e SHA1 899d68b83cd58fdf09c2b099384bb4a03031c1d9 SHA256 700e6e2b6d5b3b388dfff954a3b68ce03b5aae3167811f506ad4fb5bb58c4b7d
-MD5 a1c86bd3d7a512f0471f24040246777f nekohtml-0.9.5.ebuild 1274
-RMD160 b204d08dfc81867444c259e05733561ab8c2199e nekohtml-0.9.5.ebuild 1274
-SHA256 700e6e2b6d5b3b388dfff954a3b68ce03b5aae3167811f506ad4fb5bb58c4b7d nekohtml-0.9.5.ebuild 1274
-MISC ChangeLog 401 RMD160 0c0d479ccffe06e989c703d8cb25b622998b192f SHA1 a76bd99385546c57f619df1687eb80d778b8e522 SHA256 514b7ffc7222ccf8f714b141ae75ca9681063cc7594b01874ad6b5b3c2a6509a
-MD5 b768dfad06a0250d7138dc87d52b6fd6 ChangeLog 401
-RMD160 0c0d479ccffe06e989c703d8cb25b622998b192f ChangeLog 401
-SHA256 514b7ffc7222ccf8f714b141ae75ca9681063cc7594b01874ad6b5b3c2a6509a ChangeLog 401
+EBUILD nekohtml-0.9.5.ebuild 1276 RMD160 7cfac7c43a0e65413393960a2941739218050840 SHA1 e5f774e9f9727eded1424ed8925d88bb0eb681b8 SHA256 19dd6715c51d0ac3bdf6ed2a3ed8130ec61132ad1be6c635e984bd8232199886
+MD5 240731ac59a582890bdac8bfac1528c5 nekohtml-0.9.5.ebuild 1276
+RMD160 7cfac7c43a0e65413393960a2941739218050840 nekohtml-0.9.5.ebuild 1276
+SHA256 19dd6715c51d0ac3bdf6ed2a3ed8130ec61132ad1be6c635e984bd8232199886 nekohtml-0.9.5.ebuild 1276
+MISC ChangeLog 523 RMD160 9a63f71a7646b5c21b066a818ebc66e87b6b5dee SHA1 3578d2a4d7f8a048555b22686e88f81b3921511a SHA256 1df443758acf27de9928b8ce546720ae33338a91382e824b5ed700504190346a
+MD5 185107f910beb952f14aed652b46e8cf ChangeLog 523
+RMD160 9a63f71a7646b5c21b066a818ebc66e87b6b5dee ChangeLog 523
+SHA256 1df443758acf27de9928b8ce546720ae33338a91382e824b5ed700504190346a ChangeLog 523
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
diff --git a/dev-java/poi/Manifest b/dev-java/poi/Manifest
index c3582f1c1df9..d4c2ea205635 100644
--- a/dev-java/poi/Manifest
+++ b/dev-java/poi/Manifest
@@ -1,17 +1,28 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 89e0f8352b002748442d217bd949ca09 ChangeLog 2492
-MD5 34ac7de875dec815d44a2bdbf7f4a64f files/digest-poi-2.5-r2 79
-MD5 2e7d58ced4af69ab26ddf0bf76cb173f files/digest-poi-2.5.1 81
+AUX poi-2.5-jikes-fix.patch 1190 RMD160 f7cf0f41d37e6010edd5ca081f0a7566862991bb SHA1 e525737b05fe8a84700bbe1cc677e1416d781843 SHA256 a786c5d718e3b934101607eeb7c76c2a5b5d8e245cde9e502d14cfecfc85bcf4
 MD5 bf71154ca919a88d8c12da29e33ef4d9 files/poi-2.5-jikes-fix.patch 1190
+RMD160 f7cf0f41d37e6010edd5ca081f0a7566862991bb files/poi-2.5-jikes-fix.patch 1190
+SHA256 a786c5d718e3b934101607eeb7c76c2a5b5d8e245cde9e502d14cfecfc85bcf4 files/poi-2.5-jikes-fix.patch 1190
+DIST poi-src-2.5-final-20040302.tar.gz 6878720
+DIST poi-src-2.5.1-final-20040804.tar.gz 6870414
+EBUILD poi-2.5-r2.ebuild 1843 RMD160 f0ee2ab887478d51e486ddc60c12b7c1bb041533 SHA1 ea9fdce1ef560879ba043c041ae8fa3f3ba90f1b SHA256 ce2e996c5c3acc21aa5aa3191e296b154a10aaff8d30184f1608171e1940b9b9
+MD5 3d45ada2f6ba98361e138ebb917d55c4 poi-2.5-r2.ebuild 1843
+RMD160 f0ee2ab887478d51e486ddc60c12b7c1bb041533 poi-2.5-r2.ebuild 1843
+SHA256 ce2e996c5c3acc21aa5aa3191e296b154a10aaff8d30184f1608171e1940b9b9 poi-2.5-r2.ebuild 1843
+EBUILD poi-2.5.1.ebuild 2035 RMD160 fb800b54007494e0c9f1ac326c0b01f7b7eea430 SHA1 c1b3578e4a20dbbe7604749c1a6158c25950a1e9 SHA256 d91010dd3d7bba3a1ef41404d69cafe4bda7d8a259fbea0941b008c9a9399687
+MD5 82d2169d91d4def1c02e747117cf9a51 poi-2.5.1.ebuild 2035
+RMD160 fb800b54007494e0c9f1ac326c0b01f7b7eea430 poi-2.5.1.ebuild 2035
+SHA256 d91010dd3d7bba3a1ef41404d69cafe4bda7d8a259fbea0941b008c9a9399687 poi-2.5.1.ebuild 2035
+MISC ChangeLog 2626 RMD160 41789bcf58a7d13317e2142c2859c75828d68ec4 SHA1 a0f116ecd140f3db1d34dde2031ad3c90be65af5 SHA256 5642d8f558afba6f455b4836c2de5fd90acd786f559bd2511f795c7b2465a222
+MD5 b0ec172948c56d0babe52904912fe78f ChangeLog 2626
+RMD160 41789bcf58a7d13317e2142c2859c75828d68ec4 ChangeLog 2626
+SHA256 5642d8f558afba6f455b4836c2de5fd90acd786f559bd2511f795c7b2465a222 ChangeLog 2626
+MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 aa5948b2e91b384a44a3174db2156011 poi-2.5-r2.ebuild 1847
-MD5 b7d2fb806be4e5ec53b490ae9c414a98 poi-2.5.1.ebuild 2039
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDospuQiJ/wx066S4RAvWIAJ9tsARhnkZKjkzN0jLn4/QS74ivhACffTAk
-WmWpvr9nfpE+cQ3eBxks11M=
-=DD3I
------END PGP SIGNATURE-----
+RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
+SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 metadata.xml 157
+MD5 34ac7de875dec815d44a2bdbf7f4a64f files/digest-poi-2.5-r2 79
+RMD160 ef646bd118913e1c40bd526e502e3c561599539d files/digest-poi-2.5-r2 79
+SHA256 21493dd767c6f6806d416a390b3ef67fbb4521f956f0e140cd979abd4c5ad338 files/digest-poi-2.5-r2 79
+MD5 2e7d58ced4af69ab26ddf0bf76cb173f files/digest-poi-2.5.1 81
+RMD160 072da248836c37914e059b4d046aafe70b2a763d files/digest-poi-2.5.1 81
+SHA256 67a2b1d52e60e1f391c49744c4324b50e2f68ee00c20799ba82d4b8c64b18fc9 files/digest-poi-2.5.1 81
diff --git a/dev-java/saxpath/Manifest b/dev-java/saxpath/Manifest
index 9d9f09768d37..749af537c52a 100644
--- a/dev-java/saxpath/Manifest
+++ b/dev-java/saxpath/Manifest
@@ -1,27 +1,20 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX MANIFEST.MF 276 RMD160 52c5c2f61f0c0e7f7f5278562ecc814419edc5f1 SHA1 5f3424a59b723a35bc6acca3c36d8372dd58899c SHA256 b73b251bc3239bf854935722e39aedd94bb30eadb63795a5c4e6bfc89def10a1
 MD5 cb58720b66697c1ef1f47de80c839e00 files/MANIFEST.MF 276
 RMD160 52c5c2f61f0c0e7f7f5278562ecc814419edc5f1 files/MANIFEST.MF 276
 SHA256 b73b251bc3239bf854935722e39aedd94bb30eadb63795a5c4e6bfc89def10a1 files/MANIFEST.MF 276
 DIST saxpath-1.0.tar.gz 2166023 RMD160 59520216dc54bad5b01e351fd6ae89750b84a876 SHA1 7104f1252fc4296200d5282c8b2863b94ee70cff SHA256 90c07abb3e3f09c398c02d84b44b651aa59d724aa6fabf45aa44a2365a6725c1
-EBUILD saxpath-1.0-r1.ebuild 1214 RMD160 797b342563af9e8d9752421ff7c867ba5f244f38 SHA1 7b4cdd6feac53a78964e95f46b2732a73425313b SHA256 7a4cf9e6219bbacb1c50c278a8780be584f03dbe3a223a7e615be24eb0682f54
-MD5 34fb02223648cf5d72edfe1ee11e4b13 saxpath-1.0-r1.ebuild 1214
-RMD160 797b342563af9e8d9752421ff7c867ba5f244f38 saxpath-1.0-r1.ebuild 1214
-SHA256 7a4cf9e6219bbacb1c50c278a8780be584f03dbe3a223a7e615be24eb0682f54 saxpath-1.0-r1.ebuild 1214
 EBUILD saxpath-1.0-r2.ebuild 1377 RMD160 f428e2dba390080e0e6d6b5f02165673e98aae70 SHA1 b1b144fc7c776402ff5e4884fb5bdd2491758b5d SHA256 32a5cc0a6b825ea656a11cff0c25ee360efe2e6f39effa56db2352f5fe6a70db
 MD5 fc0ac84a94b5004017b48192a6b0150b saxpath-1.0-r2.ebuild 1377
 RMD160 f428e2dba390080e0e6d6b5f02165673e98aae70 saxpath-1.0-r2.ebuild 1377
 SHA256 32a5cc0a6b825ea656a11cff0c25ee360efe2e6f39effa56db2352f5fe6a70db saxpath-1.0-r2.ebuild 1377
-EBUILD saxpath-1.0.ebuild 1194 RMD160 65b245d103cebe6aa8146d9d7077a97078a42403 SHA1 ca841c5cb11a282971c012d4aab83e165dba7ee7 SHA256 f429315d9e1bf81048623ec4e448cfe9aaab39f8f5cc083496ae3dd01a4bb110
-MD5 328f4d3dfdadfcaa06cbdcd943a7a2eb saxpath-1.0.ebuild 1194
-RMD160 65b245d103cebe6aa8146d9d7077a97078a42403 saxpath-1.0.ebuild 1194
-SHA256 f429315d9e1bf81048623ec4e448cfe9aaab39f8f5cc083496ae3dd01a4bb110 saxpath-1.0.ebuild 1194
-MISC ChangeLog 2104 RMD160 6f43e53a1841949ca40d5de727bf6bd51044c5ac SHA1 be82910339c8883daca4e0d97966a718886f362a SHA256 3a38f11d7b0f69bae7df005fc7d06fe0b6fb150f35e41ce5f3250679afe16369
-MD5 c6e5349c60b8ea07bb2f69ec62725da8 ChangeLog 2104
-RMD160 6f43e53a1841949ca40d5de727bf6bd51044c5ac ChangeLog 2104
-SHA256 3a38f11d7b0f69bae7df005fc7d06fe0b6fb150f35e41ce5f3250679afe16369 ChangeLog 2104
+EBUILD saxpath-1.0.ebuild 1187 RMD160 6be9c3b7c661e62368db3205dd76ebda993d054d SHA1 59b85d1d0e615c9f110740db1f90720192e7202e SHA256 2a6afb2a2d6503d10bd959452587eaacb6d0b285c9c80459a34a288fc9e8b959
+MD5 3f2174873aa94dee48e34e8fa748beef saxpath-1.0.ebuild 1187
+RMD160 6be9c3b7c661e62368db3205dd76ebda993d054d saxpath-1.0.ebuild 1187
+SHA256 2a6afb2a2d6503d10bd959452587eaacb6d0b285c9c80459a34a288fc9e8b959 saxpath-1.0.ebuild 1187
+MISC ChangeLog 2247 RMD160 552445707b247d0e4662c4eed6a703c7c99fb1c1 SHA1 5a6638352cc2cc7983b5213cba26d60111e7355d SHA256 83a89922b5f5ad6cb28642b02bbd7860e85db6f2273c7a7faec7d85b1302ddfa
+MD5 e2c4cfe6c5c51e767211f7e4848ff526 ChangeLog 2247
+RMD160 552445707b247d0e4662c4eed6a703c7c99fb1c1 ChangeLog 2247
+SHA256 83a89922b5f5ad6cb28642b02bbd7860e85db6f2273c7a7faec7d85b1302ddfa ChangeLog 2247
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
@@ -29,16 +22,6 @@ SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb metadata
 MD5 29e91a0f0458d84f441434cb21ad1b01 files/digest-saxpath-1.0 238
 RMD160 409c6b590344130a17a9e59eca9e4bf47fee9408 files/digest-saxpath-1.0 238
 SHA256 8726d9cd026692d2821902539a8b664dc64c879390d5694e3154153b89daf9bd files/digest-saxpath-1.0 238
-MD5 29e91a0f0458d84f441434cb21ad1b01 files/digest-saxpath-1.0-r1 238
-RMD160 409c6b590344130a17a9e59eca9e4bf47fee9408 files/digest-saxpath-1.0-r1 238
-SHA256 8726d9cd026692d2821902539a8b664dc64c879390d5694e3154153b89daf9bd files/digest-saxpath-1.0-r1 238
 MD5 29e91a0f0458d84f441434cb21ad1b01 files/digest-saxpath-1.0-r2 238
 RMD160 409c6b590344130a17a9e59eca9e4bf47fee9408 files/digest-saxpath-1.0-r2 238
 SHA256 8726d9cd026692d2821902539a8b664dc64c879390d5694e3154153b89daf9bd files/digest-saxpath-1.0-r2 238
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFFJT3CKRy60XGEcJIRAncPAJ4lVycaPF7nDHSKYc2fHep849imsgCgqHyX
-JF8dOohbTGNMMQcYQVz9ltI=
-=fWks
------END PGP SIGNATURE-----
diff --git a/dev-java/saxpath/files/digest-saxpath-1.0-r1 b/dev-java/saxpath/files/digest-saxpath-1.0-r1
deleted file mode 100644
index 55af3577d2a5..000000000000
--- a/dev-java/saxpath/files/digest-saxpath-1.0-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 cc95ecc7dfb689a29bd42323490ee702 saxpath-1.0.tar.gz 2166023
-RMD160 59520216dc54bad5b01e351fd6ae89750b84a876 saxpath-1.0.tar.gz 2166023
-SHA256 90c07abb3e3f09c398c02d84b44b651aa59d724aa6fabf45aa44a2365a6725c1 saxpath-1.0.tar.gz 2166023
diff --git a/dev-java/saxpath/saxpath-1.0-r1.ebuild b/dev-java/saxpath/saxpath-1.0-r1.ebuild
deleted file mode 100644
index 0ebc086c03f2..000000000000
--- a/dev-java/saxpath/saxpath-1.0-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/saxpath/saxpath-1.0-r1.ebuild,v 1.2 2006/10/05 17:15:33 gustavoz Exp $
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A Simple API for XPath."
-HOMEPAGE="http://saxpath.sourceforge.net/"
-SRC_URI="mirror://sourceforge/saxpath/${P}.tar.gz"
-LICENSE="saxpath"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="doc junit source"
-
-RDEPEND=">=virtual/jre-1.4
-	dev-java/xalan
-	>=dev-java/xerces-2.6.2-r1"
-DEPEND=">=virtual/jdk-1.4
-	dev-java/ant-core
-	junit? ( dev-java/ant-tasks )
-	doc? ( dev-java/ant-tasks )
-	${RDEPEND}"
-
-S=${WORKDIR}/${P}-FCS
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	rm -f *.jar
-	mkdir src/conf
-	cp ${FILESDIR}/MANIFEST.MF src/conf
-	cd lib
-	rm -f *.jar
-	use junit && java-pkg_jar-from junit
-	java-pkg_jar-from xalan
-	java-pkg_jar-from xerces-2
-}
-
-src_compile() {
-	local antops="package"
-	use doc && antops="${antops} doc javadoc"
-	use junit && antops="${antops} test"
-	eant ${antops} || die "failed to compile"
-}
-
-src_install() {
-	java-pkg_dojar build/saxpath.jar
-
-	use doc && java-pkg_dohtml -r build/doc/*
-	use source && java-pkg_dosrc src/java/main/*
-}
diff --git a/dev-java/skinlf/Manifest b/dev-java/skinlf/Manifest
index da8438ec67a8..306086a97a45 100644
--- a/dev-java/skinlf/Manifest
+++ b/dev-java/skinlf/Manifest
@@ -1,43 +1,43 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 7adbbd46db975031a20c63d8316e3c42 ChangeLog 989
-RMD160 ec03906786b16c5b688f0d6f3e58ad33da96d38f ChangeLog 989
-SHA256 5b765726b893d3091f4a0e31ae3de9a8384250e428a21c485edbc024d4a05968 ChangeLog 989
-MD5 712c7b8f9a62b32643ac3bbe18b56e36 files/digest-skinlf-1.2.12 71
-RMD160 d17ea964bb12e3063affd1a00cf301babaa94b70 files/digest-skinlf-1.2.12 71
-SHA256 371f32ab3bd8fb66cc4435e7b06cd94904914228707013b035fa4cdd1e798c6e files/digest-skinlf-1.2.12 71
-MD5 712c7b8f9a62b32643ac3bbe18b56e36 files/digest-skinlf-1.2.12-r1 71
-RMD160 d17ea964bb12e3063affd1a00cf301babaa94b70 files/digest-skinlf-1.2.12-r1 71
-SHA256 371f32ab3bd8fb66cc4435e7b06cd94904914228707013b035fa4cdd1e798c6e files/digest-skinlf-1.2.12-r1 71
+AUX skinlf-1.2.12-build.xml 11622 RMD160 e5bd5810f4f6c52c5252d0ccf9fec9388fd32793 SHA1 c0dd71277140a398150ad183d75fc9602d8eb6dc SHA256 3404b1d02af29a500ae954aa35ca22f5e95378f7c5617095ab5d21fc3015c817
 MD5 3fb7968ec94470fdcdce84fa8cbe2bab files/skinlf-1.2.12-build.xml 11622
 RMD160 e5bd5810f4f6c52c5252d0ccf9fec9388fd32793 files/skinlf-1.2.12-build.xml 11622
 SHA256 3404b1d02af29a500ae954aa35ca22f5e95378f7c5617095ab5d21fc3015c817 files/skinlf-1.2.12-build.xml 11622
+AUX skinlf-1.2.12-common-devjavanet.xml 1370 RMD160 f52c0ff29296ae06bb97e8777502045d3cb91bb4 SHA1 a8d6887a1b45f64894fb52b8af1728b29db7f380 SHA256 348ffcb49ab0ba968415036890963509692db5e930d4fcffe66b7c91dc8f8298
 MD5 ac87465a658ce799c09247109b646312 files/skinlf-1.2.12-common-devjavanet.xml 1370
 RMD160 f52c0ff29296ae06bb97e8777502045d3cb91bb4 files/skinlf-1.2.12-common-devjavanet.xml 1370
 SHA256 348ffcb49ab0ba968415036890963509692db5e930d4fcffe66b7c91dc8f8298 files/skinlf-1.2.12-common-devjavanet.xml 1370
+AUX skinlf-1.2.12-common.xml 5452 RMD160 83142be5733bff326546a59c06846f084674d16e SHA1 51921d041edb64baf4464044f5b24d6142c2d993 SHA256 a6ea18e7187684e86797ca51f45c0224f44433184f0473afbb32b08cadc95732
 MD5 5c756abb1a1f464545c91c576b919dfc files/skinlf-1.2.12-common.xml 5452
 RMD160 83142be5733bff326546a59c06846f084674d16e files/skinlf-1.2.12-common.xml 5452
 SHA256 a6ea18e7187684e86797ca51f45c0224f44433184f0473afbb32b08cadc95732 files/skinlf-1.2.12-common.xml 5452
+AUX skinlf-1.2.12-image-utils-without-jimi.patch 2968 RMD160 e007efb32e384935e5ff9f92d0e167f0da9ff4ff SHA1 11232ab8ae24e4ea12908ae48e6bf0122bb38680 SHA256 6cc030349728e30c2593cbb8945b7664ccbe11ee4efe49e87742a34e4506fa8c
 MD5 a25557204224b7e4a380d42b2df424ee files/skinlf-1.2.12-image-utils-without-jimi.patch 2968
 RMD160 e007efb32e384935e5ff9f92d0e167f0da9ff4ff files/skinlf-1.2.12-image-utils-without-jimi.patch 2968
 SHA256 6cc030349728e30c2593cbb8945b7664ccbe11ee4efe49e87742a34e4506fa8c files/skinlf-1.2.12-image-utils-without-jimi.patch 2968
+AUX skinlf-1.2.12-image-utils.patch 1497 RMD160 2f407cee8a6fa88a8afca7fae2d90319d86ef618 SHA1 03cb521f63cca3c1a13453668775e8357a37c7bc SHA256 3a8246c1c038684c6c933f6dce6177a2d4488ae7aaccac01bcd24587c530c284
 MD5 105061490c4431c113a77768131aa5fe files/skinlf-1.2.12-image-utils.patch 1497
 RMD160 2f407cee8a6fa88a8afca7fae2d90319d86ef618 files/skinlf-1.2.12-image-utils.patch 1497
 SHA256 3a8246c1c038684c6c933f6dce6177a2d4488ae7aaccac01bcd24587c530c284 files/skinlf-1.2.12-image-utils.patch 1497
+DIST skinlf-1.2.12-20051009.zip 836773
+EBUILD skinlf-1.2.12-r1.ebuild 1374 RMD160 78c96085525faaceb7fff776f08c84d6b0a986d2 SHA1 761dacedbf928da728a5fb607afa3bc2dfd7cd78 SHA256 5a851e9a2d1d9e95a48629862a247cd9fa1ce65fc95d636102ab9c51e485cf74
+MD5 6175ab6fffbf69ec52414af176c22da0 skinlf-1.2.12-r1.ebuild 1374
+RMD160 78c96085525faaceb7fff776f08c84d6b0a986d2 skinlf-1.2.12-r1.ebuild 1374
+SHA256 5a851e9a2d1d9e95a48629862a247cd9fa1ce65fc95d636102ab9c51e485cf74 skinlf-1.2.12-r1.ebuild 1374
+EBUILD skinlf-1.2.12.ebuild 1430 RMD160 d26c03da32c29ceb840f2d54b4e47c3519c2c66a SHA1 a5d5cd379b098f3a5bc6d67b3bcfa3f1b3440a8f SHA256 ceb7f9b463b953fffd24651c327a18aecfa80f7027861044b73ba946f76ec414
+MD5 fad50119a953d53d8fa7820c4e8ea604 skinlf-1.2.12.ebuild 1430
+RMD160 d26c03da32c29ceb840f2d54b4e47c3519c2c66a skinlf-1.2.12.ebuild 1430
+SHA256 ceb7f9b463b953fffd24651c327a18aecfa80f7027861044b73ba946f76ec414 skinlf-1.2.12.ebuild 1430
+MISC ChangeLog 1136 RMD160 1f5bb6c64084b1e34c79efaf3c5a7eee60a4d14c SHA1 d8099c23f2918ad13ca2a85acaa5d2699e582f0a SHA256 14198a517879d5d9717b194ceca9f46936b1c7953ac359fbb220e603c0d57634
+MD5 0209a182298ef210b2fe633bb41ca87f ChangeLog 1136
+RMD160 1f5bb6c64084b1e34c79efaf3c5a7eee60a4d14c ChangeLog 1136
+SHA256 14198a517879d5d9717b194ceca9f46936b1c7953ac359fbb220e603c0d57634 ChangeLog 1136
+MISC metadata.xml 296 RMD160 90aca187f5983a11f749a6bcd1316f515eb1b350 SHA1 5a3419c2ca8173341534c0d0157bcb48defa521d SHA256 8e28ce8172f0873f2dbf2a82b1d0cf47873edab69aee8062eabe3818b91be0ce
 MD5 2edcd635da8bde46bdfbb82e5929a5da metadata.xml 296
 RMD160 90aca187f5983a11f749a6bcd1316f515eb1b350 metadata.xml 296
 SHA256 8e28ce8172f0873f2dbf2a82b1d0cf47873edab69aee8062eabe3818b91be0ce metadata.xml 296
-MD5 47b22b2f69422181e8655d0c646f3ede skinlf-1.2.12-r1.ebuild 1369
-RMD160 3b500466e896d30a6f3d2ddf313264281673b6ae skinlf-1.2.12-r1.ebuild 1369
-SHA256 a9aaaf222a3a85c43625a83a706a7729149f06f217256f39738082466000b7af skinlf-1.2.12-r1.ebuild 1369
-MD5 9a711d2af5980f3479ff163d1b1d5516 skinlf-1.2.12.ebuild 1425
-RMD160 001202f03d1c27fd97d532f9ccaf4fdffa3bed65 skinlf-1.2.12.ebuild 1425
-SHA256 0500ac4bdd7fde58df92ddf6e971452bf5bbe467735b7281ba093dcebfc13abb skinlf-1.2.12.ebuild 1425
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEHdj+CRZPokWLroQRAsL4AJ9MHV+Z4uU0xdlLSE3m6bXboc90IACdE/jV
-BzEzuT83+BQe8/1iPdS+tDw=
-=EJgV
------END PGP SIGNATURE-----
+MD5 712c7b8f9a62b32643ac3bbe18b56e36 files/digest-skinlf-1.2.12 71
+RMD160 d17ea964bb12e3063affd1a00cf301babaa94b70 files/digest-skinlf-1.2.12 71
+SHA256 371f32ab3bd8fb66cc4435e7b06cd94904914228707013b035fa4cdd1e798c6e files/digest-skinlf-1.2.12 71
+MD5 712c7b8f9a62b32643ac3bbe18b56e36 files/digest-skinlf-1.2.12-r1 71
+RMD160 d17ea964bb12e3063affd1a00cf301babaa94b70 files/digest-skinlf-1.2.12-r1 71
+SHA256 371f32ab3bd8fb66cc4435e7b06cd94904914228707013b035fa4cdd1e798c6e files/digest-skinlf-1.2.12-r1 71
diff --git a/dev-java/telnetd/Manifest b/dev-java/telnetd/Manifest
index 18f180c1e5d4..f7ed6f444792 100644
--- a/dev-java/telnetd/Manifest
+++ b/dev-java/telnetd/Manifest
@@ -1,14 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 e9a92de96f8ec68178e4bc9bdd1d80b0 telnetd-1.0-r1.ebuild 969
+DIST telnetd-1.0.zip 1786068
+EBUILD telnetd-1.0-r1.ebuild 966 RMD160 8a995225ba4cf20b5caeb10e41638884f3c5f6d2 SHA1 2d92681c43c76d815598ac98c23facb141d28052 SHA256 37844d0c57b70d9012272e533b7813669de025e920d8c2781e6ed85ead75b696
+MD5 a3f141bd90e0a31f89c2c1e47d227f5a telnetd-1.0-r1.ebuild 966
+RMD160 8a995225ba4cf20b5caeb10e41638884f3c5f6d2 telnetd-1.0-r1.ebuild 966
+SHA256 37844d0c57b70d9012272e533b7813669de025e920d8c2781e6ed85ead75b696 telnetd-1.0-r1.ebuild 966
+MISC ChangeLog 1535 RMD160 5ef5964ecfa4f7bb1be00412d65cb28b81ea8b95 SHA1 c0d457b3009b5ce11dbda2d2c4b6d102b1934a74 SHA256 ebdd899035d915b9f85578967e367a59a1523993b2d080b876aed16b36c00fae
+MD5 568c2840f0cbee0f17b59adc91bba037 ChangeLog 1535
+RMD160 5ef5964ecfa4f7bb1be00412d65cb28b81ea8b95 ChangeLog 1535
+SHA256 ebdd899035d915b9f85578967e367a59a1523993b2d080b876aed16b36c00fae ChangeLog 1535
+MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 a832b30b51bc44f98cc1c7d02a546a28 ChangeLog 1413
+RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
+SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 metadata.xml 157
 MD5 c0973530f5566713608d4abf3b0908ed files/digest-telnetd-1.0-r1 61
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDKz5xLLFUmVNQ7rkRAqPGAJ9IMzaw2Bxq5NAbX0EmC5cpIFM1AgCgzV2S
-ku3TBc95WqXzg5nPbmlhmck=
-=270O
------END PGP SIGNATURE-----
+RMD160 d84bbf265eb8fcb2741feffdba3612e80c58da6e files/digest-telnetd-1.0-r1 61
+SHA256 6e33d81d46e225a2fc407d8a3b3259098e3ef88edec99308b049d61ba1261efb files/digest-telnetd-1.0-r1 61
diff --git a/dev-java/xalan/Manifest b/dev-java/xalan/Manifest
index e7fea4ddcaa2..750b0235bcae 100644
--- a/dev-java/xalan/Manifest
+++ b/dev-java/xalan/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX xalan.script 135 RMD160 bd6e22386560549fe04e8d15b62ad2cb57090bb4 SHA1 b2970e68c2f81037e666261fd10cd3355a39e9f4 SHA256 ecd86596da4982485edaf7d1dfbd74ed3a53401f491846d71c47ccb4a64f8f37
 MD5 9191b4a78191c1b0485ebf92aae74e9d files/xalan.script 135
 RMD160 bd6e22386560549fe04e8d15b62ad2cb57090bb4 files/xalan.script 135
@@ -16,18 +13,18 @@ EBUILD xalan-2.6.0-r3.ebuild 1545 RMD160 538316907ec47a8c6222233a3e0d78c3174525e
 MD5 cf6bf02b253d6a90ead415ca79cd593a xalan-2.6.0-r3.ebuild 1545
 RMD160 538316907ec47a8c6222233a3e0d78c3174525e7 xalan-2.6.0-r3.ebuild 1545
 SHA256 44d63daa97fa904c32ecfa3448e5241154034443de6913c7aa748e6207924a94 xalan-2.6.0-r3.ebuild 1545
-EBUILD xalan-2.7.0-r1.ebuild 1639 RMD160 43e9be617b7bc25e3e3ba71e5986de70f4e74a6a SHA1 72bec748bf8d1312fca32a0b3f3be60ba8138b5c SHA256 f2804e0e9e073793e693552a4bba18ab494ac94e0c0cda422f04fb2284604392
-MD5 02eb64476aed1c4206eb3743db4bbb52 xalan-2.7.0-r1.ebuild 1639
-RMD160 43e9be617b7bc25e3e3ba71e5986de70f4e74a6a xalan-2.7.0-r1.ebuild 1639
-SHA256 f2804e0e9e073793e693552a4bba18ab494ac94e0c0cda422f04fb2284604392 xalan-2.7.0-r1.ebuild 1639
-EBUILD xalan-2.7.0-r2.ebuild 1558 RMD160 b20ef243a7e43af0d1a762ecc6f4d39237503655 SHA1 1e0aebeb3585025b440a6196218daca56eab442b SHA256 661d10a9e48be64c7a23f803a531df61d86f7de56b06686e283773ad31c473f0
-MD5 751b1a15ffc708dec987852277401a36 xalan-2.7.0-r2.ebuild 1558
-RMD160 b20ef243a7e43af0d1a762ecc6f4d39237503655 xalan-2.7.0-r2.ebuild 1558
-SHA256 661d10a9e48be64c7a23f803a531df61d86f7de56b06686e283773ad31c473f0 xalan-2.7.0-r2.ebuild 1558
-MISC ChangeLog 8295 RMD160 8da2434ad41bd20a0553f5d4e1f443054b9d07a8 SHA1 c9497e0e61c687439db5611c6bf4c0d60f7b784b SHA256 ef230a296dbf160639534444971a7db4d4e87382229a48701e3d4fe021fd5ecb
-MD5 baa302d41407fac671bc301ba667af9d ChangeLog 8295
-RMD160 8da2434ad41bd20a0553f5d4e1f443054b9d07a8 ChangeLog 8295
-SHA256 ef230a296dbf160639534444971a7db4d4e87382229a48701e3d4fe021fd5ecb ChangeLog 8295
+EBUILD xalan-2.7.0-r1.ebuild 1634 RMD160 8fe597dacdfda3ba51db67a59a085858b77bbb71 SHA1 62d7091d9725f577785453199e89b2fbf0264d78 SHA256 004ca44cb78ad5563cbc752de39fbcadfc7952c17deb6d426c55b81b308285db
+MD5 f62b0baa36b43f4de4b1fbd068caa2ae xalan-2.7.0-r1.ebuild 1634
+RMD160 8fe597dacdfda3ba51db67a59a085858b77bbb71 xalan-2.7.0-r1.ebuild 1634
+SHA256 004ca44cb78ad5563cbc752de39fbcadfc7952c17deb6d426c55b81b308285db xalan-2.7.0-r1.ebuild 1634
+EBUILD xalan-2.7.0-r2.ebuild 1553 RMD160 967eb7ccf7f67b2f6ddd94314ab9d20609cd31b2 SHA1 7e4787980344c31637caf21c4d6835a533d9e6a9 SHA256 55b0e4fc7d41b46f81fcb8d6e6047641b0961ede268f06f8f9029f1ee7ec84eb
+MD5 983b3fdcfb7f4a7fa858758e228ef555 xalan-2.7.0-r2.ebuild 1553
+RMD160 967eb7ccf7f67b2f6ddd94314ab9d20609cd31b2 xalan-2.7.0-r2.ebuild 1553
+SHA256 55b0e4fc7d41b46f81fcb8d6e6047641b0961ede268f06f8f9029f1ee7ec84eb xalan-2.7.0-r2.ebuild 1553
+MISC ChangeLog 8440 RMD160 a9ffd42bf87d81f66f1d4da5177605d6befd2c93 SHA1 12be578eea2d0820848b4c2d9a7a7dc5846b0442 SHA256 a8ebc9482dc5d45f23beb2f052182acbd9ca0c496289a27d8f0bfc1c42f62495
+MD5 3e8d78ec34edc93cc7c51c7fc072539b ChangeLog 8440
+RMD160 a9ffd42bf87d81f66f1d4da5177605d6befd2c93 ChangeLog 8440
+SHA256 a8ebc9482dc5d45f23beb2f052182acbd9ca0c496289a27d8f0bfc1c42f62495 ChangeLog 8440
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -44,10 +41,3 @@ SHA256 3943b42e6cc9e9628b9b73eba240913afb4d499eb35b2654e8b6514b808f72d5 files/di
 MD5 c4bd9e033dfd12f166e9f103104a8698 files/digest-xalan-2.7.0-r2 256
 RMD160 cdcdaca8b15cee6d71534b1b9b6398e38178a190 files/digest-xalan-2.7.0-r2 256
 SHA256 3943b42e6cc9e9628b9b73eba240913afb4d499eb35b2654e8b6514b808f72d5 files/digest-xalan-2.7.0-r2 256
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFFJTscKRy60XGEcJIRAob9AKCIqoK7MpXfotnKkt6bW1V3BLfM8gCfe2LW
-HZ99z0+NcerLXGAfuj/LNSQ=
-=dPsN
------END PGP SIGNATURE-----
diff --git a/dev-java/xmldb/Manifest b/dev-java/xmldb/Manifest
index 9accfae35b53..da8aba888bdd 100644
--- a/dev-java/xmldb/Manifest
+++ b/dev-java/xmldb/Manifest
@@ -7,18 +7,18 @@ MD5 21c727f1afea0d4c02f10a03bbbedd60 files/xmldb-20011111-unreachable.patch 456
 RMD160 a9ddff6a4314f5639230981d2d97dd3d8f20b4cd files/xmldb-20011111-unreachable.patch 456
 SHA256 c121305c217165ae34a593c0ec4b3c990672240285df2992f10aeb96f04234b2 files/xmldb-20011111-unreachable.patch 456
 DIST xmldb-api-11112001.tar.gz 36553 RMD160 afa086d80b917d8801b195f399fe17a045dcdaad SHA1 2fca53370d68683c88865756eba4eac3b52fa50e SHA256 9bf195503b6ce45d17e1953041c125602bc69e3f6812a031055d26ca558d1006
-EBUILD xmldb-20011111-r1.ebuild 1220 RMD160 0bd775487d32ecc8511b6ba970e428dff127ffc5 SHA1 3986b2042a4243cd2df55e9c67c81006b93b3540 SHA256 1719b00ffc523f7323e636ac5a77f1d370e2f9c2e2feb45d2056d23f25714e3c
-MD5 472ecb645f606d3dfddd5abf767b3bf3 xmldb-20011111-r1.ebuild 1220
-RMD160 0bd775487d32ecc8511b6ba970e428dff127ffc5 xmldb-20011111-r1.ebuild 1220
-SHA256 1719b00ffc523f7323e636ac5a77f1d370e2f9c2e2feb45d2056d23f25714e3c xmldb-20011111-r1.ebuild 1220
-EBUILD xmldb-20011111.ebuild 1383 RMD160 a5367d5c66269eed9ead3593a35a882490e6911e SHA1 fb1efaab882356799900183bc9f4359a62c66cf7 SHA256 b907f85e9d0b0ac804e06ecfe3c83bdeea1663277742d87b494eb40495adc882
-MD5 c53eb76a6cd8a6ab56e6f6b0ce3d70fe xmldb-20011111.ebuild 1383
-RMD160 a5367d5c66269eed9ead3593a35a882490e6911e xmldb-20011111.ebuild 1383
-SHA256 b907f85e9d0b0ac804e06ecfe3c83bdeea1663277742d87b494eb40495adc882 xmldb-20011111.ebuild 1383
-MISC ChangeLog 2001 RMD160 a702d0ec44578ed6e8123c9539df1e3433e117bc SHA1 05fe31c95c4eb591408f00237f9c53eee02bc86c SHA256 3845b4988206e461ce8265a33bdc50b1ce830dc6f5147c2d7b5683d240a2277a
-MD5 54725159a6a9c097dba5957727d06ae6 ChangeLog 2001
-RMD160 a702d0ec44578ed6e8123c9539df1e3433e117bc ChangeLog 2001
-SHA256 3845b4988206e461ce8265a33bdc50b1ce830dc6f5147c2d7b5683d240a2277a ChangeLog 2001
+EBUILD xmldb-20011111-r1.ebuild 1220 RMD160 ea546558c2a89134d0c2effa67e793e94918dcc3 SHA1 1b2342589875f8e53f6bdbd186b8d48cdce1958a SHA256 57a8d45ef911b672766e85d965f44c6163217f4d1a96ad4c2a10b49ce03ed57c
+MD5 3018e280689b5a2bf57e48caf5d6f8db xmldb-20011111-r1.ebuild 1220
+RMD160 ea546558c2a89134d0c2effa67e793e94918dcc3 xmldb-20011111-r1.ebuild 1220
+SHA256 57a8d45ef911b672766e85d965f44c6163217f4d1a96ad4c2a10b49ce03ed57c xmldb-20011111-r1.ebuild 1220
+EBUILD xmldb-20011111.ebuild 1383 RMD160 f5f38b37351d8f1f91de4e28814c0b3fa3c61d84 SHA1 ca2182e4304378c72d96f155c9c2fce928acde70 SHA256 7d731a487a127fb23bed8077485fa831531bf7fee73358aa1c0b9a18c1bf3cfb
+MD5 7e48a66d6c925fe94931d6c0600c23c0 xmldb-20011111.ebuild 1383
+RMD160 f5f38b37351d8f1f91de4e28814c0b3fa3c61d84 xmldb-20011111.ebuild 1383
+SHA256 7d731a487a127fb23bed8077485fa831531bf7fee73358aa1c0b9a18c1bf3cfb xmldb-20011111.ebuild 1383
+MISC ChangeLog 2151 RMD160 fddeadf2abad69377ac6d00c5fb5b35eeb49ce93 SHA1 29a048df3e19da1254520b2fe4cd8b7ba8a5aaaf SHA256 2414ce8229bd0c646331a4d78df728fe76baa2fa08f135d0786fc46f8fb1b675
+MD5 d81f983d07fa017a75078b2353da858d ChangeLog 2151
+RMD160 fddeadf2abad69377ac6d00c5fb5b35eeb49ce93 ChangeLog 2151
+SHA256 2414ce8229bd0c646331a4d78df728fe76baa2fa08f135d0786fc46f8fb1b675 ChangeLog 2151
 MISC metadata.xml 435 RMD160 01da37918051dd37f9a7f1b57472ba331b23e538 SHA1 ef745b84850479a7c5945f30a98e57485a590f9e SHA256 e38b2692f1a7736a0c1f409d54d99335409a62d7d6b2240c8d1bddd8245240ce
 MD5 20be4e8a0bb3cc7b9e34662930eed0a7 metadata.xml 435
 RMD160 01da37918051dd37f9a7f1b57472ba331b23e538 metadata.xml 435
diff --git a/dev-java/xom/Manifest b/dev-java/xom/Manifest
index 92a0ab5f5163..5deb0b592013 100644
--- a/dev-java/xom/Manifest
+++ b/dev-java/xom/Manifest
@@ -1,19 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST xom-1.0.tar.gz 3396586 RMD160 9e524b87d0cce968aaabe9aff3010de210e23745 SHA1 bf6de9cd45263e6670a95ac7b2a34b97ee4d3db3 SHA256 d37fbb5a2e6f1dd716c1f55f2e2ce6d96f9227788c2cd73e436c1cd087925a16
-EBUILD xom-1.0-r1.ebuild 1470 RMD160 fe20df33211467039bd8cff097e12e5f7baf73f0 SHA1 336dba2f7faac0f4745681d06e45e581d1a4d89d SHA256 be631b47dc5e642f5801d029b7712f392fae632da6b2cf5ffd758a02fa524bd9
-MD5 f982ad08e2431ec4d47bd94008ae2b67 xom-1.0-r1.ebuild 1470
-RMD160 fe20df33211467039bd8cff097e12e5f7baf73f0 xom-1.0-r1.ebuild 1470
-SHA256 be631b47dc5e642f5801d029b7712f392fae632da6b2cf5ffd758a02fa524bd9 xom-1.0-r1.ebuild 1470
-EBUILD xom-1.0-r2.ebuild 1394 RMD160 78cb39407db1473853e5fad199cc75c7605a2ba0 SHA1 a509f5c3a28671ba234b09f8fac1ce683ee6ee4e SHA256 20da1a1692db8b0264eff565ec61b1198d65600332b3e588da1e4537ffc18238
-MD5 a2afc6b1dbf800b3760ef9652baf8f9e xom-1.0-r2.ebuild 1394
-RMD160 78cb39407db1473853e5fad199cc75c7605a2ba0 xom-1.0-r2.ebuild 1394
-SHA256 20da1a1692db8b0264eff565ec61b1198d65600332b3e588da1e4537ffc18238 xom-1.0-r2.ebuild 1394
-MISC ChangeLog 2732 RMD160 773ddb3f1f41d3dc4f72d5d1fe1be651030a0fef SHA1 a76c3516dcd8f4ecd5626397490d446a8de822f3 SHA256 97de98e7a761956b3f3906f929382e094f20936ac5a23dfcf9e1b82ba95274b8
-MD5 073965acadba52d7a13ae16ffec22acb ChangeLog 2732
-RMD160 773ddb3f1f41d3dc4f72d5d1fe1be651030a0fef ChangeLog 2732
-SHA256 97de98e7a761956b3f3906f929382e094f20936ac5a23dfcf9e1b82ba95274b8 ChangeLog 2732
+EBUILD xom-1.0-r1.ebuild 1468 RMD160 1882cdb8da2d6c632c39c68f0fff2ce6d8c4ed30 SHA1 6f38b626ad5dbba9b1e95a70079604cf7cceedf7 SHA256 0c9ed9efef620637bcb76f063c0878dd80ba5bcffe9455200e40d6be9c81282b
+MD5 d30e6d519366fb3ed7fe3a8ba6b3925e xom-1.0-r1.ebuild 1468
+RMD160 1882cdb8da2d6c632c39c68f0fff2ce6d8c4ed30 xom-1.0-r1.ebuild 1468
+SHA256 0c9ed9efef620637bcb76f063c0878dd80ba5bcffe9455200e40d6be9c81282b xom-1.0-r1.ebuild 1468
+EBUILD xom-1.0-r2.ebuild 1392 RMD160 8342fa86dbb98ba976bd2a72a4e82d885a79a564 SHA1 c2535a368f2b68896b139f0bfa610416419b3e02 SHA256 8c2133e2d2f93eab1bca6fbde3f3f1d01390104da859efbd3045fbde6595613d
+MD5 95c3859ade22643ee02a79033faf4ee4 xom-1.0-r2.ebuild 1392
+RMD160 8342fa86dbb98ba976bd2a72a4e82d885a79a564 xom-1.0-r2.ebuild 1392
+SHA256 8c2133e2d2f93eab1bca6fbde3f3f1d01390104da859efbd3045fbde6595613d xom-1.0-r2.ebuild 1392
+MISC ChangeLog 2869 RMD160 b73ebbc17d1ea73344c373f81e65279f62bb4883 SHA1 528c1ef80d9037b2b2a7748d6f6548e37de75056 SHA256 f6dbc82c4109144af396f1b881c62e735f4763cc1d73fe1134647a1d479995b8
+MD5 d9afb9857070a8f03e1e0246ec77e60e ChangeLog 2869
+RMD160 b73ebbc17d1ea73344c373f81e65279f62bb4883 ChangeLog 2869
+SHA256 f6dbc82c4109144af396f1b881c62e735f4763cc1d73fe1134647a1d479995b8 ChangeLog 2869
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -24,10 +21,3 @@ SHA256 6f97856b30a3b3f4617263197f7887d4867f241b97e9ad765dc3e893ea217703 files/di
 MD5 83f964d202477e2a439016433b2e4b8f files/digest-xom-1.0-r2 226
 RMD160 cdd6d43994408957232f5c7774163d78bb612c6d files/digest-xom-1.0-r2 226
 SHA256 6f97856b30a3b3f4617263197f7887d4867f241b97e9ad765dc3e893ea217703 files/digest-xom-1.0-r2 226
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFFJSmHKRy60XGEcJIRAil/AJ9G4cjKJ4lUDCL3xz+6RDgGC/McOQCgmSZC
-XyugM+vVXvootEiDkblc3Ks=
-=y3Dk
------END PGP SIGNATURE-----
diff --git a/dev-java/xpp2/Manifest b/dev-java/xpp2/Manifest
index 795d66dfb169..f88086c334a6 100644
--- a/dev-java/xpp2/Manifest
+++ b/dev-java/xpp2/Manifest
@@ -1,16 +1,16 @@
 DIST PullParser2.1.10.tgz 2310288 RMD160 339414a0c499fe7532bf733daf72388936175a2a SHA1 136a43817c2955a23b8d1962cc1b544e37b68bfc SHA256 ad82569b809e29c19b8223feaa12923f97bb4bbc942ff985857f9d853db489cf
-EBUILD xpp2-2.1.10-r1.ebuild 1774 RMD160 1d4dc97d38ccfcb8aa6cef16bad5a8c4e0690855 SHA1 83086ee0dce7b1c34292a35e4495edbc347b306f SHA256 f65739c1412d06e66a76a23cf217959c982fa58264ce25aef5afc21a4a546ef8
-MD5 de6d6c72e02f0a040a0989fdc4babebf xpp2-2.1.10-r1.ebuild 1774
-RMD160 1d4dc97d38ccfcb8aa6cef16bad5a8c4e0690855 xpp2-2.1.10-r1.ebuild 1774
-SHA256 f65739c1412d06e66a76a23cf217959c982fa58264ce25aef5afc21a4a546ef8 xpp2-2.1.10-r1.ebuild 1774
-EBUILD xpp2-2.1.10.ebuild 1436 RMD160 75cb1d21acb3ef749fe87a288af4186051dd991b SHA1 86f297fa6d191175ad6d0456bb759083a908675a SHA256 6c924613191933b9a8daa73750a3c50a4fe55320c1df546eb3eda7a5d89588f5
-MD5 e84ef0ef048286ad16c8072e33ade5c1 xpp2-2.1.10.ebuild 1436
-RMD160 75cb1d21acb3ef749fe87a288af4186051dd991b xpp2-2.1.10.ebuild 1436
-SHA256 6c924613191933b9a8daa73750a3c50a4fe55320c1df546eb3eda7a5d89588f5 xpp2-2.1.10.ebuild 1436
-MISC ChangeLog 1409 RMD160 51ce0ed3343a50697744ffddb58f65100310f76a SHA1 41873ad5da58cce5071f4da0d60c126bf5e30924 SHA256 1ab4444dccec10581fcf739373952d6687846dafd965451c2498546e1fd99bf3
-MD5 3c12b4666de0505a08312d7206fffb2f ChangeLog 1409
-RMD160 51ce0ed3343a50697744ffddb58f65100310f76a ChangeLog 1409
-SHA256 1ab4444dccec10581fcf739373952d6687846dafd965451c2498546e1fd99bf3 ChangeLog 1409
+EBUILD xpp2-2.1.10-r1.ebuild 1769 RMD160 06a81ab24bf4e5b04472e644ebd273101c8b49d5 SHA1 3c120533bd5e54f3b9939116c6e561980000f808 SHA256 d730182500055859460377dc97fd698b45d6ef002dbc26b49b03e53748be30bb
+MD5 ef5cad50b0cbde37a239f3dd3b86b4a5 xpp2-2.1.10-r1.ebuild 1769
+RMD160 06a81ab24bf4e5b04472e644ebd273101c8b49d5 xpp2-2.1.10-r1.ebuild 1769
+SHA256 d730182500055859460377dc97fd698b45d6ef002dbc26b49b03e53748be30bb xpp2-2.1.10-r1.ebuild 1769
+EBUILD xpp2-2.1.10.ebuild 1431 RMD160 caa899c831be856a64ac224fc766743dd915eb86 SHA1 fd76342b4ca1cba24afb1d6d00466dae2e9a820d SHA256 373bf6d197867e6019fcf357f31608108dd43d9e549df1e7311c50ed03e6a7a3
+MD5 bba8a78b006560968f77c7c291563894 xpp2-2.1.10.ebuild 1431
+RMD160 caa899c831be856a64ac224fc766743dd915eb86 xpp2-2.1.10.ebuild 1431
+SHA256 373bf6d197867e6019fcf357f31608108dd43d9e549df1e7311c50ed03e6a7a3 xpp2-2.1.10.ebuild 1431
+MISC ChangeLog 1553 RMD160 a3af3f2b8593642c52f65fe7db9125fa9016d211 SHA1 7aef2ba0219724fa4306529502115037e4108ab6 SHA256 78c8dd58c735bc0de199906fc095b455d9bab8bda7fb439e332f6404b6f365c5
+MD5 c8d166c62d69a5908bc7b37940e7759f ChangeLog 1553
+RMD160 a3af3f2b8593642c52f65fe7db9125fa9016d211 ChangeLog 1553
+SHA256 78c8dd58c735bc0de199906fc095b455d9bab8bda7fb439e332f6404b6f365c5 ChangeLog 1553
 MISC metadata.xml 383 RMD160 e715bf28cf0d57355eecd0634a4726399c1b147a SHA1 5550ded53b534968f942377d95b127ccf75fa1d0 SHA256 f374397f7f31d3a657df2bd45e94f531bb29d8a2b3314355b0507dbde906c603
 MD5 db6230f453e2baf870a3018274ead783 metadata.xml 383
 RMD160 e715bf28cf0d57355eecd0634a4726399c1b147a metadata.xml 383
diff --git a/dev-java/xsdlib/Manifest b/dev-java/xsdlib/Manifest
index a7f2f79e2b24..7633e4efd33f 100644
--- a/dev-java/xsdlib/Manifest
+++ b/dev-java/xsdlib/Manifest
@@ -7,18 +7,18 @@ MD5 6fa3757ff4f41105754bce24069ed4f4 files/build-20050627.xml 1817
 RMD160 ae9a20e20ec524d446809b8de3169287bd855b03 files/build-20050627.xml 1817
 SHA256 61d284b46a693bb77eb6b818b2a5fa042d442535ff793967c109eabbf704a6a9 files/build-20050627.xml 1817
 DIST xsdlib.20050627.zip 803869 RMD160 9eb3d8aad5f2e2f3abc9e9651f2699fa534b501c SHA1 032e6b4a13de9bf04701583c4fcbfb170d2b4bc6 SHA256 af9906f1353b3e990e699a4cecbbefd6436ca2084dd7d7a6a3d766860765be41
-EBUILD xsdlib-20050627-r1.ebuild 1235 RMD160 a293027ac7129100f9d22f51be4250dfcbd48eb4 SHA1 dda4068e9836e33fee8d8219cfc93c4706feca2f SHA256 65bbcfb95f161de6b6aaf9971d7da37ca504412c5d94376e3419228a6eaf1ed4
-MD5 e892bf8f5b3f5d29502c75dc98c6146e xsdlib-20050627-r1.ebuild 1235
-RMD160 a293027ac7129100f9d22f51be4250dfcbd48eb4 xsdlib-20050627-r1.ebuild 1235
-SHA256 65bbcfb95f161de6b6aaf9971d7da37ca504412c5d94376e3419228a6eaf1ed4 xsdlib-20050627-r1.ebuild 1235
-EBUILD xsdlib-20050627.ebuild 1301 RMD160 dd45ebae99bf733cab37c77d5775d906a20264e4 SHA1 2bfa7a9222ab4b3e5296b65af1c67aa7b8947aa0 SHA256 f65cd52529e992474f793b73f71d954fc91a1327b5f45938faaa61ff388004eb
-MD5 c5394fb094a72a628ef7eda937f09b8b xsdlib-20050627.ebuild 1301
-RMD160 dd45ebae99bf733cab37c77d5775d906a20264e4 xsdlib-20050627.ebuild 1301
-SHA256 f65cd52529e992474f793b73f71d954fc91a1327b5f45938faaa61ff388004eb xsdlib-20050627.ebuild 1301
-MISC ChangeLog 1415 RMD160 a1d307d82ee29f13e933d45dcbc102c130de6abd SHA1 a40109593b2b1f4ae41972767d699a8d6a1604e8 SHA256 9305da34b14c94b2a4e44af834ddc970afd383668a1756250b867d9458dc62b4
-MD5 57ebc7bff9e5dd375b38dc7ac53a57ce ChangeLog 1415
-RMD160 a1d307d82ee29f13e933d45dcbc102c130de6abd ChangeLog 1415
-SHA256 9305da34b14c94b2a4e44af834ddc970afd383668a1756250b867d9458dc62b4 ChangeLog 1415
+EBUILD xsdlib-20050627-r1.ebuild 1235 RMD160 5bf276dd2d5f57fd1430a8efbd9c9d7bf811e88f SHA1 43657285aea67f5fec8585f282911ebe2557cf93 SHA256 a49114428c22b586f034bc9a7eefd10f81264d6a132705779145c4fd054fe63f
+MD5 7aaa64a53a9ca3dcd32c1758c0f427cb xsdlib-20050627-r1.ebuild 1235
+RMD160 5bf276dd2d5f57fd1430a8efbd9c9d7bf811e88f xsdlib-20050627-r1.ebuild 1235
+SHA256 a49114428c22b586f034bc9a7eefd10f81264d6a132705779145c4fd054fe63f xsdlib-20050627-r1.ebuild 1235
+EBUILD xsdlib-20050627.ebuild 1301 RMD160 d4d8a651d553b4755546ca9de8938841ad75d559 SHA1 1e61be8ea998279a5f69c723a2c963c63fada3c5 SHA256 0aa3980cc7605a73ddf2ec341645f615f7e33f2f5585e3ac00e6db681c098b90
+MD5 ea5b4c29748cf6e44e775597ffb08487 xsdlib-20050627.ebuild 1301
+RMD160 d4d8a651d553b4755546ca9de8938841ad75d559 xsdlib-20050627.ebuild 1301
+SHA256 0aa3980cc7605a73ddf2ec341645f615f7e33f2f5585e3ac00e6db681c098b90 xsdlib-20050627.ebuild 1301
+MISC ChangeLog 1567 RMD160 4d8026dce1afaac0fb81ba305776b6ac51511ad1 SHA1 fc35e544b67031c319059107860b290a57345bc9 SHA256 2e717f548814baf557a381c83ed878dddcacbbd193ced8e151876c347b152a5d
+MD5 64473f6896400163b7d529d34e869514 ChangeLog 1567
+RMD160 4d8026dce1afaac0fb81ba305776b6ac51511ad1 ChangeLog 1567
+SHA256 2e717f548814baf557a381c83ed878dddcacbbd193ced8e151876c347b152a5d ChangeLog 1567
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158