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-15 19:20:34 +0000
committer: Justin Lecher <jlec@gentoo.org> 2015-06-15 19:20:34 +0000
commit: bf33771790ac35f72e51f9ede1171a2d12d3a74a (patch)
tree: 9430c03c0c2390d43da6a2ba9c672d56cbeb96e6 /sys-apps
parent: Don't install uninstall informations, bug 551638; make use of path_exists() (diff)
download: historical-bf33771790ac35f72e51f9ede1171a2d12d3a74a.tar.gz
historical-bf33771790ac35f72e51f9ede1171a2d12d3a74a.tar.bz2
historical-bf33771790ac35f72e51f9ede1171a2d12d3a74a.zip
114 files changed, 1360 insertions, 703 deletions
diff --git a/sys-apps/bar/Manifest b/sys-apps/bar/Manifest
index 212dd582ff8d..d6e7a44f862d 100644
--- a/sys-apps/bar/Manifest
+++ b/sys-apps/bar/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-DIST bar_1.11.1.tar.gz 187144 RMD160 1bce804b7aa448f2a5c031d807b239298b26be50 SHA1 112d54cec7ebe85aacc6c2ef7d55e297264d1dd5 SHA256 fa0f5ec5c8400316c2f4debdc6cdcb80e186e668c2e4471df4fec7bfcd626503
-EBUILD bar-1.11.1.ebuild 1009 RMD160 b3e669fbe4570df82b5ffc6fd9eb3205d3ff8df6 SHA1 a0680ee274cb96dd294a49b8fec54dc785f57cdc SHA256 aa472066ceb672ff7265899b2f0975a11ee61bf863b38db5e72e4016bdc881ac
-MISC ChangeLog 3729 RMD160 a4ef3403ba41b6639890ff9d04a0b74a1bf518a1 SHA1 7e49c02c87ee8736ff502b4c0589d199364f5a9e SHA256 71f85cab8b01805be33630e3b5a1490e86b9689e31786a8ea7eadc4c35f99f10
-MISC metadata.xml 165 RMD160 c4557a3518a065b077539be5a0f20e4735fc2141 SHA1 1831705b1eb97b63968fc9eef31aa904a69a854a SHA256 75ca85c472d4181ae0de529c83826baaebe75d9e750ee6621758b5096bceffcd
+DIST bar_1.11.1.tar.gz 187144 SHA256 fa0f5ec5c8400316c2f4debdc6cdcb80e186e668c2e4471df4fec7bfcd626503
+EBUILD bar-1.11.1.ebuild 1009 SHA256 aa472066ceb672ff7265899b2f0975a11ee61bf863b38db5e72e4016bdc881ac SHA512 4475e14d8d855008d31ca3e81ecaebc3354fd8c96842a7072c87d73edf68bb87f707b6beb70ecf1fe9fc86b9216493f68b64301ac5dae65a97ffa91dd7f11dc4 WHIRLPOOL 995ed197c67e0803d41d52e365c4319986869ba4154207c1d56cfd2354feebe4df643707f23642b0d67659e6d84a4cec848832db60e562af77220d6161d89305
+MISC ChangeLog 3729 SHA256 71f85cab8b01805be33630e3b5a1490e86b9689e31786a8ea7eadc4c35f99f10 SHA512 1a2bbe83527623251ad461f0379deed090b208444fba8e44f77174470e27b11691b08eaaf6502a07534452e8167a81701e6008b1c1acaddd2922ff0a4f7d7cef WHIRLPOOL 3c3ad7698932e411ed0aedb107e2d75c0109a3e95f599ea8df37e7caed1127453ea1d53986d433cf400fabbc3a196a228506511e5b515e5be301cfc3c21a7852
+MISC metadata.xml 241 SHA256 bf1da7842f0ab97c846739eafc7a302bca87f3ba718ba9877cec2d924b63fdac SHA512 c0bdd937c799244f99aef64bcee711366f9d28834efad8571d8bdb9604e002dc88ce6d593d90ba64de8e6f544ec9a1d7b1d5209002837074163464ec7ee8e572 WHIRLPOOL 2e6d8891aa0d1dd51278ac1ba9eed91badbc4d7da1824cb575c1b39ed9e79d703ac6428cbf8e2a8a682efd01a3c394f4570c089dc3fb51f6e2675a0e040fc85d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0
 
-iEYEAREKAAYFAk5H1d0ACgkQgAnW8HDreRaLKQCfcL403mOKMZTzL/8nRJR5ygeB
-e3oAn2CxayuMBZxIPNwjRUWz47dbE85K
-=KdCl
+iQJ8BAEBCgBmBQJVfyKyXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiIh0P/0sqaC7iiERKHQarA3hPmL4K
+eWXQYs87tqryHKigShd+crzI2hG8LrxDZN/ghbiIrMT1tNcSZuaKzw5LufrAc0jp
+z41mj0XrPU+8UxYlzmxkRfw6HfDKIBkTky3zSbn0SAzoR1ZkRl7kV6/SFaqMcF+v
++xpIThjYjr0Fidqa8/kWgTTnzVjjdx4tlQSKtdR0CnVf5sJXxssbtOnNrRUHUg13
+tinvZjVVMlyCTaFC2cyPITmLnwOhBhNnw8A9pS2uwuUUtuNaXAY/N0FrRzNRt2Dq
+rblmiDE/eYnL/A5XmoMTk6j+6ubYWoXARGJrnf/Tbx/zHu/GcVDZwl2T7z3nbTyn
+BFYQPaFU/RN6ck3KkE2YhTkShfiU4xg66o8A1Z73qhw97xOfYKB6wjWnWudtyT+2
+FyJfWO2cyHlHyVRd+DO3qFLK6RVo97vi/4tipy4HqTT5SzUpqPz/07P01U1+Q4ST
+jqqb6ZOHQxd9g2pEWg8ruJirRZcy+9mVQKCJajWPII9g/xzQUnSZuydkkEAqSUIV
+Pzi3g7TmJfWnguz8+aoxpPEjqhpqgT27HYePODr3tE+cHutWgiFSojqPfMHo/z0h
+PB2KVESbVOWUhrZ1PlEYG4ogGNWOp/lujhYbfwsPMjbxGyYk18NCxazExZP5s4bq
+2nTh+qgx6GjHS62YRBI+
+=P5QA
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/bar/metadata.xml b/sys-apps/bar/metadata.xml
index 40149c995561..d3cb34b9ca6e 100644
--- a/sys-apps/bar/metadata.xml
+++ b/sys-apps/bar/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>shell-tools</herd>
+	<upstream>
+		<remote-id type="sourceforge">clpbar</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/byld/Manifest b/sys-apps/byld/Manifest
index 4642df43ac53..bf1b60cf8bff 100644
--- a/sys-apps/byld/Manifest
+++ b/sys-apps/byld/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
-DIST byld-1_0_3.tgz 1128317 RMD160 d56fb2fdf212d95b33c0bd99bdeb17021bfbfb75 SHA1 61f5823be00e82dcfd5804b1b0a639daad326a12 SHA256 f5206f6eb0d85f6b9435c24e554262b69dede6dd7d24acd9faea1dc77549cde3
-EBUILD byld-1.0.3.ebuild 794 RMD160 11d920f41ef2c23dba78f0a97eb8973d40465960 SHA1 1d296fc97b11209f11a8cf10b2574c72254ed0fc SHA256 6903d264e9031f37a0dc074f8381a41b77e0e982b0c1dd444138c4317bec7bcf
-MISC ChangeLog 643 RMD160 0e43a075718ce9c17d147c1467372dcacce19695 SHA1 7e411b0b180df9c4b231e9bb6869a3929527745c SHA256 d2b6f15579573a595da1708084e89c471fae6fe6e23aa4ea521062b6001b6245
-MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+DIST byld-1_0_3.tgz 1128317 SHA256 f5206f6eb0d85f6b9435c24e554262b69dede6dd7d24acd9faea1dc77549cde3
+EBUILD byld-1.0.3.ebuild 794 SHA256 6903d264e9031f37a0dc074f8381a41b77e0e982b0c1dd444138c4317bec7bcf SHA512 4968ab5a97e9ed6d2e1c399f20187f9cc590e447b3c84d5002bbe227cf0a1386cbc47ae31161a9ed79f9738aaf26f5dff1f48f8f94a0de60cf3c3f0d3265cdf5 WHIRLPOOL cfcc7273f1f83a9e964fe64de945a2283581bd81fd88f892f8b7858b1bbb7782f39d6502f54262d2fa3d3cd6cc3301f5b4997ba8db4b89d1f3aa8faac1806bca
+MISC ChangeLog 643 SHA256 d2b6f15579573a595da1708084e89c471fae6fe6e23aa4ea521062b6001b6245 SHA512 d3814db16e5c2a98563490ae7df756d8d6ec4bfa36d484090814010d904a5710f2907244d0dcff896f06f23c328d43ea41c062d95fe9355dd8e76348f058477c WHIRLPOOL a5a2f8a6c8aebf390a85e115d91177fcc97e107908ccdb6abba25712307302bd0d7640692b98887ce835b23440c7703037324b6928727740d01aeb38e270075a
+MISC metadata.xml 239 SHA256 fd0f2270d77ca2931296981788ead7fa1a4cd2c985a66f903a8815fa17e14ffb SHA512 30a6af953c94184518e1a7e9f2713c7335edca289100884c9a8c7fa4725cffec4ae4d38b71ff09cc5ee1429ce80ac00b1a2a6ce72b44e3b631085d66033c0038 WHIRLPOOL aa053569f1686adef7582ac8daadd9928d3db98944d19b03e6e09996cac5403811a313848addd7e559983d79a58c34ac2805bf5303248efb2e79233cb93a5a9d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0
 
-iEYEARECAAYFAklPPX4ACgkQn/5bYzqsSmFUWACdHyyH/FsUjofKn77aR5Xc7tUu
-6BcAoKiREj0v8yD0Lq6c1Lt1T7jlDNiS
-=mFF1
+iQJ8BAEBCgBmBQJVfyK4XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiMNUP+gJuXOqIWy6vxfnvb0fIooXX
+Pqo08p1bh1Nh8p9j3cHU2YvbGJWjz6mldUOK/9OwQ3cxQGlLgYnI73bVdg6QR+Cz
+R5flvDBqsIbBqJRWoGecrjqpHFUPYfXGN+U50pgHWTM+daIoAHroTQ6/WPbGjcZ6
+u/oQeKSKAfptgSwR/SnzhHEila1snAdlejZgocjv+LOsUnhzHoQbZrXRrvKW0FHh
+QBag1U2FrgwZXIXpH0X2Vx5BDjRnh3e/b28dhw1K5YOalsi2WE8htB4fMiOnHcm+
+wI8vk9MYR7RBYPNjUj4mVrzCKXUt6vFxzHpR3gb8+E+PzD1mOnbEzHiOXfKAMp6D
+iqmHXg0V/UXrMr96JNdLmIRi7fxgapV9Pk3YS8QFo5tUiylK0er/VuO9a8OaXNpJ
+7ka6V0Sy54kQukK3xAwrbFq/WE+zZdY6TD9I7fr1Hzr7PVXP9posEADLQDM0nF7i
+2Q+x56hxZb06Oq/m70ETmV1VM3IbvQotz9is5IkcX2QVQavZ8tqLeaKQEKjZWjj4
+dyTxaUYRX794vWbC605DUbJQhx0LkP78PJ9gSmuoi78jhaLcIepClB55+sjvIBFG
+xf/t/uDLZO911LudNRXcarNSNQnij7MFA3I7sroR7LW6ANYudWgMyuuXMbspYa3u
+Q4DBnfx1ut/PPxKXTLhd
+=YAQI
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/byld/metadata.xml b/sys-apps/byld/metadata.xml
index 96a2d586367d..b3c425a09720 100644
--- a/sys-apps/byld/metadata.xml
+++ b/sys-apps/byld/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>base-system</herd>
+	<herd>base-system</herd>
+	<upstream>
+		<remote-id type="sourceforge">byld</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/cciss_vol_status/Manifest b/sys-apps/cciss_vol_status/Manifest
index 170b6ada9f64..321f5bbc4ac3 100644
--- a/sys-apps/cciss_vol_status/Manifest
+++ b/sys-apps/cciss_vol_status/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 1.06-strlen-typo.patch 505 SHA256 4a73d097338f44d4d9a3aa4f3900da7f4196cbf67bb5d4ff33ce91a38dd78f9f SHA512 05f3ae4bd9ab38fa61406d418ac126dc3027371fc8b073e51362aa763895fdac144d7949fc600c5d3303bec9b5d07703d1ec38cb7e7a81d1652e577c3fad648b WHIRLPOOL 33d01efb8295d9b4bd752ca02d1180de99b04195746f81444f39f4a497c91d4be8fe6bb2d36b93bd2dc4506152ff4ef869a6d9d7dde1538594310457bc0664ad
 AUX cciss_vol_status.cron 646 SHA256 55fc6c33788c9846f758555be7316248d4054ed10738e8a0e3e6245ffcc0dd74 SHA512 658004668f6d1914c1526e07113eaee9a24e8d1945ab378a27537e9fd421e5b39eeb5f56610d59bebcbc6d7b2addfce65fee697b6877d164775b696930591a56 WHIRLPOOL 130108e1d029882460d26ad6ac925520824e059c626364097eedc812662d2fd737ed78717873dd7db2a7ca0fb847264b1997ab580f8cc041522c0d19dc851adb
@@ -13,11 +13,23 @@ EBUILD cciss_vol_status-1.09.ebuild 618 SHA256 79e68266d88a8cbae832688172b4e1a10
 EBUILD cciss_vol_status-1.10.ebuild 709 SHA256 6384c0adf667f06a900c20e485c758a34b0328e585a28a15626667ac6d5d2844 SHA512 22c307f9eabc258ebcbc4eb98bf0acb74b43c288fd3416003ec0008aca08af6c7a5716760c1836074dba107536017665401b0cc043013d40215df48e8f3cf6a2 WHIRLPOOL e584b7d673619332d2c9b2f31c8fbbfb704c708431a0d4d8e6fa1413c155675d029724a115f69c243262be73c119a41b2777a6fbf3a46f0a9fc61adcfd6fce3d
 EBUILD cciss_vol_status-1.11.ebuild 711 SHA256 d7c2f7b864464e24ef14300e275ff914f5be4d8c4287d741718ed545226796e5 SHA512 5a44da6ae634dccae1f081ca280e59202b796c74baf112407e238657f7654c5daed0dff53a82c8e449cd42c83505c1c102d76a5a9b113757817f22210fa0c3d9 WHIRLPOOL 9ce3eb6b581d3675453d92faac52b9d6cb2febe1a43cce790844c387a204155c61c253face30c3e1163b3ef175d4bcba62968c384b9f79becf6ebe8a88fa6219
 MISC ChangeLog 4125 SHA256 3b7ff3c6d9cd63065823f4013a20875c96d7a194f2c4b61185b5ccd4f80dba52 SHA512 78195e78e90c1014314699b7165ef6966ad408fb7dac90149f80933b49fe6092210d9a5a6cf10acd141fda7453c9786563130b7ab41ab96d6ee1c8b2db97d0a2 WHIRLPOOL 7cd9d209f87a317ff309ea8d3dae619360bd21c00f221f2f69b091cec21e2f50d282b1e08e0dc6a3c34f20f2de2eafb4ef6a29fc6c754315eee111060a953433
-MISC metadata.xml 254 SHA256 2817a53a07dd68fef8ec5467cb1a8441e87d77bd7eaf8ce9971de1adfbab7bdc SHA512 63686301cf18075f7e7578ada8a699da06f3e6fbc58f5066deb568709213efffd21e128818431d2bf54c32e421928113c480a6d6b70ddb56c46c47bad16b2536 WHIRLPOOL 5a074386445ff37caa546bc45133721249a79ac1d7c93248912d1c3dfb4e1ba874920cea6ffb06ae93330df2ddb47a3c3d6092d3b32076a930c639b32868bb21
+MISC metadata.xml 343 SHA256 4b52902fa85af0a664dfdbd779fe8300e8732eec9b94de84ac9f130653a28715 SHA512 152008c9a131b83e9cb4ffe05e8271845b7fcc6ab2124a445c9dcb95a4a508f2248639c8485952d5d3c737693cad864ab578e0a1e902d7c0caf8f84832e8c728 WHIRLPOOL 59c0a663b542a0c2ead08ef77b0d6785e3e247348fb4a4a194c31fbaef2bd2b9d10d85e49ddda0d23c2304fee40f2b70a29e1c795d595f77e7cb67d34481334d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlPn1L8ACgkQcaHudmEf86rz8gCcC97faBZa9r+gFqmQRJ/cCJxA
-ioQAnjQ0p9NXpgX3W6gnAxLJ+YrHYhbY
-=YREd
+iQJ8BAEBCgBmBQJVfyLDXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiktkP/1TBc8vvVYrW9CiXfYjPIHNP
+/imlPutvqYWnKKBa5Tc3JDmpMwIIpFRjH6fKHoB6zXjw4IEpWZyE8AgrpTfoDFSW
+1FeiwzjVWQcTHZyTJMa5hjU3Rv70+IfDkQZJMtC2xXlIERp4vWIWxRkqOvD9V6nL
+7lATru//gZVpfYnUz6KsEqBvLEa8SnLhid6EADreDhiUPz4toncEFfm/rcmy1VfI
+/7RgyzzkZx41aBTzIuzPi89uFvGbctDYz/hG9o8xwNzMO1V1hDQpWa2Z4T3RUarw
+AQvuRamTrwAdFLpOlNQJTdQqGPgxPlARX9XhI7g1xAoC9Cg2S+bidqUz93LRthIV
+UtXkVJv0j+31wIXdo87hkuIP4RnJ2KNvB/VqTMb3TmrQkf8ZRPxVaqu8XLPM5PmU
+Z8qvP4JSDAWXm/GInNKOfNoenGMfkAntdnE0ZKl5cCrLVWtyNubLiTj+jh3ZSkbX
+Zr06/cyq9MGDT4mlVSVjvhlHO2d9zhRHR2yh8IdeJizK3+jji1rlYtj8nLiVrmsl
+XBiHjs60fWsoA/McpGw5bIUF6acDRo+N9a7QygOrBCAQnxUeAalWsE+UmY9prMye
+xX3PSa4TReIHZud7CTRlYGLl2CTelQgQgDJIFerk0egM0d5m+T2kZh0gbgj6eabA
+voSfVB4aSq6vMDL0ZPYV
+=VAnt
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/cciss_vol_status/metadata.xml b/sys-apps/cciss_vol_status/metadata.xml
index d5dc80d32a78..6bfcaebb086a 100644
--- a/sys-apps/cciss_vol_status/metadata.xml
+++ b/sys-apps/cciss_vol_status/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>base-system</herd>
-<maintainer>
-  <email>chainsaw@gentoo.org</email>
-  <name>Tony Vroon</name>
-</maintainer>
+  <herd>base-system</herd>
+  <maintainer>
+    <email>chainsaw@gentoo.org</email>
+    <name>Tony Vroon</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">cciss</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sys-apps/ccs-tools/Manifest b/sys-apps/ccs-tools/Manifest
index 2862cb8e843b..3ab0685ac396 100644
--- a/sys-apps/ccs-tools/Manifest
+++ b/sys-apps/ccs-tools/Manifest
@@ -1,26 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX ccs-tools-1.8.3_p20130214-warnings.patch 814 SHA256 d909698fe20d568efbb28828f261a4316c05725180ace3b1d1841a13a134eda4 SHA512 947caa5ce7f2c80e7e0b40042b09568c4fed731b530cf70c1fa24fa0f1a382dd41443f3db82a6aa6444c0ebcd25fd7de657c0f1990d69579e4645f3efa561e10 WHIRLPOOL 11a771b7857e37df98c289c11e79daed573bcbf56068d855d5511bfd7c16a8bbb60d98670862c1500d9246aa3fc4ca4a95e2b724a919b9dfd73c13142e0f60ee
 DIST ccs-tools-1.8.3-20130214.tar.gz 227657 SHA256 56bb03f1977346f4c7dc3a0c5da8df4a0451a79558c26564478cb87fbf3e3ade SHA512 256adf873dd99b811f5cf55e6b74e1ccdc2e54a2399724b694f22825c4d5e3167e7768bddc4952363ef835ec2b8405d5704572a9b9e214f3102bf594374325ba WHIRLPOOL d7f200842a10ca2c83a46a933beb7c70436ea36c8aad3569c33392a11360b88dbf7589ac720994fec9d5c49c46f1e1c9f97ec320d2057680a6bb0edf13c066eb
 EBUILD ccs-tools-1.8.3_p20130214.ebuild 1544 SHA256 417d3436fd3c89b389994c7d28b2d9eb74ef6e80b4ca2b3382731a56aab2db02 SHA512 734316d53588203009f78090aee1635840c2b15667bacdb21cbcf19fc6f766525ebdf15b40ac359cc5a19e8afb2f92868fa0ab3d9a59529527bb284f67fac5e0 WHIRLPOOL bfc31a0c1f6dccf3db58bb3389df60d5b6546d116551c5ea2b450dd1c42fe17b11a7d77329d1e83102951fc960d01c9ece3e5912f23cadf6ae1dcd1d251e95ef
 MISC ChangeLog 3709 SHA256 75fe5f1e92fbaf83916d275bdc67cd2804a6cacacff59c9e7de836679243fc01 SHA512 80c1aac878dd27b67267e4d9a242a4d0e2046a0340b44e9b02ac08e07d40f1c57a703bb7a62226e0ee8b28bbc60e8b08d022f65ee5ec0d389cab164f25be7d75 WHIRLPOOL efbb72443f3a6f47fcf8dbe7f5650eef7ccf2ea859f4d9b550efd8d76c1bcbf16f20226936cc8b4190a31f23c7071ae46a10e81d5e6a867bbce87864c618ed8a
-MISC metadata.xml 211 SHA256 a1bb8d76bdbe2da71b9cc04ecaa254f575552aaf5b7e94e9e04b131a32392c3f SHA512 0f6138e9843c5ebe51905db7d461da54073a88a74d938fb1d59d7f077f90002d0d785a883d70b640fa81c1c5b20dc5b9ffd969966f1cd13db71d697372e6f573 WHIRLPOOL 596d2e7e8e9245273188e0b865b481131f71853cf3313d58258266e461fde4ea22af8e992ee301e8f179a612e2a839f09f8ed504c7d086fde70f906d63c726f9
+MISC metadata.xml 293 SHA256 e3a19ddab3ea20d5b920de7ba95c03103c4a9d42d312da62cf8b7cf74f3cbf15 SHA512 e3c321fa7b5bc2b777f66e46690f3e1ec297d72c6acdb4cbee71413fd53cf723505d83a60ce74a0c7b8a51f1d16a19faa2641fe0c908d9a657b31d75d5664359 WHIRLPOOL 67572142e7ddaff9a962e9f320df242dee74735faae4dedc66abbba733d574a4ab4aebefc1689c4c589cbbb38535d95a02efa82888a87ffd7c6ef6c95be3354f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQJiBAEBCABMBQJTrBTfRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
-MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
-7LE5EACiLvaaClQUKgaCT27bHRHiJcJu7KYbJWZ8SwHU+Dvs7BuO3ytE3id2llrL
-xKhn4f7lwjZQUXBUYcmUCKqjeW6oQnvO/Ctm8HdfAwf2TPk9l1O5aAgOchRaL7pb
-ffPRN+0peyfDqizFw6WuttKlyPkwDTlIXNeYzaVZXQZmIZP03jXjBes8g3M43t/2
-QnIquhDOXAI+dlPWHMA5pFS3ej0f1ygD2YuTWBcfveD50Rr0JuM4m0CNN0VY+rs4
-z8SVs2rEwYnoFMZBnM+nyWdYysj0OL6Y5B/pbxIOuoqz4b0QFu8fN5ee0XBMlbAW
-4tFvaHP6nQz5TtBQNrPGTuMeKPqR6VVFe5zZ2zmZZB6GdpnFDiviyI+pref7cQvi
-Cuc1daFZlm9Xw/hLrWEtqi3lBZOUmrt2PT565hTXJeiiAoyoWRSPr1MDuw1geQP4
-tyEpaSAPkCX7DGOQtbXdelmcKPFjD38kZKyxrxuEsuQufNRNSG0faS8Jujdvb3sy
-W9/uK9BFEA28fjZPlXqo0K4NTd7jBUWueK/BbsmDJhb2jaD13MvQnhwujOFmUxzH
-RvPEzPcbw1CzVFOr2uBuu1TecIFwqia8MEdc+i30LowVXUI+59tK/Z19+dy35JMS
-6+T8ElakJ9O5FT8HL4AbgZC2gDA1vwksVKTxZD7NYLRzCw/Fvg==
-=Ysqf
+iQJ8BAEBCgBmBQJVfyLOXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi6fAP/1zTqHyuUYdOVYVGNl9yX8fX
+ctU3PUoml2o0rco1mFiNlZZaZx4XFEWVotJch0kygqRKvurk76kFtXpqvCc4buW2
+TghHRB6FOEzZGoRYR8k6O8kQVEiCsGHPDD7IerG+Azpva2vpt+KUACJRgB9000rJ
+XVROxQJHkuw8qfotkrt5MOz2d7+q2faa/43P34K1NtaOwbM964IrIiEyB1EtbSdy
+PFhyA2yd344t4nr2KfgQRjwgBvBQiqpJDKgLZqOFKsnaVv1z4+8Us8gZyxMPfjxu
+PXxCdmI0KAUtmpVj/0lfQaiedoYqxy0sL54Y6MWcNgI2LJAfkqyW1hWembpsjSfD
+c3rfGcmbTd7wSO4mobqnnNMifuH4TyQQq8vkJmdj7fItEiyozTiNsNkqdxdBf8mX
+2ZGeL0Mrqmji/Edh2di5K0ISgdgiMwQj+Yj0MQrPSX2gKXS2P868uVR8KKh7MOnf
+tXyB5+B3StqtQjx2LsL1+fAp7pLT0UFwy5MDwYFKv4DLjEuw3IUotvHiihmGZKBA
+POsovZc/prrrlEyQgSBXtJvc3mN3N/H8jSkg1ktuchbDW9GFD+YuY9mEGf+oscgC
+clKSI8KqrGPUQHG5I76vvfOPjn1drrARTqE1dwQWFmspTXekbkXGV9HApYTvgzyJ
+LH/TkAOU2zdP5yu4RnIr
+=Fgdc
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/ccs-tools/metadata.xml b/sys-apps/ccs-tools/metadata.xml
index 2e90b802bc7c..01cfb2cab229 100644
--- a/sys-apps/ccs-tools/metadata.xml
+++ b/sys-apps/ccs-tools/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge-jp">tomoyo</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/sys-apps/collectl/Manifest b/sys-apps/collectl/Manifest
index df4d64b2de30..c5deb36cd5fa 100644
--- a/sys-apps/collectl/Manifest
+++ b/sys-apps/collectl/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX collectl.initd-2 468 SHA256 817a1861aeae78cd82f38d48069957638ee3ba7a36f4833d672ecb17a11e9b4f SHA512 bd92b82205b82967819471c2c31217239ebb52b779d88f976508d730878bc3fffbca2aa2867006cb23834fe209541ddfa75e70e2437bf936b01d8ca5bac71531 WHIRLPOOL 5ee7a97a279d3f0b7723024e4b09057438b6ccedc0501492ca861132976d976b24f35a8835941de2a9d6e535fcaa1b68318fb7b4c79979ad5ab2ad631c439e4f
 DIST collectl-3.7.3.src.tar.gz 457208 SHA256 93c6c130eb89f0ecba1b1b791e80b7e6746fa82f6c4e770feb486ac8fcc53683 SHA512 4e73fc090685933b89c595b3f9f837c28bfbe1d5c3e7ffb5310db309d529779b106dac4f33f337d8b6686175bf7b4ff5af32cbb15b6469517d6e1ddecb6f34f8 WHIRLPOOL f457bbadd556e2372337f78354d0044773989c5914312b80936040494024f367db471e1d735d9cd72bca18611819dd8062b1f24244b8b002c7a035274c1a8772
@@ -11,21 +11,23 @@ EBUILD collectl-3.7.4.ebuild 1021 SHA256 2355d78322e4f5931783956db8a14b01723ce01
 EBUILD collectl-4.0.0.ebuild 1021 SHA256 2c42d7d94ecb632aa7f336cbf5d30d462cd9350d78f9a00b31533c78f6936b82 SHA512 9264fd060ae007069de452a27744b56c2189b08a78f112742d07ad8655b9385df44fa59832c37e5998429708a0c5c49bf693c34efada7c9e6c32887a6f430396 WHIRLPOOL 2a1ba971c679c74665db7e5f2ccaec6aec0a5075c8e2beacf19db61d95d6d1318fdeaa54b69a47c0bfd8bf7f355e31ef53abab3d84d268e3c195f493570fb674
 EBUILD collectl-4.0.2.ebuild 1021 SHA256 1b0f1e1cb210ccbca25f6708ea4176dd470073993381e0ab71ce350882fa943f SHA512 4b421bbe9311f1cae6f0f135f5999c0bcd7b7eb581ccdfc735c4455c206461d56eeaa04874ea6cfd2ca264201234eab6fc2fa1166bf4084035bb10748edac96a WHIRLPOOL 8933fc4e2387f42b9c110f04c70c1731a9fc7b11320941dd82a8d8f823855f47f4c1926f6bda720fcf69e606abd115c0f20fa28b7bb5949d8d11342db66a3c13
 MISC ChangeLog 3775 SHA256 44fd0a598e6a397aaf119c54e7a3aee7679a8d49abe2360b247fcff0765363f1 SHA512 e61873b59e9c93334db9d068065e53c38736b74c27324104b61fd2a19258042ac6c5bf484475e7be24b6b2b1bf1fc9b291867abc0559722b4ee65763d6f2104b WHIRLPOOL 8fbee796ad65464a456d8dfc88f3dd18c33743d82fd9e76f094ce435addf108ebdab3c7eb0dbd7b8a4754137be4ce2e7bd0034339979c963446933bf603552f8
-MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
+MISC metadata.xml 243 SHA256 3dd31e3fa581cacef92bc31d7e15698a1020f13efdb2da981ae344ab3fd4b4a7 SHA512 b9d3f9932927c63472eab2a3bafac03639171111530196219f902784379d9d6f6a7c73d15bcddf5f233f0d5874bbb8058acdfe33a77b2f4e6dc0783e1a0b446a WHIRLPOOL 3b7f3e0b5e1ff2960413b1a87b09c75e7ffd44f3099b687e2f1b991f433d315cb6601774ac80b1a5c46a54f13b6e565d942e44a6d40926456d6fb5eb35e83c5d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJVaBlHAAoJEPiazRVxLXTFTooP/i3hA9oNcwce6Hd7o6SgSKvS
-YXsXld9mn6aytusrRhKInXA0yB4DGLziK+EFp8nIJDA8UJmoLr/adAUrMJdvZCfV
-h2E2y8EewwIgSnICL2IQhrmGcbrRylYAEg5qqINAi0x287+YrrI4SST31wXMZQ+p
-aGZm5F/Cr+WyceaW6riX90dtopKrQP/q3YqIzH/wBYiw57g/rMBSF5DQnHDItvyq
-jesyi0HJTjfJd94ljeuMpjLatl8mcpXVl2HARjIltbsBkDan6ahp1miYJ2butxMI
-JSU8v9MBORo3boSthQ7wdmN3gIqKD8KdhZBL/wExeVkdGLN8yMi+4XY50+IuioA0
-4HXBUbWQDK07KVFBCNugt1B1nVAp0axQVEyKI4Qu4bvLfurcjeszNOAp5CX/8zFZ
-qoiXuPFS6NwoPoawVB9GkAUH4RRMyDUC4OGubj68NaTDqlzgT92aDO4v0fV/rckt
-yR3AaRg29LNiFALzyTF7gsgbOWzOngOqtUa+sq2eYvduXgtnQtb3DWaMOxjqL8Qx
-58/1HxI6e4YZr53+0ga0yQhhA4nIaP3nD+ti0QZJlFrcznLnSVV7jYno5h10/Q7B
-k+Z7SFa5OHw+7VK+C6MuFM+ijtdE25j7ottMKswT/kL285+8Mfn9BAfSv2kCQR70
-9uFRYj+fxK7DHWEE+IBO
-=6v19
+iQJ8BAEBCgBmBQJVfyLbXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmic1cQALcfMBW2Xe6K5GrarRbF/ENC
+rvgzFjZkxDfux0cpJKAeTogISTAArfZvcQ8cYKad7f/YlGNGgcMH92vVxt1rbtOb
+TB11cuf23lDSCIYLsUJofT028k4dLSQYytcBArWfRJoFBiToNjG3guE+8J5fdjL0
+Xzblt9/MIrNTcfWIwrOxS6K8SlIf6A8OQ2gI11nBFwFiAi9dI2ldhMupWaipWljN
+As0F/WSWP1qF998aLmSR8d8O5RVAv+8mGeWDFo4+fHY4bxTyJmhtYuCShy02/UAA
+QlxERWtL4qJ06SvlbNOJT4iiMNV6aPTSIW2cghzREy/KLFhbNE4DjXGdKyCkvDNV
+56MfQ0uyss9bzUrZCE4UUmnpLtKb2aiKvoxnBl8KquYBTP5NLBmt2GCY2s7DrNmL
+xF7cIFF5K3HLiWSFJ2dF+lEXvqjstGGSeFx2imOxlROht6msRZwNRbTHNKMkvUAZ
+eSP97XFQRo7D3xzk+1Ro+Lq3F+YyfZMu8tsTqMrrnuTQwoWGzOoXrr5rBnQ+uCoL
+RfK3Qz5UDdR4ygvxhf/Qp5Ab4wQVq0VSMXNVJJQazlqDr9KYHIS1weFl9t9ecPqs
+ZucUb0BuBT6aGxh1QfPhGOvKby+G1q8RQc8S3ELguCu9vFCaV6LzyNPE4bZxucP/
+wYe8prgVCA50FGn2TW3s
+=TY1t
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/collectl/metadata.xml b/sys-apps/collectl/metadata.xml
index 96a2d586367d..0fdbe9d1fab7 100644
--- a/sys-apps/collectl/metadata.xml
+++ b/sys-apps/collectl/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>base-system</herd>
+	<herd>base-system</herd>
+	<upstream>
+		<remote-id type="sourceforge">collectl</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/cracklib-words/Manifest b/sys-apps/cracklib-words/Manifest
index b17ddaf78049..7859b9ac5f73 100644
--- a/sys-apps/cracklib-words/Manifest
+++ b/sys-apps/cracklib-words/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
-DIST cracklib-words-20080507.gz 4515718 RMD160 9005c24c58feb8cdbfe958cd942293e4ff1e23be SHA1 e0cea03e505e709b15b8b950d56cb493166607da SHA256 e0c7f452c1fd80d551ae4a7d1afa7fa19cbf47c2d6d5dafc1255c1e76502cb71
-EBUILD cracklib-words-20080507.ebuild 819 RMD160 20d432cf217b51f02d653dd8a6cd9ed6e77feb9c SHA1 4b7f022af6e29a2b4ff0efe28a3378ca030062df SHA256 d3bd69d1fc5c21682c747cc41fb6551e088a4719f10b0636dc2876aa47998a35
-MISC ChangeLog 4068 RMD160 782215320709dd36230f46e9634dc16af7d141f1 SHA1 8c7b0a80c1161422c51f014672f2bb79ff4d9f28 SHA256 b98711e10dd1786561be324cbef6dbc07008944178cd88f64da22d9ba1a10ab9
-MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+DIST cracklib-words-20080507.gz 4515718 SHA256 e0c7f452c1fd80d551ae4a7d1afa7fa19cbf47c2d6d5dafc1255c1e76502cb71
+EBUILD cracklib-words-20080507.ebuild 819 SHA256 d3bd69d1fc5c21682c747cc41fb6551e088a4719f10b0636dc2876aa47998a35 SHA512 6eba2e9c030454c54cf2c0284b50480c1ebfb74b0d499362cd1e439278a1c0f487776e7fa57ad6449085cc84eaa67a3f199652a0f742d7fb17c6b532652610e8 WHIRLPOOL b750f536e955db0591f78a97e025847f605d26b2315d1ec3959e7d57108e146e8325866530572f1dbe8ece4c9b90e4f8586f6cf53f89e9ec8cffb793beb0a5fa
+MISC ChangeLog 4068 SHA256 b98711e10dd1786561be324cbef6dbc07008944178cd88f64da22d9ba1a10ab9 SHA512 2d575c7d2d064bb182fa10a21944ee3357e800cdbd5a3800e32ddaf368e2405d93e87073dcf4b6b6c034ce007991b9790b51824635cd6fb815bca251df0ddca5 WHIRLPOOL 1007752ec462d48b02f27a942ff85cf20e156dd5de2a2eb0848fe0e6b749b88fee7ee519e17fdc41f509b0a2387ca5f8671507b071996c54a43964a8ed7b2397
+MISC metadata.xml 243 SHA256 7750bd19ec6466d4b334778fbcb32b31297c7cbca1c78b8ee5c5b0fa2d5b9b0e SHA512 5bf4063c5074b366451fc68b347e0f68da98d3096f67d38505d58fc4dd21f10582c1ea28c7cbd1c221d8a7ef0ba5c410b945d86b2dee1e0fe920977cbef5fc56 WHIRLPOOL 1055d33bcd9439c713cd44eb5c4dd42e7850e8808cdb873da1c7c0482ee85d6abfd6eef676710604203c7ed74ce4abdd1b6d81659885812e2fb6c696dfc78283
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0
 
-iEYEARECAAYFAk4bYPMACgkQvFcC4BYPU0pbggCgnoX3U1zZPAsNnykTvYxVxIfa
-lIQAoJwvob9RFfqb8IW3/41wYx1vadcN
-=CAQ2
+iQJ8BAEBCgBmBQJVfyLsXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmio0QQAINF8J5zjT52pOt5/HDAT3YE
+/uiV5tRM9pBlZn2cMK/P/8AD3CoSUQHPe6hDyBNZgKy0c2KE3TSt+ji8Ie1oga8g
+c843GwF1rqrKrG5tUZHKBRA0jYl3WsKg2l6dcpJaO2NJZM9bF2WaqwFnWFBf6TKR
+HzV7ZwkCtzcWd0Di75I17oKkJq4vLyIT22wcRXWWED2ITFg+3LToGCw8m8L+6Fg/
+55IbYupNmqV5fREdAQcVPTIIW97wC+SjEaTK/DXQMkTlEaNG0+7rvplDieD3pbei
+UpDS7uPNEWOuiygoY0s7a91f9aS6dyz4cpFRu9GzEEZ+TrRc7GiZs5u87EqZLS36
+M+BA/uTC+VrLccjXm77Bdsm281MEz92zx92EnKf4uMnor5q8MpBgHpzwxeF4wv7d
+yqNeU/mdgvgcMJUynAhT9/fClxQOANvJXUL2gL80pmIdVMnqquw4GpzeNMmxzgEw
+hpDmaVIB4WigZzvNtM9kO2CrHo0KmFxpgVXKaXWmEhL7KIIZNrCXRvFsNWvYYSOd
+2wqSKRANbGrc8BaNgHgNwzxGTCOq39dukuO64uWVqxVqNSM7BjD+d4rD1CAICxgC
+uFLmpvOd1z/N/n4i/Pr9LIsZDpJWRBkPZZ+rXfnNlX+yhCjJiubKwO/BTp2vhBA+
+9VePL98ebNjWZYE+Kjc4
+=QdD8
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/cracklib-words/metadata.xml b/sys-apps/cracklib-words/metadata.xml
index 96a2d586367d..42090b9cf925 100644
--- a/sys-apps/cracklib-words/metadata.xml
+++ b/sys-apps/cracklib-words/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>base-system</herd>
+	<herd>base-system</herd>
+	<upstream>
+		<remote-id type="sourceforge">cracklib</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/cv/Manifest b/sys-apps/cv/Manifest
index 26ac3f37f7db..c79bbddcfe88 100644
--- a/sys-apps/cv/Manifest
+++ b/sys-apps/cv/Manifest
@@ -1,24 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST cv-0.4.1.tar.gz 53682 SHA256 e7537b363662060a55e1a59b78a124e76b54c3b64f0bd62c35fd3cb34c725aa9 SHA512 eb64cc44a834805209f93d23f61b270d670f1f2e535a3dbed84bdb9cbb27cec9e077abb1138c8557436baa021d2d7661132c56eae04a36f0a83b3e7a116de7d4 WHIRLPOOL c496d21287b90101720d11ca5b816878e9578f646cf846d0fd3c641d27edf2afb885a6c068850fd10ce629b856afbd15d7703da433f53c74042bc20c3e7a0e4b
 EBUILD cv-0.4.1.ebuild 835 SHA256 d97412cb266cbfec68bf7420b716f19d897564d099378de165ceae406cb24449 SHA512 5793db5a77a60cadcaf73b26714c336b69511fb2ade3ae6ad59ca16b35e29fdca5b7bf7d51c54d966f805602a22a0c76040c793737fcf5c5580e27e688fa97c6 WHIRLPOOL fef470450c90188829ae8d420d02fb24fb2f4764a671b088224576f0c6c155c580b1e9202fc037d0f4e5dcfe88be01eeb79d2bbaf1fb92dd5dc19b616845f66a
 MISC ChangeLog 777 SHA256 f491930899afcd5cb070ea58aca93771509018ae502b3ead4a94438662395ead SHA512 0cd946d79f1841d3d6c8af4161ac16ba8ea80dc25fd25f7e2fcfc040f136316828014786d03dcc1ed913abddaf7523fdfd8d1025828429f50ac0ad8e89ea3eec WHIRLPOOL aa0447bd04f0098fc1384ad15366be3e7127a84f7ed991d8e98053651330f669cb3cccb7ab5a41bab0f07bcdcccaa836603cd3c71bf4dbff72250bf2cd30fbe4
-MISC metadata.xml 242 SHA256 dc60fc506f60d6edbf250878d394388804d263cdcdee74cf36b51abac7df6da2 SHA512 fbf8b425510eb7fbfa0f478b4c2e6d73ab050331bfd156004fe43bf5c19cceeca3f43f7156f9cf03ae37e530cad8fab19efa0e1071a599e2eee812785e7c2236 WHIRLPOOL 16510f5c44c1cdd793039dd8acfccde600036f065a7cdd83d81d0b72ad5fafaebf159f9796066381735b16652461d2bb4b8f0582c41516906ce288384fabe2da
+MISC metadata.xml 321 SHA256 6f00c719425bd3d04e988aab890a6b28e57ed26551c44d40518a37d8d4686185 SHA512 cc78866d03b40db8560b4a57be2d09ee9baf0e5e74ef61d1071a9b67a03dc5faab27f534c9f3beb774596c1ec7ce9ee385bbd405040cdefd474839bd6a668de1 WHIRLPOOL 71c4e39e1281e7a2e10b0374f04e97761fcb5971ea83c613a6bf6828172d079ec6a29256eae1fdd5147653bd1fe17b659ded42d8bb0ee7a9a7de89f67fd91f2a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJUY+QjAAoJEJOE+m71LUu6DYUQAIEH8//6SM7Np2t7wNzwudlw
-7RuIpAvAQ3LMLBJf8I6Y/DqTs4U9vp6VxGzNpBkTEaLH7ju8K3BdRqYkE6JON+Gb
-8+maa6y8wU+lyZxR9dvY1UmIfw4UglufjNikoMKZ5vHHKEmjdjTBNKJ8bBsfz7d/
-8tVtnOk5m8gZwNR1+56ESDGrt0pX7VZVSevYWcQp6eR/GDIrEhLdc2zXKeh9BbJM
-EK/9GpK2TKtsrC3smZ6NjSjCdXlVwgq0MjoXHTSakpW+19+B3Pm0dmXfayR0iE08
-e9/7CsEO7fp/Z+U7k07KDFYgol0ByDRcn1IzvI4y9htT97u98mMHoHPyf903gO/x
-g+FGgZxxJwsTJLM8CJIdREKZKnOJID0dR/hVE5zdwZlYtp0IMTBWjUbC81DCnDwt
-baJflLdlRe1B82QUKTprifent9dvECjomSosydugyDAQbBxylNoRPUfyfGvS77HV
-XpHY6qbRrmgQHyz4bs6bla9uL71xEiLFqOsxthaShSMhRDrk3OsNisA8DHveBedY
-p5CdmoGUlTs0iLwCjnx56/0Hhhm95HvvBDOCtEGQU5v4WylNhrzYHDG1GNI31AI+
-8UELgclY+YhhYig1xIUnlXfEEpopFMtXKFk6HhzHK5w3fR1rTzco91jgcjez2a2i
-5UgQNYiOrKJ6Ovu7Fwtt
-=0hco
+iQJ8BAEBCgBmBQJVfyL8XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiJ+kP/i5uQdjVC2gsw81ZEZO8u+ld
+ecRtld8UNk+7Tvy4xE37s1JVTtaXifuh+qFZTLGP2oPFPr1KAxid/dXfeZgJXobx
+/It1QQgOBl+72LcYHapL7c0eTDB0KOwMw0hadl8cEnJI4QfcnZooJQ1IzeoW8ffY
+0/CqRGIK38ORswknD2paAyCdl1FPc/Ny+52Agj3d69Eomg8SpSJBA1n33oN/wCwv
+EwcTQkztgOTmemo/JHdo90CHktBxTOog7ppxAsNjvU+alV4uf0s76tboL98JNRIO
+WPAfn3TYgKRlNm6A4ukJbzajuTCRZ6U6Ct1Ni0qGrYOmZIzqtIAxszkXS8wMDwD1
+xVIWWfTtvX0L1yaiYwUgDraafNhb0TxMi4DWEcQGn4nSWvQ/kgTNOsXy+CUGDKzR
+0rYhacv9seDpxyyWNawoIpn+JD4sem30iSAHygMearVE42ny0q5MU6EaRMaO/lDA
+3Rn/DDwaZBO1VtpcLbTBRr0evVrTnSlXequWMMYPcBA3Z7U7kyfnQGmpBVfO917C
+vGQxRLnMFTNGodua2/iQEB9AIrZs7MP2N6cPCW5h7UApHuJhIeseenv9zR5UGpAl
+2X3crXm8gw0V3daoKuCsYu4ut1y7vcVVvHgKp11JuwrlI9DgXAi0GreskjdDZXeX
+m7WF2KVyVEgGOgfB4mem
+=onfp
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/cv/metadata.xml b/sys-apps/cv/metadata.xml
index 2392669de144..a0e90f5de621 100644
--- a/sys-apps/cv/metadata.xml
+++ b/sys-apps/cv/metadata.xml
@@ -5,4 +5,7 @@
     <email>zx2c4@gentoo.org</email>
     <name>Jason A. Donenfeld</name>
   </maintainer>
+  <upstream>
+    <remote-id type="github">Xfennec/cv</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sys-apps/daemonize/Manifest b/sys-apps/daemonize/Manifest
index 1220fa12b8cf..248f4b72023a 100644
--- a/sys-apps/daemonize/Manifest
+++ b/sys-apps/daemonize/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST daemonize-1.6.tar.gz 61803 SHA256 e70ad94bd2f4d24ebfcbceaf009ab5ac1ac5ceb5acca4bb9d3d9105cdc1cd681
 DIST daemonize-1.7.4.tar.gz 66005 SHA256 e80bb9299b76b6d7b3bc235b2413961e138e586d777385dcf6cf478cea135525 SHA512 aa5dd1d89650fc4a7e783163852de176877b0e999c4d16950a03a81c0db1477e2994fe8d97d8e2bd61baafb7810522754eade96f3ff0301c1e6ce74f9252d34e WHIRLPOOL 8a72762ec08db2f47686bd8bb2063b986f8379e888571eafdaefe8b2e3e41df979474faa4ebc0f8701f85f2fa73ab805c3b61f88537c71673b52f731436cb3c3
@@ -10,23 +10,23 @@ EBUILD daemonize-1.7.4.ebuild 704 SHA256 22f30dd4aa239bc8cd8ae5c5155f6ac4784e8dd
 EBUILD daemonize-1.7.5.ebuild 711 SHA256 7e284eb32de42edbe2bae0555b766a1da13da5db4420f5c507458445b8e9d2b5 SHA512 28a6a8deff2a768cf4ff19eff16cf174f1707fce076bbbe3168a461e64f32f688c02433f1916e525023e22e6c471dfb5fc9f80bbcc66e5b8d0b3d9d72ccac232 WHIRLPOOL 678b49486ac7feac5dea69f709fd1398947a125eef59b6942a6c742f38cf6d11fe4a92aff973d33690567698201f1a443501ba36a292355ebd83800b02604d7d
 EBUILD daemonize-1.7.6.ebuild 711 SHA256 ba64ad86badd2a50ea98f2a6c525e31306fae114c4806e90e680d6760104e5fd SHA512 86d16b31efbb1abc380a7888284be64c1a74b194d207228e67afa698924d36eefafe54f2afa87a4c2f1b8bffbbc86581d4974a83ce4c89724a8fda8b8f1654e0 WHIRLPOOL 71ecf141101b25f67d78fa2ecaf39c5a8fbe706bf0c4e994fd78b7737300e1126c1fecb380c1f63faa5b983e48aea4b4256071f833185ae78aabdfd24e309c1a
 MISC ChangeLog 1392 SHA256 72a619e982c005d52a4f663a2b4e7e931a5eab1c136ee2244881fadacf6ffd6d SHA512 ee293d22134310e57e9ff133b6e2359c9445f77d41903848f72af4fb0e752db16a01315ccb3966cec95c6023cf34d9708972c9d2a603f6e071e8b9bf13507bc6 WHIRLPOOL f87a86eb509225a701ba0019fc9a1af4337bfa03a0c230f9d60ecfcca2d9c3a6838b3ed7bfbb1f8ad021731a997b7a578fed34ebc75a22526139f9eb1540c7ed
-MISC metadata.xml 278 SHA256 07a0afc4dfc12865b213ef6815169e0524357989b213ac40bc9436dea94c3160 SHA512 c47ad7b85f6516eec5bc86f26785d8731544436f25fce07093a7c51de184ddfeca02253022c54fb88c1b75645350d8d23de7fc1d8c62e8050e1288b4d6ebaba6 WHIRLPOOL 5fc748443c6e622808acfb4f906cc41bac88b04718771a678462d1079185b74de2840d3dfe1c0949ad96c5b8d2a278f7587af8b1381cddf72c92b9b3099b40c8
+MISC metadata.xml 362 SHA256 aec5b8d552a94ef78f310c4c351df5b212aa0d391db02bdc39539c5437b74f69 SHA512 d099c53732496607c57a891e6c4606bd306786fae7810a8e7d9a01902c6509a6973b7b0688e03806415ae1906e6e015f57a9c78ebdac867185b74c102d1c8dd3 WHIRLPOOL cd568307de1d576f1388637c70a0be7b030530c3d4937e50141be710d11d2dbfd24fd2b857dfd6f71a5003c1bde3d6244b9a43b2158266417f4ef55d0356ad26
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVauLUXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88PigP/3DENG386onqoKmyLxR1pxsI
-dkQug384AUBjxmapNimXgVwGx3vpxJGvPRuAyKBBLNHws77kVK2a+9Cw+0mZgt6+
-b5GyK4FmHGgdCdazWG5FeMfgsPolfH4miPOebovEM3M4q4HWEjvu+xAPxrv+VIPG
-0pHi5IFqI+el7rYfjHfsAh9ixZy8lS0BLd9y7IQF74aPQayYT/WsNR2Z9n6Z3kLu
-jhr+OUAWGUBubbkoB8uGkpQxTOFamWB8xgTqdhBAgC9hELP1MAB6SxrsgPSJgIiy
-JSLPReukD48br3uQi4vWqj5rgV0j+enshhen7fSWKJVIWgYNmC51i9IvI6xrTEP+
-9nXSMBvsaQIKryd25Ud/ikZaAeE05ocs2Qh1HVNuZZB+0g7UhbkuPDBxTObooT2q
-j6ebW7Gqcjk04V7Xxkgaeo07KPXYrzOREmXPuW0mfzoH3d2LTvpd5NDOBOm9xXZS
-a/PzlNEywDh2F+BC/G50EsKkbagxdRKm4p4e3ta0hsnHSCFNiANJqYxy4bL1rWgT
-2dzoVBVY/L69ojqfGymYOud86OgewhbNSQjgw5/0tYDoBr32mFWzeo7Z/hd6Lr+F
-rFo+zNMQiYca712Kd8Mm8wMO1SdXtWzKnIhiGn/wTcS2ncpQYHuyeHzltfyTHgQo
-g7DPmqkxLFAgOg+Rcdld
-=xp1G
+iQJ8BAEBCgBmBQJVfyMFXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmisMcP/jZ2X6EVjlHS21RDbf8vTkeU
+dZEWSf/S7KR8zCx87nnkR5Lf4zgktYZmukmXoSaBgpN3mkRVnObQgIl6tchpjr3t
+5Vf7/IaovvPZx94R0tqBIHpR2U4Qk9vHNRshFYUmTYxrWpd3TnGMsvJArDaSlS0a
+nYsu1alsfj1dC5Dx8GvYkAMy6xG+LNLZmdrOkFa7xcLsG1Kvknyc3JWrRWkwS1Ra
+WqmVwqdQRn6Y/6gGmJ+Ps1Vw1gknGYi8J0qKgbFGF78hSgSbLhKknxfkY4jx79Ys
+XcBJIY5//3+2WSiHMnszoemgn2mxt+mXnQMPo3gmxcAu6SMNG6XbTalF4lOWxCpu
++cFy6DeKyjPzjB4BFb/rsThz1+pFr1DLzMfNJsTTutKT8a9AbVN9SJTqPB/dd93K
+Nf+5hBYLHze3g4siFGPEFBAk5NZ47MOSuwSIiZSyudUy12ErMWuAhdm5aLbSQTrM
+eEeB1H6GFZCAt7O+FUNrFbapL5lziFzieIc9lc0scHVkRV3wxlV8nI4P6HeZ3+Wu
+wr/Ib47A8LM8y6pz30hz0g0EfZIwEq849CbDCtxKMun0nx79Vz7w/wXzzmHZ7jwg
+EEHlXfYJ6LgKGPP8qEEqhl3GfNZsCMSgLIwcT4BH629E0dYdErNMT9CiXWW4mQoC
+73iOqX3nkcgxjVEBWRnU
+=5+g+
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/daemonize/metadata.xml b/sys-apps/daemonize/metadata.xml
index 5e3a61a90139..e0f542b458ae 100644
--- a/sys-apps/daemonize/metadata.xml
+++ b/sys-apps/daemonize/metadata.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>hwoarang@gentoo.org</email>
-<name>Markos Chandras</name>
-</maintainer>
-<longdescription lang="en">
+	<maintainer>
+		<email>hwoarang@gentoo.org</email>
+		<name>Markos Chandras</name>
+	</maintainer>
+	<longdescription lang="en">
 </longdescription>
+	<upstream>
+		<remote-id type="github">bmc/daemonize</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/sys-apps/dcfldd/Manifest b/sys-apps/dcfldd/Manifest
index b75d3784d1f4..1f1ca3f1d836 100644
--- a/sys-apps/dcfldd/Manifest
+++ b/sys-apps/dcfldd/Manifest
@@ -1,18 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST dcfldd-1.3.4-1.tar.gz 163141 SHA256 f5143a184da56fd5ac729d6d8cbcf9f5da8e1cf4604aa9fb97c59553b7e6d5f8
 EBUILD dcfldd-1.3.4.1.ebuild 685 SHA256 f01bd60e37aa7b52403b4c2ad595dd2f35f0304e2fc7be3565dd17848990ac41 SHA512 0885308168ff4c555b62e43bd479ee6131fbee17186b20f56b3e0b68dd6bb7e53780639fdf447163d2c38e7bcaad93aa0f5179d8920e89dd41b4d07033d16a37 WHIRLPOOL 63638ca7ab7350220774cf67684bb833e5bb84799b7464b1972ad5a9cd10ce44abc0acb554290e07a325b89b2452d1a24c60fc0510a37cd048fa41c9f2afabb3
 MISC ChangeLog 2003 SHA256 4c35a1305fc9465878ab38ef1b8c0614c8b3c8fa89a5cd63b9eadfb5743477cd SHA512 5affb103426778cde8a6ecebbbb30153e056a009db166aef71e7fb8bbce068c9d82a24afd799bd90c1b2c226c63f59d14b71ba291356160fdb36954f6be2269d WHIRLPOOL 93f7a4177b2e5308ffb68d7ae109c77cd0b55dad577f5baa84477cf5ada900f037e2b8b03a2b84f006b3afc4d8d5e5ac326e732818b431c35594d0a50d2b5b9a
-MISC metadata.xml 162 SHA256 ef4b145d181ab6330d8f45cdc7b8138c1262043de23a5f10750a195ec73465db SHA512 a728d8f84d04f3cfc0eafcc9aaea833e1d723a79d1a34f9f0aa6f4c070569cc91aa1baf31315bc884cf489182bb6645f513d7cf3cd67adb0cc6bfe47377dbfdc WHIRLPOOL 46479d351ee55c4add6a00601850b55d609835b7b188e3ea8000de51b31bbf5ddb6e0ad35d27cd334bd8aef488fb9fa2384710dcb126273a7d217766bbd21a30
+MISC metadata.xml 239 SHA256 d414afb9e5753b292c3374262ef3cb613043d012f3e6b242e1c8a7da94199a5c SHA512 d70ea6869c7fff073f327479810f91aac702e44ece650499fa15beed19ed19fcb2fb5eaa688c7cf69cd3603a85e4d72133d286b8bd166213fd7d614b49ca0c97 WHIRLPOOL c4dbfb480b03d1fb20357811d7686048bb4e94bacb1dc74f685409bb88af4f9d0388b575056c746fae98c328afd3f7d4e3e0203391edb9333723912f890af388
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJQSqkxAAoJEEqz6FtPBkyjpB8H/iLoBvSMku+1BOUt+4Fl8CM0
-sfkYtFFHkSEttAOYKU8d5Y77jA+toVS55nzPqMUoUZdlJqMY56UWTcq4o+6G7yuV
-drOyTWz1ac9e3R/Bch0Ey/AlnJlqiv7I1psvEqA8CoE9aHS2Uw1o1dvuZrwXrpWo
-T6uVCauvETTkOiu6gtl8OiAY0Clb9unKjAp6JlnG44RHmuW0grXhPR3w9nZZypsN
-DIjTqhwG6AbO0SOPnDOcLUoJXmqnJ6neT9OAqxkiUQS6te8K06Dw6qHrRYo2C9VR
-gcIEavGrdY/T1qkM0o4MQTx6+a5DZobPY9BFlwcxKF0MfmmFnMt8uYFlifX/JFE=
-=ww/n
+iQJ8BAEBCgBmBQJVfyMSXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiTYYP/igC+HcznT1nFt9tfXEprJ+k
+DTcLP0xZkJl3LancXRzIgpB4uNZPJfhdRtrEDPgGuQY+hsvgcZcDO4GSkksyPaZq
+dp2z8xDAruqzMW7MApdp85Ap5LVZ+pjdclQpurpMWoY1kOUG61vB/BquCswVInn0
+y13Wii1EfCIVUPb97FYlUc+Nx+mx4Qvv7XFRCsVqSXFwadiPSb6A3jhfoRsxnj5I
+72rSoMQyJpwjxk7O9Eq/n6xsws7ryQliyAE1LMfeG8bsyrikfxY1NKDxt7Z6MgJb
++ejwjlml0BOC8MAJxqRmJ0SQhO/oP0RCrZFIVTKj/TzAhriQEmVs64Z6liEFrYyj
+B4QYqg+UvYwQJto1GL1/3rnzcRwc+9u1Rk3XuKeKnnQPt1x9wEJkUB1kdQ4jZ8Hk
+IwJ+2qjU5vNCPUanPhOc71Pc1NBzEMFm9W459Ra6JCQwXIk4Q3R+vz0XDroxvJk5
+eO8ykxXF5KmTnKL1iKBk4ngkRCNjb2XREzAAbLSKVfw8xosI/f9Mcnh5EzewWZCk
+xqEMWYYowEZwcNozURXp4RO+IMtKHeJYg2FOSoiiucj6rHOAg2wQCxnOV7RQR0cd
+U7VJXSw+Jw757h1lV2wWRQT8aZ33l+XMu7RBoxutqswR7cuNQltEUPt7uW5IHZZy
+rUjAuyF2/NEHYsZcrvvr
+=bByA
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/dcfldd/metadata.xml b/sys-apps/dcfldd/metadata.xml
index 2ff523b91b12..961146344a8d 100644
--- a/sys-apps/dcfldd/metadata.xml
+++ b/sys-apps/dcfldd/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>forensics</herd>
+	<herd>forensics</herd>
+	<upstream>
+		<remote-id type="sourceforge">dcfldd</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/dmtcp/Manifest b/sys-apps/dmtcp/Manifest
index 3a7114336c67..35111513fa64 100644
--- a/sys-apps/dmtcp/Manifest
+++ b/sys-apps/dmtcp/Manifest
@@ -1,5 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX dmtcp-1.2.1-gcc46.patch 505 SHA256 348cdfcdf6298c98b88d9e699513bb02905390cf3c40263177d7fba1ee717aa5 SHA512 69e9ce222492eded451e6962758009d875bffc9c8d03dfd459088b0028c19e0d41269786aef3b4ae92eb1a52fa29c3f0aedf4cc2a5e43172c145904b08d70aae WHIRLPOOL 6824930c8f9993dd8fe039c6944aea8da264781a435085593a40e42537341a0ca607d85b9937448fc33a304e70a84455eefc476024cff2523510fb998c3fc611
 DIST dmtcp-1.2.6.tar.gz 936928 SHA256 ede0ef3544f08befe2b3df45d9087b4bfa02d52074cf805181c857f5de9fbfca SHA512 cc14e344b8a479be436c5ada90d15c3693436a0e009f03755d13cd86c645249e22258eade79c5b92e801866ec7fe5907956d12384bebb8c330450f6ba26c84a0 WHIRLPOOL d64ca8143c9943925c1a85ada9b54fe98da4722d57b42d4298ef1cf35782816d300f9aefa0e67fb3046d1f4fdc7c2fdd74450710e375ce4a78cdeed7e2f6d4f3
 EBUILD dmtcp-1.2.6.ebuild 1444 SHA256 0b14fe9dba94f49a6decb3e81aa546e9dc0ed1ab20122d083283edc20bbbedb8 SHA512 05e8bcf4c53af18dd5d19555502270e9388ad336f5bafd29795323a681f9f2bb40a7cf1f918b5f1673971c4bc32b716cbc71eadc0bd484d64a3896590c2be61a WHIRLPOOL 9be7115ce7c8e6c1f7ce9acad200e2662d153d92daac9ae81e0892e57cfdf053917f04cf84621dffa323f8985d7cb516e1da24077b6d4df91df64e411e71c5e0
 MISC ChangeLog 1260 SHA256 5f83260224a35d3f3fcfd5bca731f85a3894ea9e35a5a7e1ee968fbf50e7e471 SHA512 1176be7c5915090c77fd4c01cdf999b96f6b830b57b8bf386ae89dc3df1f05124173510a1e1887752e3f09e0b78808b41525aee082436cc5a61d39ef2fbf99ee WHIRLPOOL 2bf38e51e9b0383023f930ffd1ff73b3246706115749694df38988586173f88efef9998460b10f2e9183e981f76b3302e5e31943e1b8bd4fa6d817ede74a5c04
-MISC metadata.xml 345 SHA256 9f3882b1946fa662e43890d281f58d4f3648b70a3945590830a392a36e0018ed SHA512 83e8200752a6b0cbc2f705730d10070715390060adfc9b2987c032c0c86a5d2e1dc4012c46475530995ed956c85434b25e33c9bc2e039fa49a727baf3e52e9c0 WHIRLPOOL 0333e36075b2bd27336e8d7e387058cecd4247181aa632c69158d740e38b4e6ffd6f9f9ff58e86c07cf3b7029e641d13fc5ee12d1910c825a3ace5e3c2d9edb6
+MISC metadata.xml 427 SHA256 3361846406fd476716e9d69fd9cc20a26e1cb8bd1fef7d488d0aabfabcaf6b20 SHA512 c1530610e27ce85f52712e7ec12a741a027c4c582f1ec8dbae567f875102c7b883f5baea028901413cb8af1ac8da3e56460a5a10c05eec3a62070b50f83cb323 WHIRLPOOL 81927393257b0e1a3d1f11cd0c0ce709e0df51d6a8dd9f2b4e083811944e465951d05f353c852e17c6f6854d23b2a6201e1b8cc2068849b3bfc3a80c4a249f3e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVfyMdXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi8RIP/j5bMNpAwXA7H+KoK3eSCrK2
+wFi3pZjLZjCW/JwyyyeA5oxbUA9YAFQe0I19NjcIPgUyVdUuv/HsnJnQqsbq5xUf
+SNLLM1YdJaVTk92j6Kf44ALRFVVoXN4I3X2vUz76O73R9rid0irUkB1yNYcDj3Sv
+2b5aE8EOvNpA+BVF0Lh9U0IQQUpl/ZTz8T+GWQ+5FswtpnnMgVuzAEqpAM4ydsiL
+Sz8IYwxf0OoMI0FMjEL26yICmfT1BjR9flxHIEOZWLX7LBWaDje0UUY7UgfEt8Es
+DRpk369X8t3BIqTZOvAQlE4aVnSZkhamTaJBZpm6wxapWFsbJmExH4QXFVJc5Hwr
+x8w/v2mVJKAKBuMYmtmXcZr6EA8LjFroeZDoFi0EvUfcZrkD05RCo6OG4HlJVOPH
+BNuoC6y+YAUmh5ipRo3DX9jKwv2Cf7fgjwS/rnp/UE1OnO8ASIy8VUt8GP4whv3U
+4LMGcIsjRMXoVPtjoSVx68kmZto5wc/osghI+53Eh5dGlo6UYf9gJvbbY8mdaWlu
+MIYHNfLbeY0TodA20fUihWs6qTp/pccAB3Hwm/Rj58zS8+yv5Vquw+bnXDVjWK/d
+HWcRD6mNR/0h3nEZtrvPwM50U9Y9y7JFXe1DqTc2y93J2DfOT7Bgn6PuCptY6f4p
+TDLUYgFwox8wR1jzQ/4b
+=2BgL
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/dmtcp/metadata.xml b/sys-apps/dmtcp/metadata.xml
index 5f9ad6f3e880..154329b9ce83 100644
--- a/sys-apps/dmtcp/metadata.xml
+++ b/sys-apps/dmtcp/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>dev-tools</herd>
-<use>
-<flag name="fast">Enable experimental performance options such as mmap allocator.</flag>
-<flag name="trace">Enable ptrace support (only valid with debug enabled).</flag>
-</use>
+	<herd>dev-tools</herd>
+	<use>
+		<flag name="fast">Enable experimental performance options such as mmap allocator.</flag>
+		<flag name="trace">Enable ptrace support (only valid with debug enabled).</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">dmtcp</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/edac-utils/Manifest b/sys-apps/edac-utils/Manifest
index c1bec2cc8b48..84c6b091a694 100644
--- a/sys-apps/edac-utils/Manifest
+++ b/sys-apps/edac-utils/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST edac-utils-0.18.tar.gz 285909 SHA256 2a027dbde6c3095807c9fbfa0025bedad38fc839e9967707c1986089ff4c8750 SHA512 5c81b11c28e8fb3198f2d656171493877393024d9e31233c252d358d8029aa83065e7b66ea87d742518f710466c9ba7dfcf57a1641374ce169cf95fd379101fa WHIRLPOOL e7af26138378e784c36c43d85b0d2449b5d5606d217dc8bc217f0720effb0fd6d5c4ab5b933e3e38cfadd5e5e51b47559d1a947bcc3df2ec8c8138eec7507b58
 EBUILD edac-utils-0.18.ebuild 1122 SHA256 e4012be4e46a11461b24a1c2a792b1e667c6e2ce1ddec570fa7e38930814ae90 SHA512 fcf59e448bbbe4daf208665f00c22f68b6c4cbba916e3c34e9b0b78585b4e1e20c7ad59bdce5e7685f75184102460e338808a2cafb5210a24079a1261582e84b WHIRLPOOL a13620fb212a327c3db9533dac4bcdf7d2b01bd33dafd841a81ea84ebb665293b0809a13211bbf38669756028d1dd404ab975af42af33a227ab151a606c8500d
 MISC ChangeLog 899 SHA256 be7057e93a20cfe92a72eedcff10058e7adc3444f9daf3d5deaa1570f55415e5 SHA512 3edaa19829e0c2bcfd18837e111339c65fe43c43daae4155cb22c1d19c7adbeca0fed148d7478695d3552cf3c175577fe44e1a66e59132eda9d60b370f73742b WHIRLPOOL a6ee91a77836335d50c2de7fff77737851a8b9f885c86cc3f4347bb025072462f7c1139fc8a463886b6ed7e54ccd1384c4fcdf4b72e5b4b2f4b5daef5e668d7f
-MISC metadata.xml 234 SHA256 3299defd0e5e3780bf8db22ac755b39ecc0d5ae97b62507f6795c1dd74b4949b SHA512 0e24d065bda388b72e7034a20c7405b4319deafd2989b874e1740dd596f9cf7395b7acaa11c2617bcaa2cd8d295c44a768a789c1fbe07e455d3b33f2a6aa031b WHIRLPOOL d2b0c4dd530ba32a5272f7555f782ba9d69cb9a1e04b88b45c3f6a54d94e57af4bc59143861e469a595c5260f37a68c51d38d988734f7c5234368847ed62ef7b
+MISC metadata.xml 328 SHA256 47c2bc4bcb105dfec8224b7ad8335e59a5b8a7e0080b30a469906ca56404198c SHA512 34013bb79af4921a619e2ab138677f9cdced63eeba0239bb8275f93f872353e939de422ca740338dda821df02a57e666137c69b428b6bbe1d2f4e82914947333 WHIRLPOOL 6987dbe0abe233a887adfa46cf4e24537622035a7c6e9e0f0b3a3de40c592f479a9ef44f88e10054d61608def787951e6ea5ac83c4bd9df7413df5d188116d49
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlMVFn0ACgkQCaWpQKGI+9TINgCdEj8OY9+Hwp46HnLjiemMsqus
-GZUAnjuvbGEAFEfcy8D4QL2ICN9YEjHp
-=RWl9
+iQJ8BAEBCgBmBQJVfyMlXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiFkwP/1TF/zXjgbbl416jsQVs0sm6
+c1yOA4VjY6aNVKimeXU9SLvosf7TWjTQ5xo/ZcbeNeYQgGN6vmq84yOklyg5mMIb
+WcndF0XKa/Pq+LF+IYRng/cYtpTPnqZlN1kxIfAb9H8eqhMQpku+jXpvwnW119Qx
+HZEEqLi2NsR26+/FUC2Vza6CZHizZR8gqQ6ajZ5Brwz406brfZBeFhPEtk8JavJO
+ZI1pYr0jNggPF7CA2cOwjt6S71RvmoKpAAgFZcZaTgLHr/6Gdb9oDWCEi9gdcEK8
+Y658kNSeP3yR8Ez0Yp+K9fy7cNwlwRaqnezzAgl06dN0pVfNs4l9fb4n7R/9Nm16
+WSWPJe0NHUsTWR0KvUy4fwILHelOTvqM95ga+3uETVjyrFaQTnOBS3pOm7kWvM5+
+FGmWmLrsL3NwoxA1Yyw7NlDEd5S9FnquUAHxfs0lE/AHTcDt/U6DBanx8OqQACsY
+6wzPaApuf7+4FF71iIaLQ0MhVtSpnahoXj281p90DgnKY94x8uTTMm3cJ0tI8BXa
+RPhIgmmBW7qxSqnmaVDBt84Xw6N1IQn/gWJZfS85NDVibMnew4xdjYUO9JLlCysi
+2GwiDvHjbeVj8AylBy4D2UPLkiuCpcn2jplfunLU7MLgn0Izekd4KDy81gWjlUOO
+oBP7gvkNKq2+KHLoj81n
+=p/Lx
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/edac-utils/metadata.xml b/sys-apps/edac-utils/metadata.xml
index 31c8b99f54a1..1e6fed43bcf5 100644
--- a/sys-apps/edac-utils/metadata.xml
+++ b/sys-apps/edac-utils/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>dev-zero@gentoo.org</email>
-  <name>Tiziano Müller</name>
-</maintainer>
+  <maintainer>
+    <email>dev-zero@gentoo.org</email>
+    <name>Tiziano Müller</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">grondo/edac-utils</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sys-apps/etckeeper/Manifest b/sys-apps/etckeeper/Manifest
index 0940d60af1e5..648fb4848117 100644
--- a/sys-apps/etckeeper/Manifest
+++ b/sys-apps/etckeeper/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX 99etckeeper 60 SHA256 237108fb8d1b16ba51410acea5963991de7a2eef9db7594d67a7f725772da16f SHA512 b2c49d5a1fe2fb8e59d6b4d85b6e2176a8bf8486cb120698050c84e067c3ec47cbd681a7b1fd1739730380f95e9c7c9092462e1f8e4bb6b9c9986b03da83443f WHIRLPOOL d41e2caa2b1ec0cd57defb10ff01f2acd3c7d043d19c90bb3b18573d957e0f7a2f21f56390d30e9306272ab45cd7407219a63f53c369cf84016008ef94a6ad2e
 AUX bashrc 116 SHA256 ed9584cd6fdc180dbd3c3d332b07f0287698c9a5602664b8442fea2743141e5a SHA512 8ea8195aa7d65370382c05c92951157b133914d946eec17da4cec32e469130553bdffd91261ce571f5cd31577d5381818ab2deb3f1e6ac872f054dd2798ceb0e WHIRLPOOL b15d4a65c31d7243993204619b2b4d9b1f4bcf539abf43d20fc8fce9d9eabd928a466b5139e66c35430f0e9c9c103344b4ceffa328a4374a7d45dbef0cb4e672
 AUX bashrc-r1 114 SHA256 1d29da179b460ecc317097fe3d1ab341ef34c45855e2531580aa6cdce44cb776 SHA512 2c3e068413dec16e14b196a1c3eb945af5cbc0be99c9705dce18a7c6d3f70d625aedd2799cad085236923bbeaeafa0edbf7a1f97736ca548b4269257ffbeb01c WHIRLPOOL 56a311167c8e2ee4f7d0e2de11a305750f8075fa117f8b057a59c8684112806908685ba9326a5902478f821a8921fdb05984762bd24abbae60e2a9a5ff55db6c
@@ -11,4 +14,23 @@ EBUILD etckeeper-1.11-r1.ebuild 1888 SHA256 fd67f3b3327eaae78581d71ec78cd118f739
 EBUILD etckeeper-1.15.ebuild 1900 SHA256 170bed405e79d2930e237fb27021cee59936e84aa6293f4e782988ee6421ed19 SHA512 34e6afd81ddf0050c85e53354a5a898710988959b93617ff694d8429bb5138c596dbf221bbc8fb2f83a85afd16d22ab20f89b8230fad1c84504721231b6bf66f WHIRLPOOL 84637b98912ecc03de5f09b8c1b368043caf16f4dc3f5ad58b1e5befad7232addea6f6b35b27a903c6704ac7f51c02223346f6ca5ce54df303c1ebc0c3e6a2e4
 EBUILD etckeeper-1.18.ebuild 1894 SHA256 0bfff79599019a25474aa655f6cfc8b26c316b492c06ad9db1f774f0789554e3 SHA512 7f275f1519a5391b692caf62c74a33578a60e6c26550689d4f5bbc097ecb16073a6aa5cdf720ef1ea96846a3799ea2127a7fd656b48e95dd2a422314948e67cf WHIRLPOOL 6f9522f2610b5a481c857f2ed93466d80e32c2b258c78f045b0612d4622fdd9ce1fd5cd4c6b8c4f7181e9715a7410ea6391a7151f9a247593e585259b4e76ea9
 MISC ChangeLog 6709 SHA256 48a118be97f3bc8d6bf5b92a8159aa2ca44ec43baf1c78f9c686b0a24973f9f5 SHA512 80c2c650a8615a9804e38f0b69f1f36ee83c642a2dd6d4b4c396063813d8ea6e93e15fa5f55637aeafbe0eb81e44657d831c74414f1b999ddfd00ff75501c1c2 WHIRLPOOL 044fc05cb7d0191f98ee83365a065ae09f2dadfb5fdb0cc3ad4093323c4a5ee8502a45ed0a286bd307fa7084c726f93e2c5ccb36f979fce8b61c1d2c42d41fb5
-MISC metadata.xml 765 SHA256 778a812a11ab05db9c023d83f155a78afc8335aa6440da6d0c3f0d3433b80203 SHA512 a70938956b7cd51a43f2cd3c472ebf62f80d705520cf9b00a8cb49ce260d15a6d6d86b9d7afc93820a62ffe6dc8bdf377becb7a9cc26546911fb697318000063 WHIRLPOOL 51a7d628af4ab30348702bee5a79e9597c9ae8050b8c83e1877b32cdd50409aadb79eb0b4c1e582a44d0b48483b743ff27450a70f910929d527b06aac5c13b69
+MISC metadata.xml 844 SHA256 beca47cbec2359d62f904a418aa8f9a73e8fd753eebed8a6ae9be79a80c6b903 SHA512 4b1f0c9cbdadce4c6126c38d66762b2a131ea4b41e655506af9b859283416ae91dc8b6a9288d2b8147d8e3b91ec84ead1d658139216351796530cf85a22ef8d6 WHIRLPOOL 23d968d99f4be7d31d3430edc79542ec13f00b4a09b672644cc52024cd4f83bf8ca2cd078e91c48874d38fd8adfb448978a8857c5b5bb3e1994213113ee14758
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVfyMwXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiGdIP/3mlMpx17FJwvYEhKArStF/Q
+ObsXAxzVOvmUEPOLP3JRACBKk3m3ATEgm0W/LCGQNqL5myOLjC4Xa46JjJkJhkMc
+1i77hU6t73HunGilwiHYbQaOLfRcq1YPww+hCelLj0Bj27/+4wfeQNFt7b0Ev4I4
+2JRwNOEQxkO5eioa5ZbGcFP29neVeg9w0GLoCZzH8XV45zsqDk4jgb8KwEh1aDSE
+Xg9VpdCoUTgTg+sKlLm6d+MgPR1K7SAE9xVO+UbCrkTgqDjMVL58+DeAjiBkKQAK
+ir5nK2hyn/15gG/Y5A3mjaf5wzANPABozfCJUQ/JN2YCWogna0/+vdya9jS05AiI
+1NrLwOhaRI4lYKbfE9zZqSmmezyBg7w/qyBAVPOhxgvd9clida1Rp5vie58MsRxk
+HrOPCVDMYVbU2YC/O5dJ/c7UEeZcpfwisJ9LRVp68XtkrjljTnR1EgvjKusZsR/b
+ViKb9lmkJ46CYIviJa67QDfXd0gEJ81BCkjSU9vAoEue/ymJwLnWinEwfzGRIFq2
+/P4PSobFnqjBxqr4yu4YpxwkIHpDKJLdeSQrN7E8KRU7K9GUmD2LZqPxvKFIz/G2
+038S20A+l9nZTrWQxjDmd2G39GVrUYSsE/Z0pxL6H6uja6xBG+HBD/2yIEAdVfYH
+7zjYmQG0/j3uPL0jbkMQ
+=thWh
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/etckeeper/metadata.xml b/sys-apps/etckeeper/metadata.xml
index df535e4d1540..8c1183f2a543 100644
--- a/sys-apps/etckeeper/metadata.xml
+++ b/sys-apps/etckeeper/metadata.xml
@@ -6,9 +6,9 @@
 		<name>Manuel Rüger</name>
 	</maintainer>
 	<use>
-		<flag name='bazaar'>Support <pkg>dev-vcs/bzr</pkg> based repository
+		<flag name="bazaar">Support <pkg>dev-vcs/bzr</pkg> based repository
 		</flag>
-		<flag name='cron'>Install cron script</flag>
+		<flag name="cron">Install cron script</flag>
 	</use>
 	<longdescription>etckeeper is a collection of tools to let /etc be stored in
 	a git, mercurial, darcs, or bzr repository. It can hook into portage to
@@ -16,5 +16,7 @@
 	file metadata that revison control systems do not normally support, but that
 	is important for /etc, such as the permissions of /etc/shadow.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">joeyh/etckeeper</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/sys-apps/fakeroot-ng/Manifest b/sys-apps/fakeroot-ng/Manifest
index 87362c41adb2..3a7046d8733b 100644
--- a/sys-apps/fakeroot-ng/Manifest
+++ b/sys-apps/fakeroot-ng/Manifest
@@ -9,23 +9,23 @@ EBUILD fakeroot-ng-0.17.ebuild 639 SHA256 a3c0380112c6c337a015261dc371b8f56f3d04
 EBUILD fakeroot-ng-0.18-r1.ebuild 590 SHA256 4dd898672ff4a3b11cffab23ed4793158521b885a7d739cd993ec7804a14dfec SHA512 55727583885a9f9ea7fd15ee800c22f459c42bbdb7f2a292f1f9898567d8f00c243ea3fee67db62be71a4b4ca01c4ef3249a843168b6f7ef5f5fda499da544b3 WHIRLPOOL 2dd9c98607216f11fa2f329e92ce888da9c16d0ce5d6be41825e05fd9b1a038dfe4d232e2c67e241fe9053ef57d4ffa027d55445719ffec37bd4d1e1b4c13e7c
 EBUILD fakeroot-ng-0.18.ebuild 524 SHA256 fdfbddecb025646a818d4ffca69a123534fc1818d61120e381dcad56999aa516 SHA512 1373ba7c779d0061dad13a7d36577eff1a45efe08d085e52ac595e312a28c1b460490c59221dbea2ec7166ce92bbff119224a8a6905d9091c3b2247f2c85459a WHIRLPOOL ae37043168996255b8c2507a199230824b80bb2f1adbe01611c36a0a0fc84c33fa78006cf430062d28d879ba0593f711a9465944ea3ca354d903fcf0b49e22c7
 MISC ChangeLog 2022 SHA256 c070a1b509b5b75f3dc99bb913443f5aa81a18247e15989113774b7120fbaf3b SHA512 0fb24e02ba5bbb5a2ec8b89f2ea9a02b494e6b1c6b381385269c29de41c2d121553e200c294881b8420724d986d03fbb9c3620c9bdf80be42c4ba5466779495c WHIRLPOOL 26e9076bfe0c14f6e5cdf6290893e67dc8635ccdfedba04e0bd799e07712d490a7cc0f8e78fc116bcd8bf3d12da12bcea415d4dd7c5ae9f67691ea1964acb54a
-MISC metadata.xml 306 SHA256 42f96bd2c278d165bc4f9417f3966e967bad8a2401ef7f4af3965cde55f9157b SHA512 143f606087103077717aa932d4cf8f97ee0080217d6af3cac36bdbd46dcb8a46db94cbb1ce03a2aa3305c6b94f8c1af24beb559e78c648ec6aacfdc23a5dc86d WHIRLPOOL 137dec2fc49747600e452470780b7e074f7503588b57d272a38dfbe2f45e8797403ed09f29b11dc664144e34ad5d09131d702687cc3b85b1d2f888e66e556862
+MISC metadata.xml 390 SHA256 a6d7ac3ed906d623ebe7cf4961abe9e5fbdace691a7e22ef2aea82ed76e81b2f SHA512 26a46f8c98cc08240c0f7df28f4f6b7d3b64794171afbfd5a49d249a610990997c89253a3ea58093a6c7ffcdef4e17d8d7b30de13a4350a763d92e07b8c61dfa WHIRLPOOL ef56dc3c0c58488852c589fac01861d54f040cb1d9f8ce52ac2b5485d904f202576467a8a241c9982844821bc461929aa48d76fb10b6dbbaf792cb00c9740717
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVI+1+XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir5n4P/jh1Y9qaUtHZFay3f23S8vVe
-kt5DS1VS1s/IbBvggE5vsooR8/sZwl4pftH3O2YgU44GtCTJSdgK8D1VTb4oU7xp
-xigodX7nBGhAI9XJnzTyKemhCbKfCwx8UxVZtIVNz2TRwgsbz+scraJdc9fKSh9N
-1wCdo027BfZuH0k8wbQP8IWuMQPfC8gqQqg7CjM5Y/aG1SrSDdX6m+/MlF7HZGiM
-rQjXysED5nVT2yWVCgL4pBXVFNOxPh1BFW7Mdq33sEZetXyxc9axZSqAyCfQIkLu
-A/IBSYtjvW+ex0HE47HVuNjFLVjWNmK6OjEulTNr6dCrXHkUGmJ7C/NgXAbGIPbV
-hgYEc1W+JUsf4p4JedNu5Dfdk09RrqLWQpdnI94lDNkvwiY0fkDsJwU4qCUS3HxZ
-4+DecqIaSsTqA+8l8DGpp3d1tMroDalwgTKBZSN6x0pBArbCx0sbgFglMdQBkcQC
-0J2JbGAL7M9C3der/RHH+MirShulHJA7BW5RXMtOQDp5ElTXteuvV2mltQ1nVrAs
-OI8gtI6/O1dpFrGh8zhFu4CfQUa+UiPzyjlWn12Bam2MCOW/khxix3xDvNm7yPkp
-fxBBC3W/UuGVDrWwJrKQJ707gQYLKq9YZM8MnFB5kltQdD2KxGIR8vBPPa8MKFP/
-id80q/cI/rrH6bqBdBv+
-=LkHB
+iQJ8BAEBCgBmBQJVfyM+XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmih6gQAK3q7bkid95M5+hxCbXwBNO+
+kVlN0mPWmcW9w/+WcYznMq6D0onvDqf2NpWkgxOoRkUlZO52a3kbLQGrrxIOFypB
+BKu7SCW00U+3YkuRbMOTiOJswQUf+7FnkplGBstV+Ijk4i6Qc+LTenzVr/ra2BKJ
+pGtkEvWGC+wwhzt5qsOdN5fhtfHWW6VY0QnyPyJF+XHNLNu1ZnX4rggNjoU7eseA
+9Kyw10YdTNeu/ZJQb/1IwfI3W6MCGKBeStZksbGriZwQ2Dppl0190/uSXIIoU66W
+BV5A6srtwPJMXUP8BOowxhDEoBnSy5lGSxIVfks31Zi+/LZGsU6mTLVGl4NSZy5U
+E0SIiaKpBsYGAq9mlrLSnPXvGlVH3atloxGGdBWy8snccUArHUuoumnvHomUdBzn
+6vid+aJuRhGNBRQC3ORQEjlH0uQbmR4oro0QrSr2X6121Dip7Xc2bEDGBfSW0Kk7
+jSh+iI1KxOvVIKluxBuTWxQxXAJl/r0GZoD7Ah6IEkXGhTKoZ/nSz/tGPjws3hk5
+lmao7seLbnUWN7Kx8DmTjtGychl3hDEjYRK2Bep3WxWy9KMi5hTf/nSm6OOcpshe
+DdNNwZg6LuSh/oUI0wT7b3qyuGxpTu/7y3rubqVP1HFPginusT8RT29JKMduQTP/
+jWpTWTvXmW5JICgR1My9
+=Vt2z
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/fakeroot-ng/metadata.xml b/sys-apps/fakeroot-ng/metadata.xml
index c7d86f73d128..0841cba5b9ee 100644
--- a/sys-apps/fakeroot-ng/metadata.xml
+++ b/sys-apps/fakeroot-ng/metadata.xml
@@ -6,4 +6,7 @@
     <email>anthoine.bourgeois@gmail.com</email>
     <description>Maintainer, assign bugs</description>
   </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">fakerootng</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sys-apps/fwts/Manifest b/sys-apps/fwts/Manifest
index 14630e18df5e..cb8170c26804 100644
--- a/sys-apps/fwts/Manifest
+++ b/sys-apps/fwts/Manifest
@@ -1,6 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST fwts-V14.12.00.tar.gz 3089700 SHA256 9fbc6d1bb8cff8c445d4b2ad0c080e7711564a35982e8a946156b7258e82f2ec SHA512 594cfdadcef031216807eccbf7f5a741643ff33322d84994027afdd08923fa423e1dd2621b9093034e7ac99cc2147b9dcb8b6f4dc2662b10232e55a3261aa91e WHIRLPOOL 2be8d45034e4337b6366d8fcd535010412f02d25859f041cb348b693c5e92822c1a0806a37b77ea4815899b7f03d946326caaec64e91d8d09baaba5301cae353
 DIST fwts_15.03.01.orig.tar.gz 3097112 SHA256 9926baa672159e7990abcfd10c003db8dc0db6a45212189e00ae217504c1fa26 SHA512 3f27b21d67dd7db64547c19e2d74fc909aa5d64fc3aedf0fbca403111bb5578c97a0c7f930b540bcb48f48da8a47e4e02bd679170d7b003b40a49f8358be6033 WHIRLPOOL 2a347785105c02611cec7566643b2b8d5d81c555737e4f5a34b3564dafb938a3fa0bb4d575e0da4c216fbd518c44fddcd243dc07bbd5b0a8cd7a4321f0e01b9a
 EBUILD fwts-14.12.00.ebuild 1287 SHA256 9f96dbcbabd65a4c43cbc6941b5bfe0bd51179ab2daf795bdf079ac0cbef456b SHA512 9989812843b75aaefdcac82139a051c2274703b11f5f1c49182a294b095583897de6a51733ef1177bef8e95ca36b7d72cab956f264e7d50d9a16daa681054251 WHIRLPOOL 512c008636290caf278080d28ac193f0f8ed5d2e1e0f195b90f4d09be01c8f82cc0cd62284967bca60524a9adb53efa8919fb80d744b41e26892a25c867d02ff
 EBUILD fwts-15.03.01.ebuild 1227 SHA256 82fbf330440ed291ffbb121d7d781d602f63f5a4d59bf0ca60842bdafec321c7 SHA512 245eda8680eb9e0332f07c849a1f361ac4469300cc4ef01f381ff42750e667899216b01ae0ee01a188cae2cf53cf5f64d327eeb6020981380e67ba6b76096338 WHIRLPOOL db38099e844929f5b5f1896a48cb0c5de158131bc7df5daddc2d9c0ee465e84fe8ed4f93a5d3df3fbbf7d1af0ed9397cf7ff2c8185540cdb0eefab83bd7599be
 MISC ChangeLog 2282 SHA256 ed6ce63ab41acbb4af63172647e74ac0d9e4e4d2dd70e0c787754b86b70e209a SHA512 008133a676488855aeb6d33c9f080714001d2c692b981fbff6f40fa3c07eb876013dff74d59cb6bc738d99cba00a78c55786f6c5893864342748838d58177d52 WHIRLPOOL 78664c9dad77e2e047586bdf1474bd4bd2e009ce195f31919d54dc9872b902cdb216238ed0cd9cc40256ef92da227616c3379b6d2f87b77efd31dea18c19efdb
-MISC metadata.xml 231 SHA256 9c04e1ed256c8293b1120d9b56de16e3ee5ff6cdb3967d517d46c5974c23d67a SHA512 0aaf70d152f2b3a4b333fccde6f5c9fbb6cac1a9ecf3e2b2ddb57a1c260b3f0e7bdd215edad17f959b2a3324929bf446164341531783431c3435d1b956d09d83 WHIRLPOOL d631165d8a2dd82731e34fed2e3c09437b8c0d383da28c3e0a5f704196afc1810a7efee388e6b558493e82fa61cc799ab3b93eb1b7b17464dd380efdcba60d06
+MISC metadata.xml 305 SHA256 390c11b877c7234573b9de55335ed68f85d48932fbf8aaef86a8d738c51dcc05 SHA512 974a3c9e53d6fb7247d99c03c9bb45fc1cab218d6d66c5dcda11626465923f2194ab219b82f22dc0582520eed2dd9be3458085f487f47e239ea655e184ed29e5 WHIRLPOOL ceb61371dcaa815d3a6b8aba25f443ba6ffac32a72aac50492ba6cfe73d1d57e9a30bdc26f34d79f9b3a3881e0222fb92f22d785834ff4c7c2d4ff9a5eb565ef
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVfyNGXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmisNsP/AuIKnEpzphh1ppZBKjunfeq
+rrbVZzarwK7UQyPKaVHHevS0NPiZHOq7PUAobBBsCVjz0/YYzmOcdhA3+0U6Duae
+i+QrGPluWE8sy8DphTh2/CZMMbAgUnCZdDOOmUOQnehQhjZcRJscW05n2VDia0c0
+IBpuEbDPP76kC4iMkbfjGBJnUgEvVo/FhyeLellPQUeL5NVK6P8Ag2MlwbTH1Umr
+nILNq/YeFrD3S2EcEMjId8wcxAKNWemCXI/LTEADXZZU6YCU2qn9X1JCADv6PXcp
+G+9FITv/8rQRP5kOmWBOukWOn8CG7Ya/SbQgAIKVNZnN5MyYxJxR6/inrN2Hlh13
+MF6AQ7/cEs2T3GbigHfbF1BusaPyDii9ma31bgg/aSrvQ9IMuo7Jf1iQy10+Amtq
+zVVzjSafVKT56bx9mpEE4ZXKy5c8gKWskwfbWypTO5OXDi7skZxQUMdSrYwdpW4m
+1OnuQ+UXOpfpR2YRQWJh4PbdOxj/R5If1XvBeit4FVhjy03HgWQOHWAxyKd53grv
+YHaY/70IG9YtJsbB3JTEijgazGZryPjz2obTYkMekLxAiXl1quINzz6bJAGU+8wF
+GQD+Ob7cKwojpmrmWS0cdxHvPQQgy6ouR9pLChEv3L0uu6S8nF8Jc4JdLJ+52TVQ
+1QMxShXYh55JiR8rZwzK
+=I+hY
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/fwts/metadata.xml b/sys-apps/fwts/metadata.xml
index bfcb6974f1c4..cfeca1024cfd 100644
--- a/sys-apps/fwts/metadata.xml
+++ b/sys-apps/fwts/metadata.xml
@@ -5,4 +5,7 @@
 		<email>mrueg@gentoo.org</email>
 		<name>Manuel Rüger</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="launchpad">ubuntu</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/fxload/Manifest b/sys-apps/fxload/Manifest
index 50803b029d7d..0337bc2bc8e9 100644
--- a/sys-apps/fxload/Manifest
+++ b/sys-apps/fxload/Manifest
@@ -1,4 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST fxload-2008_10_13.tar.gz 23926 SHA256 0cc8bfd2a7cbba2f68e0c5767477634922287943c91dd9fcf029fc8b9d577858 SHA512 f8a654c51a392ac95672a24962ac3b83ea4e0cb62d51a0696f6bdfdefbc7b5cfb033aa9cd80ee676a6bb00061bd635d7eb3920769f982188d8733c862838bc32 WHIRLPOOL c7242c937babebbbba90294e9b638976ede727f7243f52798b5bf69a9ac2919c819d071e57e5d61f999c6bf5a419d925552e88edde5b35f038a780373ea28277
 EBUILD fxload-20081013-r1.ebuild 847 SHA256 e7517e2d2145157b3b236786147bd19a75ea646e7e3bde79719a63b8ddfbb451 SHA512 2b20292d57fc6352cd06c7f92221464edea7f6aae42cf7dd123905148edcd60735ea0d5601846307ac3a9a754ce421edc86a6ebc62488b67a3422788a7e91884 WHIRLPOOL d76b1eb44d19c7b98769aeee72eaaded49e62a93ee5963341264e0388c398c2792a87d8924465b42ace095940f34258c61133225f924c1bc09ba5eb90d78f4ae
 MISC ChangeLog 3978 SHA256 f7f5f0355265e2f19aab5142b5a0b884194b14320bae906b751b95b2721cf26b SHA512 606f3f7b27dcfe76fbb26a144c1aaba0316fc5712b68b92926ecdb7c189a44dde34a73ce0522389b4ea9bdb6eff10bfb582b922dbf49632435bee23da6d4a397 WHIRLPOOL 28d89b787f2c00adbcc35baf10e5fd8a6551325866dc69b98142c481008641cdf7f4970359245e0d93b1e80a46e5117367eff98e83d14d81f21aafcf208ef097
-MISC metadata.xml 231 SHA256 9c04e1ed256c8293b1120d9b56de16e3ee5ff6cdb3967d517d46c5974c23d67a SHA512 0aaf70d152f2b3a4b333fccde6f5c9fbb6cac1a9ecf3e2b2ddb57a1c260b3f0e7bdd215edad17f959b2a3324929bf446164341531783431c3435d1b956d09d83 WHIRLPOOL d631165d8a2dd82731e34fed2e3c09437b8c0d383da28c3e0a5f704196afc1810a7efee388e6b558493e82fa61cc799ab3b93eb1b7b17464dd380efdcba60d06
+MISC metadata.xml 314 SHA256 9bc4662c8b4a97672e0cec09d93e7cd4112615e6472ad4ef030e7d81bdb62054 SHA512 b2dcbef620047191e8a4f9e010bb8783ebf7b397daad57f1e8cd84ebdc20fb7493f3934894738116aca75e301d1f2c2097d0e795313829bbd6a5938ee5981e20 WHIRLPOOL 3a8a5c13f5adcf1dacfe926d3f93750340e9db8985442ef8843c0a53e7bdaf1c18d1db961f378c03f3f2fb33daa0c44dfcf28357c6f8d2ea99046b6c4ba17f16
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVfyNXXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiko0P/34Ah5Xqg5wC8gQQUPhCg9hA
+uvPgDWed8cjoLpl3KK/ZWm6KroRsy6Zf0c2dHFcu3vtHtsVo0c/31MWIfg8Q5L7U
+2ePqvFDoZiI9mCzjTCpq3xIX8y00f7L28emR6UfZRlFRAO1QSy/MzbiuN2YrUpZD
+mYpXY5shRSlm9mIbx3JrC6OgBMFdGo9pdgZZ80aQxJgPNNSjH1PQpDraKkDKNhxb
+8DvrpvMRHvFEuMy5Po4Wc7eKy+FLz+nogPsyKDgKjyKPH7qHl7+U4c/NKEe2UIFS
+BfZIDrmN48ygSoHC8L7ah5+x3ETlHK1YfvN1pRerMgIwTODcjFqpCv1eX5D6knAV
+5fYb34f/icU34PkphB0uLQdRoJFlD5cx7ABvZRaCx2hbFKfkdgLyhoAPRSPvZ89G
+8tCJSjdPHheS2Rxqe97AwbpCfrGjx00c8sB8dzU4CS9RLCINShJutiyN1vLqzByg
+fTrDWBfw/lZAZ48gdfOLpucsbNCd8HFMQAaPslrGy2V8P00J02rE5WCyXZtVj2QK
+GYKBmRerLF2BprU5FPOv1FdP9/C3mOWg59jyByp3GDbvE7Il1+jYALgGCOo8oDK+
+o1JgGf6/avHwItMi++4FgbPpV7vJTHGoCvIWTjxt4Wk84pTicrNclTLhwLGVYgit
+6uzhC72PzHKaNHRQaCN7
+=o+dh
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/fxload/metadata.xml b/sys-apps/fxload/metadata.xml
index bfcb6974f1c4..7dbc2f2a420a 100644
--- a/sys-apps/fxload/metadata.xml
+++ b/sys-apps/fxload/metadata.xml
@@ -5,4 +5,7 @@
 		<email>mrueg@gentoo.org</email>
 		<name>Manuel Rüger</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">linux-hotplug</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/gentoo-functions/Manifest b/sys-apps/gentoo-functions/Manifest
index 17bc9848aae4..2f616995f503 100644
--- a/sys-apps/gentoo-functions/Manifest
+++ b/sys-apps/gentoo-functions/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST consoletype-1.0.sh 616 SHA256 b6f837be496024941b81402e6c11300eb4a53987368c5c6d9afb5fd8b1c34d28 SHA512 ab6edd0035ad2ac855bc7b94679a78aad63f647b906dfda39a9844b676e6cdfc872fd1fc897f6158a5709906905a4da5ce8b4665f9e2bc0bcd1e88bb9ecace07 WHIRLPOOL b2d5f13e7411d8e6b5c4dae875041a95bed3ed7b20e765971b86fd16b1a970e8ad10288683d2efa530ef8568c6c58a07f9fc5a4a1b6b00ee6ed731da90e472ed
 DIST gentoo-functions-0.10.tar.gz 11432 SHA256 709c8b22f404001a512e47a7a4d3192070b3e150fb9d0f943de09736d665b0db SHA512 2622cede032089c7b8a2dec576e848852f9964e0198ab161f0ff5c426c542d0849bd3d30a40c296805bfec90b533c419df43c7975ed85678471483c827ca4cdb WHIRLPOOL 6559c62083eca8a016f005d1003c8a0b6e2c89836c130cec9e0a40575e1604039f669313547c63f6cf84f1a40cdd7249d227c6f0b57f282764df8d20ef239051
@@ -12,21 +12,23 @@ EBUILD gentoo-functions-0.8.ebuild 1192 SHA256 37f33ba5f2c0d5db828da1a324a666159
 EBUILD gentoo-functions-0.9.ebuild 1025 SHA256 8ce9501feb8301e431123ff775fbe57ba8041b0a6bc4a226e5cc2aab49add2fb SHA512 2bc482faf855caabd6084b36f69c3e861cf85c6d8e8202bb8362e85b005f031a49607e0a5a5374705d2ed9ea6f4ebf1bf11c66909ec85f6464ba5da230098639 WHIRLPOOL 02ef1b89bc4fa40560cd587a90f1795516a0ab8f14d72ccb5aa4f06ad9cc7f5c484a1cc6007637a0a696c02cd02f93a7f1eec3ff0960e64e33a5a167ac6be1db
 EBUILD gentoo-functions-9999.ebuild 1055 SHA256 f00f4612d2074ae2d6456c68056081fd7cd8866f236d4b0cc3f7f31a3f7369e5 SHA512 44d7a60a9e30cb9d3e2fbe68e4ff51d86839dd9f081bba7da5314d0682958994d89e0fdfbce598870591f2b5763f8a03f860cd36b7fdcf4a242a70e781e5cc48 WHIRLPOOL c802381755e9c6f6ba5ef16449c70e17fe984259270b6379363e640ee97a4d4a6d50b39e9a08c5f022e6f71ea6a27eba1621a4dfd460f8b4203a00753e1f0053
 MISC ChangeLog 4948 SHA256 9ba2ed5041624666d711154da90bc9dcdf4ca60b126e7e5de782c1c1d8046785 SHA512 0e191cf655490ef14363fd043018d3ef5423cb9a35f4fb8aa9ba44f70305dd91f2622a24f31e7fd33c1d674b48277ce9a7d3ceaa24df12f2ee8d84e5296d0d65 WHIRLPOOL b3da246a227711f71fce22e8f49e3e7deaa1156860b2cc8dca89550ea60cddfb8d7326677f419c71e7603b12fc3a5d8a52f854c31883bffe4652a3aa24d3cc36
-MISC metadata.xml 497 SHA256 dc476822c150eee2ffccb4e6c5295fa3207b9006c275c428c26589378e6a709e SHA512 a8a463caa1b0295a30a794308bb107957df0990520b51d5212dcf6d2a80aaea373a2265e8378569f1db5bd3b96f83f49f187a26839dd4a2e5d47ed2e51418449 WHIRLPOOL 811f2249a8e4b35a16e00fde4265e1d5e6f528a5d573e7a435136ce470c7b68941f0dc669b6569496eb79a887ec86041beafbe627fb271daadb253dbfeb9b59b
+MISC metadata.xml 585 SHA256 0fee7ac74c86580d918f52c5f5154bcc63ff58e6735a4bea5706715242c378e7 SHA512 922982cfe13930bb051d3940fd0ee0a7dda2e3238cf6224e83ce2dcfb3070d2306dfa569976631777510386bf2ce52d14b884eb376f5fcd4e141cc64423af92e WHIRLPOOL 265e9fac8ac74cebed0e21e3f162d40fd027bbd20345f996d7dbec879aa9df466d6bb154fdef52248638cb072fea6e90e48dbc81305e18135df5a5275e4211f9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJVZBDSAAoJEPGu1DbS6WIAWQoQAJPcbu1RtfBolgLetOWYtG1k
-AKK8dzfrSHYCgGvTTk8ZVZiYwyW8LrJjSyO8Ixss0jVNv3CSxCSrjIHldEHMgvng
-6+ewK/kvpbUFc1FGfPZIm+sSUraGbCDcQuGXNkDsiltCswzQU5dIeCikgLO8Bw/l
-exnS3zHA5JDlFGdJGfNZ4/Tqj7LIrPeX64a9zG8cYRba3yHab/A45fseeIg/1xdv
-oqm3nrt1USDPRp1EmxisJsNkbBJsEGc5kJkeWZrvEIvipoKMBKcJwGbxOydu/EPV
-TdylxW+GHQAoEgV2iEbVNoGTqfS3YRi6JwROLqzVpNyoDlZ+7zrX81IR/6sHWeIJ
-p6jiaIh4spUmIJrWEogEfjO9nKCbwxyMYW9Ij2lb4EwoOaoX6WJZNoBfPbBWDZbW
-RJNDjcukRNBZypLlyvRdtTunwfV5xk4vKjPEgUsVWXCF+dI+aFuwL07Kxigpv3ZJ
-+bjf1eDTwdsRo9umVKZrFUZjB7K40wtMG36CA7+J5mvaPUxPIOMUoAWaZsYIsxh6
-zpjkoROerTrvOk8RJsMEys5vDY+8ODN1UdL79zKj4vuBZXf9p8fuXjEr7Ff2HLmO
-Xamw/HTOjSTR1Ik2i/tiRYqg+N/v8TjC7vU6Eq7RFKtEIlBUAb+rV5DBTb9o3DeG
-lixpya8e9jqYVUoWbz/u
-=ktNB
+iQJ8BAEBCgBmBQJVfyNqXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi7xkP/jOrt5xBo1e468joqg7pboR4
+Eohc06TO2mUiFV1gdQ4gUQcJwO5f3yP+ylZUdyemt7V2n9l7esBggKHbFUA7ods6
+rEG4+0dMYLstUnA/vUWsUMjGRqWwVEk5Q1ULqBoAKUA7yOm1szK3naU6RUNlnEnq
+lp8O/b/Vr8xxwhk7bbxw9Ni58n3b2ygRnJnGPzN2ce58bxnvaUCPyXqnMarrHEDd
+KgHA1HssLVr9IU7eUtaBpzKDED1q85TShuvTCozNPbMvT6c/IERFtTqtlJcuJ+x9
+zmMXp3v+elRSq0pBZe6Rfj7GTExhd+QHsdP1gRqsXUHiX8Q0JKIsGLXQlLc/7E63
+nXKJjabHNiq1HxGKHTgCx74+9HK6Iw9ooFFSDqbAvaeRMchQMmvxCINUa6FhT4nQ
+sim4ajSxjFcqE0ufIzvwSIFuvyWre5JK735rWVeOBgPzUZhOnAoipy5khN5ZkiXT
+cBBSV2Xos7SfOMnNhlcCl9J7oh82KM5B4DgbkDyAlDk6/gk5YqkbMdtMxdLo0te1
+XW9ZxLBWyFn+mGJKbB1Eanm883siJeQuD1n2x7lYJkjEFUKqEHqtsTEZ+xQGbCVk
+nkerpeHPKVMBYwEhhAqdRE8W2Z1gqa9eUWlWnw3GtByYBESOfWYRHvBdFIHwct5g
+G7Kl+VSVVDEQAIuGb3IR
+=6JEf
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/gentoo-functions/metadata.xml b/sys-apps/gentoo-functions/metadata.xml
index 38ba80891a72..cf7649442a1a 100644
--- a/sys-apps/gentoo-functions/metadata.xml
+++ b/sys-apps/gentoo-functions/metadata.xml
@@ -14,4 +14,7 @@
 		This package contains base shell functions which are required by
 		all Gentoo systems.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">gentoo/gentoo-functions</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/gentoo-systemd-integration/Manifest b/sys-apps/gentoo-systemd-integration/Manifest
index b2d9dd44ed61..7d131d03dac6 100644
--- a/sys-apps/gentoo-systemd-integration/Manifest
+++ b/sys-apps/gentoo-systemd-integration/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST gentoo-systemd-integration-2.tar.bz2 51951 SHA256 2466a11d9b6f6e8d726cb5549bc1c38d28d6742d596e2b2c455c9089c1baf7fd SHA512 dc962165516612ca0ff41fdbd53a420549967a3952640ae7d37aafdbb3543a9b37a928e0528fcbbce74e0ded970e311c350272856fc8a75d9c8dc94a960e3bbc WHIRLPOOL 0517b515b9d01605c46d95fc3e86bf38c200923e3b7df1dde59b875c3eeef232c7dec38833007a943390631cb8eeb4f7c89e79c4b8dab737eea8c63bb36341bf
 DIST gentoo-systemd-integration-4.tar.bz2 52449 SHA256 7027bd2056449e5ec8f9fc3da81c0f157810d482bfa11be48903643335fc6bde SHA512 2f60a98062fc5b9c7247e5df77b8875e532d28b2b903a2770713bbcfb2706f0f1bd7809396dd49ff1cc41f69d8c3dceaef87909fa8683c458a5f818f5e05a574 WHIRLPOOL f87b8aa01f24fad4ff90e694fa03b718425bbb0c0dc8a00950b0ae81230f3b92255d07efc9161707a35c8f3e0e7664c57b7ae061ccc0d896bfc55a632a8b4f09
@@ -7,21 +7,23 @@ EBUILD gentoo-systemd-integration-2.ebuild 827 SHA256 d26644c5b2c1cbffa405e6f3fd
 EBUILD gentoo-systemd-integration-4.ebuild 853 SHA256 ce006b79894e259f5a1b4027e9ce3f2e1ae23bd33f968e50eea411ccc20f7998 SHA512 61e3cd80a683671b893b153fd673a32ef3b5055f29b7c0d2f42de711d1b8aa1ee1c6d301397ff911071054b85c72b0d6ea8af2a36a0ad6738c3551c40cb48a7d WHIRLPOOL 53aae6f06da518cdd84c49c326529f10daa4239ddd0cba4ce5d2ef315cec826959881d96b5ea3dfb1f1a971fee596b60a649b4351d51c61e767fe8c28abfbac4
 EBUILD gentoo-systemd-integration-9999.ebuild 1052 SHA256 a178f6c8c39f424f3ef1cea5aa61278f382f7c1cd873f5e7a0df7fd654f284b9 SHA512 998bf2644fd678a6584b938cfa9430acfb191906b873e632506916d21d2da930a366c2221d80939f220dae5ff72b1edfdaf1186e0d23584ae681ada4f9f737fa WHIRLPOOL 14cd31ab6daf0c9fb8b639ff3419ea5188407a534f677e54dae6d6c9611b963ecbd21f91218fc90b0675e1e7249061e41689fd08bd385018837ed3ac11891b4a
 MISC ChangeLog 5129 SHA256 aa053242220a9ee96b891c591a957cb69a4c4208021e0a638ae2775bbfc04784 SHA512 13160f9bb0806a6931abb790135f712144871a9c453451018ef201ab6b0ad9637f900bd59e6fdaa64f24d4ade8c6c1909e045c3c912cb4830cfa274d85e12bbb WHIRLPOOL af62dceddbb4dca5e0dd16372eb0256a920269818cd0fddf6a0407286311c40b59c3b3ee6ea4e35a88682cc3c0f90751a393e4752cc61af828bbd712b665a9b5
-MISC metadata.xml 239 SHA256 1731c6552b4584e3ca0d760cb9504233311f18bdd2804cebfc06feb2f60b042b SHA512 3e96d13285d9cb02333157714e2d367beb695bb64cd1738bb4af9f284b7cea33c4d6be69a43b4ba559cc95d165cc007f37a3d3df10c4b0fc9bd6b08e42561ea1 WHIRLPOOL 1a0d71075be6a89d3b0cebff7e7bd474ab71b08d79302cbfc38a33e67cbb6d31d553d18b17993698bebd9fc6c29803be7aff3bffb0f1521022bc5a3c1c8723dd
+MISC metadata.xml 340 SHA256 ce4d63ca5cb8be8f68bb01647a349e51c686d55398d4ac48e4288853bea5b531 SHA512 bb4d4e21d00ab2fee0bbfc222eced3cf9540db0c17fa29c2b34008bdae3e391c85c785d1809c546e3d525fd5b8ebedc2db2a32dff2c98558e78217868ee6553c WHIRLPOOL 6a09e058ec5f7ec33e0b82d073c794dd4a478047dcf64944c7f95f69ac14e5065e0afe6882cf15980ce84989ac088dc96912bad9a04aef3ccc2462b87097515c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJUhEj3AAoJELp701BxlEWfHkMP/jPCtRjIzhFGPRoc3UfzdtMi
-QCGc/mbcDsYusfB6Grve5F33cIo6Bpz+7Jf44RsqXqc6Xz51aJk1DPFNPHwmcIlO
-TiDDzl9IKA/WSxWLi4nl9R9q1NFkjSTcvnXdFMSCaYr+k7yrONQ4lkNNZQ0UBZu+
-45aO7X6HsLHQvQgcgx9A1s0Z2KUZnjK+CULgZUCADAUwQX3z90sX2uwTaHfv04Vi
-00BnHJAow/2MjVZCPz7vWeTfzLmGPmbwyLXGMjPp8XIT/u1mcpRavQ+m9AuNPlpR
-OFwyNy7KQ3ZU0BkDx2LOScqrdFALrt2IPXNWPaUVEMeKv1xCS1703A+nwe3pHV/J
-LSwd3PuP4F3zdPkxi9Tbz+lfH+2QuSp+AsuOZXuhjcj0a8C04r1BvJ+h/fG98K1v
-Fn+c1DpX6umPD5WFbZulfCQF2zzrFfamUzAt2bs/ZC+KMGrTIQYj6J0AaKXEt50d
-ccRfocfrJHnkhpSGbV96TXulSrt0BKCqtj2ocqSisJWbpNDsJriP5l3gxJgd9Ew8
-G2z+n6vY+hrVs7XDNbL5isZCmys3U919qUy9641uyOj2QIZfIuDeDQmhdYGWCa5i
-VZR6jFmGbWyyAuGpGoWOE3vhJrhQt7Txw/Wh3MWqh1RqA9n66MmdJaY3P9+7GiYb
-uo8yX6BVT+++Y0uC6Ow6
-=OBBw
+iQJ8BAEBCgBmBQJVfyOAXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiQyIP/RQX0sdqAj4DaIoIwg7UmD76
+JC4bYX6LQJN91fmu6JT4JnmqRyOyxp4qewrn91pShcfTyLXEjqzkrHK/WSIKbJzo
+v2RDn25Dt+0YXGR5nGWDuGdLIzEBmWbzhgJjTlQlKkwP6Olde8Ohgl9lFVFmJhvd
+5lQ/Y9r04ClY/sJuFAV91buWUB8WHPYjP+4cM8LX/2jEp6uayPiaBNDUqmpY2k3x
+3rqewgcXBUaE0MTtBVmDZf9a3GSQC6ibXGxsR6X6zOoZZvVAA7i49IIPw4Sdo0Hm
+C+lMgxGtjF95AAwC1gVPQ3XqOWdRGBNsHiV8j3Mpolx6eIXuH39I0OWW2p+uCoxU
+1s2HITxF6r9eccgXWP/DHzLveecb4+KEvZK/o2OvOZ2pOuVBiWjS8WitkRoMW2pD
+m6azN0NjgppIexGXZYywQ4WKHy1J7Ays9vnjXTBylSiSOFmyL47TVL/AdihDvIie
+OJBMglJ8CZDcAgNFLx0vus/DBYDnUuk/CY7TEGT+9r2aza+vG7vZZ4KhWazQFo1x
+qiHmjzWqQK0Q60cKvDij9XjAwE4+gps5kdEKuC5c3ZI20IkRD3Zi8CMsK8sd64K8
+mWXDfEJU/+9jt8thgORlpBX7daQnJRmbP+eN8cx+1LGzVS5xkTxR4M8Falmv6VHq
+MFRYwNS/CYcfyisetMBC
+=YIpl
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/gentoo-systemd-integration/metadata.xml b/sys-apps/gentoo-systemd-integration/metadata.xml
index fe305d209585..c46ecee5b0be 100644
--- a/sys-apps/gentoo-systemd-integration/metadata.xml
+++ b/sys-apps/gentoo-systemd-integration/metadata.xml
@@ -5,4 +5,7 @@
 		<email>systemd@gentoo.org</email>
 		<name>Gentoo systemd team</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="bitbucket">mgorny/gentoo-systemd-integration</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/gpet/Manifest b/sys-apps/gpet/Manifest
index 42093194381a..a84c8a457a1f 100644
--- a/sys-apps/gpet/Manifest
+++ b/sys-apps/gpet/Manifest
@@ -1,4 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST gpet-0.4.tar.bz2 352653 SHA256 ff5c20718624b948062bef77f5083eddef2a7ef7ca66e09a8b003dfa3e9f632d SHA512 e373d57ab67d71fb750ee9af93893d036ff26f764f317328117745a4440c0559c2356866c09acfe579473e950e003744ae0a308df3b284d46097dcfe967c122e WHIRLPOOL db3d834460a06520275c0d5fdc005227e940277b8a0126eae38e483245688dd821370b63d995b131a46a1f43c88138de3d6ebe6a8cf3c5e46d7a3edca51bc358
 EBUILD gpet-0.4.ebuild 584 SHA256 0727bffc4a90d49d6c9208ab5288629011ea0c59225d83f5f6070d2703752724 SHA512 b02e25c8eb08f3f642e9904aba9c04d4dc026e81802b9af2dd4125ad6ed234628b8ac751bcfb4b4a28b5ace04f86b4684a41c0c4918f21a7fac0cdd354ccc7ed WHIRLPOOL 2ff09347417d543878823f286eb6a38d56936b09153f178406da1596e103196b81b26e48e97780449224b0edf698e469e3b10a8ddc6db45d1887ad3fce3f1012
 MISC ChangeLog 697 SHA256 c3f75ee0b00dedb6ce6b93aa4a8185dcc5270bc7333346a6dae768b5e17ed29d SHA512 8feb6dfd6683e447c3f54b7934c620ac12dc8ccf0eac5f60c66f142886f6d02eee6ff64710f023a3b682a4e9573d8d036fe61958b712ef430e9b741ea8402297 WHIRLPOOL 006f5abccf886aa95572132454ed453197c8c228c67ae3040f4f69b525ac32516322db1f759c14c24f8aed6610030dc571bafd1909009a0cf1c084cbd9da1753
-MISC metadata.xml 200 SHA256 18465d6d340f50cd04424fa8fae519ab58e37da2a4c4bdf318a9467e5362292d SHA512 967200ffa0f8608e9f3cd7a9f07ebc35f549e00ae4f1589149e39340b0e8b5dc4c473c896e8653fe0313aa134e28595b74d28a38204ab0448fe80c33ceb3f948 WHIRLPOOL 631cfe7979649bcfc35cb3cf5eec6c2d4526063dbea437c4dca72ce9e49aa0d86ddab5e36a5ea8b87a2df421faab6d12afae16f5511946c2a6f97eedb7ab1b21
+MISC metadata.xml 287 SHA256 ae9f47f0e7776093bacf5dfb30b83c52c1f58b03da04ca82420e56b73857297e SHA512 e2caa3ae67de8cf37331ee97913b2348bfa3313c712219e0b16ead3557a8ec332f6435ba1edcd28da6bf365e9514c51b650d8984a2a267f0b7898233ec8c412e WHIRLPOOL 0e5a99d1dd9bce43a91e8c0532129efe15b687b785a479367e8c64180b48a974a7d5b1abedf8a7e2b99bd6bb5e68abd2aaab5e3141b05538aa4ec12520c59705
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVfyOIXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmimugQAL3CmtOhWKKK9SWuw3a8nyLg
+IDWvXxej31y+C+IH73blSh5oiRvZxo1ReZfghwrXg/maD4xua5eKffkO5Rfrhapy
+/0KxvO4J3j6ThcWroYlcME4acCBOgAB/UEsKRxTUGnObICMO0zHjYfoKf6tVz80H
+73NH6OGMN//C3qz8aGdevVJOX9e31/yXT3xc09bBOxgLOY8cwfgPoVAAVkiBDKGN
+/sCBToN3W9mK+TdeBNqFDHOhRheFt0xQ78rp1o/mfpJPJB1GEZVdm5RczlxoLOy/
+jXXXL3X1tb2izfyENdsfpp230bC6SQ06HdNbGCdG9ucSMElJSx1yNUv72rxYASQV
+FsxRj4t3hoftdOolKrvKtnNnK1YlriF0FAfTR1iVG4x0FQvZM1suNS4uk2tWFwJs
+lOZL9uNKEp2V1TTu6qZnrvn0zOcJtJErGwJxamBGY+v0KmeuQp+qoKBosB0t5Jq5
+UNKCbo1BpAFibRBj+eSLXJMQko+NSO68j9RE0wLD9HFTslLOp66hiafVfQId/Qgw
+CTlwbZRAJyxMR0AzJzb5k+EIN2C1CTuOve8cRxYLOj61xkOj0IVeqY03+YfTpErE
++1AgPCHaz6A+7HvCPcG77nNGMgD5BzxU2QTa86I5d/4DaHsCcjUb83kXx7M0t3Ej
+DLkBAvvudFFt1+NFn+bo
+=3IZp
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/gpet/metadata.xml b/sys-apps/gpet/metadata.xml
index ac07e856ce8a..72088e816671 100644
--- a/sys-apps/gpet/metadata.xml
+++ b/sys-apps/gpet/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>naota@gentoo.org</email>
-</maintainer>
+  <maintainer>
+    <email>naota@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge-jp">gpet</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sys-apps/gptfdisk/Manifest b/sys-apps/gptfdisk/Manifest
index 61f1787b0f28..24e6bcd2fb81 100644
--- a/sys-apps/gptfdisk/Manifest
+++ b/sys-apps/gptfdisk/Manifest
@@ -1,26 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST gptfdisk-0.8.10.tar.gz 190666 SHA256 73e64151203ae0c347c488358e71ca582bb7fb7f0d66df86b71c42050390eb9b SHA512 3187bc231c3390a86f5b7b32270d5f0d1e6c7bccd9d1cbf100c29f4822afa73362aa1fbdd3b29f20c42d67ec51bd777b7b58b5791e31182b3860915bc695948f WHIRLPOOL f90b95f9f0cfba1b57b7dcfd2e39e475f322fa9ea2a85891ea70877e518bbed96dec8d4f61a8eeae3dbd2d36d276ce4bd2c2781eaa5135058cf544629f4cddbc
 DIST gptfdisk-1.0.0.tar.gz 193521 SHA256 5b66956743a799fc0471cdb032665c1391e82f9c5b3f1d7d726d29fe2ba01d6c SHA512 d60660563268c20737415e1cfd4239fba0cc2ceb4c6ae86cc34e9550d969f9b88ac3d8c862d1790f6d644266b423eeb5d78540eec01a447b722793fba54f6afc WHIRLPOOL d7fbec9fd92eb0a871510f2c25d0057577f73668b68336148af86d549522845dda79423e8ddf306d2128153436467f618decb9b65a19a6bf6e89ce5187c67676
 EBUILD gptfdisk-0.8.10.ebuild 1255 SHA256 58369f7690310eee347f8808b028c2e603cd6e4303cc96cb310d2d975f836943 SHA512 9b30f9722d342554bbfd2374bc43a7f1c2a6cce28a3dc1a84aec17c7cc28fd52b080b6f28696dd07e63e5e74654cdd439e7ddf3eda250409f47d3f08a726b200 WHIRLPOOL ea7e3ec2b55d82d0c2ab39f8018990833ed0dfada1f4f9f85ac19d0dd700f7728267943a11c8b081bea9afc571a67756b712718afb496819e9171d7c7c5ca501
 EBUILD gptfdisk-1.0.0.ebuild 1269 SHA256 deb8c74efa6b9e0954897db9c525f2b3551fd1c23b387c8e55ede304b8793061 SHA512 17ecedc5066639166afa2797a46d90017244773e6bd6c546aff0fdf43d6c0a6a886fc2b6698a10d32ee8780e2e8924ab904426a19d6a3288225580b7d92981bf WHIRLPOOL e31c73c919bf8ca86a8279703c573a0c3683ac75dedf6d7dff0c1dde2a3fbf650dd2b2f7164ce86947adc266123a9455e90e5dfc9fb87942e616176d9182f6e0
 MISC ChangeLog 9109 SHA256 90417f19814175bb6548f4583b2a66820b0b0fa5f352dbb5b17d8a51f1df740b SHA512 f559d1f0983aac2a5d8919ecc145aed6a68cabc00c7435bca583f576aff00da8d8eef267a27e203dd1760d15050a9fbe3c23f48c9abd9c0ced02ab02d28d6fdb WHIRLPOOL d4e7e22a12943b6845fe8deee6c38397a38f8adcdc978d6deff22fd260549de042ec2d23c45f28b443c7ca61e19a7bc5970a644dae7eaade7852e44ed8e34141
-MISC metadata.xml 344 SHA256 399ef984258cc68b135eb28cb0a17ec32dfa333378ddce1631aaec2f359c4180 SHA512 bd6f482f28d348dcd250a0a0e76014d0bea9b7b54b5c5657c7a721370857541d10456e85bd8169852510d09dfede1e404d987bb6c0205ed7712dd55c46025095 WHIRLPOOL 76fec2ecd3c460ab5fb3de0b68213bfa8c0eab6ffe01e375c475e7e266cc0b8b63afbd7fad647e762206a3e522926d311b894bc1b119f112c705cc07b96a879a
+MISC metadata.xml 426 SHA256 32f9f9c42796e1e9bd43ccd5e51f3a897a2cfc7a54a2a850e552826f323ebb65 SHA512 0d8201e50e725bdea348ebab36f859fb4e88a0d367aa9ade6c06683ab39acb2bf7bd38c4181af34efe833c987d9eedcf315128ab3b5a7bee8a41c31388af2c97 WHIRLPOOL 25c705e4ed40c00676cfebeed4d958178fe0139f6471da50d1889d261cf735ee2c7cfc785cdb05a07939daa3479a5aee64fb95e9c99fc3622fa80dff198a8d32
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJVL4nXAAoJEPiazRVxLXTFZYQQANvGeFbd2ZHkYIk6s2+B5FTi
-s8dQNEjTs1BVYinDVN0l26W5kjGxYjksGfkcl1pJG/WzmO4cdZDcjV57n7OXnktv
-xbnJujIAvnBYPZ2eLl6+Pq5710+aj7pzDhgDrAejxK6CNu1J+rufpt/8RL5YcnTs
-Vnt3fmRkhFshQDzMl7i14+VZ8EmfZw+ZSxe1XotBXlO41uW4kmHINxeHwNKeVIGc
-zkb41IK9W4Mrldl6EQ7NtQz5fCBQOTTlO+fZ89Gjb+vvT5orwAo9oxPjriBq7fE0
-DUyWnLyiOfQzBseGoDDz3kFs2h4aMt/9ZwiUeJ4VjPIl6vrnw2+3wp/oCV8qdOmL
-CszWjyqv0u3NAI9dTp5d8vFblKXFStD/zWcqW8tpCSMuNgDovRw4v9EVKuPBT7Z/
-WLdpRyj6YC4crwaQTvK8W87Xso4tCFf1Ggk6qVvKZ1LBISRBlh4V71m5OegGGAxp
-hQNEvXRwsm+XYgLUNVeKFUCQHLOwQsE4Oe/DmWwUbt5oCSTnUrn6zxEDSqSSvrbg
-CtiwAsTsw9f6Iezj8RzmlQaKIcP1xRzW1ijMqRn+BvE1jqiplz9FvrCzqgxADLcE
-a6ZJMYJC5oJ3NlPkmvdDcZMHb3g5saGkgZs/2MR005vj0kZdiEWEUxzlILCKFqIa
-3trdtHCb15BxiJmPC0pJ
-=s09F
+iQJ8BAEBCgBmBQJVfyObXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi+mkP/j5Ykvdz8Cs/5EuFeig5qW6r
+C0Ip/hgQBllsaZdKF00CqSTtnP/9+/0fMXbBvW7XCpIbJ+jriK3/zlKV73QW+PCk
+CJf13PbhJZvaQK/VAp4qdbN3VxwXLANyEHR+V4C2E5RvmG7eniBU015ranIY6jPJ
+8jmeIDokwQjP6u6BdkYlNDXgHlALzWdhBXnTsdrojmz9kmXsEQVO8CB6MFcBP8ii
+YlDINsPzrsxyMCTbPUzZxa/M9qkfmHd/+RlSU0K2RxKJ3JxehIEg0AIH4UPa0Q0j
+fZfoDCUVStIhdFTsst/xUQ6VnBgIzMFBl9yObGohGZ4E2NdiF+OwYxSKm/Y0C6Lx
+yv+3p43u9cuU57RwPtEU09og5u5qyA3OTPxG6xWB6N8gEFfTjVP+DQrvv8mB0VHD
+Vjto3vRlsonpIU0MaetAAVShj4BJQWw+v8Dux7fyyeA3iHqGQi74blDSTuxAx3Ur
+xfa+g2K+q4pVRhqMFl/kbhCqlgD2Dz4E/a5BesP8K+XkseDfOvOUKWduTArRoEWY
+0G1v5iqX7+5PdLcuRHjZtspu3ufKxv3+4+RPf/aGe1zn/fAOlB3GyIH6UvNcPkYK
+F1lwzfppgcBs4ARGVut6SkeR97hs7EUg7ItMbVcRFs4CSWMst+3cWJphLHA00LZM
+xdMr3xOvaZif0eZJ2Cen
+=TOKm
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/gptfdisk/metadata.xml b/sys-apps/gptfdisk/metadata.xml
index 15e5b36515d4..4beceb120b3d 100644
--- a/sys-apps/gptfdisk/metadata.xml
+++ b/sys-apps/gptfdisk/metadata.xml
@@ -9,4 +9,7 @@
     <email>polynomial-c@gentoo.org</email>
     <name>Lars Wendler</name>
   </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">gptfdisk</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sys-apps/gscanbus/Manifest b/sys-apps/gscanbus/Manifest
index 2065ef9dc4e1..78517f010949 100644
--- a/sys-apps/gscanbus/Manifest
+++ b/sys-apps/gscanbus/Manifest
@@ -1,26 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST gscanbus-0.8.tar.gz 215739 SHA256 5fd7c9e4b52a91cf3714ed284bf1fbf95ce45efe0413fce78649335f24278135
 EBUILD gscanbus-0.8.ebuild 631 SHA256 f7c2de4d4be20e3fd645da69287564712bc4cbf76ae1dc2e288873009888dd04 SHA512 f6431f4f5088f7bcfde61a4a5b5fe591a467c771194e65307ad95815583db41ca7f502f66130fa682fcbe444ec98efe5ec4ba758ca64e184cab6ff5ba89a45a8 WHIRLPOOL 56c406586beaf6c06548f49f9bd6ca1a333a85b1738f1f750c22afc8044dcd8289292622afd666e5d353d9c8a4103464e32a39b963715bd17c9f2a47817232ce
 MISC ChangeLog 2200 SHA256 3d3d8fc655a8456a075d5d59c5b54443f8775cafe3b3b629c711e968357e87ae SHA512 62c0385a5de44131a762254efea3062dca7fc51e10a13501c6ec6f3d270d8125e2bdcb652c0d96751014862f14898817a8bab59b5bd443b48367c2f4fda1a8b6 WHIRLPOOL 0dc29eb060e4aa6fbfbb9e067c1dd4eac772b299f9a356a5d7ec28c201ad13328fb0926829b4d84871faa8715dbea96ff83b9652345f83c6f4c2b0eeb38921ef
-MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
+MISC metadata.xml 251 SHA256 280c79553bf156724b73614a231270857004b01badc3769ba373027517d79914 SHA512 bd91612dd21f8b4fb20dcc958c20285027bd5969a90fb1a3d79136a450f8c2a051e4eda80d739849e91776ef862faf819cdf1a824dc716e96e142acb56aa6784 WHIRLPOOL 7d7b33f74aa6acb8707f0bd66f2be015457414a35313081b86a0706695505fae5629121c6a8e77fe6072b7144499cca46eeaeb173262675c5ec6e96d98064cb3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJU647LXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZODdkQAJNRB/PdZh8UXOK/4VtyGkxI
-UgweDB78SnMgb5mBPMHDZKIgMyP3osR4TyFLLWdP0/ZlfpLOqxiRgSHTODlSpfkN
-huppg6YkRhUdXL6MoAO/ksNVo0HRUymyanBX+TpAVdAAs/a5Y6oeILjoAMkSZeCU
-lFfJct1ZqPXKmilW3ol3JJ+sfu2H5SOdjZi5Hy7MXu3VHETejG+5nwbtb9NyOdjL
-avhGH5iRxdFZDwYxvM21owt2jPWenEKX+WzrAY0EOxesGUhyHxQTvOsOAnED/pco
-Id1teXDmFYB+lkO2q2/C9gT36KDloHSYMrJOFW9dDJKknRC7qU3S5J3Wlo4zIGvY
-fQD49rIiJ+RN5Gt1NvB7dwKAqHxfvJeywdLoKtAW5yj08wUU8szus5YSh8/+OsKN
-DGhrYW5cXJHFCMOMeg399r7J8tn4qgvw07vpgAWFHpsgDrTxtSGRticjBbBFqWMv
-lgdKdnLAk+EgOl+jwkMZkSsN3c4IkChEPlPcfP/17SwZpVW/rPI/DPWT9obs29I2
-sfpkJAumvG0pOaqM43xA1imBmk15WSFF41RuatmcDlTHYTlHw6hqh515JFO5K5y8
-TkQVJ0zXpzur0Ozox7CFRif9Ve5JfWySp6nHvBzl0KAGUE5gkJ4I7NPeG4Oy14mg
-NlzFcLy9j9MMfH53QRMC
-=xcH4
+iQJ8BAEBCgBmBQJVfyOlXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiyLQP/0vbdBLsy9Wk7g2d4fGPy63Z
+h6qSJrOk9UZkYb86iSWmKPGLUAmw2bbWDAEpdmQ+XruVEVfWv/Srj5emYQq6lV9k
+oeapF4pvBWCgqsOSJWEXqexHU4PuXoCqznhuCQwu1AaTnhEEbbLPmIpH5d+2dU3g
+5pgOwMzbXISSI0puVcAi3VudEoSNoK5dZw6HfAD/Ap/Z8AcvMW+ML7lXWjXIE9CB
+chGfQw9mYkBtUroS9MuUOB9+rcrGMiktHSmJyfFtAv107gYBIA2xkuGL9ZY9bLCZ
+LWFAL7EGS5dJfLSWldQu/Oj6IC776MC7BNnRXmEzg8YyAm8kJNlo+v2roY5Mhc9j
+B3AWP6iexBjfJCLs8X61/rUz8E4pqrs8sCngOZk1TPhTGvVvxGa1/ykL7GpGKn9b
+rMeCevKsKO3b35YbBeFWWWzxdGHQnqJYcek6NnwJlhiRDxGEtvHWdqOtOQwPJLMQ
+QdxyTCaOesiJnqmiIggJlRd4Do7oKNbYBvYD/ZJhAGR/yFGUY8nphIs3jxO1SLGA
+scFhl9YUpJrX5GqHm8cDqFqgSvUt/+LDUobNMf520agP792Wxx3CL9Bc/XvsJ5g9
+snYCHYMemc3rCpnvwnYr4YbRqR16cuRCnwfgivNULN1dfvnQ4YnJ15uK4FdzJfk/
+fJfh8CrqF1VK/qVF72Im
+=5w4V
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/gscanbus/metadata.xml b/sys-apps/gscanbus/metadata.xml
index 96a2d586367d..e02aded30f16 100644
--- a/sys-apps/gscanbus/metadata.xml
+++ b/sys-apps/gscanbus/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>base-system</herd>
+	<herd>base-system</herd>
+	<upstream>
+		<remote-id type="sourceforge">gscanbus.berlios</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/gsmartcontrol/Manifest b/sys-apps/gsmartcontrol/Manifest
index e8eb2b1f5f9f..19808b17a7d7 100644
--- a/sys-apps/gsmartcontrol/Manifest
+++ b/sys-apps/gsmartcontrol/Manifest
@@ -1,26 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST gsmartcontrol-0.8.7.tar.bz2 684394 SHA256 708fa803243abb852ed52050fc82cd3592a798c02743342441996e77f19ffec6 SHA512 3258ddcb448460afeef8d617ab5bb4720c9b2444452bc45d6798ec645da4862236fbb3fe0116a1cc904f5353481df87603bd2b6d808f348c250bde3624c8403a WHIRLPOOL 24fb546c7175306c8cdd8906b506471d20668de0cd078a8205ec87eff50ce0eb52dc04b3b05e771f8789ef852e5f97675c7c224ab6450d90a3e2ac3e51578d2a
 EBUILD gsmartcontrol-0.8.7.ebuild 1076 SHA256 668e1fb362795ef8f3510133fe4995812e6b0d40c64f7efe29f517ee08f1620f SHA512 24c8e92798dbfd9b63bdfa89a7e5d54b70bd2b3aa949d78d7543ae2657932e1c189dfc7db332ac7b7078d43d9ab52aa134a0980756275a246619d4196179a2e0 WHIRLPOOL 86bf6c0233febe898aa207954c9494cb0707876e1dcd8f49721a34e7af13c0b1be7770a1c01937d3d7204c7f8a6679723f84cb9fca906d4eae26c35c4bb68709
 MISC ChangeLog 1161 SHA256 ea76dfa40483f7abb93a0e349477539e4a51f4944813713041acd76ba5559e1b SHA512 364299b5bf15b8f619f6be80aa8724708aea40b0893a79ac4b48589d83e5749e771f5261076ec6f7fac55b5600abcdfe79e3281b9e5f5733c48db36bfaf11694 WHIRLPOOL 39c3b5a86bfa3f26f683983f94e524b4c6afd97dca1f0aa6a77d252b042b406f723f48ad184e87bd9abcb68dc2c5ff7e100a865c6526ba2ac94fc172bd6c7a8d
-MISC metadata.xml 263 SHA256 65aa9b1d10c37c41fcc4d03760cde2debbcd2027700193303184a7ee93ff0609 SHA512 a2c7955346b240c428417f11deebba06f63f4973e5f18a539e1744bcdec7326bdb272621fb4c70bb7ea763d24b175ad71d79e88f6847de77eb215ad21ca2cc11 WHIRLPOOL c21bb668c36d7460619e998fdf18dea54cd71335259b14f1f733f847f1018be963e04440483d43a625ed354ab79a6c848024657944a85bd75b65bdec91fdbd9a
+MISC metadata.xml 346 SHA256 576469b89742f77bb06728d68dbe3ca528e9dcdf70da2f582c48880fe0313e24 SHA512 ff3fed581da5e6e109e6d9e89c3c564f44e1d599e23ab885ee540803c0dee46f3cb49bbe4f9827ad1b976d89a02af88642faae38a2705d65306e6b315d7bd3ad WHIRLPOOL dda7b5916cd80ee99074d08ba87d606fb2a7ff7834411ab6dee0e1c5f9933ef2f55b488e35eb36acb494a2488cd698f8dce40f9b11c729b6985232b16c551a38
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJU6gYWXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOJ3oQAKr2jQv6/xoLNxFg2pZd5OH9
-NAzXQJPRvmSLVBP4mMRCTHXrqbf+/xhTO2oyj4MlhGz72N8jATAZt8ZeQbqg1bvm
-jpwM8PPjZIKc/6mxrlzs9JSs9i4TYjQZ1KNHNSrfo/UlsN8rnxHqd6etfRSEtUyt
-MeX5dI+eqRH3aOkQEg/yXP84rCBl+4G+XpaO7PNOUcJ7fldSoiU5cwmzoa4V4Xkv
-7AOT/j0rUUuaxXVqrZTdwpM4aQFncL6aw5byqz7GDoZGdgBN067lmoghrHE2nHmN
-gVtxJbYy1ZWcKDevIBV+K+Xzrok0zrHhF6RskQ9PqVtgZtwNuBmJaSIJaKbhQTJ4
-/+cRgK5TpsBohXfRs98rEoC28dI1dtu23+gFRN9yxgQY/bbR8f6LlWFOn65vaZO4
-thUOQ//qL7LJ3sSsUVluG+v8XypwFYtOyhlSnZEIjJazGwZPiPnISEB5WThocdYE
-v+dbzCN6F5Y1vKZktIkwqJmviKwUwGaBQaq4hkHuxEYuyWHSyNVLtLilFmhJiubA
-rsB7KaarW+bpSRU4l7TmkfObzTBWdz2ogPbbugNedKuq62y/T5A4PKnxXP2oT9GG
-80vwsmtvgObqA7eIZjMuzoxAgDBntICQSIctFMu4AeBJ0pdLKHwREqV6hMd6cLVi
-lKq4zSsoEs15b/k6QyA5
-=SnNY
+iQJ8BAEBCgBmBQJVfyOyXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiOj8P/22XaVfxYATWjKqRpkptxwAD
+6U5Nk2ow0s7Pqsh72vTCoUdbDfxdMk+P2ijJjxJ6fQyk85pSZMcnqjlZIJYtqRKK
+kEhuD0nUNjdvtBY0Wi9oivTIC/jYpaw0La704JIGRmB18UBm+scG61zGDgA+eiv+
+6fVPjaSVAuToqgxu+zKhdhkKSh6M/YWAytmzJ2MIMcp3aUJrIIjxyc4g1UTxyd4m
+N5+vSvVBqYoonWaQ+OYbRHa5xEYiNxtmyoqZr/h31x5T2HdREO3k9QILhKu8DIKI
+uX2LKtBeVZQQIwfYYrOHFcxL5LuLvkuGE+5caYPKlOix86WM9DLNVZGINvQoLu9Y
+c9pS2rxh8dS68taOORmPD+WYKqijzOz2aKPuU57VvSUhqGpfLR7SW5Vkr8xTLSIN
+Bhok3g3Fmp/c+yVG9LnNf3QN0JagvR1lcutYOPo03eBgp8W+EjYP08Db2muC/PJu
+750xRuevtgQIHV1nZVO+CbhEJRbGnWxk9O0dWD70DSiimpC9CVvpCWKNhU/EZz+M
+gQBj3gGGZnIAjyz8OAgcKpfLl8wAqxI/BNdwY2Cl/pGFiZlRnTm0SgxWPF85qGlh
+VsU2nOmjJIC3YCI8XbYsJxG8LPWEBlBAV2FXLAq3ph0H/nasiUS0QmRWoP+rMI0s
+UoWkRg3/MQ2BZbFvrlNo
+=oR+t
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/gsmartcontrol/metadata.xml b/sys-apps/gsmartcontrol/metadata.xml
index e9e6c9bb5eb0..77c4c35f6b24 100644
--- a/sys-apps/gsmartcontrol/metadata.xml
+++ b/sys-apps/gsmartcontrol/metadata.xml
@@ -6,4 +6,7 @@
 		<email>ssuominen@gentoo.org</email>
 		<name>Samuli Suominen</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">gsmartcontrol</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/hbaapi/Manifest b/sys-apps/hbaapi/Manifest
index 2d7031e37a2c..85292052c81c 100644
--- a/sys-apps/hbaapi/Manifest
+++ b/sys-apps/hbaapi/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX hba.conf 1215 SHA256 3ce301c262ac75ec932ce85c049f9f0195e87ecea0461d637a69e9da3fa45179 SHA512 5877c3a461b3d8f717d30b8ff706d31b9b607b94d9a7bfed0fabdd103400e6c0a3b2a26418f948a79d72f5ad1303123cb1af55bbc62dcc47ccc245260168a490 WHIRLPOOL c079ba40f31749c3025de4ce7b262fc76d1e8a1ed25eb7dd4081859c60c2384afe1af84670ff8a39996772b8784fe90ba0f8a31306d96f008a5e081d3effbc59
 AUX hbaapi-2.2-qa.patch 1040 SHA256 b74e85e793192f7d0cdef84f4b9e3f34d0125758ce5715ebf1b4881c0a98d710 SHA512 d920073a442e2421911eaa5cb67459f642f8c9cae0ceb987f68327614d4d6377771d2c57614cebe117abcd82c30a5bd61d3de9fb7dbd14b876e6b563fc9bafce WHIRLPOOL 979eddc07cbd4b5cb2191db482fb0d4422c589df6f9b586663760cb801c6e61009cd5c50fa6c5623a0fad211908dbc68a127b0b36075ac90463142426f90dec9
@@ -7,21 +7,23 @@ DIST hbaapi-2.2.Makefile.gz 1356 SHA256 62a4339c732437895932873810d2b4783b9f170b
 DIST hbaapi_src_2.2.tgz 30232 SHA256 c1b64243666e01c82c3f58e2b032fc76cbe6ced92d894bee2ea83ab99fc90c43 SHA512 83d8d3df0208f632016acac65bc03b9610eb47d98e99565e2bdbe543382b141c0b6d148272dffc421a36f16ee511027899ee2b70a04435a6ef221e0bc559e511 WHIRLPOOL cc8089f9ff9c29f594d5bf579e66400692b0f1455547df8cb1918fd83cef0c818d382978553c210cb5762f2c97010818984eb80f2f54a9719ae456e3fd5ab8d3
 EBUILD hbaapi-2.2.ebuild 1004 SHA256 74fa3e681f2dabdf688b3a3d0dda866012ae4ec2aabe2ffbf86a74ed106eccce SHA512 c8b660bad4d31b1c6417bb56b9dec5a4f3700f4e7561093db5e4208ebacd5aa0b1d531787562a5e9483ad7280726b07ea58952255a24a83dfc062b5be9577a02 WHIRLPOOL c1f36d228c96d605db765b147de7ea0f2c63e9488d583d0af60596f36d225d4146318e366e048da2340b75419b573c1b9128c72f79280a63b72181cba8fe43c2
 MISC ChangeLog 961 SHA256 7716a211c0568a062a7793e247f7b714028b5f6e0c0297b4d7166d2609d77314 SHA512 18617a6f8ce13cd9f277a0e9c7f1f0366f2bc5ed59853f803019c8e44275cd742e46c00acd124c1d92c5186db719a3c96a8a04eeccfdc91d12f95596f643edda WHIRLPOOL cc83e7e0a7162e2e3b18072d751f099bd3d90dde401766ccdbb81dcb63acf771de922bf61fbea3ed826bb4ddd00b534c2a5a00d348d397e387e4b0a3e6be75b8
-MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
+MISC metadata.xml 241 SHA256 103f57281b723623e993904a64de6b5e093b8b550543d86692fd6bb5709e5ad8 SHA512 8233cb37b4b9163b12bbd66d0778fcc49453ebad985927c15f692ff2809fe310676a43d1a0bae836ab0586798013fb7ec3aa186f0bcf5a5d462b65e5394cc664 WHIRLPOOL 82886678ccdb59c9f584705a760f387b3f38c13ce7416e5b932ff7b154240584ba40cd8dc7d02663c3af5668781086454549a26a758da024a59dcb47948617b9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJQplnKAAoJEDxpGckxwJCBhLsP/in+v3o8d3HPqq5nXGb5Zg57
-3mVCtaC3/fYZwyfCecs65aqwEQkmp0os1Y2HcgtuIhNIKGX4sZ9Y3E6EVpFRo2IW
-CghQXgoFoe43MIzGyYO9GE9rUX3oJ6uOiizVjZS8TG54exrbsPVFmCdp78z3qsZi
-3f8483EqG5sCSt24svJq4HroKTurHwKmb7X9QbDXaAZGfmvOtndjoUdl2egf1TcV
-jF6jGwX+ajhjr1G30F+MWzgxiVjwm20OLv1/lAKgPBhuW6icrCWNi/fd1ScIJhQw
-szXPNa3JLb7AcHcS9IdDDjL0sCDoVEAyPfxb7iwIog5oUXVjACMWtH85ikETGbLU
-zsFFboyczbGHn2O53MHB9tiNGOtUPpB9hFQVzXv6y++pN1qHVLi0S+59bPhMjRIa
-pPhtL3JXJrxkLUfvaOP1Sx40dDqcfp7ys2w2LrU9qJLm3I+wbAjuWCv3SjqKLHnb
-azZwiJZ6Hv7ywaUGbbns8PO/sFHQx501+PulavLzznhRSkGfje6ao7AkwJll6gzP
-I6YbMrPXUYpI8JCSMPhIi25LfM691cqvBiZ9s1Mrse+iaEYcveqgv9U5Vn/Tdkv0
-QBhCtoYceYFbHukU66St0nL2K38SOsPv/++HEEjxdDspEH+DCezkw3JuqK0glVxj
-gdXS1nH1YurEjgpXY+3B
-=waLN
+iQJ8BAEBCgBmBQJVfyO9XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiDC8QAJboHwFwt71YIccug8nLbF80
+pU0j1UxYO62sGaoKqXoo1Q2fQIerDob6vKfd6rh8m8lvW9wAyGxxSBzDsXUCgle8
+weesQKNp+yUJ6z2yLDexI9tCFu9/8HKBuUjVrslcLZZqkGUwR5vy2VwO0H31GKG3
+AzYE3e31Z/irRJXNYPGMTPaToeFZhhrpwMpdrWlMXDBMDU4rC61JvFA4KbbjcUUn
+Zpti/lKWba4EXF7bFU4mSHEY4Af4VcH2ud7GXkQ0BfxmG3YKzAVABaM/nFojV24n
+kReF8hPsp5F8rTu1Yz7xTJ1FFS9Ghzhq9RTpZgY95+VEC5PkyzJwC6B5af9SLKwB
+Gt92Xz6zmbzjl6GoyEQXKkqkWjaHMzA5fPjpAyoPHp2XCeLJ5KQpePrgA63ZZnpH
+crXyPPE8geFnHXYrmcKm5UbSxyPPg30HdWV+mJT8fii0DaLpGt74SGCjNIjNGitB
+0K4kI3lAHABetGvAyZCs0OKCqccIVhXuIhorfvVyZvPxceTeJVa3suV/VryhcyM/
+kfpecG9JvJS8vaLmn4yaRq1gsBhIXfcUFVhIcX/f8n45aM5rAxfLEaBixeRAVZuN
+9koNbcPLv8/TSgpFG5ore1T735xrUa85qyjMsQ6uLvXRlF03JCMMIGAwTuk8TQ3V
+fnwFUssgXztd8Q1VEn5b
+=HLAq
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/hbaapi/metadata.xml b/sys-apps/hbaapi/metadata.xml
index 96a2d586367d..290c474f4b48 100644
--- a/sys-apps/hbaapi/metadata.xml
+++ b/sys-apps/hbaapi/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>base-system</herd>
+	<herd>base-system</herd>
+	<upstream>
+		<remote-id type="sourceforge">hbaapi</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/hdparm/Manifest b/sys-apps/hdparm/Manifest
index 3f49a6b2acda..ffeca7d743de 100644
--- a/sys-apps/hdparm/Manifest
+++ b/sys-apps/hdparm/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX hdparm-conf.d.3 872 SHA256 37c95ff723fa578e9039613d09dbf790d99113a318c065422986c744519214e9 SHA512 968c6b9d26a71bf724728c259d35a499a644496875eac255dcac3cb4a7e5cadb677a4f6e5e0f8bbd7e1826b6fb77cb39af15b11d1e59b3e9daf9ba442b9e6f02 WHIRLPOOL 110d330860c4f5e3b1626b85ab369a02e5c092acf656edc845a2f311b5349644317ec2021063a0fb977d3b9851e0bb9c54fd66e814a080d6af3aa0f05fbd658b
 AUX hdparm-init-8 1469 SHA256 434beee81ba04c96fcd03e6b37a4578c2c25af2c1007368469c48dd37523d56e SHA512 f81100a4f06670639ac8c079a72028dbb0c1b6e5436e6c745c339612ad3287223d3307a40609625dd6904f737816e162af82ecc428d4405678ff0130d0f9752b WHIRLPOOL f0bb17c90466727a0a179928275a1abcfe6f669703a98a803395fe61de90aa7cc4c83b7f510cd1bdf8f44235cfcffe3c6b6a4182d7cfb6594be1b0f8936bab51
@@ -10,21 +10,23 @@ EBUILD hdparm-9.39.ebuild 1023 SHA256 fdf2b6979126f7af92653a9decb0c9d3ca873e8ca6
 EBUILD hdparm-9.43.ebuild 1105 SHA256 504f960031ffb6b28cf287a88d13dee7ae37806ff5d66bb24ff50085daa7e52e SHA512 ced624f1a875b580daa53dd2c7e97cba309b7e83aeac992cca08bfc48fc076b95a0f9925fefc5a6c7f2b3b014032d4ffabaec16a8235e06b734c754275b9f2e9 WHIRLPOOL 24d34a0cd5b9576d5816a385ce6d668523a204781eb8c45da8742d21f5990546749f0442f5d962f31295591da4dccaad0f16c248987ee39f365e58e5c867e4a9
 EBUILD hdparm-9.45.ebuild 1096 SHA256 b71cf0b3e69a5f5a5ac41bc125c44fafc8d15b834968cb629d47eb9424be3856 SHA512 55de0c3fd364235260c404c6ee6a26f639287b104ce329536b293bb906cc3be7c65908752691b033c18ff5d451b15aa52e297492daee3b5fb4917bbd0dcb8062 WHIRLPOOL 562e294917d1a6054e76c0e8eb30e44cc2676f0710743038aa6c746e0743cb0fb4f00357a23d5163b3620becfba0b3d4e8a0da04abbb6de19ec4d48829a96584
 MISC ChangeLog 29017 SHA256 b534763d5f56d8602b4341cc7ba3b7007a400392667729a6135eccfafcf29dd0 SHA512 1aa04da8e05303a232c886b76c94a63154387c0ae67603d6c292d30567b5d0579fa291893cb8e6629d96b9b0780fa13b34bd8f5551bcb40c96d0959f3ea85c5f WHIRLPOOL f25fb0890e02ebe1f7c65302254d4ae6c337e352f40cd6b71f1cb21601107b9326bdb48ac5472673c4675ae9f596fe3032369db3e62985a6b7f7c2ad693ddcca
-MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
+MISC metadata.xml 241 SHA256 cb8ce43f39a29bd724b4f43d7854108c1164375bb439fcc725e651f6d99fe7f5 SHA512 3c8635b26517adfaf4ed9c397493d08fae97acd20c19b105a12a566390bff9542412f5e281bfff7a9a7a780181d5ec0677c3d717c2351f5134d440257a2dc17a WHIRLPOOL b955c4a8402b536cc685bebc076314070c5f5ca59996dc5c84b1d88b8ca851941a81a00a0e37c04296b707f693bb18cbda52c7bbdaa650198e5146bf6bffdc53
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJVeZffAAoJELp701BxlEWfvrAQAKacYL4ehXqKDk0oFias3QfL
-XxIyD+U6ZtDO2N6z42YnggNetoVXOepv9/lgA/2pndTq3b2lLeLEbhi2XVQym2WG
-etHOPTxt0jLAV2sa2rU3Oy/CqK84LKYKZfVMxDyqEk6rnjjIhCMKS0ZJmLPA2UIy
-5qpz9RMObc2d0HrWHSxja8UaSQJW4SQdqyJWyen67oU8EW35BW4dBmV5hJgvcsTm
-2Fjc1k9Ugm/tuYGjq4V1hAQcMgHxGyDJu/XLH2oAW4E61Q+L96KCsQiHwEbQAMts
-xF88wKucHPmtd3pfRGiNiS6VGYcUX4DjqgnEVfAtEkLdYQLzAEa9czqvUnOMopgd
-B61w8JzP7xZG9hXWN03oKcpySFWEGucy5nRSRXs4oVYkYU1Ap3gSC0TjJ9pJQTTX
-8R1t5q60pLFWy801+vVWCgPSEG1/0CXnlGER9CtaAWfCtPI7OXxPUlWNf9KD8/d+
-lLBrVZiPESj48oKy0DR+M9KAEMMqjVwKRyw1KflbERZrxoD10B9aMRqPxB0YvfTi
-rdAgsoRgS+DNfOQgURflJtWXup/HUtN4wkZw8FXPCre1i0CMdcEk47pLEN/uO7Xz
-3QAHWONCCBwX1NsHWO1b+IU01tPscpmVLzynDMqaRB99fKdK1M928Ay2bM01Hwuj
-F/g6W13xwU4ehKVO1xxI
-=Jy+2
+iQJ8BAEBCgBmBQJVfyPMXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiWtMQAKzvpP/YSaJaQ6Z9AHKbhKBo
+rPPlkt7PgmlrKEygyY5oiyZMphJrtiK8qfziAW7f+Ni/20X7eeqQGcXxFCR3aZDR
+dYcX35SjtNQY/Nbaj+0K9qcfezTAGGviGapzCwwFwP3SIus2AinxDjEu3zGjNpwy
+ZZA8dll+pejev+O1R64qtiBkIhKZtcflxE13dxBGuXdS84s93WgmLO2UOfuniM/z
+GWKM5QXsFLY0qB628V9v8d7fv4tvinYRWnpwocLIMUWB8Nt9rL7s/X8/WMaa0SWL
+DmWW+2Vzl7imtUjXr4pyPy7vgF0MpB35CeOOSawwY35q//ENI5k3GwlX1POBtgoq
+aDLnNgthXHw37xJhNLtiad1bOQ0KoEt4CgRtjoyp+xoZozF8cRh4njfz6U14qI3n
+nuAD2voNtaaQ3WIDZ/qxXeZIc9+qYuUIuhTNMFCv16wGBVzO5Jj7FV5Fn/gUhGDk
+IFehZLY+rPFkYgPlSTQe5bwqtJkMIWunPyg4Zche+q0EZva7RKLa84lrQCfa5OgX
+OE94pAJyXi5KqHRljprJD+whN8k3B9kLZeesB8p9K4QPpPtdYX+gt/kiNzuE3n9J
+YZaKNBR4BdsZaPyMx9BOqF222KCOFGXcwC3HjlR+buNr4zM+IWrfgaYOGdpcZHHh
+q03y+pSj/mBXz2sdnWzU
+=HL9i
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/hdparm/metadata.xml b/sys-apps/hdparm/metadata.xml
index 96a2d586367d..5124b52e66e1 100644
--- a/sys-apps/hdparm/metadata.xml
+++ b/sys-apps/hdparm/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>base-system</herd>
+	<herd>base-system</herd>
+	<upstream>
+		<remote-id type="sourceforge">hdparm</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/hprofile/Manifest b/sys-apps/hprofile/Manifest
index 458eb4ae8a76..e24e9affa1e8 100644
--- a/sys-apps/hprofile/Manifest
+++ b/sys-apps/hprofile/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST hprofile-3.0.6.tar.gz 18236 SHA256 23aaa1d6d2cc5b6e8fb3000a19c7cdfeec71abc0d18ce81727a61cabd73d0532 SHA512 86568314a24397d2ec5898dd3061e91a5597eff49679f0533fdcb0d2c9b76cdb131b25fe45167370174d1514ba222a781c0f09f98a1cc5407898e36c30ff677f WHIRLPOOL 41afc8ee3a824ecc07f1f3305d462ac10cb57a89b5defbef3cd562fd5a90289850470b1adad22f9fb2efa03fe6fb45637d97e350d24ccf38a973503e53d55c68
 DIST hprofile-3.1.1.tar.gz 18489 SHA256 dd3a853ad7928673be689d2514a2e9da0981edc216ecf396f612fb0771dbbdad SHA512 b42bf79840270eccf164a0ba2d5def7d50846fa7043319b23be2be3fabece014a031cc4197c2688a6c4f7a542f0e0961ff538ea879eac81a7f03c024a4d023da WHIRLPOOL f4e397221f7736553ee6430cd6aa11936edc44d5605a028d8ab2cf5aa75fba28c5e80e3a9e5456e08f5c9b21ec04ef8d0cead397630eb77995aea012ef2b9015
@@ -8,21 +8,23 @@ EBUILD hprofile-3.0.6.ebuild 641 SHA256 80b5be5abc85835369e412cd6f99fcfaed916141
 EBUILD hprofile-3.1.1.ebuild 641 SHA256 a9af5d8bc3ed5d6192990b8d63ea8eb81d1f0ed2711a2ec27b948c3740fd78b9 SHA512 03d891f53825668d681375935c01565e624409a842c30e314a0ff49460c31a830900c779320c66198e28059365f302ead682c3c12b152af7cad338826216d609 WHIRLPOOL b903fc9dbf4197ef44c8eee03f157855291500fce596841d145460cea67e5eacd036e00edf1f03a18c92ae62d91415899f4999493b967b5be49b3cf863f58d49
 EBUILD hprofile-3.2.2.ebuild 641 SHA256 1aa8c9da82ed530f2df4c81e380c940e8703257ebbded7630775622de79ea100 SHA512 3061e61f24baee63013b2857b715ad893b4473d4664853db55c4808a1519d86fab3b7f25c7f9824218b30e9d6d66d2990bc685ddfe85ebef4b6a9d63a8aee2f6 WHIRLPOOL 2c92003d80639956248dc8cb4f93440198ae84587f0b70a6fe454b20fd1b3e20a9ff94a67d637134018bcc339ace58229b9750bf2776d5d04b83db0d7fc23745
 MISC ChangeLog 1455 SHA256 9f5939d5d0d2d86f51d45aa1c358a29a4919eb1952bfda9ae15641cf4b93a934 SHA512 154dc277f7556d6ff75dd55f01b37d6f96981d2437195a8017062dfb6951b2664ee3f9759302f95e122f0e9c037892260248a85c83d7ce5dd432c782ba703f5c WHIRLPOOL dd297d6673418dff3b12c0adba7de1d00aa67580c3c04c57289bf668ea8b41224b1b813d6100671542c173142b85511cd2e8754e28e52a466b5a4b55272ba8d9
-MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
+MISC metadata.xml 249 SHA256 a2135bd7aa142f60c37fd2a63b79ae6b5007f77247e95df52fc3433dd170746c SHA512 8cd5e6e422eda1998efc31963e6b327a685a66ce3b888eb5f72b38c6fe2e8b150d7d73ea756b813cceffb6ccb73f61fd995c84a7cdb7d012373ab815da8a2880 WHIRLPOOL 8d25a63990248553e834d25d2248baf6c8221cc2efad443430f78fccfb312647999fa82d6d216563227fa3663ab97cbcab971946960082dbd3d9e226d9ce0786
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJVdCkHAAoJEPiazRVxLXTFHEEP/RN1vFMQ1uozLGfQyG+0GvWk
-+LhcdSmd4OH2lBrz3c7CDvkZ3fJsNGa8MtIOSx12aze5E3hnUdzBAy5BDmxzAyGG
-TVe+rugPdPzHy8+soy/bDGOVe862gQAsqBBBiL4x4L9Xm+WJnuRWPSxlfzR2X8jJ
-Q2ot+axkc5MSKo6/G+ce0Pn7QacXQGQNkB1cv/h3EiPGpGd2XhOfHrUyv4Z45Z4R
-ZSP3P6flgiXRUsBHAgP4Wl/IITt20EOhzelaKF5aIKzXddPZ8lEZQwZcnI7tkQe2
-0Sb9HA/wR+2piGyjon+38rVSUfF0HRccTS6FOse4SHshktBICCUfP+dvYR+rQqHE
-8iEiFOqAy3U64IZY8OcWL5k6TM27FFUEY6rrIWs+CN8J2o8GLLfqv1x6zbudpbB7
-AhHVPo9owy/+Yxz17KG9I8xPagrxStgL7VnMvaTPWBer5Z2fFsJmvHj1ba61Ozd+
-VBnI4hNbGGMYf5yvFBS783Z1oMdUphjC6q9Nsh/yzyhobocG9pKKaXa0xWow+TBv
-EcZkryP398t8ZRtRlHYrahauihJ+Sr2zl/on9RHyrzqBT+1jHxfV3DPVooozUp9X
-PXa800D3y0Ox780/hzwePTiYkKl6wnNp7Kck+nQW2CZIBeTdVXvrBxxpLnlFvAIj
-3r/VslNyPDHNyt92IY9G
-=Ey9K
+iQJ8BAEBCgBmBQJVfyPYXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiAaUP+wRflSzvC1QNjqB4s10z1zyg
+JRl9BinQlGcqPtuJbEl7RK27IFJyGtuGKP6S5Of1kVR1d0egmY8CMLRmnRNDwFR9
+MrA44zF7+s2uba/BCMwkcylomf/QSQDmenib/jvYx8EXHvvp2E3VzoKXY+dnyK5e
+zb8ucqH0R1i2vqFpxPW6Sn3l4yAtgiQaiTFTm6vyHCmjRcZJzFoUBjS7rt9oTTm7
+vpbQpejWqs2Q7bgNiiyuaOMK/o/wbDnPuS03EdcOuFqIm6N0PEvSvR6HiPnxp0ZD
+JkchiuA49FWI4w6U4dM7uB2mHuiTv6X8hlUDp6PUoboxVkGKT4Ttm/ya4RXnRxEg
+xm6uJJwO/og6+qiWc6OETkusbENnEc/MmuP4JUfRz3fS14Z448KHEI9Hg0Lx34Xl
+GuyXAsIi99aaXaYGwT/wjJHiE6Dh04oJwYOJdFp1SIgbtuYpJgG+OW2o02LirlcB
+zRya+X1au1rXKB/snZbfZqbW7LKhqA0fl8bg5o8xlwIXi1srLKipPNUyWEF5n0Ci
+0Roux6V6BuC/2clcUUSOgmHWWxFD5PZE70No6Zl0Mdw7oFo9X3peDczZNjlSYedR
+RcW4Aw5ebSQzQMVaQm5W0gvzfjcgmVwjNsI7Z1FpnkgSlIc0nraa8o2FvT9C+qkA
+bCUezmBnwHDB7/IHKJF2
+=8VrZ
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/hprofile/metadata.xml b/sys-apps/hprofile/metadata.xml
index 96a2d586367d..09d45f09dc2f 100644
--- a/sys-apps/hprofile/metadata.xml
+++ b/sys-apps/hprofile/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>base-system</herd>
+	<herd>base-system</herd>
+	<upstream>
+		<remote-id type="github">tokiclover/hprofile</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/hwids/Manifest b/sys-apps/hwids/Manifest
index 33b2c032b97c..8ccba239c6ac 100644
--- a/sys-apps/hwids/Manifest
+++ b/sys-apps/hwids/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST hwids-20141010.tar.gz 1678967 SHA256 2e8d45ef56a086d2e432c05ae348584325f87353c154d3ede294bad5aeba0f27 SHA512 992314a03a745b5766ccbd86c169c67c03f05ffd36188b0a19e6e7c16be2897da820bca471408a2e3834021fab4a995a5316f45b251bf5cff21003f9ffe2e23f WHIRLPOOL f3af13cf659fc5195d3eb167221d9bf04f1431fd19d071d37f7a8c30a1e020589b4e337174f7c3b6985a4869d60618da88226b47f185679a7ffc42ef270a5820
 DIST hwids-20141110.tar.gz 1684662 SHA256 31145832799ff19bc654b2c227d732567d242f9f790ee14313ccec542d2f582f SHA512 c7fa1e38656ca02c5b316bad83590296dcc199985fc8a5a413b7ac46cef325bbb0a3aea60e2f1f250891b43cf38b0a8d477ef546e7cb13e06562fd1f31b23d4a WHIRLPOOL 2136bd4fb437da9d78b0610a1143e4becddc1949cbdad0b09b62314eb028c42a5af83c3b7b13122ce30bea34e9703be3ca819d315bbe75019bf8d7990501f49c
@@ -17,13 +17,23 @@ EBUILD hwids-20150417.ebuild 1608 SHA256 671ab149c25bd59d1638b8154c925e0628abdef
 EBUILD hwids-20150421.ebuild 1608 SHA256 fead5b67e58038041ba8501ade54e288571099172af02533a077619ad83c587c SHA512 32dcd5fafab9313d69039fc29f1c28d3db47ceddd533a0a41df1dcf605f31c761ad2ddb1f9810f8ae6a20514ddefecd1e37251d63c723666e63cc1a2c82f11c5 WHIRLPOOL 9ec43bc30c9ecfa01618a8e12071b6f7a2edcd55613041c08806886fb470b25781b0a000a5175edbee8a68dc60618a64e1d921585ad078696e373348fdbb58e6
 EBUILD hwids-99999999.ebuild 1608 SHA256 46cc39c3e80c4e6e890f0572060df9479dca5b9bc61d7497aa6a6023869d11fe SHA512 d0196f4ea43274318269bb62b6bb056c0442fe5b00922e83de38944a3e26921e781d8e5cbe71b2085c7c07e292038722175230ae3889b2c7ec99634253785098 WHIRLPOOL 0428e324f25319db208c67aa5128528fb0fe16b6f607114ad7ea0ea3412d00c9767955f1e339e01f95b0997dce0fef26d8c431d037747806fc32eb9f97dbe74d
 MISC ChangeLog 24743 SHA256 874daff243b5f6f453914005aaad61fd9ad3a3f2d5e5a86e387c38f3c289792e SHA512 53e0df85e7d9cc7831f70eb2a22576e9e9ba4bb607d92606ab378c0c7c53049994e35ca85329a14419ee3efdf85d2a3bc935784ae147e2f9abb392ae85a3be61 WHIRLPOOL 71cf39b25ee0292685e541a3d4e3718c54a100675016721276c12ca5214eeda3cc6546a04bbed946e413dabcaf6abdfaff8f152ee6def51d1f1674aa2e6b70a1
-MISC metadata.xml 535 SHA256 4f40d8a522aed15ebd5f28f7f768c38332fa096b1d19a27c88003a042c69797e SHA512 d4c2a3334c6622739bf68dfefe3e3b8408c7c9e2ca32180d82466f507b1ecba460d76d33a5825e4a2de4710c6db0b32d21ace2fda1ad3590225dcb986a7ddf86 WHIRLPOOL f4368ca4eed4e8be9a0f32f7e8c723bd2bbe736a94f7565d27af2e23bffb04cafd1e59f5582d3ca860499c95e62c717de0b0ba44a42b259d82802255747b318f
+MISC metadata.xml 646 SHA256 82fa12b65260f8410315b84baca7a2aabeaf9d63cd33bcb539947eef8aa78386 SHA512 745a9671ce94fa404335e2eaaef3623b8d779fc6a6fdfac18816a3d3efde2fc82d754895eae18f92ddcd803e7bea3f9ea8a1e0ee3dc8ac762337d565f5a7e76b WHIRLPOOL 7628eca281c861bf95d9cbbda6413041d4af6270372d6b2aaf48492436087cb2b4efc8eedec62cda5875dcc80e2e50897cd75dc3c66372f183c3bd15f39e5c59
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iJwEAQEIAAYFAlVltCUACgkQG9wOWsQutdZ1kgQAnYaWSskqZBynMQsvBv4o3QdT
-cnHIeux6Cysvv6uEsn1SVTzK6HMLIYmOmM7pOcAkPZwHygeoxd8CLP4uA6By5A3l
-ZF713J28YzYApNa+UcaPXa/CPW49SDr5juygltL1VwK0o1KK+zUNsmy6XYwhRPAy
-Wbl7wYH9CEkNC2O8hig=
-=egBD
+iQJ8BAEBCgBmBQJVfyPvXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiJtYQAKH81/y/HmK/YPnVzPRGepjh
+t7J0ovP2Y7BY42SMw2DoDF+L7KPMDPkPFVm4+G40DWnwbsd94VJUQqAW7kprtocA
++iWPoYCsew7hTm2MXzUA1SZj6rChEtPzmdVsxpegUrPRB74jHndnwnio425WWc6t
+dN14mnK31NuKLh00NcdzMcytEnvGnjppC8IhIbUcT6Q0zcYTkR+rs1Sp5rsZpPd3
+ZeqDVCcsHkbZlbiFnB38mVZyR/CchL1TMxTIqfgcqKShOCkYNrlW936kCMEIkTrX
+4n2tWioDTzwMo+Os8Z+IiKuNfxU6DNneK851b0ULIRRy2p1/uTi5+J06RwmxWrEL
+einMmtrqOsHU745PuhnTy3wSngpLi77TCjF+17uWHYs1U+bcGdO0zZl2UE2fv0gj
+d6AqpUOF/gcIaQNeT7G8fEbsvO0KsqFgsd45TYMqmrwtWg6CemcFumYFrU1gvuN7
++Y8WM2P+HS4M/bNYonUU2WoKDCuSgoWo9EL195V4KDKDQt3kwjfoeDOLcpuNa+g7
+RsGpN1Kc2cq7uKaz1vrydnCp19mpyYZspKg2koxMesdi3tjt6YNnZCXKDpxr7vlG
++bAvtqS2cPxWBsVXhIpb6ZF9NsBEBfGuCOq6ZkQQ6qDP0Mvp5Nfm9zq0f737FKie
+QSbUgGvXkbpdNF8gWDH7
+=Xvj4
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/hwids/metadata.xml b/sys-apps/hwids/metadata.xml
index a5b844194621..ce1c44f456c9 100644
--- a/sys-apps/hwids/metadata.xml
+++ b/sys-apps/hwids/metadata.xml
@@ -1,17 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
-<maintainer>
-  <email>flameeyes@gentoo.org</email>
-</maintainer>
-<maintainer>
-  <email>gregkh@gentoo.org</email>
-</maintainer>
-<use>
- <flag name='net'>Install the oui.txt and iab.txt databases</flag>
- <flag name='pci'>Install the pci.ids database</flag>
- <flag name='usb'>Install the usb.ids database</flag>
- <flag name='udev'>Install hwdb.d rules for udev</flag>
-</use>
+  <herd>base-system</herd>
+  <maintainer>
+    <email>flameeyes@gentoo.org</email>
+  </maintainer>
+  <maintainer>
+    <email>gregkh@gentoo.org</email>
+  </maintainer>
+  <use>
+    <flag name="net">Install the oui.txt and iab.txt databases</flag>
+    <flag name="pci">Install the pci.ids database</flag>
+    <flag name="usb">Install the usb.ids database</flag>
+    <flag name="udev">Install hwdb.d rules for udev</flag>
+  </use>
+  <upstream>
+    <remote-id type="github">gentoo/hwids</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sys-apps/ibm-powerpc-utils/Manifest b/sys-apps/ibm-powerpc-utils/Manifest
index 12f5135e3ad9..6eccce416256 100644
--- a/sys-apps/ibm-powerpc-utils/Manifest
+++ b/sys-apps/ibm-powerpc-utils/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX ibm-powerpc-utils-1.1.0-remove-doc.patch 533 SHA256 472eff910abc05beb40bb91a3e3ef26a96746cb79ab6855ccad192cca732e6a8 SHA512 01a9cccb83b2de57e709e449315ab6f648103906d0bfbcc4788f23cff8e8c5314d0ffa803e4f6dd60dfc6d636b38b4f3aedbaeb4cf44f9b5e486eeb74f3257fb WHIRLPOOL 6d03179a1b8bed8205c3d2f25cf5faa5ea9ae83d8368b186ffd6233c4c2ee1f5e717ac0bac2899f4afc82ff564030b9c3da635998d8af3030ecb170e12dcd50f
 DIST powerpc-utils-1.1.0.tar.gz 49368 SHA256 163886d3d1b59e92323b95461df83712f4cea5f605dda1fffdf1912567f3c94d
@@ -13,11 +13,23 @@ EBUILD ibm-powerpc-utils-1.2.16.ebuild 747 SHA256 a0c5ccf1ab74944f3e13b7951ae376
 EBUILD ibm-powerpc-utils-1.2.2.ebuild 811 SHA256 59941e9e9460df17299462a0e5464c5a9a853bad31513c2a99a2d1533cbc479e SHA512 088d772df0515929140bdd2b38a3d6a7b840d0afffd3ac86f9efc8a7176bf111c4956c39f0ccf2d8a4488f372b67343f74b008ae2599441decf5c17c067f6a90 WHIRLPOOL c70182e8659273ab062f6f1320edf1db481b3b673457cabbc97acd3e2d78ccd0a77c89d674b43ef4719cb678e9d5ac842c5774b4f2bedb66895a2c9d48807f97
 EBUILD ibm-powerpc-utils-1.2.25.ebuild 713 SHA256 c1f465d5ed394a2b814201eafaa4435a9dc8f95aed360ea7b84281eb9948c170 SHA512 ee79db0f810285d6efc0c8cd12fa56791fbab7850a2c4b284169524f1628f18eac61ce90b47dd5491e13c631627ed97b0331ad67df2b2a0c8e658bdc79ad266d WHIRLPOOL 81143b512de7a7ba78cf7262594500ae20db2d31ee611ac60baa0c5b98732235deedf0ac197aff5a68c7b99404b16e1456b1e00cce7bea8ffba3d910c23337a2
 MISC ChangeLog 4329 SHA256 f85aab1ac3643dd12ba9f437d5788e5b4fbc1a4ddb016e2acc484e1312456a5c SHA512 f6145ee33d7d0209c1d36313873bc607195f96f203c3dd86272d770f2cdbed9613403289a8209cf0feac599420c4a12ce875a4fa9f905fcb38b3c3fe29172d5c WHIRLPOOL 506abe6ef9dafd0c1fb82f750149be2ef8826bafba16b2e2a8e64fec5bda7a5898e73e6b06f86833783d6154569569dbfbe840f3d0531275186698aa94fdbb60
-MISC metadata.xml 253 SHA256 353ac2b6cfad9a30d1de223b16834da88384c0027f20dbe43fccf8db51a3ad80 SHA512 8691a7a41e9c280fae6e28f1369321f34b8444269b6ab481be3e2a971fd7fa0446909689c7f8f93e783450537ede5495f22f41b8832da072c11897cac85b2748 WHIRLPOOL 52f4a6dc83ff6db35dde3353d7642284e48f6b2fb9f694524adcb81660de6556bc31b462c22e8027127dd3d4f69080ef6081ccb2eebe8313169418ca2af9afb3
+MISC metadata.xml 341 SHA256 5421636b467b7903bb599761ab69e563d1a561a8b9f334fd82f5f2a6062a9629 SHA512 46cf2ad24e7df6aea7e9872bc03815d8d83a97b181e6d4af068bd439e63dce48958729c686676656d403ee8d12e95b08d767bbc7f6b74d5e3e70706e64465486 WHIRLPOOL 2743af40440ee2a5c0321068fda09ceb619998f73afc50cb00f34084a6b8e8848402d5da5c2ce107dbaeb2cc6d2367f9344a9577e894bdf489d7a8c722f614b9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlVv3bkACgkQVWmRsqeSphOaQACfRTpvXHNfFjpCW9ZgFna3siCx
-9scAn30/YV9ASXpCZ8KNM8txFc9vpnK1
-=wqsz
+iQJ8BAEBCgBmBQJVfyP5XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiJXYP/j6US1dEpWsxOwOxEj+v6gDM
+YQ674CIRxpkNaoFIzXEgaVMCJXfbSx6KAaUg7o4Har/LrQHeX7DrtrOYReU3lgRK
+ifIrIdOm8s6Hkof7EuR7was3raZTcj13KVCvt8T92SGw90dGFQxzqBRRnDhiwfrl
+n/CccqV9HVnSNCL8xOugeH5bj5ufKBiuPWCT5MU0imrqYDb/3+7CdbtvaA+eZ2/a
+PDmLJy/GFt2O3GDq7wkN4Dia/qiCq5yxTHiDwd2UwQetrauGP4e1BEvgHSIGmkXS
+xFaHMiVS6myJdiMGj5FKGIpyn6FgMuMrtKs11yJ55BZeV9xYM9otx0A+mIiwCTL3
+D5hPKb+r52cowyj1g6X4iFsCkBRUCS5r9i+ZhHX1CwtIokV77Ic615bEqtaw+8+M
+ofsPTp3cDMKdOptmhXElMOxwXUxkXL5PUQcLU2SthzI3FmGW0QXoei5AQXMITa5M
+F3e4ckxJxF+uFd4aA51Yr8KamV/+04LedYSKDgpU/4R0IAlL/5v6cvdL7uPJKpJJ
+eGAlukZiObVjcUb467EnjAlvAzMsqln+zRkeBVDoGZO2NL+w9feUx6v9sNsMhccG
+dh+X3hXx1PZLdc2LXvPTpLtUpODC0RjW5cnEF/WWHXIPCJ+3Fmtx468lnES0FAns
+aBymthmjdcqZ+KLVaz5y
+=iNex
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/ibm-powerpc-utils/metadata.xml b/sys-apps/ibm-powerpc-utils/metadata.xml
index 8be08fabb878..6035c92dff18 100644
--- a/sys-apps/ibm-powerpc-utils/metadata.xml
+++ b/sys-apps/ibm-powerpc-utils/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>ppc64</herd>
-<use>
-<flag name='rtas'>Add support for the Run Time Abstraction Services (RTAS)</flag>
-</use>
+	<herd>ppc64</herd>
+	<use>
+		<flag name="rtas">Add support for the Run Time Abstraction Services (RTAS)</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">powerpc-utils</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/idle3-tools/Manifest b/sys-apps/idle3-tools/Manifest
index 6cdaac6c02e6..2013ca62c7ba 100644
--- a/sys-apps/idle3-tools/Manifest
+++ b/sys-apps/idle3-tools/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST idle3-tools-0.9.1.tgz 21201 SHA256 9778060c7873ad2c9c40db3a7049d8ca22535427b982ff12f5bd519f703f2a02 SHA512 512991fad786684bd127f7ad3af94dcea4e28cd88d52221007436172725b8d2c0c2edd578c4c95bbcd425339ed664b9d81adbabbc2bb8a4a3ea71500e21db01e WHIRLPOOL 7261ff14b374dc23d0e829ed90199b1dffee8fb76a9f547810de7af66c70d1c01ae9266fecf2bfbcc6dc66e37c5726e52fe83a20ec99bac85d2af3f870c8323f
 EBUILD idle3-tools-0.9.1.ebuild 622 SHA256 feb15fd0e87f93a24e50b98c5275ed3aec06763a8fc34ab5da2a6909ddfe5d98 SHA512 83fed30abeb52d1700386b224e8cdec08566497c473fe59b04a0e221eb62d040a926b348a7b232e69eb81d950af5e1f1108656ee4d7b4564048e0b8dc86116c4 WHIRLPOOL e8475aa08d17eace751151f7c2f5ca2680963009a4db22f4760b1d849a995b22eee4353b7e746303378d1fc03dda0627cd2ef40c51dfc8da0c5f46b02d4bc7ed
 MISC ChangeLog 444 SHA256 12a0e69a578b7cedc55e7e8beb1a9538b01e0539ddb36d43ee321f351c8085a9 SHA512 77bea46adb6ee94f35143927d280cd302ff6ccd5024f95e75305917b0b95efdd24427442314583687b0053896c22ac6edcda9864a7289b646a0e9392ad50f5eb WHIRLPOOL d8fc1c37ba8d9ea798227e22976287a7f8949b8dde03adb4ce45d90f7713b66998c088099e82d9a8f4e10804d517eb8b391709f1d2d08a393231d94a86ec0742
-MISC metadata.xml 666 SHA256 c27265087eca064392c3b4939ce36f69dcd37d8ba987db29c792d68684f70d7c SHA512 77926582ecdff2c6722104a3b30deb342dee151ce2e42a1eb477ab5151516273fc697c579fbeccf2e21352a4e72bdfc8e158991788ecc24c8b81118f46c0995e WHIRLPOOL adf40a02690daf0889baceafa56253b275cf93fc03d168e866f0457bcf55f7807b594e68600967f6ce87a2270f7d1dbf93d8424bfebbcf15959c4c8e678097cb
+MISC metadata.xml 747 SHA256 125bf0315fc6aa3560ccbf71e398352d74038d13284002e9d9daac823451ff20 SHA512 bdce9b56b506130bd7ca9400593170239e50d40d4e58b135651ead172abd600b5af534d8063c796c776540f8287349af97a087d4c5831782ce3b879eae743392 WHIRLPOOL 71a6266e76e85de4252a4e16c766c6af80e5e360cb6baba70067fd3c9f9a2be451d34b34a1e4f230cbb96a7b1dbd12e872c9856e7d3220408ac9c7b081462140
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlHrpNMACgkQCaWpQKGI+9RsrwCcD6gm+BInZkHA5y2ZwblhHhyV
-9nUAn1o1eTu29cxe2rjvlmqeNsy46nAm
-=zjDm
+iQJ8BAEBCgBmBQJVfyQEXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi57AP/jEyXHZrdIGnzI1J156qG5Av
+PBRYV7/0fRSy2JwCUZvyxbpcfkD3OXBZiC8HjqP09MY8ZjvmorE2VwAJ28b8HTSL
+H89P+BxDcdYeLqFxVDxJzXVH4Ue/TxYvZrYA63sS9bjdo/X2z71wW+8zXX+2xvfI
+6QvCq4wn3d6PLMxB/jOny67ViOq/lGODoo8RdmGbYOCsWF4io0Kj1UrRSUoUxPwM
+6BFp37xfHRlufSuniIsCgThxRVCuyX8eIgCgb0qUZTw0fQNFBhSHvzjYglDnugAC
+qBnkgadcJ8B6jz5mUCsHZgfMydgLp5e4MkIr4y4SIa8i34a787nEs0l1UkkLexaL
+856D6/Xww1zTv0jQvxTMWX/tz3QHrdv7mwW+g0T2NvERSbS0DK9pIeoQQmWruRgw
+GAp52OhjAZX3hXEyTcRGvZWL6jWioj+WsvtwMjCekNQlXCOY6/RPgWNgJShIDGNZ
+ICC3hIavj5+D24D2d0RW6kP40uK7KzyhKx9zSdRDWQqpWAmGgITjhRoJZ7R0oRoF
+byLiDzeYBfLT32OWu7xGKdAhck0utoXhSZm9v92f+AGWR9lbfgz4Ah1y7N1dYwW3
+JZ1b+mUK0jfIjwIlZmPeduyj7/NsfZaQ44lpmV9zKrT3Z2I5BUIrk5Z6eHCCUNDi
+5eNOMpKEbXi4s/WgdQI/
+=vHPT
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/idle3-tools/metadata.xml b/sys-apps/idle3-tools/metadata.xml
index ac58cbf971a6..01061b45f70e 100644
--- a/sys-apps/idle3-tools/metadata.xml
+++ b/sys-apps/idle3-tools/metadata.xml
@@ -11,4 +11,7 @@
 		without the need to reboot in a DOS environement. A power off/on cycle of the
 		drive will still be mandatory for new settings to be taken into account.
 	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">idle3-tools</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/ipmitool/Manifest b/sys-apps/ipmitool/Manifest
index f856a14a2fc7..936613acc5ea 100644
--- a/sys-apps/ipmitool/Manifest
+++ b/sys-apps/ipmitool/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX ipmitool-1.8.9-ipmievd.confd 646 SHA256 3a56f0fa94f358f5fb9ee782a2f2a4755dbf5b19706553a673232d49c751fe04 SHA512 4cace868f1776a96736b7460c84f525d63d6f53531f1f3e62f0337741dc36fb5b2ee9706fdae6a7b853e98d3894376949797ddc254248bd42dc79d85742c1744 WHIRLPOOL 2ad7eb0ef06ed25f6b3466ce48710148d0918921f6701c7d12fd675e73cb2ecf3828503c286490143b5848b032452216ea70319cb58ddcf747de44c7f51980db
 AUX ipmitool-1.8.9-ipmievd.initd 711 SHA256 b6c53306685e892386e74b839d302fc0df6a89a44ff1e05b399aeaf817676ca1 SHA512 1c9caea2c4ba2b846e08caca4b2c81bc159ddbc10699579b0c33c9c69894f7ae71eee0a86a6e45ef089f7593e16dc4c668df189c9840880cd65203b54ee2fde4 WHIRLPOOL 045e4f225bd4832a3e4d7dd8000ed9909d01771fd0a834352fa4395cf2b212b47c11b8147447fc2cd9c57e0e4b17b7c3fae31ca32a48ae97d8ee909ac5efb048
@@ -13,21 +13,23 @@ EBUILD ipmitool-1.8.11.ebuild 1965 SHA256 a9d0dd4c86303b552e34fd92ad1d141b331d7c
 EBUILD ipmitool-1.8.14-r1.ebuild 2535 SHA256 52d020a3f562684e07da97e66693f9a5dd56bbd83016a8e01754207e82ca43d6 SHA512 13fdf427e994e2602c4c8c7cc7799551f0fb6a9f0b4b1f3cc69ba6ccabc6b517b8407735e9c01954db09cf7d1f552a10c2295b868196b7f0190f8c1c6bf3c4a7 WHIRLPOOL 95acd90ffb73e1aa5e162db5e09a39dec9ac867192fbce044adb4eef1558756cc0daea689d7eb914de6ddc6d0c894c0a0e5f1c6ca8e6df163cb2fcd64e13e970
 EBUILD ipmitool-1.8.14.ebuild 2496 SHA256 673044951bfa4e88c74de683cda678a816154e68a2c504ed701c2e4cc32ead2f SHA512 5c76ecc0ce4c4616791c4a9aee9d2d536c8356df1a621971683154ffd66001c72b1d2bb30e45c74737f4d39905e45b949063cafdb7f95788aea87eda38c4d3e2 WHIRLPOOL e8d7c28adb83435f79baedd39a7a61a8c84e55e75fb9058851a85d568a9a69687f32d0744f0c547039cd32b6151b064c05ab0c5a4b581355db92b5d15ab0bfaf
 MISC ChangeLog 4127 SHA256 ff98696076e2a77e469b28c26d7b1bc509b1909f6deace6e3ae22c8eb52a2efe SHA512 51fdc25525f29f83f6bc41ed52001f4d2ee73463c022221b01bc06340b433e26dd722182754fe05f778c9ce71cdba5b0bad846cc864be4b17447d368f1286c9b WHIRLPOOL fe617118cba45c20ca4d7a2b8b6aa7d811e89a418afd5c40ae994b081fec62156781a96692fff0a55577f9ebe43ce096d769193218c9fdcbbda127917a74fb4a
-MISC metadata.xml 335 SHA256 34250abb769578342a887f98cc9d5b19dfd03024f57ba4444fcec03da5633ef4 SHA512 6d5194979b657e11dc4576409cba8394f3836180a628c4553d6ad9cc781caffd12158ed0bff2207d081ad2adc9c3ca1b30b374ad84dda2e593bf9263ef9bb4f3 WHIRLPOOL d5e41dd33f0523604c73d0a1bbea7c3739ceb8c1f9419fb13a2571e9759706d9b41438bdc45132b990d338771d7f77d2a59abd07335c105927ee33c0f585188e
+MISC metadata.xml 417 SHA256 13556ca565423a075d5bbf6eeabfc0b06de49238057ff0b99afdaa520707dd0f SHA512 059a2ce0c04cccf0c2c0049e61523a92965a215203b3f14c847c584c97fdde5e261777da3f54d89681dd530740498ceaea442e29cdda34edba205fcb8ff0dff1 WHIRLPOOL 7eb634cc5dc3a582b8f88b908c062920bce69433c1e1f1662fbfcc5512b18fe4591bc4f01e85166b7e56ae47c8b36c7b072123a59524b5c738f77d611e5d21f5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJVeaRPAAoJELp701BxlEWfnYEP/Akth9P/+gaWWmqyoblzY0Hq
-5luevKyI37mLmW0SG2f2NESzwdhX8ZNor7rMQpZROci0xzsl5Fle+T7zdhvU6+6q
-9ADYBdUSYJD9Wdk04iaVm1vQK52C8S4UbPKyK/ftuwaCUikZzsYfXvVPpWcdxPum
-CbGgi8yQRdkTakQ5WeDuQu9xUER/s1uuvBQznNfPeLGLcHtxXqiI+3+FAI2wWXov
-qUc3Aia89ygavF0r2QL9q+d5LHkjvRd7GxuOaRpIgqWJQ5G3BIWGRG1BLC1Xkn6e
-j80ZwG0YrjDDuY8Ul1h2IkCOmAeU6SK5Vnt7tY6L7tr+UcsQcWW46KH2siikJwf/
-7BzTXfcXINcHPoZ9Zw9ROXoKTXz7h67SuIVa3XLz1OHgQrmheeyRLA4KZlQWM59D
-e7iFvpsJRUU7Im1/oY4DEGct7t97in/nSRMZJRvJbyhDGdeQI18WvQXPR3gVXHVU
-BmsyOzl+AVF5WLCgtVAW9Ufpg/6aKBEZNqE1O00dyWUq4Bf38fHDGD5yetMCqi55
-7KhIWrxmAik1cSojrTSsxWbyC0abzWyRRDhG9R/j/n5nD/S3PvmKTmj+UngBkWf2
-sKR/7OL521ceMwafTrCxPX+ORP8apiNw4cxwKmN68cwaXwQEC+GKJOBs3fbORTPn
-AGWu1l9bsiOq/JEIO3lu
-=P+5n
+iQJ8BAEBCgBmBQJVfyQVXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi20QP+gJlCESTRCCwoZ3nh0demOiD
+3BBJY5yHYN7bQ7h0wA5ejkEc1Mb+BTsEvcfYOvaK1T5i5xHZFqyYGN9vkRy5X7XG
+yuecbTpcCcoohqsvQ42t1MYRwsevCchpqlTXmNV3N6QMiYjNv8V3fYkEmUUcHzMT
+/20DFPULCgCtuSkC39GYPf2IfOn6ASgi2iPw/agGjpH8L4Cseyv+DFcDJzzdydky
+AM9tJniS36cQispi/LPckhlS8jH9fJItvirmM9y1yc1oyht0qQxSQlkIw4z0iXCg
+OahvUjx1YHGoRqXSzRw+jtQWIaJgqdJqAzLbBctzDK+OU0eO8HvZVvkQppO+CJ3e
+Dy5I2xhr5X7lgGAKCYX6eDabCfqu00CeKvYg+XQAx9+P0R81Oxg6hWyGNNLJFp+X
+QdJPbFrp5fGomQBBs/hTv3yrDg7NYB0TbbEOswPoSodz4EaLzP2dUNO4gCccWuAu
+iIxCJ7pgXpZpfuBgKhhi2f5Ib13mzMbaebqF5AgkSvPSUx1I1caWWq7qEhIqgBcW
+NjEa0jP8V1vnAWjyW/IpxHx12KLMpj92rKY9h9/iqi4Yu886dpTR6u33xb16ZxAM
+1/g+pFX9wU+S4AgYERAv4EpY6TxB3kHn5D+MfFSToyPh7xmgEhUYIBhrHeWyCmqt
+hK4jB9YEAHexdwMd/eds
+=GsA2
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/ipmitool/metadata.xml b/sys-apps/ipmitool/metadata.xml
index a5b3fe9fd804..bb960d0cb8dc 100644
--- a/sys-apps/ipmitool/metadata.xml
+++ b/sys-apps/ipmitool/metadata.xml
@@ -3,7 +3,10 @@
 <pkgmetadata>
   <herd>sysadmin</herd>
   <use>
-    <flag name='openipmi'>Use the system OpenIPMI implementation.</flag>
+    <flag name="openipmi">Use the system OpenIPMI implementation.</flag>
     <!-- <flag name='freeipmi'>Use the system FreeIPMI implementation.</flag> -->
   </use>
+  <upstream>
+    <remote-id type="sourceforge">ipmitool</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sys-apps/ipmiutil/Manifest b/sys-apps/ipmiutil/Manifest
index d02080e57d80..3cfe03137a0e 100644
--- a/sys-apps/ipmiutil/Manifest
+++ b/sys-apps/ipmiutil/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX ipmiutil-2.9.3-flags.patch 683 SHA256 448e5ebb170cf2a79e30c279c9db8ff2034dfc3f6b13d1081c607966bdeb3477 SHA512 c17b2c32f970b830ff03967f8b4de857e75a4fe311551214480b8bac2d52adaf026c7f5b46ef7fd533b909ca603dd3a67567b951464d8b36646400cfa4689328 WHIRLPOOL c0544c0925ae6da28418d971be4e338bf5288ca94744236277b69be5cb5dd97a7a1e5e4c126031666cd094b35808b2cc645b2320bb44c8fb6103c3aeceb9f83e
 AUX ipmiutil-2.9.3-tmpdir.patch 284 SHA256 04b1e903590ccd5ad8f49e1bcd581625bd9ab65141fbeb559f6fb25c4f2a197a SHA512 cf8024955ec83addbd2cb8ecab8a4fb16d9c2dc8ae73f51e380b372ed7ab8ede656ff0d450b5f2ea083582de86f9dc135baa9d32fbf5c75949bf0a5cc5108bcb WHIRLPOOL 477cf1b4a9a414a9c22721d9c1a84a029aecc5fefe6c859fb46fcac270c1ef8cd1fe6c12e306bae9907bad89739505c67564496a928fe6881d2629e1587383b9
@@ -12,11 +12,23 @@ EBUILD ipmiutil-2.8.2.ebuild 834 SHA256 41eac29becc393a25394f83ed4057d9722da49bd
 EBUILD ipmiutil-2.8.5.ebuild 848 SHA256 7e63c9f038ed547309ec13182970ae61276a5b7bbb3c56e1ba75448fbb4e07f6 SHA512 278304c017c57bedded4c5c263e96c77d85b8c65792faba2875d923cbd395d7293fe38ff09a01dcd9060c77c4776f8f3ac838c7ac2bd51808e97a633c87d952e WHIRLPOOL b527ce1da42760c928fb9b9cce62168951d5290af682633d9ddc2bbfc532d7910c85eee5391dc109635a4585b3303f90d3d82c6c0af624f09c12df514d79be06
 EBUILD ipmiutil-2.9.3.ebuild 1010 SHA256 67ca4b0b69f7c0ace6fe21235c01271cc91be3db4ba888df331f14c797878c54 SHA512 611db4c153fc1bfae1abc8e84e17359a6c7a3ffb1b43dc06b96d2e73a6d70669e39f06a33c246974a3800df6d4aab2cd5ce3c44668f9a9f04f7e21833d64ab9f WHIRLPOOL 3a61f2001a2b191a029d6c127e31b7aa0075815ca1a77cca7a5bcf623d0e864303bd755f3001376d388ebb08b6924c60a984105999fc827d5a1ed4b7a4414543
 MISC ChangeLog 4083 SHA256 93ad6cd7f11edea8d16272793a4596e4a7870abb84aaf85fd05598ba8bccb921 SHA512 e74b32ed308730b63edb5d4e2f57d345885ee216d5a7bb58e7c194d32e9c7de0e218f40c9a8429a1b35771a09a970bdcac380bda3113807b47eabfa21b2652f4 WHIRLPOOL 8a3ea5d9438db71fbfa7673ee141621bbe0b3f5b428c8608eda41cd3863a4f43de33b45a1f6ef2e2c86e510d92a72f19aa1cebbf4b83b9a94fb9a666c4d71aba
-MISC metadata.xml 161 SHA256 4447fa40fb360e4e153d4fc115728bf9db74e1aa3536c77de0594dc487ca5cea SHA512 c7c91da0f38f7e79683125c94864ea858a87d388c0f10bdf5d5c1c6e344373a7083a9572ed99820dd474c8fb252e874b28039ecd25750cccc91e340d09a241cf WHIRLPOOL 1f3ce9d73a10eec3fa881001d05128ed348e6ae23cf31806cbc1cb0cab590cd924b5a2fe8e1ba64867bf3335970998e6d314dcdb510524e5979c0d25f5113eef
+MISC metadata.xml 240 SHA256 5c6b54b8d95867e2dec902b5b8c49f64c3395aaee7d665308a9391e5ea2010f3 SHA512 0f2b95867d42246d022245a2ffc4229697f8a0dade0fa5093a1369a6f1f6f7a0bd2d6244accc55dfb76af23204c1c2a027d9293a1c730868f25b8d65c4743462 WHIRLPOOL 0bb998b5ffc501e5a50d0e1f2c3eb9b7b0e9ef5de5eac8bee34d4125446323f374418a1b44e73d1967a1fb7708001299960d865bed978a49339829832b3c0fbc
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlOvAmgACgkQVWmRsqeSphOoyACdHXp+4CixUwzDsmJ1Z25phvZY
-hUAAnAwC9KhV4l6ThziFmMGeynwOtX5P
-=EXVK
+iQJ8BAEBCgBmBQJVfyQfXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmij8EQAIZ5uSMTNxua6Rq9LV7zGZez
+y+ZR2uhFjF8lFpeDsfY8wCJ4W4yXQP4JjGkqdJ6l0JcIwSNXIwr9oIPrV2BaZESh
+YmP7MsjdQUT1TiwEQF3zZrOBoBYzMe2SXJF91WMYX/DCdi04gd3tUEi0VFcEo3hp
+9qnCmpSuo2XfjnPFA1IfgIcxuEOTBeKlG0SDOT6ch81x8BFOTvldHvcwj0bIYGkw
+7/L3j6ncOG0yx96CgUTa4TUWqp32DoE3oVU8P98HfAuLE9gJJtJI4GE+0bdf97Mc
+T4vRyO7Rv5EX26jCrHp7vzlAel1/kLeApZ+6sa0Od3X0Pq9v3ENoKKa7yQat7jhx
+wiFHN8e4e0/dgvBLMAJlXqqdK2DUpufbqNILDoZ4OZMWFZ0aqZOwNpM2YhPJLmCz
+4UZpLzu2pWhWTKrWP0+0FK1OeuQnNLp3i5GFhyWGKbsKtMHAIXJNOpVPk8wOGRx4
+mgYAHweLvHV3lA8lAKzNrSA1xfEEitdAXPv4yY36X6DcLDDHrB5wZM5iimEtXKgn
+PryjOO8VkTTAq02TXvi6dd1gmsQ3b88xo3i4YPoVcThTaGCprWTfPTjXHC1dcyiT
+V3i8GmLE8tUs7kk9+L0MIGCPWatSx4a0YCQWn4mRNEQaKDJ1xqs0m0UOCS8iEZuQ
+ZAvBDnNMa17apFw/jg4N
+=jb9y
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/ipmiutil/metadata.xml b/sys-apps/ipmiutil/metadata.xml
index 068c4a987bc2..80daff455531 100644
--- a/sys-apps/ipmiutil/metadata.xml
+++ b/sys-apps/ipmiutil/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>sysadmin</herd>
+	<herd>sysadmin</herd>
+	<upstream>
+		<remote-id type="sourceforge">ipmiutil</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/irqbalance/Manifest b/sys-apps/irqbalance/Manifest
index 0d8fcf010961..e798f00b05e6 100644
--- a/sys-apps/irqbalance/Manifest
+++ b/sys-apps/irqbalance/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX irqbalance-0.56-build.patch 555 SHA256 4c3c4fa8139e09c5493a472f18dffc7a078ec53495bf9490f9b854cfa59c9dd3 SHA512 c731b0e284a192d300eb3b76bdc8e9758ca8c201a2cb026a2a11591aa86bb5f92cf0350fdab455fa985b0d3b594597887db7801c9ed5d84d3be8289c800e19d0 WHIRLPOOL 7539a5e5ddca4cab3d67af89ca1d2b2560f58f7befae7e88fb8325d17b192cbedc63bc355b22daad55e4fb1fa3fca8934603f04f0966ba05f904f5266d49b01b
 AUX irqbalance.1 1224 SHA256 042d1c4a865c02523d431658244afeb8f66f029b0e5a7f26ada944540a26cb02 SHA512 5df1d07d54175b503de401ba4efc2ad102e91ae01757602975ce80cfe915bb4b5f492019256dae9619f912e41d7ef991783c67dd52fdeb9101c2dc62de666ca9 WHIRLPOOL c5d3625f25fa3294ba595a01f55598c58c5d9ffe2211c6bc459820f8091bc89cfc991fe34fb8b9f5a77bc70bbd3a6329414345206def56b5cd8db539b1b7a02b
@@ -23,11 +23,23 @@ EBUILD irqbalance-1.0.7-r1.ebuild 1202 SHA256 240f4826d033d625ee69b03de3a874398a
 EBUILD irqbalance-1.0.7.ebuild 1122 SHA256 6d3b4dd44703d18e44115ad7676d249edd59a466380e04535abd0bac0c50a9a1 SHA512 ccffec0d6265c57731bad8d9c5969eb08528fb09c548be266cb20d02043fbcb5a7a879756446635c7614843124506d70ff040e9cfc4eb0da62ced04d46102576 WHIRLPOOL 66ca1be24ed898e898c57e229e8e379fe5db65bd504c8fe872cb6e1cb512d714dc6185d10121ba7020dfce646232254735f1594e5fd56c3049d6986dcbac4e98
 EBUILD irqbalance-1.0.9.ebuild 1202 SHA256 1c9acba143d05cca50e25b6ceabd37cfefba036988dfe3cc4ed1df890af91022 SHA512 cdb4b98af1e7c26a532df1abd313b6ca321f4ae1841cbc9043e70fdda922048147c2a8770373084d9e1258806605ca17099c5ba609864c4afb90d0c97ffec908 WHIRLPOOL d0688714edf79e20d08eedbf567a4f2c5ae9812756939d1c0dcce837c56ea7d339a219cd6d5f3340fab6c3a0308cfee9efc05b305600ab4c32536d257a470189
 MISC ChangeLog 9065 SHA256 ceeb2159e1389a447b9cb2d2b8dde276a4fa0858a91242daeb96767bb21e0cf8 SHA512 87514833057939bf7bd4b95c2017b329d27620da520747c8ed5186ed35ee575e25ed85c9f0be07cbf43422999afe07f34e16a7c6ddc8c26e6d87ec0d891283cc WHIRLPOOL c40ae26a8ca02e7fe1f4654249a7d4f546d3af5023c3abdbcdcce66b0ceaedd7b4a55ce540e78a037341b5d40e86f573794106497a0e98a1032a5e322a9d05c0
-MISC metadata.xml 337 SHA256 4181c9a3aba8267bf61b179c0587546b936eba30b01b14cc6b114a13aa87e3cf SHA512 93b57df99f9e422733a0c8fe3bd08831017e30a38985838dc939eb267283634467523ab596eed283fe940481c67e6265523d419447aea0619a4d2985b328cf52 WHIRLPOOL 8261d98ea1dacd190e5229a3a90626cc13f98402d64b4f59b1b97a3b52c5242e90ce5d958c0c204da60013c08e1740c088129564f6ddf4409ed34d6dd76e6790
+MISC metadata.xml 400 SHA256 492e8d2ec98f196918bce36c42f6f25038cb12e5fec2a1c7b200819eda0ba858 SHA512 225f8e300b731eda98d5fd6303653286a6ccffc3e5305e78dd1b93e1f25a8452d49784c7091ed88ea1c37c2c142901882511d5d4b80a241bd01152cd1b6ad7b2 WHIRLPOOL 645bea66b74b9578ea6ed68f04e0995805a97307ce6e41c0381e7bc204172b480f1ba8ddfce2a0d82bd461da840135d499e076143c898cff0ef7a31e79bc8383
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlVbMKIACgkQp5vW4rUFj5pVAwCeLvEFbLbRLCt7ERllHx4Ld7n4
-agQAn2CYcF5zkbYWRK5v6VPXc8EP64w+
-=t01c
+iQJ8BAEBCgBmBQJVfyQsXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiHmAP/idscLpHFsMvE2Q8PwE1MhJi
+iX1Gce1WmAtK28L1Qc8IUVITlwUnV6RADwEaXJqjfqsMlKkbHYoXeRpaK1iY65Ky
+IRL7UdLs1HbmIh8fZ1iplyt+COTs1vQl/YTkDuq5n54WXV1Rxg7/9q9p+r5Jc6En
+zlfCK0Qs+hf5odd8jSjIcWx4E1enVpSkA8bT+/jM1qQJO5kEUsICqU02sn4P+ond
+vN6pFbBr4zYmbAFjM6a0Ca1H4eCNNwm07F4PzE9CXfSgvagnP8bfTm8EAIvXdr+0
+xTnmeIyuSF/smNpYGcWfpXXPIhB1v3hZbkTabSv5I3B0n3q0PBTW9twTf8nIx2rf
+Q+wzqhXuRyxgGZBYtc7eznU6jDhHA1v6ZoA9aZ6ZNMmT8rxuvWGUoDqamwo44NaA
+Mr7I3ApyfYOYdgQc4eJVHc6rr6MBEIg4m2AXXnlu6ITRYQlVCHSese8sIcM6F7/5
+0NmVx581WkcOqDfaJesZvk2y6dP/8Y0pGIqKxcFMQbz1rJ/YW4KwqdMY8TBNP4Gt
+GY5rGGt9wa9gnkz5RszpP7wLefRdNK1DRT4EiS+SyMPzaYPplfean/nM6JesrsXu
+avAY8UHAKpp7FfXApJmip93GSMjwO6agkvRHyQl0YNbBTJEAWOug9IQtIcEafCU9
+aEiz1GKdtcsY3LVjNmTN
+=SygG
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/irqbalance/metadata.xml b/sys-apps/irqbalance/metadata.xml
index 83f133eb3bf7..9a4bd53c8a4d 100644
--- a/sys-apps/irqbalance/metadata.xml
+++ b/sys-apps/irqbalance/metadata.xml
@@ -7,5 +7,6 @@
   </use>
   <upstream>
     <remote-id type="google-code">irqbalance</remote-id>
+    <remote-id type="github">Irqbalance/irqbalance</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/sys-apps/lkcdutils/Manifest b/sys-apps/lkcdutils/Manifest
index 8957346af29a..a03264ae2316 100644
--- a/sys-apps/lkcdutils/Manifest
+++ b/sys-apps/lkcdutils/Manifest
@@ -1,19 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
-AUX lkcdutils-6.2.0-build.patch 725 RMD160 a2704e78710795b4520b6c8019fae4d4bc4bc2aa SHA1 f925afbf9ebcf35ce2d29a5f0020955cdfb1c111 SHA256 77ecdc5949cbf29a322879f88e4286d4a59b569910161c24e2e7d5fe8d87078a
-DIST lkcdutils-4.1-1.src.rpm 1502922 RMD160 7bfcc9b8f74582fedf9486e366a1d40a25329f41 SHA1 fbc552c02b1adeb29d92ccd5c064be5044bec663 SHA256 3482dfca9f7a766eb8d2778640ed72a6fa621915639f6be1a4e1313ac545df71
-DIST lkcdutils-4.1-dhv8.tar.gz 8227 RMD160 6c770506bd2957e2a6a34702d687024d8560ba94 SHA1 7e016744795c4660983fb5c821f3c803e6b398ee SHA256 1a7a9e6007c338ece8c8c1459af8c02db0ec624bff5f2f71b5dcab4310a998c0
-DIST lkcdutils-4.1-savedump.tar.gz 21626 RMD160 bd1973e6be43a060129916bc11c2bbb0a0d93e3f SHA1 1c6f9281cedccd0f2da7b822c6e828f18a180273 SHA256 e3bd94c5a8cc4d97885020c841f47c7aec4fc746a6e3b10ab8840a5dfbc2ca82
-DIST lkcdutils-6.2.0.tar.gz 2967595 RMD160 08a83eaad59098bc0f9ba9c049ad53be3a6b7611 SHA1 b8f7913bb9a3aa99487626cda443986529529441 SHA256 f69d9eb293ad446d61a882e147120ec3d2f55280443efd859d6cdb196b0de22b
-EBUILD lkcdutils-4.1.1.ebuild 1961 RMD160 3b757c0677f888b32e2a9621dac0cb0073745396 SHA1 44449214ed873ee5380e18594c1fd7925b79b598 SHA256 4fe5634212b110220021686d83e7148f58d185a9833bd904bcd479ee68fb0805
-EBUILD lkcdutils-6.2.0.ebuild 768 RMD160 308692627bb4533d21a4687c1f490d0cc95e19c3 SHA1 33c774460c701c182da11dab07ef771a225218fa SHA256 a50b1014fc7c935ae0168cce08b624523cf36edcf7175c9a011eeff9779d8532
-MISC ChangeLog 895 RMD160 45ff62e062056a9bab1dedba814fe9558c96dec7 SHA1 0a3edee4a7c9074e2c32b3c802a4dad4e7e4aa9c SHA256 549d5fb3382742852153f1b2b8434763a5edb459bc0e535e3fed9c8d0e3cafd9
-MISC metadata.xml 216 RMD160 d46ab9151b2040928f2c7bfb74ea4e75d2599c91 SHA1 b53889e0a2bd7e74bbdb41a2b387670a0377408a SHA256 2b90f3a6fb0c799101ab158c272acb2f65a599fe690f290ca4ef9f4cafaaea71
+AUX lkcdutils-6.2.0-build.patch 725 SHA256 77ecdc5949cbf29a322879f88e4286d4a59b569910161c24e2e7d5fe8d87078a SHA512 12e9830013052364371cf6702243cbb95b929857507891e58d855529e9c2fdc4ad646fcc6595f6fabf2417941eabdb74991c8bbf04786bcabb237d19e9b35945 WHIRLPOOL 5eb27f35793f414ef7c3618e8f2fa830f69a673f3a4f05180795e43a42c6761ba848e2f0b3f8f7c356b4b896255ddfd1a2e8ca947d4c8022c9191f30e6c0ae93
+DIST lkcdutils-4.1-1.src.rpm 1502922 SHA256 3482dfca9f7a766eb8d2778640ed72a6fa621915639f6be1a4e1313ac545df71
+DIST lkcdutils-4.1-dhv8.tar.gz 8227 SHA256 1a7a9e6007c338ece8c8c1459af8c02db0ec624bff5f2f71b5dcab4310a998c0
+DIST lkcdutils-4.1-savedump.tar.gz 21626 SHA256 e3bd94c5a8cc4d97885020c841f47c7aec4fc746a6e3b10ab8840a5dfbc2ca82
+DIST lkcdutils-6.2.0.tar.gz 2967595 SHA256 f69d9eb293ad446d61a882e147120ec3d2f55280443efd859d6cdb196b0de22b
+EBUILD lkcdutils-4.1.1.ebuild 1961 SHA256 4fe5634212b110220021686d83e7148f58d185a9833bd904bcd479ee68fb0805 SHA512 ca653a1cc98ad5bf8bd402593e25f2d111f2188447c9cb7e7f4000f2d19d8fb7d19cd5342348a5d54cea1056e96a419c2c504290e171bca8369e6d087a3b9083 WHIRLPOOL 1d2e511acc244e64980fff44143ecb1ff7b539e0e198cc7b53f9f1169c4a38ec0844f28d5b99502d0e3b8a1433c93d525d2b3b80556dd1c69d917094bf4cef35
+EBUILD lkcdutils-6.2.0.ebuild 768 SHA256 a50b1014fc7c935ae0168cce08b624523cf36edcf7175c9a011eeff9779d8532 SHA512 71732dc429676a0dac03b72be29ca481abc8fbc0c80227a94825f5a59bde818c5f53940475da7baf789c695edaa5708dc006de8181893c3145fa3a79315da66f WHIRLPOOL c0630b70d5fedfc4783677107fcfa2fbc8e54bafa786809fe4cc6d2d919a61accab3c4a5d46946df99a15073dde8afc47279c0a1d5a8996dbc1e98eab173b70c
+MISC ChangeLog 895 SHA256 549d5fb3382742852153f1b2b8434763a5edb459bc0e535e3fed9c8d0e3cafd9 SHA512 8f32d823d93d2ae2b7656d7c08a63322f4d799e1477f4da842077ba44fa4cbe262760f57a28999257dbaea594e518d90a7804d357dd03aabd7aa3e49c1e04ed6 WHIRLPOOL c6957b2d588cd6c4eb3d482313575c5a1d3ae55be21dcd05f3cbbfaaf0c6911f890e01bf152df90638bd368f9edcc15b7ae7e777d7c7446863a506578d60a865
+MISC metadata.xml 294 SHA256 f7e1bb6cdb9727aec05a747d0b9aae26eb2ad7f20a7849ac8cd0f0129b3b9fbe SHA512 816814a8c69f31fcbda72aa3ee0bc158b48c2501ad7c9f39d7e3466ab58b195a88665520f5e4e9a905ca7b936f4ca21d495024f6ae51fbf314703d8d6b9c245d WHIRLPOOL 344ec7e4477db97f93a2801defc117f6d01edad614e6b9606efd753038fa4210f4793ab4a5d4d1abd8311f8fe00ee32146d26559fa8dbc2e1006b93cd8bca0b9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0
 
-iEYEARECAAYFAkldqcgACgkQn/5bYzqsSmF8PwCfTEiGOXv+tWllOiJiQaH/bUu4
-Nd0Aniy41ue7zVtzOv8oFkzaOKtRBs2g
-=MWwl
+iQJ8BAEBCgBmBQJVfyQzXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiLIUP/0tzc2Q/AZ3fffgGz4iqWhuh
+SHyJH+9Dfv6kQIYT+qsG5ywnbNSQ7Q7wUYpszTKAcTb7eRhhEZc3DuNJ4p5PDIAK
+5uKWvmrEQsOl61pXnHjB/npbhVUv3kCPWgn9lhnf8bnd7MttNTX0UqYhSdEf9tRy
+Gm4iw89YmJ/ZPlVu6AriGueCA3SVHL9D0Q4PwDcLdg+EFQEdtqQrOoweZ7zx3VgP
+rYAqjTNp81K6f1IjBzbLGVkeWli0Gomi6C5jXR02Gwj4a9Ak9ID33qWwkWFlEJta
+dzKzeyLKUwdPPwvEP+bSLEwnk43dEJykXzZn6G9Wk399c2clScckrGAeoDCSR4ci
++f/bN3r0GOpD0vTbldG4UO40rq8mOqtNp+ODzZ/FgkQlw520yPTEanZ42ZyeKbJQ
+as7Tyk80aLXas8mDLcxmDXzPzx16vaswVHkdVeYeLMJqv+H4gMTZf+h2mM3bZKaT
+pyLBNU33FhVtUZmd6brS175pgfFFZr1lSIJ3MpfBRVWhn67p1XSgsMx5u7Zbo5oe
+0EhGvwuP0USiJbS5U0IgYK+kNGjoRLHWuvnNozedwR4EFuqLHLA7GOk2RSUsU/vX
+BnFxdp6ieOuLQjHYsgcxSzZ6a3QK8YFSXdVeAmubORXYzP4k4/D9y3XTdY1c+DBq
+YSzb+5+aEP36cbo32O4p
+=4gWo
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/lkcdutils/metadata.xml b/sys-apps/lkcdutils/metadata.xml
index 89864947b131..fc290a9782b3 100644
--- a/sys-apps/lkcdutils/metadata.xml
+++ b/sys-apps/lkcdutils/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>s390</herd>
-<maintainer>
-	<email>s390@gentoo.org</email>
-</maintainer>
+	<herd>s390</herd>
+	<maintainer>
+		<email>s390@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">lkcd</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/lmctfy/Manifest b/sys-apps/lmctfy/Manifest
index 64cb616eab8b..e41c084b8780 100644
--- a/sys-apps/lmctfy/Manifest
+++ b/sys-apps/lmctfy/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST lmctfy-0.2.0.tar.gz 2291473 SHA256 b99310179ca36397074ca4719d8611a5cd567db967641214d365cefa95264f41 SHA512 533990025a9a88e2e2a467e571a80a5b057a0ef3523bfc71c155ad81e6a89463d1e1e094323d5dc875f1b86f4d2d2749819d10b8d6c781e06a93bd37747f12be WHIRLPOOL 5d3a71175dc02bc297ab8d7dfae599f70ea5185b815b6de96f21d466372f6c3c13306417a544127fd0b640f87ab5e460d8882e8c1623fa88d3f9d1a890cec836
 DIST lmctfy-0.3.0.tar.gz 2305226 SHA256 7b334456546b590d9298a3204b38ff91acc51409cc1fb2de0e92737faf017384 SHA512 9083af2d2b9ea34e6dbb911a24cf7b8a7fe5aa3a0f464d20115db86b5abac530d24122079f97ea2ef98bf4fb20a3980e598d89f38b570ba796665b0af08339d5 WHIRLPOOL 5371392de1eda88cd9b7f56f0bf032f3f3023201be43d15f4340092a756d1d6039537693ad3326666905ca91336dee251326e0fe5ab9bc4074783f0cd2e3fbce
 DIST lmctfy-0.3.1.tar.gz 2312481 SHA256 a04a52617501d8f486b34e64b34225dc8ef3c18c47ef92c870cd67879e6587b5 SHA512 ab9f2a065a49fae00b540c0592d9356022ba14e0f9dc681731e0757c259f3632a9b34b5fc629eaf2d0943d59e7747af06cfe59a64f447192e8c196a9d41b9522 WHIRLPOOL 40a3198aa7e03f46350ddec8fe7f20f1c8ced8929a10f23b7306967230df18977bb05c725f9817e1fe10e153ab61ac5c58b1ee13516fdc505d7f85ec562e5e53
@@ -7,4 +10,23 @@ EBUILD lmctfy-0.3.0.ebuild 893 SHA256 237e557a713b570fe989681a7c024ad0c26bffd41d
 EBUILD lmctfy-0.3.1.ebuild 893 SHA256 266b95139c34cd1f3c00bc4397d6fcbc502d073dce8532160fffacba997732c9 SHA512 aadeedb5dbce0f273530228c7346c0c76bd4a6ebef962608b122af48e8c20e4bbe47e0b45da2bac8f3c8921331c1e30f11eb5bd19c11eead9289f7f3d6a9a414 WHIRLPOOL 083f805c1653d63a8923ae315e01a044365c676010686c5b252193b568b113e82531ace92bb89f662f16f063f1c1e8486097edea0c10a5fda4eb745edce9304c
 EBUILD lmctfy-0.5.0.ebuild 797 SHA256 df69bf5e616b6f8b4e7c81513af9abe7c0705f93639451a9e5fc3d8457ad3377 SHA512 2be1e5ab1b374aa1a20acc1822f82076a2a5cedd375bc81f88cd1730a4dff813d9df773680fc3791e5dc62b2360e0255252af1e86b38a545ec2a0f630891524d WHIRLPOOL 39c7295b473c7b1af60da0c597074f0a3aa3e7cd3684f0a68ccbea3f82307f925a4322548ceef7e4bb88bef65ff6aad349616ad295b23f02876f6edcecf662ae
 MISC ChangeLog 1015 SHA256 3cb8fc9d06d4f76456fb1ba95997cec627d22908ebe09437229a7a2cb07665e1 SHA512 d6b1fe478ea051f5a909c4701306e92575d9397dab54b73bb77b4bb94206b982cb6c9ab2d2bed9ea7709ba0dfd0b224cef21f422ecfd2286c4b1c6cdccbc142b WHIRLPOOL d75b4b5500802edb60a891d8d83bf11fe49c293aaf0df3fb5cef90e3b3e714e39c7a215b0d3650e7ca77fc111924260b778a2b4c01a67bd9c799a811d1b97884
-MISC metadata.xml 239 SHA256 57c79f6c1b1b06b8d90265f1cc0affe89b5548b63e811f0313bfb2a0a0aa201a SHA512 1898d4e8bb4f02ffdad555a095ee76f934bd6ee1f914564eac1932f0dd96f26a52f47047324ed0a81009516a84bf72e1b10922fa751f322abf17517f84f62156 WHIRLPOOL 7375ace29b0d9c7e945e141c09b70c79599780bc9d3478e59fbc85dc4330aeda6bf2bb54fde24d25feb181f88618e11e022a90674d1f26ff9ef692bd698ff754
+MISC metadata.xml 321 SHA256 8f4b2baec53b3a1a228bce18ed706a8e1d900ca6e7efb2d0f0181e2502f0d749 SHA512 84a53cb9728acee13e1d4911c681e7a1ffd0a6ba1a9fcacc9e46c07ef296c58c92388b8be542fe739ea4a838d9ff12d6b7bd577bd70f89ff9d096fbfa6558bc0 WHIRLPOOL 2facf17bfc0264e2d168f2393d8b537a98a2d4adaffa3183caa6d1c04a7eaf351e5f45c6ead8b21ce4399fe20e9a38190ac9c361e297a1b3bcb8eb7c38577c36
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVfyQ9XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi3wAP/i6ygeWJ/swnQeX+udvPZdcx
++KeSR76HhESWWqmpWDrYMlAxNITYPr2PAsUmihsa82qlhe/jVQVS5fsYeIeRieZG
+fXKt2Zyt0uSb1reS5m1vWYqhvmLF8wWSCdp70VF35pn6XvvvJ+l5vlmUDwf+zR/g
+F7LaLJNFAeE/H1ufUMzSyzwQcW/UjC/Qo6sFCP+Njdjv7H+ThakRhC74HhLAWWeE
+kZZC5sCyRknM99mE8qcrdhPOO9KJw9gMs+pOzIXL0wMskjwlZjIpL75OurgJnwsJ
+1pCNBS0qS+KeQKfm73529Ci9D4B/duxvNCV0BY4xrs7H5cRnyYOmFJY3T94X72Uy
+HzDP21AjGJn6UU5bctmSscu8+UlhqpJqjX8QtccXV61r2/utU3iDUV71pV34NK2X
+1DrFCieARgCHyUtI9aZ/jUF/ID1Cn8k0kJ4uAVrA/RL2CXzNo7xmHmDIZsMfLGW9
+OUpli3SYK+wiX5iV5Q7zFQR6MWjn9K5tj1cQP78ZzOmKCUFTZHQKh8s9RIr9UmPm
+5PB0C8J3w5+FRzd1JIrWWx8+IpNqO9B+3uxbniztkr7HPt7+hCI1/Um598Uct9LC
+3c/Nc3Fo5MKBIJhUTK3tYcimbLddRa3TGz9hZ5ugF4kWYql8w/w6wqdvHGHZWrFJ
+InWo27hNCwtrXE+ZGXD0
+=mi+7
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/lmctfy/metadata.xml b/sys-apps/lmctfy/metadata.xml
index 6719fcd2bb35..56dba6227128 100644
--- a/sys-apps/lmctfy/metadata.xml
+++ b/sys-apps/lmctfy/metadata.xml
@@ -5,4 +5,7 @@
     <email>patrick@gentoo.org</email>
     <name>Patrick Lauer</name>
   </maintainer>
+  <upstream>
+    <remote-id type="github">google/lmctfy</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sys-apps/lnxhc/Manifest b/sys-apps/lnxhc/Manifest
index fc92e3d44252..1a4ca3603d1f 100644
--- a/sys-apps/lnxhc/Manifest
+++ b/sys-apps/lnxhc/Manifest
@@ -6,21 +6,23 @@ AUX lnxhc-1.2-usrlocal.patch 1455 SHA256 62bc5ce12b5ef725aafbfde9e0159948b1ef9d6
 DIST lnxhc-1.2.tar.gz 360869 SHA256 a94a748171b812528567a0f7a3c19f048a57463cb0fddb9e152b38e2ed8a66c0 SHA512 200ab6443c3b8f4dd99928d2f18b31e8e05c1f9c1f976052017a643430ed87fa08a399e9e8430eafb2925126bd2d90fc4f65ce1c220d6100b71c31fc0505aab0 WHIRLPOOL aa0b7f1f86bae2fce4da3db40dc97c525fb1d94b86298142675d64654676be391487c33612fb8018cae5b5bb1cedd610696092f8ef1944e4ce446f50bdcddef4
 EBUILD lnxhc-1.2-r1.ebuild 587 SHA256 86f330ab4a10923b83de6b1958cbe298fda41dfc3b2ac7a7ffdc7bfdc75f7ec0 SHA512 6de9d7ca0f065f4f2613061a4e728b439f30a8c6d938f9dc584bcec754c4db14bf60a14947229d145c26443d872343e285d25517c12c296cca16536dcdb157ec WHIRLPOOL 53d33d61481727456223c5d04657957b40296082a13437cb3589ba829f91df6c970a274834d97ea7763dd4791a0a81ae3c49934edf0f8a27ec0070be6c3d022d
 MISC ChangeLog 896 SHA256 8e2dc12d2e29ba8bed3a3da10105119bd743251c0b1b3db2243fd304beec1eb4 SHA512 81d8b6802c3e6062fb73ed2a1fb8173144f7593aa46e1d6f6efe47ba45c8b04b9c08babfc3c17c0651c12af15d3da44c880ca2f5fa2322dceae7c49dccfd186d WHIRLPOOL dfe6f51a03917613a72e20dfb0ef47a079e84c8859b962f70cd73144aeccac216a459b01d3c1d1e6f0a458d5368d5402272a16171b49921edb41242feb8c7b4a
-MISC metadata.xml 234 SHA256 df736f9d2dfc4890f1bbe65688f46f956d15a4783ae0c3cdf9da324713c63ad0 SHA512 9b555962848efc9ffbd41f07c7eeb9655dcbe1db6f6bfd4d402ae3e31a4f20daeaa84c6dee5067b28ae20b0fb13587dfe63870d81a2b80c5b9c4343f46c6a753 WHIRLPOOL ec944e7712fc4cda2b8ebadbdd58cc88ec801dde7ad7eb55aff93961a5bef8cbf47d92d68327c4f81467b9068965c8ff1557596f6c4d1604c7c5f1e37224cdfd
+MISC metadata.xml 309 SHA256 bae7159f02df5b993b04e16673842658524456b9cbf44fdf11dc0e3b68b77423 SHA512 a470f83b50d1caa820c59c7fb925ea324438b9ba1ab78bf95d91feeef3f9d3bf5e0ddb8fea43a62da50572a678d9e9e2d59accb80ba577752ec89fcbae027579 WHIRLPOOL 22cfb6b320b0fe241db41820a0f574a87fe56f708720207115d09b2542a33c8825458c0cb4ad515e095aad7e34aebf672d53364021cea8d75146212bd201f30e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQIcBAEBCgAGBQJR1WlpAAoJELp701BxlEWfMMUQAKMqmW6ySB+8h963xFHU+F+K
-oMRcmLcDq+KLpN48DLCxhQD+vU5rebYcGKHeoo1qTtKaGScjrHl+oPCqR0+vvmO2
-y8JApAnPIEUVp6s+WNrlOkqwcG2I0X5x3faXIqHHBoJR5zMfZ9KxieJnhyhpFLxN
-aFbKpajUrfb5EpTivViYJSNJTy2vAOFkF+cWki7oSWp2KTPs9AGnQfLo0CjXLzSG
-oOyP3es4hdflWy+No/qRr1tjGzAuLhfRl0ERPP28FW6DBfXP/tko/3oP74oEp3nW
-ZV58C6ZWHaqt8/8Ml2Qgf3fbVqLqjPfmgeOB2D9+4UK/wWwv1Mief1pOscd9IdYd
-aLyJQqESWPOKmg9/AqhXZ5YTGfriaBoV30sH73QNelqcThA7B4mYiVJrQtrE1NC/
-u+9Fr0V1/Wkg9gZxDO1b91GC6t4NLGR7yzbCw89DxyQIpay7e4PxrS4tPMtBV+9v
-poeyjnRJwVCBokwzK6fDCJViE4lPWJKpGJFlTmeDbRzV9BDIg4l9Sj5kc4VggbuD
-SF22lNKopOrgLRcS1dUYXoBLceO3V5AtB4BGmdwTVWCsYoPhIHkckNButImsMQfF
-VAMmNv7Zih1q+p2U1YXyt7FpVhtU4d2Mv8m6Sz6WI2hrtq78UcldoeBZem4tAvKL
-9hpLpE5QU9Lq4bnSxW1d
-=gpD/
+iQJ8BAEBCgBmBQJVfyRGXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiVpoP/2Op2UQ93tax065N/eIgIOnD
+iYZGt2JI1Ic4cIQCmA3d2WkXRFSGdGv3v6NzO/SL93jXXuLMMzAGcTYWJxYdEPS0
+CujtVzovNk94FWXGXnDS1RsQZUkyQeCtRRvpAEtL1UScIhgBJPDPX6nTd6b0WmHf
+L8CplePAV9o41iaFgmHLWoQDHuXkE7Trzg0hyckBYSF2RsO75zbogJfwSsxHAPRi
+ONf0tkBBPXc9nSxu86UVl8sfWlxR8u2/5/KUgneotISyYHm3qdIUmdwjQx0rw1f9
+BIXFbGQQOb8MRs9JwhEuQiTmQY+3PSHRarB4t1gcXD39mzMklsL48IKnMy8tVGnu
+shF1kA+VAKsb7eUnMNtMh8VXeJKb8xMnXJTXF8G/Ip8i4QWgdv2Pp3QAxwmodh58
+Y4p2R8pRu7+AJXx35Cjmg9iCipEamhSzNVTvyYoMaEL/kN75ThXIk8FQueWlRVOn
+oNFC+oNuYUnyTv883N94gkBcrDzCjNbPW35jtpCuz2OOyM6EsbDQc5nvUyZEayZe
+iOctz+ctLw6Gp80fUAEXBiDo6gw4wYTn44PrY2I8tNEDLjMQCWhwrZrmuoqX30ha
+NZOBUi73gJUKAtfkmBLsfnwORI+PyX7UjeEx6bJGngZpHVEvcpY3qmL90AS82svB
+stZlSJiS/OCDun1hs5y5
+=JeEn
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/lnxhc/metadata.xml b/sys-apps/lnxhc/metadata.xml
index b8f97c36765b..69a1599e0a5e 100644
--- a/sys-apps/lnxhc/metadata.xml
+++ b/sys-apps/lnxhc/metadata.xml
@@ -5,4 +5,7 @@
 		<email>creffett@gentoo.org</email>
 		<name>Chris Reffett</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">lnxhc</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/logwatch/Manifest b/sys-apps/logwatch/Manifest
index 193288835123..12f8ee914a32 100644
--- a/sys-apps/logwatch/Manifest
+++ b/sys-apps/logwatch/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX logwatch 125 SHA256 6f65d08d413b7129730816988e4ff49ece532f59e50ccf6a345b2797a854ec6d SHA512 20cdf61fe9e9bfe336c6b7e1f33c982c34e61370431179a2f766da8e1b56f8452c85d75fbba4f459f9c4761a7a932c309d0ba7253aeb6e3b31b220c00106e504 WHIRLPOOL b26d6d421f53c51a5e76dcda5669bd2571843d6b3bf52d862adf553eb6b6793d26b25cebf5aae9273c74c5c71009761031e820aa3a9cd714571e02be9b8a7dbc
 AUX logwatch-7.4.0-openssh-hpn.patch 946 SHA256 26c6215b7b4ee091cf45620fce62e752e90775789a18763fc8e3bb39d2ce1a10 SHA512 1238f8760a93fe9128f4435e6d5088bc5a20778bfd425a1bc5042b51a783a8f9a60130fdfd1662b9a81109ea9e9d313164924dee4d339b34f08ed9a062750b9e WHIRLPOOL 5cac4629a86e1bc0121e0ac7544b2b8c678bbbb2ae5e766019bd6c75ee479fb01509f12c813d53cc780bd349814bb9e52a4738c9ee68e7ce9553c17cf307eecf
@@ -11,21 +11,23 @@ EBUILD logwatch-7.4.0.ebuild 2102 SHA256 375eeaa04f83a133d4eaeadc6f73eab622f6c3b
 EBUILD logwatch-7.4.0_p170-r1.ebuild 2214 SHA256 1f40c914601f0434d20cefdf12c704ae4761a612f6d60b27b780d401e2bcb0ac SHA512 9330290251ca09f9a3fc3f6bc8b20514c6760d969cca1195c9b4e43e0766b18a4c13780f279fa1f0e1e30f00e24a76a501dfa26cc5ff86fb929989040bc4d341 WHIRLPOOL dd99797bbd0e2bf14705695107a57fb9cd0d2c58721f2edd05ccbfef69bc5d2e4fbb53114d7ce7f0a85520f0aa3744ddada28ce8afc2245a900fd74a5e4f62ad
 EBUILD logwatch-7.4.1.ebuild 2172 SHA256 00832be515b5bd8d97852e67f088575d67e1fa7af15ddc7eadb13606cba50dcb SHA512 366964335841c5b7303d27ad64622f1be092dd56b3aef08e6234d6d1d973d8cfc41d98108c0bfc385c354f57fa0d98b4d95d568f80a76a72595b54404043e265 WHIRLPOOL 28a802c7cad5b19c82290fdfcccc2a7035d03228783b48d8fade6338eb517f6e5cf218df431a8faf773e2757acaf62da2f55ad78b35f11c67423e149784333a2
 MISC ChangeLog 13525 SHA256 4adbda52a29f2728dceda9277c0449d6cc909769feb9fe1f0067cdae8a9a1b5d SHA512 1a893ca5ce4d97a206889a6ccb5d75988f1ad545a4194194dd83ec06a8213bac6cfe5db216b7a6b21ca003f812ea317cf593d6a8a28fdc2dd13f7593c6ada015 WHIRLPOOL b235fb5914b612e4c4d404734246b8b62b1b3639c0b15f7caa4582647153215e684084a8c6f777c83af4e77a205d360da06bf397f15ae3be352c66fce5ed1d3c
-MISC metadata.xml 166 SHA256 a33d3505ea834e19cd196ef8af9d438f1e476abb2aca27b0ea9f1219e93b8b26 SHA512 9a924987983984221311fc13539b270e032c8a18bfb2e863480dd4be10d36f3ec22d6824cc443c4dcbd34a6a0abce33ba70eeb90766122e072d442216af4f8dc WHIRLPOOL c28ad7db1ab0447a86899c0b1e504795754cc1ac75250e1b81ddb3ea1ea318abdeca1712695d18f8a12ff8b72e73b4cefef35adc05eb15a448aff88e7bd4b330
+MISC metadata.xml 248 SHA256 6e9c0b17446eb9ad3ef7a3f81f61f4a735d85f24aad0a3a18bedd8cdc859cbdc SHA512 e0f02e855b726b761b55905f7dadefb69ad29164ce8ead18a14f8a0de5cc6e84c61481b2da77c40329ec245ae8b7cee90e9e5b7e5cdd7575630cb6c9ac58feb2 WHIRLPOOL 2b3b838f9dfdfc7c37d45c291c95123d4371835a0801603d6293abc54ff76a68b66cf40dc0599b259390e760ee9dd2ae888dc9b84c2ab1748f0c8f2da059bbaf
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJVHjGGAAoJEPGu1DbS6WIArN8P/3eh2p8jctKVUNxZaPYMSHCU
-6atAqueN8pdJTk/wCiSbMXjTWf0u8oR+WBhH9+6kHh9OD2ehUyAODKx86LHRd/EE
-kFsFQbCoBri4nUjPgyAoS/h+AkKyRWshf28e668AxFFNBAIybQszBh1xCqWpjy2w
-E2vJnMVGekD6wM5PTxCadSaaI5WCYKvFwg/pW4ueTu3iqIxHTANE4yinWqex7ISm
-RqPYmKPNeJN3ljR5ZHZV9POsbUHDIupXzCd6NsFKN3Q6emlwvhYEWrAXkxC2A3xt
-Luwe3Q4Je8l4NvmT1Xe3aVj2OWPuqTRHJTOpfzBg5COYQ2f8gQrT5Fnu8eOkPf7v
-eIcmCembviO7u2lFa9V6qHtUfocp7x64KpYQ20UmVbVmIEx6YitnKuVwSELioy99
-/PX2OTFbFHK1QM1MqUtgWn8OsQXjoxcjnW5JFFVJ+gUGaM/2mjm2C3OlTu/bK8x/
-4SL+NpCkVWnFgWd6RY/iVub6Sgn3xh+0g0Pr58WEpURwwjSLsWVS+7bhMIa3CA+5
-E81CKEA8vHspd7tcEzUkhDNQGCHnBlGrfkmDVB3qBCW6mShdpCTWW3WVpDh8NM6J
-gZGjZOFGB6ffv/jrxS3n92StPVcH3DQnOs8tAv8ho2Qq4fLuQNdTQifBfcwHxymf
-WOTauAobU9hxVEq5S/Gr
-=9OME
+iQJ8BAEBCgBmBQJVfyRbXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiP48QAId0Ydqx4YrXQiMZOze0AdlX
+4Pkm8qSpUWgsEkB0moCbjcZO7TCARXACVmEheK3NbhvIpmXYkuXyNllZD0ovJJqA
+jVP98zjZAtoqh5z/tOF3Adram3WCXKAxnK65ZQdxOGcZIcKUDKz/pUDFvuDWiTCY
+uSFNr0EADFqHBJsK0FC1gguZg9Qh/ZzYMolvzSE86euUS1IpMuyZloW6dfztw2eF
+hSNCjrUPt3VDwaQgPJab2t6/3mqXpE6uJDscZYtPlSfe3rQZRJY4bBsoB0+ik/g6
+T4jtnJ+epcRxVHgVbRNE+WBgEIMRBNvKRcJqCq5dnMqOT+IFbc8ikMVlqHeWncJX
+hvtGlbcmW2b8FUgH1PoHTaR45HjzQDO8i2chAzcyRk73AucAYC5+C0XN5ByQJlpE
+lGzeug/X0M7w4qYGyVOAOyc8CwRjrjT+JN5MzVvrFtXBERus+9pWFgZpNnT8Xlf0
+Lj08mLZO+bxKTZF/juy32rvPdegNvT8Yf7IGYBGDcus4xY0iFhOxH/tQtP3C5Cp/
+vhQIOcurLNv4Wu+PU7a7jD4XdU8V8e3doG18VGBfsaITeO6gtYoG4pZHOa1Fkssy
+SwrMZczoAPROYlZkN2k1hLGeEBBHXFX1xMa5BrUV4QvttGNF6npb+lmsHeiHRBWk
+LBEcjXX62a9b3+AeKR4r
+=r4UC
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/logwatch/metadata.xml b/sys-apps/logwatch/metadata.xml
index bee9f9ae6f02..b348d7452f58 100644
--- a/sys-apps/logwatch/metadata.xml
+++ b/sys-apps/logwatch/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>base-system</herd>
+  <upstream>
+    <remote-id type="sourceforge">logwatch</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sys-apps/lsb-release/Manifest b/sys-apps/lsb-release/Manifest
index 4853818f5a9a..7033858dafd5 100644
--- a/sys-apps/lsb-release/Manifest
+++ b/sys-apps/lsb-release/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX lsb-release-1.4-os-release.patch 614 SHA256 45c55bfeedd4eeee28356c0b16f9c3efcbcd12b6f01362359ed02516cfb12680 SHA512 289795f45144071f5f166a3dfd387267fd3327767bae9d8e9c48818de0c60b961ac35952eb8b42b3ebfd415b337c096fa2db8009fdfbc218814a3ace633a8483 WHIRLPOOL f65d2a9a78af434f508dd0d8155f873e0aeb40abeddf0b85c2f8fba1880dcc37a85add6021ed8945c03e954e9d98af9ee32a023d8bfbf6fb06214904234ab228
 DIST lsb-release-1.4.tar.gz 10769 SHA256 99321288f8d62e7a1d485b7c6bdccf06766fb8ca603c6195806e4457fdf17172 SHA512 84f6f8794380463587005043f601b7a40190cd9e3409abff7f5ce7658cf029a14346eff87838296d90307192bdeff68cc00480c5c04814da7acdb3e220640fde WHIRLPOOL e8e322f3d5fddf589ae1cdc97d143da907aad418ab6099f79e90e988450a3304c58d483e2ba8c80a9a7093f73af515e6c66a1c33881681bef2da70a35c31c28d
@@ -8,11 +8,23 @@ EBUILD lsb-release-1.4-r2.ebuild 995 SHA256 e62be69e6dbe0efe6d2fb07c7115dc7aa1be
 EBUILD lsb-release-1.4-r3.ebuild 1023 SHA256 9b99d7ee7e40de756a67a57c9af2c38d20fa2f2b98842fe117afb715abf541e1 SHA512 9cccf7b15e9619093d19595f8bd6e1917d1e05e2517752ae8c2814a2a2e9db1cc66e1a00c40589ab358e99fcb7bce9ee316839592f3673263fb455b5018bbfa4 WHIRLPOOL e558923149b70c5b9a8302eeef4a43b5f57157c753f347e8b7159e5734309d8c348c8a3555d09ce16dace54bb0cc499c004f98e4ef83edad47a289a129019a21
 EBUILD lsb-release-1.4.ebuild 818 SHA256 2b2d5d702264558589b9b91d9db1e6e01368e2b3d678fc559f9f44a37424d184 SHA512 5b333bee3357d89778fe8559ba333646d0bb4dfc1412e95464314dbdde96c973a99b856c5e7471526a8813d6aabd21cb419e9502560030e25a1f0285649c6d67 WHIRLPOOL 15bf7feeba7034b1be161f1426568703c43c038471c1306e013438834d39e866d0695a4bc3bced2644deebba6f944fa7d191aba131246ffc413a25f95f1f9db8
 MISC ChangeLog 2753 SHA256 0148ccf4661645a50e056efed76b096ba02c0cddc1706e9995f5073fc148223b SHA512 ba3dcc7eea0fb2f4fe33c85b0e1cabc223c351322b48ac6eca1169d19b342897b873c3bb66993c48c17437346259101b51fb755a0c0505ff1785280ea2de2b39 WHIRLPOOL 0443f961058dcc16013e7d7f57cc2b098eacb63ca138adcbf6ebf06baadd43985ecf1c4cd4843fd8298b86ccaef8aab3c644a475d65ed7728f27103b031a4b3b
-MISC metadata.xml 708 SHA256 0bdba8ef6482035e636154b74110d2218a49c44bd0de4f7f6b13568796803e3f SHA512 4fb6848036e074b4186570b0064e18e77d4d698faf639c3ff77597e73c2787fedc44ba1a4ba187d9325e20f81353674ab6b8e610f69892986fd5a80169c9c51d WHIRLPOOL 1d11dafc2c4c45c9bc941f872f46295f2d678f0c22ec290273fb5677ad40c438013edeb58a0c22090f6b873d23137115ec87b34cbd18c7442d4822e068e89da2
+MISC metadata.xml 781 SHA256 62f4cb330072500d6fea78b657827f74ba1a388fd613718e1a5ce5a2c4544fbd SHA512 f7d7d12cb5965fa6e8878e2e3c304ca1b2456431afb0802164e9700968a722451c19b4f57935d918f089aa64acd9fea542753157a851fe07c06bb215de9b69db WHIRLPOOL 7b968cda80b2d94346d2c447ed3c719d80ebc5141c05deeb67d5b1f3242d2192b11304f90743739373c889afe042b67d4be5e5e127ac936d52721644e87e222d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlSpsbQACgkQVWmRsqeSphNVLQCfbbKGtXtahiJaeWeERZ+s0uNb
-e0MAn1dKLHVaZgUVaUP9WJlgRLnDBIYs
-=2vcl
+iQJ8BAEBCgBmBQJVfyRxXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmifJYP/0D67QcjcINpTjUJDAMaMqLH
+5JV7tttjx3gQvfNwaoxu9rvh4x7GBbicSBBQE8o0B0e4lb1bF1vIFO6x/rajQHoV
+Poehy/mc0Yp7wTGvknyTobCnESjEpDq+aUbHXY7IqtFBWcmo1bpkTeAMHo44P/qT
+aoZGkzy9WEgJINJfsF8uah9Ad96i/u/ioW1b2AFmsaHWDMBMk7LzF2Mzqotp7zWP
+Nu/TKytAcUsThMEqn41iTea7cUUJ3SYvXM58/pieVu1bX4eSqXa0RRfWuqCpS8nu
+vVqC58n9mRo+frR1lxUTkNKYs+hlvGrhTcFny7yhcJaF4doqKnegsDY+XCuZNDZl
+/lJxyxY2w5MW86INJeEYsqndj2P4UN3JXSf9DRX9aiXtvuFo45nJSDuRYu5roCMn
+/vEml9h2kC7z708fIQmQp9S7sCo47+RmS7G3vUq57Ifau95xwf7D7cf6QvwYnR/P
+6E+MX2pqPNVTJtj4XO4S7k+N1fbjYhKTJLaniYqn3iM6cAs5skssVJYkXFfx9u5+
+7F3jKBK6bIu3q8gNGZj9ARyp8rBPzbs0YRBYJFStfL1HtriOgMQL4EfVE3/7fvdm
+gcQQ+d+lGnKg3/qiVOibd0dG4u2TTLaKjXH05b8T0DXJ2VGRV0PXIXZ2rgL0G67+
+SmjtDPwlmGzmtfIyfeVr
+=AKpz
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/lsb-release/metadata.xml b/sys-apps/lsb-release/metadata.xml
index 6886884e518c..98edb104f446 100644
--- a/sys-apps/lsb-release/metadata.xml
+++ b/sys-apps/lsb-release/metadata.xml
@@ -16,4 +16,7 @@
 		of the distribution along with an identifier of who produces
 		the distribution.
 	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">lsb</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/mount-gtk/Manifest b/sys-apps/mount-gtk/Manifest
index e71d14000d90..20b509211190 100644
--- a/sys-apps/mount-gtk/Manifest
+++ b/sys-apps/mount-gtk/Manifest
@@ -1,19 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX mount-gtk-1.4.2-c++11.patch 1117 SHA256 4497cf667f0459e4e3479b1666ec61fad16b725c00983e7af056cd4886412d71 SHA512 369aea5b8b7b1df836e1970d7eec28708d6c3c833c960c38002a58f4536889fcbbe9f61d7a92907493f3aa04d164526c0fd7ead7a03cb916a2cf318ae027cf2e WHIRLPOOL 831de080f5857a4e5b2bc8fb1d12a948813fb9010c736f1992a30ca968073db7103dcdbe666b092481cefabfe3022a0253313777fde2813efa54aa2b6217cece
 DIST mount-gtk-1.4.2.tar.gz 232132 SHA256 755a4aae98c8c14c909dfc8da2e46f32ce720137edecdb3d8fcdc99fa02dbd03 SHA512 90fa174238d19bf009f5863e5571030091681038ddbfdc06c7a39f8859b78d9864b398899d66463d0f8a189e484201c7a32753b38898e0f5d55970feb85420ba WHIRLPOOL 17ea7baab7df013116e0c302c9fe9810c8a6d941e9de79cf05e3e9826a69fbc0ff49efb8d44d64658c472439019119b47adf7bab51a198616b5abda9708c47ea
 EBUILD mount-gtk-1.4.2.ebuild 977 SHA256 f12a5b0fc988fd8737fd8cd2a84c9c07e641d7c10429767101726cc1d176a956 SHA512 a598a8c746ef0a25e97818f4b78e0d41f7fb2fc69e7d4535caaa25bb758088596a595d27c5162d89f5e9de39fde02c37793ad9e4b3ea970dad82e2eafaa18b71 WHIRLPOOL 44cafb32d630ec804bed8d9835c8d8302f3c56c4d79194b792ccf116e767ab856950394da944243170fc10c178e80e8754bcbd4154ad3c3d015ab2f09020b422
 MISC ChangeLog 839 SHA256 e99b0cf9c3256dbf424252e67629955d3cf27e086c60cde1a4b71f6e82ad5edd SHA512 e9642a5082943baa47dbaa669f6f50c1a0403b89f486c3fe5ba4af46b5c99f37c700733c6f17205c524ae22ac6ef884910728de77c6aed62bc7874ebd275389c WHIRLPOOL e979dd5cfda22dfb4b69af6e288f548e576f26c75ab6662c5d1f3d349f7d63d1fedf9cf8b91fa86b9be54b8bbeb86ea486075028ea489f37b08cbbe50cb79e18
-MISC metadata.xml 264 SHA256 d824a65accf5dbc00189475b321dd057acbe102afd40c1614b7a38cbcf1eb468 SHA512 68bf6f59f63dd9b629fcbf79387d97f0abdf855dfb4fa35eccbfb23afcea373d0c41a4d9f3fd1e3248ba54f6787f767459b58157a71a4cc915aab2e02972263f WHIRLPOOL 2908edbf9cfaba7cc4f1f3254318245c2fa59bdb719adb351c2b8713372efe6e52238faf348798d9a25a4e6f93f1e10588ddac74422d56c4146653a63b944ef7
+MISC metadata.xml 343 SHA256 d01b15e466826feeed7ccda52588aef1f1fcbf75d3b26fbd4f818c1d057d8da4 SHA512 48fa635f76fb3c99ea9c081627eee57bc51a08c824551ae521aa84bd5304605bcc03b3f24655df7738b388289a9333d74f1f441765fa6eb38535e387d0f52af8 WHIRLPOOL 261e44bcd1fa471e8cbe281205a4a00c957031c9bf088425e476f4592b17584886227584fff33fca47aa89009f47d496764132af94e6e4e7ce4e2060112b35b2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJTpqtmAAoJEEdUh39IaPFNRUAIAJUhaVtWzgwxhSenkJzU/TEx
-B0WkdMgTG0Hf6ePYR9CZJu+sCzzygf1T8wz9MSaPtAsujUgZE7mHH25MehCcDtON
-WxmGV0OMtQ7PJoYvMQnPCWjfBLoyLWe/SLfgNPNg9QmeXttFKIhfJ8W9S2EZ1w0o
-5G43CaeewrSELe4J9YdJ5Vb33UTfvlkZRPSHyBbsV2mz3vF10L3Y49lnMg+oRayV
-sA5nOStH5p8dlShqU9yCwFt0X2R72mJMMpMZtY3a+vqloRt3RefTCCfkbJlPt/l4
-kk53bRf076Gwcq7bMuRFrhf/5WRX4qloQc5LC9GbvGP9ANVMq+7j2XjwYgi80Hw=
-=DZhQ
+iQJ8BAEBCgBmBQJVfyR+XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmitHcP/Rz6d0MzYFzlqbDjL3F5hvmF
+RPPc9nI4u9jTo0tFqwVMQhzSvbnxaXwi4daaB/Szx9U5N1qa8nWNE4HCsgG0Q0aC
+x5wsbBwBrS2aH5hzyyf3edbBsJxxMxTiZGgXh/k6XXeSmFgZAJ48VJVJ2sPjxz/B
+3CcYDRqJiUFus3gTVy/JBOMlAaU+0mCaF+O2tZidK3ar/r4Rd8lq0YP3GKEl1Zhi
+LpU5D1ZmK92eCQ7WgAuc7TnIRg9Or6DdNMcUHNj6rlrPOBX8z1y7FWt1X0BV7ltu
+yM6isIcb9/k3PzfZCb6SLdWptKRfX/sDzjXIu63Qr6DvFzZgC3mkbykoEZngpo/1
+pDeKtkzE3R6z37ZZKafHGveo0Dq++wapkouFA0ThuCsGhWpwRTtMwRq522r0WpUA
+fVcWHTuFhbPbqlb1DMSXmBazv3hVbQ4ZPnfd7soNjwrxRYUIIcSW8XTax+aTCP4N
+bNrW8lwMExWJh31LvYg5hTZNX37q062+kE+ewAJaRsXqAtWSDLw6WW9DOVEvQWxF
+YksAXgxsX8xDkv0OHvMF+WdTRs95qrzPGcwbEGyCx3Ei+ssftjzsVLI4CS1koE+P
+vAkJ3Ao1J24PCkAMYvuYeUVLiMOPqrSnQtjJfnP1Pa1oA5tmRe6RwYxL1IyVXyq+
+8fp7UyUMZ9YUcLl9rwPd
+=+6KL
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/mount-gtk/metadata.xml b/sys-apps/mount-gtk/metadata.xml
index 7aef4e21e881..e734d7e194fd 100644
--- a/sys-apps/mount-gtk/metadata.xml
+++ b/sys-apps/mount-gtk/metadata.xml
@@ -6,4 +6,7 @@
 		<email>ssuominen@gentoo.org</email>
 		<name>Samuli Suominen</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">mount-gtk</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/noexec/Manifest b/sys-apps/noexec/Manifest
index 2260febb106b..6686ce9dbb08 100644
--- a/sys-apps/noexec/Manifest
+++ b/sys-apps/noexec/Manifest
@@ -1,16 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
-DIST noexec-1.1.0.tar.gz 157097 RMD160 d306296db87004414b5c8879b95f16413ef8f3de SHA1 b2ea7e5913647430cfa2081a71ec6ef721150af5 SHA256 452744d3221cefe15b7d22560526d611923ad13fbfc1796486c3af37d8d09a51
-EBUILD noexec-1.1.0.ebuild 602 RMD160 eb5b7b095a6ee9d126bb88c83c1fc611b3dd5d9b SHA1 500a27ad405239a92ac557a87a93b9efbb4a8344 SHA256 7789ccf933c5989ebe9744a699101375a6c2adec06d11c0e0f7cc426f51169d1
-MISC ChangeLog 1009 RMD160 2c555ba1105642fee62b8e9586e20ab4c12a74f3 SHA1 c2ddfca2c5cb648bdfd1301fc8c5c3a790425030 SHA256 104876acd02a323c0fe2aab438ffff8823be5758b0a2a3c2ddaab1a4b48c48b2
-MISC metadata.xml 210 RMD160 c9fe92a44d079ef04bcdd31de9867de5bb9f26e5 SHA1 efa00493ddec7289a21bc4cbcc6e95ec4de749d5 SHA256 90082fe26a119a63ca8fbe227f66c33ba74167b6cf28e2cef02dea6c4f656c39
+DIST noexec-1.1.0.tar.gz 157097 SHA256 452744d3221cefe15b7d22560526d611923ad13fbfc1796486c3af37d8d09a51
+EBUILD noexec-1.1.0.ebuild 602 SHA256 7789ccf933c5989ebe9744a699101375a6c2adec06d11c0e0f7cc426f51169d1 SHA512 78300d2dfc1d683d4d384fe47d385b0abb0a5b4e10a5bb27711f9cc3335a03ca11b96c56bd6b16788a0f575ac9808cf58a8304d67aa04c57a39a67285c79fdce WHIRLPOOL a4ec3f4e4b026ee6b6fe493db8bb0a0ae4b592aff730317267cc86cb55a863b9e7a264fb9c7829c45c195b8e0e344f559a32ac78fe9355b0d1382f9dd1b67613
+MISC ChangeLog 1009 SHA256 104876acd02a323c0fe2aab438ffff8823be5758b0a2a3c2ddaab1a4b48c48b2 SHA512 193790e39ce33d787066008aac7ec03d4be891ce6afd84a04563498d29aae9921e288db8bc224b442454f0bfc49693f09e649f346f7020aba7e7463fa935f47e WHIRLPOOL f4e8c18189b7d032f51a94066c0c93f3b2691f80ef6659f6a7e9599f4398ead4b8dc6d24ae223d190ad77c9802212c08bcd1112307376cc0aa1d8edc597a0a63
+MISC metadata.xml 290 SHA256 1b47a5c2d1bacc649ab47b7fc9c8f554b8615cf740bc7ffc7f271c9e1bf7c682 SHA512 4220f7474ad97ad82218beda0d09feabbd55996219a133c2f94445c577a1e22009beb2884da0f32e5edcac51ce13ac6a68fb439b6de099c7932fab7977d1467d WHIRLPOOL a75b8be8e76807eada1f8b902eceb6b68fcd52c6b9c51b5b4d45cc843d83b16e6f58e727924e004ecc10958245e592ccce0429a18f5ffbce9224fccf024a2d2f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0
 
-iJwEAQEIAAYFAk59sbsACgkQfXuS5UK5QB0BXgP+PfEPcx46X0Y7uHDwJREITt3q
-e7iXo9tzgm+FwHQeUqcsKM5PN0PDkYsFix5PwOovhAqYeq368j8liMkVfwFBGaa0
-BIaeK0rob/kPhUMVS0eKFFXIGJLM98cF7FeYGy4KFjn46WfIz5vORudHgZxLdaVp
-0k5WvsE4XryCwbRPBGk=
-=OVTT
+iQJ8BAEBCgBmBQJVfySKXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiCAgP/j0zHlCdprO9qr1TITlN+nvB
+4UHG2FKQ+xb4wzIBvqD0+hEKE+Or/wElDn3tCGxoc5JBBMXXbm1idYuZxKbCtrya
+TU6Ott+mr9S9X36F35M+YnHtMgMcI32FS2yPocg4MCqOHpXzyKsu3Z7Dx2HJ7rvn
+csy7Uwoq9SJNF/KYb3pHLNqe5haPkbKsWbf9RJs9ZJDGog2+eV54t10zll8O9eUC
+1Fliqe47EubhhvGwP1Mhv2DA1WMzcqxnlmcLS39rKwHlmvUqfb+HzeAUuz9FNjgE
+dxb8dL2XdJSTThz6ssAYpiG6OHbDLffEu6wtjdYi1um4MohMZgenCf3eXVO+8YKM
+I5sqYrHLhRu6xz6WrPQbrpmeZomNFJysqlQRmFhNhhWj5V+/RDo+P8bAiaXQBWzF
+0FaIQpaHd104eD686/6h4v3pS0puNQfapLxfY7lErW4DtCiw8KCayMIGRIRYEahG
+kcXSwT7V1iPwXawU5iaEJc21mDkmF2PG3zqDCf+vNfsuj0APyk41AMZ7JGHFgNkZ
+WmKtX93hFxtqajb3hNacZhUCZdbOuznTZ/G5w+eot3YYj6cadv7VE3iS9b7TpN6R
+4jFaJLieW82KWIckgUfqIlLR7zP7kEE/2iBKEph8ewzlUCQmK/FZWAvzOv2vGD2X
+1f2Kt/vY3IyKzZIRdbLG
+=s/fS
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/noexec/metadata.xml b/sys-apps/noexec/metadata.xml
index d9cd2cad66c2..3c9f4a4bc12b 100644
--- a/sys-apps/noexec/metadata.xml
+++ b/sys-apps/noexec/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>maintainer-needed@gentoo.org</email>
-</maintainer>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">noexec</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest
index 885acd2d6ea2..c64fbc3df3cd 100644
--- a/sys-apps/pkgcore/Manifest
+++ b/sys-apps/pkgcore/Manifest
@@ -5,23 +5,23 @@ DIST pkgcore-0.9.tar.bz2 466448 SHA256 562671a96c57691f3a661253187616d184834417e
 EBUILD pkgcore-0.9.ebuild 1776 SHA256 00d642ba31ef4a755c06214ea3ac4e178511a82a3c9bebbbfe50ef5569e6d954 SHA512 dbae0675e68ef467f093087be95274a2c9e8a04328fbb49aff9204a17f0ea6d4c4deb83666bcea9ccbb7ff10332a99520117a2e68f6b24f2c1bfe3e706f43553 WHIRLPOOL 23b8de66415f7761c2ec9cf4c967c3e3084596aa822717c918e16ab4452e3322266adb252bd17e57ad059f48394587b01e3ae13227443b8602d63c286ca2724a
 EBUILD pkgcore-9999.ebuild 1766 SHA256 5128a72a7044b810571be9f987541e68d1637ff0d8d748419bbf42cc092212d9 SHA512 1821fd8afa5e1e6fc84922766a8e0f326a9c3366ff8303ef37e99a590d07ab1680cf812a725da1d918d960af1fd4f5e4155af940358f7e2c72f2a378f3356e7b WHIRLPOOL b3a3699e037c74497413e010acdd17264d1556818b7675941c63d58c6e2fc0398506a8faa1345da9208fe182ce56b4efd2ddd85fa378f9ad70546995031bf0da
 MISC ChangeLog 31305 SHA256 248691a5a23b1f0620901b019ba70e831d98f2d92cf9c23c4526f8d920d605e2 SHA512 392fefd1393c88794aee3aea3f66b776b266326422ce247630ae88abc43e140ca02cb3e018a7c40498cdf3eb6398e89b6d9dfae69c495b1608fefd84031d430c WHIRLPOOL 7f2d6219521803df0e79e1ed7724efc47d2f3ecad8afcb34e87401258b77994e68e5f8bb6746734ecebc5510b0451f4935e74668fb21b37eb3b567656dd72688
-MISC metadata.xml 385 SHA256 be69ea943a455e40defba6e722a58a79afff0a451d09dca9aec7cad23e0d15b3 SHA512 9b2171d3cf0dd40c00c53d6adad77fa3400c375614fa3b99e1a637e96bfbc0671579295007597c51fed3208ebe241d05323dc694b3646221c53d68b397d432d6 WHIRLPOOL 6387a8918bd0bb39a0a4ce1678b44e9a58fc694d7055c5082a406e9250bbbef0d57b119f196d065a551514a8b27aa8e4d214cb6babc06416f9854994fde17637
+MISC metadata.xml 442 SHA256 54352bca8c15555161cee96f840be2c597297c9b93b8810ee25fa48290ae143c SHA512 1433d866c0791eef2ff77ec046d8e4def5020ddaea2e40aa3597b857b941a5d9b342b7b2c4d0b74bb37b2a5aa2204ef9f7629bf7d070ff8fc1c3168a23fd7afa WHIRLPOOL 2323075d0a84108b542863eb2bada240bd5479da8e8c4b94305fce45a5caede837a94f2c554ff90e6406b974f4baba373e9f49624545e8ab2a9ef5325d179997
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVcDEtXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVfySkXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmifDsP/3/gwkZ717WkEpmYuGrnG8tJ
-3W3UkS8+d11+QszOYYg6waS5NyegMu6ZnFC2o2sDkVxNUB4wdSMqYBqJEvc6XyOD
-h6D7rmoNhOGLMBjCKqK7y7z57sGmSEhvrkZon4tf3+rWajz8ElAzSmUAh2yZPDLq
-ti1AJEfb4ffdaiIncPAFvusJL39CH+40geScmxDJfTRBG5ika8GJljDaw/9ILUuF
-FFss029/ecEqIOFR9hjXCqgCnT7dX/xoZ4fj/1iDKH4fH+1PZrkckQcqqHQudRXh
-TqxsCzCE5izfSdsshPzA+JgSFxir9Z3IrNsVcMCTNWnJhOWUs9vUNVjxkjKTDUF/
-DPKAWC53rZFLDzEEk9SJHNCvoWELMlL3EdEnP0pcKdel87cwi45UnWxemfwajcUB
-6emyqsBZwHfK6YvDSPw3W4N3B1uqZR6F9sWHO6Ikqg123Sb44vWppaKwtd2fjjlo
-Ouse1nczgkynH2OIWruQso59BzpIrazO5cSUomUkUpMlQ52l0BfvSce74lEVqfuc
-ERuIcuJOdeYVgSR0bGBnGEGilH63dd27a0nz1WF1K0/VuD1OkdE0MfcLI+y/Cof6
-KxXt9y5frUiKl7FDbVQ3nuau6VdVzucgulvbK5khQ5eTUe18pqDJRcgB/uZeK/DJ
-wtoh1ydR5AtSupToHkwA
-=Go7l
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi5+cP/Alu0XLoGNH8ZKbupxjpII6E
+vcwS7cQOHRZczNUkZxxRpOcAsNiJdDXCKDi8tdTFES8bkywnxcfaOALaa9cuf29B
+HKooZC1FEsqfeG+mB6w/0kDUEECUDnmtkrswf+611EwDMnRdbVlhQx11vpfuyLD7
+6VyLdy/sTFEmoBApFKxYicbc4AHKid8lLJsyzSM8LLV6ImjX9wFzafQbgKglISRC
+UpnKqT4m43DFfrnkaJ1u93O5w2XqYeOdWjGpJP3YXmEomjGTSPkEAKPdusakUaEm
+/eTyZ9cc7D/aWcPUoRm+j+SdwlcPBTbiqqOqYZJI6odaS2aXh+/XEaY0Zgz81rLT
+i+1bPOGYTf03Gea674szLE+cn9XuR5GByD7ZMaFnOX6gla9s03LZX9eI5jN9ypfX
+n8uaHYewJ0LFUALKKkNVIjCAB5fi/A9JV8p+um3pcfS+w2jCOsHCFEZ/PY2o9zGT
+TGD3zz8iKQ8owYcW2DX7WWQNggzdepeDvvJ8zzwE4eyUx6GtYPuEwIBsJp9FAjsL
+tSeJCyE3OwIWCiomvI91xs0tKxAOGdgwyTApIlQcr5coWCmAmQYH5c//8dh6UNTb
+fOu7es4PqkcwlylFV/QJd1zoZjpLyq6F91TIBUFcXSCeyeV28twrSWexRO8KeX/q
+kh3mxWmnd1SKm6QZq/6K
+=0RNU
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/pkgcore/metadata.xml b/sys-apps/pkgcore/metadata.xml
index 3bad377c6143..1190705cdba4 100644
--- a/sys-apps/pkgcore/metadata.xml
+++ b/sys-apps/pkgcore/metadata.xml
@@ -10,5 +10,6 @@
   </use>
   <upstream>
     <remote-id type="pypi">pkgcore</remote-id>
+    <remote-id type="github">pkgcore/pkgcore</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/sys-apps/policycoreutils/Manifest b/sys-apps/policycoreutils/Manifest
index d039c40be50b..95f5e62bf236 100644
--- a/sys-apps/policycoreutils/Manifest
+++ b/sys-apps/policycoreutils/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 0001-policycoreutils-pp-add-roletype-statements-for-both-.patch 2157 SHA256 799b93fde622a168e0c7b1a0a1ec1a0a65873379e1245ec42859c00a06ca1372 SHA512 fb96bcf8bf045092be98dfce3c2d010984428f2a302e53c72af236eb1466465a27c6fba00e0912cafb28159e3d233fd82220c2456a2b8df36ba2d1286b9752fa WHIRLPOOL e1a829e0710e045c7a7ba622f4c79e8ff9d59c370b838e45ccca95416845d92a6d690cd65be2c99aa020ec7a6db2692988db7b5d72823d42f977124b35abcb17
 AUX 0010-remove-sesandbox-support.patch 747 SHA256 af6969721dede49f4de4e1db8e98e8400a8f0e3ec0b55aee9295aea0d6ba3b9a SHA512 b7b54191d2b8703393dd23a7fcccbdc3e2b7234acd962e994c8549eebae6cae3b6f62055b47a2d5db94510739abfb2fa365090c452422b6fbc02ad625ebe4859 WHIRLPOOL 1ed396c3346123af9fc8a5e911a6c241e2b64d7424b2d5194b0cc7c6b44a960c70afde3d04a508ecf525af038a52c739bc424230db34fcb52096304b2cda2771
@@ -21,21 +21,23 @@ EBUILD policycoreutils-2.3-r3.ebuild 4388 SHA256 2b87e99e95421c093aed5fca66c6506
 EBUILD policycoreutils-2.4.ebuild 4495 SHA256 f58265fbd9bd64bba47eef2ef7f65d6a7a62c1fea0b6754f6a48bb879156dc36 SHA512 43a099ac242de40c42132f697e248da84cde5c38ca64be38c4cb8729153a8921597a082d095a6d312b0e6422b6345099460039798c0f626533141e1bf841138b WHIRLPOOL 8d5757ae72043247b9501510bb561d6f8ae516ae54ee97a9b3e9ad68f61626cef9463b73a278d043b472988f7499baf26ef16e3619f7a7efb0e1c9264125f74d
 EBUILD policycoreutils-9999.ebuild 5262 SHA256 0bf3f18e901197cfecd321bee41a7eff1e041a657a4e1824d3678728e11d1117 SHA512 e00c2cc009bfd413267723f08e265ef3f5746591d639f5273a4d50ffc601cd60f7db63aa54803bcc536cb543ccc4a78033bdd044ad0ae15d72191603de923189 WHIRLPOOL 218f9ee27401591352d69daf1d3a7ccaa596fc2c5ebd32842fcea33d96f15e90de0ce81346bbb671d9b8f9222f91dbad17a9535af35e06d5f453e2323ebaf4db
 MISC ChangeLog 26573 SHA256 ed7d9b9bc3fd89f29cb06c58cd1274191dd2e530a3b8dd83cb2da259d09d1824 SHA512 5e326782bd849516aa8afeed38c0bb9ec52049fc15dda4ab45d5ea84a54f576bf998b02bbe5f73b8c26c26eb388c064dc1e81fa2208f5989b4203ab4cf7adb6b WHIRLPOOL 8b57bc4114ca783c3bd492bfae5875124fd07c4225e64b5ccd7974d0c6e1e576e88bbbd8dde9ae5c0fb0a8aa7850124074c6bc634da87c0d05678c145be2ef00
-MISC metadata.xml 971 SHA256 9d2157deddd1a457ff3d7b1232ec23e71367852b743ef6b4b8290349c3c9c698 SHA512 79fbbb6285a75f84fdd103ed704d62ede2695e7b8fe03f989ac4a065261a5e870675c1186173c1d4a65b88ac98f8bc2153146010513926e1a1b53efa52564a03 WHIRLPOOL eadde5fe3a3a2a71031d46f7e7c602f8069138914e62c44dff4be09afb8e23391a36d7c358a011722151437ee51be9f404ee1360a2d918078de3f783ff7e062f
+MISC metadata.xml 1031 SHA256 06b7505520a24771b371e3e969ec42a0d0235618c091f82d3c41fbcd313246ea SHA512 61c998ee18c95ff4b69b6c6d8b3b255801d8e15da326b5f0800adc76e0c264965303e0af56dc10b31ed484baa7b1f2d425f02e0454912480ad0ed6e3cc80ffed WHIRLPOOL d25970c2f991f0c6022a92248f749effe1d987425788353083ad8eb1d6aba29d97a6daed2115692c462cb66e8c441752466670c6b099a649b5ed177112970543
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJVdwhsAAoJEC7dUkA7aK9HC2wQAJHJi9AsOmlUnFokVxMMkXSy
-SWR7FpmMv+fbqJOL6o1ZX11xBVKN6poqC3blCwr3Pv98iENqCbluJgzANiWFUmTd
-OS06d4Q0USfUPl3GSylEPRNIbqxoIlD24vdolN7TnU5WfxRvp5klYUAsYoTIQnmy
-LViUoBZMzgJZnoUbN7by2geHvkb5U8B1aEawkSAZq+s4M/dFlMtkgYD/DNAk/ZFV
-jNhde9bxcvxmmfV6+er2bUplzeTZtwh8wg/6Toh/dOa0kNCtbVMlzNvU9JbAjlK5
-r/1UsCE0aHrQvRSt5BNJ1DT7vUzyrYre+Wq11ox1HQBNXdwk/rDtTzRi9U/RVVSM
-I9f0OC2RSCVX/E39jjI7jwGUeAwgkVXqcOm7I4s6ThSpyZsi+VjdyMRwYJH3jUEN
-4xfT3hR1nGfPeXkBoGUqVf8n1x3tlzFManweFfxs+HZOBcUkGQh5AcDk4YDihsOM
-8mZD6R0aGkAOXzfWQMZHLUzwOdd+07FezFFfby7tYtyvbjmU5xosz1PcoyY85Kqm
-wey41drfr61lLedyufgmW4lAYAtNnUEn3bIeiwuvjSPl+J8BYhjSel/zPsPww0Ti
-kVyHB0FYagF18FR0Dg3ISYfyWJqjpf+gJQRjRhxPSTGQqcX69oRTjNR6Dds3IJE9
-UetIWSxlDBewq0kZxEOr
-=/Evg
+iQJ8BAEBCgBmBQJVfySwXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiZdoP/RMFcNOoP+7m2UQ0NvvLC+/6
+jxN5f+2hmhbNIzq6ebvbWYcJxPI0juRokV2QnVJNSHQFCBoRWp8bjwSlEeLZzAJ6
+MQLZ3UOCyqQ4wM897g3d85FAaBPRT1RHLyNo/GsuhgRhIRtPpfYVr+qnbB3C+XDC
+faik+Pe/4cdjAewp7a6WN7MXiG91P9t9/qNpJSTLm1H70CzCgDLrp/+3Yp2TOgkl
+XtuYJ+Uy1u/zljxWOGgMKU4Vrz6eU48THFo6MpfatkWX4hkQt/TowCHFmQi6djRV
+/jsIUybwCDo+CadMaqfhtFQvBHMju6zcD/bCyp2y2VdFlhCeUp1qVF0iO6VD5xXo
+2DCPb7QQMAKtFmb2GI0KoaTFjt4Z5kFPfuwfqCmHlIf6a3nijVHFNVrz5nhK0gqx
+ed1TEaN++f3gXor1xEUtCyqIUSyIsDSi1OlpstVudLnFf0guphSmKZHN33vfb2ou
+AMYx/3TOW8SLZdt1bqyzlwHTKzTUUuhB9eHHkrhbdT8pWZVi2YS+MzeLwJF4FzI3
+SsOD9P/bSBiA0ZIsBCHUVScc1jbw44sBkA9ASazvXqwwQZoZvrFnO2TmCM8KrB0G
+pIRGQwk0VsBE9V16IctG6Oq9RWzZL0BHgGc2lVf9mzMTzcnDBP67iAwib8nTq47y
+2cXhVWXMXttYpsJHgcOK
+=/8mn
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/policycoreutils/metadata.xml b/sys-apps/policycoreutils/metadata.xml
index 866173173bfb..7190ed6251d1 100644
--- a/sys-apps/policycoreutils/metadata.xml
+++ b/sys-apps/policycoreutils/metadata.xml
@@ -15,9 +15,10 @@
 		permissive.
 	</longdescription>
 	<use>
-	  <flag name='audit'>Enable support for <pkg>sys-process/audit</pkg> and use the audit_* functions (like audit_getuid instead of getuid())</flag>
+		<flag name="audit">Enable support for <pkg>sys-process/audit</pkg> and use the audit_* functions (like audit_getuid instead of getuid())</flag>
 	</use>
 	<upstream>
-	  <remote-id type="cpe">cpe:/a:redhat:policycoreutils</remote-id>
+		<remote-id type="cpe">cpe:/a:redhat:policycoreutils</remote-id>
+		<remote-id type="github">SELinuxProject/selinux</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/prctl/Manifest b/sys-apps/prctl/Manifest
index 156c1c8794a2..020239728c2f 100644
--- a/sys-apps/prctl/Manifest
+++ b/sys-apps/prctl/Manifest
@@ -1,24 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST prctl-1.5.tar.gz 17507 SHA256 b3fed2cec8721518179355d1a443c4be58f73ea224aa4c0cc4ba30ec87479687
 EBUILD prctl-1.5.ebuild 642 SHA256 0ca5b400d7d54ea48ec2c65ad0badc0a619034810d511a8b130ec896619902bb SHA512 e0547ddc8ff06213616dd23fe12612f10d744646b9b2f55c5f161b76df6cc06fef435493ceb665fee2bef91d3bbcccbb3be4f6956a6c9a4a8163787bab68b165 WHIRLPOOL 8bbab699dad3110a6d081b5a5e592ec657e94946dbd30d81ffd7f0f66a5edf1435b4f4189e13888b9bb428232553bd9721b0dd74bd8bcc23cbe0d9b6fd760093
 MISC ChangeLog 846 SHA256 edd9147e70dedd704addd08f404746ddec99266d9a6a0d32b6eb2d15914a27b6 SHA512 646ed708958020c77f920f2fde75e69649b7b93d86052ac11da38ceee6550ea9a4ee1bfcc7ff1722fcb88d0604e90f634151669d2bdd9441486ef195fa1b2dbd WHIRLPOOL 360a119f66a700e07c7530e0e77b5b2578835844f88f75744b769f865a536d28fde24c336bdb26885900a12c831583a93b87006a2cff9c4758184a1759a93f9d
-MISC metadata.xml 157 SHA256 7e261fbe78f2088ab2a27fe3bd23a4224dde9a11031edcb4b7bb95dd3ba1fe4a SHA512 0d0a45c88d8f80bd12c6f182387db789e11fb77de5f17f6896e638d1f57be0e207f8a0bdb63c4cbf570d30fb9d4d9928374bddd26bd035dd13485779158e078f WHIRLPOOL 431702b09d79742c3946fca1ee4adc8c7dc7bc1f35b8baa9db077208d540808a9dd774077e268a18b72cbe97305165b599a2cb4553f514691697da7f2251418b
+MISC metadata.xml 233 SHA256 4ab082e85e247a1e5b64f8201489a761f35926ad4b47760a35518c472be7cb4a SHA512 4386cabb77daa4246ff452199e1fd1eb6da4b0d95e7bb085871774f36999df61b711ce6a6fdc4944f99c1d78b1f38146d647254191a0280b708e46e34e2eff4e WHIRLPOOL 53d42f220ce98694f91d3ed9a88415cd4a9ef0562be66c9c0b7dbe13786527d9c03319bfa350fd584cf135904e994c25736d770560060f6c81457592ee770c4b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJRBbgQAAoJEA/daC2XTKcqQjoQAKRR2vmsKbWHEuhw6Is0ex5x
-SKalNJGUtw62K7SdSFJ86RqJq18uIz39D0eUOEKLV2NnnCn8cOVQTYz6gquk7yYK
-q+PS0p+xYGkc/UpzO5ZHWlQWQAeM9+wVpBQfVhJBvBgZWCl7V2SO2mzsnkRSXh/6
-FATHq8iiK4TP8P6Y7Q+2lAo6imRaJwRF2MkyMIqri8APVj9NpS7fWecPWg2WyMYV
-EbgMLhdEYzfFaGR5xSRg2zGeh0R6gBL7BY+nQR6TvtCJEL8qYBfkbQJKcfs7ARCY
-LRD6DkWCwFCKr7dDJBGgmFb5yMBRR5VZhTs7sEqa5uflYbGeSJNm+Sa+z39DvyAk
-ldh2QTKjOl3Gpav08RPhm4BvtT4P2OC769j+cMild2ayoIjehzS/cbDkko/mV18/
-KrzYjQhyzGcvhnMGalshmBIKmCnbNDZ8G6HADWRFP/JkCQWpr7VZdPq5o8hU7XtE
-/YFsLF3bRv+V1plK5aPRE7i5ROlQxgvCU8k9vkTsicf1xEzkEanusUUiYm7IBaNV
-+v7SKHwht0wAdzB0MZVtCbhITUgn+n7cvNzhFPoj8HeLyb7OtXdfIfOvDqpFgBZI
-PLsPT9RCq3ENmsXpjggQPsNM4N+t0rLynWzrixXAoalfTIUgYtYSDJCzNLC+imm/
-jKuC/QEVl7Z6YA3HrhYM
-=1u0U
+iQJ8BAEBCgBmBQJVfyS3XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmidMEQAJ9QQFwJvYBiWYUOPDHvG3Yi
+rPS71qXPR0ujVbcXZy9rzXwFKrxJxOPbcrvaO0Bs+9EtE6ktB7G3TRbRXY/QRPvt
+uVxARuqXnXUuYF7q00cNbJymUvCUG5DVhgT96VJOhWeGy/a9+m68XvojB+0EOXvp
+4CXIFYo2LFEL40FKbSLjrnJGrqo5Jsn3++mP4or/WRKbwYYvAdXnLZQYNAO/ZPbJ
+2ghh9pM5ETtgyJEqKYxp9M5NFW2o3f+CgKod7dPiUKXUvgUTA29dsxP4frnibaoR
+CytY1VaVzCGK2uUYmBYkWa8VO1D0PDsEMyJcOSV2eOsEDtwgCJJz88//nBAsm49i
+0ImL47Dacuz7/LRe219JQvhMOPhg5imNuMSK/4G9vT6AW73hLNgUeI+mvb7mgqpw
+mkMMvS3n0kuSol22fSdS5ReyfZ5UwIBds435oxVzKage0LDZnYULd3uTDk9wT3X2
+ybY9jNRlcvddZz6TyBMfzVXiTgGeaUf9Hi1pXMiTuhtjp30kE8/6w5KRLK4susow
+bkCmgkasvTmxsK5UiKmCfq271ZSy9GtJ6Bwb9FWSmfT/R2E8jCPXuuHcLkT4MHHj
+0f8rX97XIAUjeze7hyGYUCMC6PhzyjqRUw0SaW8u7KPpr2B0s+dkL5YIGlJVFa3O
+ohmSVtXbIQwttaI04uOK
+=QMxx
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/prctl/metadata.xml b/sys-apps/prctl/metadata.xml
index fe15722775f2..dc84e004c37a 100644
--- a/sys-apps/prctl/metadata.xml
+++ b/sys-apps/prctl/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>ia64</herd>
+	<herd>ia64</herd>
+	<upstream>
+		<remote-id type="sourceforge">prctl</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/preload/Manifest b/sys-apps/preload/Manifest
index 0a9355f3928a..e8dd5e674acd 100644
--- a/sys-apps/preload/Manifest
+++ b/sys-apps/preload/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 00-patch-configure.diff 554 SHA256 fde86c42379111b211fa750b6b32cd02ae4f0d1e2597fc7f9e85d841ebf71be3 SHA512 08d0ec88d15812e9a495e3b5bef080539f088163d3ad3b390fc6f5cffaefbdf8a6ac854c9a24ec0962466afead1223ba5621566649fea6bb84d80bcecbc16c3e WHIRLPOOL 87b800eeb873fd627f3f02985bd15da1a5c6516d1fe5ad127fe5062cf592f2fe233ec2d36210e1725f677afe26376f9adb9339f69916712604b3af7932f4d83e
 AUX 0001-Early-restart-of-forking-readahead-children.patch 1900 SHA256 13a2d3f91960f9ebddf4261aa9e53f64ce3111b5e1c5273f467f00d3ab0ac880 SHA512 c24b22605e7fc020a5f2a069a65b2ffac9caae69b70d7e5925953f9e4a71992ca34f4701de7b9e975321ae3418a2d6a6bd952e162b8167891bc68128dbdc51cf WHIRLPOOL 62bf4e4b9f67f7cbb7e176a3d59e71f92fdb9c914e3b9f476eac0b79d1d74b4f5dde9dfdf9359d9b9bddf62514d7eefde53965a254bdc0b38210daf2377fa835
@@ -16,11 +16,23 @@ DIST preload-0.6.4.tar.gz 140750 SHA256 d0a558e83cb29a51d9d96736ef39f4b4e55e43a5
 EBUILD preload-0.6.4-r2.ebuild 1510 SHA256 9288c70905ffbb0b1c595b99aa659bea1dc5f3af1d5b945effbac87cbdbeb1ce SHA512 abd17fd45e1d061761e8103380572f5048011c462f90698a25cb73975e12a4e6723c946d84bd8104c3cd66b59d46d5606d0e52a641d4f69a1fbce2459fcfa619 WHIRLPOOL 058fa67776c959189adcb9736e1549f53413e704e0a95ce78573fc6ccb47eaba6ba62db44bd61af21864922d9dc1a001df0b56ea30b9c72fa40bb7fd3dbe1997
 EBUILD preload-0.6.4-r3.ebuild 1817 SHA256 47e98c075533a6f86a45b5ad416f430ed6abf8ed3c875be94a8225ef677608f5 SHA512 40e59fc6ed680961761c838d6b9916f950518276fac75498f47b427b76e9ee44784b2ac711ec88240b9acf781f67b646e9b1d5771221604154eb715d8767c8c1 WHIRLPOOL 4f3f4f9a06df5f8b41aae7a9c614e04b9a5ff209c29bd08ce66295c25a31193d68c2695c1cb34188c9622f08cd3f1132a98630e63f10ee06961da58b915d9db0
 MISC ChangeLog 6442 SHA256 b8877b4600747b062b52b4f1c8ed2cf2c52731997a853d3e83d1e532c2e659e2 SHA512 424e199508cdd4e19740efa4d9aa0d6864161541c3e9d8c83e7c717f3adf60c889cd8343be6775440eb7e056e4d4311b0afc537331d98adb1dde4aef29ef7612 WHIRLPOOL 70f08f58165e93edca0846868e63935db719966fe9c25aea69154144a8d774fc68022b6f68ff46fcff398a6c2eb7754bce0aee6da23ad4f50e6c161eed762e93
-MISC metadata.xml 479 SHA256 d7755d46128afe847b586eb8273719ff978dff0a57097f6b8d31a844223759ee SHA512 25eb94a381533d45157939245211b8be4a34839ff136419a452240b4c2f8ec8e7b097097fb0b05ac12577c84ba837989a6420f16283f3835c6bea79765b67493 WHIRLPOOL 66d72a3aea73a8e4c67c8ad388bbca8bf71635d50c1e47644788ae56efd3b8b61d26083f15207336eb67c26834fae0b9f3ae9daae60b239344f3b8ba53f4c4bd
+MISC metadata.xml 568 SHA256 c849c70ac2d2c1d3e864423ca5ba9dbba2e46c35f0c48b0d6ac5f9435975f9af SHA512 249f23893daa674d6d14c667f0e650697e2d9c75cd79a7dbd2addd19fd3306ad0de26f0ff366093f92e06bc93783d605911d8d61b4c8bded57b041dde5ab87e6 WHIRLPOOL 5fbc78528e79a2fb4e5e5d33a2727814c5fae9339938042f32db270f9a8b066aa40f48e935b8ad7b1040563ef456f6fc5362acaef454963b294505c8a7e5e677
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlPn1QkACgkQcaHudmEf86ovkwCcDtu8/6wGTTY0KbcefdplzfuU
-x24AoIZeQtTD+Ec8XanFnn5FhTs9G/h0
-=6f7r
+iQJ8BAEBCgBmBQJVfyTAXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmirW8P/26VaDTRQq2sGEER3Lv7HUdI
+PlY3F00OF20Q4mEeBHU7mVAAVMC8poAxfM0xLcZeiSMVOEWhzeR/b0egBFLa/2pc
+6ljDCdrRE1gB4q0C88ZYPEFYyDSQ957FaG41Jey36sM5ay6Ujd3jgu6kjmEBy5QX
+l/mm048MlaRGr+h+bNZiNyOq0ZJ/NqWzg+vzva03KX78Tg6Ndw9ESgi15T+wsfCy
+7003bXD14bUx8F1uYzg790xOsrsxAJFLL4fOn5SiLC7lwDueBL468Bi+HBVLS5ns
+JiF+DP0fETcADyjdKeTXCb5eX2RE/Gf73ld0niyLef0MRtNHFUgSXrthL+IYiOQn
+qrZFmK3JquA4atpfJJWjACl2uOzVFI9vP7pW06/8NR+eR66nA9aK5TqzJ8r2G/y4
+9nUNqZXVXPkRb9edaPTtiQxsnfAZH1g8gqY7w+KU7Wsv/xuThtyh1BuCLWOXph3l
+r/DHhq7b7h1BeA77gydlZce+wTUSDWAG9p7NYVEf7h+D8sxLJLfh7D30876WeZQc
+105tLgrONrugJOVdaHedE7TsomvY6hzgG2lJj+sv0/ib5JQRdK8Eseo92lupCjA5
+gpsKSJXQgKBvpLuvyZZp1HmUQgMIw+QA1LCWupM7gDq9Fqtr2SDvw19LJmEzIvXt
+W5wrfmqduUhuRE3cSTFO
+=A75P
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/preload/metadata.xml b/sys-apps/preload/metadata.xml
index b3e981b83360..e14703d34f93 100644
--- a/sys-apps/preload/metadata.xml
+++ b/sys-apps/preload/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>pacho@gentoo.org</email>
-</maintainer>
-<longdescription> preload is an adaptive readahead daemon. It monitors applications that users run, and by analyzing this data, predicts what applications users might run, and fetches those binaries and their dependencies into memory for faster startup times. </longdescription>
+  <maintainer>
+    <email>pacho@gentoo.org</email>
+  </maintainer>
+  <longdescription> preload is an adaptive readahead daemon. It monitors applications that users run, and by analyzing this data, predicts what applications users might run, and fetches those binaries and their dependencies into memory for faster startup times. </longdescription>
+  <upstream>
+    <remote-id type="sourceforge">preload</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sys-apps/qingy/Manifest b/sys-apps/qingy/Manifest
index b59382564b85..dd02272c2a3c 100644
--- a/sys-apps/qingy/Manifest
+++ b/sys-apps/qingy/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 50qingy-gentoo.el 241 SHA256 66f0e2a345fb7f6cc3bf29879a6014165de11bbd9d1e921ea843780234cd9af3 SHA512 b4ee1fc4b2337647f775bdf38688c93bebad4c4beb5bc4e457c45da014c03832771c5d01112af4a3c3d55c5852b09fdfcde08519b0d506f978bc772c2afd991e WHIRLPOOL 2f066782c5af0876ac55dc8c77743a5a153127901a049e78ceb3a8f3242734b1ea4525b3b1e82af146915aa4bf32d6c35b1731e36de34260b687f8cf867d55da
 AUX qingy-1.0.0-tinfo.patch 1573 SHA256 f61c69bc7823e360b26b04a0ca16d7001dca8dcd07c932911298a79286296f27 SHA512 a37b92e3e4da0e87687461df7644fbf1b3adef81ecdee411073bb0593875c493cc110e9925c8131b99bc97d143a811190e5e6d03cc4992a18396135936697fcc WHIRLPOOL dfcfef8438856099d58d3e2c17504dfa8634bd8215f2f32a13bf1c1c0cfc4983d71a2865401fd62977c80cd0a873b103c634bad9f377f03a1a50a69d087ceee3
@@ -13,13 +13,23 @@ EBUILD qingy-1.0.0-r1.ebuild 4092 SHA256 73a22c6e5ffefda7a0e2cb14e7681393208985d
 EBUILD qingy-1.0.0-r2.ebuild 4164 SHA256 e6e4a2e2514ac7305b62de7ff16d2263dff0b47246899333c703a3c85096480b SHA512 cc9111caf3023d325b5a852b36bed8cde376e73d32dfeebefd1699d354c25953ef2851dff385ca6e53c14b927bf31f641ff7a9cea12c679921b81dd7d1c6db9c WHIRLPOOL 9d87845988eb0bed0e4bf39de44bb3da464c2b8be195a405ccf56aa2529fb197514ec37c8cddb4fa94a50a16e371113b82e875c8494c188aae8222bcc86a73e5
 EBUILD qingy-1.0.0.ebuild 3821 SHA256 0eec530849c8fad42ee125c0eedf9cd8d85fa7bb193754ca5f5fa1367e9f9e47 SHA512 baa4c7baf93e445b8f66de6a1aada81a8570c1df4069ec7d2c330b48f81f23a61dd0b1dfe850528fd425e632a5b5c82d1fbdbb8838fc629aff750153c18a3861 WHIRLPOOL 3f78e3e81b04642c1a20941b9f301d6a9d6e7a875d4b8597711b9d6dd63c556d30485ca070c1ad10ab0bc3ddf7c0ea126b2bc509494c918ca4590d14f378898c
 MISC ChangeLog 12353 SHA256 47776572cb4cd8f22bfc2a9baafab203a1252b0622ad0125e1696c22b702e643 SHA512 1e1a0e8e564cf34c3082eb12baaaf775283471e6a54d8e5470fa4209c4bf05b3e1d583499fffcc4e5f180ba247a2e346b6c9a12237cd375bc9d4598bc55b2fb8 WHIRLPOOL c2d2553b6cbda46487785326ee953224f83b2415ed7194a8b355113809f4d1c6a2ecac9768699cf43033ed65709b4f2adb49c7408f4bf7d6ff6b19cc758f2efc
-MISC metadata.xml 361 SHA256 dacf3c034464d1eb369aacf6c8d0fb752f11d0aa043760a565064ea74e24a971 SHA512 d64644ff50cd4c3bde01a511d586062615a3c73a552fe8309849eb4f09bb7a3056c78c724659f20bc0cd177d15acb656d28be7f30d508eba2e1a46a32cd3612d WHIRLPOOL 859ce1dc41b4b8c03f2fd02216dc0beac9a015e826e6c2dfdb83467beb2018271e727211c810a46f59b637f4026854b84dc97b5203cf03f1a1728f83e4f74c4f
+MISC metadata.xml 441 SHA256 598cf330d8c6877801de059acb10c3143f70e9ffef684a83c2246cf0d2dc6119 SHA512 b729c67752958c56acecffc6b95faab26ff46c4d9c069ea11978c40b939044b07d660f190b13c1c490694fe592918891a7c8f120879abd5a524df8bc7b2dfd0c WHIRLPOOL e487c74ccda1cda627b61e238a3af44e54ad87e427dd7f3da5ae4bcfaa691c14ce1a6dae902aa0652df1a17e75cecb7c34c0a1525dfb94e289a38c93e4837961
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iJwEAQEIAAYFAlVWGdIACgkQG9wOWsQutdZl6AP/XjUmoVDYrgxamhL1mAImnEGa
-PwV2OUvzH8OQAKaMr4kHRMuKDRqlJtANcdoZ0OmsuDf0muIdlnYOZq/jfZZKtok7
-yBvJToL6QfC/zCobo36ZYUW+B/WYykRoXFAKCwR68rTShpScS8XnCB0jS/ZaIFte
-TXW0xr3Z2An+vXDm54Y=
-=ONE/
+iQJ8BAEBCgBmBQJVfyTOXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi+XgP/1bcDmySQC5+MrFeEWFziMBQ
+KqjlMWC7AMuPvzuFctGYm1ogBjDMI7MVQFKYo3MtCERCZw2lmUmKNE85W5HfRh/x
++NWWNPzUsRlhIqVB1a2C7EaZRKvUtUr8g/3UraeJ+SVA5GP/XKw1cMVLkSFhSYVv
+b9Evk9eDCmpnpsoEZnfjmaVPegIBEr1Jqd/NkVugQRJAhYwh8jYoRwB+hVbaHWh3
+K5Uqx9O9gonUtpKx3u8y4E7Prl/e8ZVpd2pY7MJVD5dGz6GRybHmAYElD1FjvvXc
+q6RWUd6Wr8A1UOxPYjKy/vPfXJThbuSQd17GkEsuGlB+oaiJnQTkZkd0serK5cHF
+gI1wCkOt2xFIHYpy04uN0Ph/QtDW5lLnowICpCNU73xiHJEdZhWKk4MWKRYIknkS
+A+Ct99doSS96uOXbQSpGOue1v03CKfNKbWc32+86lOT2tvKqoxd33CMV3qekWejy
+Rj0Nc3oAvOCvf63qjrxbADYkK62SC+yhOIym1tyJWJYa0HwBPu/Qp19V9qWoZTKe
+kCvmwgrPaXuYB86c1llPfDuQLlwSrUGa0M59qP6krcs4O5WPj42rcnQJcwuiL0I2
+JA2sb8mrqVM8YKKD/HS6kU6RuqWRYy56FrRhTNAKZVOJ+kVkyvGEpvhm+/eVgKvX
+FTQtmRBjAYfnr1iOgvAJ
+=6OwF
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/qingy/metadata.xml b/sys-apps/qingy/metadata.xml
index b332093fd9cc..0ed2678f8537 100644
--- a/sys-apps/qingy/metadata.xml
+++ b/sys-apps/qingy/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
-<use>
-	<flag name='consolekit'>Enable native consolekit support</flag>
-	<flag name='opensslcrypt'>Encrypt communications between qingy and its GUI
+	<herd>base-system</herd>
+	<use>
+		<flag name="consolekit">Enable native consolekit support</flag>
+		<flag name="opensslcrypt">Encrypt communications between qingy and its GUI
 		using <pkg>dev-libs/openssl</pkg></flag>
-</use>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">qingy</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/rkflashtool/Manifest b/sys-apps/rkflashtool/Manifest
index b4cc9a89484d..0cd62a573ddf 100644
--- a/sys-apps/rkflashtool/Manifest
+++ b/sys-apps/rkflashtool/Manifest
@@ -1,5 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX rkflashtool-5.1-missing-version.h 149 SHA256 b7bd8e3c66170d5f6e6a68c5add677ad365e37b4121251de87ad29e7fdf06cd6 SHA512 9a8164d7b86ea2cbbddc55a19cf0af36bcb2f34f6b085c3dd4996e2182124fbefcd0ecf7bd8d515a53c5822024f7ab6275415c9b46888b99c99e657385a455f4 WHIRLPOOL 41faded05cc3cd0ada335503c3b8a2101cc7a3bf1b72d48616988e52cf6de9414dae0893aa3b570c053053969cc0d06b1b981c5449845fc4477d3ff6727c6067
 DIST rkflashtool-5.1-src.tar.xz 10548 SHA256 b802b4bd634a614df23f45f65cda8620695282e2646fb5eacd6a69001a110ed6 SHA512 0dbe69dc7fc224e91e170d5630e770e82257121c2215c6e196b2a8450a9e22bab583b57de50acb9aaad223b9d216b731a92260638c648018c319917705983fb2 WHIRLPOOL 6b1de8a5365e55eadb21d2c96c229a2876b31ae9c4a9dade50bebb8eb4e2cc5642ce33213b150487ca546215d47d2cd062f73b958508a6569f3f85c8c396017d
 EBUILD rkflashtool-5.1.ebuild 878 SHA256 0a1248b5cc1fff0b04709edf93da4476d102b322359fb757790f8931f5dd7836 SHA512 16f812eb78c9207e85a3b54cb77e7183dbfe05a2dbc1ed95e02f5388911c4e8a5a80e08e34c5f3d975cfd4fbfdba61f0f5360127b4a2dffc216db4a31b6c84ab WHIRLPOOL 77ce537078d8f948522208e0d165a6221c5d42cbe5cbdc600e6f3e15fe59de661b067e559468f26345d22ed0daa333ad6e57870ac2feffe1dd9811c8190f471e
 MISC ChangeLog 663 SHA256 f626a9f7f54fd1da8b51a1c8f50a6771772a39ddbf568b8d62dd093672a11bc4 SHA512 3ca7b1fc24bc1d6f772efb38bf8ce976b2e20ad65b6b4a47c4063ea314c70d698dda2a19d2b143689972e8b5d204cb988fe974521cd2c710298457618c302f13 WHIRLPOOL cc1a215c10c98e1da26cc65dd334b3428ea59f3413393b9fd88f7fba35370d1c52e8715db77c9c5d259930e36f11f91010a27faf176d555782ef7510c3128364
-MISC metadata.xml 231 SHA256 9c04e1ed256c8293b1120d9b56de16e3ee5ff6cdb3967d517d46c5974c23d67a SHA512 0aaf70d152f2b3a4b333fccde6f5c9fbb6cac1a9ecf3e2b2ddb57a1c260b3f0e7bdd215edad17f959b2a3324929bf446164341531783431c3435d1b956d09d83 WHIRLPOOL d631165d8a2dd82731e34fed2e3c09437b8c0d383da28c3e0a5f704196afc1810a7efee388e6b558493e82fa61cc799ab3b93eb1b7b17464dd380efdcba60d06
+MISC metadata.xml 312 SHA256 d52ecac6bce100355e412be2ceaa6c062381b6ee5645a4fd325bc55c6ee3af6f SHA512 a7866597d87cbafbf5fa7aaccafdf7db6094751befe4d4e0a68dd4c9c332d0bfecdb51fc353d6b322dbb937a72bf95201b44d1603995d19b8da0999c9143eccf WHIRLPOOL 338fce77a32cc954a21f92bc7208f7a1c2ade4cfeb39b915cd6d073edaeb04441408dcc3a518c556f9150f05a0e69c327c9fc7a0f863aa06e0d76211cebbc184
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVfyTYXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi6AAP+QHlIxKz6gzrW1u2FnuBP/dr
+ZpwpnV8JNe9vyuqA2kzvDm23/wCpEmMbv+RXpNvNNfFg6wRMbg8ZMnTqMZdz9Tcg
+JUvD4qapBE/5m5awx2eE1pxGHs088CL4gnFAoo5Ai1bGpVRYN4MqMFw/NtY9CNUa
+oU4vochizwUaNp86if5ILEgwDaWurAOqVrnM1bL9G3oZ2+XSTIWsJpNsffIa6rr5
+0B5EyeG1PlTWI7Sz65aX/OJ/2jBAkyLVZbltU8RW37M5plxUuO88QFM2b/mU8CYX
+QaYiZCRffElrgwy/EDD4bENifQKY2b6nnH32aWQ/iQy9/MHOmG1U0sdOilXAxOm4
+CF6wWT4JRFJ9Lj9hCzkm+ogj/264RI6XchmvvkehI+RwTv0yuuxo8fMXXUVKcs2/
+AU2OsIkBbdbEAajbFV9u0CH7vVoie/f2wK9NNWMae3EhlZ6YgGA19TVWunhZJ/UI
+NCx8kAu11z9fP+vn1zLz/isbIUD6urkY6IRocXiLC3Fqe999O2lFLITxjoEAHQsO
+gJ5SO5+ejMDm5V5vceRW5KNVPOZWT77x9DiFe8lPjiWHXbnQvaYhhV3zwGsOCAS3
+wfOV45D8k7Ad7IuxjNKFQno+FOOoJZ31VQQKjTuGt9gYIDd6Ek/Nf73Lcik1L3Rh
+gWZ/5E9hyqgAKOEsl/c6
+=O2lu
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/rkflashtool/metadata.xml b/sys-apps/rkflashtool/metadata.xml
index bfcb6974f1c4..8104459971ba 100644
--- a/sys-apps/rkflashtool/metadata.xml
+++ b/sys-apps/rkflashtool/metadata.xml
@@ -5,4 +5,7 @@
 		<email>mrueg@gentoo.org</email>
 		<name>Manuel Rüger</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">rkflashtool</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/rng-tools/Manifest b/sys-apps/rng-tools/Manifest
index 49e76ff90729..81170b65dc89 100644
--- a/sys-apps/rng-tools/Manifest
+++ b/sys-apps/rng-tools/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX fix-textrels-on-PIC-x86.patch 1971 SHA256 55d277a1b4dfed429bf82ca430371f2487e47948630203969bb66fc63fad39cb SHA512 201300211d322ca36e945f5adf225d072881f285b4d4a8710baf1416a532386befa91eec6da7131278fb1fbcecbf67d47742e563deecfd6d363f60b477462d09 WHIRLPOOL 92f189ee66e35f4242d2d4e7b6fc7d314775cfe1c211a900a5442f82fa3c18cbb8d375d8c7b80229ee21e8ff5fa4617c56d10a787b6b08831d7ae72cca9d0c35
 AUX rng-tools-5-fix-textrels-on-PIC-x86.patch 2677 SHA256 71fac69129bf3ac6f54cabdd995db2946d5ccc279212de42608cea19fa3c2ada SHA512 8c7c6bced6e0982069ba6ef99c169609ff452a55c32543c25f198a59f81d4e976caf400867cb52bbe2996363f22943ff73c678427da43ad3a019bbe29bd29ce1 WHIRLPOOL 2346261e9891f77a48e8ea54e647fc77e40ec79d099597dec4fd06e265ac3a255eec8d6e2ed46ae00e90fd900998b48a6c3a963bb89d9b81e3cba24cefb7ba11
 AUX rngd-confd-4.1 562 SHA256 cdbd39f7446f12a9b78e87e9f135cfd0f6f364c4fa4ade0c96084b85c32afc38 SHA512 45e0e9cbe0180162f659bf05c15ee99fb8c1b80274cd8744384ba7f791b1c9a46a63e81eea665b4f492c13b7d5cc1fdb6e524a49a25af77f3791f527b31f688b WHIRLPOOL 87634cea70a1c8ffa7598cc8b0d93c79578433cc21b58bb13bc9144502b9502e2c4f151bcf282ad4ccef44a931f1be5d1e87ff7b9b6d07cfa0a4c288b4172ec3
@@ -9,4 +12,23 @@ DIST rng-tools-5.tar.gz 122182 SHA256 60a102b6603bbcce2da341470cad42eeaa9564a16b
 EBUILD rng-tools-4-r7.ebuild 956 SHA256 00abc3affa477a0a0aa41cbaa306559d2572be3057da98075a865acd0cab74e3 SHA512 73ea16875d26b57a0650f125cbe25a930f06904a383c9af5bc5ec01e6e1eb22e7341c312a41505aac0fed3e8a6176286151401b4d0aa27d2eaaedf2490dd67c4 WHIRLPOOL 3a8a73cb5587acadfae50ef0f912e0fcaa78dd43c96bf7129330c5a1fef3fc21560aaca370569da0f4950584441fd13ffa9b04b51b40f98592e8429442177f04
 EBUILD rng-tools-5.ebuild 1019 SHA256 8c4e1a5f5f07ccbf1ec8b235f672d3256dca7a034e1811f5a14ecf4d599be7bf SHA512 cce5c741e64cbdebc64fd11f0cde7c83a7d3aa679824e13df737192fcbc2792e855b8eb0f674beb4fb29b1ca8507acfba65212ff95dfedcfa5f785697bcf9a91 WHIRLPOOL 48731352dd258b8b203801f632c87e3e7cf22a170584963ffb084f70e991d0cc9a60383d7fe53fa4a988018cfaf65e6be4d2cbc63addce90c7e3f964b62ffd5c
 MISC ChangeLog 9568 SHA256 796f5413c30ad7ddaae9b4b195b9e44baa8e9ebb4857645552697ac6be17e7d2 SHA512 5d0bf0d5f5adb31e7a13bf39486008b4dc63e6cdd1c1bd50a178d769a0bb818c23433e5c42fb3a9327dd2ce7b23daf0f29a8613f5c4f6d3866e07f3ce868d9d7 WHIRLPOOL 427612588c648f96f205c749d0bf26b995fe21e23f16cb2d92c8d46d697f67fb55d45536e43bcdc72a6e74ab80f90ea1e69b68f20708fc4b3c2ec22bcae770ed
-MISC metadata.xml 165 SHA256 23a8851c12bd4cf7cf0528250ad5605be6b0780bbec0c51331d6d2c618c13f6a SHA512 3f1bee5d098a4e5874df3af56169397cc3ed526f9c56004b9ccaa4c5cf02d4affd894400b88f50f3c19bf5ba3ae06f3d4d2cfa5c15e97b7d4c33053e5f0f63c5 WHIRLPOOL 070ba3ff0b1ea000c90d8af13cdac14693dc5d9dcc8d8ba89cf9bdbe91196e3cf9e72bd2f01cd5efc1ddab63b83184159298d1ee891bc123107ea6891ad612d2
+MISC metadata.xml 242 SHA256 5d4cb5e11150590f9ba5144ccfd4742721dde62ec07bb8d3e7257f76f2ef1ff4 SHA512 1698f305ecd5676d4d4aa7167348854c87bd38c43be63b0887c20371c34b1a5d76e39cd10878f9ec2f30d2c3dddd6454d995367370747ae3a8ebeb17480bcc76 WHIRLPOOL a285b6fd6129a2a2615ac2642ded5208d05ac29c381f0d1b9c0762772846f06de91170d19d0c171145b2a762e0901b4411dd4c101b0ec2f5bcfd68844014895d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVfyTnXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmisuEQAKEd75ijQCEUBREGOlOs9Y/Y
+U89j7ayLhM4+qlBccE4X0ZMyKiP6nVYFdReNcN7j5WWF2pnialZYM5uZYK2gz1Zy
+3MnHVfEPrMJIHyeClCkQ26mwSkaMVg5m8xROUk6gROGVhIgzp5E3SeZaKHgtOgGt
+4/XpB6cHR4qV/kQDA9Doy48QfhzofWkZjY96k0dTnPylX8Wf5pHRmuWystQR8vQH
+P+k1M2bGjF8cEMkQI+YaxStWvdgkE56hg6+eAwCL1XJ09CtR5PK7081QJ5gLfDRe
+kh/CKd+Adp1CFVHXsQplprdjxVi7fcpUEBPGevs0n9EeezooOZcnlqwtXEhwjS0h
+eE3M8hP0IMcbkt+pOByRae7pGUDyMRaGLSpS/v+0FfwE+C+YHQWpBRJ4iLFEhRZe
+URGdtrIE5qcNPhOAKG9PrKpt9KKgATUH6IDAJmfUAh8wE+eMo0YPxNoPYIxTgPg5
+NQbL0PmtOJXG9/EphsqRHYCqsq7DaKaNBy1vp0+jRK7elRhj8aewYGp9BPz0ZHOz
+kpL7Ke1fih31+lBkkn1Q/zaHduFYb93dw4f9xQ4UaoD+UN4okkw7W21FUg405aK4
+vpCw6OnHEpKGLgSzd/M6diQPYv8Xg7l7CKjMaDjH4D21+A6Km65vUgeaQE1k0lH/
+zhoFfmX8i1TeIrZn4DGh
+=Yuok
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/rng-tools/metadata.xml b/sys-apps/rng-tools/metadata.xml
index 659da0ca93c2..1b5ac80ad4d7 100644
--- a/sys-apps/rng-tools/metadata.xml
+++ b/sys-apps/rng-tools/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>base-system</herd>
+	<upstream>
+		<remote-id type="sourceforge">gkernel</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/roccat-tools/Manifest b/sys-apps/roccat-tools/Manifest
index 8a4759a95c37..b8c665d7bc84 100644
--- a/sys-apps/roccat-tools/Manifest
+++ b/sys-apps/roccat-tools/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX README.gentoo 858 SHA256 4d7ee8978e4e08443eda0ce084db65d5caa99ae22fa8fc25956b9cd712aaf117 SHA512 3f88197dc83d4bf7e3cb8fd71079754ffa355ddf5fcf151304ae439090da44b3bdef3ed9deab44b36ffffb4b28ded2a71b1abffe5d3e1aa87f56bfa264920a7b WHIRLPOOL 2279ce5d4873c8c36e2bf6f433c62ba2eb21fce1b69069918a81583c9dfcafaf9b652f4b4c9e7f0d538af00193f52e5b0eaed29da5d52c2e9108177f847caeb2
 DIST roccat-tools-3.0.0.tar.bz2 2441186 SHA256 5ad56dddaabe596f01e7b6f7e84cf7ba9ad6e3d57d65324fbfbd2ee5e134749e SHA512 1b730a8e0abd967dafe7b0878fb04e446e642c1ecbf259c4c932b3174057ef9a1bf3094df51a52f2304c5a213ee67e658e3dc097df136ba85ba380c67dc56056 WHIRLPOOL ce342a5aa6ea3f039bfdb19866114e6915107fa5fdef39a702468673dc6231305a71fb2f41d8b0005f43c84a40d5b3df0785f5b3b6f58dc06f837e8480626c5a
@@ -9,11 +9,23 @@ EBUILD roccat-tools-3.0.0.ebuild 2337 SHA256 038fd434bec52f89200882c57d7556bc631
 EBUILD roccat-tools-3.1.0.ebuild 2366 SHA256 1cfa0bfb0d85558c07d25053d5eea8c412d6e1b47a1643bc223b7dbd5fae3a9c SHA512 262e8e2d07da0467a04454b0f29bcf2f29cef2fc2cf0d3c58699edaf5b6442ff57c4505a7aa9d4aa44b227991a39f2b5192a8db03fd0d2e3ec3983f653606638 WHIRLPOOL 115fe1f8dbfdd79d1c4403a5009e89ce290c7daa433b00e3ef5486e88eee1942477ee95b2edadaf31beff0b3d8db6595f1d4452c1356f11733835d49c0e51cb2
 EBUILD roccat-tools-3.2.0.ebuild 2367 SHA256 e8ff02e21a7fdf608002b9a42aae5956badf452e876c96569263a47ab25047bf SHA512 60f94e2812b35ea2f826ae89887ed73347f13009a1ef5e213f409e690d9385e89e0ffd2381b0ab65a43ffa5fbc94ea38368d2ba32f69ed805815cddcc2cd3d8a WHIRLPOOL 0b44dfb0703e8d1fc2398948825f6133b50a3c60cd0910cc9f4971f8a9ef23a49796110a783c6e03f8a9c72883f8abb210aae40778729d4942ac32bbe236180b
 MISC ChangeLog 3662 SHA256 9d940cf34c400e367f58b985fd787222ee84f0d676b2027f457897d4ddf50903 SHA512 f7b14192595c65eabc6628c308facd1826faad2322aaf62a3b6b86a55c4e8303f9c84151acdeca0c091bc44f2bcea18c7ce36e64fde910725ab2849001642abd WHIRLPOOL 3b6f32ef91332c446ce02ea770aa8f27b47ee898b00cf3933e2cba4d0281ecd8671b4a85d5b8f38d03f4f95a6e12dc1231cec69f44215d088f05d3f91e846b89
-MISC metadata.xml 436 SHA256 c74b4da3cf150746221b3f9eb6a634c85faa54494522d0216c4ab3c64cd2a77b SHA512 cb79ca2536b0ebbf1133701ac6a8631e38fafb76e3edf9923869d86f8c2a62cb9d2fd73e6557ebe33b77499c2585cc0350c9951a3f73bd8b27228aaaf91d6b66 WHIRLPOOL b0e849cfac48cfab13483955012e89797dbe00158e929bb3986929092757ae702e1dc8bd44d67a08a18be3d2a1113602b55f5a5542324a2dc612111bd77e666c
+MISC metadata.xml 510 SHA256 e7a55086afaba65fb74480587718daf8c2d974790c95cd0e5ee7e3a906bfed1e SHA512 0cb91cd3785c589353836e00162237885cbee71adcd10fcf28616b31f785ad91de9bb11ce56bf796020599fb44c42a1144abb9deaa1cc3257840d353492f0630 WHIRLPOOL 6b5b75ce8f763e580b2050cf2632fbca5d9ce1b12a891dc97e8c24615ba809d040ca8fa82bf3904af4be06ab9d56356d54933c864f3d816c0728d60a621062fc
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlUQ9TQACgkQso7CE7gHKw3jfgCggIpjWxessBbLSYAvJw1c5J6O
-+4EAoL8lfITyZtXpoNJ8Nnl2RJPJ1iyc
-=L0dw
+iQJ8BAEBCgBmBQJVfyTxXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiUNAP/0jt7Ki0wxZRQbD8OJdUJQiB
+uBpls6N2fY5FWmUSVQs8boLR7+sReojTs3nVLxvIBUCW9HCNqVJcx/1RCe2GnLlj
+R0y2zHWDrQIebGB3KJk6oED7X+xR4dn/CLQ8KuqSYvHY59z5vI5vD8LeZVI/cDb9
+p9/dwziRm8V+Le3aVN3VNp2r3GBc0shSg1tiwsVKkWAnq0dIDDU/j/Fyj9hURavy
+6tFQOEDrRTgBGfWawa267GkpdHsVHKuwgAofEBi7rOtdaqvcvmk0aSiy7bZzJbop
+sN4/BrmTiPthobdiFVOdH5VWnF2GwDFiSz1hk9rdKKBWivTi/sQLzv795076nO+3
+cMtwpV2eeeiJHDsQZ3ARFWxbwSvESnJLIIlpW3497ODbxFDu2nJaCul/B1jmpRiZ
+B+aL6PsMNiKJREQ6OAqWIS/DpmlzSz866NsG1wNrXxCvDfCLMnXujbr53O5I71px
+Sjuxy/H2FqhvyiFEe4omqF4nif+dU7k+sxPYEPsJVzEDbDD7qjCFqQCP2sRiSNvU
+ynVBg2xv32dzAmQqygDEcUMZ6Fjdml2Ge98wjBwppy+lycZgvqLAiw79lAxCi404
+TtAEPW1uGC8ZGUiLm8jBCQVATFKeyqnnM8Wlbefyjl5Sbnpepqp5t0/JwhAoZlcg
+Dc9kxiI35OOa2GQOafSx
+=ebo6
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/roccat-tools/metadata.xml b/sys-apps/roccat-tools/metadata.xml
index 6a6ed325e890..9f103ed20b12 100644
--- a/sys-apps/roccat-tools/metadata.xml
+++ b/sys-apps/roccat-tools/metadata.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
+	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>dpisklov@gmail.com</email>
 		<name>Dmitry Pisklov</name>
 		<description>Proxy maintainer. Assign bugs to him</description>
 	</maintainer>
-<use>
-       <flag name="lua">Build support for Lua scripting for RyosMKPro ripple effects</flag>
-</use>
+	<use>
+		<flag name="lua">Build support for Lua scripting for RyosMKPro ripple effects</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">roccat</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/s390-tools/Manifest b/sys-apps/s390-tools/Manifest
index ef59a603ecf7..22fd082a4964 100644
--- a/sys-apps/s390-tools/Manifest
+++ b/sys-apps/s390-tools/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX s390-tools-1.13.0-build.patch 4770 SHA256 e7278dd938d7bfb02a4d9ee7af1487eef73e1237769e9c5c8d4e1cb57837cfc0 SHA512 e5696399b1e4e197939646b294e479604abda1a44f969a71c2f7f66d4ba43706efc413b1f6ba667d3e6b7956ef5aaeb239e9c18d31717e165072ae1f535a4e26 WHIRLPOOL 801f5aa4058bb58c8e8a2628e9e042c80a8ea753c5396681478a948ede21bffa546962f73c74d8c34b187a427094431bec9f9255a27d491f4b16ab7348e4abf1
 AUX s390-tools-1.13.0-larl.patch 2005 SHA256 1c143dab124dddc0c5d69660782ee1003d84085b0ac197ff2a7bb4c71bb8c793 SHA512 cd9c0e7439bb54ecd40837104fc67d9ed088eb10bf8d1992e8d011d05302966cf1afc6cde87195f7042142ae22a2d018c481386326e3e69e24e6f25770a50d52 WHIRLPOOL 39588c93475cc3f50efa1cfa0363a8a2a5857e7f12a637d9d7e736ca6288954dfbb50a12aadbc26d9fb72a6413bcb2d30e8f2fe0bc8a2ac2adf255e6894d0a53
@@ -23,21 +23,23 @@ EBUILD s390-tools-1.17.0.ebuild 1527 SHA256 1495904d13da645ea30d0b0714fbf46807a7
 EBUILD s390-tools-1.23.1.ebuild 1527 SHA256 5afa96c881edb5f579b2d8256d343d4f165a510cd4d7b94f46ad9d454d21a258 SHA512 924bc429c214f3cc2537f187afabb2fe5e0b3bfc8dbcf04deacd3cdbf3c5cb809e279c64f11b464c725bf4bb9475f653bb9353554adcbae02748521302fbfe50 WHIRLPOOL 254e8cf0ab11914dfa1ed6d0703f7c758b8be6aea4247602e57243aa18ef86092391a945f67a6727356767ffbf64c9d4e2ae4c2eea78519b15fe3319be3b37f9
 EBUILD s390-tools-1.9.0.ebuild 1596 SHA256 b689ceae4aad40ab8e12bf8fc0a8327197eada60635fdb67450a25c45e35c92a SHA512 10880cd1efff839bd34a371a14ac260b1fb48515de68a4a3d7b5512bd1e214974bdd54330d78eb1227e0f3eae2ae8cdddd07c118fdd2132ca9e7ed3a3c3d4be2 WHIRLPOOL 84581d3bf8d912d3cb460491eb854830854a3d2f45e1a58e08e6f547641594d9e550ff45997f0f99dbc6137821f242490ceb97e66f85f67497fa5169ea21f276
 MISC ChangeLog 5212 SHA256 eb2fe57f0ce73228e0c870b465ce51d901fde2aecd30fe0c8c3d8fe1dc8e16fb SHA512 c023c3cfdab7506bf6f193c6d29a17aabbd93d632d901c04b4bf5375e3a20aebde53b8ff432fad7b3a2a8abbd051e842b2adeea0e5835161290c63a4d0828a62 WHIRLPOOL 469c81bf4479a361e072fd83f39273990b8c6f8d79e2ec14a0d86487e8c5a18a97e1591fa8deb532d8e1b02a5d0b820cc75fd6c7ec3f305ad34259e00c651c08
-MISC metadata.xml 542 SHA256 8756df3f4e87725b0127e06b6be6905a5e36a4d20a5d6509f3776de0663649cb SHA512 7694a08c7db29f7b55eb5665af2348cc7cc431553b480743c10b0e4e33a21c005fbff7a63906edb02abb0784677f67f1da7e43d1d5af539eecc14aac1467c5cd WHIRLPOOL 523e3b2b9eba415d13fb415c6157a5c167bced4c198e6b3b7d6cfb15f67c0e64481ed762c450c53b3b9ed080ee539596cef34be75a06a107bc488bfbc36ec10d
+MISC metadata.xml 630 SHA256 cfee7cd5fcb458ba86afb4ed55cdf0f435890d2e8553f2e7638f2c27112f5d86 SHA512 ab0a3d47573607eb31d742c1b57b1cc1f1b561f9a33eb2e69671a325afe848ec96a4a7916f8fefd43d83d2d2be57167377e60dd2672687bde4b2c139da934b28 WHIRLPOOL 4a7656545430405c7b0fdf12234c3c5da6f069d3a3701368d740205851c0a869ca66d0e05ae0ecede5bd389235d5ea120b2f2a667271bdaa5d4b0d61247fe71b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJTQWfXAAoJEPGu1DbS6WIACPQP/0XFSBmjXswNn0KAZ21yWhvb
-sHR9hETdQxarz8SZzMOqmud6EeRVIpz43tX1BNSdoJUtqZ6XS+evma+dKV/yMxoN
-PMxDcox3LOgLblEl8XZESdbBnvdk4+bn2GXaLGWdJrmmxumHKI4kVBpNfZKTjnBP
-lfaaA/eTCZAvEaEkFeb/DHX9XKtOQhMs7fnVGSI6+5F7Pj7gXEwF7I0ISBXW+cb3
-68w65d3BX3EPgDYOMPiy/CCMJwdKY7Y9GnZEC1IiU6ImLCWZ1VwmimvRza3TNXvk
-Ljy1KyProIRmzfVmzf3lpWnAtNWwK3hcQD0YYTOTIwHofsYwdKenxDVxNstjxns4
-L58mBbABYJB3VIKn6IqUI592b7Crhjtoszd+fp2/wn3JsIr4zRvHrekAt3E5jByH
-pxCtV3+TKdYUtruzH1wVZxzHhn0nMQZXOcsljyzcUXF/seEw47nEZ0FMKhSVlbme
-qKKD3EK22D4B1VOZeq0lwgd2vENhM3RQOiuYl8VB18dDFgh99Ygo2D11W81ryPk3
-2q+6hYqUSLOzc8PZMqplQMENRAAuvYPDV6ddofZiCX+kZG88M+P0xIHbRq7qH4Or
-pW19lISsxActbVazA/mjfPVwcFjUBRazO3K/RiKfcA+BIPctwwN9J3yw3TKZCYc0
-sRbrRQDHAAop8cXm7Y/L
-=ZAwU
+iQJ8BAEBCgBmBQJVfyT7XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi+zEQAJNqeCBWKrmHauITNpvkUFzV
+PiGVHdZko5wSXbPLgdXvW7g3s0LU8bnCZEjQJX16LWq3wAGUPyrxiUbl7fxECuhu
+JXfnp5QLdEFaWequRTniW3gJ8RiveKeMNzzI03k3eQya6lwkyL1fTnhXXggPZ3vb
+oJOxPP69cqnIYJ6E7lgTQU6eYXx2+6WlSnQczZY6kHTHX8ipFner6vsPNxcUO1RA
+TYhzVOX965GPptDkSKnmZBmvg7pupyg90aoMx9RfmqliJzArlaz6gUPW8zYrAeeA
+AZt1kXMSZU3+EsSkoJWfExLCQ85xd0mrC8qCe2SG1nzPRUrnFEpkWNqFKqa1tA0P
+70+yhf51acTzxr120nJAxJf03dEAkOhOrvjUON6xbB+yt5PT1BBUQ899kVI1Hako
+ABf6IcgF4RmscNcvPmdsf9rKPuDFvsQ5p4ZandvRMMfHel3hdrNHbX+ZDij235qV
+z/D2LLmfyMXiTAsQO7PK63g9ll64rNZCg5bcV22F+JAwB9zEYCTO694okvcS7B8Q
+08CN23B4rZbecFcWZAJibHbVZHO2LBVHD5/MssFDi682KUzMP+dXFPMr1aHyO0ry
+TO+EwLSEf/ek7tYKTPzqDpYrXRw5zmU3ESoAVfAtr3JqkZGPd3UQrFtN61qlRzm+
+RPupxQCXHlzH2KiQ6quj
+=MThb
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/s390-tools/metadata.xml b/sys-apps/s390-tools/metadata.xml
index 7826fccb1129..87e1df2ef2d4 100644
--- a/sys-apps/s390-tools/metadata.xml
+++ b/sys-apps/s390-tools/metadata.xml
@@ -1,16 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>s390</herd>
-<maintainer>
-	<email>s390@gentoo.org</email>
-</maintainer>
-<longdescription lang="en">
+	<herd>s390</herd>
+	<maintainer>
+		<email>s390@gentoo.org</email>
+	</maintainer>
+	<longdescription lang="en">
 A set of user space utilities that should be used together with the
 zSeries (s390) Linux kernel and device drivers
 </longdescription>
-<use>
-	<flag name='fuse'>build cmsfs-fuse to read files stored on a z/VM CMS disk</flag>
-	<flag name='zfcpdump'>build the kernel disk dumping utility</flag>
-</use>
+	<use>
+		<flag name="fuse">build cmsfs-fuse to read files stored on a z/VM CMS disk</flag>
+		<flag name="zfcpdump">build the kernel disk dumping utility</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">e2fsprogs</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/secilc/Manifest b/sys-apps/secilc/Manifest
index 77714c523460..a2287be43fa3 100644
--- a/sys-apps/secilc/Manifest
+++ b/sys-apps/secilc/Manifest
@@ -1,23 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 EBUILD secilc-9999.ebuild 1030 SHA256 ba6ec0eb6324d7fcac7106723f7d8ea0778f3acc197bfa7d7cab12b2a8f77e6b SHA512 45a13dcfcefc4ffef65652762a0a03e1907101ff3bab95218c6479493b612cedbb47fd02a7de1c4d619ecf03136c7ff4f1e56e6810dc5969519dad5fbd134899 WHIRLPOOL 8be49899f088997a720a65d2ea0fc26fc495029f261af6e5dcd11b28b5ca7ec1ed3da5d31aa236055ae1926f6edfd0deaa55745956f3b36b8a6791b27a5f5f9e
 MISC ChangeLog 378 SHA256 f0c9286dc915f35b032160fb4300480b1e69f03533f61b0082d15bca1df8845d SHA512 2d45f26f81fb77175c99ef125d27f31876ead319a05eaadb5ae4d673dcebf3191d61cf048207cf4efc84208be3e221cf3ec119a273fb5b1e4a04d6641b5e74c2 WHIRLPOOL bf2f7c89779a51bee170cf5b44d5f248eb1cd210d923161d8de7ad7d9cac26ea47f5d1882e4b627d980fbbd40eabb17de47ba08ec79ee33cc2b95d10d31dfd99
-MISC metadata.xml 356 SHA256 e3b032e790a31179ad4f2ba8b847c55ff01e2f3ced5ae198e6c4d17d0c5d524f SHA512 4705f46daf9d09544fe381ab42ad9ed1b8a1353f47d8d78ddbd9cadc028b35c32459c64712f025fd8aeb3feeb508062853a0cef74250b9051687c38ebea6fcc7 WHIRLPOOL 9510473d1f7d5c5de5ddf6d3f425904cd5d1fd14673a3732fefd2c75ce86d51c56cf9c4323434a4e4fde6932b8a28e536213fa3867e711b2578e5cc7d2d6ff0b
+MISC metadata.xml 443 SHA256 7c9ba260bb722dd4c92b31a8d8192da2b8e4850a2fc5a559b7a4d748b4d35178 SHA512 ef8a2b4d755d1054476e7ecc020fdeebf3e74d78f26c82eff05daecee3c868d4a6ef287f6cb950defe9a94e7221c59dead29fae0e883117f623b5303e2f21d21 WHIRLPOOL 9c3e9efedc778cb1d978a79384186fd9453fb07af94ef84612fc528b54291074015123859cb9835af687abae967fb173acd3d367f65256d938e18bb02a9bbc25
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJVdwk2AAoJEC7dUkA7aK9HOSIP/jZ6WBBa/0Jsy/+0F3oYrJ+2
-ofl4HAkBa5AqxRKDi/qRAxYyj/DP+FpibZn7/ovlDh/UJyJEjCOIxWbXrfFxYGcj
-Dc4cFf9XdapRzZoviC8Zd/qS3DyQY2yE+0wsMkzP+CJdCs6tzqdurR7bQMb7wldm
-scwrDh6/oyEX0g4wxH6OIEqLFO3+6vgoeWOEvz4hpu3PJfASow3C0Vkg+mlN9bPK
-nmOEYrLvoBta9bLDY3+nVix1JyX1yNKc8xb1rbGwhJzDGE1dMgenX0pQRpEhIbsx
-WQ4sOjj9jf5KIRFkQcmuVswoZD9OTnakA7H3B/3XIkv8eRYoOTtAV0OyyaDdTEcd
-Dk6uqc50Fz/MgV1igi/8lqx9+StZTtyV2YtkDxXbsWoWna53Fvoqu/ozPOfct6TN
-ifDUgy7LwK2hfISDV3sZ+egGkOrX05W6fzpXHv7FQClZNcUP0AhNDnjmcXxr1mSq
-xH4DZkcp5FWRVJcICzLRgGwlvXFSnPmJWQ4B8SfGIavsE0Aaf3fYHTAbdeWJihYd
-68YRkEmkgXZW4OpAq3qvhQtHLURW/K8hFUQKaVFuQxAMR+slxLY2TYqqynUev9q0
-l+nfWuGgCgSKyCt+8otjLJEB2PcIW16bk2tPq3xVsbeipuoTsImyI1zIIwJkUP3L
-InAySf955AHD0PI+tOmR
-=hYvV
+iQJ8BAEBCgBmBQJVfyUAXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiLUwQAIRmo1zF6jpg8pnG4VC7AQX7
+Mk2ElfqdovP/96Po2W9y2puUZVOuP8IreDpp6cDJ4KMNGNXHGnNGxohl6fA42fUC
+5ncOqEWph03Vi4IdKaMT0WX4Qkcs3xrD52aV1l51Hzx9q+B5Uj8o2evM59OLYZi2
+OVsNt79WZLyJ1kwrmXNs2rolEQu7sL6TJm5OyRdacVk8u1i8UcfASfuQxJ/Z3HxY
+QJrR3LTpeeEs79Zbs98ZLptafe9QaJimZQHrQj/BR6KEH0RFBkVWO9Y+JC7Fa3SR
+nzhkRTN3JGsh/p69mgBbJl5khLK1+DSVdO3qSK5L/Lh5fEXqnvIUW7ho6JCiJdoV
+yfhc7qqpmkL8/U2uffblJS3ALodd4JADkIXs4zZW5pdOEKgfOa4QT6elSvgrv12A
+CmQFRxPV5zOdLSL+GFgqnBYtCHEUTUfk9lNnK4qTKYhdGs/4BBkMFu1OOMs2F5qH
+WcseQXVNEtmtE3ndlVzwRNVA8nKCuixmnjGVDmtogDluioJIbztwX1itdyNnj2M+
+3SNWydaunfL35mpNzcNRpA7JKRsFDpVpDCdlQ2KEBIpgWmpaBQkOAsa6+KZNeMCl
+Ys1b8S+0Ha3r62Own1jkFzHCsqGg2+dpZFi4SSzZD0S9MtpZx9AoC+HJSX4U+qfn
+wNDTN4FpPO7+nKhQtZJU
+=E8EZ
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/secilc/metadata.xml b/sys-apps/secilc/metadata.xml
index afa5a2bc4d11..26d91deeb59f 100644
--- a/sys-apps/secilc/metadata.xml
+++ b/sys-apps/secilc/metadata.xml
@@ -6,4 +6,7 @@
         The SELinux CIL Compiler is a compiler that converts the CIL language as
         described on the CIL design wiki into a kernel binary policy file.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">SELinuxProject/selinux</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/servicelog/Manifest b/sys-apps/servicelog/Manifest
index da8fdfc07b74..4b52a97b28de 100644
--- a/sys-apps/servicelog/Manifest
+++ b/sys-apps/servicelog/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST servicelog-1.0.1.tar.gz 159034 SHA256 3043c24569c118a02f8c25f27098011e73a5af80ae6a75cdb18f2a63c4fa1537
 DIST servicelog-1.1.11.tar.gz 318874 SHA256 1eb5b8bd4d56a35b770eb83c7b8773e4f8c9faa6793b9db3f22056c33184ba80 SHA512 45adabe828a2e700b0920cc89fa4f93ac923cbf0249facbd52e23e1507d3daf12a2e4f2b093539286cebf8291266b2cbdcfea1c17f83a75c537c368885fd398c WHIRLPOOL c07ba8a5b7b23c475f55055af638e386ae9ef7628224faee15960c40c013f8a77686e461b323c4d1ddf282dffa237409c3887c6752fb31be821bdf7319c9f6af
@@ -8,11 +8,23 @@ EBUILD servicelog-1.0.1.ebuild 692 SHA256 17868591739d0306627394451563d37b1e8598
 EBUILD servicelog-1.1.11.ebuild 695 SHA256 43e250f0164d89e47d18af891a22412a8d7847d53ef31c7f1d55eaed291ee5b2 SHA512 e2b45801380d9f4f3b61bd97afaf5b81c22eb50ef95ec01c31a92b6d7184332cfcd21c33f68393bbd12a17ecbc5845cbe35b9cd5dc5dc8e43bfe9d95b91fca1d WHIRLPOOL 81b69eb65ceef95457891b45a43390663a2b66cb35a6fa360aa523ae2c3c6c8df2cbe28ac9832d6b94b8679992fab5b65267d3d4722de745e69b6936173d351f
 EBUILD servicelog-1.1.13.ebuild 692 SHA256 43251ceecfde721e83addb5939da705516e9e29847c637a58ed49f4072944eef SHA512 7d808d88a375a639e9fab71fc0f056da1cbe3cee0f30943d392235d05a6543c616a68898e106aee764541aaf3ea6702eb660a85b902c83065fbfcecb810f03f8 WHIRLPOOL 0cb1f0769c9bb17697bc47360148bb40a79be65078965434cb8cbce6b5a568d0e3c4dd1e0012ad3a595e1bbb15550eb986a84bfed035f14aa5393c0e76ffb07e
 MISC ChangeLog 934 SHA256 3ea0215c512e694247a0cf9fe76a9c34157e0ba7864346fb6dbf22007b8f9547 SHA512 9d683d64be621488227319793228bee67bc7c0a7bac4e2b3a58e3cbbf1cb599dddf2aa8ffaed8477c33c50029a7b4db51003378f126866fff8fa889fad2e87b6 WHIRLPOOL 5dd8490351b3abfd15a3f40ec4af8d142cedc5268a67a6a8ba5181f063a8603a6b6aacf9b1f28eb5e3246f8ed35b9ed8e07dd478d0cbf5a8afb2a40011fcb628
-MISC metadata.xml 158 SHA256 32350539e29186f246efdc4907b750f94365676eaf013b11832b2a7015e8e218 SHA512 2b3864962e76bbd67cfb69646b7d711d56b4683d06affa2a6368a2f929cc7a07519db67aeba222992481ff45f933685af3ece8c14369564758c1415159bcd67d WHIRLPOOL b385a4234685513271b55e7533c02a268c12138467441c9fbf2e2f4bc7516d04495fbc006fba3022244f0a5f71a7e85136166195a6355a9a7f2bf763d0857b77
+MISC metadata.xml 239 SHA256 cd1b99b7fdd815c61c53e5ea471e31d34e7c77c787546bd3bd3607487cb7323a SHA512 d26cbfae70060858b6e0544c4bec1525354aa51dc564ea5136bc57a0a1fa46e4556345477af626a3b724a77fc8bfa862c3a2498c5cfe569c3145b2112c76e95b WHIRLPOOL 13ceaa6dddbe6199d52ebb8e4ad731f30c8f7617e71ccd542d5d7f55193d296a10ca11b81bc59e81e89cad593767b4995e0938755031f45e8bf91fbf5324a808
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlVv6AkACgkQVWmRsqeSphOM5gCePZTZI+sQllc5zJ6LCyKUmTzV
-6RMAnRq7ulJxOetzxdHKSq8yzFhRBUyj
-=3EH/
+iQJ8BAEBCgBmBQJVfyULXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmilhUQALC0nqPHSVCY0+1QN9oNCym3
+JSzl1AOtX1TXdgjS0/4wPeSgurUCLudicUxFsKERP4JKpLnEZKERoo6NeZrf+urT
+2aYJsE98DiAheW1dKzTFbgnQw+68Ft/wsvLXhFElvaCoF71xYG0KjWqg5i8Zc0z0
+lk3PB7H9B6AF2qFyi9Tfdi8Wryurndi0YFFsLAvyi8l0mleGLkfORsc5yy3K+ZtA
+5w0dFsX0ffuv95AMcuAHtu6rq3ViwcHYEWJl7/Sf38IOivZkio0yyxCzOuuSJoUl
+5WqtMUG99ahh6AHpc0VqqWyJmBbXPpqBIxK3lhVI0ZB2AWUdUzmDXZoKeqywFz11
+4JQP6B1SAPyfjkFZFhmvIltn+KK0Qmck/E9gFDq8Dls9WL6HnQ24VEaWbpawHgJc
+jDk4oxoVrP9N5FMVAmNXJqdDgi2X1DhXUn37+DRrGDZbjPOhkuDPm8MKn5/ipBWj
+0iVlH3IapGdjh4tBoPEDHs65gG4hkHGeJ2f/d/42HcnLzJ5BGFPBO/lff248nntf
+mqNbm0T5BQkp8qnf1qQVUfD0p3qhNUC37M+BhucJCu/cb3F/oGBlLsaXAoOIvVGF
+OXEcrNwW0rEXgb9svsCuMQ1UguBYqXGUACZhynvtjyZCP0sPBpC/+NmAPLJ8oU51
+ojN+tRdfbDhm7gbbmZvq
+=xKTo
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/servicelog/metadata.xml b/sys-apps/servicelog/metadata.xml
index f9a5b22fcbec..09b995174c26 100644
--- a/sys-apps/servicelog/metadata.xml
+++ b/sys-apps/servicelog/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>ppc64</herd>
+	<herd>ppc64</herd>
+	<upstream>
+		<remote-id type="sourceforge">linux-diag</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/smartmontools/Manifest b/sys-apps/smartmontools/Manifest
index a0573f36a463..c6496cd340fa 100644
--- a/sys-apps/smartmontools/Manifest
+++ b/sys-apps/smartmontools/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX smartd-r1.rc 735 SHA256 691e41511a27c13eeccb5a2e448daf3acba984fe833804c8b36d9ffd6b4427ff SHA512 199970c8da29c884e1e72b55b04edc1ea26b1b73655b7734fba81b80258e2f1a18bbbc0e28c3811988c806fc5a61f5feac20a6ae5c784573b4b150b48b38ec3a WHIRLPOOL 41ae383d703ef51533a8ef4606e81c5c58d25d80e27b91bc4a1def552da0772e2028314e31b7a080b6bee12deebb21411ecca99f4697bb6b63c3d878a36e19e9
 AUX smartd.confd 107 SHA256 714cc1b253e1f59b884be89693757fec91ca878c62f37451a49ef6bb72263e85 SHA512 ff45462944f01c0e7cac99443078b253dcbaed4f99ffab85052b12361d9eec4beec81cab334fbede9148b3dd503d5205add32ef4327a788f02a8b1e37f460437 WHIRLPOOL 773405a2cc669f6eaae835bc3a6415151891b91ccf4111147f8b12d9763be26cbf65815879a70cd64ae12a36f59840ffcb15ff7e527479f88d9816130e704e76
@@ -9,21 +9,23 @@ EBUILD smartmontools-6.3.ebuild 1823 SHA256 05a5bc9cb4d207e43a999123e619a701fcf1
 EBUILD smartmontools-6.4.ebuild 1835 SHA256 c62426cf181d00fc5f3e295cc1dc574a8cf2a28d27cfcca71889ac897a08590c SHA512 7197e5716e9fc7bcb33297fe0ac11a659df88052de853774607bb2cc5293f6fe4237ab41c250bd57d337f6b21248b43c28b151aa9ba47bb730b137d876cbffaa WHIRLPOOL 4818a10d6e34ea930d986887083ff0824b1cc49410cd54bbf8ce64e3a2135e0c788e6c1c001e62e437d3db88ad877b67c39c8381fba640238a55b14a66a6de2c
 EBUILD smartmontools-9999.ebuild 1773 SHA256 a390df09b231826a30bff1a59e4215094b53d07abb9725d3b6ac3f23d9d8f782 SHA512 b576605027a41e8d4359f9e1d36d32d012ad0ef8306b98cc9bf06b7ebd1f76ccb75b8664b386b7e11c30773ed109cd8650487b8619faf490e601152012aa3f9c WHIRLPOOL 410c403af8fc7723c96d7bd483562e66bf4fe86be4242d2ebd16e390ea943fd14c75ab3a0dd644abba71803525e8f62a0d69a45bb9754115846198517a900b8c
 MISC ChangeLog 19823 SHA256 cc7af50e303953c294a846a4d80cd7f661b3c9c4e43aaa69487e06c25132df51 SHA512 56199ef00ef37336673349c8b90ccdfd7270a569b3fbfd978d3f173bf0ede92cd7907a8cb2b7f3a0f1ec92d6ebb6ebcebdae865ab9aff85f9677c59a78b36a89 WHIRLPOOL c9eee2028ef7926d7d4f2c020a09c44c8811610953241253da18f161cfda55f1958245423d67cc2439199e3c591ad2c7329cd8d50ab3c70d8867ed19a261ec8a
-MISC metadata.xml 266 SHA256 bdf7da32dcd39df0f58aa02c64dfd1c5dda0ca1080c9b1001d8e110881a364eb SHA512 d2809f0df32816d12eb21b020e5edd68c28bf3ad42ca6c6ae24acb2a08afdf2ca85398b830de01a7377c10e929a8b0a3e74c4daa3c43710ad8b93a198ef2d049 WHIRLPOOL 3df4d283499b426832cc7964e0bb277614ec8fbe4ca5729dfc8dec28a85bdadba94076c845d898ab73e13ece50e7e595322fdfc095a6e4c8fa0b1706b1119e88
+MISC metadata.xml 354 SHA256 a4176a60cddd8fc57fb6b047675c371e684e00e6085737198e51f6598c123fb7 SHA512 737e6bb8bd9b55772b8136ab29fe263aa7311ad6cc39027bc69ce78c62745ef2a6c192691e6b9b38986c2f923d0c9cf1a2fe366182d765e8df31e15ca4cef316 WHIRLPOOL b237b9037ebc76b0d0be2ac0eed4c0b3315a6f34fe7b44bf59f18c9148a0e20c462fbeacd443beb91ce61df431e17652590a9cff09fed9539f296cae6ce65cba
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJVdCfGAAoJEPiazRVxLXTFnzEQAIPPYifn3rsSNp0LOJSGu0lz
-TY5xb4YcH0edMxgHQavphQvN5ZWjRldOFpGpFWd/cPkrylVH7QnP9+7QYYSfJ3DG
-QIbnkf7b1qUwH5D00fgbigy2xgHRGN0sS2UaAL8KsdqpdluwPCW8JBVgzRPpsLc/
-BRPkE4gYMuO9r6G1wjMB3K65MVp0OYIgabXPc330yC4xAlebc91Iobs6GVPsGvGT
-Xv4O+xC16dcp4bQl8jFMbV75wIsC3sDbujo4htKBont8wMc0rlAMkb256+dQCS3Q
-wqU0D3FbVDQAkpkymmP45kQmSSCv8vb9sZGPDLQDXKA4rWqSWCn6kXc6Cw7ieGS4
-9scCFuhbEf0JnjouaEj18FoxNv4pPz0X/+ibQ+oNHJLpiIt26I7CNmBTCOBL1wIk
-DtE/lKzKB4+54wgmDdrB37QX5QO8YnjU1lEaFE/zFf2xi6nAo3YB3h6B0+Damp1x
-PJuL+l39cPt8005SM2V9TYdMvWOhTtHkbiwbHWqxJCHpM2Q0ECwo+R4V7Fg36kE3
-g2EcC6pUpNNsNZwztsaLEwETs5DDLfx52RTIWuY2D+YljXk2NcLbiZyS/29ApXyB
-U0RiasxzfC8H9uSgoPGjhEKKfMvWTgiD7IabrBRddElD+G+6PlppY6v2IYOFUUs6
-83XejJTH6iLTMzFP8aWv
-=AuSd
+iQJ8BAEBCgBmBQJVfyUhXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmix6QP/jSwV3Qn6CWyE3xohDgESTSn
+/QTScBbZrpQ7rCuWdbYDbFk49a9G2BkiAUapv+y2TcJxyTnd23TI8M4LfwqQ9Xwz
+LwxSBWRv9k7fyVBTAMOGq3uaGvTadMqD7CKVx3QSNHA+ADBU3qdejKVWU2vPe8Ie
+uNszI4Q3KGyGt/+r196OfW3afFLyoXAOJNqIaqTdubONCEeE4CFWM+276bWrUO9Y
+ps1J4ypiTOWeLqR2/8fEzABsag0wYfSxtZIedc3ZkJpJw6f2uvwYkDByMf65eN0F
+W2iBKnP6n4imVjOoXIiExqjwZYlCY3W3A0mhwAWNTO9x+PXk6Vrox3mmSk2bqWcC
+KZ097EmutJgy87oZ2FIFDNrFhsxERBR16jOEKt28P3Sf4fU00fBYR5fYqGa3H1WI
+zS9ZF10u9zonkP27F5IBiClwTmIry4SDpdO+NBwLRCj52lR7aqEFfnlWEVtlBUfb
+nWbCD0IlO2mgr0T6pMnOZXtGm5ka7uIiQDJFq3ncAQKQQojnRd4ysrcJxH9kmxoO
+vJxUj+bfYddidChjwQzrXpBxLibU3279aQHVnXLOu4sJMAeJqVqz/Ojy+8Nel/0W
+Ml87YN28Z8KVt0pGcEWn0Grjqavzfm0iHDV84VBluL6h5uVA3vC83OHDmJnI+x5V
+qi0z2iA2pyB98cOqyrbp
+=DbkN
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/smartmontools/metadata.xml b/sys-apps/smartmontools/metadata.xml
index 29294b28c6ec..0eea617543ba 100644
--- a/sys-apps/smartmontools/metadata.xml
+++ b/sys-apps/smartmontools/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>base-system</herd>
-<use>
-<flag name='minimal'>Do not install the monitoring daemon and associated scripts.</flag>
-</use>
+	<herd>base-system</herd>
+	<use>
+		<flag name="minimal">Do not install the monitoring daemon and associated scripts.</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">smartmontools</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/spu-tools/Manifest b/sys-apps/spu-tools/Manifest
index 95aeef84254f..e2ef9f4039be 100644
--- a/sys-apps/spu-tools/Manifest
+++ b/sys-apps/spu-tools/Manifest
@@ -1,18 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
-DIST spu-tools-2.2.80-95.tar.gz 19917 RMD160 872ccfc13cb19fdb4e0bfbf496cd8bf2adeb533f SHA1 8b41a57057f917251c366f141c2dd244965968f3 SHA256 bfa467ddf036b1148978d251fdd5a1dd89dece3cf3895c7875f1ae61482fffc2
-DIST spu-tools-2.3.0.135.tar.gz 21580 RMD160 d1b2813523bf7fe671f6d36931adb34382c83a58 SHA1 aa615e37f064df0762ce4672d100b372f1135b52 SHA256 358ab3ee3511530ce330331f3e9d60dd93333616ef003ecad443500d60c11494
-EBUILD spu-tools-2.2.80_p95.ebuild 654 RMD160 72253215373ed9542434420db22fcbcb37641da0 SHA1 0b9f274ba07477efe6123a24d3478a3886e5beca SHA256 5edb89ce52a7c056bd7ed424df4cc8e5e2dd1fd787905a8731bf5ab639d99183
-EBUILD spu-tools-2.3.0.135.ebuild 655 RMD160 8194b5ee170d8e9122e196430ca69040bd2af870 SHA1 85b3c1879a27e844e146b63d0ee38d51ed34ef54 SHA256 648ead65efb00d6f5bf740534a62c2c5b5fe317ea232fb494319e780b24fa45e
-MISC ChangeLog 645 RMD160 99e515c9d5abda97e4b97a60d2b1e96b397eb443 SHA1 9f1a48421fda4c911ca0ee8f6c4daf1e0f4b8828 SHA256 93d7ee051e40802940f1c2da27206fac920c3900605e5025bd517f4ed9c6f402
-MISC metadata.xml 201 RMD160 27ae4292b4b83d7cab5cc4bb6bb2551625c563cc SHA1 ccc9da4e0eb217fd78e08ea5bb8a8ce0568943d9 SHA256 e5e24ce614d0298659e568940a07af4e88a650953b6604e00f44f25a2df382cd
+DIST spu-tools-2.2.80-95.tar.gz 19917 SHA256 bfa467ddf036b1148978d251fdd5a1dd89dece3cf3895c7875f1ae61482fffc2
+DIST spu-tools-2.3.0.135.tar.gz 21580 SHA256 358ab3ee3511530ce330331f3e9d60dd93333616ef003ecad443500d60c11494
+EBUILD spu-tools-2.2.80_p95.ebuild 654 SHA256 5edb89ce52a7c056bd7ed424df4cc8e5e2dd1fd787905a8731bf5ab639d99183 SHA512 8f960c0d98b42fb211052c75824617f4d9f376dac8ea74de4320be49edbe288fa6fb0fe07453ea7ee0f9ce1fbff9a1a4b07917003224fdc7f3e84f803e34228a WHIRLPOOL 20c7ab58f5d67264d67dbd87481057e56308850fd56dc8603c824d35a7bc9a85ce9b2a5533a2e126cc4cfff93953b2746d5300bbc6847ccc46b1e4b2ef4efaaf
+EBUILD spu-tools-2.3.0.135.ebuild 655 SHA256 648ead65efb00d6f5bf740534a62c2c5b5fe317ea232fb494319e780b24fa45e SHA512 a38ea72a1a8590f0d891f9ceb3682ea00b2130da0f447c4121c5ce3c9eb87064d1f13a7c2ff375d17ccbc33d35be1446fece3d7089522ca839d34e3b4b5a1789 WHIRLPOOL 417ade91211d7c572fa74c54e63ea13a6249e5ab4c012c9f97cfea354067cedc804ed23d6ba9d72ae8d110752a70af56b40056d3fad08625d91165714fe78310
+MISC ChangeLog 645 SHA256 93d7ee051e40802940f1c2da27206fac920c3900605e5025bd517f4ed9c6f402 SHA512 53b71e17f7b5da35ad43df72d985a9613bdd786e0039a3d446d975bc7a627b33c340fec89bb4607c185f424cd49f5aa95bf2a7e4851172d418f3ee07f29557bf WHIRLPOOL 7cb476ed6c80275ebb5ea025b4bb81d21730c2cd6accc6ce16872674f42c795bacab75512c89a5959b6859d445319a12bd6dcabf36a7e782ea7c794b9159cab9
+MISC metadata.xml 280 SHA256 acf81d07f6b6e6b51550998168d91d65272e7813eb36dd7e664337c0b7ede005 SHA512 578d8f8c6a4f99090d03a12f3605f166224b4c667c11d9c661d24dba1dd4b7661b964cd9c947788ce26ade2bbb3f853702b3f2878fbc57461b080a1a0a1919fc WHIRLPOOL 763fefa7567e016fe0fae419733b032b358553f1eccf24610f2026892e1327b60a8219c65c5dcbac0522d3ffff174ca9af5b8a8c8fb6f7b26889ae37acc53715
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0
 
-iJwEAQEIAAYFAk59sbwACgkQfXuS5UK5QB2M5AP+PsQ1T1oSV8C6HHlhLcVCjsl1
-cIDl3jTLB6WWIIOwIYMmVA+ZFUeDQ5yZK0MdP5J9lw+jVQ0MWzxyiYaltLhLGOC0
-2N17zlUbYw3LBSdH1S56Zc8EUsZG8INQ/HxNlXDGJk2L1h5r2NWisuEAQlo61urM
-ZR5vq1uHJ47yODK4Q4k=
-=LiQK
+iQJ8BAEBCgBmBQJVfyUsXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmilxoP/iVExCBYht8YyRlBtE/rhmHR
+SX+d6QOZbkBOHcIsb+J367IQ/EYq5yRcfnDFk/0EPVXdXqLzLEsyEFytVVRXLbhE
+wOeYLnKvTsnJy2n5vB3f/QfXgvdpucuWQ1jKS554TMbT2eS8M8Aru6B6n6IWTwjm
+K3Jk24yBH8Ob7BpWKBvMx4nXKWQTxdYPRfw/zaTdCTTBlxX1yAOHTgERIEDo/Nj5
+j5+1nC0oL+jnpl++9EZTDYXDcnOdiBTP3Dl/eX2DsQfzCgpro8NmC1NJa/g1G7QD
+/r+JbZfdzSdW0OKJYhet072paYtdNYA4RSbK0WYK50kpZtPxFFElSol5kmfU7F5d
+byULgOrDZBU3ZYuYwql9O7jCxdYEq44Y29D+g7hcegqFdH+6JRPT/7m5TWI2ca7a
+d/FNC96/rqH7At2dpAJh1h18+EngKAYGhpIk74doNxJSrz+CDMQq2jFCiRFJbosg
+acEU0Mkw4RHxkk53Q088WLL8NqiejvUNyHg+F9mbgQEynUFU9HaScogNDzVYxqsV
+JuNWlsl6zSBil0AQyTCiu9NH+n2EumKZKP3ucrM/deCuTmaWlYyMWo3UUZYnKoZd
+leJhIdlRib3Xkupjnwe0888JrM0fzrlNAI/dZEmlp9i9PEtHSEfBJMmMskxqLBGI
+NE3T68h/TI352uTlTVQB
+=XMBM
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/spu-tools/metadata.xml b/sys-apps/spu-tools/metadata.xml
index 6eb35690d41d..16fed8ff6fb6 100644
--- a/sys-apps/spu-tools/metadata.xml
+++ b/sys-apps/spu-tools/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>lu_zero@gentoo.org</email>
-</maintainer>
+	<maintainer>
+		<email>lu_zero@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">libspe</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/stroke/Manifest b/sys-apps/stroke/Manifest
index 568ac4a55696..a9eaab2015a7 100644
--- a/sys-apps/stroke/Manifest
+++ b/sys-apps/stroke/Manifest
@@ -1,16 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
-DIST stroke-0.1.3.tar.gz 180438 RMD160 62095c584d0d90ca2b2228ff235e39c37b7efa6d SHA1 93c8eacc3796e5a39442ebda940b39082b9534f8 SHA256 3c96fee2272fe37900d3f7c8cd2373170b47bc6856f0052d43d5793b6a680a05
-EBUILD stroke-0.1.3.ebuild 497 RMD160 5654dbe7761e7648ec9c7ddcecc640e969a22152 SHA1 77ae44483441afa4c753afdd7a6305886d0c6f88 SHA256 8cc23fe575f145e8de2025bc9eec505f223b733f6a5f17c4b4d3fe269b9ab1d0
-MISC ChangeLog 406 RMD160 2ea5b991e2b026d22d350ff854c7654a83b8dda4 SHA1 864b1e6fd1e28ac61e62952ff1befeb3102d4212 SHA256 cf64498a6d3a79ba459b8b1eef01a70651cc3f8c5f5286f5755f089edf0940d8
-MISC metadata.xml 278 RMD160 85ae612f4b725d8857a7fe0808090691c0e58fbd SHA1 c97840692a46e7d54f22bfcfd0a564a8d08033dd SHA256 07a0afc4dfc12865b213ef6815169e0524357989b213ac40bc9436dea94c3160
+DIST stroke-0.1.3.tar.gz 180438 SHA256 3c96fee2272fe37900d3f7c8cd2373170b47bc6856f0052d43d5793b6a680a05
+EBUILD stroke-0.1.3.ebuild 497 SHA256 8cc23fe575f145e8de2025bc9eec505f223b733f6a5f17c4b4d3fe269b9ab1d0 SHA512 5882a4a5b520c6204ba8a46054a99adf37e1d617e71a6c546a488fc8fcf11982ab2249d401a48bca53e3887525b8f393151e9fc6272caa860673486f8db55054 WHIRLPOOL c7877a12d99a46d19104d7591a416c43da2538934a0b78ebe0dfa0374d1bea57caa8f29fb4bc32c287465cf387a2f35df2ca8bb4260c91bcf63be747b2f24f0d
+MISC ChangeLog 406 SHA256 cf64498a6d3a79ba459b8b1eef01a70651cc3f8c5f5286f5755f089edf0940d8 SHA512 176bcb320f5d9385c2bea1353a8b7ccc9f43a6dcc8ff3021bb833e10b6c9f84ebad4ac847fee6a69354149e724b22a3f232a4ea33b21a1a6ae2f6760b3ea820b WHIRLPOOL 74a991775e3cf20e26467a5977f733c0c00d9c253cda0fa390fcbfce1d2a9810d23b96f7efa2b2c2f2d7c7f4264c832b501ae85cb0c42c02c328b9ff311cdf41
+MISC metadata.xml 360 SHA256 15434a0ffb88a09aea155a486eb27a8a79cbc7d84e94357aaf9e15632428e2ea SHA512 259c215ab231be4f82493af4b14d4fcb0fad0cbc8ef40bbd865b7cc190e5d7fa6e2fc2e4f91cef5b28da584d7f2e99de1a4bab17ddfacd16bab71fdcea110db6 WHIRLPOOL 8a4dcc7812ea2b842aaef1dcb9fe336d0d9f12c7b066c44e617232fc2a5f3123de0c8df983b483a75ee0686cb98ecbae05d3729d75c990c698577c547e75d01a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0
 
-iJwEAQEIAAYFAk59sbQACgkQfXuS5UK5QB1fWQP/cs1vd+v0vywEjmLraIpyxCqS
-BrWKCqxSQOshYzEcInN3gF2UDJfv9hUGdWM5M72SlzaPlb8Dqf7+bI8r8d12is9f
-XDAgMl2sDgGof+31Wo3DWFiOehuvBdZVj1o+mAoKsDpbytExbvhOGLlARJHpGMLx
-7jsS58h0wUO0Si6KvzU=
-=7l8p
+iQJ8BAEBCgBmBQJVfyU1XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi/IQP/AjAbQjxwKZBp14hu8YbL/gm
+ieN7EFaIefUTGo8l3GrOHzXMPZ+z986mQTGawSE5jykevJvCj4U/OaiZk/ZppbbI
+0Ygs7MFdBWX1M5PfCs4nrunv93xSH8KHPK2nK1t1ewQt4NrTAmtyMki4nROsuIB6
+KYu8ovqZ2ARiCtJjfnXLAQ+ntZIyM2s6oRgS3qdoVVi892ACRt/lTTTccuFy9fcT
+rnO+VvQr/PslBlI7CNrDggOhrB9FxtUrAubSfJsdo/iTfssubzXBaRURmGvv4bQ2
+TVMMifOBvyx5pvBiiEM526AQsnShYN9HWGdg0o0dzZUgm9Hh9o6Gbri9+vjXkPS0
+J7FvwQn5XgH8ZItOABZhmPfrf2s3T0qMewvubaHpzA7bjpkq+51Act9/6JlkBkoL
+S6BRSgSGwgdfV2NiAiZFzDpkH2RLjSjVhJVLBMjxZdLaFAnl9rx7PmdGfnjyNBug
+iQ9WeCCosdXi18o04BPx55KZBNeioDHRe1QqSMhPdE17l+rX4p6WbafxUMIi83KZ
+rZn5kpVlHA5PF9Qy64h8vmKGGg5fuVxXTb6rMikanmfdRWF9sk/PlqRRgvqm0S+L
+OTUuGIfxYO0NU45xjrO7xdmT3QwzzhfF4A3LNt6rGWO3maIylm63d9NqUmjStLsp
+cr1zDqEZsrfF+11vjEGl
+=QqMr
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/stroke/metadata.xml b/sys-apps/stroke/metadata.xml
index 5e3a61a90139..954ef749dcb0 100644
--- a/sys-apps/stroke/metadata.xml
+++ b/sys-apps/stroke/metadata.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>hwoarang@gentoo.org</email>
-<name>Markos Chandras</name>
-</maintainer>
-<longdescription lang="en">
+	<maintainer>
+		<email>hwoarang@gentoo.org</email>
+		<name>Markos Chandras</name>
+	</maintainer>
+	<longdescription lang="en">
 </longdescription>
+	<upstream>
+		<remote-id type="sourceforge">stroke</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/sys-apps/syscriptor/Manifest b/sys-apps/syscriptor/Manifest
index 217b246b2ec9..d00b60296caf 100644
--- a/sys-apps/syscriptor/Manifest
+++ b/sys-apps/syscriptor/Manifest
@@ -1,4 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST syscriptor-1.5.15.tar.bz2 58732 SHA256 74c8bedc473e3b55171b6e2fdc4ed694983fdfa36a213c1356f6ad49872b62ef
 EBUILD syscriptor-1.5.15.ebuild 583 SHA256 62d2e29c93b8c604c0a510516cc55a3448a5435000b75cbe3cc03e583ddff1dc SHA512 6e5fc5cc020a8463521397c28c59733da178c1cb6d32f4a20e3ca4627b2a6f66cec3232b9f6279506cf70acff0f6d2cf5166267546ae001e0539a7385565ba90 WHIRLPOOL 4f5b9c69e443fbc7049e0d19e3771e071dc17b08986190e535b54641dc6f1df2746c3bce5166d5a61cfd3030ef343d24edd6ac80ccd13888630731abc419ce32
 MISC ChangeLog 1715 SHA256 9e03935d53dc992de26ead0e3a38dff80d312825efd3f1471ff4b49e57f86221 SHA512 d736ea28f714ada968f830eeeaaf85943b66ac14f93619beb635042d77d6757883d2ef7b9e7e793b966bebc01976185902141f296a93890a0f563336f99be292 WHIRLPOOL 8cc9d1ee223cd66906d95a43628ca3d8fadcbe31e5e9e7cfb9fee20061e51b6f6e604349ebf6a4f433097389670222aafd32b53ed3dbaf38e4d1878620e910e3
-MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
+MISC metadata.xml 245 SHA256 e9637d4bda58beac555d72c868942ed79ce7a31f27ccf79764aa07ae4c1439e7 SHA512 d98cd6813ebec61abc452280431826f40645d3d7a8653cbb754ee4ae1a17f4204920dfaf97c0cd6fbe1e946d6aa15f2ef4a7939126417fd28129e1dc3d66e1da WHIRLPOOL b17cdab500ae3dd751da48cff760a5589fed4057b985a6d1f8ed1c448264a2f6777ce6b9abe01b31b9b3b8f689b0c5db41f725da5f175185260b6f70b20a202f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVfyVCXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi75sP/Rp6gps4Cr2855B1/Am9XsBr
+wgiWqSeIn6NIu26MJmm1/hntgA0ZEmWPDAZfmi/evmW0i0XOLZL7AOMPt4OYRlFc
+eJ3P63QHIGRLUJPUFTGRppd+HP2B45qexi7i5ry62+DZehE8GqvKnKlSIV28vQ0s
+OA57H4iqA0yPrcirmWuEaVTVFTwMpa5DTV3kIMp3GhaxFdy/DmDsYw+vt9bxZWoo
+WWrHhkqrfRVooR0dgQIt9RMJBBHAKLa8h7q04iGeXEIPaUig2TZ95k00puSGYDvk
+iGHAEF+mr52bxRutRrOj//QA2Wfcle2rOGiDqYWGBFIW/PED05p30a6as/bPP1xB
+aohbPHJagEkPwe+hQEuvuNIACxZgYZrHfRdVM7bdge26JcoDA8rFftn455kNAKWi
+XdrY/Ki5higVX6yTuwA1bZ6cv9Pr44rmgWr+WT7/AYCaUmfyuwoEPrvQZG/B1c1/
+VWnjapyZaOkKDGmV+hrYNpc9VlldEQtS6GZOuS5CXfBz+C7cAbQnIaphputprxhy
+Bdr/nYpqUXK6NEE1g6XuUEkr2pcBKAF+MSt3xKduEOSJdMbgb8wBEh1kSG0qqN5u
+H1qYGeOvbeRl/SOj30CkxnvJSkMzxRvW39Z42SXKH6xDRWjT3yfCy1PKvMa6f1uI
+yueedAEBv3Oo5cQfIh4Q
+=dlEY
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/syscriptor/metadata.xml b/sys-apps/syscriptor/metadata.xml
index 96a2d586367d..85abe371265a 100644
--- a/sys-apps/syscriptor/metadata.xml
+++ b/sys-apps/syscriptor/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>base-system</herd>
+	<herd>base-system</herd>
+	<upstream>
+		<remote-id type="sourceforge">syscriptor</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/the_silver_searcher/Manifest b/sys-apps/the_silver_searcher/Manifest
index 420bd608d000..c15bcf9ff17b 100644
--- a/sys-apps/the_silver_searcher/Manifest
+++ b/sys-apps/the_silver_searcher/Manifest
@@ -1,18 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST the_silver_searcher-0.29.1.tar.gz 65821 SHA256 779eb781751fd3dc07bff3b88f4475ed78eea3fa7b21139d8230d17c31db072a SHA512 648efe0cd52092ee5d036c7d024c7e2d1ce728c5f80ea9447356f2e31cdbbe96fee67b968a9d66c2b3739f1fc8f6d639452019c6fdeb5996e0d74e9549729fe5 WHIRLPOOL 0dd3934daaf42e1414363ae2b4409bb2187a9c6bbfb76c6cc9337c07129c9d744fe71a3c1d9670531ac92fe9ae4793a5bfad35185b6e697ccfc1d571f1055985
 EBUILD the_silver_searcher-0.29.1.ebuild 962 SHA256 070fe669097c8e56f1d2f0a5a96d531020926bf54a14bf0e6baa3fec503436d7 SHA512 cfecc6ffad2e1b6e59bb66b5d505fb42789b8fdf320914d1394da0d6fd9819716da23928d254b20caa4d611d8382efad00d5bd338c0bee4b2b0bc4523bf6f970 WHIRLPOOL 5ba51f179390cb199d509e851c5aedf78662187ebc1723fe65c8b5a5d818897c5a55e313f857f3ba930a70a92b604ffbf49dc3967c196d0fec6e9110fdde4c6b
 MISC ChangeLog 7821 SHA256 b4852ace8af969c37c300d09e6b1c05f21b0cf24db68cc76e809b27c71d076ba SHA512 015d10ebcbc7b659d99d838de34a53b41652269444170664239ab0e7ffe5019f7197578d324e44110845aa322bce82dbb487e4d13f70db921312c98693dd09ae WHIRLPOOL e81ba5fe18c761d019b64449f23a9fd0dc4c38701cbd3dc488e19c344aa39ab8d0f0e4790ca006faaf81abdca3975347c099a93bffa94eedbab6ca86d2bbfa30
-MISC metadata.xml 337 SHA256 3e669d9e8d36c5ae48fb302361a0bfe0cdaa3a6b3a6ec934f9f5ccd9c15f775c SHA512 a0f9941a254d685dd6636708164ab5501dfe5cd2d87ea989cc0dfdb2024004d8b7a9b608ad273f31562e3a5debe4245849d147d504b71510d7d8bc50e10238c9 WHIRLPOOL 6647e744bfc7080f80e984cab3d6c0636aa0e814ce28af8db47302e83fe06900ad4bb5b217cb5fa2e9d7923fb86644a96138abdd3b6be14ef62febefe9afe528
+MISC metadata.xml 432 SHA256 0ef880601bce2543e8cce81d560473f758d77b0e036b0c45e6ca61574117c339 SHA512 605dd4a158dce3ab0a58f886f9963ef517ca8b3bf3a8d46e03177df9b56c955be87646d20f5102251443c1aa3cba8c35875c61ce12bed89208e3980990a62a54 WHIRLPOOL aef85aa11316b5508dcc90f0e13e268373104ab56bceaa1c5a196e5cfeec0f13939569f340e50fde1b22e3ce088f87136e039a2ddce822b010882f9074c939d6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJVDRQbAAoJEEqz6FtPBkyjWGwH/1ocotnyQvj78e39N8Mm/jT6
-dU+d4iNJPADdy3gXiQAPEaO8oWRCX51FZCssF4Wte9LCa5+gczDvfaCVxgvn2ndS
-7vds9Ne/q5ST3r9kDah9+IegtGidaOQ6Q7qPSw5ZXj6gqrlq/y6V56CgG5T3V/Ul
-vhOVjVpGOWdvvGjxw0eiT2r+uoH0bNAkT31YOjZeqCFmYejp/Tp7tGbRo/EvToCl
-bsA6YEavppXdY3CthsdtSkrQRrfYHOmI60bQtcKpnWY9YVH4Zics3txSxYXgc40o
-nT31fQukQdGBp33tllDGkD/ec05WnqqkIa30bOO4SZDiCkCkkNal+6Vrr+TrhFE=
-=9fvB
+iQJ8BAEBCgBmBQJVfyVTXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiL8IQAKQl2WVh/c4vqr5P1D73eg/V
+WZEuGLaJSq20OAVxyIBVShVC99tuw1lNlbVqWrzmxcoA8KyUjk/IIIb023FAr6WX
+gUivpbfWouotH7qmFnP69wcCW5QBRHbpO5mJDIeMTzvLDfFWvqP0m+aX1zi42A3l
+KK7FhSCHmYyGgAb0dZBWOju+3seX7QrVYtqcwHW6ddl0Ot08FORdCNmLFdRPCXht
+47or5bYApVuKGJQkNYPyhle7UStFW/RTG3h0w9VQf3//iESQeYw3LJkB0uVrBf1J
+0FtehO0v5J1laz5cjLJdqricLveOFOaO05TT/uQzxmvNnxxztH7DLkIOxgt8e9wi
+UGibk8XGRJH0QAln1V2YMNuVl0VoPLVewjGYbqlkFEWq4tCJ4xhcIQtVuCEMcJwc
+80vaZuZAJTH93+UZRj5y8GvFPFV3PIrRZ8VcLznLrhkhoX6yz6rw1tB7+faOrKNx
+X8kdUAZZe68gIGNV0TN267EgC/uj8v5v8G+zziFkn0dLb92+FRdfo7580O9PEY8q
+TtsR0ZISORy/Dz5eq0j07v/7S3COGyIq7dX4vVgcPRkz2IfEiqSqQr6sNUzSNmHs
+8mxOtYC0h8TTK58FtaTX9K7Ro7lm91/vcKgVAH0ekbNQ7eZ8LBASeID916dYiFfl
+q8HMv9GhF434p6uqh1fx
+=phnX
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/the_silver_searcher/metadata.xml b/sys-apps/the_silver_searcher/metadata.xml
index 6dd76bd51a55..9b7b6dec471a 100644
--- a/sys-apps/the_silver_searcher/metadata.xml
+++ b/sys-apps/the_silver_searcher/metadata.xml
@@ -9,4 +9,7 @@
     <email>radhermit@gentoo.org</email>
     <name>Tim Harder</name>
   </maintainer>
+  <upstream>
+    <remote-id type="github">ggreer/the_silver_searcher</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sys-apps/tomoyo-tools/Manifest b/sys-apps/tomoyo-tools/Manifest
index bd65c3b0197f..c3d5e6a759e9 100644
--- a/sys-apps/tomoyo-tools/Manifest
+++ b/sys-apps/tomoyo-tools/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX tomoyo-tools-2.2.0_p20120414-gentoo.patch 708 SHA256 5f14654b236a43acd8e8d71ece53f71df41a542b33fbe265bf2bee0989714d98 SHA512 2ab4458810ad8eec0b801fb2395a7da54023d3b254350809757d999d5ada38988ddf37d2faf044cee0df840da161fd3a150b2a2b9bb1253c68c956061334ec1f WHIRLPOOL a8b42052803bdf950f8f6386b5b5c8a331baa38ae055515aac38be1cd0b4973bf7c13a398a73562fe0f9ed8b87fb47eab3013cb93dabac024b3cb16c98b1221b
 AUX tomoyo-tools-2.2.0_p20120414-ldflags.patch 560 SHA256 dc7891c3229302968ef09047af468d09f3444a7fae38e042cd685c680844bd3a SHA512 9962e2ec625fbd414860dc0f576297e53932752eaa2de849d0813854fdd15fd99b45993ceb531df507ac033048408a9e45d7666811c204e6f692334f274d4f89 WHIRLPOOL da24cb0459b3fbe335ca8cd3bd3bdac38aa336442c1df40001d60a86c6b3a1d618165faa6970e55d0d9cdee48ce0ebdfc0b2cecfbd88080b25c37066199daa40
@@ -20,11 +20,23 @@ EBUILD tomoyo-tools-2.4.0_p20120414.ebuild 1449 SHA256 d50210ec1fbf8df1496971d94
 EBUILD tomoyo-tools-2.5.0_p20120414.ebuild 1432 SHA256 85bdf2e7c473771debde9627284ce33ec8da3e408a4eedb13a84d68873934d51 SHA512 45d3268c1aea2929ce3c3ca9452b1c59efd07aa7e0e9bfd8b56fa9baa1f63657f2273628bd04fbcbe0dd18638d042c84dc77d7ecbb9c6f5f080d994725805d41 WHIRLPOOL 569b76c9713e0ce7829462c68c003de772dc758e9247d0f8a87fe89933b9a88615225354b1a0b33d02ae7b481211e45991d3f9811d29f61c2a3c876c7035e844
 EBUILD tomoyo-tools-2.5.0_p20130214.ebuild 1558 SHA256 5939f534c4bb03feb3abc711991cd43edfa02654da707c31fed3d16734d44630 SHA512 8c25a62fa6df0213a2a754c44fd41a9b296e0f2117874c4edcbf0733b20c2f640ad22de127745be1fab99d402d19d16947f6c1f4254c6abf77b3475d147ab5b4 WHIRLPOOL 02611e3c2adb0412dd8535a005cef8f0468ebda02219ab156d6a34846846807b7f9b7816bf0eae0434286a526732bcd29b428fdbbaf98a8d92a07b6981fd1510
 MISC ChangeLog 4207 SHA256 b2ff973f103c21cf8e1a627013fb683e5778cee60d04db366f88e970129ae928 SHA512 b46b2fe9a6ef4c60a40ff4659502b1b5093e77d341b4f2b43ab72581151b6c754e83a7c80ab06d12b28275a453344a1b08b5c051062cc75571fd32561c06bd87 WHIRLPOOL 590495b9215561220284d2c84cea16662aff96de7285a0c473fd5d4b766a2d6c1af95606ba516eb916be6e30a006451816b8f2f724f7a2fad5e9ac6862a5ffa4
-MISC metadata.xml 199 SHA256 cb9dd8161648bc46dbdaa6d37977c0e1c744c6b837dec81af95c9ebdb12534fb SHA512 863b0da90a846f120e430d307ee0c6c3644db7060c3129d300aba5433216dbe3392c61c872055d70798bdd46edcd69f9f80218c75cc319c0f683ded8bf6ee962 WHIRLPOOL d92ed163f816e4fe7d17ef477a05df717cb82365527d5396b3b1cc2aba25d091761da9f52c853e178310421ceda1dfa0e2074d7613f5da7918a7b1a4f9d888fd
+MISC metadata.xml 281 SHA256 7d6c6d07a0adc8a83390644e88dd0a685233a47d25c7c8fb8a10c360c94136c0 SHA512 de9e76492f411442ed96e49f7cd3e81efa7b0fbabf1d4da5ab4e90c63ea99bac0508eda8889a6554a2547c649f360bff22c1ff9ac45077c02fc7d4b99e5162e7 WHIRLPOOL 47e19c56e92cc0d6b388cb02483023e4d5d7c275cc447ededd844b67549361f3da8eece4ae8cde51840f79f924192b6ebe825bfc048fe31cf85d2eebff473d31
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlRxskQACgkQVWmRsqeSphN8aACeIyhRXb+xsKHAUtY+hpwYnyQP
-B9cAn20T17bTHOhL2JzS/HC2RYEPEV3Z
-=U8SB
+iQJ8BAEBCgBmBQJVfyVdXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiRtwP/Ai7EdhUL/8HJbrcYVRFuaIT
+Lp7j7YyImrDT3LzX+4txgRps172T2sIPXD1SQvIiYxibrgyGJxgCgFqumygXVzTK
+6+3BGlncLJGj6DNmfIC7W1/ELqMj/8qfUGOuyk0JoTwgEaPiPzDoMSo6JRBwUybQ
+A9JJ36jYUzC2pM/EVvJFXzvhOJ0ROalJiwaY7jXchjS3Bn29jreEtpY+Rk3ktyKX
+B/I0vupOu5lfTHkxuhLYvmSZg3/pdvgPEdjDhfA8Y5pC4uALPfyTlWc9yIY+mIdq
+FifKYsiMg9Pp/exmDgiFCMEwA+iGy50c/Tke6oiadi6g4fg03UrD/aHZOPp0oUFO
+YqvqYuiQvyQGdPrqroMLHnKY76w4cGtyFNKAGQYNU5BQYGWwb7JkBeqXBU2CaN7H
+E6hyq3GVXAGg8DpZt2PrvYCPdO++Ih9Z8KKKByJDrXNcm0eAKAxPMsTYNYPOenkf
++je44ubcEg82YN47/VthDE+wAa1W5bqwG5zkt5wlwqFphM6O1m4/Az473+FL0N33
+giKHQBqKX0nz9MG4zBXCGUTHA8K9NQAJ6FElZzlZOumiCI1emvbZr141eH/CTq7m
+Slk+8hAa2KFufGMsmcw54lEzkQ2+q8+e0nZRkHeZtBf+b6ksvaUmhx8upvXubJjW
+NIzolqvArJZS0iddbcQf
+=Y9gP
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/tomoyo-tools/metadata.xml b/sys-apps/tomoyo-tools/metadata.xml
index ddaec926024c..7ac93924f73b 100644
--- a/sys-apps/tomoyo-tools/metadata.xml
+++ b/sys-apps/tomoyo-tools/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>naota@gentoo.org</email>
-</maintainer>
+	<maintainer>
+		<email>naota@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge-jp">tomoyo</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/sys-apps/uam/Manifest b/sys-apps/uam/Manifest
index 87ec0af8b914..f336b60842bf 100644
--- a/sys-apps/uam/Manifest
+++ b/sys-apps/uam/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST uam-0.3.1.tar.bz2 59632 SHA256 3f3b43d1aa7d58908d417fa5d35424b91c247c90a2bbec58c5f20198dfac9a5d SHA512 bcd7a37701eb73bf3443d1fa98372fc0788cb3101619265c012d010f83e2cccc17fa8bc033704396707aa6de9caf0a80c9637dd7c7d1f86b01fd844967dac5a5 WHIRLPOOL 55d0fdd5638eaeff95789cb43bdcb86e7fa9d3190445ece0830e8d74cb95cb868a2e902dc3897ad62e46d42e29e7d229dafc8c5e2fa6ef7d693baeee680a7f2c
 DIST uam-0.3.2.tar.bz2 60508 SHA256 f2aa2f98b2b270802d1b5d76d369cbf7615ae458a3fbc9a4f8d1f21623bf2170 SHA512 4a4ee9286b3762227fc5a03a10998cb3b4a2f110cd648bb2ed45f400e31218a17d3929c83450e9190255bda1f22f4001a7f33842999b79c27aa12fc11f286273 WHIRLPOOL 9ca2af7f823191aed523f1a0c44c59d1bfa70755c63fad6fe793ca808fe0f0409ee61f435a6db0f938b00cf38cf9230be8d2c22a45805396d5a19fbfe4d58376
@@ -9,23 +9,23 @@ EBUILD uam-0.3.2.ebuild 1594 SHA256 8f859381a19a16852ff4ef4bb0a44e7172685721842a
 EBUILD uam-0.3.ebuild 1727 SHA256 64b5c7eb69cd0f81d7d4a6fcd2696d7d574cadb945355959a8ad267aaf946d11 SHA512 1e17b49ffe185ce36457044db1a584fad2034c3c86661ed404f085a7b183ea71c7602e22b0d37cf2a9039a444f9b6850d4c59e513ea5707043f0a422736c83ee WHIRLPOOL acce8efbf5710c05af9c12e88b1e0019e0edae6081eb99d520a5e4f8db6fe5e045e56ce5340c3d48565808b8d5e6075cad86a2932bbcb6ec1c56a69f46bf86ce
 EBUILD uam-9999.ebuild 1743 SHA256 74ea6ca561687a20be2119641b023e4d1328c236c09f02964813fea83ce8de44 SHA512 86a0b1274a256fb3d0160e297ff437bf06d9dd7626ee0f9acefc08b5f054e05b671c6871a6d10d7bc1521618b6ebaa7fb40cf48f0bed2cb235a34f70371149e9 WHIRLPOOL 45342ef7f05de564d338de02dc2a746e279e7273325d4ad9426e7ae89b7a3288469d51badced407af441f6c4e3912ed2b5cde713c8f0059184a1c48ca73284c2
 MISC ChangeLog 5448 SHA256 16a4c6dca5095eea021ebd8c9232f61348a4f4622cdb1c56a4b86a547f31a5a1 SHA512 cf4046eec93ec72f27f4e864dda8a25924ddb192141603a25a512c2416020328143ef463358384eee793ba4358395c2728dae5a910155f4766ed55f539dfa661 WHIRLPOOL 9ef722f8d660a46d232e92b115828451900f80ed7c7e69144d720010d7f18899af5b92e2f9d2683a9e54da19f13fa67850aa614587b19285b2e84c02b6f7d1a4
-MISC metadata.xml 653 SHA256 6231f2f1a25e9447e36a793023439c47fcf541e016fad87146e8e36450ad15d9 SHA512 723ec2e299753eda8f4ab5fd302a8ad2d975fa4af78ff1ce4de7d59ee2c9bd331ce0245ed178c1dd5a65f660e72a1f4584f884d5bce5468d41c20548c15fcafb WHIRLPOOL c10be2c6cf3e72797c354b8323a7f38c8c29beef764ea401fc3015632753f23efee22c5f2ebce73728217964f3bb18fbd4e333dee7142703a23d18c26fe1b464
+MISC metadata.xml 706 SHA256 a69396d2f09d5160d0ff8e74500b27b2e5ecfe6a6accd3160d4a213f26d143eb SHA512 62be2d5856be2d437f54dc163b9f8ad770e19bcf76b8e2971adf9bac8e377306a0256aaf661dcb0c640138cc93948fed571fa607cd5c931e6cc8044ec664f4e6 WHIRLPOOL 9d64a47b21f4a9d00e52392f066f64996316f8a3905af932518fd9ff78441e5ff519e0a2c73462a8d451e6db243facdef41256a4f1fcdc55beab90f1ea9efe9f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJTuU2WXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOmy4QAKruxxua7MRkyfknDEALHJDW
-IvRW9St1XR2P84+uBfCtfYwawu6Ievy9AWafLyfYp1NgdFfmBKN4TMGh8aLXa8XE
-v3cxOFeE1Ki+VM4LWL9do3pET/n5ASXe0tkoAoBWFtv2RQ/0Wn3l/FXF1H6F9awW
-3psgkWlA0CN9ECEEZ2+XouHB8+mdCwz/rR8VrR1TUH1z3PrCA8BRW1BPkEg2ClUB
-oTTbRiNsLS6MnZsx1KY8zS4qP2W8fWBvongIg6h38k7G6CHEyJW91GMIpxmYD9vb
-thfI76wwPlqpT8rJ30Cys5cxi4uR20kxlh41rhDxDn1SbfHQfyL5vEabtVe4MsR1
-l9ROLY6jL4Y0yFpjzMcFulVPE1QdiDtL2It9FBPNtwnKLRyES4NSPeXRpUx9xXzk
-D9cYTCerRSFjjNaRZs1mmAi052rql1FJ1D9cXnzTmyUggo+0TNUePgRS2somADKw
-RspgsQMkaM5W+OQ7fHwHDV+k805XMYyTKSMXdxucBgM16wJMp/0y9pm/rDC+zAIC
-/zSp5mE7VnusYvR9DFdm9WDLHQZmspSxJjW08KSms9MEaYL0BaF5eZ0FOsXT0TAB
-pgGIC8q3s2F8VA1lV+2/DNtmyHus631d98sGqbv8SL9QB+JWDG+GJ0oW4KMARJ0d
-fhZu/tPxHavSS6y9TBaT
-=seak
+iQJ8BAEBCgBmBQJVfyVqXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi5qUQALbs1X8rZkBjE38VB5BtNRVL
+qAkTtdmM0hR5W2EHWIA0KyH6+NoZPfKsUHZYpplzPo2YlNyU01aGoO2ZJreP3J1m
+TNsQH2fTJiBmOplOWN9cVYzep8NGDKRrKC9pW0viEaVXGEPrKWNZDNwohcIehmKu
+NIEu/AmoEIl8zmEKzI8CiL0UyYubeM4FdqQd8OEYEoNDSBwBJDQQWUwHN5MHIyQ0
+ar6BwKuqimpbgj1bBqxvrkr9ZXNw87Z0nGas7uZEGCgJPFLC4NFa0deeEDYhzpVX
+PkeVdGkWMKDDWTsunI6B23wPCVwWyOwVTkxnnMfGga0mAfzbKpk4EQHF8jSt0zHb
+zQiQ9dvfra5ae0KWOZ8gLSoXrdgOoAg9RBWzyCSIw9RbQ37WeUZfqKrS+lKFxY88
+1OEm0Aj9TkhBH/MEuDJz49dz+1sN1CuiTUfftaQsbejwdympRsKL/ZyTEfq9VWBG
+0icXY0AdL5dH60tjo/3lPS4Cg/UgI8J8aUTewOpFX1TJTOxa1ITkoWq0Z4z0cedd
+66OEy7PsHCxEeGrUVfDBVZbgGRKtqOnoTC8hIUH+qQ/kiDZZfgOFlsJuABfXDbyS
+ohmbGdWD1np/wpGreZMYnz+3vMeJWxiUvpNMZFgbDXeBPfQNS/1U9rJW0u2jWvF6
+8MgvJIeVnEXnlsz4U4hU
+=Vru4
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/uam/metadata.xml b/sys-apps/uam/metadata.xml
index d738f4961db4..9ac331c9a557 100644
--- a/sys-apps/uam/metadata.xml
+++ b/sys-apps/uam/metadata.xml
@@ -16,5 +16,6 @@
 			<name>Michał Górny</name>
 		</maintainer>
 		<bugs-to>https://bitbucket.org/mgorny/uam/issues/</bugs-to>
+		<remote-id type="bitbucket">mgorny/uam</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/udevil/Manifest b/sys-apps/udevil/Manifest
index 56aa11915a50..cc6b234bba51 100644
--- a/sys-apps/udevil/Manifest
+++ b/sys-apps/udevil/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX udevil-0.4.1-automake-1.13.patch 233 SHA256 4d2859bd2347886bef48fb912fbe81adc87f10a115636f327774072642cb9f8e SHA512 5b10e779c16f239e8a2a52148d4b0833bdff8b35d3eadbc47289135a6a259ba06596c102429d26283d91212a88e436e8e71e571a6789299fd408028bc62a02c5 WHIRLPOOL 7e7f4690aac450bafa009bee681fa1cca2043f1ca7f56442f9b40d06ab8c8bad2dd86b316908dea8282e877d40ac3a352c3eaa9eeb6ff45ac05f91ea6e708862
 AUX udevil-0.4.1-flags.patch 1047 SHA256 67f38afd87aa6e7c65b961c89ade081b2f2889722f1fe6dc2b74df1558c67dac SHA512 71ea30cc73e3ac56fe4e1278672e85434079fd2b6ead78409a30ba22a5d13dd308bfa20624fe1096f970a54fc5e6385219f1ec4d70d42c90c51273ca121bc480 WHIRLPOOL 303d39ab76374ec01cdb8406b6d236a43b872217a44920f45eca828112d4cd4ebb752b326bbda5392344b8b1ec98bff399d35aa1a7cf12074e701fed26e7a8bc
@@ -11,21 +11,23 @@ EBUILD udevil-0.4.1.ebuild 1924 SHA256 12e6a69fc64b3866958006829a92a3f0cf232a444
 EBUILD udevil-0.4.3.ebuild 1924 SHA256 7a5b725cc3c8626062606d3f374c62ab59c4c9722ecd90cb206f0f82800d1192 SHA512 f1221e1cd3af721f2390336adcd54ce538bf2c625d4501c4d932b4923d80d96d50a05be652396a25882fb463d8e61fa79881efbf898479aba3f909f1e0e98a4f WHIRLPOOL 0f676362c2b27c27644b1431a83137100a4414ba2d530029d3843a6daaafaf49a9098306b7e1346536254355bfed97d7a3be7874ccdf34ed7472576527cc3c45
 EBUILD udevil-0.4.4.ebuild 1991 SHA256 a7a563d2503e04da13c0ac1c21d30794191a5980f7a88772072ab31d68b61cc0 SHA512 4cca8e1e05c74d51271c1b95ae48286014af13da11a11a4de0d8db0131e780741ba7e6883370faf1901c22b85cf1fff8ac9d62ac8e1f69891ae9943ef8232780 WHIRLPOOL a045aefc839fa9bb9bf76adb8176d836f4dbdcefa8fcc7777196622ee9e643d0da9878649155606d5d08e261694f3fbcdbc5f56dbd5c6d74a3cdf20dc8d9eef8
 MISC ChangeLog 5315 SHA256 3e24f6b4c4dab6f39b23581071f669c5a22ae30fe59b5bce95063b1b63d7a128 SHA512 89b4d5cad902712a48c886b010e2feda784d87cabefe4c71def4121cca1a9429c845baebd0702a4a7b1322e1e3573c2d81b8d10c3643b61514eb2ab634d6aca3 WHIRLPOOL 89b0926269dc13248240f1897643ae3372c79df21ac153e4eeccff50fad3521f55c4cfb2c6f9fce277af8e659db1b33b7edb629088d22bcc5cf312de7e1dfd89
-MISC metadata.xml 373 SHA256 908a46c297d1ed92577808ad6fce77499b2c68a2c6a6f7d832a8baeb9aa5b8e0 SHA512 187eba8ae3dae81390943eaacae4143c581739f02752297759aa030ad1e7852d08ca07d914457df1d829a8ddaf7a0eac1fec733d8d05c3b588607da96982f2b5 WHIRLPOOL eb510b9496b996e25b2621b178cf79bf3410242f11aae6fcf33acb5189a0c4db50892a61c7efd435d38d362caf078855dbd15a8639a542de8b46214dcb7521f3
+MISC metadata.xml 457 SHA256 3e11d738ecd8730dc5a363f1da0d05250cb32e21fa341a4eb3efd63b521d1f32 SHA512 c2b9c40d949bf891cd7769660e01cde01dbbe47d5979c12efe89119ae7b7cedea6986d1808a65e8b716ce115e97cd5ac665f919ad28d51928bc5d63b025cd65d WHIRLPOOL 9f336ae32cbe40fd2f63525bd21784780d57b8b4e4c256520b4dac41b02254ab514904d759c5405574556f2e4ae7cfde34c7e0cd7f65624e54b92221fd5f1542
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJVfRw1AAoJEAEkDpRQOeFw6/0QAMGXzkQhs7N9C5h6qn8wodv3
-qs3TLKmx9nb9keiCwPIulfEvAIk/NUP6iIHNh12x8i/pW3Mexey24ha9q1L20gvY
-tm7RE6TIWZh5bCQR6SmHm0SQWEC9uQ2xTSqWhXWuMX5ViJDfEihyWrmNJqoeNLGf
-U1a8q5UOIAFz/Mk693hs5UM8evsxRaNTXfigIyeZb7im0ScWwiL+NYvFAXSEL9e9
-erDP9dIm5rOUky7P4YPSPfa/KsFjPymim3Yhnp0xlU33Wlj8TOlFXd39w+uFHNgp
-rbfzLQEFrotJmw/caCNaE+4wtjKC84kQ+sgiDsygapa3oUKUzLIFbPduRCnnbyaj
-3dvQNhXnaFdzKMad/fUZDpiSA0y0EKYLHkUfO4St2g1q00aWPB6ucONpPnC8mcd+
-lXuPl0P+oumtVNnopPzgBz7ybpD+yVRapbhKrWouSaxo5iKzC2IIWFQs3VH09OQv
-psIXqpJxywEImwnMGlFZQlsygGzsOATlJ9hb31aLlL6A1Hk2P+/WbLbbTh5ZG+WN
-KTv/hb6s2NxINouJ+JzwEsACgB+IU3Ro/T4bBzaDAqkeqtSsF0EYkboOyP4Mx5dS
-SVEvxPqko0N1lgg+BwF+WuJAbkC9yb7+xMg44FsGAYl2x4vX9ZeITOhxYkdsfdhs
-ovWGfnK0/SHV9SFv7wy7
-=ZWvw
+iQJ8BAEBCgBmBQJVfyVzXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiAB8P/1DeI4aBK8xS78RBIQlamt3+
+vRnQs/H3ybpT6uEUaHUnjXLGwfN2S9EpvnTUPtHKC+SsXbdyGBIYEjJ/g1To8CQ3
+YFee3wR7cGrPgdKEdFEPIUBDrA7Ejym2/dSfmhpvIJLrJ+IMDjp6JJCTPWdFyj8Q
+ZYgexWAlP1N2aRLA8RaJdI9IXxDr+qeFIiAj/WqIZyfjkWgU3x4+HAT0G+FukmUU
+jbKlaQ0BtpSz7y2Yhr+cp3wlShqqJ4WU43sohDRma7v6l5KU66bhZgidYyV29DOp
+nEALedW81WNWDrKZVN/xHttAx4G7yzTEbHUFFd9JoW6UELxdSkvjuD36n+fk1uhd
+DF3vFas7St6C337oOSXz87+THbp/s7HzDx7arkM9qOKgMvd+0ynwKWJitJarLTcK
+4NWzyIDwvfZVGTp5BJVfjRntzuh7P35p13aOpc9hdPaB52g6wkkIpR7XFq9mUYlh
+UsI8Rph9EUVLF4UC8Xk6e3FSRdW7Hz9NBAq0cri/TUUj07gUYc45MC9xQ/m7rRvm
+hNHeneAjoY4pTaUBDzRjgekjX5u131sEyevhYulYkZDfeDy/o/rPlcOtMHgT/HZY
+CmLV2qINn365jH7Fxfa8Iiy+hL32e0X1p4At0WrPAAkx8Hj9jGJtlG6a94dtJjqk
+DM5Px7WrwPn/8rctKNV6
+=dxVw
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/udevil/metadata.xml b/sys-apps/udevil/metadata.xml
index 8f186631fa62..0bd37e4f04e2 100644
--- a/sys-apps/udevil/metadata.xml
+++ b/sys-apps/udevil/metadata.xml
@@ -10,4 +10,7 @@
 		<email>ThyArmageddon+Gentoo@Gmail.com</email>
 		<name>Elijah El Lazkani</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">IgnorantGuru/udevil</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/watchdog/Manifest b/sys-apps/watchdog/Manifest
index e4c91be31e9e..44635c866cb4 100644
--- a/sys-apps/watchdog/Manifest
+++ b/sys-apps/watchdog/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX watchdog-conf.d 272 SHA256 344c6926063c99a4277bd9b79231b94346354a50b35de9693333289b6ba6c4f8 SHA512 147e8b7bc93512d96714ecfa6745062db1a21f06d0e30f50fe887b9cde81cee57fe21877a0119d034fe3fe2930b84ee7b7a8d95a1942b9061e382e1c9b7279c9 WHIRLPOOL e9ef98cf79cd4684ee8736df7e84c13441fa5e1395c2ef0d7b277f6e4b6dc6772cfaf737479505c21edd5cda7b540936b0b7e36c9cfad0813015eca393ed24ab
 AUX watchdog-init.d 974 SHA256 a271ee1d7dcd541c8778481789287718181e9607f34185eb14281ad1e3bf5425 SHA512 5f25d3537c9f86d3eefc3c3565d33ccc37bbf784215931ec537ba7f1ec18949f4715f27a1d03167075e5f261184fcc7940ce1f899c5174a5a2d2d92636d462cf WHIRLPOOL 60298992b767711c86fcbdb980c1f41c371ae7498bc713f8a35742ac4e6a684a80ca86be651898bc7a365a9a382376d3a04339657cd9bc0979de3aaef1148fef
@@ -9,11 +9,23 @@ DIST watchdog-5.14.tar.gz 216384 SHA256 620b2f49e9879f2e85c73d4c1f422f9101e6b38e
 EBUILD watchdog-5.13-r1.ebuild 984 SHA256 bcf3ca9ff68bb9c66d78204649e7f10a166e992d46c2bab9ba29e120f47feab2 SHA512 dc2d5f68ca4877807611ccc3dc83b8c9575d37c1db96ae9bbf5c29c04b6e20ca27c1548958a485b57460e49be3f90b7bc8b32c8227773dbfc82d6d83aab0c098 WHIRLPOOL 55d0169ef0112ddb37a071973ab787d20638046af5c77f2e9a8410f8e8c22c8cdce514c4b04a02dc3c7fd47d35184c34e5c6497c4ab2c6bdbdde2b36597e8720
 EBUILD watchdog-5.14.ebuild 986 SHA256 128f1c7e83573a54736bae7b664546c2f1702b7029641754c5c553c8af443230 SHA512 275052243d31d80319b1713af0176b7314bf22da22647afd4365b2c6e475467d11ed2e3a139e87e1f4f438241a656040a1ee58a794fb26e541ed9737f3daf9e5 WHIRLPOOL f243c63fd8c148f9269c469eee2098dfb215441b6ac021dc4ea336a78a7a4a9e9ddf9e13fc371f75171c79c840129c4eb2e8c3ef0ccf2c3c6de418491665f8da
 MISC ChangeLog 9140 SHA256 2f914cbe4db7c3937891694276e85afbc131b4f96d34813df4c186623922cd82 SHA512 9a106d6d1a1e96ffbb624dd0f684455632f4a6fba95e5696f9786065fa525dc67b8d786630d40fd5bec5c557e5dc2953811babcc0c2769f5cf7701c66645a867 WHIRLPOOL c6b47b3bb0124b1c3aefece0014f9e930891faab0754c45e501ee7281ec4bfea17a8ee60731cff78039906fa426bd560dfbf86ada47ead429b11daba028e27d1
-MISC metadata.xml 241 SHA256 7aa467bf952aceccf5fd4ca49cd13eb53ddc4d5143c380e8b3524531a41fe361 SHA512 e98b6e634ebf34d7297760e26759e278a5a41636de0365e04d413672112c505f2d8ee228e55c621327fef81dde565b95c3acaac7af67e22a80a0a5cdf8f7376b WHIRLPOOL 9d0615ccc2a632f0819d1a46c7ca231120f02cea9536e06921e7bd518077e758b26345148fd8cea02aacfced6f8729440683646c07f75d30a784c401dad0c74c
+MISC metadata.xml 323 SHA256 c271cb50b004a9cfc4d9b8f04668072607ff34b8ec3604cc3d91374c4e18d201 SHA512 6b2b19d1e94b1f24f0d60e867b9075d2711d672e33c36870522c2446a04dd6c3a01fa50ffec564c45217147efbffba7599a05a7e274f6a92c05a6a86fec81fa8 WHIRLPOOL acafd36d8f5215e3727f383a7d5c335934ef3ceedccfa9a14a04211b1b345fc0c6933fd456f4ef0cfbad7b7203e330b41b6f230dcd9c4029103e4daa33e52e00
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlV525wACgkQkKaRLQcq0GJ8OACgs36Ur5cg4UB18f5xLvtQvw16
-Tx4An3fLOGXrCBGaY5EhSL73MsMVVDKz
-=yvXf
+iQJ8BAEBCgBmBQJVfyWBXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmigrIP/RPCWYbpXW1bGkkPyX5nbBpl
+HMIDcIP+FPgNc8469erh/BNs075q99JBb3z5Ot2cmTeZlt85ofrjnyWw8pXtwV9s
+VWopgS80kpRn28IxjW9qJiuU/6rVT+YrlCjMjoiz7D/MsukZOrMsoPlhmlo4s9Wk
+vXn8nuGoCvkDoZDDoBuU3i8VFAXTICdM0FcV18cR7jHpkdfdjQdZu1S/Dk+ENlZb
+JHu+rNe41A3IJAZxuMh1tn5FwlO3O2veT0b+9nPAlLQtm1orByTI8zTtoVCISym5
+9C1yRGGfaRBF0dLAnfC045qIPJn+Fxb2ZlqW7xHw4upEAbM5FBOVEnnV1yKkzu9j
+sggm/JS1ttMUvh59cL5j6Y6d0Fkr58hNwjCt/q/lp0WdcZkvncZII8EMwP5ysJqC
+i4h+YO+w5xskfgJjjeBpQ9qH5tyZaGQV6i0n8yVD8+MT/x4IfX6fcyiQNgGLaqby
+i9vl1mOefbFoWN//AKJpDzSai0scGmMR/6mhj6/FFVtzSpM7+MS32jZQjDO9vrye
+ag1jwp7kZYqs4ZLbYrooYIsLzRJtuI/0mLch2sV2FVPgbfxDHgymHOu5nou0Jijo
+belQrXR3BZESEgbLg5RugZjp2QPcEVgd9aUqP5MrWFtBzatBT2kTFf8NqxyhyVKA
+uTWPVQg3UnGVZhZSpVkI
+=HBAo
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/watchdog/metadata.xml b/sys-apps/watchdog/metadata.xml
index 4bd23572dcb1..65d570ff1c20 100644
--- a/sys-apps/watchdog/metadata.xml
+++ b/sys-apps/watchdog/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>base-system</herd>
-<use>
-	<flag name='nfs'>enable support for checking nfs mounts</flag>
-</use>
+	<herd>base-system</herd>
+	<use>
+		<flag name="nfs">enable support for checking nfs mounts</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">watchdog</remote-id>
+	</upstream>
 </pkgmetadata>
author	Justin Lecher <jlec@gentoo.org>	2015-06-15 19:20:34 +0000
committer	Justin Lecher <jlec@gentoo.org>	2015-06-15 19:20:34 +0000
commit	bf33771790ac35f72e51f9ede1171a2d12d3a74a (patch)
tree	9430c03c0c2390d43da6a2ba9c672d56cbeb96e6 /sys-apps
parent	Don't install uninstall informations, bug 551638; make use of path_exists() (diff)
download	historical-bf33771790ac35f72e51f9ede1171a2d12d3a74a.tar.gz historical-bf33771790ac35f72e51f9ede1171a2d12d3a74a.tar.bz2 historical-bf33771790ac35f72e51f9ede1171a2d12d3a74a.zip