Updating remote-id in metadata.xml

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xE9402A79B03529A2!

24 files changed, 281 insertions, 141 deletions

diff --git a/www-client/fetch/Manifest b/www-client/fetch/Manifest
index c0263c0c56fb..c3259c3a168c 100644
--- a/www-client/fetch/Manifest
+++ b/www-client/fetch/Manifest
@@ -1,4 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST fetch-1.0.tar.gz 62009 SHA256 a2804a8b67672fe759a8687977dd13f810718152e69550654845014c94f7d8dc SHA512 6de273c629343b1e3190d2316a9c6f88ce89ea4899aecb3684c8df623450424eb34bc99a59578b9b822d3b02a25dbf2c5a46d0e957519dcf22d4662eada7f9c1 WHIRLPOOL 006eaf575b1548c0ea2106cffadda0161788afea1d7857755892c78cd09ab2672a414992cb9f85a67db972ac4aa0bc89db949e10da68d7d20a49dc8b5454268e
 EBUILD fetch-1.0-r1.ebuild 735 SHA256 97fd4249492384d57998ff506977229b5039747d516d41dcacfa354b6fde3fbd SHA512 9da9b0f83dc7722ef547061b8ed0bdf393d2bfca62e3a43f3114546a4ace742637d19a913f568b7aa63bf1f29fd60816516e6f8092713f4820cc476dae5c0bbe WHIRLPOOL 42098e7913735337b7bdde736c95e861c86aef9f5daabb7be65858f1efa22e4592b4da30c54b8e7542e2c1674a8f9da69158ac93c6fb419ad82b7061561c2aa4
 MISC ChangeLog 1798 SHA256 7f8e9278a2d6cc5bf52b2001c05889a182c07432ef8ca6b7be6eb757256d76d7 SHA512 557ad23edc779df120538aa38e84b710371f77cbe30036e03768f6a380f0ebf85e7e9b7f05c8433b8b8cf28dcfb2515ea7ff685bc4a6ef676a91d7c9a96d98a1 WHIRLPOOL d3d5b7999689bef588dd04a8e7aaec008a3cbe1913e79829f1e6b6170586942aaccc4edd8f2d305b7008e009d924f2c36a737bbd130ef34b1c971d56d5ca6199
-MISC metadata.xml 204 SHA256 5e5ab3890a9559623b54b611734fa15d1ca805c5a365c7a0e068518dbb18e523 SHA512 9516e70f5cf59e1e126a2129e11a2823d896d09024a34e900b93cb5cab3d720823ee402ad7cb665f9531a28794e0253ba10cbaad9cdea5123ca983a854d4c12b WHIRLPOOL aa4db81c36d05a4ff991ae5c0d02714f6dca3064594b006c3da1ea818df873d45ca03722426bcf765d4a170b05e296142d0c8621303270803f00e043de7851aa
+MISC metadata.xml 289 SHA256 786824e5572aedeadb5a54c656c39d993803fd9fd34a262fc1fb98a9196f0735 SHA512 d12510025a085da9db8d38695335e2b916ea019ddb227b16d1d44329042c2cb3270c7a3f0f20ad1a5784cce3560db88d33cf8cf0c87fd209700896779af000ec WHIRLPOOL a8ac62c870ee655d602ba3898674bf92dfe6d08aa654e6be8f1552a07ca8787dfd1b847e60cc4764472a5f649814c021939e1a2a5ef5b8cc8e73ea6c8c670a0d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVfy8GXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiiLkQAKWmb2cCQ5E/thQDHWh/l1za
+g8i40UwPuGIFYh4zhNYWwmpcxPf2s8uXLXtH/+O2rmhJ911919bAycLQ9G0JecE9
+EiZHRhCy0oJjuyJ0Oq/rZwDSv8YBh0+vLkGcVQyc8mQR4WhruxBxOF4SoKIyFAQV
+E6X01r0Rw3SjGAg07Fge1Y4Zsmy+gViyF2yy495xhVVGyDgW1Y/JCLW8as//A3MS
+H9yXiQEqkaBq+pDvVPfkfl4vhTHLuamdf/rNolj1N9Yal5GHWe4H25yIrnP7noHO
+ipX3BOmwvLKfWH2aIoELdx9iOMJ+RASLI7AyYEgHwWhsjKKZ/hIyt8ooFkbKQliW
+jWcV2jE+QXZ723MEQJlYTbtAbDC0EnaviFSulQuryG0U1PLRTvcmAtABbdye9Bd+
+BTN74SRZpXSu4BtexGFYW7z9x5jHJlC/vIJDQJ8r9eE2vde18zkKIWDLyTlsvNj9
+cm7q6KekDfJW3FqFOWyRGZVxv4kZsxiX6MBVM7//hT3Jd8U+iyAFyOci0CChpaZx
+QdWbbEPXPSTE3pNs22q6KptUkV3JSQ4IA7CLAK4SDuCGmkQHMk6krHjSj64aOl9z
+asccJOUVKTeue5Va+ZZhTmsaef4FzX0X4LvQ3ca6LEuOWTPoWb17YPxzoFB5vVdj
+UO5qQW/+M8iVyZJUW4z7
+=NIt9
+-----END PGP SIGNATURE-----
diff --git a/www-client/fetch/metadata.xml b/www-client/fetch/metadata.xml
index 8f53411b3049..d658d3104cb5 100644
--- a/www-client/fetch/metadata.xml
+++ b/www-client/fetch/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>monsieurp@gentoo.org</email>
-</maintainer>
+  <maintainer>
+    <email>monsieurp@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">fetch</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/www-client/jd/Manifest b/www-client/jd/Manifest
index bcc35038cb69..fa90d56bd4c6 100644
--- a/www-client/jd/Manifest
+++ b/www-client/jd/Manifest
@@ -1,4 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST jd-2.8.5-120826.tgz 784657 SHA256 494a190ae64c222cd7080cb121f23043bd231829572cd685258185a9b5dfff32 SHA512 0c4aa0845aca71f1172a565d7b9e4a7099fa27c221b452c623b818144b958c8b042e5ab00582eee07bc8d44186a172c9abb750550ae3293851e03382e527e11b WHIRLPOOL d1a02eb054c94533ba8b7de0d0ef1a4ffed3f3cb8528784004f5ac68983e5f59b14c4898f11676ee8d111d0303fa4e21cde6f14c6d5ad46d64c27abfc69d3dc2
 EBUILD jd-2.8.5_p120826.ebuild 1391 SHA256 2d769a22af69bf295b61da8280ba531a9c040fb73698087e3890dea744b5057e SHA512 ba51a1e50e0ebb9bb633aa144c226eab53ec272e4ee01a9ba96b9cfd3d44f8a7ae1139c5f86dfe9cef705613478965716ffacf59f74e4265e1be1f17df3a8c00 WHIRLPOOL 632d01a73203550b4e3133cfd636d599bb6bf3139041448379f4f62ff016a38329776df554a82d47a5765f9a31c07005575ff259d11651bea2e851bccb04d1c0
 MISC ChangeLog 4984 SHA256 ac476efe05d2c5b90a89d818d6ed386c9875809df04e861922bf41e0de9bb1bb SHA512 fe7845501ca4de038888e65e46916b5e28fc5e7a6a0539043526ef5487d2bf635ca37cf78aecca0151c6209979d41aff6d5864fe70d6c974f495dd7b2d9459e2 WHIRLPOOL bef742b5881e4a85b6818492821a957e94a36061f8e6587966e2100b6ed4379120aecbf287752c7dfd84aef296a8fdc82104602e25ebf61666c43872f892dcfd
-MISC metadata.xml 157 SHA256 92a8379a3f1d8c9e52e17dbaf224721ad5bd6ba9fba4302e909aa2b099b33f89 SHA512 bdbd7d926319ccc9ef6d3419c7b20af690c09e4f7523f1ba4a349172436d1a916dad123a58e0faad249f24b9813251b264b950bdabae68136be6a0a96082d784 WHIRLPOOL 32fa9ae24bdd6c9bd52e94e09f149cac3be4816ff28868272ff501c28bb911c8af52a97b4b325bbc863044c81922cdd21ac8caa19cb700fbb9b5858166ad9204
+MISC metadata.xml 238 SHA256 0f857e4f2bf6a10956bce8999e8cb0c2dce34654296d52b88b4caf2c15286127 SHA512 ba026a427943c7a0c93f05c1f62335f10a06a17a04d4aab86c206ed253179e03b2fa0841bbe25558e8e54b01e34f265ccb5525c7a308995812aa1419434c1673 WHIRLPOOL c922a04e869a677f825f104dee312170e0d97a635c455fbb24f03243400af510c15762af5d4bfce974332104b8459edfb2526f5fc0a58a5b964f6ad0c5d66fe8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVfy8OXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi0SkQALyIsP5g4mWNaVGH0zOIm/d0
+WZM1czKur6u53BHka2JsvHguIr9qgsVG6Utr4ivDiWEWzYrby4hEGsbY4qeVxLA4
+i9dVJLOCraLZ0LPPdP0RtYIJsMR5YEcURIQNZe17ZzUj7cuxjMZoN/W7CWThXBQ+
+bz3sUXElDkuw3Lc/kXK77OdXTkxFoJ1u0RnUy/HMfcN/ct+QH0ARRJwqSrChAiGx
+asItYpS0gA16RJkte6tKshZaVZ6IOu1Wwg4h0CLY/JvEV2G+9bP7PlALdagIerqq
+bs9Zk254dqRhefpvhdlJ99roKlWUSxGk2f++/Cxflh9gRlkVDvY9Abz7EeKC+f88
+TkVLuy9dZE3hm1RSTp/wGzwa2/t9egfHJ1TSiwWnMb8SnIxOWwmSrDKSbNlRgSYD
+R1u+HpT3z1iI6afmopuP6CDmbkrV8lkJE4nXiU8V0YnhmYpIdWtv1BvjONSM5S/6
+L2Ogb8UzM5oMOVQtjmw3VAVcDXvEh4h8Ui8Y0CJsIAiTJ7vkIHZfWtWllDf0HpO6
+UU/O+6NO1TyQM6cO3hUmIFn63WOKd9wBsvf9nhRvH0OFW9F49+Nih3hGd7b2lrO4
+UgHfPbE4TI3bLS1CL4qI/V2V9moY2l4iho3hXwKo9FXgYQSC45QK8ytN2ihV1001
+hevjZ3dHpCgpqy14y9Wf
+=iFW5
+-----END PGP SIGNATURE-----
diff --git a/www-client/jd/metadata.xml b/www-client/jd/metadata.xml
index 51689f0cbcb5..8aa71b38e8dd 100644
--- a/www-client/jd/metadata.xml
+++ b/www-client/jd/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>cjk</herd>
+	<herd>cjk</herd>
+	<upstream>
+		<remote-id type="sourceforge-jp">jd4linux</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/www-client/luakit/Manifest b/www-client/luakit/Manifest
index ee794626779b..9595b0634901 100644
--- a/www-client/luakit/Manifest
+++ b/www-client/luakit/Manifest
@@ -1,28 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX luakit-2010.12.25-fix-deprecated.patch 775 SHA256 110cde6753f47584ff6886ce81716aa13a38dbeaba20bd47fcfa6e11b51fe750 SHA512 5e30640a5d3ce041a4641e198721217e1d441be841091c6d562d7251934e16f9fbf8ac8d2ff97286c332907a12628152a979ba6a0402af7a63ca5f33d6551e8b WHIRLPOOL 1083db7ea3bb2d3b103d2d4051957fda74117efcaa8817a411218f1340236d166360075f0e96b9476c75043da86414c8c68a257cfe3a2f4ed4b05c914090ab50
 DIST luakit-2012.09.13_p1.tar.gz 215431 SHA256 688950fda11f032976998b52ba6505fc1bf5bba40552293f9ddc748b00f76132 SHA512 429f2911e6c0e28966579721925d3f9bf492461b3f43cecb07df5f2a7ee5e791d30885c50039da6849ec8d16e8b042286482966c036089e87c568fb394aade09 WHIRLPOOL de90607402cc13eab7a84a3f9f75edaca976f444aabccd1391f7c7f20fe0211d78d8d4c3d3685bcabb84622556617411c9778eaf6abb23ca826992c4914f0064
 EBUILD luakit-2012.09.13_p1-r1.ebuild 1759 SHA256 19ef384d7571fd0f404b2440f120e976d7676cc4f9105ae4dba5fe9bcb5994b5 SHA512 2564d89ed6e5e20ab27c158c316bb4b2f8806d8fcdbd35a9e8117a0b1619dd979cab7a7bc6cda0e475de6f28f7cb005fd44770017a389ef038821bd6b3c1cb3c WHIRLPOOL a3a186d72b75dba2e3eb2432237d2d22db3444c02eb5aa39bb67bd9d2e5fe65ffc80250b72aa2c22dde90d68917897a0fe5314873a7bc51910a558de9186c3d5
 EBUILD luakit-9999.ebuild 1950 SHA256 023abc0af8c31aaa11a23df698cae696a2f6ab8cb9ae503e07d900301de7b56c SHA512 43a0da67632d6270e46ede5cab1db6a78001fc8850e02601ca0aa4eedb743e81e079cc1fdbabe368b12e341dd19210079629e8de826f0e28485b07991b5f2de1 WHIRLPOOL f4bb99fde5a10cb35684e72c60c42042ced11fc1434d6f76b3e53fe5277cc0879f425ddcbd71125bd6daba11da316f692af9a5a21f520f83eb0188cd47c12234
 MISC ChangeLog 6040 SHA256 5919511e851249f70c22643efcc964044765c61069073a1631526bbea7a4cf23 SHA512 ca96c92c8567b84ea544e91c0eecc9a29f2341e860efe057560a2ef7effa9affe46aee7b2186cda55ef54c56cd7a01538f6af72e11c3edf8e14f6a83df8d2818 WHIRLPOOL 9c88bd032fe23d4c102dbbbbe558b911edac24f14be2b89950a62d06fc7138aac1bfcfec9d2c47233ce3518c2539e2932304e4d40e78a8cd1a63f55dbf8957d3
-MISC metadata.xml 463 SHA256 937dbf29ff0e5da94d7fabd9842ff280d3173958a6579e62c72903ad3ffdd9da SHA512 fdde22c2fac0c9aca37efaa5e7d4157405426e49fceeab471f46dd9f04ac9ecc96db1ab0931a2c2427b22b23cee3a792f5f8a6ee1a71ea04865e18d8f2698509 WHIRLPOOL dc57b506a95136e4a3e6b2d54952c0803a97e3b7c11763ac964a427999a48f37acc4c9e47a22ab5a4e09416501f3905096e1f6f13d4578b9cb7e83ff5e874cb2
+MISC metadata.xml 549 SHA256 ce430db065828748c81be84b4e5e41309bdbd3799dc58baeded2e3d192b1e6d8 SHA512 77c8beee1945248bba5e867c048d55ecfd7358bc834e60b1c4c5aec7a746a8b0caae8bcf2de34046d50a67f682325cc795a262874680293e4fdb1ec06dc826fd WHIRLPOOL ac1fe4cc88efd8df752115a9c719c6d764877769e6e034434cc670a03f6cc847fcff08705f3c0af88bd48351881a8fda0fd9f9865abf64012933598c6562885f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJUibG+XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
-QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9VO84QAJu27cphEkrqVSniw78Rlckh
-7MixHKwvgGAypsRNeLv9/v+tyHsh5YSR9fIj06z96iGF1N1RmWL2IDfwvVtQUfmG
-RQzNyEsa4VoJEU0t1lHoqJdIlHdfh2VE5lMIQ1/saR/rPzSfi/L1QWdE01a95lRu
-knQvLsrM9SP20w/zU7EzLN7+SKdJBp17IxAcztWE2FYH7qrKKCxemgrZxtPNfcFA
-XDyvfyCMP33e4emtgcNMMlxRZSKCBy1AfpKfyVz/5DRIlTfVomUetqVAlASD5mpX
-acmeGiVE27D9EcbhtG+o7X+cXeeuZjmBB1apCjl/hAsqWVmcsZspEm7fok7YUJfK
-W1ZR4OTLi5m5zVNkeGb1MwTuZl/t4y2CLeNeKNuPJg7hz25f835EZmf7oRChvAhl
-hm1KcGagkOd93WxihFpVrNkqov8VCuATsZa+q6XnXrhrYxR6fOrg2Gle7Pe9qEb3
-L9VKc160rQKvhjkhYVVDs/tVBy/BQsEIyetdf86knFh8sc1MtTel5JAARe8P63O6
-koHkS2IK+oNhXTpgfdb3kDRHyS/kVgamp4jNbvU4UYP/g5+k+lC/tlxJEsl614Sx
-mZMnkz5TuE6wPxxdqNXvieUFbO1gFjTIOqmubd2aLm0m0cH5FdXOXwHlroNa+bPq
-SakWO4ReXtRnTdIwzXIa
-=q4pU
+iQJ8BAEBCgBmBQJVfy8YXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiUjIP/Rky1rw6glBhpsSmCr9vI/Ti
+Uz4qArp9rUt4n43L77ot9TUuPNW/Kgu+z1I1/NRutSdtiVhjSoHF7L2plfcA4bsj
+MIL6ZwEY4woZjizXMrI/Qn2IV+p5Pcr1Uim7yDl3uXblJ5IaWJKfSNOONNwXs3Pd
+nyWkjkGNv2kRMebbqf8oB7kFwqN7R2kfgsfTDcL8ZqlMX/VyuUkdtdPEit0jcy3u
+RAbmjdngoREWmGvPfidOF5+i9bK1CRiRBifkAD1P+xHIbCt8aRRZU3mLMjS3Ac4T
+TAcHT87+XN7373dyjMxhihFK1FARNmngDMPbxd6qbxzs8gDhIws41YjUGd8lFwmc
+hKe73X/hHxLJ7TeX5g7Mx4EVlN9k0DxtM4puR7AR6iazCU+skxUoURAg1ax5ER+e
+FRgKjm0tsfP0zHcQqui+eJ/awzCMo3Z/et9Qc5J7zNhbycHFN9ri1ES6Q6NYyUDv
+m/BaxyFDGNIUFf/7aZjOfsz5/yAdnlTi8ECZaqP58w9ex72pIF1RtSv7O6itSQdf
+QF+jk2IbbtCousLQtuAHZjt6YDhOqg+e7VDtqN3H1q4GcYfvcZc0GwFZ7sl7rt2G
++VgwWxEVEiOqO9jbNpBxig+GAM0VI2z/MYE38MFECwwMuh0A7zM+l6XOLa1YbUxh
+36MdQzBrLZ174yz+B9a5
+=3rkJ
 -----END PGP SIGNATURE-----
diff --git a/www-client/luakit/metadata.xml b/www-client/luakit/metadata.xml
index e417547e3e94..9156b89c7a5d 100644
--- a/www-client/luakit/metadata.xml
+++ b/www-client/luakit/metadata.xml
@@ -10,4 +10,7 @@
 		should make luakit faster.</flag>
 		<flag name="pax_kernel">Use paxctl to mark the luakit binary.</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">mason-larobina/luakit</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/www-client/pybugz/Manifest b/www-client/pybugz/Manifest
index 9126749c0bb6..025d99c8d103 100644
--- a/www-client/pybugz/Manifest
+++ b/www-client/pybugz/Manifest
@@ -1,15 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST pybugz-0.11.1.tar.gz 23787 SHA256 05b2cef8a655ab34d9279e6341d16a803af07958e72320125cb30a3fd6bc8eec SHA512 bc2277a8e900765bf1799e5de65de5df8184bf50b6ca7c78478a9f43ceb78aa66bcb53c3fd89f7b194b13fa14ad162291d559554a8cb073c071104e2b0978c61 WHIRLPOOL cb8f9a36cac6ae7a42e43d6d9489e2593c8ae76153b769bf04f269967e6477e37b1633d30969c4d7c6d0bcd816aff7bd189a1754c06769e3ea0f761eda3c16db
 EBUILD pybugz-0.11.1.ebuild 1207 SHA256 8571ec88e8bb9232977f6f69417c926d620a6493a22722e76988a1ab2dc24544 SHA512 71bd89b96453e4399a805360aade16d23793e8f05aa9e3db7e9d792b308f2064985e818ae0be5a3917ae762c6ced81f938d143bae2cffe3eba03dfd749f95ffe WHIRLPOOL 936dd7012e076fc5632b2fc4846d390bc1dc34a398e1fad18a0c7455faff3e6f31fa36e3a44c8fab68054b83eac03da2395627ae4f7143aee0d98cc28dd79a96
 EBUILD pybugz-9999.ebuild 1214 SHA256 dfd359d59248cc92db76aa847d06540a07d4a3c95bb47df30a4e2a6ae6458d3b SHA512 d72ab87766398c357e84adb6a6339d3e299639161a5c708070e16af9ba9e81c87795af8e42b68652add200b06f3cd44ae4e83cb30c79791b0ff1bd669343c8db WHIRLPOOL fc67a790da381846e3d1cee398bf5743a5ac9bb5cfd193e53296e1677d2f2184bd94cd23f206f97a594afe62d8e5f61cac10e1734c6c9a92a8ae0e280e3bbc2d
 MISC ChangeLog 17975 SHA256 5ddbb99603f0a93012f74df5f6ea4a175548ac40ba7de35436ee0fd0dca61549 SHA512 8569fef0e47f48dd91e74464eda92b1d7a2133f7e3d9f4287215fda6b43a85e8a134ddf89e7336302e1d5dd4859ec03f9308da2874410b8582eefbced02f4b0d WHIRLPOOL 838ea4b12941e7e703fe1555fbb9eb221d4526d653f30605e6f4a34b17363fa25ede7d4a779cb9ca5740af085c7a0ee4c1f67425e8d13d4058de932ee6993c73
-MISC metadata.xml 209 SHA256 9702266f06a8210e65427d02ae3fa7d4b4d3188866429279a27715e9e9c34bc5 SHA512 205ea975d2acc80bad01cd1be939e75a10b5e165fe39b4107eea9803672c2456554a5314b2daa81f59cbbca5d25c98f08c9f0fcbea7b6927fc2f478b4c92b113 WHIRLPOOL 7e0d16169a317148046f705628c0ce5d7ad2d34c6edc367a46dd4e35c6472e3449aebec3b8b6549273aaee15cacd2d31c3021d17ce07d9c62b4b31ae8c9424d6
+MISC metadata.xml 293 SHA256 d7c957e70cddd71d95c3a64361f7ee3ad8b7bf2912727318a12c22effb7030ef SHA512 d029c887b4454a9eadbc45f4149d21ce32d9006e2440a3350caf6e32b3331af3651ac3a4b3ab8a4ea62d6bb547b70be9c9cc844b998140f6e2e36065657f0cc9 WHIRLPOOL 991f59c339a976ac8927715f2c10e3c248e89c2396d35404e627b295f5d01447d6acfd929c37df677d7e5b24a1e803f5e52d074c3539e2ad03de37d8fc48fda9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlUXks0ACgkQblQW9DDEZThSfwCgtvJIyC5IQyh7SbqqIFsbDbb9
-fuMAoJT07kCp6N0wYu2u5J3AztZ+6YdI
-=OBXZ
+iQJ8BAEBCgBmBQJVfy8qXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiNP0P/ithN1B7jgM+JK8T8upuQswh
+CYf/MtjDN/R1p8GQ2fzPUgNY0ghqzyS1VYbFU8k5Py+3lUqAH3fNyrLU3JUGjn9F
+KNSl7/TVXNnhO3XqTsu1e7KtokibeFXaIbwB114kDsWTuH5tEiiReWDgthw/02OP
+O7KX4Qda5KfXJC7Rpur1Tg1qXJEazHn9LwaHh15OkdIM3qyCrEAAxkKWhA+go2Ec
+uV9C6PTxQQaWM+gO7KlA640ExNfHeJ5MDMCT6TzSgRNSk/VLyCoBMrVi3Rz/RJVl
+t3A9myQkweByuYkHtqYMsALmSFCHR8aYFIZgt5dos8jaqUe8kpYxVG4vnfyCwq/P
+qX6gWsm20krm6dTNFzymTO1I/FNptskxMZHFQ87b5VbGzW1siIImAUzRbG1EaoG2
+mDPKuvaBRdAFXrJhCAfhtba0/S4OQKr4iaFEDLQPIZ8UFRYQJVtob9ED/96VlSkx
+6cl89+PNUlbLFak6iHYJD/OuHDME4re2zCdWGMG4xtApuHXK2N/KruDlIxsnvBtS
+jk6VGvmjO0T3q2R3vOYrkhF1khlxH7Vl1YIBvJGwZEGNLYQ1M4S6oYVzooBH052Y
+5U5yHBoq7AVVEiU5/QHDkxeoqh4zvN6R8pbvoW+DjoNDC9GiEo+41Jdzg9lEACLU
+VqWSaSgUV8cQd36CR9xc
+=Bkc9
 -----END PGP SIGNATURE-----
diff --git a/www-client/pybugz/metadata.xml b/www-client/pybugz/metadata.xml
index a8ea03ad31e5..acc1dbc07272 100644
--- a/www-client/pybugz/metadata.xml
+++ b/www-client/pybugz/metadata.xml
@@ -4,4 +4,7 @@
   <maintainer>
     <email>williamh@gentoo.org</email>
   </maintainer>
+  <upstream>
+    <remote-id type="github">williamh/pybugz</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/www-client/qtweb/Manifest b/www-client/qtweb/Manifest
index 47e3d0d773cb..053bd3be029c 100644
--- a/www-client/qtweb/Manifest
+++ b/www-client/qtweb/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST qtweb-3.8.5_p108.tar.gz 1126836 SHA256 4b0735af1ab88b8be0dc0ac0d5acfb3164293a73a26c6e61ef2203a4977bf0a3 SHA512 7bb2f1760e41b91c65185cce2ce7cde639262d7b04256d766bb128a19046c97c645fab329676faa88a66407e1b551f914267dadb0e4f5f6c6f6d8ff9aedc8e46 WHIRLPOOL f43cd7179cd548ceae8c1cd1c9df5f647363608d7c27a8799bd5a0c494b43f2f092a37c78e3f14d702dde3c2641f29c1708b4f79892aaea719a363898b7f4760
 EBUILD qtweb-3.8.5_p108.ebuild 705 SHA256 5f1747f7df9c15e6ebaec6f07921f2b1b1ddc30bdb2a8775e4a0265ba162fe6d SHA512 a8774a9758b7d60917dcacb786b6b28c742a54a772def0cef718e46559e05fec019f14ed648c549187251398bb4df658d166b48827a8a55ae0bfc6b49f2c85fc WHIRLPOOL 9a6d69158011410e15e5140f77f17112467d058daecd90d1746d3816752c540f689ff8dbe409a80c6dd8f386d13ab4cf30446b743e2fd59c5310373d994356ce
 MISC ChangeLog 1048 SHA256 f360bc3eecd26e85364294c6bd26473f49cd9b34fd6ba785852572b2cbe804cd SHA512 040bd707e70169724467e68ecf31f50f719af6d032d748751d046624b093d0922e3531eb4b00c2170d368738183dc78c265a8b712fdf80d6f42a14c78b5b584a WHIRLPOOL 859b38be112a5d605337104e9f37ed9e9388ee97b0eed293061e0c7604301d45e4373083a8bb5afa8d92cda511e4ccb0021ba441abeb7da746bf6c91f43f9cf9
-MISC metadata.xml 224 SHA256 d7ffc52704d4bc0180f6f1c448ea4bdd0e3ff3a562384dc944af4a00debc9620 SHA512 6487ad35c6f3d2e4876714919e7bb01fd65f57e7753cbfc318130727dded4fcf8632a06ab9b7a3016fc1ab127434d1d20de2dd0ef2cc63ad162023f2dbf64b1e WHIRLPOOL 879ad2c41f2e1297b677803b2b0478ed2affc91059b198524795e1a128cf8ab6b9fbe78b53bdd3421041f27b419bce387a267e389111125cd55b05e260abc998
+MISC metadata.xml 309 SHA256 8c830b5078f27ce25af2e43ae9cb5d97fed1a4b4b19bfcbefff954b45783845a SHA512 ac6a4d8186e21a6e88c397c5f6fe35a493ad781d7e0d5da48f1ae06a55be001215082ccd370444f4de498bf0ae5f28f499fba2c43e2b602b973b414c02bf4b3b WHIRLPOOL 8b5fa176f709f33d0a6fa1efabc68b8a15726d705523f04d58013b175cf814a293368d938598a171061c6c7d39a004b634a06941e91d67013d30a897b99e71a7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlOiPEIACgkQVWmRsqeSphO+sACeKvOm0240m9Gd2jpRfo5CMoKd
-kQIAn2qYW8yB2GJ5kRiy/X3kPK/Uwuz+
-=RZxr
+iQJ8BAEBCgBmBQJVfy8vXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi4sYP/i+UsCLEtnboc180zFoNZ0+b
+VBDxKsV6qypGtcuCEDfC9h9m7UlLt8xF3pMN7JoGSDhucweaBIMxkBzf144MTVCz
+cPoByRMXMgxzsHZbxkDfqJzLOKIwZTy9DZOJLlv2CKy1iOogbkX4eAAHXsCVeenz
+bloTCRR72lUzBDUOqhOmqG3VrVjHTSnjVCzwwDfkXq6YDgYgGYp/zFHLDrvTbgLA
+y7HbCTxwHWgAp6fg9eoibyXxLlzA4DUzbgAMn/Sz9h4hLz6H2CHbWVxsRIsgPTRV
+FKnXzJVphwm2ZOh89M53Yn7Pcy3fRdOg0kZqefurlDohTclNiyiUmrl6tywcrlKL
+ojyqsqFokj2HRjRNXbOWknnbQCyglIr5igCHmwJ0Z6ntrtlrh5Grpo+c5OWnmv1m
+KTcfHxsq6T/SZjUiD6OjHntJorOVT4RLb9eDAXY/uTLd/3p2Uz6P9H5MQQ/DvU2F
+cuZQOTKs2QEzZ8hXi2Q6Ih9ixlGY1HtvW3fa4TWZRpD4OfxXl3bkQZ1GGiX6dWYg
+P1cgaxNKwpedTA8ZqlZxcbu57f6CemvpzGl61poCs4dblQPtvYKpSBYdMum4HOro
+14rLOvtt2wlhnoocNRtlG6j1lW6jJmXVgLPG0LQsa/Ci/SDjyrITC7KMxd6Ep9zE
+gifoIk4BnTVzIWe9+NnF
+=dvNr
 -----END PGP SIGNATURE-----
diff --git a/www-client/qtweb/metadata.xml b/www-client/qtweb/metadata.xml
index ef0483f9ff68..5078e95f7191 100644
--- a/www-client/qtweb/metadata.xml
+++ b/www-client/qtweb/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>jer@gentoo.org</email>
-<name>Jeroen Roovers</name>
-</maintainer>
+	<maintainer>
+		<email>jer@gentoo.org</email>
+		<name>Jeroen Roovers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">magist3r/QtWeb</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/www-client/qupzilla/Manifest b/www-client/qupzilla/Manifest
index 941512167fcd..84b11816e699 100644
--- a/www-client/qupzilla/Manifest
+++ b/www-client/qupzilla/Manifest
@@ -1,26 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST QupZilla-1.8.6.tar.xz 3205912 SHA256 aecda29f8994c9dc4d6b5f76ce5b1ba947272a0d5a40b5d83a54023dd5d7a6a5 SHA512 36f1c79b7932b76f3ecbc4d1ea1bb207fe7e0477a98d583e13ab7df1703a5529e2d599c42b8f0a6792692c09e257abfdec398a1537a9002c1fd98d2128f4b627 WHIRLPOOL e60f66749654bd135fa2552ed2d75095c00108be6992b5d0e1609d7b458690218e601af317b3219f6e106e19870e46207109659e8aa9182117532bda7481f8e3
 DIST qupzilla-plugins-2015.01.27.tar.gz 335585 SHA256 466d2cc4a0b904705e2d23b6c05be6d36c74065f81b24aa9b82be0e377960e55 SHA512 0354b96530eca72d27838acfcd6605c0a14095f741587b89d1d4292e57bebe54d17e49464dc0a41af99873031c69ef09120c07053452568caf16dca222f1371b WHIRLPOOL a849f120f7f7a9e4dae6fa9abb2d3a66295a4778101887e99248f1ebd46e9231481f99f1d8fd9478e12f5cedbc5be055948ebe026d504d6b5d2d362ee222ba49
 EBUILD qupzilla-1.8.6.ebuild 3102 SHA256 371180b742ccb8a45d4bd445678232cb5cb7d2c54c9ef9fbdd824549ccd23491 SHA512 e6552f0816990d959e55e7bcf25e2986f82a267595dfc3f88091891282485d6dbd6fad4cbdfd760e79c6a7012371a43e2b6661299d0763271ccce2fbb03dbef3 WHIRLPOOL 825050d607ea04393073583d9d09b2cba1c8556812c1b964c8391ff9defd49b18a910dcc00242608439385fdea9aa03125342192589d36ace314bf34052af1cd
 MISC ChangeLog 8726 SHA256 b24e3a98890d9d574b2ed8c21f82c5f97a22ad2b28ee33ec868ddf124277f5c2 SHA512 3c12d11ddabb73088ad112c30eb99012afedaa697a29bd8be39a97f6c8a104405234b48ba785f5abeb22ed32d6e778b52c4401fec3a044383776813c70cab9b7 WHIRLPOOL 9aca1f49eb7f1fc16192dd916d352f0d622e1d0b7c3af65c649ecc5ebcb309c577e5ea89a680f8827b4cec71c3ed9e5559afea16bd5fd7368047b1ce52a8144e
-MISC metadata.xml 416 SHA256 1b51452eaf560d3cd580b3530bb739a415a34188f5ba555d2af9d36da646fe0b SHA512 4918aafacd22beb0817572692c198c99fb588c226abc469fc9a01c02ddcd685584bc756bc595a936f3e48c535f2203e2384f8dd6d96bffe5ad152f84c7812e56 WHIRLPOOL 17d97783743b7140be444e359e62da877ba30134b8abb83912c8f5633c9a5e94981d9db2a062f03467b4fb89b7ca6ef2d755e359a56d9c31dc26eae2eb7ccd1c
+MISC metadata.xml 510 SHA256 2a60d6149a55162024ff41c2a431208369318b1452010c87bd84edb491fa7acc SHA512 933f027dcd65d3621d8cfe69af6fd36d963986cba7170bd3b1edbb97b4ce43d759bd955f5de626c2a3b17217cd64d8e5ee6a138ab3327bfe6bc26a3f90f7f7d7 WHIRLPOOL f48c4548cf7b0ef84e71141e58c588efe5678b9188685a3fb5a7ddd7ed6abe168d43db1ca67534d42c99685ed702106792985ea3ee4a73e4a55c7be371c164ba
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJiBAEBCABMBQJVcKGmRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
-MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
-7Bq3EAClk+QrGatVhmj8iUdVaaR6D6COrEnfUXuHcB+i4mhllsVEP9Qem8ut7EKU
-UGnvOvBFDvv8WBnWq7J13fNF58fTQyNBamZsgx/pKt+vhnkhY0Czj9P0nZKcFEcL
-jRCJpVRQPwUcMb1gT2aSP/IaWXSg8L9aC7uwLUrdQqup/IAwgODMK0LVooT3vt5L
-zhVI+Ju06AEsw4buiOw5oG85EJcYsyEfCxHchzJQpvjoGOOteNc4NkHBRkubvtgJ
-B8E4L2eS6YHxloIDmrtNMMuchPdU689qzrqDDX3WqmFVeBL1EUiqljvFWPyVZda4
-jpCdpMC8poq6c3sIZjM8Ou751zS3Jn7CtiWpbJyOw7Iqhp8smAUaOd1Uiws6nmOp
-SJoV3yKU2KHjgkg+kGmmLjG7pnVGAtbu5XhwWbLZThH07xXOOmKvocq7vj4FIp0u
-OH+YhAvQ7TCOW3uJKUwuMtPWZDmJdrTrC4j22RojtdSM9uQTV9GzmrLPO+Km9F3k
-B1hk8SpD/OptMTrt3Q3ppoUgVrpDmtOBoH5kyJLhYIDWoceAUAqZpgYDiFL82oHk
-PoCvUdZg6EvUtV1qjiv9KFuKwyl5o0G/k83GRxzwU/hYlSYy7FSKX876D7MOGx/3
-aaSX8K8zw/9aWvPr48nMbF74pWpuJ3/lpSJf/kVkvFDv2eLY+g==
-=8DwO
+iQJ8BAEBCgBmBQJVfy84XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi8TgP/i+YcOqzz8Y24ngGYqy6UT4f
+4W8si1QHp+yLidEWvCb7TdAWHIN5qSMpvM6kr0MXo6r2O3bZChR0yC9Bsg2emINS
+bX+0t3Y8BSPn+DHabi6H/0iikFg2sh7tJdiV/akR3XaTxM9oNRrELhKp+eqMCAGU
+gRqNX94uEX7pHUciwZiA3cGMRVYRPVA13945b+OCKZ86Vmop2F13pVHu3q+l252e
+aA0JtjxQc7/g8FJ+5fg8ceLrNqJvsHXvGMpGGlp+jU9EvtiwprlXlikrie36jA/e
+qNC3oecKBuFS8yacoEVisXgdctpgC3IVd/KUr9bQ+1BOxLFnfLWshG/gJVLyRECx
+OY1k9LxLGDrG4/8SXzh7F31C9pyMCzIm6XVijiHlS3meAhcaWxOhCT0UEsUSVwwG
+HoFCO5lvvNYrOXPQAHzKFQZotY9f75Yui3ApQfqbp5s8XMA7czfLQYFapXH1Hd00
+5HGiOnUsRGMQ/f9Bup0isN/MYGzoMijuod+OkZtr0IR7rWDqYI0iI1URHcGYx8Dz
+Id2lHT8UFarQf0y618RdxCUOuTjbdjtfr/w0MFIcApyG/vDKhMth7cfi3z+eyIQ/
+xZMzUvWIRFHgiB3iyyXxcFJXUjOmhY1TPDs/0UaMoeZFmd5bRwKmRysxsxZpZaZq
+mq3C+vcWTBH3MAroy6A8
+=ooIm
 -----END PGP SIGNATURE-----
diff --git a/www-client/qupzilla/metadata.xml b/www-client/qupzilla/metadata.xml
index b38ad16fab0c..dc9f533034c7 100644
--- a/www-client/qupzilla/metadata.xml
+++ b/www-client/qupzilla/metadata.xml
@@ -3,9 +3,12 @@
 <pkgmetadata>
   <herd>qt</herd>
   <use>
-    <flag name='nonblockdialogs'>Enable fancy non-blocking JavaScript dialogs
+    <flag name="nonblockdialogs">Enable fancy non-blocking JavaScript dialogs
       shown inside the page, not blocking the application window. When closing
       browser windows with open dialogs, this can crash the application.
     </flag>
   </use>
+  <upstream>
+    <remote-id type="github">QupZilla/qupzilla-plugins</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/www-client/rekonq/Manifest b/www-client/rekonq/Manifest
index cff46d4bd169..83d86918a486 100644
--- a/www-client/rekonq/Manifest
+++ b/www-client/rekonq/Manifest
@@ -1,25 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST rekonq-2.4.2.tar.xz 5161348 SHA256 e9805b32f592ca5809bd1632c624c57fc0109ce98b73a8b8e3ebd04e9c875126 SHA512 55594dac99b06db7986198f1b6e8efdb0770e2219a33d34db7919d4d0d741ef026b0e12d284ae9b2e1a9b6e40efcdf4f0870e9b0819bff14f45162c5b464ba78 WHIRLPOOL 9e555f5ad935bd2e73ef62e6ccc8f634d3dedf219a5f1ef7a2c356123b0d56d47e2a177cabfb0803ca7f48ebef60a72e34801aa6c9904891630f7b47af08b2ba
 EBUILD rekonq-2.4.2-r1.ebuild 1259 SHA256 fd567243f4911f3b81c1e228d239c41296cfc4b392f598b82f3c4bc22a1842c7 SHA512 1be6d55ddd05c78c471e33436f33f185fd3bca9f4814cdab8337f56dad374e33911014f34f16fdf7a9575ecb8089543624c21e69290d3ba5da8aa07a6ced33ba WHIRLPOOL dc84a8876ecc90c14d4a7c0b1254311c0c65c79321a7ccc3782a1e4ef770a63246f9e4a53e29871590fee2e7a055b0e7cf9d6e97a60e6bf88737db8e19ae3d02
 MISC ChangeLog 12253 SHA256 64a809e817908c248f67f245646cc4f1f44f7a1cd0d32a9e64ffbb89a1de9027 SHA512 d64ef0ed492ff4de0b2cb4c6e362a221db5fa7bc2c4e8bad08449da401c2d9132a29ef42e134b804a2f3cfe8ad88998819308acc19a8c9b9c4bea43c66c7b419 WHIRLPOOL 0f404022c4a2f7fafed3b211961dee8836fd00ed058188318eeea7e510eef2708ccb7ad8d6712dbd2034e587750ac35753fd705d716c10928b8a3cec9be5d9ee
-MISC metadata.xml 320 SHA256 2d02df8ad61da5bb6cf1b5b578966a8a6a9918f5f1db8d96a33353caa1a22be8 SHA512 0c2f9f3e9224bacb92435d469c2aac4dca97804d9c63966249b108fd02f13547ffbe17fdf97d4fbb39050a2b12ae69345aff66bbbe5a4fa724c5d06d967dec8b WHIRLPOOL d31c371fc9d587334d52ad44e0792e10618d7183f956ce3f7e16616e32020aab3b73f1018009d89970ef5052a756748935ef9f1f2fd898a0abb976da5c451388
+MISC metadata.xml 396 SHA256 9b9a21742d66649cfb31fec728c0c8baaed7913f8a0394fbe41155cf3a69fa4c SHA512 307a7f5603784cc9396e157af96c082e584bb995d4de0309bb5630efb1c66312fcce05428e3ec02a0986de2c747abed681bb9648ab52e34a570b03485bd4c92f WHIRLPOOL 80805da728179bc99a9e228e0e1f70375f7fed7a4752852bc02e19971859d2fd60ad78095448b223cea38a0043fdd8b03eb8f1bd476287fa286d997947985e9e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJiBAEBCABMBQJVcKGmRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
-MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
-7FiDD/9dQ5s+d2qSL91TIy//yrrSckq36d8XPo1D0Suur+1efZuO6mBFW1S4JUcM
-dRJuWYKLjxXw/YVI9Um/nATfzixJSwqHCy5DURm35f9GMxpWJAMG7VixEHUNmUiM
-c/N/+rggyqnaGPJnxUdHeWlAAfIRFmkvFPB/sH3jQ8KKD1YzpGjU3lKTDPMnI6Mp
-jOxG+iHB0fZEnupA/3FDT53zSjGnvW+tZ0DywNRBiDepzMBULPjNlKcpTAoVksjT
-9Zh9y3oYgDbmhf2kr0w5Ig+fWYkLqNZTWkfw5SABEO9cClavp+8KGMBblQBlRJvr
-wBrC+1B9H2Lsu4C57QjP8/xB+zpLABSe/1Oq0Ij30Z8rml4nWA+1DOIWpaEWgVAl
-J+eD4cR/e6keJO2PfIem9l6I7XJOMZB6eCt4zTc+N1vP0BA7/61ua+QZDXMLpicM
-d6Sb91TkCfngUou55j1R9eIxhhEw3+gSOy85orwR6V5HDp8377Md4XnLBXXzhIUW
-eNvn/mQUi7c1IPg01ZU2qMWsPan2aOPlOeHDYWdIoHqzy2Y9YyFEGBXMA8vTa12X
-4HbNcNOlS6ooPTrj+56tmJz2Xx9I08j66VvUcCctyu71B/I25KAGG142Z4I3xfM6
-kzxUAjIsdZn4qN49czxFXpJqsi/kQfEki+yaMtl7vrAm/xNvQQ==
-=S3qt
+iQJ8BAEBCgBmBQJVfy9DXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmicPsP/0IXEU2fa7AELEUGmIqCvzZV
+fzT1fN81FNTw8QQ7Das4if+ssQwTMtim/EHS254/zNeESmwvJiyD3GiSs5pRRDQ6
+qKiUKYk8CHbRAcRVDT/SxoyuEPh/IE3tTj03OJESNmedIpBrA+UZgQtZgxqpGfQO
+B42nxbhlk8xdtookLarY0H98SKsDV08s4cm76IqsMh90r2L/L+GpRbQcYxQhvlm1
+UXwEiQlhjF0UsS+fI9QuXYO7zcGGqPV8712hIp72IgxHJVywwLa6/Sxl+Mje9nea
+WYasmyr61pmrACQ4UR0W3KEocuI4SlTHbX9WJDubTscP9qc6oorZTXjWYnkpt8kJ
+2q8724Gh3Uj9sdhAwZUdPqqdYExViBfNzsan/tkeHg+AhJ9FKPlyjZaBzJGfiMiS
+8aUZUZ8kih/chmorovOjPnEm1DermyOV8XYVgg+q7dW2ihNoNeiWHlHcmg0j2n8g
+yCCi8mwHSwec7kccxLpah6ytV+7kyT6VoZgRLit0gtZtHpnLn3pvPGJlnpi9bzEu
+VPCnSB3D3f4OLOOvHGAEojEAHk+zVYtPqmJTKBwsIP5q/SvzoBcY1/R9KDSP+jO7
+SF7LQGVwBVo0Um36tnUQsduP5ukJvSupUr4+H4+nFj8MohEDkwpgAJNjKH/vwI16
+GY9K8MZSXqi+FoSCpdSq
+=F/WN
 -----END PGP SIGNATURE-----
diff --git a/www-client/rekonq/metadata.xml b/www-client/rekonq/metadata.xml
index ad060ed9a9b8..8aa324273fae 100644
--- a/www-client/rekonq/metadata.xml
+++ b/www-client/rekonq/metadata.xml
@@ -6,4 +6,7 @@
 		<flag name="nepomuk">Enable Nepomuk based semantic desktop support (deprecated)</flag>
 		<flag name="opera">Support for Opera sync handler</flag>
 	</use>
+	<upstream>
+		<remote-id type="sourceforge">rekonq</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/www-client/uget/Manifest b/www-client/uget/Manifest
index 2def70d8a1c0..4b833f9ecde7 100644
--- a/www-client/uget/Manifest
+++ b/www-client/uget/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX uget-1.10.4-gnutls-backport-fix.patch 4590 SHA256 615cb22101aecbbb4963d81c958d2068701a4ebff2d1ef2bea279e42d6ed122c SHA512 88b94f01879d03c0d8778c1b6f3a6ed227df5c0cfd398b75e458e24e11dff0ca5de554cd01f4f54fa75cf16274f0506e419d868b1323afa493fe862c298c22c9 WHIRLPOOL 2745c399de85b524751963eab180d780b19fc11025b827d83453f104f0586fe2d8a64f440889eb89888fed2943532fce2e9a9b1a9341de41bf3bb3deca8da332
 AUX uget-1.10.4-linguas-fix.patch 1360 SHA256 df2ffa33d01125467125e60ae781b7890b70991a9b99cd6cd742df9391922470 SHA512 063636ed5185c2010ec33b0c60e3f896cf553911c795ce7ce54cb5424770bcc95eb35f7f1737df687b72350943ac5e310f5dc4a794493e937bfee0d0938bf6e5 WHIRLPOOL d699f42c76690d9e84513c84ca95993da57938a9eeebd1460b4d88f36e25c36691b514281e6542023e24702d5b9f0d4ef6a8d31e270426c0aa33e1631c5477bd
@@ -13,21 +13,23 @@ EBUILD uget-1.10.4.ebuild 2446 SHA256 c4b2ed58802b412ae5037eecf2bdbe3c4574600756
 EBUILD uget-1.8.0.ebuild 1778 SHA256 7fff0059c3f352096590d3c21b1d8cec4ea5d7b8c9068de7165bc5809c627399 SHA512 8451a515ad1575377514f43bd473dadcc7db616cc1404db4898b8068575f3696265169b95d92b4c31c4ae6fb614e9d3904925456f3a251da08fd2d767dfb04fe WHIRLPOOL 28f5324b36b683c9f7e462ab03e65aa26912552d6eade30873a088af433dc7f084ff6082a3768bc7776bdbba28f0b843e6e1f0d5fcfa5a26cbc48e6a2c5f5d19
 EBUILD uget-9999.ebuild 2330 SHA256 7780d22df52d82f44ee4c5025019740ce091e1108cc4e3530a586d4a109f6412 SHA512 0477b54de1813409ab336578465848c28ca55ec1865ad591e252c687cd6b98d5e96e86984ebd9d358ad787fbd90bb9c1f47c2d9360d12e5e06b2f8ebafdfe940 WHIRLPOOL 708178085361935d5bbd009e79e7beea22ae720302f57ff258db53fedda6597a2c9eaecb24c05c0d8ab954f1e30ac0accfdd2f324840689be54e0e6ffd19cecc
 MISC ChangeLog 6288 SHA256 9f6a9c8dbce958265fb03dbbdf1d630bce83557b8c7e550a7cb30cca3ce3e319 SHA512 1522a8add8914363ac0dba5c40846872ec34e73c73f08e563beb9f3758ddf60b156a504647e81c975e4962a11620845b16a28cf727fedd437da89cb5f023399f WHIRLPOOL c8d0cb172abc04304bcc277c6ec85498370bd191328c19d1be1f8b4c2ade5d9966457aee5a3acd4c4afc7d0d6f0b091e3982fe21f45aa2babddb08d2a20d3b7e
-MISC metadata.xml 851 SHA256 169562d7f36aa26649984b238232fa179f6f44c84c9cd57cfa97f769f04b995d SHA512 59ea62fe9a8a024c9e7dac202bec114e700e261097f6b76fd147dc183360837f9e01becafd20bb3c6b425f8981cfdc7e90ecdb190d2b84f6d7bd7a8db79b4c80 WHIRLPOOL 9ddc25503e00dbf63d798ce93334759ee60ec70d81f2dc7ff0050f08e521376f9b73a01f944009bb11de8d3d60221fffe246f3f286cba697b2d9171a10d7bd5a
+MISC metadata.xml 927 SHA256 40a9a10628581856fb310d5bf4536975cc763fe2497e7ea8da9264c2fb0677fd SHA512 03fc56f9ab62288ed721df9d6bfa6f5d1eb1e59418643046decb60dcf6258d321a7c3c28e8073937b185759a12b2847abffeac42088749faad2d2e8843728580 WHIRLPOOL d3e7c1caabb0a3c71398bb880be51e9fa3f0f9160a4768567a25c76748bd7d22e5181db2a3d803fc80da433cb211044f897d1b620f6cfdff7c42c4b13fda0e62
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJTavRrAAoJEDZF8K7rm0r68OkP/Ar1mMYlxTroQoAqlvP5FqFB
-Wwthcd3xOHWoiEKJPCFC61kgBCEp3hQTcUD6uWWW1ikzBP0WChxnmXP29v5fAv0b
-z/6cth73UElx5ejXpXijd6Ll3TO22e7jupAqqJ9YfEyeJOg3pEZm/oYIundU7eXP
-rU2WkYxlKeKyq4wIVDCNSopcGh3oz9OH1b/csX+kZAl8qWwSR2YvMJzuUaWpCWEj
-vRCG+glVNPJtrK/MHQEo4cMzM289eKbU5GelAfc+bE12uadfcaei6gJ5ris3rmW2
-KWB0x6L8F5kWjoWbX4HnZaaago2Q96FEOQhmdKr9EYW7sDWQ+Goi8KUoYxLO7E08
-MEFIa/Qi6QsCGb71AVOTle47jVPQnVrVnLKXCjVBQDpeBlxfymhGmtjwkhvSMbqa
-MTKbJDbqSA7hVnbeHMwFfG8yQ+AynYjqZZyKZKkxKO2wAdsxqrCGDk2drrGI6Zng
-hnGyYD6pu/BXYTzKrFwwN8tEeuufLoXf68PXW8NN6IqvYWx16VGA3lIeMpakuVYm
-y/ZLEUmczee4AkLphJUlK+Apjls7e5ktUs6f2LUBS5GIeyhFHEuafEDtYlNgbLe9
-YbQMrDCMD+J55Fc/8S34oSsIw9f8jjGpcx+yYTdA3e265vkbTYcpdtRnL/dDVtIP
-BVsSjvIMPISm1QgeaobG
-=ip+M
+iQJ8BAEBCgBmBQJVfy9PXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmitDgQAJRFNGRPiv/8A+PM3EZvPPQU
+1Q6yn0NilbgCVG1xlcrucrj+Un4Avy64OCcPMYNhx9WsMuS/eUHaBTsCi6Snkflm
+F7UK6ShyiUVffSo1t9DtbQFx2vOnmmg7R9J6hq8kIThLCdqN/DNNrg6oPWxarjUZ
+54UBnJXpEyjMxhsZSVisIrVv7t4lStmk80XhIJj4m92F8bRsQYWZKAG5NuR2w3+y
+gxdUXJU3fiv4AdoifJlbGUQZ9cHCuCpZSpX3Dk/w4R7tokC0S8nndi0PjGzqekd5
+tCGNRHURMy7WlxKqyU/b0/hyhmok3FWwmw4cmo4V/F6/DnrHY8ORQyoK0t65J9ft
+NfVOvbCY3tol5Goe+Sec5hYEh1qDAJYnifQhBtsrzRgTeTPsSnU/0UMCuXpkRhcm
+ngUYGPN4A2vO+wSt6qgzYMenQeVLJq1mPSVceCM2cinr/abOni0VJmHt79EifPIg
+CjfJRX/D1DP/2/pjUscPX5YJV8DJlgsKQO153tUPQGVYbFmGI2V6eG/XemIlP+0G
+tWwF0iWhNNVr0PT3nm31c1tczlscXxlG94dTXMXDh6v8MYDyECNdmqXKZfr8OAn/
+f4V7P9K/VAuidWhZstg0xneKT52uZKCQVCdtmsXUIOgphQvMBqm2aAdXKT1MY4Hl
+bHZGAVy7isY9AvsFdwr2
+=r+pU
 -----END PGP SIGNATURE-----
diff --git a/www-client/uget/metadata.xml b/www-client/uget/metadata.xml
index 78acae6f4c2d..f91cf6615e16 100644
--- a/www-client/uget/metadata.xml
+++ b/www-client/uget/metadata.xml
@@ -12,9 +12,12 @@
 		category.
 	</longdescription>
 	<use>
-		<flag name='aria2'>Enable support for <pkg>net-misc/aria2</pkg> through xmlrpc.
+		<flag name="aria2">Enable support for <pkg>net-misc/aria2</pkg> through xmlrpc.
 			You'll find the plugin in the app's settings.</flag>
-		<flag name='hide-temp-files'>Make temporary files that are used while downloading hidden.</flag>
-		<flag name='gtk3'>Use x11-libs/gtk+:3 instead of x11-libs/gtk+:2</flag>
+		<flag name="hide-temp-files">Make temporary files that are used while downloading hidden.</flag>
+		<flag name="gtk3">Use x11-libs/gtk+:3 instead of x11-libs/gtk+:2</flag>
 	</use>
+	<upstream>
+		<remote-id type="sourceforge">urlget</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/www-client/uzbl/Manifest b/www-client/uzbl/Manifest
index 20d2faec2d3f..226a2384baee 100644
--- a/www-client/uzbl/Manifest
+++ b/www-client/uzbl/Manifest
@@ -1,26 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST uzbl-2012.05.14.tar.gz 152376 SHA256 4b4b3baf2339250b81818b12918af51a33f353a580856fe27eb193f71a4294cf SHA512 d0025a50c852007d5203b05d1bb1e77855c1c1d7e3cad685fd981817e5729682ccf01786f7e06c36a82ebbc1079e5d83fdb1cca40cc768024088dcc840a5ef90 WHIRLPOOL 1e16856b7b5005ae3dcad00c48ad5548bbee0d09403cdde35eda350013944ce35d67fc53063abf69d28d3c3ca37fc305101f0a6d2d645d9f01af1560d25f04e7
 EBUILD uzbl-2012.05.14-r1.ebuild 3552 SHA256 688f358d3a655080107d8068bd9206c07f5a28e5815034d03152e58d7af40ef6 SHA512 9127590d3462e0f9957b648c966fcbd85af1c640b6c70d42e9928f71775e3abbdc2bcc1ec3051475c662e0076f74aabbba0e2a13bbb03966da4b1e015c62c8a9 WHIRLPOOL bd1aa6e38bc876c25c0fab1020af648adae65c761c20b99602e11b511fe2400f301f886745ef9e3a0557719db79d129196877d2fc3c2fb91e12997c1d3ba8cd3
 EBUILD uzbl-2012.05.14.ebuild 2880 SHA256 069fae33041256d2322e9f94f926f12753ea0f05438f1ba2ae10a0b719356ed9 SHA512 3a9c38e22c5db8819133ac2dc1b882c1c2774510a45af883755700418570e08bfbcae6dbd1f459c40375db34dc9ca1ba444bd9ef5513c1fbab3f7cd00b229ed4 WHIRLPOOL b7527184f291e5b7f5fd005c3996f5d4cef1dd9992903534516b37e0238d4c12a5bb04a8b86108217bed2ba2c5548ffe70ca5e1662303877ddd06ee4fef7b7b0
 EBUILD uzbl-9999.ebuild 3544 SHA256 3f7bf235995b65af248a7c78531c42565b939da1e1a28ee7123045ff43a68ff3 SHA512 8c71c975e0071706b2d31f7b323c37b1bc29b7c3bb6d4ae46ac4eac1b27df855eccfac56cf41ded666cbcdc151afb25ff356ca3afd8ad7ca95476bd7430109c9 WHIRLPOOL c7b7348a6f136d15b6c8286eb737e5019a7c7bcbbfd22d7387f5da6ab2daa6ada77d29bfc729cfc7d7ebe66df6dd8ad86b182cdbbeb908e6118ed94f83635c0c
 MISC ChangeLog 10139 SHA256 2f500f168e8244e8cf8dd40fb91b83291f7a384621c160993587c588edb9696b SHA512 4601015ebe38e0ba7787bec94db23ea51769e7f6b22e50d054e728bdf8215a45d29cd7e11bb7c2ae6d8cff89c05990573ce9483b11674e3aa24c6715c88a3c06 WHIRLPOOL 1d7f008cd0f16aa075465745e0a5e00a636497b690d1d6c50b2ce016ed2e6bda4aa5e6ca18812b8b43f663561f025075181e7d165bbcfc668c3036d300ae702f
-MISC metadata.xml 607 SHA256 79a9d40b918e124c3e8b9825b1e2001bf8d8f2084eb5a227591aa9c42bc8c325 SHA512 09ec10192e87660fc1d398c6ffe2a8fb020b9eafbd665e23a1b75ab688edf655d1974570e22511373a0121d96ef3fcc928baeae0d8e3b53379f9f64ab6117114 WHIRLPOOL 52fb352e863b47ff06f48108ee5c4322294c19d9dcb5d3f49a1d2bef4fab7afab74620af72639bd795b0ee8b46b3e93384a7e809f55cce04bee54228ffaa20d5
+MISC metadata.xml 684 SHA256 6011cca765dedd3fa69cea35b0dbf8424af519cc30e583e42999b6735b2b7315 SHA512 8b82e84969a3fa3dc0496086b11b14a673d33aead90b8ffd35ce2562a2e5c59db28beb68e480e9a6ad6c7bb3fb40a24f37398dc72d9c24df9ee4bcc0fe6711c7 WHIRLPOOL 7e6463a544bb2f6ae8f6b92d4394c868304d7ddc394e5fcfc61ccf050a8763cd427f169604999d79c9d9b81e505675f0f26e346cfd77ede3b0fa40fec35d51bb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJTuT56AAoJEC7dUkA7aK9HbNYP+wd3MZsB8Q1npjI9vL0ciAIL
-YMBASrZ0yz+Mo++w0oFGKjZSvc+gY727rnxUkvDn8BH8j0lX+qkxbMKnRZL7RndC
-9THaNYalFW+cxw21ZF7NsfoFzwHW0vGnu2nGgytbjTfuIhB2ECwEPnHP3RYQr9JV
-M3+bmo9uAIS5UXrmeWvTR09FvEB/tNGdFz8JCLxUxzCSudm6BFze6/PYL+6iwxZJ
-Y0WI96gBNLVZ1/7RITsub30QCKVDULJ09H7/qrxbYqk2Ejc9OlrnyeVoAPDrSO+w
-rqJwHgGrvWnNzlfHv0mhgpDSWpcE6+VrQRlbSjjEJJb6qoRx4BQP7EIjEehMvZwc
-ALsmryllhddJkvlKrmSr7wAR3MBG3wPx6QlRmj86bx6b4timYo9eRE8wAyxC/LYp
-yV4F3g5eXcf/nWAbabKoeIlyJV/GM32yLu5PF9wOY15FPhV+8QCscN8EbseJ1Oqh
-Mhn3TEAZHaeXs3QhENBtuYulDP90R7auHYcvyP3c4f5TE4lcZEH1sjWr1KoWzrvT
-NsR+W0uLzNVWWEu8HI6VGMK9FmlIOuMag8hzM7jZTxmgTtDq84XhBjbVdxCYA+Rq
-9PKBJC+/QNtHiuYYFEcxOhlvfF4ETikP20vTy2elW0WKWSc5o/7GYkyENUKg4Dlx
-yDlNK7r26wzXp7CPFZIN
-=f0NV
+iQJ8BAEBCgBmBQJVfy9ZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi6BcP/1Einw47GyYaIYhERDQhVImb
+uzFCc+tcPHRY/aP9K4xbmMeXSRX7v6xKwt3bwmEZW8fObGH7ODJ1pXrHi0Uwpsqo
+0IAX/E198N8dZ2b12Cnj4iAEPDj5QfZEKhYRh54H4ZoR7CoAlRAD6fQeJMrHX85O
+wvd5QrOkx8jdFMUQE+zKFou/IzPheXlNNgFd+MYNnL7A1ryhUJL2X2/KdZXBgoXr
+cuX1yj2D6qu3qXSkILpRTjaEO+MlAYk1OnjBD4gAn/TZ7/2go+tZJPYFhH+hIs7D
+7B2Dg5p5Po0qwJ4zALlX+T5H46g0DK21Si7Dht3M4cruRmAf/NrTi3/RC1jLSPBv
+qQH6o6MnALE30tlhB9H7t/CDi/NB2EgGBJKafozEcAPAZdRvPeLi+00DS8tVzj7R
+2KJhsJ8c8EZr7+HzuaneFmVaSPgNLnXPlkTVxt+V2qsSbsGZGq3lm8DHBOYOwM+P
+04Sjg/FQPp7TSK8/WtYvnB35cFANqCQ4tm/ZiZMrlMOmJNb7avKNVksRpcJ4M0F3
+ldgWvlAVRA39dHADRzHu4L70GhsL0AArYuQC8w2jZKKdQqE3rE9gd155BOoRiM//
+eBFAxTdKbZTW+d5Cm70uSh+Kzzh/Li+nGqsutSOh48VBkHbH1sAzGt4MYOwUrzY7
+/oUEnyoTHz0qo+cXIq7i
+=t5vs
 -----END PGP SIGNATURE-----
diff --git a/www-client/uzbl/metadata.xml b/www-client/uzbl/metadata.xml
index 10086d8fc3a6..5d8d1b030ec2 100644
--- a/www-client/uzbl/metadata.xml
+++ b/www-client/uzbl/metadata.xml
@@ -13,5 +13,7 @@
 		<flag name="gtk3">Use x11-libs/gtk+:3 instead of x11-libs/gtk+:2</flag>
 		<flag name="tabbed">Install the uzbl-tabbed script</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">Dieterbe/uzbl</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/www-client/vimb/Manifest b/www-client/vimb/Manifest
index 28e118a15588..0888ca2131b4 100644
--- a/www-client/vimb/Manifest
+++ b/www-client/vimb/Manifest
@@ -1,24 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST vimb-2.9.tar.gz 126272 SHA256 179024e07c133b049d9fb7c487bed9b9a8512b633e1d857e038b26a01d2e3541 SHA512 fac386aa6cd847215946582e4921f0742eeebd319845631d82236d8e17c715ac789940583b03de1e94ba690a94a09594183327d83552930572c54827808d70c7 WHIRLPOOL a4186c880511ee94e4021fd06c900155be8ea69314a07405c2e79214b88b6a7a96af0d5fc3f6344bd94384b713c247de7df6336445c5390ab80754aa47a10188
 EBUILD vimb-2.9.ebuild 1015 SHA256 f725f98a4fe127b825ddab2e518f9d858cb81980fc318e2e1cb863acfe674ab0 SHA512 1cca9dde131cce909575f6eba4fbe29689f3805316e4f12c08c56625ef0204e3230b4bc13339d56d368e17b5ed0d2bd05d447f450815e6488c77549ff519c05f WHIRLPOOL b32e10fde190d69b63d4decf0ac0154a54069b7c04339597869e3456a70129cb7ca3148796a02ceaa89d5f5966a99a79b7804f11337dcaae40720bcb0e6c4df4
 MISC ChangeLog 992 SHA256 99891f527c0ce47310b2c241fdf1f6ba2bfbd13073a9d337c014ec6515b43b40 SHA512 f76e059018b4f5e392f6f6edb3f79e285ad43626f17ddb929f7a1a007859a1a1fc3f1b0674aeb534cba23b87ba6d3ad101158cbb0afba966e815e0b1b5d7ff4c WHIRLPOOL 582282cec88e1ce645373a2680da2f78947bc39e78aea4884cbe594c237cc924907c362152771130fd3bbd3bda18fa43d1b0494de70dab4281e8bd481a5fc917
-MISC metadata.xml 359 SHA256 2bd81e1ae6061828b5bace0a0ed0f109d2e754fae5e5204433cfa5df2a2f4828 SHA512 73c5def3e4830c45f4106275ad09bacd4590f259d78a120b92807ab9aeb49ab163d3a529864f692cc33389805ff0d4c1d3a1c39bbaf27af14dc10aa587c60752 WHIRLPOOL 69fb5764bf5aafda02b709679805cb2ba8aa3570835f176673df22e5ebaffe6ad07a451d72ac3dd905e77cbbaa18c261f7580a70c006661fe9dbae878be7e081
+MISC metadata.xml 435 SHA256 6ecc9b9656800311769cbee9efec82c009c3415c61c57a26aca6c67866e60f1f SHA512 a2d84264bc810e86a465c166c47278b5459f57b0f06966fa59b8d919e22e9ce5ac04b1213b51887a3f8044f961b7f29fad7d092b2d3c5b20128d1ed75ca1255f WHIRLPOOL 71b90b8747605cff94f14218b081c1e110f4721734ffdaca99aa4d7ff67d87477fe9b92c1515b0adc14f977c44a54e7eea8ed912798b3ee2454228f4cb73905f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJVErpeAAoJELp701BxlEWfES4P/RFYgqXUrX9cltbDLJKvDDi6
-uja2iheL0ElyMG/W9WY51jYI58RkR1dTZ/4GCxh+b24XTQyW0fZDdU5lQMoWdQKH
-REquXcxuDPfwr9/fhRTYAA5Eqa/AVhAa/CeRPohVtidLL4VyA24wYmpoTEQjlRvX
-K9F5h9mEFTfVUgwbHyfbwcZ1z9LJLuF9+cQcZdw5InTQFljcVZ+mk4tKtjlSR9jG
-/ZBBQm+GYqkwyW917hIHVUVJyRZ6iIRZGfRhKL79Kj7PirvQajjyliqdskjhCfjn
-1O8GATsKZULL8glRuhlsV/PfsMTeTy8o4DXp9QsHy+kAHrfgyhxCS3UDVj07ZNkM
-KzGKGMxCl8I7M2FztsMHR+JLiPfDIifaUwslhpXP+UWvbXiN6p5ibullDHCBoNOQ
-tQsRvka4jI3Y1T7vzP+qAQaAQxhqFBY2hC8bUSNyfoXlGTPWYqSWEAXKLEtg8Fua
-nvZCQfpHCNWz6khWBSgN//nXVkknkMPFZHb52mhjrjrSfPYE+EXPOTeHdmf/dlUk
-xA8sQWU7vdmVlysqR8tl//NByd7Ub9KbPTqAsEmTkMKWj5EUP3ibtE+1yOnqvp96
-ZHEyYyU5j8KnRLT15Boo/cqvUqYH8jeR2CIS9uWLZ4N18TbA58NEb+CLQ5WxqokA
-KPHSyZnQply8xwfK3F3Z
-=c0OX
+iQJ8BAEBCgBmBQJVfy9iXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiuyYP/1t2tR0X+26+ikh/73cwyops
+Na99hQnPcC/Nt2+Ghn4Y8vWLxHaQ8x4iC677l2cvIcwE1v+zO2JkdRU3CtG3Q4pu
+KdGMcSpr4idzOmciZjgZxswnMeR3kKXlgU82OciKUjXTjA6+cUH5dgezaqRGdUiC
+O5XG874g6AhsVdGIqH+5Gvl5tNCo3AtDOkQCdcRxQdU0aMfwo28mL7/SrXJBF4LF
+Pu+KmymG4YHlXAjXpSqJbjuXASjPmQK7eFQOb9EYeueGf6nWASr0o1k8RN+wOJGP
+K8opSYYt6MExn3AAdlnp5SNy0dF9dS3+9nHNNk92ghXvASZOAp97wsu20bIYfeEb
+HWwe3i5It7OWTm+VC1rFu3QgwHdV0id4Y9BKO/Ny8OLq+vs8HRCN92jWenJB+8aM
+hIRy6eXg6XGOkFUenaYWYW1AqQCbRCj1cVY6Acbbe+UCv2b6g4938Uf192ovNYdJ
+iQPVEUXOO/ldosKUQ3+VUYi3fgj1CDGyxUPQJCHYC2TuRkVBVh/qgTpi7W1z7L58
+uSnXdqMkCJnRqe2ZAuMnbxEiBD54sZ4ZvCYs+hT/46KQeDIKru8RhkGJXTalGg+H
+5wgp9L+En4wKHvAl4A/5CFgri0bV9KYR3D/jKA7SNtIs1fUl5x+heM6r0UjSoGFw
+e1lh9icKZDzFLZ4QbNf7
+=c7us
 -----END PGP SIGNATURE-----
diff --git a/www-client/vimb/metadata.xml b/www-client/vimb/metadata.xml
index 3b19aa514d30..99d470df2d96 100644
--- a/www-client/vimb/metadata.xml
+++ b/www-client/vimb/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version = '1.0' encoding = 'UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
@@ -9,4 +9,7 @@
 		<flag name="gtk3">Link against <pkg>x11-libs/gtk+:3</pkg> instead of
 			<pkg>x11-libs/gtk+:2</pkg></flag>
 	</use>
+	<upstream>
+		<remote-id type="github">fanglingsu/vimb</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/www-client/vimprobable2/Manifest b/www-client/vimprobable2/Manifest
index db67bbc27f2f..7c1d7ae91d2a 100644
--- a/www-client/vimprobable2/Manifest
+++ b/www-client/vimprobable2/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST vimprobable2_1.4.0.tar.bz2 44599 SHA256 dca8804671c64676b796228cfdd60c5ef4e44ccdd109b362c7d51c05ee6241b6 SHA512 1eb82cf50e8f33e2841d43f6a8cdd46caddb691b4f41784ae852b960533c1796561bb7253ceb2347dbd0a8accce494702c392a2f5ad8daf7a4b41de12d962a4a WHIRLPOOL b5c2c06e4387cc01d9e33f45255a1e34931f85606a82eba96f340e44b49c2cc43c83111236fc7d63ffd2fba5358786e9d9284912937d8c2ded182ea4cf89f56f
 DIST vimprobable2_1.4.2.tar.bz2 44730 SHA256 f9cfd25b75e5761378c40dfbdd1fe8c3ea7581ae1b39d11e1b39413d6bec4d8e SHA512 daf55843d3bb028673b4937d137ee532feb3324ca4dcd5a1c57fe7f6b0a02e35d0f8875bf695a3c9ae1d988840e71bfaad45a9f92c981205ac358fc2832d7e58 WHIRLPOOL 748573214f96d14916ff4b95b3186f1b6a45cafeaa55bd423e16c8f761a770981e07247c9c1675cef1f3554ed41bbdd0d376f776cfcfb0f3430915999fd45a91
@@ -8,15 +8,23 @@ EBUILD vimprobable2-1.4.2-r1.ebuild 987 SHA256 c5974f41ca1c0afc520c0e9638fd62722
 EBUILD vimprobable2-1.4.2.ebuild 772 SHA256 180a74fb7699e7a76e4cd802a1f378660e3dbc9eca782deb2069abc5635217ff SHA512 a75b9c5bca1bc5f6cb3325fd54fc6f81e2f7474ab927c7ecb042162fd939fd6fe241dc508dd2d97a231d8163e4b4c90990dbb99d6fb61d51ab33a3ca92a6c48d WHIRLPOOL 3a737af1dd063f699f2e8ab40c6bd9f4125a725efcb2ca80226cb24b4b10dffef7a26200e9a76558d469255cf42a52638501a8c22b27653f08e806472bf974dc
 EBUILD vimprobable2-9999.ebuild 955 SHA256 d36e18735321fc821be7aba01ee0b1805d3558f412e034fb066edae119d4d3c9 SHA512 99eaa35f373ad5640e6fc6fdab6c4edd4edd59f6abcc15c8b4c58a7ef29271b9525f3af7bdd84f26a30edacc3f718d92e5b8e1c4428009c5843e776558299217 WHIRLPOOL 018e4d9977e602d0a2e2963c1535ae87929a5b3bbc5707a183181fd423765c8c246ef28654311d6e3ef6c24881437371b2ffe89bed77b2ce3bf0a2dcf5ec95a4
 MISC ChangeLog 1634 SHA256 3d76ca6d8edafa22b795776b3860b393b4fb740d0f194ce4ebb70c959e8d1f56 SHA512 e4b44d871b0c191e82dd8938c950bba4749099b5f621dd5f36499adc608d5ead263750b58706724d2c9226239a6814ca07571682464ddffe967625e4efd8b67d WHIRLPOOL 9fd045c8e643ee2a21fa61d5b2647c0e837f688d57b610871cc7471889326a4a0f337531a3feff396c43ee50cf4bcc6431308742cd530fbc933ee3dc4cec6fe8
-MISC metadata.xml 236 SHA256 5285fd5ca6bc85e0392ff64ec8e54d0018ebd761d3977869c00c93dee45ea09d SHA512 a1abf9a60fb1a2078d0475df655f8abd4b2f877f8d232028232fafca2eb7e7ae6ec2c835c4fe0ef27b3b5655d746d1fe53bbcb353703819448ddec84acdd4215 WHIRLPOOL fdbf5fcd34aa17330575f013aef4c87a8b039b62b6de3337a4004a6a0217238ceca43fa15425c30ddb7a5a632de7eb138ed541dfb161614cba817527297781e2
+MISC metadata.xml 313 SHA256 cee03181166516488d9c4df092c8e37f4e1611db91ee88eab7e9accc64c82696 SHA512 de810f8dddd55510b39c2b8a2f77ad49c22fcb61b409c427ff84d4a2df4fdeb65cc2f920cf67d442de3d7245e3051b1490548be97f8f5ad0a6a6f57f666c2a89 WHIRLPOOL db3a2a1f29d9419cb35a3dfe7864d483348c59142f94aed12c9764c68c3141e6e375d34902e28c05aec8315caa6381ebf1f6a318b2bf30eb5480c7ed1a6f5265
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJTyfnlAAoJEEqz6FtPBkyjoF4H/03hKtga0wNxpBSg+wr3AX5G
-ayEq4y3n3CVNgGJjsR6zmESu+rdGBYkz8xJ6VBwAzF+F9oeHuMo9WhhIrK1WMQXa
-MBCTLawG/4FCvk7LXAuMgja9yyeG1vrzd2oycmlTePWhrrKZlGQuaN1VvYU6S2d+
-nfWICTKt6KRnAVx7skvdCM4+qqW/hv4GCkXKxVCBU3393f/Nx9H9cA7LDCHPriv3
-QpE4cq+FI6Hz/+wzdGMC57PVKEKQjopgdho6/Vx2Lm78c9wl03vvAspbHKAuM7p2
-BZ3clJi0RN7riG8Etk1dS1pfFOdzrmZRNkI/1Rs+ny7+vw/D9yUbIC+hAA7zeMw=
-=vMV4
+iQJ8BAEBCgBmBQJVfy9sXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiEpEP/0u+KNyR/LG22fF4w8ZRLph3
+mJu24YoY0iX3eBDxV5uvP8XVAv2jG+6E6w4F3OgoxFDziIvWuRm7tdKZucTLCISO
+1KtOxnERTHEKYliarW5Xxcoh9jLdYUlaIOHFp2+4YenYm5avZNE2XmNDQD0PzOve
+A/ACDImE9OKvWfZvtBOS1tf2Gh6+Ywh50x/QWELUiwWPkFp3iwhD3FPjRbn+vxWF
+vimzJ4FV7VW5V6M9YmB7MkUS1Xmfl9PDTutli/KXc/KElyarrrZzauwoSeYytcUQ
+zhm+cBNAje/ejvay9P7hmdbVIA08P70qm0MfP//EUhzQQH985FgcEmm9x+xncFwS
+Z50e1YlEJr58u4esrtQ1R/7JkQIF6TNNUcUpXp3n0E6po0AMwiOXIT585cSDnOnd
+ME9exYqHhqCo8AjWbdEc6cg8BAX2WNRgI4257pljiqFJy+forIhOBdqQdas4z1m7
+VaXlR2W32lPA1Ifefc+XSaCMM+VDyFX8dDeqltJua7a0PTLAbhGJo7/5QIAJauQI
+dM0kTgaW0Mu8F+1l7h/qGnyaY6R2lA6vf56NgA1mEzgVY9vg9+JYLOYswXGhcXfd
+10LkKItFSgBP18Ni8XLPWeJNMwQkJTU9gJVfVBfAb8upwo/MR7fViYUb42i84cIJ
+GFNbHOV/iJRiF7Zm4VlK
+=QxgY
 -----END PGP SIGNATURE-----
diff --git a/www-client/vimprobable2/metadata.xml b/www-client/vimprobable2/metadata.xml
index efa5eb0078f3..8d814ce794e8 100644
--- a/www-client/vimprobable2/metadata.xml
+++ b/www-client/vimprobable2/metadata.xml
@@ -1,8 +1,11 @@
-<?xml version = '1.0' encoding = 'UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
 		<email>radhermit@gentoo.org</email>
 		<name>Tim Harder</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">vimprobable</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/www-client/w3m/Manifest b/www-client/w3m/Manifest
index d10762001c52..f1e8bcab747d 100644
--- a/www-client/w3m/Manifest
+++ b/www-client/w3m/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX w3m-0.5.2-ambwidth.patch 13634 SHA256 9cad290d4c0122964ecb674e636fb7551b400b4f32a2697ca15d68e2fe8cf4ce SHA512 fc993befa8c18484bd66b68d70b6a23939a63591c79f1146f2673047b1c283b9e747813bc1bc39d36f0357a4bbd12474d831c5d24ee2443d24e920a25f8e29e0 WHIRLPOOL 3d7153c70b6b4c484495ed5c7d0dc9ca3ac504d0964e70e19ba868f736cd8181a06191527e5ae473ca65eac2adf5316f2b4b16ac8b8d7f6027e3f764601b09ba
 AUX w3m-0.5.2-form.patch 309 SHA256 a0e6084c82db55c746cd00410c8781887fd52b61eca86a8a61269570622c41bf SHA512 1be3d16b84642f00156a7f37d95bd206e1fe8e25a6132edec5d916223014a9cd42d50504cd3ead377763930b1c58b89211f3fe119eb6c87fab8f7896cff622e6 WHIRLPOOL 0536be1af2c262e8c27ebf6d71f82c0f597f6d4fde87b42c72916ccb5fba134cb9dc23919cf87e6ef1b4d7d8840d54e76d8d6e9d2ac4b8df072264b9d3e4ff53
 AUX w3m-0.5.2-gc72.patch 769 SHA256 6a6a736db1edc3936a604d7b63512510158b4decfbdadaff85f7bf14d6377a86 SHA512 ec08f5568e2f7e4c764fc95ff14bad296dd6d7a818acbc2721f2d2e7eb0018beb07bab009b4e3c963bd9204d1f98edb12ae2a24a139086116b9858a3fdbecd7a WHIRLPOOL 07958cb8d2e59e7aecf7f81c1118d12c6d13b2ddc2b4b9648bfd8292cec683e952f720e8f0b962dbef4655c5a1c1739644b2894a28ec25478fc24f9fcea4ad28
@@ -15,4 +18,23 @@ AUX w3m.mailcap 44 SHA256 5f3c243df65c4d2e5ceeb1fae285e0f9f6660c7b0fc66bb7e46803
 DIST w3m-0.5.3.tar.gz 2202328 SHA256 e994d263f2fd2c22febfbe45103526e00145a7674a0fda79c822b97c2770a9e3 SHA512 43508c76d07b4d8f19c19f975c0b870aeb94abf0744b6128ee01c759d4e409a8b57bc866baeaf990f309ff73e9a7b02ca455d272b1dd0a93fafb8c72b1fe6d14 WHIRLPOOL 8f7dcaca362091227e29d7a6583ed796711904681a60e01d5838e45de003d60a9d88361d39b4d04056b67a14e51fe09e9d5b39fc8da18e83086484c974010cfe
 EBUILD w3m-0.5.3-r5.ebuild 3746 SHA256 286aa38db2bf40155de0c444389bb0816157ce4bbd7e31ddea35824dbee18d7a SHA512 48cdd973068b7074f407993f732a5dd3f83439f2b50f87940639e459aad8fdae7ecefa52f4323525c32e268e83d1f2168c6b1a800ea3dece9d82807572fdfe9e WHIRLPOOL 6b3f6553faa1edf03b6cda5936967ebdeffe0d42fdd3d082fd3a010cc196e2fb63c332c64d8a71e962f584abc5b53fe7194849a66aef44bd4ace8fd5f1c6eddd
 MISC ChangeLog 23017 SHA256 0c4ffce5e900459b609ca111ede24c09ca9c49b674f15ef96c308a7f556fc4b7 SHA512 1d75a7ea62ac9013b810ea35e8b06e863615b2115cfa0be83e53b4a4efb66b17601c1e470a3db2d4e6db12cb004b8bb4b97fef32f74687f0f4d42f1241ff9ae7 WHIRLPOOL 0e2c7269a8bc7618ca73a1d0471e7d11e6bd17df428b36a905839fbcfd13cc3a79254cdc898c43032b0a4ce11ea0b0c71fb1df45f0b4f4550a81418ffbba1e2a
-MISC metadata.xml 237 SHA256 58936b557c67f7e90052564817055decab28947a9934d0b889fa5d7e2901ba6d SHA512 12a76610bfe35e83c0939d8a21f552bb1bd6deea528c6c703562316df02d0fccf13c9c96598c748b542649e72aac19c15f3356f20ec08b9271dff059b1f271d1 WHIRLPOOL 4cd733feacdce05513aa74f49a7362aef6e1cf1debbcf2ca1e9e39a597e3b513753490d858feead5ea9fb768f8d05ec2032a9f790734bb836e670053af585817
+MISC metadata.xml 314 SHA256 5046539a06297aaa5e85bba4efbe88cef5f5f0d4168acde768bd2218d67c9e40 SHA512 01586a866a494f54e074125abb29cd6e73fe1f280191f17d4bf95617d2b0e17d7ba89b0145d63a4ac017e10dce58241df02581fa08041346bb990313abcc955e WHIRLPOOL 0d9fe09777c2ae5bea6c1f96a7929068427fd359c46339272ea1ebe69b07a323363594d9a63563efcd722bdc6677542e857845e2c357435b1c9015f54df19dc0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVfy9+XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiHncP/i304asA2LVlCqOSnC4uzNIC
+BOv5tPbK++PgzH5dmkDOaM8Q7jFA05MTRGIb2xXPWm/8/+9oRzwHAZRbZFNhcaTy
+6qeVdjptdubQR/+XD/VUhcTd6ZCxlaja9CmsHt4hBF5KGwFfca620BlPH8i833ft
+r1r+GoSm+RWGQHWM0FSzHavyY/F0kSPK19k68S8Ku7kqTITIcS7VrndsWaM0iZsF
+fS83IaLeOJkx4ZhAVMemj73YiqvddsEKBsjR5b5m/ZN3Lt/iPN6tR86TtnPvejLd
+2UQ37egg0hT0WZN1g4q2HWBMv1jVNxL6GpsDEp1nSRv6fUSFNlQWI7qGpE0MxN8d
+gDxwn9Sh3yo3W2Me1f64TaCiUMwRvA52UXnCcZ2YnuKgPXykSH3UBitNhaDQFkMv
+Ky2ircNVqz9k/MTiAlNiJinPJt3vmeiBTTMe4VnXPZKxzJTkiOIdBnY/tqUb4c0y
+Kg3ufQBY841SpyNLn/xHa7KUgrsHVdInxClXIdxO+iLHtoeeeXuVQoig1c8obENv
+cU4AixKwSk0828e1rpBc3BaGmEPIJjq02xZf06ehB/Ru2Tuu7Vzh3E1GUzTmvQ5S
+Z0RJh9gSU1SMZv4VVsel98sugQkAqPVyvbTVHE5YvJFu+elyYGVe6aiSheB8Zz56
+N6tQUq+VZRncRrnXWslR
+=88pQ
+-----END PGP SIGNATURE-----
diff --git a/www-client/w3m/metadata.xml b/www-client/w3m/metadata.xml
index 765a5373d3e9..eeaac1e0cc4b 100644
--- a/www-client/w3m/metadata.xml
+++ b/www-client/w3m/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>cjk</herd>
-<use>
-	<flag name='lynxkeymap'>If you prefer Lynx-like key binding</flag>
-</use>
+	<herd>cjk</herd>
+	<use>
+		<flag name="lynxkeymap">If you prefer Lynx-like key binding</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">w3m</remote-id>
+	</upstream>
 </pkgmetadata>