Updating remote-id in metadata.xml

Package-Manager: portage-2.2.20/cvs/Linux x86_64 Manifest-Sign-Key: 0xE9402A79B03529A2!
author: Justin Lecher <jlec@gentoo.org> 2015-06-09 14:07:01 +0000
committer: Justin Lecher <jlec@gentoo.org> 2015-06-09 14:07:01 +0000
commit: a67865b4821543d6de99a3f5aa6f464c57cdbbb3 (patch)
tree: 90c60b3a90dd353d33f432e307f2e64670138365
parent: stop warnings about writable and executable sections (diff)
download: historical-a67865b4821543d6de99a3f5aa6f464c57cdbbb3.tar.gz
historical-a67865b4821543d6de99a3f5aa6f464c57cdbbb3.tar.bz2
historical-a67865b4821543d6de99a3f5aa6f464c57cdbbb3.zip
342 files changed, 3318 insertions, 1176 deletions
diff --git a/dev-java/ant-contrib/ChangeLog b/dev-java/ant-contrib/ChangeLog
index 46be1e950c8a..0cc514efe704 100644
--- a/dev-java/ant-contrib/ChangeLog
+++ b/dev-java/ant-contrib/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/ant-contrib
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-contrib/ChangeLog,v 1.38 2014/08/10 20:07:08 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-contrib/ChangeLog,v 1.39 2015/06/09 13:29:08 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org>
   ant-contrib-1.0_beta2-r2.ebuild, ant-contrib-1.0_beta3-r1.ebuild:
diff --git a/dev-java/ant-contrib/Manifest b/dev-java/ant-contrib/Manifest
index 379d37e2e3c5..63e7b96ac957 100644
--- a/dev-java/ant-contrib/Manifest
+++ b/dev-java/ant-contrib/Manifest
@@ -1,17 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX tests-visibility.patch 755 SHA256 c08c7bfc90e90b594b1e58164b3f9f37a3a37171e88ffe9d2e974d7687fb1bb4 SHA512 a848c5573ffc9e02b77dd63c74d4314be5c35e47da7646d048d7e28a098290bc50d30287928ef3e06d8dcbba758b7ec1e87118ebac29bf72b04021f20e8c371d WHIRLPOOL 7113253213b7ece5e407e2028b9a3b4e7082d10ef8094c96d3310b060edb791b52f1f5cd78719bc8d26faf88c3ed11736fdb1146cbfd0a86e47811958486f2d9
 DIST ant-contrib-1.0b2-src.tar.bz2 118216 SHA256 29bdd00ee0df1d7b24e55b08bfff5641edf3f805e45a278641d42c0bf0ce9269 SHA512 5245ed1458c9c4892ab8196a8acdf8678aab0d45fc58fcd8ca446e3589f378a9a02de8e608abb75d24fa190cdcbe209454a703eec8d4e563b7690d6d58ea9af8 WHIRLPOOL 3247772090ab6b1cab556c0b4442ad4ecc4a9f15b7ffb6117f8c8f95ac4267215a741f3ecb45ed335657f1e881a933b1f3cf607a34602834fe7bdb37b30ccf65
 DIST ant-contrib-1.0b3-src.tar.bz2 3298187 SHA256 5c180feaca2704d914054a1e6b453673cc9b65cfb3da307aff17439a9aa09d6b SHA512 8147ed51612eed9d41515c00ef2bb7210ebd50dba8b471abfadf8a56c67b53c030602ce9e49e9070d72d383de61f290e941a76c282e223330fee606f3633b0a8 WHIRLPOOL e87fe9d07a97a1a8ccf4f4d0984f02ab967c5b8f6a11d6171f235fa3b9fa243dc7243953d9b14e72cbfece91d41ac264babee0241429090b1868e948a855fd3e
 EBUILD ant-contrib-1.0_beta2-r2.ebuild 1636 SHA256 1ea1f7624d705890dd1d8558ea53f155bbd601ae1cd922bea19ff292a9c2e931 SHA512 ffc383128fb198ba6d297f3d2ec7e5caa91975b565ca5ef981662e36a7d677f2d198feadbe617e53dd527b194d3e1af0da360f1698da5a3fe80dd80baa31669d WHIRLPOOL a31792e6f7c6f9d0cbb456919fe78f97dffbbf3601705ad0dcd03afea201bc2b8b1440206bd05b1ec08bde550f422ff1b2832529324d616af2527f7e4ace520a
 EBUILD ant-contrib-1.0_beta3-r1.ebuild 2072 SHA256 2585d927ca943b81abfdcfd09663002645ec8f2402ae7bc8c19887e2e8b86706 SHA512 25d3ea03c79221836283985e4ccf2c35bd3c8a9a6cb5ad7e9f8d19cfa81a556bafff46a550af6c2982ae47da34d6d68201ed05fe06a32a4d97972e80252f8eda WHIRLPOOL b248694847384cb06bb95b839c9d15783630f6b78729e8169c9cd0f5fe52171140059332537b146bc1b5962bada9df8df80eead98a5f5d49e3e4659fa2b5b007
-MISC ChangeLog 5397 SHA256 fc543031fdf6c382e1132f72e8f0a8b2e4426370902515812712b748d78dfa4f SHA512 a6dbd931581f27cb85b7dafc27cf4763a3813444e366a011e18ec335596f899ea02fa3a92da69a03fa145a1c1dd255d75b98b4af581f5813c2d0f9aca8cad7ef WHIRLPOOL 1b0b7cd7feb6105567f1620eef239d82df2e924ff82b037db89d43c1587b1332ed722b50572930a031e9c25d1d42a98a77009b82183c4489a9f0c89129780cfd
-MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
+MISC ChangeLog 5494 SHA256 186f3b7952df38e8c4b825bba5577d4f1b198568f3697f2b89b16e4f8fd46a2f SHA512 b9b581c7315522c1d4692d0365c8e634740819255fc0429bf12cbb58d9ba35b4cf690fc694a0b5cbbabe62a53e2447d06181fc6ac9531c6a01a8a1e202448579 WHIRLPOOL 4689adf03c1d662fab62c78fee9848f5febabdebf6de77d97f701342189fd22f6e9d6748fde3e599333201ba2a8e2d1cbb1fab0d81c0d7fb4fa0842d43ad9cf0
+MISC metadata.xml 239 SHA256 25d7c997d4d41336a8f8005a77cd62389b239dcf50fd192e38f90ebad6f92183 SHA512 3138e53c88aa97474a0bcb7b0860968ec25a3dd803a2d19e0ce2f26b7a2a59ad91939f2a3f90b0cf1075e5ec488893fce4719f7a91e7ec421156a12a8b8958e9 WHIRLPOOL fd26c6f7ce723502b678b07be9f2260f07e377a89e7f9253ba7268c19323ddf945837dfbe42c4525ce9812f7e21b3df5bfe3a2edfe38f6b45dbc32e1055ed68a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlPn0O0ACgkQcaHudmEf86q+wACeP4+n99KtdOmJV+jutd+du4oJ
-DHAAoITxO4VmrG6DsMDViRl4SJiysQNK
-=TBfY
+iQJ8BAEBCgBmBQJVduolXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmijIgP/1l6JLX7u48sVKXbDDIETYYC
+SxJdUlXp/b1awahKG8BBvzuA6CrLBQ96Imn1jGvQuZJ32ymAgYOkEu3vv6dR6zDX
+En4GAHO2zDBXrcCpW4L7MLc2h7ZHnHfWnmEgEx4/GoSfI8Y7hhBIglfaOrPa6NZT
+gjIiMGfGr/RFa9w0LAFmxp/Squx7dvRNKdLJJHZjXtC8LaZ6DnWNvdUPZInppGG9
+dRUsYbr24oAqxXS4fXHFn7MbhxLHyYsO8ocDa1FiZYFujiXd8KE4Sq5xulUrxcZl
+/I2UCIY6ULsKVfYARFQdCI2a8iNJUgm9wV9H954QRNt3pa8i119RrKQ5MQOYJP+r
+0Hn+4nwuY+JM3/uaFy3qY1eHfHQ57VGRBiil5bssJ7oI2JUeUcPgp/QXKOGftHsV
+6dev7glYFID/WOR/qejCaVjuD3BSHrq1triMdXyKFXNaKNSX2dm2KtbMp8Pt5vF8
+shbjA2q1rTXJ2fnk5D0WKVMz0hEt4ACvGGe/61sZRVILhkOOM6O0dF7/rwGFrMWK
+h8jynJKr4AvRDqi2mZ+xhW+nGzz7EpQ4K+0lLptGKVEsFT29qjeB9w4fTlm0ePvo
+Lh3u68pqKnyM/cBn1NJiLS5a2oQpBeMXvKlWM0KkMP5fvQJpA+nLzs99ExSGzs4T
+eJArqb1QPeIBgE5sUJ8y
+=IAID
 -----END PGP SIGNATURE-----
diff --git a/dev-java/ant-contrib/metadata.xml b/dev-java/ant-contrib/metadata.xml
index 7303cef96964..9452de6d1452 100644
--- a/dev-java/ant-contrib/metadata.xml
+++ b/dev-java/ant-contrib/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">ant-contrib</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/antenna/ChangeLog b/dev-java/antenna/ChangeLog
index c10b42e80366..37605d0676a1 100644
--- a/dev-java/antenna/ChangeLog
+++ b/dev-java/antenna/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/antenna
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/antenna/ChangeLog,v 1.11 2012/01/13 14:29:39 sera Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/antenna/ChangeLog,v 1.12 2015/06/09 13:29:26 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
 *antenna-1.0.2-r1 (13 Jan 2012)
 
@@ -50,4 +53,3 @@
   09 Jul 2006; Krzysiek Pawlik <nelchael@gentoo.org>
   +files/antenna-0.9.13-ant.patch, +metadata.xml, +antenna-0.9.13-r1.ebuild:
   Initial version.
-
diff --git a/dev-java/antenna/Manifest b/dev-java/antenna/Manifest
index bd0db17c791b..58c37f0ffad4 100644
--- a/dev-java/antenna/Manifest
+++ b/dev-java/antenna/Manifest
@@ -1,5 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX antenna-0.9.13-ant.patch 3893 SHA256 dcb5e693ce80aa944873eb3baa6ac6287157412dc1c4dd0e3bbf7853d936db53 SHA512 5d62715b7fb4b05f2e74c4ce5dcc5c5f0a959139a436714649f74fd62b61876a5380842bb03448e23cc4b3aaca457f5b6bd259a0fc5ef35f518f8e5396b6eff1 WHIRLPOOL 0e2ae755cee6f6e765979ba56e2faa993506a3a7bd0bfeb98c3fbc1c70d8ffc39ba37420b74e13fe5da1eabf725eb66af733ebe7ac4d97034ffceff11b5d9db9
 DIST antenna-src-1.0.2.zip 1502020 SHA256 a6a15d257ae2af8805cf002e51675246b119cb34f23bf3cc15398acaca0bcfe8 SHA512 38ff589b82f2298e17846b2437981ffe549e35129624b36f439bfeb9943fe5a6577ef2ec4aba7314f59c8c4f30fb8c45cd6e3c675af0196ac4248a4d256e48d7 WHIRLPOOL e1d958ac110e5f97caad2160df3e6cd019640a5ed36697f373115b8850cdbd8ac5d070860a5dea476d31baf6bd484a13282b5aba9c1380a0805a888e23b095d5
 EBUILD antenna-1.0.2-r1.ebuild 1505 SHA256 9df6322e17ec829a7739ef9c1f977cc58ff0afa910422d9edea4b28f273ae1d0 SHA512 52ad3a648d10cdf7a2f48691e2914338e4b0450aab51a3fd12f4ca5cd3feaf7b02d0e55b493fa616ff47dc80b6ac346789dfc9ae35845aa380b3f751240d91d4 WHIRLPOOL 09ea705e5008f6727485880884ef778cb1a1e6d48f99e21bf36d6f3a8c0490507bbdfcf270f2b863851a819a30132d2ec2ae97cfce07419dc1bd9d258e4f1360
-MISC ChangeLog 1829 SHA256 d9615291a7142d1a3f767cbeeb3c93c944f3fcc802666d4448375864e1a2af65 SHA512 194803f464ce4917a395d713b6de03ea31f0170dcf0bddfeb6d320cc95b50ea86ef927e89b8b02e3a3c681013ca5b714bdbede96510a41491ed09f79f0a37517 WHIRLPOOL ca86981e362bfd5f9203eb4cb9a95531762d9bc133fb0a1c0d9f2a5a7567b364ba6957f4457b54fd08cc11a3ede2a53c77cbd0554316aff9d28ca38edb4e6d70
-MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
+MISC ChangeLog 1927 SHA256 5540cb705e2fa3a1c3e11487a7d59f3b28cd8986abe80dd2253750b516020b70 SHA512 6a1ecdfeddb327cb2c7347d145b87df37d388e18a849af01c951a75249fca720e8ce40070722b23e569ca1b683c1aa8222f0bd04c2ca51790340bfab95d85d2e WHIRLPOOL 98a74c91572b322d4dd5095f237bfa971a3c99fc4c38b40bbac91742cc521470c8c81bdeba6d1e49dcf90e1491f21b712eb9f155bddaf70b662f851cf5fa24e4
+MISC metadata.xml 235 SHA256 12c240ea26bbab768a42cab7f0c677a23220f4e1b8aeeb66a124cca4cad54e3d SHA512 6750e55199a9d708dd2551db4aefbd4628c5b63818bebe834b202e0201b69e72e22dd26fcc817ec2a7e03b27a6b77158bc844150ea7e85170d34b53ebda01ee3 WHIRLPOOL 5780775f4f7f33bc50102cc71eaa79beddc69d2623ca40da002c45b7f302410bc5410a3df12aca2deef911f4e650aa686164db614d415ca93a0c043c389a1fc2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVduo3XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmioRcP/iLv30rznHBJbPHfGhaq6F1J
+DPDsYl04gYwgON0+DbHefZoL5tqK37X7fPoi+4gawozjmWZDLd/GlTbATtFlHKVk
+iTLoIZU+Ir/Hc7CxTOXipkG6mccvb+l7japar+2OkEhqsaknXMikLoxBpld/tKk4
+ytKQpaSBFqtQ7QL8APXrajz691RX4p5cBnJGESk2FRYrLWSV1q8v3XGQGQYsT6Tu
++xUBTqgXm/Aco23VHDjIdqI4FDicDrLomtQAmFr5EOCJcHt8zZhkPCCdbfYrQC8Q
+t66N54e1ZEGyr01vtd0LUSFYGSiAwmYtSyBfYfn1wjqyj4gdtAXJRlrVWE7B0lUZ
+h+uNULVGBAQw6yVCY0k5LJZ8juDhYqRG1Uij89fvsTXqV4Pmt5ap2EnnxGNxxk+W
+WDZd6mQOZj/dj9ZVM9VJvPzG/WnIob9XPegBhCDz2Wf/rsoVRhwTpk2sawcbcTmm
+00nzH1jkzoNsZ7JxOP+kM1NqZ3LmGY/4XgJLZDFfp3z8HHtUUNRTfAKp5952cvo6
+Gw/EH9fFI4SY54eI6eM+S4PnuU35x6WvOvFRvopI6TRoUkokHm8CWcaxfUBSq4zp
+CSJDsc8bCHLMh7RcMdoeSgY3r0aShkEp4MEyGO7Wvrz1iwfRtLCfd/L2XOeE1mm+
+Df5twZ7d5iQZWilwNYlj
+=rTx1
+-----END PGP SIGNATURE-----
diff --git a/dev-java/antenna/metadata.xml b/dev-java/antenna/metadata.xml
index 7303cef96964..b426ce1c3377 100644
--- a/dev-java/antenna/metadata.xml
+++ b/dev-java/antenna/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">antenna</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/backport-util-concurrent/ChangeLog b/dev-java/backport-util-concurrent/ChangeLog
index 29830009728b..fe08e11718ec 100644
--- a/dev-java/backport-util-concurrent/ChangeLog
+++ b/dev-java/backport-util-concurrent/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/backport-util-concurrent
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/backport-util-concurrent/ChangeLog,v 1.32 2010/06/30 20:37:54 caster Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/backport-util-concurrent/ChangeLog,v 1.33 2015/06/09 13:29:46 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   30 Jun 2010; Vlastimil Babka <caster@gentoo.org>
   -backport-util-concurrent-3.0-r1.ebuild:
@@ -153,4 +156,3 @@
   29 Jun 2005; Thomas Matthijs <axxo@gentoo.org> +metadata.xml,
   +backport-util-concurrent-1.1.01.ebuild:
   new packages, ebuild contributed by Josh Nichols <nichoj@alum.rpi.edu>
-
diff --git a/dev-java/backport-util-concurrent/Manifest b/dev-java/backport-util-concurrent/Manifest
index 922730519495..e5f0ca8be85c 100644
--- a/dev-java/backport-util-concurrent/Manifest
+++ b/dev-java/backport-util-concurrent/Manifest
@@ -1,6 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX backport-util-concurrent-3.0-notest.patch 491 SHA256 112918b1488255337fc42c1f5b8d71faefdc10c62a3061452f6d1b427cf0778f SHA512 f2f53a87283c1a6b13e360ba0140a93b0580a023cefbcb5dcd8658ddc7e80c401878229a323416213368f493226b445b5896bb0ff51f1a2bd95ef460f4ddd080 WHIRLPOOL 55fc40f1d32dfc41c0cd23bd3819b5cb6114435e4e0a2738ad51da331dda6d553f17fd42e1b3249e08a89e62e9cfb3bee482150c5f1ea9f9dff32a775c997085
 AUX backport-util-concurrent-3.0-test.patch 380 SHA256 dbd133bc068689d8b7dff508a48716e48fbb381f4089c07848003577c53933f6 SHA512 01ad87f71b07c25193faf1d67de159233b2b298ef4ea31013f3af8d326a09b83f73bdbcfa5629f5531ffc0a0c02b20843c11377f1260448a9758be05c64420fe WHIRLPOOL 9c8c91b173ff21b9f8b7285baa3c74b6d32b633e61a548fcb1f88f81f91fd2b71e1f976e97574aed3dc2eaa126c1164012e20fda0d86e9ca1deb41e3c0ac64a6
 DIST backport-util-concurrent-Java60-3.1-src.tar.bz2 622882 SHA256 1abecd12d48174dbf6fb0f39623ac954c7f0309870f18cca25afc870aeae2512 SHA512 caef9eef43d0de5ee3d05a84b44d3d2f6bb9498bdc82105626bd2631494fcd0347387da9beb6000fe9c80efacbbf2c2c3603a97b53e4c74037eaf629d790cd54 WHIRLPOOL fe8fdaa4942cf444f12867213bf6cc3897b2b79aebd818d41af677b8a9e69fa55466b93c74a50831345ddbe0c3413af2ede132c730dd0bbbcd9b2493e9697d79
 EBUILD backport-util-concurrent-3.1.ebuild 1326 SHA256 5b83d2dadf36ef18f2c309b802cc9c1f64dc97b48f1e3c3f647cfb7aa3dae03d SHA512 ff95e661907f5bb77b7b3ffbdc47187a646a9278ee14eaafb553277a13a0a961aa8083b7de00d06440bb892ec45a3b5caf6945cd09dc497d1870b3144e073d94 WHIRLPOOL 686b1bfff46624cbb92f4c5ea551324fa157c37541db9994b3553a6607e00d4efa1b8d3464da337077ac58672d0ff86f1edcdb78f5d804975926c66e305ad438
-MISC ChangeLog 5324 SHA256 a947ad8f0790c2ef95e5dcedd2cdad3f94db9d9f667a156bb2cafec56861a2e1 SHA512 57950d4ba58aa7b178f405c0bdaaf85ac562c11811dd37ec1d3107b788da86bab802dd8fe00f6ad53dbba21ab72146f8355b34ecccce8ec06769f76350d6731d WHIRLPOOL 14395dee624ace35b7cbb9ce5028bfa852d53c2be8f792bd02c8bdfbd2236962c861623975ddd95c482e52536b0e5975e0e65d6cabdec5cf06fd1da591b92104
-MISC metadata.xml 327 SHA256 5211f0eb4ff59809e2878506ad92010fc57863cf802f27da6d00fcaf718cd8bf SHA512 f3ff61bacc453b663b96de4f773e3f5bed9978d6a407213675ac2e7721e4bee3fb5f32913e74df9c230796dcfa827dd671eeefa37eb98fb4d34cc6031af7801a WHIRLPOOL 92567629c3a9a8532b035400b779c5f5092a52b35e3ae7bf149105c21e20ea3e043b056643313a390a2899bd9356a16759df921642ac601b4acb6ef8ac1fbdde
+MISC ChangeLog 5420 SHA256 bdc9a2afbd8ca7b5b62340433d68d7b3a81df90f2c19c41f2b87a1ebd3d1ed27 SHA512 ab81a3c198a4ee947ade85fa6708381549237ea45ecc5f7aa81776ea5ef09bad7d5c0ebd89b9945b326e6f3be4c73c19d25664b4155e7fb8a676b6f794956f5e WHIRLPOOL 6578b30296a79e2d02f3ce17355bd6f311bdd2594829381b8c68b02d98bf1a69ebccfa994a6b8355603b6e134a3ddae35cd8d016a9690719039aa29e45d21ea0
+MISC metadata.xml 412 SHA256 70659cbc0c1d74997aba0c65bd4433ad24dc998bdf9588940d15c01ddc9cd785 SHA512 b909c38e7042333480f824b87b7722dc1bf4e3e6a1c3ae0872803efc11f529f659820f39a2a48c5635878bcc1e9d9dfe6dec5283782c41d318bcdd44592f7d8e WHIRLPOOL b4dd428245a63aad5e8ef18f7cd4af34c7f4d5aa2d67cc323ab1856aa083b241e87aeb32a4b0d527c9b610372117a7c44114ffff4202ab54d76ce7231e3e8c31
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVdupLXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi04YP/2WvAxvcRW+s4lR3jANQbKO8
+7M8PcqqBh15vWm/3XE4PnHTFYPKiXL136JXQWZFeOTh5EbLbxqYnRwC2BmmKr5O3
+agvFnv78S4MldG2hhlony1BTMukoC4b8uQE7lKFkSkAOW94JtrTaiBSnYwJ/9X0C
+YkAG9BZx4JqUfDDMMEWAnMr6kZGMyg1ur7WrAgIe1xrOxv0djtS22UoV/GyeFlck
+cYxTHSxe22YrnaKJYphnZokt3Ss8BbzV77SoqqY6Nt6oIvegZpaGvxdHYlIoBLkX
+mjy70olO0SaB/y59gr6c/QI0hc7hOsTH9lbbMWNK+Q058RQvMAaR03b4oCuDWKdT
+1WkPnrQeHGWjVt+r7TQy6ptazkQf+rLkGBINrAhob4pEqpmx6UaZ/avMouy0zOVw
+OLK32D5ymRB044P8gnoRrNOt4TTUxITgHMC5K5EH+dcgC57eF6JwfZnUdP9PSqTG
++Qd1V0sYjQEbECDmoCsXq6LN52FGqzbVBT/hR7DFE2W8W3b8KX5SXITb/8Rc1TQv
+g6ibImOw/78NcIHc/xNwVh64dw9nJCIwMeag06ha6ITAzMShiaMau32NSqddl5bJ
+uW7HQk9K2HDBEyAQer1Ckijy7e8G8RT+4jBLb3rfSohh4u4kZCOVUzDXZyDPSwji
+0VX+vBtrfXFhDNw1v63i
+=V6C0
+-----END PGP SIGNATURE-----
diff --git a/dev-java/backport-util-concurrent/metadata.xml b/dev-java/backport-util-concurrent/metadata.xml
index 7f9c9182fc9e..c61248a4b1f7 100644
--- a/dev-java/backport-util-concurrent/metadata.xml
+++ b/dev-java/backport-util-concurrent/metadata.xml
@@ -6,4 +6,7 @@
 		This package is the backport of java.util.concurrent API, introduced
 		in Java 5.0, to Java 1.4, and from Java 6.0 to Java 5.0"
 	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">backport-jsr166</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/base64/ChangeLog b/dev-java/base64/ChangeLog
index c63c3de389b1..6cd57ef0d5d7 100644
--- a/dev-java/base64/ChangeLog
+++ b/dev-java/base64/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/base64
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/base64/ChangeLog,v 1.2 2013/10/14 17:35:55 ercpe Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/base64/ChangeLog,v 1.3 2015/06/09 13:30:06 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   14 Oct 2013; Johann Schmitz <ercpe@gentoo.org> base64-2.3.7.ebuild:
   Build the jar with and without namespace (the first is required for java-
diff --git a/dev-java/base64/Manifest b/dev-java/base64/Manifest
index c820c8111569..eee051436723 100644
--- a/dev-java/base64/Manifest
+++ b/dev-java/base64/Manifest
@@ -1,18 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST base64-2.3.7.zip 50473 SHA256 28003fa44f7fc96f247a0da6e7cb451cce0423456ef8652c6f52a91df0e39edb SHA512 11411f7a75ecb67d54cf1f2de253fcb18437205d4e3b6a1ddd7ad84564f4a0881f14200c7c700521b232b857ff13ea22224a192cbbc226c278fe8c88ff8d4b07 WHIRLPOOL 0338691bb35e09fa04254366898740bac58b2d827a5860d18ee685111b81dc897c4424b0ecd1b6e1dd655cebad6cf0f448cbee302309e033b768354acc46aa15
 EBUILD base64-2.3.7.ebuild 1250 SHA256 b5723df1772c5620ed0399552290b65d19a87dc957b20830ad1e096e4bd87303 SHA512 6baec4c992b8bf36a55b12b4db2412970ab298ffbf0df1d539463324626d60a0b4168f1c35b43ad72f18d03ac5e72aa9fb9a423cffe1df30fddd814270e00b80 WHIRLPOOL b05b7fb7a33f733da7bb4a04f64a339b730c23a52e713128e4bc0ed3d1dbe558f42c76accb85e4b98a1e8683870c2c75d00f257cc08db05e49682c724cb979bb
-MISC ChangeLog 566 SHA256 b2565957f246542928b2540798429e226195e24bd8afbfb64122615334f5ded0 SHA512 312df01f07d88fbcdcaa72dae1fa66172dc278512a975c6e135035f8f38aaa1688f922f5c4b63c12c21852ec366ee5343dd7d1add9f49fe20ebd0f33981d4dfc WHIRLPOOL 8a6258f1030ba24a615e88e920c7a8db8934b5302160ed2af6b6e1703f01b4c0aea55ff7cc081011859d78064eb3bbee408e40b3947fc63dc522329333d111ee
-MISC metadata.xml 159 SHA256 1c070a909e96d9d193f84ad9304d196febbe33b60a724cc4b0d20634bb82255b SHA512 269cf19c37f2d136b926f546ec83ffdbc1374b2b6e26f8a31f21854143380386c31bfc7b2a0b9c47fb1f7c02607ddbdd43e517cb5c3270515e465c4dd7788843 WHIRLPOOL afb402fec04cddb3184b69eb8a8d36b404edd2870fd06c8f5e99be39c341ea6fa7542e0b680fac05529522ed33838e8279381d7a6de9dbc58fe55841229d8a51
+MISC ChangeLog 664 SHA256 93eae8a18906eeccf5c087e7cae078a3327142e33297791b3daacf98ccf33c4e SHA512 ee0a7150170d4b4af76b7dd3a0a58dcdb91c6174bc8dfae777636d8c36440cd6a0533c42e949b1ab0d99054c91f62d7f382cb20cb695b7dfacda12eed0d9ad3f WHIRLPOOL bd8587bec97b14fa53e147d40970894ddd939da099a4f3df5acc9646da0b4ccba184353947d004e7ffe316a40562e74a6b16fbc35775ffc4a0552be6f4f191c8
+MISC metadata.xml 235 SHA256 367b26b7a87d175ddea9fa05960f987a0c29e76a810392c17ac8c82cea8975d7 SHA512 7d503bb20a60da2bea6ebdf90ee4ce10f966b85293ba5962fa0d1c97b3adc0bb1c24436dcae9af47b6f326c0defcf146ebc6b220cd211bc18fa13b52ec70d219 WHIRLPOOL 79bd3d7bbacf99eb621ce2826add54bedc38132c5099218c4b08513768e415f82f892ea1e447696d3f4305bf13a68c815a53dcf561c24fa2c7b39811d7c465ce
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJSXCt8AAoJEKCEBkJ3xQHtN08H/176QTgTzzFZAXvjsrNW57dF
-xac0/nFXDiPsQDijdTeDgxdFIYNYQMHGjXVz5/IlLSkl/8GfqbSYnE10kaWnbMik
-oL+eAYdh/KlQtuNej6wiMCZkTsv9zi031xK9OOsv4GgQ7VBWOGbsC9JgRUcXBUEx
-VDXhjd6yA+51QQStXyRffSGr6kxltmiTDhJtwVI3rS+Vnzog1G9cJAYvhTH8quq6
-1fOpcaF1mCcPmB6g1OkVOZvvBuR2yWaqReMSKU9eZTDGEbrgt/AVy2/+KRyOov0h
-GfLYrA2GIcxIePIT3XE6kKJKl6oDGcruHRBi0k/B3Azhug4AWvkxoEDpVCVRTe8=
-=Q3k3
+iQJ8BAEBCgBmBQJVdupfXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiM9wP/iAvxFq2HDfJPSZYBZQu28xB
+QTyHLVgGmxcN4NHXZWXSxYjOFzJkUm9A2+MOPZibCtRM7eYzuK0BbTrKlkTIDSYt
+3HCuN6nLxgjeZdcUnsSnGuomb7JZ3G2InU9/uneJZBzLhx9ykyXXM7gaJpgkoHD+
+pR6DVPnPYlzjyZlZg12YSfY26bfApCJ/DDZGaBOqGUxDSjmettsNRcytTEZkeVaE
+m5I1CHiFVOKF3GYreUjccZpzdAB964KGogI5Gpa0QorrWsIcUpRbP23ajGRNfewc
++1/keLsx5hvpSVhSzFnluLK4K+U91oNuliubq3dcp2ZhHeOLXvWfjh0BcMyL2Y+0
+xYEnUN61GQFWyxdERVS1SgIaefsdfJNBy0M6xpb9yh96tzScg1VrJ//FLaMBGfUa
+U1pbiwLuRL1QzY0rx4xHaE6uGkGdAStOyINq1BDELddukojlzTcycGb0BsUb4mIg
+FjHyB3LFulspcOBQVm8kzb6DdI1hgPVH5NGFVUs2favgGAnXS7Uzy6ufZ56ghP3W
+20TcYrumu3slwfD+SzxD2vMDMqebeWfO12n3Tc0gqs+qmghDCTvL6/z4J1giyXAD
+NRPT62xyclRpnm6uqrsPQT/3SNWx5S8J8RHsc9rnM6hB8RAGKbmoeplLp3lSJFSy
+GbXy4nhJrNQIICVvmypn
+=7TSM
 -----END PGP SIGNATURE-----
diff --git a/dev-java/base64/metadata.xml b/dev-java/base64/metadata.xml
index 604e0a4238bb..f19ab613be34 100644
--- a/dev-java/base64/metadata.xml
+++ b/dev-java/base64/metadata.xml
@@ -2,5 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">iharder</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/dev-java/blowfishj/ChangeLog b/dev-java/blowfishj/ChangeLog
index a734cf2fbe3e..df180f55dbe6 100644
--- a/dev-java/blowfishj/ChangeLog
+++ b/dev-java/blowfishj/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/blowfishj
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blowfishj/ChangeLog,v 1.18 2015/03/29 17:54:22 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blowfishj/ChangeLog,v 1.19 2015/06/09 13:30:27 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   29 Mar 2015; Mikle Kolyada <zlogene@gentoo.org> blowfishj-2.14-r2.ebuild:
   ppc stable wrt bug #535032
diff --git a/dev-java/blowfishj/Manifest b/dev-java/blowfishj/Manifest
index 7e79150d66fb..da8dfc1029ba 100644
--- a/dev-java/blowfishj/Manifest
+++ b/dev-java/blowfishj/Manifest
@@ -1,17 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST blowfishj-2.14-src.tar.gz 33726 SHA256 d49ff16dbf320f8988886507c0065312b4660d4dfdbffb894db7ff7d6f5bfaa9 SHA512 3f508be61b494eddf6f276e21c7979d1f6a46dac19e8256f7451f3a434cd1d7df34c268aa2c13b7370129c84f289f331f47456c400ac31a9f0996fefeae12aec WHIRLPOOL 04cc5516fab856f45269bbbd7b0cce31331f9e6586023f14442228aa7f9bd5b39c731dd73c34460eaf60d995312cf7b118fb38c10d7ae2f7c4a27574fabd1260
 EBUILD blowfishj-2.14-r1.ebuild 1000 SHA256 f3949fe06f64f932a290c1f2b3a20d6e5f0b7b7842d41301ad009090b803e098 SHA512 35775abe0cc6b69564fe72e0c1ce94cdb9a8f667436ee76215c58d2d54a40dd17fbf294c7ca19b936bfe25a71798afaade56b46fb18c1a419ce9ecb482b4bcfc WHIRLPOOL 119f41bbe26fdb19282eb895c45b4229c3179a84633ff67d747347efd1dd69b55cd9f6bf8b2398acda2a6bea5842bbf9555ad0c65f67b58d7f67e614bf7496b7
 EBUILD blowfishj-2.14-r2.ebuild 1015 SHA256 f683b5f05f989a443a3f1c57a8dda7807ef9f97d25a293dbe28451c39206684b SHA512 07f22b9ecf8a45aea3503b8ed23e3ee9c6cc56d0056965ffbbf3bd62083a4d34313504e27a0dc78217d5c1cf7aec080f6911786393da312552d73fbd7ba13e00 WHIRLPOOL a2187382765fefdf6f7b20505adfbc2aa02e3b5a54e1d05d396cc3bf02cf8b574501fb8d62ab23022ace5ec08061a761dd576f4328fdc353ed58ca031cfcefa7
-MISC ChangeLog 2423 SHA256 16f9d774c67bb8c53d6007e8852c077ceaf900eb0ddbd88e16f8c2d957125012 SHA512 c65bdf115b43c8dfc50044d712ece7210c92baff91176ec87675899271f37f2b76530ccb1d76fa1716e912b44c933184cd302ff2b90941624879937b05e1a61f WHIRLPOOL e9116c1e742937f88e86c3b18f08f193e094b851253a4298cc417835f1845b82e1eb620ed5987f89cd5616fc7b20f5584ec7908f68a04b835a4a17df3b744c1f
-MISC metadata.xml 530 SHA256 91426be8467ca6948f9e1d4c629ec8a2891b7e996b5a6fef116895801c4ccb4e SHA512 208514e18fd44ad3257af500a05731618ffffe9ab4feb8fcf7faa2a047dd46db166899311ed310879e63e9dce9d386377214337b3972333ea109e2297132880a WHIRLPOOL 70c07455b4c62efa91272114beaf1491ec5cc97de8770bc9392da0cf3b2233e5fa46644f5d3920e285392eb2fa7288ed3b78d6c5fee92cc429ffd456752cf848
+MISC ChangeLog 2519 SHA256 fcc1f178ea009ec68cd5b1c274cb74decf5974b230b45024a70281fd232c293b SHA512 b5fc8bff037620e498940eaab887b040801a9a88b889488653e2e9544a2c11068c00b9e96f1856197554073676f75dcef9e0389dbb7bd7ea626f527a9a02a116 WHIRLPOOL 74fe0e9a39f0bbaaaa4a096e840a35602ac1805b064e1952dd5cd26da1390792a9428bf3f35cc79d151b3d71332971265c687ced58b2810dcd7f70c52d6abda7
+MISC metadata.xml 607 SHA256 b8de52d412c73cf6cf51caf084565995fed968109a04bae96a95eaed50446898 SHA512 f48cd3204bb2bd84cdaef3d09c804c930e109b4e9a75f964298ba3191c84d4fe89415b86605c9f717bd9949db9fa62205caaa388f8707635ab69ebd211936710 WHIRLPOOL 8c854c0421afab85112e924df5b6b14d5796b206ef976f4246bbbdac4559e32791d10e5dd556ac1dce31e9c36e6321063dd02dc171af086b3148532f2b4beaa2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iJwEAQEIAAYFAlUYO+AACgkQG9wOWsQutdZoPwP9FTs9CSqgIfcvoiN7voiBJ1mu
-RlUC084n52zDlIiVFEiBOK0rUZ/TNt5N3rdIF16SbdjOSyIawcjYSWoFnp9JjKLP
-J+J4hwnfCf005zI7+VdV5zhj66/8wLuDoGU8ynwU3EGWZATXC8X1W5FDPUhUrqmt
-elA5w0Yr458vkXvJWFQ=
-=fkN1
+iQJ8BAEBCgBmBQJVdup0XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiClcP/jBPa1sSBdhimS/G7mRh0wtg
+IhZGMreqeP4aCMjVZYvUVlxn+p1y4NXPCHXUD4KnTWN3f6IN68gGsxuVd+U58D4u
+qAOzn5lbQ22xsdI+5oGSR+rGCS3dst+typ6hkW2WtOOpmOA6gmT0cedFN9gbEwTZ
+WRZ78Tf706t+PwHvuEvMxFHDckbQ7iCDNMndrTuePUzhZBtC1CjmznJJOqIDrRrn
+VZx61GYrY7AIvrWqYb5pTkI4LXCyzVSkGgXchp5TxzIeWW2ZrrEljza3PR13jj1I
+yMaXwDCX8ieEKu5sYkwTeWjPzN2NamQtwC5kgA+goODEJ0eyYv2z1/pAMLYJcbsX
+0BTeq2jQWqLK198wuzjmDWJEmQf+LfYkd0/ttzdjRIApN98rpl5dNyE92LpxIp2L
+rgmDadKLOCVl5CqUzmzAGkoTJ/jWixKh7PpOi5urfP1no1YloWdu5rWEC1+jPYhq
+S+Y4wwaKDjDgNPh6vbVLu4+U87nu94KJoiV9VY1guCSjWoVMH5D8RDak9go4xfTB
+iqomKBmLoaQKl61lx1uwYXO48zI19KhK29IdqjMS7FNAnsc6JJwmXsS1Z6QkjyT4
++Qb+mS+NRWWB6/jcuY+6xsJ5QscdcM5zSjZh0C1Im3fojOUHHPMtgh2kmM32A79s
++hS1hSvLw4eesFXCRJ6i
+=4m5y
 -----END PGP SIGNATURE-----
diff --git a/dev-java/blowfishj/metadata.xml b/dev-java/blowfishj/metadata.xml
index e01407e6d730..0df99acfebe9 100644
--- a/dev-java/blowfishj/metadata.xml
+++ b/dev-java/blowfishj/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
 	<herd>java</herd>
-
 	<longdescription>
 	The Blowfish implementation in Java, provides very fast ECB and CBC encryption.
 	Comes with the BlowfishEasy class for simple string encryption, plus a solution
@@ -11,4 +9,7 @@
 	package includes its own SHA-1 class, all sources, JUnit test cases, demos and
 	JavaDocs.
 	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">blowfishj</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/browserlauncher2/ChangeLog b/dev-java/browserlauncher2/ChangeLog
index d1f2cf6a6cde..9e54a86cb1bb 100644
--- a/dev-java/browserlauncher2/ChangeLog
+++ b/dev-java/browserlauncher2/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/browserlauncher2
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/browserlauncher2/ChangeLog,v 1.16 2015/05/17 20:19:49 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/browserlauncher2/ChangeLog,v 1.17 2015/06/09 13:30:51 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   17 May 2015; Pacho Ramos <pacho@gentoo.org> browserlauncher2-1.3-r1.ebuild:
   ppc64 stable wrt bug #535034
diff --git a/dev-java/browserlauncher2/Manifest b/dev-java/browserlauncher2/Manifest
index 856a76e1e41a..8c857f6adf0e 100644
--- a/dev-java/browserlauncher2/Manifest
+++ b/dev-java/browserlauncher2/Manifest
@@ -1,15 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST BrowserLauncher2-all-1_3.jar 186442 SHA256 45445b2eeaddf70a0f79f4b3c45cffe097bbc16ac76ec59ab9224562ccda2bbd SHA512 529195a94b757578afb3863c6b53cf16584097c659c576167fcbf86897cc484d80092c8d6e409ba1fdec69cb4f4a42b65c89c881663ae64bbc0a0a496309da5f WHIRLPOOL df45cef7d159c38101d66ec86b8a965cb1bb28f0d0e3c8a289059c3be01d83573e2a352d950b730eaced3210df19e2a9d1904e9ea444ae8250f91010a2626777
 EBUILD browserlauncher2-1.3-r1.ebuild 1265 SHA256 18d010e33afafd48a72ddd49727e61fb58fc7ce0bd526b4abd5f2ec61aaa288c SHA512 bb04fd0da88222a6b02e3e7b3f23094b1ac4db1658d74915dd4f2565c5a99cafb473111ec4f5ce8042185bb55c69c89d8a2f3e31f627e86c396f4afb9184e567 WHIRLPOOL c00cfb936f71735711bdf1ee75d208840aad52d9e94236eb7cb9692b714e5e418785b2d2a1e4cc15330a8a90e50b8a35ff749fb238adfa373250b09f066b9414
 EBUILD browserlauncher2-1.3.ebuild 1246 SHA256 d45c04eef8361b6b11d32af77b12df621e1085591769a31f9d881aee19a842c1 SHA512 74ab66c4876687b2f5a59438af84143f65bbed60572bbe4bc3176a27794ea72489145dab3e06009784f6ef5cde5f3d24e34f89cda02dbb4b555e48fe82f8f354 WHIRLPOOL f1b25d7163d69e09d855abcdccbd20cf0e362606df1cab217d31ec6a871fe45e77627604ca9c5d6756d8ef0909a73e072a4a3fc48803a66db3881d238c65669d
-MISC ChangeLog 2099 SHA256 69e3c77a529c31e7999d196b0693fe7d9046074535ec981a4fcf8cae3fb1da24 SHA512 97fc79e062132457ff559922ce137e643de09cbf5f446d8e0c17d56705c0b81ece177ea56e370941f5e4ce0499cd2a4cf2d3f1c495641ff526025fad4ef69431 WHIRLPOOL 740ef8e8155a77caf14929f9f53b4648ac4428ca989d57326c216e917da108e0a7be66c8547ceffaad2c7bf07be54b281e7bdebebb1b27925a2e0ad17d107c30
-MISC metadata.xml 466 SHA256 bc60df3bdf2b8ebd01e8d0bd2376fcc0dda76be941c3f4ef1289d919b72d232f SHA512 aefa5ef72709663a354df0ac35a14efbc49dbd22f5125fc97ed001c415ea369bbc563f34445d8b1adf11acde5c5a3e9df44e4e680f8ee28e0f47a05443de80c3 WHIRLPOOL 89327f721fe5fbd05731e5343ade6a8ebc1a00263f116ab0d614b2c06ed9521a8f67feae3ad29cabbee1a2e56ec7744e64589a5200f3f15a998052dd77fa7f1f
+MISC ChangeLog 2197 SHA256 f5ea03362852ae09287587761700a431680f0f200041b0ab4ac95bef115a0e99 SHA512 6db4e86ccde3a18ed52caf51443c559a7b23db5c9714ded527cd31a1d04f60cfa41189eb2a7235b013706eda2b4b514202f0cd345d93101ecd36b45dfecefefb WHIRLPOOL f629ce7f026069b452e6641354d7dcebcd7ab137687fb63736ce33a958142476d73ea269ab2333b8d83a66f8cf7058ac0d6f0030704d81546606d5ff1f12ae17
+MISC metadata.xml 550 SHA256 cb8a0ad6bf6b7657b2ce53c12999aaeaec661734bfd1a2fde970e8d107678963 SHA512 eb95e411f8ca96107acee378146e85f30550bc66335b6015073c55fbeba9db273c0ac7e06e90eaa6048528c08d63f9fecd586816c5de95c395c607f07681f6ee WHIRLPOOL f6e0ad32bdb33ebf69aac97f4a52f99b34352dc2dfa3a6660a5f9aa00edf9ea9d90047903290c540f07fb107df15d0e2642966e16d61f3aa1c68caa5973857b2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlVY9+YACgkQCaWpQKGI+9QaLgCdFypt7tUe9HxwMIGP+fs0treA
-QPgAmwckKRb6OHmAZDBT0HiLee9tQKIR
-=Myne
+iQJ8BAEBCgBmBQJVduqMXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiit8QAKAkkTvLWAXO5IH5ZTBzIZ+5
+5g8eCiT/fbAIspSos8HaxrYUImHpy4CQpsRl0c/qYs7HYf1ep73CY2fKr2upPXs3
+vsj4st+iw0R1UEEkcGPyA8XuOKov/hfCBWrPTSz8K/16qyxhJmAOPUjjy9ENw/oE
+5K2PaGsfPXkzU2UnWLZefrobpUwAxC+8UQRhJYvCxq+si73ksvfLaxA1o4sI5nxV
+pjXU38xR/GEUMUrIq7/sgh1VORFB3AxWTBRfWM2fQVwmOE64ECrCkVBrV1DqNmfq
+uuP+MfpLXTUCVQ/NfSrIE6Q+ACN9wSYUqUDLAH4JkBa0/mmpceTxaCKr56GKTKk1
+TQEL07o6lwq85mXd9sb/xRwX5I0DFFvx/8Io62mN8yTkOW6g9BDVOxpMGycVwTGP
+jRaB3FMaiAr0FP3XxmeCXBHEFyoz4eZZdpByDvOAiJVjHXsrOQ+ILVWi4uQAJ5qr
+5JSdMVJ/MeBKWtRwAqDCWsp02lk6utDDqiCWQBw7Z7jLrRliTbaIb1utr5pzkd1z
+s86nHaRQbt/RGe2/ba+Q+gQ9oYHaZbZDZmJ5dqBWReJpax/vpRFm7E/cBgdfSAyV
+mRd98N3pLgqUGwl1WGwY5O7EKjs2qHaZpwqeefHRdQJ0ZaZDw9CRMZWhC+Ff0rzD
+9YuAuLiTJr6C0q5N7wcd
+=Icxq
 -----END PGP SIGNATURE-----
diff --git a/dev-java/browserlauncher2/metadata.xml b/dev-java/browserlauncher2/metadata.xml
index 2b8b0952f50b..698f4bd621e1 100644
--- a/dev-java/browserlauncher2/metadata.xml
+++ b/dev-java/browserlauncher2/metadata.xml
@@ -8,4 +8,7 @@
 		directing the browser to a supplied url. In most cases the browser
 		opened will be the user's default browser.
 	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">browserlaunch2</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/byaccj/ChangeLog b/dev-java/byaccj/ChangeLog
index 50b598f7ab00..355146d4dc67 100644
--- a/dev-java/byaccj/ChangeLog
+++ b/dev-java/byaccj/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/byaccj
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/byaccj/ChangeLog,v 1.16 2014/08/03 10:26:35 sera Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/byaccj/ChangeLog,v 1.17 2015/06/09 13:31:13 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   03 Aug 2014; Ralph Sennhauser <sera@gentoo.org> -byaccj-1.15.ebuild:
   Remove old
diff --git a/dev-java/byaccj/Manifest b/dev-java/byaccj/Manifest
index dac558d53f38..2dc955732a2f 100644
--- a/dev-java/byaccj/Manifest
+++ b/dev-java/byaccj/Manifest
@@ -1,19 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX Makefile 2003 SHA256 85d625ae63d5939f5654ca85b4228d2422ee997c46ad8c617b58c93e4294fc50 SHA512 d48f81fcf89ca5f6524572b75dcde4866cea5f434059233c234a664f56e80c0daadc8f314711cb9c55430a947cc9dbf48f4a0bead0433da5b333f5fd73fcbc68 WHIRLPOOL a6c0f56e66308e12aa05afe9412fed95cacf47cddb1dac509a952bd623f2a9c1638c89047de85b5362523e6cbbed7d18ba09c3c9c1f57c7e7ffc28efcc996eba
 DIST byaccj1.15_src.tar.gz 53646 SHA256 4d6ba21fa5bc4ec4b1be9eb6e6efbb367eb6df2577fd0eaff60be9c6614f6609 SHA512 6423ecca70d21dd0c1dd8366361f6c4420536e099090b18738013fbb6e8e0710ee739e51dfd7f603a64f8761f48cdd1d8dc7844d1b5ec6b792535254d290addc WHIRLPOOL 81846717ba6f7b19ddb3a8368f9ef26bc77b17b1862797b2b725e1ef504119a5904cefed314610f20c6161789583aca524c8439f813b95e514c6edda579cb6f9
 EBUILD byaccj-1.15-r1.ebuild 814 SHA256 b7b31445c6f9bb0585243b76be44790b3db95514b9ee473f9f5e679d1911e377 SHA512 015bb685b13014e2939a48755c185c978d3c34cdb498cf0f2849fb08d29e730634c44bcf7b71965a2d7567914f4e299a5844e6fc2834e0a3af69f379ed3a1a10 WHIRLPOOL a9f09400199e64f11001f3df08c8946c9e46d0259b4d6a04c8b23169993e4f1d23c9bdabe194b868b038a4466b883df75dd953b4398027c94aa562fd8fbb2a60
-MISC ChangeLog 2266 SHA256 b846227fdd5ea4e2182a1f5ac8f23a97fe1c5a291f8ed16276d3a9915fd9b2ed SHA512 ef343ed3be4502f5644a9bf2e9dc8262b94d4ec2eacd8a97d445317c47693404085a16ece917efd6b418612f260f5b81f9d6e4ba41cc7d481a14a4b406b6dda0 WHIRLPOOL c1f329e1503356d0c7a36f00063376c172b573506861e3a75fac4bd6b6373f6167774c9ba57a180b42afccb105a98326663541967ccc6c6ff47b48a4a268d858
-MISC metadata.xml 159 SHA256 1c070a909e96d9d193f84ad9304d196febbe33b60a724cc4b0d20634bb82255b SHA512 269cf19c37f2d136b926f546ec83ffdbc1374b2b6e26f8a31f21854143380386c31bfc7b2a0b9c47fb1f7c02607ddbdd43e517cb5c3270515e465c4dd7788843 WHIRLPOOL afb402fec04cddb3184b69eb8a8d36b404edd2870fd06c8f5e99be39c341ea6fa7542e0b680fac05529522ed33838e8279381d7a6de9dbc58fe55841229d8a51
+MISC ChangeLog 2365 SHA256 9caf1991d5d1f9f5a3aa7fe06aee15f58c4c7d0030c120fe26979c11f1a97b8a SHA512 ff850c07b69d297dbe7d086e3606f4eb57e8859de575e73a2bc1de7d5324056478ebe3727a22008982696d33c8583aaeedc638b813c69144550b8bfc1ed674f7 WHIRLPOOL 2cd27e4712de272a6c4454c15ce9368b60eb9bce3a63b381da2923a3d2ed05328c9ee6cd82e0b556064a55b33360921de54479798568ef4fdbaae28cadc3dbd5
+MISC metadata.xml 234 SHA256 d118159679f7f7c6358a02c134e22a727c66d02a88f72f4df53add7aa2f71fcc SHA512 05546efe03f1f3b40760f7f2f1f093d135e279e51f406b27ac6e9f9fc088aa329ade993ce00bb7441eef120bad4fdcda6d6dbe00f97dcc5bf08bf8dcbe25c714 WHIRLPOOL c240341b50abcbbe28327289f153ffa45da3ebed89cd6e7783fbaf0acdc4d480e742d1775f73b38ac5951878b0c6fabd81241f7202c77baf25990b56020d6519
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJT3g5jAAoJELjwI6Q8XPda6PAH/1YoddD8aAE6C2bTb5SaFIgy
-p6aueV6VF31aclgZzElnuifVyQjFoRO8C4Ge2NbDN34I1TZC5N49TxtIHFC64I87
-Sq1puGR86qp3gGqhT9TTltmz2hHy5JUnzaEqYg4yDszTR3v1Aq+PYBzyJa3A5DoL
-6NRXLM7mfNYJ3mIMbWtBym83kcK62bPEiiPU/r28aEGpHJpgKwMf2nk9xMfRMGZx
-RPkkuKrM2YKYzsMTVx2ErqxuO53X7ZKL7rj75tF4LoRvgX8PMjnvziDjVdybl9HH
-6/uRngagNp3UhiLqJTXepNOc4CBdS79fBIxRvwyCbAqol/5Ss0FlXGQO7/oHfAA=
-=fNqf
+iQJ8BAEBCgBmBQJVduqiXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiuxgP/2jEQi9kzqrbKdPs6lwpqTCO
+6u7NmcwkFS2hdo7+akBoqhR6cI3U6Eal7d+lR2Nrz04t5rNnOGUeP28QwvBpDzky
+JYzPyXvx30bsFjCq9xm8iJ1Qef4Te7k6gaHwX28XnJAZY/hOsX2Kxs18rFV5RMvG
+Wxv4Hmiq1l2dxBucvTTe0OljyDVL9LAliyXepHXhd5P8EPxQmoNKDk4G49ksiwyo
+1IoujJ8dgWk7uxwCquCx/14jo66ofdhkbK7spIm/vIl4Zk8U8pSoyCTU5qjFhxKt
+y6nf1s5/7PNtGQIXXsMYNZZFVUS3fQMef8JOZTWQwUxt650A7G7/falnCYk40RlH
+VmWFPTgiIhi0tye0R/1DBukAXYbkZsK5D5jl3LEbDa5f+1Y4NGEhVzJ/eyN2y8/F
+oMvyXqb3iKjuosKdVpCfMs2eNeTrIA1h21ZGzTmSo7IQf61AUhxyW9WsVeDAv2kn
+vjolAXdcFVVTAxZV7L2HqV24xETLPFUqE2o6Q19dmBwqUWyYzu3AbvRZ2kUeAJb2
+jmHOxtUIHzEG3CaoSjRobTYUBETIGtAaD9rpaWfV/unLLJ4wVW2SFR87FPZJTsQj
+Jn8D2pFdVP9PSnA5gM8Q2sAP+RTaAdGksn4GVg04NHi4Cqk5ntacyEpqJKsBFWSh
+B32E2K4y2lHUi60l+qFP
+=vLM7
 -----END PGP SIGNATURE-----
diff --git a/dev-java/byaccj/metadata.xml b/dev-java/byaccj/metadata.xml
index 604e0a4238bb..02d618cd67cf 100644
--- a/dev-java/byaccj/metadata.xml
+++ b/dev-java/byaccj/metadata.xml
@@ -2,5 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">byaccj</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/dev-java/c3p0/ChangeLog b/dev-java/c3p0/ChangeLog
index 7869feffe051..315d7a1c9e87 100644
--- a/dev-java/c3p0/ChangeLog
+++ b/dev-java/c3p0/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/c3p0
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/c3p0/ChangeLog,v 1.30 2010/04/05 22:48:04 caster Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/c3p0/ChangeLog,v 1.31 2015/06/09 13:31:36 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   05 Apr 2010; Vlastimil Babka <caster@gentoo.org> -c3p0-0.9.0.4.ebuild:
   Remove old.
@@ -110,4 +113,3 @@
   +c3p0-0.8.4.5.ebuild:
   Initial Import. Closes #55196
   Thanks to Andreas Sahlbach <andreas@sahlbach.com> for the initial ebuild.
-
diff --git a/dev-java/c3p0/Manifest b/dev-java/c3p0/Manifest
index 8a3d9525ad5e..f69895eef89f 100644
--- a/dev-java/c3p0/Manifest
+++ b/dev-java/c3p0/Manifest
@@ -1,5 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST c3p0-0.9.1.2-codegen.tar.bz2 15434 SHA256 c8c920d7cc240e07276525d861f88128f6403e1a123e2526796caa440b9c9025 SHA512 4b20c5307f98dfaf82676d21ec9ade0251c043322b544acea912dbc6a866773180c548aa32764fb73894daa9115ae9eec702846a2112f620e90d1e462c879075 WHIRLPOOL 6df9184ef6c1385217e74dd0a5dd21dffce37be80e7f3bc418a3b83d9062e793f20ef436d641e8f03b7b5a2bcf3ce71d19f1b09dae1660c2f103942a6aa2f1c4
 DIST c3p0-0.9.1.2.src.tgz 380118 SHA256 b837a5668a7fb0cb2338dbe26867ecc91c6e9ea030440107becb999a9a8724d3 SHA512 a33c413b5471d56d72224e3ad74996828854a2a0227bc674d5956612db517348de1f36695d16ab4cbb38827bddbe03952a5518205296fc35ecbd11b536b5aa32 WHIRLPOOL 864fd5eb470024c1f6072a886ba62732d0c1e06ae3f0cc3235b071112f0d4a20b820d4e3b68194e8af0be07567b38f219d2dc8e597f3e5d6b01afa21fb5882b9
 EBUILD c3p0-0.9.1.2.ebuild 1779 SHA256 d83aa8c48714f741fb58baa13cc5a11ca11c30566a7cca96f9d1e33b8a8e2515 SHA512 6f8fc087c5dff150a3ad93ae9232fe7c13842724debcf19880e6cd09620b154e3d39181e308fd43c019a6221271edac3440f425cd7567558d9c3469032359ef6 WHIRLPOOL 816a35455c39f5a287f658cf1b0e50c104d9ac25f7ba031cf6ad4c7fc327b4f0dc42b36987c72b79a53b38c7670c8ec9b6f924594eeae6010534607885234af6
-MISC ChangeLog 3688 SHA256 8bc62b45278c1ed0d10c530a6941994f3f49341f08fc2cf7d1d124f0f67dbee7 SHA512 ad1a99f1f723b80861fc39cd5e0f8e4e463c716e95d302934948f5634a48b428ce0e3759e14460294efd5ff40fa674df1c7275091e7ec42b4cabd3306373952e WHIRLPOOL e2192b98e85aba5def61304a6ca0d73c6acce9e23e19484796d27be4c887c60d649d48bb2f9a64a68e6d0ce58897bfb8ed0edd1dadfd7f30af1d34d1cb9e0251
-MISC metadata.xml 157 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 SHA512 bbae663e26f48fdc5e272adc2b06c14f77f34c53caf84acb53908ff036e7c12a3edbbc0929d2db56bee861a453381d979c7e0983a23716f629ed2135c22ffece WHIRLPOOL 887e153e2481e7d76f0f1b67a395f10f0328b93930185ecdb8fcb5fe3c50f839086a18831d61cf45b34657aaffca6c3b7900cf3c04b712846a05027a84602448
+MISC ChangeLog 3784 SHA256 876c5266ac5250e29e9b20ff0fa41b6061f454dc594dbe0d46935b134d5ad9e1 SHA512 235e223f93e1bba6d4bec376d378cb23e9ce6f02bc3927e62c549cae9258391f5785b1eb0c935127d37ab28cb9741aa34b31b92cee595d91ab8060eed652ea37 WHIRLPOOL d8f40d48dec3efed79ff28b8fc87f851286687fc0acb9462517f4e075ea31c09538072b5e5d568e6fc2fe632efda5674b4042875791217bd7f06eac100f71fb4
+MISC metadata.xml 232 SHA256 90d8e90a1d7526217351cf4940fc3a2482a059b6b741d031329bb9280c9b2303 SHA512 2f13c3a1d8ccc5bdb483c6e75fc869a25abf43fd37d8f69d6d340b8b0634540f3117fda611d31b042fc754d42da466ed76bee4f9733310f19526957359360608 WHIRLPOOL 1f705b7f62789bc85b89646fbed56883516a18665992fa43e7417d58bfe011a898be9a1e44b356cee3c4a627348bd2916fa9dcf38dace6f21c4f994ebdf25ff9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVduq5XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmie9wQAKUDjo1IbUAPGafzSfYtULeP
+BpNgvBsDNNudJd2rwDeuBcyqYPAAQH0lh99FJai9THDxWaKKpqE3SLivx8ZCrMua
+IyGS3LrLtlijSudADaa5w7NJ2/SUeeDzMnPWcWeAjtRN4/Gql7aGOa2lz8F70B2B
+UXbwOn2PIBHRmsLyZ4MY6MIchu5h/Ii5qvWaD5nZWnkRbr8hhzHuDLA9NPpXccdR
+cb+X54EOz5P+8mObsr/VQWxg3eXrJCLaHkM6sNQhstP7+VjvH7Hlt8MxrGaDpZI5
+6BOUp/GropjUF9UopSBNXUBYgyRv13OEX194k+VirBVAs9xvrX3Bk2E4blFi+anN
+ri7MZBwP82GjClL9Cd03g4e1lhfB81uGQvTnTFghXPq/WyjGXnoCAkEzUuwzp/sQ
+KX6A59uvNcxmAR0iRTZTXymwiI02xDh1NnxYuMMhewBwTKWuFEzarWfXfTfIRdsS
+SyciGPXEF0AdPiMXeiPhb3ZRs6fZfl1Ruuf/H8nFn5IhSg1xvRo2vTg/G7t1Frn8
+eS+RDpvDYwXf27+yHj+FHVpeFxkf33p8LNyNCU4OFqn4xbixNh3JkiZCS20Rdl3x
+5STtoIM2cKgdu9r2Reg/B4kzXZiW3jarSnqhb7RSq5uQMtDV3eVEpOa5WRrnlMI9
+Mu68SVKcE92rAys7JMEu
+=YG6B
+-----END PGP SIGNATURE-----
diff --git a/dev-java/c3p0/metadata.xml b/dev-java/c3p0/metadata.xml
index 838c00a4a448..b8f3288b7250 100644
--- a/dev-java/c3p0/metadata.xml
+++ b/dev-java/c3p0/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">c3p0</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/cglib/ChangeLog b/dev-java/cglib/ChangeLog
index 08af05ce2e31..15bd34c505dc 100644
--- a/dev-java/cglib/ChangeLog
+++ b/dev-java/cglib/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/cglib
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/cglib/ChangeLog,v 1.61 2015/06/08 23:28:00 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/cglib/ChangeLog,v 1.62 2015/06/09 13:32:06 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   08 Jun 2015; Patrice Clement <monsieurp@gentoo.org> cglib-3.0.ebuild,
   cglib-3.1.ebuild:
diff --git a/dev-java/cglib/Manifest b/dev-java/cglib/Manifest
index 82ec65771a8b..cd87f2b2403e 100644
--- a/dev-java/cglib/Manifest
+++ b/dev-java/cglib/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX cglib-2.0.2-asm-1.4.3.patch 721 SHA256 06997a5c61860cc5426ad0f7783447fd4f980692c21a321c533d54d87281f73a SHA512 2647a94e8e4823f3f289bcac210016fb7683bced50700da2d6d0a77d00be03878551d4beaaca29d439c12777d2f46a1c3c3b94b8f1adebef55f02f2d7eea4d5a WHIRLPOOL eba68768d2339be29aae393813e4d2dd4f9ab77f2aec08e142630fdd0cc0468fe9fdafb2f96ca200c751726844aefb78efdb418d59ff00d717085dfd43f570e8
 AUX cglib-2.2-build.patch 2269 SHA256 0528b998d5a276ed4daff1001e7b3178596af23bf72c84b53a693a1d437e6d35 SHA512 bbbce587260758d6c76bfc28efc1a0669321d26e893037f0d59048af35fecf5f88802a22041c6d592420905ca00aacaad677df2ece037adc88cf7856b97d68f3 WHIRLPOOL b3361652b1fb8c65b4abff4f6500b4d29aab8954232672c3e2e7d62ba4934f53b5bcd8ddc2498b1c42614c6e92943a8eb0b6cff58a249087b9948c5518f17d89
@@ -20,16 +20,24 @@ EBUILD cglib-2.2.3.ebuild 1728 SHA256 7e00558592374ce89ce31a992762e1be096f3bd9b5
 EBUILD cglib-2.2.ebuild 1665 SHA256 4eef4f6a560173a83bb954d323ced0360f61c8e4c06bc723e1ede7ed9aa90a10 SHA512 0e9be8add245561258e14f204c94b48f96b60a99207a2999ff76bc55d838dbff6e5c712a3da2c2fde2c914bd5eedb84168cdb33e68ea7f0429be7a3b414fdcf2 WHIRLPOOL 1039c27770b7925c3d38a0072cbff640f815734d38135bfe2c4e0968c6544184bdf253ce9f9b65b41ccd2518bd6716199667814985ef6f74cd479c571df8a5d3
 EBUILD cglib-3.0.ebuild 1161 SHA256 ec8fb881ca12e2bd83d05b4be08f6f222ca1cd6020ef0fef62deeffc075d5e09 SHA512 b754c02a4f0746c48da7970dc56080ea0e61ca2374fa548dcd3fa057eff2e8f6459052945a40a1ab1e50a85a4637c7f7c9935b6bc10193eb13a0cc559758ce8d WHIRLPOOL 974a02ebfd90716c4cb0c7bd090556aacb269eaffe150dfb791671b5655c76ab91973ab078e24d229eb78ec48bb4ef5c79626f7db68a0cccb683331bf5f8343f
 EBUILD cglib-3.1.ebuild 1237 SHA256 4ccf584864868274032782bde5e20817f4f03c27e95b73c31c4251682d3fdda0 SHA512 eed713a552ee8c82dbd904f329431eddee886c6f6b79875727bca11f53806e104455053adeefe7c3dddbb26c96ea430dd982da8aa99fcf66a59e396652c3ec4e WHIRLPOOL 0bb58e4b9b849251f83d138afff1d7b434095e9ba220b0f91c64c3dc92e0a53714d96b212c704d1ee7871c5c998e15fdddc286706b3952c2ee9a7d2ee722e1f8
-MISC ChangeLog 8829 SHA256 e533b5d82f331a5d31ecef1202a49568e4305b91cd0855c30e10d632bf455503 SHA512 d91329aee767eb4f1aa3a7ccbd6bf1212cf4e53935aece686a91631eaf68254b209cd08b1bde2d6eada02522584adf93578cc98a1b7920d2dea0dec9f8d7fecd WHIRLPOOL e372bc133319cc498982eef65a5d80215b8abb6bd040d95b5c13497ca66e404dcb4291f84002eb7ff92da64ee5714697b58e80840a549895fb13a07813df9d7a
-MISC metadata.xml 426 SHA256 db1fbdbee6a4e9b0e8f09876db6cd4a93313dc079d499d3fb0a5cd9c97301e53 SHA512 40d7fcb5b8273baff8aca444e82813c87d4d7012dfa5affba82ded3cddb60f2d85820d48afb4c1d225224d8464749d4c579b814aae02371c7befca4139e11775 WHIRLPOOL 05ab8a7e04ade5314d8cddbb9504b8f2cfef0b5e763acf30b988bd9c52413ba0a8b0736ed2dfe84f4037363332d29567e98ca93dcd515c9d9dec6e732e952eb3
+MISC ChangeLog 8923 SHA256 41e211be3664bdcc19336463e3e11e257edae587fd08e453203daffd9a63c5b7 SHA512 f6ee6890acc53afd962901c1f93c4e0149ae5a9cb602bb95216beb5fc6d723eaa760363ee925cc3ee204e84e2b0c582471a61250522b98cbeadf114ce18cb947 WHIRLPOOL b2105f1d987d73711b4bbf55304a67c62fbeea7ea1af7c3672d74aca8c3bf24961bb011cc3dc6c9754ef705ad928437d1258b6547f6191459e47877a24ee4f37
+MISC metadata.xml 476 SHA256 611bc2f2246cffe4bf4b381dc2cae0ecafa91741842cdc312499e962c3c8260f SHA512 064b8704aa975bcf9545caea1c59122e47fcf4bf92a083e410d1f65e4105bd1c5f1522220a3a8bc9ea1e3eb186396247a0d08945a6a7e7f19671b7d30072c99c WHIRLPOOL a8b6edf717f149d47f029ad41329e0474140d6974b363b4bce708332577b02f9f31aa53ba3c38cd70cf42d60c72b02c64b103c9b950e3fbe7d37ad87855af90f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJVdiSCAAoJEJGRpfGTSRu4u6AIAKPJNkxJQTKRFZPxj2zzkcP/
-B/pFwhsl2OAcoeeBjn/25iR7SXxc7Un6lP4yCqZ/h7ipNSfRzhfiBon1ChBLejXI
-p/m6XKUngvqVvJ41wwq4DdOfAUGs7yVEooED2dJOx6oS55n/zNfS1t8M6iJmzmQW
-JmZfxeaOOzgOLmf6Meks37B3EXkyNpSHFckHAmJAJ87RYBt3BoaNRJtrn/gyXlLp
-wl4/yemTV3pBGJRzmepQlUA21M+3MXcVN3TWg167JDsplwLWG2/yUI0z6t4bxk/i
-hJK+KJucD6m1gk3B0yC6j9YyANFkhRzep5E7HHOllGAZCTOb2U3oalM13wJ6CaM=
-=g0Na
+iQJ8BAEBCgBmBQJVdurXXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi9VsP/Rlhbx8Y/jgKb30JfZARoOKP
+2KGvbGJT8nq8TeBClw4t/su80FCLPyhRTJZqEXV80OGDm57KI+Ihq4V52j/fK6Eb
+IsyMYacUopOycHHAc57A/6mpUjxD87VawMsdsOTJlCU1TmNOx/q+V7XKxSz4MAZq
+NpkA/xKuOCvXWXfyCCh4zZ7O58L22fkh3AnLwkCnrm5XBVlFhS7SlpYAwMuSKA5k
+gdhJVF+5VagfryxF4FE1VGOja0d3wSjlZYVv2F2MnmzP39gCydPKzeo5+FYRpENp
+s7pnRjmzJncwXaajCRz9/w9COsX24ljVB9l43Xo6gj1rGiysFVr/30Y+pXA7toxC
+m/vGr+FCJuCAkCcaZyRQGniPHGX34qYqc6CwZZjsUAUe3GNy7f/37PAJtSI0hvMH
+uiJJWV/XsdRXl3b4tkBo94GtCCdyP6nn66Y3sYU/qRjRNsVqkgrZNRm6nfh+i8jo
+pHPLIailSKGrrDQmYyetdj7LnVAY4LUivwsHKE/Uhf6zdkyMyAWaiB+Tg/xOGGR3
+xMsTs9x56f96Q2p8mSVjuswK6xO0pB8bgpfMry1UjHu9UeBx/LS+bZVER7JoB/q6
+t0LaQrpt9i8Y/TmOV+OOTsEHKlZpsyPrVoBYN09i+dA2Ssma72EkBb/ib/rVFjGu
+8/H9r3Ogn2fzfRQ/0EpY
+=zNrO
 -----END PGP SIGNATURE-----
diff --git a/dev-java/cglib/metadata.xml b/dev-java/cglib/metadata.xml
index 2ff1ec115be1..80d7a322ef6b 100644
--- a/dev-java/cglib/metadata.xml
+++ b/dev-java/cglib/metadata.xml
@@ -9,5 +9,6 @@
 	</longdescription>
 	<upstream>
 		<remote-id type="github">cglib/cglib</remote-id>
+		<remote-id type="sourceforge">cglib</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-java/charva/ChangeLog b/dev-java/charva/ChangeLog
index b184a0cd8589..068b0ef5182b 100644
--- a/dev-java/charva/ChangeLog
+++ b/dev-java/charva/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/charva
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/charva/ChangeLog,v 1.22 2014/06/17 10:47:00 mrueg Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/charva/ChangeLog,v 1.23 2015/06/09 13:32:27 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   17 Jun 2014; Manuel Rüger <mrueg@gentoo.org> -charva-1.0.1-r1.ebuild,
   -charva-1.1.4.ebuild:
diff --git a/dev-java/charva/Manifest b/dev-java/charva/Manifest
index 88c2719b675f..0d7ed46c6a9c 100644
--- a/dev-java/charva/Manifest
+++ b/dev-java/charva/Manifest
@@ -1,5 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX charva-respect-flags.patch 1028 SHA256 e603854849eb0350e7b4b8ec8a977bf2b870a6db9a5af7a9a9d934d2e4b6181d SHA512 3ca1d130a76f093fb8e84e27aaef4479c0e6b7ea2ba67515b71e9538279997dd0c37d7a18e5e4a8cf87e81cc4c175dc1729e836173da5713298a928b69251f75 WHIRLPOOL dcae9766c890d17c8a4f44ee8185181f87d63573e0c05393f1b4fa9022febfa380845e3c92532d0ea8248f2489ae94f9225dd7562a17f4263d970add7202b341
 DIST charva-1.1.4.zip 2100886 SHA256 cc62e83e80efb7ddfab7fa91a09ef61ff8ecc5815def9631ab5ee83a4309f737 SHA512 ebd3c11faa7091f5c7d9265f3da99cba12b4c08bd126c50f2717664756695b8b417f89324f40d5327f591c8f55a3dba8a6cf78d6bb9bffed466a1564c0075b48 WHIRLPOOL 7695ce9135a352b63cccd3c4ac58919d71ce6e6784d264fecdd7dacf40079767938b36f87a63f43ba490a8224890be9f586bfa804c99e13151a4dcf21374f40d
 EBUILD charva-1.1.4-r1.ebuild 1424 SHA256 0e12e2f10ff9b2718da257ddf8d35f245eebcaeab70dc4e96727249febb8b955 SHA512 b348a8f5d8d7d01f6a3640ef58650d1f68cc890a587f44d3159514b10acee99588e1b8c00676c22707009d1b704c317bda4d92734c534ba3fe9b29d3d4323875 WHIRLPOOL 8d4c6d5b19ac46141a9c680b3c9a6fdf2b5b5510fda7c14d40660e427910206ffa1221468cda6a1dcf77873196befe2333c170bde1537070262f5219ff4d0b87
-MISC ChangeLog 2693 SHA256 566b15cc4385da8fb1b1d3c15f6f11dfcbae329fd204f041e7df657bfca03db4 SHA512 bf225ba9cffdb62c8df06e242a10dd30e227a9af8d83f8a053c07d2af38e061727c28987a4d37c97161896b5edc4f36fa1e74f6d11e56834ddefcf162d1852f8 WHIRLPOOL d0cd984659b49333899754a39dc7c62e8a88ade4fc6ea85ed88d4d4a2325971d3a061aaf3b9114ae16f34bf430bcb5ae20867a1adabbbb7e6a49f7465338a09d
-MISC metadata.xml 157 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 SHA512 bbae663e26f48fdc5e272adc2b06c14f77f34c53caf84acb53908ff036e7c12a3edbbc0929d2db56bee861a453381d979c7e0983a23716f629ed2135c22ffece WHIRLPOOL 887e153e2481e7d76f0f1b67a395f10f0328b93930185ecdb8fcb5fe3c50f839086a18831d61cf45b34657aaffca6c3b7900cf3c04b712846a05027a84602448
+MISC ChangeLog 2791 SHA256 93669000e1109af34d0ef47ffa96d40149a3a7f065483be7171be23cb00d60a3 SHA512 160483ce6df7108b676a7b24806210b55177eaaf454a25e95da629192f71e394f98bffce19ba39a3a28f991cf695f4156d375f536659052632b6dc057599be5c WHIRLPOOL 96d250942d04b2d3ce87674d02db4d6ac94aac7d09a8fec1ba156b5b97ed7c67e004342cc339e72904bd4eaa7be88b543fc44a3dfc6b2ec3bacb62cb3889785e
+MISC metadata.xml 234 SHA256 04f42f80b57f0218cace73c1db89fcf7eff21a778a6b7ed5b56b5bdd88983a93 SHA512 ab1f194e92b1fa87e9f09eedaae40b145479a12a5c5e3dd333f9f1dbf2abb13f1bfea32c882456a7997d952844c1bc20bf940afee1c9ccc94cfc6909213545be WHIRLPOOL 595439b19aa1d4a7a796c9ca857a5964d2923d3b387eab1bce83dd0cb2a4662aaefdd088124af8d0d78512ab338a540f776bfb5422fe6b74e7c5764b01106097
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVdursXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmie4IQALaBcLWRTPyOysU2Xm8lERPa
+Vo8icfyi1IXb9mPCZvYpaxwsgW7ppR+xwYW3xGz9ApaBFd+B3B82rVBbBqPcpZ0y
+ivwbpojr3gBeBdKskz+wXPSrpr8KLTqGOxSemQuyh3GGAlFc61fgphxItTCMYJoI
+szfSDlj/cB8cxv2VZj4epwcEaVkSt2voHFLfiZu6xi0gZfUKJfSaUavRLwUf1Ql6
+XQXuYpbw/w917aJKFJSyURlrw/nBurDlpsYbyp7M60sW2JBavnAvEpGCNvgFVWil
+jOtejIsuZ+C74clLZ3UQVuWU1PCkJHBMC/BKv0qGT+lng8yWvqrTQHp+4BEDpHuQ
+4fwE139dgK6AlJVFxyWHDAHZbyWChgGuxxl+oJ1PLXTi67jiBAgKDRUABrKO6aKS
+B9L4t1LsvyXeYwff6HsOO9I6uu6dbtDvnqAFf85hbgV1/1iARzavLHD2mR74thNI
+HkzyIP9xTtYmQ2GwMTkakCVHDyrMJm6JHRZ3N9OBzqQ1FY4DLyqBe3YK/BmXwSxX
+MVtvnu7zNyMUpZtQ1vMtTNvTPWDzM7CQhcUQPFcWcQbkHv+t3J01L7mUcg3QKTOG
+vTzwuns7VGc83a7OOXHQPudTEEOl4Ry3c7FIKkYrM0+YaWSKcIlVDzkdmXomneVZ
+eum/2dr1j+hvpAgl29pE
+=GLTZ
+-----END PGP SIGNATURE-----
diff --git a/dev-java/charva/metadata.xml b/dev-java/charva/metadata.xml
index 838c00a4a448..ec76855e0cb7 100644
--- a/dev-java/charva/metadata.xml
+++ b/dev-java/charva/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">charva</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/cpptasks/ChangeLog b/dev-java/cpptasks/ChangeLog
index fc2417183f16..bae6e0d788c5 100644
--- a/dev-java/cpptasks/ChangeLog
+++ b/dev-java/cpptasks/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/cpptasks
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/cpptasks/ChangeLog,v 1.14 2014/01/02 15:16:02 tomwij Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/cpptasks/ChangeLog,v 1.15 2015/06/09 13:32:48 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   02 Jan 2014; Tom Wijsman <TomWij@gentoo.org> cpptasks-1.0_beta4-r2.ebuild:
   Shortened DESCRIPTION.
diff --git a/dev-java/cpptasks/Manifest b/dev-java/cpptasks/Manifest
index fdba0c31b5f0..a70ba2c4c4c8 100644
--- a/dev-java/cpptasks/Manifest
+++ b/dev-java/cpptasks/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 1.0b4-profiling.patch 2003 SHA256 235801d7370c2eccf8946853ab8bfdd70f9cd4255df01b01f592e39a06cae08f SHA512 f51ad16d137ada9e705e084edde6a6faa2a166f240e1855f0c25fc734f82ee5cad330cd812228fcac858a07113be7a2641b01237778f11ea1dd78f45f6671596 WHIRLPOOL 686e5134037115ffd91fd899fe64a1babc562173756a798eb643da759de00b57e8faff42237f92aff0c4f925a28c9f79ac0e7bc7d5a204dbc06a9cb0b6b04ef6
 AUX antlib.xml 749 SHA256 f7eedb6243323e4309d70c4313867030859175165172a069c4c02aae00572ac9 SHA512 7fb9a2cbf38cb36e4a58137eb07038d21a2d64a645e0555ff0785ed02d4dc70f9ba4927da406488f878bd32943def20f9c36721094075857f93595571cfdedb7 WHIRLPOOL c19e16842a33d13d947f49fa73e8b53ad1ec0df5770bcfda50156d7910cd3326d3e2e99af87f3f860a6f617225138e3f4234a02e93bc89c91609059b8cfe02bf
@@ -7,16 +7,24 @@ DIST cpptasks-1.0b4.tar.gz 879715 SHA256 3472af7389c5a7daaff48a054c2b9f10994b553
 DIST cpptasks-1.0b5.tar.gz 902930 SHA256 d181cee0c4e28bed202f8bf582dc42bbc824c7712ea29c7b17f036fc7cdfc209 SHA512 620d16e60cdd4d8a09efe6c5889ec1beb20d38df3a7ebf337de546cd60881b4c22a08f24374e7dac02dbbb3b23defbb740a70f1d0ff59212496e631251f0e32c WHIRLPOOL 1eb3a0726d43a40453a7a70c89b2fdf8880979a52f8dac6cab9a01800184c72d084d603a647804dd6a55a162a20fd2102818fb415336e21beeb010bd3b7eb196
 EBUILD cpptasks-1.0_beta4-r2.ebuild 1587 SHA256 ff41bbd444b561dda648267f6981dc172dd012ff01dc6217f0fe38eb47371f03 SHA512 3f86f2b924b31b01ee757e1e905697c9b615fdef05572021a1507b557b0bf9d3c22db630ee40578d63dea8bb53f2e8def215914eb6ac8448674db0f2b268f905 WHIRLPOOL 95e4243caa549b00166885dfc7aeb2c32a44c332f4482468ff543252fa30b67352f0377b4c636c0598d7c7d747f72e6b6585ad68955229841fc7aace8264c7c7
 EBUILD cpptasks-1.0_beta5.ebuild 1510 SHA256 53f13e981f1b209e40f3ca7a7d98a7d6cb14476582c3cc1a426e334b7a335029 SHA512 63b2ef878d49f0743b9689002bec967db2d0aea626e3f7a8a9fb817c6de2bcb975ca5d6ba5626fcbf9fb64745cb340005b4f95d73efb41f3565bdc03731cc2a0 WHIRLPOOL fa48ccadab9c7e352113d450134869a81ab87d7e8c6657178d3c5e11c19615df37c7dc0d7ab137b2c27e280d2d834cdff53f6ebf0321ae31740b81771d6778ae
-MISC ChangeLog 2471 SHA256 dcf1d94869a90f3b740df6aa4faa956881f6e15968a6a8ccd24a3184a6cb01c3 SHA512 424f8a81a699de3bd5434aedefde133a04519123bfb0de3dc4146ecfabda0f0732157f2a1eed3fbb45de19e63d6c553874d0fffd010489728d34b2e545d10a4d WHIRLPOOL 0086c466cb9d8de042fb753738dbef90b1758feafed831d50250e4f8a073c72c16c6cd842af0e85f165fea70376110c2ebee15a06bfd2b486a4e989b553fe897
-MISC metadata.xml 159 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb SHA512 74dc9ada199a90543b8e1c168c7054f2e973fbfa2551e2b959d67501f2538e269cfb4b2f0905a88a1afa04c20b33961336310ba876f80d47c8e7615b2d7c830a WHIRLPOOL a0ac49efeca233ec4d8f63eb69c8e46e1d4ecbd926693c25b1b8c7415e4c565680936aec46f0c4197116fd7a19a3bb571beee493c18bdae1e5e978e3db84f17a
+MISC ChangeLog 2568 SHA256 101cfa05fcdc4c1e72e559a419f789ca32b6ab716373e2944b59d9c132d74e11 SHA512 a16866fb03a053c93b4dc81bfe1d3a9d20d0890f53aa6b937b59c5b132d6f7dcebb5dae5ce0deecc6245d3e57cd5dc7a093b8a5a7e8498082513df8f7e314096 WHIRLPOOL b2d5de71e6543e67164750e114b5fc6154b9a7e8532f67fad30e3838da5b14e250f412ba017a909659f91cb3bbbba3303549e5b2da9bdc8d70611da0b5e946f2
+MISC metadata.xml 239 SHA256 25d7c997d4d41336a8f8005a77cd62389b239dcf50fd192e38f90ebad6f92183 SHA512 3138e53c88aa97474a0bcb7b0860968ec25a3dd803a2d19e0ce2f26b7a2a59ad91939f2a3f90b0cf1075e5ec488893fce4719f7a91e7ec421156a12a8b8958e9 WHIRLPOOL fd26c6f7ce723502b678b07be9f2260f07e377a89e7f9253ba7268c19323ddf945837dfbe42c4525ce9812f7e21b3df5bfe3a2edfe38f6b45dbc32e1055ed68a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJSxYKeAAoJEJWyH81tNOV96VsIALcPV5lF/94lFPdu0hLy4/x6
-l3lpaxCHnXKXIxL8u4+hUQ00j53ixsHVK76e/xh8oH5+/jHbs8VZpPWgvfZYBLbX
-ulouKYGTzEyV5GHl3cv0jItyER+LQw8BmFHaCfr0d9XRLXBRgfjUno8dnN2Uh2Rs
-4QZYmE9HBOdsDWqbbE47j++eJyey6ekRGB/3hftUmlmC5yTFP6DQeR6pl8hFA9br
-HCbBmAtOAVgFjqN3R4hxgsRdrvLfFY+4pwyGhhImMmH7B5/lv00sUP0Oak4FJVKY
-+yRUEW8X6fjGD7ftnxY6wGEUvQdKniJMBTw/UwVqWkPABeK8RGJSz333bGtGI4Y=
-=se/J
+iQJ8BAEBCgBmBQJVdusBXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiOAEP/iXLGlsNoe3422bLTciZuSso
+i65alxgWqui4OACa79IbN3e4JDwI8idTYEFuyWTY8Zm/eP4pAJ6nxyTFF6aENRpV
+ip6qua5JctFYZJMKFw65iXK58WMNex9G43jdM1/TJSghVvgbbCY6ogVRnWeI7iwp
+RrSi0MP3IbOwQjOZ0igQRRRFP6GTQ/aGb9tfCrNVGbmYLRHMwwXn/TXc2HZZ1oGF
+gTpKqMa1GfjQ9pcFfMuYmOJNeaRGfROtzhGM8jpIVhDjrprCTllkc4aqRfl6hcxZ
+jfZfOP7x4XjWYkQPvnbi13r3depKGMvCEFzwEBGoICj3lUwQXStNsq3PAUTwuZPu
+P0ZqdtgVYPd/eRvCjqqKiE5em2bmlCjwPxplDeadPicS8WSsZYyEXEyIoWHjVX1g
++JDXyqoQuT8epcNxADlwyJnU+3i/pV28/dNcDe9xw11w8JaQryEexX4fpgf36/GJ
+G1hhT5Oc/xTmPaEGLY/L8hEJLPBlMmf/YJnQdiTe702tL6k+IBSHks7h1TZx6iIB
+Fj6pgCKcepQRs+6BZgVok7Q8MGsd+VcsGXglPQi/O8RX4pC2n71rHHXhzGH7kMDX
+07SIdmQQRwlxNQpvU9zFFw2ESP5dEIilwxizXF5Hp1z6syZC22wfXNMaj5KnNyW4
+ynGHltguDaWzzvqCskWi
+=M/eU
 -----END PGP SIGNATURE-----
diff --git a/dev-java/cpptasks/metadata.xml b/dev-java/cpptasks/metadata.xml
index 250f2d1940ea..9452de6d1452 100644
--- a/dev-java/cpptasks/metadata.xml
+++ b/dev-java/cpptasks/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">ant-contrib</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/cssparser/ChangeLog b/dev-java/cssparser/ChangeLog
index e043be537ec1..abf0fbd77d69 100644
--- a/dev-java/cssparser/ChangeLog
+++ b/dev-java/cssparser/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/cssparser
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/cssparser/ChangeLog,v 1.6 2015/05/27 08:31:32 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/cssparser/ChangeLog,v 1.7 2015/06/09 13:33:05 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   27 May 2015; Patrice Clement <monsieurp@gentoo.org> cssparser-0.9.14.ebuild:
   Declare dependencies with SLOTs to avoid java-pkg_ensure-dep warning.
diff --git a/dev-java/cssparser/Manifest b/dev-java/cssparser/Manifest
index 3ac9f571154a..e8279e8f497c 100644
--- a/dev-java/cssparser/Manifest
+++ b/dev-java/cssparser/Manifest
@@ -1,20 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST cssparser-0.9.14-sources.jar 234339 SHA256 0a41f330da911f31d4911d2745d83ecc37a131c41e99a052f131fdaf585addce SHA512 e7f9ec1bfff774d75c367c1dfcaf2b10550755900071cd6a5a64d9453b789779e0bfa6bcbdba48a679604621ee1ffb32eece774dc219d614a52e5c484256feae WHIRLPOOL 3d23c0d1873725699f2c5031aa13c30b1954c3079bd18826f0f868bc3ca78ff9be4203168778a9fd7dba0b005b29c03311404175617c621e0d0c787bbef827bd
 DIST cssparser-0.9.15-sources.jar 239976 SHA256 8b018e92228ea16ea1c52bee73bec9fe224c608c628af30d20951f571f1e493f SHA512 86c6f30542b6be967ee4099b59858531f1e333bfdf2fe4a1ef13e252cd836911da2d7d9258f8aef5fa8987d14f35905af5a82929810bc0550f4b58bc7b993e64 WHIRLPOOL fa1974a5e4d47e0037af7fe6ab2c4fa80e2379310c92604e48f289e81cbbf1812a3352289bf1389552fa4bfdc3a509556f2b3e0aa2cf1dc0cdec87053e10519d
 EBUILD cssparser-0.9.14.ebuild 599 SHA256 cdb7cee6d594bb63fb1660f9c2039be1c9fc2a34618447b699fd11e61870483e SHA512 765545c3c827607eb48725187bc1d3dd721624f8e936cc89f4cef05fbe5e53821942cb9fa92f1a3ccd999af3486e6abd9b08b00d00b2a15c4c8684965d7fda30 WHIRLPOOL 4611e37671df6be3ea3902df839c98714e70c58f694ec2261354211573f121de5a5086894d506304b5a26837129abc895d23dfc2b83673e8ff00c7fafa67f3be
 EBUILD cssparser-0.9.15.ebuild 601 SHA256 5915c416671a117bf22676fc9afd4b654aed4cf5974bf64def5cf2affeb315e3 SHA512 01030ebc08fbab53f5634164e77c5c3d50b89e8c50112a59a69565cba6059d51f8e130ee3b47fae5f11c9527d7b02706f7408b66fa69e9db55b84a55bab96980 WHIRLPOOL 4e359c2b28e500c49cba24a69052ef1de261555dee0b98cbd787f8c7a81b084080155bb31ad03b4a0b9e403cb1b44b5ecc29c02b375f87474501b9323b9cc96a
-MISC ChangeLog 924 SHA256 8e886776a23091561f65aa12b95da72840eee3e84478127991eed5a5f2cdd75e SHA512 51130547f0fd2ff84e0400474c94a41e1b8ae0c648270ac021409d57257d94b73faa33a719bc3bd98704c06667a42b369450e00a2c41f3654b58030665cfe1f4 WHIRLPOOL 91f74a6a9e9ba3a1e512cd2de27f18d55599102adbb091fd0c787638669ff04c403ee3020cab178e4b46024001cc07116df668888e1f51a7df95373b2ccaa38d
-MISC metadata.xml 226 SHA256 c0f7450a3293e5d1b024fd79b3dfde90711acbe89233eac187bbf375e8551d09 SHA512 fc467104cfd4fe89bf880db9eb46daa0a9a4e0a0d8d3dfb9263a47016883cd294f026ae3e43318491aacc63447f930a8df147176e40813c1feb8c740a316f9be WHIRLPOOL 7573504f99d46cab7ad320ccafd60ed174e13f4fbaefe79f23fb26f80cc4f492e0e0f6f004d60af70275d66827ccf2dbed127340c6a89728b978a7afe0fc08c7
+MISC ChangeLog 1018 SHA256 50a3174977fd5ed7d94a13d70080ebe71a4f2172a3ec2476b06a2faf37f9d8b8 SHA512 f551a4924206ddd0c0fa55089007fc76ab45b5b9c669f0ab680cc4fc382453695ce407a8325f3558f9c789742460dedec1592b61bf024855ea2f823f0885cbbe WHIRLPOOL 7e2a74833159da7ef3e76f0206e59be8caa8b4f408c85e6d18242d5219203267ef4e0fa3342c3e87cdcc08c41a9250ef59ee7e21531b6e9314fc2c17462f5e03
+MISC metadata.xml 304 SHA256 9744cf0aef5a2532decf32642cae52959f5ba71506ce857bf1e62cb140968dd2 SHA512 ae91e5d27665adbcc7de8a5a2249ae533dc6adb5c42e0f646740a04412b79c77a8d85d1518fa7c9742c9c928494c1e330c395f5afff5a7d3a6a4902a0679c4d6 WHIRLPOOL 865f42c6a74447ff43af4e95cd0420b313bfdfa0f1a8bf3de6b4a57fdab6f235663f0970854a5620b0e6f06e95778a03b4dc48a924ef631d94b3afe3fa335d02
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJVZYB6AAoJEJGRpfGTSRu4vr8H/3jtwJ/393NpWnKNag8VmUZm
-SLQsVTaVfXIw7KfNVG+VGIuaEsOKs6foyXhIr2C8lq0yXQRAoBYUCjSH6T7EUM+j
-hYhtCcpOrOl4uUG+/iv0Li6pkOJFA56Z55O6FEovlitbrsrgHJy7Wgpni7mhXNlZ
-a2Kz1iZPixcR9npOo+7Fz+yi7TZb9XlVQU/nrkNVNXatCGU7LLuuj14TzwknDqk6
-oZTMZLDs/0V9uQJ7PKGEVjSYaaPiMlWrb6bNmA+tGVMi2Zt6jdLb4PMZRhuduCoj
-cvY0BUthBFFlmi0XsEeyx78MOAVETCzCgk3pqW7dozL4gEpLfIFVK6XrkDgnuTA=
-=R4mw
+iQJ8BAEBCgBmBQJVdusSXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmioxAP/1bWKceY8enjLdWI1DbEL/pm
+W6qr+mv5sA5oMdr/Qgn+v70KBZF73BHbfLjolhmgMKSiFySD7PGu1YBMaMXrDS+G
+v5mvPNCXpsZcmICUEwiLm2Qsjf/j7/Zl6Rdt4XMpbR3vrqTIr5ShvJ3ZCMMMstSb
+DqX2d0mRUfeNjwlwaUUNOaI6vbXDqxwkuisFEIt+3/S2MwZy+zdpL6QITEHs+YRF
+XrucWy4E7ap+8inNZtJvsZnNGKQFNpb7w/p/h+EnPCk3hwG6Kea3PVMCK5RNoN+U
+D5g4Sx6Z3wnKR9ETR+NUPLEXQPMIk3W3tSzpq/w9Oc9fJ+Ojr8uPtpJlvmv5UTor
+0xA51EK5s/VTA39d512vd/CazmTyRzPhpwwEYogChjD4Z1ZgOu6LraCYzFTjYMvS
+hAPqjK0NOjVBzgJi71BZ/0WFNCnYUnNgPbHl6pXXK/2QKHXhrcB6hilmM4mMPAxr
+16Mrmb6PS+IGykTbWmp/6nVhDb6qpIoPssf6Lew4GQFuoWlXU9C8muskO7CWt05J
+y7REmAAhFpPIdO+uEcB3JLgzWjpNXsrM6eEkHmk/oMgWjxNM4uCYQGhnUHc8+sG+
+vZT0HDsS0shKr1061FAgyCxSxlewp8pBgwU0dC1deWSBOSsBVs3OQ/isx6PwEeUB
+sIctDPCA5hi8LMMz1zSV
+=y4FZ
 -----END PGP SIGNATURE-----
diff --git a/dev-java/cssparser/metadata.xml b/dev-java/cssparser/metadata.xml
index cf7680714292..84b2b66a12cc 100644
--- a/dev-java/cssparser/metadata.xml
+++ b/dev-java/cssparser/metadata.xml
@@ -5,5 +5,7 @@
 	<maintainer>
 		<email>monsieurp@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">cssparser</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/dev-java/dbunit/ChangeLog b/dev-java/dbunit/ChangeLog
index 064990ed8ad4..a93274a305ac 100644
--- a/dev-java/dbunit/ChangeLog
+++ b/dev-java/dbunit/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/dbunit
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/dbunit/ChangeLog,v 1.29 2015/04/21 18:35:10 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/dbunit/ChangeLog,v 1.30 2015/06/09 13:33:28 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   21 Apr 2015; Pacho Ramos <pacho@gentoo.org> dbunit-2.4.5.ebuild:
   ppc stable wrt bug #535044
diff --git a/dev-java/dbunit/Manifest b/dev-java/dbunit/Manifest
index 31c3d479f7ed..6b39dde4c2f3 100644
--- a/dev-java/dbunit/Manifest
+++ b/dev-java/dbunit/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX build-2.4.xml 1620 SHA256 e1e4abfd368f0c8e6dbbcf2cb68f47a02ecb60d881fe53e3d537ffd192d99916 SHA512 7d7770b3d5fc3447d7295d4000818c89aa4a22a1753e9484472cab57532c747f86116e2e864a4c7021f664cf8f03e798fe8c8afdb776dc40b275c6625d625bb1 WHIRLPOOL 72740fc99d5b84d09b7bbf4fbdfec7b65f08e6321d90594d62ed7c5139756d8cf71c8f5d236440125978d17cf1149a6ad8b24bb838d2bcd0b3302e658a35f6ac
 AUX build.xml 1446 SHA256 6a82e56811feb099fc8882b28cfeaa9dfb6fda31a14f3a0495fdca2838a02eb6 SHA512 b87d99fed035554e4e0fc8f07dea9e7c2b57e91b5f826b77d53c0cfcf9548a703e14b154e8fc256cfe47770f7e7d31df6072a64e69721083c693dea1f677b509 WHIRLPOOL 7409aae294c27c1fd797445f6e8d5512fcf11e55447324be792224dde1eb7297d70b01df11f985cac81f443aec1af94b8ffbf3aefb4c0f11694d268755bcf7d1
@@ -7,12 +7,24 @@ DIST dbunit-2.4.1-sources.jar 486115 SHA256 2c7dc2e2c37d8ce6bdfe20a5bfe69b5d0f34
 DIST dbunit-2.4.5-sources.jar 509812 SHA256 a31762bcf4d41e24a33cbb20043f9c0bbcccab099a8bb11f29fb88fd6af2b9c0 SHA512 9f6f43337d020aa8c8066e6a12efa3d3fc4256b0bc3ed3d330ddbd155a6430accea03e45987ecb44c747a4844c7c49e36549317c63b3cd456896d0e5bc508b5d WHIRLPOOL 6e230abde0d9792dda3f83f549a0df960a8f7bcb4e3541f4c279bdb3b3b64c4aef7281326d4beb25770b5e6205f8a247a02698d94e84237299ba4da4d5fb3133
 EBUILD dbunit-2.4.1.ebuild 1285 SHA256 d763286eedfdf67210a2480f23b8a1166f54b47eb78c74c575e859599f2f94c7 SHA512 4dc5cc9f8f63eec5a659c558f0e63569d12aef539fb5a239635444f06d35817cb2284aba153995a0c367d1d2a5449828be1cabddeb0647f64b6cdb90d9bc20e7 WHIRLPOOL c9d3e9aaa63ee66450e37e45f776b5d9ce5f47297361fbc86ecefaaf25eaba5c8d3b07ac9ded94608faf35cd39305eada79fd0b3b8a39c29ff47f865fa947db5
 EBUILD dbunit-2.4.5.ebuild 1315 SHA256 a9bb0e2f474bd9e6c1df0c0c47eb0a2a1752ce2ccba932cf46e5d7aa6f6d3924 SHA512 79a240c2fe9836f66a7ac28367506df451d6e6bf7b765501c3bee515d635cfb6ea0c85fad77acf0ec85449934bd77da3c8b21d996a464a04efcbfa4289d2ad18 WHIRLPOOL 966aaf983c60e3c90beb1006fc3d704d6d34c883df512da86cc989ebb6e32b1907b4c29c95327295878177fd2696e9d4d174b55ce0a44cfd86d76ef9cc5e0753
-MISC ChangeLog 3128 SHA256 20a75cb6fd0c02ee183fd87d956820339a90455d59d3250441976373a8c711c6 SHA512 e91b0483fd836c6fcbbfc1ae11841bebaa98405aab69a686be441ffec3b1ea27b15745f9688f66bb0d643cf11c32311af926eb3dd3b7eb674fd1845b579ec7c0 WHIRLPOOL 0ba65ce5dc7a10e094f9985ec4650f003ba911cf90f89228047454131031cce068849b98456285ddd0543a173ca7aa7288d98b43e71a280aa3038ee18c5ba7bd
-MISC metadata.xml 330 SHA256 a167b88e34441478573f9c27cf762e93eeee9a7d6f80447bf03106c2b6b1a444 SHA512 b3f7234f1d2d53599f252df00f1a1364df00ed13c47a36069f5898f2e224e4a79a3aecc50585f4374f37185d83c98983a00adc6a5849a87eef506633760d7720 WHIRLPOOL fb8534220c45e550ecee9d936f424235ae9b28e9f81f907550bd60608ecd3ff67ebc1b7078e1feafce75fa1f420881d493035744e6abc55482e06714f2a52074
+MISC ChangeLog 3226 SHA256 afad0b520da5ff4a2d42f4529d5a7c100c519263cca3aacd1a4e97e5ebe666b1 SHA512 2e3ceba386f326ba84c4642fa424eadf719c0f95d027cf03c48fa1c3e4a27f777d0ef1347745dc120184cf6fd566e47e93176aaeb3247075cb04548059bfee5d WHIRLPOOL f8333b14dca5af01936d0fa48308b518c0deddff4382f91bbbdb59256b7c9341357668f23376782d3d8522f12e451d7ec58453bcd44ff57f6f4ebe5e169cf354
+MISC metadata.xml 406 SHA256 d656cbc352722be893db593434be2a849f90213576b71f155134a3e788394194 SHA512 488883095dd5cd9b97dce4d2c932fabda12426c9ffcef148a0cb6d992548e5e8c6971ea304197ba1d153b713a41a47e43cf2228b53caba6bce6cf623831609ee WHIRLPOOL 44eaf1ace114cb49444b51c5db97e860fae0e0a623b87085ec06fc5ee3b4769b9b1f11e246a825baa60fb4b262db5a5e76221a1bd51ad6daf88bd4cff74d2426
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlU2mF8ACgkQCaWpQKGI+9Q9fACfa8pz/oJq4nEUATeutetJ0VYY
-lI4AnAgdtU0Vs48uIgD/1AMTYoGfd+Ed
-=Iuel
+iQJ8BAEBCgBmBQJVduspXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmikQIP/RBH4zo5YRqppgju5M5wMAb4
+tIK0ZCQ+2lZDxXJTX5+3LcQbZOHxMDyur2PPUWqLniwSd9cnuNDQ+arTVoW/CbMn
+6NxCRUk+Ew2qBk5YTubBKYDX8V9Mr2oqx9UjE1ejr8hade1cE4agFPpY2JZ3QEkZ
+wjShMmayiqJLvWtxK5a6kgOpCAwwLrP97tYeYYqQ+BgD1FO4TB0V3KLVUxmabb9n
+3TOW58E/IAHjIBNxEBfXapqKZMnL7uUSWP0pbZvhAdEXVGzwlQaT8mvqHNoN6nPc
+rV4u20VpImeZYt9n+T8HN5oegD+rcapkKvokBQKLTcgdu84j1w8tScLvq/L+RiSP
+YVz++reEqcBi0uw+EYp9rWa0wuKX9OPA0N/YPWxNJMjCjNMs9PXysClzkHbtejBW
+nNsXXETdTk1Q1DEhtz3s4cH0ZlSJxcEaJbtqu/VOenKcJu9loTIVCMoo+ghAx7TQ
+Fjl/UhDKq4WWD2Ek76Lhte4MRoRb6FXiiY6Ybx0YL5I+yBOj5k60FJ07aNCh077X
+GBtH6K8kRkc3TGqnSXGMY3NkaEdQCMNvxc1GKL+UKtDkv2rJOujDmsrhfldlBakG
+Np2KTSqWgI9D25JLPenkOU+u6UZhpgC6Sj2fXu7+7lsXiZ6HNaXguy5yl9Jbq4SZ
+3Qtf4gUIdXV4/4nm3wNy
+=8LGc
 -----END PGP SIGNATURE-----
diff --git a/dev-java/dbunit/metadata.xml b/dev-java/dbunit/metadata.xml
index 5166d7d6bf7c..01d4dd9b4580 100644
--- a/dev-java/dbunit/metadata.xml
+++ b/dev-java/dbunit/metadata.xml
@@ -6,4 +6,7 @@
 		DBUnit is a JUnit extension targeted for database-driven projects
 		that, puts your database into a known state between test runs.
 	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">dbunit</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/dom4j/ChangeLog b/dev-java/dom4j/ChangeLog
index 15e714bb7913..939e6827b7a6 100644
--- a/dev-java/dom4j/ChangeLog
+++ b/dev-java/dom4j/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/dom4j
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/dom4j/ChangeLog,v 1.67 2014/03/09 01:31:16 tomwij Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/dom4j/ChangeLog,v 1.68 2015/06/09 13:34:00 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
 *dom4j-1.6.1-r3 (09 Mar 2014)
 
diff --git a/dev-java/dom4j/Manifest b/dev-java/dom4j/Manifest
index e66bb878fc39..5dc592ff762d 100644
--- a/dev-java/dom4j/Manifest
+++ b/dev-java/dom4j/Manifest
@@ -1,20 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST dom4j-1.6.1-java5.patch.bz2 2900 SHA256 5e7361eac5332c3380420bd88c2d3a2d4dde30984486c6d4f7e4621940abb42d SHA512 38da606d77b62976366cd089e5194a922e348ec396e7b9af4dceb0a536c47f66e0900cfa59c91df04aade6076630077a8f88c713b9c20224d69316109b293a96 WHIRLPOOL c3e56098f9a75340243e554f11e8cddbbf3e56cd13f0dc9650151ed5ec2b3914e33921174ad275f089188033f95d33386cd4642196bdc7cc6d9bce980c0251c8
 DIST dom4j-1.6.1.tar.gz 9687211 SHA256 01b4abf86bce337a2a900bf121b3107320ba63b4c0f352e1922fbec6e0736c6f SHA512 95c5a7105a81734f77b4bf27f8bb0af116bf43d8ad5297a0902a6687a54109a87dffe2953cf430d14947cdaa590aa0fdf083b46a91d1d98d48431cfae4459d94 WHIRLPOOL 3edd7c8f629465add6fcbb944eadd75b1e8fd84120c1adf2fa24d43ae04856162d18652892697a2605c1006f1e7d3e5837e30a13e01ab7d1a101614b6dc4f8d0
 EBUILD dom4j-1.6.1-r3.ebuild 2001 SHA256 b5d875ca1e200df6b5c5ca08e1d9f10893f9bff9c05d407f2d9e46c38407ac72 SHA512 1d4c6bcf9b7694d8d41c016ec7d85080d9f34510568cebe111d2d00ebabb5472988df9c5d80e0d69e7366508f04fcf3b36ed9305fb2230b4c5b7aad28a7d889f WHIRLPOOL 1bd4c9e5ae6c7dbeff0454a2706447c0f190024cbfaf660770b1d657669d5a9e29bb959b099eaccd8a848d70f4c2dfa5e03194513e3d7582465aa332a590068f
 EBUILD dom4j-1.6.1-r4.ebuild 1949 SHA256 3f832d0a1a890bc515c20827830122f85afc9fd9cefb513a89e668eeccc7272d SHA512 3acee17f45f8b47b8445265aa0a5af817f3a2d12052ab056c3d0a759e54c900c8c1bf1ad4381dd0de8017917fce64f51159ff77ecd61d92d6c81746c5879ac2e WHIRLPOOL 11347ef9caa81abaf8ba8a38a0c43b2c8c87e06a93a9b26fef1d6ee9e5b132bfeeb8c09b42fa8d54fb45b31bf78b6fedc7f1be6d27de5cee9f4c9bbadb6e37d4
-MISC ChangeLog 8190 SHA256 21e41fc355af7b460cafeca121c5aedff9125622b9bbf88408726cf701cad89f SHA512 37f37c613aae159cda0af59642cb269a81895a0401f0c7272443620ba7f2460998e1bf5ee580cff06432ec8824a875ff4816f4faebe7efbafb3be0ecdbae4e69 WHIRLPOOL 4459df72f1e2dcbb8e0a0d81c3d9abe65616c5f6b18891e74443b9ab7e56590fe3efc54c78bd965dd4bc7b9bf744d08e3ea6a85bf2dbd83b4679eb9d1aa5f38a
-MISC metadata.xml 376 SHA256 1b7f4f99476e5a8b0f24104d0bd3d6c717ee3a32011851d32a8d3f5674e5d2c4 SHA512 d3115c3fd4ad28050a46e304c5de5a7499cb35c499cdd73166974f0d74fc3e878d89c6b471840cba6444d6bb58a79e6b43aeb3a14bc4eada349cabbb9334ddab WHIRLPOOL 7c0d514c9a61ca80a37066cf02ee96ce921a4b038aa5666fefc191439e17e2632a854f9d264ae8c9dd9bb4e64656b6f45ebbf65a2f01b15bd98ecefae36d2964
+MISC ChangeLog 8287 SHA256 c934f50296533217fb42a15916e5894519ca8dd3a2f152623c20c6e01fa5fbbe SHA512 457d919bdb8632a74c7e2bc535a6e8e480b42096538e1b779bab1ccdf232aad10d8f26b7851b4323c7d949f5a76f9554ddb98a7f4b9f8ff532f3fb1217ffa1ea WHIRLPOOL 04413a84f1a398a034b99c8b13308984075600eaa4ba9915c8d6d5db4239b645875421f275596ba423feed40f43f6169bafe69c4e9adce83e0ecbad8fb6fcb0b
+MISC metadata.xml 451 SHA256 c983f738a9d8f025afc96f91698876c4189475cff722e5d74b871e08fb920c81 SHA512 1b533f28f53bdea5157bdae00ab397ea00f854fb001fe6419527b3da3d7f4cdb9edac20c046a0537d845c1953eb4fc0f8d748c246dd0b69fbe1ba92b034194d4 WHIRLPOOL a99015f3b1ae64ad854c5383ac29243b8ef349125b58738ed9183bcbf31469ab9851265044f7828fa2e6dfc3628c7c3610f4b150e65103d8ddbda2ae56f4804c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJTG8RDAAoJEJWyH81tNOV96x0IAL30nrDq/0dIFo1octxAhmfm
-ewHT99hLVe86g6vy8LY8JS8lbENymVofpHFM9SxFCvLVjO1GyBjwlFQ+K1qPLHiy
-QtK/ENq/ClAmnuldYN+IWxB8uUw8RYnTC2rMVw3UFiw3dbrvIEe/KDv9Ra69wEuG
-dG7EY0+ejQLM8gTNkz8DVR20VrocyoCo4WW/Mu7dulZXXhSSfpffnhx4tF5uxGUe
-By+CJPgFC6B8etbiPR0lL6xdRv2qJ3NulzuVcMcWiAfKAVDG4/ZFn7SqtGhpS4wy
-hBoAFkCXliHCePFbU6ehb5OQeL9lMh21IMMo0cp/foBBp0/T0AvL+FSyT0vvqrc=
-=TLLP
+iQJ8BAEBCgBmBQJVdutJXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiONYP+QH3Ptn3vgPK2pDOlElbec1W
+M6mnzxFcINQvKJrbkGpiK7/POlBDQNQM137ffydTR3glU3ft4DSpATp0En0JZpB7
+Pk6jXe5KYiPcrUVzq+1d8b51KtThV8tapOoaopqHAW7+PTaV1n9n4P5GnFYoz95e
+ENpFBtPSLNhnKbii8nDu80XQKfL6jWhdELHs+QwCp5VIxEMDUJP+RrHt1OHtYGv4
+26ialU0gz5x7ulSodX8dhtwqNkrrWsO8f9cwWdBQHi4YrU5vP4BUeEWpfjXC7FeD
+8pJgZ9yV/a9CLS0KRbZgp4BA0CgEYTgPLi88CwrbDlr0Tl8Z2j+RtmjNDk7YgUen
+YPdpVDqBWcrcOp9q/pAzfZ8IGZGGZbegqCilkxOP9KpfOYeXwPDqiOvbYm5VWXdz
+bK7XRVgFDoFAq2E/RNLzYyGUnIxlpcHwKC1j3SQSX6E0c7FSSK3IG3ddoIRHYjqN
+W60TPa+uXJTvvqbxsKIxxH9rQmgBDZfHR6gV5om3rNCmg733enIlBl1XK0EhCF6o
+W3p/H9ZEgYMHGdIxoPvzrup/W1V2c/eeVKX5kVNL6KumUhf6DpfnfL8sgMCJT5Ls
+277CilBSNN1SzbRFWi8HPVz81CnD7GkCWtr4+Q0bTi1M0jehlfoYVgm11pFeffxs
+Fw8PccEWd576wWlQb5PO
+=AsQr
 -----END PGP SIGNATURE-----
diff --git a/dev-java/dom4j/metadata.xml b/dev-java/dom4j/metadata.xml
index 00eb79757fc3..c2307b378c9f 100644
--- a/dev-java/dom4j/metadata.xml
+++ b/dev-java/dom4j/metadata.xml
@@ -7,4 +7,7 @@
 		XSLT on the Java platform using the Java Collections Framework
 		and with full support for DOM, SAX and JAXP.
 	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">dom4j</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/dynalang/ChangeLog b/dev-java/dynalang/ChangeLog
index c91983ea4bf0..1c3bb9887874 100644
--- a/dev-java/dynalang/ChangeLog
+++ b/dev-java/dynalang/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/dynalang
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/dynalang/ChangeLog,v 1.3 2014/08/10 20:12:41 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/dynalang/ChangeLog,v 1.4 2015/06/09 13:34:17 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> dynalang-0.4.ebuild:
   QA: drop trailing '.' from DESCRIPTION
diff --git a/dev-java/dynalang/Manifest b/dev-java/dynalang/Manifest
index 1222525086f8..b47cd0d94f37 100644
--- a/dev-java/dynalang/Manifest
+++ b/dev-java/dynalang/Manifest
@@ -1,15 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX build.xml 6787 SHA256 cc3c0ede12ca39b0304e11055f7dba7411e38032f0190d7856c1ce61daf754bb SHA512 be9c223fab73c48e9f7da8051d5236b65eae7155a699330895f8eeb85ce467cde11c63cb01819c20284c47d666baef79d49a19d7b4a4cf4ad94b1fcc148a950f WHIRLPOOL 01e2d8c2b18a396e4851fbed52903e3240148d4fa8e5c523ff8917dc91d70b9132dc666db9adaf86014623d412fb4d3a1b4c2522c4a11d654cf829615b2e3e68
 DIST dynalang-mop-0.4.tgz 227338 SHA256 b241b763d8178f7ba74123ed6145df4f255f78df39757665f3569e3ccd11d5cb SHA512 b7501fbc44ae29e10cf3eb55002420d88d83226f790861f43f59aaddc0cd1bd5021fed207d831d5c3adb14ceab01dc17ff53cd31cb6a93c0fc00240b8e3e9797 WHIRLPOOL ad5f558a105a78625d7c7c55b1c7f7b185aae30fb7ab917e27aedfa083ee99191223fb76ea22f3f573da576655d8612ccf21bba807a6488ae5344ce9705c22d4
 EBUILD dynalang-0.4.ebuild 1387 SHA256 52065ad43ad5dee95d43762981e8812203b9c69c0338b585be12b004e6ef9c84 SHA512 c699cb61fbc4b7b1346004de2d6ad772bee5f0097ad08567d2550d7aa0e76347f2287b1ecde40f2d03379d5f06e40f107da08c40258997d598a397852e749e26 WHIRLPOOL fc8997ed6c0b48fc6e0e60d00d88a91f0f9e414bf2b7d1a0111d284ed4490d03d31c2caa35ac5bb7fff22ff851e210a14bef77199ee475663893841f098b6e25
-MISC ChangeLog 586 SHA256 ce586e00f4db0da57d4aa7425d47be94eb91c014b0d7a574f9fff4a9c3ab000e SHA512 6505df97c52e4dc2b5161a908327a36316153e0e5986a8fdb1bb8af9f0f58255932d75a95224408c4432e42141dbacf848e4b98911f249e011f0eb3baac12ce3 WHIRLPOOL d4fbe379e6e155cfa731234b5e4f15f10c0248f76c7b73a7caecf1031a02e45d8fe0bc768eca971ee7f277e4f12ce91ad75b20198c3dd0b59f3cb9f4f1abdc2a
-MISC metadata.xml 159 SHA256 1c070a909e96d9d193f84ad9304d196febbe33b60a724cc4b0d20634bb82255b SHA512 269cf19c37f2d136b926f546ec83ffdbc1374b2b6e26f8a31f21854143380386c31bfc7b2a0b9c47fb1f7c02607ddbdd43e517cb5c3270515e465c4dd7788843 WHIRLPOOL afb402fec04cddb3184b69eb8a8d36b404edd2870fd06c8f5e99be39c341ea6fa7542e0b680fac05529522ed33838e8279381d7a6de9dbc58fe55841229d8a51
+MISC ChangeLog 683 SHA256 e77bed6c6b90d5fb0bf0ec8d24b76fcce35461d4af516ab2ca44a1d7f2dfd78c SHA512 9211a259448d8804bc07e1b35f1e86c79e5bb5da65987cd822e08dc8cc68402279490ee9330e0920a16c2cb16382f7f98df0343447b521e7e5e88725a972929b WHIRLPOOL ada05d8590d5da694b16c01e2874b95522fde4c9bf78e5382c2514dd4191c8610686edb9f5eb05532622457816d0db3e609609250272f5178498fe48f3918a2e
+MISC metadata.xml 236 SHA256 574dae9386e4f9b4460d4d304d3b8cb2421c4a3e910eb3faf201845aa1afc964 SHA512 a3787d5f8e0a9d7d43cf414570783756e537f777c121a22b684f1a9fb98a45c341a981ed9e1d8603010cc37c5145a8bf7a153092cb48027c64e3d8f70d4f6fd2 WHIRLPOOL 4c9a722008ef638fea55639882f475e643abfd680bff2a24bb2db5c19a8f3f7f17ec582c42250211f93e946e2555b35972754b49538e6c2abf54a2b412eefe22
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlPn0joACgkQcaHudmEf86qzgACghQQXb5gO2ag9pRCztfVqziEM
-7E4An1zgDICxMU9cxU7A5NQMqjVCg27u
-=xza8
+iQJ8BAEBCgBmBQJVdutaXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiPWsP/jKWx0Q/mUxNc8M5LKJsRVN9
+ueu8RG85MYNVWTBbyFNsPboZLsHCZmiUwTRJGdMvLS5XClNb+gcEUhb7YyZTGirm
+qfQMHYjteNoHWsjfVpZSC0F31MIacJvue4jv1PUBunM/A9KKaHIEXABUD+IuuyCp
+VmXENqn89TjkIEeAajn3J5e8G2fe2NYHVIFOrdUfxUe9smkWS+LQbWicS4+LMxzR
+imw2eBM/0E5QN4jCbPNy3yOrqcdxwx1G4CqibO3Yr5iEwf/y24/KEygZ8h20wt3M
+H9cSGcdbpfy7g+53lleDYScXtqPNZVWA68Lm88D0AJlpmauHvmNneGUJL0mBO7l/
+XImg5uRkrjprUpgDq/xSVTcl7XFoE5PLiZZIkPzfHeg3Wd8uH6dDGV7CGIbguibL
+dqGlYeU8PSs+T1MXtVWodjoEhVffxCwGBxwUgKyAk/QdKNxycSz2Bxn6zDND/s2M
+MRwr4oZv34lE36ClrfHYwQ76Urd2CY5XAgXkXv3PiOUoyxfaLvKKWBz0N+WPuReS
+gCwl2mOeNNmZGvxgZ/2uwU3HTwFR2/L2rsKJuFa7d3pi5Jtix3aIaSLePLgqojE/
+SCE1oFLrUj1uifDkAQiarsxltOb5UPmU9EZFNbJb9vhFmqUq3eoNv0FZlUwo34aN
+cCwUOaS4yd9lEX9ITU8u
+=JJFU
 -----END PGP SIGNATURE-----
diff --git a/dev-java/dynalang/metadata.xml b/dev-java/dynalang/metadata.xml
index 604e0a4238bb..028fe36423df 100644
--- a/dev-java/dynalang/metadata.xml
+++ b/dev-java/dynalang/metadata.xml
@@ -2,5 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">dynalang</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/dev-java/easymock-classextension/ChangeLog b/dev-java/easymock-classextension/ChangeLog
index 4d3ac64041a8..f1f4bf589d8d 100644
--- a/dev-java/easymock-classextension/ChangeLog
+++ b/dev-java/easymock-classextension/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/easymock-classextension
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/easymock-classextension/ChangeLog,v 1.2 2013/09/11 16:28:39 ercpe Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/easymock-classextension/ChangeLog,v 1.3 2015/06/09 13:34:52 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
 *easymock-classextension-3.2-r1 (11 Sep 2013)
 
diff --git a/dev-java/easymock-classextension/Manifest b/dev-java/easymock-classextension/Manifest
index 0feb070193e8..ffd09dcbde5a 100644
--- a/dev-java/easymock-classextension/Manifest
+++ b/dev-java/easymock-classextension/Manifest
@@ -1,4 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST easymockclassextension-3.2.zip 155678 SHA256 4f16c1a4359d194364ef2a152e8b2547ffee03e72824bf351781bffdb9f272c3 SHA512 bb6fa5cf69e3b07bb2e7d7d27b7186176a2b34e2250ab2945633ec55e49230ffeabc0dffed64bda84bf7f7e30b5846408536f9902b915b751fa3e3405e4b72b0 WHIRLPOOL bd824f57cf2840c3c08b09aba0999978128259e681390caa14c8bdcf298e52ca3268214b60e07b0fdc5efe014c4dde4b90bd72b39f4be54ce70cab445262cc7a
 EBUILD easymock-classextension-3.2-r1.ebuild 1151 SHA256 1b9b690ce417a231d5d14e6cf0a5b784c429e69f15339c8f40b4071e6e86c1ce SHA512 c56f9c288c6217db641971828b88d5f9ec1797000f0e055ddc37f39449a4916630eadf1c6e4d863fec9c72112ec75dfbfdc8b7062448ddf9e666565ac622cd07 WHIRLPOOL b586796e4a578a6927f821f939d2622550bd63efd16e93a3384172d1b362360f383f07bb394ba98218f55dbad2dc6e06c0c20e2ba65ff5cc32ffa727e59108fe
-MISC ChangeLog 664 SHA256 484a6798cc4eaff6389e076e59ffe4c7bffbd17e57dd476beeaefd967c49ef42 SHA512 07e520e6fb3c0876df4195fec7eee24feb6dbad1c151a908ffcb9eb18ec415ef33f00f44f6aabcabab2225f3cf7c3a6f8252763c33e3ba1a460ee778d76f8794 WHIRLPOOL 7693b5bf9d371c0956a9c49fd1883cc21ea1f45ee0356c586f91e517232c3c6a211e37e8652213f2c16ff4c23741332130997b83e5c22cf74fdb471a5e4bd04d
-MISC metadata.xml 159 SHA256 1c070a909e96d9d193f84ad9304d196febbe33b60a724cc4b0d20634bb82255b SHA512 269cf19c37f2d136b926f546ec83ffdbc1374b2b6e26f8a31f21854143380386c31bfc7b2a0b9c47fb1f7c02607ddbdd43e517cb5c3270515e465c4dd7788843 WHIRLPOOL afb402fec04cddb3184b69eb8a8d36b404edd2870fd06c8f5e99be39c341ea6fa7542e0b680fac05529522ed33838e8279381d7a6de9dbc58fe55841229d8a51
+MISC ChangeLog 762 SHA256 7764b8eacbc3ae1421cfa609a3dff998d5f88774172c441042426130dca4a3cf SHA512 3275138802bf9f0cf43be8aa217873d5bce595777a06b583229c4ddba9a965b535f8f9ad1d286fb055923778f1a5c87de746903cb430ed0112338a034551c666 WHIRLPOOL 75b6c8faaceba7abf8708f0a6ebbda9aa8f5ba363feb6464ad952960dfd1f296ad148f2a8c77dfca9df305e790d5f70ab5119f6cefd282931487eafbaf792f1e
+MISC metadata.xml 236 SHA256 275a0a69c8b24e82696faa92058340d3027dd054b0c147136040282de9fa52d3 SHA512 c21c71d2c74d42eb5e00a98f488f44c22b4ae041fc295e361a96780cbd718414482f17ff628a05d6c2f15e9e1b65ed0d656156bfc5bd53c8502e7b240598041e WHIRLPOOL 7f796853b8a24d54d8ed3a6b0ed4f7294aba8361f971893499ae405dcebe14c53b3e4dcd4afa80b04a0221214373c36fe7c83d8de74f879a399657099245824d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVdut9XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiaWQQAL+42r3o8/jeuTzq+6rZo3iS
+nqARdHq3dLKmASTHktYrFHhSn6VwTC531jfDki8OyLjClPa2pdWyWhrsHW8nTyW8
+S8y3DpxmW5xMGiX6iDbJahcVqnMKg169T4/m3UyPB866qi843R5tHVZVftqFaqpj
+a3ltTmJQ+uiOyc1AtoR4PZg3roJtcHAhafI/vS4rsbC8xCgZS4tksYTUtzVxmIIg
+JZKMrZc/lu11U9PQgQL0BbDy0c15zSyfA84uB1Vgvq5AhusHhu+6r+dKXBKloDGa
+DszE3HP7UKJitXWiT9Jl6wRrYSHmn+Nbpd2FP9T6xJitUlW0k5sWxq7JX2I+0law
+MgDabeVvVwlBst7/Loi06ZYtCDfPcUB8ZTYaiWA1KxP4Y/Qymz5a8ybvod4HARHq
+kKfBpEawbeidwfyd4uQ5j6YtNRuIyqDrFppvJyhO8p5rb9WtZ+6ooAivFF0sRzV2
+RfmGVheJwqBFFiEo3YrVKeMyNtKkOcekKZBTPAGKazNkjO1/+eqSLPO9XDFOt3Uk
+ZMF5cJ2krZRACaHZC0L64R2ILFMw2p0RR9pfcVqhq3GyTekHAfp3KST/mgqXFGjM
+r8lw9qSsz7eHVUui6ObO8FFOkEFM+AJch9OzGOqkhUVycbbbhusqLXQ2wpf75082
+Cll0duaGXPSN8YL84PzP
+=naYQ
+-----END PGP SIGNATURE-----
diff --git a/dev-java/easymock-classextension/metadata.xml b/dev-java/easymock-classextension/metadata.xml
index 604e0a4238bb..5a7239683c94 100644
--- a/dev-java/easymock-classextension/metadata.xml
+++ b/dev-java/easymock-classextension/metadata.xml
@@ -2,5 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">easymock</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/dev-java/easymock/ChangeLog b/dev-java/easymock/ChangeLog
index dea9812c27f5..ac70612f11ef 100644
--- a/dev-java/easymock/ChangeLog
+++ b/dev-java/easymock/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/easymock
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/easymock/ChangeLog,v 1.5 2015/06/09 12:23:56 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/easymock/ChangeLog,v 1.6 2015/06/09 13:34:35 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   09 Jun 2015; Patrice Clement <monsieurp@gentoo.org> easymock-3.2-r1.ebuild:
   Revert previous commit wrt marking the package stable.
diff --git a/dev-java/easymock/Manifest b/dev-java/easymock/Manifest
index 60a94ea40ee9..66d5f2bc3f18 100644
--- a/dev-java/easymock/Manifest
+++ b/dev-java/easymock/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 3.2-no-android.patch 685 SHA256 4b3653e6d39c007fb960cd5773638e60ee1b811b7d8126f1c2b404eb216765f1 SHA512 3ead2f05c122e3e8a3eb1d1748b59c15775fee79e28cf01dba193b8b21aae0039d9608300cbca6e9bdbe291ab15db9f56abe8c2503c6667495f61fccbf3d56ff WHIRLPOOL 203c833b98294753786caf4972762d3781eb5a0aa9073911adb9cd6a6566a5d695e54db417cf1824a4c069258fa54c8fb55f39a9749d4d94096c7dce93f25e29
 AUX 3.3.1-no-android.patch 685 SHA256 4b3653e6d39c007fb960cd5773638e60ee1b811b7d8126f1c2b404eb216765f1 SHA512 3ead2f05c122e3e8a3eb1d1748b59c15775fee79e28cf01dba193b8b21aae0039d9608300cbca6e9bdbe291ab15db9f56abe8c2503c6667495f61fccbf3d56ff WHIRLPOOL 203c833b98294753786caf4972762d3781eb5a0aa9073911adb9cd6a6566a5d695e54db417cf1824a4c069258fa54c8fb55f39a9749d4d94096c7dce93f25e29
@@ -7,16 +7,24 @@ DIST easymock-3.2.zip 970922 SHA256 3ada340522b94d549a887774d42aaea008fb0aabc6f7
 DIST easymock-3.3.1.zip 1015625 SHA256 06332d947698e615e00baa5441e54f03423912079d81733dc089e57cae138a36 SHA512 0898276df82a99df10e4c91b5b097b6d579914580995b35274ef9d4e0c874266d54c865f96d008becaa210a6307916f6488d0caa205a85caf62920e939becf46 WHIRLPOOL 61e68261374caa1c7a879c28c329e8f3f6a5f067b57bb3c3eb79405b978544e0f3924b5cbe63cdee35964284d3ea602bb039d68461c73869783cf5e555a2d245
 EBUILD easymock-3.2-r1.ebuild 1218 SHA256 0137e9cf2266e5876159f85f83a75a621bb4ac6765b97687f8a43adcb1633cd8 SHA512 8a704db3b7d3e758a237f44b7e29744d469aa5024055fac048fcd45a20d40d2ef5a421c27556823c718368aaeca7df9b639ce6e7cd4754d7f3848c586e459a87 WHIRLPOOL 63ad0ea98faa70c12797da1adf3ed130f10a33b3de6c4b2b6f1ba36c7d54bb05d23f0409e987c74a4f16f5cc0e665cf9ac47fdfb17ad6db88b633b35458de142
 EBUILD easymock-3.3.1.ebuild 1250 SHA256 4d2c96ed72e6b5c194f3972e0af932ce280ff9b2641b07dad29b4edbc6771622 SHA512 ff5f63c796aa6c5983305e53d823aba0421a5c1ff24d7da6c8239a60b95246a89652e637eb0cb55f3f59ac730402355d10b6aa814004eaabbc9b24c5ebf93c7a WHIRLPOOL a557b55669b92fe98fad0a8f580363ebba686eebb39a45ae94a72650e305b3576e295d480ea4c3fcb8cd03f987875f1068327a4665bba7fcbc3aaccc241acb4c
-MISC ChangeLog 1104 SHA256 45f94ca3cc51da77028330a555d84e624644f60c3364ab12fc905606235ef2bf SHA512 08ff769b50bcf65cfa82e4d7a63367927afe723c4bb1515934511a3f2ac5f259f1c2ec4552bf7db021979daa36c71b10ee4001ea98593f0fb57ecdc2b6353ecb WHIRLPOOL bcc98fc027f239e3aeab5bfdb9f1d9b9445286bbde2a10b3fbd0e7caa767109ad218c45745a235e9a56e0d9fde200b21985e71a826517bb795f42c27b6a4fb6d
-MISC metadata.xml 159 SHA256 1c070a909e96d9d193f84ad9304d196febbe33b60a724cc4b0d20634bb82255b SHA512 269cf19c37f2d136b926f546ec83ffdbc1374b2b6e26f8a31f21854143380386c31bfc7b2a0b9c47fb1f7c02607ddbdd43e517cb5c3270515e465c4dd7788843 WHIRLPOOL afb402fec04cddb3184b69eb8a8d36b404edd2870fd06c8f5e99be39c341ea6fa7542e0b680fac05529522ed33838e8279381d7a6de9dbc58fe55841229d8a51
+MISC ChangeLog 1198 SHA256 3a8b48c9bcd9759288cf7f0696d2811cb51e1b44196a0e55c97ab862a8bf309f SHA512 bb428a0e3c9e6301cc9aadcb786e346cfd5cd964ff9455f5eca3665b4e41cd4f511189023066103278f3c5dabc27cd84d300b0bf07095b3558f90eefe8c5104b WHIRLPOOL 65a8bf91c8281f24caae9ce5bdff497b2d7aa29cf7ecb821f5ab7df5ab524a13cb0c0092b00ac65de3428754d3b2f71cc4b7b39a2a7f0e0a4e291b60c6fd5c62
+MISC metadata.xml 236 SHA256 275a0a69c8b24e82696faa92058340d3027dd054b0c147136040282de9fa52d3 SHA512 c21c71d2c74d42eb5e00a98f488f44c22b4ae041fc295e361a96780cbd718414482f17ff628a05d6c2f15e9e1b65ed0d656156bfc5bd53c8502e7b240598041e WHIRLPOOL 7f796853b8a24d54d8ed3a6b0ed4f7294aba8361f971893499ae405dcebe14c53b3e4dcd4afa80b04a0221214373c36fe7c83d8de74f879a399657099245824d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJVdtphAAoJEJGRpfGTSRu4T3AIAIitpJ5GBRUGSXbiO0VsQbrq
-YhDPengxhbeAdPZp4/5Nw/F91LAOGJnW+C9AqdcgbtwGAxitJTNhTnMxfKCgMnyU
-nKKPr+Qbpz3IFpXRzllm+CdKDX7TOMndVn934Rb/vIt8cyhgF9Tjcti9VidAFZ8c
-40fenG0dx7y8BYkRqiaPNuhJWlbAmb+ZgsZ1+oqBrNkWpN9A6yLNMsKIHspm28p3
-JoZw/NlqjVz/hUA1ztTn8i8AaEqyvKuOdyDUeK9WU8P8gyJyF08Y1ZfD6SmbAeEA
-XqniU1+CU97BUF69vLXLf6XM9SzLWtaKgpZ5iM+iVOhsRGQMp9fLNuGMcvUfPtk=
-=6gEV
+iQJ8BAEBCgBmBQJVdutsXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmizyUP/iz/ysvRoRHLa5X+z/haljqf
+vBdihQyKXop93ae/1QH/USGYRDTmQp4ma4GhAbDdXxjXZDuv0gahKjpzT4OqHC3b
+LS7YCzqolUDMgt5Gm+TJA2YiR81klXLwRnTvSxQk2tU6KzWrcXmhn+2R5ZOahKap
+mkhY/iQOt6tMtRK8rRqK+VVES80Hg5IQBAtap2VW6+2SU0B+0arUFIowlu5l5xt1
+qCWrIJj1MGHgYJykeAhxjFrJJsRjGk+boO3etPdgAYwYRHtkAmpQ3Za3cgVQA3Ue
+PTxSx2AUoTDSK5Vdib7SlfpbnBf4l19qHXdj4VCL07gYOqGwQAEYKlrc/UF/+txS
+fKjkRsWMmoHYeFNWF5Chhnhz9d1YLg7IlC1kwdCdLjr3g+4ew0hv5V7sWkCSmfGR
+dkl5WKhzbBhq6mQ9+H1t1eCdXy49MgdJK66AnSR8cd8r4uC22yg5HpjdFe1+1Xwp
+9RhKP0wI/RN6o23ETRk6Z5F1JLzw0ijzFMeJcgmQ6tYgFkUAgccXivDpth1EQ9fI
+vg4sfFX1hOJFsuWZsxYkFnj75Dflaf6HfX+xuV/c9JpiRtP40gpqP0cyDxARDJD/
+r0CmRcjfqKPXLAqIh2gHl/BBa1XclaQZF6tAHZTCKnMext8IAcBVjaRr6ksioOq8
+vBJTH5G4L/xlJSgVqG4Y
+=EFab
 -----END PGP SIGNATURE-----
diff --git a/dev-java/easymock/metadata.xml b/dev-java/easymock/metadata.xml
index 604e0a4238bb..5a7239683c94 100644
--- a/dev-java/easymock/metadata.xml
+++ b/dev-java/easymock/metadata.xml
@@ -2,5 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">easymock</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/dev-java/easyneurons/ChangeLog b/dev-java/easyneurons/ChangeLog
index 1b0c51965448..a65c16641023 100644
--- a/dev-java/easyneurons/ChangeLog
+++ b/dev-java/easyneurons/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/easyneurons
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/easyneurons/ChangeLog,v 1.9 2014/06/17 11:07:39 mrueg Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/easyneurons/ChangeLog,v 1.10 2015/06/09 13:35:10 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   17 Jun 2014; Manuel Rüger <mrueg@gentoo.org> -easyneurons-2.2.ebuild:
   NM: Cleanup superseeded ebuilds.
diff --git a/dev-java/easyneurons/Manifest b/dev-java/easyneurons/Manifest
index fcef92f3859b..0bb4d2fe258f 100644
--- a/dev-java/easyneurons/Manifest
+++ b/dev-java/easyneurons/Manifest
@@ -1,4 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST neuroph_2.3_nb.zip 8257618 SHA256 b126485f212e16f8c0162b35dcbbb25eb66da1ae1523bc5bd420d8bd82cf0faa SHA512 f2d6c87862435fe5217259842b3d9829780fe82dc87a682bc3ce38ecb708968b2458bf2d8631daeba209ccb9ca8e7c74fd1e5dd3c6ca606cf8b9ce4ea23db485 WHIRLPOOL 60366565c900deb2034e0d2d6527b23339486ebbe81ec203622be3bcea50b6dfe3ab001f2c0c82733f599aaaff60c812231f4742883506729a62a15fdc5bcdd9
 EBUILD easyneurons-2.3.ebuild 2043 SHA256 eab9f181a653b9ebcdf475c43919cbb989bf262dc001b1d134eb807551e83f84 SHA512 1da81b1c81b82f8221c0ca14456f833f0eb4307a8a34d2f98a655ae9357cf71521090d21aa3ac147b365bb9894706e10a32fbf33cb611ca817f6272331829105 WHIRLPOOL 722b79b028a1a2fcac2641d33d8733dee82034e795b71c9f6c2f678290eac9ac40da09eba01894125e7678597d5c1f2b7adc6f3730ca492e639006461709830e
-MISC ChangeLog 1641 SHA256 d920612f9834330f85b0c41f1a0baf8d75cc7451e9d62648ef7086b528c48dda SHA512 71a2c32cb2f6895f772961e5f4a8871288133b56d80ba139a732b2c945e3e73968344c0bb3ab696c4b102370496b5cf45d270d3e8b06e6baa5e87e318495ab8c WHIRLPOOL 1cf7ad1cfcee177ab4ad144d8191680c7645e5da17544a46539a526f80232d7b2377bf4f4a118c1d2c1ff296b3ca68c15375712d098a1f5a2cf65d97550f8c52
-MISC metadata.xml 159 SHA256 1c070a909e96d9d193f84ad9304d196febbe33b60a724cc4b0d20634bb82255b SHA512 269cf19c37f2d136b926f546ec83ffdbc1374b2b6e26f8a31f21854143380386c31bfc7b2a0b9c47fb1f7c02607ddbdd43e517cb5c3270515e465c4dd7788843 WHIRLPOOL afb402fec04cddb3184b69eb8a8d36b404edd2870fd06c8f5e99be39c341ea6fa7542e0b680fac05529522ed33838e8279381d7a6de9dbc58fe55841229d8a51
+MISC ChangeLog 1740 SHA256 8ea8913ec611907c387b5ae175554c7cf3747480997eca22034012003bcaa806 SHA512 90952ae28e989fa63fe3b984e1e4805e7f5366704138e5c3699ffc4327333f127f8e3f4dd69c2c67d3a2742b9b67871389fcca3754035c1b111b2a7e6cf530fc WHIRLPOOL be697ffb74fa8347d5bce4317fe306a3121aabf886681804f67a3c21a7c8046f580e61b1750dce07dacb776d9cd76dbcbdcab0c0e581e504b4f623a308f86098
+MISC metadata.xml 235 SHA256 d36689b4ee8d42b33acea3e4da212bfadcf8764b2f0107e0c03c234892dd7d85 SHA512 10f46ef50a124bf06f578580f9c91c1b8c9886f94c46339d7363d72303bebfa83532eb78779c70b5962cfc2cb8d5de74ba6f2c65a28083a9633be6dfca8adacc WHIRLPOOL dafe83d4f1d77e0647b8457047c5d5f782ff64f7344dd7aa1aa1ee2ea289b87c987e41576f61a6492937e61f3a96a96ff1e0c5587bd96beb59b9f10c2dbf8c01
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVduuPXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmickoP/1QzqDK+ZFNh2BwAbCuY8UJT
+Nqvdya5yT/3jfFhsLLePLOl7Z8r+BaHIhFGdQ42YtP4sPXZZx5ETnAJT05IYw+5V
+8wIYSVAv3dQ+Hyl9lWB4kx74aTKOvx0GoCx2Ap/y0a68XF2x69X2va6rL7xHdgUH
+a5IVzse7fueGUzICmyuGkVsUOt2z8vMf/VBJRhYGU53QcCCO0QRk6jUX990RvKtR
+d+qHQIKAI6WKxX3gBQglMNdJXpvo9jWSXeujl1iBmp3rON6IhBaXpbQ16U5Rbhq3
+SZ+Zwra/Oowu4rcz9iin8MQ1EAaqFu3gcS3+vVpDxiIl/K4Hl22OrWFhVxQwssUO
+ILPTqmDFsLgryQ/jPicQwVGIVgj24vbsoeKSiI+0+kjSDOMOFpShdkQRR50oewKb
+k313MDqWWSWDSbouBFbwwiHbeyOfWsKBU2OD00p4mn94p8lfleRZTJSH80U1BA2w
+rqJANjyaqHvB7AFKlL93QMGWHjA3N7YCTZfQjdPiq/tQ24p+3qDFSEXkJHx6KHJ+
+moCkcT235OWmFFE7lBlTMqchtGqtN9C+fkWgIuxISmAiry0qU+NG9qtqJkf7B5cw
+sisy38QwVrkmY7IRTfw+edBe4vFzkp+b04ro4TSF0hPL9k9nfsn3/SOhMsTtz05V
+enLKAblLdv+huds2tt4U
+=2UU9
+-----END PGP SIGNATURE-----
diff --git a/dev-java/easyneurons/metadata.xml b/dev-java/easyneurons/metadata.xml
index 604e0a4238bb..b88f3d4a8c7c 100644
--- a/dev-java/easyneurons/metadata.xml
+++ b/dev-java/easyneurons/metadata.xml
@@ -2,5 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">neuroph</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/dev-java/ehcache/ChangeLog b/dev-java/ehcache/ChangeLog
index b8ff62bd1eef..cbba25f87836 100644
--- a/dev-java/ehcache/ChangeLog
+++ b/dev-java/ehcache/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/ehcache
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ehcache/ChangeLog,v 1.22 2015/05/25 08:31:00 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ehcache/ChangeLog,v 1.23 2015/06/09 13:35:31 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
 *ehcache-1.2.4-r4 (25 May 2015)
 
diff --git a/dev-java/ehcache/Manifest b/dev-java/ehcache/Manifest
index c1388417be4a..9919bce6a963 100644
--- a/dev-java/ehcache/Manifest
+++ b/dev-java/ehcache/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX build.xml-1.2.4-r2 605 SHA256 f0e595f3de8ef425c5b69df443d3fa08a29b09dce90632d17ab31f3d6a78cfc5 SHA512 caf712a79a709269973d284f7bce951ac85843745bcb7fda1fd34f674e74c4c1bfd97e01219aa1ffac3c7febefd7eb0289d5b1a8019274daf17f9dc2679e76a9 WHIRLPOOL b457086fc5f82dbbcc9deeddf100db2658b0f213928ce9a26d4ed946f96c08698521ac4c1fa5da6ec49e4bc2e784035f2c199e5846ae33fc022e33d593b40e66
 DIST ehcache-1.1.tgz 228733 SHA256 b1709cdb27a7dee9c3f6beb8967a2f64549d9cc32af7867f8fa43b0d5b4bf226 SHA512 15d37d4a2579fe1b720b87954a135307af34c42c6a925b13cca0f8d861e92c3802696480e3a8c3e478e905f0a231b0d93c135ff75fb934e7a968ba790713d9d5 WHIRLPOOL c32e92bae557e20cab01421104da3cba7f02654c8f262403fcd1f93598afb62570a14aadc3989a07a6de68ba8a34ad8dc04402b3a6a4f62f6fddc291e7aed34a
@@ -9,16 +9,24 @@ EBUILD ehcache-1.1-r2.ebuild 998 SHA256 c41d9b425d90772ce37fcf9d840dd22b2251bf89
 EBUILD ehcache-1.2.4-r2.ebuild 1534 SHA256 feca0714d8f55520e2a6c70b78eb7b367ef56f52868dcacf63d411fd32267c77 SHA512 06080f4e9caede5261b89a45e877fa80b45ca31128995f8561403f8e88476c8347874dce40991f07a35c394774c9f243c7c8288ea51e022fd521acc8175b192f WHIRLPOOL 9c043d0e945433e49a266021d5432b52123d1fc8ec99ef67a89219ac8a97a66c359637fd7abd4cbd33c0d45e6129604d4ae2d7e73bdbfbfb9b243a2404bdc608
 EBUILD ehcache-1.2.4-r3.ebuild 1055 SHA256 f9164817fd5ea4c7a80ec0aee9a0bfbb2125f20eb8a1189922065133a13c2487 SHA512 7e8c0dd88cd4b4e6c245f445ce4cc8a629270124937fb7038dccfcf7b248fd6dce3b0cef872cd43a63636142186617017ed1a2b585ad9f0798b9223f926b7f5a WHIRLPOOL bdba52e14627b0b62913c4fcc645cc34ccfbf2de28888657afb101fde33b356c83d3bd5065e2e45db9a401c2adee1fd1ba44422734cdebaeeca0725c3fb86ee0
 EBUILD ehcache-1.2.4-r4.ebuild 1043 SHA256 eb845677c685892882db4469071b787508271bc520c2bc8dd9742e1912c777b4 SHA512 b1cd3279da79b9ad482e586a9c634d2361e41bb3abc233ab6cc6781bb67a6b29d9cd6c62f7a5ff72ad8de9920587899f4cb297ae82b74d90b54a1ebfdc85163b WHIRLPOOL d419338b1ef30c8006166392a311d0b1c73dd8af763ab7080516310b5b3216412c3c5cc7276fd12e78a08ed0cba40d44ede449e447f41e9c4072afd19f8ebfea
-MISC ChangeLog 3584 SHA256 423aa63de8d50bc351c262dd5aadf5293bfc397a42c297e77927a149d8ec6038 SHA512 3415c7735db6522e4c47eb557974b646c31dc5ee9d14c0f37e5eb70b3e5b25a06cfc04f7e05c0f42abd7ca41dcdc409ece2e6aeb05265c77a9bd4927dd98d8bc WHIRLPOOL 097d8d459301153ac63460c814f6094eea6649302e8b5aac26e8b490c14150b0c5418984a0baeec1b6f72e29d999e79f115195b48184c0ccb079166f280a7435
-MISC metadata.xml 159 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb SHA512 74dc9ada199a90543b8e1c168c7054f2e973fbfa2551e2b959d67501f2538e269cfb4b2f0905a88a1afa04c20b33961336310ba876f80d47c8e7615b2d7c830a WHIRLPOOL a0ac49efeca233ec4d8f63eb69c8e46e1d4ecbd926693c25b1b8c7415e4c565680936aec46f0c4197116fd7a19a3bb571beee493c18bdae1e5e978e3db84f17a
+MISC ChangeLog 3678 SHA256 db31e8efdec572c468c4d71691dae6487d91c37d5d9ea0c65407b76673606cca SHA512 0c74ebf38f25da79555233e74e9b8a7105de5be6668e2a653c73941814fb56cb8471f2d190f19d06021c1273a26e0a3f2f547a7e3fa8f6f73c5cf6a02ade4744 WHIRLPOOL 1e6a2bba9866fd70e144b684ee9083acb994897669c34788ddfc64a69ccdf5362002cf50a049c54e47b95f1e6f4925227e8bd285c5ae676488d1a8612be64058
+MISC metadata.xml 235 SHA256 e000236e4cf02520d0adc5fbc777022d6a5add1b386effa58251b86d5c6f0883 SHA512 1f115022d81166850ac83165ba7cee358f41df34b0dd8901b8e49c3b51ecce998f2ed92b4b760dcfd9adad396c60f1a42fb16ac530397d7d4ce71d08a8efd5e9 WHIRLPOOL 0ba21d3805888067aab78ad2ff00e7c1fbff5d6ae0766278911302c8ddc3769b11f0fc62b5ab558343bb10147563b413a94dea7112660d82fef87bfc98da602c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJVYt1dAAoJEJGRpfGTSRu4298IALwVkX81E98Q4ZY3mxQIEeGm
-JR0OwpsPTc2+L2w3MDXLIeZScG8h1H0l+L57Q0PMRHlj2flclLUW9v/HuzytPR31
-naw8QMunxXNeo/o+URWG1gVLKyHpNobWAhAteAGgDgG42xizhvALuWJrk0FUH89/
-Il1ddwnzEhhTbSSV7m73HTul9VufMLFdTycSPtD60sf4tk9cRJXTUE/jXX3MF4V+
-vu2qRnDHV/PFDWYBbb2UZVaAyRfJ65y9taVLG84cYJhfvzjEIHBj1LhHk3XhATzm
-GyKYBLIIQ3xKgEjM9nRrg5Wf7xzs72jp7/JLPYR/G5LA7ZyxDdfM/3X2TQoobZE=
-=PxyO
+iQJ8BAEBCgBmBQJVduukXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmid9EP/RHX8VMccMyzaM1LZMzPw7pZ
+xleLByZFArCSTn6lXsTwgtuTc61VNtMggHqjpKkUJFZNyeHsxDiuKOFGi9kPd8x7
+LD8qp6MvXwWjn9fEXLLSlPlN2lfe3k1M9TBwG7SCdJjg15u4q2DGojl/fq46M2Gk
+QmRrltc4fBcex1REZnjpS6SXpbFzQb9vrUAfNQfyned91u456VuZd0z3qwP5V/6e
+T4bUXJGeTjEnwIkUsc8+rYXu2YFJWFxLxbvbE8JcQOC59QlpXRQ2cDOVG1K7A3/H
+BmygxcYP5NAqCEo9iSonAbmUMV0Mhj58ll4+hvFnhPYs9BK1RsHQVEMCSSK416Id
+BD6RmHXxyK6dAq3t/I0Ty2IpexawFuJnLCNLqR45dayycMmfxaFYW/YKv3p1nNRD
+04w0uYgz6orq3jc31TLd9Pzi3SpLKaNB6WIxFzRd4LZRKlVm66zpUj8Pb4h9FIMM
+KgXrwV2huHdgoeQDZIiOOCvnFDIo6UzeDrFRe1CIWGyX8cUDe+ABrVsZuj/+wD2w
+isdcaj62v3LAv1c7/IJaPb7a7C5gM3MZuTw0UqPNCfD+Oh5rcd3EQoKveWxs1Gqs
+iOOaL4hbG1MAOty2pbtWPNUHyoZhlV0HWwpVUkefqCFWZvin9Q3uqdnG0dXWDuNR
+3u+zBFWINvQrb73eoseq
+=LfiQ
 -----END PGP SIGNATURE-----
diff --git a/dev-java/ehcache/metadata.xml b/dev-java/ehcache/metadata.xml
index 250f2d1940ea..fbc3b22c98e8 100644
--- a/dev-java/ehcache/metadata.xml
+++ b/dev-java/ehcache/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">ehcache</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/emma/ChangeLog b/dev-java/emma/ChangeLog
index 993a8e5eb941..6e9fd55374b5 100644
--- a/dev-java/emma/ChangeLog
+++ b/dev-java/emma/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/emma
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/emma/ChangeLog,v 1.21 2010/01/20 02:37:10 ranger Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/emma/ChangeLog,v 1.22 2015/06/09 13:35:55 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   20 Jan 2010; Brent Baude <ranger@gentoo.org> emma-2.0.5312-r2.ebuild:
   Marking emma-2.0.5312-r2 ppc64 for bug 281006
@@ -85,4 +88,3 @@
   12 Jan 2007; Petteri Räty <betelgeuse@gentoo.org> +metadata.xml,
   +emma-2.0.5312.ebuild:
   Initial addition for emma (a Java code coverage tool). Fixes bug #157478.
-
diff --git a/dev-java/emma/Manifest b/dev-java/emma/Manifest
index 5adc51b7bcc4..6a504fdba327 100644
--- a/dev-java/emma/Manifest
+++ b/dev-java/emma/Manifest
@@ -1,5 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX emma-2.0.5312-java15api.patch 841 SHA256 c8e0b61ebb49a7705afb81642a01964cb4adc590f543aef09f18393d60606c68 SHA512 cd485a0bd9bb157f9a0e420bd3bd8863ae5b1127401b8ff8944459c04fa2f5a7e6b008d9f86affe25cb24cf007d9dfe780f843745c6fcdfcfe1f734e9bb8fd23 WHIRLPOOL fc3cd0b1be6fe0806d7c4936e772979651a1591ad234fc580f11ad9958bb549d1454e823d96e777934508b98e4a7bca75c9b0be898c668f9843263811f1583c4
 DIST emma-2.0.5312-src.zip 421109 SHA256 2c6cd6177f2cf4b011ac23c3d301be3655ef1fb276b523d5a5155064917a9833 SHA512 d99b7ff1c4682a97f714f74cc6142bb766cde47bcb33932dc466f1e505e836883f01faa0a959dad77c0837fca3ae744754e0fcdc34d7a8d14720b0b7ce90ee4b WHIRLPOOL bc91a3e681c4926058600382387c775cdf615abd5ad0e50e245aab28a82855519ff4ee0a3b3e74cfce909dfce405e64ab1d8e90177526b6a6247eeaf27630c57
 EBUILD emma-2.0.5312-r2.ebuild 1172 SHA256 40899125e525e82cb8149ade3cb1cf58de25c2c190fa45ab086877d65ba535b6 SHA512 d384e54b5f7e3f78ca8e14bb4b9efe75d607056451c9daf57cb896bbd9b736aa3309495be5c9f64c5299c81588a4ab9799889f56fc71c94f6e6739de0bb53576 WHIRLPOOL 39edf149ae68a6b87c5ce63266a920a2e46f9614acef04e7a04478fd2130a59432e80b3290cdaf380c76d1e5202af3d33940bcc76ba6e6dac43cb782a7714672
-MISC ChangeLog 3084 SHA256 f352a590e6713022b897e207a059a40f8810ac52dce561bceaea5e3ccb1ceb2d SHA512 5e235d6bd2c1898d0d5fc3ad0df25deb32cdded40aeb4219326dde1d3a161a536403f72ef1c9bd1fb6fe930a0f0311608aebf7c022092e05589ebe93aee46a74 WHIRLPOOL f6c77a72a6bc43ce5826e61e74cd02a044d340e557c72fdcc7620422c55c51faed5c4c8e6f680247d8c289de6b2a862230b07596a0a79f2fd3c88ace954f0cd4
-MISC metadata.xml 713 SHA256 32aab925124196ba516f26838891601cfa1233e1cab12edd179cdf5ad056d735 SHA512 330498676e1534ea89a955ea86a78b2d9826359858e181f49243e6b145ab9ce7a936fdd0998cfdc6e8afe6d1069375b8cc8aee659f6b171ef81305d661e2e359 WHIRLPOOL 1529deb7761f510961f1a1b296d842b068e3c946b5c6d3feaf9ae6649bd6462ab8f5a5b2ad79640fe98482eeaad3ce001201dd9658d61d9562657dbf7c9c9051
+MISC ChangeLog 3180 SHA256 7f397a2f9b6972a4f2ade7e984ef8e429762bdd8fe89f8dd84c85af46e76557f SHA512 30ac6a6169e5cd4ec43bb656736141bf780305d8e5ec8fe3c389c0f1345d31bc85b4d65435892c148925f833963ad5ce434a4bbc788213bf9c5ab8705fe82ace WHIRLPOOL 4f1ab4ad896480201fa433bdf884065c00d1fa7e2ca3e7826a06adb35ace6fca35881afddb8dc5e5ab90db3d1d2cb6c02eb686c8e94b5de35615ea14e8561d26
+MISC metadata.xml 781 SHA256 1f46597ba8697c7f27e5a19134c2b9bc37a62498b1d6de32dac3a07437b33a19 SHA512 ff46ebd6ecd7b5ec665c35cba4355cf97dd6b823441a74b0133a05071e116f5cab45ce954a25e9f897c384ea74d7dc0c054d35092d6cfb4a28fd6e0c141a1198 WHIRLPOOL 718d37c73e1468996121559331e59c805c6ca97ade65affcad69e20dd1397acaac6fa335e7fd6cfc3119e4aa703d87f747664469a2254d43ae70bfb5965bf102
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVduu8XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiaKkP/ihVB8YqMASJyr2pdLCZJA3B
+Q2FIcTnUsT1xDTEHUhY61hZGt9lBvBRBT+UKbhOu5LEAnnhJ9ZBkJFkL/6Hcci1i
+uq6LjEZDTyBWTJAb7dVKtMzNtQvgwpN2XrXyFLSARryy7AnFeeSqoGwT7WbBiaTr
+io+TU9ZZO9cBR/7HadUgCWwNvY9vbhzKu2nGQLucSZ+3O2pehpH9WPcW7omv+Wad
+mQxCP0UjcTaJWMMhrJ2eRs8sywPpdv0i+CEfTQXFHOLius4XHTo1p7/AZl7C7r/k
+3o4PCVpnMaWVskrmVf0nPyFMwDAQ9LPP9IF5RCUe6LKrHD9wGYzWKZBuBD73wYOf
+SWyJGD/DFEplBzgFngNG4ikrFXYL61yk5eWhzA3zrHDE+85HRM2DW9YjZJ4FH3Hw
+elLbFBWsJi6CicHuviZx2AAla1FE5j5Ya/RF681ibaGdDveNqVBQ+tg1JAj18Sfv
+F9hwZv2qB8SB0j+SRzPTvGDjXWi0jT6D0YZdE5wvSoAUu1KC2TFF5kG8U63QfULI
+ctzghcCK+G28JFdagfx0O2IJxRgNjNkV13HyYvMI5pyD5ytwZUlJdW5olz3QaVwd
+qi0ib/1Wz5WD92GXRvJj6LuYs4DZ2BHpH5zwB1SOUgcMsxsO+bqhjqvlSVY/ET7/
+Md2R0WcJT0fw6WhYT1Qu
+=tS8m
+-----END PGP SIGNATURE-----
diff --git a/dev-java/emma/metadata.xml b/dev-java/emma/metadata.xml
index 653ac7ca30f0..45e018e0f406 100644
--- a/dev-java/emma/metadata.xml
+++ b/dev-java/emma/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
-  <longdescription lang="en">
+	<herd>java</herd>
+	<longdescription lang="en">
 		EMMA is an open-source toolkit for measuring and reporting Java code
 		coverage. EMMA distinguishes itself from other tools by going after
 		a unique feature combination: support for large-scale enterprise
@@ -10,7 +10,10 @@
 		and iterative. Every developer on your team can now get code coverage
 		for free and they can get it fast
 	</longdescription>
-  <use>
-    <flag name="launcher">Install /usr/bin/emma. Collides with <pkg>sci-biology/emboss</pkg>.</flag>
-  </use>
+	<use>
+		<flag name="launcher">Install /usr/bin/emma. Collides with <pkg>sci-biology/emboss</pkg>.</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">emma</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/freemarker/ChangeLog b/dev-java/freemarker/ChangeLog
index 810078e246f3..b1dc0335ad5a 100644
--- a/dev-java/freemarker/ChangeLog
+++ b/dev-java/freemarker/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/freemarker
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/freemarker/ChangeLog,v 1.31 2014/08/10 20:13:32 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/freemarker/ChangeLog,v 1.32 2015/06/09 13:36:18 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org>
   freemarker-2.3.13-r1.ebuild, freemarker-2.3.13.ebuild:
diff --git a/dev-java/freemarker/Manifest b/dev-java/freemarker/Manifest
index 03876b650c59..5bea11fdf92c 100644
--- a/dev-java/freemarker/Manifest
+++ b/dev-java/freemarker/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX freemarker-2.3.10-gentoo.patch 1934 SHA256 9ae7310dae12b6a12389459683e886c16ddd6f5610a353dfc92d96f0b1693266 SHA512 33c7bb10a2ca076ce147b648d84178a6eb0de6f58bd6fff9791d2b2675dc90da15cbf3cef5a812a8c6ee69e51c94fa2ae91824eb6b69d378e0e5e89a91bd7085 WHIRLPOOL 03d32311c9aa4b4ce609058c98fb5feb6dce8c72e6f32cbde6e5eca197a2f5e7a8770678c84896ac4a180aa1a612ca9556fe3fdff3800a939ea4fddbd58c1ccf
 AUX freemarker-2.3.13-gentoo.patch 5228 SHA256 6bb4a5f0aa7696bbd1fb3666ec21605a90c0946c0fb131480282aab0d6cc97ad SHA512 857762085428fc094522d03a39b57a2fc74c1f7d57afe260383d04caeceea9fc30a5ab45d3a1039a30d8b18597c6b0500a0b998bbacfe746bdfb0902e96c8fbd WHIRLPOOL 91d5c51b2ee1c7883763d97520d7027aa76c77cfe11b12d5ee56723a58bfbe7e17d5dfbb22936688997e5e49b2e57c0675db7a93de43c87184c295347ce7832b
@@ -7,12 +7,24 @@ AUX freemarker-jython-2.2.patch 1132 SHA256 f46b6f48c25b170561a1bbc3d95d37294362
 DIST freemarker-2.3.13.tar.gz 2136791 SHA256 00b43c28bc5b141e53ad9e56c472f40774b5638f96fc29f3d7cfa97048830eb5 SHA512 9216bc97e74779617ec91916842185472c3cfd4c5625168ddd2f4404237767df44c62d8308af8bed0ab10d72c8835c97daab7fbc1efa80c3e01c861dd334ec3b WHIRLPOOL f46ae311feb122e7ce52d2f4b518216c72135e5e6491d02cbef177fd76b798e7b7fa883a22067225e5a4de2163066696fb34f21708a5d821daf0d82c1460d9cc
 EBUILD freemarker-2.3.13-r1.ebuild 1713 SHA256 40aa3438b69c69000438d1000d8aa6db47824dd95ce43f56c2f8970fbcdc7eb8 SHA512 732c7dc2c6f5ab4d60cf0f2b6f7bb7e5f4ad06a270d0175c03fc347c9ec63811ec761b8ff37a1b12da0b840b88a4addbdde23ac2ef755e290ac38722d4920079 WHIRLPOOL 32f438cdd2fca823b433a6e315ce9f24d03e5b30f615922eb767018fb95e9f7368d0dbc177a87dc3fbe3c4181afbe216c4785e4035a7848ccd5233b4967ca01a
 EBUILD freemarker-2.3.13.ebuild 1827 SHA256 1def63cb42cb5e05375e48581c5f872f53e9e271b7aec33a661dffbaf413763b SHA512 24e7c0666aa2172d257b0a11044cc4a477d743f260b359b3eea418232f4b4a3328c958572357729ac1de0f2b09fbfeef15dbb5b3401e6f2c33eea577316a5809 WHIRLPOOL b93fa86ac9b8cb90638f0f851d652a62c8e3435267954678979e6b4f720b3dd5327ca1a52299b42b65fcf17b2a5e3fbe32f9bf4b952484681863b624997de3af
-MISC ChangeLog 4688 SHA256 283461389b3240c1cc83604bb039b92ced3168f921e979bd3d31a0dc9d2fb3ef SHA512 909797e344a0761b97c0907e57634f5ad559a3d6ed1875a9ccb62c00e224edbd385854d8af393bd9b57c6d19ea8da0250021af43737bb290bcb96b2286388273 WHIRLPOOL 1507907f29758cbec0bdedb27d4fc1ff754525762d201841a211e37be4aeeaa2860968877fb6cad83d70455ba73f69d4d422984ad958a1dcf9b2d664ee0535c1
-MISC metadata.xml 159 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb SHA512 74dc9ada199a90543b8e1c168c7054f2e973fbfa2551e2b959d67501f2538e269cfb4b2f0905a88a1afa04c20b33961336310ba876f80d47c8e7615b2d7c830a WHIRLPOOL a0ac49efeca233ec4d8f63eb69c8e46e1d4ecbd926693c25b1b8c7415e4c565680936aec46f0c4197116fd7a19a3bb571beee493c18bdae1e5e978e3db84f17a
+MISC ChangeLog 4785 SHA256 bc86effd6655277c33d17f69d95e65ed21c027f2a600f5b404bae72fe7290818 SHA512 183b1a03af323ea184b086c7e1fac008e1fe9025cfadd8744ed9b6ed9fccfa0b654a314a637cde6a653cbea87d15ad9fe0e4a47bfb0c2c5d9e748ec04fce97b6 WHIRLPOOL ed4eb2503ea00b17039fae866044b6c7612182d3bd2a005e5dd9744ec7950191d3c2e62134bb96a247d2419076f791da683d8fced9e0c9181b0b03225158552e
+MISC metadata.xml 238 SHA256 8663e03668b3c4de9fbaebd655d3b1354b9382cfec7f644e1a9451d4c7669dcb SHA512 248c5b3258e29ae98d82430290ad06401f438757a687a1cf0eeed7c30403a3149c5b776116e8a2c6a7a7c61c6392bd89e0154a75ba603b4ec5f68f7d36f9622d WHIRLPOOL 7dbd4e75e5799ae2d6f8dde730d32e02466746deae609cef07b0c94c2448075da42050fd2c5f4a2312118671ffecbf285f130592f8661c5a80c2f2e792de0482
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlPn0mwACgkQcaHudmEf86rIxgCeKnUuP1TUyGandInkO1QOGIEI
-tp8An3/ik4LARBFE5nmrQeZYNU3Ripvm
-=drBL
+iQJ8BAEBCgBmBQJVduvTXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiS5cP/jF4K1b2jHVSK7qFTZ7KO2rq
+XDbmzL7d+cK/Gn+bb8ipeFRtjw3hKCvwUuHgxKec4Hq2M3i96Kq8U+ojCKzPVBVk
+ExKjq8CRmulutluLso1My7Z/5wrD7/Wxnhr8uE84nL30cdvCvY6ITjE/YRZzuRU2
+Nsef5llGD9JA3+ElMCluEdq8C3YV5uKHnHLPyLIXGIn0Qfcvmn/buycr5pvtOplX
+/goVa2AnBB6k7hhZEXp4Z3cEzw/CK5Spp7UkM55lXlNXl1eeV/jAljfhbGfVj+mQ
+xWhlW8MnWX2pGER6u5IqKVJn50n+DLYF7jpTlcjWYIiNjpo30dX7qIDzOF3IX0d5
+2H/2LH9Nm85+0FfbNwSLoY0xnC+7navPTeIoXeyfeTb+yrsWtJZlq6RK+jaHMZra
+i2czI2+6lVlIJmfEUAOyGFN6AAj0lE3gXDpnwkxt2laDSXLFQsEAtGLk5ouImJq5
+43sZNNp5hSh8tTWpwv4LrrGzeiXidKUT4L2lNgn+FjmO1bd3F0lt5bWiVxlI3GyR
+ugfLD0Rcx2jhlKmGyx1OXq2SEXTnnhvWzM5CSvWYwjIvsxPmxjlx/vyENDHJGYSE
+FPkX8hArhZrTN1nWZ8hRYb9Ho7zOG86lVg4QT0LfGWbuKd9A0ImJ63/NpgfLqju/
+jeVmfC73Ofjoxe2+8E1b
+=6SjW
 -----END PGP SIGNATURE-----
diff --git a/dev-java/freemarker/metadata.xml b/dev-java/freemarker/metadata.xml
index 250f2d1940ea..5425ccbe2950 100644
--- a/dev-java/freemarker/metadata.xml
+++ b/dev-java/freemarker/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">freemarker</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/fscript/ChangeLog b/dev-java/fscript/ChangeLog
index 0e5790a0d61f..70bbb700a31c 100644
--- a/dev-java/fscript/ChangeLog
+++ b/dev-java/fscript/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/fscript
 # Copyright 2000-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/fscript/ChangeLog,v 1.20 2015/03/27 10:27:25 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fscript/ChangeLog,v 1.21 2015/06/09 13:36:36 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   27 Mar 2015; Agostino Sarubbo <ago@gentoo.org> fscript-1.17-r1.ebuild:
   Stable for x86, wrt bug #535056
diff --git a/dev-java/fscript/Manifest b/dev-java/fscript/Manifest
index 947b161cda17..0643178d5f23 100644
--- a/dev-java/fscript/Manifest
+++ b/dev-java/fscript/Manifest
@@ -1,25 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST fscript-1.17.tgz 117300 SHA256 196bf481f1a41fbb4026262aea3664ae9af64d2c75de6c4b79ff633e5a0f9f38 SHA512 9f4280ab1131f7ccdf2564fdb9bf1b6e91b593b5ef2934203a68aae87c3d89adfd73e82d0409d6cddd8685ee7bddb69dd67532c6f13a046381b12faf97d47e50 WHIRLPOOL 806a01b2120e0d9806426f9050513d453818cc343ed8c9723b1138df1217d9d8c6e60bdbe76f562e6218277e2f25f9627306a5863cf386faaf9f59bb33217ac9
 EBUILD fscript-1.17-r1.ebuild 932 SHA256 ce4355f401ca9071423505cacd2edc8081247fbfaa9bf291783e1638bc454fd7 SHA512 6e6c24626641007418deff0bc223857047b18e8f3e0d8ef4f78153200ccd7d67164802e14b46ae852acf9afd24f6986c968f63a0ee73ab3a826a81d84709d360 WHIRLPOOL d212cfb2709201b74f21bb30bd9ea95bdfcf5ab3c3f15e19ef645f47717c3d17ef4f418dfdcfccc6995c52c168f54098d9dd050e49625c607a64bc44169d0bd1
 EBUILD fscript-1.17.ebuild 935 SHA256 246b6f107d15cc4839652340ee7a5b7e17d1afb54cb7b428373c481f4a81967a SHA512 bad58ed2cebc290423fb4e94a22e790fec3d5ecf76fab504fd318bd8365d441cd81a888126f96ad0b49fb232142e89e6e6899d338aa27b75864c5f3f502a4811 WHIRLPOOL 250ca31f5188a7c0a3a0ed2a8fa10e44bd7b3055a44d66bdec714be764473e1e2fd3c1698403505d73def088b603957b5bd2a3de8e0fe8bcae7ed8ff992a72b1
-MISC ChangeLog 2512 SHA256 8e31d166a26117c75c506a2d6c3d9219f952a34593c805a1b4b30d7919ec3096 SHA512 bbfe50dc57a857cf67fbcaf91113e9f157cb1508697064b33131a91be8d815a4b7e93fa8ab364bbfbbab0662600b737b981d78b4b4ff3caf28e2d67858de9d1d WHIRLPOOL 6272101534a244d4829171d79d1e9c390b5d9cdc8d65dc7bc75df1e512bb4290380d1d1c0392978e40b663018883e22c7a372954995b27bdc780896b063d2a28
-MISC metadata.xml 157 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 SHA512 bbae663e26f48fdc5e272adc2b06c14f77f34c53caf84acb53908ff036e7c12a3edbbc0929d2db56bee861a453381d979c7e0983a23716f629ed2135c22ffece WHIRLPOOL 887e153e2481e7d76f0f1b67a395f10f0328b93930185ecdb8fcb5fe3c50f839086a18831d61cf45b34657aaffca6c3b7900cf3c04b712846a05027a84602448
+MISC ChangeLog 2612 SHA256 0ded82d6a8465ecf399ae9a308cb9ff8f6b220e71d5856881c1ededfce5dfda1 SHA512 f5de5a909d96f6a8e02de6a003584ada236e8ca3c7c32dc8c762af6b7b2303372011ac0a2b855ef3832a6feee37fac1e5508994e80c44cb867d67724818d37d1 WHIRLPOOL cca1a390bd8194233423e22522f45ad4a983b7a475a5197cd915729a36deec10f4f6fd4b96a9afd7d448a3716d07cba57ba59028a30d313f57bfaa76b061de4e
+MISC metadata.xml 235 SHA256 619f1c8474abf909fdb09545e16d3d4239f7b898f1a9ca767429dc0ada6a10ad SHA512 43e1697288a3821fab4ebdd11a92cb73ce858161408653763d6a7f97e3ce41ccc2a4e691fae7ff4c18224fa21ef17207879db5e6e84ef3e4224ffa81998a584a WHIRLPOOL 1fab593fb626a08a51b1278d1abd78cb1a92dca880b6ad5a6860f4f77193debbd6d458c3a0b3ad6fbb83002b05acb868927834c3d2c788a685ea3b40f1769733
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJVFTCOAAoJELp701BxlEWfJRAQAMSUGoCMpvb+PKC4Uru6I2J4
-kITOhB/XsiSKhrzqeFp+EZUu8pcK/8EbSofmLpfyD9Umz7Y6f2qdNv3rLUEt1UdV
-580SasWF1BAimKiFGQDaDyE+k/44khL802tAdX45w0OleLG6NJwKRglyhuX5HDDG
-k7IuBXewEM+8BshjLsV6bj9ygjaSO7Em5JLx4p7DiYXP1EwuutF7TgHNuBxDJgP+
-S/IOhENXit2+w3Iu8JJ3kMjcyDr4e/xrePDRUBslqX8H82JMUKyTlmkb0bCVh23u
-DrPl/nLi4HauTpl8c98ihEfv3kGhjxYZ5os7HQaGzDRWXdlhWdIG7sxemEoT6oh3
-NbyzpkU1DWl9M+OiYe9EvRwRQ3f6ztgBDRgkgYwh614ZOxdejDoyBe19kcYloG0e
-C97R3Wx3SqgO3c5Wj7JYRPfVjIRvK5Cao9vRDobj25M988D7uYl5+OiKphpOBbtO
-/12sphK65bv06S7RJ9XnCgPR9laKHnT8rd0t+7w2M07PhLRhgN3bLkldbAkyt75g
-R7bTjbWii9bC7/MrCwzZFlOBoq9THUE6kW/pBtpsw5hXGteO9xGSUItylSijuTA3
-uAArnfDdx8KbfNq6hGjl9D3SlXRv0EQu2XF3msNveHI47GUxsXHupzXm3Dtu9FtS
-WoeE254JvvXE6aLZr5dM
-=I+vW
+iQJ8BAEBCgBmBQJVduvlXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi6swQAK2NqPCN27nzJhuQ1usbrRcv
+P2iH2t/tzbK+YlLPRc3ugs+z2AFS4XGZ+w3NMiq/enqOm8SHOR2Hi7q4Ww6U4a+L
+zSFmDVYrAxAVEAouMAc7cIEi1OTMFbcoifgsbmJ4BwWhQTvAk8VxAiSq1KNJVeLk
+naFolnA76dy/KGMCO8fPYMl4d1443qtj8lUNTieM9mx0rikJu4WjTucHP7RFX+lP
+13u7OaBuiNz+/5XA6zeOzrO7qAMpbt9zk/bf0cODkLYZGq4If6NsvW9Sowu0lJx4
+JwaajWSC8Fyvi8PFiYr2O1Bhz3t2FMRSbExiObvXj3j9Dz5cOoLDX0TMaimnuc9C
+jbGVyYUim6S649vBR3yTzqxGjfH5mobFQtjJayh8et5R1HnBFh4LI/BDxp4JmNbL
+iC5F/fW0qwysNGWxLTgzRoDK1cb+A0u6w+DsSYbADYUpZpCNz1qLGnedOIvS2oK7
+pzYl+ea7w82esYfVKujVXwr16FudQAWDuVJwP5iVaJA7KBX2Xqm9IuoQo0zXjGs+
+vsgHPxdJBFOW3QAzHwgUCAK2/HlTvAFWLdyOlpsYS7vHvKhJT/u98+AKK8K5BGVn
+274AWba5tBAZK9LiACngDO62oHybn3tKuFW5W8QvP3tOS/NHeU/+mRUnr22BkzZJ
+nEthoxggMFt9bTYx1ZBS
+=rHZy
 -----END PGP SIGNATURE-----
diff --git a/dev-java/fscript/metadata.xml b/dev-java/fscript/metadata.xml
index 838c00a4a448..86bbc9c8ca2a 100644
--- a/dev-java/fscript/metadata.xml
+++ b/dev-java/fscript/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">fscript</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/gnu-hylafax/ChangeLog b/dev-java/gnu-hylafax/ChangeLog
index 51693168a635..8b1116597ab6 100644
--- a/dev-java/gnu-hylafax/ChangeLog
+++ b/dev-java/gnu-hylafax/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/gnu-hylafax
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-hylafax/ChangeLog,v 1.2 2015/04/14 18:25:45 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-hylafax/ChangeLog,v 1.3 2015/06/09 13:36:55 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
 *gnu-hylafax-1.0.3-r1 (14 Apr 2015)
 
diff --git a/dev-java/gnu-hylafax/Manifest b/dev-java/gnu-hylafax/Manifest
index 1968b350860c..50e990d83492 100644
--- a/dev-java/gnu-hylafax/Manifest
+++ b/dev-java/gnu-hylafax/Manifest
@@ -1,20 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX gnu-hylafax-1.0.3-ClientPool.patch 1940 SHA256 898e5fb098f7d5931ee3bdcfdb30a209af94a5b79e701e7349e190f5e609ce0c SHA512 3c38ad5ea49b7db4870ed5e5e0742499e540481402d685d3d33f3650b33a6f900dc97a6d253fad5b22c1778c080e613b89671a2cf0a2257a9eaef921414e8597 WHIRLPOOL 36af3ec2685f6173636377158036d046108611544f9782624750d39a3cc651885c425ee1267ecb7bc2ee6f34ec51d963f28b958c09162f9dd56c4876ac5b09db
 DIST gnu-hylafax-1.0.3-bin.tar.gz 1742697 SHA256 1e35853af20d74e1c3acbc460ef7fb04f76fc52be11ff0b560abe14b3c4f0a61 SHA512 7af66dac5a1b98eddc3d60aa439809f4e683a39a795ca50d0f99f92d4fb17704ab5c7528218be1f4698bca0749efd46c5ec3510e8a10a68b1b77faf1997dc4a2 WHIRLPOOL 2081d2238ca8ec5709ce7520547370b6a8431e33e33fb318612eb43cced6edfb1fc02836cca4bfc1d7c3edc24a3ea63bc53ac34cd573da436f10031c7f7b1ccf
 EBUILD gnu-hylafax-1.0.3-r1.ebuild 1137 SHA256 a2a4a0351340b041a501a353732c1b195f67efbbf4f195542275e3d216815503 SHA512 06876c2c451f4ed96c826dfc59fc622fc0e4e16d01c9d27c08fd7ae247b12eba70dc5218fac740a4742fb65f73e9a705c811bbd415894ba1bf8aa51fa023776e WHIRLPOOL 0a689ecd94fcc078d8546a8780fbd192f88ec773ba62a305e63990723a168a7fb7407e225b3f2d48b1e76a7bd0500b4cecd6a5f988aacec6970c27344b890cf0
 EBUILD gnu-hylafax-1.0.3.ebuild 1112 SHA256 e53d56c6809965709068ff91a3a07240d938a7fe81362524d9c8e4c7bd6af8bb SHA512 da963a0be7fb43be46f0c2e6e130392964b0483d590d28769c8167170663225d622a551f1c616c5d990c448ab56b6ac7382842e4a360321a8a78926353644bb1 WHIRLPOOL 8b949ac617785bb965179c1d7a2fcd66de02631c3b2dc0267c0be1b9770bffdcd7137653e9555afc641af5c9914657cff9c27deca59eb322da98c502d226cfb7
-MISC ChangeLog 676 SHA256 2646a27626a7a0de7e2ec680b898e2279f70199058d423cd73ad73d5aea4fe2c SHA512 f58e18d486b9aaccf8d43683d6d8f8dbfa6e97617752d6b138ffa94514c5f8d595ee833eed31a3c072839426c2256b8d5e29b8374b220e197828e8a614adb541 WHIRLPOOL f3f7b0422eac4084596526560a9ee9194a8291f96662e29783e01a68fce47d7562d7d99a3f1c076aa3ad01d1656946c9b8bfaaa68770597dba211a2e2814926f
-MISC metadata.xml 159 SHA256 da2aaa3223c5418688dfbba6f899648c5bcb2e4610126519a1a862913c4f8fa6 SHA512 f5bc77a4e168cdb5a9f9c347f6f437b16bd28978351ec692d4f7e406ba93479424e2272de70fe85d2e0668172de8ccd3aa096f49d5912ed91d17bea11756865b WHIRLPOOL b0cba2d5917cc20d7409ccfedc345ab38c71df76c5c030df578d6db718f8a60dcfc1927c20e7062fafc62e955a90ec9f21cdcef6d7a566fddf374ce766ca64cc
+MISC ChangeLog 770 SHA256 c764584b7735748bd6c428e58e2d6fb65a80f0a73f2028192f646ad7c9603dcc SHA512 d0228b1c977f1dcbc9971fd3fc94fdd0ad16933bc18177b61b78093da3a8022174d582053cc27a66d45d0f4d2fa83c120faa0ffc9b8fb4b7372ba8b7c1085cd4 WHIRLPOOL 1088ab2a5f0fa05320135e6075697174ea97fd066d0cbc50d1d655ba6854326f53c0c723eb595d070f04fe431232f39da9230769d37debc808eadb7e9b85132e
+MISC metadata.xml 239 SHA256 39ac073e9884371811247478f74bff926f564fe3e2886f8a184c5136d7a1d8eb SHA512 c12634b2ad695ff7cd0c5a9b4b58c9159d33c33f944ab235d021a5e83daba6173cf662cb16ad761f41c18bcf9c061ddc857fa8e3362eb640ace0ebdc424b1912 WHIRLPOOL f56e822bb371feab038655713ab291bdd1f1f8e1c68f0e228b6a2727d83ad473fe0f1d885679834bb97c6e4a79eab3e4f8fdb9d264c47580a7f2dca7b68a714f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJVLVvaAAoJEJGRpfGTSRu4vd4IAJ4CId9hov6VTgjmUWJsf3kR
-flT66XwR8WZAwN9ubeUw/EH+4sqaqMcycmt0cV753muv/LNSLt0vExQ+4vhD8b+j
-Yk0no7IqDGnu6W+By0gb3U79BMsaRoffSYVzoSYf222CwtKybJL+e4zZiz+ya8kA
-x9SwGY4pE2gXNFa7/rrxQe9Q1mkExMRZsIHseJiTQQqxEGlR3sXQAdf7WO4jqI06
-7lcnF9mKKvi0p2KTGM+rhr8crulVpdjPppHR4W4YUOe4xNtMcfezWESWFCrBKw15
-8jaCf/fELwIag1BcTzW2ybdbClcQ4lGFI59cRm1qOW72bjAu2rmpr+iNQD4A5Is=
-=wpKL
+iQJ8BAEBCgBmBQJVduv4XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmizWIQAKvyjJYygBUz7N8NIds8K+eC
+mxMPaoSa7PnZsicqzbrug08I1HhxWWVkjTtR6BgtUIZO6+yFdulnSp9BD8grzmc7
+0TA//OxTispOf1TYPuLEVKN8imlowiG8Hml1OBBAm8hFmTVtaFWmUT+DdGaq4rBv
+kAerbT8qggwWT1RT1UKcN488qz7TWNwG2t20W65Ey7YOHIS0arMfzRB1HhtbXuuJ
+IUO8+ZO4SWKEJPoH1DvXkIV1WbxkAaPMsvN4kwB2+sjW35SX+RXHyRxWl0N2q5zo
+3cSiEIYy9k0gcBLplHVKcQrju6ErtcBiw4b9KCgPaLnz44XtPADYEhn06VdDblQb
+Oyi2vSWJ9NONGFbw+/VhqvD3gZo91KK58etOMONOiYUeo0D64NoZxuVQAtZcmPDd
+QWJ10A/kPp0eJWXrNyj5+gpyvVHD0Moqx/XCQSwKGeP1Yynr12UldhlBLZgR+Ma3
+Op41+X/j8xVzlZfcsmvMQfdZ81skFwbTmNJ5ke6xrTJNIwTVcpEthRpCpm93ysDd
+RIt7YCNjMggMxrBxr3TB9MoRkKgG7EszJ04oEb8rrLy6mJ76OWbotD+CGlGSVH5Q
+/UnEUMnCdQ5MoQed36iFG1+s2CShqEQvRoo9++M36pABwBIszFmdUmmtYrcsZeId
+SflULD6PSJQUnW2BH4c1
+=vy8T
 -----END PGP SIGNATURE-----
diff --git a/dev-java/gnu-hylafax/metadata.xml b/dev-java/gnu-hylafax/metadata.xml
index e80ed52a09bd..00c3849387b1 100644
--- a/dev-java/gnu-hylafax/metadata.xml
+++ b/dev-java/gnu-hylafax/metadata.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
 	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">gnu-hylafax</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/helpgui/ChangeLog b/dev-java/helpgui/ChangeLog
index a99093d4dd2f..11b583f91e86 100644
--- a/dev-java/helpgui/ChangeLog
+++ b/dev-java/helpgui/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/helpgui
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/helpgui/ChangeLog,v 1.11 2015/03/27 10:27:07 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/helpgui/ChangeLog,v 1.12 2015/06/09 13:37:11 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   27 Mar 2015; Agostino Sarubbo <ago@gentoo.org> helpgui-1.1-r2.ebuild:
   Stable for x86, wrt bug #535058
diff --git a/dev-java/helpgui/Manifest b/dev-java/helpgui/Manifest
index 654b3c2f5eac..a32418f0056d 100644
--- a/dev-java/helpgui/Manifest
+++ b/dev-java/helpgui/Manifest
@@ -1,25 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST helpgui-1.1-src.jar 168356 SHA256 bed678f1fcfb46cb65785a3fe6b819c312458fc6bca976142c52a0e0896a8112 SHA512 feb76605c841210cd9bfa140d22985a090e72712fad08e23963fee3f6e28cb6c198583bde8eae5999e80ed5e351ed8aa30dc5cd7318bd1817a4ba351a1c99a77 WHIRLPOOL d8d396bfc4842bb1dd5bb618b911e5f4f88f75ab1463a13da3612091bdae6e8c31ca044f11d61d32f4f8bf15db066d10394a77718d3f9ebfbebc4dc6307cab95
 EBUILD helpgui-1.1-r1.ebuild 835 SHA256 5079cfe41f5c3a1237150cee087e515a51fe3d01984c366d43db2e207f23f98a SHA512 f86af98b81d9eb763ea94603d05490e651c0a1658ab4ce28848ae5094521fec1f0563a632d57093d3452fa5d9df3588a1389088328cdcde7f565e22b8435c9e5 WHIRLPOOL 19ff8b913afe596c563b026a283d28666470b48163bb4ef40f85acf92ccb2af0d6c06e053521e73c8c38eb1ea9ce35cca0ba26784276a6d74cc9746f2cd05a6b
 EBUILD helpgui-1.1-r2.ebuild 811 SHA256 987fdefc522d8df96fe6820e23b5c41437c61cbf6ec8554e3523f1773f27b3bc SHA512 ba96b4366f4c7165e2da13b9d7fd338b8554bde34f61988261a319167a3c33def4b04f8d307b99551d89100aa3f9dce2a4bcf039bf9c454206336f13e510b25f WHIRLPOOL 7f0d21368f1214333a7768fd089d96d5f48ab8734a3765664bc0b282e05174b0936cbfaa10058d33274a153f0f906fe617a7863f93591c9d6a20d31eaa815670
-MISC ChangeLog 1525 SHA256 653f90fa0271a8fd2217d88497dc0c11bcddf9cfc56daf47f8546357e0beb492 SHA512 a543b852b46836457e35ebe7fb0e181b27409c16a86269e4be89cdd2fa6c024ae77ca21c7b92c05697e8a2c35cb437df34082a4cba9059d7c049772fbe261de5 WHIRLPOOL 8717d44b0858644833ecc0087d5561dd0029969dd83ba5c1f5177484f6a75365e7d2bd7983056bd4fde0aac4a27eefc067a1be76e3052556ff91ac3eb24a9265
-MISC metadata.xml 157 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 SHA512 bbae663e26f48fdc5e272adc2b06c14f77f34c53caf84acb53908ff036e7c12a3edbbc0929d2db56bee861a453381d979c7e0983a23716f629ed2135c22ffece WHIRLPOOL 887e153e2481e7d76f0f1b67a395f10f0328b93930185ecdb8fcb5fe3c50f839086a18831d61cf45b34657aaffca6c3b7900cf3c04b712846a05027a84602448
+MISC ChangeLog 1625 SHA256 c0ceee62526e7bd327784eaf2e0f2d3ed5ca6e726f23634dff5769ad273e7a9d SHA512 f2d6badfb28a4d978accd926074fffca2a413b016291479d7f7d5415a28916cdf065b79dd935152bc5ec8cf3be4fc0caf35c2f5cef4d4489bd2e8e85a0f1c09a WHIRLPOOL 3ec2a3c52bb8b2bbc7bfbc0a79d43b901ac8854f01cb88530038a8dd6be76c85a5715054ca5e152a4d94af837370b93a9204bfb9bf0626f6bb61d27e429224ae
+MISC metadata.xml 235 SHA256 6b4896a1ff71c8118281a0d5569056de62fc2787ec7726430abe35b9ffac7aae SHA512 0e60df966d9247cb90eb9c286526079731314069ddd06420a54e69039ad464fe8094abdfca11dafc998a1f961baf87ad0523b437fc926449ecc8100f7862f008 WHIRLPOOL 78f682e4ac383870dd5a09c8139c23dc6f2771f14320b7e1183d48e4812b6c2f191dc46d66069d538680020942aeeb91f43d49c30328d1f138409e090f513b75
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJVFTB8AAoJELp701BxlEWfQBUP/i6W6YLvTbpV9NFEpGalIXy8
-lAw1fkRJ/pkCUPoIz8gRZbS2ynrwgERD2wAv38nTHA1qj604AsCja9UIba8TpHDa
-LwrYlGnJpVk/IC9vEcM8dTOZ3nMJPYUrPZF/IF5RUMLo1Xuyrw0L/jYgQQlx0L5r
-n881TOQGwhQaSbuSDpxRuClQcj6uza8El9Ih/+504jdmSKnaxNgH3HKZtZXMZsTb
-/ZSGzuB030mCUCBP5zefnfW4+KeJPmc7CB9tqChF3hRjpbzLfB/l3ReIVd4f6ula
-VPQ6VKi8fEPa6jJi1TuEV7BCVf7kxXV+aDMvgM/MJrUKJil3M5dGvWD7uTS8ET1L
-pYI9ZBs8pAKCCYPosdG0NyDCr3q03lsalYkVyHcAZzeaafFczW0bZrEysD/Zjme+
-wO+ua3qZjzbuH3DNHFCoPwiAerfqCPJ2wwIsLHRUSDnyCzfiarH2AtkvdXxR7elj
-9GKq0ShtFKSN6VLIfFATKlHIQSrz9FYLZnAN/DxpSuTThT71xtDAoKbWr4onjw49
-T1mqLaQE57iHko1cDTIauCOJ1wdvJTA3X107l0fqKwU/wB0YFmKbw3gtI4TGmeCy
-Lr/8F1TPZp8cUnFvg2aRigT7rWvFtnnUhkjhMIAIs5i+Ik6ZlIrgAQYtMa0/2ChH
-BYbJTGjy/JJEbcs1Ek66
-=6QaI
+iQJ8BAEBCgBmBQJVduwIXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi99QP/3cX1oGxP53UfniSUKQ1f4ob
+YeRwoKIflV8or3kIEwigmBh0c/bbM3EACK0rzikPFbkDEm8ZGqbDk72ZqAB3j0H3
+wdqZIJk5e+pjTbOg/yOz6CA86XqD6jdNrzGviB9K0EimBmKFifASmuMb7LO/+luU
+a++KzQmHQ8JojXGJuaTAPMQAJB2u0MbjZzmYZmfKYN8jroHYEOi5qIUj1SDWbL4d
+I8liZ6zHNBk+CasZyVRQNq6q+f1KkuCe3kRNdB+H+Eg2Xac0cL4Exc1jxScJoB8r
+zLfC9qJb8BUGK/bvJq1DqA/jaLF0yAY/5w0mnUYlfLfB8Iefyk/pDlwXYJWPi5RB
+aTX0PVGeTy+GLyvLcMjmpfuN/kgbz1nsyr3EvvU4Om05UiI01r6x8OsaDC2jHa6+
+CBPjqmRrarb5AI7TZ5UW896YJis+g4iqPmW6V4CgEGY3IvRApstj/jR3P0rj1dQ9
+HuV7nmi25loOd4xNFq1x3ivlwPhMX1ltgQqASCxeJJtryT6/3gutFOz/Dxp56muo
+swox5Y2GYeQuRMvpG6EXQ0qX8H1eBL+kxCttHMkMMKaRTmx+BJA8CDaaACDOfMFY
+yqyQhKliu86+RJ/jeNztWeWGdpECW3XKKan1ti5oWpdI+50K0O6V+78su64KCwCi
+2oZ7eK4l89VQq/VQP1kY
+=SNBQ
 -----END PGP SIGNATURE-----
diff --git a/dev-java/helpgui/metadata.xml b/dev-java/helpgui/metadata.xml
index 838c00a4a448..325982e4f9ee 100644
--- a/dev-java/helpgui/metadata.xml
+++ b/dev-java/helpgui/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">helpgui</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/hibernate-annotations/ChangeLog b/dev-java/hibernate-annotations/ChangeLog
index cbaccea19b92..11d423120e6c 100644
--- a/dev-java/hibernate-annotations/ChangeLog
+++ b/dev-java/hibernate-annotations/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/hibernate-annotations
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/hibernate-annotations/ChangeLog,v 1.1 2013/10/24 20:47:16 tomwij Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/hibernate-annotations/ChangeLog,v 1.2 2015/06/09 13:37:47 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   29 Jan 2009; Alistair Bush <ali_bush@gentoo.org>
   hibernate-annotations-3.2.0.ebuild:
@@ -36,4 +39,3 @@
   Fixed src_unpack
   Fixed Copyright Dates/License
   Filled #166441
-
diff --git a/dev-java/hibernate-annotations/Manifest b/dev-java/hibernate-annotations/Manifest
index e731e15d91c5..640d6d96ca52 100644
--- a/dev-java/hibernate-annotations/Manifest
+++ b/dev-java/hibernate-annotations/Manifest
@@ -1,19 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST hibernate-3.2.0.ga.tar.gz 19744419 SHA256 e242eb6b243e7b0fac132f37f4e29bf06ec87c37be5a80a0849709a6cb89b03f SHA512 2c2c8ab8c15df1a36305da1a705ea0f1ab59f306f2cd07520ed95a68bd60f0322a8813d5eed7408e89b5e79cb7eb0e6acc364f72c3a59ca05b2de0d53ffb8c3a WHIRLPOOL 05054879c82ad573d7e714150cf2a90bff4ed88cb161ec9bcc4fcd6d8068f066aed156b5d46e56df10e00f91dc96f55958b3bca0a3bc1c1a5b80cb9e94951d0c
 DIST hibernate-annotations-3.2.0.GA.tar.gz 2075220 SHA256 7ac81b03c4d4623cb7c883a3f85a47078edb261cde3fee2bfbc4fcf70a4e9bc8 SHA512 b6ee844fed4f1c2636669155051d082c167f26653b4dfb663e9fd154c6ced63034d62907ab095955cacef26ec61762ba1cdf693a08073f7c48fb530148a9d391 WHIRLPOOL 454e6f69d6558b2baf614a4b68241968198ca669f21974805b1537920b1147cbef9d473f541a8319fd5b81511912da880df891d909e144be9fc3a39771d9986e
 EBUILD hibernate-annotations-3.2.0.ebuild 1418 SHA256 8f9533ed07ac03fa663b55a41dd5edec0051b1f59bcd9a470ec241eb9f0d503e SHA512 7da5da49f827b11fe6e246157c0457b37f139d9265a885084183145fc1a5aa9cd8bc058eea0eda90efd1b178a0d51a2935a47a255c70f36e89ddaf46f16a4de8 WHIRLPOOL 1938e33152575518891baede18781027046116ef36244918ce8582f562515dfb7707ed97bc6cf902bd3876b86638123c20e89d62d3c9c2c2748d49f4cb8fbb67
-MISC ChangeLog 1382 SHA256 f5dd4016ee1407bb1bc73be703a6054534b29ba274967204e18f91ee823e1724 SHA512 8732398a7eab5ea66f54377043e02e1618db8c566bc64a59e0ae915df3e0f7edc1b0dab43f436e2b9f8a7d34c1a70fe0306c07264af44b9ddadb1e0c1a32a28c WHIRLPOOL 294455ca8f84653f46c118cabc15e0df0fe90cea1c196565eb9c0145655e9281a7aeeb12bd2b2692ec310dcf74e5e8f3fc96b33d12ba4d100885b7bfd2c5ae64
-MISC metadata.xml 157 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 SHA512 bbae663e26f48fdc5e272adc2b06c14f77f34c53caf84acb53908ff036e7c12a3edbbc0929d2db56bee861a453381d979c7e0983a23716f629ed2135c22ffece WHIRLPOOL 887e153e2481e7d76f0f1b67a395f10f0328b93930185ecdb8fcb5fe3c50f839086a18831d61cf45b34657aaffca6c3b7900cf3c04b712846a05027a84602448
+MISC ChangeLog 1478 SHA256 d50b785f5532f29470e4232b584e8039251d1d3dcc4ea0b49417536ff54c2526 SHA512 216684c7a45a00af1348778f261b9aa90361a0913b7918ce4bde5d00dbebf141b5e79e5bc6e05ce686583be5a62a7283d72310311f74464bbe4facf653cfb758 WHIRLPOOL c7188127b9922c66c543765cee0bdbabccc2938f9377ec8364eb5e76c720d8ca3f56b6c11c95c7cd230de1fe2b20932661f5ccea7dfd3246f648e439d9fe8737
+MISC metadata.xml 237 SHA256 42328874e697e7f822c6da29d0e674d25838616c12310070cfab28643b7a3461 SHA512 4214b2ee41cce5ccae91dc40a9925a97910dbc7ab1656b721aebfb820a602d0b1361c595158aca36832834121351ea9e92273abf8c7140a544c527b8103c2284 WHIRLPOOL 1e34df891ff004359e883337870d9566016d96955af654127724f43eff372b055093d47447363e1930fa16c8a0669bcd9e31a3315ac0150b3e9b46ed4a601654
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJSaYdGAAoJEJWyH81tNOV9/E4IALEAe7wsj1y1eIEZE2c2AJLl
-Y5SBs9Ul3pqgTXBA8Gvv3y6Yv7ZaZ//PZwY3k8RDDbWW7RHiTukt++X+sYhkkHI+
-C5UqsuqRs6G2Z7zbqNUcS0sv+otoFGyTflbc5P6DQLbd9VPC0dxkZSiF7l8CBMEk
-/pxyAw2Ucbk31l9KzX97wbk6z6nzEinLCpZp3RPoztZtwagbHWE0itazKQktV3zj
-qB+xcd99LdTN+5+88/b8/4fMMOyV+dG8JMK1ZgTy8hRDtKE4vvAYWqoYE/Urx2mF
-zt5zWQVyo7nhCOmoZQDwrAyBbblLdU7mEcaf/dUiYagSwelX2JxmuMArBmT1aGE=
-=UjDq
+iQJ8BAEBCgBmBQJVduwsXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmitaoP/0WP3OO98wntE4XX9v06Ytwf
+eK4Yk+jfjg2JMwmYWgj/JC2y+3leG4kXdSrHJnUGt/WOkhzkop23Dt/pdot9RNuD
+OFQCtDoIYDUkJcd2lpxdRkclRxhWNVZOuwJRS07MOkD5I6xYhu59y75j0MgWxbHb
+MUjoQowCJOXXEY5PJU+4fNVU3BTVmrJgKC0RBNSXjlO5lIf3KBrCmzlto68Lzu/g
+SILYyrSjRtI/oqzaJXOhxkMSlls1MhvwHVt1O8YDXKqCBTGXYY5NDXqSiEkXz5yR
+fJsXmB0DCvcpguPn2leWd/m8HELYtME7wt6m8+3BOOnm73WXcqSlby0NP0OwnFts
+/UCM78Uf9elzqH8OKxhyj6auPcSRfHLIyuJztuDnLPIY1IrYTalKsBNVh3C1MM4y
+uYSkFB1t6JX3+FU+EJkqk+lb425BuicwTN2r1r1blF2O8vqCqA+Dk/KUBVqiX0Bk
+rV5QTCLIjCIrsyRhZuOFadTQR9prn+gCFVFSWK/162l/BF3vCHrXxD5Qc5hBI3IL
+FmfvKTz+dyRH5bRunoQzgSZqrSTB1ahv1nheT+Mweg2kfA5dUPXUpJBHxmZzdERT
+gLNplODLDWia3023O6V2w8lvlFkQuyo7p/ueqdsvtCaRjOCOLmmiiN+xoW8j+Vuv
+I49ybnpPUEnnmMszeVHU
+=6/uu
 -----END PGP SIGNATURE-----
diff --git a/dev-java/hibernate-annotations/metadata.xml b/dev-java/hibernate-annotations/metadata.xml
index 838c00a4a448..5d17a7d4a79d 100644
--- a/dev-java/hibernate-annotations/metadata.xml
+++ b/dev-java/hibernate-annotations/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">hibernate</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/hibernate/ChangeLog b/dev-java/hibernate/ChangeLog
index b52a32e72d04..13d9e2a19934 100644
--- a/dev-java/hibernate/ChangeLog
+++ b/dev-java/hibernate/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/hibernate
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/hibernate/ChangeLog,v 1.48 2015/04/17 08:47:18 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/hibernate/ChangeLog,v 1.49 2015/06/09 13:37:32 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
 *hibernate-3.1.3-r4 (17 Apr 2015)
 
diff --git a/dev-java/hibernate/Manifest b/dev-java/hibernate/Manifest
index 1220a8955373..8ee3d2190f9d 100644
--- a/dev-java/hibernate/Manifest
+++ b/dev-java/hibernate/Manifest
@@ -1,19 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST hibernate-3.1.3.tar.gz 18529984 SHA256 e34feddabd7e1a432f11c670d08338720beb6c1dc5bb62952612f05260944c49 SHA512 5a5acf5abc82bbc38313148dc73cea981f69c68fb6b3023f1c6261a392853b5bd4a9852991011891e8b678ff0c35aea9554ebdd17e0da1b8fdf816ffcaca4dea WHIRLPOOL 0c2c6d5f0d5c04e9cb5e10f9eb22dbb796133791a57b8c4c18e780aa8eb637fd5fe2fa793da4885fdfe8902f7676bcce8e740219afc5176be4284bb575c99497
 EBUILD hibernate-3.1.3-r3.ebuild 1814 SHA256 a4b7efe4361a88cbab9d04ccd1ee2a8ad2407102d4c123e20a8c137340874906 SHA512 564220817c4fad1e8b55c7474a0b6e90de1ca74e5065074f901f76692f00dd7991fa040906944d9f5ae9c6697eb57200eec4fffe04e1361de169d757b0ab0e26 WHIRLPOOL 3c149dddb422fad3f18a74a3413f0ff7c2a3fa14bdb33bcf464e48bbab071331c847adfb7ca754113c5e57257fa4b0049947b6ecfa7ae58a6b67db5bcb1ff563
 EBUILD hibernate-3.1.3-r4.ebuild 2108 SHA256 5d833c93639989ee579e292050b2a5ac90e10e26f51b530aea090f7190d57e75 SHA512 b6229038800f28e5d54abd8fd513804485c75bfcf72f3125f695645491234a0866e89bf500ac59fc002f4cc4a7554ed3b9a9c2e6845522efe425a81e327f7047 WHIRLPOOL 09eb08cd1fd5007d9d0f74e1f38457d77007492e1d7c88ae2f7653ce04dc4dc544c3bb7e9de36b18b4d13eee79727abab50538e33c05f433c999bb3c0d7ffe2f
-MISC ChangeLog 7094 SHA256 50fe939c60c9d30d6b7c2bfcb8bb36f2003a0655fe6197181b016599c4ca8043 SHA512 7471fa309fd03fef6266f6ad8d07ff3ebfd0b52ad69eaefdf8cf3d63cf8f8a020cb78c1c4b4857418a78ebe3a74aaeda0bb48bde8876049d6eef6ce64b445bd8 WHIRLPOOL 34f3e674e33d2cae60a779488d202d033f5af4cfa1344b5b4c8bd778284bdc00c818ca426afd5bb4a50a96d6fb6f9f8bb3e2a7dd7bdad66b10ef66b772cc8274
-MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
+MISC ChangeLog 7188 SHA256 c20a3da0f0b45900acd08b4d8e2e7c8c82a16cd9c710bc632036b661ab6e4998 SHA512 68d5ab0ec218f59de9dbe0549d490ac52af7de196c74974cb029f86403d7f7bc63f4e9e1348b49c4a88fc9e542bb17d0eb1f69d3e6a84344fe594369a6d3044c WHIRLPOOL ba1712f266481e2fab44665a1aa57d8b23cb883ce8158f7437a012874f8eba4d07c73c8af64506620058cfc47739f8381afedf9233bb36ed6c3df4f5150ea166
+MISC metadata.xml 237 SHA256 42328874e697e7f822c6da29d0e674d25838616c12310070cfab28643b7a3461 SHA512 4214b2ee41cce5ccae91dc40a9925a97910dbc7ab1656b721aebfb820a602d0b1361c595158aca36832834121351ea9e92273abf8c7140a544c527b8103c2284 WHIRLPOOL 1e34df891ff004359e883337870d9566016d96955af654127724f43eff372b055093d47447363e1930fa16c8a0669bcd9e31a3315ac0150b3e9b46ed4a601654
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJVMMieAAoJEJGRpfGTSRu4VOQH/jyURhDD/dtdJNoQwvbiirB5
-ak8M1wHpXz7caDL2JcJMGlHlVr4bLKz4hAzfjfQjzqxIbeOMoDxhvhzyit7Pcmjr
-MAj7bqVUFleADkGo/B84VccMyLWvUOOdpOOe1MAm0v2BVQDW4IjhmhoFfoIS3Hgx
-9/xjsR4nIKMXX1ysVoOU9Dba5Pwg8Z/HUo3ZNnUQqWPgL8FnRSl9FSscuu7U6Xe2
-okQPWYnOrHCUCXIi4YDgjcE7ZQtEP/d/Fg8pipfRISVye/Rkz6uVlFcX20nyWm4A
-wA5yZ7DTIf2Q4aZAUvHDDhTedeuQLtQGCcDfo7iqnVtli2h/Tl3JLWiFHVoPP7Q=
-=AS2j
+iQJ8BAEBCgBmBQJVduwdXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi+SUQAK4me8ABMCfr2Q/bmPFgr84y
+awePoJW97gvVZa13XB+DWSo6+xuaKtbyb01MTTCm9C3iFT6zdFHRxAq34EMe8wuc
+vKGUBltfLQbs5yHCnyOgKtCzVHSNgGBXl/apfcO6o+DetXfn+fMgGSi6frNK0Ldi
+/QkgMxRWRC6wRDuQq9NMpi9ktscWb/hbnL7r+j5SuEP0PzyQumVjHlmlPQ7a4rqv
+pvU+8pUGdRXTt2S9rnsicL6PiNtdz643dsUFGP7w/U5Ewpu7uuglIF0FbwRQn+c4
+3NdxlaV3FHv1gaO4q8Gp30eIEaK6+ITbd5iliPSKJYeDxqj2fkl7McOxGJ6icovJ
+o+I3WA/z3Dn1TFU7E2HRnrNtwrl0QiwdxWh1esw2wuS1TBXOP7ju5r6PiUro77pP
+GbYWWvB0MnjYfPOOpEDoFquLcTCZJAlCr/aL+05zVetNyggx4R2jb3R/+DmJlZDt
+Nx2B2aQGJBpUpjIZOvMDgheqtoK5jI35t6LKE9+KYfVmWrP1FcZj4Ha2NmSjP6bG
+A3b7WBaZ85dkfMVbFWDuq7z6XHSvYaV8mu5KZfCcS6NIGHmP7ASOrzxAyUxHx/6W
+ts3DJC9nG7mYaUioF8FeqgcRwNShLFUwljSp+hre4AnNu2KK3jbm/b2woWLffu5z
+iHlsvF2jcyS4MRMZWp10
+=Shwz
 -----END PGP SIGNATURE-----
diff --git a/dev-java/hibernate/metadata.xml b/dev-java/hibernate/metadata.xml
index 7303cef96964..5d17a7d4a79d 100644
--- a/dev-java/hibernate/metadata.xml
+++ b/dev-java/hibernate/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">hibernate</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/htmlparser-org/ChangeLog b/dev-java/htmlparser-org/ChangeLog
index 087b4746d213..d8820cf10d76 100644
--- a/dev-java/htmlparser-org/ChangeLog
+++ b/dev-java/htmlparser-org/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/htmlparser-org
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/htmlparser-org/ChangeLog,v 1.1 2014/07/11 17:54:09 ercpe Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/htmlparser-org/ChangeLog,v 1.2 2015/06/09 13:38:06 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
 *htmlparser-org-1.6 (11 Jul 2014)
 
diff --git a/dev-java/htmlparser-org/Manifest b/dev-java/htmlparser-org/Manifest
index 8d9b0692e20e..9fda3f793433 100644
--- a/dev-java/htmlparser-org/Manifest
+++ b/dev-java/htmlparser-org/Manifest
@@ -1,18 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST htmlparser1_6_20060610.zip 4346070 SHA256 e4f1ff4be7501572fec5a17740c817b711a7dbf68f0ee97ec7f4921625981915 SHA512 f23d08d9330dc45133a227b8e1a80a515d01298027ccb0ca0863d1b4fab829f52950e3a3ccad057718fd57b05f8c0176786583af8625c70a38a940d3e878cd5f WHIRLPOOL 17376507ce22c08634455d60f3cf822e98dcd55cd8372508a78395d88ed93e64f0dad60427d9c85a2cf8cba6ed752a87f15962314e545fb46481196cb108f148
 EBUILD htmlparser-org-1.6.ebuild 1344 SHA256 2bf771b3cbad2abb71b619d94606510bb39cd831bdf7f4480e0030d0a3b86544 SHA512 979f5034d7327b41d476b356d04f2105c861a24488b8541da4ad61f5c47d76c349870b7b5b4a7dde91562e437d5af7841404533b2e85502b796a709de0cdafa8 WHIRLPOOL f383c3de539c38be4a58b253d690b751c6abb3fe040361d35ff022162ffaeab0a0615810b358fe7b80db11e5b23d744ca58e5b52c98d0df054c9376fff5d8e23
-MISC ChangeLog 464 SHA256 ed11d504402be24aa79761928d00fc0584284c5c42c9486ca3b217f691723fdf SHA512 494268e30f9b665ba768ddfdc983d0480086831b8ec6402072ec66c0af8be1f55f641f7c2f211670971aec490ef2ec405492f832329323800e6a95eac4498a77 WHIRLPOOL 57a8584652e15ea5605540e3c83f18adb068679f5d0fd6d8818071c94ed8dcef03f8a8d3a50116207051d998c63ca04ce44adfc01a79c54b02387c0b07277555
-MISC metadata.xml 159 SHA256 1c070a909e96d9d193f84ad9304d196febbe33b60a724cc4b0d20634bb82255b SHA512 269cf19c37f2d136b926f546ec83ffdbc1374b2b6e26f8a31f21854143380386c31bfc7b2a0b9c47fb1f7c02607ddbdd43e517cb5c3270515e465c4dd7788843 WHIRLPOOL afb402fec04cddb3184b69eb8a8d36b404edd2870fd06c8f5e99be39c341ea6fa7542e0b680fac05529522ed33838e8279381d7a6de9dbc58fe55841229d8a51
+MISC ChangeLog 562 SHA256 8215283603fe94935062505c2fcca712a6bcef2b097988acfb1e32f89a01faed SHA512 c3356b189e88c477330d04c8fda0a1499a0f5428ea4465b213e5567720b3d736d22743daa3ab67c3f85cf977eb527da54b8325dd802d7af9d12dc3b9429ab96e WHIRLPOOL c634a6e01d01250e7a1e639eb1bc063996c74e54599ce0cb80b8ec4fcb53fae139dcd4d4ac2724bd582f8b0461984f7d6c9bd07d5e7d7258472e9c465a26bf93
+MISC metadata.xml 238 SHA256 70c6e550627bbe8559539061f3757cd8f950feef9a8a2a88a7531adecf1aee2d SHA512 79c95c4e9336506885ddb120d71e6d699924b95dbee6758388bbba0900f825d6344b0af08f1bb6dc2e090b19fa15767f6d2e7c2cb770580492cac6dfa1504748 WHIRLPOOL 39e90485fded6884fac6ce2f0a2e12915c78f27f5dfc9a60be921303112613e6db11ef80dd008dcee3ed101f729e08efe398164a6d849510d381a78704f406b6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJTwCTCAAoJEKCEBkJ3xQHtv0YH/0afUVi/UqJTRQwrtJyomDzI
-rPFy/J4ZoHEwDW3mz1IEaVCiBGgPRPYFmiW98w9qdlXgefkzw5Ko+VUCM6F1EStt
-FiinkMxDcAXpBsFKx6x+S+IC1UAkKB+Z5cGfUekR7yRb4i1lmpmS4+9wk1JvM/Sk
-KyjL2yAHERNgpXOHZ111qetU5Tl3/35cL0/ommLskqlZR8NHaOlxtT/RyXrfwGXY
-w3Ze8QRg69bycKtosxbW/l0r6SVb8Gvv7GqJZv2cfdH59B8Txr2ZVBRnDK4oxXxX
-bHqF/DtMBRz2ch2/fGWnb1g7OaucLr/fze537v6dFeejOiurotA8waboNQkggXU=
-=pnre
+iQJ8BAEBCgBmBQJVduw/XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiK0IP/i7sSFw5J6HRno2g05ChpGTJ
+x6U/6jici/Os42JMw20hoy2Ycy7QymyzNlpl22jjp8Bzv1dkw6mdFK5sHJg+Hkik
+RDnGuD929s0U8PTC17uxmnyTnuUL1qWwUpq+xVCwgRx3F+PtQN1yhUZeDGnc+hYd
+TINS5ifI/INrdWB9tunOD+UT0+umCWiCOYf3IMRAKjpK3ggf101f8MUrYBxIEST/
+NA/zHaAG/UaUeB8kv9yZrCdp+xCFi3MWEVbXUpjdOsLh1yZqQAodroLze7jUsks4
+rS48Ti6EcYI0KJXDM3GJmuxyZW4Z1erJUuDpBRuL+u3fYDBMh3e2KmvKxocgcX2Z
+pAq3d8c5sz1FcRvCHAVIR4nAnfiHw0N/V8ktvUnpOARAE1qGHXbDCvG3G6m0/qOO
+eze5V93ojOwBS4zK44Zt5m1TANKDuZmn6/1sL8Sv7P8ni1WAcjah+0XYHn1TCTxA
+3EHfD+J/MGBoHK3aUoOf4i9h7EmwQ0w2gdF/ZHAFFTjxv9N6Jxv2EuB2iIDb8z9Z
+I1DwKAWsVIlO1Rz1qIlST61IWsCdlqWXysFLoVYrLZ8EZfm4y7lXYKTHsxvlAgts
+1JUVJ6CXvHw5lAKOtST6RDJHMstWilJOcLSYARzMC72xNQvPSpLvRmIrsovPhLPJ
+Ad3WtvCMeExPewX3Tyf1
+=azIx
 -----END PGP SIGNATURE-----
diff --git a/dev-java/htmlparser-org/metadata.xml b/dev-java/htmlparser-org/metadata.xml
index 604e0a4238bb..b4339a64621b 100644
--- a/dev-java/htmlparser-org/metadata.xml
+++ b/dev-java/htmlparser-org/metadata.xml
@@ -2,5 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">htmlparser</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/dev-java/httpunit/ChangeLog b/dev-java/httpunit/ChangeLog
index e95ebcbce6ad..75671061508b 100644
--- a/dev-java/httpunit/ChangeLog
+++ b/dev-java/httpunit/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/httpunit
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/httpunit/ChangeLog,v 1.14 2014/08/10 20:14:56 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/httpunit/ChangeLog,v 1.15 2015/06/09 13:38:21 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> httpunit-1.7.ebuild:
   QA: drop trailing '.' from DESCRIPTION
diff --git a/dev-java/httpunit/Manifest b/dev-java/httpunit/Manifest
index 8f75b844f7af..72b9c6d4d802 100644
--- a/dev-java/httpunit/Manifest
+++ b/dev-java/httpunit/Manifest
@@ -1,15 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX rhino-fix-1.6.2.diff 1099 SHA256 0d805d2fd551ec4f35c8245aaf710cd2e9ea0d86ce3c816e088a480abade81d3 SHA512 d7210f10e90db83d2a14e61b092ac427e13c98ddd9a52eb340462a547dfddccd46e7a470a39222c4eb6696517db0d30e31ae1cca5fe541ea120b57c9e22601e1 WHIRLPOOL 4487ce4cc90805fc3cf2cfd1f741f5ec044160190ff2254e4d35cbf17cecf5da695b3e7852743d9732f9c02e418beb2c7ea59335dba1dd972b251ecb6b9d4fe3
 DIST httpunit-1.7.zip 4181983 SHA256 ee178a368f0db6979dfdca24c655f73726c3729fb76dafb064a8fdf8b057f625 SHA512 1d109b8ef65fb80d7904c2786db31916b2ef26c5b92730ce41b90c441d3e8d46a4a8a84a5e82237b52412c6bc29fc6eff18297d2f961616bd8429bf5d579567e WHIRLPOOL 2c397d2a9788812ee413ae682393be9103535942e695a2103ff404fe1a2ec539ed8b22201cdc2c10b011db729f821d91fe100d700b3657600c284d484070b5ce
 EBUILD httpunit-1.7.ebuild 1124 SHA256 fc93bed41f527f24f934cc68188571ee9be34e2858a7f505421ba6af66a73947 SHA512 7caef3ca45309dacd81f3d927c775ef2e2cf6012dc02427bb724e1b7d70a972da316331401f704cf780a8629225d500ad4c7fb236221e28ad145a9e49fb0ecb2 WHIRLPOOL 68df96c5b1effeaa9f0ec2640865edd8aa48cf127a63f51af0ceafa7130af97f1132ae832088ee828be71382700e73aa111d39ba822dca788fdfcf862ebeaee9
-MISC ChangeLog 1915 SHA256 78406c28809b20cd303b0ea74b7a3fb42a57a21fce098259ad5c63e25af48b67 SHA512 dd64868836aa6b72141fde20e46ddc9d6801aaae255dd444e47786bc4c8395b9dcc48157bc219a4f1483997033dffbd03f015bb56fbb9b706bfe17a065a5385f WHIRLPOOL 96659a14e3766074eecff4ad3ab37849904a887bf22c1746a93589c63028aeda2cbf5ab6afe0b44484f1dfa455c67a6e40ed87fd809cb4da4f5b4ee3a4bdd7c9
-MISC metadata.xml 507 SHA256 d8142cbfeb1867461ca204d51007a57e60eebc254140dfe6a3e49192ccdcf0b8 SHA512 a961f0540c304eb2062d728ce2e2eaff68e1cfbb2c50fd8a068468645c46a65e545fa81ce5c6a31b1ae0b873f72a5098feb98dcce391cd53315a6359cee31638 WHIRLPOOL 52bf1be44b14573c6d4d65fc803fcc7442394b71bfc34dd7b1027308da605e97c073da7e97942f95303c902536adcbcaa336cfca5ba5b4996c4e51df4fec2815
+MISC ChangeLog 2012 SHA256 95e0aed3cde5cd6eb8b9dd92c407f34ad60f5e83f2b49a4ec9b6bf96725e5c41 SHA512 ef160e9ce4332c1c802a32384676f1358ec9a51b83a83a5813c796985cdb8786a14b14297a202ad9f58dc1e7d8c771c0aa55af0ceac5b69f625601b5cc5b4b70 WHIRLPOOL 826bd6ad67f91adfb78efed6f64cb915888d2d806d033f4b633341d7bc214beef4f7cf9e5f9b8cc1d4437485ab6b867d43709a8ff49087746d3bdedff0f53745
+MISC metadata.xml 585 SHA256 25f2b20e369a95c55b4e49cf36f9689fb1d3c67e4864f0d5197568b574535c7a SHA512 5b714667a190726d4b8319ffd41c0700887e8975a0062e581a76ddc5561bd0b9ed915ea28f6926a952eaf26b15ec7c3f90567a60f4dabf1b105369cd0e566841 WHIRLPOOL 9953756fe406828e4602ffbe044b5356a67a183d37ae7783c85095a38a7652dfb172fd7651067200f9ab796fafc8573d86395a5be08bad141a94b0cd01737b88
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlPn0sEACgkQcaHudmEf86oy3wCfU2qVrJQlUyN/8n4PIRPsPK2e
-QGMAnis9zS0r/2BIYJOfieiP/8BWfe0Z
-=l9m6
+iQJ7BAEBCgBmBQJVduxOXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiuswP+P3+1SVHJRWu9SWccF1LcZRr
+YhO6h/LKnwgMF7r4p4Y1BTB69yBwdKZNbVWCozY8bbZKP9A125hIWCI3x3nG5k9B
+ESzxtM9Oao4th2Z+r9P/4mP53U0h+pQtQGzmthq2sM1dgJDnXXFRsMsm2dZjiFWD
+KWQ//bA0urrdh0KfIOqpD7XpOImxXndPC0xaIU9JBbE8P6gEI8Cnr9kABvFi3kNf
+MKKMsGRAEzHuTFk9ti36hgJo2NEhXYT2dONNa6j/Nq/AjJPMZi01QSs1SWhZY8LM
+c0ZURYYHnv3Pg6X1dJ3NUF1hM42awHweQHLaO3imTybUAfua7UznUHEwlbnFXLfY
+CyeWDOvHYPC2uVfj0keXoKACfWlSdiLjMLy+Pt3P8SNSuz6I28Zyt+DzzUCv2fFn
+G0h8JrnM3P2NX1iWmp5z7T1YAxKXosTyL/rW9H6RHWW8oiX5Ufq9nbISuD94LD7p
+5+79qv0Yzd2NCpSIcU91Xyqz04hw8cKMjcChf3qaSLQkNRd9ly+RJZ8gLmeElBA3
+UmbSer+Y+hBOT/I+F3fmdK2+86NbvYlbKyJD/zl3cZ1LRuN3P5nGdLUdJjO5rf5H
+vaw5NX8fqeRowFE5YdTANvXNuKws7oRJ4WtTLFGUKMRUv6rQiBGD+42ZKL3fwtwB
+gqF1MIra+hhyzFFeMqs=
+=22GS
 -----END PGP SIGNATURE-----
diff --git a/dev-java/httpunit/metadata.xml b/dev-java/httpunit/metadata.xml
index 8337051fb6b7..4c66010521dc 100644
--- a/dev-java/httpunit/metadata.xml
+++ b/dev-java/httpunit/metadata.xml
@@ -9,4 +9,7 @@
 		to examine returned pages either as text, an XML DOM, or containers
 		of forms, tables, and links.
 	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">httpunit</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/ical4j/ChangeLog b/dev-java/ical4j/ChangeLog
index 7142c83db03f..a58c756d683a 100644
--- a/dev-java/ical4j/ChangeLog
+++ b/dev-java/ical4j/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/ical4j
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ical4j/ChangeLog,v 1.14 2015/04/21 18:37:21 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ical4j/ChangeLog,v 1.15 2015/06/09 13:38:44 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   21 Apr 2015; Pacho Ramos <pacho@gentoo.org> ical4j-1.0.5.ebuild:
   ppc stable wrt bug #535062
diff --git a/dev-java/ical4j/Manifest b/dev-java/ical4j/Manifest
index dc91f42badb5..14c0009c7194 100644
--- a/dev-java/ical4j/Manifest
+++ b/dev-java/ical4j/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 1.0.5-build.xml.patch 3196 SHA256 460bef8c939ec8f3e357129efa7855768ce6d8ff78f2b5bf308a34e4009d7992 SHA512 888a57e0c2ca9bec191c14dde8b33235b024e5ee764c0fc44e61cd51040f30a8ba4698c5457c1b4acf4180092b152c635ac14521b7bee958c533ce4ad3854e34 WHIRLPOOL 9e32dca603201f9646cadb93b1e92c9ae29b991be79289efe4c74fd44515092d8c9e56b928e50f47292e75ed7b05e9c5bd2261de92821d5c0364aad04e3fbc5d
 DIST ical4j-1.0-beta2-src.tar.bz2 1328056 SHA256 c2ddf74c8f57d504816aa930e7a63498dd812c914ac77d19c24d9f36eb46afd6 SHA512 794799eaf2fd96783f51d0ac87eba2c250a9ff39e77f841f7fb948d93c0aba9a30c28aea09c04c78cf8ee42dac6514edd07a8d22ea18d6005787b86d9857949f WHIRLPOOL 50e0df0d482b8b0a63c86d519b30ea6b6c556a713663fd67b929054f3fe6e587822577de4b58fe9e07dc93642ebcf9a0611f368a24d55ce67eb423da0320ca68
@@ -7,12 +7,24 @@ DIST ical4j-1.0.5-src.tar.bz2 9307268 SHA256 7fe8bd596489f3f015b904794fb9d9a3468
 EBUILD ical4j-1.0.5.ebuild 1573 SHA256 1a3c4b357d2ab8634f66b4220b21679ca3fc921724eb012f88fcee8b6fe7b407 SHA512 66a1855c638a24106bb938d76b3219235a1d8516f8626c2ab751c1877c5b30626c6c2bc6a02fe12c10c1491c739986764b0fa8293ebc8d6776404c36d4ab08d7 WHIRLPOOL 27c234c26c190535688abb384ddf899d784c25eed65e3605f6e086d86c4324fc85d97a4893ca2170037a38590d00d5f439940cffd7618f7f0271e060e629e991
 EBUILD ical4j-1.0_beta2-r1.ebuild 1440 SHA256 18eebe7807fb6d6cb161e9c53b1f42b8aafaccef3af4315d2244cb1f0d7a9f76 SHA512 a81b07bf986ec8d89a56b3d0680f86a41423717b0772bcc4b26210cdd99140363c02b8172cd8b97893addf51b23276db916f08a6241955257f355e31d78a385c WHIRLPOOL d8f877412c880836ab261987e66bfa4eea33fe684dcaf4eeb77d6dcfdc29ec76189904faf35211ce6f7fdca39e9345ed4a3c3948c4dc4cf8c3d6178760c2f591
 EBUILD ical4j-1.0_beta2.ebuild 1652 SHA256 0461709b28e2f17ae23228ac4eac04b41b322a87f5021f7af4a580a96ea5ecc8 SHA512 06a07c05003b0376a18a7c473ee3221228bba78acdde8892397c9ce32c655fe91cf04b7e2abbca6a7efe278298846b89e76024046a25478d079aa0f2acf02039 WHIRLPOOL c0e171f49cc605f921514dd702bcd0f46878d2be961f97ee619b884e2d6381200cb08ccb162152b8f0b450b594294b3cf46cbd18e26eb95a715fb2a8519799a8
-MISC ChangeLog 2094 SHA256 97690c6edda5e823a1ce2d3122961f76fffccb429d256dcda91c2e8ecc9e4f61 SHA512 dd0aa345953397edee4477b88f92284ae3b53285de668d0b9968eab29f3bead08fe8fd091421fa8b770371ec434e1240b29468f3c64d150eb81bde3ac7d80117 WHIRLPOOL baabf23a9f8b1c66008f3594fae605c2081ea291fe6a71e9bf79f5f9fdc1ed7dfd17889fbee014126323dbe3c52d7902e6a9264b239c1fcc595f8935dbdbffd5
-MISC metadata.xml 830 SHA256 1970061c273c049c1f541f368176c373daf594d9ed1eb1a91d8943b2ccaed8c9 SHA512 b789b8d94b16016c475ef29aff1fd0f795db9990410ef8bced5616d7a1725b3280b33c61cd9de6030385931eef9296a614fcb275657c14e0c1e6c7488b6cdb0b WHIRLPOOL 674b60fedfc72cc2dbd89d8b68b30ce863d3fc73c10d95b19045abae7bee27469b5ebd790abb55456360b34bb28ad5851e1eea6939d0ddf949c47a5cf3d2be06
+MISC ChangeLog 2192 SHA256 579d1689ca80404152f7e000086d83d1a3365cc40783dee74867379d3cecdda6 SHA512 ca8f86547d6c5d93c7262478e1bc040a0b07e97c21ad21ec015965f78f9e1159dae9602f58c499385210fb4fa98766a03b2ccf39672b45a6c72158c7570c098c WHIRLPOOL b7f22e967bc563ecc183918eb1700b033106be2841ae167d4c2b2ef63c10acc9f79c63f52671bb24488ec0994c6e3e374f0a5c1d9b2e51382bb6bd315706a52a
+MISC metadata.xml 906 SHA256 7fa1a9fee79f20e33576c58066df4c90fab754bd08ca2ebdd6257b407df36542 SHA512 ca2fa5e08377525a5a0dc33c1de11818d40a8439e9b912c955c108bb5beb6a1c4b10a1f92ee7d5fb2a2b2c6bbd150203afb0354ceac575863fe6afd288178582 WHIRLPOOL 7aca34bd759b2b3cca0cc272cde83b5b70841b502a84f2aa93894c8b1193c2d0281e2feb16df011e3e6246bd1adca1cd5ebced77fc7a1cbef1352d3554873763
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlU2mOIACgkQCaWpQKGI+9TqvgCdGW08v0rjKNEFq7iNKceYqREN
-wQ0AmQHdAkFrzA89wxors9vwj01/fYvE
-=FV0v
+iQJ8BAEBCgBmBQJVduxlXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiSjoQAJANfvQO9hy58Hl/AcVmM0s2
+AKnYZdsfTROu2Lc2QHOvf47pZn2q3/wKaYx1szz/hPm8ECHWaxSgDeN69LAep364
+2jwb3t/KLYy8oiB2cjlV2RaP8tgpD26lI8KFwLIu+rDTJbgor+MbnGKvwqVeuT3x
+ppCG8DLO5MXgSS765YodizoTgpqYH8uZrCy6ApOYCR9j00vUf1h/m1KUMeyrHax8
+G3ZhpNlauHW2RxgVpDdS+UDVTFmlvuSKVTflDNc8Yjxyh2/EXSnY+7ldHLiNHUgV
+rRZCqtkYO/2l7gKk0tAY2Fd/nRaV/gWuq3thwvkO4AFjjQcZcJQJatCVCYY7divR
+0kTaHTvIo5jl+KWbH55ODx84Cr79k4N/XQkKGhn17YnDPB6EYaJ9jlqfxtUarxd8
+32wcIy2r6qODLdriFf83gDgp8CIFzZCZYH9RMVOG8fkrIbzvcuoqAabdYmTuaxJz
+kdAWQ61d2hPkqLE7E/TAZJtnJZYKy0VqE00LY0pbDV+Ev099P0HyQINEkIIpue21
+y/rKMO2Q+1C4uBaBxEedgZD397zQyoNJPeH2/fbtZVVg93/Y7mlp4KCr5wpZhs4m
+rTT7VmBkJjalEb6p0oxJWtUgHfOrcD0j1zbIQRxFCyypw+6JIzY0k3fbZo17lOPL
+mHFyxG3D2sqsCouGJpBG
+=wOzz
 -----END PGP SIGNATURE-----
diff --git a/dev-java/ical4j/metadata.xml b/dev-java/ical4j/metadata.xml
index 134e8e588124..fb19e8790932 100644
--- a/dev-java/ical4j/metadata.xml
+++ b/dev-java/ical4j/metadata.xml
@@ -15,4 +15,7 @@
 		also provided to ensure the data maintains a state consistent with the
 		specification.
 	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">ical4j</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/itext/ChangeLog b/dev-java/itext/ChangeLog
index 5d4cf69a9136..131d40a8b1ed 100644
--- a/dev-java/itext/ChangeLog
+++ b/dev-java/itext/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/itext
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/itext/ChangeLog,v 1.104 2015/01/12 17:46:51 ercpe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/itext/ChangeLog,v 1.105 2015/06/09 13:39:09 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   12 Jan 2015; Johann Schmitz <ercpe@gentoo.org> itext-5.5.4.ebuild:
   Added patch by Andreas Sturmlechner (bug 475552, c9). Also added files from
diff --git a/dev-java/itext/Manifest b/dev-java/itext/Manifest
index 188065c43a7f..c110442cc5f1 100644
--- a/dev-java/itext/Manifest
+++ b/dev-java/itext/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST iText-src-2.1.5.tar.gz 1301652 SHA256 213599606c9b77c064486c3f5335ede99718eb4bc8c00c29a21758ddb67653e4 SHA512 ca6bc9807379923b25e45cf06976c7ddea7ebce5bd418204ca4a6f668cb55fb06ddda2b55d34e78aebd2ae307fc8040bcd702369b5c9da849286dab7f8d474ea WHIRLPOOL ce3067c7c747b2e8f07f63a0e0693bea1025b8cbad09d66912bf2c039e0f4aa9a2a284bcdf7590f604c4afe14ab21815a880b3c3f9ad13cd5584f537da3af4af
 DIST iTextAsian.jar 329741 SHA256 19c8c57b430958ee93d7a7aab61448e1627b9acd2b0735aa0ca33d78404587bc SHA512 fad669829efb9b6d3e5de8b8b6b175058e4aedaf310c1f6991487f3ebea15f2979e401b7969e6388bfc8ba456382d452986505abfc431fca714f471faa70933e WHIRLPOOL b861a2e78e71e2df07e45a2be44ccf21328f4b16b6d4cf17535b205b2592ff5135ba54133e1360547ced983356a60b1fd25e6264ec06d63bf8048439dffa6e48
@@ -7,16 +7,24 @@ DIST iTextAsianCmaps.jar 1696864 SHA256 f7fdbd3c93f7b552d935d8300b6644685beb57e0
 DIST itext-5.5.4.zip 9765296 SHA256 d4ddf4e5825f2c240641aaf3d7340cc7e6e2318576dc2f523b9da170df005c4f SHA512 bfcbc1de97a94451ac5b486bd02a764ed60d28455aeeecab4e93c6004accd015e61cce2019dc4979e46ef220547e7dfdbbc5d3aaad182f88280cc0053b4681d2 WHIRLPOOL bf7e88c16393df90e0de0ebf17d19088e2120db78bd219fefee251457b2c6dba72a084a10ac547cfc73cd1c074b312193de7c02241681c152a7746ba83d62d64
 EBUILD itext-2.1.5-r2.ebuild 2007 SHA256 142e969489ce59e16e9e288bfb82d2abfdcc84ca8a03013671c1918ded2dd224 SHA512 2bf5c7f88ad68327127f4896c88feedcddc17ac9c3b881e340013f987e2cbe6847df500707052258ad49cd771c41e90fd608c4178a169d03f94a7019657e9a0f WHIRLPOOL 820cd5da2a557d68dc4e0478ddeca14663d2de5d4fd830b92a2dec501c27b9c91b9fa80806ab1c85338bb3ae30280e2d59951e299afec28e0dd593083396e73c
 EBUILD itext-5.5.4.ebuild 1223 SHA256 9bb4b9241b548fd11dfa66d76a281d0db30a1657de01c0b3651d10fc05fe6a4d SHA512 05d722ceb36e7a536350e8e69450162db5f77bc9c9b6f52314956cddd9cc0db149fe7137f1e754ae267e013bf92fe339f7d2463c04e4916a56568be9d7f25149 WHIRLPOOL 0faf87410effd1ea165052f1df97fd8cebb7c9ee8dfd0cf319a0544bebaa06d1aa6523070c892f0527e58229f23cd0aade63ca2727f925129e3ecc3f012f59d7
-MISC ChangeLog 16084 SHA256 8769791ff76ff21f471c898cfadd736dc82cf52247709d68b319ec3a42e77306 SHA512 b6812001508b1c220d9bbaf5dc0df14d22075047c6362913bebb6f782a0067b5bc0304112cec8978df30393e30a4c54a2fcf48c68e6b23a19d470bf6359026e6 WHIRLPOOL bb56f1f067d4cad51ab5d4dce186f95c6f242b0b3b0b2a0ad9e43a98885c0875059f461fb23cfd13bdeecf15c2920e338b1ffcbc03d8a645155c63d35a2d6cae
-MISC metadata.xml 829 SHA256 287f2988d97cdfcef44dbbbf665da2637890d63f4461f833c206008417e794b6 SHA512 c579dc640b8eadf55d8b968080889404d11b9feedac6d1c7cc7b495c164d3eda39c8ca8e9c10671384bbd71dc84a1ebd165d99cd7607aeace76c27459c45eefa WHIRLPOOL 507b07a99261e51370f23764a9fa53c3b5698f3a7f49f072f8fed3b4705a81477b505b1c0ee9ecc3e1bf9423510c20ae6b666ae7be664038d3167ce9ebb53f6e
+MISC ChangeLog 16182 SHA256 ad582468befc3946286c77da757726d0113d681351b494bb8c18a149a0095c3e SHA512 6d3e3553d54b8dd1331e559a13564c0a292a9911e7f8718e2206d3556f68a21891b4a35964e532ed2294e97b46bdc4ade2fd9ab84291c75be58699edc7054b59 WHIRLPOOL f1dd3662cdd44bfc85fe4486fbe9f8a19c1825189d1cf537d585e8c13351d6a88d52921fddf2742629b7b8686cf8facd39287ce6bc84c44308abe9ac99cbd80d
+MISC metadata.xml 896 SHA256 d889c9bea4d2089899bba25ed2101c4fb5000cccd239ab8c676b2bc205586f1e SHA512 6ebba9b5546a32b72b38f458aea0893f0c3ddfba020030d1f033c05aaf8d4aee04fef96e6a9368ed2e76c96fc9e2fb643806f63b5acb8a5f42f45280b3dce6bc WHIRLPOOL e9178ffcbc28332faafdba9328c64ac25a3b2041be4bf87412348f0bd53e0dc641e93b7578a7d5e50e318edf58a7ae8609830af7df35adfd20ff86c493e585df
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJUtAiUAAoJEKCEBkJ3xQHtlwAIAKs3S5e8+FRbllL04mFHlCbd
-abyjCOOV4UXjwchdQ7vMl2xgpsWUY2hii3E1k/1w4ApdWKiec2qvIR7vNAL9Ups8
-5Oe5aoqOC4yGoEI3/ABymrqiWRN1mvZ/D12CQlJcbQluGZfuRKISTh3yeT6b8Pdd
-kyTiQh8DIgmLocgwRr8Gh4z1v8FMkQj4Fhh/8NUqdsqK2Dn9j8Ob627fUdyVtow/
-iVhnoYdxvisbNzmilGRvPxzrjflorCLCNM+RStdzTylDs3wlkJfc/0z2FgW1Q0up
-FZrDJc3DqtGYjxl/h3UocKZtBAGh4m9sIaLOA6rU26JeyVe1WyHaBZDc79AmYSM=
-=lIED
+iQJ8BAEBCgBmBQJVdux+XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiD4gP/0Na4wVbfRHmxBVLdWkRwzfe
+t62+NUMjVWHJyZONqgW9IcAMstPRn+/ITUCur8rudnf7o8OXZq+lam+TSIjJJytf
+rnDB+HTOYiccbs1UJbEPlXsMiJ9A3PUIUtdG6WrE1zaANJiRNNS9GeTvItdNfJh3
+HhP2Y8dCio/KKG/w9LbMaCFEGFDH+G82769ssFbA+JbTqH4q7v9ltQTS/bmC9JmK
+zsL6T6Misl4G9oitBEERA5E5F3H7d7lpX2SU0dprJHobGdLv1X+ymNr3XiHTppWA
+8b/cpwBZfMwbrR3vVrJeGtBaAgBYVaFT8Q/1FoNND3CGtA5698m20hlvEFu0l8DV
+ViiNd1oS+wAbpvbKj8mhYYRXHdZ4mPkvV1WlmWgLfeyywWPQm84H799di/rsnlTR
+rnOtMfpvxJ7Sb3Z8PKYUmCY+T3W9v3c8zSX5V4zIEd/jWUVF2ZlM3CSX6Px5EIpt
+hWB+dUvZ/uz7LKULEB9UsOHhMxlBEDoKun5/sUh2gWFdw3PWUJpjaI7wcOX9Yke1
+2Yu+USLO0Q6Q05oIVt0fMmWP/CD8RR5VbJP91IA49uH51zPaiSv4yTUY28RJdTJF
+YbaxU2HGPV+8tOrleT1LwlNuiu6l9wDkxquHYOLIC2Y7Zz/8gnmVf/cmtq1Aw0i4
+6RBzFjY2i9hiPmTbDub+
+=r0K8
 -----END PGP SIGNATURE-----
diff --git a/dev-java/itext/metadata.xml b/dev-java/itext/metadata.xml
index 3c9f33868919..73d4832148ee 100644
--- a/dev-java/itext/metadata.xml
+++ b/dev-java/itext/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
-  <longdescription>
+	<herd>java</herd>
+	<longdescription>
 		iText is a library that allows you to generate PDF files on
 		the fly. The iText classes are very useful for people who need
 		to generate read-only, platform independent documents
@@ -12,8 +12,11 @@
 		iText and PDF you can control exactly how your servlet's output
 		will look.
 	</longdescription>
-  <use>
-    <flag name="rtf">Build and provide libraries for rich text format</flag>
-    <flag name="rups">Build and provide GUI for Reading/Updating PDF Syntax</flag>
-  </use>
+	<use>
+		<flag name="rtf">Build and provide libraries for rich text format</flag>
+		<flag name="rups">Build and provide GUI for Reading/Updating PDF Syntax</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">itext</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/j2ssh/ChangeLog b/dev-java/j2ssh/ChangeLog
index 9412db0f2b84..704a3884e44d 100644
--- a/dev-java/j2ssh/ChangeLog
+++ b/dev-java/j2ssh/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/j2ssh
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/j2ssh/ChangeLog,v 1.15 2013/10/08 16:37:35 ercpe Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/j2ssh/ChangeLog,v 1.16 2015/06/09 13:39:26 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
 *j2ssh-0.2.9 (08 Oct 2013)
 
diff --git a/dev-java/j2ssh/Manifest b/dev-java/j2ssh/Manifest
index 2920e719cf92..cd70b9611343 100644
--- a/dev-java/j2ssh/Manifest
+++ b/dev-java/j2ssh/Manifest
@@ -1,20 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 0.2.9-extras.patch 7597 SHA256 7b518b46d28d9c147599298b3fd242830462f9303b0b6808a64ba2e2a2dd6eab SHA512 e60f449e7cd39c1cc551a012c97f5b1cca229d6a08c06abfea6c47a0e2577d36887ce5e710dae2a1db5d1436b1eb0a13c5bdcef84555c678d3b54124fe6ce17d WHIRLPOOL cc31661e59521df26552d11ba749b55a9cbc9f689c53119a5ca71b97651d64cdac72bb86486022ef231e03ec998f1e200a20be8fc9bf43d5fee1a53cdc5234df
 AUX 0.2.9-no-versioned-jars.patch 2187 SHA256 c81bbb752d2c211ae2d1d51e4c4c67039cef6cc7bcc747323e9176e0f7dd3e9a SHA512 5ef6e3f1f51a241f0a45810a561f4a77ddb2fe706e7ae4d0f6e36c28416435eed50cdec33debf7434f788c28f5b147987df3b1a12e59f8a0fade31183f57332f WHIRLPOOL ab7d29d5efa289d36e0f39bd541e42349e11776566bf24067fc322d6cb9cee7cccbbcecbc664469e4d95a0da6ca701a296f381bc23ddea13d67fb36ce7c97962
 DIST j2ssh-0.2.9-src.tar.gz 2182523 SHA256 9fc60e295eb7124ff2cb77a76ae6936b6583ad7dac742765cdb3f34ece70d0c9 SHA512 d7720766dcf50205089fa22d026721dc25de5def1d451fcb6680832017becc3fc8d76c2ffb5ed2e2190e08c864da24d2544515478956f78ac4d8cf4126cab6e8 WHIRLPOOL 3e039e95255f91e47c8a52ee1b4f83b8f667e1232d4649c5aeb29c9076fe92d66110bd6ec11187ed4bcf2f3987e83041d38cc1e4774bcb6b3e26adfc6feb4cec
 EBUILD j2ssh-0.2.9.ebuild 1121 SHA256 5e0552f9282e315e6495cdb110c297af0b18116293115a61ea0e1749e3eebddc SHA512 d542b3bfd0f7eb9856befb57029d52fa55232f53874e419b98944901a9fd4145716574dd5bca88df3a3d6aedbf0ed32d7d3cfd05519f14ecdfffb8c83cec88f6 WHIRLPOOL 4d9a9e8f759a38c1af1c51b62b3df04e35509f86fef4221aa2140774776de2b726845708972f702ae7cdfd58cbcbf9ae976eddd34442beef5e65ecfaf35d6b67
-MISC ChangeLog 455 SHA256 0a67dced7168f1659a5aa25bfd9350e608729e35491dc158503ba9d8e0e8f683 SHA512 70ef9b9868cf754a17e2dc8edf3c006e9b41056d7dfe79cd8d83cbd2ea7679f0530390e77bd86c50df41c0d7b007a413a728a2af7b88e825bbfb2b8255ac1c56 WHIRLPOOL 8450f2af014d7f3b46b47fd80ad35487f50068817b7e72c2b2404f16384450c0295476ceea2c04d47cfb8a58bddd904c2770ef20e1df00c9d6a0f94b80701efb
-MISC metadata.xml 338 SHA256 00e0160eab2ea97281087afee88309ccaa35cfc54007493c21c5f74506b0d8a4 SHA512 798e558af38f8e8d11d5925a8ae0554fb98199c53f5ea5f31d0b95c2dc12f80b6ebad255926c51693607307789376fc12584273e722dce66be6011af8768a551 WHIRLPOOL e99d29a3f8dd7fe8154c1c3e84eaf23f09410178bcccea519ace5bc7ef87f0386bc5bd839df50db11095faa2d697ef10c0216ea7fa15699360a73a3f6e059de3
+MISC ChangeLog 553 SHA256 e44e89229fa0b7d371352ecd3c7026b2709216bc8211ca7117004bb1bf597515 SHA512 71b7d3731297b91c414efe081f9da4c97a9eff4d3d54f3f331c3ac555f03eacc913ea41b01aeb0ddd374ad966b2c7f7b04a7e16b41985b91e9105263bbd3fc90 WHIRLPOOL 4fbef735d61d28f6ce3bf8527fd5c3bfc472f422600aa8cb2a2c3c272451084cc39b9749f33d8803ed18cfb5da2688aae1aa615cd2be09a0bfc1f55390aae98b
+MISC metadata.xml 416 SHA256 7ab7592ca501e7f38d639b38d620e1fc81aa4c07fd62a961b8616eb098984320 SHA512 cfbefaa6b72897f43c52984a2fffb88b3fd486497a0f7c5c4ffec49a89ee39863ddb8d5e9b0672d2619e2b9e55e384da05ccc4d20a893ccebf2a985f8be75bb2 WHIRLPOOL 1e397ab2a8a5014bfff309f686db5232f48aba12f25208ef96448064ffc0c5decc43db311115a295db7f966088abcbb30a7ac6db108712d4f3fcb0f8f6fd0ab0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJSVDTQAAoJEKCEBkJ3xQHtNw8H/AtMgfPGI/u7WhBhsonX7WNE
-yVIfnb2e8PeqtIvfwXNI5fbuns9YzRYuvq6AYhSjZSdDfHdJNOAhNXZItVp/tQci
-5E3rUbCqI7H/PqiVYSX5/YJ2RNLTF5UE/3khvpBvnXoe04r8Qkrm9I0c/mcX5lT9
-TdhBNP/4csxoNVdL1IL7t/kGiYWmQ3N7J+R7Pp7yZD7dUKR1a8kM+oKkJGBhC4Rq
-2V1hy3Tb5kYIQ1A4Z/k10DujH+Zxe3zmRhSDvXKOpKhlMafmT3ReyRxSinF1Lnpy
-hVvy6NC0Lsw18l9pkhAo2N4QYwoZjY4eajbmXWB5D/kdPto75M/D7VBLkdsl768=
-=RKXe
+iQJ8BAEBCgBmBQJVduyPXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiZRYQAJG1cF0veU4P24/FkqWFQpPp
+UfBGVUnZdYy7XSuXVbgDc5PHoJNGACGC+b+hEe0RjE5JW38mwpPNfMN7k3citPav
+s8zIidVmzIHa0ymgR7tZSR+UBj2c8H1TftSmZv7s+B/JxafZbKRqNU0nEeqspNrq
+Ukc4of0+uV4imV/+0ZgG62votsYHmuMIweI+cLjnrTjbWhvV9o1CD5g3f/2lt2Am
+S35RWi57t1Q1lAMY02r6wjMgGmSe0mHEtIry0N8yWsgr7DrSHWYJLykiO9rBiPNh
+DzzUdcV/9C1if44zCrjwgjXVV6ShBIiZ8p8GX8lTdIZgYXdK30EDwlAXMWpX94B3
+wNVCpdkSQI+ooET9E3uELK9PP9FLE/fWYq50HmOPO2c/TBidzW8yrsiwYOSF3PUV
+mii7pdHsT6/pS3FSR6aoFOWUKEgW9qYWeYqwHa7AnnTsrnZQV/x9GUgLnKQ33nPa
+nMf0RdAYZfHuoR6oRroyLjZQl/XaSGRCMEtynDgvhE9ISDlzaqwyXZx96l1tndu+
+6tEa1A6jzB6U5Ey+FUEogrL9EFdfior770Vr88MV4MpuDgJRoUMzcrNMCjMnM4yb
+GRDb8i757IUfhUKhor/GmHxcsIGuH9DST4wh06Z1NrtRgXrVpdM0yZtJ/7P37pkU
+h/cZiXtmenUX/kiinkCw
+=uziE
 -----END PGP SIGNATURE-----
diff --git a/dev-java/j2ssh/metadata.xml b/dev-java/j2ssh/metadata.xml
index 54da87107dd1..3917c9cd3fa5 100644
--- a/dev-java/j2ssh/metadata.xml
+++ b/dev-java/j2ssh/metadata.xml
@@ -6,4 +6,7 @@
 		SSHTools is a suite of Java SSH applications providing a Java SSH API,
 		SSH Terminal, SSH secured VNC client, SFTP client and SSH Daemon.
 	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">sshtools</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/jacl/ChangeLog b/dev-java/jacl/ChangeLog
index a7e2c442f1ed..af7440dde7c3 100644
--- a/dev-java/jacl/ChangeLog
+++ b/dev-java/jacl/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/jacl
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jacl/ChangeLog,v 1.31 2014/08/10 20:15:43 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jacl/ChangeLog,v 1.32 2015/06/09 13:39:50 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> jacl-1.3.3.ebuild,
   jacl-1.4.1.ebuild:
diff --git a/dev-java/jacl/Manifest b/dev-java/jacl/Manifest
index 040b30e3d9fb..1c93a13b34e1 100644
--- a/dev-java/jacl/Manifest
+++ b/dev-java/jacl/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 1.3.3-javacflags.patch 1184 SHA256 baf06c08fddd20143840b9318cdc5c8444cc099782c96a3c40d29e027f8b71ff SHA512 a18bfb61f8716f7ed47138cefa9b692c2c0796ee3ed9293c992cb87d974e9ac0346cd334e673f73fe7042c8218598243c6b712359698b7c73df45ca986bf3972 WHIRLPOOL a3f3fc968cae8eeb852054794d040299f37ba6d5c0ad8b2e913ac26e9dd6c1803d98a8929f65981ec67431c4d0b21d0c725401c1739256000112ba2e31f15f8c
 AUX jacl-1.4.1-build.patch 1418 SHA256 2763ef0cb6833e0bb3182651d3184d984dede5e28a2d5aabdf21b2791c50a55f SHA512 3b8106dd795e444800e38b182508ce5e69a66df9ba0916f3b9a1fc9eb449ff7e97b06f39312bca900b3de2fc7385966ebdcc57ed1c3922da061be339e0565c5e WHIRLPOOL 78aff2387a0e297d58c31999d5eb4d7eec85c1b020b62f3cdc3490264ca3583dbdda07ea7c2baf8bd865ab0cfe7c0546ced1ca1167970c49285e076f1cc0d922
@@ -7,12 +7,24 @@ DIST jacl1.3.3.tar.gz 999934 SHA256 9f195348cb13c6f4c9cdadb927e08654a3722ad11822
 DIST jacl1.4.1.tar.gz 1921630 SHA256 0edac0a7d2253c29c44ccc92427fa9ad4ee81b6c82142e417f72399a8584b749 SHA512 e4b906efbd3ef4ab9338e8bf2f50c3b820e25b9fbe61f194e90cc0fa128f68d64eb459f7b05171d4b86b4c9635ef483906a02952bdedcee89ccb92256b789247 WHIRLPOOL d40416577c88403a34b3f4c2c7ba45365330690832d4f7c4013a4c17b3ae2e589e99a9d7c8a93d18b4690fdefad1e3298dd28b3b89a467b8dcf2138e3e3b58cf
 EBUILD jacl-1.3.3.ebuild 1348 SHA256 a93f885f9da85733d90794d059a366e0e18d0c68b78f6e47198f568108a1020e SHA512 05a3a6a6ba523bc3a366595d7917363ba2398ce6fc9be9208d1e8c6b0cdc6db1bb86db885832f3c0430da290d57790b60e28576cb16dec3073951c0f86c8e1eb WHIRLPOOL a9115250cf93b49e18cc618d1fd4ba95d4b17cb7adc41e4c803367f995fadd791ddd3cbbd4a8ba400eeb997af4b00e7691481ab64fca73932cbb93e522c70a88
 EBUILD jacl-1.4.1.ebuild 1463 SHA256 7f9b35ec6c17eacd9a5ecbe7dea0e4e788c41bb41620472426060158a567d5a0 SHA512 c036804a719b42e498458bfcafc042b1120e47344aca55aa47b5285ad557ca1b8ff6045160dc5f9e0d41e9ad1ac88c08f2306e85d1642d1856084df31f49f0b1 WHIRLPOOL d8eda38362e211212d8cdf231194d9dfd8f9ced5a38ba2769a8a663baa597e37971d139c5d7625d3cd16d485c75ad701e4bdc6b6b2146476303758a7c2045401
-MISC ChangeLog 3585 SHA256 1687694ff538ac2773bad1b6e293136618077298ff839b68ce4a0d9c34aa4f8a SHA512 9d7dab44d7e5475e7594519213275707b765b914da4e40264ef901546d2601452c15acbd8a7bc7758516db33450f87bd8596670bffbd1a3c069a5ca21730fd50 WHIRLPOOL c53c9daf0614de061cde65d39caae4e52db8f69a227278e11baee82e224ed1896a1df8804d4e272e394460f9a537b3b5efb112683249fd5cb4043f9900e52ffb
-MISC metadata.xml 1959 SHA256 510ca7882bb166d65aaa8f2fc6e0c7e3d5197f4671d4cc1ea2058d4adfb9de91 SHA512 856025943d8b7ae3330d02cf041fabaa008a0ffb4e483c37c00d0ea0531300e1b3269b77f48512b4a9cf91d940775d32c70244e2e894070920fe5118a5dfd50c WHIRLPOOL 872638ea74be1dac4e3f02266d1c0a2791626e7b4c07f3578679ccd06ac847ec9dc072c6b6d68a4083a4e6130c5d03c62c9b913e6b1fa0ad4ca0b4c142363733
+MISC ChangeLog 3682 SHA256 3f1c0dcc7809f763f20bc319b39ce1d7b2acb1b000fa46f0baaa9e72e4197083 SHA512 8e2f39e6cf0f58de6836be391e6749b36cd451fa81ae2184069d115eb3006ac8326461b4db1623cb9561e660ed9c9a803f842ec32fd65564e01d61e539d6cc6e WHIRLPOOL dd4d68aff4f3bc8cd900f2f5706e804ecdad51ac528e123597c6f476728ec0d21bab650c98218474d5a9ceffd88b2511b4ac185db267759c186ccf8176d36dcb
+MISC metadata.xml 2038 SHA256 f8a167e59e3885a81d6772f2ad8564de53255f91096dd76a4dd9956aa72a5c09 SHA512 5b8b327e0014cac37a37bd14fc66cfa8aa335e5d4d584970af6c0a538ad03c7b61157a420878ef511e63c7022a3760f52b3e5b212845486b9dc7d57215d829d3 WHIRLPOOL 879223f417bdb046a0795a5c43863c5574824dc378ec859a0c00167d3c5b985025d3fa037cece8922ea9055c05068d5d5827c5d75dd7765da879b86fe315e0fd
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlPn0vAACgkQcaHudmEf86rHMwCeMxCBf3Ses5WXapUDJY1okcaI
-vmMAniN+f0ArKrMDqRY0JRgabl5UHcmZ
-=KJJB
+iQJ8BAEBCgBmBQJVduynXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmie54P/ifRnJpSy7Py0bfvsdmZ0qz7
+W+VyeikDKtUWCZwML/JWZ+Uw16CeojcDu9nMa9U/H2o5iwNjTceEUrr3TBC6GSQX
+KEY9WP+ys2Ign7o69SkC9Qf+YwkqP53wB+V3Wqk8UupY4VRLTRkL+GM7b3X0UU9D
+RUJ3+jmpO/Wpm7KWtoTutUWA9+ZgeTE15A+xiAkr8JCzZUA5yZmYVYWZ+fK/6zUU
+ALGPhoPuVvs6HDIkFOiXE8DRTNVCFLPjQqOCMSbm7PdAb3bhsAwAUbdv1VmOZ5/K
+Ro7RdB2S1CH3SQ5NOeSH9nX6UrEVhrqbNX6wN2Ylq856GWQnZANhHSP4LRt/hmBr
+UHVNggbHl8x6cNFkPeW6QOM0fnw+WbIwoNvsQAruilgf9iODQVU7jXKtysNikRgs
+n5qifnVO77GJr4gEt36hlPCBYiCz0HDqtTikyZUF2+Gv1LC5EA8bWBHXjQrrJZRx
+hHgQTFcWOnSO5dpebl+QFuz803EvS+yv8LmXYAlS/lBdWNdpbPuP23OF8gZSpP6j
+nWLtJkd2lHqkaTjE9DcNmUyWv7yK7dvvmYvmS0aNs2KB7gygij+yS6Su9VrrJ0RN
+Mwq1mG4DD4gXd1/APjAorj/LSi8cf+0M5GIZy8NgNasCKICwANiuZv2Iz1EHwEf8
+3vrlna4mqA4pu1zF3qEp
+=RyHQ
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jacl/metadata.xml b/dev-java/jacl/metadata.xml
index 907d3c1bb445..6b283ec84313 100644
--- a/dev-java/jacl/metadata.xml
+++ b/dev-java/jacl/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
-<longdescription>
+	<herd>java</herd>
+	<longdescription>
 The Tcl/Java project's goal is to make integrating the Java platform and the
 Tcl scripting language as easy as possible. The project actually consists of
 two distinct packages, called Tcl Blend and Jacl. It is important to
@@ -32,4 +32,7 @@ procedure from a Java method or implement Tcl procudures in Java. The flexible
 API and wealth of implementation options provided by the Tcl/Java project make
 integrating Tcl and Java easy.
 </longdescription>
+	<upstream>
+		<remote-id type="sourceforge">tcljava</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/jamon/ChangeLog b/dev-java/jamon/ChangeLog
index ceb2205a31a9..e537966e8932 100644
--- a/dev-java/jamon/ChangeLog
+++ b/dev-java/jamon/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/jamon
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jamon/ChangeLog,v 1.4 2014/03/08 16:55:26 tomwij Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jamon/ChangeLog,v 1.5 2015/06/09 13:40:04 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
 *jamon-1.01-r3 (08 Mar 2014)
 
diff --git a/dev-java/jamon/Manifest b/dev-java/jamon/Manifest
index e7fc00a5c230..757f23b4e485 100644
--- a/dev-java/jamon/Manifest
+++ b/dev-java/jamon/Manifest
@@ -1,20 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX build-1.0.xml 1546 SHA256 db486d24f063b5ec263d6da56b52dd2a7cae686cb9c347fb9702cc0d3dda7868 SHA512 98d426ca462d6b3546ca75fe33073016792c6ebfa5a4eff66c40685c34c63980b4442a20967b316cfe9ff48e25690dc068e0b2b0068f629114fef428eada35b4 WHIRLPOOL c004b8d43d540d5af50ba721497eddc5bf758ccc87f5320e643002f1bcb6f6da42174de2d241cc4b51e0d79a69a37f5de706827e424f079105c5d7cdb7a68447
 AUX jamon-1.01-java1.5.patch 1688 SHA256 dc48d61d3de0be89940282d9face0d250a0a507149d6539a4e79afd610c84d70 SHA512 5a9c128a01adc5d95c0283b5eaadff37ad792834be310d10c858374d87923ba3343aced22b4f29f32fcafa4179cf1a2773d2a95a8fe8a0053c445d40887c852a WHIRLPOOL b1dc7c38423b3e27dc58dd830e59791249522552158255c7c41d92510f2d5ecf1ce05a7319a78e14556511dd5fe917e265359bfac2ecaa14c217334178a999a8
 DIST JAMonAll_103005.zip 143825 SHA256 23eceb23264c4643846372c6454f9406d2435aeaf840a183033d9fa50176c9ab SHA512 bb4b7fbd108a0612ceb59486c985f32ffa4c9dd158fe6d6c307357d3ab76c53dfa87ed691295a9de9172744e46c6a01c2ed976d3959834e1665fbbc36dcafb97 WHIRLPOOL 53aa936d313f32e052609173dd94de9bc8b659babcca8af71f4729e646989fb44d25a49f442db792dcb1bde762c40f3b46db69d9c075f659125d233dfdf1e015
 EBUILD jamon-1.01-r3.ebuild 1110 SHA256 6c80265b53f8001398ee1feb2c9b7ee8f421cfba92580b584003422cf6c5da9c SHA512 de01ab9c303cfe2af0202601c3ba88f3c863718a293d930fb9bfbcb11f04687614b87a0fc9b54db5676a9dba8e0eb7bdad9cad3c50ef4f677af0fb13730783f4 WHIRLPOOL c1672f226b73a9a6b52a594ab9bcbb1d6c529d6d5506fdd38753e913a9221a75ccd3c387d6486968539ac4966de126ee1b2732272ed623a17d39ef42e424e5b6
-MISC ChangeLog 998 SHA256 8d7e64858ab7d5940a63736d09de869bf47b27e5cc113c46bba0eba8a9d4b680 SHA512 ad37b8b968e488a88c28a2bf1efedf37c05a29532a023c13edee813d1e4d372927d34a9ed9cabcf3766b79b63e2eaa17c930c038cc79823fbadf2ef4d015cae0 WHIRLPOOL 86ba6e224fc1406b1ef26908b279fcf8cc7f6340a9ee67bb0b768144309e449fd8c33fed8915fc720ea57b68a62e16de8a546cd98a3d05d9fb230b7f9e6750dc
-MISC metadata.xml 320 SHA256 ea9f3ae8bf46acbaf61a45e3c55ec564904055843f2ecb15bfcb546278218e4a SHA512 4c54a6aa94b93c7ddf87267edd444cf646e497b40cc06473ab7eae99415a9ede99737bd072523ab9e9e7dcfb6de96fbc4aac3b7390d127be7b8066bedac9009c WHIRLPOOL 7c4d993c82ba725eb6ef896c4d34d3949b5ddf9660bcfd2845c667262d3129344539e4b905da52014177899bd21259dfaaafbef2ead60144324bd48d4cd8fc28
+MISC ChangeLog 1095 SHA256 40b372ccf15072045e60e2240abe095d16dfa358c06371599727c44f81b1b82d SHA512 f4b9b679a21f9e3292825975b2217e24abf0722cbd5e1dd1b8d40f201acf0fd795efeabd515d9c92dedaafc3b4b7c8564b410d86482b2fde3cbbbff8a6604e88 WHIRLPOOL 8f514255adb5d90d5733ea101423f7110a335f4405db8666bbee04fc0174f8cc51f383f93799d0d8eb805f68669ab9c1d2483191103947221d99d9b0577b60d4
+MISC metadata.xml 398 SHA256 218f63e823c3be66ffa3ffda293128c06dba6cc9b84d21645c246d4e2f78fa7f SHA512 d66c067d7898a9758c744fc62657ab095ab10a211639a6c6735de48e75e604b8b0e5b41d95c602f5c2ceabd9eb2437030ef0ffd645a374d8140d72dce69b7f4a WHIRLPOOL bef37376f4ba74ded64b89616e612c14d785ea5cf8d24fe093bd84e591028789badaff474d3c6e774acb2244b6e0e7093f292657b0b31a657e1330a525d3ef9a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJTG0tfAAoJEJWyH81tNOV9YMUH/2TI0KHeiQRtpkw9FAnzrSdn
-jw/gZKnKFGN8M/rcWuMVbSEI3BqUK8YQtOy1p4h5k30kBQBmqy53zcgv7i0rX7qu
-FHvC51VV8Rc9IKV3gkoI/WcMgFGuuq11MwRcFQx5IpNGgvCGt/0zwwSR7sLytIaa
-VwseGCjCyPmmcFgPNpQjELLtzZlyoE1U7j3WL9bo3y4/ro0zmg7Lx8ByzSdxeF44
-sydxRZzDfnEGNXsJvf1l44tzOTwEmbtmJJBH8LF2ajPe2zMncL7oqRWOU2wFGAiW
-YOqWH4Tmm4M2nl4gScW0vL2BNiRXSJ20pRo8lXHUKwaVptcpfSkW3EJ2q/cxZaM=
-=lbcX
+iQJ8BAEBCgBmBQJVduy1XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmihfQP/2AX/nG4ZuHYZWVl3kbHY6Lp
+gHnaT6TMA4EOzp9OKn33egs0jGZgqjA1V8lQSPE1nhWfmgeSh0qiqKJoJE26lHqi
+BEpdB71WYr8twrjK4xTUT1ruqD2N824u8oOeOmuXJWq/m9x2wJc96EcH3C6qHuwO
+LLr2WA304LWe66k15zmXuKU7cBe0V22zuQpJVlNgYGy6jvPh9t13WszWAm52B5TQ
+qQzEdGYduwSTqNSz6AOD7vQDg6QQUYLT0kd34meBi/GNxLRcTUODZPwgqD1POlW0
+HVXZ6J3WY/eB4KzNfMbPbU6vHA8H7GnBSEHWXfae4AOrJnXjoYV27kzttcGtMGum
+BVhg9uOWWYQcv1HlczdpqeKTG2UNa8wtT+QTUeoojGyJu1vRx/tr8k/0IiC7lPsm
+SrQCWLqvjI8Z69YTm+xq2v9dIsITF/C10yCL6gkjSKfpumaxPoR+Kl08g6Tlnnb9
+ed9M4BQeb2sDS2wdio7p0KregA2CSGY459nK1INvREaf3NJB3V1UgVLg77qbJUCC
+wS0O6YP66N+tqRESLtTEiTNpNUqqKq4jvVayFibnh5q+2C/2rr124M/aJvmIjBIF
+2jzhO84o9gCgaXKTLrblZMhi8eazIfQAWiiI8YlWyexrFEHV7KJeSOBdnFB5EcBs
+d4G9ndFvgjt2o7cUhqWo
+=cH/+
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jamon/metadata.xml b/dev-java/jamon/metadata.xml
index 17f33327810a..7ab7fd707165 100644
--- a/dev-java/jamon/metadata.xml
+++ b/dev-java/jamon/metadata.xml
@@ -6,4 +6,7 @@
 	A free, simple, high performance, thread safe, Java API that allows
 	developers to easily monitor production applications
 	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">jamonapi</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/jamvm/ChangeLog b/dev-java/jamvm/ChangeLog
index 726914a38fba..780deb7127b9 100644
--- a/dev-java/jamvm/ChangeLog
+++ b/dev-java/jamvm/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/jamvm
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jamvm/ChangeLog,v 1.53 2014/08/10 20:16:11 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jamvm/ChangeLog,v 1.54 2015/06/09 13:40:26 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> jamvm-1.5.4-r2.ebuild:
   QA: drop trailing '.' from DESCRIPTION
diff --git a/dev-java/jamvm/Manifest b/dev-java/jamvm/Manifest
index ef84f02535fe..e20487ca7221 100644
--- a/dev-java/jamvm/Manifest
+++ b/dev-java/jamvm/Manifest
@@ -1,16 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX classes-location.patch 1184 SHA256 c973ef294f31c2937a55d5f683dc3ee2623877439b777093663e4f6367a791b1 SHA512 0e441916dbf66289bea37da807a85930a9fe320b5c3a5301df85a870418125fe9fe0c5fb7ce7e4baa9dfc75a3438509e9d77b0ede67b06411935875ec7e641ee WHIRLPOOL 131a7a1dee1a295cac7e2725384c9318c659e5ab3bf89a1d587904cffb5ecd1527105a320970f26b3051ce5bafa5a90b633604e9c90a859b0ed29cbcd07e8ead
 AUX jamvm-1.5.4-r2.env 320 SHA256 0bdb8b07a21509ff5650629546a0bfd1a0fe40e5c7b8e9a8d2a1c3797bfa9f04 SHA512 5924972c0f91eef7b7c04e33dba8458b495aed131c4a587dc19626d060f8d0c92ee2bba221fbc14ed9f965d954cc4d87ecaf6881b5a1052e34c9216b6516ef1f WHIRLPOOL 688aa1051d65839eeb3cd7fcc0b31b39803b71957dbcd7f9bf04a54c5777ccc7ce180888081ff2526ce749af5fc2a9dc61996f1b634bda50090015416d056d13
 DIST jamvm-1.5.4.tar.gz 656283 SHA256 7865693698bc4322cabe1014a4b7ebdec1bc1daf45f1a4457b6e908a4446b124 SHA512 a4a7a2917881262fee19b6aedd9dc50a78463c5e4b02bda4b8184aef49797e3476f8ec8671047a01ba246af7d84cbe58f57ee84bb198817738c79d9f62c1ddbc WHIRLPOOL 615d94ab3a8359c8d6d0a2347d836c0a6adceaeda03a72d105b094f4ffb3161a5f3abbd4c12aa75703823da203d1cee91591e829a796813f82fcfbf2703068f2
 EBUILD jamvm-1.5.4-r2.ebuild 2430 SHA256 8e6e0b0490155e718bc9aac63bc27a917faf69d66ba555c88d4324dbecd46ea9 SHA512 1bb71435e4f3f749d92101ac07642f0d4c52e1de453b843ab3fd8185062491867d1d2991413eb6d0387ccd39557c6074c360195f9bc9126fa856c0223a5ee06e WHIRLPOOL 5ed271773a4fe8be1a74688cbc347000c6d28dc358679d52bc0111af1b650b8624dd07acc1cfa24614c066f91595a329385802c702c30071a4767afa1bbed070
-MISC ChangeLog 7671 SHA256 cf7970a21433802bfc41c5c35cdc9134e55331e3cad40b0115bbd66341981e54 SHA512 abce934cce721b758e8bd2323be4936e73555b439e38128d68d8795096b8b5ed210ea9c409bad7ef3b44c14f901543e362d2e71a1eeac4737b29db74f47979c4 WHIRLPOOL 201e30191bbf5e69ca26c9c0c8defd44d5b32f07d0e886d510ae13b34b36d3cd9c1ba9e5ec0069171c8f91c437a8fd68b428148d7c67729afd5294c73e50e38b
-MISC metadata.xml 159 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb SHA512 74dc9ada199a90543b8e1c168c7054f2e973fbfa2551e2b959d67501f2538e269cfb4b2f0905a88a1afa04c20b33961336310ba876f80d47c8e7615b2d7c830a WHIRLPOOL a0ac49efeca233ec4d8f63eb69c8e46e1d4ecbd926693c25b1b8c7415e4c565680936aec46f0c4197116fd7a19a3bb571beee493c18bdae1e5e978e3db84f17a
+MISC ChangeLog 7768 SHA256 39b543f954b809f83f49b75c835a8a3aae6d9d34ac7981da953619e4dcd6a407 SHA512 fbb36c8ede4a8b39da6c97af537f73b59d348de6f89343ce39f8ba47e199c0e2eed4abf657fbd76fbf427f99307f4b6710998854eaf9f3174ebced8981088a87 WHIRLPOOL aab271a43cb56b4bb05a7c958604c118b919bc4efecbee627ccf0861893e91648e91c2a414dd0909ee184657a7510324906e3e377e7f0062aa6dec5bbb31e78b
+MISC metadata.xml 233 SHA256 4d4c4c1134a48a70ebe370c77be6a10a60cb6ccfab6daebc11eb2d3811a35c3e SHA512 1028199a32a67d8ab4072ca6cba9092bbd871f47392e44b9f0d5f240b9416d20a2bcb017c744f094263ce9bfa64efb5d3c6820d3c3e0fa037404203fe5b4cc85 WHIRLPOOL 218f302ab8638c3cc6c796045defe667468060c0938c6ee3120001cfabe9f3ba33d5490bf94f5228f514d4041b209fac3a53ffdf582d66a375aad656a55e63f8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlPn0wwACgkQcaHudmEf86oJiACfTWEbDB+wdVyK541Fqg2uGTQs
-P60An0Hz/hGcjxMLSgWPEPmFxF3P8mvk
-=XiQt
+iQJ8BAEBCgBmBQJVduzLXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiuWIP/3pISHwzTe9eFX3Bhfm5fwCa
+Pp2GXvNLJsrUX8IDVl6mHw50IcmuljpVKISU5OTjVn2jApwnff5dSfgusxv75nBB
+gjWBbdeCnqBf04uqBQxGKkv2G3qoDP7TNJeePFycjehN39vOh8H8tCKIQwpVz15+
+rQTT9zwerpUrRurCY4phEEvld/6Unfyku633r0NYzq1kbLnizbGrKnP3rIv5fBkA
+fP3PXAOuGijY/vbzjfvokfc6ge7kzFosdBpvXOOLmMuzAvZOAIuTCaZ168nAq8+R
+fodpiJfHfFB1qCR7LiCHrxZijkEaQ2bR/OuSjmd5B0I+oiZW0R8z61FRiE9toG0U
+ltHqdmP3JjCvSW7b6gzlIQzK9djN4u8dA49OAcUnMYq65FmU/YSGi2Rq06Jc0sY+
+gPeRTxysvlnDQqN1GN/ny8ltU5L+meiKC3AbL6On/hysa6L/S8UpGA53Pdy403HF
+TZIQ90lq7Lr+kwNzMezbXyb4DJqu+GTPFQObZykfbMFUv/u3qPxne++O25mbup8G
+HGfjRLn3SumjgcSsF0wQ6OScEJ4JVPDj+1Rzu85p7h4LNTOU4Q6CqzEKgqOaiWtZ
+W88RhqZdFSs5R0p9TMqiBjSg8L/CXyMPtPMjK5+zeJYx6sxq7VUYr3gftGI1F/CI
+ySrRxf14I77SYmEpCGV5
+=U0yn
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jamvm/metadata.xml b/dev-java/jamvm/metadata.xml
index 250f2d1940ea..a98889672a9e 100644
--- a/dev-java/jamvm/metadata.xml
+++ b/dev-java/jamvm/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">jamvm</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/javassist/ChangeLog b/dev-java/javassist/ChangeLog
index e1c6040a1d17..4098da70c0c2 100644
--- a/dev-java/javassist/ChangeLog
+++ b/dev-java/javassist/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/javassist
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/javassist/ChangeLog,v 1.35 2014/09/07 07:47:11 ercpe Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/javassist/ChangeLog,v 1.36 2015/06/09 13:40:54 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
 *javassist-3.18.2 (07 Sep 2014)
 
diff --git a/dev-java/javassist/Manifest b/dev-java/javassist/Manifest
index 7f8ea0fafad6..080842976524 100644
--- a/dev-java/javassist/Manifest
+++ b/dev-java/javassist/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST javassist-2.6.zip 1143271 SHA256 c77a56714df64996c704c76718d07ea97f582c6eba20711bfd9ecbd468bd02e8 SHA512 8a6da5e2a44cc3bc5b87538a4eda56808d13998d8c9932153f9bb42a1c7844d1a1c7311eb22b0b4ad04649bb7c22156acf851bee638cffbd3328bcef1d2a9f37 WHIRLPOOL e08b458d1fd3e1a89b81b19077c9e7c22fe8fd33d64542d9a7d3ea63ad0aef5df8bd229c6144e85e612eae288dbe6b0ca16210790bba866925148f2d90cd71ad
 DIST javassist-3.14.0-GA.zip 2258443 SHA256 8a6070659f3409cd23392bcdf29b86232666043dad06ba25c4de221c8c8affc5 SHA512 e8e1aac22a147ee13d73c8e8c43835e28e63b1f7cb0d9ccd91e2d0ee23507f7af0eb0c22c779ec0bf6e9ab0a522c6719edb2bdd4e2d38a715c1397b6fd76a562 WHIRLPOOL e4167a5a81e80729f3cf47dea4ee968cb6b94681d448e67150c08bc283b8d0e6b3c81e92e5539b612a3adbfb359dc3c93d74a5bbd6aac3532c83ba387126450c
@@ -15,16 +15,24 @@ EBUILD javassist-3.4-r1.ebuild 1039 SHA256 2f0fe8dac3be8574288905a334e4aaf839a22
 EBUILD javassist-3.4.ebuild 1034 SHA256 18f0a266af042a07b0b9721988d4e08c7cb7d40a1dbf39754437ef01220a3fd2 SHA512 83a2b955f5784fa99511bd3f3387944f827840c37a19a9c50b108a499784816fd9b79b2df671db8d22e362e94ac62aa4e6b1e67be776806a6c156cd20720615e WHIRLPOOL 8db869be43f62f47f6bc2c975717fa978c0fa3ed3e6cbe4ccde817d3c2f7c92047902efed339d635c0ba61cb63979f7bafa4ca40fb14fa600406a223760dcc43
 EBUILD javassist-3.7-r1.ebuild 1042 SHA256 628ce6eb21fc4006ff76f1e298d677ed9de1d4689f5d96cde1f7941f2f9f2110 SHA512 4ac2ea9ad8339e033f6c753f42ec1aa42d0b73f3219d04cb1e74d5b9bba63584d86e3bd71679137dbe1981b1e84e07705ec172eedff7c79e207b06adca2d89d2 WHIRLPOOL b2ccaca8d6d551a7948089d17b29f93a8f655acad332a5c30f156da15a26bc39a79486a90778e14ba76a5b474aacbc6b27873f54ff9e60eff89dcd0fffda6292
 EBUILD javassist-3.7.ebuild 1048 SHA256 0c02a39ced65c2ea1076b67380e2dc6f557b46b6f48727a8fdfa98ddec1eb0a0 SHA512 05aaa33ea7ea0723f1bd13add6d87565cd25817774cb1e307982bedcfd822c797db91fc376b051d5b7bdd77d6a9ac8abcc8d75bbe26eaea32ea9e20b45a74f3a WHIRLPOOL 288375b8bb6fc6c9e518e5bcf5219df71a90ff1e90be667f8be5d3ec31350c53cbb6927d9f79e122a13126f5e23e010b516cb0c59a5afdc9507e6533e18f2cae
-MISC ChangeLog 4952 SHA256 708e41ab59479c54353055189462e0b2d9ce1b178196e49313d2c36b49f1891b SHA512 2155e92c883eb579e3bbecf433a083fc403c8cbfd136df391adc24b7cf89397df400bca6d7aea5512846079af3d98fe49ed1a64bde76f4bbb96a0aade728ea93 WHIRLPOOL dcbb6db10b061d2a29fa16a2bc50e7198ad0e14475abcb5a24c3f6c8170952eac9fcd01c66cce2964a6f5575e79d5c55cefdbb83658da498aa543a0dc141d9f2
-MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
+MISC ChangeLog 5050 SHA256 2e47c682e71525aba1dd5744dcb172b54a3cf119f85bd1a8ed871aa29b3f71eb SHA512 ba916b7a0bc7dc22fbbebc19351c95e3207cf16903d59fd3b7b47200b76dde668c8cafd129b3b065f62f92ace83ce5b4fbd4fae134d3ae165b31f63a78137290 WHIRLPOOL 246d48aedfa4dc2e241eab13cc318a42ce62030901db821cb5ed75c2553f09ebfecc196c9bf6d5533e834a7c7804df624342292cf158a5f2818abadc01aa3b0d
+MISC metadata.xml 233 SHA256 7f10b3ffd3a1b3a6fe0fd06ff7b4eb3ebe9d0ad8b6796c43d25a6ef889abf98e SHA512 7941e1a2703c9d71c57f51316951ef4042259a78bc5c1bb56799d25f657649213988e5a40bdc35ddfdf6feb9f4f0b0eb4fe7146f64cce9cf9c73e5d0ce75b811 WHIRLPOOL 8c893e542cdc556054a5b02101355e3f647d8b945665db28623ec56ceda353019b55c64698fbc5aac8362810b19a4869afe3ca75e48b81675f0a961b7e38eff9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJUDA2EAAoJEKCEBkJ3xQHtEoAIAKmee3m97qzOKYUwWi4wTh+X
-ZSRGjHLvdnYwp0OKgWhMwN28LY7E//Mh2LLDGSUvu5HsJs+iqCSgSdemXXON/e3n
-NpNZwFDZ6JXILvp2UJUj+ir2DGqLCWIC7GR5Mq94jJ3X8qBfaWoE213g4fVXkzVL
-NrKCiebetraGFD3KGEPP4s4TlYwAYyTAhw8l5S+qVsc1+v+w1K5IK9IjAofcWj/o
-by8DqZIZ6Djoeu5lTpd7pIOxMdUbkGQw9Tz1y3gCQ3z5bRDUczkvf6/qZNPohO45
-KFjt8PNlabjPDGJX/GEIbAMOlc7HeWyzRD0imfj/mUdfScUsuLSGHCkqim0l6SU=
-=DTPW
+iQJ8BAEBCgBmBQJVduznXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiR7YP/i7ndE7dw7y25u5mKE0FDezA
+UuhFoO9hcqElJYN565tqwXRarmjR7Y/YgiB6GXpp84DQT4S8/KEJq6d2iHDC/fAq
+mQrHCIF7OEpTWwj1dhUQHI8fIZqpQ+S+WS6/i3bCs26m+vmPS6ppK/pYCpV4jhOf
+/Xm/8JX5mRI2JoLZwGzBEw4ee5oLlSMZySfLmyI6OgmzjK9jQQWEL3azs2dQ0SRg
+6hzbNRT0wR1bbl6szkx/mbzWZ2KdjMkjorQI3+sqmhx5BaRGsntxgO4a00WY/1AD
+qhKV+6YzBOO88fSJ1uQEc8pGNpAr2GozDszhcuSC058n/TehqtssUGewUlWl4Gcn
+KTzWBOYi6ddfAPo7T8WZsHCqLraacPZfSzEhknyFbjGxQw0QzLrtpQeBCEyvxRcX
+xZ02ra9RlLW3lM9f9XWm95Cr9H2llqJPNyuPfTDI5tEafksC/6eFCo8X6z7M1zbP
+q3ntoh9LTVoCFWi28lUQQwlpkbrdTU4oLnKoW8UCM2p+jQtKP2Jrek6+nL5cn0JE
+EQgfO9r91h3OWezUHIMRCn8y4l0/TAiVg8krvYkNguMjZ4bRNbC3NGVxzCRJVmqj
+RcO5p+qca+el/aPfE94vRKCfJi/RW1qVozgGUW47sL1XK5rFoHHmJUD1J7VjEGBl
+YCBUHiDVfi+hLQjuvgmI
+=po1p
 -----END PGP SIGNATURE-----
diff --git a/dev-java/javassist/metadata.xml b/dev-java/javassist/metadata.xml
index 7303cef96964..b684b894016c 100644
--- a/dev-java/javassist/metadata.xml
+++ b/dev-java/javassist/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">jboss</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/jazzy/ChangeLog b/dev-java/jazzy/ChangeLog
index 3a801325bba0..64f4d2872b94 100644
--- a/dev-java/jazzy/ChangeLog
+++ b/dev-java/jazzy/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/jazzy
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jazzy/ChangeLog,v 1.3 2009/03/20 18:54:58 josejx Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jazzy/ChangeLog,v 1.4 2015/06/09 13:41:15 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   20 Mar 2009; Joseph Jezak <josejx@gentoo.org> jazzy-0.5.2.ebuild:
   Marked ~ppc for bug #215151.
@@ -13,4 +16,3 @@
   28 Mar 2008; Petteri Räty <betelgeuse@gentoo.org> +metadata.xml,
   +jazzy-0.5.2.ebuild:
   Initial addition. Ebuild written by me. Fixes bug #215185.
-
diff --git a/dev-java/jazzy/Manifest b/dev-java/jazzy/Manifest
index a13573a3c236..9d79f51826df 100644
--- a/dev-java/jazzy/Manifest
+++ b/dev-java/jazzy/Manifest
@@ -1,4 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST jazzy-0.5.2.src.zip 235936 SHA256 df6925f924094a9ebab51f30c0e90299e93be7258c194b6f0ea06a1df04fe43d SHA512 6d20f9bc133c03049c4c2a5c8612a52ef9fa09bc7510fb762c1ba9de479b1ce9319633ae2e78d3a1dd63900198d4e2468887113d034d95ba3e05bc631cc2de5e WHIRLPOOL de286057fd174df70ce571699c2c38c4cee67f3c0d821be254e126e29e70802fcee420706a2814dab8fa45b6a929e1c78c535702e0e0dcb0e752619f5be3fb03
 EBUILD jazzy-0.5.2.ebuild 935 SHA256 c2d8f953485a3cb4dd8a951461bede7ea55ccf4ea6a1145c35ce8f49707a8aab SHA512 54f45dac1abc3346c3fac13a5e1b3c2567a286b1cfc80cc05c4da69c50977eb3fe423943f67f02f7785193794825e3d33b30d44c954866c89ccc82071d1598e1 WHIRLPOOL c87c6574441c814fd51c4d280cb2039cccb5368630f8f0081d49d0b1444c674fdf7cf4925527b52fbd4b295075bbe660d2d81e79c7693e539725b8e27ca1f0e9
-MISC ChangeLog 568 SHA256 44a63a43ac8ae6427d8835898c2716be158229188f4026b46b60a9b4f3f93425 SHA512 deb0822307a1805c4d31807a8249506413100ac8ab909076e524f63b0f6a668e96f0e9a6d551dbe270c1b82982c2ed30133302ae4d883e73cd42ed03d47c4708 WHIRLPOOL b1acc7e2e0e7db7f0c5e2a185712bdfb4ed7886511dc0351687953524c2fb112822e5da726cf4bacf9a550213cab4975e125b7323f98a356ed5c781c52dd2405
-MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
+MISC ChangeLog 664 SHA256 5651448582ebe380fb67b6cb411d1afb0a21566601a7b7271b35262ed8c2e1a6 SHA512 cd3d5d81525764aa76149d0c8c6812b8c45139ca014bc9d14e091bf22fb3a136ce26e4dc0e34155fe3efe7af12b0d92655514930a17afdb82cdc89ed415822f4 WHIRLPOOL 595d983454d3387b142791803d7c9716161cbe661a3536915632e43ce3739b97106565b8382f0eb3ea670208135d34f28b8a58248b7672d2d9a397b65d7a509d
+MISC metadata.xml 233 SHA256 ae922485cff112b697cc9a85a2d9b3c3d4e1dd3018febc5ced2b76d7011bcabd SHA512 44b17a002f57d81948d9023fa3529054ab79685b098151b58dd58ff537ece877852116f383ea92996a4bbc738489a0a4926ee1bd74940a5d2ab2181a7d7c6af7 WHIRLPOOL ca0ecc1d3ac37be46f43013d00b38d2c64b4e03549ddda01e4dcf54bd54a6025b50fd296de314148571fd05734bb504638bb67f3943bf2afc35acbd51e4008db
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVduz8XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmin7oP/j+/vkCVgtZTFm3cWqXA9Phi
+oXHlJhL2BTAigGnfbmVmpjv6+7DuenVS2ETj+8aDGlkZBTCN0gVdE9puh6thv2mf
+l+t3o04/3xWVdvITjJTnp+BJudSkVflq1IoYEfhVql/MNxp52M8BKOk+idJjbYzk
+0rqatYk3q9GRoGy1ZN7/+5iIEJrVJGgGKgZYnydEGzS3ZNQElks+akIZyNdT7ACm
+nHmNYl9Tu2iP8rPxwl86W1KK6BsnyHGMnlkRrtdnEpAJkmnUajnXF4XGfFarPc0y
+Z8YjIhKQQxvjFcFnsZcItsRq7YWLqrzhCp60L8OKF+x0ZT7iBLcCOS9FpZ4BJrpq
+dCxz6ECFZA/FBVlmi/uEnu5of1niZ9YuZ2y1c3rQ/FHCo16HnKCT27iFpzDfHTpt
+QOHoj/tun2I0IrNvtbRj/0ORFvqTTZ/4PFbY1G33Cd1ydTFusCbIGV8jt2KWCckP
+SyBmOh5yTuel7kcEx76Q0/KX2i25yMnlu3cGshtux/NZwNi4tnfhCI1jE21HfpNn
+nR8QTTCxrrzDhaxS1PFRTX+k5ZQ3ovALJxeS+CWHobpZszAA5i1jsrpEZvVLAOeC
+KcaIfbtLhJB1IrzIyKgvRKCldaFrInem5ODe3f3zDvCBkOng+u/+hd/AAg1ujwJQ
+IAtHDJRQJOuUZztHO0j+
+=NKLH
+-----END PGP SIGNATURE-----
diff --git a/dev-java/jazzy/metadata.xml b/dev-java/jazzy/metadata.xml
index 7303cef96964..51b51082a589 100644
--- a/dev-java/jazzy/metadata.xml
+++ b/dev-java/jazzy/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">jazzy</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/jbitcollider-core/ChangeLog b/dev-java/jbitcollider-core/ChangeLog
index 96910d0c18e5..fdbfb157eed1 100644
--- a/dev-java/jbitcollider-core/ChangeLog
+++ b/dev-java/jbitcollider-core/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/jbitcollider-core
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jbitcollider-core/ChangeLog,v 1.4 2012/03/24 17:24:05 phajdan.jr Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jbitcollider-core/ChangeLog,v 1.5 2015/06/09 13:41:32 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   24 Mar 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   jbitcollider-core-0.8.ebuild:
@@ -18,4 +21,3 @@
   31 Jul 2011; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
   +jbitcollider-core-0.8.ebuild, +metadata.xml:
   Initial commit, fixes bug 377011, based on ebuild by Dennis Schridde
-
diff --git a/dev-java/jbitcollider-core/Manifest b/dev-java/jbitcollider-core/Manifest
index 030d4aff1614..e75db03eccf7 100644
--- a/dev-java/jbitcollider-core/Manifest
+++ b/dev-java/jbitcollider-core/Manifest
@@ -1,4 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST jBitcollider-0.8.zip 1192489 SHA256 b36482ee9e919c669bb1797ff7e50f57edf505af67664e280fe1dff361861044 SHA512 272e9e0e6e66d3ac9d17e17d8fcbed82b508e512c5cdada7f18c2920597f31ae5968509c9814c5530ee7c5bea9f3d1b049b922d55056637642bcb515b890a9f7 WHIRLPOOL 6f095ae92410596b9b2bf51f7c1b365a1f8ae2f495299716912ab87dbfd351992fb6657846a104b73b334f883d9e762c0668cceb2c4709c45114b9f213263b3e
 EBUILD jbitcollider-core-0.8.ebuild 989 SHA256 3ec3198ea52aa730012203addb1e1d8b91c119d2b6fb39035584acb2286366b6 SHA512 d59c15dc81f9a69c4c93c1c530ab38f3dd39ef138468c9c7cce4fc047ab011026134f82d0ebcaa3450379e4af682c79122ed52bf3e3c3fbe7c1bfb5ec30bef01 WHIRLPOOL acc1be93242fe997a56bb2bae448736ff26eebf1acbba39ebd5b830c22657594d17a1f01f8372371a5f16623cdd422c22e1871f30e05e2db046e6426ed5fdc17
-MISC ChangeLog 814 SHA256 c267c7e557e7f1f573811ead683ca14ae95a72be5c10229b18ed7813b0393f68 SHA512 0ba98e4caafcd60be656a0698e7d30347dbc929889b5d9aa6cd9bd6e107c3e7f7ec1ac0d989ae1d433bf6bb0b657e9e4d12387dfaa933c68c16d80e8cebe59e4 WHIRLPOOL 1fe32321984d920a1d8ea6dd66c612374e08037b7a5c4b4e6ecda6beedcbb3cb81113abe42e47be15934340efeef1d7f0bc5a5f8035baac97cd1c926c1f75bbd
-MISC metadata.xml 243 SHA256 76e8c4cafe92af4eb083e9682c375a2f887458dac6ce8f2982976a96abcf8219 SHA512 92bf36a1bad3877a5a981271afa7381a38f3cc87267233205af5aa0ad53c455d851bb1d9ff60fe02eda49a3347c497c5bfeaa4c160542abd62d81a0450c4b77f WHIRLPOOL 18fde625e32450606e852e52f034c73d6514284aa19842867313432d1ab1cc1d40ceae766c0c61b927a7b5c3917a6624c8e875583f49c0d5951797cf66e8ff95
+MISC ChangeLog 906 SHA256 f7f975a657bc2b1d3a7a5d6f1417968e59b5bff8b2e5fc69ab5445016b795c9d SHA512 1d9f28b6e49cfe10af9cbe3eddbe498df2d7b54fa43697a31b34dc82b4cc216ea0a80c9a5c1a2e056ce464a6a04b3be6ad5dd783bacc965a57d78becf84efbba WHIRLPOOL 6d76f583183c260784be2a34940badba5e6e551ff31cee93bcf0f6ae7272379c0dc8a92cbc1921db77073db6c8c996e6691eab8cb5c5d80be63bda471c302d6e
+MISC metadata.xml 323 SHA256 f00eb54977ee0a6a8d26920ab4c96980a49a64260a95c821630fe2c2d28374a0 SHA512 41c4374144f29f1fb09d6f5b6cc66d3c31a26ca6938e79ab7b8e325f9289b2fea29f2de83e3885ac88eb4152ce6183b4e1a6df4b152de203b5d308704ac48aa6 WHIRLPOOL 13c924a6f8561be90bbe7685268050a1d0e3ed0a94726f05a2590a09adbb014442821ac3d59938edaf7363125cad690b007c65f73387f52db9fa2958dd14b68c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVdu0NXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmivPwP/jPfuJaivXt8zMvWf98DCpsr
+99Bso8F24r/0dnjIjFZqSNqXIkB3vNLNEYihtNXN3E3TzdmUscl4psgXXJQI/O7v
+KZt9DI6WqLxpORazvwDA36zRCwSj3JJXwbijceKvNa0RqFUmc4yd8kso/t68kVnb
+Rgi48CUDrdmkAVyjMSMLOzPbYMt5xeY0uyp2rk0O4k43Rdmlt026eIE3Q19wFN1k
+U+XCMOz23VN50kmj8gSVNsIFqriH/LvevqPHIvSDJ4Ro+674nqiJULjZIJ28R0t8
+O5eWBW4iQvjuxq+6a3aSH5YtzMtMcKYoCwvKlA44bykwx+EeoBk/wbaafdZqbmP2
+N4KA2A/7ZVwZVTe2o8PzvkRpVNTPA5kQTQCrIz9k4IMj/U9DE9sB/7LXnXSYyi3i
+GG1jcJ8AKGhdCJfde4aexI/4NhL8NDpznipBeW5scJCTWWTi9lnZaG8ZQcN1fATZ
+gy5TqQ++DseLloFKxGohmAFjL9+P4ZBScMzOMSH3XTo3t+K9IjYxAEFGPMoq5xBv
+zn1lnufw10tKPydREUMGl5F6rGOAl7Qzt4RvLC2t1TwnsGg9V9/I62+qzMkz6lPV
+gNR1Whk9R7YDUEU+Pnt+fiWDc9vQqV8+xLfBzfkAvvl7oJQrlVTa8mh0LBNNXaP1
+pdT1F7AGhjBEuy8/eOBx
+=cyAC
+-----END PGP SIGNATURE-----
diff --git a/dev-java/jbitcollider-core/metadata.xml b/dev-java/jbitcollider-core/metadata.xml
index fed3658eec53..af796c11fbdf 100644
--- a/dev-java/jbitcollider-core/metadata.xml
+++ b/dev-java/jbitcollider-core/metadata.xml
@@ -5,5 +5,7 @@
 		<email>tommy@gentoo.org</email>
 		<name>Thomas Sachau (Tommy[D])</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">bitcollider</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/dev-java/jchardet/ChangeLog b/dev-java/jchardet/ChangeLog
index 52e7d68e9561..4c2b33c5a61b 100644
--- a/dev-java/jchardet/ChangeLog
+++ b/dev-java/jchardet/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/jchardet
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jchardet/ChangeLog,v 1.2 2012/12/16 14:12:42 pacho Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jchardet/ChangeLog,v 1.3 2015/06/09 13:41:47 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   16 Dec 2012; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Cleanup due retirement, #95685
diff --git a/dev-java/jchardet/Manifest b/dev-java/jchardet/Manifest
index 903e7d0f97d8..39e0d1bf1e00 100644
--- a/dev-java/jchardet/Manifest
+++ b/dev-java/jchardet/Manifest
@@ -1,15 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX build.xml 559 SHA256 dc9ff4e15a7735237897d560d34ee7aa82d46c3cd51793a9743185b203ed366a SHA512 87abca9840918f40261f87f7c157d23fabedb8141c80a097efb874e986bc6da00b319412cfadd41ed781f1d0d4b13259152347eb6d084c73c4fc867e830af65a WHIRLPOOL 55ecec03371a44d84f7fde5928a47ab67bee2e82f3599ecde304383be0bc62620f17290195257656f85344011b09ec9aaa54cb2ed4eadea8d53c27e96679cd5f
 DIST jchardet-1.1.zip 82782 SHA256 2d83cd7a24a5a5c1cbf02f649008b0d792f5e4bc11e18a7df8ce4f885bc8650a SHA512 3a6141b1783286adfc072075f46da8f6e719361425cb2cbcd1c4c4dd82a6ef834a9f6f1aad8126d663dcfa12ad20cc362566dc2095ea95e01bd95adfae20bc28 WHIRLPOOL 4dbc0af21024b9da7d332cd2cb6c9103300a2618b189e4cbe97ad574b328db4727db60ec008f0c09b316d1d27c68371a33645d6a4dd1703f6cd906af3376dff4
 EBUILD jchardet-1.1.ebuild 853 SHA256 33d71a7ce6a18bdb5198b7e7aa3bb4c67c1dfcfdaefcfb6304400c7a038529a1 SHA512 c8a0f5427e52e3e79f73e7699e30efefcd650ef97c4a38f384475af585543337f3064021b436e2407c9e866f13b50c461f0a43de18e0d8c00093dd3e19310d89 WHIRLPOOL 7ea48454d3b6e5922e55ddff136c2b52f651a41b1ff79198a52aeedd4356c9fefce04022b0481e64ec1817193d1e7d32c92fe9d48f9458458d92114efb604a9a
-MISC ChangeLog 535 SHA256 0c525fc3ab6b01fc8432a202b077ea4919f9104ac0c80aa5b0c4d7c085c90c1d SHA512 67f21174048bc30b7e442d1bdcb84771da784bba1ff8ba0ae5afc388e8adb0f66d90ad0e836314b46bf105c0d06ec6c9930d1ec2ae89547487307b41896f1f54 WHIRLPOOL bcd13df2c6f62fbd35f8a71ebb289d5d1ecd97bc2cea2e439fdd6eeb1cb189677de58c7b50cabbba2dead4cf8e56f7bb048194ce63163f7513906362b19363e1
-MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
+MISC ChangeLog 633 SHA256 aec8988e050edda33618a5b3d9dca6c4bdaedfe432be15b218add650773610b4 SHA512 c5599085b7a58c50aa356032e934587a9050592a2121f96fe9eb25134b9d987ba26955cad4f099f67a680b71d215534394769460e3fb06a36e334b1ea3718bbe WHIRLPOOL f2813614d59cecdb57ee8c87922b760969b41d4ad03969796744e607aa5dbc47623ef73373393c72d061707547bd3b2706ef355606e1928c16a66e67c0216cc4
+MISC metadata.xml 236 SHA256 d9214447109c3d6ca9f9ce8a986394625d2d887bcd52c97d0bb8d536372dc52f SHA512 d0aba7aaaff1d79be639ab36ec99edf40368ef1141eef290f026d7cdee355d93ae151776c5e1d2480ccd4c2a4fcaa44a1028e5e868d7bfe474215d9c5e8e8113 WHIRLPOOL 84ec9e9b71d66c0bd504ce5da0df02c2cf523bba7e87e605785dd0aaf1674da63e4ca5906d23295dc8aa2f9a4896ef5041500ca8759771dd4c6bec8c3af83368
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlDN1tsACgkQCaWpQKGI+9R47ACfd/vCodgA8+Rv2giREK14BxEQ
-Nn4AnjllaTPlFqfrvz0If2OEzDEfO8lr
-=zLE/
+iQJ8BAEBCgBmBQJVdu0cXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmit3cQALbPoEmjMnssxln/XiKbySin
+LUGiLExZWdi2UWNjzjhtBt9N3OAXgzGIwiI5xtL0oiEXmx3q2KUvRW7+x/aqpdPe
+uN4CEo1b+9O1piQ/Emf8jUOAcaE+sIpK4oNAQRIsqN12pZVXBd5XMDF+Mea6PXW4
+Zq78hp0X+HCuM07yjS8A98d65UFTQiHbgToQr2wz+2Vbum3iNDAGRzuW/4y5jC/h
+A6WXP2cYFS34fXn885yLPpr9zUo0t3/De8JJQMf6b+THOeXeVBkeXKob4h5P3tfk
+DxcliDcHjP5p8ZwsTYgE7EiOSq243IpNgx9GKT2rxmbOwbXluSEy9KOb220G04u6
+44gjmwi0lX/lmJCA5lfUElpyf+di4SlwQL0ce6ABnNK4GIWKswfBNwVnXhXa6VND
+AZ2I8N9P4zvw/mAKNW0o+bJGI1Mhfy+j2ECNhkxhdNRANw/10DU9TM9VcVhgkBhz
+K/zd2PoSA1oh64+i9as6KJO5zFnHuiM03v26Sq9H9kU5gDgdKtndB0HFenV0xKvL
+auQHvbxuJqso62PfBVH62105whBy4l/nBwuPm6iFB/sb4MQaRJ591wc9yTiJxT6N
+kD3PtBCKA3XWiOipdIIFbpBVFIzUiYRc9jYhfDdxDehApJ0UrECuYw3diVfoNEsc
++Gc0ns+bOG9cH7xWFEnx
+=zx/K
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jchardet/metadata.xml b/dev-java/jchardet/metadata.xml
index 7303cef96964..636867dbfc6b 100644
--- a/dev-java/jchardet/metadata.xml
+++ b/dev-java/jchardet/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">jchardet</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/jcharts/ChangeLog b/dev-java/jcharts/ChangeLog
index 75109d329751..198a18110774 100644
--- a/dev-java/jcharts/ChangeLog
+++ b/dev-java/jcharts/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/jcharts
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jcharts/ChangeLog,v 1.13 2014/03/08 17:32:07 tomwij Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jcharts/ChangeLog,v 1.14 2015/06/09 13:42:04 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   08 Mar 2014; Tom Wijsman <TomWij@gentoo.org> -jcharts-0.7.5-r1.ebuild:
   Remove old.
diff --git a/dev-java/jcharts/Manifest b/dev-java/jcharts/Manifest
index beb9a7da8055..f1c08d0d5909 100644
--- a/dev-java/jcharts/Manifest
+++ b/dev-java/jcharts/Manifest
@@ -1,18 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST jCharts-0.7.5.zip 2499046 SHA256 add40a61a022f353421bfc578537871b7d716750896d689ada8ac294334956d6 SHA512 6b3da4f24cf6481d978a2ddda6db723b93c4fa966b536604ed2e9a6f238925c510eae59bb2cf1c11ea66cebf38292c880655aab4e09f6c8af3fcb4fbbbad92c1 WHIRLPOOL 26d00c4852ae00f4e605061b4c50f911a81856a198ab50af4547af12b73972ba8e23424d252fbcb65343f40e42b4c8b26cfec863442c66c372d21fb3a7db0bc4
 EBUILD jcharts-0.7.5-r2.ebuild 1392 SHA256 5bd96b446820f002c9eb5cdfb2c7825c0f616bb87c3afb5642a2851a233ddcf9 SHA512 16308d899d29c18982a13cc0fab24c2e48d910ecf73b982310faadb3c6c5cb2b26eb3c9fd3c826ed1f586bc2a74b8ac73ed146c135a9b9f45d96924d8aa31ef2 WHIRLPOOL 83a97853d05c8bc915b02821846ddbaa7896301d854798f5c08db071da4618ca2c4a056ab56c2a9b44d2b8086799c6b49f55bd99eb6849942834fc1362046740
-MISC ChangeLog 1779 SHA256 c72e22bea4e17271df61b98306baa78432326016fb72f070cd730d4d5cd2044e SHA512 3b6d493e71801968eedfe2c3e4317b37e871fe291d3cd3474b7dc687b6c36146822803f2921210dc0038ca2c57c1c6240addd3a3eeeab538d8bc335245281ad8 WHIRLPOOL 5984fb0d78d3c7ff6ca76f3b6ccbe1fc6fc71a379fa43aa32066f0eb1795c506b4b539682dbf1291152f1440b4a6899607321f0fe745edd0f2a95ec895ae0fd7
-MISC metadata.xml 455 SHA256 148ca08bf90898d798fd8c6f047115ecd696909c3950f965d1d76f2b3c5a435b SHA512 04b01a3238673efa15fc1b3ca5d0923481e5f4cdcbd45416ee99002cfb0e296d2c893c1b05ab9a038e37b2324499bb536eff7d730b09ed3bbf5732dc1ba0c6d2 WHIRLPOOL a4b34f8245fcd12ff46fe1c231d0fcbd663fe0462128aec80e3a014db653dcb0d36deb2f5e99890b57873702f970d8c71fed89cf24e50f65332053016aa3097d
+MISC ChangeLog 1876 SHA256 0447787dcc108dda06e389423b3829bf1c17050bfc04e568bcd694ec0b57c47b SHA512 35b0df03529fbf686ae6c2dc3b0c07d4d4b5d81d9289f880dc64d1cf508bd65acfb3efe38f55543c198fd81d2a2034cd363a23546f4a66ad96f1664ecb5073c0 WHIRLPOOL 4850c039cd8d3953f6992c3ae4e1f95ac279477fa860da01ace5226773bbf60e5c14e337fd0e30c291765621e68d30c6d43ea7cfbb7e24439f90a6ddc4d453c2
+MISC metadata.xml 531 SHA256 87586a3cf37b3f365f878b9e197255e5e642d01e388fd7cff586eb88eae33b57 SHA512 524d26765282a3c5f2b90c82afa23548d63131b079e4a0d0b11de1399ce40741359d41eda520b12e740a90fa39dedbb208efcf89a276156ee443a695d31e5114 WHIRLPOOL 395fe48a309af22205cdc37c1adb8029682ae07648d24c01adf0fb2f78d11d6cbff69d5313cbf205e6ec9921f504c7debf64eac0f9788310b52a49d533f8a199
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJTG1P2AAoJEJWyH81tNOV9Ci0IAJruDuZOIxYq4g5PwCxt+uKu
-9VPNf9BtR9z4ELwDJHVD7KDpku/qyCxC2CHSWI2WnqFvAm3A2kVfB0QUi+45cruL
-IjGSSMaWp5aphFmNcHSQwuo8FfOHfZYilijSA9WuzqD9J2Crjc/tDwYhpUu0ivkz
-KaTAUKUsotUFG4O4oOkT0IhhN+JxpFEj4ikjsB+CuNbv4TS626/P0Ld/YKvJ5qlL
-kuyUx0b0KnhiK+4hDcfzmcpb+5kPMm9Mj72rAq+WxVGdg5t2328BZL93Rq7iG9Y+
-+mH6wdElXv1cyYw7OxxyFVQ66BoBorbz0fIpFrhKjTMFJkMCPMq4JaIvI6B+J6w=
-=0f91
+iQJ8BAEBCgBmBQJVdu0tXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmivPIP/3okGDqbNsU/rs5bKVTYHrHK
++9adgMZX3w98ycsY/Bl0uR+rVMrAzpLX6+yAqaHS/hLwTfeIHUTB/+L25C0dGuhb
+/hA3wryFRGBw3S0XjjJLRq7Zsi87jTT2IPRrh780IITqXL8biWgghYM//rwm6e35
+MvM2VSPBollKb0OcXii4aZovkrYSmjLrfeYbdb9gJ4YlhcpGmGo9zVT+SCeD7L3a
+tP9uDQnizMkwgSACebhfVPmgxWPLzJ+NfvCbl1POGHBX3D2YaOekeUlEuBxuVpTT
+3dB/auiwqXpTvv42GVlzX9Kg/eIuDnsTa+kYodbnUyGJYMzbJI8ygPJfdSBVTFLV
+kF6pvXqnWNxpUl9jDKRUPMPHuDamO+oe2U0Q7mK/hvr5yME53wJsfOErkL2ylc8W
+tAQ+nKE6amNYHSZBHeIYFLMgh3NKHkaNgTTTb4MLXvUC5j+591C7ZvLu8mJCfRbz
+/t8BxwhQbhmug7SD4j5pzrXR2r1YIuxMBdpZpN5H/DzoFGfW/IfTYq0Jb2UO2PzQ
+MQDAx7jJWPSVcjvJM7ikaNa9YkF0Rq1mUR2xff6aWz3nN4j52y4tR9bC3UDlhU65
+rQfjd2u/zCOaqIgUuaEkCUiXYGduRk15Suqkjvlt7l6xkZXyMu99mKFQFhP3c5/b
+2YcdNiZ3dNQCzXl5Bs0H
+=KNnK
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jcharts/metadata.xml b/dev-java/jcharts/metadata.xml
index fa154b4b2346..808861f03622 100644
--- a/dev-java/jcharts/metadata.xml
+++ b/dev-java/jcharts/metadata.xml
@@ -2,11 +2,13 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>
-
 	<longdescription lang="en">
 		jCharts is a 100% Java based charting utility that outputs a
 		variety of charts. This package has been designed from the
 		ground up by volunteers for displaying charts via Servlets,
 		JSP's, and Swing apps. First release was in December 2000.
 	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">jcharts</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/jclasslib/ChangeLog b/dev-java/jclasslib/ChangeLog
index 8afd4c4de065..d0b3b42b5aac 100644
--- a/dev-java/jclasslib/ChangeLog
+++ b/dev-java/jclasslib/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/jclasslib
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jclasslib/ChangeLog,v 1.12 2014/08/10 20:17:37 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jclasslib/ChangeLog,v 1.13 2015/06/09 13:42:26 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> jclasslib-3.0-r1.ebuild:
   QA: drop trailing '.' from DESCRIPTION
diff --git a/dev-java/jclasslib/Manifest b/dev-java/jclasslib/Manifest
index e8a92f37f86d..3dc891f29917 100644
--- a/dev-java/jclasslib/Manifest
+++ b/dev-java/jclasslib/Manifest
@@ -1,17 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 3.0-browser.patch 750 SHA256 0bf260f8abd58f0972019dcb0b120f5260997db05257feb597b30805e3e39bc0 SHA512 44724b1405676de81e6b97a602727b6ad3ea13d2a950e903242d6791b0bd6236bd475aec056a62eb6bc73ce22e67b7d19ba6c75d65272beddb278520da4fe9cd WHIRLPOOL 0b86ca081b371c107d759e4408f2fdc8944240982d6cc2520c067ee4070d79974c0f2011db47a81d3dce3bc5d6db4597399d883ae52ac7287b4dcf16dd7ad9cc
 AUX 3.0-pre 81 SHA256 aca92f4a67fe119dd38682e3c336ea461bf57f47de15fbf0636efeff8d77f16c SHA512 122c6f5ca4754332673221c78ed01c6e7344bbd5f29e194d102f61b26fbdbe8900a2dbfb40529fe8da9d901d17a4d26761360fd14e8cf8e0af5e1330ea2f4a58 WHIRLPOOL a9460352ce093f4bf95645781a49a1fa20360f636416ce2c15a2d8a63ba0da6a48c65e0d6df43098114ee9730755a497256e0113d3aa8b0db981d10be74d813a
 AUX jclasslib-3.0-buildxml.patch 840 SHA256 e2fa6d7ff69dc39d5d1ce38452414f30c4b32c4c56a2adf0ae17021e0b6e78fa SHA512 ab5f839bb7e183e795b61f8a2389b88dae3c2a38d7bf137ce39413e006e3a43847fe0b63a7e53523ce236871ac90b392251155eac817d8a22df6cbf5788264cd WHIRLPOOL 08937cbdfbdfbd20c93f22254a423406b1900141fb412f8731ef4ad319129d400fc52d585dc6badd857978e23cb8dc80a3ca0bed4ec1d1b12612d445a5c0cbb6
 DIST jclasslib_unix_3_0.tar.gz 1774938 SHA256 eec6d971b913802904e1f76758ff9b739680489bdaced18543a359308390405c SHA512 0bd46f5a1c837f888d9b570f49085bb04d71e401d89b74880bd4af765cf27493b56e17ff065b155672bf6de6edb14006c619b3afe8bc6c488dc16e2fc97131ab WHIRLPOOL c15bf9a2457b72c517c83109b8cf1c88a4d0343d3f7a82de40e20f63d518ece9f53255181e9e5cf04cae640a663bb10e7c33049bfbbd8c05a792407ae1a2db9b
 EBUILD jclasslib-3.0-r1.ebuild 1258 SHA256 8214091ef1e0665e06366056fdca644cb30aa36dfea0cfba6fafcd51106fe631 SHA512 dfb6c04f12a1a431fd13df345bbf6d303cdd83766d812aa283dffdfe280bd67402fed8b19bcd00a61a6b4e77706ae16f94ce73e5425444c8e5de38fcfa5324a8 WHIRLPOOL 045d8dd011604ef98b92b551c5c5ea79a1048df33ba14d8ac725ddd959c8b5ad5d876955148554de801cada9287f746ada35be26d08ad2a5f558b679a0fed82a
-MISC ChangeLog 1956 SHA256 2748979e8fe4a7c2b504fe61323fe3dd64d291b21ea3f3eda060ebca6bca2020 SHA512 bd342c5a3095df131c5628366a06c7a2c54a92668be0eedea9677c93fa8280b1a7c25e5d8ebd9a669aef1663150c25af3799a34b909cdf0c3fed40053233c2d9 WHIRLPOOL 062f1d2f97e2c835100f8a1be6a54cd6adbda23c39a923a6a33cb11809a08dfb1d34fca6a56fc12370c9c52bee504b85dd60d095975ca9e6660d5b1cd127c529
-MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
+MISC ChangeLog 2053 SHA256 e5f73b368b2389b2bb2e59331211380caafc489541e747ef31ebbb8b8758806f SHA512 49d73943f181b72fe2043772e4bd6eafa7226ef4bcfe5538214e9c2a815ebdbd35424580826b6cc05316b24fc6ef19f25894ba8cd36b6e5360e3fc06f70040c4 WHIRLPOOL c4f2c49ad17fcec015faba927a3105ae37f37f4c9a6377525149b3168130a79f7b7dae778d34427fe8654be0d2eca5acd3ffb906d6bcb5ae9c837332c92fb5ae
+MISC metadata.xml 237 SHA256 e808d348951c1a93894b5357295b46a2e5d0a8d917116a51f6ad7b99f9329032 SHA512 ea5e1d4bc34125accf8dbd70aa8303aa69a7bc39c4c9b59d8a6e598e27bd10b2f063f8117cbe1e67487d9dc86bd0b54a330ee69623e898c112700aaae438b4f3 WHIRLPOOL f4a582c52b5d789a1675545df9e79331ae1693dae9c06adfc90f772985a5065e9ec1bc06375d4fc92db586d8d04c93b3bf70fd550ca52a7984cb3e998eeb19bf
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlPn02EACgkQcaHudmEf86phLACfVJnLTt/dxdon0qvMHZN0GXKW
-P20An2Xk/PRO/q7t1kqxBS19IHBaRigd
-=tFCt
+iQJ8BAEBCgBmBQJVdu1DXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiJzoP/2t5BkxIHbppkL56wdeK3w69
+pAOgLPsa0+oIPGCDrM7choTDCw8Ea4SV0h+C9lGqnDlOwXCAMoTAbCDjKMQjUwJA
+ywIgELw3QiMqSQOaJiueiRJDZfZPaoiiwgfVjzemJWiLr86y3qaUEyXU9oMguAzL
+SJ3R4LkcPp58ZGE5IdGP4YANqaHpII8Q3LhV/WcOaJ3xzC+dNJsq46eVodSX1Fxc
+M7o6RHpRFHcHqHnurRvy0zXLjgUM6A7vPDvLOuDq9fLFNV9MlWgrEmtnJ1FaWLV4
+tqelg8bEvo55L+i3ZefL8bCMXAv/Tb6e5Ax18G1qYgHkf/hI6SmzSLKVwrYGo+Od
+TNVSqu0UG89bhh7OJ2ctwK6/ScWCahQOepMIoW+LwtjwhWrdGqyYk593mwq74ATi
+nKFznZNhfm5R9BA2kx/hOdhqQGogLc8Wf6sjuToEJJNEm1/+2eGQt8mCEofxDaoX
+Z6jRdFseS3ITkRlW30TrrwiLYl7szLQqy17W/hRI22GkQyYon4xKV6AMwZHXsG6q
+ErVpxjUx4RlbyeHfGjXZxYejt2J+KeHPe774MaoTmu95sdVjQFezX+FjvNB4UPS2
+KLZ30JDBes6r37Il8pEZqdgE1fb/iG+2llPYwknVzBTHGG35Ir1FNo/Iz2ohZGlr
+yZAf+a9z1P0LIw8H0fFN
+=Uw+e
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jclasslib/metadata.xml b/dev-java/jclasslib/metadata.xml
index 7303cef96964..53357752d126 100644
--- a/dev-java/jclasslib/metadata.xml
+++ b/dev-java/jclasslib/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">jclasslib</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/jcmdline/ChangeLog b/dev-java/jcmdline/ChangeLog
index 2d04be1d0f69..7ef2840774e0 100644
--- a/dev-java/jcmdline/ChangeLog
+++ b/dev-java/jcmdline/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/jcmdline
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jcmdline/ChangeLog,v 1.13 2015/03/29 17:56:07 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jcmdline/ChangeLog,v 1.14 2015/06/09 13:42:52 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   29 Mar 2015; Mikle Kolyada <zlogene@gentoo.org> jcmdline-1.0.2-r2.ebuild:
   ppc stable wrt bug #535074
diff --git a/dev-java/jcmdline/Manifest b/dev-java/jcmdline/Manifest
index f16aeaa6b296..98c45b41b9af 100644
--- a/dev-java/jcmdline/Manifest
+++ b/dev-java/jcmdline/Manifest
@@ -1,18 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX jcmdline-1.0.2-gentoo.patch 934 SHA256 e58c9b66e3d10dfcdb6ba156c665e55082eeaf6d9d2718cea5ec8ce9d279adcf SHA512 1326e1867b6fcc0ad37e0f0d557f518c5df5b8a2d87be91c66c2d9e72c044221713df5a864f5500e3820f853b415bea0612f02d8e30525d28aa10bb5002d2608 WHIRLPOOL 354e5d4878222d281370c301e2e87546ac13b65a0ea38d2c4c3c98bb91351a7e3667ae39cb527829ec73f64e3eaeb95df746f9c3f1630816757f70e0e12c47e1
 DIST jcmdline-1.0.2.zip 397472 SHA256 a042f7061c79629cdf298ee4f7b334c3ece9c1a4d87acf7c2f051ae0372bf43b SHA512 b261856eed9426257fd6391d45760f96f0085a40167632bfb2f85d35071e58d766553819bc0f8022b92fa193d47464928d09d2b0772a08ba484dd954b6206fd7 WHIRLPOOL a62bf4ab0c3e5236655d246a193135f23b52f692d1e1865d194dcaa03e1a0db6249f32142c212e34661d62fd2c4ae4714e18687b97f2bd2ab08141ff1c76ef3b
 EBUILD jcmdline-1.0.2-r1.ebuild 869 SHA256 04f34ed088acc086d4a82a2a604f6bbd69e0fab56773d9d4d55a0482fe1fc370 SHA512 12a0ee6f0d31178147998a0a852f0d7d1b31472456bb7a70503c2492c18955f569670d033d8245c09f171e18c864b829721adf762f42ff66a8a456cf3fb32052 WHIRLPOOL f78d7832c71275b062408dce75a643cf0a1ae471f8a9fbb96346647ff37d6537d4a2a81d9cd2f6db3ba04846948aa6dd55b466ecd588a056fb0c164a3ddc5cd3
 EBUILD jcmdline-1.0.2-r2.ebuild 875 SHA256 1c83360f2b4cd7169cc7cfd36f9d5c7281fe67019db74d84c7bf0f89ebca096a SHA512 018f084a1571b4b286d6c5bfe5c59ddc381cb02a6b41a78dbfa997450407c1ec95eaa88db03a8312c1b022140aa9c0dc2f9a53f2d3d19ac62747071a1aebbc34 WHIRLPOOL 8cf0dfde41b434a0ab3b803de67f9298ec5299831fdefb2fabf158cee5a2bf14a83a10ffe85375139e25391cdb7cc963cff7a4b5fdae30b1632392586a8b35ff
-MISC ChangeLog 1895 SHA256 4b4b9bf7e378c7649af8fd8d0d6e0f4ea6c5fe79bb160c80903f6c6980d566c2 SHA512 776bcbafa37f03ecde1d76db22e2def8a3709430248fe47fef99f5478e378e73aa9db5c5fa5841ee63a902f4849bbc871d9a88d98118b086f454bb70b78a8efb WHIRLPOOL 0aa5936678e9f09799fecaaeb592f892a8d2efb0d4aa0562d17906470de963f0f430fd9e0063e44437be6b58a58bc324073751ff0070e50da3220e53e4a5fd40
-MISC metadata.xml 333 SHA256 2c4d273eafa68f54c13455e09c20780f15e0b12963d912abb3d7a7347c7614df SHA512 12c18ad0a9385d3f46373b12c28b9aa814019038be8d6001bf745ba18d8e9e44518ce570ea27004c0f33d2f20bc9b2bad8b5f37de3e2bbd3e33aed7d8e850a79 WHIRLPOOL 0f4d36b9d6d44658a34f46ab6e479696ec7dbde1619340e288a5e0e2eef8a34a712406d0f31613e917fc3eaf8b7fce68485e87c3382b5433a23d187894e7f664
+MISC ChangeLog 1991 SHA256 17c7f23e7dc26c3fbed41d6cc62028757af4fc1fdfd8b23673d19883492e15d4 SHA512 9d11f7bef786c4b0aff37ffbc34130fc8adeae4d3f00a9124f89ee94da9c185dc2211a9653ca1a847475514b66999d4f8efb90d5bdfcfe93e38ca80fae5922c1 WHIRLPOOL 23f53bcffb8ccd4eb7ffdb19bba276aed4019b5b659d660325348c4875b03aab302cfc5e187ca57e7f01c1fdf379377c263baeeaa1a18bc7bcf12f8e75ffeca0
+MISC metadata.xml 411 SHA256 a7cc20ec05b3e70fe1ff816b78f3bdb24d64738755ed732b477a7e2d926baa8b SHA512 d8f456a484b468827ede0e4c23492d6cd113799660d9ed5ae35c3ac94482bb2416c2cae6ec80704a576e260f28fa623e5beda5be6bf2ea4add5f68a6824f142b WHIRLPOOL 028513a0888b00aee0ed52b1d028482bf590e019abdf1ca2f3b3cd5140bf63de24e2f697191da8dff2a67506f40fed7ecec22ace468ac257a1bc67918524c83d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iJwEAQEIAAYFAlUYPEgACgkQG9wOWsQutdbIWQQAiCChG9upXTT1kiLPqUE5FuUL
-Vb1ULYjjYgFMZOeq1joYzgymdC4P7gK/oL0QBzJ/yIyKEY44G/J9JeAXaiBDLEx1
-tZendxcug8/YmDAB1M5cKgSeci8y0g4PyKtlA1gVQ2NWOmp51Nb1s6QNhFA4/izq
-cnHFbH8XWEi4JTAaHoA=
-=ArhT
+iQJ8BAEBCgBmBQJVdu1dXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiN3IP/2rMYLhiwcpVuVh21tVR1tqz
+lX39Mi1nPyFzbRdkEPNquLQYC9s2IVNY1sysJnHEU+M8ZikeBZI7gfUw6cIugIrF
+DUEbpWpW1E5HfI1g2hB71hWmkxTnYuDqf7Lr6u+mIjnCPbWYei9kSysbOL4p4dHD
+euKVq+mVCek6QzmibATuZczPSFB15xdeSCckHxIBPfXiscz+MfxLT5m+9tKiQMj7
+LLfo1QIzIX7V2POcBqFrUhT0HVaTA/h0na3wdFFRabsiqfsGxMZoTHKArbPKBqzc
+Um3DYsxBNzkNy5wYih2j7bMOg9OW/asFZP3DfpCILKO8Xdy+iGnl2lt+FxggjViG
+LkxcbdE4e9n5jqoZ4xF7KvtlZSKM5lWWeg5KYb2rpqlPcByqDOzteipq67S1wrwK
+prYgq3rcLVEneKxIl0UW88ygYxxaEDXf/1PPEBSmUDjmfFKo/qJfndd6QUuaimze
+7zIS6GK9gdxV+8i9/E1JBBkJxupIoqOvAT47RlYmGJVdw5Gxaw5A9UVhXGVu7qka
+2PofEvCAAfwuayZ7iLKzkjlYz27nwiJLSo+9DKtdaKsVz54I5W5YBtgnciZBVHG8
+zJqcBSRt1+ucqTKWo/o8TSuU/GRJ45aA/YLTk3DqR062D8nyUJEL6wcMMyhKDPgz
+K2/e4s86t+cucZe4d8u4
+=Kc8J
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jcmdline/metadata.xml b/dev-java/jcmdline/metadata.xml
index 9f4f4ccec1e9..df9de2927648 100644
--- a/dev-java/jcmdline/metadata.xml
+++ b/dev-java/jcmdline/metadata.xml
@@ -6,4 +6,7 @@
 		This package facilitates parsing/handling of command line parameters
 		with an aim at adding consistency across various applications.
 	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">jcmdline</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/jcommon/ChangeLog b/dev-java/jcommon/ChangeLog
index 7146aa2aa200..b51ee9ced4e6 100644
--- a/dev-java/jcommon/ChangeLog
+++ b/dev-java/jcommon/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/jcommon
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jcommon/ChangeLog,v 1.37 2015/04/12 18:46:33 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jcommon/ChangeLog,v 1.38 2015/06/09 13:43:12 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
 *jcommon-1.0.23 (12 Apr 2015)
 
diff --git a/dev-java/jcommon/Manifest b/dev-java/jcommon/Manifest
index 3b0bb3d67ec5..b879363f12f3 100644
--- a/dev-java/jcommon/Manifest
+++ b/dev-java/jcommon/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST jcommon-1.0.16.tar.gz 1130148 SHA256 033fd5506d10dcfc7814180b09627e66232fd1ee29b769fc283aa936d7dd607d SHA512 81152e6d19f10eec2abe7704c8bb138448c25f39dcf42a9379e488e9163db041dec18b9407fca4c94e514801af5373c698d3867facc9887f98fb7d8e18086fae WHIRLPOOL e87eaec68455a89ac538ce9fcd3ccbea70efe6f2e5ccb0033c77b823ca5499686b3aaf7b13b29c4187b8b2c9e864cf1ecca2794d5fa37f6dde40da774c94c2c1
 DIST jcommon-1.0.18.tar.gz 1133961 SHA256 a4daf9ed40712bfe9564dcd6eb8392711325aec78fa7c03e57c195f63413e3fd SHA512 83a4dfe7c7f631ee251cd1c133726060d8d380366ba0b39b043327c20e8128fd882b7374448738dcad3e1b6eadc0221242588c15c6feaa3c06101beafe2e79bb WHIRLPOOL cae9c1ff0d3658199378baf2ce58d25710aac17b7bca4d5e31136133868ebb41c6a71fd384a3ba1da2e800d364dd0bf5e70ef768148bbb56d440c78b8fe1e6d4
@@ -7,16 +7,24 @@ DIST jcommon-1.0.23.zip 1373666 SHA256 6351512b94fc2228034a5c43da52d9ef8ecb7781d
 EBUILD jcommon-1.0.16.ebuild 1324 SHA256 07821f3c8e719b3d27867cf972c061bdc2d9daa5e5c941d22e9c44fa4784c76e SHA512 cd520d39a39e417d92a6f3c6a1dc7609aad5ff68fad632d79aca6bbc27f560b5f4306eeec119478f56d1705cb946e73459f04579bc3e3462bdb3af274466dbee WHIRLPOOL 0db24d4e3fd8d686933f2c83828f29312887356f1079af03f794e37427ac73af3c41ca54141ea73c0116d6c82096ddb7a0e8f028efa7661c679f93468e709ed7
 EBUILD jcommon-1.0.18.ebuild 1349 SHA256 0d92826ef1269db3346f34ae314151e576ace595e02066fb69660c256a16d6e2 SHA512 086d37884da1491ba4b309ade05a0078857093b7f6a7f4b3823e907f15812a2c6c4a68f43e9ee601d2c7bc75577b001ca4a87191311370ba569c58e8c3b6c838 WHIRLPOOL 4e692096f899a47a48851264bf04b8ebb3e62c6eeab6413f2ee5a8dc5c50d79f6c81530037b048484233d4b6f79a4a39b2a69f37931da1d0593df753eef14ba0
 EBUILD jcommon-1.0.23.ebuild 1525 SHA256 c8e8afd411dca89828734c924b81fb6834f44589c4efff545a8da44e9189f1af SHA512 1ff25961ac19a6edb2182b8faba243912be8c25ccca83ece87cfeb319366ee4a884fd7bdd61ba5a7a320eb10babf4041fc408f4b145482442d587e6e9ee650f5 WHIRLPOOL 5cf0fe458e52262d0f018975d71f029b55a859e65a4ecadaab247cf257318ffe32968b8bd645d466f5fa04a5f8094b2122376dcc8a8170d2eed0d30a438c1538
-MISC ChangeLog 5256 SHA256 66a0b45b472abc3cd21a77e13319c97a3b80cb26f3901f9d699b48bcd839d52d SHA512 1b9e11141bd0b89d1fe49edd637478da1ec53166085b8ae3d813dd1063bf89f609d38b850244ac684f97d66abb21431037be756ee7f78241db852abee1a2da49 WHIRLPOOL a298024980deeee267e94e1f37e5cdb1178385103d79cc344cf7774cd85e46fc2cc702a5963f6c4b9040764e02a4cac350a53f9475201993f8f8e863408b13fc
-MISC metadata.xml 157 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 SHA512 bbae663e26f48fdc5e272adc2b06c14f77f34c53caf84acb53908ff036e7c12a3edbbc0929d2db56bee861a453381d979c7e0983a23716f629ed2135c22ffece WHIRLPOOL 887e153e2481e7d76f0f1b67a395f10f0328b93930185ecdb8fcb5fe3c50f839086a18831d61cf45b34657aaffca6c3b7900cf3c04b712846a05027a84602448
+MISC ChangeLog 5350 SHA256 4c414a056f429cb31940275202406faa7d0097deee939395c1b91dcdf538326f SHA512 62a1893962413090bbe0cca84b2c691adaa67adf42a7a8f6860349ecc733981912450b8ae8dd5e5024537865d0a5fbe23e2aef28ce81bb386d23f71f8d7a3fc9 WHIRLPOOL d5072e0ed6389a0f98efd005209b4d2b212cd13d3ea4b11c165e7b2ff2ac4ffb475d6cecf5e2d5b7df54a7e4b148069588a780b5eadbcda29e0e2cc4561bb226
+MISC metadata.xml 238 SHA256 26099a04ed71a19c3abc0a53add8a0e56d3653c89d2947c83bbee3e17c8c58e3 SHA512 ae2e34141a8f20df547c2a5e8b2a39bf170e18e71eaa68ccb927669b1878da94e6fbe9d6ab8467b953dc9d6325f259154caa060f44deb49e29a4b9291e649b09 WHIRLPOOL 59df1c3b2a8cfd29dea7669f6634bf937c03c38f8c8e25deaa8df520332da77064085aa96abd9bb54d93935bb0d375a43f54390003fff8e870dcb3dd5275b6a3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJVKr2NAAoJEJGRpfGTSRu4A04IALATkhQgsz4k4ajPK/YKLa58
-PPr1ptU68xsC1BiV9mqPeyk4Mi+JIKA7/pTiyAcDBq6N09UXdnC4NCpl766B2Klw
-gJtcFzKuhU7s5npkdeXbMUEer6s/YYSm43dBPAW7TAQXv472MxShNGIxXtbYs0V/
-D2DIm6qJTi0hvwzIIAkYzuBwp0ijEE4LXlzt81Fj7UsqKJR+6eEUgQEeeHUHbJDd
-/usxzpI/6ZJUUe3F0QcPBAvZf6eg/k4C6VKeyTL2nCCV0e/dV41imdqgFyMh6FEg
-8hthtWW9ScyxyP6QewUC9I7HTdUmNqSyxBV2jB6aWEgoSMPdaawM4Y8Z1tdRIGg=
-=7nAg
+iQJ8BAEBCgBmBQJVdu1xXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmivjYP/iumh4k0oipHkNTaDLHJkomq
+Pn0aQVrixfq7mdhJ/Q2/oac6iQyn6Ipwyfl4L7RXdG8vXhsxMMokjZssJ397zmF1
+xaxY9pMgH0k7FtfZIu6GGUpwzlc8eauM/xmoEBdjMz/QAzTYxU0Be+/+KCc+8+UO
+vF23N1SBSOzgVLguAEiPJ9UcuG4rsSMXHrLUxHP0D+uRyE7SxinJnKPc0zo5o6Gf
+0p5+v3+ZuMUU+wdUsDpBYmkuwEd1SdckhH5mTYEDDs0bc2M/YGuG/iKC3m5KIfdi
+Sqj3xYWw15ytm74UxEr80c2xCuvtRacaKISXiX8bhD19RpYInQPGwJzfSaq5PbBj
+MDyLmfE7TuOXLIO7FgfLEphk5+cQa5koRRJ2oF87ghDs52qY+pxe/aFwAX/7bO3x
+mJKwYF2q/id93ZENzfngpSHLxOdRJoAsVkCXp+gM1QWZHf0fNLWfpij3nFru70aw
+CvOM2AcimEMifN4t8ZYl2KTW6PoWnlAstnYbGMOBFV3LqfwQJPVNea7r5YalthsK
+85Hieypj1BXZ5YNnPphgj+aemYBgmSsh0KB8jRXfAQ+pBXvi3+phn6YeUniAuoIb
+FmpzKgQrn+x+OeUmWC5ggPyqQSjwPrMUJ8/py2IKynPMS7Rexh+u4HprIoOuKy/v
++tzLstCfU5yipMQ3cWsi
+=CRMP
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jcommon/metadata.xml b/dev-java/jcommon/metadata.xml
index 838c00a4a448..b23178874827 100644
--- a/dev-java/jcommon/metadata.xml
+++ b/dev-java/jcommon/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">jfreechart</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/jdbc-jaybird/ChangeLog b/dev-java/jdbc-jaybird/ChangeLog
index 11eb993394a4..449bd8a30272 100644
--- a/dev-java/jdbc-jaybird/ChangeLog
+++ b/dev-java/jdbc-jaybird/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/jdbc-jaybird
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-jaybird/ChangeLog,v 1.35 2015/05/15 21:05:39 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-jaybird/ChangeLog,v 1.36 2015/06/09 13:43:38 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
 *jdbc-jaybird-2.2.7 (15 May 2015)
 
diff --git a/dev-java/jdbc-jaybird/Manifest b/dev-java/jdbc-jaybird/Manifest
index 9e68b224409b..f8bfede8bdfb 100644
--- a/dev-java/jdbc-jaybird/Manifest
+++ b/dev-java/jdbc-jaybird/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 2.1.6-remove-unused-ant-import.patch 586 SHA256 7fbb207fd9405977e502a0050edd154389b8cf7b9dabf9fea73afa6fb40f992a SHA512 b9497322c0c1f8b628e68ed562587290230523c51da162d1ba55ade0f173d29c55098dc71783825fbd6ba42b2bb2c76590a81c1ac3a0ddab467c45ab62513d62 WHIRLPOOL 26aaf74a9b3f1b7410887454aa41f20ece38aa7afb9b36aec17c8578291b56ce1163947a45d5d62d5d5ee5993e9dad94e854778e922a894a1473ac710f554a8f
 AUX archive-xml-2.1.0.patch 399 SHA256 3e3e1f0d3bce0b6582a1ed7a5d14d55f8d51a6ef6a68a9ac4532d96323c6917a SHA512 3df81880ca13bf2589da303c18199281913829f6ab5c27f04c5458597209977c8ec7b9a9f7eb35b77b5e07b678ec17a2f668c3c0e0f372505af0ea91f2cf07fd WHIRLPOOL f2c57e550413d56fbd1f784d3edf0068e310a9f1d5703b3194b0a931f73e3491149772a09c6ec3ad60df302f5cb1a0183db93ea7080181e30d77f413c409f5bd
@@ -11,16 +11,24 @@ EBUILD jdbc-jaybird-2.1.5-r1.ebuild 2575 SHA256 7621c378815806714d931f2ecac04a3a
 EBUILD jdbc-jaybird-2.1.5-r2.ebuild 2984 SHA256 1912c2c650c967663146f1dd34dc62b479814d2317330307eea2523caf94013e SHA512 173dc5b3a862af51b4409b7ac1ad83ca2ecd6245bacd013b589a22848fb672414dc5d172075e5ef9bdb169d183d55890ddee792e6fa00b1c7220b1496f27e5be WHIRLPOOL f2dd45c7c9eae4f143454ad23e1efac6e7fbeb0b32b93591fd76902d970edb5920324b8ddd7cc19619e44834d8fefdd7c254e04752b951ee0f3b43492ea9c508
 EBUILD jdbc-jaybird-2.1.6.ebuild 2886 SHA256 f40c30de4c5896cc7c682e482b7dd7b19f43522a168c37f1b5f4ba26f6059317 SHA512 b97441622126e5a1660ceffd176dfe5c13d61eb82909634f0856ce52df3ff5f6a14507d2983a0cd6d6c9d009c890cd933b6751c51e189dd650ba4ca6403e4c8c WHIRLPOOL e711c3014203cc8040704af26e0d7290244096cc2231b9cd1348180027776f38b36ad2ab5c4b960007f95ef7a7a56f4e42c3f7e4cc42c4bbee00c617c4176bc8
 EBUILD jdbc-jaybird-2.2.7.ebuild 3403 SHA256 b93d128788ebcd9efee468b00174d056562621342c5ee83a01f3f4a145085291 SHA512 cffe9eef20ff6995290002211cc4fe7bb8543b803e0aef37fb16493e6ae095b7a64b1daf02798a35959bc1b311af34efc5d18661c24a0305ad3ec2950f6364e6 WHIRLPOOL f48651cf71c1eabe8eb5db493609625bdfcbd34d151db04393f4ce2d63c62f4c83b30055e0261dbbf5caa60ce2699837a712d2b7b4a216ab51811384dc12045c
-MISC ChangeLog 7002 SHA256 fa87e3c143deebc42164bad9f343b826a46785929c2f82e19c1fe8c6b4db3866 SHA512 9bac4ec2839dce3fb7eaf7bf9d432608232abd803fac23a2b6c2679e731a49306b937e312993022a2e8408ad3f416760a61cf2816978a475987c7fd36d9d3071 WHIRLPOOL 10713eb24763143c918363c6f5df9d0b05b74865190e3e847fc1e62ea5526ca244c428f503760a67aa609b2dcc160120fe3b57fbe457a0568c8f24e856365c20
-MISC metadata.xml 414 SHA256 d3635c61fd3bc2e887561ab219c5cf0ab20a8e9a6ca0f27d104585f1db3319a4 SHA512 84ffe94d59fb0bff0fd0b47254d68c3a94adab8d1fc849c5754ac33082d70d04f837b492b47da5c01c63f8f1f212d1cf53185a30b265c194fd97cd394967b06c WHIRLPOOL 206f0341af8a5bf9a6183634bb9f644481e8fb6ee56fcd9a5d8c8400028f0770545297d2634aa4f2562253021ccdd5167d3c7d309058d6dc9d40f482e2bf03e8
+MISC ChangeLog 7096 SHA256 228a2426d2f48d5e6bab0bef315b451b7d431d2d10a0bd06d4f5f1f747a28733 SHA512 8e43376f23f8df97b9d4e62231f7df20c9a4932c803a5adf03f2ef2305f9a424aa031ee0dd39f7f946ade30b6b6663e4f8c9d19e21fb2ad6baf51f56dbdda210 WHIRLPOOL fd765b8dce73f51178123b65d450ea7e734821082515f6dc1914b5c3056a52df2904ac9aa0aa34b0d95f043c0cfae5760f5ff1fd33febec3db6a589d7ee0e6c4
+MISC metadata.xml 486 SHA256 b37b19e002b5afa7d4862f34d551787de9d96dd1084b04e8aa76de8c704a5ae9 SHA512 64336eb9029e74370f5f11c671a7e4b3da0ac2f41e16b3a2bfd9dbd9677880fbceecc945f026e7b812c499f0529b1db9f156a5b215c59782bf6c881b6a81361b WHIRLPOOL a88077f41a16c4efdcf578a31e79e7ebff0c20e7282f69fb85a9deb7f4ac9fddc19bf09a1b6763f91f84da91c32615ec0cea761e274b2f53befe521c5f2f5a10
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJVVl9HAAoJEJGRpfGTSRu4YMsIAKghZ7gNEDbQ4RPX+k1iwk8C
-h4gT3p46Eb8T+zZejGBXh7QqZuKgf1CzUpzeWE/dpGrmi8EHXhi/FVtBpgRlVFUs
-yG1/SFTlmQCAjHOqBm/lKKFPuJ7AtMP6NR0jSqZ8+dFhSz6Xp6VsEcWh7RMiFkh2
-f8mtVhkY8qAjjj5T0KY4mT3zzPRdkraMwIl/pyyZZP/RbAHxyZraAkONY36JJZWr
-ernlVX9dqKA/Wdr4DdfhdXrvgEaLgLpPeyjy+W/EmvE7YAuVBTxUaB8SPKRmuP/r
-+dbfa2pFOTVBAjj8P8AxCGkJ4BdU5tCiHg9s2ObiY2ts92lX6Vb+KIdHqbSCQ90=
-=BWeu
+iQJ8BAEBCgBmBQJVdu2LXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiP4IP/0MYy2JiUr4XrJjh7fLgVoIA
+cuzlZdC37N+r4Figfx6UQLZlS65cIr3JZTQUbgKHJIZf+62FgF1aWa1Rf6ur3AU6
+30VRUZdmLN7gV3tKkCA2vhvywbbYbccpv/WauK8NV4bm8d4ezrTbOa4Y5U8AT4Bi
+zn+gnZ6VDK7GLqZDAsom5DjhGgnabvDj3a/CAW1qQKrUP+6oH0EaUoJVkBnxk0Ly
+vq/u5GFJbucrR65nGrSvhSVzsx6cCvBqBpIWYldXBUUSfezYeKLCTjneHktyIEJQ
+CtLfE0oOtH5O39eid5WtKowGuwM9ckOpu7pawxQV6hU4IJ5KiUb0flR0vO1f1/nW
+ZzHdOnZpTV4Z/ZldBOlP7ILFyBn6ByaaXnawKgL1UhpQBh/Bznp1nU0QptIe1Tbl
+FPinLQfEgWsYENV1sX7GseePPHEk5Q1sRccPkt7KD6rNgZE4Gj5VuuVfjPl9O7Tf
+QZdKOyAXA9u4jjZJOSNfFCR4bwgKO+dR9cKx4IpLnr5ElBjzEXJU8zEQeLwMBD8d
+F3kyJAa0ne0B72Zl9XfIgnbkEb1n5mqbNDrhfqTdTviqVw+CYVhWzdcFqUE6mjRB
+nEIwSBlT8L8zR5iY1Tlyv/2OH2lz2VAuKLLMnygClF1xsn10hqvHdm+reK07XaCr
+fEH5HB52HBNQu3adz3tS
+=5SPC
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jdbc-jaybird/metadata.xml b/dev-java/jdbc-jaybird/metadata.xml
index 9bc2ee44c254..3a6d3c72094e 100644
--- a/dev-java/jdbc-jaybird/metadata.xml
+++ b/dev-java/jdbc-jaybird/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
-  <longdescription>
+	<herd>java</herd>
+	<longdescription>
 	Jaybird is a JCA/JDBC driver suite for the Firebird database server.
 	This package includes both a type 2 and 4 JDBC driver.
 	</longdescription>
-  <use>
-    <flag name="jni">Build/Install JDBC Type 2 native components</flag>
-  </use>
+	<use>
+		<flag name="jni">Build/Install JDBC Type 2 native components</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">firebird</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/jdbm/ChangeLog b/dev-java/jdbm/ChangeLog
index 2ed1157e7ce1..5288c276ea50 100644
--- a/dev-java/jdbm/ChangeLog
+++ b/dev-java/jdbm/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/jdbm
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbm/ChangeLog,v 1.12 2008/10/23 21:46:47 maekke Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbm/ChangeLog,v 1.13 2015/06/09 13:43:58 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   23 Oct 2008; Markus Meier <maekke@gentoo.org> jdbm-0.12-r2.ebuild:
   add empty IUSE to make repoman happy
@@ -46,4 +49,3 @@
   06 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org> +metadata.xml,
   +files/jdbm-0.12-buildfile.patch, +jdbm-0.12.ebuild:
   Initial import, package needed as a indirect dependency of openjms.
-
diff --git a/dev-java/jdbm/Manifest b/dev-java/jdbm/Manifest
index 33035dcae323..1f8d87831305 100644
--- a/dev-java/jdbm/Manifest
+++ b/dev-java/jdbm/Manifest
@@ -1,5 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX jdbm-0.12-buildfile.patch 2260 SHA256 90c4c98d734946a12504e89851981fbd8a489c6fcea09dd6fb4bb5c3a5939e3a SHA512 22a86d1d647bac6d384fcf69cfb17013396235c113d40c5c38cfa05702ab38e2540d5bd38921d0975f4cac0f22d717b550417569a8dc9a4442abb392e9865565 WHIRLPOOL c8768eead4844b32b00dca67ba81fb1a750ae245ae1242204a98bb530fdbd25f7d34690e18d914deac7133c01f53b96004d7f9a3b47f20ecbd14d782c9528399
 DIST jdbm-0.12-src.zip 969490 SHA256 ec431becfd915f4908e5e3f71dc13b05310890ac2ad1664e508a9890151ea10a SHA512 cf65a89d1b3262aba40a2b10cdf3bbc1ed75fd60facfbd22baad2cfbcf81b5d67d3b7a372c7018907eedbcbb0114ddbb8d13b6cb7bc47896c47997996b0d57ec WHIRLPOOL 2504311219194c370509f91bad895d2b8818221f3d1ad454936484cd63fa028958d0c1e92c322bfefafff6a017a441ecaf952a151b5947fca73ddb922d717b51
 EBUILD jdbm-0.12-r2.ebuild 984 SHA256 11e41b3bf48520b116e6db93e330392534273b0e35f3aed06c4937e6efaa2155 SHA512 2a7955f7ced7fcf17fb661b91cccacb039b8e7cc1c24c577c71e1b3baecafe6385beb6e24827ed81c3c216bb5fdb7dbab40514480e5d92e2e03f4d2b4a553cc2 WHIRLPOOL 0df248f76003db43987edc089baddd0dd3069798733341048e3ba09444103866247580734902969b1efc54da53967982a630bdf7c78fe09334062d256abac0a2
-MISC ChangeLog 1752 SHA256 5b935e8911b6ebd4456259e5abd3cf6da2c63d2dd35f2c0a905ade95650fc7d0 SHA512 40cb10cc3d8e0bbe9a1a999ab4c8d9a95fbba638d72373217e69c35aa66330cd961cfca91821cb3a4057524550f8f6abd751146fd25dffb1a550c8748122c2b2 WHIRLPOOL c7e99c9d209031690cde1265b7a5dcd098ca716a9ec8918e4ba1070bdb3096b5455c14512643333c5cf5bc95a8b977804cf2769b997e7a10994c9e64e6037f24
-MISC metadata.xml 157 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 SHA512 bbae663e26f48fdc5e272adc2b06c14f77f34c53caf84acb53908ff036e7c12a3edbbc0929d2db56bee861a453381d979c7e0983a23716f629ed2135c22ffece WHIRLPOOL 887e153e2481e7d76f0f1b67a395f10f0328b93930185ecdb8fcb5fe3c50f839086a18831d61cf45b34657aaffca6c3b7900cf3c04b712846a05027a84602448
+MISC ChangeLog 1848 SHA256 5d6e725bbdc578ede8e50e8bcbd63748275e18746b1734a27e10146fedb7449f SHA512 e5b87535d593aeb2464d1e5ca8a5ab8e4dd9e4e7b65be7b4f7eb786d038352765d02467175d7b9a62bb266bc70b4b063a7a9a8f8561132ed89876c923e9d8d41 WHIRLPOOL e427f82041d73a7bd973fa6ff9c26fb603e59025dcb0c377209198aa56717c2b2f3dd0fda91d02b7b4a1afe8b38629076b18b45d7d7aac44f99b2b14d924b4e9
+MISC metadata.xml 232 SHA256 9b8ae76e022ca63cf024e53f891f7b8d007fc601637fb5044cc70638c1c8e2f9 SHA512 772a0732798e69dee77af2e02422279680e5b961b59cb5ca67104731009397c19b3a47c6ab7c87531d01684e4e4b1b3be676b1433f731fc678a51f11f09d38ac WHIRLPOOL 3405da161bf0e33a1c1a4b555cad80936fcfdddbe327c01de5b119674888182ea02b63503cf57e956298f4fa26a153876bb45552db5d2128e16b9ea955906f9e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVdu2fXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi5goP/2uIQB5SlWpLEHCbnJp371AW
+0ikwBIwCkRXKNAv17ukPGlSFWCiEgrKl7V9c4ZMMWYzs4YJc8jKtvZiUuCvLpRdk
+zIIU23LK0wAXjYYEidhb4719P6emOJHYhqEXikSw+mKvQDDh/rEr94mHnIhrCmyv
+I79IdOxF7YzQPc91Wldmz+qKzKJg6vpVXWkXQ52Ml3FsbHzl6oeiyHonHzu6M10u
+MMqmMuYFbn40/PwcZGvmIL+OzHzMRPED+sOODSI7T8Adc4iIb9xlwatLF7WHjsiZ
+wFs7WM7bT316e5qOC24f7wHpaiDf4NCPBmDAHmHlgB726szp7rSLdhTIY0GIqXAB
+avV3EJ4D1TcphSjkTk7/bTZanEHe1d+JmD12Y1YcFi5Ki7kroFEeza8AgxN2d6JN
+L1V85Np/bu6zG7g4bTIgW/tsIyoZe0qALhM4KJlGyZmAOWYUyb+u/pp//DQXTLr0
+ld17LiS7BGmxF58sN8SNvGHg3dCGViZQUMdizmY9i0RapTcuSJjOhwwqaE0+Ew6u
+TkCG1JuUBntudM40SogYzNFUD67Xm7r+7HSSVexAYHcGzj3MXS6205C4P3f0V0JS
+M5T2ychCchnBZda4BCv/ZqXw6PpDzIhQYs8BGWN3AM9WEXMA78qsNLtYA/UlcnBE
+R+Hfkrtt986yFqfreeMk
+=vzWj
+-----END PGP SIGNATURE-----
diff --git a/dev-java/jdbm/metadata.xml b/dev-java/jdbm/metadata.xml
index 838c00a4a448..47a0ce099855 100644
--- a/dev-java/jdbm/metadata.xml
+++ b/dev-java/jdbm/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">jdbm</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/jdynamite/ChangeLog b/dev-java/jdynamite/ChangeLog
index 3480b58740ea..fb0f5e460b81 100644
--- a/dev-java/jdynamite/ChangeLog
+++ b/dev-java/jdynamite/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/jdynamite
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdynamite/ChangeLog,v 1.9 2013/05/10 09:37:31 tomwij Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdynamite/ChangeLog,v 1.10 2015/06/09 13:44:19 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   10 May 2013; Tom Wijsman <TomWij@gentoo.org> jdynamite-1.2.ebuild:
   Fixed build with USE +doc and repoman warnings. Fixes bug #453142 reported by
diff --git a/dev-java/jdynamite/Manifest b/dev-java/jdynamite/Manifest
index fb8473e20e0b..f86962efb3fb 100644
--- a/dev-java/jdynamite/Manifest
+++ b/dev-java/jdynamite/Manifest
@@ -1,19 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 1.2-build.xml 310 SHA256 ef47fdd12fa3daa2caac4bab0c2e9c188b9f462e757b4997a02ea4875cb15c62 SHA512 1459dccb91857b093985d49d14e97a9378265de621e26c152a923d3ee10c5f7d8504584616d5c502ca8a4617bead402e4dc72c021b6e295685aa5665ad12361b WHIRLPOOL 7daddd44a230a73f72ff71017e8367ffc9a6169f200e339c4a8dbc75b85d6cf73666c27f26cdd4ff1dc8558d3dc2507023beb2127a84e6c7f8ae18ee313fd3c9
 DIST jdynamite1_2.tar.gz 216501 SHA256 cc7fade32f35f84bc0cf64a37b205c45f719b7234299f523e9da58546d9e57de SHA512 922dc3755fc673d228edcbb7d20084a7d2123b936b5c38514781bd0c5eeef4a6420a4ca7256fb3ca8796fb057b854c49c6bacd9ca76ac9fdb24b3d3404ea4aea WHIRLPOOL d1a1f1f43aa73dcad9dae1646b9069945cb4ec0f6fc1833dd88e64dbdf7cd9fa526d16d8a7683cac9f56a88d6a4fc4c8737c1c753b3cee2956b58ea74caa09c9
 EBUILD jdynamite-1.2.ebuild 1150 SHA256 6bcb0249c945be81854a891f967d17c0f1024fa7b4c980c0ce98f20f125f224a SHA512 af117c9e82e9f0ba403efd6607059c70f07e3dbabfe0996ca7faff4fc85e49fff1bb2d7921a836d78e537bffea6683c0a26d7665f0dda62544deaa551f69f144 WHIRLPOOL 95090fcbc5ac7669bdae8e860e8afa3c8344b180cf57ecc068b895acf4c89ce3ea20dd34067809dafb7ad62ffb87ccf3b7ce37175c80979d9b35bd620366a981
-MISC ChangeLog 1272 SHA256 d2a362071c8728fea42d85620c41e871f220080efc5c72984edf30ccd0af9a26 SHA512 0f5863dce7f9c5ddf67e46da39142953aa573f8ee3dffe4baf7b42fb0c4192aaa01da71b96a89a1851ce59c1f7970898184d34c072af8e608d81518c6972b8c2 WHIRLPOOL 4dd8d2a80c9b6a748b34b8ba8d7952f9e549d9aa1d9c286d06e968d580f94bf0df56fe57241c2b9a86a1589f8ff7c0952e986135feb7285e9d533923ecedfed3
-MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
+MISC ChangeLog 1370 SHA256 df8bbf048691978b4b93c0de73043b842fd76051006b7ed6475953f0212e76f5 SHA512 ed415d92417277fe59720e6250f1aa7cacb25318489208e568549f274eec0fd423b600527789d61f5c8d43e80811157082751ef23704976872c711260aca208e WHIRLPOOL 524efea5c5ba2827ecb8f21f21c80e85ec76c325055e5f95b2cebae44217f06a0de18f7c954e187a4ebf501db0ee5b20fb918f2c527af9747e861ea448b64609
+MISC metadata.xml 237 SHA256 497d792e8c08c388839c5428aad04f8f818a140e1db2c187f655be4d1e857c0e SHA512 dfecdcdaecf87927defff0ca1b54ed7810695c0e33570204dee9322acded1e0eec54a4a642d7ed7545a66c2f8a21a3e89d6bb3fe7a8be2b1c6f50aa6bdf1e16d WHIRLPOOL 529fc82fb576e300b90b6b0c94eb9eb6f9d46032eb35904985cafe0c775f419dc3173d0dc128b58bb09ba19d40485cda99ebc02ad3c777927a7d0cdb3fa0e04e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJRjL+AAAoJEJWyH81tNOV9RrsH/1FYRSrlcyiHFzMlWNc7mhw/
-XPE6Tr4Jrt52m9lTIL5Ko2QaoOcpcwypuYNzs4CRWcQTo8XrHJ6HKn2/h5agIDCW
-21BjyHKrRB4cdODWakbppLc0tqPlq1lJ+mm07FdCqIXYMpbul4Lfg9pc6MH3hAu8
-rCU/BTJlzcWFYHC0FBQAb3tfvdiQNL0zmBl3EXsDKEZs8fWznw7u70fNxjrhafrz
-hcYh7s8YN9Lt4Dx4hbj43WF26UbVLMGST2i9l19P3cw4e87Tk9Bq916pLs/08wLF
-6AMdhzYDJz8oEXDJKXSzbXWCk4Pw2ZSAKy+IQP5tqWP2PxInaT9Iny/XH7yXvTc=
-=2ASQ
+iQJ8BAEBCgBmBQJVdu20XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiL6kP/3cR1zKhNc2sMtZY5YQly4dr
+kpEGJRipapvGtWXC0QoiHRot2TWZdDqLq7S7Ttxw46at+vnN5HlH3a6UzKmOM8+o
+E4wbvd9LutoUnS2eHwi5ACyULLMSJWAWukJlLm2KjBEQxMH1bKYXSg1389kz7m64
+V0BTp9qrGBUBgNAbYlW4Qd+XEmO1jk1VLzpXwH+/A67bXQEuANMOAKZx2OfnqAQJ
+3Yu6w+XG6vpJF8ElSsnzusKs7JkYZQ/VgElWfhJ3cZZAKkNLaaFmo2Sg9W/Myko3
+ygc+AjFsgChtHzoDWkK5V+Hn59BnaqSzYrStmH02DkXAaRnJC0JmKeue3TMK9f7e
+AP5wuqS3tFJm+tY2+TjA0CB12Si5k/nIlQULeXN0DuGJ2XFg+TTU63jj08Ei5WZo
+W6KFz18rsATpNDwee6iOyq09FR1SeSWXlBEu9bFieQysj8iJpcZM9S1ihY+bl1t2
+nn/Mh/PWeTmjbXtByaNGe9h7YH8keXbyN2M9lx/CfUSr81OoY5Ml1pB6/y/RfFKe
+Cny6SSN0FWzuavtlxxeWfu0qy/IjStXI/d/aLVIjxkmDSKiww9/0e209PwMAKnXy
+YBWY+xxd4u1FRYP9y51Oe6sCiaXbyOX6QK7f+nlZvnRLNRCwh4Q633qqItXKC2HS
+crZanxT/gM9oecKtou62
+=w/6v
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jdynamite/metadata.xml b/dev-java/jdynamite/metadata.xml
index 7303cef96964..414086548e0d 100644
--- a/dev-java/jdynamite/metadata.xml
+++ b/dev-java/jdynamite/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">jdynamite</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/jexcelapi/ChangeLog b/dev-java/jexcelapi/ChangeLog
index 102f2ba83503..eff73349c580 100644
--- a/dev-java/jexcelapi/ChangeLog
+++ b/dev-java/jexcelapi/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/jexcelapi
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jexcelapi/ChangeLog,v 1.23 2014/09/07 15:17:52 ercpe Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jexcelapi/ChangeLog,v 1.24 2015/06/09 13:44:41 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
 *jexcelapi-2.6.8-r1 (07 Sep 2014)
 
diff --git a/dev-java/jexcelapi/Manifest b/dev-java/jexcelapi/Manifest
index 0411f93039ee..105688bdba04 100644
--- a/dev-java/jexcelapi/Manifest
+++ b/dev-java/jexcelapi/Manifest
@@ -1,19 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST jexcelapi_2_6_8.tar.gz 1925926 SHA256 12f05e4453c203b91329a65329b564e86aaa77a005101f876c4de7b648c36034 SHA512 c649dcff8647530ca719f3e546d45ac585fed46d0a220763848f6d97b3f42c871b6520aee3575202598c7aba3391f647690075b6d9d52d1c2920817ff69548c1 WHIRLPOOL 24d60ad81961b224c6d63267ee4cb4432bca5bb89c1462797dc96dce4f7fb6403741c34819c78a36312a1df9f0fce756c1d026b1672c751fc8b3a42cc9f0e3c7
 EBUILD jexcelapi-2.6.8-r1.ebuild 1024 SHA256 03588e5a5af58c46dbc93f70e8db3ee0f91d2c3e376bdad01f6a917be9c95061 SHA512 0092fb9ae9c04edc5a6a7679dc8ab8f54ac155a9c1258e1278045aae8ce7a87f82244e791af532ee6aa579c626a1742d8c391a567987cc3f0aee4b59a8348ada WHIRLPOOL 96f95e67334e2c082b95457bc7c8247f836b7c767c4e406c9f0db18533c40e5902339b134b3236540bc75615b9f4ab831027b21a73b39f69d28e9687745e69c0
 EBUILD jexcelapi-2.6.8.ebuild 1084 SHA256 d88ef4786214e05f3420d01c947fec3832bfb2068d4a83bd8ecb85b0bb0dcc58 SHA512 2c6cbe9aa08d874bebd2a13c6052a666429255cbfae49c40a7c7cc910f8b28f9e8af376631251f0bc9383fbd65d48dd8b4186486498a40a3a825dfe4a117ab92 WHIRLPOOL 3ff607763b35f991c42261df58dea3ef8b4ac3a20418a3970a2e9a75e7e89667d6a2e9d02523ad16f1b1ea6c42a18735ee9ecc0837d46259004ed883de05f70e
-MISC ChangeLog 3062 SHA256 95c871327d0fe2cd9894a666c1746b18cf5707c04638f6a2b99e9613a65291d0 SHA512 09bddccceae92e7dbea688d3c8d5595cb1d0500e1d8c0e1521b22f2516808ae051356f2823508e8f7c83442f76468edecc8937c6f5e6c4ed689cd7ca68f97b3e WHIRLPOOL a30b05d34c78c400e3b1edde8b237db82510388e9c1adda8a322eec1a44038458662e2f66a2a6a649f81071be53f99ae25c7ebf7141835c4c9eb90e7404d142a
-MISC metadata.xml 510 SHA256 6e54d607865db79fe06ed352f7feadee9bc9d00958e5898e20eb1e3aba906e1c SHA512 6bc97b9f3c80d1fa2437332f0683bacce17ae08b99c4f15923f7f600a7130eb4001aa05b80fe4288fb9bc2196179c8adc21775aef9707a5aba7057d07696fd7a WHIRLPOOL a2dd9d06010db58306d789f6665149b692e014061cb39b0e59a4c9f67551042da3e087871d2bc05f0f5f14b13b343090f9f1a5e48a928ec7c73ae4deed82103c
+MISC ChangeLog 3160 SHA256 473b344d2c2ea5cb8d6c2c2d4bcadf5ab639a5130848e7c7066092dd541bcce8 SHA512 65333702930385ea5c219bad97305692e49ce1b22a3f4230021b75da8b8dc945dca53ac6309834618d4decd1452da2a91b5eb6ac9502905eb2c61aa45761911b WHIRLPOOL 2f3c0afd235167fff6b9711347b555e2db748544b80c5d0006a59ef956a5945943563e5209b9049a5aca1e5812b2add0d20741d357fd1d852a9473168e7bf183
+MISC metadata.xml 590 SHA256 139d58757dce798f510790a88fcc9fd2fecad1d49c6596c6a5cf05c3a16f28f5 SHA512 2fc579523127b810a56c4dcf9db58c603e9b82ca016b580e8154c07f62c048a88b9cba2f3bd57e01cfceec21ed1e65549ce3723fb97aa46dcf055133360319bb WHIRLPOOL 05dd4dde259d9d5bef68c7591a591468a500888595d210fa3fa6ada8face3b669e9f5701ac61bab9cb92460466ee0ccc6e751ff068c64cfbf9da60eef7d9b006
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJUDHclAAoJEKCEBkJ3xQHtj64IAKQTF4nGQj3ukqEPowNbjRp/
-OzZxKTEy8sxrDTenaINH35lMVxL2AS/Jle8rUbGbn2uIkvMyPAzM82Zvo5r2LPQg
-1rTbFQ8cvhJWU0uMjGbbrXWPnD/zMQbyjlDzyoecJkZ+k31bnVWJvmX1IS9l27ao
-/OEoD6d3yIQy5ZUjFGoH8w7Fcpu2zGSmOnRoWTE/lBjtU/Ldnxp85WH7sqKwg1NK
-p6B+KsZ0+fFft3ZLUzgvevIfKCufIJ5R+WuMuCCyJjVMxCGv57vyWQQEsq31aCWU
-11KE+mjQb8LPLfGqKMhic+IxdTdIM8f1HqqOO8BrgpKkZDHoC6Tp51LEPayTNAI=
-=/hM3
+iQJ8BAEBCgBmBQJVdu3KXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiE1MP/jo0jmKc2dCo0iWkyIlm3sih
+whcgBsWC4PbsLJAWIKYbiwwuJbGvSXuwCed9PNUb3JKgFfSYiJeEICnQzDRq0Ywz
+nMdy7rEY8xx3pmw4mCkrddiQ8BqnG7WKwyNdKBSwIL9DXakAJTjVEEa+6MybPqON
+5yzhY91GkEeeHJKgJkvuIPmIek+UH+WRWycJcdxeY3uZredL24cR2P+cbcmk7yZO
+ku6AAXpZg4cssMkUhC+hbiHUf0ucEev9MVvniv7Wn46XAjv97VYYhkjET85cuj/8
+THaub7cbrKUxjVgyH0UhVBIOD8lgkEeBQxdVi4dwnLO8zsowsi3zLMN4/8mMumh8
+Vwyj4HTNFg5u79IsbZRfBo3OJ6zLWaX+L8ye3qW6zp2DotMsg/El/1BXsjkFMLYQ
+WCT6JwlGGzPtAKogngWgMn5M5ZkRwVCc6BrpGtMt+ihMWRhf7pZ5y9YAr20bFdKb
+iOWeSONLtjyYy5Mq7bz1/wVjz4I834bPgDHaJWKpW3pc1t7YWnXH4rZkVWx8cj8Q
+95dcaKiF0inet3xdbM/kOinCTMoVcNSnIHdkM5b12ImTE2Pk4JTeM1e6ARvweflG
+ktU4o8eQ5oye86lKLwKRa7mfdwr4sjmp2UBwMa4oV+3x5BLweTp04IdjtH2cv+zP
+RQi7sOTjKz1IB17cFzGG
+=BnW6
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jexcelapi/metadata.xml b/dev-java/jexcelapi/metadata.xml
index 1f0ef76d3211..51e8d055387b 100644
--- a/dev-java/jexcelapi/metadata.xml
+++ b/dev-java/jexcelapi/metadata.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
-
-<longdescription>
+	<herd>java</herd>
+	<longdescription>
 
  Java Excel API is a mature, open source java API enabling developers to read, write, and modifiy Excel spreadsheets dynamically. Now java developers can read Excel spreadsheets, modify them with a convenient and simple API, and write the changes to any output stream (e.g. disk, HTTP, database, or any socket).
 	
 </longdescription>
+	<upstream>
+		<remote-id type="sourceforge">jexcelapi</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/jformatstring/ChangeLog b/dev-java/jformatstring/ChangeLog
index e6c7b94641a4..f61c49b7a56a 100644
--- a/dev-java/jformatstring/ChangeLog
+++ b/dev-java/jformatstring/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/jformatstring
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jformatstring/ChangeLog,v 1.4 2015/03/14 14:58:54 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jformatstring/ChangeLog,v 1.5 2015/06/09 13:45:02 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
 *jformatstring-2.0.3 (14 Mar 2015)
 
diff --git a/dev-java/jformatstring/Manifest b/dev-java/jformatstring/Manifest
index b8651b030d6f..b35fc9972e82 100644
--- a/dev-java/jformatstring/Manifest
+++ b/dev-java/jformatstring/Manifest
@@ -1,26 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST findbugs-3.0.1-source.zip 9625065 SHA256 bd8ec66550d419ed40283bd78a6268f9af57dcad20b732a9309fd1835abd33ff SHA512 d967769f2356f28b34d92c7451cf3e2ac004e667bfc3b049b5b10b1c19d7be2cfa0db132a77698d042300330f77a2bb5dd8c4baa0d67c37b7e5ae6da9e83a64f WHIRLPOOL 9e407cb5733560d6a548da37becdf1b1b120459a2453d85d4a345a7ff30a3ba1d92179a2586ebfac3c23c6d20f591aed6429b501d6ec791f4b1a390ab77ce387
 EBUILD jformatstring-2.0.3.ebuild 869 SHA256 c0fead603ed12c759c415668f77b1c3e500dd8e853e160e04d25ba4b19ee4e32 SHA512 25b986dcdc470e1fcaf329b6a5b6b6a33b57f28ac0f1e0a74bdc5e775a41b2e9db60414966aee80df42c266bb68c679ec78e7fba72207eccb59d6f4f1267f28b WHIRLPOOL 8c7bfda3882fcf2f3c1575cc09f7c8893ae94cb4267184bbfddd95d7d19c4b21824f8801e5842580e1f2f44d21324bc71dd7a9c412ae8854876ca2b5833b209f
-MISC ChangeLog 1189 SHA256 7294fdc6debe7f2e14676407862ff1e7c965d859b6bd0a2f91dbc3b1792e5b87 SHA512 1143f818baa71f0ec67076a3c6a3783bd97eae21d37d7c42a59a932e7f2eaba49efa2d154f5b1c84bee5c5dcd3fd8297088ce6f4d4f68b9a85efcc215efd2102 WHIRLPOOL ed6053490198343841cc4ce21fb8a6cca08c2e821d2a8b8fe0f30e6c0aeff4a9970024f29d93e3b04a2fe6616c201219ceff24aa0194a3ef521f1480ae435565
-MISC metadata.xml 409 SHA256 0168fb8de08521cd034fa447953189e70c58af3d2484a25a239ee85ccbf79fec SHA512 30928026e28e1682b1b335bb79a688b0ad1b1d8a8a4c848317d17789d2911e58b94371c4b4aaba307869854e4ef01307c32301d9b377799d157f43176efb0b0e WHIRLPOOL da8de8005812f2d99150d3d1cd86e658e6c3ce9d9c229a8556633b117978d40d35d19cfa93649ea0781b7fd7de5ca9bea2d33a209f219a35ced6ffe5f2fabe0f
+MISC ChangeLog 1287 SHA256 48a0bc27c7580cd89eadcd0e3c11574ba25cd73af76c7b32181abc8761293346 SHA512 55be35331270f8dc373be8f94739393f257fe2ba2331fc7d69932485b0f3c0daad8f2aae14120210a6b089a3fea18730236e5926aeb75421e3db2bca923f8b6e WHIRLPOOL 7ab99a02e4e5ea00e4e2ea99d658a68cc94dc85668193ee9fd14ff6516141445d6e028b35256b8cc48a4add86029c4d17f2914eaa1f8ef37f56135f62359ec99
+MISC metadata.xml 487 SHA256 1c9a8e416b9733071f39d5857b74ec6735af20d6875fab50d570c4a651af2d15 SHA512 7fb35f3b1d2d5cb39ba78c8f364f6a5c99abbe0bf9f04b385538efe1ee7ca77bd9bdefc280cd2aef2dba0e7f50422f5595a9ca9687c96b9989527d0c2d4117e5 WHIRLPOOL c3f1dbe3edc504dbc493606bf666c5ee4a49ab4bc97a0399899f8c336a467faaebd454bbebf0cd0ddeba1d9d8f91870e4e4e653a25f6b95575eb5d46c530370f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVBEy0XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1MjhERTZCRDg2OTFBNDM5MUZEQTJFRDQy
-MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3kVvIP/0+wc12k80lbObrdlSmLGhFD
-zAQTDJgButf+mHupW6Vdwr2p7t+ruX/ZXJ0ULvHaexDlmMBgv8Ncr4oEeCBDJoBu
-PL53iqff4fyEriKw8X2ASA81qo0BQC2fpZD6Ttd9ymYhlT4vcWkF+b7H6uob/FX6
-UVrmc3iTk/KuaWYDTcRWJrys+dMGKKrAq7W+tdMtOW9FIhTA1MQmrZNseDl7tzcZ
-LY2MMsOxY6PvCv4asG9xAd3YiW4n1vX0IzFNUK6V/8Kx1B9IxXbHMrIblQn73dBM
-zeL78jhEZZuyjssBJWHhHRt82s5mT4JFYEVX3aV23MIdOcigbdR1kig+ngrsuQss
-S6uxtG/eiofkFHMGJXo3bssNI86wbqD5uTzDiDylQ5pUN9Jyxoy2ji5MF1ifRkgP
-VdIlfZSnG7NfxhEedmZDIgmyb3scOpzRS+dj/NcE060o873JHnBVug+UroedGLq5
-LC2Zkn/2GN9QqfJx7ghIb12NyPW34mdb3C4dPqWvTBenwGcun1RZOvn3bfoP5T+c
-CRsiRZOSrPVPEBdj5nI/G7asA4J/V1TaeQaK6kvn12+ld2yFdhfa5ZQvZHFcGrGC
-aMqPboyYG/eZ/m8xewcEYqluO/TfKWFh6DYECduFJYKR3Ootp+Du7zxczdWGMBV2
-sHW9PPQuwrARIQwwnTpw
-=kGAL
+iQJ8BAEBCgBmBQJVdu3fXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiW9QP/2tBLdjQynuFRovI9ri9sMXs
+k+q0sycoeUoxpXXWVvGg9GYcXci3OdTi60+JWhWYfdY4RNFh6gT0FcoXDqXlUGLz
+1D1two7RcRt/589XN4YeCwIig4kPASM0hcVPeDYVcJhKHGFJ/TTYbSDdsrDrT3I1
+qq/vzk9PbSoBS/0PxYwpctSmBNoOX0bpfwuiaBo7wbNXuZ/vKvVk+vsS3hRjPVab
+TWS4W5UNNFu7To3ts9abSDThmQHsr4/oASiOqz9N3Z4skEWc1AN/7G/cXe8Yb8wS
+gtyL4FcCFjJdPADxh+xCWNtNjcgQtLkra6wGO55wwkX5+t/keVKPBI/h1WWKNxBa
+dCm5W5Ri0Os1nBSe9s4ACBh8MgsbAvvW0FXET+wxaumy8SlI4NLhtWfdZav2wHq6
+ABzndb9SRHNJQIYDYa9actGgzerClWjZvGuiTFI+BM+y9GP/HHJZwj4Cww0ISSp3
+/RqnstRS+bwxRka3/3jY339dNMrK5y+bqBuwQkPqqwVzISdo8xbFCe5jiO/oGv4p
+fZsq6iGQRfqudJEvlz/NoyHvFGKfUU4SA2p7zV0oR8HyTCrSAoOFLKQl1oeOT5ui
+YlgD0WW1sYfIYhsSanYQQF9TVzAH+6a+ZE4avDGzL50ZLcQqAlEJzwCmMXDye5Cn
+/veN/wdWl3zsvYuykd0R
+=nkFX
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jformatstring/metadata.xml b/dev-java/jformatstring/metadata.xml
index 2e1274aa1899..be188d74bc12 100644
--- a/dev-java/jformatstring/metadata.xml
+++ b/dev-java/jformatstring/metadata.xml
@@ -3,4 +3,7 @@
 <pkgmetadata>
 	<herd>java</herd>
 	<longdescription>This code is designed to allow for compile time checking of Java format strings. It can check that the format string is valid, that the proper number of arguments are supplied and that they are of the correct type.</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">findbugs</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/jfreechart/ChangeLog b/dev-java/jfreechart/ChangeLog
index 3ca4ca30d327..c10d69840674 100644
--- a/dev-java/jfreechart/ChangeLog
+++ b/dev-java/jfreechart/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/jfreechart
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jfreechart/ChangeLog,v 1.53 2013/05/22 13:10:16 tomwij Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jfreechart/ChangeLog,v 1.54 2015/06/09 13:45:26 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
 *jfreechart-1.0.14 (22 May 2013)
 
diff --git a/dev-java/jfreechart/Manifest b/dev-java/jfreechart/Manifest
index ae87b44eb5c8..b643a88f02a0 100644
--- a/dev-java/jfreechart/Manifest
+++ b/dev-java/jfreechart/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX jfreechart-1.0.13-build.xml.patch 2919 SHA256 4969addf776a91c81f853d830fb3fc12fe6bb255610b3fb2ad07c043dbad9f2f SHA512 e8c9c2ba3bad8dfb7dded05a14c8166cd9af5733ee630f5e556011fbbb106b8ede19d20ad43aa34d2e6bd0a32dbcf3606e0ee5bcee49ea9303f63cbd405bf720 WHIRLPOOL 524fa81a1bdd859de21958325277985a93e5b625d1bb9384ad37e156d019d38350717c84eb702072aff65c028eac2a39868b5dbd3dc48e4888f20d1ebe2abff5
 AUX jfreechart-1.0.14-build.xml.patch 1344 SHA256 6e3cbbf4e20d7bb875918d770e6e5c74fa8464e7c02eb7f9e282b3ed30ddd655 SHA512 e72381bc3fae04c4943adad94e1ce810d2752e4ba5eba81f3cfe400ccadddb2a10c904629c01854677c6030ff8a6fe7ca146a28b324b06c0d2d2f262de2bc29e WHIRLPOOL f3a846f50163362d3f8a19977eda33ea35de57c15fd344096aaf87f354d815478326dc88ef93b23368b4c12549f7d2bb63d84d45f7cc281fe6c993439a20b15e
@@ -9,16 +9,24 @@ DIST jfreechart-1.0.13.tar.gz 6306139 SHA256 8b8286cc86d898961f307bcba1f8b6f6471
 DIST jfreechart-1.0.14.tar.gz 6376551 SHA256 9250d0ab465fed67aa6f48090854258d9d0053f519ca534e267a8bb84a6727f2 SHA512 4d2344553032aa138143d88ad91942ffc66385d90b3d8f279f4257ef2273012580e99a60107baffefa3ea4e33cb0bad9e656a42747a4d0132642d5b9cb27da7b WHIRLPOOL 13cd39d4f287291eed725ba0229f44187b63466348c347c7acb0e6137d3c638136d1d973e8fdac31c7aec32793bf3864cc339df01abf0588763a77052a351e4d
 EBUILD jfreechart-1.0.13.ebuild 1843 SHA256 5f6a1a7e98fbfd2e44b37d07c35e50eb15637ecadb12ac164fd06b5a3d07c8fb SHA512 5c6dc360bb22f4fd00dacb17b820bdace08c41da967543c5678216f3ec256ea2ecd7e65de091179c6a8be60e48e6b6bf875a14e46476eb1c02877c3cf53936c9 WHIRLPOOL 5afe9fce735b198c431bafd5b620d9b3d448ba958efc71a5ade13b011e6549b5f3eccad549d1c1a43059a4bc7344fe25d2eaa0f96be69ab1968715f2d2f1ac28
 EBUILD jfreechart-1.0.14.ebuild 2148 SHA256 94b674b7402ed0dda668ea9547c366b8afee54639549bfa425dccfc804487d5f SHA512 f377c028247e80134b6b03049874801808b10cc5633791420bf6c01291bc6b339d980c92bf6dd3dceaf6bc3035cd91f88e63f5e3f58531c949d16e5df85aedd2 WHIRLPOOL b0361e96951dae9d97af49ea4aacf4655bda1dc41ad596fd3331c0e0f6a643a7263277d7f40f4e1900e6bd57409e8b7b8d71f4cb8c097a5a2bcf250e4a2f132a
-MISC ChangeLog 8118 SHA256 a5e97a22efe565a962db605094150c20c8bd6c19ced07a3dfce2bb3cbf171cac SHA512 27dbe8be0955cc30b70b3a4a2f756646ae5937fb7e789d54654b87ab600160ed513bf151d467c1a1486912ff0e601988e7c78ac96a568b3feba7abb75b3cea63 WHIRLPOOL 97e2c5a73f25a28720f97fe4b320907456f89c13b9a2cfba91d5abd9d8daea94091f42ac5286d4d7badead96b554ff2b0d3c188fa04f061088122c155a1c0fc7
-MISC metadata.xml 239 SHA256 b2a6244ef3f3b6f51b8c4389815ea60713c6dd0758b8a64bf9b3c5a03bc06873 SHA512 06769efd2b3f33e77c910d4f3509f1657d90e772b0751c901697ec8044cf5b8a3c64c4c4d30e786c5939c17c72889e4885d9a36d97ac3e15c829f2a086b8f7c2 WHIRLPOOL e4f6f9c71b81271cba96f24bcfa107bc1d7492519e18d5bd42792e53bd70bc1387b479ac17ea9a993c4ad96fc2ea2fb81d367f7baf86dfc9cf19d94d5ea8f8c9
+MISC ChangeLog 8215 SHA256 6b737b458534b0d5b213f48b45442c0459066b2ff988be8ed14a1f2ccf7fd69c SHA512 3865502afc289628a41c1f4216eaf04d9358e26cdfabe6a723ea23e33d016ca65b61a8a7ef280e5fb83bf6aa1af977744aad47b817e9bd925939722e28efe825 WHIRLPOOL 1c172548e082a8d59c810ed637c81df8ba71e08622d2364336997d935712b256ac5ba79188835d987f9b01cbf2c9fcb087455dd66ac2bf85c941ab4d49781ac7
+MISC metadata.xml 322 SHA256 1aaa26802eab1e8d23ae75680befa7057e6decee28c7ed7ffbf87e806b0a2638 SHA512 8f92a811831d0d51c4b6f99461aa35e3ed94aa672c551a6fbc4cc2671f495cd81314d7b8d2f6143292f93f71c20bd37aba61165828cc7fe7a7fc30ce0800e2fa WHIRLPOOL f91f59aa2bffbcb56f994e93e34542dcbac7e6c485f80b95ace8ebaaaec41c984880d6b0b605d37dbf2d7078cc000e11c402349fbd6e96621dd617d318472927
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJRnMNOAAoJEJWyH81tNOV9mHEH/0G8g59zjjbinP9EgmYjIIch
-84lddDOigVUWwbKg3F1ahvhvWoqp0VUV/rQ0sPcMLB+nziQkMSvTHN1vLYlqqKVC
-O53562rK5ITBUBeaF6VTfgD0/2V686+NTPqbv5jVoiwdFvubX/LqFLDGVdiP8sIN
-SeGVp6vc5A5B86wXhFdIZoJCRZw7Uk6u2CjrYeSL441gqdEJVr4SBhCIedO6HZh2
-QyrSAqB3xaUW6HlpXeQhgSCw9xBM/JS2hYFzWq1UelBCpspT8dxSXQMcLQXhfZF5
-Ao0ISUtf6vHDh4yo9wydDbyGqBfeB7CFQdrNnQBlZUXP37wDsvBbZUQ19ir7Dzw=
-=wgY+
+iQJ8BAEBCgBmBQJVdu33XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiLF8P/RlYYcKrwZz2PRxXh0LtOOHS
+XmiaGxQbaQreL6BW2y016w3nd53rK2uwjyc/l4D2Gg4JSTdAukhbsBvCPDogxwLC
+ioJWiX4Jgq+3W+ybr7oVwKbxu8oa+e2aDKMnfEaf4ygtpPuxgb2JtTlLyWPH3nyF
+t7ZGJUmQa59F+odMscjA8cNfBywU77kHPviWU9k4m52NeFtJ/R07jK7+HEPwCil/
+3OvLo7oxjuP7qTP4GtwXFtwtInt4yllR6SM2mFQUZGxNYVdEVAyx3Nfff2hNQP5g
+5Azi+CrghYDVDVHMcCxjMOR3tLLiVmU7okTCI7ZTM65FOJ6mldn40P758eyJmHgf
+1ou5Qx9a8zV0qzeil/DPxjErOcTHy0xeBvXvebW/dgU1GM4ql1thX2pIx7QFYphR
+RJbLKjsZQYIYdkp7qDLecDX635xFnSGW+iG4wAGItRFce0+cTLFVEURGh/b1AlV+
+6W1tfiqD2C4bn3ZAzodkkn8ociLYDzg6Oi5F77xyqI5DnlXgyCxqr6cQclg7n3AM
+a9Pn9j0wWcLBDAd02Qpuqt6el67yBcK8Saj5nlm5muVfPQg4M2u9aBu6yCMP8u3t
+prlk1EgvWGY8IE9SB4Cvoqv/L3rlStzvnTVPWlOBFQsVoxAINCD/X+/R6Fon1uvu
+/bYJH+O3N6pw3kG1ezrK
+=fhna
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jfreechart/metadata.xml b/dev-java/jfreechart/metadata.xml
index 83759310c990..c70c3f8a99f0 100644
--- a/dev-java/jfreechart/metadata.xml
+++ b/dev-java/jfreechart/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
-<use>
-  <flag name='servlet'>Build a servlet using the servlet API.</flag>
-</use>
+	<herd>java</herd>
+	<use>
+		<flag name="servlet">Build a servlet using the servlet API.</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">jfreechart</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/jgraph/ChangeLog b/dev-java/jgraph/ChangeLog
index 56f108e33130..646ab18762c6 100644
--- a/dev-java/jgraph/ChangeLog
+++ b/dev-java/jgraph/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/jgraph
-# Copyright 2000-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jgraph/ChangeLog,v 1.35 2014/08/03 15:53:41 sera Exp $
+# Copyright 2000-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jgraph/ChangeLog,v 1.36 2015/06/09 13:45:47 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   03 Aug 2014; Ralph Sennhauser <sera@gentoo.org> -jgraph-5.10.1.2.ebuild:
   Remove old
@@ -125,4 +128,3 @@
   15 Feb 2004; Chris Aniszczyk <zx@gentoo.org> jgraph-3.1.ebuild:
   Initial Import.
   Thanks to Stanislas Nanchen <stan@hood.ch> for the suggestion. Bug #30578
-
diff --git a/dev-java/jgraph/Manifest b/dev-java/jgraph/Manifest
index 27f8a9d05bfb..2269218caf4d 100644
--- a/dev-java/jgraph/Manifest
+++ b/dev-java/jgraph/Manifest
@@ -1,18 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST jgraph-5.12.0.4-lgpl-src.jar 3460750 SHA256 73b8b6a656a0c8ae8ec0b42ea27633c3bab22e981859aa3570c597f7f051ac04 SHA512 0832afeb28c4d5abb9288de4e1b74eefc432bb98f622e71f0d192bf9f01741feb406ba0473b923e0cb93401120c1456a00eec4653355c37bff7e9e1863e81b5d WHIRLPOOL 89b21eea236717aaf9cd885c227b43d8a81702ee1f51fcacd8139df474dda3ac1bfa2892a17d998efbacf147ebd29c71bbb555d7a0a40561bedecba839d0944c
 EBUILD jgraph-5.12.0.4.ebuild 1106 SHA256 ee54316dcbbbe46bca600aea1f755efe412dcb7e755255f060dcb51c5e5a3d29 SHA512 58fd1d028610a378262cf0be94fd6ed4bac59e355af23426327acb12c774bb0aff6da2064989c0432fd6c48f1e79be362ab42d661744b89c83e954e0878e64ee WHIRLPOOL 83956ceacc03b5d372f1aff2e25a78e555db6d2204a69aa1680f7379f8504cfc003564e0dfd5e3f3c3f1ce671bf0a30aa40117f37139f17ba8ff57ac3ea12096
-MISC ChangeLog 3991 SHA256 f03820bf36b7c7f6506fa657aa9febe99af2b3009bcae97e504173b4494c445c SHA512 70d69931b3c5f34daee089e7e87f452002019ffa77e08c715119cace8cfbf722d6783e6784ac8aa41d58edefe00324ed13e63669c4fe9120266414eacd01b17d WHIRLPOOL 84e9c05e190b06ea0ec0ec2c14e00efb971afdb2a0a0eaee534218affd374ef39c69fe6824216566110c2036cb30af10bc1901e5dc68d10d49e31a22bded5833
-MISC metadata.xml 157 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 SHA512 bbae663e26f48fdc5e272adc2b06c14f77f34c53caf84acb53908ff036e7c12a3edbbc0929d2db56bee861a453381d979c7e0983a23716f629ed2135c22ffece WHIRLPOOL 887e153e2481e7d76f0f1b67a395f10f0328b93930185ecdb8fcb5fe3c50f839086a18831d61cf45b34657aaffca6c3b7900cf3c04b712846a05027a84602448
+MISC ChangeLog 4089 SHA256 c48c6d2c16fb5120be61ea66bdb69a78133ebf09bab80e8325ec0e17f9941bc2 SHA512 617b6092abd2a68d6c6eaa02888281ffc7a33aa963af1f857f977a09d392318d1727cc6def4c9499152ecfae0b308ab1dde4fa2faa583af9bd215f1bcb58aec8 WHIRLPOOL 784c9023b55e86911ce3f2d5b85fbaae7d6c9970f7cf17ba146d4de7986a7d02745ef578ae385c804cd3083ec01ea282d8eed18ea8fd9921d32a1754df6914d1
+MISC metadata.xml 234 SHA256 a3c2eed6fe3632acb9aeefd29e31d39dc1f4a0a0ececc7f01db5d7b24cf7c9b0 SHA512 d11dfa1201e2253979f994625b8a15bf68a3b5214956b6e793e5f63449ee0f123425d5f4f27eaedf5bfd87bd428216497574e0ea8397f9d0f8217545fa0690f2 WHIRLPOOL 737646ccca6ff691a6e8077adee5b7fe6859cc34072e0cfa127a4d66530fa16cca7b1b71ecd06e00d30d6c4f79b7a3b845afe534f85dcf4cc97eaa0fdd8964ff
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJT3lsSAAoJELjwI6Q8XPdaJc4H/1Y7PwdHQcqDdctopoeCAqmX
-nOxuR/iFCM0Lb+comDsJPQOT844TSsvHclRo/dx3by5PjWzYS3XhC4fv66/YY73b
-KEFGoLAUJsKwakL9d2i/XINrVOrpj0hxRSwHCyPJYUSkSliBM6vWyt+97pCuqhmC
-CWy+TbYdIlmzfwI/NduP6LfFWH8XDFrgusQwG02bSuk8dU8oTQ077uBVKCwA+6VA
-nbLVkexwQsrYSSn6lsUGRuyF0FM2jrGlbL3BQe9AX8BpjO7lG+ZYvrHdFTwTi1wX
-Fv51AcyUGILHjBVVpLmaQFhfjNvsDW+5c3s7ToXba+wsElaE11RkSMaM7mDUOM0=
-=HaEN
+iQJ7BAEBCgBmBQJVdu4MXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmilqsP9j1DOxL0+1BClAuaP8os6gb/
+Aed0LqIFg9uzDa/iY5Rx1bPKDxEH6U3nhIcH6SCOkQiAlceGGDi+C0l48DWnsW01
+FtJIAqw6j4JlCBrhrXQLQuNS55tmBGlHbIUBgwmk/oEmLX0UTx8G+9Ux0SLtUyLf
+fobLtXMJvUtgCDmD+mQ4wRhVGDSWVjV48vKXH140mAOLwAwe2Ag2mrA7lkgIuwW0
+kvvVoBzvJygEwZrAxL4NDSEiPZK/moYHBdsPvaf113rV+fUHgFFAn3MkfkRKQYcP
+tsEOT7Fm4vYlqFVbDJUKzoGFC52w2L0+26oQkxFAx6MODUKLsJai6AVsdEPA79aG
+XitB5JuCccCInIeM86psnPAC+jdbT9vuoVkpHHfbd+aU+NK4ZIYxYDGR2YocuzjZ
+tFD0+ukkANbOvQ1Ig1r8SR0sWlt/dyZFsPvcr0xLDGwl97NvJ+CsaZmlG6upcINX
+398HybAbwdn2fVx4C9Gc8gdR9ZRpBmv21E9PVqTLzEjtWCX7aj27sh+ORolAhlnw
+Xink1AlNVZUy3NsT3D+wf38OV2Mm2jP8MnslCu189wJO8zLLhC3a5U65svvUGcKf
+Y94I5QRFyo98fPLmwfY68KDzhsZTzroLFT8iNkOVK1M18iki033C7Npqy/np30XQ
+Wdc8HG5f8IBIu78Aj1s=
+=Qjkk
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jgraph/metadata.xml b/dev-java/jgraph/metadata.xml
index 838c00a4a448..675eebf3a12f 100644
--- a/dev-java/jgraph/metadata.xml
+++ b/dev-java/jgraph/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">jgraph</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/jgrapht/ChangeLog b/dev-java/jgrapht/ChangeLog
index d9499718420b..e14de93f577c 100644
--- a/dev-java/jgrapht/ChangeLog
+++ b/dev-java/jgrapht/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/jgrapht
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jgrapht/ChangeLog,v 1.14 2014/06/17 11:12:39 mrueg Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jgrapht/ChangeLog,v 1.15 2015/06/09 13:46:09 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   17 Jun 2014; Manuel Rüger <mrueg@gentoo.org>
   -files/DOTExporter-nullpointer.patch, -jgrapht-0.7.3.ebuild,
diff --git a/dev-java/jgrapht/Manifest b/dev-java/jgrapht/Manifest
index 6669b4785b3f..93f949510296 100644
--- a/dev-java/jgrapht/Manifest
+++ b/dev-java/jgrapht/Manifest
@@ -1,4 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST jgrapht-0.8.3.tar.gz 1268147 SHA256 be8232508220773b7b94928da17547d32a68ba9697f7ff15f4f09bd9b2a7aa45 SHA512 964790dc74fea1d84f4a4cda4a253ede810725ee7173a2b376acb3f0e10baa2eefcbc38c76441600e0c282e0486243a464116cb803308eac134561181a2c28e6 WHIRLPOOL 53cc13347c092b70210b5246692cf71261c5014706dc6adcca16fbf8ed0b774b20a41a00c6f8e819d5e52e78ddcd84c48ae339cde45d7314f1ad39cfb2823670
 EBUILD jgrapht-0.8.3.ebuild 1178 SHA256 549967132f5bbe27c3af2a5e753398685583cbf0f19d1b5e39cf7f850fbde1e1 SHA512 6113e523a4664259aa14bdd9c196af8d1633299a4d9b2f7897823d0bce04f6f1691d3894c6cb08e6d6d0dfbad17c873ee7d06a74c18226e4878e1fb4088e9a0c WHIRLPOOL 3f654436b1712c4b5a59059a60b3af8ca52507a9e07a433ef9ebbf0778cf17428d6af529798d861f6a632b13fc33da178e7578e7e9139b9f1420e0a2baf6537c
-MISC ChangeLog 2102 SHA256 c207fe458fd5120c0b2feaa98ffff7ac6ef7935b4b8195e7b96b2c2a484a5684 SHA512 709f3b930f81595155ad405d50052c00d9f4e3fa555ca37ba3e47f9f8978341e76d19703857994024c6051f87450073f7c1f616a997444564465242065b457f0 WHIRLPOOL b5621a09b6e2ce557fc5492f90b63bc5f18f3485a4b07afb1f9a1484d959242376327b28ee8adb78ea578d723c28e64f8ccfba38a5a2210aac2bf9003037e63e
-MISC metadata.xml 159 SHA256 1c070a909e96d9d193f84ad9304d196febbe33b60a724cc4b0d20634bb82255b SHA512 269cf19c37f2d136b926f546ec83ffdbc1374b2b6e26f8a31f21854143380386c31bfc7b2a0b9c47fb1f7c02607ddbdd43e517cb5c3270515e465c4dd7788843 WHIRLPOOL afb402fec04cddb3184b69eb8a8d36b404edd2870fd06c8f5e99be39c341ea6fa7542e0b680fac05529522ed33838e8279381d7a6de9dbc58fe55841229d8a51
+MISC ChangeLog 2200 SHA256 5d397e6907b0da8cd976983475c5b80e87778e345cc0247c11973d947a5d9360 SHA512 028b1ad245f45f52a349d33ac5d2ded307fd97857e3b144dfd7c451a95cf0d384fde6b8f05a34beb8cc44f261303b0354339e113016762a1b3a29f14bd9f3fd7 WHIRLPOOL 047fa57cc090808c1d85e71e3ba363f7b98e2149045f66adb706f1ecf8ffb42607e822c64ce8b31629aeaf28f64c1baeda66abd8d3cafa529ab6fd7089499c01
+MISC metadata.xml 235 SHA256 7f45c5b13bb53d5b3b8d4b15b06b4bad1829a83a540fd669afe64ae0f6e91cf1 SHA512 474c33abd766f5ee851dcda4e083e6c2c0f9dac38ce26b9566adaf8b9d6e7cb3b43531d562c4406ec0e38fc9c7feb10edbed6e751e73664aeea9c58e6bbb9a6e WHIRLPOOL a29f72b76d299fd5e201585e363b404da910ee348229ea1bbea3957a867e2abc0ce95dcc3de0fd1fe92721cdc9aa71b4e6864220e3009e42209ab199e41a5bee
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVdu4iXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi0WkQAKVLV8n5lB/FoTBFmvTewxfu
+cGbrirGAsKQuRr6MnbFF4pO3K7ayrJKRaoBLHt1lvQFaNZlwNSoxd2lrgCtIzL/n
+HHdz6IkasrowDuhq56m1pdV05LxMy06512WUCKY22NxGeewdryZIwlR9rZSuybLa
+OYNQyTwYl/2kIPoQuLEFxaPd7r8nuZEq7IiXk1xg9PVtn3KHQbla2u09kOe+JOWZ
+8luIljMtGeulrQbiRqwtysNZkZUZ2MdFSdt2UKanNbupv2WhPS60n5m/xZFHxpc5
+riAt221LkSAiLu+bl2anE8Mu3OZPQ1s7vpVsAxXNYkWhuzOtx6K1YrTfQk8sNbhc
+WrotqGfrpVI2/e6BUKASjZ0XpJvKz4yBs5iaaQRoIj4g9m53qDcWxRm8y4p1dIXk
+p+ZJSbYO33d2C3jt/sfiPuYEvmQUEb8km6LceZVb2kWLgiG6XDnq8ahptnK90ucy
+CZ9ScuCC/JcS6ublNb4qWUs0mBNagx1RKij9GySz/Wzi3nQnraDFrPvc1RFlRX7/
+S/FuC2frVXbSMCdOL2B97l6wBpMsBHC8qfOSYMql/FjFwKr7w+FSsNAjkOrX4MhE
+duApMI2c5zJgGBO6KwEi/rDj0mSGDZiMhRBlmSO1l5nuec5hSNhCJXRfY35EBed5
+8ehdNftE7q4zWPlQ00Y/
+=NSkU
+-----END PGP SIGNATURE-----
diff --git a/dev-java/jgrapht/metadata.xml b/dev-java/jgrapht/metadata.xml
index 604e0a4238bb..b6ac288e0445 100644
--- a/dev-java/jgrapht/metadata.xml
+++ b/dev-java/jgrapht/metadata.xml
@@ -2,5 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">jgrapht</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/dev-java/jgroups/ChangeLog b/dev-java/jgroups/ChangeLog
index 81d9a2fee050..5475716ec749 100644
--- a/dev-java/jgroups/ChangeLog
+++ b/dev-java/jgroups/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/jgroups
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jgroups/ChangeLog,v 1.36 2014/08/10 20:18:14 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jgroups/ChangeLog,v 1.37 2015/06/09 13:46:30 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> jgroups-2.9.0.ebuild:
   QA: drop trailing '.' from DESCRIPTION
diff --git a/dev-java/jgroups/Manifest b/dev-java/jgroups/Manifest
index 92f1d77e189a..972e0b3f8cf1 100644
--- a/dev-java/jgroups/Manifest
+++ b/dev-java/jgroups/Manifest
@@ -1,15 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 2.9.0-ant-1.8-compat.patch 733 SHA256 71b28581158c44ff9c4ff5734db9b3d6843f1ad8583abad2d6be4ae88bccfa88 SHA512 71c8c0f4436c983a86b6eee8b4600cc573758ea5da7e33ed4fde8e40f47b47656cd453513a4b367807d51151d2298cda8df5ec1229ac6abd68f3d6bf3fdeaf22 WHIRLPOOL ef759ca617a8630460990633a9da1a1e8195c7fb363727c6e0e6958da2e1b52dd25f2d0aac4170f9ae2308af3c00bed29aafa15c97ba4d765616317239863a45
 DIST JGroups-2.9.0.GA.src.zip 9227273 SHA256 d8094e696b399e109a71289ddb4dc62c0ac52000528bc800056d225b80871a53 SHA512 5482e3a7d895db4d455f92d14c27559eca9370146b397efa4dc17c416a3b833fcfe0753117ca00e1445e49be239f817aad9bb8b626c1b0fb68869f7d1c9ad0df WHIRLPOOL cd46cb18db2b5fdda63f11b76793e58e2b2d8cad1a7e9d391c315b383498bc592ac6ac463dffdae1a33d9e01973fb9030b147b945a72d2ee2a81c692fb2c8f37
 EBUILD jgroups-2.9.0.ebuild 1991 SHA256 239f8b8cd9511ca2daf49e7426763d4d171071a0d3ffdc7fc408c154a852ccf1 SHA512 1dd05798722f075d7e072c8d9399cf1d5af0d5b1e8e87818bcb6916f30ebcd8952f011949c1811c9f5948037a15a1a849c8f5b5dbfb2f82f0d3f9f21dfb988fb WHIRLPOOL 7b5f124157eae03b0358b23d9eef8256449750ae45984a0690cce8190e3a34aa95ceec620c15f1971f10f35e9e7aa571085712dbd6f7bb6f20cf34957729bfe1
-MISC ChangeLog 4952 SHA256 68807b9f064a714c6917cb834dee81dad86ede318d398a87e6940218b387afd2 SHA512 1b80fa58cb7b64d4b2a4c2c6137474087ff6ab14c7294cdb3041f75de3f0582f26c86f9843cfa74d3e99668941532f5690c4d257f2dee1cd2784997aee84209e WHIRLPOOL 10180da4ae89737e1f0bace20139b337b132b34cae162a40c1de3cefd9055ba82f90f1639c6c00522878a633b5e44cb1c44dc80b2504421074489e399e778d19
-MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
+MISC ChangeLog 5049 SHA256 30eac4a73da059d74570fd2a62f11ad4ef3a5b6bee878b0414838c6137723f6d SHA512 d83916ab2eb4f2b231fd74c4e6e5d5cd4c106619c4f8232c2b836758acc1c242dc229f64a92b8991c7aaa6e20e3e273c6442d84ff514fd8485fd819907f6a03b WHIRLPOOL f95e6770b770345b3650b32222fac9eb9343c34e8434f55ac05a106fda3a5deb3ee702401289e9faa73beabb0a860d792a302c0f50c77605b8e391b173eae3fd
+MISC metadata.xml 238 SHA256 adffbf8d9081da80383bf84dc696210af07ac9ab960971e1fe26c52fa6cef3bb SHA512 fcec1f5e6eb1ba52d21c83f2ae2cae3a8fd84f592f1e9260cc660563c2aa3fc774508b9ee152dc9439c0616390bb91a3668249c39807fd0cb5e16dc975082231 WHIRLPOOL 7437fa58846d841565801ce8716f791fe377c2d9cc3dcdf36e3b220c98bdf8ac4933b7707efbd096c09269adfb31963826a25805049b61ce2c202e364c7c0bc5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlPn04cACgkQcaHudmEf86r6vACfS+Cb5vlLodaROr9P9IdhCAyC
-YXEAnjps8L625n27ZJ7dd7jl5DSr6BFW
-=n2Cv
+iQJ8BAEBCgBmBQJVdu43XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiGIIQAJ2IQ0ESzGwLdcUH+JprWgKj
+HQyixs4XuypOV46QjS/AyfnnwXTLSSh3JFnDg+n4wlO78m0jOYRM+25GQx1C4UEp
+ubQT/d/aXCCOZ6PEhwf53qLTXDAPteuad1AMXt0osU0R09ZTXZ9csE51nhdywX+2
+NLrZHdvMsX+x+a1IHBLf7ny3YMrEQJpetKvI0agLxsqdU8IqWYvDW/FqIH9W8PtV
+sLwr4NA8wIsqY7T/GJAU6dkh2KI1t28UGTmN2UcLvuJ5jpHtrdxOyuowMo9nHtZ9
+YxfWQZjtmslapzpKh1WWN+fZXf7o1UvCn9JPqy278WGeFsVET8YoQGLdKz/sLbEm
+4v4KqWkdClOkPi3chGZn8Jt5Jp/Bh5ERe7BNv2YGPY0ZdohXzw54z/oBXp0cBXLA
+oAljGKeKziDccyAH5a0Y5exBhQwOZ1TRoHH0M705QrVAZsBLuknhi9maAwB5oSfT
+k1mTcttS9D30ffci9ktFHuk61pp33bhP5TqtvbBpEN2nsqDuvn4D43uGjD/e8+Mv
+la0by56x9D1tammBLta+IVmu4vxIBzxJE1bOmoXKGEo512j7xAbgKGnsBs7GUcje
+BSCSiagP5rADDIOcl0j9ejKYzxhN3Q2/z3jTIlKo/iD/LYvgfchCKWfwEaViyw5g
+MVLDgSFpHmpig1aJQwaP
+=d+Jp
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jgroups/metadata.xml b/dev-java/jgroups/metadata.xml
index 7303cef96964..135a729b92b4 100644
--- a/dev-java/jgroups/metadata.xml
+++ b/dev-java/jgroups/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">javagroups</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/jibx-tools/ChangeLog b/dev-java/jibx-tools/ChangeLog
index 586ea970cfeb..e42cdce96373 100644
--- a/dev-java/jibx-tools/ChangeLog
+++ b/dev-java/jibx-tools/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/jibx-tools
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jibx-tools/ChangeLog,v 1.9 2012/11/01 21:29:07 ago Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jibx-tools/ChangeLog,v 1.10 2015/06/09 13:47:11 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   01 Nov 2012; Agostino Sarubbo <ago@gentoo.org> jibx-tools-1.1.5-r1.ebuild:
   Add ~amd64, wrt bug #440664
diff --git a/dev-java/jibx-tools/Manifest b/dev-java/jibx-tools/Manifest
index 415eb0b9a5f9..d04b32a32514 100644
--- a/dev-java/jibx-tools/Manifest
+++ b/dev-java/jibx-tools/Manifest
@@ -1,5 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX 1.1.5-build.patch 1208 SHA256 0e2eb5609c9528fed3024d2f08e1536a4c6c80e638fd6da8a697ff98f018c869 SHA512 4cb48ecd222c5356c7080ba43dc2ae48ed28a958bf3a8224df183b15f1d8ebe4f14f711f86cbca70b071896e4804a9688890a6d4fedde847e15074aa0a7f7758 WHIRLPOOL b62b6b094404a538a4321ad94b4144d591b5c71e2c58092c3e40fca2011166eb63a38f9d9dc4c244b5ec4779c98daca361b2648eb44afe602f4f6f56e43399df
 DIST jibx_1_1_5.zip 6788994 SHA256 121dbe5b7338081ffbf09cd1175afe5e1862a63673f467d560e0ab4c27fb3f17 SHA512 13c3a43a53746e9146d1240d73d1948b3c03ead55aa0e79158c2700a385b0dfba0e31122efd11446c1a46c2b3f85235035dc198c6b3acf2fcefa88b2a0683cc7 WHIRLPOOL 427b9970850f5497796e65e43200262e567965bd5ae07f59893f00eba4cf6942a70cf15fb0985d99e26c649e56f175b8dd0b1451b77c27a9859b196bc5cd9d91
 EBUILD jibx-tools-1.1.5-r1.ebuild 1245 SHA256 766e5d7e3c0bfdbded0137162af287100073710ff7408ddd4adb67b57ffc076d SHA512 049a231cf34f178f79a41d6a5905556e42df5720a7ac3cc302cad44cd3e9b1cdb6958d07c49bbcf4a727b77f6a76875fe85e3cbf3faff15997f1ff3cc22e5de4 WHIRLPOOL 6eb3d65f268efd3f526d0c54e174998b9f2f8c09f46af56bee1a63e56caf8acc3b2cce6a2107ce7a362117e103d62a566803a6e28101bb7eba079ed75def35c2
-MISC ChangeLog 1409 SHA256 bf1d1aeb2ad4f2e624a3f21aec35c74693cc3273935b2b1af6c95f1fe1ef15dd SHA512 7051b6be31f9a7e1d945e55386833ff9105efcfa0c56ead760f66b96ad1c447bb7eb58208e009d531f13e9389a51bea6545a09adf5861f5f53c5a2428726eeff WHIRLPOOL 6e987ea3059ba4a2fbb6042007249ee9eadbdc165d0494ae6e737d22bcfcde374d0393730132151919aae8b0d354f9b049274a2dc34d7398aea8271e0286e7ba
-MISC metadata.xml 159 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb SHA512 74dc9ada199a90543b8e1c168c7054f2e973fbfa2551e2b959d67501f2538e269cfb4b2f0905a88a1afa04c20b33961336310ba876f80d47c8e7615b2d7c830a WHIRLPOOL a0ac49efeca233ec4d8f63eb69c8e46e1d4ecbd926693c25b1b8c7415e4c565680936aec46f0c4197116fd7a19a3bb571beee493c18bdae1e5e978e3db84f17a
+MISC ChangeLog 1510 SHA256 d5f1860f8747d9a2694456f38a110bf5a46e9de00f91b2bc3ca3d55f8ade4155 SHA512 ff40cee429febe29eabeff339321dcbb89fe4ac0b33deb069dc3973405745ec8cceae25f2b7681206ccec5ba0bd63455a35b7a3b019593f6377dd56b775ae179 WHIRLPOOL 639701eb66ed51303ed955caf9c6546cdfc528939c191bc44b4a388d16ba94910d5634bbd631703c70d55de67b0996d70e295a1af117a95248e56c5fbd6b930e
+MISC metadata.xml 232 SHA256 ce0c5d70dfa19270f73cd656f67560ee23fafbd8b1c94fd6e0ba47ce0c0a5877 SHA512 ef65da280c5d4b52920b61cd7ae20f67131dc0c9437fbdfb4229976ee0fad35c53a9da839d03f4b08ebfc4e4ca149eb9e649eeb8ea11154021f2b60d662512ef WHIRLPOOL 7e6cb96e7d3d992f5cf5af7b83c8e963e67b835d27af5f7762baad7c3ec90035da18ea28fb5fc35b42745481cd7c3342bbbb61cfe8a9bdf3113c5eaf0c6d7d92
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVdu5gXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiG3oP/0/JghmuZ/IS5t+2Quy0DQ9F
+5vIPM38lqL7P2Bgja0oabSciKXb67RlQ3C9bmLNf2z2XuImcxUlotcGsoN2zv5hE
+tENopHliRC+kLLzBs9/L3N8jTKo0Q+DtT8YAKSWgCxUcelE0uRZocWLW5gvbjdbc
+mt35fgDXY8TIAzIhB89JUEUy+x81qY7hfIF7AgRX7QZ3/34SiGw5tmSP+Aw+f7Mx
+5n+APSYtKaVyu6dYkMLjp8B82KKMoJHgfm5/3owIDHc6w2te0YxBXAkoIaEaQ9qv
+Ul3723nPQBa89SXSzh0HZeEOkEjbcyLOJLFc89iggBwerpdN7W07aHR3NTZUmhdi
+vkum6pkijjfCr1xoAiB4AmdIdie0V3XBlu5H9T0JnPvmsi6Fn5tcxcFnn5SAsPDP
+jCLmpuNVNxGbn+K85rBF3J6yXQBC6lyep+mRwztgaZRr3U7kXYEd/x0W6dxfCUXh
+U7tJk2X3tOSPXjgdqRNXe1DCfukvrfcteVaInwiCRYyPmYa5nng/mCVcNsZMAiu0
+9baPb+TmdNwDiyUeLWcyxEJ1kV/Ou7QGNFkxX8m+Jw8mucWMZix/bDABtzJicSil
+dk+mm9JETM8WEEIkRw2Y1izNWwAv+oxcuW2MZxAz71c4d7o3UB2dY9g9Bf7InY2q
+/hSQ0LocdeenS6fUnk5t
+=IizU
+-----END PGP SIGNATURE-----
diff --git a/dev-java/jibx-tools/metadata.xml b/dev-java/jibx-tools/metadata.xml
index 250f2d1940ea..bc6fbe14e0bb 100644
--- a/dev-java/jibx-tools/metadata.xml
+++ b/dev-java/jibx-tools/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">jibx</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/jibx/ChangeLog b/dev-java/jibx/ChangeLog
index fb3d0efc26b5..5bf4e573cdd7 100644
--- a/dev-java/jibx/ChangeLog
+++ b/dev-java/jibx/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/jibx
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jibx/ChangeLog,v 1.15 2012/10/19 08:28:54 ottxor Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jibx/ChangeLog,v 1.16 2015/06/09 13:46:50 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   19 Oct 2012; Christoph Junghans <ottxor@gentoo.org> jibx-1.1.5-r1.ebuild:
   added prefix support (bug #435576)
diff --git a/dev-java/jibx/Manifest b/dev-java/jibx/Manifest
index c78f959b6713..ff9f5e40a117 100644
--- a/dev-java/jibx/Manifest
+++ b/dev-java/jibx/Manifest
@@ -1,18 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST jibx_1_1_5.zip 6788994 SHA256 121dbe5b7338081ffbf09cd1175afe5e1862a63673f467d560e0ab4c27fb3f17 SHA512 13c3a43a53746e9146d1240d73d1948b3c03ead55aa0e79158c2700a385b0dfba0e31122efd11446c1a46c2b3f85235035dc198c6b3acf2fcefa88b2a0683cc7 WHIRLPOOL 427b9970850f5497796e65e43200262e567965bd5ae07f59893f00eba4cf6942a70cf15fb0985d99e26c649e56f175b8dd0b1451b77c27a9859b196bc5cd9d91
 EBUILD jibx-1.1.5-r1.ebuild 1343 SHA256 b9fbb4deea005fbbf1cb9f289638350f7afee60fbde6246a25399071625a40ec SHA512 9c5fad15eb769737a1556e087f78ac7c7b18e86b2d6a763822163ed083b43d8881305ce48d52c02b5bf9ac40204f60f6e00b2820143df38495a734d7554a3225 WHIRLPOOL 55135ff4fdb6f7280764d124acc8db3fd11044923028ccc367ef7ee9f7b13839214885e0ef18d3aafca30ede8b1c363326064b8a41407a8fc701ec4ba6ee94cb
-MISC ChangeLog 1847 SHA256 4a5dc731760f3b8c64af404f273d0015b40c1e7e5b3d2093e3e47bcb5e1fd735 SHA512 b2c0e1b7b38111b72dd987eff1e8e7c26b0430954b2355270b53d9adc6dd221a7888c970699106eabe2ce6163dda8f8556e8461d3f56bd011544401c3cf3df50 WHIRLPOOL 3b46451e8096d3ac711fd769c24f9e18054a777b707834767115040601766e770b900d62bdf01e23707c04f97efcb18e7ce1e87d13912b5306c22941cbc06d70
-MISC metadata.xml 159 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb SHA512 74dc9ada199a90543b8e1c168c7054f2e973fbfa2551e2b959d67501f2538e269cfb4b2f0905a88a1afa04c20b33961336310ba876f80d47c8e7615b2d7c830a WHIRLPOOL a0ac49efeca233ec4d8f63eb69c8e46e1d4ecbd926693c25b1b8c7415e4c565680936aec46f0c4197116fd7a19a3bb571beee493c18bdae1e5e978e3db84f17a
+MISC ChangeLog 1944 SHA256 04f35ddb0ea1bb15a2a7d0576443102a1f499a28134b125b581ab83c58380085 SHA512 47fc8574ff38ec2e9fa068cdeef533861f099fae471527ecae2d5bd93ca6765833876ca4e2af71d2e5cc536b32304a86901d030c0d50c438f85dc47e269f5c83 WHIRLPOOL a59a8adfc770db47a74b5bc18785f06b38667797c7df5d82b914dff1d2eb4ef3d1b5ab9cfe747df68eb546bf96dfb17e55f262c19477155286b785a0a046a7b5
+MISC metadata.xml 232 SHA256 ce0c5d70dfa19270f73cd656f67560ee23fafbd8b1c94fd6e0ba47ce0c0a5877 SHA512 ef65da280c5d4b52920b61cd7ae20f67131dc0c9437fbdfb4229976ee0fad35c53a9da839d03f4b08ebfc4e4ca149eb9e649eeb8ea11154021f2b60d662512ef WHIRLPOOL 7e6cb96e7d3d992f5cf5af7b83c8e963e67b835d27af5f7762baad7c3ec90035da18ea28fb5fc35b42745481cd7c3342bbbb61cfe8a9bdf3113c5eaf0c6d7d92
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJQgQ9IAAoJEOeBhlrCAAWGys8H/R0azUOGg9RwRtTAfHaqzpis
-ySL2pec70B2tBNLCT6bWWAsSeboVj9dCT310Znk/wyQYvBnmtNpsCiEVHXDBzN1W
-7fhtZcW4tNzCI7Q2SNZvpU8+a8+aowV/b2Pg/yq6TcO89lyICGOfE+WPswpjW8dB
-CIQU1IsRZOu593cCf+cp42fpCm7hKfKTRbzZGJI0k2g6EXO8WoLtg88ylK6nzv7e
-1iydQhnCXh/PniiwfXTx+YAmLSPblQ/FFAdnt9yWyYWO8JP8Ak9yUFY/J2P+MkTV
-E4gKA44rpwvq9jjlSgJCvcyPiVs1HJhBnDxnYFigQYn7dGk+7GpFfkWGJoH3cV4=
-=IC02
+iQJ8BAEBCgBmBQJVdu5LXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiGBAQAIbXIyxZo6C8V+lLvuHaz3cN
+a1BOS9fenZQgMZsbc2fOIYB7gzJigPp2RbZfAuqmrs91kuK088KKHfsAVRDX0rgM
+g36wo/z5Fd6UpABgXUOMRVwKSTLmZJJ2z4/Lo3K2ss2EgUuHYsw40pss3faAelfY
+vvc4O4LI9cPHUrA+//0W3n1sO1MQ/Xe9JQW5+tVMIuepW8QcNYm5wPQO1dcCmw/r
+pj3ugxdQ5whzyFId6ozYJIn0aCxZryWTNr7DghKoO2whQrhMyTmXz5kgfoanSflM
+/aUZh911C5VVCIP/X6qW3R4kVq543dIPmuNRWMqkBh+X9OhZjlfZUMFb5YQ8rMAX
+ikvl2a0bxTz3o+QRFhfHc+Qac3wJFhbsyFQ0RQxTmPuEtkh2gTDC2WdtUHffmfte
+9qUbjEeQgp09KSb8pyqO0sjay3kYpwXLEXoH5WWG+PmWZsk8GoC0dNzC15oJLYv/
+yHXS7Wg8kxD/CsSgP93vhQRIfagMceu9FuvdmkPE+aJlhuRHc+vgbsPeyi4hcIZg
+a0F2bBnU1YdayK8jGFGIpiH27fUzxy/kUso3210c5DQJa793N2ZE8Mu8tV9T1mTM
+UQxK1/UmJi2RvSiBmi7nqojOfQj5Se0u+fxIN8qMRgAihvf9/eYWnx9xMx1mDbNc
+0hTHMCxh2YoSGUCGGZLj
+=3zqM
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jibx/metadata.xml b/dev-java/jibx/metadata.xml
index 250f2d1940ea..bc6fbe14e0bb 100644
--- a/dev-java/jibx/metadata.xml
+++ b/dev-java/jibx/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">jibx</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/jicmp/ChangeLog b/dev-java/jicmp/ChangeLog
index 84cdecc64ff4..d36199edd0c7 100644
--- a/dev-java/jicmp/ChangeLog
+++ b/dev-java/jicmp/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/jicmp
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jicmp/ChangeLog,v 1.5 2009/03/02 21:49:13 serkan Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jicmp/ChangeLog,v 1.6 2015/06/09 13:47:29 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   02 Mar 2009; Serkan Kaba <serkan@gentoo.org> jicmp-1.0.2.ebuild:
   Filter out -Werror from compiler flags. Reported by Diego Pettenò
@@ -21,4 +24,3 @@
   12 Sep 2007; William L. Thomson Jr. <wltjr@gentoo.org> +metadata.xml,
   +jicmp-1.0.2.ebuild:
   Intial ebuild, dependency for opennms and a useful lib :)
-
diff --git a/dev-java/jicmp/Manifest b/dev-java/jicmp/Manifest
index 2e8cfa282eed..2164f9ca98e4 100644
--- a/dev-java/jicmp/Manifest
+++ b/dev-java/jicmp/Manifest
@@ -1,4 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST jicmp-1.0.2.tar.gz 348805 SHA256 3661c2dd59d8be3c72904fe2cd4e0d06054eef5f8e7f68023b6d241a594fe0db SHA512 8633f12fdbf978e0312c07966fa37ddb9d904fc9845343e7d947400352d3a42d53e83a97a847cd61cf44f4fd1a6a47bab208525155eadadf62c222995a6e2d7d WHIRLPOOL 003590f3f785b88fb739ae7a54b364a1ffe09213da03f081b7b88e49ea2d4af7f28bcaf8cb7ffa30eec5fecc524c0ec2f0bd8556c1eaa7d8acb09ac83630b7d7
 EBUILD jicmp-1.0.2.ebuild 907 SHA256 a1776f38a30553c419a48c2d6986e48373521b22e0db049e0f6a191bee9b81b8 SHA512 b2351f05c31444bf6df7daf8652dd296366edf33420f0606743ccc578afab24c2ffbcd2343a67b144c748f3bf491633455be328ab102c6e2c93d2517a6c46b1e WHIRLPOOL 8061b484f54374f18c74a1816f9a12b9868f0dc6f1ab6727a6d2befdd7ecff505d76160e451f225fde63e77d3ae546f0822f572831dbaa5364df698a83bb8e2d
-MISC ChangeLog 951 SHA256 84d4b420f6dc0c060780d72855d7dfe649686154101ebc1878bd69a00d1fa4c4 SHA512 b6882b0bd2d09ca66d068a381bca739d262d74a24fa9a72a835708f5e9143288e704b11a6bedecd523a73b3177fee980c5bf3b28ce4c15d6080e3a540d725fa7 WHIRLPOOL c80e34e13f5489636a0ac140ac4f8148d9a1e4daaad2ced9ab4078ca1590c3057e635b85d2504b865e34747c3a6824d546bfd4518df9486bc5069658c209645d
-MISC metadata.xml 197 SHA256 1d8c86001ae1bb5388e31c49245c86e49a7c11dda62347def11ed24526df3f8a SHA512 760e384d8d351e80467d11b42d57c373d4a44bf7a70b9987683c3953a2b1b975e90c13eba53fe98a71086e506eb52e1123d8bac9553879d9ec2070f5fb2596d2 WHIRLPOOL 45b0e32ba0fd5edd91237ad996b4d78bc1426e7d35eadac427199cf05384f0c355fd52b02cb3bc7c2ce24210bb3bc2289cc9fa2783806703e12b36c3b12ab28e
+MISC ChangeLog 1047 SHA256 d1f5d195288f5e15efaa679b6aa7ba9e21e0169176333b436c769993b73b4df1 SHA512 792b8ea7297956b0eee86e0f45e9a2ae0cc471f51afb288a08edf340257ca59d43fe939eb75b23e887963f7b3c4946a70975f5ed08802d9b7055d6951dfa64d9 WHIRLPOOL ba6fb73c32b2694b0db813872f3afc1a41b55ef8df2b9beaca36abfa6d6ec857931e3e7c355445ec444868ee5824ae74a6f51e40bbaa18bd5f169087f197cc50
+MISC metadata.xml 274 SHA256 d21d6cf381512f3d0dde6955d614d4a7e881132fba7955abeab44de2ef98ac03 SHA512 f206f212376cdf542194b49d6d1fd67776d84eb3002a3566be0afde98f4d533faed5ed39c763df8a185d0e3fad7533696f7275038c46150a71bf3bb1451ea993 WHIRLPOOL 123d57d3a0776eecd82353ae0573a52fa9f21bbc42af57ac849e30a3b7c1d5b6cf12074d2757103bf81156a539e7ea41894dfe7cb83064bdbec6c3fca715b5f8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVdu5yXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiA+oP/jLrql1aWYKoo8z+MtcBJtcG
+2o3450SaW54m9VQHbQWLwFGUNe6a2yvnlEHv90u3741YqvCnc9EccfE7of3IzINj
+GKvwhGHwe9uf6BgUsAwXQjaeaJtfKa7BVPQYN4Bpwv159FfFTXmDVZcOoBu2pYmQ
+pKb/wv71k7mtvbtpNQ9k/PnFFjpIMGDmRYnhpkTigS7gmbq8cfkH3IZ59XkAuR0G
+Qh+q/jhSMe394/sHosUjrvyZneRduJtH6BovsxqVxMrlzVZd3U+ltM+s+7fZov4q
+pYzeLNouxamNwu4mJlw4110WvoBS8nDBGY4Y3/1UtlXyG8MvDpG2f7WK4cI/8Tao
+whpcg2XdhcBwlpgLBmQetSV6DWpL0DxI8mi/aNZ/uFc4iCvRSK71FGJFhR7hTux/
+fzLuYCZyM0lAQOPuyQeTHPrZM2FDFnv3YnvA9PMUvDJKSGizJ3rDfLBD8seqnWsw
+cYMAjjuidlLwFHmuhru89XDi+2Fac9Bqejm/V8MCEbYpkEoqs8QttMbM4WkxmhY9
+Lxh8OeG+VozokdsDgjbrWoOBApMcebALWuV3rYYXc1ty9u38Kl1dSMia3yDX6JdZ
++yFPu+0PFK1+XKI7aFO0ZwM2YxK+js8a2PU2eh/YxciPRFTZXU2rsEAlA2f9WLpl
+kk/h4fS/pc5kcHapddT9
+=YgRs
+-----END PGP SIGNATURE-----
diff --git a/dev-java/jicmp/metadata.xml b/dev-java/jicmp/metadata.xml
index 08fb1701a836..1827a10ec19a 100644
--- a/dev-java/jicmp/metadata.xml
+++ b/dev-java/jicmp/metadata.xml
@@ -4,4 +4,7 @@
 	<herd>java</herd>
 	<longdescription>
 	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">opennms</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/jikes/ChangeLog b/dev-java/jikes/ChangeLog
index 9a40ccd80b24..87c4773e103d 100644
--- a/dev-java/jikes/ChangeLog
+++ b/dev-java/jikes/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/jikes
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jikes/ChangeLog,v 1.56 2014/07/27 10:39:42 pacho Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jikes/ChangeLog,v 1.57 2015/06/09 13:47:52 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   27 Jul 2014; Pacho Ramos <pacho@gentoo.org> -jikes-1.22-r1.ebuild:
   Remove masked for removal package
diff --git a/dev-java/jikes/Manifest b/dev-java/jikes/Manifest
index ae8e2bfabb96..55719dada602 100644
--- a/dev-java/jikes/Manifest
+++ b/dev-java/jikes/Manifest
@@ -1,17 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX compiler-settings 148 SHA256 1fbc811d45721ad8672cdbdcf826c26ee33a55956e068e52a7ede11e15f6e472 SHA512 65694da1b1520b062761da80a225e3a37117c981302b98f294686d0fc8b13e163416dae36e5db4eabf3af0e735edeced0c19b93f9bf9b0ca66f5900143044ef9 WHIRLPOOL 430d564f6d933ec0031305fd5e6f401fbe5c4542fbbdf97fbd993305ee72eda7e923fb2353029aed58364f371bebd8f22598aba416c35fe164cb85c0003fee8d
 AUX deprecated.patch 995 SHA256 59e09d783e867a95bb2ddabd29e2e8f0bad173731e8b859a45e49f2a3d0d88eb SHA512 a99d25d3cb588677695d5ce549ef476b3bededd8ea2e84835fb9e3af57c182fc2a87ca539991e963a9aae22ff437e453a8e2e20f15e08dbcdfbf83a44d084a18 WHIRLPOOL c55baeb130fc45702ccddbf6f0468f7ea7fea6d03a78f63dd4087a6912748b98d43e4fbbada1a9ffebf838b3f0b9edfeadf28ff7dee54dad8199ea2a9b6d20c9
 AUX jikes 381 SHA256 ede10b0f53b1499aa14337deb7b39d932e635aef0087ffe0cf58672cb1921c09 SHA512 9d55888ab0b372357ed549b16cd16f7592d34caf32fe3bd9f599fb8bdfcdbec184c1ca86be799b696e1dd131da9646cad09b82fa920430e8f0db65c0d3f1efc3 WHIRLPOOL 5e21d563fb5940873b84d621656e8eb3e987e8300b6653a48b19d75b7474594451dd6f86d5bce44dd6110c91e8cd8376a458f68bcd0edade832bb5e774a9bb92
 DIST jikes-1.22.tar.bz2 616655 SHA256 0cb02c763bc441349f6d38cacd52adf762302cce3a08e269f1f75f726e6e14e3 SHA512 6b318f49f075da0cf0558512748bd77072f5b5b0428160538bcba01201c94719ec0f4b0cd0159ddb04fb3a86c323c8f11f09dc4b31cf880fb94e00c1ee0bbc58 WHIRLPOOL 1c97d130c72933d2eb302e3de782f33c0ef2ca59377df554b6391f6eece41d7142a8652d9e9b5e49e0ab134dc7223793b7ef1f67c0fe2ad787993587a87855aa
 EBUILD jikes-1.22-r13.ebuild 988 SHA256 89453a38ac19b136d4aa111e1812c3651caace0fce8b17867c1cb91c35018c63 SHA512 3dd688e771cb80e6bccb411e69d3828a751a47fa7157b2b1eea0a227db29b98638f76fe274bc6905797028a5dd7ce99abdc7d905664158e566700de6e66ee36c WHIRLPOOL 72183464efd161f68bb08dd2336a767c2fa08b093c169f6f8935b3955a0fe6a7cb56941d069ff49b4c3884c8c098253520b4df772765234f898399e689246ccb
-MISC ChangeLog 6709 SHA256 2e00fc62ff5b7cf3431aad213bab46bc36ec21ca959e62ccb78cb4c3b4ee0c5e SHA512 b99d9893eec1978c9f60c11cad867fda4770a01bbd422fe429420b8ee759bc0d563f721fe7a7004ed2d452ff77c9f8ded75efb2efa932054c57671a6e195da67 WHIRLPOOL 130f066fbcf5c5bfa03b87ccd057e0df1c2dc39a39bc93915d453ed52ac2bace4d5cfbcfc2e0c1cadaaa985a8f9889736ee07155e438da71ac92dcd7fcc64882
-MISC metadata.xml 157 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 SHA512 bbae663e26f48fdc5e272adc2b06c14f77f34c53caf84acb53908ff036e7c12a3edbbc0929d2db56bee861a453381d979c7e0983a23716f629ed2135c22ffece WHIRLPOOL 887e153e2481e7d76f0f1b67a395f10f0328b93930185ecdb8fcb5fe3c50f839086a18831d61cf45b34657aaffca6c3b7900cf3c04b712846a05027a84602448
+MISC ChangeLog 6807 SHA256 2cdad99f33c6deb58479e2a09aecadf465862f35c53a8a85a48e009f4f1aca56 SHA512 d8a528edfc2b505c1f93fbcb1a970b011bf965190fb4c99e585b46157e214f33b5621d1bbef7f5cfec516f238cb2e911e4d9adb412de966e9e59c958e09de252 WHIRLPOOL c8197533fcf7c4161cc4cacb98e064e328d9fc16a30e6bddb8c46b4f665f0c3dc0af06483b4d13437b19a12edfdb2d5003637337ab3be4a54e6ae698c98789e4
+MISC metadata.xml 233 SHA256 77bd67c6c7436e5e23bc2cc4845e6f809624465599c75fa7432bea2932ed124f SHA512 91020312d03e68b36d667cca450a32aabf0bca277737c0a9021e4cec3868f037b1b0eece4bad20c9829bc31bc1e1b4d0143e59d30c187ea7fe0ca2192f6b5da7 WHIRLPOOL 3b635d6789e8da6f9ca2e05caa7d947794207528960d3a061cebd3449a3416f773ed3446a6db72ae84c202ccb0e320976f7405fb81f989043801d24c22e5c0af
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlPU1u8ACgkQCaWpQKGI+9QRHwCfXqlS8g0WMdoQbRebKjzgEpLL
-z+gAnAkobjqmfkCsp5njQPerkut0z9Y0
-=jkpn
+iQJ8BAEBCgBmBQJVdu6JXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiueEP/RJS+/M5wIxf+RjkI3zMxTiu
+wpnp/NooV+E9Rbui9jgNKbvg5g/Qx95maixcCnwEMZzZfrMNBGtuEV1Lz/aM4Ab7
+eGvFYtuiBCTF3WCPS1xLwe/WuYjhxQDNpHaUc2xr5q6CDgvoW6jpkPuOsMRbjRnS
+klZXBziK4IuFR+2bWswBiJWmV82ZelRD8tm6N2s+bpTwJJE9L1XfuqEdRNBZD0ID
+DTqiXmoqVz9aQNOyXsrWzYv9RULe7xX/BubGTGR4Z2EczVIISl9flXiOho3dL8QK
+/Ihs+NwgTSlNqy2njRKBIHLuCorkTA+KXwdQ2XIKR5NBPuVRVwNwl1UwGPbcq3Uk
+9PYTMQDzqI8cgZML4cA+1EBKdLzqCFwg99gdeqNsQXMk/cHuVwNSybunCZ1DlhyU
+e7fYYEW4QRgBMKS6u7P7n2k7EmXbKwyDQeuTvak8hp2V4s3yGkZuwaFF0bQ939wE
+BDy6UmsXUPZyuNzGPfypptOU9mwPRn0g/BaJ4RKq8/2fqOoiPxq5zAl/7vZk1IyX
+dKIQkqOEGZhZwRj9kcBnxSI4r4qd6BR88E/THx62beOd5LntRH2IWBkRwqhuFasN
+EM8Vdtgig+FwSI/bFxX+U2CA4H16evJiqWp8lD/WgAd828GPf48xY4l5XSUlBQYN
+P+cipffA1SMjehPDVo8I
+=bnbK
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jikes/metadata.xml b/dev-java/jikes/metadata.xml
index 838c00a4a448..42250a2eee59 100644
--- a/dev-java/jikes/metadata.xml
+++ b/dev-java/jikes/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">jikes</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/jlibeps/ChangeLog b/dev-java/jlibeps/ChangeLog
index 64f0ede24e96..2730e0f076bc 100644
--- a/dev-java/jlibeps/ChangeLog
+++ b/dev-java/jlibeps/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/jlibeps
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jlibeps/ChangeLog,v 1.1 2014/01/03 21:59:35 mrueg Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jlibeps/ChangeLog,v 1.2 2015/06/09 13:48:06 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
 *jlibeps-0.1 (03 Jan 2014)
 
diff --git a/dev-java/jlibeps/Manifest b/dev-java/jlibeps/Manifest
index 2877d0a2a995..92b5fe43f0c1 100644
--- a/dev-java/jlibeps/Manifest
+++ b/dev-java/jlibeps/Manifest
@@ -1,5 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX jlibeps-build.xml.patch 610 SHA256 87e2e5f5f1033c215808ab7236e7918fff55df3f03887c4acfdc1cb970cea40f SHA512 fb160eb2b9cffc78a82ad78fb947682330af81f1eccea25ce0a3730dce7551020063a0f3928ca460f8f653d86fd3da9ad0b36f09bb4aa5424a04da582c5b3b89 WHIRLPOOL 45d5c0ad575582a5a23059eb96c96ecd289520af0dc94e28a52d74b9059a1cd1bcfe3fcc038a889d06749a6fba6d39d31bf73a1947371ddd70e17ea1f824240b
 DIST jlibeps-0.1-src.zip 85686 SHA256 078fcf9ed6720f693f6eaa669e340e84ab67b938d9cd92357783194596017d44 SHA512 ce28d31d8aafaac2e493fecf8cf95e84ff5076fde7e4d2be8abcca5d849b823ab2b31303fa4f24450ce29aa1bc71f451c880213f820343a98f1aff0036693b5a WHIRLPOOL 0802ba9d4e0560b5bca9ba97112cadaac8d6911acf5774afad98adb106201d1624349d1e84a445c1d818c3bff9319204a5ddb87f4880a3595fe2eac3eedce871
 EBUILD jlibeps-0.1.ebuild 904 SHA256 feed25b4160b24bc1ef1ab7f564fd5eca9f3353064d69d4604c0cea98d7a225c SHA512 898b7cd70a2c6821c7b511de66a3225adce91cea035e144e44efc47151368b05d67965b322aeb576fc31d772d96ccbe1ba4fb93cc8bf1a64f4b331d8c649c8cd WHIRLPOOL 6af1dcd57805c68700cfb416783af43899c42a8fcef8f62e7f4c7c3bddcc0c7c45d0635a5b800442bbb47075f9b01394dbc4979e7e8b5b03ac80fe628946f2e2
-MISC ChangeLog 425 SHA256 b33e088ff94bc8c335cce0beaa30e5deea3eae25697566f4de4f7fd94200fbdb SHA512 a5626d19ada5c2f178868c0867c69aa66b7848692b751e180670637c5f2010b1bfadd7e7fed4fb87dfdbca53cff612ecb852e962f442b1c6ecff49bd1be56d27 WHIRLPOOL 5b6b236d3053bd4e63e856972d9fe8dba4330e5c2cccec0a8af995505da5e243dc3fad0116ecf1bcc219f767254ed15ed9f65fa9700e5d61c405c65e17c0b5b1
-MISC metadata.xml 250 SHA256 d516abf3795cacd6b2b05202374df98c2ae4480d2335976c0e67753fa7bf72e5 SHA512 56450aa869870109341005c07303e4db8e9e2d42e32864a36d0d9c78d0442cc84d03e8fd50fe13344df2c4afc3f20cb8b16a3a7f7fd7ccdede8c70df1c200fd0 WHIRLPOOL 4f864f7eba9f0564879b6e68b647c415a3a1218dd3fc0899b80d5d0461955191c6bd9ed82c8375df6c5dd271b6e2583e5cbcc83319926f19d78c00ea55e732f1
+MISC ChangeLog 523 SHA256 f7800a07e32f4f5f4c4039d1ff3a1b493bbb3c3ef8e88d5a21c24be3257b668f SHA512 0619ef9ae8ddb27d9a7b8f61759d36225af189a22af84579ccb23e84d9c4039bee9d8e5ce84a2a151bdaa79de44df92282c8ba88da7bc473d8c9e7641b8e19f2 WHIRLPOOL d7b74ade3b130a119c19e6d87adcdf227fbc24b2cc1551130a38e6f73520001b4760979bc2c2bbc84a6129dc56967b77a88ff795b64b92e2215e3b3e5c520b09
+MISC metadata.xml 327 SHA256 e1c3caa809d4d02c062d25fc78e197c1399c7497b29eed75d32d593c53870aa0 SHA512 10777f2f15657d288882879fbc349c220c7db63aef2914f896a34c50266f60a2703a3272fe271cf6dba994f6cebc6b259a12c98f4509cedb5e18b72f1c786422 WHIRLPOOL a891740ce54050f3b0a39c449c7786e7486d70cbf55b45de742df4ba06a7f3f97e225cbac75262bbb3cb95f616d93513ceb6e840f1ce3671fa4b7460904d52a2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVdu6XXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiNvYP/2fmsl2n2v3QjVnKPvCeZUu0
+5HAZU/Sb1AclR1OQpc8CAQNPbapYjAMnE2wrrt//kU3bTS62UALIsOTMXoK+nQCE
+ooA0z291q6T0qv+fsaDcGXMnbT6n888DZA8aJhWx/xRcEgrXgfRY1werzY44c9WG
+lJXulK7ZKc4wTrOTU2Klvu06h6TfmqvgoT/vVmWY+k8VdAfrUQtqAWNYH0mImRHW
+20y2QIvXc7xUdpi1jJvpdCw6b7dymG7yDsnxkhpXfAACd++oYwzzq9vDVMJ3eF5I
+JJdx4HO+2GHmqZjiPjp4BJiOMtFfm/YSlWi+J1WmV6QPraBVm9vmdulLYomrZPZA
+hh17eclEhREjTkuCLfikGgHYzGIfNS62+ojkd+zZq2UjSBSbcafTWI+gtCUf4+9S
+kDpIPQSSbabddHS/aQVERqHGXuZ1gu/B2V9sSiM4vL4jzWlPR8vlfzqy8sPKYmnv
+Ic/X6Pfun6Zv3xDxRawl6NlqT9xmBdARQFLFP9xmRA64cuCsAM+SYruptBtKYNmf
+Qbp53DCzjtIn0Sm7aBuPASoEwdOsPuuV6KVwb1O81s9mOY4nHKlibM150j6Rf712
+UooYKTbvCdPitV/veVRGiQpzMQgyIoK+r/t6L+hdHrPjibntEQmpmC3A6VVVN/1C
+uqviXj2f9yMfryKAK3iL
+=88Ge
+-----END PGP SIGNATURE-----
diff --git a/dev-java/jlibeps/metadata.xml b/dev-java/jlibeps/metadata.xml
index 512450f6984c..ed6cb4271158 100644
--- a/dev-java/jlibeps/metadata.xml
+++ b/dev-java/jlibeps/metadata.xml
@@ -6,4 +6,7 @@
 		<email>mrueg@gentoo.org</email>
 		<name>Manuel Rüger</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">jlibeps</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/jmdns/ChangeLog b/dev-java/jmdns/ChangeLog
index fc2eaf8f86a3..bddd63d0c5b1 100644
--- a/dev-java/jmdns/ChangeLog
+++ b/dev-java/jmdns/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/jmdns
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jmdns/ChangeLog,v 1.18 2014/08/10 20:18:21 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jmdns/ChangeLog,v 1.19 2015/06/09 13:48:25 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> jmdns-1.0.ebuild,
   jmdns-3.1.4.ebuild, jmdns-3.4.1.ebuild:
diff --git a/dev-java/jmdns/Manifest b/dev-java/jmdns/Manifest
index bc5989e18b9f..9f7c33b1c35c 100644
--- a/dev-java/jmdns/Manifest
+++ b/dev-java/jmdns/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST jmdns-1.0-Final.tar.gz 157799 SHA256 eed717e220f13e0063f09cd9b0bb9fe43dbe9d8ac68b7fa184bae5ce2864295b SHA512 62fc4e0a8ce42acb8f414299d6d59a313a3a201fb634777a77be78bff679eae4c2068959e035d82d6b6159cb1a42abfdce02509d9b511f36d8aea6eb3a19c6b4 WHIRLPOOL 060b316324596157a056abda9cdf5114b5801702ea948e8c5c44755cb32d15e919647fadfba2826766337e7525a0dbaf56c85335ce443455c047e1361190533d
 DIST jmdns-3.1.4.tgz 275127 SHA256 3824642f040d358745952e8e5e8686d45a4f18a9ed4605e5b72eae8e082386ab SHA512 4c644b02f814fb8c6ea81d74ee18697eecfa2e57de73bebe2b3b1ac89c7f5b45143c55c343426bce2ac38bd0ac82aa316b5af6a704bd9732ebac6224c3ed8e44 WHIRLPOOL ba4e27f9d3f42656df816a02b41d5a81bfa866727c3a6c513607bc3d35152e66a082f809ccaada69d82dc9cf5a9d2e1af55333070161762fa14a6ea6f35bf856
@@ -7,12 +7,24 @@ DIST jmdns-3.4.1.tgz 665503 SHA256 aefc28fcb0a8d8d563abfe0b764fa91a2737aa8b19f8a
 EBUILD jmdns-1.0.ebuild 1248 SHA256 ef7c3e4b2a47055b9f1945538e563a1255ea03a994040d63836cd6965701e81a SHA512 946ddcaee522c44fc370c1810a360eb42fb09400f3500c1775add264bdb943a56112d4d81a183ba58f638954728d7424bfcfdf839298944adf5ce3df8bc03ccb WHIRLPOOL 12fa71bfcab7d2d422ade5c99fe12829d2107fc401ada423bdd30fcfc88539490d6ebf9237b206190fa73c84103e4fdc8d3fd5e7f4d3edeef9e0ff1de57aaea8
 EBUILD jmdns-3.1.4.ebuild 681 SHA256 36a5f498081527a22ba034f759cd83793a6f30b440559cc187fd24141f59292b SHA512 a807c963c7a83133faa7c9e08ae8e6ec93d2cad9eab46d5f51253a30ca627ae6fabd274a9bcdfd5b9058ec1a502dd428945ebdb47556ba9a232df4ece1acf2f4 WHIRLPOOL f8c1bf3b3187d327dbd6304fe9cae42759d04047d20282938a4388e9e648fc1f7b0849b36c047c245232accc13acb4013a51ee3b42ab9beecfd1d53bd7c59706
 EBUILD jmdns-3.4.1.ebuild 751 SHA256 18de02bc41de3016bcc405f269adae34f2a0d0a9294b22b3d87924e61f157158 SHA512 4d9dc3fdce7d855c262e62e1088fd9e408363d7cc18a520742641ff3008de3527febc99d4ed78ceb83cfe72d993b28e0bf91fce3958ea9324ca60c5edd26c7f1 WHIRLPOOL 99d103703de374656e707ab12a818132d8da99d56ef0a59a41dbf81bad03772d1e8d89c4f168dc367629dbc902e129f9234a7383ae490f1514e6a71ce0b40dc5
-MISC ChangeLog 2298 SHA256 a5b2ac7e83ea096288967a98ae1870b206ec0eb13f53fc14af18660045697734 SHA512 3fe75514384b3735643e067ad0cb1ef6a75fc79ce0b09df97a77c3116d62d71daa4c5e4f0df2391482912e63865d8a068ec6b0fc86eb16e3cdd85a8d0be48c5f WHIRLPOOL c061db747c101767bf35e66ea27593af536548a7281c6c243fbab25e1b96e4dd643b9b161844aa4c498fa0e877fabde5bf2c358323e5209cac1b57cc2134e9ea
-MISC metadata.xml 363 SHA256 21ea5e66f55a7c124b2645c1e6089e4dacd8c7f0a3581a0dfafccd01c31cc5ad SHA512 53e1685b404c45562d359096e53fa906cb8396fa0b243e5fb592720c7477a84762f909a7a0650427ba3cbfe67eba99d4e3c835714b88475a824f131f5b9289dc WHIRLPOOL 6c9b915b1ad399fee2ce956574b90ba6ee6013006402649821ea8da82f3e4a10cee2f3b2d13f98e93a8a8cf30a7d9dc6ec156e2ea804d174c4f276b2f4242b88
+MISC ChangeLog 2395 SHA256 0bfca4bedf2187bd37dcd379288f1a90dd479310ea5017d00810cb7c6e77b138 SHA512 f8ade5cc208300c124d5ce3f2115b1b79566c8dd886db79ef700403221eae1520a94a9a083dd8a70004236b9131a25969a59a375ba37c3d4a21699da0e0d9136 WHIRLPOOL a4033681e5e21b7bc00a84c0eafe4f56c120e1e2efa4fae3e35f0cb922886bbbae7ae82973a4f6d8212f609574db1bbf0b94f31dbfaff0cc2ce341b80594620a
+MISC metadata.xml 439 SHA256 934d846fcc0cff7e8dcc5ee7b9652c323b3de07a7c53be6463145fe15592771b SHA512 74560b2b33b716e543f765ea439fb2e9b5b14d2b30fd07851c66388eb4feaba0e5aeb3050a20b308dc3c35537b77b745a8e758f64241ac5b1df8ad00d769c1cc WHIRLPOOL 5f959cb9965619f0b74b68339416b413ac2195f10d204c5ee033da16a8f366d36529c443b7b126bdea73161b85f241c1c1b40fee4025db38e84890d17b0a67b2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlPn044ACgkQcaHudmEf86r85wCghQWlMMhPPwXxSnvz1bBYmxHM
-z8oAoIAgUSxPlQ+G7VqxViv/ATgC69aD
-=8TPR
+iQJ8BAEBCgBmBQJVdu6rXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmil0wP/j22tqpelfGATt0BxcOqDOOh
+dKymflo7azvNOJZOGZxSF/aGjARJ9R4hYfbeVdDztiUy1TuR+G2fPqr7muAhwLaq
+ddKzDsGcJQJTS1d6DCpk/ktcoeqmikpHyhaDk8U4UNx+HrZp7o94H2VKWJUvl7QE
+/wF1swai9LSkbZOrV1Ku9xrryFWGsqNnp5cKdZANlqLi6xG5jKoKTV/wX69W7taa
+5GlH4shqyqaV7OHUkgFI4h4504Q6EHLCiNxcKz9AuS9T+SPV4RZsj1th9C4wJgZN
+zaQuus34nCzEShdl9pbu4/m2WG+ifaYjnCkxW1Uun7R5FPLzj1htJ0RVLzsof3hE
+dLbPu4ThQCx/ZlCC+9f1+AErSWJgUfCPTA7ZB6pTbZb9gwfGbdpf9z6PY6U2kZCx
+2PlVD3npPTtnQH5/SKFxObyauDfDrEAnirpdLiMnoo1ne02Cy7xI1ep9mVBssl5M
+CJNwXfFndm2Y36MM/AZv6fc3SOQecc6re1rlcfzQhnIMaRtG0iHK57xmiDLFedvK
+ZD8YAhjJ8+iHl35zzOUI/1AO+Ppzwm6UC0v6THGIJHkBL51hlTTNv17Wy/NqYl1X
+km7fyl+zsp0N0ECXJB9QPkXErncCB9Nh4DcKQWuk1A/LFrrSLqPw3kfUZfZ6x6eF
+Bv/i1zY6CQZL0F9tA57f
+=xddU
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jmdns/metadata.xml b/dev-java/jmdns/metadata.xml
index 5a814bdcc7c4..d35fc3014bda 100644
--- a/dev-java/jmdns/metadata.xml
+++ b/dev-java/jmdns/metadata.xml
@@ -6,5 +6,8 @@
 		It supports service discovery and service registration.
 		It is fully interoperable with Apple's Rendezvous.
 	</longdescription>
-<herd>java</herd>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">jmdns</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/joda-convert/ChangeLog b/dev-java/joda-convert/ChangeLog
index c5ee4a395d1b..bbf81464281e 100644
--- a/dev-java/joda-convert/ChangeLog
+++ b/dev-java/joda-convert/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/joda-convert
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/joda-convert/ChangeLog,v 1.7 2014/08/10 20:19:12 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/joda-convert/ChangeLog,v 1.8 2015/06/09 13:48:44 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> joda-convert-1.3.1.ebuild:
   QA: drop trailing '.' from DESCRIPTION
diff --git a/dev-java/joda-convert/Manifest b/dev-java/joda-convert/Manifest
index 30f5c6b65b9b..c6d02885ad5a 100644
--- a/dev-java/joda-convert/Manifest
+++ b/dev-java/joda-convert/Manifest
@@ -1,15 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX joda-convert-1.3.1-build.xml 10459 SHA256 f8d10e8045681e688424de6f2db9d703cba1cca7906cd7d263f3e6ed49e7cf6a SHA512 cfeec9e9ee537814eaa3277037e45878a71b80cd73705bce560cf24d1c0d20033dadd030dcc447b1be5ad742fa97637f57931cab96ca7e21d6b79c7897d7f0ce WHIRLPOOL 69b1790299d38202d3bdb790f40a0eac92453b58b223532c4cbd0e1878a51fa99b27b3e7bbe7734181b6c8e90e2e9f25ecd5ce98f239924215b9665c8858022e
 DIST joda-convert-1.3.1-dist.tar.gz 131288 SHA256 f73decd925a63ff23f010c2e0f894662ccce087eece4027dc0353574a7d2e537 SHA512 ee3f7264e9ee445dd8cf088c862809faceb012d317c4974d2312e1ce9b580193096259978a79cdefc2217818600ff38569348625986e19bdb753edb03ba58451 WHIRLPOOL 1ed3df81cd70bfa52bd82b74d5a4e412d46ca54ca250e2d24a0ba6d0711ee29cb82696b9d3e24dc1f43d563506d8334a76646a3902513c2ba221b91f6e79583b
 EBUILD joda-convert-1.3.1.ebuild 1047 SHA256 05071026a785360c0be0493887dc026899333a2b5e306949465e56fdf14afa01 SHA512 ed55ac83d36f94b079043ac046b9cf4d76569cbaef8f628419f9e3d622b93a7d25caf87d38f5096947f3723db57f726d508d92ccf3394164689c2e46cabe9f74 WHIRLPOOL e561fc98bd05f18b481d57c86f1b2637bbb6cf89719e74e347efc9a520c0c09c99a57dff157a9c258d4d05107d665b8e1c99514bcf6eb18f05fd18e89c056642
-MISC ChangeLog 1315 SHA256 234a1aa3bc92363d50e6ca8482aef7e68189ed871c94449febd98110b5e48e5e SHA512 98e0788a5fbb8356dfae58f0848e082203449ac581d31878d1af8c609eb0d8feff8321bc2f2b2ec8a45c2ca0f118cc0f898a5516345ca1701f3ea57b5fe9501c WHIRLPOOL 1f3838bc7cfc1323378b06d3b0c7b8cc3f86e5dd62f86361530e95b74431b82d8b77d8175358d24134a1ee7b89b900a1c60c2491d60c40b46b2ac7929e935805
-MISC metadata.xml 159 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb SHA512 74dc9ada199a90543b8e1c168c7054f2e973fbfa2551e2b959d67501f2538e269cfb4b2f0905a88a1afa04c20b33961336310ba876f80d47c8e7615b2d7c830a WHIRLPOOL a0ac49efeca233ec4d8f63eb69c8e46e1d4ecbd926693c25b1b8c7415e4c565680936aec46f0c4197116fd7a19a3bb571beee493c18bdae1e5e978e3db84f17a
+MISC ChangeLog 1412 SHA256 12db7be006df64189d3c90c4ccd68ac158de902a08a899fc445531afb5f835ca SHA512 169713a636b522e137eb1a575c183a4d8ca8087d721fd5061bad183c89f2f7152867441cf865786b2b89cf831561fa7ffe581d96c1fcfd5a611889f17a43dc61 WHIRLPOOL 4445cd4837a81a98fcfdee3b6b7187fcbe1e8569997451a278f423e7639671f45647b8e56d518d691ef12fee088ac3f2ff84f89695e5ecd0b953c8a0a794669b
+MISC metadata.xml 240 SHA256 6d1abc96717c1c3e7c9ca720d426a90844ea4c087f9477ab88f5744eeb05d712 SHA512 92f344658c6ac6436288e9d100cf8b23a560e22257ee023ea0d00bc241bc6f53ec542d71640c6efbbf3a6f0bc97d789a8d4caa5b2d3f70bad2beac00d7caeec1 WHIRLPOOL 8b65dc365f9c3cb0ddecb1d03a030aad9b2c834e84142fe965a877924483023579849d5839ba4c0d72ab52b3a051810a42e77cf1d126fee6e013ab25dbf1af29
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlPn08EACgkQcaHudmEf86qbKwCfdnMllNPS+M+hzyc0tLm3ow0G
-dpsAn11k7ZJ1DLaRP8RpkWSuh4sYUiqL
-=1+7C
+iQJ8BAEBCgBmBQJVdu69XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiKPgQAI4URFJHgl8TvOKhDKj1fT6f
+enjuwm5HW1EQ1tuBi0g0tze/TP5G+sL2WHksi3RsNldt3STSS1rhOkOutzi3fjEL
+hFLbFu1ET/eB2eVe7Xdrv5u3i4BWPUrxR+e6H9hSVe5IicJIeGc0tyyK679SFASd
+3MOr+iJgD0I3V4iLwtOLLY67YTKXsSOfWAjJgX3GY/wfZVnXu4ngFWCLal/59hUh
+F2zpmciRT3/2BNF5yl9Ll/hf3lboYXotE53IDn6uAZL/WUiY/1SGbQJLejhteOmZ
+WdJuP3QrXVv46jXCcz9u9CAhQuxD/EF7Ied9RDUyi57MNtuGbsIH7smLQhyhPgVD
+mpKaPGAfH2No59973GLFYf+qx/Fm31/yN6bix1qkvAt/Q3xA6gCqYBy1JrNIwmFY
+j3JAHtxEtDt7a6Cjo+xbd1mpQBtaqm/nZIEDliODndTnsOxSgzadGQyTkwLt4G8w
+C4n0GWVY2R2Q2DdVx1zQPE4+d4H5hvj3aBqkWGVjXxIami6cWj5WFrs/0mEA1ENy
+z++51BQVjpXujbQABFzHYKCOKIJbpPZyljHkJr+VwgRLMOixhFNFJkd/bxTuWI0h
+1hH4l5VYeToVWHHP1J7/gMrlfJFUfTsgwSfckM3amv+HGvl9LTUcCrp8cGhHTGk+
+2m1jEREtiHfcWb25Jucc
+=xRuW
 -----END PGP SIGNATURE-----
diff --git a/dev-java/joda-convert/metadata.xml b/dev-java/joda-convert/metadata.xml
index 250f2d1940ea..ef639372017b 100644
--- a/dev-java/joda-convert/metadata.xml
+++ b/dev-java/joda-convert/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">joda-convert</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/jortho/ChangeLog b/dev-java/jortho/ChangeLog
index 69eab1eb49cb..ed9e308aacc9 100644
--- a/dev-java/jortho/ChangeLog
+++ b/dev-java/jortho/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/jortho
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jortho/ChangeLog,v 1.4 2014/08/13 09:33:54 ago Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jortho/ChangeLog,v 1.5 2015/06/09 13:49:01 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   13 Aug 2014; Agostino Sarubbo <ago@gentoo.org> jortho-1.0.ebuild:
   Stable for ppc, wrt bug #501728
diff --git a/dev-java/jortho/Manifest b/dev-java/jortho/Manifest
index 01f1878f1aba..a35ef2f2fdaa 100644
--- a/dev-java/jortho/Manifest
+++ b/dev-java/jortho/Manifest
@@ -1,24 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST JOrtho_1.0.zip 278599 SHA256 fbe9019ced6d13901024948f9f6dcc14a7faf7bafcae841399c0564d0b0456c2 SHA512 e9d99984e954711125eaace5d6bd3c7ec92dfbcf85cb567f0643a61533334a7d7b3d34bc47e2b2a147631edccc6898b9fbe4c999836f1638ef284aa0479a400c WHIRLPOOL 339735791ad3c6cc7da5a02279d0cc0dd9a8b7f9111a622ea75febe76237e5579bc267d2d069ec6a647e508ac34ed88c58b9b1335c71137ea82497a96a0e529c
 EBUILD jortho-1.0.ebuild 1022 SHA256 2743e27955defeac4d20b5be2d2fca1b2ddc0332bcdfcf9fc46f53bfda8db0ba SHA512 3f9920c8afed6d9785dfcb4d99eb14887b06eed3fa368682ffd7b2c30fc6fad01e0d731170539ee47e6a7ca925dc8bd3a00a9453041b47ce52db44a34427778f WHIRLPOOL 9d5b66476587f270f5ca17e10b1c5fa5b7377efb797bcc8958ba1adc1f9b33676345f0a9fe78ae0a8f591ab0ab7764ab9e08e9c9dfc81cd4f368b68f58b01dd6
-MISC ChangeLog 654 SHA256 f79cdd3e7f4350576392a5c2bcc26badd549004ee37284ca6634c166038bdc36 SHA512 17aa3dbfb45483ef872614c9fc4b9da4fec5972fe21a7f8806e89dfea0a0f8f01e3e5b8ff639e97974657d7de51e546ea74ccb1230d0f6f6362848101243c7c1 WHIRLPOOL b9d17a0e27f5a1b538eded43f70bf79a0bedce585c3d011ebba1ae53b238d2d9440876b4cab943c54d6470796cbd7c559d55d3ecbcfe34461f2f51376d214010
-MISC metadata.xml 212 SHA256 348388f821b26464eb498816e263bb00f60c76507c1a8a33f56e4f3b18bdbdde SHA512 9c95c0bc4c08848e054138f542c25d07dcb8f518205412fe3e436106139bfa10fe35084f468bc4ba1325f20b36f2da61f6a5a01f2496f522ab7645d1a8007aa0 WHIRLPOOL 2f72d1e0800bb085dd44cfe92bd91aee239b7809cbdc95551d2fc66b924ae5e44158089a3c9525764f48272a16d15ecd5854543209052d58c127229de8461045
+MISC ChangeLog 754 SHA256 8182eda98c07d20bca675761dfc51a9987982cc72d9c2a47eb0999853a83f5f7 SHA512 d5bdf26620e297fcc452216895ff27fd68d3e95f193f47d8a8abb65b5bbc91f261c7966717e852d559bcbecd2e524995332bfecba3ed41d08d37ec42f91ad9f4 WHIRLPOOL f2a27093c2cd80faf2b539c8d3d8979f10606c9a027eb7e79f90cfba86393a102adbfbded0b863d187d26741e06cc1bece706200ae36365f6af221068e89af0c
+MISC metadata.xml 284 SHA256 37b3ec6268839890356fc2fbcbc08596ba65f6b053d03bf371fde980cf99b513 SHA512 3f7d94543266e9408289befeb3ea5568ee0bfdea87860dcfb6db386212c674e587559eddd03d8ff542fac59b409b61655d44e8dbe15f1a70289b6bd8ebe372d4 WHIRLPOOL 3a56a978ce3245bb9bc7350d1486e7b01a7b1b962bdf18ad59fd535d49068d85c78dd0521786a77c23f32b97f59961457616d973d64a4d0d3c107dd9c449dd88
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT6zEDAAoJELp701BxlEWfpoIP/2Ed0bgFDpvwymy5pTpG4xbX
-sE1332sl6cmusoe2+hNoAqelB/xxSY2W1/zTcTXNHJsfTCRTPaXYOHDQbwPU8uLs
-TPJgtVdo9skOqsBrV3nfeW+A0sVbui4yDo+gl0tPGtpHv4jtH8r3OMR7B8lV7rb0
-rrYkuPMQTJecoj0KQLmiGb3bz76LsBID+N4H8LguhzBWeGeI2Q2aM1y+Byz3YPV/
-Lr00qKNecA/ZPcUKe67RsgBnV3jJxNd+mjfS1gJyJAFUzcvGszNOv8wbG82uRyhp
-dHJxebEB5bEiJPxJ2qlH/R8GYpUKI+zr2P8K5/8cqn6hIZq4ZP/HDYHa8vay9uOp
-8aezt4v5V8jSB7Xz3aehp5UuphAn0igyRR4Spw51+4QZPY6dD/+0Mpa0VZxz8hpB
-KrOnnGqyoYbAac/9YIuM5VabDj1F65L31yS5zRlct6t7GiSKAD/x2vMOVZFNKrRm
-1yBC4luEGLRgOvf35RCwPvN6KRd+Q9I9/7hWZIhIcV2jdYn2NuXOx9TMWVAt1hvW
-5UfarIi4AnlICV6J/8DnWLDHs9DXDIP6IjR8isjxbnnzK5sa9qtY/Y45PKYhX6Ic
-m6ESbDKdeUI4Des8OIjUo58BIcLFABCWUBqJFNsdqh5mcYsrjcuAjOGGPM7jYRLH
-1SqMJM6eorJNIs+PzDCZ
-=7wuR
+iQJ8BAEBCgBmBQJVdu7OXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmilIsP/3yt+tmkECiLnxOUduxwlI+w
+s1lCxXyDs9RfocNKOwURZzqScljUTJ6mWUX7jfxoDN7QQzsfd9GY39TzdU78bNic
+vnvYzHIGD6L5DPYsYVoK/x2jNcO4sdt8rksh5KGAaALSDA0xbBvp+O+RZwQoNoti
+Hiq2KKqMH7mo7sjOPWQL/pn4FFhxPawgfwuhnH0ocOQ+USk4CpqAr/MxaDoBYuXW
+5N6PWHyUW7I/zM07XC4MvjGHR7SZdIqjy450wPk8FvtiEMUvYYnzXpZNL1WPuLC4
+PZCYeJDe1Z2s58Jc6DtsUor0YiXTyN83q9GrI7BbwrX0WUHE2GuuYZzyzoV/UQhp
+NbvpgZoBh/I25njfq8kzA8fm1EQsCclkGKzYzaFDeqvMeVtxX19X6FnvIe6cggRq
+A9FwMogoIoWca/AMcUvDUi3wgl5pv+yiKhFeIUhEt1f+Rl6m+hybw+r6+LeG1aNV
+1gDylkJ0xUGtZgrLkFIk/e8VQShp6Oiwp+dmVUYJTd7My3QMX370uD+iteNPqQzu
+DHbJkQ1if9o34fF5TAh+l+aOmpSMm0Biv65gsv7vYAorXHEZoAJ++/PP/DxYrmVu
+Nspw3IWs/WTXXhnBoZKKBlW+48Y7F9YRX4H4ChCltO83dN4ufQ6jfugvGu+0DC31
+stKsP2+1gUpWZWJ8q2wU
+=5UiR
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jortho/metadata.xml b/dev-java/jortho/metadata.xml
index 74bafaf44d5d..2901eeea8413 100644
--- a/dev-java/jortho/metadata.xml
+++ b/dev-java/jortho/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-  <pkgmetadata>
-  <herd>java</herd>
-  <longdescription lang="en">
+<pkgmetadata>
+	<herd>java</herd>
+	<longdescription lang="en">
   </longdescription>
+	<upstream>
+		<remote-id type="sourceforge">jortho</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/jpf/ChangeLog b/dev-java/jpf/ChangeLog
index 8d0f45b6fc2d..86e52bfdcf3f 100644
--- a/dev-java/jpf/ChangeLog
+++ b/dev-java/jpf/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/jpf
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jpf/ChangeLog,v 1.5 2014/08/10 20:19:31 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jpf/ChangeLog,v 1.6 2015/06/09 13:49:18 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> jpf-1.5.1.ebuild:
   QA: drop trailing '.' from DESCRIPTION
diff --git a/dev-java/jpf/Manifest b/dev-java/jpf/Manifest
index 8423ba6ea6bc..834e1d678f1d 100644
--- a/dev-java/jpf/Manifest
+++ b/dev-java/jpf/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST jpf-src-1.5.1.zip 1115573 SHA256 93bc9852b9d86f788f5e3c53650aa11a18758526542e0ebc17a508818e91c2e4 SHA512 90326013b110f5729e25bde3f61985f7bee9f78c58ebc3631c271c3d02fc7e91851adf3aa79de71b8e1a1411a2d3b67ba8e4e13f55c9332505ea2adbbc00149b WHIRLPOOL 8530c8e01e034dcc4a642d6756d1bbf48572ed7dc15548bdd448847c661acfc80b6cc1d60f8bf147aab7e314114d077b6924768cfe2e2e7b04b371f3aacb5d52
 EBUILD jpf-1.5.1.ebuild 1188 SHA256 26a23fc10b961eae10acfdeef376cf4ef14cf3ceee64aaa558296b65539449b1 SHA512 72e8a6614d05a1849883c41c6aeb882dc0d6c24271b0af8e101c27642cbc007b1385a5f24ccbd282d15bd357e4cdd8881cd951f0d78ac55daa48bcca5f115471 WHIRLPOOL aa93556c636ffdf0d1379bd237a49298aeb311a0bfbd58ab49e21f90d67c3aaa99e2ef969086967d3fc49ad2dcc14b01133104a6ba302b934816ec188eccb237
-MISC ChangeLog 737 SHA256 27592ea98f6ecbdbaa72ee8f0a675641587ecf1ccc7b4d8a9e231e10b4a943ce SHA512 d4c114d7c5cd26d6fac9be2e2ad41cba8e1df15505081f360de1c3c00aeada64182471a1cc57e2b1031a3247f6ff11d6516b96f6233eaed3331c2b41a1d47290 WHIRLPOOL 93736a5b12a16cca8dd22a98468f60dbfc4de51b8a7e36f5d2d5c012090485e99d562fb8bedccbc1cc8c0c161d5d1d0e139cff40a294749f6b44666508775361
-MISC metadata.xml 159 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb SHA512 74dc9ada199a90543b8e1c168c7054f2e973fbfa2551e2b959d67501f2538e269cfb4b2f0905a88a1afa04c20b33961336310ba876f80d47c8e7615b2d7c830a WHIRLPOOL a0ac49efeca233ec4d8f63eb69c8e46e1d4ecbd926693c25b1b8c7415e4c565680936aec46f0c4197116fd7a19a3bb571beee493c18bdae1e5e978e3db84f17a
+MISC ChangeLog 834 SHA256 20881999d760f55ebcf1720bb889663d1236b2bf9dec9991451f1b93f7a6a667 SHA512 3cc81384d5692de6b79ae89b8de352cc458130f72e9b0ffa821bd77008f33803b0947dc6922bc59c5f5d267be158709c2dbb39b3bc7d9ae138015f2b02b9b274 WHIRLPOOL b70ed1d71503958ecc7282e11bf75db7d196303d7d3dae67dc6844a7ecdd13cd7eea46848260fd5f926642d9c767c1825ca9e4bd2193a9cda217f29c9e5e52ec
+MISC metadata.xml 231 SHA256 4f9431ad8261f30031acaadb31bd412127a55526992423d594a9160f2716ec61 SHA512 2208d4fb227216c831bdd0782bf1f2359d0f02065bc8a8efea15b74a17e2e573c1e8736bf181d3ef10ba65521c8213f70f337b9ef64008e47f5ec5ba5f90929b WHIRLPOOL 8e8418626dcf9d7e5746da4f3f45b121bc978b44341c26eff7d193ebb4a57bbc5037d89d79204f40848985359a84d27611645b3230a171d30c6b9054e37d29bd
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlPn09QACgkQcaHudmEf86pCXgCeMzezPSWvP7oiqlT7R6KVrsSe
-3LsAnibxWj8nt70ra/t8jjC4a7PYe53C
-=fZim
+iQJ8BAEBCgBmBQJVdu7fXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi0EQQAJKdpq7wbqhj4rfmUyt4v3aR
+jbpvnkliEpKkqfFclszanggAhj2duZm8ZtrL/jMIekyIjzV2NT0y03alxhHVRa6C
+FRbmhWQ/w2PKgpJUwsCLHGgVRkPBsOky9ODtMVqSjS1wRI5RRgboipoO5bWMRMk6
+6ax8a9RWL141gK6fG+PTQJ+kuR7mT05GkKU6b40uAT98R/AXxZbBxpwbWjLn3pLH
+kCrBUz/dy6jyrQN+MZe80IjgyiHnZI1n7Vqocou7N79D278d3Qcu1wk3QXuNHXls
+2+YFokcB7/0qLUKpckXOlNF/AjKhk0xz65/sKssveMPu+lUL/0Q16dMQKZRmcK/4
+FVxc6WH7l4awBt5bhiLFE5SP4PAsE4jXvCl6uk24mi9DdRuRAN4H9ovqvX9hMahu
+k5QaC1+9XMuRC3y0vE704WMMmt19jfjh+Vvc2HCMbxG8Zu+XC89w9ZLZFxiCuN6t
+Rxut+lwlNRgvm2VWWSGsu7LOLhTMQWF/c9opNFyzaOgCYY8+zMO0mVt89+tcSvKf
+VX93G4+bqnyhpGteqCCw3s4H5GwjWxJUXONJKFQcv6jMIRdw0LYU6pOB+F/pWp7K
+yvvejo/6ujsY2PF9C1bsrtE+sS+Va53W4bt/t6mPFXbwKwwkVHErREvyX5IFeF4L
+o/tklAKJMyHfybIzy3cN
+=aH6e
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jpf/metadata.xml b/dev-java/jpf/metadata.xml
index 250f2d1940ea..9c3dfc5d5f17 100644
--- a/dev-java/jpf/metadata.xml
+++ b/dev-java/jpf/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">jpf</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/jreleaseinfo/ChangeLog b/dev-java/jreleaseinfo/ChangeLog
index 2d86f4447f08..dba063bb0b8a 100644
--- a/dev-java/jreleaseinfo/ChangeLog
+++ b/dev-java/jreleaseinfo/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/jreleaseinfo
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jreleaseinfo/ChangeLog,v 1.4 2014/01/02 15:13:14 tomwij Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jreleaseinfo/ChangeLog,v 1.5 2015/06/09 13:49:32 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
 *jreleaseinfo-1.3.0-r2 (02 Jan 2014)
 
diff --git a/dev-java/jreleaseinfo/Manifest b/dev-java/jreleaseinfo/Manifest
index 09722983d41d..adee2c3a56e9 100644
--- a/dev-java/jreleaseinfo/Manifest
+++ b/dev-java/jreleaseinfo/Manifest
@@ -1,18 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST jreleaseinfo-1.3.0-src.zip 38437 SHA256 a06af23a25f10a9ea943b4119cb4bfe79554e4a8fb87d13f2074de1e4b5d646e SHA512 6c339787085ad0701f1054ebb96e387168e0ea5997a977d01dd758b6a5cd9090fee1f63124960112f2a0c8db3685e98fc8c3ec90821b13a70b0dac8cbf25c38f WHIRLPOOL 2acb87fdf056fae8521b8038a22e4fbb81f9df31abaa12c6fa555ca40f430daf4014f7c841e446530196b929351e3303c0c2e5add6e0d3b24e8bf7bb307b8e89
 EBUILD jreleaseinfo-1.3.0-r2.ebuild 896 SHA256 195ab668d70d49f9a6f4d4c0cd719a5f35d36fee9c90b554c16120268dada69d SHA512 c7d13672191c44b2264ee5f24467bc76e94a546ee5e1ef4ac944498b9ba8309e210b631b4f56c7b1e59c111c29b4f5e59920ccc5a6349fdf0ebbadcc97cf2bc5 WHIRLPOOL 89f31c8da68e5e9d695ef01f9c4205abf20b886971f1977c826e0a498b83525c1a1b53f0d17a3c1380bf006d289d74c14c973721c975df01c920c64e45aa0d21
-MISC ChangeLog 948 SHA256 c2e3b5bd8cc4db61e24c15ba4d47cb0b7aa238a8bb245f6eaffff6cebeaca7e3 SHA512 88dd9cbef99029807d5bdb3ac4f833ea4615c6b409ab48ad785c4780f08f1a605cc3e15788b64db6bb0a47755e405335e587f25c6f229330aa53a9b4b8c81432 WHIRLPOOL 4869dc0846332e3e722300d85afbb800be17e6a8661fe0010cd3fec64eb02152e42c259234322ca1b6e124a07f7418f76f894e3349d329852027420a59e34cd9
-MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
+MISC ChangeLog 1045 SHA256 ff3c45140659403eb12fbfacc0d7999f3224987a6fb7c8613d1630710c070002 SHA512 0ce630c16cd636822b6f20c737f90acd6df082051206ede16fed7dd80cc1d2de138c57cc9275dbee7a0b2fdda10716c2d0934a71438f14e35790bfc88b2aec9b WHIRLPOOL 16f88301d0deedefa8545f86e61a138ed02294f1bf68d1437b786f267941fd52b132cf4321d8262fbc8728bb3a6d754633973298265b7dcabc2eb884e1cd25f9
+MISC metadata.xml 240 SHA256 383063a9eda66288e64cd8186d8e38658aa6e1efcda1f462d42f471781ebd96f SHA512 582e93a939a174126e887b7abc793fcd24905e6c3e03ee1ddb7f308c0cd8049d5d98638349106b0646fdd6a9b2ffb4902a67b670c84c61bcf2ed3c90ff0fb22d WHIRLPOOL a14a2aec47fc977475fc146bfa36dcf3664fe45b3bdacceb9bb2cce3e0da7af14de7c00da304d919ab4ffe031d0452f55aa975d3806262c5ceb11d885ac8936c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJSxYHxAAoJEJWyH81tNOV9prkH/j5BBqIqhn1vE+HD/xy2Sp7j
-KAmt3ax8QKotkuwA9rJKDKbgL7Y/N8tBaxGOUWNjMlOZ5aqwj3SbG9nDxZcza0A8
-gzNxxGRDw2ubbalftfbCESlae+R3mlMS5rQAKx2A77w9CusIxHE9O+WdfyaMnl5t
-tBjBd4/ztSJ2B8BcO2EFgpUMwFBUyIimzGd5pVveci319Nbc6pvP/LkAvtLq4Vx8
-XJCMhlyTjZ80cyQLhX0tggAv2Gg7faBqgsz0cVO/6FEppUINeJXet3c4SLQrXE1I
-w1bbss/7MF4N2HNS1TuV9ztNfTWUqr5AYWlHXXXbnbKs0mqogtg+cSQ7NvplStg=
-=LXDs
+iQJ8BAEBCgBmBQJVdu7tXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmij18P/0vRNpEqVXIRWvh5uyjtT0tr
+ZOIOjjeKspwROXXOOpj0l9Nt/CKGzcWbakIKn1IYFlvYLe2DM1CrToNsFLngh7bZ
+8ICwgpLPIYW7x2+sMVLfZROHeyQEbPM0XwGULHiLGf7OVkcs+g0eYLwI9THfBsBT
+/zOePu70DhRdFV+gs4oFypblx1w/WK+NdPyVMTuHClSl3pJQY6Q+yZU90TB1AbO9
+yJIf8C5Rg/wtumB/9WVW2TV2pdqjUJibQDQn3beyO7ox1yamQI04kJH/4gTBdG//
+zdnHQhF42wsNk3UrC7dUuJVuj7nuZGOgBTLYGsHWJDf6klOniFzfME65Tq0Q21yS
+S7mbEdc2bcysmKMOd/+PkB3U+wZyd6cS8GgdjCEEG0Btfky7tC/8Cws4gg5OeHVY
+f05vokdJWGicY+JjRsEAb5NG3o8A3wV4381vqFxQZVPn60LVA/r8Mrmn0UDzUGH/
+74f3eaBln2YhqZXfrfeApqcIhaCn3DNNj690+xwn580wVHnkYakzXzZJwkgXeLGI
+LUZmWVZj/xpx8bG6V3wITa9vusfOwfeW5FzbIx2uUTNLILS4bJpaOKgEc7qKl/w5
+8TpDlVF/6GCNvSsYz5xy6DaRLoTrBBJZfOTalcmUvgBstSj3L8/Ct4XIsPFNifcJ
+WfZ0ozMWC7s3zNXeeDCc
+=77WV
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jreleaseinfo/metadata.xml b/dev-java/jreleaseinfo/metadata.xml
index 7303cef96964..65839deefef8 100644
--- a/dev-java/jreleaseinfo/metadata.xml
+++ b/dev-java/jreleaseinfo/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">jreleaseinfo</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/jrexx/ChangeLog b/dev-java/jrexx/ChangeLog
index cfffaf233330..a47b781887dc 100644
--- a/dev-java/jrexx/ChangeLog
+++ b/dev-java/jrexx/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/jrexx
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jrexx/ChangeLog,v 1.18 2014/08/10 20:19:49 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jrexx/ChangeLog,v 1.19 2015/06/09 13:49:52 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> jrexx-1.1.1-r1.ebuild:
   QA: drop trailing '.' from DESCRIPTION
diff --git a/dev-java/jrexx/Manifest b/dev-java/jrexx/Manifest
index 734f593251b4..f2c4d62aaf02 100644
--- a/dev-java/jrexx/Manifest
+++ b/dev-java/jrexx/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST jrexx-1.1.1-src.zip 62878 SHA256 6655b611c7693f20da86cd8e933908483615341a916556e777535192aa8f1b0d SHA512 dc3e84e9c6313d8fc4c8fb57bc2713976d07284eae5d36ca4411d0e28eaae36351bbf7a6a16d9db365105e592d2e0cbccf7c3662f8d24114662422f02f0707d1 WHIRLPOOL 1f2e4451672c1c557efd5edca511504095196746b529e14a9ab1a7bbe82a243cd59ffc047561e066f4f54a65356e6c14e88e0b809609b3ba2ae12a696c0792d8
 EBUILD jrexx-1.1.1-r1.ebuild 1219 SHA256 c068db414df8f1d0dab5dfa2f741f127beccd5d6ed8f30908fa16fc99d2260ed SHA512 058e1f5f247afea162ac1e17320602acd6d51731ba03ca127d8b36f3380a2f410d9f04f28979b55cca6ed2e8937ab2b74c22b4d5580679bc6bea8d959a698bce WHIRLPOOL 06087a4826887380583f399f7b972bad97e0442e5605e4cf7567463ccd121f5afc2f418e38d4b9a224628328797de37b458ef981599f3e1b81d497a4b2682ffb
-MISC ChangeLog 2200 SHA256 1f8e7391f881120357e2a823da8b1126c4f03ba591338ae112a103bbb830e7ee SHA512 a4bf8954e4c668a09858d7bc4f3bbe6b7368c46c116f670e67f4c13295e481aace946021482e4f8216e65c82180691a8d11da31870a53a1553f77621d8903405 WHIRLPOOL bacf288cb894ba8051b5ee4ffbfb02848640088496df492ec4b71ddc299e0c0af189f069f4919d5f637a94f324fb3a6563a5c677aead427a6838bc11a2f4d938
-MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
+MISC ChangeLog 2297 SHA256 42ad3c9276e0b13385f7508417f12d64925dd31857104dc350c4dc3c07b066aa SHA512 aa678cdc51176196c0d28ad6e5946fd227732ab8ab9b2e6ffe736462645d5a565d0933d8ce1d45ce8340b72f51d4c969e97d0102c8306f903c123d8590f9dfd2 WHIRLPOOL 72f933bb34e50fac24dac37a2a48c9b792ef12d9cf8a87d3d520490d0916823dc43c43fe67e2fd2fe7758755d1b68a82e033f9f3dd0840ddbddc5fb6258bfbe9
+MISC metadata.xml 233 SHA256 33b4fa605ddffaef5762facbd4037b9c1892a9c84430ef6a2e7ff51f10f49a45 SHA512 a7e7f7f4d6e676b5b67e39654de66d7f116b6e905d17ec528aed57973e461bcbb193106ff49ee486a182a092c7bf7d28e9b87b3106b8fa1a425230b1ac1a44f5 WHIRLPOOL c6de01c60ace3816d4ff6a0b4a02903b94a057a8801296a0a98940683f991480773b14954440c1392b40fad8469d85f0886b2ffd60fccd3019e27421f97d2cc4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlPn0+UACgkQcaHudmEf86pOPgCfVx3QSd35zb6LqYicXeXdy/6Z
-DeMAn0bwUtu2CvvrgB8SARQlncm1rHxT
-=4P3w
+iQJ8BAEBCgBmBQJVdu8BXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi0xIP/ipAPpkpVYqQzB6yIdflIAjj
+SQlM98ul14CjdAHRg4krRg/PrtVSi2bB0Boj9fsUFSmMrzMoqoUX1EIib89OUL4z
+SgRDBWoXRm9oOGZjE6M4O4vKr6ba3BxLBWDUOdU/VHWrJuWv9Mfj6kMurYDHteSI
+TZvZx89PXF4x8NFYDLe3MpHWqpMZ1T2vIXcHY37z1S/Ki5AlxnvvyZbGcsvcONXX
+yB2uY9Ix8Ldm2ZIm0ycyhDmL+vtEnpZa35KLJSpESDC8rlazSR8JUhK5yC4D22SX
+I7cuCapJX6zpkYa+lE1Bt/DO9UIE9j0nps8iPtRyfK/v9h9IcWWAyjJTb7qRcjfb
+mswgeOkK7HGN2YN+MmZrZHMnDQ0mcSiMjdwpXoNTXzrAv3d5kB+nxD7lWEjDUty/
+RUaQoDUpWdjVie0764HDXn4tMIueRhVqOc7aFRTeymWuwheAZLJ8FmbAMdTKZmHn
+M/VSdLynkppS5TuZhImPyezgLwTaxTOpPFaS6vLAUfZTMsXdZVNV0fexUVCtp2jr
+VHQWOGXgdAqESyZDZXRtLXUoYJe507mKgvclApbHKeO7qVYHSIsZQSI1uUvYt70X
+gdeCeB1E9k6c/mfuJBKROryt7uArkohSZr+CJ2Ap3bcDZAHsaWjLg8fbdZBbqiVh
+ExzrIjNDm76tjyKIwMNZ
+=N36U
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jrexx/metadata.xml b/dev-java/jrexx/metadata.xml
index 7303cef96964..83e2fb6cc275 100644
--- a/dev-java/jrexx/metadata.xml
+++ b/dev-java/jrexx/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">jrexx</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/jrrd/ChangeLog b/dev-java/jrrd/ChangeLog
index 177492ccf72b..e4a52b144fae 100644
--- a/dev-java/jrrd/ChangeLog
+++ b/dev-java/jrrd/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/jrrd
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jrrd/ChangeLog,v 1.7 2008/12/08 03:37:55 jmbsvicetto Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jrrd/ChangeLog,v 1.8 2015/06/09 13:50:12 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   08 Dec 2008; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
   jrrd-1.0.1-r1.ebuild:
@@ -33,4 +36,3 @@
   12 Sep 2007; William L. Thomson Jr. <wltjr@gentoo.org> +metadata.xml,
   +jrrd-1.0.1.ebuild:
   Intial ebuild, dependency for opennms and a useful lib :)
-
diff --git a/dev-java/jrrd/Manifest b/dev-java/jrrd/Manifest
index 0ed65c8d0edf..1b44625d23a4 100644
--- a/dev-java/jrrd/Manifest
+++ b/dev-java/jrrd/Manifest
@@ -1,5 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX 1.0.1-javacflags.patch 346 SHA256 7080c843e1facc232d03984872a12a4df5fcc87deaafd5716bd73414c2cc3413 SHA512 4c7383d1e55bdb56657cfd3de944ba1e18fe299d90b4493ccf9708abbaa0d4fa141215170c2bd9bf0f71002124a8221d5af657cd9c28817971801349be71ffc2 WHIRLPOOL fbdaa6ba9aa8bb03e96b60faac9b4bbade37abc28c38eed2d87b5b63dad5d50a9e6f634f0c57dbb6e6380136c9a6e604af9e2ea66f4f9415254a9ba8cc38c477
 DIST jrrd-1.0.1.tar.gz 320476 SHA256 ec209fc07b5cd776c96e4e2bab817ed7158279e3e0fbec20642b89f95e5d1728 SHA512 f794f052af32544e17d5aef58c7acb068f442c85e991d7f11c25119d94edb4aebb75f744df53caa64f4fd1e9f900f9018a82790a77dcac48e071b13833a8cced WHIRLPOOL 646dea281471da5b5b96878fa9c331d2010b24faadc0baa9cf0749a42fb2f35a16c2404c6f3d2662b531827fdde4ceb59348b752a25807c45244a69a750b1f21
 EBUILD jrrd-1.0.1-r1.ebuild 1066 SHA256 6c87337089270398f8d94b7358c32ff1a52585bb96dd97790326ba4386b5d474 SHA512 0f04f934706564b823fa61cff2222089f653330dc28d9b7f91028cb63d13b74f19c1f6ecbfb128e1642971dd88d8178d91365943b4e0f79c23c02b8043fba1b6 WHIRLPOOL 809290a64d2b006363a54514c5c29a8924bf400f13e0c3aa03632ee1355ade11764ade897441db18b2fa6c207896d778f47e6c8e72d09960949b35f3cd18e17c
-MISC ChangeLog 1263 SHA256 44f432b592262c6f9f4247e9cb6fbd3a7612268ba5e015872ac9e710c8e7f7d0 SHA512 71ecc0e690a0c5d53d6e5de7eefac45c6c6f5ff2dcd62fc10198938eba23f12d37ac4b5ef615af129b07b15db5fdf92680e11b44271c0dc7e9a895f45d054844 WHIRLPOOL 91f185f72275c94e2ada23f9652de1fddcb98c5b49da9eb55d22f0079a644c4fac875d3e8b7b5fe277f700469e3837b4280a75c45a303d45ae93df7c7a0b49e0
-MISC metadata.xml 241 SHA256 472bf3c6f1c307f59624c3597bcdeabd49b488992fc115197ff80942cb5d7204 SHA512 ac1e1e43d37dfb1f1f07f677b1d7a0cdffad592402ba33bc25c7b9412bea3728b0136ccf2d4a20acc46a4389e946b8de28f2f4962e689b9f1b53524d323b5ef2 WHIRLPOOL 697f12f0519e6d7a3b45fff4141b097428cd4c072a030c0683c4d47e20e79b30ea3d2e570ef44bffcb73ef3dd53f71b5260f48accbde22a3c473ab39c34b4106
+MISC ChangeLog 1354 SHA256 d23d9a008311c09b7082ddb03bca64b065295c840baa9b0db46447ff92b54b7e SHA512 0a3eb66c762846c85137b9ab1137bf9dfd0dc0e43b1f10835e85340d44b872f32f277f4eda2f1bc724d1563541b3109218de486391711c61b9784406144c1ddd WHIRLPOOL 7f910e15464355812271930f0670da20221087ba08ca1a0c7c0580beddcec90d545efc2158a440def11bd01881e906566bb22183af934401c3d5356bb236240a
+MISC metadata.xml 318 SHA256 ea2abb0915b1ccf9edc2c53bcaaf55d63c8b09fbddced1d145352e837fe7aa02 SHA512 d4fec6291b8a5958e4e94697ee3a5e01ae79f43a76e64c08acd3018965684b801f0a559e9c4340b9fa71ab4d66fd78bdd526b46b07a52d4f79489e8fe7ce7352 WHIRLPOOL ec7b3664c043892502b7a69ccede7f3c4e23fadbb6cf9e17d86ba642dff4a1ec7757775913f056acc1de6eabf65afea966f5efba6b1f64a2a9d091880c27c791
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVdu8VXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiKrAP/iAz5MU35ORQ9Nt07NmWx4Jy
+U8t9d34IS60A0e7G4CDDrclJuckrJWHty9I/3RbY5xtU6XxAkZkDTpemYkCuEOl5
+3Cq0uUpPzadvCqNNVWyK95Zq/baMhk8TJ9ZoYSzlEr2I51WnF3wuEdk3fL/j4U+E
+M3w4z9PDaH3H/C7rE+nnogBnTTqWQqvFOGNtfVK3Ti/IPBU4h2+WqFYTTQqoKzl6
+oxDF4vY7a2EmvZWjY3D4dp5Lqnvxa6wMV5yDNlIojWLMCp+I8AF5KW0gMHZ4mWBz
+VwGliCpNhC0Gq7TjbldQ+jNT6+aXJgujPalB4Wd/fowgd9LyTBtFp/WcJCDQXGQC
+JD38KD3h0V0igNFonWJnsBAP8bAEXee3RTL59NlIYeV9jc3ij8H8xjA1+uXWH4W5
+pxQMn/PuW215cpmUS6P8B/MdsmlQzi9XqZ8FsZ2t8ZGpPP6xy7zor0GaEqac4mBD
+C93Km844nz9uPrKAVSY0KFIpOOcQQOuItZz6pkbpCv1RMNJoVRvbGdEpFT+vToU1
+bjsKujlfPE78U1S+lbCWWhzSZqUqZ5K3Qu8N1M+DOd2KgQSMF5u0Bhek3TmSfErr
+K12xVrDE0yrRO2l8+CClfGgdmdWG0NrWE6M8q4/8b+nSIa8iEL9LFyV6cGI9j7+2
+nu9vvCGVxCZCIYa6BKRp
+=kXUE
+-----END PGP SIGNATURE-----
diff --git a/dev-java/jrrd/metadata.xml b/dev-java/jrrd/metadata.xml
index ed446d077739..3ca4f82f4e2d 100644
--- a/dev-java/jrrd/metadata.xml
+++ b/dev-java/jrrd/metadata.xml
@@ -5,4 +5,7 @@
 	<longdescription>
 	Java Interface to Tobias Oetiker's RRDtool
 	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">opennms</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/jsap/ChangeLog b/dev-java/jsap/ChangeLog
index fc1d21ca3075..8cab724a6947 100644
--- a/dev-java/jsap/ChangeLog
+++ b/dev-java/jsap/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/jsap
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jsap/ChangeLog,v 1.8 2010/04/24 15:29:43 grobian Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jsap/ChangeLog,v 1.9 2015/06/09 13:50:35 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   24 Apr 2010; Fabian Groffen <grobian@gentoo.org> jsap-2.1.ebuild:
   Marked ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris, bug #314093
@@ -25,4 +28,3 @@
 
   21 Apr 2007; Miroslav Šulc <fordfrog@gentoo.org> ChangeLog:
   New package.
-
diff --git a/dev-java/jsap/Manifest b/dev-java/jsap/Manifest
index 63a94afa48db..f005f6ecfcf3 100644
--- a/dev-java/jsap/Manifest
+++ b/dev-java/jsap/Manifest
@@ -1,5 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX jsap-2.1-build.xml.patch 872 SHA256 90b4df32a7653a239058178a094f2408e17f17ef3bce2250d7c6b0e8315e1e84 SHA512 441c653f38ce71036a086d9ef7e6f5851479cbea5af77fbe97a2423513d9a0ff8492c44c69d0d8e6aa49eda72672a4f4f53b99a126b7d8ad974c13d15cbf2cc1 WHIRLPOOL 001213ef63717fbb5525485fb50ad2094ef3c80b48722603d8a652f1648522cc84cc7252f981e8c5ac8c83632855f371db1e67de774cea34841cb84af480d3f9
 DIST JSAP-2.1-src.tar.gz 1281840 SHA256 5146bf75cba18fdf9299462a4127e95919c884494aaf3ed023cb2950217a0862 SHA512 5509d67b8af11cfbf94ca1a4d2b055b84c6c025ca26cd70390f63394d112a842fd39271181dfad0a88856964acd66f8abe49c72c58cc0086445d810837ba3352 WHIRLPOOL aecdc479d5d088429ca10a24a90b8aefc849ff7eef03276e9c2667a28420a2fefcf6d6541b1eee5d8c7891c3aa2c7392dc9e943084aaeac86bcc48d4a4d1dc78
 EBUILD jsap-2.1.ebuild 1431 SHA256 a3d978ce4a41861c56c76fd6a3f762a3d1f9cba4dea74bfa44cd5f6af64d3d4f SHA512 c3681552c3fc3a7363216fd761290c24700e678fbb0b3aa2322a410c9097856c65949635c72f01c1ed6418207d4f1716ff0742acab72f5b5195f81d663ddd4fa WHIRLPOOL 8f8b65c24d364fae3cdc6e3697c9939ddccf0a6bbe8879d8d1e8a31bc542ee3d8527f12a5a66ed461b46af0f7965b4db4b8b12cd7233b92ab280cbec2b91a3e6
-MISC ChangeLog 976 SHA256 63be1b4eebfd654fe5f38081ea34a1bfe8e9917e6ddcd52d2cf59f4f20853c36 SHA512 d6a151ecf0eec58afc6fadcdf094f175d7acf629ac5cf55f03b0cd6986102218a230ccf5c01f1a9420d49bdcb5eeadf6a75d93ab95ba5d5be1cea0ffa969076e WHIRLPOOL 5949c69364a4398f95ddf939c8ecee34847cf8252f19b214c06300fd83c2f5ea102eab8e65cabc80560972fc30fd2573fc2e0eca73bd70cb983a4551ad73a233
-MISC metadata.xml 157 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 SHA512 bbae663e26f48fdc5e272adc2b06c14f77f34c53caf84acb53908ff036e7c12a3edbbc0929d2db56bee861a453381d979c7e0983a23716f629ed2135c22ffece WHIRLPOOL 887e153e2481e7d76f0f1b67a395f10f0328b93930185ecdb8fcb5fe3c50f839086a18831d61cf45b34657aaffca6c3b7900cf3c04b712846a05027a84602448
+MISC ChangeLog 1071 SHA256 1dba97e9e302648421dad38513deda84cbceeaa12cfb3c4c20df26862d365805 SHA512 61c60cd2040b3060f80973d19cbce7239dcbb0fff5695179605b578583be09a21b7ac3b85fe74658685e943f445e95d988b0667b5791542fab9b21691e392197 WHIRLPOOL 6b1e92fe3a2552060bda48ba2e9d2fa8f4b28987336309fada4ab772012a45bc7789d7156f0b72c8f5ef4475b964435dfce1c904fb17cf971540a68f7f603bd9
+MISC metadata.xml 232 SHA256 d18bb8c486db8314a8a00cc69131fb832fd972c701b9323d14db4425a57da1e5 SHA512 707f4317da6286161f180cc3b5cb41847e58583c2794f5aad70055bd82b00951421be2864354aa1c5f69d0c5586538dba392d2bdc3c4705a7960772ebe306345 WHIRLPOOL fd6db01b81680163e9be53e7f575ed0d505e8837007411225d5729c1b42d6dab39fa0fdbc24add3f35df74c89c4170d26a50d4a6eb0b4021694e3066e8dd3bbe
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVdu8sXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmitVkP/AnDnYbwCiO5U1Ma9VxDC9Kv
+AYnQGx+Dh6yD27NrwgPX6jo2n3z4Klqy1kBcZOYWnPNGL7XDXFjMZCBdiwAXyhr2
+HhPVop/tQ5SW+J1yiS7koo9FKXI0mR7vJDkNPFiG8gsIIdyWGVHxkz//6af40GAN
+EN0EpeBtt1Hfo2+SfavwtTAJDIAQRN9B/WFiYLIOzwBi0yXYoZ4g6WwE+1vSHWN+
+2B8YtNHnWX/pDzNSEyVES/tDl4VEQFPB8Zo1G1KGW9EG0SRDleDYrz4gfqrViqqD
+Zq8NUdqibPZtWLKLN+/m+YJoqsdlYcU4iAm65TfKbud8ylTofqpCdFcyqnd11DZC
+/UKLzK2GjymrSI87cock1+fV89/nmfBALjdaZ96ymv5/wZ7JpQ7t6wZjYhPQOm4v
+ZGMwXyN3loVfFT4Qv7w93DYVO3pXltYASPq9Scgyjkye9qeIEaODn/gbEmNg/IHv
+DnaVNs32r+GsOGxQY9bMLRoUuJGeDk6IZxyLhcxj+e8zMUN3feQHWnLNF3jmOeJD
+MwCT/LH/U0Q+vWBz5ObtivCewT1y3o9wqjncZSoh6wkYQUjXwI2qrDDobGgxd02m
+224Mzy61pJN3pONi3LKF5Di2l7h7/JXlJmtsQsohlViEk2/++l2s5lYxOr+94Avd
+eKBddrWdkkruoIEELfVt
+=9j4q
+-----END PGP SIGNATURE-----
diff --git a/dev-java/jsap/metadata.xml b/dev-java/jsap/metadata.xml
index 838c00a4a448..f67c76a9769d 100644
--- a/dev-java/jsap/metadata.xml
+++ b/dev-java/jsap/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">jsap</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/jsch/ChangeLog b/dev-java/jsch/ChangeLog
index d3187810cc84..991936647fad 100644
--- a/dev-java/jsch/ChangeLog
+++ b/dev-java/jsch/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/jsch
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jsch/ChangeLog,v 1.91 2015/05/17 20:22:17 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jsch/ChangeLog,v 1.92 2015/06/09 13:50:59 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   17 May 2015; Manuel Rüger <mrueg@gentoo.org> -jsch-0.1.41.ebuild,
   -jsch-0.1.44.ebuild:
diff --git a/dev-java/jsch/Manifest b/dev-java/jsch/Manifest
index 656e6f02a1b2..435b0e1f7d12 100644
--- a/dev-java/jsch/Manifest
+++ b/dev-java/jsch/Manifest
@@ -1,6 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST jsch-0.1.49.zip 312322 SHA256 c017dfd2533b86dd751a8b1caea0ab4f19bfb9199c207c94fbdddcfd2ba9bbfe SHA512 6f21db4b561da65d4d22ecaecdc784aaca26b2dc625646a18a27b5dd7ef0eef5596786553e65b2d7f118b4993c4bb4e9561616052d15edf1a1ee1a3a7fd6b4ed WHIRLPOOL 4d09f8d122d1948400825d286718a2ee5cb42df55fbda059ff6c1260c88a5e6318ae9704d2bd7afc1f655b55d9347b39d158a01eaab1d77c506a6b99f117217e
 DIST jsch-0.1.52.zip 363648 SHA256 ceda29572f9bd670e425e48772b066e62e7a728edc6a6e23ba75f10444832ab5 SHA512 a5a998b6139638eee403e120f5f217112a5c09e81db8e1b1240d53ca311df4540b56aaa5f67f7a5c40cbc8420535d72d456e4fbfc95fe86d46376a00295bec4d WHIRLPOOL b820f35aab95e385bf457fbbd3ea4fc3c30057114c5c7025ac56dc435a4c708c51b450bfbac9b8202e23b90f062cced194def4aa8b479d629f1bef8121c66e5b
 EBUILD jsch-0.1.49.ebuild 1311 SHA256 21dd32f8f9630044af0a1d9fcab7532652418418863a2d9ae68446f918b0af71 SHA512 a0d82fa0f2b1923ea13107d5d3944a4a1f55ce643f4860d44ee731937f271ba7c27d85388f546b21adf2c997b603cfd7d3228049d8ef3cbd4f830fb934b57dbd WHIRLPOOL 626fd1cdbee71f3a1e9f1a794e0057537258849399509780e1fa889743b780bdde85e8c0998be686c0e7ce2e731f1b612fa92dd69e2546607c7ce2518eb75905
 EBUILD jsch-0.1.52.ebuild 1321 SHA256 1b2a9dce3464174daf4108d9e6c1e877c0a238bbd26fe2b97ac5f3eb6e2388b1 SHA512 70bc2893ce64d0e558a397286af25cbe83bf91ab10a45b9fea437ebb225f1f3d4708180263de9a6a624ad40af458242788018bf009277d590b914ada2d3eaac0 WHIRLPOOL f2ac20b6130d7e5a9514bc23a422a3a166dd82a09d5711df3382b49f0b1673f8241e13d6f900dcf81b855bf84c0dcfefbe2468b07185318de0e4e24893d73d5e
-MISC ChangeLog 11220 SHA256 5627b647d055788bd3e7db6fbfec400deff0c83a4524f1240e4e624aa8fe2e1b SHA512 bda7b303d1749cad96bf10eb6e46297770cd731e5ba425e0c868718d8bff9766af43ec8f9af63c476ff98db581d1069128e5d40e1ff3a6918a3f59ae2b083d7d WHIRLPOOL 3c7fb7438b1dcdfa690c9328cdff10c0cc6634bf63f22ec3738980f2935f1c1b3baf00d9f3090039ce8682bd96ee13143d2f1c5a6785dcde5e496559bdb5956c
-MISC metadata.xml 157 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 SHA512 bbae663e26f48fdc5e272adc2b06c14f77f34c53caf84acb53908ff036e7c12a3edbbc0929d2db56bee861a453381d979c7e0983a23716f629ed2135c22ffece WHIRLPOOL 887e153e2481e7d76f0f1b67a395f10f0328b93930185ecdb8fcb5fe3c50f839086a18831d61cf45b34657aaffca6c3b7900cf3c04b712846a05027a84602448
+MISC ChangeLog 11318 SHA256 7b1832b84f22a31df2213fe3be7a408df870c98ca06b16a5e6ea678db19a5d4a SHA512 1ead95af3df9234bc513476b1a13e9ea0097487d4079d478acf6fd3f10cc1fed9fe35558378debfe2cd3c608eaed5ca53a0553b7042a77b0b96b0d988d092495 WHIRLPOOL df3fab80f70813804a3671d09118738670bc6c00e9981462955e9f47386b3da007a5242c708790d3bc5873333868e3460c971f3a0a3714cfdfc22235c1721696
+MISC metadata.xml 232 SHA256 57ddff1092ce166edc67c181cdc9ff76f3fd26fa857f7e8b7e751157a6d880b3 SHA512 6a3c1822ae88530a2587484b7d98aef8648db3544d39672815d34e6f75cd5a2cdcb28a720f93b88490943e3ea731f80bb5b37ebd0a14e6826c270cf54741ffd4 WHIRLPOOL 06818c76c92aaed7dc69b4ecd2cfe79b1fa117a4c0648c37741b3cbb5b4d42b30db6412daa1c72bee9031ef71b662548b35f87fd72556c98c6b7b14768c37630
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVdu9EXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiLpIQAJTnW5AN8thiTXapf90OmFB0
+B5TSAljJaEhMAaFfISxTxhrhmEGF4K4nPPZbNPhNQeViCcWoR2M1dbkaKLjU5SNP
+5f88PA/guk09xougl3ELbsXihGs/D2ZLvU+WNm1zqdQaWarOQLexsFtOuT+n4AEN
+vi77NaC+wPfJES13pr1w84y6fQgtFEQ4dlK8KAmFnSaehdf/oN5U+JZakzhyPDqH
+5ZWC/rVCu1ON5pIytHOWmH+olEdQ+jhUniGJ4tMeLsu5Q61p+Qp9oHo8R0YEbJMJ
+yEEqnOlflbiEjcvcllf7iPghOYzUe+8JlwVQ5RriJS0gGbPG+zAU5BcDOlXTZBke
+19ridYZ0JTIjaiPqChkmtlRxf9euhtZb+tweeVwlWOm0BKRh7n43SLI93ha8yxdT
+J7nA1yvOZQT76zVWet2PJOKMh1GGqn8EU7obK1Majtxke5I9hnxePqBSlwaBZt37
+LJr5BSPwgHCwOVWEqsOGI6wTPSomgdi9ei8zvpER7T+jVyPWp88pi9bsmtAkETlL
+aOE5PhhlHgxd45MnMsphIPW/btA3aWFUjZNJ3qKreJK4EHU8sBG3rcWmavFaCBIB
+AJdeGrULJRbScuLBMTwI0Q3fvK2z7ZB/Ix8xCp9tCmgS+oK4/e0HbEW7i6p4Z9B2
+L/WauNE4t2fuVb1rBALR
+=8YgS
+-----END PGP SIGNATURE-----
diff --git a/dev-java/jsch/metadata.xml b/dev-java/jsch/metadata.xml
index 838c00a4a448..50449828380b 100644
--- a/dev-java/jsch/metadata.xml
+++ b/dev-java/jsch/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">jsch</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/jspeex/ChangeLog b/dev-java/jspeex/ChangeLog
index 1ede03290298..2e23f723d15c 100644
--- a/dev-java/jspeex/ChangeLog
+++ b/dev-java/jspeex/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/jspeex
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jspeex/ChangeLog,v 1.2 2014/02/18 22:37:56 tomwij Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jspeex/ChangeLog,v 1.3 2015/06/09 13:51:18 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
 *jspeex-0.9.7-r1 (18 Feb 2014)
 
diff --git a/dev-java/jspeex/Manifest b/dev-java/jspeex/Manifest
index 4d8ab929845e..987ddf98e7d4 100644
--- a/dev-java/jspeex/Manifest
+++ b/dev-java/jspeex/Manifest
@@ -1,20 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX jspeex-0.9.7-remove-junit-report.patch 530 SHA256 4d826766c13b91991e6189014e0a9641a901924433762960cd73411a1d8ace74 SHA512 8a38a6033ca138a131ee716712efd463c2fda87829d46eabd8fa561af0327fd8718a673075eaa0f6a08a931bfd142be23c65e16959a36e1a845dc002744010aa WHIRLPOOL f8e7b03866eff9aec912add63c49828597b9f5c781b6f5be84e009b8094094a0112e6142d4701683f490bda5beb889ea1b33f834222f0c2bd081f7b2896b215d
 AUX jspeex-0.9.7-remove-proguard-taskdef.patch 1655 SHA256 a5cf1d2af63fed9c255f30878627d952d180c513640bc03d3a512d223133d7ef SHA512 d8c6358d01c659bf2e83d99d7831f1177383701ea34c76e8b39fa83a85477f8712b6911b6bea5da4e07b0e677816a1b7b4e90e51ee3c71fb7d0faffc9fc9b0d1 WHIRLPOOL 8cd3815b3ef36db1b185c29da6dc6839f6ac034e9c40f6823c6aea57a99202063d964b03967adda094a230f5c35be5d84c22a0d1d765d7609998191fd6113d0a
 DIST jspeex-0.9.7.zip 733580 SHA256 55d04780617d87ea2216401dfb66dfdfda9ecf5c018e48a2e4bcdd5c60910daa SHA512 9673bef155f1cccc45bc0a0d5596e79b48ba044309ba3446548b570bc7bad60b4b22cc7761749b0769114c7341b9fab6db8e8a155070f9de6fe2730c843199fe WHIRLPOOL d7555da834098c223b0b0f7c188d35594ef837a79d044c97ea14504a1173c65cc3741e993d936cda2812d3121d3a57e5226be9502db3fdf918b6e55e89bda5d1
 EBUILD jspeex-0.9.7-r1.ebuild 1263 SHA256 6aeddf11223b51cf3a7cd7079de6e7e6abc3cb1e2002486e9aec5481c1e4fb5f SHA512 6ae3733ca5f7ee3d5e3ba4eadb3c4f9d137ddfed04cdf5f251b98e6dceaee94f4a88886ba7905c662eda3246aab6c0f105e9d71fc8e39e9e51d7268dda78f8f2 WHIRLPOOL 720d3dce32a596791551e8de3ebd16bcd0a8d07d93ea38f852ae67e75835fcec933173fcbe65d69a8b6e82d5c1231f3d80c5f3884ec51f1f7f85d7515e75b5c7
-MISC ChangeLog 832 SHA256 a2296e0e59bc36718910789b85182ddf272e88d4e7d7e02b81a06f8ec9ebcef6 SHA512 8437b75975236ab1787b0060c99f8c049fa021954304c12f47122a2a9f437bc282591897d23e9322ce13a8718373b41d3ef4543043387efa3b2e55f1845450db WHIRLPOOL 841855d881824a45f07a1245814a632a62d4685e9dda8145220fddbb00572e68cd0ddeca5c151d6b5a8f27dcfac4d1cecade12fb2e387b6f44ad2376b3b7d51f
-MISC metadata.xml 157 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 SHA512 bbae663e26f48fdc5e272adc2b06c14f77f34c53caf84acb53908ff036e7c12a3edbbc0929d2db56bee861a453381d979c7e0983a23716f629ed2135c22ffece WHIRLPOOL 887e153e2481e7d76f0f1b67a395f10f0328b93930185ecdb8fcb5fe3c50f839086a18831d61cf45b34657aaffca6c3b7900cf3c04b712846a05027a84602448
+MISC ChangeLog 929 SHA256 ca520e844928506f714db5e57868582f784f62db8488fc8a434c8ce8398c5ebc SHA512 0baed61f061ba8ee60a9dbb5cc2c23dc55ccbe9ef50cdd5f050504e82325a983fbdb9012a80a82dd52b0925e640ccd08d1f805451247282503371d917c235cf8 WHIRLPOOL 07a9aa67bb4c870f913a0d264502bce8b413713f74de8e8781b89c84335027a11db4c1818edf79e2f7c48b0b8463ad8fea39b198655d981b1dc0285a15aca559
+MISC metadata.xml 234 SHA256 041473f7b9582e7803e5d24db377f43ce5785fcd4073a2318642fa217c9b2c93 SHA512 bab26181dc1230464e7bf06eaf722a2bb580299ade0e1360c5bd991f522f3c4ae055d13a42475a71504168e260e2521a96c4ada54c23de0f24259d7c14658755 WHIRLPOOL d801e3a5058b17701b67d331d20f8f12a48f437f7359f0e135fca7c01c107bd1953e8d5fd47012120a9865700636504eca81fa4164414d754e1105f6f660f982
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJTA+DBAAoJEJWyH81tNOV9vAMIAKIDDbyRiJvtglrW00dzV0X7
-Qdeh3ftbjSwnAsg78Ws8jmALF5HpHGESMGHtrLLB2Ui9S5Q5kys1q4y7lSlUCpUJ
-GaVN+cavD/x4bmOgM+tEUTIddNT6fx/Cxhxt7A8JcRZJl/LG1Ce5r66Aqo8GArfS
-Z3nO8rbhfbvhek7YPJCcMlMzPlGE2SAbNwmpsJOPv2OPP9r8NQt1D3Llbi5MDCUx
-vB/fMqFJsBSWtGiX8agwajG6zivZzIsR+V0F31dehksX4mWSuRXqTXrYGuxyZSNs
-iJYp6MuiPF9811vI1gg/suC72gwWEYWm8rdxGAnhr71xweJBqQr87J/ttaI3Z/I=
-=90y+
+iQJ8BAEBCgBmBQJVdu9XXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiWQUP/12gmTtsjCvi6hkHh6BZ8CPg
+jaVySgxFiJ67LwFXEXfqBM8DarRxqp0SP6b40wdKzdd2/6tVzJHD0ZxZV31v9wL0
+Gx2H6kh4vVxe4YpD4lhQeiZdvFtZImF+aR9Jk8jDlWQmFRA19a8POEN4WaVY8rtw
+MQwSyVOzrnKZLGYhhx4zpPR8UjvZ75RmghM03CyBXpevKmyvcnSq0PDM17cJlAmq
+5OTAlQzk/47oEbvCMZEMRf6YV3/fpQs3rOhcyIJGs/tNUeKEgK/hxJixqxOE5pcC
+sO1qHpJukJoHzA2uNprJ8zubW35ZaKc5yoF/GO11iDdKqKei8nyfN2bpNA9H0TTX
+UQ+D72K+weX+VZvAx0c1E2OE4DFnZpGnhHnoF2+fVgcgyELMth5bOpTciirQab5L
+ZHZX4TsK8kR9RblFNOFVgUAm86t61eDjndzSJZ25OsKd2NjpdfBTmbvDXf/+7UiZ
+tK9MbVM+jNFJLyjGxB/9Dm5roq8c/kw/L7oV+Hua0p8RyQdkv2QwhnJIwG0e+6ei
+BA7edyuIw8T9gqnnL7KHH9cnov4B0VYb+g8+7HnmsfiQ3iZYaUNe1ISrDFK4gYp6
+/WV7D2OwcnXIS4G6/zoglklT3WDyg0qhNOlwRtEcN2Kj8NtR6QnH5wOCx2Gf2zvc
+Ub7lsrp9QOd9klRBdI3r
+=uvpx
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jspeex/metadata.xml b/dev-java/jspeex/metadata.xml
index 838c00a4a448..76fec185fc9b 100644
--- a/dev-java/jspeex/metadata.xml
+++ b/dev-java/jspeex/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">jspeex</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/jtds/ChangeLog b/dev-java/jtds/ChangeLog
index b4f92cb5eb8d..2402a3b79146 100644
--- a/dev-java/jtds/ChangeLog
+++ b/dev-java/jtds/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/jtds
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jtds/ChangeLog,v 1.34 2014/06/17 11:19:24 mrueg Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jtds/ChangeLog,v 1.35 2015/06/09 13:51:37 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   17 Jun 2014; Manuel Rüger <mrueg@gentoo.org> -files/1.2.4-buildxml.patch,
   -jtds-1.2.4.ebuild, -jtds-1.2.5.ebuild:
diff --git a/dev-java/jtds/Manifest b/dev-java/jtds/Manifest
index bad61b65f436..1f34ba631c87 100644
--- a/dev-java/jtds/Manifest
+++ b/dev-java/jtds/Manifest
@@ -1,8 +1,30 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX jtds-1.2.5-build.xml.patch 1009 SHA256 79cb55d1a57b7d6d1f89ace77ddf71a3248ac213adb1e2059d7ebc2d4701fa88 SHA512 6cbee0e153ee66a5f7120ab297784093e4719b057d91fa3e4c36ce63066b71e06509c46b4aa07973675c7c08dd1e9915859344936be1fe9a510c93975202da1d WHIRLPOOL d4f04d37d4c23550d80f31844258f8e408e14e9d22586314bc54e206b0cb5ef94936174b49dec1dd64578b36e46a4aafaa3ea587ae44d63da3fc592d5d053ae9
 AUX jtds-1.3.0-build.xml.patch 285 SHA256 995cf012aca97c6908186b3a96723d965a9dd17e5e3f5fc3730dd56da46bc6ab SHA512 9ec6a3e92d33ebe5bb62cd25814729b3f95ee1fc4ff9aa72257fc26106d469de431d60f40972f61c2bc193d8b6f7c2ba181f00f11361d6f79b78aa530b34f1bd WHIRLPOOL 84df412ddf7f46a702408c56894d787bab3ae2f32b4bc9fe5aab815f0075e24f3cbfdbbca415c3f9729902a7cf950ed4b3ef496de5910f90ed3dc95f93f137cc
 DIST jtds-1.2.5-src.zip 3953955 SHA256 d86c7244826543d2f2f9cdc1d50888003596c1ec18f30808b21627e8889e9114 SHA512 d2b496a7aac4e4c9c0e164c1514d2d21392024903e1376b13fa6a3396d045a1bfc6a085b2beb1202703a6b6e59e8b534bc82508fcb58c71a25b6a13a3d051eda WHIRLPOOL b5e88e6cdb00f797de1d824a7581d693111d4d746ce6d5a709934ce00befbed4fb4c3b248448715bdf27691c33d8f1cca8ca270e942eb27907cd2567e919084d
 DIST jtds-1.3.0-src.zip 3377646 SHA256 9f500d9eb243e87ef16fbec3909d297b7261893a298646223c9722162ab43c75 SHA512 a07b0a69ecf055a6b2fac0a0cdf3f7562fefb7c4e4c65eed96cc9b667a66b4b4a0de543d904d8a9871031e181c0e75c450afb2f01bfb7a504d1abcd9776216e9 WHIRLPOOL 65707009909715fdfbdcc54b0345c657ec226810414b7d5a3fa08ec04b5eaa11950901221f5934a0e81739cfba70d004368dd7e2a95125d93d981204bd67072e
 EBUILD jtds-1.2.5-r1.ebuild 1129 SHA256 6e369dd8a7a1dcd859c5db37986e106efb24f9e962219521ad6b85e98d1b3748 SHA512 aec43bf96b1de8070673e6cf8712dbe177ca97d8f88858191576ab6d1bf23ecb2ec60148f3bcd363d79e0380791760e9036ff8569d498ff43b183d7404679be0 WHIRLPOOL 9b71478600806076ca03777462ee75aa5e112bf7b6d40899b9e1c6aa77dd5007368990e35aa3bd1176d1d9366497ca0e31668ba226597dfc79749dacab41bfc6
 EBUILD jtds-1.3.0.ebuild 1101 SHA256 b9685a1a77738daa071dd91a951a4a2ee658463feb050ff5bd152b7bc7076635 SHA512 3787f33ca16130fbc22bb827bd29ce80760d7e25e33e2d29ca5e3ccd86a90fbadd131840555baf8b3c4b9cfe9d7d2f1c88569b422515ccd2584ab600877aa6a1 WHIRLPOOL a051a179e6e22b667d40e8d6c088030122d0e2e457b742352346d13acaf31a47a1ab03a934997f50c3f7958f3fdd70530ae863400ef6b603fcfbd0afd469b946
-MISC ChangeLog 5062 SHA256 f976aa943c8f2387e86a42802980bf77b0c11bad9af836ecafb0a744321ce7fe SHA512 fd161897b1175f82bfea68547a6f5ebfdbedb1d74d2b2df70a78f3fe23d14a4040222d53c24c6524764aed0c73e29a1ee691931c9aa72b668fcbc5328233ba2f WHIRLPOOL 47c987b87bf9c648600d2cb737f42ebad87027d3d14115cba066c72b3b47f8a18b688eacbc6fcf44e955128f5531ba4f7011868119bb8bd2fb2d98b28348f73c
-MISC metadata.xml 723 SHA256 465dd20f6c462d27f6ea146e8e74123b9fcb70d59476e7f2be93f5b32d71d47a SHA512 f6c39c65fde1f2ef766ddf6a3574fb9fe96122e8789d870678b416755c7497b648e72ff98d12c940fc69392c065eee5d2b3a6b2e7b4e48f89af1d0da32c2d810 WHIRLPOOL 0173482879a754497fee42fbb3247aa6dfc2dd13756866741aee23637cf6a7a1218501e640b646ccf28fe38d3a0a58ec5e006129ca49187442d679892a349463
+MISC ChangeLog 5160 SHA256 3ca0cfbb671a653a40b4500d0eea838cfba699e738df8df2414153301132b8dd SHA512 4abf06bf692fcb27a8e92ac57597d254c13bcee18fc44fffb9856e92a83f01926245a0ce64acae5e6030b2df1fb35131a0b86f383441d4759cd373936e924346 WHIRLPOOL f25312d573a6c476b4df6fa3c7a47c2dffbca9996488c16dd6b70e005670a13d5ba8406d20e285d139210dd9848c927d5b1a6054010121797d6e0e06a0981894
+MISC metadata.xml 799 SHA256 96e2cc2871a46da906b4069d611d746cba5cc00f957d28a7b11c09a42bd4efe6 SHA512 232cda407882de6aee0ecd0af6971bb4f4368706f20bcfa69ad2161e7142124b6f0370e9f500bb6e74dfbfa50405608fefc26e840788298551a9cb39aaa0c1cc WHIRLPOOL 0c7368cb1bd03cc6f03357f54ee3deaf7d2a5ddbc2782846c9468206f17e79bdc163f924d9554dc4b5b458b83eebb0c8f90dadbbd6c98b27b88afdaa6d767f7a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVdu9qXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmimSkP/0IKWF/zcowhdEnmNJLuDLDH
+NDUOZfNbPttBt9rdMZ57KaGZvCoa+GisQvbE87DhaM51qs0cLYLfc5VZmeNlS19R
+s4NGqEQh/Y6xup4OniHLejAagRNbZ8TCyBG4ByehG7ZX4k5jcVJMq/dkYJY/NNAo
+ZYiW+R7RDSMhjOYsF55dY93JmhX89HfmxA5DstPKWs2Uc9lzF7W+g2ZRRBmWuJui
+HCbQblR+8Ecn+voky/zCUez/n2nJE1zxue0WC163v4ZfNoIXFScevvjX5dP2HfKv
+t9zrjttPo9M9f/oMduw1/IBhOV/M9nsn57cOpQnpncX2VSPidyH0oKbVxmSTfhwD
+f1yInEJq2+vxokSqOYnSS+qDUOBt+2gYzu8JhTDgQhLG14dupsONpmFcVO42vUga
+Ak2ngQ/Q4ZDuT5C19nQyGRqda3czppjkIGrncgVSvasUaeGSuOB1Hop6OGu+N+2E
+6hQRXWuHNwigUeMhgxJAbT4GU8iQ9TBsDPE+1LpAh1UJoU5WvPJ/Io1ehwBZbrwn
+gaDcQLN8yg4eW3hrptm2KPkVo9sLPKJIIZeD/ySxUftppQk60gKg8xDV8fCHlEr4
+HrqkCpaaHM0pUHaotrBItan1CDb8uyLz3nfq31tNYrygfqRy8Sb7koR85sSROoVI
+M9KtCybJLtI4XtqANRhn
+=AmuS
+-----END PGP SIGNATURE-----
diff --git a/dev-java/jtds/metadata.xml b/dev-java/jtds/metadata.xml
index 751c373e5877..7e2346bcf86f 100644
--- a/dev-java/jtds/metadata.xml
+++ b/dev-java/jtds/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
-<longdescription>
+	<herd>java</herd>
+	<longdescription>
 jTDS is an open source 100% pure Java (type 4) JDBC 3.0 driver for Microsoft SQL
 Server (6.5, 7, 2000 and 2005) and Sybase (10, 11, 12). jTDS is based on the
 work of the FreeTDS project and is currently the fastest complete JDBC driver
@@ -11,4 +11,7 @@ compatible, supporting forward-only and scrollable/updateable ResultSets,
 multiple concurrent (completely independent) Statements per Connection and
 implementing all the DatabaseMetaData and ResultSetMetaData methods.
 </longdescription>
+	<upstream>
+		<remote-id type="sourceforge">jtds</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/jtidy/ChangeLog b/dev-java/jtidy/ChangeLog
index 1dc12eb1c96d..836ac679b594 100644
--- a/dev-java/jtidy/ChangeLog
+++ b/dev-java/jtidy/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/jtidy
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jtidy/ChangeLog,v 1.19 2014/08/10 20:20:08 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jtidy/ChangeLog,v 1.20 2015/06/09 13:52:00 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org>
   jtidy-0_pre20010801-r1.ebuild:
diff --git a/dev-java/jtidy/Manifest b/dev-java/jtidy/Manifest
index 46c564bacf96..68d109fe1ae0 100644
--- a/dev-java/jtidy/Manifest
+++ b/dev-java/jtidy/Manifest
@@ -1,15 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX jtidy-source-1.4.patch 316 SHA256 68cfa05ec18fba8a4c00ed70ec271bae711bedd6750a474d584b0a5f396ae956 SHA512 718a2a53d5c9b2a505ebd24a8a00fdf01919436eb3df25db69a302b85ff613f16810216c87733c3855d0b22e0aa43222e06778372895ee3378be10090f9fd4e3 WHIRLPOOL f04f4250d4b1b6eb0299b09970fccb95d435592f319c3680e41d337273d5ccd48cf8d3a4750cb36cde5cbe5badd316550dc858e89016af01fa2439db31c68296
 DIST jtidy-04aug2000r7-dev.zip 718750 SHA256 18e9fc9bcf2d573a27a466ceee2b75772c6dd830af8e83cadb23df9d772583c6 SHA512 3e8baedd992797d7894b2b47f5e214b55189b34081d276563a152ef8603a22188c64d4a363279d1a400cafefdb24018467249bc67283c547f27da44c77cb261c WHIRLPOOL f90403fb86b9860e355710ce0b638a16979487f6aedb9cc1ee4f23d3d0bddc65689cdd989dcac2391f141bca15429f8aad24228a25dbf50df76802ec6118961c
 EBUILD jtidy-0_pre20010801-r1.ebuild 938 SHA256 94d10c1e30a76660fc287e7ea3250e37d3d8b429a3941fe26026a78bef59e48d SHA512 05b5a26f79b3b555f6fc6b89d324dc3c52b48e62a00385612859116a0876ed2a1f8e59a1cc6cdadbc46beb51a9e86410ddba1147566d0e555100f6bbdbb1f4a9 WHIRLPOOL ccc7f6e1d9dbcbc54b6f97f5304c526948f3c05ac15f25e7ecbdf9274833d0c7971ca985c3edc4e4f21b4358a5c16d2442a1a83175e7a33fb65cc41e18891e84
-MISC ChangeLog 2701 SHA256 a6e23ea989c19bc830f55ca7080caccd2d12554bcbfafcea2b7827dc3de23ad6 SHA512 a95f8292ff926a394b060531e32372953cc5f03c89f2fff63fc46a319c1e4a59a8c9f6a1370ee2ceb50a132178510e3480a1911b7e77cb6274e9d22c02f8090c WHIRLPOOL b33dc8f357c1b87d2e480dc054073080eb04106a236e7acc233a4f1c4f07ca346a96ee06cbc65a759a05f2fe0683977ffbc907781543693567c979355c2e0ed5
-MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
+MISC ChangeLog 2798 SHA256 fd4e9a0a066476384cebdd0b65a31256bc1471a0d74ce1443d271edd1f8f6b0f SHA512 2ae7ac5d20c0f329046c1832e4e50770f8d75fbbce056c97b10b83e8d4198de24d0577a16cce2678ec14c77ab57a7c208680b40d7953081d98d6e25024209b59 WHIRLPOOL 446d4d30d0a72222fa85e669a6eaeeb9733a514567d67320ee28ca1a48ff7ea3f94b024f3f67ae061d8fb925701f0f09b9fdfc42082d3fac3fbcf42814c1b420
+MISC metadata.xml 233 SHA256 865d37d18ba2f2d09698a9e8d5dafbd1df0cb27a659d3b877e661daf438cb092 SHA512 fab7a2e8526a42c5359aeed0eda8c41e55352b0284c4b0703cbb5d111f6abb142371ad23b32638dd7ff08e4a0a228f4526a4847220e71eb96d5607903754cc79 WHIRLPOOL 13ce660c26372a636b5e9b7ed3739036b5ccb3214ba17244d2b63dae6f75618df3d159f9f5dadf05a38b0085aa12dbdd486b49e4d4e0ed02aad2d9648e599a44
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlPn0/kACgkQcaHudmEf86q6PACggAutiO+YhsDtVY+cHAsK14jk
-06EAn3WkwkjpZpb+BW8N/p9NKAALXlS+
-=nrbZ
+iQJ8BAEBCgBmBQJVdu+BXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiuAUQALHvThBkGtuOHOdnWhXOVSvt
+1kcgFc9zf8Qs8jid5zxZ8TLN9XydLGkid5pIZjuRD+MAGek2UurfRcaT9NwiSoP4
+pzlzKKidGr8+ZkVBIUuYqrsQ2BbqXiTqrrj20/ntoAuSxtUTYST/OP2gQbwQOVay
+9mwate6cW9umFcdHcwTOCRfyuRQA48GSPsA6ynXGlIyk+rfkIngkv/DeD58maeIY
+/tEXpTbXeJfWhhQiaFB0tr4BAb4T5NN048F2SNXBhA4j1fJvhtRtLMBL9Wt128fM
+7EJ0Nhc7DLcSVQ4brw1rfho3AlFJht+IC8oIEPze4v9yeSPRry0dnD9+r0KbVxpC
+eK5pFZRaJ/p1Tz3MuCBJcV22GgavDG5K2mMHfHeeYSJQ8PDN6GryQCFukTsUO1tP
+/RIOw/q8nZAZ4TmjikCfgqvvuWCTm75spGf+TzinSUKetjtTDUVzRSPCAMGSLU80
+3A8XCaX7yTqjdcTI1sKgJLx+9j7PwIl/3jKfRIsIGY+Uc/+0YXKDeb+EVSmWtq7b
+MVdOtwVOXVW8WmxB3qlpuRRgbM3e0gi1wUiN4z00bfZQypyb2wN1fwgvF1Q0uEL5
+Ql5eMd5NZStvaz4Qbsnc+bZFpW4ryMpeeLii5UOD4l4N7LBuzKnnEDwwFDVn2pJc
+zP0opS8nV0hheMEpyKi/
+=XqAQ
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jtidy/metadata.xml b/dev-java/jtidy/metadata.xml
index 7303cef96964..dde84c30de46 100644
--- a/dev-java/jtidy/metadata.xml
+++ b/dev-java/jtidy/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">jtidy</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/jtreemap/ChangeLog b/dev-java/jtreemap/ChangeLog
index c6234111b488..84e5327300b9 100644
--- a/dev-java/jtreemap/ChangeLog
+++ b/dev-java/jtreemap/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/jtreemap
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jtreemap/ChangeLog,v 1.3 2010/01/03 21:13:18 fauli Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jtreemap/ChangeLog,v 1.4 2015/06/09 13:52:17 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   03 Jan 2010; Christian Faulhammer <fauli@gentoo.org>
   jtreemap-1.1.0.ebuild:
@@ -15,4 +18,3 @@
   +files/jtreemap-1.1.0-build.xml.patch, +metadata.xml,
   +jtreemap-1.1.0.ebuild:
   Initial commit. Added as a dependency of dev-util/statcvs.
-
diff --git a/dev-java/jtreemap/Manifest b/dev-java/jtreemap/Manifest
index 91d7356ff6ab..f46f73929aa4 100644
--- a/dev-java/jtreemap/Manifest
+++ b/dev-java/jtreemap/Manifest
@@ -1,5 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX jtreemap-1.1.0-build.xml.patch 1327 SHA256 42baf7496d5cfa3701152ac36f8068680c92e399ccf1c3770d80f1b3bb6d9ebe SHA512 bb47118dd0ab1f947f4dfd60d9ada68e940667c5b75484f481452a6c712c101d1da4d4684b13f888f25ab69fb8aa42871176454ad3d93ac25b919f0b26c0ea2f WHIRLPOOL feebfba625f9976dbf2837ea3b79f8bbf80dda6727c0d82968f845b70ce058edd2f8595899acb910364675f1a9dfcc1c2ec92182e16000de3011bc55cf0d516e
 DIST jtreemap-1.1.0-src.zip 7358161 SHA256 c6e27ec233e0da4e9ca7dc8b9a07ad60e99aad4cf9973c0fc4f37d0e58a158a3 SHA512 61c6b5e22cc839d6cfe8368bbd51db94b3667c8f4064645c3d70f5e6c93b029dd495b64b602570f59559dd99723516a197dcd1d915799411dc7f7c516bfce84c WHIRLPOOL e82944d0317b7ad3848552ebfe474d1bd8b58d13ce59a36f7339c15b8d23ab1ebade829072b79b46606f340c4b664038d1156732d57791cbd191c51d136d7ef2
 EBUILD jtreemap-1.1.0.ebuild 1018 SHA256 db3bff8a43a494997c54e2a26cadfaae618a9d57f1ce7c879415ae26c224c630 SHA512 a1ca5f8054eb5cb290f781f9b01396c658bef0127ad08dc7b5dd770a8cafe786be545cda7621effb18fd209c24ddfd67498dfba9adef30d029c90f667f846dbd WHIRLPOOL 0389967208fd6ee89f832c762d8fb9fda60b440c478991f85389b1447b1584fbefcc69dd07b124c2a9789218fd6ce5f0ddcd335621a63892aa0791e6cf5116b8
-MISC ChangeLog 640 SHA256 96c40669172a00fe4c9116b3c9e8336f840b4b9df485e4bc5a4e7eee43bf00cf SHA512 d8aa66eff5e382819fe2b0a0d1ecde4d26be3ec0374a607f785279b2aeeb8f869f44cef4d6202c10cb1ef6e4898d4fd7560f835e1cad4cd9d222dd4dd1f55bb8 WHIRLPOOL 0eef43a22ec30af84c5075ad37d58520e7e11e8d74d2d623f2f0886374f87fb30725689d0238d9f08d3afcb29e827ea59b37810ec18af735d2915eb4dd61219d
-MISC metadata.xml 217 SHA256 00a5772b0da0819b665dba21d321e4e2393c818907d38678d179cafd5036c7f2 SHA512 c831b55f48fe5072b2af6e2e4731462838edc100a568248719a12de95fe7716198d12e159aa3025294040c26841607e04ccc87451be220e667fdc1146f4656f8 WHIRLPOOL 0d6782469b5a96acc07542adcdc15ac99674231aa8f6384bad12fd50cfd7994afeebef4cae6269599588193aa8bbcbd9d986579baa5a33581d89edad6de8634c
+MISC ChangeLog 737 SHA256 4c6be9e83c5e6baee8b5c4e22203642a7d1dc7c026140ee39a83cad164116bb7 SHA512 da475ca03ee79b70b874bdba93f77d4e822a5f0f6ce6e2e3da84568f14a2af9f2406499a5fa76ee4bd3978605a4ac55a985119aec2f16bddb064c7bf49871536 WHIRLPOOL 86fad0deda99f6a5356480d345a4f0d75e4067ad04008e45149aa9e5f564a1537a833092e6d96f90feb18c033dcfdd9bf56edb36e7193eb4643cfee21f6248b8
+MISC metadata.xml 298 SHA256 81aef408768e3e51671d5af8981bd766d7c5b8d180d80b7e869c3217069fee70 SHA512 1fa5b30c93f1afa33607f576f967765f07025a5292e0e9e3333a387d5210e7b6629d547d6f4d59ad57001eeeec0f163f8b00b084bf47c97c962eb2ffee53739a WHIRLPOOL d8cb385dbd97e16f4e26c583d4796bb473c7d5f76b847bb5987e7aaeb71feda9097dc6ef08d1b8339352df42770dbbe8c6f0126d7c909585d2a26711ba0bbd73
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVdu+SXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmigKUQAJXYivyWxjyCTYzWbm3M7zvZ
+JZcdxsRqgxKvS31OhkQk8a3iEPt3/ecikdlXLtjy9dZ8MVRoUIyhwjR6M5jozkS0
+uDVLbSnaK9mrD+ea2f7wjP6YyxOoI5u3+29PLHbogw3P5EjRsrSHlW4qd4Go/HAg
+hGQOyk0q/ihXk/ejHUKoXElyfqqg0Zz26Q36YgJFnzw5C7zLp/ycldShWHS+Bl3t
+XxK/+uHyXIjb7ep7F88DbAxqQjr2W1UIjMFiMlHRjJZGmACy38x/ZEXbnY4Zvp4i
+/GN9w1IkFNEI6dScZI1ZjzNhn+w8OrkKgkhOUruVfKCAPHF15uLoOAAu/sRLd5f/
+9y88WkfX9KNZ/sBnjdnTPePWTSv0SZhLb4jvvrnvD/ieCDk5xYA9jFqVl52nwTtb
+tfTGc4ZUIKau3YXObKWWFee1MuaLgce3S3QN2i9rno94tp8ZsoCDKivUxpb6hW7n
+xDHnf6fjj+5EGAwYNhm80IwBRtYhx8tyJSGtNJUKEHXPnJoJx4ekTtDqu4vtu3xw
+A3rWn/kvlp9e+E3i6Uc+/07C9Y3kg82lfU8beyjmYMUXH4zko03w0VetCvch8UeJ
+brklXPq/EmQOy5+9ut2Pjyvul6VQJpKl8fUZkXPQSH1ENpnEm8l4YnBw8o5f0gpE
+o/zwX2r+q/s36xZzTAUB
+=fQwF
+-----END PGP SIGNATURE-----
diff --git a/dev-java/jtreemap/metadata.xml b/dev-java/jtreemap/metadata.xml
index 407583277d87..091965f6213c 100644
--- a/dev-java/jtreemap/metadata.xml
+++ b/dev-java/jtreemap/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
-<maintainer>
-  <email>java@gentoo.org</email>
-</maintainer>
+	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">jtreemap</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/juel/ChangeLog b/dev-java/juel/ChangeLog
index 6fe058998b2f..0a8ff6c46348 100644
--- a/dev-java/juel/ChangeLog
+++ b/dev-java/juel/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/juel
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/juel/ChangeLog,v 1.6 2014/08/10 20:20:17 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/juel/ChangeLog,v 1.7 2015/06/09 13:52:38 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> juel-2.1.0.ebuild:
   QA: drop trailing '.' from DESCRIPTION
diff --git a/dev-java/juel/Manifest b/dev-java/juel/Manifest
index 3d0021997d5e..ef8cceb0371a 100644
--- a/dev-java/juel/Manifest
+++ b/dev-java/juel/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST juel-2.1.0.zip 477363 SHA256 31e581cc27b9c05d3a545fc399b6340efb1f95e03a5deb8979e24c17b87719d5 SHA512 eec79c301491b8bae5c394591feab0abed302da55e8cded798874286af32f15ce575bdb365ec9f90add89e320d23d3e40fbb5d465d34c66da60df26e1f7cb6f3 WHIRLPOOL 6d4b1b1c6a041738d001cdf5b78d0a831a6762ab2a1286065019a6ec17ae62fed6acaf7e1c43526242ca9948965730bddec8bf61ac5bc83890f0558f4627da9d
 EBUILD juel-2.1.0.ebuild 880 SHA256 2307d9ac8affa048d5d9443a82b0c7db94f81a0ccd4257feb4885c864e7c5025 SHA512 c2c6204243c0d70410a0acb62215570aca674c444497ece67f9cd06ac1172f19131bbfb2390dff64e3965ff37942fd3246da042b89c3f169fbc65ff1718c63a6 WHIRLPOOL d720130a0a3f0e3b2766b569a2457e9901737e5ddef3ea17956058c93a0eea71f514c1adaa3b5f5144e820a96b7f31a777ba7f93de493f517e4cb9cf31e650a2
-MISC ChangeLog 945 SHA256 f9122a448f5505dcf809528aff081d2128724f74b0dfca88719a5b4447f0790d SHA512 be8797de426cd99eeab6fcc2e781a42c208367a27cc61894856bfbd0ada3ecfbe5948a9f3b03d2ffdb0090c2eb091a1291ab4e86ae8f656a5890feff637cd3af WHIRLPOOL 8906909019974fb54fb630830e24264b470880bc03268488e205129f889c8cdb39aeee3548d4ec2dcd4427b4787f96ea53a47dcff88484af65ea8f778e2f945a
-MISC metadata.xml 208 SHA256 6f66fdb8c81cc2b50f9cf18e34a7792a8054bba3bee24ee1a1a178e9550ff05d SHA512 f098d16e343caad7ac670447a5a8cc5eef5498e7a49a3b496312755d482359772aede7725273d49be18e80dd3227c3f64bc19e8bbc474b40d479bfef5c4e8b01 WHIRLPOOL 37ee9d284583d6d352049c26635af60161ad6faa0471801134e282cb315c347d79308e86d7e31f25ac9a3e8e72376fe9c3ecaf53e7f822b801a98982cb312751
+MISC ChangeLog 1042 SHA256 57e1d58dced1fc34b03f412f3a143fbe2ae8184acac63eb2d14b513c52ec9147 SHA512 bf6f41c2f1308c299d8a3b01c3de9779cd3918ec64027e0938c77aaf99d8da1f5685bb77e922916cfff216af771af3f19388dce4940fc794ed07671610d75085 WHIRLPOOL 008f30968d26c784a20552287bb9c1c08e6a0b54a156c346f269ca7ca38d94aa932a35f07a7cece27f917f66708bd8fbb19441193e8e45272a261a2a1d6c91ee
+MISC metadata.xml 281 SHA256 f7636b7b35e7f571f7b56ffdabf6676dbeecc87216a91202b3f243be464ae88a SHA512 a6a03215efc6470ab401505d0958bc4f82374621e8560be6f1d2827efb4560be35241e03fb83d5da05fbe6a5e3953bd29c174c6d30f114e5779a7fc73742b552 WHIRLPOOL c554c0b9813cc9866ce169a13ac2ac6c34f8f03d8fdc9a8e343972541aeb677de483f66bbbdfb6b9da9df06488c0fa635414ca6794c97e9c6626e491df3fd2ca
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlPn1AEACgkQcaHudmEf86qkGQCeLM0dlHBSpwW3Una3XXaJfnOP
-MxIAnAxDo/UNpnYM41FKG+WqG02YS49E
-=Om/S
+iQJ8BAEBCgBmBQJVdu+nXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi3+8QALPtw33WqKRWY4r/8EGIrd+G
+2nsHBMaTugqnpMWGzN8qIyVCHoYHK+BcY+5LslDCxYOcMEvyY1erUieayGi8iAsc
+Y25bogI5wEYLiqUiDs2k/pAv7JARDv+ECVfeBupnDRB3q+xPhLpVkoSPhmMvjVAc
+68vhLN21zJLSWDRGmWCSRUm3r8aGYv8PfeUZDCoOamRiCJgGn1SZy4BxBBcunnxL
+iL822nKzVpiVueKo5RjSk2QPQdMOrzdNwUd+JBvrUzSAmPkT9VVbtyMqjNNLFce+
+HA3A+sKX12YN+vHcnIy9edJmSZRvYVE+47D8qlcikx7OqU+7yO2Pzt9MNAoGwzh9
+IxuLgAuTF4OnIbRvXIFHhiF7NTOCk9oeh2h3vGF4rDAoeKUtghQukjIcV/ZHjr05
+qgHx7V4ad6jqjcDmpcarSJBPJC8tdoLIvHgxr7Cwjge+4CSs5VrLKWO05B/0gJ/n
+ExMjsaLv/AIhpn54KALpvOyCT83ArH6+FNsNHzIgZn0wLSH9kx3f/X1M2vhKnE3p
+m53TE9bxV1kIM1XK8rMkN2fvPI75sGAdYICZJ/6WGB6IHIcOnHaiUuI5I09DpVZ6
+djp1m3et78fT6DkJKbveJc8UgG4nhiHB5d7K2vneoinOIJiYkphFuaPXe2DS5ywt
+OaZ8Dd5Q2xXzewvh2A3i
+=mTg3
 -----END PGP SIGNATURE-----
diff --git a/dev-java/juel/metadata.xml b/dev-java/juel/metadata.xml
index b3ca8942252c..86ea5076699c 100644
--- a/dev-java/juel/metadata.xml
+++ b/dev-java/juel/metadata.xml
@@ -4,5 +4,7 @@
 	<herd>java</herd>
 	<longdescription lang="en">
 	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">juel</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/dev-java/jump/ChangeLog b/dev-java/jump/ChangeLog
index 7105b5ab85a5..a460e56906bd 100644
--- a/dev-java/jump/ChangeLog
+++ b/dev-java/jump/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/jump
-# Copyright 2000-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jump/ChangeLog,v 1.17 2014/08/10 20:20:25 slyfox Exp $
+# Copyright 2000-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jump/ChangeLog,v 1.18 2015/06/09 13:52:58 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> jump-0.5.ebuild:
   QA: drop trailing '.' from DESCRIPTION
diff --git a/dev-java/jump/Manifest b/dev-java/jump/Manifest
index c8d032c40b56..0a6666780781 100644
--- a/dev-java/jump/Manifest
+++ b/dev-java/jump/Manifest
@@ -1,15 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 0.5-test.patch 1025 SHA256 bdcfdb73813e83bffa9489592b2aed91f4a56fe72564582c63307d2d137c2392 SHA512 fe423215469dc21f52d72e40f67d5c09048f9cc03b14f72a3badee94cedabef19e5937d63fffa07e8d78cd45c1bc55e44d7292084d667dfb86f10db899318f1b WHIRLPOOL d4d932e9031e7d165bea95606123f1576c922730cf00e13e086038c08620d46009cc1e2dd873d0002ccb706bbca38461e366bef93f17faef6049870ebf736606
 DIST jump-0.5.tar.gz 31266 SHA256 608c3ea156cca8ce6890f593467a8b5b41b257479a84178bff8b957ed56ddac0 SHA512 9772ea61e921c4342f0e25a951d74850b9dbdd2bde5de9fabad4d55ddb82b6d09debd478f92f3f8c02a05425244b7eaf12d7b3d7d2876263234bafa27783bba8 WHIRLPOOL 6f32af4aabe2964edc9a450c06d01d7f3d69873cf8d7988826941fa9838e841dd04ea584eca59dd3d1c4dec263f62762ad72a090324f411a63915acd1d8f3140
 EBUILD jump-0.5.ebuild 1159 SHA256 3e8adca6e94b80007f2fbab9b1eb4a327bfc60ba60048da0bc81a627e59cee62 SHA512 70b182baba5f2bde3a73736c5c64cf423888684d0f8040213c7e8a12171d5a1f248eb346b3fa03192acfcd7b71e41751579086e9dd13994b924bd333bf42c646 WHIRLPOOL 7dd6d9308aed0f681ec332b6d365893526eeb276128b58d8796c661fe6ae553d63da2f7aee3768931fbd0f10c64f8fcd70470239a0c58877087a5845584edafc
-MISC ChangeLog 2479 SHA256 96356480c7023223126019c2d948b10494799d3cd1e349761dc43a165f2b1207 SHA512 4f5c8dc59385fc1d39fd2ef568ef8c0a9459227c64b8ca679eb8c5671330087d231c14ee9f869fdde9903a52bba02264cc97142395cdb132777c41d473b8951e WHIRLPOOL eccac58b9ca188ef185e5e138cb21780401b11abd2dee9238773255890c2fd381e13e2f82320ea091c428b11dbac614af8c01c015afcc189bfc5c24213c13150
-MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
+MISC ChangeLog 2576 SHA256 c8da279403d8f29f7b0b86c63a2ae4f298db6f0600506e9968f6a2b3e2e307ed SHA512 20b5245fa8d30725446decf190eb3d0e04c8ca1671630f484ffea876b9ac0c0a891a389dca6448d0efbc802fd2bd15fa37bbb77a8323cbafd173f27fb4de72f9 WHIRLPOOL bf0ef51fa157186503afc536d78fe65cacc2077dce8cab16c5f26f2e42c75f6fa8136a96ad795028c91d11d130873b7b8c1d50b178810083da1e3e170273a941
+MISC metadata.xml 237 SHA256 35020f195773f41d0b64bd2f19cdda572444bc802357674cb996146c36086532 SHA512 a4d6989b2ab43eba9f2939082b0ee630b7fc477757343f18e365a4d9ec0efeaa8e0e91aa6b14742776296320dedda4afe23bfbd91f79b08f9e66708cbbd943b8 WHIRLPOOL 54a8e6168c55888d86582fd27bf07917344261af97e5cb9cac28d1bf102dd0a809bc8b6941295671802ac6f0e083dbc10423b4120e5d100e670942ff2ab05962
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlPn1AkACgkQcaHudmEf86ruFACfTDCGuQ8C0Ofxg8sfYTGeIwI+
-euoAnA49h2p2j8svtDCuZzH74BVs4rUu
-=fUXL
+iQJ8BAEBCgBmBQJVdu+7XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiBg4QAJR7ptXBh5RXplAX3Nr5vhLC
+8fb2XYYIDecqDfsn0vXlIHWO8cKCtuGHcYNVzyWWV5njCFtqKU2MO7jiLE6hXLTx
+dKttEud+ORGAuAO+1pbvJ2KYx4nKh0sv6pTZKj1FXHE37h4HnnMinMXyK39Yquyv
+UanXQ40N9yzvhB5r0pAulnUCrUUtC14dzo1PBO7gO7tO1WPF+bWY3AQdLxsVv722
+BT2K34uKRqELhRaI50cq9N2gB3WJMmAwn8d6/hKmz7kA/vr7xlG9hY2Kj+IvF1dX
+hJlPbGmKrnaDSSifT1LcGG+JInJk7aHvmkyIH9cqZ/elJuH5wnsrF9TIxaOffHNQ
+WnP3miZ0y3JT144WJq9zCloz32KL58j3eMwITPnpfvdeVTOdchu9ErKyS+p/VNUO
+wOEk/UPijp0aNI3xHGEgbGKpxWtfvoXEAxBLfHKFIfmmkIb+l8gWClLhr537JANI
+6YDamobNdR7IwGGZ2LuXoNQ2asD8UwjMGVbpYYUn5ckjQ3C8vX6oAJUcLHRANO9U
+7A/Wck53/TAJpy3zLt9B2Jy/VySiCtZrV0hx+oeb9OAm7QAsPtfiV9KhsBZNcn1s
+vxi9BaZZvDwgDbGWHvnVqnGJgxB48ZdfrqwtTSMASy2lYTbD4DOhoYz/XSqkuNc9
+jQoflZjC8r46s6INRiTv
+=Id4q
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jump/metadata.xml b/dev-java/jump/metadata.xml
index 7303cef96964..c6c19da3cdd6 100644
--- a/dev-java/jump/metadata.xml
+++ b/dev-java/jump/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">jump-math</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/jung/ChangeLog b/dev-java/jung/ChangeLog
index 79c34dd8306d..5d25d1d6b519 100644
--- a/dev-java/jung/ChangeLog
+++ b/dev-java/jung/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/jung
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jung/ChangeLog,v 1.5 2012/12/16 14:51:19 pacho Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jung/ChangeLog,v 1.6 2015/06/09 13:53:12 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   16 Dec 2012; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Cleanup due retirement, #169737
diff --git a/dev-java/jung/Manifest b/dev-java/jung/Manifest
index d4279d488e0f..0c6b2f6e2a9d 100644
--- a/dev-java/jung/Manifest
+++ b/dev-java/jung/Manifest
@@ -1,15 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX jung-1.7.6-build.xml.patch 714 SHA256 f3ed0bb93b662ecf05469d3a79b02c29473f5db52937ffd2bb9a29f5cde5893c SHA512 d9e8548ed4b0271a88aa827dd94a49a95fda7e22e78dfe0e0490ef7c9e161c86d7289f5f3382d4bfcdfa95daf84582143ee6d1cfe7946114c9fb35d2fea17c4e WHIRLPOOL 489dc9721d8ed00810c20f7842fbc3376b61762575ef4482b74d50a90ae90ac73ef4c46f9f232d41736e06e83dd3c031f24796fde3cc4a8f7496bd436b6e7b82
 DIST jung-1.7.6.zip 8164548 SHA256 2443f63f8a81a31a9c9aa2a8b8e6864e20e04be220082574536044b4f07b93db SHA512 126f06e34a6db6cc55df2b1c1b52612ddece7db7a1fb45cbc91892122678b0b629eac00276fc501aeab558cf1f01a4e5e7f5d0392bfae977ca1950df2c3d063a WHIRLPOOL 63e37fd53dd3792e8c1bb1b484ec2eda89e5c7768e9b0d3d8a3f5886277556fe8209ccd756fc4cfab26e38519d7cb39b3f31219c3e294718ad007080c58a27c3
 EBUILD jung-1.7.6.ebuild 1179 SHA256 fef6e5f952f62159c2de98feac704c887b8945e5cec7138ee4b832d6130e6fec SHA512 f3e43d902b6723c37f000fe5667bba3bd1d65b5a8422f77f7495a7e077ae6745f084366435221e06e4b83f29f487ed1de48c4bdc08882e5762a95071ead32c28 WHIRLPOOL e6eccbad61a45d6d86bac72221b0de2f9d620d489d072a1cce4352342dcc3435a64c2b8cb5c5032dda1c77ca305cf75e395a181fff54df8390f2101b302ca92c
-MISC ChangeLog 939 SHA256 5d28894f652573bf555d627dddbb992ba8ed89b7aeeaa8bb854963e213bdd2af SHA512 66100ff35459fa7007f600fb9ec6783ef7e9cfb53b9c15b0b2e6eedcded7f988d97f8c12ee5e209e8052b7a72f7adf90c557b3f032101ab94ee87128d591a179 WHIRLPOOL 6470ff2459837a2d2422d44010353b54edb995ae381f97c829fead2979a88d7838b51c927db9a422e0cd72ecc028cf32d8d95bf532ca0d5024def1396f6fcf1c
-MISC metadata.xml 381 SHA256 664c870f6c6321d2e3528e216cc6536e674db50b94d6476bb376020956873642 SHA512 049e742167d5a3e9e3ac96725b71d9b60aee01a2eab55b5a20c05f97e6da513329e6e5f536510ff61bd482e9854cdeb32388b9cff3a768176b279eea29e23871 WHIRLPOOL 89249e37e9d5a67561cfa86eb00d49403fd4d254be03e73b90ed219ee354050f2ef82e741376680495deb5f488699cfbd02860be4cc90cb2c15d34ce90c97812
+MISC ChangeLog 1037 SHA256 c84cf885929adc29cec9f614aa4134bc94ee8725aaa1f5f110e8e248e93155c1 SHA512 ccf596f798e49e4ac43502a7be8189a5c21ee7e187b68a1c3baf68e19a88665c26bbb3cd43a9d2bf07e4bdc720dd013b7acffa59d64d9dd9b3e7cdde284d174d WHIRLPOOL 2b2f19ede5214298d242745e422007490ea8e47e50a5e52dbab7d21e5651ac24945c46d25b6fac4064984d3b08f92765b0e330374d3c530df51994839df0457c
+MISC metadata.xml 454 SHA256 3202e865f5821b104338e77fea2f3e70a18a2014c1279e76da2b9b193c90e534 SHA512 c161d2e30fe04590431fba9223fe25a7a7ed2b0f1627efcf19156da379f84e7dfc05b4cb26eb7423260be2ae3cbb8472af05bf3f77c9e7bfdd186d2879ed50a8 WHIRLPOOL 536690abb46a7ef13bf3e7b6b7d2f3a9f0ce65ef7251d74a951f9c2a59bf00c7943db9bb87bcb0851342f71e551fe0741af3c3229379e7c20a35c67be62d48a8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlDN3+gACgkQCaWpQKGI+9SsywCcDAq5v6jcaOBMWoZBP39F4MHA
-mAgAniE99QogUAv9xyDJYb4Hjs29Ab64
-=9YQp
+iQJ8BAEBCgBmBQJVdu/JXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi0ZsP/3iha0jGlu22LhHx8MAWy3ph
+HuDkDw5mvOjsedvLI3ti4w34/46lP2mswrRU8JqK9brC2MvGYAABvwVfmWcqyfSM
+eLAZpUh/F7wNHxr/u2v3VaEguQRPe+hLdi/BkJLwHxvsH5o9fYvkSPtzKd90er9Y
+7k1ewBXSPaU3fyssp4h0sORK02VITGX626rpsV8xC94abM3cjZ55FQUApZTh2rEH
+VcM7CixDmKKBBdlBpgoHeEojPE7l4SY0ooKAxYPgcLUHaeMX8SY1KiZq9caL+i63
+1BwKdtKJpi1lAW2m1bqbjIL+SR0oRuJyD0WXo4qfLfwjniwkIavjOKEqUbdeZoZX
+2vT+CqWBresrRISC49FLR/yimfIBEheWFSwgxkz1BA5dDD1Mn1p/Tt8iFlg6UhJz
+lpRujgHDbIZKzG2VMRr1OiNgSf6X9FcX0uieDaPgssZzwqtPExFaTFS/TM9AcG90
+IxwB8wtWXF1WQWpIPNF26HYZee/ZyD3xhkkkor7mcpA894v7g1hu/0qVVRSkXgLX
+04lWJtiatUxdvpwYCaeTaQcVMa3WsdVSqNRz5DwGUU9kouCspuHuWLjm0ShjRu3D
+1ekpO/AjCbcDic0ByxaSRpbZxAfTxlFnItvKPriH9wYoo+Cj42gWJ9z8CfcwQPhz
+p+JMh7rxwQC2skFQbrZQ
+=Z4xc
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jung/metadata.xml b/dev-java/jung/metadata.xml
index 161644961f29..0d3245c368a0 100644
--- a/dev-java/jung/metadata.xml
+++ b/dev-java/jung/metadata.xml
@@ -7,5 +7,7 @@
 		the modeling, analysis, and visualization of data that can be
 		represented as a graph or network.
 	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">jung</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/dev-java/junit-addons/ChangeLog b/dev-java/junit-addons/ChangeLog
index 6f9d47d66109..1972239d0e54 100644
--- a/dev-java/junit-addons/ChangeLog
+++ b/dev-java/junit-addons/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/junit-addons
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/junit-addons/ChangeLog,v 1.5 2014/08/10 20:20:32 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/junit-addons/ChangeLog,v 1.6 2015/06/09 13:53:29 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> junit-addons-1.4.ebuild:
   QA: drop trailing '.' from DESCRIPTION
diff --git a/dev-java/junit-addons/Manifest b/dev-java/junit-addons/Manifest
index 35b5fb7c46b0..cf5784290b9c 100644
--- a/dev-java/junit-addons/Manifest
+++ b/dev-java/junit-addons/Manifest
@@ -1,16 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 1.4-build.xml 8725 SHA256 449d3c41e228c0403d272347a362d5243f8d390e19d34983d1c02f2e77787433 SHA512 3f3eae33867f9e311e8e2e58a87dbc67dc4beb6eb89793b2b477953a1fc5cba45aad2a8241e07717de472969ec448c6205617da2427243cfdb21f0cf4ba91b12 WHIRLPOOL 91b5faefc1560341518ae4ada70acefe78efe1b6bd45bff812ab06933983ce1e2f00174ff5997ad9dde6288e5d97ab63ee95686f7b019e5e55f7bbbc0b3f287e
 AUX 1.4-common.properties 540 SHA256 71e0c35d7677d4673886c5ed13c79e3ed44b3158ab22c893c7f4c95fecbc1426 SHA512 9362f56305b2d6cd97a10ed6cd661de6ae86e700d250cf69c55f922fca2c6f57e8ce1c306ad4378196c18cc8b839bcd5440816f6ef60f908a28da7b4ef78bbc6 WHIRLPOOL 842f586d028b66ae74a09e6e9e3c01ba1a97bef0debc5eeeaf910418d57f18c65b3d8845840f9a830c594432e7ef5fcc75c5223ff3404e7359526935da82abd9
 DIST junit-addons-1.4.zip 293750 SHA256 8a7456eaabf1c3528b8e73c15df1b8a467386cbf3905b1d5df536201f1981990 SHA512 0ddc9a95d80190417c92e86697669020a2947e2211d2394334b80d76bca5397f132d90e00d0c679bf48607fbadf8d1d6e97d3770d06c35cab78c6cada198434a WHIRLPOOL 2bf3c99b31d0eac1d76e8d6bcd8fbd45f668712798d4ba6ecb019762dbdb045ad877497140a83317bfe1439af33a0637e7964023472ae776d7f457c69cc66be3
 EBUILD junit-addons-1.4.ebuild 1603 SHA256 4ba41fe7e290693a944c8dcdc0c96a995f7a5f6eb02f0961e3d2924c17d766f3 SHA512 8c7aa7840df517f39b235236f36f24bfc6992c66e82b45240f7c09fe3614917e31466b87c498c0dcc3cda7d1c4aa155561f14c7c4ab33aa542cbb8e9bd7921fe WHIRLPOOL fa707cdd4e4f0e506f95be5d50daff1733a7821a03a7e2e29f33663baaf5f4e87a359743444488f23b5718c25ef37ab48d0dba272fe12c0fdae695914383af81
-MISC ChangeLog 885 SHA256 ca95ca09e7c1beac336b4cca2a9a472ad6ea66abdb4f3477f2bb77159873fe94 SHA512 a7d9d6ef614de4d8e5d9ca28940ba6659882a38c591898f9277d5be7a7bd0150c5a94bd840e0b6644cb132585746e8aa35a74bd4fb329818d71e0562fd2ef3b2 WHIRLPOOL 93b88724172dbf40aeb63ed850b09dfc3d46f7de07eaf7029f4cbde646f84a28ac2228bd55a54eae36bd9df6d75b8398554829dfaa3ea6b11da9491de07e6e03
-MISC metadata.xml 330 SHA256 c72e764417f3780d0d22b1de038be67ba6d94557aa0cf39c4ad20c2b24b56a1b SHA512 b6ea4f665c79658bdac453cf9b8b6857e4dfe2c79fff5e99d456ed318e1df221608908fc809f545b2175a7bee7732c2a04ab26d173dff6962107eb67bbd632e7 WHIRLPOOL 88cbb216cc529b4a91c167e851fcc4cc37ce23dd142c7709092effbd09f4dadcc91a284c65cd9d3eca12274ecabdd7a5a76a286844f319f04ee70dd5ee800b8a
+MISC ChangeLog 982 SHA256 c557bbe2324d24b46556edfb157edbee5e2762acef0da6c7e81ca76c21548839 SHA512 57685c3443c365bd5bbf98cde1bf0752ae1ac41972712c963ccd069bed2bcdd47f68df16f269404e59f0c7426ef7c20036ef42306d83cbb2f88942fd71bae7d5 WHIRLPOOL be77efc21504712ddd179748f269d7e9fcd3ca28916c0eebc8a67973d7ad6e86ae53fe26fa5ef29b68d7eff49471a6b85d1cdbc8bcbb2b54f6c746115684ec26
+MISC metadata.xml 412 SHA256 c82204071e0262f30f7dbda2877a1e386f9d420fbb3de7ce4c8d6e94bb5e13fb SHA512 c35a54df7d8c1f00be183dce3daabdc56a352066007024a4081648ea73dcc16013b73b78ada988b691c25d0663368eb219de01d595e2b40d9895c01666272914 WHIRLPOOL 050c4a1269178b961d9d26d870c39f222d83750272de6256add7e3ee3f8a9e048e7f42370044b68d5147f1c3b0f67da13e8d89fdadd0a444d2fb569696bf93a6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlPn1BEACgkQcaHudmEf86oUYgCdE58J5eJpxVYbGdcNIYrp8XLU
-G0EAn01IHvu9hTV/lfhEBaCc3DfcV+vI
-=09br
+iQJ8BAEBCgBmBQJVdu/aXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi0OoQAJlaylTLkpT/Jx4m7v8/M80C
+GYcm4WI0+fARvYZOJ8VExx/wr3LlnP/V8ZmtIBgLcXSRI2h8KwoFCfSNCDWl8uuZ
+cVC4ui9MD3Qyj0Vu6XI8BDUtxRAxcD7+clnOn0ezdA//sUu2WW11yOPGbszManr5
+65eErvitANoVv44YP2ZHMqj2SfmwflPgKIREt+9jAf6TAvVJmhfmIJbRkZFINQF2
+C0x2lXqdnq+NyKrq94c14fQF+/J7mhH+SQn8qwgzUBRM95GtLq+cb5SkiXjv2q9a
+vetGweMJTYtlAmbnPZeN/0g3pL9gv9MMHH5cUno3vQTTYzsUpCdCaVFKsBEq/ZuO
+34B+a9/p8wHD8TGjJnWxILnxZCpTytarAEo6k33/iUiKxzQD3JfZxGYIIM5k/UdP
+JUP9yLEi7e8Ve5KWel//HXV3kKK3T0bVzPvXgouWAZ1oeSuaM5PluN8IZW0Acn33
+idkMNcN5FtXXn/0vzsy4TgljCe6qAZIxmUU8OZP8DEobhus28mjywLWq8ayNb6jy
+550g3QnKsWVLixC9yTNwcBn2N3F+ni7fgo8npAD38JMqE7W1RmGH+KcBn5T5s8td
+WngYfIpcOgRXutq6/k3j8huMSKoIctqfRN1tf6J8u/wt43EwZLILejC2en7hKkN2
+Py41Iyfs5f+YrM5JKFeQ
+=lB8y
 -----END PGP SIGNATURE-----
diff --git a/dev-java/junit-addons/metadata.xml b/dev-java/junit-addons/metadata.xml
index e41cbe5e5d89..f13871da48ea 100644
--- a/dev-java/junit-addons/metadata.xml
+++ b/dev-java/junit-addons/metadata.xml
@@ -6,4 +6,7 @@
 		JUnit-addons is a collection of helper classes for JUnit.
 		This library can be used with both JUnit 3.7 and JUnit 3.8.x
 	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">junit-addons</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/jupidator/ChangeLog b/dev-java/jupidator/ChangeLog
index 01e963596403..9dee8a76aa7a 100644
--- a/dev-java/jupidator/ChangeLog
+++ b/dev-java/jupidator/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/jupidator
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jupidator/ChangeLog,v 1.12 2014/06/17 11:20:00 mrueg Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jupidator/ChangeLog,v 1.13 2015/06/09 13:53:47 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   17 Jun 2014; Manuel Rüger <mrueg@gentoo.org> -jupidator-0.3.0.ebuild:
   NM: Cleanup superseded ebuilds.
diff --git a/dev-java/jupidator/Manifest b/dev-java/jupidator/Manifest
index 4b7573c3e910..5caa6babb149 100644
--- a/dev-java/jupidator/Manifest
+++ b/dev-java/jupidator/Manifest
@@ -1,4 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST jupidator.0.6.0.tar.bz2 253170 SHA256 00213313f794363cc3b4dd8c335cb35cc8582d0d56d72cb941b3edc8f2b94580 SHA512 5e96831ca41b6871eb5f6c883c21eae17474844a74fc5e103b534d6e225d0a16ef98149da1d52728e737607eb7ece586f05aafa0a0ada29c4c28ff3e078a2415 WHIRLPOOL f8625ac738c610c1b3ed60f05a140b0e7367d97189bc27e70666886879c1da74117df360b938718861a4f8a52fdea7e8ed8355b68b33fb459272145481a3f45a
 EBUILD jupidator-0.6.0.ebuild 1198 SHA256 bb4c46bdb7accad4aed1570dd01882b99e6cf40c50c41fc047f8ba9c0e6ec0be SHA512 00b1f83fc01aee248eb60f5d4745797021069810c8fb77f729af5413c09fc0de2334365dbd8940d2f338bae06e925a88c0ecad7fc571a8ecae760b8bbcab1f2e WHIRLPOOL c52f1114e97fa244234f8f5b085fd2a61278aecf9b558415e491bbf12fbb0d7131f5cdf2e284ea8199ca2e1c1b60690188d14337c3fa7bfc6eed0978a65b9399
-MISC ChangeLog 1600 SHA256 f38fbb113b0e74731829d4d208b0aba46b4512e998c06cfbf60de953719cd6ea SHA512 d110fd59d266ab3e57d5233a6e64abcf2a993f8b375d3c1f8d1a31123ca015bb86c8ab6b9b51a8bea11a4d6ed02643e91bc0fd8dce6ed4fd0d2811e21e143524 WHIRLPOOL 87af6924d8ae2bf66c52276af2734e9960de77e74aa7f42cc594850efeef3f6b53080f05709e5ffeea055a53fd963b148a1dbf9cfc233aa00d5f130f32a15058
-MISC metadata.xml 159 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb SHA512 74dc9ada199a90543b8e1c168c7054f2e973fbfa2551e2b959d67501f2538e269cfb4b2f0905a88a1afa04c20b33961336310ba876f80d47c8e7615b2d7c830a WHIRLPOOL a0ac49efeca233ec4d8f63eb69c8e46e1d4ecbd926693c25b1b8c7415e4c565680936aec46f0c4197116fd7a19a3bb571beee493c18bdae1e5e978e3db84f17a
+MISC ChangeLog 1698 SHA256 ce8c0db637590fb5c9c1137ad326ee5ec887066270fec3915077beba7eef8984 SHA512 9828af9700eb3eb415c5539a0ae95931cc50e4735c1aa180d8835a0a506b05ae17c6d517e372ec52838ee207910d59059cb8bd1802f8b66ab1e91e35b5ad1444 WHIRLPOOL d4eaf1dd48e32524822e6a67e235cedc8cb071c51954616b2e63d6ed6641329b9acc947b2476aaf7e74abd277dd39de0aff19e2c34dae3d924c746645000a681
+MISC metadata.xml 237 SHA256 ff13606e5d4f3399d484ae08e64ac1fda8893fec35439a50a27983e753796bd8 SHA512 9cb568ba2bc592525e9e7fb7ee9adf01958200f61095f2045ed1841483908348826e39754079e2fc49c0716e392ceea81bdc24bec5c6cb722b3ae9dd9200a72c WHIRLPOOL 85ec0f5c7aaa9349e8847b2c7d8562b810bc0fd0ae1f5d1cf194da10d1579e5fae262cfee043503036054110375aff04f3536e18e71ffa8befb9572609911c0f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVdu/sXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiis4P/00002uoxafOuBeoIJMg7wv4
+W5N/Ir0aHVn67E98/d1YqibQXRwIFtCr+CM6xDvoQJDhDgZFujhLgQOdYfGkknEq
+M24ouZsAHM4Agm7iWAREMTndGNBAJ3ibFwvetkbSLRyajMxQY62mhtjC9R8L6ryh
+7rZsY4Tokh8Futl8XH8y7/C7YHvKd8BAlH/Qje0TQrqAoErzo8Lhu6L8fkJw/Hac
+Rf+aVysrzPxp27cydG+9pM9fhEBuSlhIGvdhpSMFEN0pcEQcYcamXimXyWcGYDjk
+ERHiTp6A0yOvwm21DBwddDauYt9id/ohrzZiULdrB2WW82piL3kna+wx+z4HyzsG
+/+qno4W3yhYS2bNIP6XniUPsyCaSPYKUvRDwScb8DznE3W+lj1RS3BDSjWiMxu9u
+dBXuXI6p6zWUt7EoRLYIpipUwRs3qRSBmnDO1qnekn4mGMjj7dOYDj9YOgKO6HCT
+BbP/tq6xfHf4sspUKXSZ0p+UeRA+jd7nCpvv9Q59w1dti4QX5wu1vSeD3V0jmyfx
+RLwijq+A2DFI9iVSEqCZUGXOFWve96j1/As8nvMRBUTnXbCHZtZzgbHUyxOAw10j
+wvydjy2567jHELk2IXVvVzkDRo074ccdDNcHRptSzwVVT9qyJAD+lNwgK4Ox8bSv
+ZjQsPpNp6oXI4qI34U7f
+=ZG/H
+-----END PGP SIGNATURE-----
diff --git a/dev-java/jupidator/metadata.xml b/dev-java/jupidator/metadata.xml
index 250f2d1940ea..4e84a8985356 100644
--- a/dev-java/jupidator/metadata.xml
+++ b/dev-java/jupidator/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">jupidator</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/jusb/ChangeLog b/dev-java/jusb/ChangeLog
index cc7e890c7a3f..84c95720de78 100644
--- a/dev-java/jusb/ChangeLog
+++ b/dev-java/jusb/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/jusb
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jusb/ChangeLog,v 1.7 2011/11/25 02:01:58 robbat2 Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jusb/ChangeLog,v 1.8 2015/06/09 13:54:05 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   25 Nov 2011; Robin H. Johnson <robbat2@gentoo.org> jusb-0.4.4-r1.ebuild:
   Make CONFIG_CHECK non-fatal in case there are no sources/config to validate
@@ -32,4 +35,3 @@
   +jusb-0.4.4.ebuild:
   Initial import, ebuild and patches contributed by Petteri Räty
   <petteri.raty@welho.com>. Fixes #89487
-
diff --git a/dev-java/jusb/Manifest b/dev-java/jusb/Manifest
index 8510dc41e295..9394e68a67cd 100644
--- a/dev-java/jusb/Manifest
+++ b/dev-java/jusb/Manifest
@@ -1,6 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX jusb-0.4.4-makefile.patch 347 SHA256 05f4dd5fe1e19c0762946cb337555829fa605fa288c882b4290b383a22d9ae9e SHA512 ff1c2c4a73eb8ad5715ead492af57e1570504f4734a7255696acf26e176ed1ebbb129473b88be414f5e2e885f8a46adb35fd38b5db249f966ceb3097a15d4e62 WHIRLPOOL ca0257e71fcbe0157fa396b719e8829d58485959b9ea1897e2aa66d4d6f414f85b84e2a06323900f771e9ed0aa44df72ec52184430fc4dc43410b85f5e1d7abc
 AUX jusb-0.4.4-native.patch 668 SHA256 d140216d9c2e472f2a6bc919750cbc712e45ec4f50ccf9daa6c0e76432cb8caf SHA512 ce47f3d70df00a621d3dff03d584000894faf3ce5063a82a3b59776e24bf93b76fca7e7eceffd84736ccb36d7afc86bc0bb692c4ecc6ddd6e6f4e020c5445061 WHIRLPOOL 5ba43d394802cf0c936e8497893b9e0da1c621813fdb87509ffb976307a2c024229cf49fa1cfc36049d2d8ba15db090f6c2810a0fae62c688c9eb9447a557d7d
 DIST jusb-0.4.4-src.tgz 92432 SHA256 42782637e3cf190bb4bdf46cd16f827976766ca23d7ef737ac3ed7b11fa0d393 SHA512 a071de83de85fee9f7064cece4cc26ad310ccc1d95cae937cbcc826629f670485f10d36494eb8f31fa7a93727a76573cf82305f3f027ad32e18eda4ac4585995 WHIRLPOOL e59b325a05f2d3567b31e364a0f7cb1c054fa802c70644a521a3f1a2e26eaf86f1b60960e543f667962ff30d4b67b497b126aa1700bed2bfeb38910d9de515c1
 EBUILD jusb-0.4.4-r1.ebuild 1712 SHA256 fed9b8508b0ccb8907782136453f136f5c9b6e47caea194d8a7f3c5e35855bf1 SHA512 c56080a37262fb92d4371d83120c14126af29bc5a4360ffce9c3eb59c5ae9a7251fbd8f3dd16ae0ef95fd0466834dd40de09fd7d3d7fc502ecca47819d3c07f5 WHIRLPOOL 15353d433981bf214c6f795cafa3913cb806711bb6ef59ce28937c83e2535803154bcf741408282f141319861aaf7ea1359921c553e7d6f75900d44294116dce
-MISC ChangeLog 1331 SHA256 f37ccfbe9bc3f2b7c04501717f1c708b0578e817eb7fa4c83bdd7644cdd50926 SHA512 870ff06cb83f2f7954041f2373c8b029b9bab7b35b55243617e30c030a5d8b6d8bf56077c1eb75384b0ce1599411a31fbb37460bbf3a349239ae8d7a47f1bc54 WHIRLPOOL 9f1bce018b4f261caafdb67fc9f9adade212067e68f6bd3b5918efb89ea8f77448148a619dc92ccb8fb84902fb4bd0185b569ac102a8c708f12fab9c9afaac7b
-MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
+MISC ChangeLog 1426 SHA256 3e648f73e0f6eb51b67f26f6d7ac5ecd7f35f8b6178b60ec1a4c5000038226cb SHA512 dc9cc85ce6702beea33ac95129743dbf62168f5816758c868070d2b4ee28620148542e6785ef880c03fbf02b86788ea74ed66bc688f0fa013743cec706c2eac1 WHIRLPOOL 8e7d947c59df4164fda20f81d9f6a9880b0be3fc0be93a83998ff922954d976347fc3ddcf51855df2921f06d8db53c3807d3d367d1df05fe2018b3ca0b6bda2e
+MISC metadata.xml 232 SHA256 adbf97ef7b8c2fd444345048cc1f0b23d26a559458bacd94c767987eb7dfa304 SHA512 953ed3305e7f95625501995fd2feaf3d4fbe2f9471a7856eaab37b9b0dca9dcc0fd72954870d6de68856169f75a4bb37a43d51ffb4ae2e83019269356e738ed8 WHIRLPOOL 193ca6bbc0b89ad9f7755744cc193bf44374b2a1ef9f48f0271df60e19416c5cdee031e93b9fef50fb0452067731ad07625d49cd6b20b80cca7c6110540de29c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVdu/+XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiocEQAJsPpDhvjFzBR4OaNk5HpFSa
+SH8+EJAnGT1pAA3ZpZOCFAEi1OBzorlxHZUZs0jTjQEXB9w9nAwPnBqS1goLRJRZ
+c+zP+BRuJIxmXBrsWTrsICRB856KLV7kA+TqKJYt+QUVweZMKJpx7mBOe4xGeYmj
+/GgSvGyrdQM92Fqjs7tHnn1BJj/cg5nUQT6cQ0LHo801iJAPmVSNRwGtvzl+hDB8
+boNdq+49a3zrDwDUdCgFQxBlzDbmqngw79nG+h/Yg7JW8AU5c9jyCwDNBH5BdfaU
+0f+985Q0A+M49R0BLC8rD42TIPVqasWZO3GpkP+kvkNtSa9PnORkRe+GRv/Bjrwb
+ckaS8eO2iz73Ae+7AOl329ZUpUNHkiZW/khJldgAl2nXutrLX4ZpeoSo6ima3qi9
+DUlRRsrq+/TX2RKHNCGT3U/fAGlIgb+bc3PIGEjMfKtFRd2fbzWePcAHjjDYxLMc
+bFuOuYgvca0qKc49PMhr7SNLhH52i6lSIzT/hQYGaX29UoCxHqvOAaKByupI6hnv
+YyFzMah29hHlsIGR9je2wBjrCaj940gAkOTopckbFQid+DIBELeO8/KVa8pdxx1f
+2U59ETY1BjJJniI9vkPNTrPr7eJVeyEBJxWmq9VFeXA3kkBs15FxMZBR+YyQFO7+
+6t4IIHhpV0C3IocuXN6c
+=4QXt
+-----END PGP SIGNATURE-----
diff --git a/dev-java/jusb/metadata.xml b/dev-java/jusb/metadata.xml
index 7303cef96964..90eb95966c36 100644
--- a/dev-java/jusb/metadata.xml
+++ b/dev-java/jusb/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">jusb</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/kxml/ChangeLog b/dev-java/kxml/ChangeLog
index 8360586ad05b..35c95b6d4b55 100644
--- a/dev-java/kxml/ChangeLog
+++ b/dev-java/kxml/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/kxml
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/kxml/ChangeLog,v 1.2 2014/08/10 20:20:54 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/kxml/ChangeLog,v 1.3 2015/06/09 13:54:21 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> kxml-2.3.0.ebuild:
   QA: drop trailing '.' from DESCRIPTION
diff --git a/dev-java/kxml/Manifest b/dev-java/kxml/Manifest
index 7829427cef50..e626ae05884e 100644
--- a/dev-java/kxml/Manifest
+++ b/dev-java/kxml/Manifest
@@ -1,15 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX kxml-2.3.0-build.xml 1888 SHA256 ee9f33adbf7f7a7dd214f9d34cb48e225ee512d64bba396ecc02f3d5a039d0ba SHA512 4fab1fd2b9abc410d0df327ba08f99658c1752e07fffd97183c924e815f72c365293ad5771d3eb3375b827b80ccd17bda3211d595066cbfd16e32a080950148a WHIRLPOOL a2e36dd67d284152f21d15c31f65832954e554cd90e41e6f48c5a64aa81b94cbd57391445b1801b46247ea9a663ce0088e83dcf492c17e5acec37697822b429a
 DIST kxml2-src-2.3.0.zip 354878 SHA256 f2441575236be69a460c6a54344b6ba8b8ba03fd0bab242b989f4f0976944cd8 SHA512 f4eeaa71fbe76b51cefb9a195d292c22c79c241920915fe8ddcf30dc11af39bbeb6b848a8c4dab9775fc8e327c5a29586ac53263a577de361312bbf45e25c1e5 WHIRLPOOL 0e8bca0f903477b8d83ca2558702ca17d8f15db2e4526758d6a78e29b070c8356840f140f2671e621ef29d052a26236073a6bdc1c585adbf8a5181932c44ffc2
 EBUILD kxml-2.3.0.ebuild 1206 SHA256 838b44c21f2eb33199f7636c6448717be9c0e8809077fcfeb4e4355c593ea04f SHA512 34ac56841bb8ae849ad04c06591c31ec8fff71da6f0dc8a5df46e068ee9c14332e0a9e838f4c16ac76d1960a8c328158f2288d23e13e6e5e6bd458188cbe04f8 WHIRLPOOL a9e8e861968e3135c44efb3448eb68f9e88b3b603e3b17c38899ee51c60d9b5602c2e1aac0fe1b8d02110ec850df66d533060ad0b4bbd3db214db963ca93fc9d
-MISC ChangeLog 677 SHA256 1617bc8c0af54d76b9acb47249f71a0173fdc77bcb5922434ee5f679d29d7306 SHA512 f777f8c6033e21cb32757774b3d887ec97f990afa527023ea65efd920e1a6b933ad58eec2d886bc717f98f650b1c3413bf56da8ea30c1761f89ac97e9d2921cf WHIRLPOOL 1b2a1e4e4128e3d950391fda3e9a0a5f2c323f6f3cdcc486a1ab83f7a18a3328d013bf9662d9c27198b695531498cc6fdb44190bab7dcf1a3324ab17839f4ba4
-MISC metadata.xml 157 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 SHA512 bbae663e26f48fdc5e272adc2b06c14f77f34c53caf84acb53908ff036e7c12a3edbbc0929d2db56bee861a453381d979c7e0983a23716f629ed2135c22ffece WHIRLPOOL 887e153e2481e7d76f0f1b67a395f10f0328b93930185ecdb8fcb5fe3c50f839086a18831d61cf45b34657aaffca6c3b7900cf3c04b712846a05027a84602448
+MISC ChangeLog 774 SHA256 d65b8994f7bee0ddad5d84c548d4de1f3aebf2d8fa86018310318994c6cfe751 SHA512 a46b61000f7f01271c6200281de111d8a2754fac8911f37669aa85f0465f3d94b1f19d2af6610b15b6114e17c6c07cfeb2879e584a801fe889b9c2c64a735c22 WHIRLPOOL 990da07b5ad39cf1b264aa8bace29abf1a46b666e9aabaa46320ae6caf6fec13fd28c40d3ce221f4c8ca3e48aa0f1467442b447009b2266912cb45fb79225704
+MISC metadata.xml 232 SHA256 f541d01cf76ae3f8de9ddbeff067c37806d133eb3f3c90129eda7fd38279d422 SHA512 26cefc2f0b6a895e2b0cb9b5b69cb5e76796d3adf559299151cdb1b20296bb747e5e6c20da7e5c8bcdded642e535be03b00a1f2aff05d817a68ad060a66df60b WHIRLPOOL 4cef87839d5608e27cbbb705a317c18926e854aea77397f73c9028893f36c8391d1e2b277287c48660f8178c663a0a3380dc4cb60d25b73a1fc438e22634bd03
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlPn1CcACgkQcaHudmEf86p+4ACfRUrEDi+UqabO7jJ06gmJAJyh
-HEYAni8xQJaChPK6dwPnV4JJ1EAC3Jii
-=A5J4
+iQJ8BAEBCgBmBQJVdvAOXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmidnUQAIHd7xkaEFQ8tLdh4Er5VZY7
+uUPkVOYsGoLyieht7OAzUqF8+qYLXJQ93Y3iAfsZ3hvXLtH5L5kosnJEuq0P1v6P
+LzU7uA56Oj4JpuFug9xTd5mleqTqtuBw5Y1H2QJvsEGaBnBYod9u/bcr6dY1dLOw
+eoUhs521YrK0oYjgqg8kSkUOjaie3vZXjBvWTH3vbZEQ44rn2qg+OQAtngUakP+T
+TFwDOiOX5hknY5uXUFkz8Oz1icCObzcVRx9nlYZniQtZaLRene1Si21KTBsJR+h6
+C3tixPgxi1G6iKqEpwLVjZ2BC+dATBijznOhDgWQgvjMqlPEqGcOpLilDefNe6X5
+ncb9tXDHeJTm1vw1PZlgLRGk5EOB5kWVp6iSc8uUi51pSb4duAnnjyhbsBJlawbK
+ZTVwfNewccEmq12sS70zaVCo55FBeZrmDIchxz0el+TdgGmtYzrg90pPaGQZALCd
+N0Y2xH4huUiJP4aQp7XUHOgo0Ff+v/fh1yyWpK3mYYh/ZtZrvh3soDBu2BlYLHeB
+ztcX0sR+QKshEJ5QGZ5+x1fXx4BiY6Z/z5592pKHFwmoegKBqEm2BsmoEDYjgoQZ
++kUurzLz3kGh/BmZBo9IZISEs4RhSGmpcZEl/dtQ2B+FInK3wXAzWmYE8onGzGp3
+XsfYIa+XpjW0d40ArEko
+=VCiq
 -----END PGP SIGNATURE-----
diff --git a/dev-java/kxml/metadata.xml b/dev-java/kxml/metadata.xml
index 838c00a4a448..43e3aa909990 100644
--- a/dev-java/kxml/metadata.xml
+++ b/dev-java/kxml/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">kxml</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/libreadline-java/ChangeLog b/dev-java/libreadline-java/ChangeLog
index 6171c425b55e..cb7d1440b6d9 100644
--- a/dev-java/libreadline-java/ChangeLog
+++ b/dev-java/libreadline-java/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/libreadline-java
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/libreadline-java/ChangeLog,v 1.40 2014/08/10 20:21:13 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/libreadline-java/ChangeLog,v 1.41 2015/06/09 13:54:43 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org>
   libreadline-java-0.8.0-r3.ebuild:
diff --git a/dev-java/libreadline-java/Manifest b/dev-java/libreadline-java/Manifest
index 3d17097384cf..6149f6e28fbf 100644
--- a/dev-java/libreadline-java/Manifest
+++ b/dev-java/libreadline-java/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX libreadline-java-0.8.0-gmake.patch 532 SHA256 2d8575b101f5856bf7ced9eb8d606eaa6be2386db9bec871aadb5033442f182e SHA512 079f978e90968a6d04f717e25511320f69e4eea76b64b9ae928eea868433d4cfff2586c2598ff0b73eeb5f6146066d2926e5c6c7ec077a69e0f2abbcabb9c2c7 WHIRLPOOL a720c1d5f42fb3b6ec7a8d02c47fe87b9e082f7f29cf730e8fb8a866fba72afa935dab1660e38ee988a7900f1f864badf8ed96c8916a287377d15152bc145abe
 AUX libreadline-java-0.8.0-ldflags.patch 528 SHA256 b25694f4c2ea4dd9052f81ae37ba64b7279c80d20a13ed28fece97c1d8f1fd33 SHA512 72c2bfaf88ce2e9ffb82dbbd47a22f75a532d2d6e18eb256280665b1fe169bd1104c3da90e606814f998c0725a4828c9fcc86a29166ceea46cd77acc4b3b3722 WHIRLPOOL b2da3ae7f35aa425a385555ce06b62478d52a0d134643abfae05ba938a91b503a59401d8a040f97df6d031a373193a164e1dbcf98472bc82677a74fcdef542be
@@ -7,12 +7,24 @@ AUX libreadline-java-0.8.0-respect-flags.patch 651 SHA256 4c2fdb6cc0b2cc3071fad5
 AUX termcap-to-ncurses.patch 498 SHA256 de636c7cc3e812a276ac530b571d7c9a0fd63cd7011868ceb46a59fc55f2e337 SHA512 43b6494d94da3d8874da34caf3e191e489bdea3e680d76514f3acf7d1c55db784efd8220e9aa914831c8dc753c231a06d5c3980bdd28835a3369f4c1d862a932 WHIRLPOOL 2d9b02dde42f2d3297858798765a33d2be803a8b6d57bbba91ffe819f12134cb9842442903ecddcb869665616d42a95c61de698de49efb1809bb418687c6d6f8
 DIST libreadline-java-0.8.0-src.tar.gz 77122 SHA256 cdcfd9910bfe2dca4cd08b2462ec05efee7395e9b9c3efcb51e85fa70548c890 SHA512 16bbb01a4852244387d63d8d5a7203e2862f235d8a68b436f33b586c7a6ea5297d1fabfa910c54bc33cfdc43b5dfe80e9eb4828b80196a974410c90387c3d1f2 WHIRLPOOL e54b33173b26db1c7e81612f01159feb895ae47ffaeb2ba143a605a3c484179d993c04fc716cf1db2729225585ac6ab4a400f986cfd15bbcad0f1bf73c0e1d81
 EBUILD libreadline-java-0.8.0-r3.ebuild 1429 SHA256 8e1750899f1f7935b94d007c3f23053011c0133830bee5b2fec39b702988643d SHA512 f2f8068e8efae52f322d0060ad8722d96edac9caa60a0003770f682ca8606dcac82ade4abe753f1fb802a8d7a5c45c3d8d7383b25a3fc60cdc1277324c4b118f WHIRLPOOL b1a534756a7f78bf3ccd693357de206e4d9281d5c6170eae6dffa2fbe95bca7a29660b926d688c985fd204f191501999fd7bb13e5b38ccc15b44a1d74f8f831f
-MISC ChangeLog 5612 SHA256 25daab59ed4a86029c9c6f8147507e4d2e1e60425ec9f392dc6ab840f56ead25 SHA512 38d702cee0cdb4e53645d1a2fbf3d15151b7c8ab9c3c71dd569e862952ebbb1c9d6ea07016eb002acd3f0764537a3ebfa869076544a4e9d604204c552de6e28f WHIRLPOOL 7fb72d4116b473fb6b2c5964ebe05d9d458f89f8d1e7bd4c4df7d3b3e91b756ed665ad817833006088886a66991c1321828f52b331bf44b8ed573ec2883cd837
-MISC metadata.xml 157 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 SHA512 bbae663e26f48fdc5e272adc2b06c14f77f34c53caf84acb53908ff036e7c12a3edbbc0929d2db56bee861a453381d979c7e0983a23716f629ed2135c22ffece WHIRLPOOL 887e153e2481e7d76f0f1b67a395f10f0328b93930185ecdb8fcb5fe3c50f839086a18831d61cf45b34657aaffca6c3b7900cf3c04b712846a05027a84602448
+MISC ChangeLog 5709 SHA256 881d2e0f6386d3ee4ad33b339b62bbcdce22eb1433e8f11140905c59e9b649af SHA512 e90daae8ee10db28ce85dd973fb90814f7470c92372f461c5321e20d9a58e7987b94c8051b10734f1b63bd7a6e0ba47b4d224755c99404b82384f39b52d1a18d WHIRLPOOL 8cdf1293051e121dee9283cb80b0cd900d052e27eb055c47897f75f8f7ceddfe729ec5a9d9dad65d2ecfaa133321fe75846d693e3cf0469d335f6397645bf120
+MISC metadata.xml 241 SHA256 2eef31573e6425e9ef33eeebf026efb3e50dc0c34fc3c3237a7c56e4f369e7a4 SHA512 7aee0a193a7272afb7116d4b568d190a84364b168dfe5868c5761f704b0d9cb64a3529ba886329b0fe50da1864e9b35210a41e6de72a199aebcd34e85684edec WHIRLPOOL 138e193babc25d4ee4f96c006e96fc117cb6aff52db683ba3a399f1b6895fcc186b64f763fbfd928df292d041d9d59bc8a97d8cc6b7aa157273fe56c07b7a012
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlPn1DoACgkQcaHudmEf86qlNgCfYzXat2UJfZZldZHFYZxLbX3c
-BsMAnAmABzP+hrpj50rmiGsmDAG+FsUZ
-=sFs/
+iQJ8BAEBCgBmBQJVdvAkXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmicM8P/0kw0SabZz73JKH1u1tdWMr4
+XXLa5RblB+Q1qCVcqnohOchQxKbjqxgGKp33CwGcthX4XjD6mNaAHst/3vlpDsS3
+fFMu/crta7cpcNRXodS0IaYU5xphvMe6bHXe29vEPQYMOUWXBc1EVFndjlz1mNyu
++uzhHIJNK38AID+Y+NQc6ov6WOHz1F5E1OddOkwG8g1iTBDNySTr8y6GE5q2Iuyc
+3TThmrGzdSepQnUTr+XgMZvEn6BkT3ltOHx4Q/QS52L9j8IjGEiqIYj6g8u7DEPw
+LjsL40JwApp9NlpNanafFk5O9JQoYoCe/waqXxs/S1kHpyZ4Ay1pDPey0XhGoeQY
+IP7dqxUqO6mD8tOFzGuZM3AhwQhyVZFv9pRpzTzE0FIe8+fTr3gXh7jKIvRqAQn8
+MettYzCLhB9vjrPIEaZLGzrLsqtT1afQaED2SC9eQfrJBNhp8o9ySIO8kyv6IER2
++csSjKZYC/MVHqWGk5JBDDMeayr0QiKvWKDREtuHKwnMRdLeiKX/EspzwLUJfU4w
+Yd+mz5EzKtL57125v2Tc8/7xpZH6pYxKY3KfgO3f2WWdbvAgFZHHXJRrWPqu3U7t
+tJ7rSifRWLYj/7mjZXBtnRTr0EB4R/zEiDrVZHcbn3c5L3pN8lb1m8FOeYS9L3Li
+hIALNRJaWdNzOJ274lWX
+=echE
 -----END PGP SIGNATURE-----
diff --git a/dev-java/libreadline-java/metadata.xml b/dev-java/libreadline-java/metadata.xml
index 838c00a4a448..fae0e728371b 100644
--- a/dev-java/libreadline-java/metadata.xml
+++ b/dev-java/libreadline-java/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">java-readline</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/lzma/ChangeLog b/dev-java/lzma/ChangeLog
index bd39eff47ca7..f2bc973377ff 100644
--- a/dev-java/lzma/ChangeLog
+++ b/dev-java/lzma/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/lzma
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/lzma/ChangeLog,v 1.4 2009/03/09 21:38:20 maekke Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/lzma/ChangeLog,v 1.5 2015/06/09 13:54:59 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   09 Mar 2009; Markus Meier <maekke@gentoo.org> lzma-4.63.ebuild:
   amd64/x86 stable, bug #260527
@@ -20,4 +23,3 @@
   19 Jan 2009; Thomas Sachau (Tommy[D]) <tommy@gentoo.org> +files/build.xml,
   +lzma-4.63.ebuild:
   Initial commit. Fixes bug 244922
-
diff --git a/dev-java/lzma/Manifest b/dev-java/lzma/Manifest
index 47184e9b773f..140e32fb6f2b 100644
--- a/dev-java/lzma/Manifest
+++ b/dev-java/lzma/Manifest
@@ -1,5 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX build.xml 465 SHA256 0c34f76782a8d9a421d21f4ea7d8182d9f6411bef014c47335b79b5e850edd47 SHA512 4eb793b6f94474cbb100302190b34692817b7ead7e14a6171db78fc80f1caeebe51e6422e1539997a88f6df8d7dc4029268a9ca339fc98d4331c2e84ad413260 WHIRLPOOL 6a7be40bd56e0d2bc042e4eeed435b8bc156e9b96cf36090e0c35ca3c3b1a05996470e067d74b43f15000f987bb5d62d18221d365e5a0776f246e53f3842ecb3
 DIST lzma463.tar.bz2 288057 SHA256 42396b90eedfef31951c1411902ed21ca9fb62d506c49dd1a2d4a7c56e53fbb3 SHA512 9e1fab5c54611c8ba9db2f4a0495d8a50d68a053d42e57a30f3a05021c68790d20578feac7c6ecc96777180633a552948e731e37dba0a07c9160e83e35e69fe8 WHIRLPOOL e1117a5867639b2569fbf4d5f2dc52c1bc0e5b2bbae4680aec20cc3482d1977c4304953955fbf29f33f371687dc4c9c62d155b6acb585bcbefe3e55cdcfb0c48
 EBUILD lzma-4.63.ebuild 909 SHA256 b80dacfcfac0b998387f9fc198fc034cffe3c457386e68f0e01ace9536d3ed13 SHA512 69b939f90e112afdc24bd614d386187327c437ddb6695f528fdf6ce58d6352e46a024db2f94c109b019527792fc0abea43bfdf720bd495c212fc65f8c182c36e WHIRLPOOL 7fd0d8fb1ab8eabd3a8768cac29d20cefaaad7231027c9960a019454335dccb970fe018d6257d2ab4dea777e51067e514cc64a3a12d315611201e5e5610ef76e
-MISC ChangeLog 733 SHA256 19b5cf8ab634b67070a76b8853fd37abe515f5a3dca3101210817ebc2d0121b2 SHA512 065f5dd8f7a0138028d491cf00960af76eecc5d0139ef40980a7bafb6067480f1482a4fdf0db926f42e3ec7f5d683fd7770eaab86bb60af5967892080eaf7b08 WHIRLPOOL 7fdcb6a4aeeb48b2b1bd763f365415335cbfd75b48bd58de19dd81c5f4d2e295e917ae9598d4334c0a81c2395750a9b8233d85662c54a757eab83a1c7804ad32
-MISC metadata.xml 262 SHA256 5a48177bba82f308c835efee09c4f2da15fe97eb7bf5a9a9950940dd1b7c95a5 SHA512 9ad890243702105b0e5b3f7f0ef0f88a71bcebd481d1cf15c80143f1b30780e438fcbc804630eb26c3080454d0556875c1922abf4c854a44438dbdc629d9a2e8 WHIRLPOOL 69ee1e9eba2c234d3f54dd3105f309c551b7e255a958dc7dd6e2c70baafb4fbc7e33fc4231e52d2ac983f441db7c63ba63915e658f44c3cc42cb3d7973db5b29
+MISC ChangeLog 829 SHA256 03f1f83da923096c9f408d702a8824804c6318ce19d0c431ba7e46c83a15ae23 SHA512 15417efebe1eeb99450450c928c10b43ba4074fc2218fa15793f5aa3c1c35a7eed2e714c4be9175312767e77e6c5bde35756520887fae2d139a582bf55cbf005 WHIRLPOOL 5923418c8aaa288d0693bdb786efd7c5d3322ad2a8d7138acb36ec87c458d3425e354b63c4f96f74cee0ab9b9d33913558e65bccb2b16743e019c13a719efaaf
+MISC metadata.xml 339 SHA256 21cd84564d4b736f12f4eb30f6b6e1b95591cbc31e046d325066a28324c1a463 SHA512 9bdff531ecc125f810e05adefb435170e9d4c22342972a8103a30bb566d8d62beb33f21a34dad639a98c20a70e13250adc8aabce7748427989baead8cda30cb0 WHIRLPOOL 4c93ef3f763429f28823de2fb552e3bb6f93694c47c6fbdd4bb36c2e7b7a1b25c0e461603d544f5a7116570873f6eb08f4756be7b5d9518a4d23d6bbc3b15f4c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVdvA1XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmijTYP/A8bYh16Ed4OG5dHr62CQAUc
+/ZzuNI8dPVVppgiTG5aZ1CbXbzA/sAfU1kTMjFvS6tri8BzhTnm7c6fOcSZ2694B
+l+/LZXk4pXXBrS2JfFgg99FQH8yYsyEVXtdy32wXTwr0Og8m2wnQsat9yL6lZ5o6
+Lv0koCDK1S26TgbmUdJlA/3FtxYG0QsWQ/5UpylUbbvoSwza6o2zq2EdkONsF336
+gIxKHLVHgOd2EqWZ5u482U3ilqZmLgQq27kz2PlmyT5GE8nu/NqMAL6xJSHD3QJq
+OaWsze48+WvMzvFH/eJ6TsuTysfZnHsFrdfpSgezYzlwFdZPamZ2tQdzI4phvfra
+uM3HomW6PQ4oLqCZm7yFcZRCpIBM//X3rlBFTnI7gqudbH1CFTiLI7E7Ce8XsoHd
+fFInHK2EX/jRrSoGkGnn5zeQcVVyl7cLXmApU7bNzy87+Ae3uAMz3UzSk487vCfS
+/cbia504/bT4fp1hwT8aD/MAcXfrg+47/hamFR44g4Q1dbK7N5tXjWfclWPj/hQo
+KO88QDd/lYEPb8Zib7rBk8X5Czt8HzmB+UwEZFl4C/O3PDHZJCp/NbHQkdQJnqoV
+8llawJAiuAlzS2lQbzxlvyeNBBZVvvV7AyaglrSxoQNyY2hqsh+R/JcR3BL5TPB9
+cQIj3O15EZC6LAnLwIDv
+=oi8g
+-----END PGP SIGNATURE-----
diff --git a/dev-java/lzma/metadata.xml b/dev-java/lzma/metadata.xml
index 21237a6e3ed0..5856244767dd 100644
--- a/dev-java/lzma/metadata.xml
+++ b/dev-java/lzma/metadata.xml
@@ -6,5 +6,7 @@
 		<name>Thomas Sachau (Tommy[D])</name>
 	</maintainer>
 	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">sevenzip</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/dev-java/microba/ChangeLog b/dev-java/microba/ChangeLog
index 108e486e82db..862e6b00e374 100644
--- a/dev-java/microba/ChangeLog
+++ b/dev-java/microba/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/microba
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/microba/ChangeLog,v 1.13 2011/03/26 19:10:22 serkan Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/microba/ChangeLog,v 1.14 2015/06/09 13:55:21 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   26 Mar 2011; Serkan Kaba <serkan@gentoo.org> -microba-0.4.3.ebuild:
   Remove old.
@@ -44,4 +47,3 @@
   +microba-0.4.3.ebuild:
   Initial ebuild, based on contributed ebuild from Christian Faulhammer
   <opfer@gentoo.org> as jabref dependency in bug #122085.
-
diff --git a/dev-java/microba/Manifest b/dev-java/microba/Manifest
index eab44e12d284..b41e6ee41cca 100644
--- a/dev-java/microba/Manifest
+++ b/dev-java/microba/Manifest
@@ -1,4 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST microba-0.4.4-full.zip 631831 SHA256 33c3779dd243d7415b137dff5d15d292589390b08f398f77fef581099aa1b5c8 SHA512 80103b33ebb50e0dafa82b713218bbedbf59424922424515a453a49d1be416960a78c6c4d987eede5ab168f806cf0bb7ffcc900a6a19827e51e9bf612d08e742 WHIRLPOOL c2bd6033dc3e18597e6d0219bde742d09dde70e72a82012a14d27966c0d12ea9ca725d3dc2d8732bc557979cea8e6808a7ed5ba9b3a3be04b33dd1071bdb9dbe
 EBUILD microba-0.4.4.ebuild 1135 SHA256 d521d5b7368995a4776c88e1100ebb68d9b78df11f83fa9690220eefe53ba047 SHA512 8dc19c01dda53a8e9f9aafaf6a883457f4f11a91ff340517d8dad2a68180ae8adc28181a52d8c1e5af7283c63f30bb053f180c74d963f001cb96c68fd536628c WHIRLPOOL 43bd31626d1b3d83de95bdc7ed3eeb76d2f12a87ea5b634014b989150490edd8207d95988bb018f55360e897e63ceabe4b8f497af6f9f04fc9892a222522c303
-MISC ChangeLog 1625 SHA256 f2d7ea4dd273b26a7a6e3247e9e7b5dc6b620f9d97133a90b706e6777d2a3f9c SHA512 2b98248168118b8555cc63442bb293cc2f6659fcfcff069583a64f477fd861fb3ed922f999d04e6f102d00e3b70509517a1823c6c4c6d57499d8d2df2df15567 WHIRLPOOL 3d770812ee8820430863e59b9a8b1aabcd9c9832e61dcfabd86cd3153b53add8571222bcabbb1fd6a1b9be850c4264bc1679d4e160e52b3f5998612cf0d13e95
-MISC metadata.xml 157 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 SHA512 bbae663e26f48fdc5e272adc2b06c14f77f34c53caf84acb53908ff036e7c12a3edbbc0929d2db56bee861a453381d979c7e0983a23716f629ed2135c22ffece WHIRLPOOL 887e153e2481e7d76f0f1b67a395f10f0328b93930185ecdb8fcb5fe3c50f839086a18831d61cf45b34657aaffca6c3b7900cf3c04b712846a05027a84602448
+MISC ChangeLog 1721 SHA256 b20660de9098983e868daadb41017271962f55adee5c4f4a9313ef091b39d022 SHA512 ee429ee79f44e8b5145b4d7056bf04e864586a92cbe166ae27c66fb801ff6ea0e755537f95b9e9a3df32a62033ea9b4ebc6c4d033b3d7ab99b7d05fc37f7356e WHIRLPOOL 9046a9f046e69c8bff37d5d128b0ce41b6a3a7ae9de45b88a52e8dec582709c0512eb4ab360f7e14c17bfa905976884de89795174618f91e754e703ccc2ce009
+MISC metadata.xml 235 SHA256 58bc8b754bcdfc99788bc91c8fc515c799e2456f40b7c019ee1be3e23d2b1de8 SHA512 c4748cda02931abefedc7dddfda2aed0ee601816c6a145b54b7faed011932f554ffcfa8d24296bfe33fb7021f5b63d2a721418d48d18b2de2f4654eb36528d3b WHIRLPOOL d2faeb1724a164b0a71a79c69cd6749a5f738b1b14ec8ac672dd37c2d388524b8ebe675cfa1de8918a7f941964983d4edbb820fb5d4d96efd1e93f5db5363103
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVdvBKXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmioIsP/R7jnEbCt2GjAs3ej8kZ6nWy
+3wBTmxNE7kGW4MvVEGytFOUMlTUrzxKzmvdD0ajO3GwpHnDiWb+QNR10n5nfDenw
+hZU6rwh8xC1xNFd5fQ8epcxrGsxuKRMOSCzSU2OHTgrcavA9OyKZdpSuU6Qevyco
+Qc9tzf98mQBHiBStfdzcB5cOcXjC/UgXv/6QplWQ0YLhyZR631v7Ldr7zfxP2fQO
+7e8eFrftiwJOoFIMOjRX2dv3zOts8haqegH5bgbvCrtXvvdaoya5fTgdEiuEcN1z
+s4/HrySehnyUcYTUXD40t8MMo+vsyFEM6DyWmHkH9NBNTWgo4lZO7PUsvX/WUx8P
+Cbata3LDVsNLD8Mtv1EajbL7MJ3h4/Lg95LsONj0aYL133Vw1evMTqzMfGZEkb3W
+vwquiF/CumxglMutnjc1a5p3OI49agUPPJLDwvxFf0BRjhhD8RDlQ2GQ3pkaOddw
+4bjkCv9vr47qgd4VnWc5zJQYQ4QKuW5XBj523NShPAEDo3zgb14k8h8lD4zE0n6H
+ds1RtvLXFKAW9Ypi2+F+mEsHnr98NDcfyNhewGbfWXoEwl2bonJLMtvvMah6xKMe
+9NfeJn1pepaJukDtoxyym4U+PcAEUAQsMKWPEba7fHQp/bB44HmBhhgu7iFBC9CB
+qjzId9vPfLtgcExeMsw1
+=Rs2O
+-----END PGP SIGNATURE-----
diff --git a/dev-java/microba/metadata.xml b/dev-java/microba/metadata.xml
index 838c00a4a448..ff6f3454ea40 100644
--- a/dev-java/microba/metadata.xml
+++ b/dev-java/microba/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">microba</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/mx4j-core/ChangeLog b/dev-java/mx4j-core/ChangeLog
index 3a2310809314..9afcc932613f 100644
--- a/dev-java/mx4j-core/ChangeLog
+++ b/dev-java/mx4j-core/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/mx4j-core
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/mx4j-core/ChangeLog,v 1.12 2012/12/02 08:29:18 ulm Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/mx4j-core/ChangeLog,v 1.13 2015/06/09 13:56:05 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   02 Dec 2012; Ulrich Müller <ulm@gentoo.org> mx4j-core-3.0.1.ebuild,
   mx4j-core-3.0.2.ebuild:
@@ -49,4 +52,3 @@
   +mx4j-core-3.0.1.ebuild:
   New split mx4j. Resolves bug #152924. Thanks to Alex Tarkovsky
   <alextarkovsky@gmail.com>.
-
diff --git a/dev-java/mx4j-core/Manifest b/dev-java/mx4j-core/Manifest
index cb46e692790f..b074ff2263cf 100644
--- a/dev-java/mx4j-core/Manifest
+++ b/dev-java/mx4j-core/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX mx4j-core-3.0.1-split-javadoc-build.patch 1979 SHA256 e34ab853dc00c9cae2f7f41f7431f7ab2eb26bfe7a37decf46ffd8f827d3263b SHA512 8cd1d593fbe99d2c0b88abe1841e10cd592990f53cb82c847732d8f170f185285fcb8e187c0064879239699d14f4feffe63d0008d28697c22cd514f6eca27bd7 WHIRLPOOL 4eebac124e24b1c45db794c63204dbe9cac5a9b24514e9fe3447433c9e78c2d0ecc53a037c3e69a6be9ca6d20768d609f96b311a485c8e05467cbb5279988e66
 AUX mx4j-core-3.0.2-split-javadoc-build.patch 2049 SHA256 90066b3c38398eb54a6f1e4359284d120225ee9a71e60b0d0e43cf543aabc3d1 SHA512 310e6ad1f2cba7179d514c176938a907e316c891b0044f82517f80eafd724412e66c3bb5953ac45121a993ef22fc126b5386eeaf8f52937b68989493a1eb8251 WHIRLPOOL 9702b0cbb563ba6ae19911e3f896b9fa8c6f8019b798804ebd568b49b8cccba1fe4c6a0adcd40595cd1a2ab5151794feab37222ef629aec2ff0b6e87097a14af
@@ -7,22 +7,24 @@ DIST mx4j-3.0.1-src.tar.gz 622504 SHA256 f6cef53b68b06d97041f77b69e091eb76f08d1b
 DIST mx4j-3.0.2-src.tar.gz 618163 SHA256 bb552a8512567c4ab508a04c5931bff0d859dce36b44bdc4213c6433f02cb266 SHA512 24014ff723b0880ca5f94b28d3c698659aa04258853e259b7b4025decbf27f0022cbe9da1101b8e2d4e5fb950bfabd9556a402a9b99e6122d0fca324e479ebf8 WHIRLPOOL 31c45b785fef2596bcdd39f0c8507db8ea315de97cd78e34ae3e473b71e644d91554c6601ddcc283a325c36a2215680b8138ab89f3bd817961119edf2c935f05
 EBUILD mx4j-core-3.0.1.ebuild 1667 SHA256 da8bb458bf5a4a2f966dcd6717715b1dc5c815d33e1414fce60020be609f918f SHA512 d2021ec268d714a56f022c27aa6a3cb1bb3060e91a3e04d0e669eebe31e0fe94d1768569a84d222ccf1364c8e8dfab9ea4b71c700f31d1bed6f1e9ae83f35743 WHIRLPOOL 69bd60bcc414f601997a12d821505e56cea8437be7d4fa12bd822ba1d72da1823dd19eb1f24c7360915c0a4bed77acf86f3e6058a5f35bbabda1e12f49e333d2
 EBUILD mx4j-core-3.0.2.ebuild 1756 SHA256 a1228e7291cc6081a7c2f1af589d62e4f5ba504b27fb08f26c69981d95056765 SHA512 c62b010e236699bbb345b86ebdd7c4949a971454b9b445a5a43a530178b638638b189113f7ca0fde52ea7e4bd6b778ccdee6dd30b446e79a4f769dea37e6cfe6 WHIRLPOOL aaaf49879d0a5ed97cdd44af4602c70884e930fcf0eb14577fa7285f51dcfc87bb765d25a530878e883183873b3458d6833fb16e898a3266643328ea3f5eb99c
-MISC ChangeLog 1749 SHA256 c9a90974109d146a7cc8df893288bf6538942f195d92cadbc327c536a45683e9 SHA512 819bef8c8beb5b80d78cd9f2cce0c99cf64d6c6f17b59f3fc07ceaf487aef9ca75bda50570f3ee96465995c0826743767c10fe3639e2815a08ea86593255c6ff WHIRLPOOL 2b8a34abeef27160b6f9d9aefe1c04c9b1cd5d343fae123797a59e030b9da2732c4739516ed32e8c4cba4ce8ab51496fda5fb7302744b1e40c6ecb9928efb327
-MISC metadata.xml 883 SHA256 fb7e87fff55fbd72651c1dded32f35a7b2008196a6f5cebc72c69b8bfd48cda7 SHA512 5185890cc85efa6ff7ce14b0a476857e2a2060fb4f8c47ab71e25be0cb2cc638e31392592a1d6ddf4985f3c1697c2e7427f4f554e7c192ff1d756bcf663f0602 WHIRLPOOL b79c35a5eed89af56ebd51f3a61095ead9c6265c9488116d916517b555281a283f42cc0f3d71c64f6f1f82c20136b197802552c960747222527e15a092d83018
+MISC ChangeLog 1848 SHA256 4f721aeb7f2c25a9e62dcfe4b57c41487cc149e8f3016780b9a22c731b4ed516 SHA512 8493e366d1644d71343b8c79e37ef6eea73bf75a0e136df47d776818fd49a2ec996b6554e58d19ad10c8e293c90e2e843a0338afa377b9e75bc33e65983e7a90 WHIRLPOOL 0d94116f90024c0cb9152c25b13ce10a3ac24cfb8fc7bcb88e3b5505f19d24667dc7c033e2155606312b91528d040e25627bc3cb16c57d7cf3b13c2ea665a0de
+MISC metadata.xml 959 SHA256 dec247795b994d19d1f85e6ef8a9b42b048e3554d4be5c1cd337f885b9c025ad SHA512 18172589d0a75dffc1726de8743ead1750d2a094b84cc608accb51d7c47e5492f02d670c63f03bc97cd31742422769736ab7c59ce7e95e87a7531ddd02cc5d48 WHIRLPOOL 798ab79308dddc57d4e8f6d56a5b79d1ec9c3378ab22c783d19dbcebd0b99004cf8206ebc6a82ae94830ee6c7cbf178d08457bbcd0867802e28d97c941b38354
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJQuxG0AAoJEDxpGckxwJCBcdgP/A++qiHNpT0UOPP1YOuLlkqq
-nHCn8FDum3KWrczGEETYlFi8wCLk0ztofz/f3DqdMkqYdGQD0TMKbfWiMKrHG2ZI
-OKhBu/W09LkmUAzLr8oFDHRYoPLnqnA+03+Q3imDZwvSQNMSctNLrKdMY6CKtNNt
-3uRiKHLubcgTXPJ5EXxXdxLmhH0TJPrfDVsYR2O3NG8ra1twjL3GPDXQz53xyxqD
-F5O3ewZ0zBly4fEtkByJpDVEwLdwZ7jQE42BPxAmwnssjgjPxpaCJ/sUohxZ8x/K
-9M+0QbHcMMlJPVJyK8QoUdsO8s1CRMiI9lzbvaHkuXQ6z1Bp84KJEiqtx5AtIygx
-0DG70VAN7z97LFUGzSAQ4VzhOX+kia3NbR99p03vNhueByGMTljSdf0hdZ8TfVfX
-V6jPClunIghooQTVsytd2EBXIwY/SiV2xpfgsWPNd5OFUYlyqcJKu1ULycbLfXqt
-HL4bF7NlwAChDPRvQjwUll9vaLAevBhgRmdz8TtRAplgT/TDYQYh3k3pOkSoyfLc
-5YmP+VwDBAWt8URqmES3WLt4EP5ZXG9qWgjleP9/oAwXsAhENfqs6sL3+dJPrboG
-i0QJfBiODRqd47H5KZDNY9ZILF31Co65fz/ycCfyMO095cpqVOnjdtPafqETia8C
-Semn3FEVdUjbBCrUYiOm
-=6Ybf
+iQJ8BAEBCgBmBQJVdvB2XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmif8cQAI9IBSdNlBZ38B3dD+eLTuFv
+cDZOndq1TUkOPKEy0qwteLrg+Wy27Zgu5u2Ibs/XV3B3M5ZIfDk/oG7mKmM/O3pb
+kvRaRWx70ClCfbm1WlN1l3vbHTjm2e0hOeYJ5mv9W3gFVUicy/tJAhpvXgA4uCK1
+xUTPKy7Xtot6uy+s17N4fQ9kTBUEIf6q/H7ITix1lv7giMCTwrbJP7P3ugycJ4tA
+Nd2YS4jOTO2wNadZPkgIxokoNXbDPh+a05fKb5++2uL0AmyJpGfnuGGlWAVDRCRW
+OpaSSatP82xxdQnIAc7RTFY0WkRcY3rkQ8IBFyZLgzHEFBDxfyU1zxgOf1I1JFKn
+c13BwvEgGmYMRKBVzWJuLcBHlv8TGk5p88dXPjj73vizVqlJYFk1TZnf3+utC4PY
+X+xBFzGdbhCzoxYe4wrY2UNLLtHEoXwzYPAjETPn82xajTetpfe1La4sj+uIXR7l
+JW8R7ryBQiLEA+jzishxZvBB11aiGr9HzneOtWAHL8REdqnUJ7ejdRODD2Q9Ct4t
+l1+ZqBBMscYxkkcTeyM6ju3CaVFu4GhWJkJZzcv6JTJJY9H+tJg8W6gDuH/F9r5j
+kbhDWmFhXaU8RvJGs/+1zBj4xPfug+q1xDw9HmE2mBKhdfGQYqpp8BZ1w1Wu/if8
+paAV59M5em4ieoyNP97H
+=exAn
 -----END PGP SIGNATURE-----
diff --git a/dev-java/mx4j-core/metadata.xml b/dev-java/mx4j-core/metadata.xml
index 60444f30d740..5d6507f94ff6 100644
--- a/dev-java/mx4j-core/metadata.xml
+++ b/dev-java/mx4j-core/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
-<longdescription>
+	<herd>java</herd>
+	<longdescription>
 MX4J is a project to build an Open Source implementation of the Java(TM) Management Extensions (JMX) and of the JMX Remote API (JSR 160) specifications, and to build tools relating to JMX.
 
 JMX is an optional package for J2SE that provides a standard way to manage applications. It can also be used to wrap legacy systems and provide a standard interface to the outside world, enabling the development of web services. JMX allows developers to write more modular and loosely coupled system components and reduce the complexity of large, interoperating systems.
@@ -10,4 +10,7 @@ JMX is an optional package for J2SE that provides a standard way to manage appli
 This package has the jmx core. To get everything that upstream binary has emerge
 dev-java/mx4j with the appropriate use flags.
 </longdescription>
+	<upstream>
+		<remote-id type="sourceforge">mx4j</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/mx4j-tools/ChangeLog b/dev-java/mx4j-tools/ChangeLog
index 97c10ed95632..01b647e79dd3 100644
--- a/dev-java/mx4j-tools/ChangeLog
+++ b/dev-java/mx4j-tools/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/mx4j-tools
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/mx4j-tools/ChangeLog,v 1.16 2012/12/02 08:31:21 ulm Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/mx4j-tools/ChangeLog,v 1.17 2015/06/09 13:56:25 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   02 Dec 2012; Ulrich Müller <ulm@gentoo.org> mx4j-tools-3.0.1-r2.ebuild,
   mx4j-tools-3.0.2.ebuild:
@@ -73,4 +76,3 @@
   +mx4j-tools-3.0.1.ebuild:
   New split mx4j. Resolves bug #152924. Thanks to Alex Tarkovsky
   <alextarkovsky@gmail.com>.
-
diff --git a/dev-java/mx4j-tools/Manifest b/dev-java/mx4j-tools/Manifest
index 3c0d56d069c9..a39f728baa46 100644
--- a/dev-java/mx4j-tools/Manifest
+++ b/dev-java/mx4j-tools/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX mx4j-tools-3.0.1-split-javadoc-build.patch 1979 SHA256 e34ab853dc00c9cae2f7f41f7431f7ab2eb26bfe7a37decf46ffd8f827d3263b SHA512 8cd1d593fbe99d2c0b88abe1841e10cd592990f53cb82c847732d8f170f185285fcb8e187c0064879239699d14f4feffe63d0008d28697c22cd514f6eca27bd7 WHIRLPOOL 4eebac124e24b1c45db794c63204dbe9cac5a9b24514e9fe3447433c9e78c2d0ecc53a037c3e69a6be9ca6d20768d609f96b311a485c8e05467cbb5279988e66
 AUX mx4j-tools-3.0.2-new-hessian.patch 1666 SHA256 831bbce4b2ecddd0d1a6f24181fb993dddfb601d559a99227b9cb8f925f227bf SHA512 fcf4388cffcab4ad3efcba64cca9508ef7cd41ae5352df0b9898191988dd38f83ebdc9d475c1404bbccdfdae8223e012ac219aecb748fa472453b629e1043638 WHIRLPOOL fe0d0f715c29146c46ff9a81c8d981c72e7191a91dc09d71a4ca07fe5082d498d72102277a7f8cc55722d313cacfa9aa6b87bc64beb5dc2e0f679b61378bfaae
@@ -8,22 +8,24 @@ DIST mx4j-3.0.1-src.tar.gz 622504 SHA256 f6cef53b68b06d97041f77b69e091eb76f08d1b
 DIST mx4j-3.0.2-src.tar.gz 618163 SHA256 bb552a8512567c4ab508a04c5931bff0d859dce36b44bdc4213c6433f02cb266 SHA512 24014ff723b0880ca5f94b28d3c698659aa04258853e259b7b4025decbf27f0022cbe9da1101b8e2d4e5fb950bfabd9556a402a9b99e6122d0fca324e479ebf8 WHIRLPOOL 31c45b785fef2596bcdd39f0c8507db8ea315de97cd78e34ae3e473b71e644d91554c6601ddcc283a325c36a2215680b8138ab89f3bd817961119edf2c935f05
 EBUILD mx4j-tools-3.0.1-r2.ebuild 2635 SHA256 45f032a4fac0216736460651d4a14f80d31fc95515cdbcb89ef8520465e970a4 SHA512 bc0fbf9332537efbc11fa99f43e4b5e61caa4300726067e88bd041c253cc2919fdad375a539410931467320aaf71dc786dfbb9c8b6766816f5cce60915ddd3ee WHIRLPOOL 2dcd66b44bd29558accec32d3bde1bb59dc5d9ecfb373833db53c748d9834eb75beb1d715718a45af9213e6fc44616556e0724ea2c6620905ca427b3e6875a63
 EBUILD mx4j-tools-3.0.2.ebuild 2645 SHA256 1040668b52bcfa51f5149d2ad034c6c19545ce07b310ce8fa65b46d272badbf1 SHA512 a1ea643c58a969aa8fb770b5f317f7d0d110e996444c0495a3e2f3dfe58b904de94c02e39c41774cf37b22a8825af3fc4817411a9be3d6ed167c4b857cb55ff3 WHIRLPOOL 4c7dbeeaf1d2f1398144da6a8aff15ee3217a1b0f0239ebe257b8169af00609984e030f5e8a6d5f217578b540b845ce0b3bca5ed5e57d2788249346059b6e32a
-MISC ChangeLog 2599 SHA256 0d676a7efcb8caf1749691b63da25699882d3fdf19947e2e4d3466510b1bc36d SHA512 65af6fb6608b55cc2042db9fbb985652c2dcc285143638bf158269e8f5a3b06206e5789c5c1c5eb0459e1b4fdaa695cc781edd117932a9bcec85946540e400e4 WHIRLPOOL 03d58853f8bbb2c69cba69b5fd8702ebbaaaf8549720c4dc65e53e9d72afe2b9d66964545d0ba9c49b3e70fb7f5e4135d9037831c94210e74e5085998825bc68
-MISC metadata.xml 889 SHA256 2bab20e1dd2a72731c4fce19fba4536e318a86fb4c8152a6c9f089097e9e064c SHA512 3bd1a1fbcfce1397bec881d0ac5a1a68247edf7f8ed9aed61359662b8f57bd5fe2ef0ae6839a2c8d2fb418d55c92cfd4e00dcf62f94a75c64c8fe29424ebac81 WHIRLPOOL 68e46e06c597126b24ba4d1e5c65d70e8b178becd585f6e704007b65691e638da2088b3fa08f90e64801c08d6a5cf5348953a3a50112b4e4d40eab8e61ad6ff9
+MISC ChangeLog 2698 SHA256 db67b8b3ffb8781579e5e99c8f6cc82083e87e32255be7d08dd683a170559747 SHA512 95326f6fc9152e84e0244e185de012f0551829a2edbec57c1383fddd6306c82b40d98678bed96971d31207182fd1dacd53fdc49bf6dc892d9a69b5addc711009 WHIRLPOOL 0e206bede7ae0294927729536b7c957e96dad0d54c2c934bf54f08df11a3d5c8449982d2244372dfd327ebc5cdba22d21f60ce30313b978e4b0ada4db067a654
+MISC metadata.xml 965 SHA256 a503f90a5e63b89ac88462bc31928f65782200ca77453ef904222fc9df238316 SHA512 849824bd8ebbbd6feccec871875f0baa4a4f62e668a17d15c6fafff10eeffa6ec0687834de1756d205b9fd10119883cf0966f71fcc50779fb429e14b76ce710a WHIRLPOOL 23849fc46f903ca96f2d70dab93f316c231b1a6ffa942da0a7287a878a1a088d85c6de21b15cdcada6cd0b7e29b542e009057f90f574e1f5847ae9355bbfffa1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJQuxIvAAoJEDxpGckxwJCBO6cQAJT12ai8cnSUR+LPrMSxygcC
-qelu80uxHDHIvd0hbgACppWRPqC9HN9VqImSVX5uBTamH9Prmm5YpBMWuABi92q8
-NcshhCg+FaX2lL9yKptyILNEwlljJJpm1jeBbC2OuTHc6BzMKzigQ2Ene+xCGfY0
-lszxrg0cGvFmCOdBsZH7TSbMLb4X6gEHj0n2tNcH9sBrnaNRj4hk2bcztAlBJoSo
-ohNm5kTBXg3CKOMSXjLpv764rLmVTPhydZ2wbAiMf2LLNcjpjcZW0wx1lSEM9EY7
-AlbKGZ0lAgz1lKNDO/RNRBJWBFKWP1n1uXVjL7qBo0QdrKn5HvhB1FaFMZrW7aD2
-mEDQ9FCpmGJ+Tz3jvuvjjA0JvCZd/XNrAnBlpYa1ny78u3JgNQDhUMmde8K4EZzB
-KDYYFY0Hn8gOsGu5ecnMT1l8U4Q5vyrEu7MgAHZekUHWagLjqkfm8E4z7J4t0VFj
-UD1MLz4Bnrn1WF7CTZUVXHCZkwq887Mt0Rv+1MGoB0r9jyHJC2qxcpVXp+BszbOl
-8D9oAyPnUgMuDklASHaiCC88/GINEgRBDCps8TMs6uxnges5b7iFufCf/jsF7DJz
-YuGusNuAeMPfSXrx976PwKF5dye3547RiQ7VFlCZdfXu4gGIfLO7Kbw69TI11e5U
-t/CWqHzHw00gm2HryR8s
-=+rCT
+iQJ8BAEBCgBmBQJVdvCKXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmixeMP/jvpfEj13bSOUBFhuJmRXFu4
+9jdMLUWrSn8nBlJGEjkIFwa9cK8A9meAnh0dpsrpavX6Lz0611oVY4ye8WslRTnU
+IUSYaBJu4rs5bf/d0vy2S6UGGYYt255XGGWSH0+uvw5xJyUy+/aUSOZ2mNRho7fR
+wvEmI5QMaiZyJI19wVEo4BRPtSol7UEwNJbF0/eUc2yibL2FGWfCkxluH25Oe7Fs
+/NeNvtbDUThQpXhYA9baQq1HRa6iL1QU6b9QkOLKxUdnVEXAAF9zf/GBNfN129m/
+52+9yEgXmN6NUFa4ZIw2li2i0U1kYx9/byCAkStlGWhvDDkXJCGh5LrUpA9c4Hy6
+z15P0/P18rXwNaGMXfKfnF4mXPLWeEDOD/JtAUv4H0KxajFmiKoU2mouqDhunasl
+j0159s8wg/O9repr9iVon8sfRP6jQbX1QdTyHvNbtwMaVykf8jQ9MkTHsMW1VRzW
+UnH9xOPs+r10CdWxVd68spLiNi+aMHkkw17OS61/kjIOUcbGS/KhtICcrhC74oct
+wa02eYrmYCp2qaPE7F8HLxFJe4sTPznK1k0RUutWYntdxGvS9Ik31YrNc50+gzFZ
+bVa8e7OeREbv4DOzLDvGJeAo0rwdE1ls+4sm+MzqK9jzV6Jidi6k0sHorD76aFXM
+A00kAs4ZevCkAl6pryov
+=ey0D
 -----END PGP SIGNATURE-----
diff --git a/dev-java/mx4j-tools/metadata.xml b/dev-java/mx4j-tools/metadata.xml
index 43c23b39dcaa..b59408fa4e72 100644
--- a/dev-java/mx4j-tools/metadata.xml
+++ b/dev-java/mx4j-tools/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
-<longdescription>
+	<herd>java</herd>
+	<longdescription>
 MX4J is a project to build an Open Source implementation of the Java(TM) Management Extensions (JMX) and of the JMX Remote API (JSR 160) specifications, and to build tools relating to JMX.
 
 JMX is an optional package for J2SE that provides a standard way to manage applications. It can also be used to wrap legacy systems and provide a standard interface to the outside world, enabling the development of web services. JMX allows developers to write more modular and loosely coupled system components and reduce the complexity of large, interoperating systems.
@@ -10,4 +10,7 @@ JMX is an optional package for J2SE that provides a standard way to manage appli
 This package has the mx4j tools. To get everything that the upstream binary has emerge
 dev-java/mx4j with the appropriate use flags.
 </longdescription>
+	<upstream>
+		<remote-id type="sourceforge">mx4j</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/mx4j/ChangeLog b/dev-java/mx4j/ChangeLog
index b443e966766c..3f07765b6ea5 100644
--- a/dev-java/mx4j/ChangeLog
+++ b/dev-java/mx4j/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/mx4j
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/mx4j/ChangeLog,v 1.30 2010/04/03 12:13:31 nelchael Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/mx4j/ChangeLog,v 1.31 2015/06/09 13:55:41 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   03 Apr 2010; Krzysztof Pawlik <nelchael@gentoo.org> mx4j-3.0.2.ebuild,
   files/mx4j-3.0.2-new-hessian.patch:
@@ -121,4 +124,3 @@
   22 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> +metadata.xml,
   +files/mx4j-2.1.0-gentoo.patch, +mx4j-2.1.0.ebuild:
   Inital import. Fixes bug #65302
-
diff --git a/dev-java/mx4j/Manifest b/dev-java/mx4j/Manifest
index 727f78250610..92a71c685c9a 100644
--- a/dev-java/mx4j/Manifest
+++ b/dev-java/mx4j/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX mx4j-3.0.2-new-hessian.patch 1666 SHA256 831bbce4b2ecddd0d1a6f24181fb993dddfb601d559a99227b9cb8f925f227bf SHA512 fcf4388cffcab4ad3efcba64cca9508ef7cd41ae5352df0b9898191988dd38f83ebdc9d475c1404bbccdfdae8223e012ac219aecb748fa472453b629e1043638 WHIRLPOOL fe0d0f715c29146c46ff9a81c8d981c72e7191a91dc09d71a4ca07fe5082d498d72102277a7f8cc55722d313cacfa9aa6b87bc64beb5dc2e0f679b61378bfaae
 DIST mx4j-3.0.1-src.tar.gz 622504 SHA256 f6cef53b68b06d97041f77b69e091eb76f08d1bd0d92f48c9bea958e8cb5dcba SHA512 7e37b49f7b25475a8926caa74b3f2d252f106374db26063d4f9c72f2e7a32e9c90256ee763e8791ce6a1981cacf8d1848cf616c7771c734c3e05494681663465 WHIRLPOOL 333cadbdc1d166202960d9da1978ccb2c6620d86e3b5aec40101139295160615bd32a5ada4c9346513361b41b026913b5d328aad15dc2bdc858587e920521c47
 DIST mx4j-3.0.1.tar.gz 4562130 SHA256 bcb066f5b2323c66b80e80e641685e3adbd4a2d4c654f31c4a49b32b8290e006 SHA512 dbb08991b554a8fec29c3e18ed4a355b7af9e69bd5f9554968b6861b6f8e4aba03035c30b6df16e06cbe61dfe6d62819c4b3c3c31da55a3ad7c47429a334f096 WHIRLPOOL 192615cdfd531a84211198f8289b879760248d7edfde094d6fe076330fb2fcdeb3a37256c078b63ea72eaf5e0175877820aff29028d6d4db4f1fd7b03f82fe97
@@ -5,5 +8,24 @@ DIST mx4j-3.0.2-src.tar.gz 618163 SHA256 bb552a8512567c4ab508a04c5931bff0d859dce
 DIST mx4j-3.0.2.tar.gz 4555894 SHA256 282bd68e517aba3d0f5bbf76f90c3c09e446c529e7796467ab7de65398bb1115 SHA512 a4b8b62530ce41a0e3170a0c31dbaf5251096b98e50f73eeebd725f29e5b7e920d8c7f03d486d72c7643e9ce069a86a048c080f019fd0053dce5e6774809a26f WHIRLPOOL 775f2b51664e3d05687b1e3fbb7b538e45e2918b8a079d2048a75a1f5aca1c323a2d0c1e8847ca94649973fc7e6f9bb324d44f76acb551fe1270138ae126ebbb
 EBUILD mx4j-3.0.1-r4.ebuild 2475 SHA256 de24692a9d4d241ded1de72c5b04f746a01065343116a547e44ef3147057b2c4 SHA512 be0b826a44078d35d1b653b76f86d724e8dd15d632b98944d8b4d123c6606df5e280e7803036522c385c3e780f4fe277d6738ca914fd36b8635c34185f0d0c30 WHIRLPOOL 117304656cce0f3757e6049685cf2bbdc7ae4660953d3fc93667547f7adac57a4a8a2c598969bafea9a21a4077ec4b3e9fa301c45b69b3c3f127ed5ba23e0275
 EBUILD mx4j-3.0.2.ebuild 2439 SHA256 ef84e799cf87e1db2b246a1713e8d44fcdd46ee287cf7ac2133b9dee60a359a6 SHA512 5f1fda3c5d0844a19f579c605ba971fa91f4cf5d500b2fdd46b9601dff3fd67ccb95d26fd8cb8952faf0025dff39d30e2f3366ad9fe8e60de91020be1c5f9c4f WHIRLPOOL 02979d60247d1f60ad498bfddf0667e46f123ec39f35745e7403c73f6ab595decb33c5a2b20c393ede9673bb417b3b859f13d9fd22401a0a301f3007691551d3
-MISC ChangeLog 4422 SHA256 3dd8eaaa00a0c0f785b33d239c51256bf63fa489e3d353ff09999f07f2209746 SHA512 dd30ff9e4526d216182840e3dc06bad991f88cf5c007d401f156e18966f21e07869de1a733a5e0dafb985535b6c75f8a65b14c5503de68054bea07fc9f401be9 WHIRLPOOL 804c66a7fd611b9b9918f17555a8acd5edf5fb96dc00217e791a3ca556b14317566084d493c45dfffee291c8db5b850ce285e0cf2385a7687fc2e82f29de8376
-MISC metadata.xml 960 SHA256 a7c53c20547646cf8ee55f8c64935ed669eddfcc8dd3e54da66afecf21b4d2da SHA512 29497d00191efbfb788b85e552eeae0f3d7b4bcb3b0c8a6bf88a42cf1eeedec48d06db992afd7f78fd86ce886d3ffae06cce1760db0875689a29389104626667 WHIRLPOOL 322784ca3a6a7024d5457e9a96d68ff64e534e35ab095f5b4bebee6e7b5944e7f3a5156c5d8303adc547d00380e405e5ae9e08159e25d82409458b76ea473d91
+MISC ChangeLog 4516 SHA256 40630b34a038d2ae7febbb5e6699d56fc24bbc975da1acdf85e9475c86d11a2a SHA512 099e73ac633308b3654ca3751c2f74dd933ee0110ea4046e3a0d40489d9fe8afba708207419a1e6ac3e70a26b7a76071ae815b0c2b79af45631e38150103aba9 WHIRLPOOL df5ac4ad7298d6e85eec783a6f8b5d2ffd2aea46f9d5aeabfbe1b7ef8ad358ef4d771a448a504c5434afab7985f4e8b5aa0e185f8bf1ac998df64ceeda832c8e
+MISC metadata.xml 1036 SHA256 bf9b1e290c948f7313b125822caa76a2f54b047f42b003ef411c9b637981571d SHA512 b3ea0c2e04113816a29f4a44fb9858dd3627bcb6dd6485e94df0c12fe43db0774c0f04c1c73da25e0a3ccf76a1edc6aba19c821a1646de3f9a228b64b0e0c8c7 WHIRLPOOL 93582b99b79316ed5a436b23454685d17949389223db1325a69ca035057046c128b2c91496e0a7a59106da280584556deac232ac3c44591535bbe7d8ac3822aa
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVdvBeXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiwsMP/2pY/liuJyza3IbR65OeWoyQ
+MaaeTDnDwaqynLBh5zkQARwGpQtK51zr+3Kj8p/AvZ1jJ/JloC5SJ6DhTk28p2o4
+un0eF10irXpVuh/C4XSbGakftMAUBlYmnEXLTSNBD85RRKqogniAIHiezWjlXWgj
+A0dq0ueRAX8Avvf4KLhujXj8h227BbWWpD6CzHXMHWVzkMbCg5l7mJ62whXi3lbw
+kow5x/45xNEYMq9BRFImw6EXKs3jVspJ2Oa92L908pc6eIJtyuI4PxqTEm2vmxI1
+6vqN4BKy/9evDIobQRKsl+rfApgdVNSJPm5tbOjpvU8wURFu8i/0K6wzeSGFhkke
+lr3uUBeRO4e+dINOhemspp3LRI4/anRStNqhp8C7Rbsr/O9l1mPjNagCBJR+9Kvi
+G04Bo843YHEZm59TgZk3eUXYAfchSqnmemh5wCmE+DqpVbzPbNZXBobptq5iTc6X
++BwVctgvLgzyP0Xy2bDvU/Vtq++NnMrs1UsQhB47y0YHwOfZwkS1kOxuip/ht4ur
+QhZaK2jJb68+FymToJRZIXCKu+lo4OMKzP/ab4PpP3atMWiQr/7d0ZqPDEKk5TdR
+4iUDtNnZz0pXFU/SnD2y58gQ7bIP9rOvCa/c+3B45q54jqfjwE9Ar/St/tsLmyS0
+w88Jyq7OHBzN7CrezMYo
+=Xddr
+-----END PGP SIGNATURE-----
diff --git a/dev-java/mx4j/metadata.xml b/dev-java/mx4j/metadata.xml
index 1ebf8a80b9b2..ef5247c538ae 100644
--- a/dev-java/mx4j/metadata.xml
+++ b/dev-java/mx4j/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
-<longdescription>
+	<herd>java</herd>
+	<longdescription>
 MX4J is a project to build an Open Source implementation of the Java(TM) Management Extensions (JMX) and of the JMX Remote API (JSR 160) specifications, and to build tools relating to JMX.
 
 JMX is an optional package for J2SE that provides a standard way to manage applications. It can also be used to wrap legacy systems and provide a standard interface to the outside world, enabling the development of web services. JMX allows developers to write more modular and loosely coupled system components and reduce the complexity of large, interoperating systems.
@@ -11,4 +11,7 @@ Beginning with 3.0.1-r2 mx4j was split into three packages dev-java/mxj4-core,
 dev-java/mxj4-tools and dev-java/mx4j. This was done in order to reduce
 dependencies in packages that only require the core.
 </longdescription>
+	<upstream>
+		<remote-id type="sourceforge">mx4j</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/nachocalendar/ChangeLog b/dev-java/nachocalendar/ChangeLog
index c1a49b3033b6..c1233f609b70 100644
--- a/dev-java/nachocalendar/ChangeLog
+++ b/dev-java/nachocalendar/ChangeLog
@@ -1,10 +1,12 @@
 # ChangeLog for dev-java/nachocalendar
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/nachocalendar/ChangeLog,v 1.1 2008/07/21 21:33:08 serkan Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/nachocalendar/ChangeLog,v 1.2 2015/06/09 13:56:42 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
 *nachocalendar-0.23 (21 Jul 2008)
 
   21 Jul 2008; Serkan Kaba <serkan@gentoo.org> +metadata.xml,
   +nachocalendar-0.23.ebuild:
   Initial commit, created as dep for l2fprod-common.
-
diff --git a/dev-java/nachocalendar/Manifest b/dev-java/nachocalendar/Manifest
index 8bf6b923736d..b1297f1fbfb1 100644
--- a/dev-java/nachocalendar/Manifest
+++ b/dev-java/nachocalendar/Manifest
@@ -1,4 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST nachocalendar-src-0.23.tar.bz2 412489 SHA256 e276b0e7bd7abdeb37feebfc72343f48b617dde3644b20ca5f18ad72dac226c0 SHA512 a7b34d1caab2fb26856bd668a80b7f5c57f192be0729f4f9063600866160c26a4163389bf0136c3f101911f4547c5f474800c8e3d96cc77de6febd589564e98b WHIRLPOOL 1657f1c6c47ef7cd7476ce30b033311e2e56f041e2676ec256f81e9b5381716235a3cec45fd6aee98cef769d5ccc18e1fb356414d2bf901218673a17082cfabe
 EBUILD nachocalendar-0.23.ebuild 1470 SHA256 78aec9bd05e55d682f6c6bd8eab7746ff29c7f46fce7a065be4fa66275bfc28f SHA512 8f91f964f9c7c39dfeb5c9be217eecc7c9b58304213f95fbaabc6e70d3ce0857491b4536ceb48af6277469380be0159c9696257a5d7edfb787cabac6435a2180 WHIRLPOOL 947fcc954b90305807464e528a898d9ec6597ed948b1b6741c4689776f9a11185883fc75371ea01cf9cf48a2c79c3e090f9c8a5162a04c1c9bb47036c6f4d6ca
-MISC ChangeLog 398 SHA256 1f7f7fad64db12b40756142c400b34caa1c914f413204fa2cdb9f549ab0d6779 SHA512 71efdf175d20737ef3eba8d1cb1479a7ce6ae018fdb0cada0fd244e90b14704d8209c80008e3f7f26808693d68fe4dea11fab7157e864ca9617298f98f7e3801 WHIRLPOOL f41db797ddfc3860672750a43689c1749e0e8f938c386bd44846740f5cc5d615ccaa1082c1e2b6109c63435dfd69343dd5e6a45a191464b78fec74bb24b1b94d
-MISC metadata.xml 216 SHA256 94b55a2ec67c524728d32249d59a6a1545fd37d61c83259b5f05163ca47e87e1 SHA512 5ec0a0ccc6c58e6d2e2a8bbfa582c362bc0bbca43c134252bf1987bd2d616e41351604e4c569c519e53b99ca1c32a1e405a4071e75433ff8cf9e31dcc68db32e WHIRLPOOL 94bb953638b83f99143472f4161ca3f83f59db7f8d96ec8f15164378725f4daa9f9281db953aedb4d0f667c7d8ec73d1d6b07f2e3b5348938c7c4503cd6fb986
+MISC ChangeLog 494 SHA256 4ede45ff54dce7cfcc670837b41f794629de24e88949a47fca182170b1b5fefd SHA512 fd0c07fd77235b605842153b7c8ced0a9c16e7e9d1884857182ef985b15a297c6046d3d4e240e053c82deaed9f3613aac5c4a36f9445d7ea7fc9eced1590c43e WHIRLPOOL 0f4e28b12f6e3e360a970726075fde7d10b2c6983f137abf31f69498d9224f51dcecb5d426cbc025ddbcab91ea2f34fd6894f64e4ff8bc14bf00dc48d17def79
+MISC metadata.xml 303 SHA256 f403fa4be87ade55126b0b4d3afb3f1d4dc906c3401336e4b6cf848f10210aaf SHA512 ba2fd0d3b22707e374f71a7e3320864c3fc9211b4059e9c00dad1308bcd15e034cca7be8c7133f1548945c32cad7d3b8ff8ec05d2b61e570d37b890ae5ca37df WHIRLPOOL 4f7aaefb4bab08fff830830330200adf7fec1cd2a6097fc376e7753197a2c81e89586aa70c83bd7cc66fad7b9e269c8640f43fbe16da8e72f0a0368efcbabf63
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVdvCbXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi/p0P/Rbna/4b1r+vQnS2ayBnKdf1
+yiXjloYlXVL+bxXMD+pRo9SnNd9S36KCGh/RAn4J0TWhx1jzDF5pPmSUsoNoyKxF
+hQRhNCk1SOkZPHDYPBptwGsSOXqWRHXrR819Em0bEMN9JLgSktkwPGExHQaDRT1V
+yDirswBAU+oPBbyEmwpC5+S53ldU9ISkxK+Hq3bJC8FnVO871foEr5fUkR6Lsics
+u42kV9kszIa0xh9+BW1eJ//ndVlQQ6DOk8i5oaDLVMsIhbwDu/0tJ7+G12vb5Kdg
+likx3jUo/+DEG5eqUp8NaUIyv0ci61AJDjSerAF9gSCWzVBk3iaWGDzq3Htinl0J
+/xs9+CyuOPVqF9ykP2zc1uht9Lrg9G2kEXbtFNug+fg2Ie3N1l2oh6WwrTHMhnKH
+oxL5szWXoD4cqHYpw2cz6EmyvV+gUpyE7b23w69l8KBo0N6HAexcibUiAtfSgrGW
+dnpftelxaWok3uGfsvW6//VmLyqa+TxhF72fLnSWee//lPHyw7IhARWtD6Nh5w9P
+RMFesh2BSl+pafOOiPehzK/vM70GN5i3hSkXi4c9mFNdpAtNrNUOeNPIkJOHRjYC
+6zR+xfEDRUr9j+RIz23X63NXkfuSkR6ZPwT1KJGcPO8AzZamsg1d/xY+3OQPRxfl
+H1Q03WyThUfWspJhCh9Z
+=Jue8
+-----END PGP SIGNATURE-----
diff --git a/dev-java/nachocalendar/metadata.xml b/dev-java/nachocalendar/metadata.xml
index a2ac2e03bfbd..71dbb743752c 100644
--- a/dev-java/nachocalendar/metadata.xml
+++ b/dev-java/nachocalendar/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
-<maintainer>
-	<email>java@gentoo.org</email>
-</maintainer>
+	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">nachocalendar</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/nailgun/ChangeLog b/dev-java/nailgun/ChangeLog
index 879af27e15a5..783366f90ef6 100644
--- a/dev-java/nailgun/ChangeLog
+++ b/dev-java/nailgun/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/nailgun
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/nailgun/ChangeLog,v 1.13 2014/06/17 11:24:08 mrueg Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/nailgun/ChangeLog,v 1.14 2015/06/09 13:57:02 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   17 Jun 2014; Manuel Rüger <mrueg@gentoo.org> -files/0.7.1-Makefile.patch,
   -nailgun-0.7.1.ebuild:
diff --git a/dev-java/nailgun/Manifest b/dev-java/nailgun/Manifest
index d9fa7e321193..3018d6cca205 100644
--- a/dev-java/nailgun/Manifest
+++ b/dev-java/nailgun/Manifest
@@ -1,5 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX 0.7.1-r1-Makefile.patch 584 SHA256 5c32be621e0e70568a87b18fec8d0d289b27dcd4386cda7e9e9ba98e9323cda4 SHA512 818cb35a65902cf325d06c85c4a1d896784e90cb6a770e70b3df55b8e9661c6b4d83ad46c6e8cfc99c4e6d572f1e496ccaccd514b24fc6029211b1fa2cc89de9 WHIRLPOOL 9582c72851c753b5e6a9ccdcc95f383dd1585be1a09bbd80c857573d241b7f3601ac837925f5443c57855bcfff84f56746da50902777ca2261d819aeba824863
 DIST nailgun-src-0.7.1.zip 1489813 SHA256 2942760e68fabab1afc3bc447545cb532ae7bd6e779ca4af8b3163d629076e72 SHA512 51867248179487b042f3fe93585390b972d1d95928f92fc6b342c3ae663696b251fcd074c8042c6ae129947105e2203cb256a987b46dd8499bb3964302f1ccae WHIRLPOOL 7c24f82a260eaef397fc694f5e15abfe86c2463d644366bf4d59904cf632e301ec5c9f26d0a63aff4491c196bbf3b8dfa612862e59d488eaf3af6076abacd1d8
 EBUILD nailgun-0.7.1-r1.ebuild 1748 SHA256 5a09f05f503d5f98a611854c56fe813971efa11fee37d5029179dc4e5d76f9f8 SHA512 a4f02a74084d54d5d81b020ad4f88d004aa8dffcb755220989fdec7ad54aae68ab90d82f6ff1ba75edab893364857a7f5fa31ea1185437a4d9958ee0b5a0c3d6 WHIRLPOOL 697bb81cf9b891ba5f9c4a3b743b1ca0f5bc992b3e4d2675c9cd242a63da1c1bf8ade545a17c84a98727f3adfe080c57e7a256640ea7957698e12e4417d5ed4d
-MISC ChangeLog 1789 SHA256 e1f746399a1e3925f659f9c7ab6fd3c1efb0ba93ec56e0c30e1181c41fb7b619 SHA512 fadf48b9fea6b94961bbdf4a7876b726625b682cdf82e0a581d2b674703828b15e05ff85ba1bf2891b628f7181c4b732b6d82846ba5f09cf94f7164c0dc03a6a WHIRLPOOL 70cd326fdebaf05b073aa33779796d62ff9ffb7deac1f92506eefd5c0ed8f6b6a333b371f015f6d261dc0d566525f5e86d195b50537caaa4dded713645730fe5
-MISC metadata.xml 474 SHA256 10a8eb25ec6d2b77fb14f6f35778ff95ad48336d3c4d4258a92d2bd68b9b9be4 SHA512 08222ebecc9fb0a1f4f5c0824cddf9311bfb121345311812cc286a0e5d993cd465ca6749cca920ce03b953af86869b36988edda9f91811706344008ca55c3679 WHIRLPOOL 532eeb243f05b927bec54be14a5fe82d58cd254e95679a7fe37e2d050e9c85aa3772160bdec35393f1c7b210c5c61902b647e54593678f4971af1c395032449f
+MISC ChangeLog 1887 SHA256 0e5276e69c93efc665255c69d8c79c5b543957178a6b15b79f6b83cb30d29514 SHA512 1abdf54212744e4b4466164efbd1ab8fdcdcc02ea205bc0a26f49016f9f9ad0e8256a2114c0d78f92190625ae230a1db6baff49f61530ac41499fa9154e38047 WHIRLPOOL 2272a7cf125c8768071b98cacbe1598caacb38874c902f7db694b862e8a0bde1757c021c4c5683da00afbd080db91d5af73e58d9692d7ae8c3ee3ce07ed14ce6
+MISC metadata.xml 550 SHA256 8abd9b37641c04a55d2f7e10d8de7d4b15b2f3cf4212f83b8d59e30d23811fb1 SHA512 442e8cd7d5f520bb0301a0d2b76923950156388961512872ff1042de2a4abb1de8de698e27337f669c8d1ff89af15eebd31942acbe17cf16b497c3412ef40529 WHIRLPOOL 906829ece23cd33efd4aa6a538771eac3cd0e9792017c3b0c18d8c7e2944feaadb34eb15464ac36ecefa52fea98e9a07aefc4e2de3bdc89f288ec99edb8a0fb1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVdvCvXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiaWgP/RmSLt4CeLIqN6XQ6OiXl6QY
+ItO8+4Hn0qp7JpmYDLsanE6dywdjBsSHcw02RR8ZUsPYiDTHXmoaHWV3gSzkR2pI
+dG+rOLHMhDRPa/2/qF+NyqfYEqzgG/+wURleFdPzKjzErZD6O6FNN8sNFgr5/xYZ
+jL671ExZdCWsn9uXFMK5+zjCyEoKkxNnHp2EIINgh7iFr5k2Uh565qydu3W1SsSf
+kwwjEPcaAMmXYdwJOfe1u6BSyplfSI2c7eXiihw5xCpQw4GU3Muk6aT/k6IQYJow
+zVxT3yHoSOMz838iIJST+hYr3SmNyIc84hcwdtteNvwMJgWMb2gHELcDI0Gsfs0V
+KfpTS0pSYhgd3Sr9C81CmsZ/JOUgNDkux9iTXc8JpZmalYPZh6+cyW63BkhYLDO5
+WHMPqRz6oal773V/k//+P09AGyEArTklMfXP8+Z65HwFZXF2LGRZr91WxMn8REBv
+Nf6PkGTccNuwChY37ESX/sugGpNgMJsUaDGDmzexdIozMKdCEx8QMQuFM8C2VXNF
+ojBjfiyzhlQzC6icKXo8/FmaxO8HSd52sGpqFdF/m1ETYa09pS+9+evwC2iP5rlB
+PFabQtRJORLL09anv8IIoU4w76abbYPf/87g+CAdG8EYt9lHOaHwVCyH3CixRavv
+eFcbQkWjCfMgi11TJb+s
+=0ObT
+-----END PGP SIGNATURE-----
diff --git a/dev-java/nailgun/metadata.xml b/dev-java/nailgun/metadata.xml
index d278d0b60703..b25a04437581 100644
--- a/dev-java/nailgun/metadata.xml
+++ b/dev-java/nailgun/metadata.xml
@@ -5,5 +5,7 @@
 	<longdescription lang="en">
 		Nailgun is a client, protocol, and server for running Java programs from the command line without incurring the JVM startup overhead. Programs run in the server (which is implemented in Java), and are triggered by the client (written in C), which handles all I/O.
 	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">nailgun</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/dev-java/nekohtml/ChangeLog b/dev-java/nekohtml/ChangeLog
index bfc698ee5650..f1bb462b9358 100644
--- a/dev-java/nekohtml/ChangeLog
+++ b/dev-java/nekohtml/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/nekohtml
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/nekohtml/ChangeLog,v 1.21 2015/03/29 18:06:48 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/nekohtml/ChangeLog,v 1.22 2015/06/09 13:57:24 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   29 Mar 2015; Mikle Kolyada <zlogene@gentoo.org> nekohtml-1.9.18-r1.ebuild:
   ppc stable wrt bug #535088
diff --git a/dev-java/nekohtml/Manifest b/dev-java/nekohtml/Manifest
index 22e8b92421bc..6a28700876e9 100644
--- a/dev-java/nekohtml/Manifest
+++ b/dev-java/nekohtml/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX nekohtml-0.9.5-xerces.patch 705 SHA256 32a7b1e79c9258905aab082237d10583fdf3e0e88a7c50349daac7c6c2222925 SHA512 7a7b0e342258dce436a332cfc6a65d559e5ff3930d3a5e4c1555a1c1aebcb446335966d2b8d0669d8764f76ea79acf04521e3dbab9ced56ccd6a8b9f0036caf2 WHIRLPOOL b2d0381fe56da8e5667cbc9bdbc7ef3bda151d6dbe802b04584257e60e5e90d735262e5f51e40627369256f3b7a45fc7d8f8b16b8f062a31badff557bd7e5f1b
 AUX nekohtml-1.9.18-remove-obsolete-xerces-bridges.patch 533 SHA256 9d72da5a1b4281fb83514db33c471e70dbf91c1e0c9bcdbb9e41a5049ffa2bed SHA512 21c077f13c5157928f6cdc1be45f729e05b42d5b33cae7394d0d8c1167045f27e8baab89a5aefe33b907d1c3e2146030ee54a48da6d1a3bdde6c75f729dc7937 WHIRLPOOL c15097c889a72e511d8c2e6306f35b54821a7c983a0d995aa4d11d739002f4a2bd5c1512eb1002014dd21fe80650181e3f8bfa4b1ce1370eacff39b1d22673bc
@@ -8,14 +8,24 @@ DIST nekohtml-1.9.6.tar.gz 395521 SHA256 b0b40e4facee1ce2afae6402172835b8d869841
 EBUILD nekohtml-1.9.18-r1.ebuild 1349 SHA256 0ca985c18611edcc662aa435d6086b918445654e0de13fecad9b81db4851ddb7 SHA512 70ee8f4ddfa712dc18c3dbc4735e2139f7dedd34238a14c415dd8234d032b80ea79c495c43d3bba1f9925513fe60660abe6caaa5673cbe70a396a20c1466b9c9 WHIRLPOOL f0f2ae715d32a2be21e96de5329873fa55b219513d877b90e682d1a2bf813d04afa1e7680d943617453de2303a0f328e0012ca0fd31bb8e646dad7bf2ab1cf32
 EBUILD nekohtml-1.9.18.ebuild 1344 SHA256 fccec41da89afbca8b66736e2e9539de9156ea600993dd18907835a08976571a SHA512 bfe34ce27f8670b92c1ed29472f3a26fa6e0170e4f6fdd60fcef152db5d5ab179ce87296c3605c5e360f2669c7a81c5842434e4951aadbe7b5b1cd652c0eb4f6 WHIRLPOOL c5276fad4e7cfacbfed2317981a6168edd4ce93f91a820447ae6c32ae9ff8ca6fc4e5512f4b9e1c2c46a9b484ee4dbb2a2b1ba28f663f4627bcff81bd1662330
 EBUILD nekohtml-1.9.6.ebuild 1182 SHA256 b4ac5e9c27931812fcf32e9c7f81842ec38cf7d39b8e69ebf5a5a4e73058c1e1 SHA512 18de18f1947fe1db8a65a8e0f15de294d6129385f55454b789ac3323f40f514b5588880acc5ad80819c52a739672c1a462352cb3676a914ee54096c8d2fe57e5 WHIRLPOOL 6e72808b8b640365a522ceded5eaab1e990b306dafec02c46ef1f4f9dc5671e8f052c26d92160998abb9cd1bafe40bb4b6fccbe6790da01a1317f970d46677e3
-MISC ChangeLog 2914 SHA256 377df637311aaf759d3b414ded33515eac2461d58133a62d39117a38081cf376 SHA512 ac2d254d12438beb00d99c42be720d90c910c02fc3fb9b9fd5dbece1ec5cf2329b29256e57293ae46d1cedaca85c451bdd0d419b524982dbec3f66ea73395290 WHIRLPOOL e47f2f98873b39839b1f7b5e1a9b51770e6f4364b3e82f729b9a4849bd502272cf087c4fa9966a3cb962139829a1acb0de8b61a56f1b22f7829c9be110d32386
-MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
+MISC ChangeLog 3010 SHA256 9d69edf04680c9c29121bce9d7400750f2a76fe6561ca28ffbe1b96b3127a21e SHA512 a87dd55f1a0c5a94f64e6a4fb01aaef2cc057f4a58b40e0fd9e1c356afd10e1dfd4fc120d718a81cd600ec6b37c0355e0970ba3e0fcd0d31fb1b0571eb2798a5 WHIRLPOOL 23d0b17971ea430efa01f725fa21018d1b6982405156ffa91e294acf011099b1dcea275326db65e5d8a8eb2d79136002d9b627991a5c01fb51f253f1157c616b
+MISC metadata.xml 236 SHA256 421e62edcd46412410532085e0610fa2992f97cdeeb3dfbca2d0de03399b67c4 SHA512 105be426172c8296941ecac7ac2c88335339f12134e9905d7fdf13ba0bcd49d5e8f86bb88929f9e81a2d3b9ab3c17abc0c75da0e2a929797ce4fb843a8a7b492 WHIRLPOOL e37af761155a6c5f18aef02ee3af79cd9d187d45bebf03e8465aa77d40b59957602ae6b5111dee0f72d458b0a027ded1fc079faae9917c289377e024304d3f49
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iJwEAQEIAAYFAlUYPskACgkQG9wOWsQutdanFgQAvU0kdYMqadpcSd+JXr0pTyiD
-HVY+EJV8Ptc9WoCy9ZUtXkWfKrcaaEHN+UhM979QaHEty/Zk6o7F12L+Oar7lcGo
-XfD6XKhBSNmFWOTIVdwiKj8Cb0tcQF3V/Sk3k/N4oETZIfAVHPLILbZbBqj/plkC
-PAOtzV0HEcKwl0ceIf0=
-=PPJX
+iQJ8BAEBCgBmBQJVdvDFXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiLlwP/i/hXPbhPovAUeheHumt6QB9
+w8yxoY61W/61Ht9qE4K9HD9KBNaYU7EqgfUAiALTqZrA5zSPcoznOZk1ws+XNz9G
+NLsqCKq4j8dIH5qxkSa0t1yL3zfd1bfhDTuMeKq484iCxhbT7yc07UDXv89Ha5vx
+DD0t+AielpZrf9upqdZbCKYRfFTIfUugVoG1g1RotAMsDOsKel6utGPQKBI4zZgC
+PvSFQ2Ml8tLUJie8wk7COtbFujpTVu1ViuM7BVLXxF0iP0U08Gdd5ihaAfNmTB1G
+hymz09Imsg4CgNbAd81qUbeoucVUqcjsi2QInYLCGq6yB1/EZ5pzsktxScHjg0b1
+SPthvpfnaC1ePIcTone6MqejzrJpzQWZeBu7AUix2NXLAEkofFaa6EYRonnLd7HZ
+Od11r9HgnYR0aEGkfPtz8K2ARo2OVu+g8v2sqmrEfSsQWcm+2S0M3lqcZVBxg/HA
+zcd4BGYy9yjeBXfTJyU0G8EQ4A31i+tJR+yBHw8rheFcxkpaa0xYYZdYG9P2IfpU
+E18JuOUSXp009x+BFnNtnkEpMcWPVF7nxzDeuUrTfrOPPE+BCHVqSLtxr7dBIgj5
+b7MUbEYTRxpH7QdyLqCkzjqInyWSH4E25n7ok769iGv7flLD+jvDHnBpgWP1kJJz
+I+gDMI3UCCdb02FbXpdZ
+=149p
 -----END PGP SIGNATURE-----
diff --git a/dev-java/nekohtml/metadata.xml b/dev-java/nekohtml/metadata.xml
index 7303cef96964..6ecee9585b31 100644
--- a/dev-java/nekohtml/metadata.xml
+++ b/dev-java/nekohtml/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">nekohtml</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/neuroph/ChangeLog b/dev-java/neuroph/ChangeLog
index b0c0976b77de..69442c1084cc 100644
--- a/dev-java/neuroph/ChangeLog
+++ b/dev-java/neuroph/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/neuroph
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/neuroph/ChangeLog,v 1.15 2014/03/03 23:38:12 pacho Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/neuroph/ChangeLog,v 1.16 2015/06/09 13:57:44 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   03 Mar 2014; Pacho Ramos <pacho@gentoo.org> neuroph-2.4.ebuild:
   amd64 stable, bug #492018
diff --git a/dev-java/neuroph/Manifest b/dev-java/neuroph/Manifest
index 77cc4d2840c4..4f7c9e066dd3 100644
--- a/dev-java/neuroph/Manifest
+++ b/dev-java/neuroph/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST neuroph_2.2_nb.zip 6631580 SHA256 fa4dcadee831a7f1bf7280a02528f32e541f5825f1cec473d8157b747261e7c0 SHA512 5900226c617fe129a563633161896b3c4fd51522d56b0a23a6af1c4962edafc735ec38844aa1a80492b5f5e236de5263e47a6ca9b5bf7930f330d576c23b00ad WHIRLPOOL 63fb82dbcd7b86afa31122a1acd51d1bb32c35599cd22681734501a11224c5cbcffa45c05678f1fa6aecf3f12a0dfa42d4d664979d481560386ec1581a0dc0f5
 DIST neuroph_2.3.1_nb.zip 8006436 SHA256 d5158425f9637340365f3125d5a477215593400c6c9741ad287ff4270c19b738 SHA512 50977d407e45c11d7a9154d434a84fac5386b55c542b91cefd27e4b147a10fdaa0903446ec4e6ceeaad139013ef78a81125f783ff2fae9f0bc6661813dfe48c8 WHIRLPOOL df5beab7f34a4eab260a931823a134e6c8ae5c4f1dbac2e6e33268e8a64335461df558196c32e538266f6f507078510b32d71619fde5d41836558fb5d2597845
@@ -9,12 +9,24 @@ EBUILD neuroph-2.2.ebuild 941 SHA256 5e8ce3e2c9ebcea5fa874f71305f6d99cbc78361388
 EBUILD neuroph-2.3.1.ebuild 972 SHA256 637e3d0e705ba294310515d215d6bf3931552d9101458cd3bdfd50655520d6cb SHA512 9cb9338e03badb90ad4d7828173a41b4411f4bdf09e81e346b0bcd5dc97c6ef40164b771737c107331c89f7bc61f62123b0ad75331b36a955953e5eafbba3afd WHIRLPOOL 4a81d065d30f540668a56ac949e5538e8db60bfb31fbb7451e7abfae71a7e7ac24effa93c8dba3cc03dea33748ba1aad2dd9df0bf2b33c89e11e5abbff10f745
 EBUILD neuroph-2.3.ebuild 970 SHA256 b0098b0c47df51d503c4a77c1add8145ebe07be89ca152abf2870bea3573cdfa SHA512 cbd46f0460edc69bb514370b805329c089afc6475f12e22cd78faf6c5b111435253ae95eb7002d9f0237f776ca39c515649fea17a5d76e8080d86d22dbb9c50b WHIRLPOOL 752fe257be639bd048cd54030dd9db4d8d6e97b881fc26f2badcaec7d51a4e5ff2e264695e3f2745135383d013bd1b6ea173a6a0e165bd81bf76fc56eb7b2de2
 EBUILD neuroph-2.4.ebuild 965 SHA256 b5dfde77326ddf318cdf57864b1bb749ca9e0b98f21488809e64fabada9d000a SHA512 e6fa9a4d34a0b952550c8b1f1641224f577202bd4e2d237cdf4fe0848417f5213ccf2304eb889bb4acc4f003589f83d7170fcecb8f29bb2fd504fd572b7fb475 WHIRLPOOL 719d55e2583dedf191fbd390694b069d2133ece4c0922333efb819ef02f69e7888b3d60b9693edbfc25335f7ad85c4a5d129e484a28809b2f4e05be5c477dba6
-MISC ChangeLog 2106 SHA256 5eda24582b8ffe0772588fe94993b2399edd16450b7d69c0f41d6d1098ae98f6 SHA512 0e85169de21b114fe0f85b5cba86224fa59459f70e958911fbb98023db9c36ba7e3f9a499cd0b9c24a6926cdee6372a3966f0d0dab87d4917a865e7497111af8 WHIRLPOOL 04e61ce77b8cbe614121438783fd78e53abd937f66b933c12f12ca77e8d9562f3004e53baf8b0d2105391efe4d11f0e94133f5db32e8c9114dee7c56a7a14138
-MISC metadata.xml 159 SHA256 1c070a909e96d9d193f84ad9304d196febbe33b60a724cc4b0d20634bb82255b SHA512 269cf19c37f2d136b926f546ec83ffdbc1374b2b6e26f8a31f21854143380386c31bfc7b2a0b9c47fb1f7c02607ddbdd43e517cb5c3270515e465c4dd7788843 WHIRLPOOL afb402fec04cddb3184b69eb8a8d36b404edd2870fd06c8f5e99be39c341ea6fa7542e0b680fac05529522ed33838e8279381d7a6de9dbc58fe55841229d8a51
+MISC ChangeLog 2204 SHA256 81cea69a862a43e3af39b6dcef72e2d5cafab0279f66ad892a2ea7327ada5c13 SHA512 90183e054ac96bca57413438609096996f7636e021ad1f68ad64ccae93998fa2c7eca8c0484c20acae6dc94a98215825d527df9506ec30f3a7f6355ec5782a0d WHIRLPOOL 5749c3081b9d78fe46535f01cea3fee4162f603f35c0ac1f366e66231b0a1c8f18d4c1deb825c4840e72e14ffd1e3b4d290330f4b9394f5b59c2a9e4943ed4b0
+MISC metadata.xml 235 SHA256 d36689b4ee8d42b33acea3e4da212bfadcf8764b2f0107e0c03c234892dd7d85 SHA512 10f46ef50a124bf06f578580f9c91c1b8c9886f94c46339d7363d72303bebfa83532eb78779c70b5962cfc2cb8d5de74ba6f2c65a28083a9633be6dfca8adacc WHIRLPOOL dafe83d4f1d77e0647b8457047c5d5f782ff64f7344dd7aa1aa1ee2ea289b87c987e41576f61a6492937e61f3a96a96ff1e0c5587bd96beb59b9f10c2dbf8c01
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlMVEmUACgkQCaWpQKGI+9S3YwCcD2Z3huRgu0iMfQ+Xv/Oj2hag
-kS8An3P+QzgqK80xvVcuFHbmXzQPxsAY
-=gKsv
+iQJ8BAEBCgBmBQJVdvDZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiW80P/37SZjxEk0V2yxeQRG8zcNi0
+j1t15tm+9cdFob2JRjUgmnA/GDEMlAyWf4UfcKcA4QPazNv3xSTZuZfnWHna06ab
+zDAiu5E61TqT3Kzb8Y1AhbpYg3Eck78kKhyN3L0ArR7vylecSiquGM4yoF9bpdAq
+Ahzxd1rc4f0B3KleAK81gVxwaFuYGEX8GVBfemXQIxGWHXEHJiOn39t8wGHWINzp
+VA4v5EmBLibZEHqGXJydNTI0JeaoEDfEW3LoER9eIfLtmB+3Fi79U3tsaSlHz8YH
+whCiL9jkhTIWHkbLnRRLEe9c54vIw97ETyhhsUuthVRa5o694iNDnGKA+SYUoZ0D
+At0zg2mTKD0G9gc34za2MkB1XZqsmQhH/7sk0pAmP82viB6Cr5Ud4ig7b6G6EDi6
+PtEjaAh8w/vrx9shl/aPP6EIuGAjUfq30xnlc/YnlfENZfix8fGc2a8tsuIuQwhL
+Fz4HuL5hoPuBDEHQblwlgSFpghPvx9m+wRrtRAQMZ5Kzm46i1O3RL8EBSc5zH4g8
+FcZFJ49R85KU88LUCR7KlNVivEU/JtZorhvQLMv9NQcbKh29Q/A4AwbkXgYry+35
+sSck+tS0JA39iR+SwbSbxyIUs3W3ZJHoa+WzEcbek1mIgK5BLOCV+lUXwnPht2rB
+6kKFW5/RacSVmGADCkIa
+=8tFC
 -----END PGP SIGNATURE-----
diff --git a/dev-java/neuroph/metadata.xml b/dev-java/neuroph/metadata.xml
index 604e0a4238bb..b88f3d4a8c7c 100644
--- a/dev-java/neuroph/metadata.xml
+++ b/dev-java/neuroph/metadata.xml
@@ -2,5 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">neuroph</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/dev-java/offo-hyphenation/ChangeLog b/dev-java/offo-hyphenation/ChangeLog
index 712af8198feb..adedac7b5a82 100644
--- a/dev-java/offo-hyphenation/ChangeLog
+++ b/dev-java/offo-hyphenation/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/offo-hyphenation
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/offo-hyphenation/ChangeLog,v 1.9 2014/06/17 11:03:07 mrueg Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/offo-hyphenation/ChangeLog,v 1.10 2015/06/09 13:58:07 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   17 Jun 2014; Manuel Rüger <mrueg@gentoo.org> -offo-hyphenation-1.0.ebuild:
   NM: Cleanup superseeded ebuilds.
diff --git a/dev-java/offo-hyphenation/Manifest b/dev-java/offo-hyphenation/Manifest
index 324b3963848d..2aff26b39117 100644
--- a/dev-java/offo-hyphenation/Manifest
+++ b/dev-java/offo-hyphenation/Manifest
@@ -1,4 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST offo-hyphenation_v1.2.zip 378809 SHA256 026c3605416e921cdc5b24ba486fef306d1a4863ba95295f689b7190885e5c5a SHA512 ef0cb0aa7020bedd6c59f6d4cec95274f18fc5a7d19d24d1a05014c7c20b70c8e515aa7b7db4852a0c1bb87f594f638a906b5b61c0443804902cc9876d35d934 WHIRLPOOL 1a644a55a1769a866fa47e654310b942ef176396c3c2070c7b69f3e5e82e69156f42535363a127733753488bcddfee5b41b505ba512b4a0126f37fec96b6c98a
 EBUILD offo-hyphenation-1.2.ebuild 1233 SHA256 f94f6b71d02746b4f1f734569ec0aff1478889b839f969c37434b672cdf5f763 SHA512 2df2ada582ef73aa2e0afaca5f6c60ca2feadeef82fb5782d2da9b9750f678c2bfad2ac0d4e9e2cac0418f9ab603e42f7fc91e134cfbf426f0c5bc41756d35be WHIRLPOOL ea682a20407fc2dee4f970ee783713367a25fb9dfcbbd9237ed6f4403b2538574f7207eda8d0b7d4d42cc87087e323380461c7227ff4ed61d0e53979aa783ba9
-MISC ChangeLog 1305 SHA256 d8dfd469dfc97d51d662870839211c393e564166a4399beac9e719aaffc9ce51 SHA512 c223078f8e11255f6d8bf250ca5413ba2ef0b991807640aa9fc37d5954b77022a5591bb4e83133ba0cd853dbddc32f495e48939ab1b90283686f8dba359f231d WHIRLPOOL 0a40ba89a720b53d6f8cb0b2a5751becb392576418cd4fb8023b3b0b7392d1abcade98a2e31e741b764337f8675961604f81899da013372d0b32a00c4befe0aa
-MISC metadata.xml 157 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 SHA512 bbae663e26f48fdc5e272adc2b06c14f77f34c53caf84acb53908ff036e7c12a3edbbc0929d2db56bee861a453381d979c7e0983a23716f629ed2135c22ffece WHIRLPOOL 887e153e2481e7d76f0f1b67a395f10f0328b93930185ecdb8fcb5fe3c50f839086a18831d61cf45b34657aaffca6c3b7900cf3c04b712846a05027a84602448
+MISC ChangeLog 1404 SHA256 1f2f31c1371768aee58ac5a5eb6900ccc4d9526b8b6275bf0b46a7f92dd32919 SHA512 8414ede68ad0fdf1dd46481609f5b10010bdacb9c39536cc4f7941b0c9e6ecf85f39ea91dff48be40d9d8666a4ee1b2d251ffb5581f7a811b0efe0a5e8d118ba WHIRLPOOL b5a55a5e8bf78290213834c83e839fb37558081acc446566a0d19c2746e390d4cbebc80924f28f436c2790764aa4b6be26108ef5e79fbd7bbbd191540b225ebf
+MISC metadata.xml 232 SHA256 27163c5014f17c1fd5f54c8c6ff6c041e28ce679e4a4555931c09ff241cbe851 SHA512 1ba1adf4848a30c391c9ffadeecc165cd742b167373b2af70064cce5f267abc455f04cb4476546db42bd2860ba3f4df70078086f00a0a18b6c39aee4bce2d9ad WHIRLPOOL 598cd70e58804ae8c47e3fefbab23ea70877be73bb0671a138a79e6dab89dabfc3d46a375786a83c7fa7afcb2fa2509f7c13152a45e0467bdb5b9dfa3195b8f4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVdvDwXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiac4P/RIc7UwmNYcibMax1J7LHAmd
+9j5utZE2eoopcQ1CAb+YaTmVYkLcr9GrsNturZXPxQix5Z3utAf9zMsnDmn+Vafj
+cQnfkD+ev2GTwpXhzU3F3pxHQ0uPMZowchh7YTD3EvzpxQctCrATTYVX5rM/WeLi
+tETkTAX5K8XDzMqJAdc+7mbjiMCfzHj5YErYrT1w8bRv5Njf8b/lIbzbcYpZ73WJ
+VaxH9eakIuzs63ENW4ZSHoOH/xHokU7jsJi6aYQ0uPS/mSyp1xV//nK0K3Z6Z+K2
+TDKTa7dd8qSGDVgJa5G6q4B1cdbHnFUP8eNm1VGeEeiH8sAxx9uzUoOI+n1rBPUL
+DM2vRYgQACtkbZNAM174dX2iF0RsRhH8eFn9Bl1/PuvVFBDWcyAW4jkQmOb4hhdh
+5i26N37/29XanJZDUV7ERoFhHRevXosmeDj48pQU4CkFQ6hTCFI2ANOMDQTg5+vy
+HrSY+dv/B3pxJSPaDIST/qTRzPfSW+8B4ZTDGyNc/wz/h1rLFKD3xTTDTkDS/D7J
+h3cXInLBR49nO5wpZMjG+qn/BQH9GS1sc2qE0zsM0tWnD/wotGzPeuq/JY/F5CnB
+fAHvEVz99z95UrFPmG26e7nU0QImpbOjlUZ+EGCO6u7l2OAD5DJZwBvEqulWsr4y
+im/4bme+l4uEpIY5vIj/
+=xcCl
+-----END PGP SIGNATURE-----
diff --git a/dev-java/offo-hyphenation/metadata.xml b/dev-java/offo-hyphenation/metadata.xml
index 838c00a4a448..12697493b88a 100644
--- a/dev-java/offo-hyphenation/metadata.xml
+++ b/dev-java/offo-hyphenation/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">offo</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/opencsv/ChangeLog b/dev-java/opencsv/ChangeLog
index 3cfa62b0ab6a..a5fa7236a3ca 100644
--- a/dev-java/opencsv/ChangeLog
+++ b/dev-java/opencsv/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/opencsv
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/opencsv/ChangeLog,v 1.1 2014/07/11 17:49:16 ercpe Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/opencsv/ChangeLog,v 1.2 2015/06/09 13:58:23 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
 *opencsv-2.3 (11 Jul 2014)
 
diff --git a/dev-java/opencsv/Manifest b/dev-java/opencsv/Manifest
index 37abbad606ef..6f2f5598d3b5 100644
--- a/dev-java/opencsv/Manifest
+++ b/dev-java/opencsv/Manifest
@@ -1,4 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST opencsv-2.3-src-with-libs.tar.gz 280510 SHA256 04ebc52af08b20e18c193f194ea9d169a7737403b2376f1707d858dbd4e7950d SHA512 3831cb9c5aaf8b19ed6895406e7358ddb6b30cba1876b42daeab41230d83bd532b9db53c073960413a385222ca889f1aae14404fd46143aa28ee05b3d1019106 WHIRLPOOL 069c1bf477c04f0ad6db927e7179c0dc29104c48e179f0fcf8e4c42b0de2e83e3e3ab5fd80ebbd8e13e12cacfbe231097b675e99ecb0ef1610277dbc9a9c927a
 EBUILD opencsv-2.3.ebuild 819 SHA256 1e14a4bb0f31b6a981c7b6a5c1c9861e3c15bd079c8538634ca92e1f17840eb1 SHA512 c260e9b01ceda1fb1fd7207303ea6a863d09122033f5db5c0ae94a1cac31906ef54a889b434b13fd4e348a1ff0d85a3504e93c4ab44aba3cb29f80a0817d149b WHIRLPOOL cf2f8d1a074bbf5bc62195ce3e6a7c3b6ed64b60f07e0f7c6acf36443f8963f521836189d2ea0b6a77c459d002b22568f5e9216d21110d3e176d75dba74bd177
-MISC ChangeLog 370 SHA256 f1bc39d383884a49733a8982bd8f112d2a2931bf30cd1408d179ed85e38f8e9a SHA512 fb54b280dc963621ae41e38e5bfc08f342686999d2d5f8b4f2a66a7babc350591146fc43331a7553d73d43bf21b1310fc578fbc4aa41c1b9b79293ea2b55171b WHIRLPOOL 0ea46e96df7e55e79d7e002fc759e6b389e5b03b52303de86e6fb708f551f79ae70b56ef6a599753afc9d17e139900d41e7cb1ee4293717d6f65c6dc14e2e588
-MISC metadata.xml 159 SHA256 1c070a909e96d9d193f84ad9304d196febbe33b60a724cc4b0d20634bb82255b SHA512 269cf19c37f2d136b926f546ec83ffdbc1374b2b6e26f8a31f21854143380386c31bfc7b2a0b9c47fb1f7c02607ddbdd43e517cb5c3270515e465c4dd7788843 WHIRLPOOL afb402fec04cddb3184b69eb8a8d36b404edd2870fd06c8f5e99be39c341ea6fa7542e0b680fac05529522ed33838e8279381d7a6de9dbc58fe55841229d8a51
+MISC ChangeLog 468 SHA256 fa8f36620911a712abac8c3f4b91a603a6b92786dc344d4bdb4604d2abd2faaf SHA512 8d332d96495d9db9a7735aab2370bd1052dace532308fc10900149536b525e3265bb2ec696b497f7a74a4cad0116db71916bd66f0ca33d5e0bd73707505cc541 WHIRLPOOL c52ca0be4974ba7da6df22d1ae62c5f052560c58945b8e9e2f8d03db1d4329fdc87dc059e1c4e4838cfb0afecc795c3ec5032a7ff252206a57b5836b133afd6a
+MISC metadata.xml 235 SHA256 8df396666ea1a0692260f0c21ffbb5bf44dcb1d25d5f23f9c84ab6ec858ef0d1 SHA512 91117471c31810d1ba1fd7160f5684509773f9c90e815b06e75f09a3864e761eb572740dae3522823a7e86891bb769a9614bfe0bd8237030429366e5a875ef36 WHIRLPOOL 8f6d862aceba7dfb43e3ea8c770388d99e325cc2554ccd15c83e9cfc58fb9a9e37a726348d124801286de43a82ece4438e7a2efbacff263b8a2a72f8cb2e0f4f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVdvEAXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiDVIP/iyC5TN9OJ+SSjRESxXwSeWI
+C9SDMDyY7TDcrimtfahm+rjHaGjkro36XXlHW0KlkjJ7ZRh5hEzNSrac6ahK/VCy
+1Bor2us9whRVVi27xYhjaUZf8GwAgs8fCrp6tVxzhsk3RBFOM7xH1jqiNkfWpPi9
+IxMS0UxmTBfXg7UzavGsj/MQiTarDZTZSDADUuBVsishctgK8Va7xe00ltQJpllW
+kes2AS5JnkTmSW+baR2znATNmGi7rz8UgpypuCA933etaKOxOCrTpxBlKe/MVNfu
+7nf6jjXjto7gjE7+55HK2ZcAQOgENsoWs/7Lb8AgwwFwNLP7PCQRpaqOb2kyN+gL
+Yjr5FoeTwPzCjhf0UO0ad619B9g/mlNwVq6Ssdyr2mqxfQboA2aVzkZJz4nxCSfu
+yhLUyYJL3nvdO//oCxkXREx8Qf6FoYEzivQgXhNu8ykDSNVYw0nQUxpSyObQ/JYS
+4dQPRVW6tiCZ1QqNTUnI/+PFs3bA//LRWNTMziKtXryQ2zFkUX6qHr78UcI8AnJl
+RTGLoZLyn5XBzREN/mi+W3S2YqY1DwzhLN2+vCXoX3SEwH0rrVspVDMIiKDtI8nk
+qQwd2TXLo00V74PX0zFAWCLU6yiiQXcu8qyKisNgfso/jnNki3lVk7VvsegMTHJ5
+3uMCZO2JVfn1X+PBC/3y
+=zgH6
+-----END PGP SIGNATURE-----
diff --git a/dev-java/opencsv/metadata.xml b/dev-java/opencsv/metadata.xml
index 604e0a4238bb..6eab0f966490 100644
--- a/dev-java/opencsv/metadata.xml
+++ b/dev-java/opencsv/metadata.xml
@@ -2,5 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">opencsv</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/dev-java/piccolo/ChangeLog b/dev-java/piccolo/ChangeLog
index 0f160d72bfa8..3871f347236b 100644
--- a/dev-java/piccolo/ChangeLog
+++ b/dev-java/piccolo/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/piccolo
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/piccolo/ChangeLog,v 1.2 2014/08/10 20:22:14 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/piccolo/ChangeLog,v 1.3 2015/06/09 13:58:38 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> piccolo-1.04.ebuild:
   QA: drop trailing '.' from DESCRIPTION
diff --git a/dev-java/piccolo/Manifest b/dev-java/piccolo/Manifest
index cb4dd1ea9c78..8717cf65acc1 100644
--- a/dev-java/piccolo/Manifest
+++ b/dev-java/piccolo/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST piccolo-1.04-src.zip 252316 SHA256 75a8f729c98e3b8015fdd044776cf5c4555ddcee6577a72c1ffa63cc17111ade SHA512 fa0809e8d9eb43713144bdf193975c62344269bc1b24d12159c98c98776de4633c95234bbbb023d445e00786903fcd9b49d37053f03d8d6a1e2c84b93668f947 WHIRLPOOL 2568255ab0f69d7852a435444213bc1867c255478ba7eedc6373f2e4ce6625d16dd116693b1027726a3823be716d552221b1f1c4191c0d907b2db92be58dcd79
 EBUILD piccolo-1.04.ebuild 737 SHA256 1156cc85f3ebe551a8f1a1563286146251b0adedde2952c6014745262f6b7eb1 SHA512 22cc34bddcc94ca4ce6ccfee7924583b515f452d66ba5130cae8a379eb066a64a2d33eec5651fbed6755891bf4289d4877401d8e375ac739b1f16b3eb770247d WHIRLPOOL 25cfd2d25bbced829bbd41094784638ae1299ab935cc0c276d31e556940c9aaad4d7b4644b5852763ec70baa79c3c852886ebd3de7e1418c485b9b9d6a20fb4e
-MISC ChangeLog 564 SHA256 f86102740a08adc146206ecdfb9f57dd4f31cfe492f18dffe0f4bc525b3a6494 SHA512 41c0d08067834d008fd568bb15c54600934114c61fd4886344ce28d9d25ad0e82a68400f84279379921c2549a0fed312699822e2fe17f000ac2168b45fc9d08e WHIRLPOOL d3e659979b882e8ae01d98be8580b9da8bd531d48cab8936459af0a004ed654db4b919631784141e6eb8de904608e850a90fcf0987864cee2817300de09dea62
-MISC metadata.xml 157 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 SHA512 bbae663e26f48fdc5e272adc2b06c14f77f34c53caf84acb53908ff036e7c12a3edbbc0929d2db56bee861a453381d979c7e0983a23716f629ed2135c22ffece WHIRLPOOL 887e153e2481e7d76f0f1b67a395f10f0328b93930185ecdb8fcb5fe3c50f839086a18831d61cf45b34657aaffca6c3b7900cf3c04b712846a05027a84602448
+MISC ChangeLog 661 SHA256 e9392a6195c9fc84ce8b47d3adc68c37fc08c301de3db3068ba2c9fe70e81426 SHA512 f186dcfaad57b037a331e302c20a1a7c23e869a495dac66248d72f59fc0098922405e46306715a7e9edac1505b99d89006db4da05b920fab994660b5f6d145d4 WHIRLPOOL ce058001dae6bb65ca0651e11fa9d8dda0fb30c4bd97a6afe99429364e9f276e6318f4f62fa93376118420adda05e97e98911f38c79137619e787b7167ebb8c9
+MISC metadata.xml 235 SHA256 8da084f1c6006a645e9c87a4902f0d5f0349247a084e6a93fed83e9cdb2ec6b0 SHA512 ffeb2b2dc6d56404178735b33885888a6b28b6d5ca847cfada1f9ab7291b4e8e93574cbfad64e43ab61b4a1e0ecca8efbae15f86bae3b0007a56bbe802857f5d WHIRLPOOL 38e2a86efe0c2214920baefc5f7463e82489154b0423dd6631ae53ae585426ebd43e189f7ba4324b6472d821f841c9ddd15f6ada4b009e25d0e3296956953d89
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlPn1HcACgkQcaHudmEf86r4FwCeMDLTDo/juxvHLJgz1Kr84iLE
-8qwAn0ZlX7T/nPjglMxroJsQQngcI2uD
-=wcqx
+iQJ8BAEBCgBmBQJVdvEPXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiCIQP/0ktcG7vipTJ3MNkHmzpK5FH
+KBxhqqTYQncrnRAg1OzvRM02IWM7KAIEHpp32KlSidtHWCMA8hVonKQtQ1QmbGo6
+Lej7L4eQ8nSaq41plZuOsqy+jFL6KQee7+KTFaCsl/7Nvuv1vl9n1f309kyys/rK
+2i0IIpawr28Ek3JCHVRiYRoTLmWv/+iQNf1ZSKzCWWPb+3pHpIUEOZ5FCHOEPeiZ
+oEBApBZEzCrPwq+7oHUwNEHsL7PEC/KiRcHQCviSZP/QyjQ816UUnYM6EE8xbbkK
+RsoiFy+ZHmy/9a9glF3iSePjU/yWlDbzq5BiTK+noNDBKq3psJQFznYcNl6VTWn5
+RSrqx71NA5ndHeCH3jMXdjVmuIikmXWHYFSnvRu7CwDxV0o7IA4YKy0GzTAKbI7y
+T21+ZFY9yZap6WWIYz9hpxoJoVLKqwKmNb3zY/sZXXmwvycbfxMXwR9Tzwb9ZyE5
+BsYvlX0t041J8QyZ6N8oHJp0+COuvurFws8i5svetDU8xuhHGMoJio+Qj5R610sV
+vTdv6CVdhaV5XUIhu9JoKxxk+8qeKZN0ql1gcmQDnqO0gHQ+rt27czxpQmXDeTAV
+q0khbgJP/Csonaw/CS9XOn+3FcIL5KwhA8pqzP0+b5MNiZn+XJLEH2qKCmHHAV/q
+aFSW/XQvqAGkqKRRj/Xj
+=QOm3
 -----END PGP SIGNATURE-----
diff --git a/dev-java/piccolo/metadata.xml b/dev-java/piccolo/metadata.xml
index 838c00a4a448..ac174a7752db 100644
--- a/dev-java/piccolo/metadata.xml
+++ b/dev-java/piccolo/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">piccolo</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/prefuse/ChangeLog b/dev-java/prefuse/ChangeLog
index f22d4d140c20..4758c2b8c4c4 100644
--- a/dev-java/prefuse/ChangeLog
+++ b/dev-java/prefuse/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/prefuse
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/prefuse/ChangeLog,v 1.22 2014/11/25 10:37:42 mrueg Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/prefuse/ChangeLog,v 1.23 2015/06/09 13:58:59 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   25 Nov 2014; Manuel Rüger <mrueg@gentoo.org> -prefuse-20060715_beta.ebuild:
   Cleanup old.
diff --git a/dev-java/prefuse/Manifest b/dev-java/prefuse/Manifest
index 25c6ae8c0620..a516b2099127 100644
--- a/dev-java/prefuse/Manifest
+++ b/dev-java/prefuse/Manifest
@@ -1,4 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST prefuse-beta-20071021.zip 4334966 SHA256 c816d4182c31e23ecb63470ea009a70dfedc76dc8e3a0af8f240867047526b2d SHA512 289386d4614d5f04ac3dbe0bb0be41186540e278b36089a8dfd8f1accd813b229d85a1a36fb05f15d204b77c22e6e41eefa259cff42d8f26680574c6dec7e983 WHIRLPOOL b41d4688bac272756f0860e90e7d66ee72cc078562417698c2c51b1233d10c7b15070f26c38d60648fd4ba796e8530f54a166a89a74271f5e24d59e307efdfe0
 EBUILD prefuse-20071021_beta.ebuild 1219 SHA256 4aabbde556afa5d16e34ba78ba43e1098e1c15703518217cfd94a12181f41e32 SHA512 6451999735544838a9f00d327cc1162072d048740a5e35dd71998bbf1406ac34e6debeeef9f6b12996d76d59fa690c58a2522ba934dbf5ef9f7a360019bc4fc4 WHIRLPOOL eb8e0e94581d79a7149ceb341e6cbf103c2b3aca9e7e61ffdf824194f81f585111cacadf64a2a785456aad889adc9a6dfd5fdf4bedd110311f1ad7a8cefe08b2
-MISC ChangeLog 3198 SHA256 8b953acca781d0b52cf92287abe21ec2bbec39280eff910b5ab97216d31f61f7 SHA512 09cf218f30106ec74602eca8fdd91e840619311572d6cfa15c677871bafcd9079712843139440a5c5d980ff4ad3928e746c3f153305e42ffb6795d106acbf74c WHIRLPOOL 88225dd96639486011f5364d39f4edf04ae90c83aead23d5dc3018700041f851bda02e5c8b7a9d9f52c03eb692fbc2d21c090e7a8677e14f6b4c6da4a53a8c8e
-MISC metadata.xml 308 SHA256 6cae3280c5b2ae862f18531e7d17e862c55dc3b5a21aa80d8c1f4f518df87cc8 SHA512 1de16047bb51ec8bdcdbc90b6c7dddb00bd766e2a59ba9b17f35f85ad2bb16e841b247d6da2b33bdbb7118f1b68bca09c706928aff42261e728ca95436b47cdd WHIRLPOOL 5aa6f0be2a7726b42c8ab0061f20aa7a245b0e46d2e3372595c31f075ffe27b42f75292c832ff1926e51a5f9d511104985ae7aac2252d2513542ab6d5bf1321d
+MISC ChangeLog 3296 SHA256 36c477c160475f2c088ba790c29388f78d8d7690a1e5f6db1e62219a934a5789 SHA512 be8b85e9da99c67717c498927bd292f9d3cbd4838560f179ca02f5476f1d6f01bd0242ddd23415cab4a1f281cd45549eddd55b7387c92070fad3f4b77d22430a WHIRLPOOL 6db24a7473836fd9d97e64e4869ea4cd6dc05b971153d9fb02b0efcc66e30bc699f87b0c930d68ec910ea04ada68bd80626aa376036b43f8a5d5f1c09eb47144
+MISC metadata.xml 385 SHA256 187c05c55a3460cba676457595a9a97e899e3755d905957b6eaf3f619beb2530 SHA512 a90280a153a624ebbce0a3144669aa0675631f3eed59c6bb6aad62dd635223bcaf1a2460aac4501c400cc84eafecc09f0dfea6acb661f4729198ff2fda7e15df WHIRLPOOL 0190abc725dba66073bcf6c4194c5525e3a69b4f5ff51f8ac01b1ef79673dab3ed3fc44314dfdcd4f278a8c781f6a1133a089f8a67adbb83437ee77c8933a765
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVdvEkXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiVdYP/1e0nPNHvnp9YE03I3Z/JIs5
+ninhdQyAhgg+3bSrYWwA90H/tXEczvIOj45r/D76cq9fJO23p/MNSRAPmMVCY0ES
+Bs+02CqcBWL5YwF99kF6rP674LFu+Yuf/xTq74Vlc2UJ04OkbY+5D6Xx+jlWq3GX
+hHtTKbJWSuOY1/cN3Lf7kFK1i7bt7x09ltO5FjxIzM8iMlbXmt1vRIxc4uwkIT7C
+XqaHYgr1XSNgOihTdelOPqL87jBq2Y0b1D7LTthfBfC23gIp7Y2RE29kwmndb/Hx
+iDcPvTQ9IS7LmIja8XmJqdM7ar7hro9sJGrtpeD2F/nmDiOUZ4wnrtCK9r6TvQLF
+PFQeJn1vEiqdfalL6habIMRCvYLBpdOG6MvdYuMELB6y/shHnP39lsvdiCwuNdXP
+5gEcDwF4CxqSthGCSu1qrmw4vcNKKqijY6Re6EITrw5Zuo1wL16WNfprfDU8iCnV
+PLMh8vYna+8nBCu+aZ2vnpZfgdYJ9ilE+cFUbsdtnf4qA7wGUYLVDUeVjCKS9zK0
+n0PHI6DdaIsWR1mGSHEqqR2PYCWEIGaXEPpKpAlmH6cb4PRrDpYoscQhxla6c1s6
+BG0xH7fy5K5JB1Xg5rmSKtUP1+5vVH179J2tCMbgV2IkyhjdLyKSUlXR48jV63Po
+XkdKjbBFPTPUWMJ9sfK3
+=tL/J
+-----END PGP SIGNATURE-----
diff --git a/dev-java/prefuse/metadata.xml b/dev-java/prefuse/metadata.xml
index 92303c28be6f..aa580f769c29 100644
--- a/dev-java/prefuse/metadata.xml
+++ b/dev-java/prefuse/metadata.xml
@@ -6,4 +6,7 @@
 		User interface toolkit for building highly interactive visualizations
 		of structured and unstructured data.
 	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">prefuse</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/proguard/ChangeLog b/dev-java/proguard/ChangeLog
index 2713093b4fd1..cdc2ddf50ebc 100644
--- a/dev-java/proguard/ChangeLog
+++ b/dev-java/proguard/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/proguard
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/proguard/ChangeLog,v 1.29 2015/04/04 21:20:52 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/proguard/ChangeLog,v 1.30 2015/06/09 13:59:18 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
 *proguard-5.2.1 (04 Apr 2015)
 
diff --git a/dev-java/proguard/Manifest b/dev-java/proguard/Manifest
index d273e334ea02..4b3e7c27c823 100644
--- a/dev-java/proguard/Manifest
+++ b/dev-java/proguard/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST proguard4.5.tar.gz 1827325 SHA256 ccd621c0560817c252d999c66e1c975f307758e928104c14be02ec311e107e4e SHA512 bf1d9c29a4b3e1ba8062632b0f7f97e8f8d3dd2fbfbdc4bbbe98fa76151721fa45b22a1d99890654c557f3a1b87b45038d4882c0cb192b907ec2c65f4e7429fa WHIRLPOOL 0783643bd69f8d972d7a469300fb61f1e06868ee434d1eaf4769bd71d0b9f4d56ef348906857cfdc8b5e20deae6596bb1c7ba9c10cd593b40715e49381fce61d
 DIST proguard4.7.tar.gz 1902321 SHA256 ea2c245257d59957ce8dee9476b9595ac99c0a9c5194d739a3a800af5fac99e7 SHA512 cbf3e5ddb11a37af169cd563ffc04e554b925e99ff4f3797626e286ac40554577f2715050b46f5d1a9599de97cb62090b39798ea0aa006273d91cf8217e9e60b WHIRLPOOL 55723ae601ea02ffa27644977499c3c81b3491534a90506884b3eb68ccab87e8e1191d15fd3729871e4276b65f0f8e24a54a05b2527e27f5f906fef00227dba1
@@ -9,24 +9,24 @@ EBUILD proguard-4.5.ebuild 1711 SHA256 892a4c8782d7e2832f3c5efb272b9077557022760
 EBUILD proguard-4.7.ebuild 1713 SHA256 4a52ccb2157a0dfcaebb3cb0a6222926ef2f5ab413b17d0658ce278d0ce31a78 SHA512 2b69bf84af26221f76d5ce649d233bc71f8b9d4504abea7b2a76cec82a0e17cb224a2776864e023ef1cf42a98d28c60ccdd2990a25b6b1d79d7cca109e6bdb79 WHIRLPOOL 3ebf2dd948a538ddec46cd624bb6fbc8bd92fe9046f1eddb5a32703027fc5f3d792788ca9a8a9279372c43767d866116b1daacb66a687390dc2a842b2367fe07
 EBUILD proguard-4.8.ebuild 1707 SHA256 bdc160ec1940f25197928494a4ed9c32257ef47498a5f5bfb87b43e6003b96a1 SHA512 f14a48f53d51c4cc2ee5794ca713f188df0f4f9cc3f37424e9ab04c32422cb31cd974a2f83906263c4e30c987f92cf37931df7975df729a79da05e2858b5ea48 WHIRLPOOL 2aac4706812617c960b3d588334d8c21275f8138817c04a3e3495d3b0f1bd89bd7c5a7b9e21fd641b641aa872c02412d8cc4f922ba6ac4e9a47e901dbdf74f9c
 EBUILD proguard-5.2.1.ebuild 1705 SHA256 ceb5a680555ec42fa26c086e24d1fddec50edb74671617baec44f336d4d6fc3f SHA512 04b70cd3ddf6cbefd7401756c0acded6b88153ac47fb4e18e246fa82f0f686091cb78aca81db94ccaff630ac46abb2fe46c9c0c6d00c0896e4b0f2c36464c1e4 WHIRLPOOL d755091be212f64c6bd0d0070917299252cbbd57fd11540561e6220b37acb85525562c4846c3b2da6a3119f9f205a478817fc2fdbdd62b2da14ef22be624ca51
-MISC ChangeLog 4069 SHA256 ab46811ab996997495c9a3f83a14162d22043e0c82a6d5cd6cc57975af66e82b SHA512 71e62a3089a131161f85b0d8d89794be4d920c2db0f3252146af40208ad8baef1acf8711f3aaf6a65c0150443d7be1cfac58b2e5c0f626d83b2ccb5905baede0 WHIRLPOOL 32832a40671660c83d64a65f3b619ec90113ee9dd11f216249ee9afaaf45d03484554c25937b5f2da05630cf5779e53bdb235a83d92f3f14bd504e6010cf6f4a
-MISC metadata.xml 321 SHA256 54a8ab20271a859093e023d0b1ccfa55cb712577d69111362544d613c1f341ed SHA512 1f4a1d064deabd6422a47a65e555884832c3646875354e3638157106618a9b6cd29114449a46d0cb349c7584a66678efc32a79e0ae8f03ecdaebec5f0a64eb08 WHIRLPOOL 0188342284a842ed2140b89da41b3a57fad8bb072712275a727656d2095ac5aefe608bea7995001c5f98a4091697c44f86306be6af3413a423bacfaeba3e9b76
+MISC ChangeLog 4167 SHA256 e33a27c87d3134ce867a1ecc1833c99dd08652c40c3dc348048e6103d257fae8 SHA512 7b7b401ac14df7582feef32d795ac6ce39d0d7eb6965f5cf5156e8d984246012199bc0249c7d544062fc904e231b349e7da028919e23de18f03a920612238855 WHIRLPOOL 3bbc52c51b7ffe805e1397ef030658faa144f5de357f29589f9f1ddf350ee39b38e1ce143e1e9eb80ff95e7f59814ba5a532b71a2705dd36a102b5ab051d00c2
+MISC metadata.xml 392 SHA256 69877fcdbab2f2a45b5b3e10ebdce248dc43ae40b254fe4674b8d17ec7ae97a8 SHA512 f6bdf8e1e6c1a155f91897fb7f3d6c3f131cf9907184427d705161948a6e98ef9c4a9a9b0687f5b0f25b86bc11772aa1027c8539d6508d164fb1b905547349ce WHIRLPOOL 18472cc69ce3b1b81011585b48d89ce6bb12b251f7f76c187a381df747d5b60697d065a436d3386c8d715b5c5903d6339d6559683e9f706b133acd3e225227a4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVIFW6XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1MjhERTZCRDg2OTFBNDM5MUZEQTJFRDQy
-MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3kMCIQAIi6XGaYgR9QJX6u4LtLpFxy
-yd/JTWxi/NCZjrZ5m6KZ3OEMHP7Ek5gtYyfvKchDVS6DlTUywwT1+tzoY772Dl5E
-YgmzYVfULTUCL3GlPuUdODr+sjoDi16fpevHryMwSSLAXBvv3lBWLItTua+rJ0k4
-0Psr42LW+HyffaXu7FuAFh6sjqehedecGxJL1A37x9mHRAvtX9GBJLHeBC6q5oJo
-Vv6/3ffvhNVLUg93lPg4xScALHDXXTEdLVG4/44AM4aQDHHBP1dpGK/3iqmmTNwK
-dnh9BaxhKSlMp50uvWCG253Ri6E80+ynpdL7qH7Dz4sRuw+oOrlQKg/cFpnkE0cf
-DAKMA6b1d6fclvaRSv6RofbdvZ0x8Yj2hXyNg8K82eOxLHftOAdYZ0YHyxy9VkN4
-zY7NShAAcZ00UTvty8nc8GZ7j510K9/zcMIASDSFzcDMDu4y4r9Fribikp0ylZy6
-DcFAmKYAON5tuLqDev+wBBBpMdQKgUHNAiHBYc76/zZ0IpwBXFzbqI7ESLxN1Qzy
-gz+4ldtG/cbJ5pZHC3bFHFIFpFjLdexQDrIBRBzsMd3l1diORLmef3p5vpehfGT8
-9VBoZGeW00bqLZy37VxEvWENCvqVPVBBgFuKSdh44g/fdm1B9G88+232hUbO7bcX
-jY7xryIvMQABu54PTO3h
-=0Wkx
+iQJ8BAEBCgBmBQJVdvE3XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmirkMP/A06NhsTrL6A/stUIiXIMxRH
+hrGPrQ2on4DDYNdVwNUPuLeP57cvJHNTe90/NZFwA64SyUX7PtnnxLrFyTbRM2yg
+F8iswKPZcnVe+rrdRiAPdMJnpL06D0b5yqg2KxxAQvgu6FRebyd7RBunkpiXDXPN
+kGTaqd5tjQm4b1TIv6wLsyQAet8Mw79qwBEIbIQWVikODEQ6fwl+4O02tdi0sLkU
+y+QQy+NiBIk5rvDra8D6zBbOXvYcpc4g/km8kJJiE6RdIRdPYdK237/FxzEAvXo8
+T3zithm5enYy/3rXfMmZ7qJiqO7q+ptK/vEutiTAUgxi41rajXnkBzEkvzPjdCBM
+V0mj8o8f8SxPun/zXn7DfnSLQebtqvAraPfhTCU17qcd8QIxEI1yJRqfPc2q63b2
+XaRdCtu0siOaFjh02xSFB/0e4HmZmRZruMtVqpxpZm2pCWj4mRlBYH17m2OUphBR
+xbJdqymrjGN2ynY5fCvrF+kAvTFlOI79EQm7Py0H7K1W5RJjHWhxwgep/M7Yp9qt
+Uu2PR1Q6lUF6PdwY8sWJQr3AUgInft/AIsIRsuxONkJkG1HzT0avXRft4xLghBff
+nekYvi0jscWZ/8qJgoGNMtENIixwheyXMfmrItIM5aRAxnpz+QHhF5uMI82Bqoa8
+xi8K2aRfcawyCqzvrvLL
+=94Ip
 -----END PGP SIGNATURE-----
diff --git a/dev-java/proguard/metadata.xml b/dev-java/proguard/metadata.xml
index 4f4f18795e29..e53d61d2885e 100644
--- a/dev-java/proguard/metadata.xml
+++ b/dev-java/proguard/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
-  <use>
-    <flag name="ant">Ant task for using ProGuard in build.xml scripts</flag>
-    <flag name="j2me">Adds support for J2ME Wireless Toolkit</flag>
-  </use>
+	<herd>java</herd>
+	<use>
+		<flag name="ant">Ant task for using ProGuard in build.xml scripts</flag>
+		<flag name="j2me">Adds support for J2ME Wireless Toolkit</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">proguard</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/proxool/ChangeLog b/dev-java/proxool/ChangeLog
index 98060dee6707..6ba8cf1365fd 100644
--- a/dev-java/proxool/ChangeLog
+++ b/dev-java/proxool/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/proxool
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/proxool/ChangeLog,v 1.18 2014/08/10 20:22:39 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/proxool/ChangeLog,v 1.19 2015/06/09 13:59:40 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> proxool-0.8.3-r2.ebuild:
   QA: drop trailing '.' from DESCRIPTION
diff --git a/dev-java/proxool/Manifest b/dev-java/proxool/Manifest
index 8a258a27095e..b5010ec354ba 100644
--- a/dev-java/proxool/Manifest
+++ b/dev-java/proxool/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST proxool-0.8.3-source.tar.gz 5782824 SHA256 2de39f0b45b71ba05f5639943a8f59a8bc49a4cc025efd7d1b16b39dfbd0ad11 SHA512 ff81c18a6c55aad245092c221f61df963b9574771218fa52c027f11ad73379429e160b481bdb2f5a335f7e4da97b7bcdff41f4c3fbec182668437fc965d6b94e WHIRLPOOL 69604c3afc3530a3ac35b250b3124cf474346cfb65c4888a8b611d66b24659869231bbb6820d450715672fb6e8777aa15d049c9ca5a6c1a78bb6bea9026ade8e
 EBUILD proxool-0.8.3-r2.ebuild 1417 SHA256 db9ad87ba118e88380220e085f675fc91705644ad8cea44c5d2654c08bbea1ea SHA512 605f9403854996ab205dfaf14a369a13af1276315f12b5e58a59ae518ff73f15082b5197a346c77c0fbaee85e10a985c96ba2f2d3a0ea3375a3931d1436686f6 WHIRLPOOL 21f64ef35717001a23382ac7f488b7fc9a13911f9e6fd800c61f331c052e8aad05ac06b0c864795bb832af4dfceae54016db59d47315e0c515a9b1cec1189d01
-MISC ChangeLog 2579 SHA256 5e442e92fb95fe9c2db6dc1e589a90ea9bb2f76c6f16f01ea3b6170854aeed43 SHA512 ebfaf308384ea6d2a5f93fd02de514d6e9c94a3d82331b2e7ed53fae8778bb120b4b753c5018eb21d0d38f70a99a782d91e87ffade19faf8c74896b202646f82 WHIRLPOOL 6403662dfba485215f8004309fc0515123a0ca03fa0a1aaf5e545cf6791936f7e4f4ee97d4c3d9a4fdbeb8fe90318e6cc0cfeff9110c3b0e74dfd7c29e0c56ea
-MISC metadata.xml 157 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 SHA512 bbae663e26f48fdc5e272adc2b06c14f77f34c53caf84acb53908ff036e7c12a3edbbc0929d2db56bee861a453381d979c7e0983a23716f629ed2135c22ffece WHIRLPOOL 887e153e2481e7d76f0f1b67a395f10f0328b93930185ecdb8fcb5fe3c50f839086a18831d61cf45b34657aaffca6c3b7900cf3c04b712846a05027a84602448
+MISC ChangeLog 2676 SHA256 0981196414f5c53108678312ebc6508b70fa00559527d083ceab5fd9c98338b9 SHA512 b13e7deccfc0a7ea6c490b6c72ab24e31ba7d9496e710885bb4f4b4d441ad0df37eedf7f68914df54e91cc88c0c4d1696684f6cc512c1accadb548deeb7fef72 WHIRLPOOL 497f78cfea8733ef614e3da2e60a434430c8152681673f2001c93a9fd7e60ff34d37b467c5700769599c675f1e5e0a874a3f47e4074a9f394b7384a298c7d1ec
+MISC metadata.xml 235 SHA256 75b88a6059c278f1ea2760fbb483da11713f345546ad47117f61414465c7b2bd SHA512 f249f5890c17eec9bc470ba2c8fad4317be7cac05dbace422855eb1a94f51f539a309f4905532a6e2a530616da50891f2eb5301855382178f0dcfd6cac1a1682 WHIRLPOOL c8ecd5da038a989979f4efdb5c40b022d66558fb0a8fe445b86fc551a258c6d3dba84a9440b2f63b73d0efd19184ab6774e0fab5f8f5b16fe87e9f429c948f83
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlPn1I8ACgkQcaHudmEf86oEGQCeMJ4UxEE1N7AwkrPk/mplFpzP
-TAoAnRuKPpXfM+U/QgxsMGIi5KB6hN2+
-=6awN
+iQJ8BAEBCgBmBQJVdvFNXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi51UP/R8Kbj4r0qnGLqHbM9agAqZb
++ypJEovzQKeqxOlBzGRlyJIDNoHA02uP/NnyJ9WC2eWGbLG7pR8txOTgvWChl0Mi
+lo3TG1NMDs9tL4LnlRP7m6Q+bVKoSAUk12uqgAmwbiklH/PxB2FVTUwwUo5B5r4v
+IybVMZpT1dsOroi6jE8tqkL+et2MWmnyDPAOwi1esESQQg3W3+aP3rfpUXdaw5Qx
+0/PfBbK5ZAeyD7SfPkqpFVSR4EvsRN9A1TsOmXN5iWJRtIOH9zUUJgzZLEPEZVlE
+uO88RZi54LoyQ1LYuTAP7gaBfqUKVikIwyhMTY/I8MrxLCXAF8Sbj9uElKQg1QIs
+hm/5gmJnBG+fqiRf6ICbzxXIWovbTA7r550xrOyHRGtz11jFVeo7jQGsD0XNtP0J
+2yU1aHU7ppliYS5lZXt8HrKgVvFKRlJThiz4muPAVWT4Mlg56WtSorCb4+wkik/b
++Ue5n5lXJiy+YqelXLZB/5jPxwH53sdQKXrpYdRCjM8dAgoirKMFNFG2pfUMt8V+
+DyIrNNk6gTMrARHbYU/s2q3iwVGc0t1HHud0YuWJXn4SFHrK/XilCch2+EcHgS30
+F7xE+aX1pYAOD/drq5RRNF5L1wqn3JPNMU8r3+Aj5ufnSmwH8xYi8Pgln4cjFi5B
+xBYYJ1R/2bSs9XcuarLW
+=8aiX
 -----END PGP SIGNATURE-----
diff --git a/dev-java/proxool/metadata.xml b/dev-java/proxool/metadata.xml
index 838c00a4a448..b0ed1ba5ec6c 100644
--- a/dev-java/proxool/metadata.xml
+++ b/dev-java/proxool/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">proxool</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/relaxng-datatype/ChangeLog b/dev-java/relaxng-datatype/ChangeLog
index 41c610dea3b9..72bfacb614dd 100644
--- a/dev-java/relaxng-datatype/ChangeLog
+++ b/dev-java/relaxng-datatype/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/relaxng-datatype
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/relaxng-datatype/ChangeLog,v 1.26 2013/06/27 21:17:52 aballier Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/relaxng-datatype/ChangeLog,v 1.27 2015/06/09 14:00:31 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   27 Jun 2013; Alexis Ballier <aballier@gentoo.org>
   relaxng-datatype-1.0-r1.ebuild:
diff --git a/dev-java/relaxng-datatype/Manifest b/dev-java/relaxng-datatype/Manifest
index 9fa9b7bd1659..f7ffead7fc5c 100644
--- a/dev-java/relaxng-datatype/Manifest
+++ b/dev-java/relaxng-datatype/Manifest
@@ -1,15 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX relaxng-datatype-1.0-build_xml.patch 1972 SHA256 f555900bda75436f1cf35bc86a06e5f0a4def6ccafc8b7389463918ba87059d0 SHA512 43ef9ed57673761b60f5792de19cfbc324042eacbe8c78958f19fee17abefa6baf1c0731453e6b056d269a32ba52ea890bc6fc1f5e20676e5731356e8a944221 WHIRLPOOL e7c6a17a4543f8533b2334e211cb28108fbd16e523415d8f20f058dc44f185a51f7e3a8f5383a59c92dc9a216064c6e75a08d9bf47b854a24580e8eb4cf4a223
 DIST relaxngDatatype-1.0.zip 74033 SHA256 7be15d1beb7faf895d5a7abff793ba324c4753d319236f40941ee63949f65eb2 SHA512 712b99209e927e8929c46797cf3733993cc2740bfbafb458c518e5e130a7860a19dee45acd360a9d7179137f9340c3edeb514cacf501233cca515b38e60d6b79 WHIRLPOOL 27ddc5d44c7a6f0c792fdfc4db4cd2c38751c4ace170422bd9cb9a528725c07f4ba896b75d165c5a8c6c1e2517403468f6d1425441adee0982ecaf934e15cab1
 EBUILD relaxng-datatype-1.0-r1.ebuild 1078 SHA256 ec62719bcf3abb534f5e2a1d2342990c23a8988a3b55870e752047f0981e0a19 SHA512 ecc420137d8ab4511ac1939b797b190f672aad5c7c82963327b2519f1d37edb0b4f10ee39689517d00cf5959c36fe58a3f3d62033f2f86d4f18e004138326ba2 WHIRLPOOL 4ba34abdac5a76a036dcb09b756ec7e2c7dcfcb9c77014496c7588b95285e854d62a7f2019c7ffd817e8c27813edfcc519921c733ce6c5d7a316a7a3e7c16e65
-MISC ChangeLog 3278 SHA256 36d64408e7a054fbe1a48bf1e3833b6564a8ae96f7273e254c505b3480535ac5 SHA512 290ae381cc52dcb505c486f8917d2ae8d3fb03bcbeeee85c621e051782dcfe3b8e5b71387ddb432973c1b90f68d31b5a4d078872ca9b574ba811055d43b2d514 WHIRLPOOL 146fedb28088b501fc6e72d52febbd040b544504e2eff394e208d786198139e2ec914c062cb16a0107c7ae7499dde612fd7b5b0f88870c133d23d60da47f9671
-MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
+MISC ChangeLog 3373 SHA256 d6e382b5b21ac39d8f1877cb0202e7e45d7a98ef01e3a89e8a3e672a51bc145a SHA512 1711cb3ef7b0b42147521125a946bf9e28710576eba4952f64f701b01f34273a2df8eeb5e2a620c5fbfe83b609cd55ce4365912f3c68947dd9fc4208a0c7c159 WHIRLPOOL 2b3467714aef8e391d5a5599973f806ae85bf0724db66ed248f123a4dfe73d23266bf4b56bae44ef61e9e4b9a0d3219bdac3f6214c2e1317df6d71c880d261a6
+MISC metadata.xml 235 SHA256 adf8b7c545b154aee33090a5b25166991d349fa8662839aac4c22d226181ac1f SHA512 3318aa3d9479318a9f1a744a743c6b5e2e3c953749fb68f6fd8a34013b80b5f6a1c880ab495a1a0329f07a785ed0bd56ae6ed91580da65165dd846f7359bc6b4 WHIRLPOOL a79b79482c8c4a7e05cbab449b8d45f9f1aae2046a881251baea1f7ff770a771a20d94a65d28568212fa2d7cfc98f96ee03a1f9db0ecf43f2d827b6475a30096
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlHMrAEACgkQvFcC4BYPU0pZzACgqMOU9NJfPLTV5RzAa+PuJl0Z
-tOEAn1vquuYzPgpTHOjvGXn1ed8hWDIr
-=fcas
+iQJ8BAEBCgBmBQJVdvGAXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiJYMP/3MIOlC5BoDy/24JWjNYhdmg
+fyVRHW5woEYNUMZQWP+gyhDg59Y5EL5aJV/gYqL9TeBLqJ0WzDvD5voDu+RyTdSh
+ppiQ9/+rLJq8rJ+HXKJn8IKTaNk7Om2k/H+LetztUa66fOLBj+0OrBIpY0xsWPUl
+OG0epSOgLSnagm0Nq3kQNbRz0O49VRIkJzfAMKmQWzAr/C1fJ7HZyjLIGMC7sRRn
+Bwg6hsL4qIEQlcz6M4YB4Tr4uParUCA0X7U+7ut77QyvtrXGXW6ZgfAbWb/611du
+iUs/o5cvna4M9kpbphJ+EI4S11t7GJ5WG0UoigjDAwvj54sPKYj+6rkGy5OpbDOY
+pYlJWF35NVYiLx7ogOeX2S9Tt/dDm5twBAEpiF3FaCrbPFzMA8sWNPFayOyYin7C
+twiMaSz+P+f59GKi19y7jLHIkIZugZQOK5yYJNqFkfrWL+kcofNEsc9lYDpY0rR0
+Aaa7xy0MkO2eexB0/JT2CTnmHorn1cEZRkY9WpQEbUPwW017pkfE4I0isujFQV5I
+xJSe+u49oR7mgE1Rb3Pn1CNkNF+oMxBPrCDeE8rOehUO6KQ+463HgzES7Jp0hSLA
+94PA7TfKNdKlIKlsmf5hBgChEQeIumcYlaEQh6y8LZVnQ1186jXVQ5KHChDZkjCe
+Q02y8btG3Pde86b4cAGN
+=j7ke
 -----END PGP SIGNATURE-----
diff --git a/dev-java/relaxng-datatype/metadata.xml b/dev-java/relaxng-datatype/metadata.xml
index 7303cef96964..de9b803e551e 100644
--- a/dev-java/relaxng-datatype/metadata.xml
+++ b/dev-java/relaxng-datatype/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">relaxng</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/relaxngcc/ChangeLog b/dev-java/relaxngcc/ChangeLog
index b9e5359edb6f..06d9a029ab8d 100644
--- a/dev-java/relaxngcc/ChangeLog
+++ b/dev-java/relaxngcc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/relaxngcc
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/relaxngcc/ChangeLog,v 1.18 2015/04/21 18:40:07 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/relaxngcc/ChangeLog,v 1.19 2015/06/09 14:00:03 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   21 Apr 2015; Pacho Ramos <pacho@gentoo.org> relaxngcc-1.12-r2.ebuild:
   ppc stable wrt bug #535090
diff --git a/dev-java/relaxngcc/Manifest b/dev-java/relaxngcc/Manifest
index b5838cb38d14..34a002803f6e 100644
--- a/dev-java/relaxngcc/Manifest
+++ b/dev-java/relaxngcc/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 1.12-fix-jdk-1.7-enum.patch 925 SHA256 df6984bae7a4c0e16ccef300c2a94f4893615edd78a6104d880718250328e41a SHA512 5a459bdd6d4d9f173f4e0cd7f23476ef5655f5918cc291eda43c0b847ad190f81d10db55bb76126804dc84efe5122335c11849577130aae09c5e73ca801c5a40 WHIRLPOOL 48e6c98923fd96ab05aef5af7957c090723f607f732c16c2d1ad673e550b32c49130846bb541ed8f19eacf7618f6ed3fdb467f3fc329ff2d24e2675f98762936
 AUX MANIFEST.MF-1.12 56 SHA256 39bd5c69bd3fe7c5c8768902bd82e65e0de4ecb35117697ea4c2d749902eb111 SHA512 6c1541a9e7ae93c6a11fd25347cb98b4365af35b68e7939222aac527fc6aa1ff39f69da6f3571e65581072e243c1be2056ec65f51bcb2e869779e5fb4b89821a WHIRLPOOL b4605203682b3b0afcd81878dad2150338ca12db0019cee42debf5d76c6f6e7db337aaadb549bdf5fb59136f957dd87f1f52bf35a600c6dd45fbde90beb3a462
@@ -8,12 +8,24 @@ AUX build.xml-1.12-r1 1052 SHA256 bf13c856573e64f28caf5890f68823b5b849db7d353ae4
 DIST relaxngcc-20031218.zip 2162036 SHA256 b6a3e797e8a4d6389ecfca5d7c0218ca22966b893e8fcf5a9b6cd7a417d27f30 SHA512 df797243c095e79e9018d8f17deb3963631128718428ff325af6910e285e649f27c270b63101f2b5833ddde23814c54a662397000f433f8a32cea30917760d4b WHIRLPOOL e476fec6c65775e2552a60856ee0e32ada9df0301580f1f8e9deb604532dbbe9ca7c165c72d69226930d84f0b5529ac9a6c6f790d7dcc35400686a31848eed92
 EBUILD relaxngcc-1.12-r1.ebuild 1357 SHA256 6fddb00515033a41ad8a36da4a629c35e7eef070f6d607d42256bf40a2867151 SHA512 ea94dbe25418669a11094c8a68245e0466ceadc268c638fe010d16a960d81015af0fdc46572ea271e449f3c612c7ddd19271b229a74fbf2119ac21971d0cb7f7 WHIRLPOOL fb5afeb2e43ac52053306a95f2cbbdf48f7dfa8a765061b2b584efa906edde51b0244b54f53fbd1f95047ce0eec5947cd6a2d2a645a894e843da2018b287551a
 EBUILD relaxngcc-1.12-r2.ebuild 1385 SHA256 234dc78fc0c3b94f3b3cee1f6655c95d7e7bdc104225cd5886587393eedd3d88 SHA512 d09dff44d4bd6b2f8b271655648e9927fd270726f06fcc22b8ae2a3907f06ea2ee7ea1b08853c52743e744694f5f79412523f5d6597faa6311e4357c64ca785d WHIRLPOOL ca4627a394421f2deb9bf104c0c887ba24a4a07866f8ffb0334b8981972748b8f4b1f3b15c4c39ecbf986ee3fd7d20b5bce236e9d3a2b1450108f98de70c3a03
-MISC ChangeLog 2594 SHA256 df82469dd307e9abd7b5238f3e6f2f4e62ec47f2ee516941a91470c89a9a712c SHA512 f3d0bf4030204a95405dc840ace8d651a08fd7fa71428a72c52d0df20a74f8aa73548235243db4645ee51718a51cdc42893efba0faa4c4ad94f9b65b36c1c7fa WHIRLPOOL 5b08a2d2d2e914776228d54b99bfca046c0fbf274e4bebffbfd78f3c609b52907e63932be7396be85406228950925f0185e7ca0555913a0f08234fc924bce158
-MISC metadata.xml 159 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb SHA512 74dc9ada199a90543b8e1c168c7054f2e973fbfa2551e2b959d67501f2538e269cfb4b2f0905a88a1afa04c20b33961336310ba876f80d47c8e7615b2d7c830a WHIRLPOOL a0ac49efeca233ec4d8f63eb69c8e46e1d4ecbd926693c25b1b8c7415e4c565680936aec46f0c4197116fd7a19a3bb571beee493c18bdae1e5e978e3db84f17a
+MISC ChangeLog 2692 SHA256 a7c63063eb2e9708bf660be9f914cb37c903b7bc08042f2713196026dd1d27be SHA512 bcd83e1144d0b88ec4d7a08c1b2d1198d4f5be811b1b60cb11e6329738a85414872023899cd95a4c1bb033a022d2a0ab782a34af9b1f386c212aa52ead45a6ee WHIRLPOOL 6b45c16389b4190e47bc1aa429a750d6ddf1dacd2be3678f0b45dbdad16ba402c64e89a1606bd7452196d1a112b07138b3aae677e4ea5d8fc3974e16920aa3c6
+MISC metadata.xml 237 SHA256 efa743678c755c880a0b121ce11ea84fbf3aa1fea88580760876d5cc7571760b SHA512 c1ec64f4c68a29555985a4e3393acbbd467528c262c7e7dee95d3da2144662a34c424f86b9a9637b13647e94347e0f6c836308e5f3597fb090376c26c665304b WHIRLPOOL 0a8de58c78cc4f42dbd700e69236510deffc0508914876cd5cea92eb4d24a3c83229087833c8b8f9bee79abd6f7fd23d4f7972ff1e6fafb98cedbb8bb095f9bc
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlU2mYgACgkQCaWpQKGI+9QfSwCfceHL3mWHJy7hbg8mXIVBqW27
-e3cAmgOYqUkVi9KybVSu2roRXPnV0U1B
-=fHvN
+iQJ8BAEBCgBmBQJVdvFkXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiwFgP/jLcRlONyupaC1njNvOj0p3R
+KH0KG4B+YwWvIvTxzjyr8cLq39rel2TWHbccN6yh6RhFPcz+ZM2imxYvs0e4IAmm
+8gP0TBCveDnyR8noDwhQkRdEvpWAwiQ34n5H+x3cEXt6Mt5FwSvIttKSJb1M6I7q
+mjrqHt0TScx61++BfU8W+E9RbSMsIagfMNA3rVAEw/mCcgo5LjaiUVaY96j319QC
+RMWPkJfdKH5C2UNrL1wIPrvrjGtkYQV0wP+hxNCU2OjIFbdDCsv3+mS7YK+5tUFe
+eg2QckNYZzbsbHGJsmfAPVac8PiByxUPY1QVY3aJFFcXUBCyNz+Cdbc6ZHmkRBPy
+gJi0ZZal/OKMQieqmzxdAO+B4qcS4IYmrOnLGFkwWzDHi4ZWYSsSMRoQhXWhIKY6
+KedeL4KR8qQBtMOGJa46xr7c+yS+uosMDGlwr62xNAjQTfyyGIUfB1i90+cyHjXS
++A0rxPTUP+/k5HCu7uoMZW39F6c5M0jJHCwdjy+mY27VfgNK/CWSPgf1IZNYUM0E
+asub5DHMJQAG3e8Cr9yaFXyo9JJXKXDrtbYeGbn6SYXozpvORn9mVwIL9HzSyJOt
+v+gNkWYBcJ0A6fAVrGqawLuy4S8RuNbgQI4jM/x5vIImOfBj8RXbcV3y4/BXv1Sg
+naP4OKTFhY80EGFWjIV3
+=MJMS
 -----END PGP SIGNATURE-----
diff --git a/dev-java/relaxngcc/metadata.xml b/dev-java/relaxngcc/metadata.xml
index 250f2d1940ea..cee33cced394 100644
--- a/dev-java/relaxngcc/metadata.xml
+++ b/dev-java/relaxngcc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">relaxngcc</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/sablecc-anttask/ChangeLog b/dev-java/sablecc-anttask/ChangeLog
index 414d48ead46e..cea8bc055126 100644
--- a/dev-java/sablecc-anttask/ChangeLog
+++ b/dev-java/sablecc-anttask/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/sablecc-anttask
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sablecc-anttask/ChangeLog,v 1.11 2007/10/24 06:06:34 wltjr Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sablecc-anttask/ChangeLog,v 1.12 2015/06/09 14:01:13 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   24 Oct 2007; William L. Thomson Jr. <wltjr@gentoo.org>
   -sablecc-anttask-1.1.0.ebuild:
@@ -48,4 +51,3 @@
   19 Sep 2004; Thomas Matthijs <axxo@gentoo.org> +metadata.xml,
   +sablecc-anttask-1.1.0.ebuild:
   initial import, ebuild created by me, as a dep
-
diff --git a/dev-java/sablecc-anttask/Manifest b/dev-java/sablecc-anttask/Manifest
index 7eb56bdb8558..4d620744dd36 100644
--- a/dev-java/sablecc-anttask/Manifest
+++ b/dev-java/sablecc-anttask/Manifest
@@ -1,4 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST sablecc-anttask-1.1.0-src.tar.gz 14045 SHA256 1225ad44f093c6ad73132e599f9294abd20cbfb51c7cf53eadcf96cb14945235 SHA512 23e8f3e911660549fd5bd6bcec4c97c58138fbc478bb958695b9b5327cf3da6985830d1c7a8db45516e2f708f7a9405921342b2a05bdce31c39c71569d62059d WHIRLPOOL cda4247e9ae789e742d4a084b8ac7d6e51bdab3b9f7dbacfc8799fd75b2318f3e544f490630016343782ec1139b41a4c5f124da651c6356d9b1f1422f4a1a7f7
 EBUILD sablecc-anttask-1.1.0-r1.ebuild 691 SHA256 f3aa4e02aa837e5a17e4e54b9fca6876d2f286094650ef69b971d6a5bc394aab SHA512 6f1cc04e3483da563888799fb14326f1b99e0a7b961c5d3532e5c0e648045efe2cfd02693bdbe39365225c268c5751e4017ccde24d9cb3cf4eef42369b5b3bb0 WHIRLPOOL 8ba0feae92953beb0ea5ceb71ba2ec3577dd8c0470edc8bc9e95e1730ccfac42cf6b4868b88348ad124267f3153fa4059c7d6829d56b816bec95327f8af0f9f4
-MISC ChangeLog 1670 SHA256 c250acdd7cd51a537d0ab340432a24dffad44acb1269127a75efcf6d2a033c38 SHA512 b75a28497e3107127502287de6f840db935265f1f530ad30bf019977e6c7d6b6f9b740c269ba0838af2f49f40ea9477ef810d0ac72849ef7df34fbbca4d444c0 WHIRLPOOL 32b16b79ccce4a0285327a1d9ad67cd2d2b17311f788158557dc5ee5357e2b84d1a00d869fd81ebfe4a6baa9c038c3c37f625513bfb2c3589814961b3c934dbf
-MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
+MISC ChangeLog 1767 SHA256 d953c3f4853a6f211032aff68b10f19ad2cf7d1093be922cadde1abdec5796ed SHA512 b2e526d7323ac0053aa4992aad0056fd351a6ebfbec392b949c7d98e6fbf18ab8487810aec1a845db6efcdf862c063a3a1fd4ca37e5388081bc0afb3b35ebf4c WHIRLPOOL ddefefbb03ae4f8a0b11ff7d603f636284a5aa95739eb29d54f67538c0d9a16684023b6cd4428da68d28f21bbc564030aba8c8a1df4a8fc8a98dbc6cbb02c2d0
+MISC metadata.xml 235 SHA256 a540c32d3b28f235c83ac18884c9436816372b861c0d60db25e981cc7c96e91b SHA512 cbcdeef7756514af65fd93076e7b4cd820d685c49ad1a9efd3aaeba2916371a0e48d42630bb5ceeb7efb8d6bebe716c5e98b84977bd1b5491eebdfc6d7c7b72c WHIRLPOOL 0be048ae8555894987671a71136a719897f135850b0635191a87cdc3d685329e39e856c480e5534b1d5094027af6097784bc5dd118c66223de61810df7ae3364
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVdvGqXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiEg0P/RX5XfasV1WzG+GIqQAPdOYt
+v8SypsF4+aVd6r7dUyfFThSBD7i8Ig9hzW74SRjrnfiBxDD+EOsWjCrsm3EatZ5Z
+y6wjMcBnsbtdKhikhbYCnWr/QtFSHiFP+G/Ju5elUGMaVfanTl51GvxxnkDNwswG
++WTLWpsQj/aXxwknFO32gk9WkaoW8GlbOZLhHpBpmeh5xeKQXmJxQE/yBSXsGg3a
+602dCOFMCbxvWRlAl0F+Qze/zeKKAfTNPCtr1EqI5NCq/grT3TTGt7Ba2gQOgU4D
+6H/vzfi7nEXKtBh/rbDPgKR7raIBaiAt38Bs2chidBYE0l/Xf+Dv17i+wqGc6+Uo
+/vpCy/tSV7Kz2w6SGbc3aabMOn6O9tnZPBWhySOpX4igbpAFlcAnFwaQigjJyhhy
+WiNL/OLkyqG5I/C2DJalCY62PbbelRKK0vxh/HcppskEDGr27e6TgcwR+eVcemyr
+oOlVUm6VCGgMEIXiE5IQDZfUa5FwlsIk3X8jbGh7RZi9w0HRM7IhgchpasPZGXu4
+ChQhBaXPC3XoOygMBr84IJ4n5bfRUTFglMwskOssDahAUKA/iV+nEqSwWPlq4f9Y
+mtfKpA5RWiaiH3XKbeHpiF/55RIMAKn7FlAFm+pV7k+/VowQiO3LMQ3tIvCT7rFT
+V/QcOM1WaqvZSLmfE+m/
+=jBui
+-----END PGP SIGNATURE-----
diff --git a/dev-java/sablecc-anttask/metadata.xml b/dev-java/sablecc-anttask/metadata.xml
index 7303cef96964..6c817e87bfb4 100644
--- a/dev-java/sablecc-anttask/metadata.xml
+++ b/dev-java/sablecc-anttask/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">sablecc</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/sablecc/ChangeLog b/dev-java/sablecc/ChangeLog
index ac1c4b8f12f9..2dad67fbc245 100644
--- a/dev-java/sablecc/ChangeLog
+++ b/dev-java/sablecc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/sablecc
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sablecc/ChangeLog,v 1.24 2013/05/09 13:23:22 tomwij Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sablecc/ChangeLog,v 1.25 2015/06/09 14:00:52 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   09 May 2013; Tom Wijsman <TomWij@gentoo.org> sablecc-3.7.ebuild:
   Drop deprecated Java 1.4 filter, drop src_unpack and make use of java_prepare.
diff --git a/dev-java/sablecc/Manifest b/dev-java/sablecc/Manifest
index 4a397fa0bf67..a6c54a768e92 100644
--- a/dev-java/sablecc/Manifest
+++ b/dev-java/sablecc/Manifest
@@ -1,21 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX sablecc 75 SHA256 11749783593c2d750c0e468291d30101784150ca746b789ad89efb6ff4383389 SHA512 b7c39e6502a3bb664aa768c6440ff4827ac22b308d4648275aa2e34b6795598b78238a673f073ca25f3b24fadfa60a9c3ccb05fa5019664481a51e4dbc5afe80 WHIRLPOOL 3301db9b37cedc445104d8a99387f4f06d09278a29b9a492e64162a768c876f40824821c823e7b4a490c85f95c8a6a09e8f3e3aa5123a0eb2111b8490113cdf6
 DIST sablecc-3.2.tar.gz 440484 SHA256 f6a9e9ff5d2f57fa2c99f08653bb8c034fbd2de9e34aaf31b412c1b656fef80c SHA512 d8682a1cfd8bbb77543733008a12c4581c6b75c4e20a320d4dfc26b179e03076adfe735d70cc0ed92435ee23f6f74717524c800724f16804dc4d0078606918bd WHIRLPOOL db8aafe6134176091c7e173ed513d1acd61bd82767eadab788ada43de09645d975d213dd10626ee482b02c44372095470975854e52b23f23800aee9459aba251
 DIST sablecc-3.7.tar.gz 556985 SHA256 665e25207832246449dcd3e5d1fff4dec77b0db27378a3de528bca2ecbd680f0 SHA512 c53212ae10afc546796a46b8f1d731d3337c1fe184f12a285686b1f876b207a6cddcd789876d5c9d6b378583065bbb8ca7b5c3797d88b4eea3609ffe9a9c8f71 WHIRLPOOL bae77590d9a9afe017d0a797edfd1fe67b4fc099b4cc9bf654d57d3101d97f601cf4df849c28fbf0047ff888df2b285421fbc4556c942cb77da56ea07e7ab2ce
 EBUILD sablecc-3.2.ebuild 784 SHA256 0af998cd25af11bbcc91bde83c7f527bd70053e946984e333304058157019c12 SHA512 8b264dbe6b97f36072d41e94b38c89e2499a4d1510c3305e53ad080c39cb58d23e1f6cc0f2af61bda5b2dfc4a3da972c66fdfb95616ce3c41014522db2a0cf5c WHIRLPOOL 0287b21c95f0fd40600d1e8604f8ee81efe429ad2d997e4f884f2187a065dc3a269ad805d8c4d5c164c25efbf1d3965618159c5dc9e25275a62f9e59f8b97cd0
 EBUILD sablecc-3.7.ebuild 733 SHA256 0e99af11a58f3f9c0c538f001e18fb9906be7b2fda8c1c1407a173de7daa0503 SHA512 31d7615262ad4eb25b269546276f3400e744e8a9ebba4a37af15e58d3ebe9064cb397615475d1a9735fb73a31e338c9834fe179c760cb7dc4b7d101965e1ae2b WHIRLPOOL 933dfa1b6ef62ca806ac3702c51b4db804ce9e15ba3a444b95d6ff6a787fb4bdf953b35f364ca207ca01ec78b05259ec92e2d3a3eb8f34ec40c32533675c5b28
-MISC ChangeLog 2913 SHA256 d367d360200b40311bad221da695d078fb59e677ce9c00a3f85403b3c779b748 SHA512 c7bfb76cabc9ecf06413b426e6f6fa76d90a137cb3e17fc7e25461b8a9e6f9dccd9830a259b646ee48f70537d5148064b27845744603e51d0618c339bde1bbe9 WHIRLPOOL 91dc7ac789d597e715c761abf354a9755846844e00cb6e3c991b4323ab9370fc955ef9bb84bd76105aaceb7a97fc530fe523fe58128c396441a823cbda3fe98e
-MISC metadata.xml 157 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 SHA512 bbae663e26f48fdc5e272adc2b06c14f77f34c53caf84acb53908ff036e7c12a3edbbc0929d2db56bee861a453381d979c7e0983a23716f629ed2135c22ffece WHIRLPOOL 887e153e2481e7d76f0f1b67a395f10f0328b93930185ecdb8fcb5fe3c50f839086a18831d61cf45b34657aaffca6c3b7900cf3c04b712846a05027a84602448
+MISC ChangeLog 3010 SHA256 1367a54d4baed1157245fc87ff905c37393ec8dc2eada4efcf84fc0702d1ea28 SHA512 50747d9dd6c1f6d3a05c5f7f4391dd96fd9e9e3f8385f4f94edece5111e71bea4c7cffc47fc62757daa252c32abfc49ba23791c3dceadc120d7189a15817be4d WHIRLPOOL 6b1ad0c4e9360ef72dc5f99ac3e718a7127e166281f539287d6d971ad91dbba58fbcecf158dab53bf6784c2835eb043a7542d0ee93056288becaa8c80f6c1074
+MISC metadata.xml 235 SHA256 a540c32d3b28f235c83ac18884c9436816372b861c0d60db25e981cc7c96e91b SHA512 cbcdeef7756514af65fd93076e7b4cd820d685c49ad1a9efd3aaeba2916371a0e48d42630bb5ceeb7efb8d6bebe716c5e98b84977bd1b5491eebdfc6d7c7b72c WHIRLPOOL 0be048ae8555894987671a71136a719897f135850b0635191a87cdc3d685329e39e856c480e5534b1d5094027af6097784bc5dd118c66223de61810df7ae3364
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJRi6LyAAoJEJWyH81tNOV9UnwIAMMqUKi461NIRPvZk1y+eeyi
-I96upMgDMT5UqOFnv9E4kvoR3rEHQXr7hSVPr9lHfGFYuaJCGtvEkbgm7EDB2OHr
-4UOEOVKSkuvG+kYZ2n6GMN/pf9KBwLWMxiY/w4bN+mCDFrT+7LCIq6f4EpSg0Hth
-wOfx235jeUuoGfQFwBUtSBK5WZB1J6R3ljCv2JlqB3YZqeNn0xJmjyeuN2EUB7S/
-uxaOdzVW3mdIZk3X3/THAO7N0xITiC5InPHeGnO+tPmalpJQvuqmyqyYcRcSBB5l
-LGNeKZf8bbKmpCxI5vmKLb7pwiN+UTbs6ZKz/0NQEu2Uq+z4TwxyBgj2nBEnJKQ=
-=l3VZ
+iQJ8BAEBCgBmBQJVdvGVXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiwhwP/jKMDNNvudm+9hurumgfHlG9
+uQO1jMcbwUI5Vc9vlU7YMyT5ufy3d2rDLdyAyYOwsODDNeJwPX2pJo9zuR7yuD3V
+WDZ8/PPHnId0KcJj5JYfF5xpZ0XOxsW1B1s31JVM+vLAOMYokuEhUvGM7HnzjZyJ
+wC3fcxEroFSJNUI8d7ieZUdYN1xGDhFMha7/wX/UtRKVjA+3Cd1GXGb/7F1JZpJp
+osZXcHn3H7MDJNDvAmFZIXuxgZVTSK5dzvBqzf1vQRzQrp5qpf96kpVx+O8Z0vdm
+cAWUIQHVVJdyGmA9qd68MCfrsnb5JGywyM1gf4qzu+63o30A4rAtgiFAnoe3ye8N
+NGjemKgYzekLPTac+X7hr8B8O27g+vk3ER6U6VtLw4zh/2ShUyZCty78Lh/YIfR5
+3DH9J57eWYwya9Yy5XfhbRyjgH4viYS68iDxTVAErCnNQF7iB3wS37tKOg1QKXKC
+ZKS0YoDQ1BjpVtdTsRrOzxqgb6mz0ZvVzMwwWIGTjC5lKhu4TBjI4B92F2obuIEV
+yjyCPfGb6234S5fNkcDqwjr7sOO6m1K/WW092X68BuKUAe+K77b6VcB4tgzPqtMX
+xrtoAuvSkNw5yeDiAQXWss9M4HAdLLmAlo/Ot405Rn4F+dWVx80GC6qRC2UNvUgL
+fGyF/xUxzkvgEdxErX99
+=eB4/
 -----END PGP SIGNATURE-----
diff --git a/dev-java/sablecc/metadata.xml b/dev-java/sablecc/metadata.xml
index 838c00a4a448..6c817e87bfb4 100644
--- a/dev-java/sablecc/metadata.xml
+++ b/dev-java/sablecc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">sablecc</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/sax/ChangeLog b/dev-java/sax/ChangeLog
index 5f18fb59736a..3a47cb901d5c 100644
--- a/dev-java/sax/ChangeLog
+++ b/dev-java/sax/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/sax
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sax/ChangeLog,v 1.20 2014/08/10 20:23:08 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sax/ChangeLog,v 1.21 2015/06/09 14:01:37 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> sax-2.2.1-r2.ebuild:
   QA: drop trailing '.' from DESCRIPTION
diff --git a/dev-java/sax/Manifest b/dev-java/sax/Manifest
index 14fa1dd7ea51..dedca362c6f9 100644
--- a/dev-java/sax/Manifest
+++ b/dev-java/sax/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST sax2r3.zip 372488 SHA256 f9221ba55b3b753cf900ef64dc588a1d6b2716f63440b0f1ab55fe9deb418272 SHA512 af05c14994894f0b6cd860c1d632a1148f43cef824081357c9e4b256e66e0f36ac3cba1838f03322182339f2642b4bf68f707407fba8ee6c2f95d5b8d1267648 WHIRLPOOL 5822d3aba16ccb8bde702f3817090d931c01b6bbb83fc4abf521d3a369599bc4a88707e37db6ef9abb074ddd0119b4b845d7d8c12e6eacd93f382f0acc01d9f2
 EBUILD sax-2.2.1-r2.ebuild 949 SHA256 60e0885b5f5e6c717ef7695ab76d944ea8e364afda7e1216ea8a77abfd213d08 SHA512 17117183d17fcd491fb4134884bee6182c0685b1125b5c3dec57bc3c6d6167c176a25bf6cf8fc252cd2864ef07004d7de907126e2d7e8e8feb45028adf1f2ac6 WHIRLPOOL 823cdbc16cc6f0403feba3f54e180064ba441fa887c2ab840e2dede6bdb2e7643730180c446b9c87df2f546e264ce1294fab72205ab1c85debc6517016859b05
-MISC ChangeLog 2438 SHA256 88ef858330c5319ec90fcde7e9fe1a6d1c17009b9430169a322bb757ba94563d SHA512 12401baa07b2d6807958848a18ba1b49d2d285601432ad437ec17e513ccaa2f50db6d99485fcfa3981a86407141d34e7b55a80b32ead189dc919bfbf700a61e0 WHIRLPOOL 73527e788ef1e8ded8bb4f9a5c3a644794c2085721f9519197252eeba63409d5b55e66e4891568e13df22499389032866b37f5e582912b072703a9100e7af420
-MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
+MISC ChangeLog 2535 SHA256 9a2518613049c367c7e1578465812385d86c80a2650f83c24f75866cabc3bc9e SHA512 288e2b205c79361d1a19562202291eaa357e95c5a2f1191262f716131bf2d5bd1d223f4d6aa04138388aa24835f47dd5dd8144ecf09e42fabe602187e6d055be WHIRLPOOL 0a341661baa4fb9171cde86c5290619ef0e902a92916a13fc4dfbc89c2804975be19ad4992f0168eba75230aff080db50d0063dc7a78d30c8ca2db7dde5858ae
+MISC metadata.xml 231 SHA256 514563c646feb50088e854515228f09f96849a7c7fc096bafb8ee57527f38262 SHA512 51d9e6e0c8743e7ab2b8e5839fe3487203e83dffdf4338272b235a41157676258273d96ae583ef8fd3bfcc9bb9a48e2594e52635eb6edd5efff86b9a7336d3e5 WHIRLPOOL 97f65d4ae5471e7d920f2fd598b21b970ab4fcaa1893dc8ac9251d924815b7e4528f7b4e321afad4a47fcea03cbd132d802bc67dde501f2af9a867444598e295
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlPn1K0ACgkQcaHudmEf86rvlACcCeDbyUebEc6DWCqtI6eVQXJZ
-xhIAnRIMW3z5Z+rxp2NO/Ydf9QfJ8/n3
-=Qo/y
+iQJ8BAEBCgBmBQJVdvHCXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiUoAP/jIv6sMFipn7U9ajvZKniAQJ
+ik5u8KAZGsaA64uIDIIfoQUWzIKRPELLrxu6NTW68fCTPdwnc3zy8jW6fGvgWdZe
+UJzhzegob6t2q3mV/qkY1EO1hJrc64vAf5wOYKSfI8P3LtxJWk3W5+syMNohedJ8
+6e8qnYiiFw0oMMGFUghibjZovBwTKjr1bmV/1YdUt3L/vBARpy1Ys3qTdoQjii4n
+0l2krbRUieKrUpcipHBpyalr3u2PHtz2RVyu0QfkYxrzOTlSW4XP/pyOHJ3uKZYe
+QtEO7My7lpen/9LWi6YFDnvuUcvvOSl2dMmyASGh4SyrzRNH4v366+hiYw1TSasp
+7jnqgGa9Xc8LD9YL6yF1an6ygVcZdDIMYttUwc/1OjwtBc0GJ2QQ4VCYzQNhtINQ
+8u7nQ7RkmfjKhBa9iYMT85KA7Tol5J8n2XGn9tDPxjs5/YdN6Mhf2RmPUiEpGVXR
+Gpk3UXQ4kZc7TZQhmLSuZ/YEssVXB3VP/DOvHa+p019UA6Pg5FswHPPg4kAKcrsC
+B41Do/t+ga3yAtfdKo71XgL6ZmYPM42UtwVlAXZJnbY8iYYoIXzUIOGHxoa9s7Mq
+ZHNI64hbSEkJgd4G22coKV4jQDqdjA5idPZKzxhuv+GMpbHj+9zGbPM83eKegeT1
+VxHZKxDO197ju+hH2cZ2
+=4m30
 -----END PGP SIGNATURE-----
diff --git a/dev-java/sax/metadata.xml b/dev-java/sax/metadata.xml
index 7303cef96964..2cfbf2b5202b 100644
--- a/dev-java/sax/metadata.xml
+++ b/dev-java/sax/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">sax</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/saxon/ChangeLog b/dev-java/saxon/ChangeLog
index 7ec372ee09f7..bc7ba856fae5 100644
--- a/dev-java/saxon/ChangeLog
+++ b/dev-java/saxon/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/saxon
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/saxon/ChangeLog,v 1.46 2015/05/22 09:20:32 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/saxon/ChangeLog,v 1.47 2015/06/09 14:02:05 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   22 May 2015; James Le Cuirot <chewi@gentoo.org> saxon-9.2.0.6.ebuild:
   ~arm keyword for v9.
diff --git a/dev-java/saxon/Manifest b/dev-java/saxon/Manifest
index 2ba1caf5c22a..8f0dc4ed4f09 100644
--- a/dev-java/saxon/Manifest
+++ b/dev-java/saxon/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 9.2-build.xml 2061 SHA256 b319aec150c2ce260518e41eec4e8b164f0f49793f86a00f96b962cfe9fc60d2 SHA512 9e7c02427041df22a7a5eddc6d9e709635493d079efaba66a9da6320af961d933176105028f8a96fef8f84599724829d582ff64d061d70364f048ed39308e67c WHIRLPOOL cc45db5c1ec871599ddd33dd6a818665cb512052497f09863f202d68153ea3cb5f0a0e7aa0a40edd01369b4502af151e7ccad291c8b3bfef3f9edfa94e7b254d
 AUX 9.2-edition.properties 74 SHA256 b520d14d6e7f6180efac9b992b598653a025a077e919bdbedc35c4165b78af3c SHA512 2c95fc288bb35f68819edc95e8ce30f921b17196123ee7ce0c9908d210e8758c51204bc7dd222d6b7e4803dceb331bcd83120622fa2bcb6587d150a0f479ca02 WHIRLPOOL 5bb0b03a6fcdaa9e8590d0a6b474bfec6be272ab9faaae39f4164b6e8a0bafa918c09b2f1b7b8942c2351e6037de03e93512dbf934ab87185bc2060ea0ede0f4
@@ -12,24 +12,24 @@ DIST saxonhe9-2-0-6source.zip 2942625 SHA256 4f15659cf8bb537b4b20f63cf060bf56f39
 EBUILD saxon-6.5.5.ebuild 1321 SHA256 4fa3a20be18c155c13ae92ba163dd0988d9c3870baa05bc729e000688741097e SHA512 701e94f9cba4d05a478d6c1603157d40e9628a91d74f0d0223f62b901f8af7f847843255aab99c0947cf2c70650271058d221f1c16e1ed708eefb5f0918bbc36 WHIRLPOOL aaa727ac03847f01d40dce3ac7b10e5aeafe1f5713eb3bd89b71ca515c58829a17a2216158abf934926e6e1543afaf944ced871b0bff6ba0edc180c5714835ba
 EBUILD saxon-8.4b-r3.ebuild 1582 SHA256 65b07020ca6bdde67de404df9bb5e4b13b507102bef90ca690c62832c47c0f0a SHA512 d41f2fcc049dcda258f96b567d0782c7c81c8dd8f344d754ace1cebe0025db636baff34a71800c6af725ad6f82e0fea17e592c48a056a32f1d6b11bb584aa26f WHIRLPOOL 195a10463150a3d9ee5fed9b555e95536cc6dabb4a019835d35373c04cc8a3c85d40f3e853d240a4f8c8f7732a1009c4a598c427cfafa6ee04baf9be99ca2722
 EBUILD saxon-9.2.0.6.ebuild 2314 SHA256 65b7b6af8fd08c14777a248090a92207e4fb1df4b28a2d063981f0196fe48cfa SHA512 a35f6d7dda8fc30b7d1978294932e1e1095b3f08fec4df1c36b3168d9e453ac5e1bd28574bc0cbc7e7c336426fcd17fcd09d25b8d83ad62e722e058cc1bef321 WHIRLPOOL eb75ec8fae4d3ece8eccd9883e15cfe06203a4a4fbd7b8ea2ec0988bbb806f7ba6d4cf6dc8f60849723bf5242e83833a0f9bcc68b5da2a8852746e6f23e8aac5
-MISC ChangeLog 5144 SHA256 cba921595f5b1ad1735ff6e3179c4df61868527f29bb04f2d7bfd203d666d60d SHA512 b9d3bd506fa7227ddc5860928b9c51a83dfd798dfc47222ec3e4063dfd2feeb5f26a2b2a1224800bf2cb1669fa1f245989306a4555f8e5faf272392ec06e0f38 WHIRLPOOL 52848f051444e63bd7961af2754bc74fc47f02a3a3b6547e66ae3897ea2dd1ddb697dc2b7a22d3eacbbd0ca30f3977febe475e2a05f6a39dd368b868015e9520
-MISC metadata.xml 157 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 SHA512 bbae663e26f48fdc5e272adc2b06c14f77f34c53caf84acb53908ff036e7c12a3edbbc0929d2db56bee861a453381d979c7e0983a23716f629ed2135c22ffece WHIRLPOOL 887e153e2481e7d76f0f1b67a395f10f0328b93930185ecdb8fcb5fe3c50f839086a18831d61cf45b34657aaffca6c3b7900cf3c04b712846a05027a84602448
+MISC ChangeLog 5242 SHA256 f9ac6dd3a71814066208c1b697d08ef60f4ac7551b0870aec6392891536de928 SHA512 9b3435b7ff0f307a99ce6e733b88a4d0e39c2e079095b46230c43d26035de5f5c92cd87f14fd9542cb45463c05c3677f0ce1260fe2fe2bd86ad036deeeeeb2bb WHIRLPOOL 2008087b5de32bc7d7ba40f0d345d4cbd9267d1ee5e13a8a1342818a2c002be2a8e6f7536f0426cbc2e46bb8698d228693368c664c60cf56b559089b7b0aeb68
+MISC metadata.xml 233 SHA256 eb0277ded6524b69d99336d401e927e69b73de0fc583356869146743e237b36c SHA512 be7cb375c0d154fb5267301428ebddaa6b048f3f68d0740446767744f1cd813edefa206c2d1d5034ac798721eccfb518c26d22e59c8beea9dfd5d6c09c3aaff1 WHIRLPOOL 769e41b1b54824b22793e7e5dcd59ec16ca1b853e25832546bfe886aacd889ea98719bc33f4628816cc5a7b9c1cd3883c413e840c8bd7f00d352bbdc5ae49a55
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVXvTuXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1MjhERTZCRDg2OTFBNDM5MUZEQTJFRDQy
-MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3kpogQAJNIHvy4pwZJMxshuYhEsbfj
-CvQcUBlFwOFqQ7rFv56aRdDPo8RG/B8Zg2nipLRVeHO8tOHM3rVCov3Ebkh6rrWn
-F+S331goZxv81pgH3XrxBpji/QbryTRTFsXR8N0Nt7Eb5KPOBkWJ9mZQfvVnwj/M
-ddugCPg3gNJpVZJ28PtWWaRbEQjj0U0/sp+1QeLgnMupJi0MSDSMgBbevOlivK7q
-Cvd58YM6uW84HC5d+82mhq7o9EbOlXZG+fl/iibq9lWfwjy7mQy6x48YFEN7PGmP
-i6CN7kX7yvAwXocmykCac5AvVpcDIvU4cXd/S8rqu3MoRTNHa2ODPqczpJpderrF
-6d/IWLB7RT5d9NHqU+AuupCEHhHEL5qoxwAlvATupOR/mEcQYSqQF1WUVEgEwUdz
-soDqsmCqqCeVxzVfGl6pyyOgMGk6XAMszcd28S89AZleCLyj0Rb5XO4crrov1MAQ
-oDYjbchl38udlvUs2komyszEzgp6kbYyEuobvgUQwEdoT6OS/6x94KDcwmCIF709
-ps59McQoTVJtnrzVMVMhRM9fm83d8zkOCdywCyc9GOGyl89pfndFqPWTHk3zcd/J
-8Qc0llRxP2sdLjAZ1TqFSUF1GgKTVSw6XEemFsazzuPfd6L1hRKno43PDltZAiDZ
-OQ9CNX5L6sizu1is078f
-=YdNF
+iQJ8BAEBCgBmBQJVdvHeXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiQhoP/RLjaFtM8JqnctAOkcTob8/t
+cwWQIvX0mP64Ocjp7Db0CP3dmAoFFPS55hHd71vzLb9aFO0zuiBSrPbTy1+c0ElP
+6L4EKCrMx4AawzlvC83+3tagglUELUXtXUr0rh6GokAriNIgrhLOr+d9oP8iBTjz
+99m0UuohHVK/3nECxqS2YfAKRImMppdCevIFXbhecqBnizo/U8ZI+ll3Anb7JSNS
+b99ZHKS8gHjN4LlYh6iwx6WhCQnZdy/IMkFL1JqyzVIxaZoX/CV3gDUxNE4eGQfh
+u6ZCOBJvE5gHmGBR+NgfYmPECg0QAHrNZ7/IR6UlxhYRgeBbwDU3cLEU7SIX9mDo
+H18d6ixzl0kRj3f82Leq2itq1XtrhK1aPn4Kg8pyxJBImddt8GVH5JGlPZEmEbTd
+Shd0sQKA+HUQe2Tt6syqJdjt3sQhm5dXkUPzoWmijs7QL8WbW1hQ/3Uneghjyoim
+TbPgRbi4fEmAXFnE/O/MLNGSz64b7RAxWRe2YVP79D32exQjMt6eQWCI3znsIKWA
+AR24ruSb9hKbkfCvKjy2JFPpSsuBlFnIlMFWPy44kK5agl+PXkqkmEt6haCe1y2i
+/BicSIIw2UtT+tTjYolmHkc8+AAO0Ozvcj9cmQe+bqh3xX+NeasCTLav7VgEQ5uT
+8W3bSCTw4ws8bKNceLgW
+=eT26
 -----END PGP SIGNATURE-----
diff --git a/dev-java/saxon/metadata.xml b/dev-java/saxon/metadata.xml
index 838c00a4a448..9f1123bb2bec 100644
--- a/dev-java/saxon/metadata.xml
+++ b/dev-java/saxon/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">saxon</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/saxpath/ChangeLog b/dev-java/saxpath/ChangeLog
index cb571551ff3b..8a9b72f9a9d1 100644
--- a/dev-java/saxpath/ChangeLog
+++ b/dev-java/saxpath/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/saxpath
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/saxpath/ChangeLog,v 1.35 2014/08/10 20:23:30 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/saxpath/ChangeLog,v 1.36 2015/06/09 14:02:32 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> saxpath-1.0-r2.ebuild:
   QA: drop trailing '.' from DESCRIPTION
diff --git a/dev-java/saxpath/Manifest b/dev-java/saxpath/Manifest
index 1c48947816b0..2dc13353c3f3 100644
--- a/dev-java/saxpath/Manifest
+++ b/dev-java/saxpath/Manifest
@@ -1,15 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX MANIFEST.MF 276 SHA256 b73b251bc3239bf854935722e39aedd94bb30eadb63795a5c4e6bfc89def10a1 SHA512 a9741e72b04366d8dcd9f63b4b4a6351941275311c68438eb3200342b8524463a359156e90e27acdfd6e05fa9fd6b425eb969544768882d5bbcd2ffdaba3e03e WHIRLPOOL ea5479be0021de149cb1513935e3d530fb49fe3bf6ecad3104b5b139a292988e2efad7493e91565b12d3dd5dc86bcfea29dc62cee3d1df3801efdd6261b0c02f
 DIST saxpath-1.0.tar.gz 2166023 SHA256 90c07abb3e3f09c398c02d84b44b651aa59d724aa6fabf45aa44a2365a6725c1 SHA512 aafd5e3d6d135f0916ebe3e4804bbbeb9c255b23210a46474716485ce2da0ee81fad4313a38951865104d2eaf1fadb81efd00677431b0294b1d01b7a729cee9e WHIRLPOOL 18b2150261a2a1bcbb34ecf07b38c9276d5610be1f1dd16b3de7c8c5de9c712dee44a896d5c9cfcb5dc9152342b5a7c2b11f70243ef74c2531ba3aaf6706a35b
 EBUILD saxpath-1.0-r2.ebuild 1459 SHA256 45d855f7d9020400a39a151aa493c677924ab046640c35cb8a4a15b246f00ac2 SHA512 f5fb1edd299b7af07e379852f6681982a026f01ddf520b669c2981902d8513ae12306c394c0e6b247d81cb5a6ff6e6d906dd749c4a7870ab56afaf04f94d236b WHIRLPOOL de53946ed55325377b467833b19097c2c29100ee76c919e450c7491e9342fb6fb0b2a8ce2da462c461dbccbb904ae7e0bb1383a0271d40a39506f67cf9ec0cba
-MISC ChangeLog 4317 SHA256 7a4858495af3538e83a9f5c3bd1f3b9726a0d779625e194f32d47f413094ca19 SHA512 59b3261362c2db0eba2d537aa0e65e80e7f4a553861bf679f847ef71e11371cceb5605850126755c7acb1b51f8467249aef6a928412353d6fd4f74e9610073db WHIRLPOOL 05d89e8d73227153b396ba5307ef970fe217ac9a6b62cc932dcb925d57889413548f8ac658782a1f7aa8db0411e47b124e6961b0f23facf35e6234d028dd34d2
-MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
+MISC ChangeLog 4414 SHA256 b68c3fe6ee0497b6e0ba30549b2bdb8e0ed6d933934305d3e3cdfdc41c88bcb6 SHA512 b82a7e52c92dbbfdcf12c1d9d5265b2e3852715a5b702a5cd02135f3d17ba12afc968c5bcab9eca9b01d2d5f2370f8491fb3adad1fc44e62d04338d0af95509d WHIRLPOOL b54cabfd7431dc94cce60034eb4e867d3060fce7cc0c3f4a7935e54ff61a81423d2d319f6e1e3f8fa944d0094642ce6735d2e7b4fd9effbdbe02cab2a2d9f625
+MISC metadata.xml 235 SHA256 9ee71bc1c2f05e30e924306a4964803497137d6d04f012d045fe56d19792edb0 SHA512 89f483e2c9764998294396a1aa9fa2b0d53af6ccc92010c124991462e149a192aba62feb72cb2d305f09d65ce26dc6d691215bccc1633a77b4ac695a6f6f8c05 WHIRLPOOL ed27b206145c33b92bdaf8a27ebd4404deec815b98fdc6912406b0d62496f241a41b23e3a86d3c9fdbbaa9590f0685b64104b42cd3e694819573aabcb72ecdc3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlPn1MIACgkQcaHudmEf86qAQACeJ+SBZoHqHzlR4Sh7stwY4isW
-5g8An0OIAax0uXcIxfXIqGkGJ0tSA5at
-=ucJy
+iQJ8BAEBCgBmBQJVdvH5XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiObIP/1Myf/gP8H+LM70dZaDK2Edh
+YLbGAvdmt9SKRSZCqiTIVz/+63NlUWPr4zcN8cZrd+V9FuRWcJNdeT0x2gUz4lcr
+JFTX2/ZOgqEVSYE9q/cMC7/iNgY4qChEspwxp8OVbDVF9Xcu7d7C6Fn0z+f4oD7+
+HgEi9HCjwGtsr0hJOpJv5UbFDl8doeHrLThgveBH6MiS8GXk9R6evH7aYfTqeZMc
+QkKFsnLyY3HAK6VcR45MABRp+Tydfr2ChRssXYV7dMTr//tGQ4Tm+Gs/NdgmJg7b
+s9dEc4Eu9t4HnARj3hNgF3Axbc26gHmpIdXDYK436/QncLV5qhP9O8oji3HRiDv8
+vLxqYufATkYyCi1/RGVwR3ERn76UOuR11EG4PBBEaADQtkYfJn9TmOk+rfOdS+6d
+9rdMh3joBsN1AxLWZEV0FPDaLF8C2Ixo7M/xkeQHRXI9Ngg54MkvkUKcAXb67h1V
+4/60oCBzDKKOLdjoEhoxWwmKEdWeXzmPz2EB8FndcflWWDbEqLZquNtwKxHZYRHt
+mWLJ4tIvB5wxbiMVtyv/TiRP46zeN+XChJoTlc/G1fbPeFo8ciR9hV6rDApMFF5R
+xAzP1kf0vcI4la/OUWzui+r39jujpE2aGl6swt/NwlGxqm1Zw6NrsjLCej+JcFJR
+tr9/cbgObPP49ZsK9/xO
+=EAL3
 -----END PGP SIGNATURE-----
diff --git a/dev-java/saxpath/metadata.xml b/dev-java/saxpath/metadata.xml
index 7303cef96964..e091065382f5 100644
--- a/dev-java/saxpath/metadata.xml
+++ b/dev-java/saxpath/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">saxpath</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/sblim-cim-client/ChangeLog b/dev-java/sblim-cim-client/ChangeLog
index c09aa975535b..db3c9e880928 100644
--- a/dev-java/sblim-cim-client/ChangeLog
+++ b/dev-java/sblim-cim-client/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/sblim-cim-client
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sblim-cim-client/ChangeLog,v 1.6 2014/10/31 16:39:12 ercpe Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sblim-cim-client/ChangeLog,v 1.7 2015/06/09 14:02:49 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
 *sblim-cim-client-2.2.1-r1 (31 Oct 2014)
 
diff --git a/dev-java/sblim-cim-client/Manifest b/dev-java/sblim-cim-client/Manifest
index 911a20ae0836..833563086dec 100644
--- a/dev-java/sblim-cim-client/Manifest
+++ b/dev-java/sblim-cim-client/Manifest
@@ -1,20 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 2.2.1-no-network-tests.patch 2189 SHA256 84ddf29cdab0b05c7c8ef78e8f73fc40355e8b3e4282b66decaf48cbb78a9c9b SHA512 bc3834d913d168c66a71d993d1673dfcac2c752860c08f74f13defd51cf73298675d357d503ae4af2064e158123e4f04b37ea4590bd16d859a91323112875160 WHIRLPOOL 0ce5218da7c9be58a156e7c9e0d42af21c037de5b043a26ed72e49e5edf433d1eb66c8e6cac8d906e8dbea8c8476afd47af42db190f949c8b35ac7a14d5464c3
 DIST sblim-cim-client2-2.2.1-src.zip 1082959 SHA256 ef1abcd69716f18ff54e588e35aa8d8f0a5da00acd77d8e0f56ce616bdc7f81b SHA512 b7e1f56b87fa24c97d8b3e97261195ff04ce13839e72f4b8824daa8b9854158ba10c0bddd16e0650197125510d68adf6f4458089d132278510e10bd2b25b4aa7 WHIRLPOOL 770958a98cf85dfedddf0766fbef0db6b5cbfefbceb97f66140c804a446ffc48fede4751cbfca06f710ec4a9f60bfde3477dd1e179504f0b15415a447ddc9c15
 EBUILD sblim-cim-client-2.2.1-r1.ebuild 1124 SHA256 fb5b3ddf2f5391087aae5080c6657586e360b1d32dc1c62ec695091d89f43f59 SHA512 e5f4b40f802f5e4a41df75e37c10624feb6f23dd20535b6d930717beceb134051488c4191e296d38cf677f91261a5364068dd002b186191e91682743066f8514 WHIRLPOOL 770e913a7952a20f578a1320b1f24f2de432105f212587b5b6823de2453aaf7e7e9001b33b38026cda30d0c1f1c62a1e4f4abada35c7dff6f327ef823e2c3838
 EBUILD sblim-cim-client-2.2.1.ebuild 1042 SHA256 5dc4e68e5133fa80cc23788831607a07403ed4c865ecf42704468c337dc8dc62 SHA512 dbe5028c39da12444d6306f8e43feeaf612070ee8fe802dfc549188a890b75c8aa8ae2f6081003e246e8cef7c7cb30ee456727d825f1318ff2ee9f6663bca599 WHIRLPOOL 4a7a265b318b30be188302954f9cceb6839b77a721fee91e660ba55f3bd1c5876ed343ded5188869881cbb5a4b8079ceb3b5b104f346917bcf82a8e530ee6315
-MISC ChangeLog 1418 SHA256 f58f6ad838f137806a6ddce3415cad72e0b55c9407e02cec75600a2ef94c8617 SHA512 7d91c9e36300363619149011caabd6ae94cdb23f0246ace6c5232def358366d428fc13eab206da23f7ab700d44faee1c24756ef2b90770ce3edc844544a07738 WHIRLPOOL b3bf8818d1b1f8a2be23baf9b0e3fbf78a838d34fa92189b65c98f19901eb5da3fbec54053a100dd2e1f948316085499141331db1fe34402f35bad44fefa202e
-MISC metadata.xml 452 SHA256 f10dbc872d51ae02e9448b0e0651ee02d4dce5108b3e92b0673da47ae6a56a66 SHA512 c4da179d309daca9ff03d63dc260ca9a64c1acda902ffff21413d6fa801be1466609f47bcdbec377598c48d332587933f233d03edca53a8db3eb626726bac173 WHIRLPOOL 3537a747ad2d7fa8593120b3fa0289ab9eb21ecce10e43314e01e67b98b895de161e3ee21f8ade347892b5b670d5e83db7333e46df4c9a0459c8dbef560d6d2d
+MISC ChangeLog 1516 SHA256 fe81844b239a50e4327ea1799bd4fbb47b5c2661555de81d50230faf52625e92 SHA512 9edf20001949318d76e526311602f8d30bd3ecbb5645b0426f0eb186e558a695771e5d15464a8742508f065c72b86f98b8e466f132cb7b892a5065dc25630cef WHIRLPOOL 6e7bd2eefbc72f43cf9a578ecffed2faed63da472176f097fa31a5f75c4528a4ce543d5393ee68b6bb00aed31b22c2ee7966cd6c672260f91c05503d17bbf5a0
+MISC metadata.xml 526 SHA256 dc03f663be55dd74df8ebff9f3616a5ecc25276b31605ffc44e7b6fa0d575f40 SHA512 4272144ae64cecd9c6e4bd59376abea651c63a8043b108e0224d99083448a0a56df79566377bf7b264a4e42cb68b1d418ac01ac3c2438d0902c6300aeda36141 WHIRLPOOL 8cd2151bcbe5135d3284a7519eb78c690a3af2c44ea92a4155d07d222e04dcb3cb5d9ad2efc825f124a795069140620a3a7b51e682eef6bb9c7413cfb6607293
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJUU7s2AAoJEKCEBkJ3xQHtpO0IAJGGEZ2zEh9TeXtjTgdxHE62
-TrWey3gcR+1S30OYrgUhTqJwkrXyaysIuyzQjtc08KD3IPoZl3PeYvXKKSfLSwoT
-wB0mtaTwMZoXp68uOuYpDxs4fcOegtN2YAuTjJSOqiOPESWmP4gXFJftVZc1uNgt
-8yamqNpbMAZf+hd8ZXKbh4hw/jIRjB05YCQ9+n62Lu31QXL3QW6BYUwHufocKkEQ
-ixGrTnXA7HXbJiTMXuE3BWS9rO2ISapr88llIEb+heIuNH/8ULv1RPxEGVo/3DS9
-0uZvzWDFhz81dtXERRLIUXIAbPc7OzoyJ3YGkqajR45X1AkmEax6OmFb7am5How=
-=uGvg
+iQJ8BAEBCgBmBQJVdvIKXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiJ2sQAL+ccCeNr/4b8eiA1p0R8Yvm
+k0mv6jZ/80eE/bjFeQrttAYh3bDHBKi7p6thxEp26c9mGhqTt68bPotDlSv2VW5l
+idyxa55h5lMKq3eoLO1RCIE5l4+tUjVlOaDPJ/4ArI0lAfybS0SEA+LUpDqX4Hb8
+FANmaYu7xkbwjKoxAuAboizXxLxRAqvAvD/x9N+xhPuOpm997LIxbj7tjzLgWy9v
+ukQR/D6IfRLzbaxaOhjP90qnmD/3ILpefTZbvvivItlM1TMA7V+jKCDTGVGrUe0X
+Jsmnof4eOYxNMgPotGNXeNl4m8Lsr57uyZEgdX6ErWirhBiXfuxvKCLgNaAyyE1F
+TCW/IjVPNxRQk8lM/UW3NFmPO7GM5UP2twniRDqCVrnxoFt8czGL4je5XtVntFsV
+fNE9ddoo+YCHhCwDyJ/i4eadBd7AxganVB3XeDJ2ERQ4xpxB8jOrQcQzCGl2Cmvn
+IflN4vHWts+BQmp3pYb4FNBdsow4tSq7HSGrjXhASMH/vKFtymfAgLt0vv72SeMo
+OCX+45aEhXum90Eitbf0VTxJ2ty8Yp+Qte7djbBS83Q7Jo1uZFWcvEOU+ARmMggK
+ppjlad0u9i0DSzbpBsW9vqww1pocym80bA6kPs3qnKyU3XZaTBSu23d4fuHnRFWi
+0DpP7SzfUMOBjxRpqYPX
+=2ane
 -----END PGP SIGNATURE-----
diff --git a/dev-java/sblim-cim-client/metadata.xml b/dev-java/sblim-cim-client/metadata.xml
index 6b293b884f58..48a24992662a 100644
--- a/dev-java/sblim-cim-client/metadata.xml
+++ b/dev-java/sblim-cim-client/metadata.xml
@@ -11,5 +11,7 @@
 		An implementation of a WBEM services client that includes an IETF RFC
 		2614 compliant SLP client for CIM service discovery.
 	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">sblim</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/dev-java/simplyhtml/ChangeLog b/dev-java/simplyhtml/ChangeLog
index a8ac73bd5382..d861d6f9f7b9 100644
--- a/dev-java/simplyhtml/ChangeLog
+++ b/dev-java/simplyhtml/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/simplyhtml
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/simplyhtml/ChangeLog,v 1.25 2014/08/10 20:23:38 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/simplyhtml/ChangeLog,v 1.26 2015/06/09 14:03:10 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> simplyhtml-0.13.1.ebuild:
   QA: drop trailing '.' from DESCRIPTION
diff --git a/dev-java/simplyhtml/Manifest b/dev-java/simplyhtml/Manifest
index 2156bd74e726..afc53d9a770a 100644
--- a/dev-java/simplyhtml/Manifest
+++ b/dev-java/simplyhtml/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST SimplyHTML_src_0_13_1.tar.gz 473258 SHA256 34ad16951e1165261e81f1a23ba6791e8391888749b19429d7f067e3ca1300dd SHA512 e37140ef7461f2c741f43ce14518e224cb41ddb42c4d396f8f934476a5fbbe4d121950dc3186ba1ae603068e81832a92240e99cd25d3778574c0d3f370d501ac WHIRLPOOL 3f29e95d3b5369507f5e769501b01084667125f1a4744f24275168cc417c1d7ab48f6f5e4ea9f1ef17c933a94d868b9de79562ae8bc6db72b16da0bb03474ea8
 EBUILD simplyhtml-0.13.1.ebuild 1323 SHA256 24aadd6d459b64d80dff412a50f301cd8d7f4b1311a94edf341660408c1161d2 SHA512 523c8b86e2320f5ab4d4229403941885fbede4503b7a2e50289c28f89504c5eb1b317b33e884f396ea1a3f2082df6d703877682baad9fa4e81051da1f6d0ea6e WHIRLPOOL bcf7b6b8f5988dc5f9f3ff3fb2458cb443f4a15cd6ac5db357c6b249791fee290006a062de45854a48266bb4a50278b2473a658041ead867dec9a850aea59186
-MISC ChangeLog 3210 SHA256 4027dfa11915901f51568179e1817c0981aa8e84f831db9119811ef91ad6cb8d SHA512 ee0196d7855c1f2b347fb10f1bd501bf6bb84ab72e4d962a8dfe6806e112f744042920eeb69b399b6bee34bb5d0a95861e982db6bbddfeb0b6f5d575d454d128 WHIRLPOOL 21fc401e5901a73aab9cc61f02b916c2085a5d29c7aba4e0171ed0098546b6fef0399dcbaff163147c4ff26a762a28163314abfefaae403b37c7334fab08aace
-MISC metadata.xml 157 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 SHA512 bbae663e26f48fdc5e272adc2b06c14f77f34c53caf84acb53908ff036e7c12a3edbbc0929d2db56bee861a453381d979c7e0983a23716f629ed2135c22ffece WHIRLPOOL 887e153e2481e7d76f0f1b67a395f10f0328b93930185ecdb8fcb5fe3c50f839086a18831d61cf45b34657aaffca6c3b7900cf3c04b712846a05027a84602448
+MISC ChangeLog 3307 SHA256 eed6f6074e00d45a8b6965b59cbb140edb556d9efbc1bc60cad912abd012d873 SHA512 1f766242ce16d913e6a8327713b4c132b06fec152abec0143a4bda9875b78cbe8adfefaba22e66304858339792af60bcebcb643cf968c6d96c5613bbf2dbea4e WHIRLPOOL 270bca9e07cd991b1afdaeefa24f8934f1aa91da731ba43d4ecd20ff61b853885e958cf3ecd7ef5641401b5c5c847f98231985776d21e85a8bdfb29cef6be2d5
+MISC metadata.xml 238 SHA256 df81ab611b24b77b680ffa0c9d11acc4e1f13e5310a5773d876e273a7df447aa SHA512 8b8f7f183e21a7c5a49e2907c1e972943919c6594971c98a56b6070d5a7a7a7fa4a3da332c314f4a65333a092eb913a8c4a450d67e9a4a150b23dbf0780f6cf7 WHIRLPOOL e4ea31df848a988a1233eb2e4cd4721e159bc342b89bb206620b05aa10d8bb3e297ff77e006864508c52f40c3d55628951d90063a9e8c7f4ada5afa4035fad5c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlPn1MoACgkQcaHudmEf86p2lgCfSk0dPK3xhkpQqt2fbR3zZvTQ
-trQAnj3zqS4mKm6D574GnUVwv8YKVnrj
-=fLtY
+iQJ8BAEBCgBmBQJVdvIfXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiybIP/3c6xdhhKwK7/WPGQD6rI+pk
+DHgnyxNjMwPhK6eTvyG81a5Mtga3e1rJw1rF/PHQR6n+ODV0At0nKiEik9OhUAj4
+zkJG1ofvEh9b7UTRECegEh+1lrOy7r7+7v5gldWQlxNfDtaps9V1MTqmjpWXu0Pb
+3pcHktzgxq6ShdCi3AzRaukiTwS5V1ENLwN6LEUlBdphE4FndcQpKv/4i6xJeC1/
+Ol8OcPYqeP0DS+irXhm/J8NURb2E7rgkQxzdO0S+VCF4nnh/3K8sGkVbQjKGkdH2
+GYaQDS1AC5WWTiLSI7+ZjZ21RKK6quq12wQLlL73B75m5Kb4Vy5exYfPPEuLTffE
+GGvoy5igICcYDgOWcdbQX9QpB9IVtHrIYt5JIKsJsAzZi53fSZAbcIXohHCtouCv
+59PgtV/GumpU7HwzZOFTm5ENwzY0Zbo+wT1xyPkCzUvu4OGi8IUb/osGmtrUQQW5
+7PVGcgJnIDOxQS72rmW8tzLK5BAIPq/FbJTKasgK10EVodHcHXQX7H/5jMdBHCq3
+E2miYpIC3p7Qoeoe0v18EuFazQ0Gkk7O1xp24U7Em0NFSmfHRPwG8hJba/OqXMbT
+7HwljSryoNqMEKDR8P/Z6eOl/Tx1m1YeNl+fuMOo2FCkRkeW7sASu6b0W2yhSezb
+34MyU/HE96o68bINgUyl
+=6opO
 -----END PGP SIGNATURE-----
diff --git a/dev-java/simplyhtml/metadata.xml b/dev-java/simplyhtml/metadata.xml
index 838c00a4a448..39c18d820a9d 100644
--- a/dev-java/simplyhtml/metadata.xml
+++ b/dev-java/simplyhtml/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">simplyhtml</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/spin/ChangeLog b/dev-java/spin/ChangeLog
index 49fc5191f896..1df611b89e7d 100644
--- a/dev-java/spin/ChangeLog
+++ b/dev-java/spin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/spin
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/spin/ChangeLog,v 1.20 2015/04/14 19:50:22 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/spin/ChangeLog,v 1.21 2015/06/09 14:03:29 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
 *spin-1.5-r1 (14 Apr 2015)
 
diff --git a/dev-java/spin/Manifest b/dev-java/spin/Manifest
index 032c4a6d07ef..23d04f3b421a 100644
--- a/dev-java/spin/Manifest
+++ b/dev-java/spin/Manifest
@@ -1,21 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 1.5-build.xml 8638 SHA256 3d12461c120fa893159383093dfe93386741a9b3df4446679215501fbe9b88df SHA512 8126661b264cac4a86dfbd646a8e88598075173479d1d952dcaa3c756793394bb50ff1bd5a57f4a4a86cad99d4b49cd5bd398ad608fb199a12adeecb64228583 WHIRLPOOL b47941c72060efce4564ca9227b4229f369fb4d45d43c9f996e2214265f9651b1325d627fcc566605071366dc6c0833590cc86537513ddc392053b52543d24c2
 AUX 1.5-maven-build.properties 673 SHA256 786fa052cb592effe0fa867f8c670665bee7b6770d6e07a8183aa82f1fd599aa SHA512 1004515f5a89a2d22409cd7553fb11767a4580d1288393516f4dc3c0efa0c149d7bc3e46fac93800e6481fc7885302730e52e9e518d6d7224a0d9220d0f3c3a2 WHIRLPOOL 18963767a383a147b3dd054e0da85a15c54d4ce828b481ee83a85ee15e4fab25f1ba16b8115affb09a89951ef077706c24f90ebd0de3d537441988c67708d979
 DIST spin-1.5-all.zip 482286 SHA256 5515bb6b6724c856e94271bc3bd11fcc0170cf37835bf5fd93026b98c6bf3594 SHA512 ce1fad3b138781359d472727b186722d6f1f23b7002dd1ada294efd80b3a9caf5de15207cdd682fcbfcafa85c63895c7dd9683fefb5ce5b09cc4115ae3733466 WHIRLPOOL f5e598f01d923cdc202e776fddcefe34abb1a312b5ec9ba68f3745431faf89fb58d9ee233b62225bd1a549ec0829a13bea126e8a3802ec78a72f9dc6ef01eb88
 EBUILD spin-1.5-r1.ebuild 1124 SHA256 5699818e84a52abb62b19cf6703cf0088e3d59c433a5b6d40da943256010727f SHA512 48947128d1d5e003dbb0b5ebf60f2f7d94d89dada706cb93493f943656853254a4b30d135a671dcb221edb89cb512e5bcc7d6067bdabda488094acabab6a5d32 WHIRLPOOL 3a1974162ed0a54d4fb475b439b192f338e073f9bfe39c8912f8a104ea111529366e837fb6786894d1fe2d4c9e3aa4f724d4e6950e5215d91341cd73b750853d
 EBUILD spin-1.5.ebuild 1118 SHA256 65cc3fd07446c2333ea9eac10082b80b39e8d44cb1ab8dacb9ac800293cf22be SHA512 4366c0f6a6895aca534d60db5f6bb068ee92a5dfabb5549c7cf8420db0aa1d97ffcba38b0cae834a7e33111fa853d5e16558603b3af706af84a80e567ab8a3f6 WHIRLPOOL be1ca10a7b2a87d13ded53bf002062e80d9627d09cc3d7741a3d3882e5d5d3f9ab746ab1a45f0d182ad8904a85fa92a39790aa40262ac48851078a27619d6390
-MISC ChangeLog 2562 SHA256 0ce0a7756676fbacb60d0aa7934daf7138caa51a4f054662dd8c8b1cdcc08f46 SHA512 cbd998cb247eb8726f2f473d3725162f0259034959317938f42ef083cd456ebbd84f6c290e49d31589f743bc2d6b6ed2c6becb20aa8abc1e2f07c8d5d5df48e6 WHIRLPOOL eedaea3ace45412541822974e53cf53ddff17b84c5a6350d633024c1ac0c55792c69217c966579b53fa24e0782a3f6d876295716e52b73c80fa367fd45b8536b
-MISC metadata.xml 157 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 SHA512 bbae663e26f48fdc5e272adc2b06c14f77f34c53caf84acb53908ff036e7c12a3edbbc0929d2db56bee861a453381d979c7e0983a23716f629ed2135c22ffece WHIRLPOOL 887e153e2481e7d76f0f1b67a395f10f0328b93930185ecdb8fcb5fe3c50f839086a18831d61cf45b34657aaffca6c3b7900cf3c04b712846a05027a84602448
+MISC ChangeLog 2656 SHA256 477d7747fe2e6c7389305f151320f34ef375a14820c1c884896266f593e0073e SHA512 801ea2c1f0beedcc977589f6115bffb72340b15752a5ce40a89917bcce384fd4c38d5bdc08896607435ce4abb09a75134cea3c871443ff74304a068ed602c704 WHIRLPOOL c30bb4ed6c69211da452af63e0aac290a903ea7e9a09da2f3daf47ce1844471f623fb0925fed19869a078c3452c94b0382e3288aa6de208d9a8cb4298a742f00
+MISC metadata.xml 232 SHA256 3842e9d1d0f702aed57b82ab72bde0dd9c7250e5e32524dcd7d4891a1632ff2a SHA512 261de7095dd63483a3dfdc0ed4e2571c53cd3beb844bd4e0e27990a718128393f29302c2f6516b0de01397b335fff8a334497acb7803d5edd87acdd88f62cf78 WHIRLPOOL 72e4d43324dd88fe6bcd7281e727903e26606722b3cffca2b7cb5a63ecadc203d1f6ef142d6df40b3a9cb22bbfdcf8f8419c67e3f042c78c1d2e533dbc317045
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJVLW+uAAoJEJGRpfGTSRu4IeEH/2GyBKkmls21w2S0J8W3NC6T
-QyKXaOuLIpXFtY2sR2hhtWY35kzrWdCLYc38R5qvsM4m5o8QksFkIF3EeRTHKa/7
-D25iWuBvuDnyVgZCXlzU96YeshTSckM6BddVLPAuBuJkBX/X/vgRR2I05HMjY5O9
-Keaol5xApABX0kMPjUHrWlIC13FgPYTnYOF8Kbd9X4Q6Tz+n9MbqA91FnNqA3cx2
-dqsgiqaL9+cEateGq246O4VoPrpzZO1VOyBHQSCIe0IXGOzSP1tFlpmzhKVZNEiW
-LSdHMNLMSKWe96UCFiig2PmWg3OHkvQJXyOet1D1pbS5FmmV6SVM8mE06i2H3Ps=
-=UvYh
+iQJ8BAEBCgBmBQJVdvIyXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiaMoP/30ZN3hmcOG2qILiI1muOKGH
+hq+rwGaX/HaoPfc/eZGoRe4sff+NHLWbWo6239HjiMNrerpEcx7HZiJg3hTT/EXV
+472P9eH1EQ3rEMN1Ys8NaHbDvyRun8ZnFCPUdpxjB4nnhZ2/PKmAwtFOl5WbfrBt
+gju69KIBCorIO6MoOA+Iqmb0phAZDtTa6x7TjJKCXs47LzYdatf8dYJ+NAd5JV+7
+I/1++3/UclMwsKJUVzWaWfspoOzIKVPYR0jpKWrSaPLBSC3gKvhNCsHhcDXv1C+E
+O14u2KsCZuMs3nZFHLq/1RQUUqeTpBJKwQbvPbSHvNMe9sIVK5usTTH7VHWQGq7B
+0HdcbjwMPJ1ML2OAWcNdyVrwJGiqiZOe6Rrbf5foa85KQ37dsRCq1kqW4/JvI2/i
+l7Q4RSkkBvudWbLWNleSBzE64kll3lo40layZJY7kBUyNENGK1YtHhOAGSSPAioO
+qXJIuqHtvGkQjINS0RLr9WtiqRr0dqlNGWYDcItn+P/SGBcl2YYroIMj/YqzrUtg
+6mG4SxftOhqwF6jLbYxgEBycafM67+xplnRQwWn6EZRUZH7AilE+pWQwSOdbBbcR
+aED9VQSlQNPLRtHD4BBuTzq0xnhcfey08TRg0pX7yrIPn5BTSnUG9TX4K7eEf+oR
+CbGnpRKzAgPdW+veJGe0
+=O1e6
 -----END PGP SIGNATURE-----
diff --git a/dev-java/spin/metadata.xml b/dev-java/spin/metadata.xml
index 838c00a4a448..a15327b8ef8a 100644
--- a/dev-java/spin/metadata.xml
+++ b/dev-java/spin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">spin</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/squareness-jlf/ChangeLog b/dev-java/squareness-jlf/ChangeLog
index ae84b5d1b533..72b84829cbc0 100644
--- a/dev-java/squareness-jlf/ChangeLog
+++ b/dev-java/squareness-jlf/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/squareness-jlf
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/squareness-jlf/ChangeLog,v 1.3 2014/03/08 16:37:36 tomwij Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/squareness-jlf/ChangeLog,v 1.4 2015/06/09 14:03:41 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
 *squareness-jlf-2.3.0-r1 (08 Mar 2014)
 
diff --git a/dev-java/squareness-jlf/Manifest b/dev-java/squareness-jlf/Manifest
index 119075cf2bd7..513f8c4689d2 100644
--- a/dev-java/squareness-jlf/Manifest
+++ b/dev-java/squareness-jlf/Manifest
@@ -1,19 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX build.xml 455 SHA256 dc5483ebd4fe58dec0e20cdc1a90449b7acbafe8cba8a256882ad4c599db7403 SHA512 af90575487cc91fb601e537c9e85af8d500a0f27321997af10c6f5182e95e029f954b85a29d03d18553bded6cb9bc5d505e31ffc51dc88c89f0db1b1fe95cfcb WHIRLPOOL 4992cb240f63060fc79007f141081391a38101cb6eee2ee3abeafa659fa3613b68b04ba1918ae337971fa5b12469a1691484e58269137ae8b273981111c62836
 DIST squareness_jlf_src-2.3.0.zip 67307 SHA256 a7439f1343f5f13ff3a6709728f2d2ae112097f5da6b858e7b2a4417fd530c57 SHA512 9c3d1de6f682968b2e2db37afdaa571f53857897415df04489ecac1c545ddc0a8342df94c658797979a6024e6e69bbc9a8828029ec428248848c933c9f901a71 WHIRLPOOL 883d3cb71dbd24b22ed2ad2d1b0e9bce468dd8f7ddadc5593590bf69e8680821ef2824d8775577f2c03bd86fa46a9a43cb4ff50d5402d80977737dc7471877f2
 EBUILD squareness-jlf-2.3.0-r1.ebuild 860 SHA256 4673b36347dd5dced7fe82bd31718b5604b74f946c95e0a392ce76a4b01ee6b8 SHA512 ab55c7459f91147b034e23c752380dbe522279b30c7291f528c31a07bc4bba20df96a443ce66486be79fc0bfc5ed8a33099a1360f3bd370a528d82179967877d WHIRLPOOL 0a0311585815e1cdb4965163f5ffd373a3d89f35ae818700677d2c394f97cf809003a65bc8b344763908ff7f4b80501e9387812359745468f589fe9aa6570866
-MISC ChangeLog 687 SHA256 f6c9659755c0b7e675e0fe0d3e92199c8f1f569821c75a3ee89321a2dade3c08 SHA512 f8177e06f73cbd6739f2c7eb7497bedc89b95493b4ead87af54376267b7dfd21541ec919416cd3e6d6cfd78c2474c111a1ab6a95e87e7cca3a678b91ebe8edb3 WHIRLPOOL 04a4e772910202d5095161a50e67d1407315d66ddd6632b4c2ec6ad5b2f28a26951774bf8906313b0465eda52b793b85287868dae1e8c8a22725bb053e328723
-MISC metadata.xml 216 SHA256 94b55a2ec67c524728d32249d59a6a1545fd37d61c83259b5f05163ca47e87e1 SHA512 5ec0a0ccc6c58e6d2e2a8bbfa582c362bc0bbca43c134252bf1987bd2d616e41351604e4c569c519e53b99ca1c32a1e405a4071e75433ff8cf9e31dcc68db32e WHIRLPOOL 94bb953638b83f99143472f4161ca3f83f59db7f8d96ec8f15164378725f4daa9f9281db953aedb4d0f667c7d8ec73d1d6b07f2e3b5348938c7c4503cd6fb986
+MISC ChangeLog 784 SHA256 4546e76e620cc36dc64afa6a07ad60fafef885c83884b82efa7456eead91549f SHA512 37fd006e216441ae84b3c8d9df3264c45b7f9347006b891e312ab4488c7f1a9ebfe4f9cf7c144a32d31b5e19b92066096f16b92390135d60ff8f70e0d06162f5 WHIRLPOOL 617a05599650d2cabe873c6fca8e28e130dd3d01a30d4e4f4a3c1c1aaf96c3dde19109fabccf0488c3986cbb414bc3c1a52b71239810883b4474eb85820e4326
+MISC metadata.xml 300 SHA256 b126b339c30c6a51f04c63d5424b62559555b62b6a01649258eb85cedb67815c SHA512 7b4bdcb7251a22a7ffde9f26b97e2c7c52a0553f989211b5ad4889f195c24ed48f2172aa1fe922956b1261d5221d4d4a96339d28fdd8062d200b1f223b03606d WHIRLPOOL 5b9bc6526c3aec4f641177c65b1d7b9851285ff86e7687bbe6284e6a89c26703a2a2d727e7e02b8d555b3619e61f5c930127133b10792a0fefcbd6b5b4b5642c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJTG0cwAAoJEJWyH81tNOV9EO4IAKUhTEO3DZ34yogykjOdHyyf
-pyxBigrMQAU/df7+bKuXdkjvhdRoFRGGEenSLoWQcAej75g4J74wbUpXKiXDNSky
-ilJsCGqsbiZhXvavUlbvri9ivzN9HWmR8PEO+6Xw6Wh1cINNMJU9lozoln4dfZNC
-CnpAwl/JMfPWd2nM8pctQlaWZvgN5oVpZif+FLaDkvi5LP39V3oneCJ5ZHDjI7ie
-BxBY7YsrRz3xphM2QYWwG9eVqwst/4M6oVl4Vffu/r5txscVvOHMHc9UkVSKikwB
-iYa/NGL3DGFxAuE47M6F+vV2JrTxW1HkOk8mqmE59NjftdTysVT7rRnrE3lx7tc=
-=tDGi
+iQJ8BAEBCgBmBQJVdvI+XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiKigP/3+v1UTyiuPlPiBEpDaO3d5F
+wP/BZxtmS4IjjBvv5AC9VoKjVh5esR4xb8KMzoXD91/eWEMPM5wD7ZnjTRA2GQ7+
+MoMkWWgc/L3HfmcoO8aGMQBtkhmgoj9Up/yvPOkmqyerVKwHK2f82JMaZWpz0yTX
+WwjOtI1D2hXeWslF4GVVKZ735tCsTwRopIb1SyLtada0cZY6Rkt4ELNAlfcwkB1U
+OjhQiDQf/4vpTJ6VSadu3pP0jy0B4YmKeWj6PS7jMH4XASa/t021hi39RGZn+b4t
+nF+R8Qhl3/0/ux+YtpjS0X9vbDZN+LTBEa0eDlU5NjeQLpQ87GkXBQSU0By/s17+
+e5+k9ZdS51nFwzNeH0Zj8zH8qj/Y5F+mEXtelQcOS6sAd2z1x00NwJLAKPRTcG6i
+0F5NlbGCyZiKtawMAznSvLDsvrMrukOE9Ie69HWuVubTphWMnVuLDEbrm34TKKb0
+TEIlGs1ur5CSYjjXfMQsP8lKr+8W/cQWzIMPAz5Mq17avL3F1yvkj7q+w50jBn/n
+Uau1Ni+Nr5q8iYaRkQjj19XcMLKH0AW35PvY+h/nUalLfvqMnAYekVQBi27nsxEV
+PfX7ywjLQ13WLs7GJ5cQ0loOkCKhRShKZkzc2VAiuWhdH1vBuQ8giMRGMAj0l0cy
+9bM3XQglhQ2EkIZjJyB+
+=AVMM
 -----END PGP SIGNATURE-----
diff --git a/dev-java/squareness-jlf/metadata.xml b/dev-java/squareness-jlf/metadata.xml
index a2ac2e03bfbd..4fb9ade43357 100644
--- a/dev-java/squareness-jlf/metadata.xml
+++ b/dev-java/squareness-jlf/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
-<maintainer>
-	<email>java@gentoo.org</email>
-</maintainer>
+	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">squareness</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/telnetd/ChangeLog b/dev-java/telnetd/ChangeLog
index 696c647ba10d..7240c1f828b8 100644
--- a/dev-java/telnetd/ChangeLog
+++ b/dev-java/telnetd/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/telnetd
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/telnetd/ChangeLog,v 1.22 2009/11/07 18:26:53 caster Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/telnetd/ChangeLog,v 1.23 2015/06/09 14:03:58 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   07 Nov 2009; Vlastimil Babka <caster@gentoo.org> -telnetd-1.0-r2.ebuild:
   Remove old.
@@ -84,4 +87,3 @@
   +telnetd-1.0.ebuild:
   Initial Import. Closes #59117
   Thanks to Dag Viggo Lokøen <dag.viggo@lokoen.org> for the initial ebuild.
-
diff --git a/dev-java/telnetd/Manifest b/dev-java/telnetd/Manifest
index 3098df13ab5c..6d82f01886b8 100644
--- a/dev-java/telnetd/Manifest
+++ b/dev-java/telnetd/Manifest
@@ -1,4 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST telnetd-2.0.tar.gz 421949 SHA256 40cbf93b4fedb3cbc182ec8379b0ca59862a74a33400943cddff7874707330c0 SHA512 1d25d624b2f8308bee0b3fa9f2aefb1cbbf5abfa415e857ac1ed5d958c218592dc63b322afe76c50afa4b361f85903c1c469a145503bff2bde51783a45f3664f WHIRLPOOL 40710ad224229de583266e642df03f2afb94bf555c7c0b24621e9c04f22dfb7b9b82cf71c5c992b20983d2aaed12a9272dc84eebe29ddced09302e553aef69ed
 EBUILD telnetd-2.0.ebuild 907 SHA256 cc9aa787bc8fec1999a8c3b798e5234b91d0c5c3da1db5f46d2b60ede22b451d SHA512 756a6450647216fe4bb378d8fc21bb425245c522908450f640797ce4e855554105764d23b72ca1b4376fa2f801cf8e007740c6d1053caf3ac0e19884f26b5404 WHIRLPOOL f614cc4fb88b839d9d62b30def3d65db54d5a8bc90408a279402ce3c48d9f3f8d0d492ce00c64dd946e1fcb50e0fe93c795e3609164b30a27a582a25ad385fc7
-MISC ChangeLog 2831 SHA256 8f542157edcffd42aaf13fe02859c18fce8a17e3b697ec842ca85d0d3d04783c SHA512 ef34d14eacdc0c4d2a866860745db3e9ce1b5410a8f2fa0c87daf7688e9d7146a0f7fb95fea0fe5ac5e41a220a632180c75940b3baa53c41993f67a497dec03e WHIRLPOOL bf9241d34f329390319477209cfe978956b4c568d03e231231c6d1c441abf10a07edf58c1caaa4d9821772ecda7688ba5d09c7a2ace56e8ca7d2d03a5793e074
-MISC metadata.xml 157 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 SHA512 bbae663e26f48fdc5e272adc2b06c14f77f34c53caf84acb53908ff036e7c12a3edbbc0929d2db56bee861a453381d979c7e0983a23716f629ed2135c22ffece WHIRLPOOL 887e153e2481e7d76f0f1b67a395f10f0328b93930185ecdb8fcb5fe3c50f839086a18831d61cf45b34657aaffca6c3b7900cf3c04b712846a05027a84602448
+MISC ChangeLog 2927 SHA256 bf5d67dd0b880ec47f399d20051e123c0580bdff03b73c999ff1a15ff101a29d SHA512 23fc90df2ce5e8f96345de392a0323a7092ef3cc3a5692867fef0db91c7a478c5dd835e59540d87ffa30747b48298fe82a93d06985b75d3450ab5def2240f22e WHIRLPOOL 58419ae550cde14a3a503bac385d2075bef91748b686641b5e7b67f06834ee38322d708139c0418c616bfdca096f35609dca43fbf8805c206af58847b1be8acf
+MISC metadata.xml 235 SHA256 bdb3083e814b4c0fcb52406149fd47ff009c0c825f156ad945129ab7afc9860a SHA512 1994db3a235962a0ab99666e8cb877dcc21dfeaa0e9e54a290fc60460569823dd1eb1c1c4cb9d18717629b758b6a7915643c355db994c3fde1ce1c1a1208303c WHIRLPOOL d9916d0a6efd1abf7c8dd38694e5b60a83204eed1d32680dbc91588ece5a26ab9d422635685d7bc731a9098de7a618d1d643df13341cdd393b3511a7eb8eb42e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVdvJPXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmieysP/jCMGITLPj+qaDu0hMrFhAS7
+WDouvREstdod2j2i9botOPlOud52k0djHvDsBlr6AITvLVIvGiwmtbe6kw7BkK20
+lbgeRB+d9ralI5JA6KdvcAD9dhRxV+qzvHAHQIBfGPLy6FNxvmqCmKq2TIWxKAcT
+D8wl+EBArPN3sP9OFmSTfZvlsbOzsCwVxsJV7/iItDc0MEVq6FVcSoKgoQBHffsG
+2KAfLNJ2gf3eHxsMIkYrW8UBR7P8MxjvJh4LB9tIgKr464QR4qVd5z8VwED74Fyt
+CtpOCif1aUDRl7NE/Orx8hjGaPdjWIATxtbgfcNNdVzUBd5DOQDne3g2gXdKGKrO
+/32qzej1omgtfMUQ1m15r2h6q3oeWuAhtEUVDuvp+ZLFWxe8BE+riDMCY/CeS2p1
+8XpUT7KyZbPZFZLEdI4ltOhRFbyAvhy0KfhOzxU9u+mF8k9iC4ApGw9WpZ/ZHJaO
+LXm73WDHZS3Xr7n9fCNNYRm/w8fNNtWkOrAv2C+3kxL6GllKt/sq+n09+qePvc+y
+zA1WncjbsUyQBdmRusbq+sj4NnIowPjvYnaSEp8/2MkGrjLngNTqcCU3Kv2A65C6
+8AOVDpQOsrYjoSEYkjytn18sA/Qto34qgS5xXCnCU9S7DNGd11w4v7GuGUywCF6v
+HX+S1gGEbiIDPu5bKBFJ
+=WD6z
+-----END PGP SIGNATURE-----
diff --git a/dev-java/telnetd/metadata.xml b/dev-java/telnetd/metadata.xml
index 838c00a4a448..84d9df72e3b3 100644
--- a/dev-java/telnetd/metadata.xml
+++ b/dev-java/telnetd/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">telnetd</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/touchgraph-graphlayout/ChangeLog b/dev-java/touchgraph-graphlayout/ChangeLog
index debadaccd4ea..c4575bd96a1d 100644
--- a/dev-java/touchgraph-graphlayout/ChangeLog
+++ b/dev-java/touchgraph-graphlayout/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/touchgraph-graphlayout
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/touchgraph-graphlayout/ChangeLog,v 1.5 2011/01/23 17:02:41 xarthisius Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/touchgraph-graphlayout/ChangeLog,v 1.6 2015/06/09 14:04:16 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   23 Jan 2011; Kacper Kowalik <xarthisius@gentoo.org>
   touchgraph-graphlayout-1.22.ebuild:
@@ -26,4 +29,3 @@
 
   22 Jan 2009; Alistair Bush <ali_bush@gentoo.org> ChangeLog:
   Add ChangeLog for QA.
-
diff --git a/dev-java/touchgraph-graphlayout/Manifest b/dev-java/touchgraph-graphlayout/Manifest
index 0d0924e1a055..a4d8c18a4b6d 100644
--- a/dev-java/touchgraph-graphlayout/Manifest
+++ b/dev-java/touchgraph-graphlayout/Manifest
@@ -1,4 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST TGGL_122_jre11.zip 202777 SHA256 52651209d131f6c012a4a5735271a8f9e572d8fbbece44b643680d725da9c853 SHA512 5c638972264ada2cb91ea1667c0b770629120a01496f7834ef3e4999ad5867ff911e772ea1361e33c168d8681c6f19f46ada33ea637daf4474f66a5cc97610a5 WHIRLPOOL 89180950669d0840af937e983b56a06e58eae6105e70cfb58ae9f11e18efa18981d1e40226536612b25031dfa2c44f65b30dfee8f30083bb2226b59aed4f3957
 EBUILD touchgraph-graphlayout-1.22.ebuild 914 SHA256 e9010a4a0c89f41aa9c6ff88b916f6f8d00d39da7e34470ffa8b1dc902bbb931 SHA512 6cde191b8f8e89e1c0a574e15dcf5b339d8ab4b85984fb519e11c90b1c1bedcac2cc5a3c19d7de2e273e83b71cc216143fe23ee268cdf26596f920d00f0c0fc2 WHIRLPOOL b417a8d32a3a2ae869abd12cccd72741dee88d8bcb67a8cf247c9b823dd8efe4e619a6e28bb7d27eae700cfad731b34b7b9ac823d3490d9ea05678b84d79cdad
-MISC ChangeLog 1018 SHA256 617a3a35934b99c06cbd6b3e627dc80b69297f10f25b1a25bcf2a369cec83809 SHA512 bf2fc7425556edc15033bdac3a35f7b2a7a3a51e11ccd83b99f55b928d69af279fc50adbcbce51ad70729dd180abd99e7209b26310850734ac69ecf046036168 WHIRLPOOL d4721d2ed85a6f43644e6699bdbb44db802288cbd213dbdcfc327a0c75e5a96217012013af15cd5a307c22581cce305b6e9ce844f981acd31bb47ae3ee27e162
-MISC metadata.xml 159 SHA256 1c070a909e96d9d193f84ad9304d196febbe33b60a724cc4b0d20634bb82255b SHA512 269cf19c37f2d136b926f546ec83ffdbc1374b2b6e26f8a31f21854143380386c31bfc7b2a0b9c47fb1f7c02607ddbdd43e517cb5c3270515e465c4dd7788843 WHIRLPOOL afb402fec04cddb3184b69eb8a8d36b404edd2870fd06c8f5e99be39c341ea6fa7542e0b680fac05529522ed33838e8279381d7a6de9dbc58fe55841229d8a51
+MISC ChangeLog 1110 SHA256 6de51164dcdf9b55fb54a0e90f5ca554f24c1e0c5146c2e853d1c8bec8f53ee2 SHA512 eca8173f7c657ca75523a008aa433a62eda76ed6d927b56ac4cc337327415072ab3139a75161270a24f1b8180953b7370b6b4e27a74c3166298325ed5911751a WHIRLPOOL e2af38bb1a0c432ef5896ab30dd9f823e97e6f5d22c2b675640ad7582a208eb71e6ef1bc82564155da154911fa4945e8b28278692219b0e5ce3de4137e011a51
+MISC metadata.xml 238 SHA256 ba49faf0b9440809f772e37fb4e215995dc28681028e546f60fec3e7060df0cb SHA512 f5f4e57b4a52b1b93a9d071ea5a6e21362a6375b6e9370c92704fcca7edef36b04458b541fb420b24f079e092e12e7cc82cd7bf3bf7ec22b83c49b737d08737d WHIRLPOOL ae3672bb7fe754f566144288110d3317dd1fe4f76bfdc4c1770a6df81ffd5ced5ca2802430fb12893d48572a39b1122e8a6941dd93559d90f8ae924361df603b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVdvJhXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiZ+IQAJzmPDELNH/tFGiv1gs9kQKA
+3vW1SZEYaezsofGi+0g7See98s/hjLM1iPS+pqlvMZAXcAQXR1YNQET4l2Yzlf/I
+ITYY9dG4HStj8VTLynqPZuTrnRHWLo3XfX8lx1hnrBmkNZEIRNLPZOhK5VfJwn8i
+/iwJ3HDQ1lBrYnNtEat/TLS2tK6E6QjIrGA7nqIKnDJK3BUCEjfH40vf7KydPU8n
+Wi5SoKWtGjaOFbgko8tVua3tMRVLoH4aNI4S0OIFHIGe2ItJfIrSr9Q2EhCdZbtd
+N5R3UbETczjyUBFoYJpb/f5BnTHOAhSK+w02b7u1zi6O7PhCVdTR1xb3c8lpVgMN
+hHdvOPCOWb9hqt6khGNQ6KT7h4oc6j2TWfc8x0N6z6v0cbdqhuDPvsmQZqNPYEa5
+O59l65bxvqFvSr0Igh5JKQ7HpmWFphyjIRq55MsJtSsTzwxW5cwP2L7jQ5Zm1FcS
+YDgbkNZ7QbPvnkxrmv3nsmu4XEDADC5/H14IPo/Gp3d+9Mo3LKfdE5PSyj558jnz
+ORUrw25/+10SqCIhPyXcjVqieihDjetdEbNNdJxLjhct20EeVQfk7furMr6kOj4m
+bh8eAYRsecIp91qZ7SXqE11NBlbmJZZG2jBUfK3CM3aaHrudoeCS5ODnWhPS8NBJ
+4trobZRkF4IlGpWQzIby
+=0Lei
+-----END PGP SIGNATURE-----
diff --git a/dev-java/touchgraph-graphlayout/metadata.xml b/dev-java/touchgraph-graphlayout/metadata.xml
index 604e0a4238bb..ef50d3af37e1 100644
--- a/dev-java/touchgraph-graphlayout/metadata.xml
+++ b/dev-java/touchgraph-graphlayout/metadata.xml
@@ -2,5 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">touchgraph</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/dev-java/trove/ChangeLog b/dev-java/trove/ChangeLog
index ffb3143627cc..1371d3bf33a3 100644
--- a/dev-java/trove/ChangeLog
+++ b/dev-java/trove/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/trove
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/trove/ChangeLog,v 1.24 2014/08/10 20:25:54 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/trove/ChangeLog,v 1.25 2015/06/09 14:04:35 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> trove-2.1.0.ebuild,
   trove-3.0.2.ebuild:
diff --git a/dev-java/trove/Manifest b/dev-java/trove/Manifest
index d3e7b1b87a21..d45aae09df74 100644
--- a/dev-java/trove/Manifest
+++ b/dev-java/trove/Manifest
@@ -1,16 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST trove-2.1.0.tar.gz 2438529 SHA256 a5929e1f93aee0c6c71df0476675875b172e797f0657bf5129cac60e047e6b6e SHA512 a0c3d71fa5bade59efcca7a65cacb90138a48d4346886a7a6e0c30f2736ef91afd532484efa73cb5b788449391433810bf6d51acac35bf28a4ceca9787d13429 WHIRLPOOL c38ea897666ee9d85302c569f506f17e2fbfe07481f3f2062c7c2c30dc02401c99e6b80312cc557cbfce4a9bf017e7a403a46dc5499b6685ecffd805bdea6ee6
 DIST trove-3.0.2.tar.gz 5880161 SHA256 24dc843223a8b547c4408e511b819552deeda81cf7d2c66409ef615ee29f2071 SHA512 27460a66bad6f206eaeae02453c94333456db5a9c566246d495fb4184d42de6033b66d1bf74060f799cf4298d531afeb9597b92da4e2963b43dd4ef072ee750b WHIRLPOOL c89ab0bf9702c7e8e8ba58605c033666cab4fdaec175788ec6c2b2219ac5722039991ce730d54ca369735934b03ede414f7f0db770aa625df3b989e75e3ddb8d
 EBUILD trove-2.1.0.ebuild 878 SHA256 fc84222cb17da8878bee999cfbb2eab46ed2a7b5142b637f70e165a6dd6632b2 SHA512 6dde24cdee2b688cf0a404bb8791258473f374d61647f6063c5b4a435528c754db03ba986fa6a8f4e1f7475599f8454918bc0315bcfdd515c395430c3b61d52c WHIRLPOOL 32a23d7b8f3d1049f9d2c066719815bf7509b139684dd409d90ffd8ce05125e34d8073ea39177b58d2e0484ed8c0b0555b9d9f102f687bfa584d31bf76956acb
 EBUILD trove-3.0.2.ebuild 870 SHA256 94f1f7632ea57ca979a7da8114cd4d85b76a31b30c48ee6acc83761b878e47d8 SHA512 62f5c1b269e38a8e3043cffe7ac881e7fcbe1689b051d58e79ace3a541fd73e8126333c4d20a463ad0f787ae1b915a9f22396e1e231d4466cfb28563db956f87 WHIRLPOOL 34e60e774dd85f8007abd8ba03da1ed71132f08640399cc27293bafd62fee054f2f647c981f68bd6ec450913210ba4a67c6061c411e31ac0f8b7e103355cf049
-MISC ChangeLog 3074 SHA256 640f8034a8ec31f7de2775adf2c1d9b9f7032c34585ae5743daebc20fe4d5072 SHA512 c44aac17fa8a103763c17ef00baddc15c1da550df8000a7c70a305aa3abc08d217643607cf27c971a817122967fbb3f8ffb26fb97944ec45c15ffe9931a20764 WHIRLPOOL 0145762a488604e8628cfeafc9ce618ecee6c516df85776cac0c4e62f9da675745b673d75adf84048a4d3d9a41003189b97ac401d813360bdfb1b81bf00b9ada
-MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
+MISC ChangeLog 3171 SHA256 7248b334e13a0233b057c8d36233c47d284798eb335f4519ca0e451f59216ccd SHA512 c659089ccccf911fd0f157d5455422d0da9fb0fd53773f3f0ac0e185c33998b95c15edee3dda085a0dd2850f7a0de460d244aa25244c5bbc460e63296daeee8e WHIRLPOOL 9527367ecba3a2f5c044d812f7053281631dbde7392725b7bacdef4fc862808c8b933b097b8ef439408bf3b7a5d994ea08c426c3e5408571b4b4c146f54b304b
+MISC metadata.xml 235 SHA256 a4c1811de5201f069bfa662d8cfab4997d5670c1cbdb97d39549f32c7b100d32 SHA512 712467d5d3fe5031d21dbef4b6d3e316ff9cafe3cc01b9181c31b8a1024672731e52238aca90e9b3771bc481749fe1e06cae09d4cfd434126a177d543f82a268 WHIRLPOOL fe7a6b48ee090ce9c2e3957f2a9bb26552b4d818e6aecc471f524b5b4ea0f3d2472c84777f4f30c4e1a11951a96f598cb72b9a1ccfb2e160e89e32d549116974
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlPn1VMACgkQcaHudmEf86p+9QCfRHjtlzqO3QYgA+6YfzPgTDMg
-lL0AnRKq2giBHMArF2mBC7oB/3E/+vXM
-=y+rn
+iQJ8BAEBCgBmBQJVdvJ0XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiZDYP/0PdJ71JCbY5owtVs+INKKSY
+7z3FkPG8cuT9e4tnyvObyG3uJti2DKDIpzuN9tkxtEHFyS4XynXkyFnuycsQsSMk
+NYJvBW7lVxZ2RdZ61icysN44sGbwStR/HTUzrabWa/AdzJYuOl5QdeRDAoKqfPw7
+xPbwkQLDZ/aBXFhUP1SUBOAYCz4Zeos/Yok3xcKE4ImxnU077Bo49FoaqRb+o+iB
+9zq//tvLo7wPUUYNxcrpwv+r0/QXstEevUKVzSum1gmAarkwNc7NVbRU08LlejSJ
+tXicke31weIrW4+oO7cl4pL31P0TBte08hQTEwO9WzZ7RZdpdwqwoAAc2UXwm2J7
+nnRE6gWSw7XftzUv3uFN5AFXiqN8yyuSPpbCr7so9+vohVP8Eg77NNHABg7Xc5eO
+zxydda0KmokNsAVaxJxCcmiPW8kATZLi4Jt5wfHvUjgiHDs35aWtde7ofphQm0zs
+JRAmBIYwg3nZmcmuvdKzvRO9srEJAXBPmTWV3TeH83cQWXtNDMYrCW3CmqMRO6rh
+a+f8G6ls1d9UlKHa0iCfWYAHRZZSmW6GF8PlIlsLLnglHjE1Swh4s2Bh5V6v8BKm
+TyoI6d3kAx2XdzxXVMZt+MzDzbOrUk6XMZUD1TG7JGd194OnAdd44cP9VwAwFArp
+8a+f3BtiUgAj/fg7l0sR
+=EhRh
 -----END PGP SIGNATURE-----
diff --git a/dev-java/trove/metadata.xml b/dev-java/trove/metadata.xml
index 7303cef96964..e0f411981bd4 100644
--- a/dev-java/trove/metadata.xml
+++ b/dev-java/trove/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">trove4j</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/wsdl4j/ChangeLog b/dev-java/wsdl4j/ChangeLog
index 71ba7aeda7bc..045e7659e8ff 100644
--- a/dev-java/wsdl4j/ChangeLog
+++ b/dev-java/wsdl4j/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/wsdl4j
-# Copyright 2000-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/wsdl4j/ChangeLog,v 1.22 2012/12/17 15:44:33 ago Exp $
+# Copyright 2000-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/wsdl4j/ChangeLog,v 1.23 2015/06/09 14:04:54 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   17 Dec 2012; Agostino Sarubbo <ago@gentoo.org> wsdl4j-1.6.2.ebuild:
   Add ~ppc64, wrt bug #398693
diff --git a/dev-java/wsdl4j/Manifest b/dev-java/wsdl4j/Manifest
index 1bcb92bf0238..f34909aa5b01 100644
--- a/dev-java/wsdl4j/Manifest
+++ b/dev-java/wsdl4j/Manifest
@@ -1,6 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX 1.6.2-tests-sandbox.patch 548 SHA256 eb4ba587bb3d9125e2982ebbb02add25aacc84d8a795b33f21baae164860dbc3 SHA512 bed0bcf00856309d8f628d4a41774a112bd26c651e9fdfa00af3113d780f430e6b50213fe0f743b486aafb78f11cdd924c4dd8eef64300715a8e88c64c11368b WHIRLPOOL 891b539cc38a4142a71ee594ab214776c45c8b632130cf03ec7302c632f704b91922fd0c5f1708dabd2b22827f7dd89fbb2ea6e43cf942a7023efa7806401bf3
 DIST jwsdltck-bin-1.2.zip 599377 SHA256 e4bd4987a2b437d5d7b0a302165c882db2fe5eed80cbdb5329cb0eaea5b42abb SHA512 a8f86d9895c588d752d266413e77c2a8db241e9cf9c199909f2e9d1d1b3b1b03eaa6b5841c62b0e7a7c779089eb6721797fdb4f2db841789a6a19884bd48711b WHIRLPOOL 764d6adea86aa93b656a38bb8245f44ee21c78795f7828246f31cd9c4db13eff84e0883d2aaa248fddda6a9e170d7d851960eb4a129c837e26c3709704fb7b02
 DIST wsdl4j-src-1.6.2.zip 172400 SHA256 9fe77f4a71700d005b185049d90c6430d1de50f058485b1b45f0efd767b5fa25 SHA512 55d0b8eb6a08cecd4a48223a9f29fe6ed0e00ec4dca99f44a04882efdba448601bb7dadcaa347e32e3ff5bb9e3334503d6666ca2a6276c7bb48b80acea57b751 WHIRLPOOL ff0c6e51e0a880f26ba02b9647fe5c033d69a12baa26d4f211f3951b886431f5bfd06c9533c0a6b7e970cb7870a1607a23a51f57e1cb5c21f4798e10756cecad
 EBUILD wsdl4j-1.6.2.ebuild 1493 SHA256 91dbc6e4147634fdd154f1c4247c18371e8fdfda61d19d7ecfa4d2ec0a4ed0b3 SHA512 dd79427d13cefbb220212aa0f09bf4faa2434b7ace9b3dc28319a14ed2a7bc4d48b259c1cf46f40bf408ddd1dd6177b27893b1204d6f7fb6393a7cbc07cb7eec WHIRLPOOL 4e98b33cb7c9ca55a2519a68dae845b99ec323d55ed65121169f256ee04f74eed7010a3d6346a8d307da07e9021f5816e9d4e62fb9cd1444177fbc5260ec349f
-MISC ChangeLog 3149 SHA256 c49a77679c1fc3d809830bc8b727b233b4359a5cf3b2a3348aca6b01ca1331b7 SHA512 af8f5a0fbcd3e67401e308bfe4e6641b9ca1a3f3e973ffbd31438cf146305c9a6d39f9a0bacc3f85ee7345d2f2ffa8e6e53862737559607087849e078680895d WHIRLPOOL 1649e0e565f44ddd0c02838e4c4135126ebce933fa615bc964f7466fc411046a9ef1f334487929cb77799f81754b9b770efe80ecc8bd88d68edf3194a7f16c45
-MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
+MISC ChangeLog 3249 SHA256 da8e27048742a80db43c0c2614192d6b2f03ef1fcc3574760eebb281ad254100 SHA512 5c038206876a3dcf19ce8eb2df0585f7bd28f6ac4f77442b415d4c83bf1b8146640a32149b21492331add10e1921b87d2ffd33bdc8038f5c68b6c1c6ad3d8181 WHIRLPOOL d50f4b0fd6e493ab192711ba18588325705a834fdd16fde507ef6e4709fa5d4752a8ce626ebbd85b5bf64d0eceff02a606fde2367ebc942640f7191f2c4051d9
+MISC metadata.xml 236 SHA256 f56308a1d11eaf5b694a141a0d0eab80a85e6954d398485dcb7572242a963a57 SHA512 c223d0dcb23b267c87b6d77bb266d8c7491955e875acdb582fcc5596d2e5f53fab135737491d7143e43ef796eed55a1b2d7ee4647758504b5c2764430ffe0a3e WHIRLPOOL 437f50108f65d96da5fb2c9ebffa4364701754d2a1f70f5afbbd1e9766b37e44cbd23598e1dbcdb64e829235da40abca6af3448ba0c4c498fbc1ac3bcab4a0f2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVdvKHXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmimkcP/2E+LASam8N5iTsRnuiUjpAt
+99Nny6NDwT6iowYbxWEtmKTpgVCWWkKIAySZ92mU6Tx7RroeFF/adFmKi+sY0cJe
+VcZahoX/45xJ5zyHDPn8Laf8Q6F0uWQ9qe8Ffo0C26W4WdKOnFLKY9rFtJI2x6kc
+s5rhblycrJTHjVy2l6r3cICw7H3mAQLRhAHb5IYrb2WQQHWoHKv+P3eiBusJuLQ9
+954HwLkPO/Yt0TKH0QrhsYJXPA2ehiOypYJWPIjhlH7+dXG0vv3lfKHe4WgM8sMa
+MCMZTWJlBM8/LK6l2hWQ5teQnLgVGn0chjhnRlMGZ8dnnTOKW/Q0+iF4IQlhpr6w
+12sivgDrGJgfmMiLqY9Mm3aUR5nSTl8Np5XLshxVjHV+nRa9xk4nFZB9sQhPQs7b
+mcNtWMTxjzpHgrfgUlkNMhlEVxnIGiLKrNp11vLPujKA0tghIvtICdAjftzxiWco
++9jgp6Jtg0ceuMz52igBKqFjVCpUQ5bPwLH9IZYmZLoeVTpsLRysezkgj9rOL2gP
+IaXCU683bONf9wyNX+ZL2eHc2JjFTYd4JZvKCB68c4sU73TcIxx5BLpCoNPFGoFR
+wbRPPZHyI2T8U0oE6U+5GB7RxNsa8TsjCuEbT1c96P4u7cwgdlb/haYEH39VzqFt
+d4p6OykyOCvDVWSVYJEq
+=Jb6k
+-----END PGP SIGNATURE-----
diff --git a/dev-java/wsdl4j/metadata.xml b/dev-java/wsdl4j/metadata.xml
index 7303cef96964..1236e4d06274 100644
--- a/dev-java/wsdl4j/metadata.xml
+++ b/dev-java/wsdl4j/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">jwsdltck</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/xdoclet/ChangeLog b/dev-java/xdoclet/ChangeLog
index 2a2abfa6f537..6674ac815f8d 100644
--- a/dev-java/xdoclet/ChangeLog
+++ b/dev-java/xdoclet/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/xdoclet
-# Copyright 2002-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xdoclet/ChangeLog,v 1.33 2014/08/10 20:26:42 slyfox Exp $
+# Copyright 2002-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xdoclet/ChangeLog,v 1.34 2015/06/09 14:05:13 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> xdoclet-1.2.3.ebuild:
   QA: drop trailing '.' from DESCRIPTION
diff --git a/dev-java/xdoclet/Manifest b/dev-java/xdoclet/Manifest
index bd70244f6583..9944a7251378 100644
--- a/dev-java/xdoclet/Manifest
+++ b/dev-java/xdoclet/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX xdoclet-1.2.2-buildfile.patch 2518 SHA256 87e2c77a325d50683bd341b75c89518123178e9960385bab540c8cee3facd51d SHA512 871dbfaa908a24a6bd8685f05f8754f6acb3720a9cdb942b9517477f23da2dee1d7e619edafe7da757af0f27480ddaba9a205e9142a45abebb1c78fb7288d944 WHIRLPOOL 7303d9483d0ab79e92a83739f6ca740cccf0f10c05a27224518209da9e22bf4daae93e522132a6eea95c7aad67f62cb5b04ad68c5772a7b4d8466f13dbf9ec23
 AUX xdoclet-1.2.2-interface.patch 10893 SHA256 29bed1be7a293586da850e4e8800c16834bb8960560b544c5adb24dc854bb95e SHA512 05e804b31a3e8ce788eef4656f451a04db792c5705357ac949c729f5e71c8e620da1754aeac12643617cfe8e2d84ff40ce4e0af538066922b35804d9607f913c WHIRLPOOL e7c563a180cb4f798ecc2bbf2a9e4df934e214df9e41a46e77da0add45282259ebedda0c0cad7da92593fc914bbe72e6636f5552e3728e8c018a2b1e2d32986f
@@ -8,12 +8,24 @@ AUX xdoclet-1.2.3-interface.patch 10893 SHA256 29bed1be7a293586da850e4e8800c1683
 AUX xdoclet-modules_common_ent.patch 369 SHA256 0283536e3d8b386b798b3c409169b5e60ecb04f884bb17a3508b8dd2fc572c02 SHA512 bfd4304d2c1075b33e834bfa2044243b641936e2cad3b2c542553c3d86844d659ba197ed79514819f312bfe3fd946cb1f5c3ae1c9b01065483318980086849fc WHIRLPOOL 37c0c4e82d0378ef3200111fbdff133a8b9ea1f5b43c60e32f4a33e402b5777edcd60b3256fd718843e29fad0be3e2fb81f207ba4e1ac3abc330a982f05b04df
 DIST xdoclet-src-1.2.3.tgz 5880180 SHA256 b7b8e00954497928626db15e9759280a0dc18397dc54b02924a162e819eff4ef SHA512 ecad04c0bed00215c55f84782a74148644425efe6db4bde2717dc04854769c7617b9e396be67f9b4b6357f2f023e1658eb418f2e671305c36374d4f8849eb90f WHIRLPOOL 29f8379876ae5834a1371be582869205803248df4fa76835467ac0e14e2399f17a8e3e8d870a583940050456aba7647acb2e5ddaf252cf0cd7e57ddb211c7e03
 EBUILD xdoclet-1.2.3.ebuild 1699 SHA256 aebb215e7483bb204eceda0caf49544011b4cf7891132adc228d98db82758f12 SHA512 6590bcd88d5abc600634c63fdc879a42be724993447c1480f6bb9d5898f5d4808a2ce8f9e961a7b39908fcb9bda6af559ee9d5eafdca6fca22606096f2c8488f WHIRLPOOL 946be8bdd4d237014dedaffd0d407d8b5591ab7eb634d1a74b1f32188e3362f056811887bb244d0c2435ef605dd62ad4b1f46b0b7e1f2cdc3400d87d3d3cab84
-MISC ChangeLog 4839 SHA256 049ca11152a8d99420191462e307d7a3c4f2626b176fc3048e251c780ec28585 SHA512 b00c37b638398f1383c6f56e87bd695d79d6733bbde3eb219eccd5a67d0a93308bcc4ba25be765cabebb2355a4021ef2b260e7f8981ba46675952f24cc8eb611 WHIRLPOOL 534cc67c37b466198115d2ed4bfa2a7387966ef2753cb449cfd48ae19942debe5d35f364058632dfa18fa3de4dc2ac03e57f932f222c2edf40e70ae00546e1d9
-MISC metadata.xml 542 SHA256 739be6dd0cf57b8b6be230062c00196a73b0bf5c4f3473d48799cd4240823d38 SHA512 4dc02c319645252de8080a57c2c88f61ec9ef893329cf00bdf2e2bd8ab4a122cd4b337576efe8c27f5e1d8d6d299ff0db357d6bf2654314af3b6b3a1cef19860 WHIRLPOOL fb5d715afb7b4d655cb6e2073cc1252f0866c9466e5397e6397b2de72127daf32cd4d9e80604a551915c9fabb9a55382a68409d33bc50075284643e02936a6e6
+MISC ChangeLog 4936 SHA256 4fdf3aef76597495ba67087cb75c563d5ab49a43949c2466577111259fc00837 SHA512 97ecea3b42e79fd4cfd2c6f0a841db416b9078c97344605f8aa153ceca78d5c9c80d385f0ef8cdaf07a726b70c352193562d0bf3d3080b382c692571e555b73d WHIRLPOOL a2b5085b7f64993203cc4dc9c61f631e437a2dcc93e194436bb13ea592694f1827ee27fc29c295529a6da40d7d1023ea839839c486d510e258bb2955f1797f95
+MISC metadata.xml 622 SHA256 d4903668ff7f93df2bf36eadb4fe6553608eae59fb8207792bb3f053b6dbcbcb SHA512 6d7bef0090be9ec13af85fd4d7bf68b1317a1443c90bd8dc55e54ec35040e7d6300e8b80918cf3233c54bb81954451aa65d0e6da8e85b16a12c772702ae0038b WHIRLPOOL ee9a229cf8fe38cab1fc5458c438df0d22e9dd301f8aa08b5fad9d5c3da0a69c639cd9ce811df371f8158602e97f41c31492e6fa47f50e1eb8353746f4573a63
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlPn1YMACgkQcaHudmEf86oxcwCeMg4mfX8nCve8WC+LhO94GWvz
-GKgAn2NYc+28rj/kqYStTnUnljXYO3R/
-=irck
+iQJ8BAEBCgBmBQJVdvKaXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiadcQALbnI5dpGQmjVAy/1Z6LZuK/
+TYoVm0n01agATO8Rx3G/sSYjG/llye7JEmVPJTn65EcRLEJSPq3Q3MfhvpbpiV4H
+Fa7VWqGZ0Yb5FtWxYmLJV8c9DqqV4E15lCEpTm35rUi+f2QLef51ao3+DvGNDJPH
+Z3ilhyhliFXvd6y0nOHerFQk7/odxxUHDxmgLDGwvU9NTc8OWNS0A+NpdL66ajf1
+3ms6B93onJ3gGAFHHoLS0Dnj7eae8XfqjpvYdldT8d+6a1X9DAtKpEHZHvWyFLQL
+n32IXo6WNT0H8gMx/4fVM1PjSZCsmN3ug5nkwqV3AUHEVdBoS38LZi8lEMyQlScd
+EbqFTSvwVVT6S0F8k3zECwoHHv7Q6e/FJDN/9a46tZt3vgX972Hsj7E5etq1qOlb
+KA1IpepRIuraJKtxGD1hUBxImP3ApI3Yke5SVu+w7wfmQhXwPJrCszOeV4/khr4k
+lypEErqJKNQxeNxOZ1rJoNVwn93LQVei2IIpJ+GPLWWd1viJuomGgnUQn50pq084
+YhxUA9L57wvZfoBKre1TGofYlOI+X8GxPPAFD7/ZnJMlo9akKk4Y+v+oJsE7zfup
+5q5JZAUFH17KQROPc7Kb5FTW8MdtVj6+I96ELKm+FCw+0Q4WMwIUVa5ui5aH/KzS
+NMRX4sSGra1k60Oohduu
+=8zuD
 -----END PGP SIGNATURE-----
diff --git a/dev-java/xdoclet/metadata.xml b/dev-java/xdoclet/metadata.xml
index 793910431309..d7880ffb1370 100644
--- a/dev-java/xdoclet/metadata.xml
+++ b/dev-java/xdoclet/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
-<herd>proxy-maintainers</herd>
-<longdescription>
+	<herd>java</herd>
+	<herd>proxy-maintainers</herd>
+	<longdescription>
   XDoclet is an extended Javadoc Doclet engine. It's a generic Java
   tool that lets you create custom Javadoc @tags and based on those
   @tags generate source code or other files (such as XML-ish
@@ -11,4 +11,7 @@
 
   It enables Attribute Oriented Programming for Java.
 </longdescription>
+	<upstream>
+		<remote-id type="sourceforge">xdoclet</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/xjavadoc/ChangeLog b/dev-java/xjavadoc/ChangeLog
index b75fbb02e031..b3eaac7af0dd 100644
--- a/dev-java/xjavadoc/ChangeLog
+++ b/dev-java/xjavadoc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/xjavadoc
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xjavadoc/ChangeLog,v 1.18 2014/06/17 19:38:20 mrueg Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xjavadoc/ChangeLog,v 1.19 2015/06/09 14:05:30 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   17 Jun 2014; Manuel Rüger <mrueg@gentoo.org> -xjavadoc-1.1-r1.ebuild:
   NM: Cleanup superseded ebuilds.
diff --git a/dev-java/xjavadoc/Manifest b/dev-java/xjavadoc/Manifest
index 40e716533d61..480a88f066b4 100644
--- a/dev-java/xjavadoc/Manifest
+++ b/dev-java/xjavadoc/Manifest
@@ -1,7 +1,29 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX xjavadoc-1.1-buildfile.patch 1094 SHA256 9e47de14cea9105743d4f1e11206778419a90dd5cdc64b33c204185feca86c57 SHA512 7b65568af2392da62d5bb4f6ea7622047c553c40b55b19e8f8bf525714fdf7ec99096f4665bb296af6819b9063904db2aca5b2bc34bf54bf0ac679ad063f2a28 WHIRLPOOL 94c69fa9eeec8f53a7653ed2acfc1fa88828bfac302ab184352e4ee46271e011ac9082fd39386468736ec9b6b41f294861162532c828712cdf1bbf405d7e1bb9
 AUX xjavadoc-1.1-nojunit.patch 1073 SHA256 4dff308db89d52e830dd5224b72e4c3f886885a54fd8aedd5bf14550586479f1 SHA512 a023962f642defa2523a56b709efe9c7c026117c14274fa29962a9dc676c28f82e8dac68822eb2a631d3a763a60c532a916bdadf0b9717f3547765b5ffdc10a4 WHIRLPOOL 8245644d2a3c65b01518ca0f4ec14ed9276c3e88d93e1b6d918d972c36e34d4d9f6eae888e226d7e40bf329d5819c5b07ca4a34237a85d38bd747011928b2165
 DIST xjavadoc-1.1-src.tar.gz 58804 SHA256 dca21a4568f0ce349e797c4c942c788735f8e637d2a3305a781378b8b26a3c67 SHA512 e186d2b790def023bde797ca1693b06bcd00e564cf99400b0bd4c95b46a43ee65ee6b37528878afd8c415820972b43c35ba660f4321b15ca8be4d27342b64a92 WHIRLPOOL eea59a799cd5e14dae11771ae01560400c4f4f4f673b8dc56f723057e0cb9377ee9801dd08c67d34730c605e4c7303680e004f8ee4e272c983e5c517f7cb7946
 DIST xjavadoc-1.1-supplement.tar.bz2 458861 SHA256 e9f704c01f0891d386792821a7cf0cad0bcefb3af5b7f0c105a7db634526d16b SHA512 64d9c43ea75ebb9c1faf22b69e6f818e2deadfb4064cfc5d0fdda7e18bcd4fb8c806bb0d12b42080f10488c8ae466764de26a7f070085a1db108b0b9e801cc2b WHIRLPOOL 25ccf314eaa80972849d569aec434a7486fc04670bb7320e33d98e5c5da35c190a0ecff24827feb857201e9aad034d2e279978cef1b45ecd0a4e83b7c14dc549
 EBUILD xjavadoc-1.1-r2.ebuild 1126 SHA256 8ffec28068be32d0c927ce9ec36f555e690ce2ce473a1d7ecffc92e36593dedb SHA512 21c76bb2f533f59b492ae66d464ddfd537aad0cb7a9cf06b6b3c506f2ab40408d1d4c00507f6b8eef2828358b503e55a96488c8434c77b184589c5b6f9d05145 WHIRLPOOL fe621d9fef795abe303cdc653391201333e14cbdcefdcc002f7f3256c87b864bc6087a3159778595e279a2eb5f47f21de7e4d4016afc1eefebac46ad3818f3c0
-MISC ChangeLog 2368 SHA256 a7b30e660955a70d4e3ae7d772d6331652c27155f05d152e43ced211429507d7 SHA512 f1013c62990b7d07632ecc42c1ab79b8f8b79cce9feee1240b6ed07e63306a05fc4cb68b27af51299c9be3b214a3aa0f433171cbbae1020f869da78701e9f797 WHIRLPOOL 419354d708d296332679cf692c66046c309cf97dda869b9f79ead3b56719077324c2010eef90b4984810f49929c9e6f1ed10bbe61af037f0087b765fdbcf96d7
-MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
+MISC ChangeLog 2466 SHA256 b1f7b84663bc0040b082fb677b384ab9e6e8915831dcf1af085a3fe8399edc1e SHA512 0e17ca4fe81e942e7c4567762935ed0fa6699581d31c3a0d39f0ac561cf259a7d04709defd509c9c199aa75e4fcf2a4360bc79f8e7e423ad363d16018f45d1f9 WHIRLPOOL 78971cdfe46bbe1818c4f5c65f75d19c89afd473ff9895d204ecc2b4662b8a110b1268abb10e885cd6ec6cdb63c979069eae957b6054554abf81d44bbfcb7e49
+MISC metadata.xml 235 SHA256 d559d2cf597937cb7c4fc5d8c558b6d95f21dde74ae764bfb1ee93066cd9450e SHA512 64c6cb7de70e94308589e72fdaa23b5b754e231722c43b0871b3a5c24b49e64276e2cf0138032d95d78429d7e13f6d42d31417cf613bd1b48bd3e4f0f57245cf WHIRLPOOL b5eafe9f4bf7ef15ed4d20f08f4198e8fe46223623a2436ddba74d3b9e966fdb931398791f1041563ff02474c1da1aebf6c49bafd784cb390e62e160add94f0a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVdvKrXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmipEYQAKh5cXp1Feye3TadhzoROYBI
+2CeIBdlyUj2wSPuo7GxolEJhl2Q2M/ZaeTcpXg1FqmHCqAEKCeFMp1uWQ1tEkxZo
+AQGMDdKdL6qVDiiZ52m1kLNT1hZz6Omql/37IaAxkp4xD/m7nch9rBxP2/l3NW2m
+omq/jFvZsc5aGbQOHpwGu8oYZDjTYF3nTzVVUTM4SXE5TGg3+rHR28d9JVxbBcTn
+cxAZhxIKfpMxwdhrH7etsIkis+stt2NuowCyVHey9UtrfivZZ2pSFtGr8nAGHnbI
+rGE5u0O/HhIk599z4RPzHufachrzYkKeS82SOJ7fU9jgnktbSYy81BEnJqtI//0z
+zXpHVLqmhnelSsVzURxzaDQ3fjCXZtHM2ZY7FXYTzeDjV08hsSALcvJZxc3AgH5j
+SMTcaU64XmEYzlfZmI1On6hIbiwytiwZAYlnhc89nPc66tLBPFkd7f9vCzsDnbS6
+QddsLIjL5a3G/4uAhh8lmoO3JAU7QlRfgET+80qP+NGebkjKRdfinSu8UuW5pJr/
+4tjMt4Gz1A5ej0ABFBjKGPlui5ho6zYavXjGyWztNegMI4C69bBmBBu+kWBqKvwK
+A9GOtlhlFhpYFp+0dJ+ats07UfYH9bpHwCWRKfC2x9p8Yty9YikGRMNYAwcagB8x
+2PlK77Fc7DB+yChyvuht
+=x0Wt
+-----END PGP SIGNATURE-----
diff --git a/dev-java/xjavadoc/metadata.xml b/dev-java/xjavadoc/metadata.xml
index 7303cef96964..bfcb77c44f83 100644
--- a/dev-java/xjavadoc/metadata.xml
+++ b/dev-java/xjavadoc/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">xdoclet</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/xml-im-exporter/ChangeLog b/dev-java/xml-im-exporter/ChangeLog
index 06f1a1cb70fd..78e822865750 100644
--- a/dev-java/xml-im-exporter/ChangeLog
+++ b/dev-java/xml-im-exporter/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/xml-im-exporter
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xml-im-exporter/ChangeLog,v 1.8 2014/08/10 20:27:00 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xml-im-exporter/ChangeLog,v 1.9 2015/06/09 14:06:08 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org>
   xml-im-exporter-1.1-r1.ebuild:
diff --git a/dev-java/xml-im-exporter/Manifest b/dev-java/xml-im-exporter/Manifest
index b4bc0d62f867..24e5a55c270b 100644
--- a/dev-java/xml-im-exporter/Manifest
+++ b/dev-java/xml-im-exporter/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST xml-im-exporter1.1.tgz 235161 SHA256 26b7ec388b39f2094af8d270dde5d84c46839328e5c58446f3dd2e857b153c76 SHA512 a762fe18a90abcc558fe3921038db7338a8bd98d9a7a0fe3ce86d733df5641541663126afcfa06dd1723dc9da205c80e2cf5f38f39ad84300b4750ceb77aa19c WHIRLPOOL 04accb4fedd521a529868c47c138256d158ab3b15d961f357e7d147708a9f392de631c1b96b1de676997a96f3af9b1b070dc7649fdcbd65a13f878917ad1c465
 EBUILD xml-im-exporter-1.1-r1.ebuild 870 SHA256 d49e9038b6b225ae9cc4bf79e03eeee9d35afab6980db5a71d5d083ff95c6467 SHA512 348d8a17bbf1b483b9c9cf5bdbbf2fbc690899fbdaba35f87c6b5488988369598c8aa3cce53ab6944284ce835c8102dfdc7bf414d11f70868940f7785ad9f681 WHIRLPOOL a593937bceb17b7c01df120fae782f3104da51a7a95922bcc1ae5dd20c626f4160adf6020248e6079f4fe910d5a11f14c2b23481b9859cb7dc37a22400984271
-MISC ChangeLog 1372 SHA256 0abe8dd90c01a918ed79ed959a0f11ac08a04c65f37aee0f116cdb8fe15d94fe SHA512 dd873d1c383d39ca75de705b9e9427fe5516a6427d703b0d27ab3dd417d09c8c1e3f9f75563ba7137112c7ef6b62abd658fbad4830cc54983737eba0c84083e0 WHIRLPOOL ff99653193acdca67289e8e0a8ad0ae53306d57ba9ec0338899d1b8c27a8a5a8bb1bde4084031a0490526e504ff0c364319dc8641b296ee75c0a3ee68e0872db
-MISC metadata.xml 351 SHA256 b9e23b7d706f95e5f9c1fb891dc90f379c5df5c11eefce88b8e0397c85345805 SHA512 a6b54c72280ccfae967c0196a6c13caf386eedbbc2c62b6ac05f4d436e950ade34f768577879ccb93e3f7df5a137890cedccbab3de50902232ae8d8efcd5accc WHIRLPOOL 3faa2d3e80aea81a835f251b54086f01e85989e65c3cf50546bbf22e6be4bdffb17197d6013d976801c950deb184ccfbc0d3a7f7216fb2f75396e5ba1ac1130f
+MISC ChangeLog 1469 SHA256 bfe0e5a9d89536dc0bf9f30dd5bf2765a2eaa9d8988aee370caed8ba579b5780 SHA512 f77ffa62bee39731b04ff86292371836c7c84409221d9a13a2dd327a0100ec2facb4bb3502288e50e8c1e0d0099e3906776e3e5590938ae3b91331896e213bff WHIRLPOOL f81b31bb974b0a2c69c1f1e35f5ff6703cb2889f92d1852a7cb0b89cf63a110d35e8647beaf56e2c69e833bb669777f3e3da96c6a1ec2e854e3e6e9d9d58c07c
+MISC metadata.xml 436 SHA256 b25a0dabcc788c8e481812d211f013a28031178e76525e8f14a8d2625ef70fec SHA512 a3a129164ffcc856011fd8c5b9f3e1d1cf8232456c43c5efc44a836084741c8b0cc3ac6b1e4c6eb52333c63675dd54ec4e1e928800ad48fbf56c1b0bd9d835b1 WHIRLPOOL 6a87f2a95f89f0712b70f27cc0eeebdb83a011a6c4fbebf2eef2af5e43220ca62f5b7819bb053fc11d37800a2d1a7c23f7a130615dcb6ecc3f2a28653f0b0951
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlPn1ZQACgkQcaHudmEf86pHTACeKdSJMfFrkr3uNvHJ2SJbhyQv
-nEQAnAx7iXmeulaSASuUOKm2I+e4VWmU
-=svyr
+iQJ8BAEBCgBmBQJVdvLRXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmixfAQAJqPTAni1SwyOQITpzHRGS2O
+keqxOPzb0RUOMsmh0HikorB64BTdsh5C34RepjLMf97XrBfqT16ygHY4kXrjZ0FB
+0D/yZ1uFicqjyuUYuOxFmpRa7rTS+gTkTTwQul6Drjvn1wIbl1n7mgSnAfy3W0W6
+Omg67x/ByW+SQ1DfDM9wQ7wWDkNjOZhmy/H3jw0rpTalVdDAqGeWK8T7bb54QqcS
+1yALZUu284Cz2JBjRzEIHgb96cWtLRvZve1VqF7/hLFSoNHy81BR1X8eAzCee4vi
+PhS3WKh9Tumzb6e1LG997qgP+/sUDP7+YSAiQB5hHqVYh6epwzThjrzFwhhE0aYU
+vQ1jAaPUwwaSlOv049FfCn1nhhAOvBHOogYF1kRsJ9XPcb4OxbrRFzjl+YVamEHa
+zm8NeR9UHWfVIyC3l5IPvyggEcHzoaQyvHGWgUOfc+q8CtpA44zDlPLVyRRBj1jM
+Er+tbOM12h+2/Sz3Y3e3PXmBfwfhnNQXlIFITzDrn6gn2RjrzFbRtxOljVPK7sgi
+4ZN3ZtQrZyP7m2A0B2QBlla8dKABIKTXCH2zpR9Gavgd30UgltBB3XNX6dLE3I5p
+aD2JIMUBtMpU2P3dcqZGM+nbsmfhNF9TwPPbFK9w5eBkv9iAXqWDegtV1CKsEH/c
+/dDWQccJIzVrTKRXUeQd
+=DOxI
 -----END PGP SIGNATURE-----
diff --git a/dev-java/xml-im-exporter/metadata.xml b/dev-java/xml-im-exporter/metadata.xml
index ab9ec9968a59..a153dd1cad8d 100644
--- a/dev-java/xml-im-exporter/metadata.xml
+++ b/dev-java/xml-im-exporter/metadata.xml
@@ -7,4 +7,7 @@
 		straight forward process of importing and exporting XML from
 		and to your Java classes.
 	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">xml-im-exporter</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/xmldb/ChangeLog b/dev-java/xmldb/ChangeLog
index 53b9c18c8f59..1fad6cc651c8 100644
--- a/dev-java/xmldb/ChangeLog
+++ b/dev-java/xmldb/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/xmldb
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xmldb/ChangeLog,v 1.35 2014/08/10 20:27:20 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xmldb/ChangeLog,v 1.36 2015/06/09 14:05:54 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> xmldb-20011111-r1.ebuild:
   QA: drop trailing '.' from DESCRIPTION
diff --git a/dev-java/xmldb/Manifest b/dev-java/xmldb/Manifest
index 285c16950cd5..c26e19d9251f 100644
--- a/dev-java/xmldb/Manifest
+++ b/dev-java/xmldb/Manifest
@@ -1,16 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX build-20011111.xml 1982 SHA256 5869d9ccf4636bb21423fa5629e04033aa329ba642060d10f8422b92b3d01ede SHA512 9a7f9a10d8936d36686fc4665c1fb9105a633409bbdcec1c506702626d88a9a467f319eaf66768abba69787dc9bead21cb1d4deb39d19573d7e5be842270d811 WHIRLPOOL a7cbd47bfa82575354f894c7562107390aa479423ac550852a6ad7d353c97bd4121c0311d7207f310800fc4e5eb53b1ee84c63ef7bb0c5130b9d742c16599414
 AUX xmldb-20011111-unreachable.patch 456 SHA256 c121305c217165ae34a593c0ec4b3c990672240285df2992f10aeb96f04234b2 SHA512 73fa4b70352369483d126b66b324d5117143e8614c2ddd69e50edbc567bfbfb8721c605e5ab7e6d0fba25ac3885beaedaac8e938c84ae0176ca29d8e6fa541e5 WHIRLPOOL 6d529a3dde61d4d89859975fb54cbacbd4ee1b8e3532a9972bb0a0deeab6e729d0f6093555e5f1d1e55f3d7ccf0d3bfdcf3f1c185503e4eeb4b6f6f99469614f
 DIST xmldb-api-11112001.tar.gz 36553 SHA256 9bf195503b6ce45d17e1953041c125602bc69e3f6812a031055d26ca558d1006 SHA512 20123801a57b5350ade4dc82aba5ba2492cfbbe2e0389aaba4b73cdd3a8d07981a895ec2318885358102e48644cdaa30a18996ab9315891e506506fbc25658a2 WHIRLPOOL b96742f2da55b3330c5554c103b9998a69138a71050e9b48b71926df2b41dc92c3449b9f75843e9ba03b16cd480d23b6d2db1d56b29ae39b55a062836047e014
 EBUILD xmldb-20011111-r1.ebuild 1494 SHA256 3580dfd916720992735e2cab1cf0f7e905b41cc95a35e06eaaac4be63de15095 SHA512 a4c89317879fa8339dccd0851bdddea3ec63acbd86664eeb0a19bf997a7a8ff37b9118772ed7305556299647b2e3b7ab3eb7eae04f6fcd91e364e186226055f3 WHIRLPOOL fdcabb804ee91b3b4ad71433308eb344cb676840686422a9a969920326ba2096f81cdd4614427cd72c1d6893e98f7eb2bdc819008f78b028588e015af1212846
-MISC ChangeLog 4373 SHA256 633af203b2850470c3615723232aa6b685fbe92aeb40e6867089e288a9c88310 SHA512 2075bb380a661346b2e63c69d8cca57fb6475ed9a08ed9819de215fc005062a194ffbce2d0665a2af25b27c784e73853078e08722a9c4f94245b610ab7ff9eac WHIRLPOOL ef4a0a4493502d926ebd76449287efd22551844bf70ffd40842ff9b3128e5c832b4be71cf34e355472238c7e66fb545e7f9fcf84b30a0a14db384010cd196359
-MISC metadata.xml 435 SHA256 e38b2692f1a7736a0c1f409d54d99335409a62d7d6b2240c8d1bddd8245240ce SHA512 d3e7b724d59f9d6ca193ca2697393399e27b85994c437b7bdc2cca5de64f1b30db4a8444f9dfaa1512532ee506eeae8c23c2228d467e23d6c244c6ae24101b86 WHIRLPOOL 094615a6531cb2b6d1ec5e0319da2ea97481bd17885dfc954334264df4959a7b53af3a7d49db2137660b23cdbd58f83fd0cf87fb0b7973a74094e3bcdc03baaf
+MISC ChangeLog 4470 SHA256 8d710f82cd99f9234945cb2f6b232b5c3318a097984b0d230abe428b832ab526 SHA512 d2d10267dbb28dfe424f5c0fcdec2eedeeb5226e5d36c3e1bf4a2deb1162cdb9be67ecb5bdcf68b83ff533c170cffeebf16ee623cd5ee0238950e54a6dd3a115 WHIRLPOOL d360c7f49cc856dba5110c022d5b3fa0c59d48d8e405e2a6c445ef5867d60ba8728315206fedff837791393e4a2f1fe752fb98255bd5549904f7a7af1a45ccb9
+MISC metadata.xml 516 SHA256 4da102dda772a6ea8ac9a840006aa40e09b72978a9b6b25b36a1f3042c99b2ad SHA512 28809c47098d40c3f51743677d975a3da01fe89c115b75b3290404b92ea24e015ec66b0407dfb35a4f0a1887d16edcb07d85444bb465dfcf1ae6f2a302c970e9 WHIRLPOOL 0a2beb139297bfc1ded1df57ab36445d8836339092ab2637f876f97feb85d9d08fe045d17e4eaa113593e72486a9d9a6e1a3596a3affc34bc0d05367f822fc8f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlPn1agACgkQcaHudmEf86rs/QCdFq9679CSzSIav90sB+tqX13y
-lyUAmwRnqSq1RXBQYgROYjg6vHl32W2H
-=fqaO
+iQJ8BAEBCgBmBQJVdvLDXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiUOYQAIAGv2AeQlHBE2/1xEf98BlS
+PYkW6/rJJpsu2h4sEwUtsVa0jrSsHlUlq0YQps6ORoEvX70b1JqkqOzBmUP/OXnh
+jvavskjbxRHzUrxVbsruSnnZtBrAeH//N2xziH5/rlDy0hXe5Ge4Mxqtl1d5HYa6
+MOtUgxwQzcpl6aEeSGdVXAdw9oe11yP9QHV8gsUZYJ36HNQB9mv4d86JJ71xdphM
++t1IyXzniQ4fa7NByPM9vUN5mMrNZfJFxdVcKraGNZGHpHdfyYg+mj+VQa4K1jEC
+KlUGHZCJ7i/w1iL5Jr5aHNI/JWpktym40gPt2+nzryi5xOkzQ5ifmYTBVWNHUUJ9
+ndk4UsQmPCfFXeMPaBi9Q10rgVrdSFPqTFBavSy+Mr5gEocNUdqZsFY73LQgThw3
+aT+fbAExA7gYUeYm18PtzoWgndJMWS6w+li1UA1w6pfdcVEMI9K6mXclYEbhf8Mo
+RTk5aZyp8KYvCqDt5v1PQf2AXP9gVQgiRvYCXwHiOafjdb9tcA1xqtIRDIL+TuTX
+j+Lo9YOXcaL06Nbx5j015ZiaqvQoirOY3OZEADAXPs7XW/TnhIPJgTAbnUUhgfRU
+q8aZYg9j3HeXrBjfk2H1jfygZBHzd4ifDnf9ETk1rUq0LLF6X1czCXjRPkGJEZd4
+5Og+nkykOpfXJQAjAda/
+=5Flo
 -----END PGP SIGNATURE-----
diff --git a/dev-java/xmldb/metadata.xml b/dev-java/xmldb/metadata.xml
index e8fe4af0ea67..2b157ce3b0f5 100644
--- a/dev-java/xmldb/metadata.xml
+++ b/dev-java/xmldb/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
-<longdescription>
+	<herd>java</herd>
+	<longdescription>
 XML:DB provides a community for collaborative development of specifications
 for XML databases and data manipulation technologies. Along with each
 specification an open source reference implementation will be developed to
 validate the ideas.
 </longdescription>
+	<upstream>
+		<remote-id type="sourceforge">xmldb-org</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/xmlunit/ChangeLog b/dev-java/xmlunit/ChangeLog
index dbde506dc006..cc69b04bdeba 100644
--- a/dev-java/xmlunit/ChangeLog
+++ b/dev-java/xmlunit/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/xmlunit
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xmlunit/ChangeLog,v 1.22 2014/08/10 20:27:49 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xmlunit/ChangeLog,v 1.23 2015/06/09 14:06:27 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> xmlunit-1.3.ebuild,
   xmlunit-1.4.ebuild:
diff --git a/dev-java/xmlunit/Manifest b/dev-java/xmlunit/Manifest
index b642dbdedfa4..8a40de5d2da7 100644
--- a/dev-java/xmlunit/Manifest
+++ b/dev-java/xmlunit/Manifest
@@ -1,16 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST xmlunit-1.3-src.zip 836670 SHA256 fe5ff18925a4b07a70d939a1211fed2c021496ac6bedaacff884c29c8d01b42f SHA512 51f38df1fb7d146777bc5d99c9861157c1b97c1c89bddd1d04649c5ebe73af307db3113733e1ee8517468455683287d8d9ff2ce3dd714ff39b09d02649d3e890 WHIRLPOOL 9756973c61280df339494121a0eb6f2f0f8c026223df94a7bbdb818175277cf446d88bb8c888914ceb575ef2834116252437864f8f4fe797a915fa6e44ef515c
 DIST xmlunit-1.4-src.zip 816904 SHA256 a849cff7531a80b5d1992596df647cedb537ecadeb7f640adac8e20f65880163 SHA512 1534729fe93a6beacd3961998c0c548eb15f54ee184740d9df2b3160bd69da4b299a2a98fd43eab5f1e7ce0cd8645ac1040c6f7e1007c2c4d90babb25136d381 WHIRLPOOL ae7b97557cfa1d3c1c54d0af343005cafe673e8554ba965aaef9525715696ecf811c46eb31364450aa033c2d3f2ad5e5258cbb9364fa3338997ea6f08ec06517
 EBUILD xmlunit-1.3.ebuild 1439 SHA256 c6bfd8e8a60972927058d638b824463f98cfcc1096167d69b07963b57531d6e9 SHA512 a63b042b8ce31f8566e45221bfaa5d9960f48aefac5fa581ebc0763cdea7bf3cfac11d1b79dd5d8c45c679b5cbfdd011ac5fae4c50d50b262583edef0420e35f WHIRLPOOL 5460f514a3902579d8a0c00ff67a6a6e593cea0f92003ae458f98eae03ed12690b72334f07df8254a893c16e30cbcf1705387ba7db274fc89482ddb7c8abb614
 EBUILD xmlunit-1.4.ebuild 1219 SHA256 2495cde9eb4a0493ded88571bbd58ff25895f12f5723f81d91a5ce8f0c0cabe4 SHA512 bd2f78e2ec914f0103a9b27a2968b4c3e5b522ef258709ed6bae001e4423f4a28f45d554f6314b9edfd6f792f03257c8fcfa59aade8f88e8c8c8905ca3484791 WHIRLPOOL f4c4e83b546602c8e01687281a172d2a809a6d4255f3097cce9b8aa0ba32ac946b56cf81a7e1d52c3f1cf2ceafc1c8a172a90974c2a7a5772eea8a9665354d58
-MISC ChangeLog 3288 SHA256 3999b975e06db47dcd542465b1c6486d903e2636e7488d7994799b063b1e4747 SHA512 19ef8f2568692fe3e209d6712c99d36aed09d27e70b6ccebc018cea2022c257c6fcf7553b80b488497fb2af004c91ae63d1c60a46626dd6af328256775612f15 WHIRLPOOL d5386a4684a73af2635bb1a95be71f717d3becb6bb8d5705d7c8ac893b83caa5c52e81f99d2e1efa5977148329289e05786199e4bf243872828f28cf860d8269
-MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
+MISC ChangeLog 3385 SHA256 504cd4b6cf96adbe229fd085dee339598b87d13cb3dfbb78e8666627266a5c25 SHA512 ee9b9e90e6e3ecf9866cbf1a819202c7b1e20b1b79c3582450c09e8f395dfa04b9bab07868c71bf1d82c066d1e96fd00c092c73d98b44848ee83ff2b564129d0 WHIRLPOOL 79d19c235fbe04815c4b032dcbfa6f59add868581b83932a77a0a5b24eeb20558f62847d2d89312725391586a4be62088a5d8cbb59cc6adc02fd45b27ebb4f85
+MISC metadata.xml 235 SHA256 5e1780428e905389abfb7bc586e5e70eb1543e3cec5a925d9588ce32781c4282 SHA512 83a0e7c5c253e47073018d42c92640e010544eaff1d8ac665378cf7750c57fe8270ead13f41b8fa65cf39f51481a2d41f4d4955b292a603b59b613ed02a6e811 WHIRLPOOL 2a62e5469672b2876dc0153ebf49023dd17d73714cf364147ca9a3f999f1957b1d499df2bd6cea3ecc8115a5f287310dc55c41824a0d76770c4ca7497a182d37
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlPn1cUACgkQcaHudmEf86qtWgCcCi65cBYEYdEG1cfhVvH3LUr7
-cpsAn0n/SQwxG1gRGrx+mfaRD+Xbckp7
-=bhyS
+iQJ8BAEBCgBmBQJVdvLkXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiLmsQAIfm2nx7B4v+jlE/1PcsGYn3
+EkbVxsvl4MTv8ctTcZ5Do/Tlj2L7W+dd6MkMp8XuIFgpSTVjwxzwccNIUR4cxD6t
+THkExCbKxIyFSuiN8VvqIXxMWON0zYYxfGltZULsisSP5qeOMEOL8XUQMOYeMTEN
+ls3fHnR2s2NB3wplVaLWDIOCKP0ub9vqBNFaCnqP5zspJbHNZdMoK9oUKNaEfLmU
+jPvFmPcHh+8SDLHWZ1vQwUFrF1McGYjj/OssNnMrSqa5lRfA0/rdbHi1cNg5Qmy8
+mp7LCya9ejkWj0XmDhcb/RUch1gwL8hec85x91fVcI3H+b/f5AUWujxjyCbYdnv5
+9SS4Fxjo/UwsB4adSGv6yCnKOz+363wyoIVJp1kuY7yb01wadKoaF9o9B4jSS9eH
+jzCjshvOlCJgrfrODX6sW8k0cXTrMZU70mUB+DyUao68RsG9/1L1Iw0kBDb5zuYW
+HBEHEI/25YFZb9FryWMYItad0+76DN3SnasZFFwR28f68zxb5KyUkajezrXaUs09
+SXXLOyJlXiSp/kw5CgPdlMUm4DCnQ/Z/selomF3n/uTyIdyr7vesFO3HtsCFxY83
+NpzOcC9E904KJx26lYDt1Pm4sYaC1RIzVc5VcALC7lotCR4sYBil3MUVc+6JmwM/
+uu9eftzeTOpw1sWC4+A9
+=iam3
 -----END PGP SIGNATURE-----
diff --git a/dev-java/xmlunit/metadata.xml b/dev-java/xmlunit/metadata.xml
index 7303cef96964..515ace5efb61 100644
--- a/dev-java/xmlunit/metadata.xml
+++ b/dev-java/xmlunit/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">xmlunit</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/xsd2jibx/ChangeLog b/dev-java/xsd2jibx/ChangeLog
index 709999b0e653..20f34a249e50 100644
--- a/dev-java/xsd2jibx/ChangeLog
+++ b/dev-java/xsd2jibx/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/xsd2jibx
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xsd2jibx/ChangeLog,v 1.9 2014/06/17 10:40:48 mrueg Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xsd2jibx/ChangeLog,v 1.10 2015/06/09 14:06:45 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   17 Jun 2014; Manuel Rüger <mrueg@gentoo.org> -xsd2jibx-0.2a_beta-r1.ebuild:
   NM: Cleanup superseeded ebuilds.
diff --git a/dev-java/xsd2jibx/Manifest b/dev-java/xsd2jibx/Manifest
index cc2747047018..da85203bff91 100644
--- a/dev-java/xsd2jibx/Manifest
+++ b/dev-java/xsd2jibx/Manifest
@@ -1,7 +1,29 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX Manifest 2315 SHA256 5201595492ce188576c18415aca69229681c860b5bbb7747a1ec89c7d67744de SHA512 92d74bfa9c9815485e640c260e4ab213b2db7d925c9ebf377fb9c28be16a56b515e594c2e275191fbc8f175208764154f428b6d84c78681eb528391204da4e71 WHIRLPOOL acea0754ce2b03beaa84ef4d684c8385a079fd2d8510f9af131c365d02126061ba674dbbf70baf74e0db1d3512ee59d7417d8adb2317f91ec9dc475cad7c297e
 AUX build.xml 2458 SHA256 53cec632269f65210b4cafe6563b92b0cfb2f214b372a886e00b416e4713b84c SHA512 c79d4448f740ea8b744222955a216ffa2ca089c94d462adae42bbd7dc10764ac1b302b9c063bcf757a1bf2fed27702deaca7ed491bb8e1f7adfddbcac1a6065e WHIRLPOOL aad0147e5b4b13b9f888b0149ed205031405359ae3002319559d20dbb229bd1285d449e4790337c4299c7e5affac07fc22cd049736aa6afaf7e7a21a81488d66
 AUX xsd2jibx-0.2a_beta-freemind.patch 3010 SHA256 df51d6a5141f026c44265be3d7528f2ef2f03364bfd345bccc101f94e2e0ee69 SHA512 617d8d5c956400103228928c5869ad66ec6cc8c4ecd6df6dc393339e3afd61cae3204d5b9463906e262a3a39e6d188ff1e83464fda25550988230c4b9488ca35 WHIRLPOOL 56937d0666ea894f5f8e158705bf2686be8ca661e3ea6982a2ebc66e5ab11eb4836474fddc2979e6f0ffa336f34221f18f8f70d7458c9603b5153e913c7c0652
 DIST xsd2jibx-beta2a.zip 961258 SHA256 615d573d944d361dfa23ff1099c543c78fae1943af0735c7a7743a0472c865db SHA512 d525b5e71358c4ce259d7e65abe5ee0214b89093d209c07861f4069919d6c13ffae292b5db80a6f01b8451363aa6b40706beadd04f663bbf1224aaf3bed5b0a2 WHIRLPOOL 7fda5e53a5d96422edd679cd489038760951a39afc2337dac4ce0d103e33ad293c8fad558fed5a3d4626f804050b8bd1d331a727579fc3ee84d74f80526eab2f
 EBUILD xsd2jibx-0.2a_beta-r2.ebuild 1455 SHA256 7901a0ed4ff886fcb782061a4068a76e8475f39fe9600e2701670f36bdc4a8de SHA512 429073e2e8d35e5eb1e9123b3f50a0546a91db496a5f307ab944c4daa1ff0fe1335a0c1a4c26d06a79c45ba5f526c602d3dd6ef45d4fca53de286cb72cde6491 WHIRLPOOL 6c3f33cfc989dd19941637fa0c2b77b42311b32447e21b27955520d16d8cf03b82d7c9237e6c0151c3b8d9fa5cd8637e672ba3d58d194c6277d8c71a0ffd7880
-MISC ChangeLog 1561 SHA256 e4e7f61846cba73e350b1426da5ae3652437bb4459a12c51b2874ebf8cc447b0 SHA512 341da6346ee6f0771d9f68f163ae4108e78959575a26139b7039a53bf840dca16c94ccd2955562699a987f19f22ccd3e6818002559618a9abc4e61c1ccddf562 WHIRLPOOL daa629e8df0a67b3b015a75e642d0d130559ce1877a7dcf7098b980bd57db721792d325bd32f10ac50fe725fd7891e0afc9d520b42143237c2ca67721321ab6c
-MISC metadata.xml 157 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 SHA512 bbae663e26f48fdc5e272adc2b06c14f77f34c53caf84acb53908ff036e7c12a3edbbc0929d2db56bee861a453381d979c7e0983a23716f629ed2135c22ffece WHIRLPOOL 887e153e2481e7d76f0f1b67a395f10f0328b93930185ecdb8fcb5fe3c50f839086a18831d61cf45b34657aaffca6c3b7900cf3c04b712846a05027a84602448
+MISC ChangeLog 1660 SHA256 eee3e47d23ae507297459f86ec36230666bcb25ee73b71f25dc899d02eae6628 SHA512 2c3760b9535f8c3d636b200b0bdaadacd12f47bd7b2f9275f5a78bdc02d537a2e7a292c2c4e468a595d028efdc47a0d91065362ee056ea2fac7354c25175c1ce WHIRLPOOL ed6c4ba628b942919e3300c67b3037aeaea5f5ab3fafbe1f5300483b5086e69e6a13ac072a61c23d0ac4e02d69ea2c5607f56636f9b9346fff08db5473267e41
+MISC metadata.xml 232 SHA256 ce0c5d70dfa19270f73cd656f67560ee23fafbd8b1c94fd6e0ba47ce0c0a5877 SHA512 ef65da280c5d4b52920b61cd7ae20f67131dc0c9437fbdfb4229976ee0fad35c53a9da839d03f4b08ebfc4e4ca149eb9e649eeb8ea11154021f2b60d662512ef WHIRLPOOL 7e6cb96e7d3d992f5cf5af7b83c8e963e67b835d27af5f7762baad7c3ec90035da18ea28fb5fc35b42745481cd7c3342bbbb61cfe8a9bdf3113c5eaf0c6d7d92
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVdvL2XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiQyoP+QFxF59Ngloh+mztW5qO/8Ps
+G+KFZaMX5jZ+aQUml8pRJ4pXC2e/m6A7UEkrrOyta70wjVmjbatCXeDSfkyeEGmP
+lKv6asgfU37Rf+b9HVz+V0VFA0EwWOmVTDi6C0K5A/iV/whKwULP/DTbQfirZBve
+/XR0hegKgB7Vco7PnKtD/HbynjCIDWQVq8IY0BpDpVhWMjaB8VM4Car+hgG2izmt
+snXsH9c8ZGS67TC8foq3mFATxPOep4dQOdw4sEE9N2IO6tiM5cOCLsSvWysSAwRo
+LKfgsVQwGGptI4DC4PGuUZou2Tl/YoC0ecNIgWQ6/tp96D0LKJq8sfbm6huJYFwS
+s14/a9yjjF6R6iUYdISNdPtUo9R9ztznRMRKxE34YRRrmLqXfpOgPiS82zTOM7ec
+fT+80mFQM15URBJ3dkxrefZJ+spYfVd/PXRFtBwT4nTYP6n8K9/XfoPZAevhcrlQ
+M4V+F9sRJihodSRfOuecdBPO+gFdPKCzbQ08VIHeHlO0dypi7Estmy1weLwMbPuD
+ioSLju5GZ9k2u/METhzUhZGaNG5AwqlcsaDxIP7odGEieDD8mKOGNEu4GpnWdP7A
+GW7Eh9hg8XXAi5Lr2PENsYJuA2jg98oenB7mm6mAo7JEs1VkpW3jMMcxLEKzFOdX
+Ls1rt7sFGbsumFhVstf+
+=A+ue
+-----END PGP SIGNATURE-----
diff --git a/dev-java/xsd2jibx/metadata.xml b/dev-java/xsd2jibx/metadata.xml
index 838c00a4a448..bc6fbe14e0bb 100644
--- a/dev-java/xsd2jibx/metadata.xml
+++ b/dev-java/xsd2jibx/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">jibx</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/zeus-jscl/ChangeLog b/dev-java/zeus-jscl/ChangeLog
index 1f095bf74e2c..fb3fde76bc83 100644
--- a/dev-java/zeus-jscl/ChangeLog
+++ b/dev-java/zeus-jscl/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/zeus-jscl
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/zeus-jscl/ChangeLog,v 1.4 2014/05/24 07:35:48 pacho Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/zeus-jscl/ChangeLog,v 1.5 2015/06/09 14:07:00 jlec Exp $
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
 
   24 May 2014; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Cleanup due #199047
diff --git a/dev-java/zeus-jscl/Manifest b/dev-java/zeus-jscl/Manifest
index b370fd03b25f..6ae3783af336 100644
--- a/dev-java/zeus-jscl/Manifest
+++ b/dev-java/zeus-jscl/Manifest
@@ -1,16 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST zeus-jscl_v1_08.zip 411676 SHA256 c33ef05673399d3da9c8ae495bd7efd9513bfae953c056d5bb62467d0be37953 SHA512 7c8de7475fdcf307ed1b604eed98eb3ec28304f112e1aed9e5349f648356ace38338ebbc0a204b40e10c52dcd48bed878523187ba75165f494a08d688d8d38ac WHIRLPOOL 2e5a5e0adcd4791657da1094c4b4502affc32096dbd26fe1faebe822976f3633a1e84e285dcb49106ab5bbcd72a7c90583fcec807ce09d2105fb5a504bdd5bc9
 DIST zeus-jscl_v1_64.zip 585558 SHA256 d76ddc5b76648b75b5ede5f02df6ed498db12d708413adec2900a67e1e0c4e9a SHA512 e756df28da39322121575041a949965f47eecea6106e7dd619a4f0764a239131e1ab8a9dcf7c6d461fc4861ea86acaceb19a5a51c8002c990999193050e03b10 WHIRLPOOL 832b7198472a8e0ed1ceeceb171b18fc66a3c9249c785e40430e2e01e75d21a3848a31afbe92ffb0f479e462357cf782e611b6e9f131d0fa9e0a5b3f6b59e3ad
 EBUILD zeus-jscl-1.08.ebuild 808 SHA256 641c038be48254fcbfa8c0a0f18cd105902ea165e61fc7dd0674ad2c9527226f SHA512 7c791af7edff718a5990facbca545097192b7eacb90894d0aaa73ade425753a4a9bc606a16482f7c228d4ef126fd2c1c572e7ad0199b3cdab56e98feab961644 WHIRLPOOL 6525e5529f1a2cc58568fc7c5b5a5a10a39971934bb8a0c776e5de4b8e64115da1d6cfbb0b72d760a6dda63597705e25b122809bddfc73e868940f2027ee71fd
 EBUILD zeus-jscl-1.64.ebuild 807 SHA256 397f7f85ab9ee99c8450633ebcbd25ed955956c2df3afa2e248b010fc1464cd3 SHA512 cfdd1b4e3cad70cb75c869e6e8a4cfca6ea16e19e2fef035ad5a857d47e6191792e8c192bdd3e63e901de07f73e69e1448d21a247efada306c13ca96544be88b WHIRLPOOL ccbbec8d9adbec246c9431fe98c6acfdd3337c5b8379c950b8f0063deedc8a8457f05f4a7a697d2756cb7d6cc165dfb701184eda3ddd4e5023f26096912b56ad
-MISC ChangeLog 892 SHA256 7e5ec239b3be9f29f131c3cfe5042a467f30b7838f1d404a7b39eae0cdc57a26 SHA512 349dc3e9e89e02fc922f6e9d29107ba50ab377b9df7de2f164d9e56008b3776c726bd2d176acff7264c2e41ce1b3294ff95cbbe2d771d6445da694ce522657ba WHIRLPOOL 1ebbcc69dabd8502ba027b83537c8f838cf9fc0d0e7981f694ac1a36a96d41fa57f299d9612321ba5d30b87079704b262c52e006eaa96e17d1d8058d9b9fe9ae
-MISC metadata.xml 159 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb SHA512 74dc9ada199a90543b8e1c168c7054f2e973fbfa2551e2b959d67501f2538e269cfb4b2f0905a88a1afa04c20b33961336310ba876f80d47c8e7615b2d7c830a WHIRLPOOL a0ac49efeca233ec4d8f63eb69c8e46e1d4ecbd926693c25b1b8c7415e4c565680936aec46f0c4197116fd7a19a3bb571beee493c18bdae1e5e978e3db84f17a
+MISC ChangeLog 990 SHA256 7a28e1cc30385ffa1916218aaf7c04ed2acf062ca138806e041dafa7863232bd SHA512 53ffb71664bbede1bca2a78739c77dd656c4cc094ff1db757a347bc8a20013df3461eb1f788d89c5561d11aed5c70133a8714ab5096b5cc3e94e285aa8d427eb WHIRLPOOL 402f48279071954051bdebf5f071b2656fecb69ebbfbe94d8f5409d3e7447bf94b34c4d7b6f9779432a85c244780226defd8b3c26cc512e46e831bbb6ef0c869
+MISC metadata.xml 237 SHA256 535741b96cb06bab08f1db2a4a4df54512af9d879378aa8722527e1f6c044e3c SHA512 2fa6411b16f54eceae9d7fb4c607413d48ab0d1a80da367eedda303fdaf219ab4e535669dec4885c8ce0761bf3c9c8b6a90ae3cef35edd2b2510fd76c82f0a18 WHIRLPOOL a2221d8db33746ff39740c7cc400e72ef34e13e956986715b762b11372457cea3dbe421d99b784d7e0b0125ae748cad0cd3eeb4d10643e6bf6455586c3e42918
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlOAS9UACgkQCaWpQKGI+9S0oQCgh3b2RWPT7u6gz20ZL/Etq85O
-nGgAn1BubaFFnVPurSyZ22seeCbh12Xs
-=ajjE
+iQJ8BAEBCgBmBQJVdvMFXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiWPwP/1it2da6v6FwLmHkCQn6gx4q
+Jg84pKEQGeF1OjAjI/hNZLrRrA4SUZl+KRx/ac9tV4SAwQq3E4R2T+kRnNfbWPcH
+m+coIxXY671rkTIIZglJfjEsa/g0HjAzQ+9IYXCSb+B5rUqfUqodSajsxJY/KTsY
+u2m9f21gbx6j+WVHIYlZ1fgCMCASF2YC4GS/zFHn5gCEWu1UGJbclCJQFMoPDWGi
+GXpVLuJZy4iTo+5/kVdZ3k69119fsmOLSSkbJhKcTfHV/xPZ5VkppMhHH8LPBJi/
+0VlAmhtUNcV3KSVCzVXFL85Wh8x2k+GO/+dt3Y6xOFJayWxUijwdLV2ekyz0a17a
+9/Jba2zlZ0eKBkR2kL2qLCJN0+i2uZPeqUS90JGO13QqUuT4GDSDVYE3ZOUrJRWi
+DWKA8GZXq9fiJ5IlPLN7E0sr0ec1PLBOePM9+nG+qybtvnrw/v56O3h+Ker8jwfZ
+UK+fnyo8S5L9FQwDLgnC8bRcG1G4cuPWEs7Sd17VF9vsB6mEhXicm3Ow2uNm3PXM
+vxeipQ/LryMk0tQfJ3YvyHwfMhQyUdbSKn4ypLzfdze+eOkqd4o3jxG1hIPcNtOQ
+G8Toh+Mfqyc7H8p9oWt4GD0DIkPYr5Dv/RzCtytRYkBn0zeefo9hFue8od+ps1KI
+oLtdk+Dx8OJx1EOcg+KG
+=QDEU
 -----END PGP SIGNATURE-----
diff --git a/dev-java/zeus-jscl/metadata.xml b/dev-java/zeus-jscl/metadata.xml
index 250f2d1940ea..92b5efac03a2 100644
--- a/dev-java/zeus-jscl/metadata.xml
+++ b/dev-java/zeus-jscl/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">zeus-jscl</remote-id>
+	</upstream>
 </pkgmetadata>
author	Justin Lecher <jlec@gentoo.org>	2015-06-09 14:07:01 +0000
committer	Justin Lecher <jlec@gentoo.org>	2015-06-09 14:07:01 +0000
commit	a67865b4821543d6de99a3f5aa6f464c57cdbbb3 (patch)
tree	90c60b3a90dd353d33f432e307f2e64670138365
parent	stop warnings about writable and executable sections (diff)
download	historical-a67865b4821543d6de99a3f5aa6f464c57cdbbb3.tar.gz historical-a67865b4821543d6de99a3f5aa6f464c57cdbbb3.tar.bz2 historical-a67865b4821543d6de99a3f5aa6f464c57cdbbb3.zip