Block on dev-java/ant-optional because some people still seem to have it. If you get the block, unmerge ant-optional.

Package-Manager: portage-2.1.2_rc3

2 files changed, 16 insertions, 26 deletions

diff --git a/dev-java/ant-core/Manifest b/dev-java/ant-core/Manifest
index f69d863c3289..e35d470381d6 100644
--- a/dev-java/ant-core/Manifest
+++ b/dev-java/ant-core/Manifest
@@ -7,14 +7,14 @@ MD5 ea37e3a5b2edbe1b1fca02ba48c4ea47 files/build.sh-exit-fix.patch 345
 RMD160 4c4cfdfb1b13b9cc55f279a5765afda6da9f6f4d files/build.sh-exit-fix.patch 345
 SHA256 bafac89599d2d5bbb8f17060e39922a01891826251925e39be2df38170d88e2b files/build.sh-exit-fix.patch 345
 DIST apache-ant-1.6.5-src.tar.bz2 6283500 RMD160 4680b53cd72d4915b9ca2bbe2131a71fcf505a84 SHA1 08e838c506ee580f5d220401a974c757ea80365d SHA256 f3ef501f06bf1dac88981038ebd5311c738bf2d50d220de85c3e6c7656169d59
-EBUILD ant-core-1.6.5-r14.ebuild 1858 RMD160 1dff6e914ce7cf61b3e43ecd8a3f8649b54cbe49 SHA1 091046be56c641bc8f48876761a1300d88edba6c SHA256 d3aa3b0b072626abd77607a6788c14c97a00fb174c7e8daa6f948f897394ca9e
-MD5 5eae4a13094ad5c03bb9b1a736b23434 ant-core-1.6.5-r14.ebuild 1858
-RMD160 1dff6e914ce7cf61b3e43ecd8a3f8649b54cbe49 ant-core-1.6.5-r14.ebuild 1858
-SHA256 d3aa3b0b072626abd77607a6788c14c97a00fb174c7e8daa6f948f897394ca9e ant-core-1.6.5-r14.ebuild 1858
-MISC ChangeLog 22538 RMD160 97e9b21e4cfb8134596b9089aa1733c5f3b3843d SHA1 ad4afb95464803a012972292936420fbad58cdd6 SHA256 552e7c20f6e664d5e25e43c58370f82c59b1d16008e0f34a089c110759776a49
-MD5 80212778d0e56604e43a77fc95eb6830 ChangeLog 22538
-RMD160 97e9b21e4cfb8134596b9089aa1733c5f3b3843d ChangeLog 22538
-SHA256 552e7c20f6e664d5e25e43c58370f82c59b1d16008e0f34a089c110759776a49 ChangeLog 22538
+EBUILD ant-core-1.6.5-r14.ebuild 1883 RMD160 8fc379df9e583076cd2314e10d6f9986299b44cf SHA1 428a16d0c296f3c982ce22ed8f8e06d8a0ff5f64 SHA256 b02128de706b3d18831d8c73ac79180d1efebd835716c604227da8932780a800
+MD5 cf61cd3889944dd8a7adf4191980cdb4 ant-core-1.6.5-r14.ebuild 1883
+RMD160 8fc379df9e583076cd2314e10d6f9986299b44cf ant-core-1.6.5-r14.ebuild 1883
+SHA256 b02128de706b3d18831d8c73ac79180d1efebd835716c604227da8932780a800 ant-core-1.6.5-r14.ebuild 1883
+MISC ChangeLog 22741 RMD160 b842672264b9ad03794ebba3e66340b65da59224 SHA1 1b350e062985f580390f73c6defd93b847482c1c SHA256 ac2e0741495accb6ce96384b35d5a8bfb624059419886bc99db8364009d04240
+MD5 2335597a41b9307d40e653ead637a4e6 ChangeLog 22741
+RMD160 b842672264b9ad03794ebba3e66340b65da59224 ChangeLog 22741
+SHA256 ac2e0741495accb6ce96384b35d5a8bfb624059419886bc99db8364009d04240 ChangeLog 22741
 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/ant-tasks/Manifest b/dev-java/ant-tasks/Manifest
index facac00584db..521bbb0516c9 100644
--- a/dev-java/ant-tasks/Manifest
+++ b/dev-java/ant-tasks/Manifest
@@ -1,15 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST apache-ant-1.6.5-src.tar.bz2 6283500 RMD160 4680b53cd72d4915b9ca2bbe2131a71fcf505a84 SHA1 08e838c506ee580f5d220401a974c757ea80365d SHA256 f3ef501f06bf1dac88981038ebd5311c738bf2d50d220de85c3e6c7656169d59
-EBUILD ant-tasks-1.6.5-r2.ebuild 3297 RMD160 da461ba29cbe916e4bb8014efe47c913bb681259 SHA1 bfb8ba72b5aae97cb7927fda6a79ac6fbd4554b0 SHA256 ac486a51acbe4ea57e6cf496fca9f338b820d418f67fdd2174dcc036c0d7c9b9
-MD5 8c8167876a8b25f071965a93361869ca ant-tasks-1.6.5-r2.ebuild 3297
-RMD160 da461ba29cbe916e4bb8014efe47c913bb681259 ant-tasks-1.6.5-r2.ebuild 3297
-SHA256 ac486a51acbe4ea57e6cf496fca9f338b820d418f67fdd2174dcc036c0d7c9b9 ant-tasks-1.6.5-r2.ebuild 3297
-MISC ChangeLog 11899 RMD160 4afd615944abb97602cdadcf6cf9580e6ecd591a SHA1 f992a7f8e8f96d744f2956b78aff4eeedfda283f SHA256 8a1133cbd2fe2b8e2c7a3c00617cace07cbaf4b94ac5593412e27c0eba076bb1
-MD5 6e7ee911f639f38987f3dc018e58e93e ChangeLog 11899
-RMD160 4afd615944abb97602cdadcf6cf9580e6ecd591a ChangeLog 11899
-SHA256 8a1133cbd2fe2b8e2c7a3c00617cace07cbaf4b94ac5593412e27c0eba076bb1 ChangeLog 11899
+EBUILD ant-tasks-1.6.5-r2.ebuild 3340 RMD160 8b66de3169d42d2f6a4b4d41a628f2efd72fec97 SHA1 fefc4cad93e46ec007305d212572016a608c3307 SHA256 82ec2c7a01e305c9a96e38b12ef8e361176626fbe4ca2ff3fa0b47171d6f062b
+MD5 3a0be7aec79c00d513e2453e0f399170 ant-tasks-1.6.5-r2.ebuild 3340
+RMD160 8b66de3169d42d2f6a4b4d41a628f2efd72fec97 ant-tasks-1.6.5-r2.ebuild 3340
+SHA256 82ec2c7a01e305c9a96e38b12ef8e361176626fbe4ca2ff3fa0b47171d6f062b ant-tasks-1.6.5-r2.ebuild 3340
+MISC ChangeLog 12099 RMD160 801b36398e9dbbd26518ad7ecac66503a30001e8 SHA1 82f03c5383251974bc4ea88c05be1f41b171da1b SHA256 2234d7d5a8c2fbec0b8a661cdb6c5d01a3aa1e6da55b4ced5bb024348177452a
+MD5 180c08e16662dd962150dce5b2096336 ChangeLog 12099
+RMD160 801b36398e9dbbd26518ad7ecac66503a30001e8 ChangeLog 12099
+SHA256 2234d7d5a8c2fbec0b8a661cdb6c5d01a3aa1e6da55b4ced5bb024348177452a ChangeLog 12099
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
@@ -17,10 +14,3 @@ SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb metadata
 MD5 31de0486a830c545c91a089241b3bb9a files/digest-ant-tasks-1.6.5-r2 268
 RMD160 3a54cfc35c821291722b58076e3524c513ee1dc2 files/digest-ant-tasks-1.6.5-r2 268
 SHA256 6d25121ad88d0c2a4d0822cff5bb2d50c9f6886369b452882476811f65c1b8f5 files/digest-ant-tasks-1.6.5-r2 268
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQFFeJc1AiZjviIA2XgRAnO6AJkBmZrPnGGddZcQEWtmFP/mnWGvrQCeOVGS
-HzEHsQcfXjFNT8J0LibEoug=
-=R6vz
------END PGP SIGNATURE-----