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 18:11:19 +0000
committer: Justin Lecher <jlec@gentoo.org> 2015-06-15 18:11:19 +0000
commit: 17d0dbb5a9c2e4ce963f9768c5def4683db802d9 (patch)
tree: c4c3e5ff32935180a2623e74449dc048243e727d /net-misc
parent: Drop old (diff)
download: historical-17d0dbb5a9c2e4ce963f9768c5def4683db802d9.tar.gz
historical-17d0dbb5a9c2e4ce963f9768c5def4683db802d9.tar.bz2
historical-17d0dbb5a9c2e4ce963f9768c5def4683db802d9.zip
204 files changed, 2467 insertions, 1166 deletions
diff --git a/net-misc/apt-proxy/Manifest b/net-misc/apt-proxy/Manifest
index a4060cd69745..215673fd341e 100644
--- a/net-misc/apt-proxy/Manifest
+++ b/net-misc/apt-proxy/Manifest
@@ -1,6 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX apt-proxy 454 SHA256 1ccb4cbf543b1c3148c0d5c6c65cf77a726074780f252b0bf68ad4aba16c387b SHA512 0fe76183cff8c66ceafaa7198b75cab856ce749d2166b2e98aeed63a4a38c7f3179343f64fc5e4dc0045fb3c1fb031b8fcc809e9c1534387286b65000d90c256 WHIRLPOOL 8c55bcbf81f7a7c80a03a4800f75ae1da6c58f86ea2bd9470f30cef8c1a531674730503f03a83894852386181c2e384938ad124907685e068495bf0968f763be
 AUX apt-proxy-1.3.0-sh.patch 438 SHA256 c8a78f77eed5fd1b6cf22be3f17f1d7b9738cdf08805d31ad43714df18617e4f SHA512 f08326045bd2fa39df43d7f3109af55d8697e311c72ec3b4bb3be51d4c391ad78b726832cca54a46530e8f3833498421fda6e984dcab1e927202e37fbf6875dd WHIRLPOOL 988082ceb41c3a43bd1c300e8c22b2c386f4fedd01b8bb607cd05fb135165face8f5aa6dede1b84f68b8393170e22860d39ffb7338835e246c5a0a9949a0c8f4
 DIST apt-proxy_1.3.0.tar.gz 37951 SHA256 12e5c5361ba3050a715f21c8191a1f52e255d179af10e3d110271651cb739ea9 SHA512 300d4684e726f0ac6ece0cf9dfe5c805f187651d36a38530cdf125f730f6c261dc1edd7ac5c0f54d6396a6aa8e3f007fa70a4c90e96bf672dfe9081c9a5b36d0 WHIRLPOOL 407a76367657baca536e5b753ea5ff01b9571d34f1b1d37d163c4586c09bd6a99168754ab22937994677e445941252374800d50258d61e4e5341a2b5865e67d4
 EBUILD apt-proxy-1.3.0.ebuild 1594 SHA256 aa8fe67731278c73bd10391eea0ffc1432c13502b90a9c2216732554a107aaae SHA512 6db55f4d517936ef591e2edbf7de3f3e33b97d9f79d4cc9527a6b6eedc2c964adf5ae419ea469698a993b3c899799c4e9ed698cb3e20852b3d1d2bedf4ecb5df WHIRLPOOL c6a56754c99ed7135440daec24814ad1981dac915859c2fd4f29f8a9d07592bb5e4a8de474dc4aee7a3e738eab4cd6fa50ed40fa437ef32cd5714c3064d5d344
 MISC ChangeLog 964 SHA256 1d385a1066caaa8da9a73cf2760b35ae7f05cd8b33414a60397d8b869de1c6e9 SHA512 17ca4903c6912a33234a7a335f6094bc275ec5eb355bfbedb2c2254d3396c8864f7ad19861b1474a0889d7ee818359241984dc0774d204c791ee543236c903db WHIRLPOOL b8dab079479614541fa992446d03f5990e77b2b0ca6584e8f10c1b92e37589f7f32b75eb7f7fe3346fd084686b5e31b8231074c26ed83992924e2677dec6d69c
-MISC metadata.xml 210 SHA256 90082fe26a119a63ca8fbe227f66c33ba74167b6cf28e2cef02dea6c4f656c39 SHA512 4554adeece55ce9adfdadba04443a3ede6ff910b96a11b77bb1f07ddd6bdbc756b8e6e1873660f8f54e67f46db1065980794a6136c6de7883b24d0ee13ff51fe WHIRLPOOL f546bd1233d5a9934ba0480881ceba944cb8ff1869c12ed2421d4ccbb247ee38dc0c7c8b979f10533ad0fc603b5e4829d0ddf174a83d0bda8e8dd62c1c873eeb
+MISC metadata.xml 293 SHA256 9cfdb24297b637e75141e7ddc7c6b5ffcd9f7573208de543d1e5177a02ab8723 SHA512 6aa02d2204a066fb64a5c6f3bc6f39d843c722e6b865d0912d16e035badd515e5bc78439e84c8b88f0cd7c7d96985d6eca5066b3594f4544c27ca517e87e4aba WHIRLPOOL c9ba21aa40f723fb783c6526b7afdbcc20c15faff1832c95a267f5a7008722d7d0d6b0aa23c43938909c7c709c2d5b0956a769eb798524177bec443cc3da12e5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVfxBpXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiWQ4P/RiEklv4dNapyjv5d3+vw8Ng
+PsdgsZjxKpwI5j27jnrADgXG+yMIVzXszi++2SBSGcGoPVF4e0/3+d9MavzQKCdY
+gx8gtlLZas4wbAd8cV8jk3fI9r5aScee2UHh1swJXxMlix/FtLno7GdoOEb+lB/T
+632SD7oJLxnQQTF3SPTLSTwd71QZQgfMYSK16IP32Q4oQPS8rp9ZwNOOrHMZjbZ2
+5XnvlR/vv3Pwf2l9xKa5oRbaOYy643a1ncL5Ud4nFmHGyGH6zlRjY+aMDoMErxOk
+4gHTTAW+R11agmvqWksSdXwbEK/zuc0QKDVDF2JazZM7KWC2DVmrtOQk9o4F5wvb
+J957bRCel6SeHgk3a8YjaLDnbdMN8V6XMwt4iYCaED09ngZsJckJsKorxPyGffZ8
+Ws62w/8jdgXxg74xIgyv+TxZsaT2E/x8NfcAk8AN82kwrFdjFTt9akDr5h+2Q7Wd
+ByRii4JQtbyRo9LkE16QDB43hK42FKReqg5LUOGlYpSOHq2E/721LGg9OvkjSJiu
+LRu7KzNtUC0ccIdkubbJ8xLf73d+g2telXtCVXowpvrg0YHV7jXf++8DoRBlptdh
+CEQ6uEt++gRQxwysIee8XVw4XjpTkfVwc9Q3q5ft/mVfT1YZROEOv8ZsFRmpowat
++Q1rovNghSz0mnKUcCIs
+=q2Od
+-----END PGP SIGNATURE-----
diff --git a/net-misc/apt-proxy/metadata.xml b/net-misc/apt-proxy/metadata.xml
index d9cd2cad66c2..f270708b4def 100644
--- a/net-misc/apt-proxy/metadata.xml
+++ b/net-misc/apt-proxy/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">apt-proxy</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/astmanproxy/Manifest b/net-misc/astmanproxy/Manifest
index 245c0679ea04..e09774e25811 100644
--- a/net-misc/astmanproxy/Manifest
+++ b/net-misc/astmanproxy/Manifest
@@ -1,7 +1,29 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX astmanproxy-1.1-gentoo.diff 1051 SHA256 deb9222d8e7b0b32a377b403bf759b8f81f29392622fffa01e7308e09a035bca SHA512 979ce93ac33d66abf8b2d9d99f40ad05963801b2781dede601c69e1f080a0b5e1c6a0f4a2ced6e62568c152d45897b5e238ce76603fe81cb050a7c9a28b932af WHIRLPOOL 7c09246b7115c590fe319ec5cf72574eefa7c2f2fa00007d80d7489ad4ed4d13f7d64bd25445735f2a897a9a509f76a98270ca2ed4cc32b844358ba5f3496675
 AUX astmanproxy-1.28.2-gentoo.diff 1130 SHA256 35e97c56fd26e8709100a810cc41677b1979f084ee82bb9ae017cc7308123ef0 SHA512 296d885478cc66868a7e77d5edaefe1779b5939e3ad26933c21a6e4f44744de00ff0d6d8302948b63f7b924b6cf90c9e790fc5d7d74fdc9df4a6ed3ab5a1b44a WHIRLPOOL 90e4725084f7e2c9dcf5ac7e67ec9476ac1af486803952398fe48fb2fd098a541992507c5a99e99a94459467238eee91e0ef89e949277c626dc77c4b64a552d1
 AUX astmanproxy.rc6 480 SHA256 5019b74917de7d1827c8930a73dd25e95e63b182f3d3a22678efb69c298d4f05 SHA512 d66c7ffe74e136e8321844f8c73ea10d34eb96c35c16c95cbd5a64f6041c7f36496c091564c111beec826290de5a68a88220a8282b2c6ee83e15510eadf6c817 WHIRLPOOL 4194fc6928d8df2809737443b65e883593c4efed2ae44295ce8e407b2f68fd3dd0a65071ce1616b4ba949cba460ca9e6be8babedf7740bcafdfa0fdfd57d08e5
 DIST astmanproxy-1.28.2.tar.gz 65506 SHA256 09c2b5750d69c9ca8d9611cb648a5cedb0fa7102540642b06654e3ac5c31ed4b SHA512 a37caaca42649b19d40b9b0cfe61c6a0e31d7d0de50378565a6add1b27ba09dd6044c7ac2d9b38c424f143fc12acbfa0931c59492399ee34db063ed73cce9293 WHIRLPOOL 08b9d9b186ce424f309efddefa05cc91856cfbfea2b60d65030a15a0868bc1f72717431ba1f884eb0dea411d18fd950c6e17af5c356eae5db030879a0d34cc67
 EBUILD astmanproxy-1.28.2.ebuild 1093 SHA256 bb9bda5b0cc84322e6dc274b36e73b11eed17c95c03f8dbd8f5e5d56795aa1b8 SHA512 bf112200cdd6d5c04d3e66a18477b4b35d965871fad16ae223f8228862a52714bdd8c5abb1308ff2a68b4fe2caa2a027725d7abf8c3c9a0866cd75e46520e44f WHIRLPOOL bf38a01f2787b9ad7c3e32481655ac7fd33009f6b12251dc89e15bb7a0d5aaee07bfb476a3c4f593a30e515901db9004d0c1030eaf89f2e0b1b5b87ab9750606
 MISC ChangeLog 1966 SHA256 0843aa24f5088ac0fe33346d152db4b2c7305880093d86b815302bfd8e05c764 SHA512 02197fd2323d27333297b9003efb0c1fac6b4c82a4ba9ddce48aaafeb25ccd1af71776b0c987694529353053c020708de6773a8e8e3b9d20a1424024c6794b03 WHIRLPOOL f02497dbb85a7ac2962ac2627aa3f6b9f4be164a840d980029f3b3ab9094aaa0a085a46ffeed0197f2f4ebaa8587b147f26d40ab33982650ea618bd5253ecb29
-MISC metadata.xml 199 SHA256 0221d723d795a0c2a87a73390ac40f0ea3d6344440e8164e0cac6575ac5ee664 SHA512 6e66cdb81069d40938e73a3df001fddb1f3ea31912cc779b1f7a6150143be56e4c541339cd6a2b4f77ae19531abcf6d44cb8d9105078332074e40cc188f8bd1c WHIRLPOOL d159c3e98e2fb60490bfbb8d31e755234cb95855cb6155748ea906ff3638435cbd4bf5ba2d3e8f8c947d1346be072429f6f24c0cc66a9a44bd1f7a6ba0edd0ad
+MISC metadata.xml 291 SHA256 a4c1c92fe22573f30d40924537196ebe7ec8f6057c5f5d12a4742d5ad45edb9d SHA512 b72935409c03bdeab0b73cb054e8f8a37631e8d482a137d5de1410c480c7806189e7a9e126c696aead0b2472a83e657f0e3b4035b20903194dbc44d20c242cfd WHIRLPOOL 4b5a8f48ee9afdfb4216b5447f7d002cf5d93d2d91d73dc495f0bb54904d65aea7eb6d5a0fdd2a94ccbc354dcd1430c298dd6551259998ee1833ded7e93804c2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVfxBzXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmio/QP+gMYS7cn07+X6uw5a6fLfgJU
+6LgP6P4P6sQTtY2JFh9L/6SGme7l7hd40w4wfJCV25SRKYcSELBErZVjjO1F6ViC
+552eWxZtvcEM2lE1BP0BGD2HNLPYifBSAD7jlc3rwn3yGj2ydgVApJZhDByroUFA
+ALZ9LwhMtNlGxlt9MjznFVQhjNb6t2UhV6WSQzkH6wT9amOGaURrKH93qdKr5ur0
+NN6CgZp/XUXn9n4nMNDS6qne/6mTLk0k4BKDHoNRGz+RuQvz2gATcYH14NxvvL1Q
+McollCXYomkWgeLK4yZ7H7SphQn9jmUnQQiEig/iTipzxa6KlCS8hRr6aih+dV6P
+NRLvCeDHf+Nlf2aVzQG+uO/CKHaYjgcg8qj0Q1fjrohxyjiH4ODow7AieQqasm3H
+om94xDj6ShaY3AqTX1laAIulvW6q43L/io1Q91W23IuDz84x9JIhFmjxuolNtmop
+8fl2WAuyDwMBw4p2V8IF2HVATwvdqkfG4nji2dPjIqLr1wmWZeIIxTXmQjD5RIjS
+DRFGH/i+3N1rbNyqeiHChgMY4aM+9W4cHLe2d7hnc7ZAZBlAbb4KTv6xAPHPR90U
+HSZISnQaykngc7DfckLkvpQD98F7fBwEqIxCkZTulCl9L64Sb6uAUjN150Gx21bc
+V3gC1IHLjWk6c78ZI/Ts
+=2C0y
+-----END PGP SIGNATURE-----
diff --git a/net-misc/astmanproxy/metadata.xml b/net-misc/astmanproxy/metadata.xml
index 1db71bb6e0e4..15557bab0515 100644
--- a/net-misc/astmanproxy/metadata.xml
+++ b/net-misc/astmanproxy/metadata.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>chainsaw@gentoo.org</email></maintainer>
+	<maintainer>
+		<email>chainsaw@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">davies147/astmanproxy</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/autoupnp/Manifest b/net-misc/autoupnp/Manifest
index ff0c0b29c954..07c5adcba3a7 100644
--- a/net-misc/autoupnp/Manifest
+++ b/net-misc/autoupnp/Manifest
@@ -1,27 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST autoupnp-0.4.6.tar.bz2 240257 SHA256 a8d0a207074fafdb322510fd29a25eb4bf62da9468ea3dc45e7c9740faeccab7 SHA512 570ae76d940879a375e9336cb62cce8b2e007c57df6cbebee5878cf6a71d1fe5853218166ba0ee794586fa20a7c62b158aae9242b30880f6fe110c9bb1502ba1 WHIRLPOOL 4b2d848f36e3f2848e6f08f71296b5cf3fe7794bdfc9e6495428b3b3ae9283ed15e81de0bec2fdf0b36173d59a4c7dbec5dbef30bf3a0ba24e320de313cb20ab
 EBUILD autoupnp-0.4.6.ebuild 752 SHA256 a1344464389394e67dbb5c098d80f2e9c705bcc91dcb3d38ded7f24c202dd7a5 SHA512 2c7d7d941e6dba848a9f3fc382dc177599656dd283fd35e67d9cb27b7f9291a2fc342d29fe7b38d2b9e83f3c3f20ccf93cec3f98938b96b7f06728accf627786 WHIRLPOOL 6574cac30c970a0a9c6d42bf81031deb77d56ab70cd68420e9d684a25ebf6fe2b456315cb71fa3e0f03024458f56f6b780847738d337378aac2ee4946f450444
 EBUILD autoupnp-9999.ebuild 823 SHA256 893b8ddf6f7f8d31ec9de35b7d50674fcde101646794b9d3f3e519eecb0f6199 SHA512 13e1336c46c289b19a2354fd50df3831d34bec5d373153e7dd3469b5f4acb283ea2de6ddc50794d100ea2a1b756905cdf5a14ff40c0f2255b11bbe623edbd768 WHIRLPOOL 6685a3c21cdbc16a3aeb280bf6dbf2470629878bbc9d9561be425b7f105eb3dd3872810d73e8fd52a90c168b9a535f85538bdc1d2c55a57d75ecdcdd98e04ed6
 MISC ChangeLog 1288 SHA256 7cf9f1ea844766a6aae1516a4c74f63e7b2d0e32146f121db92e98dbf4ccf67c SHA512 276bb90987664fa42a232c97ac01bb935c65c777763fe6fe9251bf03b2ccfb204f94ad93d0c35caa442caaa1bcadc2bceb174c01be3ad04f53ac4f23632e9f38 WHIRLPOOL 9687cea90dd934743160a1c0d3c0ea1b683f22e7f3e19d41024ff003ff3b036db5938d63aa11651ce887269cbf1ded12afac5132785bd2a0efc72c260729f5f2
-MISC metadata.xml 439 SHA256 3a365320d3276e1ab252f945eccd0496f894b0e84783bf43ccc252622e1a390e SHA512 2d57f3186f2a0f0851e3c717f046487f11d7986e4e3ef0481fe2e374ddbb31d842dd527d9aee9d4e175ecf0a199f339d4a27bab522e7142864b60cb8d4f25bf4 WHIRLPOOL c6f649caab55c32d893a09c04dbb133dc01f4d413ec274faca2cbca283a80ce09bff0e2352ff9f6ee26b9a5f917954b7dc5feea1735cd6a5431fc52052c0b74a
+MISC metadata.xml 497 SHA256 a6626353a046de23380173ad6df9ea422bbc41254e129ca0bd785fa7a856b9b2 SHA512 cb3ddda2f0f5260d04f55d9abd143c8932523959f070918892879613804a40f5fdc5ec82479387c682b9f6a0682a890e151d76ad9fcfc37ae31d80235882c447 WHIRLPOOL ebeae158464fd87ed498936e43464194862d4c6abe84a757ba5430e377b098843a4fe671135984ab5a8e5a07c378f30112ebb1c3abd547a27f51db52f7875d2b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJTuU02XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOfsIP+wQzfeR5l0DKHxL3IXJdw6Gr
-kysHj82rejMy/KgvoF+/iJLLmB4iKJeN6bpzpk2oygIvBp62PxzBIHOHs+Ae2Ccf
-tL7ll3OB6E4fGO+u1Gk2Hh7mNtWjuHeGWYB5HLBnY8tJZEmOP29APaMW0ACayCkJ
-7r9PNDORKATaa0rkjrscDzSpw9VEDN1N667GhX5hsNRcZpNSpzQ8u+Ln1HCgRTyH
-f0W6kglWc5wTug5s1jMrGo95iIQimHaMRk+axS7fql9mDzTNrEQLqs04sKvmHMKK
-v7xiquHEIYnNOuM+nXwh4zEpaM1nfnAn69cPShC8C3dhaLb/PEbWg/JGqJyIwVP7
-J4PxUzDOojA+ChEz77qomzK9Wk77sCCY6N6oSGQvH0dATIBkKHT2heOwlOEq62a0
-4RSSWYjwGlY+HQkE8Ye/uvEn95hToL9r/WETKB43BkhmftNanYjZfWz1AsYJfx1E
-5n6wdbni0THS1yhyyBuSZSfBxAwf0C52MYLHnHD2JXaqfVmacZ4sdr8qfvlAREOK
-3fn3U3hcSwprZbIg3rBhrPsdic18v68dnbQlLhZyJjEE+nk8M6Jss7RL/TApyZXY
-ks2gSRCXyi+mYpGE8aZLafSjW2zmDwozGftgpx//2PL6jn4OJOp+MuNRZ0jXJk86
-uaIt+VfuGDczuyUSWF9L
-=gcuX
+iQJ8BAEBCgBmBQJVfxB8XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiHmoQAJRO4sktLxMnpHsmWASmkk83
+uutfJYS3zG/uYeKDqWpUAbiJCYsIq8hrQbBc8CxvADFRJzge8vmMDrZNko3EO+Bn
+x88FYhwcra8fBqk0F9/3lFJ0O+1pVbp25mtZKYM1YqrCYUNwxKzIDYs5seMl6PHR
+GyoX+anP1sKer9WM3Tm5CeaiH9ai7odbCI7hKegorI2GEQ+80cZu+n7kHq3pGdNa
+czSqwUngXmk8dFbU4jvi5o/iwP928MdduB/GK1EE8y4Mf5fizEfqVbMmsWI49nkS
+I8r6ITvUj2wKFI3/RbvATu/s/LcPP+N22hfehqFefDBX+pbgedretorf+Mr4PvWJ
+z+NYqRRQa3VP47hkozQoNqOjwvYeCjzNIgCXQeJygtW0KZrnSDQYJJ9PuGxfxP/E
+NCCkIlQXZj5ijbFTK3303iiqxLq58fJ1i2+QPhfXUPyEe7GO2qRZBpuLYWUUqF8I
+nCvxzbMncnRWHCLYU9GqYLbIx6vv7hcttUG2AhH0KX8o0/X20KtxAntXiS/gar0s
+Jy/gH2fUNm8kRx3vJ3QBE+b3NlzIsKi+TPVoJHWFxPgdPn+vcBV/6QRnKsjqthmI
+DyCAA7gVQdMgSMrxQtAwPdBpXrXNnzY9rwXCkraMeNNHmm7Yz0ZTH1kBW4EjiVPg
+tB7PF2Tp5MaWB2hDk+/w
+=ycxX
 -----END PGP SIGNATURE-----
diff --git a/net-misc/autoupnp/metadata.xml b/net-misc/autoupnp/metadata.xml
index 2c1b42969448..1ceb5b062490 100644
--- a/net-misc/autoupnp/metadata.xml
+++ b/net-misc/autoupnp/metadata.xml
@@ -11,5 +11,6 @@
 			<name>Michał Górny</name>
 		</maintainer>
 		<bugs-to>https://bitbucket.org/mgorny/autoupnp/issues/</bugs-to>
+		<remote-id type="bitbucket">mgorny/autoupnp</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-misc/blinkperl/Manifest b/net-misc/blinkperl/Manifest
index 432ee27ea6a9..f27585712d80 100644
--- a/net-misc/blinkperl/Manifest
+++ b/net-misc/blinkperl/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX blinkperl-20030301-Makefile.patch 623 SHA256 1ba66b79f24b1560bdfd0f206658ee5f8904362a49663f23b6d4b788d1a831fc SHA512 a59a3035eb49c7df55ecb4c7fecf0f44e4650dfcdd008b0df9296766405845eb7d7c33d605032ca3ce6edb3ebff6906acf5fa22c9901e27ede17ae22ff697a06 WHIRLPOOL 48b4245b9cecf36bcea6ec30cf4a6072d12dffd67bd277a3b48061d48959d337c929993acf5bede24c3c65d93ef959799a9772d11f6e37a8b6fef8a72f9f3cc2
 AUX blinkperl-20030301-non-local.patch 578 SHA256 3396c8663b2be05db2e62a6dad6d673713e459b72bc3cd50bc648a2fe6571c5b SHA512 3ab799dd71489f4ef946c7bb846695a4a7ed69aabd9fcc641ccd5c464932dafbce98822dd4bc2ec42f07d089231f3260f571e4fd2d871ed8a4509c6b26ba0a40 WHIRLPOOL 5ce1538dc7510fa7430e12b23a729727fde46eac94d0c3e6a0a81fe412b88b6c7c55b11b9801864b1489a2fb708657d8f6885f6c8544b4236935cb60917bf160
@@ -8,15 +8,23 @@ AUX blinkperl.rc 453 SHA256 183eff47f2f802542ef93e23ad3896164e044679b23ca0a2980d
 DIST blinkperl-2003-02-08.tar.gz 64918 SHA256 f131d00432df6b991d38d035565ba471508de822caed1cb7422ace03f11382b0 SHA512 4759e00b179ecc210af7b0a83d0eb18ffd09d1659b38ae4a3de346bc7d5b7d6c319e80f0b28981eb643d165581b2dc35ce78ad59c6b97f1d4b1ce6df33127c9e WHIRLPOOL ec33b073d20677364b28dc94750d6a688f6a0a173d24900d8954e50ef0cb66ef34f1de4772e3f71e70188a47a34ae6ea9dcbb0f50b2b064ceaf0df000f3aac2d
 EBUILD blinkperl-20030301-r1.ebuild 862 SHA256 6056c1192a4e61228bbddba14842b2ada8bc0d6aaf0fb5eeab7e600fb17b2906 SHA512 83b285254704243da86d4e08952daa92e4487b77f905b148fd00b9206500ef408b70adc8bfc4daa9e01636f304c5488275539a524352f012e6f1497343ba95f6 WHIRLPOOL a6562ad5d55c448f657f949adf3581ec6ca0e6138969a61d5c3b6a7233de46f41c615d793c492da593e2ddc73a6b2add114f5d8be4d24ba4ea3dd3c457059927
 MISC ChangeLog 1521 SHA256 bb822fb4a5236ef728836faf3fda91a6977225d2cd7fee1b4bb617a471d6495a SHA512 5f258f95ddb3ee5ad8b301bc08f56010d781a8af28d7873494e4d2cc1d62e09bcbaf101029e394fcc9fd88a0467f5eff3c273cd83c4cf5d2b97210213f78b85c WHIRLPOOL 13adf9b0b010611deffbfa7637176b0d33016a731ef63e5778c2972ce77e2d50aa5d610e7f18e44fba985c63ff633c32baac93a524040a59086f8fe11eac9af9
-MISC metadata.xml 210 SHA256 90082fe26a119a63ca8fbe227f66c33ba74167b6cf28e2cef02dea6c4f656c39 SHA512 4554adeece55ce9adfdadba04443a3ede6ff910b96a11b77bb1f07ddd6bdbc756b8e6e1873660f8f54e67f46db1065980794a6136c6de7883b24d0ee13ff51fe WHIRLPOOL f546bd1233d5a9934ba0480881ceba944cb8ff1869c12ed2421d4ccbb247ee38dc0c7c8b979f10533ad0fc603b5e4829d0ddf174a83d0bda8e8dd62c1c873eeb
+MISC metadata.xml 293 SHA256 de5419183f7544072e3565075c553469fd6b564577fd510d550e608f1be09e52 SHA512 a701599d07e786e748738a226e1aeb54bb2bbd69671e1cb9d01fe2c2b5e0bb57b01642af92048eb99215fd3aeef032db1a94a95d5297a59e9bda1d196967f4f8 WHIRLPOOL 9f894068c1fc8155d7ca9b31ec5464c154671b5ecf99c447dc5e3252f12c4d6805a4f060986b0aeea490328736fdd285601bea0ffb9d002e5a8433ae0bbd02fe
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJQIVI+AAoJEMbwO6tnXQ0sHXcH/RbgrxVx4RIbtncLDUT0yGf2
-G6NylNm4U/GOi0O3YyTfJIQEV1/vFNSkoKNzt35dasy3uoCZBiDTsHLQu/gEzVwl
-Ijh6KkCMh4eG7MHVqiGO6C/mZCyM6Tn2GEibB2Zmv6NUYsI+Cd2yXMGYU4znultY
-NT50a/T6kRky+VVLhoKaKGk8R1CBpIcQrVlHx0eSOU/Pn4z2X1cXwJBrQTd5lH+x
-X1uKBFlZZaGJEnAXIiK1KRqiPV/YEZl1kyfFGiN1rYiYuzEJF/4F5hCldBM9IMRi
-mGs0RHlScnQdAzlbIRWO7p1mNajgqcB8HyxUXu8vlBtJ0Z6TIS51O82DdRcFMTE=
-=2bho
+iQJ8BAEBCgBmBQJVfxCDXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiDI8P/jBET9VgDk7F8XUi/ogQ3C2B
+oFAorXJ1Q3EX4mMtyB1ktElKz/uf7joI+Vy3myOnbKWCOnJc5y2oJZaqBAA9NgPl
+odorRCfdXNck5ALLJ8iQ78u7VPlKshbwKS0fD+HtymfjXtwFSMCkcKk6Zm1lwdcT
+UNW+M43yzZvHgQBHIyl3j7rIMMPuj7KCQP+a4YDQ8JQo1vQuzH0O/cC1vr+qKg+3
+Suqt/cmHzkud6xJKjtQ9r8td56LSAw8POLJuHdV2gvT53qxBzLRlc0HXhVjM/mRd
+ePPlhI9OLxIFNSg9sQ+xdO9QjSMtP+bswSM1QovMHcGBZrmyovE4dW4ySXkvq0cm
++Gh3nc4lXpem5tYybleY9X9F2Ez3mfVEcGFAO0sNi/i+c7YIJnphPmVDGlk6XA9m
+b+PIxtgwdpb7QxFKLfXv2nHJOud6I63L4f0YOnKKEr5m40KkYbV3SbTlkJY1Dx9M
+v5+YdTnu9UxlmaNEqB/6nmODFdDRQQW3/Lhq/FVXe8u9Q4NGraAXYLvkBSi41gRD
+F4/Nq7n8N3PscMHZNVWquz/aE/KwpdzhpyQTOsBZHri6z8LQ/p2dY91pZLHeFJ6B
+iXjmvzF2BzvkcUs+a2BSuBvlhLoA1uyAQxEfUzNx6E0RK82I4R/bA6UzvQvFOvkt
+EdjLFiSlM9q+7jVGnCmR
+=SibU
 -----END PGP SIGNATURE-----
diff --git a/net-misc/blinkperl/metadata.xml b/net-misc/blinkperl/metadata.xml
index d9cd2cad66c2..2f6c6408bf0b 100644
--- a/net-misc/blinkperl/metadata.xml
+++ b/net-misc/blinkperl/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">blinkserv</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/bridge-utils/Manifest b/net-misc/bridge-utils/Manifest
index 00555917db55..7e6318c3a1da 100644
--- a/net-misc/bridge-utils/Manifest
+++ b/net-misc/bridge-utils/Manifest
@@ -1,5 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX bridge-utils-1.5-linux-3.8.patch 435 SHA256 ce60b2328784307ad7a408fad96c0e0165b7740d1e4aaadb3cf2d6e6feaef235 SHA512 dea1668cc0b76b1f88e7040262e3056db278000df2680e8d3a1596b6821e7f8213a0e67ae26ffc23950b848c2ccc5dabf61baf6c40159eecfb7c22118dec2635 WHIRLPOOL 056fdf262ac2765a6996d54da8014d1f52d72d646ac215476dfb14bdb983fd0c8283ff61a056d3d909ef9a9cd1f0cb7cc08db112e4f477204d8a94371edf84ea
 DIST bridge-utils-1.5.tar.gz 33243 SHA256 42f9e5fb8f6c52e63a98a43b81bd281c227c529f194913e1c51ec48a393b6688 SHA512 4e525fbd3defb509664ef3b728d9e5edfb92beaebdb5d7733d8203fb38cb3f4bb54d02dc1e28813889a2ee19c78b9b47da6d99c8032481a7fd7f104658dea7c3 WHIRLPOOL f11eb95ae9b562cb301bb1f657d87878f0a0729a2129b90fa5957747f078f3afe2ebdadd1eb7ea4a59e544acc8194cf1744126db9ba3f3704210bc18ee3480fa
 EBUILD bridge-utils-1.5.ebuild 1403 SHA256 9eb23b0360d22b2070a4fbd83f58d9bfe10770ff42973916fa4455130ea4bfb2 SHA512 aef7d11d8c3abce7b63bd64ba89912a5cbdc22a4bb9abd4ed597c9efbaa11f90a7556efff253387195e3af0946f15bb231e38e0ad28de5aa6c3a79c57aa4807e WHIRLPOOL 6e3d76537f21f19125fe6b677e99003b7d6eada66b0ed9c6e4a6243ccdda887d5808fb796da8057b5a297fb9a5824d307252faa7c263c54fa39aca358d0ee0e1
 MISC ChangeLog 10269 SHA256 09a7e39e286023aa1bb9adaae16cb4f0eb5bcebfdf269ec259539f4f7d21aad6 SHA512 3993e85d6ad2f3afb9ad741ee56bb90ed468be20e91d50cc96b3fbd3b710984ff4f7f0ebb390dafe93689f7058c05e4c004c6ce0bd3d4a16935d32a998eb4a3b WHIRLPOOL e4b8f8e80174c7b38ae1b116b9b88304206bc0a4ef96bd1305db0c8877d650603d09e23aceb802b71384731e6b0936b9ce05ae26f40ea9bd2af031fef1053a24
-MISC metadata.xml 227 SHA256 eb6179099f91f31168c95bd4a018a01f37aa1eb8d9ba8d3ed039056bac71bcf8 SHA512 1e52da091741cb67f6a61955ebf0c314c3634d5cab187a27820fa76f36307cb9c404271360de061f9b2076dfa1e4f3fadb46a3834ad9fc6685fbc437e5c7c789 WHIRLPOOL 0baafc1e244b376dc66e10952a10ec634fabb384431da1bec9be95bb344109c7943c6e74ae249070a9c5ee93410714e2c9343a65e01309bac7918239b6492820
+MISC metadata.xml 315 SHA256 498bdff47df93906ca2617f75b7123e6bfbb944b0cb17e97d63797e9de2248bf SHA512 8ca951675112f865e545879ff5fdd76f17b6b8ef613a98f54a1f44298b9e3b82a81b3130d9af99174ca063e093cab746ff8a04f505bb5d8e4cade7cea525e9fc WHIRLPOOL 2c5ec019c69801a6233359bd377258d52daf17348a68f250fa0068c2d91bfff45a9ff0667fae259685d32e9604249ba9cb32505aa6d6ec4785edc2b409c36aca
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVfxCSXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmivX8QAIVA4MY9yXklFJXjeqF/GdQs
+R9VFETLmTDyV8abUZTA2NDj3yfffCftTl209VOByI62qp8PYR+573W1rsKHD96V0
+RHKJd1ETuXBtZBELYxRXar4KgJB926PIpuqIrhXopezOVJyjMnQR4PaT9dtAOAZg
+uXC6bhh5MoZk6N6AagiVQ+TXAT7PppTvtxIhmF1a4t4M/Msi/FndR2gIoO95MNLO
+WYur2/ejqvz6dSbtuklL42dFEIHRPNhIYkIO7ujW6LILtmC4NFYeAoNxaCaXmT3H
+E3HtP8j/OUPKwSmZQhAZt1SctdepTvbZrY+A19HuTqwvM7+jEANK1wfhWG611Cm8
+793iUaTz7WLutoLQbbglDK08uxkHPkQBU7B5I1+letkT94g7C+JMaRTLVlAJp45T
+X9cM6qh4FRYRBsMizlvUR0w+khtkBL8RqmV2116cHDpPdphQasB+ax/S9qrLuTzP
+sRVj0qkB6Spl/NeonnLtkmZAWImc5UoY5cHow4HLu/thRYAMaQE8fux4+8T6EJ7s
+L1Y6bUlTa3iKpVkuzXKnzOiwJ7SvJeZb1Q8VjX2UVpLaAI7T5pysE5+ij3aWU9yq
+f6BkqeW2p5AgWqKR94ooYewP1WzAQY/BcChIAZEm1+qUQD7QPdmii2ejNy7nZCFv
+ZB2o4tQkkZ//6Ythdigu
+=CQn6
+-----END PGP SIGNATURE-----
diff --git a/net-misc/bridge-utils/metadata.xml b/net-misc/bridge-utils/metadata.xml
index 035bc6b0e2cd..61bd84d24ccf 100644
--- a/net-misc/bridge-utils/metadata.xml
+++ b/net-misc/bridge-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>base-system</herd>
-<maintainer>
-  <email>robbat2@gentoo.org</email>
-</maintainer>
+  <herd>base-system</herd>
+  <maintainer>
+    <email>robbat2@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">bridge</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/net-misc/capiisdnmon/Manifest b/net-misc/capiisdnmon/Manifest
index abff120416aa..ac05e7f49d8d 100644
--- a/net-misc/capiisdnmon/Manifest
+++ b/net-misc/capiisdnmon/Manifest
@@ -1,20 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX capiisdnmon-0.42-capiv3.patch 776 SHA256 84e4c2917faa0ebf3a96677b8bc7df710b8c56a578e2f0780f4c9a041e4fbe51 SHA512 14de9043dd695fec91ce39713aba2872699df21004411600ebcef386a3ebdd1a2af2ed053c66cca7b893b0bc6d2764344b57001b9615b31943238e783ff4ca9c WHIRLPOOL ccd1e02201dae47b12aa7bb11a40f042934720d1d99f53de54e9337034073cafae68faa95e8a931bcd32f337517f298737725411fd3cfda1ee2cc1edcb6de8f2
 AUX capiisdnmon-0.42-gcc44.patch 839 SHA256 6a8e6bbf4ec6e4741250a69e3b8528f53fd7110b05ede97f1abd98e704f52e0e SHA512 b6d15c0b8cd10998f5f64bed901b2df833001ef18e97f870520fe5e20255118b3cbd97e35c50ec1383656f2433bfc8b4a2cc2bcd8f868f0fa956cff41cf02aea WHIRLPOOL c6b793121c9869aa9116c0884dfa50c1edc1ecf66442c0d9a675324626b94b5273ff729531b7953f47d0d018a145281afba7709fe7f1aa9ffea32bfa4f2b6625
 DIST capiisdnmon-0.42.tar.gz 79945 SHA256 c5e5de33fa5d4c2392e603c4c3d376c94e41f916ced360754844bce4a14d04ec SHA512 61a87aff01835969bb842c603609c1e3a95c4ad62de36bb96c992217d806ea8a48babd47c3371b5ab288d8f710b677c283daf1130adbbfba37c4b088b9bbd217 WHIRLPOOL 4ad59dd72f1abbd0bac1974520be30e6a8c0cc322857131b4770985cc963be57a27568d7abd5dca123eb16627ea011f08ba7925721044fa6e00bc168b69e0c6c
 EBUILD capiisdnmon-0.42-r2.ebuild 1039 SHA256 cafb042e424b6e56f1d0b690a2f1f3876c9811c97d2a337efae1e1fac5e36e55 SHA512 2a530b52fe9d63222666d6851c94410f53b9ce566bdd36c7d8303c18f3b04ca62aaed247f50e81aca1ab338e17544ac9f5d67b68e3f1403b87e1c87f70b8bf9c WHIRLPOOL f6a2d55b53e676156bd4e79f8976b027cb9337a3ad302656949ff8d87880eb48b4a0bf6f42c8a5e684cdf2a569566850ea200af23b36079a075273b48637b6b4
 MISC ChangeLog 1915 SHA256 de079fd623eb60fae2d9d6a3beeda724b5871e73eeefc473bf1ca3ce33a53241 SHA512 4b354290c79a49c0aa42b8b0fc88e59b9904fc6d24ba668379b61c280960d2a2fb6a8baa099fa381df1d9be1e946358c9a28e7d13c5e59289506f71e61c231af WHIRLPOOL f7f7287531eea162ca06e467067b1548b989322e1d6d95fe0a88c08bcb6718e944138cc19dd789cf4846329a100888dfcb1660346a31ab0fc99292f933fb6496
-MISC metadata.xml 367 SHA256 6faf518025f2c47d9239251704ba3bde5fec045812afb8fd6440946c052fd90a SHA512 fc59e2639422eefe07cf5bc4a9790c02385d9528ec73d9f3c61dbfb31f598be77385526d70137490bca5253b6bf500c8be503d6fbf6f1910e976346234cce483 WHIRLPOOL de3cdf6d2585532b1cc16d37660f08e8d5ea68af07f7ee9a69c9c4d73c36816ed48d507ec891d7d81e2bea9fc38daa0ea6162f0a33778e701c805a30abb20f9d
+MISC metadata.xml 451 SHA256 af0646b0f4b00f01a0a008e81808e8582cd59e7e0df00db6cf507fae53d7d9b0 SHA512 49eef230d12e25849d087c92fdc3dadeba4d07358b6e7d1028c808891167953a5dddfef2c4f8e8cd7fd8c6b29aeec6abe2ef7f6cb811301d306f2665dede70c0 WHIRLPOOL 00a3febc080d6727a26d1a1ae4218c04d0895c9ec6e31772d75d7616a32052df7b2d5d2a226b1587a7cfa5c643d591589e2f048e72e3ce3591be2955404a6857
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJU+AqNAAoJECo/aRed9267GKAIAJ+CfCKutAViQDoYCHmaVSC0
-0fyTRJGHuE42vPexYa0nAKvn8iY6xcxbgOb8NRlzGNDDycd580fmLqJFRGkpkeoX
-Mfi/c9CaRtqW4U7AAC774/11/6gxWNIPhRgyleri8zDoCHFpcrIEGe5iq6fsjzQV
-7WH8LHm93Yg8kFEzMFujRIgSRe91/Abjl3wNr59wNEUwNcNgYCzPECuxttJ7BBJn
-y0+91shrRwMxxJkJjtEHdqpUh37E9bTOfp1GiJhUljjYeVphPaJiTmcJt4Undp2p
-QDOoKRJ5v2Wu22w9IwvVhltme7i6wttIVuTnM2J1mKM9xKYLUy9qYrnPpY5n5Wo=
-=qQ/C
+iQJ8BAEBCgBmBQJVfxCcXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiYkIP/3KwprnrrKs9AnO/bXn4Wkgz
+CEW20WuBs01SPAIzKzLsv+TJJP5vdALaEPwbEM8z1fL2Izl+zg6LdO7mhoOUthOj
+H0arjj/Ri8kPRAjOJ0KLf++MvLVjaDIrz7T2rXOMlVm6OH4M9zIhh/gvxkiHEYI9
+R46m0O86LjNnq7+nLmdXMzNeguh6btSrnt8Y1AfArCUHmsJccOL6HoaqYq64kQ9M
+dJsGJn6SrNICTzbgbrLd89E2FXRJz7nI7JRSEjzoKYzJYCTmIZwuUYxgSCySnMZU
+ADebjYjagzXhclBiDh67cL56sKnqUMRt67S87h97hBT2eCWEbDPEHIzSlTyzTXFR
+TOifqAdxeS/iY9NyUkCLAdb6li1CcA5yHnPU8XZry5Qca3V3F+acxJzYXZDouV9O
+pemCc/2tgMq08HIuUrmLEhjnmi0DwaQIb3G7PAlLskjvPAuj4wci9wI9Rdhziol7
+3ttwrHNRBzYfCcKTeBd6AQEYiqRkjVqYzW01xq++bi41t5LnIWDigFs7m78tZ+tR
+rYg/Iqid1Ot47W95JXK6O9ZzR3k4dyYzL4+PITKmgGXIl5T7o1G/XkaRGSbSBdIk
+uIf7nprqAEQbE6YrcDC+KNzpaZcCVHkz3OpOqY3JY5HOh8f9AiT0HVPk8Cc1Ze1/
+qdMuFhdimOmQLuXKDeUq
+=T9Tf
 -----END PGP SIGNATURE-----
diff --git a/net-misc/capiisdnmon/metadata.xml b/net-misc/capiisdnmon/metadata.xml
index 74c53674d0f1..5313bf560f2e 100644
--- a/net-misc/capiisdnmon/metadata.xml
+++ b/net-misc/capiisdnmon/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-dialup</herd>
-<longdescription>A CAPI 2.0 ISDN call monitor with LDAP name resolution</longdescription>
-<longdescription lang="ja">CAPI 2.0 ISDN は LDAP の名前解決の様子を表示します。</longdescription>
+	<herd>net-dialup</herd>
+	<longdescription>A CAPI 2.0 ISDN call monitor with LDAP name resolution</longdescription>
+	<longdescription lang="ja">CAPI 2.0 ISDN は LDAP の名前解決の様子を表示します。</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">capiisdnmon</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/cbqinit/Manifest b/net-misc/cbqinit/Manifest
index b50d6e62ba08..bd140e8bb549 100644
--- a/net-misc/cbqinit/Manifest
+++ b/net-misc/cbqinit/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX cbq-1280.My_first_shaper.sample 79 SHA256 e794aca2ca2ac3188f0ef8025381a13bdd6ecb4a197285f77385407bff7a678f SHA512 859b8fc0cd73ae348df0816c73bec4a835b645cf972700b04b2e53590bf10f0a44e18ec25a1f03585056570a04dc882dae29b68aeee107dce6a9fbcf5c3e9ee2 WHIRLPOOL 0c86ef5d74229af37f1166e72385462918ba38eb9c56bdcc7061f12ba45cbfbefcfe2732984f1fa2a9455aa7d61ac183e0be7a33ca7d8aa010facfe0940c05b6
 AUX cbqinit-0.7.3-gentoo.patch 1904 SHA256 b7ff8f52b703287c71e2395d34b0b695e01fb090a87c147f739c1b072e618054 SHA512 b33e3e7e23d6363dcb4b66357f666bdc5b299b851798db7a935d3edaf2612ae3494e6d0e0ea68375409a2834a0d50d322170c9c3f2b97ab00054a19f5bb27d44 WHIRLPOOL 1f355512d41f829c654a2de19f3c1ea1e09ca77a54ce3540950322ab5b90bee72aea4f7f421594c15fb125b52dcc7dcdd11c8135b8c374a0d502ba3775b4c555
@@ -8,21 +8,23 @@ AUX rc_cbqinit-r1 504 SHA256 f77918c320984514a74c5dd9bc0777060e67e7462f5303aec3b
 DIST cbqinit-0.7.3 33438 SHA256 e7f9016be2efb340de7ce82d775ea3c863f1163b934d16438a6517689d1dc022 SHA512 ab1f66ebce4653f53d85314f47dc4d5e2f28c081f7c0385138c33cbc78e588d7190eedcf8354b744cfae8b34d536d610a944d492c9b49361109978016fa167a1 WHIRLPOOL 5a2b76d135b2ff67b9157bcd7af5da09385617308a9e6cdf22e729a0c3a38a0478f0b66f74e31e2f6da2af8cdfc36095ce2cb3ce7644d168ff69cc95512c652c
 EBUILD cbqinit-0.7.3-r1.ebuild 874 SHA256 61bc6870ec9f657cca2f235573efd7d3f2f4bf5228958d46890b89b8f7b7eafc SHA512 64967693ebe23218115165b3d37fdf6f9619e38459cfe0bfb01925672c7230df9a7352823da037af08ae88319e86712a6b3bb51f5ab7b1b0d5204cb4de99de05 WHIRLPOOL 40defc44691bbcece5a70c94943f340cc6c1b1a5f9a7ac7ec89aa63aed541ac0a6e138287a498c01c6f2cc68150f0efe7555869b3c70778668a582d1491a088e
 MISC ChangeLog 3130 SHA256 e6ef9eb636becdbaa59c5dde9452d46cd0e8fbcf90d8673e9554e3695bb4e74d SHA512 db4cafa00dd24e936204ad07193333b5e3cc4d5a83d7163640c406109d7a9411d131decad9e8b47a2a0b03552c11c0132e3bcd876a6e6582dea8e9116c490c4c WHIRLPOOL 069705c51b1d860d6133c62cc66e96684a6315246e7e8d1b07596233a3d4321ab7e13a68416f4a0790aed778e357286e500262a93c773b79d0a3cd2c27ace379
-MISC metadata.xml 210 SHA256 90082fe26a119a63ca8fbe227f66c33ba74167b6cf28e2cef02dea6c4f656c39 SHA512 4554adeece55ce9adfdadba04443a3ede6ff910b96a11b77bb1f07ddd6bdbc756b8e6e1873660f8f54e67f46db1065980794a6136c6de7883b24d0ee13ff51fe WHIRLPOOL f546bd1233d5a9934ba0480881ceba944cb8ff1869c12ed2421d4ccbb247ee38dc0c7c8b979f10533ad0fc603b5e4829d0ddf174a83d0bda8e8dd62c1c873eeb
+MISC metadata.xml 291 SHA256 bf46adefeec68c43612117abf8cf9a0cc1216f91236777367e48af66a240e16b SHA512 88b6fbb8b41a42a4537f5b3400b92e34a7fd817d4890b3bd27018bb10ceaf727fed84aad5a0da46d4b629b40c598840f880e7a601b01a4afa735a911e72e5dcc WHIRLPOOL 8008bddac6d78e2835d253ac27a6683007df65e91029033fd1449fc1b907f45c4d626151dc52bb6663f63cf83ace3cf0a5fd2b69ff96e529e689f5a91aba248c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJRNbiwAAoJEOSiRoyO7jvoQ/kQAKRmGXfEpQ8cMOKyoT1EgbdT
-ygr7B8LtQ9L11VbI/lsGRK6w6fvkPXL3bES+EgZyeCPvsEONNleLw1LPpaWLs9pZ
-ipWPPpWd/usA4euOjr2JV44aKU61P9Zsg5yFANSUSLVPxe7kY24ZzO8/z2kHUdwn
-qU3fA7DNxCYiFmeXFns2Feaoj65WHjJcKPU5qN30Xh2i8+3JUQCpc4mbw2zgj4R+
-T9ALJu53QD4TRlniNYuk0Xy3+TlO3ikBeSi+R0L74VfIMFr9jsx1TY/OW9jXKWYD
-1ej2dKcG3iKO2uv7+NjSe2rUkxw3/9IPXDTa03PSfI/nep1WKxhrqcl2oiUkCIbk
-8r67auZnLlqsgH7h8e8uyq/bhW3gIzNzpTP/y/Nhi5qLymr7hmQhE+mx+1fWr1KO
-5CyoTYP6gu3mAzaW93nSEzKW2NPnKLDeOddqruzd7wRVkETgzETn9Agk648a2f/R
-Ho+JvWKzOAjDVOMKf+VN+YGy/Cb/UCPTdVCAAlihmOEY+gLhlalBrcdG9wb2XTiR
-JbO+zoFzNozib0hV0ifY+IgyfY2oicnV8kE18ZeTuIkB5c9728r7W93UPkL4gmb0
-BQTHBMnyQt9J9OAFybNVCoNQ4afaDjizVkYHk1GSdprerrvA/fBvq1FtexWqpO0v
-LDPS8LUy8uJyowbJrQl5
-=VMdU
+iQJ8BAEBCgBmBQJVfxCsXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmizxUP/3LbLIc7582xpXM65GwG1J3G
+RXw7Y7RydkZtZDuHRAjUgQIYLn3Ci8xApeCeUyPus2f+YS+5+yS9sxerbE4YEi0b
+ntoDvGLxGtdWXePWQZe+mVHm3SGoGs+OKJB+XcsjIDcqOwD2jko0LEWKfJVyMv3n
+7dfeQN/cxbWsjmaigwh5cXdfA4asr1W7F7u52iDbgATuPbKAJgd5hjwUUkYLpwST
+3dWcefLxT/Vf1iKc1QDBSwCzN5zUvo/VAf6hTjaM/UZUmIFDieqtvop+kjfgsq8T
+p9ZWtJbv1OZw0kXt7P0CkHyFniLW/Cac30poLd0tYNlQ2paP7BZuG14G59Sg87+d
+Nb8H0pb83Fpy+Yh90QLTD3Hr5m/6fVYh1jhknxeAIEsGGvVf/FraTua2rX1jDY4I
+5jbnRMi4h4EWEhRys+LZnEmGKcO1ELW2SfbL4FDkXmvEdH66/Uc7Y2JlxbLF9EGW
+g95cgdZP9nj93qRie5rdSRK50x6xeIOB9YcMdeoKRQ/L9VCLqK4VZ4lfUqk5JHjM
+KzxhfjlLB3o9khEOUMtBZy5B/KslYhcLa3Jb5Gx+CLx5aSVBa/ikrKAMnlpNcJtB
+pj8zVMLL5X1JvYMatAkG3IikuKxbkkm1CZzfppXtSyNIBpKxFh2Q/UKR7mVwJ4Y9
+m2oG75JsNPim8WvXjqx3
+=fzHs
 -----END PGP SIGNATURE-----
diff --git a/net-misc/cbqinit/metadata.xml b/net-misc/cbqinit/metadata.xml
index d9cd2cad66c2..779353881a83 100644
--- a/net-misc/cbqinit/metadata.xml
+++ b/net-misc/cbqinit/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">cbqinit</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/cbugzilla/Manifest b/net-misc/cbugzilla/Manifest
index f700b8f5369f..fd8a115a7f2b 100644
--- a/net-misc/cbugzilla/Manifest
+++ b/net-misc/cbugzilla/Manifest
@@ -1,18 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST cbugzilla-0.2.1.tar.xz 240824 SHA256 b0da07e40cabf38915a9ad61521c6dc73b3eae8707c199c58b67295d04c8e5ad SHA512 4a5671bfb222d17841082d123e68250526f6504aee3ba816b454b5d37174391eb464a7e3eaa9fdcfbbb5619b443b4af28ae520dc4bfd49faab1e523d59e2392f WHIRLPOOL beec75039c81e88cc6ceecbc4a185b35d1c4d1c37b37faa2a3f58884045a7f8969370ec1739c9e2678c1ea2fbe5e069f55f022f406999c4347cafebca8be8746
 EBUILD cbugzilla-0.2.1.ebuild 615 SHA256 f2c7183c8664d504664bb975fa721b3608c84430d6bb62e6fabb3dc254bd5e13 SHA512 64072975dee8f733c4988a44148ad9812c670148d8d2cb2958261a50d0fa94fa0939752eabd02c2b3e17fec3dd134de28507d4d1f01ccda1bc1f69e0de150be1 WHIRLPOOL b9a907e2981b2f0dc96f1c9be51b808077409096031608748c2ec0d3ad62ab6c5a34faf4b4a6c28c773b90167cb4fe83f5222cd763f90d0e0d10e00f1e3cc810
 MISC ChangeLog 937 SHA256 5a2f23331bb47f41c98afb94f64e0227ab2a0389f3469ba10797a2e5de592312 SHA512 7323f4cf54abaade140b9e2cc1314c511252b2df1222e2bee8c810af411042a9a9e0f48c98c46eb1f7a3827f90353714bd0ccc067fc9ac00631bdbd3c81b192c WHIRLPOOL c9538198e5a875a46ee350eee3cb0165735264886366cc51672399fdbf5d18e7b701de62b488a022899c1beb73de361161e83cd73a0243056db17a38c21ee127
-MISC metadata.xml 228 SHA256 afc5b31ee16fa342353d7cae56f5e218f60a666909e1cd4c53d729c2aa3de982 SHA512 0088cf5242256d222f6ff3f7765f9c427f3d995b30a96f86209918a61ca693e66412a9907dccf2d4043f85c6bcf2f3c79865fdb6e6f70064e5405d05e00eaee9 WHIRLPOOL 6e7ee5efb6bba29136e73da5f77a2c87a2b7de4b610430cad1b9b4dd1795ed9d30a0086fe6698ae9d33bdb4a9e3117ced2bcd752085c3db2cc5c260dc886c889
+MISC metadata.xml 307 SHA256 a9204e61692dd261df102f6ac40d4ff1ce4a7f6d295adba95e3d132a66135afa SHA512 9992de338df5373dc5be4108c5489ed83b4f6cc106f32f6b1b24b42ad264b779ddf1e87dea0abad5e0219662673aec2ac6b9de471cdad3dc4888e050533b4e39 WHIRLPOOL 41ed3216171536a1d82caa932fb4787c42bb846f9ef51d4e7e87750a078270dea40b74ed5c1002a29ec7be3d0b9174ddc0e2714354eadc034f5ed6eb91db088e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJRvwNgAAoJEIN+7RD5ejahfUMIANqdUTgFgnMy63Cq0LjA7+Mp
-baeVIOqm3Q306U5PtYS/TVf/+qpwz8QNvylZBNkOOvRt1K5H/E+9mRZagWXqpd6q
-B6XpW9EffpEJaDxIrbvGowO5+/aIT28gDmLn/LTzZ2hQ3Cw1uk7zYDlTjuOg21lP
-tmLds02wp38rtDlpsQ7uKPObuEL5oIaOoAnnDaX795Vs7usWbRbOnjxjzOGIZgho
-SgTV9GOAB1V65/ZfozNaWnwwVObrWP3Mb09EXV/axf59CsE6O8dRYJGw1xL2gNf9
-Oz0uWDwsKKIjDZOCJ0XvFIx6NcyyRjqaFx5pvhR/jdnwp4EfX+Gwgv4/5OuaFso=
-=9/GD
+iQJ8BAEBCgBmBQJVfxC0XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiUqIP/0o9QPdQzzeBrzEIHTx1jhNK
+tMmKYKJssCNSL8lg0Rnj8vpjpmb3YcmtNOQXAyZ251n/0IYtkWibylhnk3uvTtSM
+6kX3ni9DfsEPyd30cbyb68e4isuXhupLI1uMTkh8wWhTO+cFZ78C9cfKkGJQblNq
+ZPy2+ZHw87+RBkWrL18keqqjW6VVKLMroiTsyRBOOCCtvsCk9tApLxGR393FmcXA
+BJ8y7Sj23cGe6i1bYTzlqX3fniysSXQYhli/57Hl/QBprxqPpiztn8kP519RDsjJ
+12i4DPagxLJKebBtPAH0199+2ihyq5BBHTuqVuRzuOM598VfG3UKlkla4SDuSuDv
+/4EKZCcwiSjCFxVBRE2FIkQUUdnc+S6FtvEpXbkwurYunljmVewIbdaW9LSgn9gC
+lX6s9tUi568je5ir9eJRVBKY7cqT+z8hzg71f6+5ECEZwZNP6QkUJr82vOnYYdMx
+plU6dFWdRt60sKr+v6wCLt7TyI30sTcIhXE2cCvEF1pChGpo278V0qjQD4lHSoj+
+HyhQoTm9yzwpnX1CqgXo8IjdV7+6OYw0BPivBNhc3YLWXKl/ZtWvKErh7NRnrUd3
+CEvBhPVlrtaJH/+n3Ap9NIttY/0wdgcV7oE4zfrBxpOc4ayggb50dk0rOrpIUNIU
+8DLzqFoaOF59N30eZ8Z0
+=7Nht
 -----END PGP SIGNATURE-----
diff --git a/net-misc/cbugzilla/metadata.xml b/net-misc/cbugzilla/metadata.xml
index 1cc5722744ff..79f0d33aa259 100644
--- a/net-misc/cbugzilla/metadata.xml
+++ b/net-misc/cbugzilla/metadata.xml
@@ -5,5 +5,7 @@
 		<email>yac@gentoo.org</email>
 		<name>Jan Matejka</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">yaccz/cbugzilla</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/net-misc/cgminer/Manifest b/net-misc/cgminer/Manifest
index 2e69086b4393..4a2a7d209e18 100644
--- a/net-misc/cgminer/Manifest
+++ b/net-misc/cgminer/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX cgminer-4.3.5-system-jansson.patch 1559 SHA256 e4148e28da15e6d89d73a822a8780e9110296a457dcad0813e9c4256a8da78d7 SHA512 d24f3697dbf86c47d43010384a38917129a5a0de8f2231ae7256916e7e4e55f4b21c1b3ff93640322cf145fb3272a96b7243e7c7b4401dc186f4bfdb62edb238 WHIRLPOOL 689f143c4acafc0fb3c40eec96a4a66eff544aee0808dcfeaa735217e2aa7780baa800ab65e0d15be670511302788452bf49a520e416a300907ab34069698ba3
 AUX cgminer-4.4.2-system-jansson.patch 1559 SHA256 5832fd34622ba0c376560fedef5780addf1bf5a990c7311fdac9f6ca97de83e9 SHA512 93f7e7a2d9c7b72269b5e18a8882f77cb4d4139254433407b698cf2a4320929a0989b27f7d8c36120e791d11f94f72e9a861aaf9f81c575abf6e68b083d0bf63 WHIRLPOOL 0bce1d927195d741c787e753bcff40bdf043b493a2cf7ab0532295030f6eb882c4f58a468bf3fc1387d6b58446ca257e916fca2c204aa64b8506c5a48d062b42
@@ -14,21 +14,23 @@ EBUILD cgminer-4.9.0.ebuild 3041 SHA256 cdf626d37f049e8ba54f307574017a17781bfea4
 EBUILD cgminer-4.9.1.ebuild 3041 SHA256 f7dfa41a9b7fa95e241bc3e30b8b0a6c0d7fe51c3921212ee69bdc69803ad84a SHA512 07cd22336a1a5f85e0c6a01edb5d3dc6a8e3ad0a09c2776bbb57d6d8bf0119372bfdd1f5b201d87d7780e631875815064ad46bd5fb202192d083d07c0f52e209 WHIRLPOOL 3916a986b0a8dbaa4c65a93edeff52baac1761232e7ec669b3886124c5f69c90370e009dd4bee8ce9df952ca4556781aa5e20b161e976240f48531e35c6834f2
 EBUILD cgminer-4.9.2.ebuild 2514 SHA256 574c09515375dcd8d030859d08783420e9e0ed68ef9f2ae41cf5a384f3e6dafa SHA512 dc931277d6f1a4416d88f6677c2667bd5b5efc268ca6a6ccb8235b42b6d3e72d012f4b5be0091090bdf17a451910f9e18158737f82ecf415f4168a3b0ea538a8 WHIRLPOOL 4fc057621f17da45cfe79898bfc01ed6ee2fc014734946ad83e9e871d77b9d9e1823b3632452646590d1dc5b08d4d039849936e9ec89c484c1a8535dc795e95b
 MISC ChangeLog 14519 SHA256 9bba0bc9e4b38aff2a2bb677f31f9f1fe9fe43c25618ac2814f65d5906da4e8d SHA512 79fb4e6053f19d5f7b021f63ac52138fbc0f203b85e3be151249086a985b3dd2af95c4e9e2e9386e9236580e7a97c5756b91d0b7d60d00c6fb85d70343d1ae23 WHIRLPOOL 76caf591b59c88188c43da91065b3efc20ef82a5a0e2ca6ba66e7d5e0611b27c685859fdbb6c16bfc70b6f2ef91e9063bc5a8577ebf4d797faa51f16d4fd8411
-MISC metadata.xml 2117 SHA256 c187d91f284ca414045c121cf5340c29ef8039824b21a9eb78a3d4af32a15ac3 SHA512 2dd8b16b4b522f40e3095f173e1138acf8aa31d3efc0a5d45ccda6f2ba09ba1ea8a8d9f8af5dad1a64ad42bd23be490094c00078c9f43d83575a1c06245bd5b0 WHIRLPOOL edc9d68ffb9c07af7682c83e99fe9b625d4277b1ad30601c5a7d0325ac80d6690ede45ebaddcf00e9f821ade749f0d072307bbd9a286daecb23f0b75f8d3571d
+MISC metadata.xml 2198 SHA256 12709b44c29e334f051175cb1d5e5c50664c3a7e11a89b71ac1465ab535e09f3 SHA512 232678a3c051efa8a2b89a5311bb40738221a17043877e802599ee37b420ff955a7d78c4d6e821da839b7534c9508b5e5fdcaec734185a8e3c695ef1944672e0 WHIRLPOOL b1208ff2427fa7860e83c90dd05702956a862f4c140e59f592c2f38288ffce8a6f30f85332a9ccbfb039abad5f237b2bd4f83146beaed064af5e57bfa87d6da5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJVeqg5AAoJEJOE+m71LUu6WvsP/inW/qlzg2VjGSxZFpdTjvo1
-GLS5Dhj0DSvG3Tef4GRYOcyJ9lii364LeiLo3xodvicjNG8poeQPubKiT26Aa//d
-qEWgJTvA9ueUmIxSz2igNtTZ9RKLtVnXLMOoHdPqjUfVmgkwBi8rOqh1xonYV4k/
-A0QexHKcYJcucvbl+xq7GFIGsOBOzcvfpyYDX67duiSmKUd7pVdHuzX9lfVAvzsM
-XC0Gc29YaPpE8jVP6FfhWBUE5xDk3bPiTorCPcssCLuvv+u5w0rm3DaFbfPKQ5HH
-WO1hdb7YcHzDfzLkiBT+aUpyNAOiRA2T0pbJZUQUE3FJUCSbD48UE8u7d4bg8RE2
-4g5MzMKo4tAawjyiXclrWXOdSfmT/Y2Rg3r9bq2rmO4iEZWCRaUOatWfGCBhyJuL
-OJNnwkARGY2JkN2q1x2Peu0KZ0JgjZmv1nYr2i4qiXW3Z82RNTjkQ2Uh0TONmiyo
-nMqH+5xK58IN4pCYOTBQtDRb3hiIxI70lR9S1ktl1kXX09gXLHGPCY7t3BRDUvUC
-bhLGfAvRarBxnj6GBFRzicoSBBpK8lJ8Ls8j3uewqmqOr7Q3clLfWVIMLVy0JWbC
-vs9G7Y03GRbkEWDbajTHd6Z9KbSzMoaptLvLWTJaQ6Xn3SC5sAlvAg3XP6Kt42kV
-eisHkD1EjVRSEScBIbzH
-=rXFg
+iQJ8BAEBCgBmBQJVfxC9XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmincAP/iK73IQuvVXK1L99zG4Dkp8Y
+n1rBF4kr6VGyIL0HqVQjAoj7JdHrJNqdT7gN5gN0pOHo3GbfwJ3R13QhhYgHuyO/
+/Kd3g0Yz0SMaI/1jkbgD0miQM2Do2YJGYQIAzMvlh7jRsIvzHv9b11cFkgEPVgdp
+AMXHYSW6/ExzJVt9uyoHlIM8zT2qHMN5BcxT2XO7dP4mExhuCZGaG/OUtA24YXkB
+BvJMuwB0Ex4+GxLwXBTnpViUr5LNBuwMQhHAlHrZgd7UBGsJliSXkSi9LwEjOzd0
+ZaCf5LawkLbyqYA4kcX1Wj/NFGmE+MDsGqEsBxpFfCU9WY0/nL/v/D0qRWs0FWkQ
+hcdBNtaHS6CYK8yQF41l30MwAxCrkb1TcPqhgXcEzGBmLhHcE0GHIa9ZOS3lMxS8
+eVyg2Qjr9bm0UE/YCKNHCweLs+ZrxlOYErjfpMxEqCaWHUcJV0vHI5oK0ZDcf0ks
+1yD/qMFX2LPCF8f1e8PykqWZMMr1UA7/6lPUQHeRRdMYHGJVMydngSqG5g/pZQt7
+jQUkpAvRowie3WQqIVihiuGA2Y/Gwgm/tuSShKrJsdgrkhWTw9HZ0Nl+ahIWaPwe
+OR4hxbDdXs9wPhgFUnM0SfaHV3UmdMr8qjHQwyPQ/MZfB0YMgDeW6BLpyqfp61ac
+a/m0PO/b6hFXQoJWeLOK
+=Iqxn
 -----END PGP SIGNATURE-----
diff --git a/net-misc/cgminer/metadata.xml b/net-misc/cgminer/metadata.xml
index 38771f3382fe..3ffd4b4c1866 100644
--- a/net-misc/cgminer/metadata.xml
+++ b/net-misc/cgminer/metadata.xml
@@ -32,8 +32,11 @@
 		<flag name="knc">Enable support for mining with KnC miners</flag>
 		<flag name="minion">Enable support for mining with BlackArrow Bitfury </flag>
 		<flag name="modminer">Enable support for mining with ModMiner FPGAs</flag>
-		<flag name='spondoolies'>Enable support for Spondoolies</flag>
-		<flag name='sp10'>Enable support for Spondoolies SP10</flag>
-		<flag name='sp30'>Enable support for Spondoolies SP30</flag>
+		<flag name="spondoolies">Enable support for Spondoolies</flag>
+		<flag name="sp10">Enable support for Spondoolies SP10</flag>
+		<flag name="sp30">Enable support for Spondoolies SP30</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">ckolivas/cgminer</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/charm/Manifest b/net-misc/charm/Manifest
index 41555bdf8438..9948459d300e 100644
--- a/net-misc/charm/Manifest
+++ b/net-misc/charm/Manifest
@@ -1,26 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST charm-1.9.1.tar.gz 82760 SHA256 43bd9725e68ed6efc8c2b6d5163d384491a2f8b49c121fe7f8c256ebf60006d7
 DIST charm-1.9.2.tar.gz 84927 SHA256 ae2d536303e770ceb002f69c1e71f6a8532c8d5dd075d2f5c1bf09ad02c3c015 SHA512 9ea4c7411764dd1d1c87a1a19de2de3061e08e030e793ff259e80477aa5880a01f05f8a8d1ecc9b1e696111c3f3f9504f5387f535d9d52d1496d20b04c68835b WHIRLPOOL 9e25c985ea6f3e0f9bdf4ad4c2508a2b77886eaaeb3ffce9e04887a2d6fbc9b553a4accdcbfa2114fee81926864872b06aacf1f36a2af7108ad2fffdc1f0a329
 EBUILD charm-1.9.1.ebuild 938 SHA256 3c316c15e126450037966a5ade243ebc1b608b54a02974625060eb50bb364be2 SHA512 c83b85f3196777592b8de396f2b5009706361503ef5d8d63fd250baae3741578738f06ee5acc24201e05c1f5bfec16211deecdf6ed80572009b0f96531549ff1 WHIRLPOOL d22d03a95151702ad71240fa3a809ec9cb3198c9ded2922ec483ce33587d18148c5930a18272a485590a02fd0abf3028da2e6ff85a0f7abc92b8b04ead81d342
 EBUILD charm-1.9.2-r1.ebuild 943 SHA256 20ed9aa1ef64f17ada2e00ed2f1e0770f060e0a642a1f1e8d8ed13f7d95ba416 SHA512 2ff34c16fbedf7b1a683240235a5bfb4f76cf575c45340ef86511b57283c13e8756c5c35cc4875dfcef3445fe74c3c637251ac7407b6cd796c7de4730bd2dc55 WHIRLPOOL c67abcc8bec3d849f3fb8218b6887ecbb1105bdc8f6ebb8fbc833f6c0eeac0534e1a4f2a7c5eaed4dc53717e09efcef3a8f760c9dee4705765bacdccf4e8e9ba
 MISC ChangeLog 3001 SHA256 61d7c51322ffaff3fa54c03b2b806a535cbf58acaf48b137ad8190c4ffe71633 SHA512 fe7a265ee06720478e60a63c8f989877fcc0147864cb164dd79f4fdb4bcc34a758a3b44614c94352da3db69ec8abb30bccb2d32d2d2206a4889927dd7de36ca8 WHIRLPOOL b095ad0bfb396a569af6765f3d5b8bef40a67862333404b3bdeeda2c250aa5a9fde73e24986f7d497a5e585972e4393fff89bc09de6c96f9ebe1f6f88ac4878a
-MISC metadata.xml 160 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a SHA512 7c02a1de1ddcb6b7c6378cceff0458da3a15d5381417f7cdf01874e7c372664b8899863f41b3a2fd8d6ad67ceb732dac6da0cc17575bf8e3e6d89480417c6628 WHIRLPOOL ed2795e4466eda8c804d5067c87386e269a59fe959393057ca5ddc36851e00f5210c4da1adf4bbdfdbb7d1d3d5c60aced25727ca12fdc8305d9e263a3aca9b13
+MISC metadata.xml 237 SHA256 cb64cb2d8560cc70dbefab0f4dcdc3ef6247a2ab7a0a694a136cb7241ef557e2 SHA512 e944db861994245b74651c9a063fb4c76517b4a6717b496e6c6c229a536c45a7ce1c5d335c37dbe1e9fc4bf892c967e64b50f1aa01d0a91b9566334a0e300984 WHIRLPOOL 42087595243424c7bd641437a52397ceaecc48400f44fda735abc677611aa6465e2295f5b6354d82489d5476fff4908aea930a0d3436c3328b7d8b8f647a63b3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJU9DwAAAoJENXWzZRV2HNsFlUP/00SmwaJXciLjddeBBd4eskj
-atiSdKBETJ5wRpnCMnZvYWlPHrLHkVVkLGcd8htRVgr/b5UVRyoDrO1SgLJEVyx3
-rSdLs/EvyEI2Tiw3fk18DGg2hnAKXJ+FQdyDIyTXeCP3PM9jwJae9qB8xu8+EUvD
-dz1KeEAbyFBMD0Besi0mAwth0C7dwpKlgKTyIBDtniubUxPC31I8cTP8NVIhA6V8
-L47hIh4A+w0JqHYbE+lj2ypxldVbaf+iAo3WaMMQWaoFlGjO7NpO6f+bqME4Pcit
-WZhuoDZlbrCS52WZEVOQElSkNsNv7RdDgLnpx5cf4tB07/HjaFJGa2pFRCjEoyse
-KtKr4N30G5fnVREpExaQbCgXpBZF/EEIYCpLgk1r8nce0Ab3xVenBldesFnNvhZo
-/GnBeQYnWbyt6P5pSWgJezhRhSVl6WoG0ZpcJLpKyCdGsO233BfJR4/fW0u+Fhvj
-TdMexbbTuiGJ65Xn1Lor6W/TDpUE4/5oZZtOxpztXWgEvgnfbaNzuN0ZAGQrYa8s
-U4sS5yOSD1xQDmJDRT9cVmsDxpO8FwTFEfJkZSl0ZzOMbmWJ6x/V9Ap0FgnIP480
-HK/u/Dhdf7rtfl1ozfNaRQlKVzgsB62MCrkw0Mycz2jTN/tByvnut1V0MDc3joG/
-wnwZ3op42qYPRJHtFJuG
-=qqsP
+iQJ8BAEBCgBmBQJVfxDHXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiPhwP/0DyVMlEkSeG4eZVu7pc8Yvc
+AbDghxtnH8nr0m+Vjuafa2lacRJE/4loU/DDIZbj0N70I+887wyfJqaigMERidtd
+cl/I/zuKXMPv1UhU78RvJNXYTDiIRQVsXczJcFfDfXCfScXrnoqq6tijMs+CChbA
+1F37IBZrQMKartJuyCT1gC7BAGMIz6QtlExa2imjrSaOmabn3dfBnfg5hsJknGAK
+ntYz2p9E1I/KvE0yKP20qopl/IrDXob1KrpvjxzkCyr1AYGjcsRjqn5Jw9LQEP0a
+ZAYgtChMgn6FpXgWQPD8cAmJxy2m6zNS3C0MZbcCvwCuUGkM3tsGUuC+MFuJ01T6
+4Oy4m6cHATXGgyxn327b9ZXNhJQvAr+ANhfOUgZ4xUX9DpV2gd18kk1Tdl1gDds+
+/2BSD265o1H8l4P2yHZZP7DlMrzwGHQO04KylOXZ4a/IxN5RbymCVh/NB4N91MGh
+V6HAaW0Yi2mZsCyjZJeka3N+1GgrE5B1DFP1WLsnc16jLK+jwJu5+mR4HJOruvTj
+gZagCWrXLp7SHGnw1ss3ggZEfQODQnZFOkR8ZFh8RY/VhaBxww3hrIil0Va4zMM5
+wgY94eUUxkvfEXzNwSz6XPT1bYkOHfMm7FUsDbpFoA3awZnv4iVhk5zx9n1n2Yqu
+iGJj5vGS+CEaHl7K7uCb
+=OQi0
 -----END PGP SIGNATURE-----
diff --git a/net-misc/charm/metadata.xml b/net-misc/charm/metadata.xml
index 301d2207cc29..7a8af9a8b7cb 100644
--- a/net-misc/charm/metadata.xml
+++ b/net-misc/charm/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>python</herd>
+	<upstream>
+		<remote-id type="sourceforge">ljcharm</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/cmst/Manifest b/net-misc/cmst/Manifest
index 492f3edc4618..53a0d2439e3a 100644
--- a/net-misc/cmst/Manifest
+++ b/net-misc/cmst/Manifest
@@ -1,26 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST cmst-2015.03.01.tar.gz 340176 SHA256 c97d0fe4ab2cfe822121514b8ba6200d4e733bb63f05f04cd17d0b53794d465c SHA512 4178ff101df007e4aab43514250036947b150623f3a45e36dcee7a37be75d2180ba44ee0fb66ecf7240990084d43ccacd4f59259595db91d94a4ea0d08845b77 WHIRLPOOL e6d253bcebb007fcf70d51534b729b4bcdb6c292e4d7b89ef0d702a4308308a4bf1837e24b0051939ee0dfe01bc38b57de9a3e6d6761a958725cc959b24a1565
 EBUILD cmst-2015.03.01.ebuild 901 SHA256 b31e6ac2c6a92bff9f38f3dfdbc798e86b9724a9d1fac53f9d985045aa4577a2 SHA512 16d4d74e7a35b28526c53a9d089db1090db1fb3220f32893ece787f1d2a3d41b3ffd8b4f02e7443e9aea632da47f65a5def5edff7b3b93af1fdd9e505d75810f WHIRLPOOL 16b51758304c73bd9781f3fd1c6315d301ce88d5a42ab80cdc8c81d3fb6f3ec37d91246548a7af25d9dbfc3089cc6d4cad351253f98825eb6047b5a7921e0063
 MISC ChangeLog 358 SHA256 a0680921eceacdf9b299585bc565eb563940cc7dcd84633e1dc183b8dbb23e83 SHA512 5e647b2147e742cd972bfa5cfb912e811c040eb7401528d4c76feaec5bbbe9240192d2a3e3c14410135148599299285b91710ea9ad942a7b9b3d248713661fbb WHIRLPOOL c4a2b05908a95d83951dbd6adc878b957a6d4a017596f38986b715d300c852c92da64f5533ad0874f3c16a30ca9b930dc3913550073539ce781a1c4180e78e86
-MISC metadata.xml 250 SHA256 5ae987a3ffdc42c07f472259748fffc9ae259cd1b2eee8dc7bd300f7fe9f46af SHA512 85f5708fbe1484fd721f78b084c3391615ca972058bffe9be28633c891583c7a786e8e2cab5e924a18c1b6c3ae9af69fb316113a76adaa10a1492761a83cd8fd WHIRLPOOL 818c6eef22e304c01a18be82372cdac5fd71b879c7fdf129e99f4e93054a1bed02a716586057487f98b9f75a46763e0795f9674b4c047e1cb94e46730eab6e6b
+MISC metadata.xml 308 SHA256 f749549ceeda374706bb4c7ed3a7bd51ac92d08041074fb6043864cb29d30f00 SHA512 18c0f75a3cd1a7e6410c1cf9b00d6444b135161e160873be8cb2bd9be46c2f2fa95d17f39683c2d5c32ee514b094bd3063525a3dc18f70eda36152df914ce4ac WHIRLPOOL 3e96a138a447f5c948620f0dfb99b375d4332ce2091cc5029aa617dd4cfc940b3cd5a3204d7df2cff2b194644e37a047e3661b1883cf8d081a42c01edacf426d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVBXVUXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ5MTlDREQ0NUU5Mjc4RkU2RjJDNTAyNzU0
-RkRGOUNGRDJGQUM1MTRFAAoJEE/fnP0vrFFOPywP/2CSjmUVPxlTrnZ9rbDrCnFI
-/P33uOM6/hxXKhb0jiAe38smrx9tp+F6BaQ4jeCJaku31HPDwex2ouh1JZ93q+XB
-FC+h69e1ABtMv3ZVEcG1eohw0H2Q0zgsoHMh+74sb38/GdCfjnZoVDt+elr+F6Qs
-B7Er2yrfZAMTQhb9ZwwcjYorVQdCMcWSpfiyxVF0XnYstX86xziyHGZq7MpNdGhf
-zhqA/Bs8cMl9pKUTbPt77oQk16YkosB1QpqZtO5Y37Y+251lO8AAkX9UIjoWmN4R
-cp6RPtHfgGvWaTnq/EOyEm+5/fA/2fqGAijCBXGgvd4HnMgrZIat0Y6KBZotwOMX
-yFBCe1CAj9eG1mSUR7CP2qR+xKZGjCDjntKczO/t+64RqQSO0+CdzaLlvjjgNnrR
-X7Ed4h9Pk8v3Vf7eP3Z1aYum6CCWYCqTNUyun5aaDP9Nh8RdoX0j5NciQ3G/HXXV
-CTIO1iVU4YP5uGY7IOD8qEDiK+CfWJjvnL1E9vAneqoQFx4lySBOBQ/MMUCYpaLU
-jWWEOnqSVoQ5M/hIznfcTWMbpHXtZxY254+dDL0EGRbLQ5Eh75KpapfjJYBe5dQ6
-7Fok4QfocwNkr40Cul5llIjFsC3rgsf1RONxEEQ1GNGwIJv1Et5W10QocCsR4048
-oZFXFmbOdGTv5BjSgdzD
-=rVZC
+iQJ8BAEBCgBmBQJVfxDPXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiGVAQAK75ukICuaD1ZFb1ZdxeaK1a
+hLFsR+UWmH0e//6plf8+REy50Hpj3Mi2hQeWNUXOCBgXkCZfcwkwpq1qUOFaDx+s
+heZkL2Rg+BYScu3jKzC+qmamzSLxakfyh1jg7Oa/K8/4kleF54sNoY1yG88hEHbC
+dgpwYVGb2k0BJkc9J8/Vz7lxwz+uj+GxiVkb1zCmtut3ORdmY+GFhBAAt2buuc/4
+UgKByrOIYXGYKrtQgV+zPAShlZN7dpRcY7naShY80hK0ZvU496eS5oalABg4h1xW
+jvlyFZsC2xnClp0OTRuJATXZefrkKuMhihbVaZ1vRD/H6141aNzsFlEI8NA47GbF
+GY9Ny321AhX0zRgwbCAhutovsNwFV7Fw//4ZhVPUr0OKbV17WbNffb0IcFsjYqkX
+/GUyuB/vmUXF1xkNOXaNqF/7NupbGmqaW7FV+jiwrgwwkCTKyvXn4Mme2c5neAtD
+hnx7q62KZLrC0bNfiYJJ1Kb+3seVGzPlKKemhEZszKGO1mgTtwBt0Yotujzz4WhV
+ForlY2J0aXts89NsasrLCyBRqlvKN59Dg1mWskeFbIs5oOagdHxBPhYLafwXvTA8
+aHjtIW4ibT02BHpzoXj2UPJydM2a7Nptrm3KarbDfOUxRWxdIC9/ljzKoU4XKSyE
+p6NXt7Ok/uD+dVehyUl9
+=IZt0
 -----END PGP SIGNATURE-----
diff --git a/net-misc/cmst/metadata.xml b/net-misc/cmst/metadata.xml
index 2eaac35250e4..607b1687ee0a 100644
--- a/net-misc/cmst/metadata.xml
+++ b/net-misc/cmst/metadata.xml
@@ -4,5 +4,6 @@
   <herd>qt</herd>
   <upstream>
     <bugs-to>https://github.com/andrew-bibb/cmst/issues</bugs-to>
+    <remote-id type="github">andrew-bibb/cmst</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/net-misc/cocaine-core/Manifest b/net-misc/cocaine-core/Manifest
index bb40cfe282ad..96fbfe0a1b15 100644
--- a/net-misc/cocaine-core/Manifest
+++ b/net-misc/cocaine-core/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX cocaine-core-0.11.2.5_binutils-2.23-compat.patch 559 SHA256 391cdd9106b81cfde17b1b8c34a76acb70aa22580399dc7806468127b523c723 SHA512 b3b3dda65aab873057029bc76526e2c5f89e426788622c945888dd0005dd084f6854b0f739ee0f3f3ca6e1d41b94e1bd3b37964782b91d27a833f42ada229833 WHIRLPOOL ffc0735f7212792d398968f98c897fa2ea854aee96b7fd349ec37897cc737d1ba034d43fad5fdae0123f5669ddff55c4fa27a9776f7797f1ece275ac7dc01c36
 AUX cocaine-core-0.9.2-boost-1.53.patch 619 SHA256 4e771001ac7f32b6230faf50410a67c1705eedcbc68d8b1e6ce920403fb41d3c SHA512 1d4eebb1601fa974720d6fba2fdc21f9f99b9222df0767ea8f1c96f023c7fa3bd3862feb393242e8680b3bf970da06f01a331acf7dcacf78b6426841a73705ec WHIRLPOOL 913a580063071a099cb20bc0e9363db8fdc3ec81884ed2eca2f79b349c88b0361dab3a8cb331a9e92f48aa96fde19a793a9a4912af68fc0b8d7e3c14dc4a3020
 DIST 0.9.2.tar.gz 174494 SHA256 c44d99fb3771692aa2ed8b4573954d264397c18662e05c2d95e93a5027499c8d SHA512 42bf9f38311026966b11414fc9987b4fc1d30dba9360152662810ce4e49ab1c8e662b18299efe2831b1ed7ea3490a8afb36195d7e7fc609cc9527e2c71f71bd1 WHIRLPOOL 970510d9400ca86b89fac97b5504ec6de6169bdb05819926445c8a62bf0cdc4f0166de831999f41fcf39522978acf381255d3639365142e9c4f68c9748b8e6c1
@@ -7,4 +10,23 @@ EBUILD cocaine-core-0.11.2.5.ebuild 669 SHA256 ae83b79c42390027e37f5e71f9bc5150c
 EBUILD cocaine-core-0.11.3.2.ebuild 679 SHA256 a6ec0be940f9c6bea8869caa2b96b66fb86eff89c89c07c0ae08148491aa3672 SHA512 7c5f6bbf4e27ee9bbd9a630468338f951d2e36b22ea819723c7ec004d1d62d92f25cda04997dcd754e6906e3c663c6f1a530b1a94b3e98e7a2f21f26cfe09856 WHIRLPOOL d26d0a2e47e1e3296cce0b5922e6bef85a5d0c7e0fe41512a587db66d6afd4e229b56c8405837d7ea96ae027f28975daeedd290910e593fd9286ce61ea7c6aed
 EBUILD cocaine-core-0.9.2-r1.ebuild 640 SHA256 40aac96c447a79e7c2f2d09b188aedbad06bb97a3e6d332a5907014823037de7 SHA512 8ce70fce07c7e33b671748e779c685b3a2a22de4d9f38ff4bd39265e458cfb09a5e87e0775d0e275acfe5618f5749dffbce5f46623fc07d20149050c94ef121e WHIRLPOOL bb3c581209699cc79cf5482c2eec082a4c63dc7917ba1263ac45468a9e1b407e1bf9baba146c24098bc7c048a8cda445f5dd906c281ea816f894b3a5c9947044
 MISC ChangeLog 1106 SHA256 4743191baacd5a99f01d5ac85d0d5ae941cb7cf4c6f41246f76b7f88a7bd9bbe SHA512 99a597bc53b57643598852b5e9cdc6bfb220e52320375c766706feda330012c7140758ce2040fd2e2d8e0818b8ec3282685c7e3f693d1e34415a92b5a30dd700 WHIRLPOOL 2ddf61b80d18a8188feca0a0541a66864acf488d00e19cdaa8b349410a1817d2ff73d05cd4c46fbcb55963af75edf5df6c062563785e246e6d97256d2751e433
-MISC metadata.xml 233 SHA256 65209e280ca6de32a92e1a57301ff69fb3472e55ba07848d6f80405d35e92d47 SHA512 0d30bfb39315a04767e07896409f5d3954f8e954e20fcbac7b92bb9a636c9f61c50b1b2cf55e6c1db9a199a0edc159b5c8cc8f541efb9c4adafa28e3652cff7b WHIRLPOOL 027c5101e1cbc665c9d2ef240f73a874c9f49a9b70175c5947e012df61de484585088a46b6ce9078816e548e6bcc326e7223539cc999159eee2757d0a2eb1480
+MISC metadata.xml 318 SHA256 6d317f0fe48b644693b642f2b91ec621be25b1bc54dcbc6548345df16a998577 SHA512 d82928ad64107cfe9a1af5a2e2199f20182d82ad02a60246ef4c7ea8dc6a5e73e01fffa46a6a0cc1c12604d59f394c585edd3870d7989211b9486bf63a53bd15 WHIRLPOOL 30a79330cc6d566d8e084630fa8d6f6ec2dd859388eccc06a942144f6b49fe78b636d9962b977a8f16305c9aecf04fec9e0ddc300934314457323ed5e3e368d4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVfxDaXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiDHsQAJv9j9FogbjWigfQdhwW+Bsc
+9Xg+gJQy4e4C5Zy1FQrNwt9R7Bk1kXTznNCAgNZ+8lMFyj6ycAp4yHZqVT2PTOsQ
+sDjEAmZYg8k1hixkVhJfGmXS/F+QqDuDx5vEqRQCoMDx1p42dXA1txHgXI4azENR
+IXsVobkCO82fsjDZfqg1z1ic7KTB4jcyoVo3pstmgohmkG17Lw2ojS1EiCl1Jfi9
+umtRemo11NfSwGKr38l+cC1W9gPyJCEaRq0ZxOvy561t9b56F5sJ07TfJRdsIMQY
+vcIrL5yty5Hb7LGPRGp/XxAp2JRqXVeRRpAmPLzbvmZzKSyJ+LEdDQqpfyGt/ick
+kq9JiEUeUsV3WzoEPPGaYaeQE9jF1X3iyoDkXRnze0bHHmdPcS7P6siShrcb7G6F
+YCf7JmdL+CTDHamHHr+xrzrS+YwhzksGepoU4hqQY6UJB6TXW3dQdl1ihDZP2j00
+vNT+C5PNq5QQinX83cDhxW8FyOT3h9AaeOfjAEXmZI/WbBioqtk6/NuHGrhnic2P
+INy+78YxIhS+zbMOHetOIkHYXV1/y5exqVIMxalH45761PzXT5VIzUKkbLMtOAhT
++fA48gZV3w74H7VqZuQY8eUZ8MRLjBWE3T4DtRzYXwS0ckKkWKBSFnU9NIAVhmoD
+hrpcYU00zZEkOvmJ1vCn
+=u6AV
+-----END PGP SIGNATURE-----
diff --git a/net-misc/cocaine-core/metadata.xml b/net-misc/cocaine-core/metadata.xml
index 24cbb90cf0c4..67ee8b27ff2a 100644
--- a/net-misc/cocaine-core/metadata.xml
+++ b/net-misc/cocaine-core/metadata.xml
@@ -5,4 +5,7 @@
 		<email>patrick@gentoo.org</email>
 		<name>Patrick Lauer</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">cocaine/cocaine-core</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/connect/Manifest b/net-misc/connect/Manifest
index 6d84eb58909c..137eb6d9efc0 100644
--- a/net-misc/connect/Manifest
+++ b/net-misc/connect/Manifest
@@ -1,28 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST connect-1.100.tar.bz2 21588 SHA256 e34be67caefc38f9b48fba1b5cbce9b0978fc4d33e2640d5d287789a14cb9ccd SHA512 e0bb106ae7270ff0352c2c5167fd47d6d9ac787f08b3019fd9dabe0636606709bc1caf696f6c87699e146eee0cb81db229f9202654f006c12321208c22832108 WHIRLPOOL af15bf382f84742618df9d42de14410f9ca4f6a888835cf4a28f2f5f20d2ec962b52f188a787fb9244f95e5b41f9bcfe6b465a1a5a7dd456d0592bbcd69b1b23
 DIST connect-1.103.tar.bz2 37980 SHA256 d4ea2e1c2831f7578c264196bfeb6285618cc1d50660aa923b91145282ac3155 SHA512 6de32aa48171b1528abe12c1044e1d498cd10c3ef7b4652318402b7bc12bbb50ce0f9eab10408dc3cc26c1c0d56804bd088fbedae688f921c84c40d1aa0ae4d9 WHIRLPOOL 2007c2bcf9460d948554f1b53a389c7f70f2135647b629290c9cd21f11f5f3a647c5d28389b7c20f7e8f4d7c4b9e1c1eec82d7306db3831c31eb1728a9dc79cc
 EBUILD connect-1.100.ebuild 975 SHA256 7f17ca3ece39e53e2e1e569a767c4fa37037a3abb11c48d5f27d236c4116373d SHA512 e5ca2b8514b5d5dce06b7acd9612779e8c7c4434809c69bf71ed2cb57875f80e45a4a5d1c3b78db2c96e6f4d2f13074b33d6789ebee760fa42f6e19910e88b45 WHIRLPOOL 3f5c828751c4fee3dd8ad6089b723c36166079b20f9c1e3f0de52467c0ff3b53f2afface8e8a7b4b843723c4f4fc594816aff9e91dd35b29b137bbe5026875d6
 EBUILD connect-1.103.ebuild 977 SHA256 9fd519d03807594d6c333b053f62380a5e453eecc97f7063ebba33f7d6a1e69f SHA512 e51924eb8b62ae91e04c102ad02d86799be7c45f93a67dcdb58c77ae848816e8826d9677e23e02ca59cfbafb51751e0ec56bf55b16bfc9e3c29193baf5b86cf7 WHIRLPOOL 5ea271c19da08355397bbe966fbef315e7db84b43efba05a46fa5724371c2f9e6723ae60d8df0b69549e570cd5c09bef7c7209b126d91676dfe0c6d9b7cb8976
 MISC ChangeLog 2243 SHA256 c561dae57facd40fea88acb931c3005041abf9af3a1abc20cdf00f245d184748 SHA512 206d2d378079895f6c10e7a5cd2fccfd92f3c66e2fc5a64a5f1a2f48e9bea08448b324f944c0593e81919d36f238c3c353dcd3e98bb174ee714f4daaa7e087ca WHIRLPOOL 1ecdea47be61096f1dd9bd0a6f6f837c0fdfe242540ee595c28cfe8304b67bd4e261826fd11199126d5d3bf596219f6a9436bb8a5707d6e3f1022625ce1a2770
-MISC metadata.xml 746 SHA256 bf896a11622fa322648414140e19e7bb6b64144794a7f6711c1a5e4c8d81bae9 SHA512 85dc545987f8550fa7846131f411e752412342268397b1bf16ccd4215d440ae6c6091e4b4b8b206b46d821032d75b6772c6a40384429e8a23d52a7e317c29b5c WHIRLPOOL c74750280caac25306d30c708f278fef55ec2f72824c48ccf6364f01c5c08df5f7012c0346a164ca89b75199336f1a2fc8a4af336fc3b1fa41064d51a29a0d79
+MISC metadata.xml 834 SHA256 e5997baadce9eaacb441519a903eb3c8189ed8ebb71ff40c4804deb6f6330a8e SHA512 024c6635db1181cf77c076b307cb7b7d5f52cdfec881f31bbbff7a3f65bd4fa22f9c431aca3a6e1450dfa3ff0bbf5a053f1eee5af8dc321c376bdbf6bfa81be3 WHIRLPOOL 699f1bdf0c99963c1d2fd8108b0ad26e724e519e3ca9044386b2388fe87114e74058e77f1846a918dbdde7b2e7e1f85eaf3540f99e65c4673f12cc4cc5bc5e09
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJTuU05XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOTHgQANfoVEQKvNPqvQUseXL2Erza
-jEPvOC5LMyGJibpkAWPxPk2sXMoXpN0zk/tbJCECuHrZ8cOOg8Hg/VW5A+2Ktgyg
-lrLfqwGeheDPHO5czZsjt/mAYg7ZOgWcompArdUs36j8/7wp6FmJED3c/lVDwBKY
-Zvjit6Ygnf/PAIE98q/WEY3oXmT70J9NTnIuxvHrEI51gWjx82gRSpMFZ30c9XQH
-Ix7VDIn2B/mSEmtvfpjuOAfHjsmQzts0Z1rSLzPsIIo0cvyK5oBXlSO84XdfjRpd
-+WwuB2Ps3aBmNreSM308v2hOyd3Fic9ATZzLENujhbZzqaEW6qkHqO0DQ3a0rblc
-72Gf1TOw9trW8pHW7TKzgUXIlC+DvjxzxzPkLZoIa3PzYD2qnsccSEv9VhemHjtt
-t/A3222Akn/xwL9yB0YxsRHiLESM/vCNZ9Q9l66LY/hvHlTZF52CJWbGmlt8X2hd
-4EbI2T4EyebOLFoAJD5P8Oaz+JZ8GO+rzQocQw84b0WV3VSAJKo7VZ9stpb/gO47
-F63ro32kEpT2ajlNa4BblKKf4FCAXG/ZM+2QS2ciE7M5EyJa8QvaPqmB6I7CaMPQ
-AMCCXBBYewGqUNcr75SkMRgXDIKhSrnnlZXsA9ldS+8Lyk/PPi9cKmx9X1EY+ows
-A6HFmnCTtijN2kLLSIRl
-=Hmmo
+iQJ8BAEBCgBmBQJVfxDjXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmisxQP/0+n4oDvMJnYco6PrvpYd4cK
+4nJMxfAIHaMJ//kCk7T15ZgNqO4ztts0dp7cra0eiZEs2g+8zuRkoHARpVR1lrVm
+Oo7TKaXjHih7Ab7Wj9Jt+cbzc04u4LwadjM5YjfZmqetO9FoWRflZYe9z+JRf9IK
+4Fwrfhkap/YwXwtI/bEW4nIC+GeqCK5/HFXjeJNzC+eSHhiiUiMmCaaA1v8NUGWJ
+1dL76zi+MC8eqVs0Aoq+KBSfih98tMCTAF0Xa30pmvUohkEKVi2wHy3RLXfY7z4+
+6w0BBCXMPz5IHzjfdhs6krfJis+aL99OGrT+Uqo1BtU+bo9BsRKrFN5Xr+zybXd6
+72tfwrm2McA6N2XPYpmipW86mrH9Hcy8F1g1YmINu6oc+RmsWJnu2Rlom0ehGbVG
+klcv7+pItkJ8ZoWdIsCELf/4Gkkr5B84YkiEfNZq6WMa5k/p8+bCVVBi4j3YBuEq
+qRaOmsouGtv9x8rR0OzNppFSkfRqOE7yif/lGd6pIer6ODDwsISv3UlvGdxrsnKd
+GERrMcRCaFC4dn859BuENQhAaCdsR5cTZQhtpGxaRFrC14zp+Ri1n4iyHQ5rZouu
+SIe47YYEJdz/GdA463Ko+6z6oIiCxO/ZdWrVCZVlVi21AxxNiYiiT6Um/z2uy9CG
+xUzcgqnKJyhlWzODXHqw
+=M7me
 -----END PGP SIGNATURE-----
diff --git a/net-misc/connect/metadata.xml b/net-misc/connect/metadata.xml
index c50956194ce3..5938ebe814ca 100644
--- a/net-misc/connect/metadata.xml
+++ b/net-misc/connect/metadata.xml
@@ -1,19 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-	<email>wschlich@gentoo.org</email>
-	<name>Wolfram Schlich</name>
-	<description>Primary maintainer</description>
-</maintainer>
-<longdescription>
+	<maintainer>
+		<email>wschlich@gentoo.org</email>
+		<name>Wolfram Schlich</name>
+		<description>Primary maintainer</description>
+	</maintainer>
+	<longdescription>
 connect is the simple relaying command to make network connection via
 SOCKS and https proxy. It is mainly intended to be used as proxy
 command of OpenSSH.
 </longdescription>
-<longdescription lang="ja">
+	<longdescription lang="ja">
 Connect は SOCKS 経由のネットワーク接続と HTTP プロクシを実現する単純な
 中継用コマンドです。主に OpenSSH のプロクシ・コマンドとして利用されるこ
 とを想定してます。
 </longdescription>
+	<upstream>
+		<remote-id type="bitbucket">gotoh/connect</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/dhcpd-pools/Manifest b/net-misc/dhcpd-pools/Manifest
index 6bad2ceab8c8..64024c18fb00 100644
--- a/net-misc/dhcpd-pools/Manifest
+++ b/net-misc/dhcpd-pools/Manifest
@@ -1,4 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST dhcpd-pools-2.21.tar.xz 544940 SHA256 c444dffee4626216190f85e28ef43e97611058ba9b3e6ce9c563f91bc2de011c SHA512 33c89dd7eb23b3df6e454cd75051f3d842cc265e8596f5657a9e72ae485befbe78655eb682cab10c14973286b85f2b174c2f23b88c5142b63589ca9ec0a9d975 WHIRLPOOL d681d8d461dd515944c5e4f8f326e2f7e93901e6ac049c85a3e2857f51e25d8c8599c7afe04daa48d1ae7350ee5baef85fea0c2e69f27237d747478d74d0e443
 EBUILD dhcpd-pools-2.21.ebuild 585 SHA256 7c3501a997d691a69b40835fc034c515ee15b31a18dd816e16f6611e7af14320 SHA512 34a2f953a6f942703a0d8559c032c43a2d09fdd71514bbed1bfb36e7248c4e9fd48d2f0c8dd0c5e4f8ea4f4984b2e84b14ce36eabfca4a04ae5ee5ae397333f2 WHIRLPOOL ee00d3eac2f82f04a5b5d401e0931f25b6d72dad492bbb8914280cf824accdaa8f20cdd690304fd9dd24756ee8ebe9d49c05dcd726d6b5aaca3ca945dcd7512c
 MISC ChangeLog 362 SHA256 96bc2a48e6fc1ff059f0676e5b3fcb70e259a9d830c6cfda60f5348228142f6f SHA512 9a0f9c417e3ccca813f7a0e01cb3c54704a0d49d76c16fc33e8db1703abba1f9e189de65b1c53113204043e84d34231ea9a39e41a2f95652986b80f77a870689 WHIRLPOOL d621a155ff01170837de0cff92e6bc8a71454a623141fc239bf8edc9e2dfca81078d004c58e28b226170471b6b160d2c9145c18fa218f867c63e52f643a6b804
-MISC metadata.xml 234 SHA256 1b248180bba128fa7169db80538f0ba5851a72429e76f3a18981dedf499ba706 SHA512 7e995b05e93539f9b374f54e77d30724d4d33752a7ffe2a7572cb0e6a8c1cf0f79af80191c02d162768f3663ce586698828606ed7792b1f2307f7736954533b7 WHIRLPOOL 4c4d661b59ceebadcb3bfb06f0187a5a83049e299e01fdc2c6f604fece76cb812e882fb332bd0dcf6e5070de05910b244871ed6bc57dace6db0d987aee103df9
+MISC metadata.xml 314 SHA256 968b6694b0c7239afb04fcad116b52fa137b301220c8ce2ca896791a436c827a SHA512 df4f5571232a7390eedf34cc4e7bfe6b1a0645f3c58fed89652ccb1840093d988fad8bea7bf039c7250b5819c19ced2ade3d29389da20bea3216b859e91fbafa WHIRLPOOL 8ee33ad748dcda8804cfcda98abdba82314b654cadb07f36cd903f84500d217d5481867b49160c3842cbf23451ceb93bdd3e2a2b2aaaa816ebf4501e600b8665
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVfxDpXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi7yMP/i28ZqY5PSN2851Dqg63NoTz
+e76aAFnFv7ASxmei3P9SmJ7Kzd52thO7zlSlMGwdtmBpgo9WuXslXBiswfqkgeE0
+A7ADtIVhjdD2Ht7LJr4ASeTIdgTnDeHzSzQ7yhZC9EbWYdHuCcnEI771jAUxekGF
+AU23cAZ+Kg2GMApj/a850CZMyONCp8cEhXH6s68UkGLb5ehYNmXqczB4Utj/KLUH
+HBjJ72Qncgd1WYbNfQzh9dk8HYvyIaI7zAkUKBcwFZYZsUUCRHybvdKNzm6DBY+L
+7UvCVp56wU0vyMFXQ6Vi/IpUssPSF4aHLjQ3Wnnc+FjUVm+5hxvWlHmEl3fh6ei6
+G3g0wrog0galAaum5Xf0bGFbvomOtNj9abAWvPBnLH0ENFInSLUa+tz+OrrPMQIq
+xU5FDsFIExMHlA/ypJtVKq0MgOAwRYX6GwN19X2B5SmbZQaqoQoLpIv4FT51zKIs
+5mOUyhxROvp1iR0QhxwLtsS9FZuLzrgawe6SQFZVWBhA6puVVQeFdVk9P2KYiJRt
+WRG0vXeMlWluQk04bqzpmf6Y145kmFXqFkfF0fjBOzMFxShQyU/q/oeYv5+0T/5t
+2UgRYYIk4IN/PQ28julf4EiFpId5e6OJSm7iVuY0jlAUgPRAj5keUJc5YiswwdmP
+X7HDADNbwRHPySXq5vKw
+=JmRV
+-----END PGP SIGNATURE-----
diff --git a/net-misc/dhcpd-pools/metadata.xml b/net-misc/dhcpd-pools/metadata.xml
index e8b7c340d5db..fc319ce95c0c 100644
--- a/net-misc/dhcpd-pools/metadata.xml
+++ b/net-misc/dhcpd-pools/metadata.xml
@@ -5,5 +5,7 @@
 		<email>cardoe@gentoo.org</email>
 		<name>Doug Goldstein</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">dhcpd-pools</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/net-misc/directvnc/Manifest b/net-misc/directvnc/Manifest
index 81c3eb2cecd8..a7d08c3ac629 100644
--- a/net-misc/directvnc/Manifest
+++ b/net-misc/directvnc/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX directvnc-0.7.6-mouse.patch 993 SHA256 be7ad2732a52d8b9b75a707897a5d00369dd213f62f90fd7ca0cef7677364503 SHA512 7553c00bc6a4d62dd3a82accf94acebe235faf3aa67aa0a66a2262c2ca6f59d1913601432219e5051b42cf47c22b0fd978b7f256d2fda4df1e1b45b2848414e3 WHIRLPOOL 374ce931b1e9932ab61ba1d21e5fd64b417b17670d400155d17d296f7634a039305d154fbe1576c1ab8994421e01ac07060a4892ccc13843b8be27d79cff0d09
 AUX directvnc-0.7.8-mouse.patch 1056 SHA256 eb04fb28266638dac900fb64713957f1fee5dd8ac35daad512559c9727103e3f SHA512 2e584bd2c3af3f324e80587606ac11b2871f9ea384876602e873249e2e55e6e3c7aa6a544a45c759e5e4241e0d231163b3ab2fe823badad6144a8ec7b4b9200d WHIRLPOOL 20f1eaae5bd6668c2ec1e901ea874d51b008c1453462d15ee877fe37739ce565d738782ac5f8e248c2ca3a521b340ca549991412b57267fc56968ca1b76ce0cd
@@ -9,21 +9,23 @@ DIST directvnc-0.7.8.tar.gz 374455 SHA256 07d6109aef5bba2df86f0dd658be7ed9d82880
 EBUILD directvnc-0.7.6-r1.ebuild 1023 SHA256 099d21077190dee6c2f796cd1dbb66fe7617bcb46657281c427af34562bd1f64 SHA512 50eb558ad060c289332f303da62b74db8c3d8a7a6aec0059585219762e3bcc3525159333bc9e3b073e49a55967237965af6d774ec0b58b6b6b9f0ccdbea11e99 WHIRLPOOL 1854bb2a28b364685646c99b0f8e4feb89b2268eb8bbb852dff0458784a9b65eef68b5bbd6b1baa73502b4eb3a517e7d39df9905ea9c358f8ab721b2aea2dd2a
 EBUILD directvnc-0.7.8.ebuild 1269 SHA256 85db822c2b24452381aeb3f4e6b31912a65fbb303969cc32feba13270860b27d SHA512 f6e4db2bf87b44c6448d92b6a505bab34497bc2b1a24d41c0d1c3260fa2408c0209812b2131f28425f320363011a6f42a391da93a11bb0a44538cc810a5349de WHIRLPOOL 1387e8d7104b661c55771134d708b7641c4538d956c616ba8eff4a637eddba5e8880893beeff8d44b843f33cd66e7e0509344ab19ff016f662e2901e65905a8e
 MISC ChangeLog 4366 SHA256 c8e96799c2f8ec1ca2a879bd1d36caaeb2a06dbb3a77b4070c7d28ca9fc169da SHA512 d2d1ea6a4dbb674ec5bd0bf65c9a94c8928d7ab19c99a1e52942409af70cf1338e4caae2247185c2ee05d93a12e306bf2d6ac61c777318463b7bece864d1fe4a WHIRLPOOL bc573583d10ace57693f9b793fbe8d4ac7f4c51e8dabfcf2cba4d22346df68ac3a91ac20c44681f7ceaa3944f66acff6f22ecf04ea922ece9c8b8c5ad3ae001e
-MISC metadata.xml 372 SHA256 500b515ef9fd9fd57a8aef35f12f9b53e1821eb346256433e9b0447c57a4df31 SHA512 85d2cc10bafa6869e773e70fe592935ee2a7e3fb1efb4cefcca336e89e1000ca01ba4a646bfe5f8e87beed31a81946f48b4255b0be9e2d8cfdbc24cc26ceff1d WHIRLPOOL b4317ae30251cb368f6885fa7937ac87b5aee098a0995361e84c140422dd75c7c36e2ff482ce25bcab0886fe57e09a9ca579cebe79a8a47aa7df99e07fe4b11c
+MISC metadata.xml 460 SHA256 6b631a89e007218e564ce6e4842adec91ed38f4d41d9470b27c0fd9d282b19c8 SHA512 396c586bad261105151dc735b74e920f27ff00177876b776b83d526eb7561b35d815498f71ad6487afc6cf8a1725216d6f9763d1563c667daeff3736ad105427 WHIRLPOOL 11402067cb533ce63bbad8b05008188db8f3201d9972a2bc7a10bc5b0c85541081f18d9d4eb58822790e74bf8fd92773b28010cdced7de735798718b8ee1404c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJS2NYnAAoJEJIMDbyqvv1VLHwQALM/9tHhBhTusLhXtki+bBRU
-X9UXOMOz3aAPVUBkDl5evcLlaejOfIx8UcUofAFCTJ5t6dSHG5VKsqyavR6zukUV
-IBxEI+qtserW59fzfdw9/UBImAhOyTOhJPD8IPhwPaYDNwWKyL67u9V7tkpgCcP2
-5B25uKmnct1Pexz2Y7pxwlzsWMnv0Lwb3RkK7HYMrtwpGC1UArUMvh6xNBPbY0aR
-xVzgfq/hHOLVx8T0UTSdl3edUJ3g0Z2X3sQT60kbXXy/NH421tOJTNeOMHhiDR7q
-/HqojjMbXrnmajG71IwUiGMile+2pZ1sp4Dh+1HvrMOxnnA0PzBXGr5U6G6uRqP5
-HvS6PRM7q+oqCPLFF+JCor1QSaSvvVcbsANouT2qoXKkK5o2DaRBS7dIxcenmXBb
-QkQbAMwh5vuYslDHqI3W3MPlx+/qUHkm/+NZ0af7hGc/LU5RlkM3rbgOXTxq+zdb
-pFWh1jtZDw7y8ZejTiA0wmb369TPp4N/Mj5d1D+gAirqRQ263ipjd25+6I18Kxuj
-a3SOiUnPfQAR3fJQUvQpnCvZq6u5g67LlZIDi5rElLjRjDgsWINtIh0Lald5cK1H
-J9TDOX1733xpO/1EdPk6+pZI0IA904ZlpIwYtqfs5nToei8fxER8EBuK2bpSTyrJ
-oULaI0wByUp0/XAdU7td
-=mrY/
+iQJ8BAEBCgBmBQJVfxD0XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi+kMP/jsqjMSa+Rly92GKYjxryMcO
+2CtZMf1VLS31LlxcFCQ+cry/XoYFzajFSKxoX+2fsIv4/MDdSOmyepaVVk8zI6ck
+zDYZD+FIfKJFsvAUqLQmM8OJFBgeTtUfZoKY43DuGHY6rN4FQW5ISB86h+g9LOK2
+CvwxApC/PZzwBEmm136gilgdv4fEfXW645PUTlNR6a8o2eN8rhjbkB5bU8pez5BE
+4lwavPEZF/XFPZZVMC5F9PThCUKJprHBERwrKT+wgqfp4vVHlftXKCeu+GbBMHpE
+NEUje6nGaarXr5c2raWD7VLPMfrksZPECKD6cGX91wfmi5ZTE0fxNJHoEBTUhFgW
+gdX0OD7BCtT1ttMMliU8UaUPIV1RCQZQ1MI4U8GYViupR5L5hd7GbfkfscQBft0z
+312g4Sr2V8M5wAtDvdJ4wro7Wts/hIm5TFfDwTnuwqK3f5AeN7VL54HIR/X+nB7b
+rtfpr4P2iiYxI9a31kb6eVKWYbU2cu+mQpa7RVA5ScuPVG7EQBsFZn+sEMtxZnvG
+oaHSXQ6EDITFhnCtNrm7tXY0zK/R+mIrlnG84kYHcJwQNQsWW6YC4NrSSseWKxMQ
+kGsOp3B9JZjuFc+Sm6sGxZ8FS6IXOE9Dp1MaE/NiitRhj1nYtx8nQyDxthlhPwPO
+KK0jOR5OHpUjUihSM9NL
+=paay
 -----END PGP SIGNATURE-----
diff --git a/net-misc/directvnc/metadata.xml b/net-misc/directvnc/metadata.xml
index 442033176fff..071297add332 100644
--- a/net-misc/directvnc/metadata.xml
+++ b/net-misc/directvnc/metadata.xml
@@ -7,6 +7,9 @@
   </maintainer>
   <use>
     <flag name="mouse">Adds mouse support</flag>
-    <flag name='dmalloc'>Enable debugging with the dmalloc library</flag>
+    <flag name="dmalloc">Enable debugging with the dmalloc library</flag>
   </use>
+  <upstream>
+    <remote-id type="github">downloads/drinkmilk</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/net-misc/elliptics-eblob/Manifest b/net-misc/elliptics-eblob/Manifest
index 88d1746798e3..d0066bd001f6 100644
--- a/net-misc/elliptics-eblob/Manifest
+++ b/net-misc/elliptics-eblob/Manifest
@@ -1,6 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST eblob-0.0.1.tar.gz 353118 SHA256 eb19e68f42d0fd1140f874aa115186e542e395dbad1a22e550b5dc3b50760c8b SHA512 fa5f9a0773ac7ef6288a5ed77b6d1c6c65fcdc1bff1890b6e99c3748ea0f07124ef88b91f4e0d61aa896bb00b85ff95417362cbc41d0f4216f2f78e299aa1a10 WHIRLPOOL 11a31a9dcab869a1592db5380d0675f7c046ebb2de864c735ade3c9d859d1d9225f2f47307d3fa3a77f9f5fb267d5156fd964a07c2c34ae3638219f87088fbfd
 DIST elliptics-eblob-0.22.16.zip 191321 SHA256 a9b9c2160473e2faa73d0c0493522d1ca6e1f1e199b46aaf111a4bd0b5880dc2 SHA512 bb8e00ecd8b111032a476cf4cdcbc4151f02c7166aebe0de3890c4d79d456249765e82ec70df38ffe1dcff3d6dd5ed7a2774aa5c21075e381ed39e2de00179a3 WHIRLPOOL 346ad194408ceac074e777e756cc3938f4117c790694e75ec7788b62668818d58231ef9ef35c533a33639b845a79090f531e7bed8699fb20c567df333efaa470
 EBUILD elliptics-eblob-0.0.1.ebuild 1111 SHA256 763ef979f5964ef66b77761f08636f461913343be7e766998666c01e8c985a96 SHA512 7cab0c8be96d8c495306733d1b0783714068e45e6f8a0fa244d7550e005465e69cb6d83d365662eea3ce6c99d76a9208611de1604f27ff75b3dc105255af2407 WHIRLPOOL 030c32229829735536af66d8f8cb06375f7c60714a401d5789481157fe4e327a898eb275191b84910c133a57bfdf1be7b63d6568484acf04b916cfce9c8b6fce
 EBUILD elliptics-eblob-0.22.16.ebuild 1025 SHA256 e7dec5654a38909b0a91cc2bf922fe535ebf21f7f70b30b667e63d3d9f308dc0 SHA512 50ad5b20e92af12b1cf005eb710a9e1f93a93e748bc66995ad9b1a954c83e63b6599efbc2aca16c065d6907fe24cd2f304e4c424b1bd2711a0b3bd5b1fd956b5 WHIRLPOOL ce46464ac96cadb46a9b27813251320b20526be219a50c7240aa8f8c45725f998c91dee4d6f9dbdd3673fdf18f79d8d45b1ca2b13d1a0fd4057fe20f848c00cb
 MISC ChangeLog 957 SHA256 48234445ce8ccca04b810a6a0234a169390b550343b952eb64bbf6f484a85129 SHA512 e29dde72b82019fda0336af2e6978a1695f70889ba0be3183861aebc47bc6a863f4e66cb0f130b2734a0f5831d3d2ac69f649d4ea741f550534e24b587fb0fa4 WHIRLPOOL 68592d11facec8bde161b08accf0b65ed91e340b8d3e6e97cead475047002c2bbd9104b32fc548eb4b0b42011469515e76901b115ac3949469b59270b81ad199
-MISC metadata.xml 233 SHA256 65209e280ca6de32a92e1a57301ff69fb3472e55ba07848d6f80405d35e92d47 SHA512 0d30bfb39315a04767e07896409f5d3954f8e954e20fcbac7b92bb9a636c9f61c50b1b2cf55e6c1db9a199a0edc159b5c8cc8f541efb9c4adafa28e3652cff7b WHIRLPOOL 027c5101e1cbc665c9d2ef240f73a874c9f49a9b70175c5947e012df61de484585088a46b6ce9078816e548e6bcc326e7223539cc999159eee2757d0a2eb1480
+MISC metadata.xml 314 SHA256 51401276317e2cd13bbad32de237abde9e0f312cae1bece93a6abec2359d15d4 SHA512 0519ad2f42f7269d4e696f574f1b8236dae24e3f4d10c9bee7d1644a53a1525e43467357282c69b77be667f5def097d31caf848db834d16e58a041ccdbec1c5b WHIRLPOOL 9b8affdce29516b38300bf3454ac888ab04608c723c1ab5324e35a85dbfd624df99feef41cc05be3366551eda4a25db559f8a2bfce7d3c341f0cbb81b26a3b74
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVfxEGXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmicIoP/1c19iW+ITKO6yI5eAJLelb/
+ibkaLpKuky5lL3L+uTfhRErb+SyvAy3Ce4WNqMhut6vcedqeY6GFpQllR3e0ivn6
+Dx0R6O7+qNNAfBzYJ8mUwzynHHFRAFd8beTknqLWyXD65uQSri1t6f+HFquA7KBj
+iXF3VLLte52XkCXNgQfLGq5rPQLz7w4U4vju9ZLgzII64PA4WwktpS4VddrEVctA
+RWqOgsD3iJQZIHAVuyLwVsYrmGHT7px7b4IFaZyOCubdCkvwrSgfAvvv3zcgFzO5
+wCcrZH/Xpl5I2z8KY8/3Noohs0To3nb1QvAqJDY0jsLN6XTy12y+PpjGR0lN0ZXS
++WeT16X1x5dX+OUx6vBSBvf220nRmRCqaRrj2la8yDWfHXOImakpBNrae4qfq/8U
+qDeDhjTEKfbEphDZhZyH2bMVMm/m6R9ik9OgH+ffU0ZkIGvCoDkUxp8PVgt/yJ9a
+fhOhIjDDbMzHmH+v3IzRbDbh/gIIleyKyDiydyVt/nNa1EdRmC/P4V1HtkTG+iCR
+U3GJba+hQwl4nYrCudAZyAMuDUSwNCb/KY0sTjKSLDzrhIOkDZrwf5XRNz0fiwIX
+h7X4V259W01FlMOINmBvFsN1FkEl1BmwkVcEaAtQ75uVZooddufSsrM4pOf4Y6ct
+GMDsLAKCKdrKNysSqYk2
+=w+77
+-----END PGP SIGNATURE-----
diff --git a/net-misc/elliptics-eblob/metadata.xml b/net-misc/elliptics-eblob/metadata.xml
index 24cbb90cf0c4..43acb2cc82ef 100644
--- a/net-misc/elliptics-eblob/metadata.xml
+++ b/net-misc/elliptics-eblob/metadata.xml
@@ -5,4 +5,7 @@
 		<email>patrick@gentoo.org</email>
 		<name>Patrick Lauer</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">reverbrain/eblob</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/elliptics/Manifest b/net-misc/elliptics/Manifest
index 96f7c976019c..0e55d1cdd6ea 100644
--- a/net-misc/elliptics/Manifest
+++ b/net-misc/elliptics/Manifest
@@ -1,16 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX elliptics.confd 101 SHA256 5bb9274f72e6e2063becf14f52ef512c6c8fa2727cfabb172a41b47911d3e85a SHA512 d0bee143774b0b2b28917a008b736f0fc2564c48ef8dc09623fc4787571fea0913517365203ec37004e2241d6d413ed1c7d0440dd1357e08a4073e57667fedfe WHIRLPOOL 8ccd3bd75338432a351970f4fdc59236c4ec744e51c723c887dccee1e44f569df071ce62a86c82db2e8f126bc54a704f8bd56889765e39004b9235026a95628c
 AUX elliptics.initd 760 SHA256 d5b43ba8c823fcbb840f4199072d92579b8546ed4136140dacd8b519e4f157a8 SHA512 476d82d29263b8f3bd3bd85ea7ad1338ee1a415bafc2e53253cd402be54ba6f976f01095a67ffc314c72eccb74b7ae873c30e3f1c48ccabc66de11b7aef57713 WHIRLPOOL 013aaefecba40d248be81de86551e7e7f557fb14b20c1cbfdbab63cc40e80fd7228272bcac02492d4312f392478f27f8d4f119686e8c8b62408c3c0e9bf446f2
 DIST elliptics-2.19.2.6.tar.gz 217118 SHA256 33803bea4f1bce448abf0c3203b9b2828ccde8dbb4b2b1a234d187b1a73a5436 SHA512 63670812fe422b2b02335e8ff248bdac19a0825a69118d3afa473c7775b177b469078c2dab47ace08643859e92576e1cdcdf44388489994b9560e96e7fbb400e WHIRLPOOL 44c334b238d0fa6a5767815cb9ccaa9bef68279b4314f405e8c78ea53e40a6210d4dc4e31fc62e665886f25272c079eef4b94a8b75fd0a0c2d5a9d0815227088
 EBUILD elliptics-2.19.2.6.ebuild 2052 SHA256 7f242e3c2b517c49c180f0a961d4e87bc78ebdc1884523607e79102b9484c2be SHA512 9c26b25615cd7b21e6c27a65e0c38ce9d704ff0e3309f1eda5cdac6aa5ad0605263c89b40227c0e61b0d6834c17b64e6cc632be6702e43bf4a8e472ddcac569b WHIRLPOOL 8e9e3d77e2b826ba184dd8b77177b6ecb182cd1160e5159833b95aeee57abac25c37fa33b44275d2f2b70d74ea30d9d88c7b95e1599469f9ac2851219f805e23
 MISC ChangeLog 930 SHA256 6cd98f59b57a99ac6f02df73bc063c1c4b78e75d81108153c51017f2da8f46e9 SHA512 9ada9e969cd939d329e98d0d3ebe8abdccbc9fc785398f53973b2e285243823b7a11f92d65ddb2efd282d649a0b8c8e322789c08776903ff1b845f055cb1616b WHIRLPOOL 22334e543cd0033443fd253885772ae78d55b58e0df5de485ae207d10b94f22743576f25ceee51b4491bf496589b253f399e8eb7f96e9d3905f683cc967250f0
-MISC metadata.xml 233 SHA256 65209e280ca6de32a92e1a57301ff69fb3472e55ba07848d6f80405d35e92d47 SHA512 0d30bfb39315a04767e07896409f5d3954f8e954e20fcbac7b92bb9a636c9f61c50b1b2cf55e6c1db9a199a0edc159b5c8cc8f541efb9c4adafa28e3652cff7b WHIRLPOOL 027c5101e1cbc665c9d2ef240f73a874c9f49a9b70175c5947e012df61de484585088a46b6ce9078816e548e6bcc326e7223539cc999159eee2757d0a2eb1480
+MISC metadata.xml 318 SHA256 45389caf06acca4a6777c5b8a4fefa7dfd15b169cafaac60b0fc1083dfe0ae24 SHA512 007f389069ee3e7d8be1521ed1629c856dd65c76cb6dfce7f265cf227920cbaa5e9c9cdf5a8ae8da3ba2cc6d36af616683bff5c612dcf7fb3555750d31dff1e7 WHIRLPOOL 011a87a344d199adf51a59ae1c79d161f3e4b4d31090a69b3d3c73c7213f37f58d2492bc68c3785649ee7de02245dd900610aaf55072b8e420216387de2753ec
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlUyT6EACgkQI1lqEGTUzyR6MQCcCDaU9a2s1c32l4Oixw/lFDoI
-PCEAn2yYpKmn4GBmle4zq7MLHJ2pycbv
-=VHaF
+iQJ8BAEBCgBmBQJVfxD9XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi1AcP/1tHym/oU5hOeNG3GLAug0vz
+RE4eDsFHDae02mds9NvMl3JBVWcUTujzjRqDTtEHgjQ/fO4wJ+4VdmZt3FHLadU/
+wahyvLXL8f3TV1crHPijGDh4eLcgL+R46VtsnsBY2y4MGVcyZUevb3670SxUQH3i
+RCVQJIo1MEjtsrey8Ptz2/v8PRfAav0Ux++gzykEeh8GP1uWyPlZpSYIsw5B4nF2
+m0BGZSN2+7z9OxWjeKMo8e8plhlqv29wUEitj+29rscG/rkmHNMN4fPwD9jKdQx+
+7b6wMVQ3M1+LQCa59Bp+FnG27yvlw8Upw3e0uk3U8Lyj0jfEDqJarnqtZ4xtm+gP
+U77h/hVApdvuWVBy5T7Dd8GwYD0DPQaJMn+BUja7l2+E2zv17x30xjXLu+a51mc8
+FUtfzWAUPMJfpIPjhKpBhTPOWgXTciJKdiMVaPcAq0NxBHgMpmkuI/fVhdSaXi98
+aBDB7vaUK5bHrNnQT3tMxftwqE6BKlype2pjjJNAywI0hWFVYeFmLa4rIa4xzb3K
+X2+LuCYVH5zjezhNZdiT6Mmwbfl4sDOucpScU/Dbwwxhqx8I39DviyaTujj2svh5
+NLzUvpwQ2NkATO0NkaOiyQd+ebtey8HGta1DM6vZdBhADjrYfywN9r0Xm114UyEt
+yKN3hN4rsHlianuGwBHu
+=R6T4
 -----END PGP SIGNATURE-----
diff --git a/net-misc/elliptics/metadata.xml b/net-misc/elliptics/metadata.xml
index 24cbb90cf0c4..783c4d3a16c5 100644
--- a/net-misc/elliptics/metadata.xml
+++ b/net-misc/elliptics/metadata.xml
@@ -5,4 +5,7 @@
 		<email>patrick@gentoo.org</email>
 		<name>Patrick Lauer</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">reverbrain/elliptics</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/exabgp/Manifest b/net-misc/exabgp/Manifest
index ff7e4ede165b..040025440bd8 100644
--- a/net-misc/exabgp/Manifest
+++ b/net-misc/exabgp/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST exabgp-3.2.17.tar.gz 596373 SHA256 c8bf85a4b3c3697c63af848d3fe4d88f64fe79ae12d2b8bae4abfd9d7a9fe1f9 SHA512 69dbff75caf287e9e0f6ab3707a2bbd576b0b4c8a8c318217cf88c8a1c417d47915b038bc7d64be3bbce9771caa550275703e5543fb5799afc7149dc9f054416 WHIRLPOOL 11c9a08f0289032257847448ea828e61fbcb19ba7b2e3bb4b6202ef00f22f60f636038b9f80c7d81d98ff43ee5ebc11e0b773d7ea0d70b811a863d0cb09c01da
 EBUILD exabgp-3.2.17.ebuild 548 SHA256 5ecdebf83717018162fe5afbe363d20f57773bd1db88dd855a291191ba48f30a SHA512 a5d101a95d1125a41abdf97eb40d259a6d11b60e6d4f1dfb0f701b77ddfd3355112a5065f6ac7d96941c68a440c7fff1af8ea508da4c5ef30249c6294e82bde9 WHIRLPOOL 8efced3666ee5e7ba993932a5f4924cb4657686abc1a5d06357470445312606ba1441da42eb4fd775bd6e36397c1bfb46fac8a48eaf592ba52beb64bfa7b2884
 MISC ChangeLog 421 SHA256 e06dacfbbb6b776c1b3c0bc78b05216c48c97e823c803f3727d998c38daac0dc SHA512 bc633c0ffca27c27710855daaec020370ecaeaa11e86a1863a8aee20dc648d39db64c4c72451cf835acbc60e21c51858a02b461c9398c363919fa2b919a241d3 WHIRLPOOL e0fcaec8e09f62e97043a3f5d27d965dcdb1979181693d1ac3c9df36b609f5f19ec0fc24cc3d56a15341c103e136ae8c32febae1f80deed03351bd1b868f6dce
-MISC metadata.xml 237 SHA256 88d9092fd208599a8b524cca9633d9330223e45c34a44e54b2de05edb4738ac7 SHA512 11773ab2b5adaa81f3c8f73413d2f257ea1d1624df689154ee2697412ff14ea8f9851b805c4a474b486abb0a066cfc929f91eb852a208b9536885d467df36af1 WHIRLPOOL 324b778d3103d615af41fd6d1d978beeeeb08f4823a3c81fd453464b4df2ed59b56a481ddd65b4eb740dc75b4dc69133e761199abe6d27333b1fce97d5b5a1be
+MISC metadata.xml 325 SHA256 e676c9a5fd02b840325b3403ea2679e253aa3fdb1ad30bbda753d37eada4291b SHA512 6c962b8d65ea9d8543673393deb1511b6a646afffc99fe3b41b7231fbd1ea8d562ff06f968e45102f13f11b67a7195ebb2bd8a37779a85e2fe547ae84a511c71 WHIRLPOOL 7e5eb8e34b367e275d40093ebe40005678fdab9140abcefa5067d3576d9195209ce9c79762c4531a579a586a5eebbdd28d7f7ad6714b86d6e1e8f6cf3bbada4b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlKKKuMACgkQp5vW4rUFj5qOeACbBI3l9vP1nqkiHqv7V0DRJnk6
-7lgAn3zP4e/6CCX0EibyT/r5Fx9i4UPU
-=dJRc
+iQJ8BAEBCgBmBQJVfxEOXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiJ1MQAJ/V9l7mSs0Vg4VnIpUlSnzM
++2fhb3sjwLQCmmLzI2x+oIccYl45Pe4ls9NWUJ9+qeNSc6/ufUT2Jtm9xEbwJv5z
+mWZ71f/02n5I1aiyQzIasRAVDLno9/cVSSZNwYdE9clpVK01OCrIElw4XynJzbbW
+uqQfacy9a7Ce5gsW/KzoyxxFO6dtJAhHX8S0lqFrf9kmSbL9tsPQXpXiLULkIj/b
+lWlaFmdJyGP2WZDeBs1v609lEsoJsK8m3RBv1+ZjUO4efVYxvyCfALRTqrNuKS8y
+OmTYE7C5YArivYgWmVLXbD82B36IwmJjzRZHdsPUIYTGSNTHlI5uRUGZnGCH3AFi
+IkNHX/7FcKV0K1W1Q8GveOJ39i5eojc/WclekmVRSa1xMFF3Ct653YizA4LuxJpt
+gOmkvvoMgZEzmNJ9ARkjPaK7deIz3rB4DNYsfs+OOL4z4f459XC5rnlpqrS8aW8w
+a2PN4qUUZULUR6PWU1iIisMn2JsYZG3Ag91J7FJQ9qe3IOXWF5SxmX9rbHMCXaNi
+rD+HaGWGwxt+z4KJh24dZ8LCobMoAZHEEuRGaQ1yTogs/+9FEp+DM5zvK+6Gurbk
+j+Tb84WyCOw35ObJKHtHGBNHdn2JkLjn0D6pNB9EFz36+4hTth3udcozYrvTvXiv
+PS6oItX03uSWDH0A0+kN
+=9Ezh
 -----END PGP SIGNATURE-----
diff --git a/net-misc/exabgp/metadata.xml b/net-misc/exabgp/metadata.xml
index 3ed4669f55a4..9d6cb653b38a 100644
--- a/net-misc/exabgp/metadata.xml
+++ b/net-misc/exabgp/metadata.xml
@@ -5,4 +5,7 @@
     <email>chainsaw@gentoo.org</email>
     <name>Tony Vroon</name>
   </maintainer>
+  <upstream>
+    <remote-id type="github">Exa-Networks/exabgp</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
index 75482e7f6d58..c805bb9f45cb 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX freerdp-1.1-CVE-2014-0250.patch 12976 SHA256 ea10fd71a81596b990c84771a5475de4abbda954af62d7a73d6cee38e9c05b0d SHA512 87f719670701100419483027982c045f39e2d0d0f39c58907ff508ca5a40cb01e18f9411854d3b947c9d07f5ecf32ddd6124484900801f1402396b2c847f2d71 WHIRLPOOL aef1e9233229db9437cd9817041f5a753177c25b4005b37519a66097f16b0addb64f2466d2e56595c934596f3f3fd6de6f5033109b9c234bfac9f517879f36e5
 AUX freerdp-1.1-cmake-3.1.patch 2729 SHA256 ba22b2fcc1575926c55e0dfe1d4d9b793e203c35df265f0fa353b3498c7315c5 SHA512 bf8ac5f30a3340dedc8cc664bb0fe11156dc521d2b70fdd0b1fe2e1f8f45c4419705d5e284fcfd4bccec03ddb9ffd8f571645c0bd312fd8e62e4819c43f3d8da WHIRLPOOL 684755aa9d147a8f8aa841e5ca892651dc05493cce32e886f2207c8575430f969242ea4c25ccf4f57dda8f86c5fa7de1363f3f220725b540fc7cc5202dfc9cac
@@ -19,11 +19,23 @@ EBUILD freerdp-1.2.0_beta1_pre20141115.ebuild 2711 SHA256 a049203055f1206548ee35
 EBUILD freerdp-1.2.1_pre20150326.ebuild 2708 SHA256 3cd7802bd1fe7129b2ca41e36baf0b461f7147075cf6917ef280366eb7a42eb1 SHA512 13769344bc612d56ddb194284f0f0339c01b9ccf291d7298e83480eda0d263a3b981b52b3c26edfe3c85318ab574b03f7063898b0ebec6bf7b687996fabe5b18 WHIRLPOOL a9e193f2d99b8ec0541a18c63ff42736cb860b8970ad0fc49cf670f8a335bdfaaa892e793bb45ee123a045651d0b10c2e371b3c8b53b1091418c0ad3be7755a2
 EBUILD freerdp-9999.1.ebuild 2704 SHA256 3fb8c812751f41fb22cc8b4abdadac146d5ddea57faa104ad52b555a9969e8e2 SHA512 b84913056f167f17e028f8e6db5ca919271d5804c30b97e70a5b7f92d29914255720bb5484a045921d7240f8e16d98c4acb6888e364147a88a86242c26c9cbf4 WHIRLPOOL 52a88921f1208de3e65d97c829133b4b4350e4cec4a6bd69ba4e2588b7cc341bb49c53ad95d5a93600829ae92fcef1f6732daf3d615bae4ec456da30589b9e6e
 MISC ChangeLog 15149 SHA256 6358859748cb71e549e87ee34641649a9f4ba17f78d26273a8b7ee8de424e9cb SHA512 2eb94f27e867e4f6aefdb48b368333314bf7c14da906de5de75716014639549c0d38543506b8f736153f491da2722f1c54521bb6ad0ea70ae068d8990f5c4f82 WHIRLPOOL eb4de2992770af30b2b0717602be36a32735cdb8ca924e374922f80ab34cbe61b32aaf92238793db0f9412034d16a286ef20b940fbba0226982455611d1d71a9
-MISC metadata.xml 424 SHA256 677d4fb3c378ea8ee9c4e340b7b32cf57a9f4fe9b92edddb42ddd39448f73f01 SHA512 4f1bb050f9b9889422c2e86b87dd43246b41cf45c1ce4e6c05e1c477c4a3031c20820edfd648cbc4ba2b61d2bae40883fcd5676246a0bc3fe767f5713701cf54 WHIRLPOOL d3ad68eadaf540d6200dc6a15ee3fe3597f80a64c1d2f8b7d22b23fb137422fda2edca1a8438800b31cd5d5dfd74dca23f611ad433b812f8bfe1ac0f1aa85b11
+MISC metadata.xml 508 SHA256 a5e6e91690b857974cb3f119123a8d128e4db307ae99c2a3f825aa906edfaff4 SHA512 5b33d5330f4f14bd0cb676b11ba85331e2f0b737e337d39a784d376d12709068f4b742e404bd6c5c6b89ec4768c0b87543d07db24e342249254c215d52923a41 WHIRLPOOL 6d21e8f89f2f71664f3efaa402343de17a465f7dbc64149654b8b236e82931c22968cdd42bcbc876cfa94eb0cad1a52221c3896ffbaa400137470b4d58abf39f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlV53QwACgkQkKaRLQcq0GJJKgCeP95QokFVUTuTGAUtw/L6OfD7
-rHYAmgNVzqL8rlU5VfCPpXmeja3O+gc4
-=0Qfu
+iQJ8BAEBCgBmBQJVfxEnXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiv+QP/3VoqXo6gRXWb7dq8TTj3eBi
+o7rn3NDvZKvd2csQU1PPF1TkLqrpyHCJTnnz57xB5IxFyqh+KujJ7Qi0C0/qZazr
+FL46+EEkX0QTnvRZogEjYi888JZ5IHteBbzadL52z1N6TQ2Mzrs28vQe+oLunsIq
+d+exPI203AXTC1Djl0c2EscsCeSxsiSQj5Lwb5msAbP/BTBiFZNTKdYOu6QvVebx
+iI2vACFzNY+4Oj26gKUiEEXAyDixUZ00vLvAnOZeLurRCGPDlGU+KAnvTkCNDu3t
+iujNtDqwc2QsbI6uakcHg77ySuWtM+sxM9LEJo5mJVXow959uxf2jsAvJhgc8HfV
+JGedyl2yf1/ezVNBM8tlUTlSrslGIv6GjbA41JXgRzg6bdBcXqEepEPS5yT0rrKc
+eZo+dRRUUmEdNT4BMAJ0DctPeWULjP1BjdaAb+DXJ5taedqmoLTlCCsHaPSoF1gD
+CXxr2HLiZklVTAWEq9UiXai1mbhg+xlFtF4c22Jy2A6HmV+H+dLYCcYHZZAyr8m7
+D/qtCVtVo2zvbLk6UfrpTEAWRP1nuFGM5B8B4slx7/+kip9ZOFKa2iwZJDbcJCjN
+KGnU9m7fzLDNq8KwQ44kqjBqAmJvWpAGDjGde9NvfPGFlbMZfz4U0PtLoy5o8jJF
+sFDn69vbPDdutIVhUpSP
+=ydwv
 -----END PGP SIGNATURE-----
diff --git a/net-misc/freerdp/metadata.xml b/net-misc/freerdp/metadata.xml
index 7d4083b3d4ac..cf9652841d21 100644
--- a/net-misc/freerdp/metadata.xml
+++ b/net-misc/freerdp/metadata.xml
@@ -10,4 +10,7 @@
     <flag name="client">Build client binaries</flag>
     <flag name="server">Build server binaries</flag>
   </use>
+  <upstream>
+    <remote-id type="github">FreeRDP/FreeRDP</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/net-misc/geoipupdate/Manifest b/net-misc/geoipupdate/Manifest
index b1d56c57cbdb..c2cfdf1505fe 100644
--- a/net-misc/geoipupdate/Manifest
+++ b/net-misc/geoipupdate/Manifest
@@ -1,18 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST geoipupdate-2.1.0.tar.gz 333310 SHA256 7388c46f6c483ae609e5f5333a2585bc9713d56bb522da5c11b09d41c87aa5fb SHA512 f3a16394af7ac28652282d880ba5d827db918abafc01865f451c1389da4a89fb3cadf154c184150f6f1439e564424f436fa3b0aedf392d89336eba3644db1345 WHIRLPOOL 75bc92e643ded03b05ac6a7145225b39d16cc12380fab32c3e3b21baa79b2649e81620858a4d44d60db890b770c63d51ca68b8b251719d19d715a4b7ba85f41b
 DIST geoipupdate-2.2.1.tar.gz 340884 SHA256 9547c42cc8620b2c3040fd8df95e8ee45c8b6ebcca7737d641f9526104d5f446 SHA512 5d28803353badd4d00a9174202912524f31e057ef4f5381360c16909fbccce3033f5ad7ec9c55963b70c0bbdb74589932bde36ea9b34f2a0632c504c1718dd85 WHIRLPOOL d5255654481a237175948817f88a80eb71aad4e65050e84db9c4056bd0883c4fc8b0bd2ebc8343b3ab37a7b4358dd6d4f5fae57c742711eba1156e78c5c8be38
 EBUILD geoipupdate-2.1.0.ebuild 699 SHA256 ea60d4f1b837b869f4832fb925640d55ccd10766a69bee56665aec3b10ea3c25 SHA512 54043f90bc850fe8a1753e6adfa7c9b2a2eff15d90f1ad279918ad29985d63ac18a4a9711dc852fd7544c5e9629f507e5901cf6ae49ddc2ef7933fcc5bd20a67 WHIRLPOOL c3db3014b6a613b5685eb51d4d29ecd639228d37594e8845f1934fe4324bf44791fe33c41402c26fbfec781cd6d0ab1e6ef88c5541771b4e579fc774510cb30a
 EBUILD geoipupdate-2.2.1.ebuild 703 SHA256 36c0b9be4e41788d4c22127b0c042d127675391a298b7af2ce772ab36e665f62 SHA512 1f749b2265c7a144998b7e505ec3c73782dca16596a4a70291bcaef207179241bf97ec6fcb82353df0205e562c1c415dddc7a64f675834be1a405d62b4d62973 WHIRLPOOL add9743970b2b6f5c8e4de573e374ace386354281c0a64bf512488ffc8528a58143f271e71bbd4097b47b9785e911c3f8e780005dc930e563253671c44fad0cb
 MISC ChangeLog 5567 SHA256 90a91770b27a909060c32d0ee3e1928a283a2478a545edd2a1c7ff4e7be5ba77 SHA512 8324f8fdefeaabb462e6aa35eb248fdfc5767a0d95e7b9dc31ecfc04068c2ed0a9690668fed277ce4d9a20f6b84a75493e4a3afc383905ab85cd793fdb278c63 WHIRLPOOL 98b84c860e8ad42cc79ae3974e5759fc6f0932d2fc7a9ce0e912250976455de363064c8dd6fcc68ae3364c831c94ff251cafc1a80fb01ed32e478c4670da7f03
-MISC metadata.xml 159 SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6 SHA512 2c104d2a804da0a38770b6f1ec26cd5b0a49e30392177d5794734a3f4129e82fd0971e5a8a1e48913bfaf1bab57e7bac1fe5ce4f5c618ce057aa5aaf9e59113b WHIRLPOOL 044dec64f8899582332d7fbd7612d2a7c5c7234c44bb9fc51a56f7d6400cd3066a154c3c49dd3f4b468f11e029aa24ff0097ab1387b9f322d57f1d9876afd601
+MISC metadata.xml 244 SHA256 7920612c12bd3cfbb338d67a1e90973b3333368c9fa92dbb5772bd7d1fb358fd SHA512 85d9b0ac78b4f27fce840f3a1c1e189c42cd3eec8aa3f8acacaacdb79cba320c2566cb4432e13a3dc36ed5b5469229154a1a681bf13507eff5678f903c89f2a3 WHIRLPOOL c6c424ce6ff055c374a32e462c259bded035ead98d3fb416f3765d0decd5d2eacddbd1fb2b1fb81238b067e72afc2c8c5e24b30165577286f611346522954788
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iJwEAQEIAAYFAlVrFGQACgkQG9wOWsQutdai+QP/WeXuTeUzwFAFC7df+82FDkI+
-P0V3P0isPxr10wjITnODoIX5z8KDourAvMV9atfZifqfCRsNsP09Asl24qCHLK1i
-AssqSTHW4bhuoyF2mi7ST6bNDN/tDyTzdHUlYcvlpGetSy1fuy92V3O82Mh15/Qu
-dIADdOlRMBKIvDESPy0=
-=Qd9k
+iQJ8BAEBCgBmBQJVfxE2XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiJmUP+gOXdQWOLpIkYbsesuaf4ynG
+zMxQqXKc1eA/m6PA/PB2RoRa5itScnPp8QGw9qoOa0LSrWufHluQ0q5lCbMIY7uQ
+VZTSVfjwOz6RWAbL5lFq47pyIIMmDYlrspEhxj2mtUIich1SfArRhjP4kAoRKl/p
+E+EsTqwxWXLV6M3AuwUNdyZFkCqgTD19Fcwp03MRL4RpopQviMLBfou+vQEPZy6G
+ojd6v85F8q1jstNjbP7mz98alqdiUCebLpUSTh8hj9CihTJoFxL7ASsFJbfj/+dx
+5QHU9eD8wKDxCQlYycvbXMXqDv+4N67XBnzMSqq3f0cWFRvkA9siU9ZG0f1bOw96
+N8yujhqteoJPVnpm2kh/41Qad8lKJfJpifjWvY841SLATPES0a54ZDWjhqHail3c
+joYDnH5TNebg+a8XSf58jw91MgSpZLFAxViwWXeOCWXYD6Z+LwNrZs/TI5GLqJ1l
+L9ZUbBIqmwnAlyGL/5wPEU8rqZjQN0QVqE1MZLBpFA6q8xk+k2VXD4r7sDw6a7zb
+MlySN6cmw4sXSJEpKS90LO3NxPOLu/byY4CcHYqP3/bYXMslnTPMiIo4gidHhOEt
+MO8gPhmMbWSoyNEBMYsa3vyMezYGOwfzeXyHmmp3eKU+Sw0cx5G0jTCuFjDee0K9
+S7aYcgl2B2xhC/mi7urP
+=C5Va
 -----END PGP SIGNATURE-----
diff --git a/net-misc/geoipupdate/metadata.xml b/net-misc/geoipupdate/metadata.xml
index 03aa50bab7e3..e0abfd5b2dbb 100644
--- a/net-misc/geoipupdate/metadata.xml
+++ b/net-misc/geoipupdate/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>netmon</herd>
+	<herd>netmon</herd>
+	<upstream>
+		<remote-id type="github">maxmind/geoipupdate</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/gnome-rdp/Manifest b/net-misc/gnome-rdp/Manifest
index 209233b4d110..800c989fe829 100644
--- a/net-misc/gnome-rdp/Manifest
+++ b/net-misc/gnome-rdp/Manifest
@@ -1,16 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
-DIST gnome-rdp-0.3.0.9.tar.gz 138141 RMD160 72164b776c21af03a9afb19993bf3a5c6762cf86 SHA1 bfb608b0dfe5f51a5f9f0d0cc882964482ef1358 SHA256 d5b70e42f9a7d407daf1fc76232c11e5190cfa6b1ec7f7a82a44753c13e9168d
-EBUILD gnome-rdp-0.3.0.9.ebuild 957 RMD160 17b5212989311197f3804a85a528d45ddf7f1e3a SHA1 7cea5578c8dad3a1b507fbc41b6098c4fc6fda71 SHA256 557402594680b1b21682d7bec6e2ceeb854a60dba952913e0b63cc2478d980e6
-MISC ChangeLog 1497 RMD160 6af85f9ea04841da91026cf03419be8ada314b39 SHA1 e64d50927d14378bf6e62566c8020c6e4054eeff SHA256 48c97c29ff00988fe1d3a4b59f66863d1cccf5130245fd7b3b67462bf6b2655c
-MISC metadata.xml 414 RMD160 5eb6f38e186c1d4c2b78c254e157088681912507 SHA1 92085f0d92d385e2b5795253233c4358a799d1b7 SHA256 1166aefbc4d79c7b567d39667147dda2a6bd697f9228545c7197acb9faf2f0b1
+DIST gnome-rdp-0.3.0.9.tar.gz 138141 SHA256 d5b70e42f9a7d407daf1fc76232c11e5190cfa6b1ec7f7a82a44753c13e9168d
+EBUILD gnome-rdp-0.3.0.9.ebuild 957 SHA256 557402594680b1b21682d7bec6e2ceeb854a60dba952913e0b63cc2478d980e6 SHA512 eaddeedef9aa91cd933237e37baeb300804e24158d98b137ed8224939e152b689012fc4a33719c5ebbddeaa6bc68eadea482f5ea99ca327084929c050c2954b7 WHIRLPOOL a79811fd9663de84cd18df77f4964cf81ac3f669a918f14c448857d88a43d0a1344a05a707020a791fb6777877215a7fc0bba7e22bf822a205692ffec8cf00ae
+MISC ChangeLog 1497 SHA256 48c97c29ff00988fe1d3a4b59f66863d1cccf5130245fd7b3b67462bf6b2655c SHA512 68fca11a9fd864e7951a0e257f92ab0dc17611264a269f75a3d1dc0dc28db52e8f2f3c7c3b61ecf9a62e86aab59993b355df30fcdd66290b5401d7b909c40dae WHIRLPOOL e80553097147ed1e72fa4c6d37de75bc58bd3e0ad25f27f2899b4c8a53e55da19e451939da8e8eb33cc79ff99d7732cca680351661d8447201535cefa1551d79
+MISC metadata.xml 493 SHA256 45fff73c18210a5a6af47c6a92fd200b0705f6bdffa6f77a38ea03e43fd349d4 SHA512 ed68d81b549a425a92349ec0e94d6ea8b9ad57049fa5fd9c18340e9a8140540f890f1eedaf4272c2f40effabc1111b4750fb757be6a7ccc3246612cddc6323c8 WHIRLPOOL ab9e3f5edc1a0ec8e1ed6300b6f9700d15b304d848117dd806557f0b0aea502f9216134c71c404b8b112d865f62ac6132edec8c1ccd56c4692a1ac8e924adc1e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0
 
-iJwEAQEIAAYFAk59rR8ACgkQfXuS5UK5QB1DEgP/SoPKFyZsbBb1b9tlD63hkbV0
-tLzefeFSHSSY0wdOmOsS/34l0oT7egL05Zwf/e3SwGd8CZ7LXd5OyzxkVhMu5NJq
-BIS5imB93XQJ30gFB73ZAzFFcuJd997OkDxxHNeAu6Hlb1PrJtTscIt5olX/TS/Y
-Mnr22JVi/WctybPs+6M=
-=6oTF
+iQJ8BAEBCgBmBQJVfxFCXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi0xUQAKb4PKgtI/D72RH1y5Ls00sj
+qWzkyYrmUiyLQhBe7NQkzLM59MdbDO7wCZtdUPm/x3P6+KNxOAwC4KjQeLgzCNMj
+2221ASvDevCeChXZLxdl6czWKVCbvWuEYRU6kLFrx4cmXjQO6QpJz9JLxRspygsH
+Vdf3G5SfTP+DKsVFy/GxB10PXZFx6bxf7fz2uW6pmY/WW4sK4iO81ADQP6FLEGxq
+I9ebkhajbhQjzP4PiyK06wkuC2vdNBEjP0mTJUDmqwF23jp+X9+X1kMDz4Sb/TvR
+uY7byjxbkwOsMY4PIRc6Ir05XtKIblv+HqFOXN/u6fRwqnbeMAIJiU5vcapBWFYV
+aK8u0VgwBkklRL+JzxPtajR9EhmGFXqynY3Zzb2HzO2ynt93RyEEbLZEuf9duVFY
+FhEI0YAasmbEuOuUk54p9fabVVniw6j/GGlrpjzy7/RD0fOmhmBgXZvh2p7lDUNs
+b3erY84UWQMpmUSx7MaO3adQ1ALMGOx5Le2lnw6A8/k+Ao+LwbL28wPKPZdz+n9P
+z5sQvDGa4UOxLg8sH/9mUH0n6ATdn8LH9IDlhQsSzF3NK0tpt75lYBSWlaWL3Xe5
+RB2bAbLckoqC0gOO5R5LC7/DbGo7NCmquAruTG5mwmyjOoFkJC0H9CstCnuIMvf5
+QAIZH8I+NzUlJhJtJJzh
+=MxvR
 -----END PGP SIGNATURE-----
diff --git a/net-misc/gnome-rdp/metadata.xml b/net-misc/gnome-rdp/metadata.xml
index 56e32a39eee7..4ae5dc419018 100644
--- a/net-misc/gnome-rdp/metadata.xml
+++ b/net-misc/gnome-rdp/metadata.xml
@@ -6,4 +6,7 @@
 		<name>Bernard Cafarelli</name>
 	</maintainer>
 	<longdescription>Mono Remote Desktop Client for the GNOME Desktop. Supported protocols: RDP, VNC, SSH. Configured sessions can be saved to the built in list</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">gnome-rdp</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/gns3-converter/Manifest b/net-misc/gns3-converter/Manifest
index 2e1beecd52af..c7b76f21af38 100644
--- a/net-misc/gns3-converter/Manifest
+++ b/net-misc/gns3-converter/Manifest
@@ -4,23 +4,23 @@ Hash: SHA512
 DIST gns3-converter-1.2.3.tar.gz 32962 SHA256 9257464a112aaca345b2eaec7001ea723f319f9792a8a313cacb94fe7e10a7e9 SHA512 830ddc041d3e159688325b00524feb085c5a7de6af55fb9c6f507013dc0e64e79938cc3f003fc22435c458ced1f682d2b3c58221afa9ede9f5ac24b097e37da2 WHIRLPOOL f781c513e4cd8591c313ae7d36c267360d188525a26fd33e8ef7d5a51e81f7fadd70657e5abbb288a6c32789fce97e55ccf5b7d559eed474d1c45b9b325a207e
 EBUILD gns3-converter-1.2.3.ebuild 615 SHA256 cf64de54c23c2b1ae41aedcecbda25b3251c2997c198fc57563057bc0ac8649c SHA512 e6f5971f3f7483c4ebeaeef534ebd35f7c282743538932d9be5d0a871c7df906aceb655a819f59f193290ba18e80f1d09c0629963040dd9aea63e1873efdd810 WHIRLPOOL c531839e7637e9665bf5efaba7141d4d4ef1bd07ec22a56bfff308030d74461469a78c81a8252d532398c7c2a1d42ba305e5554afc70e5bd8a1c08331fb77d28
 MISC ChangeLog 1035 SHA256 b4060b693cc9b8fcdb7b0ef93e4a795153ebd0e7b138fae39d5474bb6c5e3e32 SHA512 5d146bb8184e17c30b42624763e1ef9f34e502ef38fcac3ba7e3b138c8ee0f90b8a70c6e5bf792e1b943086ee33cded3a970ebb79dbb0807a920bcf15c20cef2 WHIRLPOOL 73bbbf1b8b4a0d231f84aecc6f29b3ab467c3638c389f7d03d7a7f996b01410248b3dca6fc7d69fd6fc2d53bd20c9438a3b14662b9eb75f3b7a06c63bd0e1d8c
-MISC metadata.xml 316 SHA256 7689fdb0c760fe33fafd6216eaff7399e1c1f23fa8d9e92c68c9435d086c80ff SHA512 9ddd6576ec6250294167c1f086315472648354e390a3f57a73f5bf7986847a7ac0bd0d7c7f4d38354a278a6f86fbd669c769e4ac6ec1549420f346256582664c WHIRLPOOL ef28caf930bdff8933aa0c6bd7cc2b0e6caf500c6a5d14d882d65fbbf1fd4eb70f6e8e490d85b1c1baeb5c2c1b4cfe0fe687167fcf2ebd5ed938d096204d8dc3
+MISC metadata.xml 381 SHA256 3d4a742e56d51f391a917152e38562222a19c602256dde34e12b28698c724f67 SHA512 498534a1a507ad9e30df3eb5d11a65eba19c629bf800a92cdc305b0b88bbc775701073997b1439fc9b20b8d9f3b33a4a902da23ec179d0f65301e2fec656fe5f WHIRLPOOL 93989f79ffccde6eb132df6a6e28eec7d4441d0b6e32b805722108e0ce622ebf6db5d1a4c781fb0187a80cdc494c1ab4f15b90452104ffafad232f1ce09bfe62
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVcCu7XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVfxFLXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi89IP/3dTejYXmiVVQKmIq9TYKGbl
-zyFmSFkmX4eIoCJnh3zN4rKkq8p5e/r91JOnefKJFuFuvXIERp9j5ZbBpbCZA6jr
-Hnnw31vkrcjtl6hAmAzaBAwFsok/5uSJrKB5XQXlZAE7IvdYIYdFHcGHeijGdhax
-4btuutl9vPtev5WiaDa3bX8p6mLx+uucXh2Nmnxp/fhm00UBFFhHfDVxOms6u7rm
-ucvkor57LuybPY2it3kyBAYt6DxRTaeBeDOGYU5FQp6ufhImg4wzNS9iTLsGKm5z
-DsGrbi7dA9QFwmzEOBvcBlZMGe5Cxwg+csRC6UOeBl49tuZvzpaAKEcOdrw5ObEc
-spdJLGT5KkkanNxCTJUjpQhfWTbIsNLwN+B1HyUi9LazV8XZcIrnscpYpV4KVupP
-UmR77GbJPy5LOGRwtTEhMZovLD+8NGdf1p1r1TFP+qZz+w4Q9DEA1uQQuf2ZXAqX
-3QfaZZQpCHY4b48xgDV505LDV3qTAM3nCsMsHLkJopr19jIBNuKwr6Q0EUsedVWA
-L1bHzWQMoYwHAggDcWjsHsZFM2fXGAZ2yd0lXpm/guuj4SOUQsW7AVMqQQgZ+IPi
-t0iNDkvY3i2wn0H/xB0jTOrmpWxEiLbF9TMjQhl59gnyovv7LCNGb7UYQ/vNK0Dp
-PLl4+R8qrncMDA/tiCO0
-=tREa
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmibzoP/i8FLWX2UWKUkMvAKr/P0Sau
+Z9CI0KpoFCH4bnHQkGJkuM9jlJuA/4VIejFIswi7jhhdlLtMTfaGXIz0DxtylLV1
+G2Gz3cJU6uOibFXVwcQawsN0HLid9ygMYr0oZogo7lxPICtlZPuQnPLOPcW5eWOO
+XpzBC5CUg7fcw4ydF7kPmEhFmDkO9b78KDQPK0hnMlhmZLis0Fr765ztOuPSaxnq
+xb3JJQZ6eCtHhSMD9bqgyib/k0jhZrWVT6qcAsAvvT9kaV2Ok90NkgbeNA6ZTLTe
+/hvgToHhu3OqvS+Db86LHEh9+XFn2HFw7hfoNYgHRYljDEjGHc71gN7ywkDlaoSC
+nKNgepA1LtClwX6Yw/Ux7QNL7wM9EDfeZ5QgwYkYGXWq5pO2Ho4zuno9RJVQ8ZAf
+Z8VhfBuhinOqMINRSSuym148/OT8BUJhtS4YLABgeotictLIfOJSkKGatc5jaeoA
+mJn0ImzFwMarunH72/+jyEWs5iOw7tF6t6DmBAtPKIorD1TrwabnXqPRMvxW3AJd
+8jaS9fmMh0BQv7zgl1YJFBxeeM3S43/zjBCZ75LAXLE5Gp+Mc2SYj0DZcPaOgAYy
+5IXHJya2f4NspcjzKjkX/CPUjM8E6moZz4K73VNpyFA8mzh/waVz5SwPQBqxXGua
+W+ehf489epfJfDzomAXw
+=NYvT
 -----END PGP SIGNATURE-----
diff --git a/net-misc/gns3-converter/metadata.xml b/net-misc/gns3-converter/metadata.xml
index a408b6c3f519..1ea66e6f8ebb 100644
--- a/net-misc/gns3-converter/metadata.xml
+++ b/net-misc/gns3-converter/metadata.xml
@@ -7,5 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="pypi">gns3-converter</remote-id>
+    <remote-id type="github">dlintott/gns3-converter</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/net-misc/gns3-gui/Manifest b/net-misc/gns3-gui/Manifest
index 1e43ca63538f..15dd1c0869b0 100644
--- a/net-misc/gns3-gui/Manifest
+++ b/net-misc/gns3-gui/Manifest
@@ -1,26 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST gns3-gui-1.3.2.tar.gz 6556874 SHA256 5aafebe28ba57820288a24c3b62d52af2919b9d1ec8c8843cff3d4e0f672cce7 SHA512 ddb32e9cb77513cec027f1642755d31ec1d7ae99424f441dc6470120213b42c694993dac44a4580c537ad296d7d0d7f7013ea4c2a3b780c7f1a0404796eb6ce0 WHIRLPOOL e0ce6c12be54a52a7aa1dd3ea5c94ebbc7e77639c0bfc20667ded0b5f8127806bafe3836e287dbc4375c3139814c755fa92ae9d367f5fda06d744dc105094aab
 DIST gns3-gui-1.3.3.tar.gz 6559207 SHA256 58d148a7a1c01ea8b9722524d0f9c2997b3f84a0baae64074e5ab65823ad717d SHA512 421470f77271a861d665429c1ffd16a9bcea595edd2e1596b5b0f40645f96cd5213c59219fbb2c74f627ba34f16535bf37d02d23dac115b994903c92452c3e98 WHIRLPOOL ccc98ebc763934283bdee45d51758661a9fea0bed62eb33750e2303b2871715890b23379169a805a4d03d4374841ecfa5c15a57197fc4fe80140391e6da395cc
 EBUILD gns3-gui-1.3.2.ebuild 1364 SHA256 69757b41d19d582ca91ca1d1efcb19b43370bd4ce07c8b8539283f92721ff7dd SHA512 470a2aa45cdc7c725bf4fcf8e5a5a48970fe63627c57c8b673c790004d732d85bbe6d5bbd104a63b04770d7a603f9e94ddd200a84c0e3b9015e9917c98e77839 WHIRLPOOL 9e1b8f27278a9c41b72674776bb17e3e73b2af254e49812fb240a813a97e4f38c6eefa6574a8d25614fd0cdff0aad46f133612cd1b265c26a2f568bc1fcc8fb4
 EBUILD gns3-gui-1.3.3.ebuild 1208 SHA256 2c9eb06146a03c2344ecd099f0da4d7d147a4c40b9f19dc7074f576d9ee40112 SHA512 feadb6c7f02a1981844b734cd8fc46fd79db2e28f46c70ecd71969a96823af7eb24999977b2ec28e9594eebb9bd4aa8f4f0027e5b939c971b42bbac87d415d41 WHIRLPOOL f09ca811522e57e1939d4f77e75c7705e9229e6be97dbf61a662c59839f332a1fed41f4181537b9a82e38429407993f304009dea56e56302134a1296a49092a1
 MISC ChangeLog 2034 SHA256 d011044acae838fa36220890e3e0c443e0c9cca46ff7276afacc458ccaf9ca5b SHA512 0940c7caac70bb815b75cdd09ad069ba31e949cc6533d652e708bce7343b970fb9d5e97c9c2338dc6d031eab2c9024257e32b0d1e8017e5e94014b9cbc188d7e WHIRLPOOL ba87271014843f996fbc5e23ec389c38c580f3af2468bcc5a970b134e5d8ce294797dbc52096ceb64c46604dbe0e4a6714e17f64cd2095dbe9324529ebe3645d
-MISC metadata.xml 229 SHA256 0e32bd4374eb7ddef5d9d3feb500bfd626eae6f88edfe43ac3847e65dde78281 SHA512 8a66f8c117584e3d9b891c2813466691397dbd50388956981eabf86c7720a15b57bc4584f704211faef0044500106802d3ef1bed1592145cf3f8b5259279a43f WHIRLPOOL dfa20fb61d9b2ebb6e4e35f24bfb2e584706440d30fef2e82c463f5ef75df66d5ba809f0126f95c908a59627c59ec1971f015e5d281efe121061b7b09137c883
+MISC metadata.xml 307 SHA256 f56fbb5a622eb503ac79cdb59dfe8e56adfa3e87edf8f571a1436e32c3df68c9 SHA512 69682d7aa51cf7bfa319191901437b1415817118fbce5f953130975468ea79353a6ed86966fd48d8dec36700f5cd45490fe6fc42b75a06a07a64647d5afba15d WHIRLPOOL cf86808ef11cb6ad5ec5c8245b026e7da3d4e7774a68f2c46b49af003114d7ca4b373fc3cb865609279bd372d73d07c2e99a64efe5c622d654132c1778f0ebc4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJVXGxdAAoJENXWzZRV2HNsAEcQALxd47EV+HF+S7Q1t2+2IGP7
-Cw+8pdhfIacs83BxblByrTrBVyaFLZxCXMiezaitMidAOycVxRWh1lP+QSwwysPu
-puuxiTpnlpMA6GT35eLwsV8+9hdUPwMRqa0rmgqXRLqvwv2eTDDpLr7JDOyDceA4
-JUqIGELqSB7DBbsBAHSZUjs5wKmS2HbmWqZR5FJPsj7F7fYSlchmXEA7TRI7eFPt
-kgmL1xQFDwxgP+xN6IKaLARO5n/swhTAHv1LmByBaoE42JNBrJfCodm7KDoqtbcc
-ZqvdU4dWskdWXPVAGPdq+WmXda0VsSG6GdztE1XJWKmFWSDT4lLY6ecxBwXuzmxw
-MoXvSEpFmGVloAkayKprTn7OsUgckvSMDBmrAr8ELLZHJWS8Pk86rmcEslxiTI4B
-BJy1JnutJ62RPqWCHcCTknOSYrbKzxFj45DvBJQrDkh+oz6Ae4kZZ3CL/YqkvXVS
-eOdEXX3etS8VJvn3Ohv6n1zI9OCCUjH2tIkAqpksSfDoLk7D34cTOiNH5HZ6MgBh
-ToZm5R09hrboIDV8nkh2+47NeokfNzsZEBjgccmx+3b9DIo/0sxpR45VR6GGbE/z
-SKB62J/OD4mBQU/jtD8TyRX2/EJWe+cxWRg1QNxhC8RJKo9tWFoOWx4Tz1SrOdg2
-gSSDk9O444cy3cTna98Q
-=ceUK
+iQJ8BAEBCgBmBQJVfxFVXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi5R8QAK0OZLzzvfes8Tbwy764wIoF
+atmGwRQNigalzMAHw3xOXV9B+QSY2I74awWWRoi3RD4Lt0xl8AGqTuq4iCoJCuNw
+/diE2C/WcFoMhMUOq2j1tk5V5lKkGKdPrcTa8OJVt6nqgH/f0kNZerfbGJEVxKq1
+p52O8FCM/JoA1rk6LG1vEjbyVVB2aKoe1/PIeIAFMlo/1jSB+2fVRp6XLZnmMU6v
+AobBnlg9336oY02wxDJXLKz4nIzoDSzR944fVMUObiaP/u2V594H7UKxApbReRhZ
+jtvQ4of29Ap19Sq+7OK6tII8bA3gbX5F4ftfZHmHADqvszYLR6/18n818G2aSwVr
+PrKCI1wJk0C7Q0iQdrhipd1caR8TJzmqqInwa6euSCSYIGHcoqu+tJejjaZkYMOW
+F8PksCW2l8Eaw65dfcIb9BWf04BSVzlZaiT43c7079Oa4C+K+09NVicw7IW4abpg
+eNkaVrUjhTSSUsgIKXiVQ4fwlx86keX8/AKxqbHokB3xPpHBwYu7EhHb+Pq0lnp2
++YNkmkbxPrfq2NrQmZ8ETz2W4c5yX0ti6/FMeg8j8cLD6a+0/lNpKuxv1PgBSSPj
+drj/+8WBoe+rlLGdWkzoLKwLjgqg0d5nLvAWALHuuuLtQG1RoVuJMd7KuM8jsvTq
+1Gcr7so5s+j1RQ7gkOjy
+=mqvW
 -----END PGP SIGNATURE-----
diff --git a/net-misc/gns3-gui/metadata.xml b/net-misc/gns3-gui/metadata.xml
index 7516f758690a..5d17ca27e775 100644
--- a/net-misc/gns3-gui/metadata.xml
+++ b/net-misc/gns3-gui/metadata.xml
@@ -5,4 +5,7 @@
 		<email>bman@gentoo.org</email>
 		<name>Aaron Bauman</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">GNS3/gns3-gui</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/gns3-server/Manifest b/net-misc/gns3-server/Manifest
index fba022593dba..8e758564a5b8 100644
--- a/net-misc/gns3-server/Manifest
+++ b/net-misc/gns3-server/Manifest
@@ -1,26 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST gns3-server-1.3.2.tar.gz 173570 SHA256 771dafcc9f437dd20c09cde9fbde63e301b6f263925de9abf186727a721123f8 SHA512 6913e50fadaa0b8cc814e1907c5c5d6d7c90aa1e75cdbcb74c7b6f69fdabf61c5baab856fe741241749840df17e8b7d9d502da1406b0806777fb922c4ac82928 WHIRLPOOL e35e7bff085018a391c97fe35180ed1419472f914c169deaa288cd98146bdcd82d9b8acd97db5fc7ea4f5b60e24dab9ae1a67314bfbaa5120ebacbaa978cabde
 DIST gns3-server-1.3.3.tar.gz 175790 SHA256 b2f493a4db42d6170dddd8f5baee1c075e3c5cae803b405bfbf2d2e1b0e56f65 SHA512 11af84864bc40a83af9b7a63abd3e2eaf5f6197755e49b3b1284cf7cf71bf0e3963d5e96a7f2410bc3b89087812069cabbc5c7653c5534463518d26250512d6c WHIRLPOOL 71a3cfea286cc5e657a464617609eca63dab119cceb56aaf99c45dca33300fa7570cd025e4f9717e36aec310b66bec4d41b2da5327a7e17807eab02c942efd76
 EBUILD gns3-server-1.3.2.ebuild 1579 SHA256 3c88e29f250133317a13c9ac019816613bbbfd1eade636b3f27298ba88948286 SHA512 9be7246e2dd45aac93d8225385687a1e13549c463a86347ac927ea7012ddd0f37375cfc44f4c888c063b7d84b25f2423983623c29bf3d237571f76e0571e9003 WHIRLPOOL ef02053f95168574f4b0391e9bdcd7843ad5c3f109c7d89f613cc4016328561888cb0e639e15cdec4f655bccef6f263e89f6529ee0de56f6d45fa7754f047ba9
 EBUILD gns3-server-1.3.3.ebuild 1379 SHA256 6ad9b047d6e7f6b5cbd2b58f5eeabeb9d98470dc2101ca083223d9d2716bdf22 SHA512 667ace4a0a90932eaeab850dde7acf5ae60df9c1422f9764c35d29957dbea22ea9e595f38edee7f2bf5e14dd7651b904eccc10fb51cbbfcbd008b987b7b18e9f WHIRLPOOL f766dfa9a4782670a293d43592cc2a8e896ae8fa4739af6ed7c6f2e2ea31c60d1dd8a7829846f7ed536ed1586841fcaa2ed008d1bbaf291ec3d6f9caeafb8a65
 MISC ChangeLog 1677 SHA256 be354caad1517ef6043426c755b3a2913419f21af3684a3897f9416b9f382cf3 SHA512 75b4cb38f31d3af199db662be124838980cf5e77224e809672b12dd5bdc83872b718c4e8800f274c05285155e22112dc73929ce3bb5b63c9739a48dfa3331707 WHIRLPOOL a1a54309236c9503d7e5ae06a1bb955015094b76e89d43d21344ba468ffc42fa13488020b1cd18d213b39c18b050ac24c848e501dc2e6b0116fdab4b7bf1b542
-MISC metadata.xml 229 SHA256 0e32bd4374eb7ddef5d9d3feb500bfd626eae6f88edfe43ac3847e65dde78281 SHA512 8a66f8c117584e3d9b891c2813466691397dbd50388956981eabf86c7720a15b57bc4584f704211faef0044500106802d3ef1bed1592145cf3f8b5259279a43f WHIRLPOOL dfa20fb61d9b2ebb6e4e35f24bfb2e584706440d30fef2e82c463f5ef75df66d5ba809f0126f95c908a59627c59ec1971f015e5d281efe121061b7b09137c883
+MISC metadata.xml 310 SHA256 f57792f3d98048487f212103cb53ab32c504f31260d32155511e51497c459b8f SHA512 b69253008d56dd32b4aa797c866f83918445da3b392e67e885055f160416668ac641e6cc2e6f9d77d8b76f8f51edfdd2749f998b26b67f63b14e251f40a3e5d7 WHIRLPOOL d76a8e3e7d6f4562d2707e8596853a2a0f9aa41d01e51576e002624feb0eb3a687f731e0168f81cd2f2263382c173f139296517ddcd85ca6221af946798f7d3f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJVXGsaAAoJENXWzZRV2HNsV+cP/jbR9XSW6Js3mxCQc3Q2XqAS
-7fcO5GhMW++1v/8iPQbQub2PCadfc0+EEIW6OpY0I8sDzw0Oa+1HiH3q1MaoOM+J
-f+TztJ6JQ49uThOlds0FTRnaxw1jo325hLgf0pcPHMaHfs6i3GZz45tCKbxL6YeR
-CQL3BxT2x7nso7mP110hQ4FqI660lBYSCLj6TDS1UnJV6asbkSGKfL1+tD2sO7h1
-7MY/3C6jbX9roxbw4gxKL4jNKnvp/YIem0GEyhQ4XEGCh0qMDiVq5aVy08IZKt1j
-2JjrGc/o04d3xajmPNI4/fPyDVOn4Oj6ttEVh5TPoDUkyT+cza4wdWXZwtAkVXBH
-jl8q+oX5fJ7ky+BwFnzOjiQpvSofyTglvTGZcHOdMJuEWkwSfNRqipijYxgcnzPw
-yKg5tp+9hAlTELsYxHx/FLtIVaoQL6/lawfR1pY7kKdHZp4sTenLa2dpDwLCtcz+
-r6kzeXWmJe9B2fi/acN4pHdEHEh1w30ctWRzWxXY5c+SiVfM3wJHn26WGi6/d5U2
-dTJpE+Vcq6oZRfdOg1VWV4HQh7Lg80KFiVB2VF0pknBTG8PGgpPPGRSyb3tOVX8O
-sMSZY+JeyXZtj/wlpMCBHbYTRyEw1bWCc+FAHBonxfDI9SfPyHqOVtYnpDVqyEiw
-83WIUVnZPJgqmdHEM+da
-=daHq
+iQJ8BAEBCgBmBQJVfxFpXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi49oP/0l6/UVwtEMcVwRJ8K/xxg6Y
+Eiv1Pt/RtxPglBJZrR3rc3fpTqG0uMFWlF4Ni6v88F4NWN8ztTvAQpzdQ/vjB+S6
+l6ilJrcM90nsqaJ4CQanUnV6gYpGByLntwiiCvypgaAW2KEZ8ZMvKS14+qy0FeFo
+Cp/BxgQm+5ycf76PeVCTK3Mqm90+Rovir5At0cq0KN8ihSO+eZWAmJsk6ZwSDCEW
+cJ6TTR+EH2CnNcd/tU3tmrxt9mdycxJtqOzb+zmBd5a2LdHIHiD0d+MiOF7h+5dd
+9K4VCkxuIL9iWmRkTTrI/FA0YaBKnWNZtyuXgch9gbDR7W+mTjohjY3buTiIlPU4
+E2JVCj0m6Hbgy5S19+YLb2xDsLR5WViCsN3p5qYjUMDtAR3bPhZqEgcuupYJJ8J/
+oGpxREA26zbcA1H1GwQCDLKDB5hxaYZagWWgfSYga+Q2R45eCi5Q8JqhaKvg7Wkk
+JiLEZd9zxOgcZadzTdb5Cz8B1Pt82xRbbFPekBLjYGNb84gSYSj/AeoWXIvu/cUK
+WPRlS+9Tf24VJOZ8M6/V5qG+JbmQl2t94SZl8cYOwhSmQ9EmAemwy5TMglGpD5k8
+sHsfoYfrAyxc8icvOEtIqct0O5UYDeFwXQjmJBzaroDxe/jpZrVsjRm5sgu1lAt7
+fKIN7e7IJyQuT3ywzJKs
+=ttAX
 -----END PGP SIGNATURE-----
diff --git a/net-misc/gns3-server/metadata.xml b/net-misc/gns3-server/metadata.xml
index 7516f758690a..6553eda3e508 100644
--- a/net-misc/gns3-server/metadata.xml
+++ b/net-misc/gns3-server/metadata.xml
@@ -5,4 +5,7 @@
 		<email>bman@gentoo.org</email>
 		<name>Aaron Bauman</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">GNS3/gns3-server</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/gofish/Manifest b/net-misc/gofish/Manifest
index 60fa774ac590..ed6f3ea5ece8 100644
--- a/net-misc/gofish/Manifest
+++ b/net-misc/gofish/Manifest
@@ -1,6 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX gofish.confd 429 SHA256 426e7a16f269693c592563646ff2387eb2b33d593e6c5f430c6b1fe738c9b807 SHA512 3a3fc8a701149195d6a18aa38cf22030415fcaf1e72bb9603175345d639a055e7b13130d4a2ef3308eaf946ed4d0c8d21378f8793e344d2baf6dc4c9ad0b7db6 WHIRLPOOL 547eb21ba3ed189f3394abc9208ecc6c6db72268ff7676b329a44cb43742f9e208f5184311bfd66bf1d3e94fdddba48dfa32f26a1168f8c2ca4a509e65e49ac9
 AUX gofish.rc 606 SHA256 baed011ff50966f9c41e89a90e8011ebf3f9a8bef89cb7a04d383317cf3a858e SHA512 c6a409dfd086b586204c1b90d05d1780137f217108daa3797073e549b9fcd95300b601f9bb505a39049f993720f4cd71416b889d8811ac70372d901b241a538e WHIRLPOOL d45f94809626c36a854f36fb873f10835b7eebc3567e7e06aaddca2ed477580f251f3c13e1c027923e4b4484941789630c937314766f7e86c4eda8545ad7b55c
 DIST gofish-1.2.tar.gz 212596 SHA256 1ab8390ec9b3373a298eee564c8b10b3527b22f86f044c9427d32065e9b6252f
 EBUILD gofish-1.2.ebuild 845 SHA256 276e662cf4930f476d2a44de05c4e3bf6e3fb9789c7ed79f1cb550c3f5a75621 SHA512 8c51fad13699b303dc15e34ffd505dda44e6490346290c5968b7d5e87830141f8e6d52beb16ba937640989a019722cafcf7d699fce2298340286dea2962acc39 WHIRLPOOL 3245e07fceaa4899080b2435bb645bc6c46c6b46c8e72dc8693cad84f1c2c4130d42882cf663320c45c7150ace19dc4bf0eb01286a376f87d293b4711496978c
 MISC ChangeLog 3056 SHA256 32d77508283de06808e301919c437d2728467ec2ffdac506100ef1a80c31682b SHA512 954813cc6921ae557261fdd6b5b6205de9887da8f0aef4d1ae13af7a5462bc2dfb5ffafe948f3ad4a762f0a65bc05f7620faa0ef5d03de9ee545dfbc2de429cc WHIRLPOOL cf4cdd457f5dceb81835c3461c730abdfb63c88dc66e91da4b12006436d25a3ac0a3159af278b9a65f3f5b64e04223472a596998e07ba9da459ff04d7978a37f
-MISC metadata.xml 225 SHA256 4fe82023835a361f6a28b205c212aacfbf277f63806275b5de2d07d2cfe83fb3 SHA512 6a395905dddad2d0a0c0c8b9b790d59ef752058476513bb14152a946551c7e7d77bafc3b17f53fb0ec2e416cad5f58ce754e29796dceaafb5b486397f14bd6c9 WHIRLPOOL 53af3713dd0f11fc8fc10167b0e2200b42e7b201c2fa733cb0ef29225366af0bfc98758430f806ad19f6c1b53888fc5e295dfd9c44e2564fdca9a1e23c5186e0
+MISC metadata.xml 305 SHA256 b65e374c99313c875f7c7c968ba8989ba9e789cff64acb1dd203dba75e9cb597 SHA512 f0582fbfb525972e9cdb6268b9e709d31e9a784370c07459412c75f4e820c4262b2bf44377432a2346af8583382744494a4990cc0caa8455425aa8703ff0ef50 WHIRLPOOL 7692c002fbcf30cf70ab1fc47235f93490159583768f119bc89d35e3ba9150a2b7b4acd168ce50f9abc953f18bb1c10bd8502853b737137dcffd9a32f6232134
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVfxF0XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmirxsP/3whCfJJv36GxrCnL+mkOtUn
+/R9RJKlExZV4ldCQ2oriqIFYAZpq0z6900ngh8/yZv6bEGvs6tCtaVJU2tKeY9oV
+I+PGHGM1D03iLzKDFWUTI3lvoWxJPE11XqinLHDcCM8hQ4lPbiC8jzZIRLuh+LkX
+dUjBT4hs44eIN3xPggGuq0NvY+522Ji8rN2txD++u+tYXlTgXTD4z6OfQvxz+fr6
+V2F7IYCfOisKjekFTWdZ/Q+0v+dURCjUBOj1ZmCgjPZ9cuVdBlc1TLNZyOlWf2bt
+c5OF/W9i5yoIQ8K3rrSBENvPyDuixLk8Skjjfeqp6f6F8TCO3n0eEqXPb5bQgSpk
+tcUml6tzerORWKTFf6cKuzT0MJJA2giwtpYQTTuMt+lxHtMAwEmFhpZ6vX92gbYA
+8cDbXbs8YPmxyN7NJwqfoHkfKrpNOBeQHw4o2ZOqVoQWaTNvMSDCZ9VTDIY8tKl8
+xVfe6AlPtCTc/1jrgFomxmHS0DJOrGgJKF9wHtiA0lYEqIfTTjYgsT7uFtpAYq6g
+OTa4JFEXaa2Z2kljhUluY0YVCP1QBEcH1QM3caVD6tNhE8Ml5qJilBeCtaVZsd+t
+eIbDh1ERGOPJJvCbihkt2QPRbTtsCKANofa8dMKheXQecOiZkhyaF1crXpmSVXOm
+ptzf9rSB5lNCY/cyBzy7
+=Nyqk
+-----END PGP SIGNATURE-----
diff --git a/net-misc/gofish/metadata.xml b/net-misc/gofish/metadata.xml
index 0f350e3d4d81..bcf19edfcbef 100644
--- a/net-misc/gofish/metadata.xml
+++ b/net-misc/gofish/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>xmw@gentoo.org</email>
-	<name>Michael Weber</name>
-</maintainer>
+	<maintainer>
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">gofish</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/gsutil/Manifest b/net-misc/gsutil/Manifest
index 57c3d8bd615b..9f8c55c85401 100644
--- a/net-misc/gsutil/Manifest
+++ b/net-misc/gsutil/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX dummy.boto 128 SHA256 9ccaaa014a58a8fcf456241d0664bf62604d022e87429bf2ace67b3d3b2dd5c7 SHA512 9e420dde9d7e8e9fe2513529fd2681994763e8b9069ae9911c56a3ee72d77e40a8e5c8b0e7c006fe5c336ccb78935d908b20bd1bd275dded317a0c5d2b7bc97d WHIRLPOOL 67dcf175e872fa47b787a290444a9d1e9847c607bdc4cd4f29053ceece9149a4aabe2a0d313f6aff9cad7765312301acd8156401ebf2f14afdcc10232f63ec5c
 AUX gsutil-3.37-drop-http_proxy-clearing.patch 1144 SHA256 148697e311fb2b11ddcc1caf9e05f3b63e26d2e33603cee1f67f5fb8792177c9 SHA512 30a1a3c2a858941201a0f0cf435cff6f9bfa22e3439e62913ed4f999fcca077c35ae7c2a0fcd90ed988d686f38d0df0fd021ba103bfa99a5931ba9dbe4a0e480 WHIRLPOOL 7a79fb91867480f41f061cc2e6f351c8592db256b45282f98ac77b3301d176c6457e975979c8d3d2c491ef62c320d8b0199329d9ef26a013e80b365b2c96a2d3
@@ -39,21 +39,23 @@ EBUILD gsutil-4.6.ebuild 1384 SHA256 d259d6570bae3465732732083ddc5ddd72164a73885
 EBUILD gsutil-4.7.ebuild 1415 SHA256 2b81fe06fdb90ccae07273ba25919f2c268c86be01bd2a68f9544f38e7d9f405 SHA512 bf841e447ff7a361db9d90652a52407312e4dde7404950049925b63f9e8ee18fc5179cdf791e76390e0627d454bb0d5ec3912624b77e74da4243342c4e370ea1 WHIRLPOOL 2735bf9dcd75ddf51e6f22a6cf44e145adc51bdc76c639bd9ff3c664ec055067a1e16cc49d002a1c4ad608d6d7f5242ba7017c369a6984d3d809babb5a0f567b
 EBUILD gsutil-4.8.ebuild 1359 SHA256 c0c33b2fb36a5b7e03c739aba8c393c0a649b8dd5c6251c24ef2e88c9771c2d5 SHA512 fc26c5b8178e56e69bfae815f88e0942e28c01f480f6c61c03e09d94ca7df659562fb584ea1f7af71f4905ae62108afdf323f81c361b6a226b525656d70f8b4e WHIRLPOOL b09e11873a1b7dbbef9203055264b48f63a13cba7c4ba8a6d59ebd9baf50f6503ff9a50cdc05f6fe4dd7a25220580becb108ed3287b50659cd3a1e44f35f10e0
 MISC ChangeLog 3375 SHA256 81d1c786013ffeeea863d00fd0e5696d9106ff36c869d45fec3fd999af329bd5 SHA512 0578cba4c835f5c2b5c550b7fb01b43849e588f8bcb15a5cd0d1f536fa8211cbbfc86f4ec9fab2431f5bedef07a26de25ccea63ffe747bd7c34d6063a8db768e WHIRLPOOL b068b4680e6d873709849c3589f11c3009620c58367ce10c67b7c72d5f4b298962640bb58c28fc047cce1d3d726bbe2df1a4da327f55d60d5f3970415cd0f218
-MISC metadata.xml 279 SHA256 2f5ae61fef1327d85bd4b0fa86038ee21e3874a6e7fbfef8f293868aff24e414 SHA512 99e70099183392c5d73cd994c35ac73b958dae2f542e43b9da84c12528161f6a44b043be24a8f1541f8080a4f49a9215f9fc8e5076718d7cd0d0ed4e531872da WHIRLPOOL 39bc89a7f235cb2f5c10f77a0decb0c45cc5bd322202f50100c19e84db22fe99610c3f858bf995e6a6b26ec2f238c2873981eab24c1f9086c04c439eae55d8ab
+MISC metadata.xml 345 SHA256 e13b960e6007eb964f67fb11da4cff4fa194b5a5293240938df80f61fef5d6c3 SHA512 d80f88d2c3da836e7ec52cdf2030bda5ebea6b0a3a9689c846144d77308e77117b364f0dbc65c1801e080d38cd23e8db21048b4c5daecae0d2fbaab3746fbd24 WHIRLPOOL 380f50ce318f2e752b1b7ef2052bafdc85165e8955c8d5b61d4722ecc5895b1f267c5649bfaa0290731747bacc28791f8d9be706a42d2aa8479fd9c74600d2d3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJVXGZVAAoJEPGu1DbS6WIAGJcQAISxRgNstqOdFSvn1Kne+CzH
-1iIAgsri8TUZvwbO9CfXV221anuKvRkASAX/FWVbND2BuR228Kd2gsHQYkLXTREw
-T7yf60Rk8jrDIOKcAHsI6g10ztEr28xNwNJPAmbcZCdDOgYQWuaWQOot7Z2LMtw3
-7fJiDinM25iBKBVyFvhwZ2gtLqdr0j+uNOS4PrbrCsn5PM/hkWmFTDejDTIgADqN
-BqUanvYV9lUatOsSQua5yEvWBgK+Kur25C8shJZBqvLmGdDNeyq8dNAD9oKFsUTz
-XYur4KyvMWSl6FKLLCefy36K4JQ7Qr4Y5znx9NYLi2A2QdC1UrqM2yilK7wTkZTK
-d6qP1vjmYXK5ruV2yxNn7mdvrXOU2I04EtHQ67/6cgS174/7PsoLFb8j0Y75Anot
-k4W1z7KXMkpHOA5iP0WPEWa4jwSQqQThVa3NcvbYORF1IH0L/f6Emfk37nBZkuov
-/C7tTV2bxyKhQKkOz9QYtoGXrNY1ZSyC3wJcck3aXpc/lVV/qXkz+nSsiRDlZQzo
-PjtwK2mTeLC033WWByzEhOVuvFnxDAOxFhP+DWwU/HhQOWYfyPrnoa4fAk/bd2ZN
-rCvYF1KYOnJwp4Yg3vFiAFv4bbrqr8nBa2QoV6vaZfsltPnx7r8yTatPxe4OukJV
-JNK/tF9rjH6xffjavGbT
-=cCAA
+iQJ8BAEBCgBmBQJVfxF/XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi9ccQAL0vhbsdQozKXm+Yez/uuvzJ
+nvOrSkdqmXXCDkZ9DNAHS5LBVro8LAdMdbIeWNAIBT1Ysvs2RpGvlQahpETyIP08
+CCcSS61Cz3/Y4c3uw5Qeqvv/greriEm94Oy7Y+SrZEIPgxVsALqNIn+UvyS/XuxT
+oJtzkQURXjhWHFl+bGa5hew/RXBKEnxh+Bq1tDt9yHS7UyKJ+MkebbJsshYLEEWS
+OFCTjYlCgI8dCMnisPgaGNhoVEgGzrOIPKu4e2ZVkexFKCrppTomJSYIxGrQlnqp
+4OfO+PK0e6b01mVpypIPKrD3Vxdlozqj+7fustqnGlNkbsBunzXFfIq2EkZ30kra
+ZV0vm7N1Yy6P/GK6Gzshf/NO9j/tnRl6K0Z75nsGSdQUNDws67sKItcaMprvbrEa
+JBRfWhNFAEGHBkETYxCd2SEcf6rrFC+qITo+lbeRXZtqNYdKZqP8Wqzoy+0QYZqi
+E2Rk+EQe9i7ELWdf+vr76BUk+ezUfUWw6pmxrR19ZYYkK3qBhE9W2A1RKUc8erG/
+9p2qxawdza+x4jWOhGRTZ3NS/VnIEzJ2HTdH+EkOIu4q4lOzBzGqgFlFdfe5RL/x
+OgXLCmUd5Tz29eIdsKXOaMWodJN8lcYCdGhTXiK7lXqUHuieP4+h7GlGlhvfM1EZ
+ILB4xlfy23dqkfuLB4d1
+=fRMI
 -----END PGP SIGNATURE-----
diff --git a/net-misc/gsutil/metadata.xml b/net-misc/gsutil/metadata.xml
index 139f125c93de..cae2a6d112df 100644
--- a/net-misc/gsutil/metadata.xml
+++ b/net-misc/gsutil/metadata.xml
@@ -6,5 +6,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="google-code">gsutil</remote-id>
+		<remote-id type="github">GoogleCloudPlatform/gsutil</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-misc/gtkvncviewer/Manifest b/net-misc/gtkvncviewer/Manifest
index 4add6fb79615..c7d4571cc2af 100644
--- a/net-misc/gtkvncviewer/Manifest
+++ b/net-misc/gtkvncviewer/Manifest
@@ -1,15 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST gtkvncviewer-0.4.tar.gz 79464 SHA256 e439fd92d445e87b8e450ac0b8fe3d555ceac579daf29028a36b551f231bf708
 EBUILD gtkvncviewer-0.4.ebuild 1095 SHA256 c46beaf3b69619982a1cbc122c6c1d0af06c814f4c0f5a19538be7e1b805f014 SHA512 6e086ddbf25a4b2971078991df0d5beedc2c7891432d5da07111df1cc55c497ea362f9c79a3b276f2f92f95ec8fd0d16044b875062e580f38e0fcea403616f9f WHIRLPOOL f2ef16bbdb49ace83fb13a379bf800f39f38eb02c3852c52285286962fd7c2386d8303e29f28eb26b22758e36a75ea0cfc10c140a95abe9513aae011acf7f3e4
 MISC ChangeLog 494 SHA256 ad9793efc3a1b9f9b763a22db7b16b928ee68d06f88e612c997639c6263c7d7b SHA512 179e834c22241a8f3af45526ed30c200aefd18f3d3c346b408f17b83f4d01bc19523d19b8f12921d1261973681eb6e6e0b6db3badfb5dda42a7bcffe7efdab76 WHIRLPOOL 6b33fc4c73e53ae135b6fa7443eed7da16fb1cc92588f3e6ef574b5b4b100184ac75947ebec2b0d839df834fd79635c26ec3b26b46978af74f499599df6af6c5
-MISC metadata.xml 236 SHA256 3d0f545d018f4339358833ccd9c96f191d49a0ec57538a6555b1e8309950ffc4 SHA512 1b0218005e78814a9faddb69385f8c52c70735859380dd678148021c65ae7010fd045e14ce87945a01e6ec3a5114f060a6be64cde6ecc5d6e142179bcfffbd7b WHIRLPOOL 17efdd67f82ebefdaef81327ecff218d23085003b7c1eea0eef873ade2c2ea2a3de078e44a46290cb359212a1b62b48cc795c84219bb8fb05d71039996e3eeef
+MISC metadata.xml 315 SHA256 810dd703b06cfa5aa50a94e6bba7b8033c650c2f98cc5cfd5f9db555ea771940 SHA512 ef9215156ff8bb9521611ea67c0a160f17be53e98ed7f474d98f637661c390bde427f42cc420b6f4f35ea46ab89619da42a30aada1bf4e723bc7be066de95acf WHIRLPOOL 9b55b2573d617431a82568a3d838757a70196d8c69a24680a8e87a685e08fe90c42017ad1fb24bbe95107b0a456ebe4f253d3c8ed4bc7d4a04120430479bc36d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-Comment: GPGTools - http://gpgtools.org
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlBHCC8ACgkQgAnW8HDreRbmAACdEyLbLBtWzsFTJngJuLb+VJLH
-GTAAmQEfh4YdGHNEJKO1L8aKQdgC4TFh
-=xfJb
+iQJ8BAEBCgBmBQJVfxGMXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmisyoQAINhc/zXj4682Jp270PNn7hs
+zafcsLG/KVKQ2TIdVaXktNfRx7Mcvkf+T0XAk3iYE7YMCytpHTLfMv1fMkYdSY1D
+u5q2Gokenm3qRnA95wInIWWKglkNeq3SYrgwudjqE2ikMupwt15I3WF+OGGiFZBd
+RgZeaL7rM3euctMmx1xEd6tYMP9Nxr5sILetkCpWwn/tGkk46RoNPzW4sEiIczy/
+Yiu0fDBalfaZBt0ITynea6jjQQqfULK53cIdOTuOSeEymfSjvEG9Cc/z3Vbbkvq4
+u0fmo0oTKGNSrnW5L4TbOBrzuPzJJpIGqrNtGXyhhKNlk1qrl/+T5oM10ew3jS0A
+PdCEFwvxQXQZTBnNkl34z67xi7XBX57Ge1wZraGQC9TeFADpeSivxSonHge/ImoB
+sCLAD16g/6YEcjAr9sX6mwUl2sYpD9xMu2O7xyze/mvv+vfwnfJ9Iibqal2cbF0T
+IikFPupj4rupWO7ZR1iL9H3rhdGl0AYEUZkMyfrW1/H2eZNeDsO7C8MlVBxWNoAJ
+ORaFnJHGbh282tps7CwecRE+b3c3T0gBnr3RDd7+lEoQwGilFxYGaGuDvY2vrsyv
+4hjtKzwVX66i4oZoEqrYcfVfaE2RVqyO2igo+1whPQIC/phWQydomHqeV6mCCxCA
+xEcew2etrimds8U+Fyod
+=fY7v
 -----END PGP SIGNATURE-----
diff --git a/net-misc/gtkvncviewer/metadata.xml b/net-misc/gtkvncviewer/metadata.xml
index fb7ec4a9a25a..eeff86f130f0 100644
--- a/net-misc/gtkvncviewer/metadata.xml
+++ b/net-misc/gtkvncviewer/metadata.xml
@@ -5,5 +5,7 @@
 		<email>angelos@gentoo.org</email>
 		<name>Christoph Mende</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="launchpad">gtkvncviewer</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/net-misc/guacamole-server/Manifest b/net-misc/guacamole-server/Manifest
index 7e02d851a2b5..668f5083e4f7 100644
--- a/net-misc/guacamole-server/Manifest
+++ b/net-misc/guacamole-server/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX guacd 665 SHA256 a5b727f5bba5e34cf89c0dc26a810abe1fd3d8438b1cc94f3baedaae0ed6bb72 SHA512 760d64c4950d4bd942f5f2acdfe44db4f55af785065a3e28c7eb2f66793880c274354ad144b09dcf7ad13ada8f4a7d286e9d889ae36936bfbfbd0bf3622e79a2 WHIRLPOOL 2a109850bb7999905c2c417dba060410199a9896194a1b8057c4e1d7334f373792ece6e80e48202b68beb8c330930814e8571749eabb05e9eef9c13658dd7224
 AUX guacd.service 178 SHA256 4f0201fd1888bf1b147736691ea15c5081cc04603b983b004449817fb2e9e30e SHA512 a7b36ab99a88c5f37ca37ae57bd59e21c7d5a890ad6d3a19756ab9655da44abed98867114799407d070376a8207a29ceb6097785bbce377826686c4e7601e0e0 WHIRLPOOL 1c8ae0675b2cb8c0227f33a50c5e93d16b7622f7c9afbf554481240b6497f540bf1a96a97bdc0dd31f36d361cca73d306f9f3b237224b758f91cdc2060758444
@@ -14,21 +14,23 @@ EBUILD guacamole-server-0.9.2.ebuild 967 SHA256 d406747deb641074c18c002ce2c5cae2
 EBUILD guacamole-server-0.9.3.ebuild 1649 SHA256 71e5d46d802273cdaad48d59bcad7f0cce50c1a33e8eed83af254081dfaa9532 SHA512 98cb86dd784bb2e101257a3591803a0da66135dcf027f1c0e8392e670ac1833a65eb941f0118836c9d9e14cb6926af00524631cd38cba76264df0e23a6e6d982 WHIRLPOOL 536a38460d59f47bfd2e5abd671ef41e7c021f3112e2c446c63557f0654424089e828e9ca5b472308532aeaa5534561eea459d494665a86bab98be842516eea1
 EBUILD guacamole-server-0.9.7.ebuild 1426 SHA256 a9cfef6ab8c25c06dbff09653cc2d5d1bbb4ee56a1970211e46fa156479e8a9c SHA512 c4f8923a4233df0fc39d5c91fc3c6b850c657e87d0cfddf5965adf84de12fe325a153e50f30e1202815465e06be234e8080e6fa0fbe23331df3d23a4363bb1c1 WHIRLPOOL c27602d78f5758d83d79e7af62bb30a7ba115550b947241fcd38c8d3250a1c82ae017f6948c02b29c042341a87bf9989afa5a9b9175bf0fa9f387cb70a7e169e
 MISC ChangeLog 1612 SHA256 734ad7131993b53cd28816186ffdff7c5e996254c5a88826b3cf11dde40c4999 SHA512 696080d8380957f8d76f82776a132d51889fcd68d933914994e0cfee0ddc9e31436d4fe0f457c7224b3f17121e424246689cedbadd6e5b8a3e85f4f0f1f4b4b5 WHIRLPOOL 8a3908c87bb894daaf9ff9193e44678111593d9358ead4b185644170687c825f1f7c143d8516f75e4060adf86c8e89316753484662e8a44ec4fc914ab8cb8bec
-MISC metadata.xml 627 SHA256 48656b6c4364c17f75d8678673e41899923df6ce9884a8e0e468a7030db1ee83 SHA512 fbff490c62c1ec4871310cd0deaae719c2e40321ca32035c0073c93047415edae9160da1f8936def498dcdf960fb2fdec19e1101375acda95effddf6d54a8f90 WHIRLPOOL 52bfb428390be8f6e65851772b9265f80680afa1183b59842d5966b1f470f41710a6efd8fe13d3455def9d1a815c3bf08c7fe4af9c7241888639e6ea42dd8391
+MISC metadata.xml 706 SHA256 c5293b0abc794d5095aca6bca0d49b99107cdfa79d2bd33c74b00ff74701c028 SHA512 bb1d2dbb87579077194b606d64002a282cad631a345113fba043860e98c8ba5de3a82693e1efd76dd3f2a0f44941465e845b1cba86668173920efec85b4f64cb WHIRLPOOL 08f219f0757345a83a2f4ec381fc3a612aefaa595f003956668b892990f8b2bcc4776d155433b37377ca5c9b85332f691be2d1e27577a351b668f9ed0e08d3f6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJVe/Q1AAoJEIug43o+kWudcL4P/j6mOyXlgC16BrxBx20zxySO
-abVnqi+Cig7RPiJA/EkuilSJa5+c1bwqwKWPN810ILcaL5CMy+WLITKq6FkG1BW6
-meRDOy/CoRP32irTlMMOy5nF6oxNWmGNvgChXqohTFqMQZgdoMZ9n0SQnf1afYNx
-n68C8DsVhRkPC+DnLM4IAPkm54/9F7zBX6yZnrtOgLZqqwXEHWWptZZw0d0o5gZy
-8KkIIHSkucBIXa+vaVGOVi1HDpuraJiLQugqDGIECxhDt+z/CY4n2AFxKKzV+5/u
-xbMsEX8EAnLN5uMlGEUvXU+ZlJU7NqoaA/2kkZMtgSmyNh6mb9rQeydcGbxVS798
-Hyr2yFfUx/XrYKmPifTrVUKob28/A3Ec5Fh8ubHs3HKzY5OA06tYCB/yReSDTVJ0
-1qDqa5W4/g1opJ61BleOzAjmn1vi2zNe8aN+gn1Ja9M+2p9BkYGCB3JBeZ0OOqCU
-cQOqdvzsXa/gDHMUEC19y4o5+xOdtd9Dy2fF5RaWxcEuEr85WH6TR5di2P1De/Cs
-HlYZGBZiDaZYF76sk1U1XiEfRQgzxkCw4SYw0Twd6H83Upuij8xnkgiDHeJa7Jxz
-U2rMIUOjVyY3ITdBT5XJ2f9F20a+hDMxW5w3ZlgsBvU2WBpeg7OSS4yEQoTJdJ8Q
-jmjaRHfkQW/Uc6/FvtWx
-=bJ13
+iQJ8BAEBCgBmBQJVfxGXXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmibhAQAJ5JFLTyfvQ1bYH1DYVWU3TU
+ltNjNgRx1itUmXW1iWqvd6Ii/xC4VK+yNorc0DFeL0gD33S5tQejqmF7g7nfKe+9
+UCnd/1XK6f9JSxCa6vxB7AN4nwPhOX5QUEss1cbT59/lUrd6Wa0xxe32OONbb6cZ
+0GGWLSCWvi1IIGvLy3ODe17ZchGuFRHXNubZd4SzD/eChlq45O8JPci/t4Ag9BX0
+uFLMr1GE6mMrK/oT25w3ZpfM4TuG4FGRqvHC7Hh/5/m25WpSnLwKo8r7qMWyKCbU
+aeWQ9R0rdjvry7cA79ayOQgw9lVqUv1O4VdU3BL+JGzE8VqX1olxrr5XINjrojMK
+7eYoR7w7nLbKXQ3w75XtYQ2iQ1mXtCUVmi+vnVIwGaIeI76+RopSny6zdK0Coic5
+Idi4nk0Fciyl4EMtM3wYTMuDQIq+TwJkBOpLI8ON5mBN4tvF8uX2hKgER5iQ26fX
+1bOAPSFOjA9ageK1ll0z2kxJUL0Z0FuL+wovg/tjF1E/jf+R1F/wa0RjqxKduwlb
+kmxaSd3X+RUKmctPFzZ0fvgNyg5joonPo3wx4NyAWC6sUY7ieGeV9Yqm7GCzaE4n
+gMYoO30CoWyX5iMQfmtMNP/zVNalTtys3bM+l8IEevQG+dQqWOhqBUWP/cBKpSK3
+up4VduMJa9xVhGe8EjkF
+=ly6S
 -----END PGP SIGNATURE-----
diff --git a/net-misc/guacamole-server/metadata.xml b/net-misc/guacamole-server/metadata.xml
index cfc04ae0b39b..6a85e12515bf 100644
--- a/net-misc/guacamole-server/metadata.xml
+++ b/net-misc/guacamole-server/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
@@ -14,4 +14,7 @@
 		<flag name="terminal">enable support for terminal sessions</flag>
 		<flag name="pango">enable pango rendering</flag>
 	</use>
+	<upstream>
+		<remote-id type="sourceforge">guacamole</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/htbinit/Manifest b/net-misc/htbinit/Manifest
index 907c0ee1a18e..45be963c2dde 100644
--- a/net-misc/htbinit/Manifest
+++ b/net-misc/htbinit/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX htb.init-v0.8.5_tos.patch 1656 SHA256 0b2b595d4fbf9aeac17646bbfc999009431a97061ccd995bd08c2edd26e51afb SHA512 6b8c78cd75207d23b1786ddeff01ba96e45fdba575b51dcd9e96880518a3edc97604f2fb2ccf44243e697dbe86233d38a26be54db3981e93ca98e3bf95e9dd87 WHIRLPOOL 8f962344b16c34e9efe50de29dffae52933ee1f6d741c33108ca63c183efc8ddc10d14a9d0d8f89056b811f9bb3a95130e2347e692aa40f21b931ec6a2bcd5f5
 AUX htb.init_find_fix.patch 1165 SHA256 23b55a4d946d75d44fc697537a6fc9d381df15bf041644dd5b9518b43827c2c6 SHA512 dbca235aa92ac5b2486fe7a89a215c4e621965f72ce04336d2c04cc02f61f40ec5a92347c1515b6e1114d176ea29cf61d457d504bfcaccfbe149d20231145d07 WHIRLPOOL 6ddd8812bcd2dcbf18e6c14e42bc045c58e437b4e9295b10658f0c3ed245da6535ec32aea907ee37c83af237caac44d664898ab76ee1539c57823fd7798cd684
@@ -11,11 +11,23 @@ AUX timecheck_fix.patch 1221 SHA256 af5579df10eb67a37f6a9d9b042d2347e483cff4b89b
 DIST htb.init-v0.8.5 32038 SHA256 acfda369dff72b9073a8b70f2b05b1397a61a1cdb23970e5ed216d632ff33586 SHA512 5f54f662e8b30c4efa6c8cac50eeddfec8650aa6f651065c0962c32067ca7ba17266d20860c296bac44d1f78caa50f6c948f3c55d468a76f9ce2069a43d3c6dd WHIRLPOOL e83c96c152f5e781e963585794df339d5b44fbbfdc3f9bf23defb3c37aa301e08b7324877c784411138ffa600c6ce3c3b45e3ae92ba3e274a09eeb05d2d12d05
 EBUILD htbinit-0.8.5-r6.ebuild 1679 SHA256 ca5c713af03b7acdf113f3f6a4ebb2031be6cd83c9a45b7423f0b39426dee885 SHA512 d7ab6fbce5eacb72875836e2ce926e676fce34a995c02bfd7c9b24e4fe34b5be348adb8c4ba0cb265f8f0029dc425ac1c2f181116a8d8c39dbaf7292c85cd28a WHIRLPOOL 75aa084eed2393ec435ac888fd7ec59fbfc8899e3d2c2530fe587d8f55ec9d9e5681499bd826c31a7b08cd2e9625a538335873f6306dfbacac5081eb86737b73
 MISC ChangeLog 4348 SHA256 a4e84527ecce4add39a6e338a66b97156a2419c21d57441b6d233d43cfac3744 SHA512 ae1cb320b647b1286f99d928ccebd425f7defc643ef136545bd44b0d76bd4c8bd758999783fc048081db356b37eb009fffe066af53882471fff2b84986d8399a WHIRLPOOL 2ebb5c645a43ffcb27db757f950b9a6141fd654f28fa09dedb9751be47ceae53b957fbfc39122cc4864bea7a1c44d842b3a1b796f9d7285723e4ac90e564274f
-MISC metadata.xml 979 SHA256 b5574bd89cfdf5bd96236c279d0780ff560463ac815f8e3af15fe5a3e4e82360 SHA512 0885ada912d762b5faecd4355fc9502d9e5184c152bbd8cc43179309b0e8488c01a741aaca3fdea949c1ad2880bafef826ab84cf1a4039c0d6a4eac33200a638 WHIRLPOOL 4ffcb351e4a75676f540279fd8083ca8567ff072b41058543473a227f1eb3da72adbab3f41bd8df8c9354ad4c158759034ba160c80e3add9a075a8a5f4d52fdb
+MISC metadata.xml 1060 SHA256 6ac49c65d158d8691a3585b362bc0431e4b926705b180930d3ca757d3d6ed067 SHA512 4707053a849b5ca90229f408f4df054280694a3d30e461a846ea0c3bbce88a7d15b2d2307048ae2e041b25439a0469760899bc4179468147b6454c7a9ab3b606 WHIRLPOOL d3b4b3fe9cea64edf061b0354fe145925b17b6751b23cfccc0b94258da7990f9e690c361656de15574730dda02fa199dd37a920ab89f722b77c2d5df96803457
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlQ5IDkACgkQCaWpQKGI+9StjQCfc+VZXf3F5riyyZ/9gEamAQ07
-QUEAn1hycRB1u5qt7ge/BztiYXWZqcEh
-=ZpMg
+iQJ8BAEBCgBmBQJVfxGlXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmirBQP/0eSzz2HAJBRMXP8edaxNnR5
+S3VSFoF13u4feqzRGq1XMN+amUgTguOwb3Wf2bGQSy6TSZLn5FeFzVgVXJrQWuiU
+C8GEH1tyYIae3k5ouuI2xCNNQTlkXXWmXyQQfnqUDOXXA2GHR1Ao07t9fIg7zVZT
+ryGRm1ToqnhnWmD92fXq0q8yeTG2aQznORQxDon1OrgWTtdE+u4voLbhk6c/ppUl
+om4viuRrdzLEdzukemMgLCpno8IgLKcTRZygLBWYC8s4FgeLBlbdSIqJKDhuBVcy
+8sOgEpat2Q+dMPUgEWSKImwVCVeWbmE5HUptYD9i8pEj1Dvh1nhr0bOGVq6oYSZf
+BR/kIaHAu7uxJShVcbZNimPxuxwTywMqpWoDr31VhGXNb03DnHRILHHth/SHaBJP
+2JbH8ddxUEricnzg4xMINgGi+2+vkSIr+wi48EYm17aj/dEASIf1rlbbI8jNTDwO
+IV6gGX1HE/TBc9puD3Gz6JE68d5wfP60btGPdFeC7xYHd/SlN28AnxUDcEyLaG1/
+Ypjm36cKarUYh1P0licQ7gWPzOrnO4Aa5lH2jabH5tGdrA42QNeWF3iyHXuNbJNX
+S2ft4ivOCCSJw8DoTv9WUavNlyn6VIHcEW4NmgjEvG62tPpGEaNjrcVghZJSYymP
+Fj3HjGAwgNIRWElzLUvV
+=rRxO
 -----END PGP SIGNATURE-----
diff --git a/net-misc/htbinit/metadata.xml b/net-misc/htbinit/metadata.xml
index c4fb9beafac8..dda213eb495f 100644
--- a/net-misc/htbinit/metadata.xml
+++ b/net-misc/htbinit/metadata.xml
@@ -15,4 +15,7 @@ CBQ.init に由来したシェル・スクリプトです。HTB (Hierachical Tok
   <use>
     <flag name="esfq">Add support for Enhanced Stochastic Fairness queueing discipline.</flag>
   </use>
+  <upstream>
+    <remote-id type="sourceforge">htbinit</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/net-misc/httptype/Manifest b/net-misc/httptype/Manifest
index 3e5de576bd0c..286ae6ae1e81 100644
--- a/net-misc/httptype/Manifest
+++ b/net-misc/httptype/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST httptype-1.3.9.tar.gz 15254 SHA256 2b3981af663c406ae7f3a4e36b2def3f7a7a45a032e2bae76fe2f14757464526 SHA512 4e23bb60596bcfb0665c1ef5c0588ffc8bfe9b74bd7998577816b2e351ad55b2d8d01caf8e884e00be1f743adc31cb40264c8c55c90d9fc91ac7bf8180c1803d WHIRLPOOL 4af1caf417758f746e5c4c49e82944d0b0c46ea46f4b49edb3e6ebd06c1f7506b918207c48819069433b146333ffe05c7aab4057eec8ba7f0f7b20fd1e4896e8
 EBUILD httptype-1.3.9-r1.ebuild 574 SHA256 cafc91a61f8408b8ac33f5c9ae3c7de5cc59be10fbb4d6a6a1a59538df1cbe9c SHA512 76c5cad9bf70b83673cc5bcfb99d37b85b818b47b1ea6a71d9a2c295a3c5ac8de3917660aa1cf9c4a45f45ec21b880bd1c9ffa5a4c483a7d076abbd3f86885f7 WHIRLPOOL 0bab81b5ff7fb4ad35587b1faac0b54129606574a088626b0120ad2457f2351fdbc0e048d9db05bb8f4d5e6acc14759cf0d39fd0671f3eccf04a220efd17532e
 MISC ChangeLog 2357 SHA256 1f2ccf71d5f7adbc9d779890b8d3a6784c006d40f4ccb0ab0cf6e043c90aac95 SHA512 404145da2ecffe7abf80aa351afc13230ccd3045c9734bc6cad3344bb2d0be5fa58695268fab6d3234a3fe12790955e842a2032c3ecfda1a2150730c5e7564f1 WHIRLPOOL 8daa13ea21fd94ea311e99c753b6b36d52199c927002698da96d7f1d3c99de780373d0c4cd6bbcbd6aa9be020dfc985866de50717f8a2eac5520ae70841a72fa
-MISC metadata.xml 160 SHA256 39e232fc7ec88ca0b077cb3950cb39d15cd990842b88d5bfe14f02f34d72f37b SHA512 3ac3a74a7cdf45b14884d967b10e4752f9cb06c579f6d7baf921f9be5450cbe7536c2e5a480ac3c95156eb6abb32e68f74cecc86b9ac0dcc4e0e1b4b255c3e20 WHIRLPOOL f7504ce9e3e8a58d19bba5448305f806c2ae01d0a8d2cf09d6bc6a089a6e1c28a1b12a80bb6020584b5ed21df94e4936b1695a54548704cb8679660b6b807955
+MISC metadata.xml 238 SHA256 46229b45a545063c45f5274853d5f14d1ea345d4c74013a30145773463f2d0e3 SHA512 6cc4ba064f56e5a5bb071b9548d6127df973d48f2270bb56cc0de554741fa240693c4c235a7e61297b2b8a8b3877e3c62b54b89568570b79b712af92c6392bfa WHIRLPOOL 873b617266919faf601e2c39cc0b291e7e1c9337cc10d1e0d007b9b4262d8a0c4e29a84cfed2459f4282e5c4150b77ddd21e37756ef9f1acead8d5bc770adda8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlPJRH4ACgkQVWmRsqeSphOKOACfSY9usXCTYFs/+FtZxvwIBCpU
-VtsAn0cMAcSxLiXhDPF+qMATDDgfxR+p
-=v1Yl
+iQJ8BAEBCgBmBQJVfxGyXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiabAP/jTf5hJWaW5rWLZO5dE3TwL+
+YNP0GSURmPEj8QFTiVbcNzpF4qG2ehBIqybJxcjpP86Ui5lH/sSn10+yoc+R6Kp0
+bX5JXs5hZ6ml5Po9vOv0pzaSA1Aa3UM/ZWW4LPBVXNpfEzLAPGNZz2GdTNSbe7jF
+RoqKQWQ5vFh8VM9qqkKq0ddtHxdgMVh1U5pGrPBQnn5PG9PlkRwT+ZHg/BAS1Huk
+tcVEqV7V8Kz32PW2TDDh8DGMoXM4YmMAIP+/5aDM+CnDyxejfWNvH3stiwffW/6L
+36PuQ8e9x8vobBv2Vf/vsh1QSMVL+s2lC3bG2x1BPKRbTWTmGuA5ZF85EbKn2NfO
+oWJIPz5cVnSny9sTrsr/hdtUEoAuojuJt1Hf43E0bteX7iVJ2HLtvSVjbIZXrmJ4
+sYMpgyyrp+du9fcCwwkL0UPdro08MiBaWVNlRSPUxoSVocZoRY9u1aVgDgQYNe4B
+JpKx/16wpsg8Q1H1B1FCTmwOxAOrBfnp2BjGx4r90P7XvMBNtkoiF7/qq20IjqV1
+8XmLRqQY20zMc2iyD0ZFlVg0X0pNeflXOyATyY2jt/KOKSJGseAYyBX5JVKW9QeG
+mPyIiMg3lxjaFvNp6pVEG+dsr8N2eSCCybDMc1FXtElrZKG979d2pUcxXybmVmEJ
+yA2tdNn1VK1OJ4ZHmuMC
+=0Vxw
 -----END PGP SIGNATURE-----
diff --git a/net-misc/httptype/metadata.xml b/net-misc/httptype/metadata.xml
index 78692635ad22..c7ed39f7accc 100644
--- a/net-misc/httptype/metadata.xml
+++ b/net-misc/httptype/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>netmon</herd>
+	<upstream>
+		<remote-id type="sourceforge">httptype</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/hylafaxplus/Manifest b/net-misc/hylafaxplus/Manifest
index cbcb801d8aad..8956edf88cda 100644
--- a/net-misc/hylafaxplus/Manifest
+++ b/net-misc/hylafaxplus/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX hylafax-cryptglibc.patch 3154 SHA256 e8939efe6535aa51e9cf70e40c2951175f70412c368d5921862b64918c21c92e SHA512 04e2253cbc8b1f71e984a3d80e98d8aa5a7c7ab7ae286ecbecf8fb6c8d5528085b719a9dbc9f5dae6c788cfa83a57393d9ae0c36525eac658d244f4fc500f0cb WHIRLPOOL c01cc89a63d05b488084651b568a211ea7414f97b9d097f984918a70f7c85180b673b59bb509ede1567552c169137736d256a1b0e71a39dba15527f1a8ec0051
 AUX hylafaxplus-conf 572 SHA256 bc8851e560282ebce22073c146acaf2e848c4c1bdb49c4862b7f66c2062c2942 SHA512 ee97c45e49ed03bf2d393b7861fb8d0a92ce927243b7f1843c52de452540e78633e1a6d7b6892e6f5e30b5518b4b3d998354a3cfebe7adfd84da3f9586585621 WHIRLPOOL 136dea535ce736336d872b0e9545b745415bade140468801e14971e5035b75353f838de7e45a3f8bffc9cae671d8e337a1df804d071512ddb82e6cf8d0cf69da
 AUX hylafaxplus-init 3139 SHA256 be1280b1e28f7135f9bad491bbd068eabe8c450f43f69892676c5bea1bc7ebfd SHA512 e68aca6a3868e43589c88607a23640e4e8b656e8ef0387b91dff6ec0777c781445392b33a2d1301ed105849e761e40430d3a16d5fa1082bdf2e3091ad97a6303 WHIRLPOOL b029f6d2b253524eff9113d269dfab1b095d1c6cbaa16ffc120a67a7e16a713da82cb99b385cfc45f04719b55236dfcf18b9c9a16aad08621a0f876fafc6aee5
@@ -7,4 +10,23 @@ DIST hylafax-5.5.5.tar.gz 1353495 SHA256 2916fb7ed6141dd6433336ee3ec4f9d93183d11
 EBUILD hylafaxplus-5.5.4-r1.ebuild 4807 SHA256 5a192bfc41846e917b49efd302f065fe47edaf2436f1bd446ef053b797c64125 SHA512 6a4fd6a3d0ec143fdf496b7d1a0247d6f960727e68ffbd0ac3858d199bd0582c09b158d2714622aa9c2a3a890d4c8a1437097e10f5aa5adfc1b6857dd2af4763 WHIRLPOOL e7d8e617296623a15e7c9d7beb2844e9c69cc618665a8a44be98e249c3b31260ee92db1922682dcaa928c040b3847cddf507c41f1f5026f7ab702b5dc2bb4946
 EBUILD hylafaxplus-5.5.5.ebuild 4806 SHA256 4d4444ca394c012e22f3e97a4fc5d92208022dab910c951eab61e4ffba4670e6 SHA512 a1b4ea7ff3716475549beba52c460ffd6c4af6cb56a36073047510e922d88c0d66511d9d0f70bf13ca3a29a00cd97df5d0491bb578e5e4e6f5e2c747571309d4 WHIRLPOOL ebc992fc0acc0d8485b73ee0475493570eb64f5220f5ee2e9d3fdf307bf19630021f87b4fd994f353a599924c69f2d692ac3f1afea44da0fdf863107fe3ee08d
 MISC ChangeLog 2957 SHA256 445ce6431573173113219b4ba1b0866df68f491ec616e418e662e4f85ba6c2a7 SHA512 34cbc05f300f5a9858f361f14144a40e59132ec9494850fb190db8565fe90ff1e974d4ca95c70c8e1da54e2ee1c007c744679e2e9181a02a365fb9edc9486405 WHIRLPOOL e83f191d3aaf3feac08b79a2026c3a2f913b075a4dde48255a26dcc6fe4b7d7109f00fd8f263dcb32592eab035322fe043d32a886f0061f67ad4ec32ace42e85
-MISC metadata.xml 620 SHA256 d8c1ce4499b907397bcb03086195b7d17456483d8582f0d725f9bd7e7f5c995d SHA512 25ac059d696814baff43d61be28e551bae7874685461a91e523669c23c285eb56f4c4ff1017e9e5990b131ff903a3770a92c4021b89963d26f402ab3b7c16a55 WHIRLPOOL 5d5d1d9ab11cddec2b50948646da9e038db0977e0f5da77bb3335f723add63bacf2a1fc36c32e5613a0d37b4834b8d1fe7d3092411b6b76a0e9e13db88b76828
+MISC metadata.xml 697 SHA256 62990d672ec0892b954a2a3b378696cc02ca036d7387f0c859a1486b5d7e5385 SHA512 3530b8fdb481d01399b77671fc44e81271e849ba8b67b565c1c298b1e95d8e2bd55af1e99e75caeeefc1a9b063a12d848cdf13809f26c7aae7ae030171efaa5e WHIRLPOOL 49c59065b210825ba827cea576a280b1aab6b7533b76911300f083605071533ee2f13a2ebd60e923985a3f0ffb1b976f947730a359d27068c6ba85388a01221d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVfxG/XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmitTMP/RZbNqAFFwbtYKcLEpMTOJZa
+rMxdVW4XH/Xg7a4uQPdbdv3lTqBCXxEvpsIvnr0ddvHQ/gIVS0K7X+4psjkL8hR3
+RYVHfsjulFBRBB9P56ImJ6hSW5zVCJSrnYndWiBJhDvEKIaRwCGSHzpNrC2rXJKn
+0dSNkwJ8RBAkG5zyPXQ2dYtUhh1nuk1QuzBO13nNsgIsgA8c/KbpuK68kT93XMVO
+kXagCpnJ4OG+/fFhKv+AQNAtWf4pZTBCvND2VCRkqGq9HYdneXJuWY/vy9PbS7Ez
+Wje3ucl1RA4U3A2tzH/Ma0IYm/9IjA0H8K9rthAS1veL6dqm51LJt75BODYClDFh
+NAFjaHZGbR4CsTtJNjWpXCSOYWBmwlY4DRG0EmqiukElMwO476G+MFGJcmo/iPDw
+Bk3CZ8Ke/haEPHsp1C2UFgaGHtxhMOX8dqny3dDvGJvOX/TWVuTv/v0O9OahnedO
+hQqAz9e6GNf99cfjg1Bk+9yDXScFLrLD1EWKd/tS7P/KAvxzgbUS7L1aTEA5fKO8
+ukwUuJNI9hKG44zSSUz8cw+h1/evDVFmry3j6emycgxqbxOvlR8ap3xs7gvAdUb+
+K1MxqBkZZMAN1TtLMIr0WgmCYIhV9LyT9htDte60qQUV9UYqlemGnHUznlDiV6eC
+AEaUwmqzzxkkWrUId80X
+=NwgE
+-----END PGP SIGNATURE-----
diff --git a/net-misc/hylafaxplus/metadata.xml b/net-misc/hylafaxplus/metadata.xml
index e6c94715cb35..69548ea80075 100644
--- a/net-misc/hylafaxplus/metadata.xml
+++ b/net-misc/hylafaxplus/metadata.xml
@@ -10,9 +10,12 @@
 		Enterprise client-server fax package for class 1 and 2 fax modems.
 	</longdescription>
 	<use>
-		<flag name='jbig'>JBIG Fax Compression Support</flag>
-		<flag name='pam'>hfaxd authentication via PAM</flag>
-		<flag name='mgetty'>Receive faxes via serial port connections</flag>
-		<flag name='html'>Convert faxes into html email</flag>
+		<flag name="jbig">JBIG Fax Compression Support</flag>
+		<flag name="pam">hfaxd authentication via PAM</flag>
+		<flag name="mgetty">Receive faxes via serial port connections</flag>
+		<flag name="html">Convert faxes into html email</flag>
 	</use>
+	<upstream>
+		<remote-id type="sourceforge">hylafax</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/i2pd/Manifest b/net-misc/i2pd/Manifest
index 6e6b557d5a50..896edd434ec3 100644
--- a/net-misc/i2pd/Manifest
+++ b/net-misc/i2pd/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 99i2pd 44 SHA256 ecc85329d663182165bf6b5f672237a9f4f129f39f168d38c876345f3b83d765 SHA512 0bd08ff5b1b2ad8d91572efee848a760e2fb46d9c1a5ead3fbdde91d679d832d985905952b393eb523ec9d8f1815bf1512ae61fbc059d10f0773991ac097c23f WHIRLPOOL 08404eab764fa25ae0f5cbda5fa38deabcae913baf3e0d4e151ae34a0fb3383994d0ab4db15e60827a3fc18ebaf4e4f541163cc3825b3baf3c75533a08d4c94e
 AUX i2pd.1 3414 SHA256 973ef9ada67ab875172e3d7f7ab1349dc26d9a4cad8505ce6894988eba88e596 SHA512 d13c971d4aefa17cd260923143e7753d40e1fb87dd3b298785381110838af03041ff9ad58e966521801871c7cf9c6715265bc9e8cce88302b7d5bcdc584bf1e5 WHIRLPOOL b5f96fdc19f49d210f7f6aff74354cd822f6b3e0a7d1ed45da3918d6b844f52462589a400ce881f52eed5fa6cb5ae6c0300495b8e5eb9eb7100801ddc6e5f174
@@ -14,23 +14,23 @@ EBUILD i2pd-0.5.0.ebuild 1962 SHA256 64cb6f1abadfc1de30b736d32cc7b5df97eb52919d7
 EBUILD i2pd-0.6.0.ebuild 1999 SHA256 8b11c3246aedb9c51d8cf0ea24f834d4900eba02ea886cc8bf938ce5f0895200 SHA512 804bd79fa4b5235609562d9983be5b1edd4f2538413112489e7247eee991e159ec0d5a8dab96770b867a0ba0c51d048f4c70f21fdb186bd6133c2feab2ebb79d WHIRLPOOL c09db2b296f4acf8ead0c65c352b8ef5a486ef5ebda54ae04293bb54758083c22078e0aa881be60ca8c4924f061655c478703c2f865378fa297c557a7c1843b2
 EBUILD i2pd-9999.ebuild 2418 SHA256 c25b3dc79729114b840da6542adac517ed31480ff60ae818b1f9219717563cfe SHA512 0a205e42de682b35f48160bf21c6a679fd1d8d73bc92ee69b4f7d750fea8bafb7a18dd4644d433b3d1c577203608a055111677ed7d7c96a0d7a02d4f705404f5 WHIRLPOOL abe650d2f0b0947413cc8b8be15b9f0b6852020ec705f03e209169dcba6c6efacc28efb6313644964ace4e94155ba17fa692c05bd3c5587b376d594a4262401a
 MISC ChangeLog 1850 SHA256 afef0d08e75ee62222c259b24fa888538e5d8517df6c6b7a4ec3a75e785c48c2 SHA512 ef764665fc54df2a1a9f9e75325631af227f5200a6d6a5326d5191e91ac22c3d0e71f6da5f03b837d193895766d2d9facacbf994ee903e56d45d76eabe64a42d WHIRLPOOL 5f8466fdcc9eb40d67cd3c94282e4704e6c4f2274acb9378624073fa5f0c9a5136a7700a66de6ac25d16ebb0853c5f2b982a4dd165f505357ae5de9700391384
-MISC metadata.xml 523 SHA256 bf0415cb10300a3494e0cb73d4a3357ef1ac293d1e3732e6d586e575f21f8888 SHA512 b32d2faac172e2118858ade073716010b296edcb80f7e3095693619c6343b9d3594f971def7d6f919a00bcd848c05b7542f8f723c7e4de547f66a2ea9665c930 WHIRLPOOL 226cce55cf76223ddb49c9cfb8d2dbed2d0200fa56fc3d9a165371276f9e3880f179722e8caffa1c74a90b8a6ba3b6bbdec8de2175601e742af091ee53b6c37d
+MISC metadata.xml 609 SHA256 3f178c2847876fbefbbf65bf303fad494272d8a74b5df088d2c40fb4c262c880 SHA512 92cbbb3f900cbd060c1235ec584884de9208f28f8fb49c22bfda31706039c409d9b53872de605e4b286b306b22b5c758d751caeac3136ad19687183223ee1f78 WHIRLPOOL 0d686798d32cedddd5a56c6bf17283253d802e9176036b8ca74098da666b0d1eab16abc6a2ee2957d47e2a6c0cf5d49ca20eaae69ac1f50d27aaf4041425a1c6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJUz65+XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOVuwP+gM3wAVZ28wQsT6r4yTGswz6
-FfLZkUEbnkZ6f8igVseaKq6vbuQ5q8P6Y3tTlEIEgj7JyLEe7j3deDeMC/eelLJ1
-QD6bil9cHxeC6lAVi4hbS69TqN0eQ6MOqWjAmS4LBsFG+QZMH1YMaImknt9Y59WL
-JZGkvVbhOLBkmE4Q6OAEztzbZacgHyknV1h5HMxeWPb32U1GEGtypNWgtaoD3dCR
-OtdKlS8mnklQDQ3i1JEagyBFHATX4qAqjnKHXdAmCSwqoU5eWrFCjMMyrIObsYG9
-aQUf9fBy3YpOEUHJ3DAYVN4Edc2tSKNRWnym0PasTQyIRX5V08xIcskmlUWYTwoa
-SFwbl50k356p2POFU4IxBdPHekLYxbi0lWstr96rtXnGcFo7s+dG2Aw++xTohduw
-nFXSm4nawknQrT13uKrFCwI6qpiQShiWSTo+ryn5yUm9uHAyuDyhYFKxGlzjN1EE
-pe7IurME+z1ZjoUhyGtIgR2UgWY7iIhmyYpaw8+PSUSd93tf9N1MOBr8Yf0sGduq
-aknSeTvOd84kf0dX9EJigdJN9fDIOwKcjbtveFCFRRcFiNKQirIYSdVPQ0ppz2CY
-8+/eg/XBfmVwTrgb2qJ4kkqXuzihQi8VkTTzd+GdhNmEVnn0KlofzW7anZGoyo7j
-I08/18mhx5W+IDQ085mO
-=LY0Z
+iQJ8BAEBCgBmBQJVfxHIXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmijH4P/R30zjoLiPdPElL+0+PuXpXS
+pwdI95PWQUdHy0RRWhx5kU+sY3dySANGTH/yQMDBzRkQRDvHq6vcs7T/ozra6+wQ
+e2lzjrtaYRFaEJ+NQvHXrUVPPmyihLMGqWta7V/0iGQptXJHO4f7JjeYUEOoFuAg
+1Hn7nVlAFhnW8ptt+mDAZKrRGaNJpIrXqOkogrGJPS0KTH2q+CsfuLxRn8RlFE7h
+PDqpmSrjyPbZd7C2oHQSiDFPXmxVzBNXrmyesCV0NeUNFT+TK3ikJHsuS4yfKMAC
+gpFg6eFfMG0LXjv/B1/9Wyk5M9NnvHNkJThFasDXFoE+5kBFG3uOjIcGRtSeoe/4
+nT4Fi6Maiv5MayH1UyX+osTVRbqjRvVQcs0fQHSBhzZ8OQuYFpE9jvuXq4s8MHU8
+qt978Sm1GnzDopTxLMW+1QAeFWgHJJTQ47JWYnjyyZHhR9Iy/k8UX9yqg5JStVyC
+s6zXLzP2u2X/IbVXC1OwZY5B5hD/nvGPGR6O95JWReyh82syyLqSu8w2k44Fcyc2
+F6Tnq7qr44DY1FOO9po6aKc8voqM0+8i8IGQjN8P1dLXcFYmzR/1IqZssKmhiZhy
+EmQH3IaTeQ/gIO5BdMNkcRJNIrCDAqkSIr/+Xlgr5AeScD59tRlxpXcpgv95G2kc
+HDCk0Pt4+reLNnT2BJnr
+=sQyz
 -----END PGP SIGNATURE-----
diff --git a/net-misc/i2pd/metadata.xml b/net-misc/i2pd/metadata.xml
index ae17edb69717..4f8a4cad1613 100644
--- a/net-misc/i2pd/metadata.xml
+++ b/net-misc/i2pd/metadata.xml
@@ -17,4 +17,7 @@
 			Build the libi2pd library
 		</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">PrivacySolutions/i2pd</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/iaxmodem/Manifest b/net-misc/iaxmodem/Manifest
index b92015814f71..a9045c8b2a9b 100644
--- a/net-misc/iaxmodem/Manifest
+++ b/net-misc/iaxmodem/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX iaxmodem.cfg 2684 SHA256 cb3cab672319a8cd63e9d87f032bcb7493e26be25c87caeef7ce863cb80021fc SHA512 f77d8d5c913f166256b2ab4f0de65b8fc6cfcca495f161163ea47beb6099f8dd7aa763c0015481a80d07f86446b40fca17fde0a8297fd9f36f0c19c38337af99 WHIRLPOOL 14333e90aaefea6474aeb11d889af1552419f29cbac99b18e3840b32d95f056d76967ab54778ca7f6aad8638ec174674c1571f1409d71dcc81b34971809d78ef
 AUX iaxmodem.confd 140 SHA256 15fb51ad1dbca1731b90070eb78c024a4fa8a20060cc363ee4a55ac01fe32297 SHA512 6c69283cad4485fd782fa0022a2788c3ec25c02388804f4df06f0948be9b1dab3cb2dca363a32bb326bdbce392b5f7c5015a1ca6b87f6ad00c05511479a630de WHIRLPOOL 8e170bd60a16c703b85da32ba6c55f0b843f98d508e64f252d8622a7ddd2b025078fec2450b2a57271eda77c162660645dc01cbc089b4b1d3f0eaabed8f46c9c
@@ -8,11 +8,23 @@ AUX iaxmodem.logrotated 164 SHA256 515f89aeaf50c30633c04329b084e56d8ee33454de318
 DIST iaxmodem-1.2.0.tar.gz 3075769 SHA256 fa263c0df0870cb8133c4bee141146ca5db47ece6db50899a6acf508d76591ed
 EBUILD iaxmodem-1.2.0.ebuild 3006 SHA256 c296a90b36aeb11e71d54902dd24349841f8ad756a307c6e6887f754d8950151 SHA512 c5c6428903666e854bd75d303876020add8a1dc6dc9765d66e2e27d49412e910cc0358a9570f125f5531943feca2d67614365677139ba5d900a7536a3449e971 WHIRLPOOL 3d2ad84f2f8d0aa9abb769f3bd7791b2b09ecbdcc98e2d01b2c24a9c2d3a4e33482f0f857acc9d56df8f800f8e73be70ad12429c4a09cd7b637ab9b01210ad99
 MISC ChangeLog 1051 SHA256 60fd218fdbc70c7ef34e7d972a2fc49cbfda792c5fe39e49a8fe6f18d6b6f244 SHA512 93e8a2884c69caf45f1ac32bb0298f396d8232ba4673a9d35a00e8dc622356847804a3bdac908d2ab09a3b8c7b18942054c0ec7b638c49c57e6929bd195fdab7 WHIRLPOOL 4bcb3be723e667f5dcc65ca8f1a6a0b3d03d0ced4872071d63a216feafe41c1114d922c8cfe27bd3b5d8a132a30452a77e23bcc6bf2f233f7b584389f41104c3
-MISC metadata.xml 425 SHA256 9ca849bd6fc1d23018a313fa118e4d535eeb48cde8dc666bfc6dc04cb310737a SHA512 168832461e5dbe39df85f479ff02abb7b8e124fab0fdfe71316a4a578dc4ce730d2aa111a88aa7330ed29f63f07540fba0124e4b6c5f369e6488bf6d183e3430 WHIRLPOOL be510373c87a7e49699eb40715511a185c2d444c87b8239d1ede9355ea917923026d63d08a0de758acf08f2ebc85434e97a5291b570d34f7afb43cce1870be65
+MISC metadata.xml 503 SHA256 4687b40feb6b181c601b6e9e485209d53ce81272956e82c83f1c8935f312a81d SHA512 8765c16f5b3a13beb32a8107fb045493189448501f1966fcdd505a9f0e0c03665d3eda50b90bba803e2d4f40f4e489295d1a22c26c951095201602b119d7168b WHIRLPOOL d547b6214f1895e28e3ca2f760ff61cc620c32fd01ad3db08c1fe0b1071517a483965303f6884a63ed4ccbc7b7e262a01b1525fb360693ec1fcc6276ff220ab4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlHrpIwACgkQCaWpQKGI+9TaVgCggVir14EqOF3Az3sosIOnxfcd
-8YYAoIGsAN7T/vkLWwnBXENSGPQOfNzt
-=F8ej
+iQJ8BAEBCgBmBQJVfxHpXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi4wYP/jLg/bo2Ck/8DaF8AQxzC4ez
+qN/Y3ShPTxbiiLMz5vJpHb+bKhbRpNHyHZ4pck2RZiimq3QVZbeYu4HfJUKLvdC8
+YnZ4vt8XuHh8xzDgUejBonLjLzIy/Tny/x9KlvSmFmCVecZBDPoGSYC0ATayd/VB
+HAYNKJpN97ZEevIwIL8zR7rH8j/byyG4zHvtJy2v1F9Ow/wmlukzlvCl/SL46X5Y
+vaHW+sZFmh0auWy0wjwJtQbYkIc+IRip6hhGMuP9y4wSTYvXHxuK7HMW5jzFpvhO
+VEXHlYuwghm1JQAS8pZoZfDARDT2nZMILEyDB8EKYW/YWq7Af+NfMdjSZiSeXgJf
+uBhMNfVmDS/gVbVPxirpSyQZefXrYOBfSDJyCUPL5M+MyQRMC9mKJzqb0i61vmPG
+d4sJpcNxstEf2M0v4WsLoZ1Ld2+GkfcfzCrzEMCPhzSMFKkuhKjh5bz/y6M5leDx
+1p/FRgma++xym8kVMPJ6gIDBNKxaqG8oV/EwXTSJ9MVuEHWiWzej2pAeVgBsdMMq
+m5BfqV8kDKMZZFO9uNkD0ykKLDRT7Q9sJ8Ehoi7vtfDVNLScOcGeVWSoWbKDHGYm
+JMZhhHnQB9TuSbs2SZAKivwRonK/dunEB94rhidB4PHz+t+/GIh52r+vb8/gs1Wh
+0N+gcBDfxoyyz+9u8rkj
+=XJgA
 -----END PGP SIGNATURE-----
diff --git a/net-misc/iaxmodem/metadata.xml b/net-misc/iaxmodem/metadata.xml
index 0c85bc5dc881..e81a784a2e5d 100644
--- a/net-misc/iaxmodem/metadata.xml
+++ b/net-misc/iaxmodem/metadata.xml
@@ -7,4 +7,7 @@
 		(commonly provided by an Asterisk PBX system) instead of a traditional
 		phone line and uses a DSP library instead of DSP hardware chipsets.
 	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">iaxmodem</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/igmpproxy/Manifest b/net-misc/igmpproxy/Manifest
index 505203ca36b0..9e6cbaf008dc 100644
--- a/net-misc/igmpproxy/Manifest
+++ b/net-misc/igmpproxy/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX igmpproxy-conf.d 165 SHA256 f6c143334c1b2b6163b1f4d89cbce10d61df8559c5e717102868320c2e99a6df SHA512 c09d4ba3756d5a391b0738c4ef1e83f083a9b9b4f23af66c1378b2f0b4aec6abdd509e48288c1fc96c7f43fe004cdf0c090702d83d2b665ef701a064fc2da80d WHIRLPOOL 97fcdf071df84621a08878400e9e1bb18123cf6898ecaf80bf9a1ff3b941131c0a12304676f45fd0b4d4476111224378f50bcac590cc98ce4e19d3dda064ba1c
 AUX igmpproxy-init.d 628 SHA256 1c437532ebeeb50343089c63741d657d9d15bf7ba74bac13ab620a2533acd438 SHA512 cde3ebd63e62d214ed2093c2a895e44b103ff87cb762237a66d11bf942ede5650c0a790cfdcddc6f5ba2bbb43ab2ae2e5777faa07e07369d4d490ba8ad0eb850 WHIRLPOOL eaa1bd27718cc0b675a92e4e791a1ec53d3f64a9676601f2b4863bfea46166eabb91dd59989af4e5a10bd76f818e71180a7473d10eedeed628851b0f7426ecef
@@ -7,22 +7,23 @@ AUX igmpproxy.service 150 SHA256 c50fd8e9b871b9843606111ace1d9d26d6f24dc525b1622
 DIST igmpproxy-0.1.tar.gz 140159 SHA256 ee18ff3d8c3ae3a29dccb7e5eedf332337330020168bd95a11cece8d7d7ee6ae SHA512 1a569814d8984610402313d8c4adb78ff362f82ae28c968a8ba0fb411e12a704d1b51b387111b51517ab8fb2e86952bbd196f27eccd311c11ce288fc6fa25ad4 WHIRLPOOL b7e446c4c3a9c318d65cc51a54df4900ea334c521e8a8adfa487dc48c80ea81f4d17097b4bbd52eee9d7d76c5d45aca74d194ed31e002837b308e2bbcd95dea4
 EBUILD igmpproxy-0.1-r1.ebuild 749 SHA256 67c6923cb7605d621bfb77be76e8e1169e14fa099482d4c86bff52798d53006b SHA512 0ea33ccde4210868241966815c9538768bda9a782abccf2ed3025a6f4d77e95fa54abadb391a5a8aafab743d5bd824e684e3068f45e48b57c6f0ac1302ac8ba6 WHIRLPOOL d8d4d3718d84b7e36671be3ecf8f96f9c25165267ced162d9be36563abc2c4b5ae39e42ae3b0d7d24f2ecda6773265a33625d8b78675465057350b1b527acfeb
 MISC ChangeLog 1805 SHA256 f3a6142e7136308f341549e5cce1d9a3cd375a9958603ad08d772aff60df6b52 SHA512 f605a720c423637fa312fbfb2214bc80c48cdab4f6d4de71feeb860a3b900605dc9433cf1bb4845684bea021acde23c8a53c5484e9321ff2598b775114daa106 WHIRLPOOL d60fa7ef37b7d6faf34e7b2516c6fffb8dd705d679f5739cec8e47c3837e5a1537cefa8f98c111aa8a047884fe7f3a4602c60be65757443ff4b9f26454648937
-MISC metadata.xml 415 SHA256 b7021f4e44f6dde63b1e0dd00ba131728697d92bc4070abcdc9c3b7f6e52e475 SHA512 82691b58640a605d31f4f4f977bc043dca4ff5b2e292f51a4a40a25c2ea158c63b1eedad6565dae282157f5d05cd20972e55c4b4984772e43840424819331cd5 WHIRLPOOL 46ebbfc92805b58dfb0df5b6270858311d1bf18c9df207e79383fce65cc822fe6c0607c41c8076b6207ff54ca06422ced47268e77f54e04555dcf5a89df9f6c9
+MISC metadata.xml 494 SHA256 e6ad479161c96c3b22fae0a5bec8630405c2a617ee78a7d47d9b6ef7118530dc SHA512 7b7eed843abed599ee4e805b0164a8dccd64fde6f14a77d81a845324e34572849fc54e55f56fef26463beb90e2f3f27a92cffc06333407498b9427e85721f1eb WHIRLPOOL da8c0f1663dfb11dd9d12a25fcb041f14919312f7c4466660a8786b1ad37ce274f5981028afb43aa5cbaa99112da03c64823c68fad7df60cdf9c703195405a9e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQJiBAEBCABMBQJTLeXaRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
-MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
-7EmaD/492nJck+6dykPTyb/acyDmcBnGPArOI5pWU4+PEPDIgK+2b0tfRtN7DXJU
-WpRj/f7Cx88Tzp2/n8oSEpL+1uuq0kX5A0KKByJgTsPmgT3Wy684RFan5HlCWvjw
-ra7B4upDfY8txfOTzjgdi7iBC9i7MUFYZXBuzGkHK0UjJRVcHux/DoF09O75ScEz
-hP0qLrACRtZztmTBNfrwJTNBe/wA/giQ3cInfeah/Z5KI33I9iMxSkPvw00CRVd2
-C9fO/7iWmiX2RokU0oBuDV1QnixIiIqg/yLohWZSsmfIEUJW0fGt9PlUQ/RKL3Cu
-p8UVNDduS7hnFC+Pyq3mE5OEf9P27k+ZtOCyvTiFp+t4aJwSF2e82X30xlaOZ237
-zU0ODCp4M/yqbp7nL2YNp/rRrj295egG4wh7HkA/blMGKK+ePtMcx9LXMZwvfpZR
-0g4Z9MQT3OlpSFJ3TXfnNksmYMxbdBRbzQcSgyNM+Jagtqx4AsV7EhPnqWkFUi3J
-wfoR7zS8Yon9ZlvaY4KUwzOBC4NaZtbo62gn1wmXNb4Odyx+jFYLV0dob++vz5Gm
-Uu/xiUi/0YVhIqnsaiysgITcy5xxwA0Boh9lInQAFsaaKjgPM10jbVLTdCJFpPQn
-GcOSE0S6xZLj1FwQcO4royzSQu4uPmmYHKyiMAkdSjJ1J6jKcw==
-=32EZ
+iQJ8BAEBCgBmBQJVfxHxXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmif2YP/jzgYIfnARLzfXXQV8LoPj2o
+MjzzoNOw/3JSceE7dD6hi9DSAxSiB9jklB6kKzmelYvLlHu8XlVtZ66gCNrVEqsx
+/5/rKjzUoNF3cJesqQih1FW+pBJkEqOvrVSXp71hs97+RemYHk/Kxc7QpP++OhXE
+RLAaIbL7lF+g1kUv8fkxIhoxxrey/weDUwEpeXEtIolwwKHBYg/NHqAdN3Nwq/lk
+RcX4cbtiH9nvD7EYWLQ3hHjstLgy3gLI1n1s2nQWHIaI7kOh/02E+t60pB/uZRst
+rUdM2K02LFOu5LwkbNlfS0ptdbu2m+HSi5dknZsbW/Y9xyJPSZq1gg9M+xjfm9j0
+Mbq6YXkdP3KdvRupeh3UL8XFNTrFDXZYIxCWmUNXmTXpYYnSJY3/KzUoagM5733j
+kuXacu+zGbjZJByLvipOF5sRHUOK9A+QEVlGnqyaDCbrDHtuK+3Iaa70XIUZ2aaZ
+pn49JYjt8ujqz9S7v4SUHsI0OBoSKuQUnXVk6xIsVBWXf8Z02qljfFPs0Jaalrfb
+RhVEiPJs4FrXj4BisaBoA3qrXeM3x9BlSygI8e+59LE3gArPc92M6tsoNrKUZH+X
+R432vTl0+E3uJIKvcjveh1oStPW5lfiXfK0lJT8lxgqbA39jrATtZHC1VvqAY8uN
+xnXl3u5hYHArXDm8krat
+=O2TD
 -----END PGP SIGNATURE-----
diff --git a/net-misc/igmpproxy/metadata.xml b/net-misc/igmpproxy/metadata.xml
index dc333719a85c..a05381eb1e7f 100644
--- a/net-misc/igmpproxy/metadata.xml
+++ b/net-misc/igmpproxy/metadata.xml
@@ -8,4 +8,7 @@
 		IGMPproxy is a simple dynamic Multicast Routing Daemon using only IGMP signalling.
 		It's intended for simple forwarding of Multicast traffic between networks.
 	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">igmpproxy</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/iperf/Manifest b/net-misc/iperf/Manifest
index 46726798094c..db166718535a 100644
--- a/net-misc/iperf/Manifest
+++ b/net-misc/iperf/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX iperf-3.0.5-flags.patch 1323 SHA256 239b00aa090e7cfbd45f14ef0dc88a90fa24760f05cf005a17bded6df342e01f SHA512 d5e106b9b6fdc704e1e8d5c87f767a912a3e643994b51f09fee34fffcf9007b3eb91adcf3b87e04f90c994e29691dff0e400fb2f13a94e68c58183a39d833403 WHIRLPOOL 9dee2ef383d5dcc39358964be09e0d19d1a5cb0fe864067c6274dacfd994380c1bd4a5afd0789bcd4052af31c36578dc3a62c196134442b27f5b2c844ed06768
 AUX iperf-bidirectional-tcp-server.patch 709 SHA256 732fea9c648dcb9c75213d49275567228c9cbcb49a1eaa32b84fe6fd8af60894 SHA512 b08f6c9e884f9a6b0945c806d471d5007c0e357e90fc344f19f17cf785fb603f0da4c7de667f85823c66f39f58b0a0be46359284730421dc9a573baa67ea6d28 WHIRLPOOL 368615b1ebc63b3959b1519e6f6f2431f7c25aa3c20094a7e8b6c76deec9ef6631be0d9fe4de1c4b4f71ec687c5c01ac834a16784c0ad4cb37270a551d40bbb4
@@ -21,11 +21,23 @@ EBUILD iperf-3.0.11.ebuild 807 SHA256 99f8ea45a6d57eee45ca1f8f09ddfd6a40d3e759c2
 EBUILD iperf-3.0.7.ebuild 800 SHA256 97c7916879fb0588c87dfca16c11d3f5ea6b18ef0e85bc97f5297a863d338210 SHA512 80453541fb8417e03ee24f52d80d24bac3d43540902065372c8c4dfc60102917e47cf542d20690e2bf8957841789c1481c4c26d043b10bfd65932fc6b9701e30 WHIRLPOOL b6088e5e5b4f2574a7536fd3bf9b1514224b357955dc53dd0824f82c9878ff89235669fe1e17dd0f2b92a1d369aceb1e6f870ba43ef3a5e7cdc2bd73533ddcc7
 EBUILD iperf-3.0.9.ebuild 806 SHA256 9c737f1040f59ab980fdc783e2bb065127fecb18739c958df395cc7ece7ee432 SHA512 d608488a2b99d440b0e4401900d099bc1a8bb606d674126e97458b5d107bfdf0081966480ade969fd513522fc0f67c946edc1f075f1448676db99b73a623a3f3 WHIRLPOOL 897a32498f8eb855be93c22ce3ebb53af87b47fdc2137c18b00136d8048414988872d2175b99e0886009dad3b564da3dcbdbac36f6d39ba29e9ac2ef2b68f036
 MISC ChangeLog 8377 SHA256 2c66c7313282b15938602c696b5f74e8a0be00444ba9484ebf66ad799931c4dd SHA512 73b839651abbef332857507b586fec4e4b1ffe59fbf460c189b8cf3f4dd248e2c0119f38d4d8fd66a7661eb744b432c708eed874ba1d3be4ff4d5e99d292d6d3 WHIRLPOOL 9e6ecb2efd4191c03a8fac558afaed5dd9beba890f892e60903bdd38892cfdb1531589a8c6e5f5bb182298d4614f4997a09c03fc7ac7321e5a53ff775c1d659a
-MISC metadata.xml 159 SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6 SHA512 2c104d2a804da0a38770b6f1ec26cd5b0a49e30392177d5794734a3f4129e82fd0971e5a8a1e48913bfaf1bab57e7bac1fe5ce4f5c618ce057aa5aaf9e59113b WHIRLPOOL 044dec64f8899582332d7fbd7612d2a7c5c7234c44bb9fc51a56f7d6400cd3066a154c3c49dd3f4b468f11e029aa24ff0097ab1387b9f322d57f1d9876afd601
+MISC metadata.xml 236 SHA256 3f1a1ac5a45884e4fff60540ec0373ae91e95a77b732816e97d523ad8c02d76b SHA512 f79e6944ddca6f1af59b6e8f7c5c16c6a78b107b1c2b0acef1753f97cbca4d211266fb4e9518afcd0da4ab325c733d1cce0ebf862623a100cede80a3e509aeef WHIRLPOOL 53a7c5e4436ce25a3153efbfc52345290d96f1aeef2a26284e1c4e8f05d17bf28043068d2fedb09c472156b6716f4c1348000f22065482c4f3fa14b0a37c96d7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlS08fEACgkQVWmRsqeSphNkgwCeIDCHZ7kUhFekCk2dewMAic6D
-tS0AnRWzxudPPB+UZVqKJRWpXKv7KMAA
-=hBVx
+iQJ8BAEBCgBmBQJVfxIBXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiLJwQAKhKXkn8TCyN/D2dtCQt13DJ
+yKFn9Gxlx7EXs63jauGr4c8mw90h5SxeelvmSiwnh2OXIN2Msy8MNtvDXOaUsbyy
+SpQERZbHovPZ8xzPGozqPfW9Hqj2j/cutAGUbmyiFQKmhweqbqir6EV47vFp5NWT
+OT95ueFCdWO7qDj17GN10l8lzRog31djYNe6hpSuAfRjnfDWfugGTBTAqgnCmUXW
+nRVWeV0knKe+VrTD+cHy80FPs65wDlJTTgSynIlIw9qVNWzvwYVucfnJcUpUMJ5R
+PF9h4is7L4SfxkjlIEArFa5NDg9GOulJ7I46zMYHJJhJ89P73DQlHA3aIZbY8dx3
+E5gZ9fPCpWoFM+IOZ/rmR2GiQfVjsXzfPf5L6aUKizsSdPI2+HP637iW1jN+FF7i
+GByEu12VrHJQUcZA0gjiNriNr/GkOOhSxeDfodLPtG8APqn9L4d+MM+P42WFFaEf
+SuhX6UJjY2rwnu2AORhwWX6330INsG2gHyOJJ7OZMjEeM9ZoJtVewwTRKCCRyRCS
+qapTmlqmEFU+UgBjEb4Su2vZua0W323f0GYGWoXZfdl60CwaLGDNZJDfVtMEcyHI
+n7Pt2YEXINBPo+W4WRB4wTZQ3pm/xvM9Qm7zxoTX1U1nXExjJt70S25dU+2hFL/+
+Fbguqt2yCXA0ymiH8xLF
+=scwk
 -----END PGP SIGNATURE-----
diff --git a/net-misc/iperf/metadata.xml b/net-misc/iperf/metadata.xml
index 03aa50bab7e3..9371ad630434 100644
--- a/net-misc/iperf/metadata.xml
+++ b/net-misc/iperf/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>netmon</herd>
+	<herd>netmon</herd>
+	<upstream>
+		<remote-id type="github">esnet/iperf</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/italc/Manifest b/net-misc/italc/Manifest
index 5fc4accc0ac7..57959e7b416a 100644
--- a/net-misc/italc/Manifest
+++ b/net-misc/italc/Manifest
@@ -1,27 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX italc-2.0.0-gcc-4.7.patch 367 SHA256 a3365b44cb1cba713d4e9b70196302132788c6cfef9a4e433b703d2ab2b3f97d SHA512 0d46430c6031a2ca87bb02a546fc27b687bcab4056e9ec96ba68c6c46498e3978baed3b3209900a04b437660348fb65a783677089f7cf491cd8bde5ed450fa55 WHIRLPOOL 78de183ac9d68465678e9248fe8e7a21d93560d260e859db71888129b961b57d06b895d8e196bca7640264a3d147e93c3d3b0d912fc1d61307361b7b13390430
 DIST italc-2.0.0.tar.bz2 3413075 SHA256 edb5e0502ad73e3398f63e2f485fa7ca7d12cae50315801ac3f22304ccdb6aac SHA512 2e0a0ce97933df1d7332f37d8342f39dd3fad019147e212cb4c2e4e241fdace9ae7febb48cd8808017108de201850d132de7dde35d01a7e60fef6f69302cb4af WHIRLPOOL fa90a335cc5253a513eda1216def0e712e47ccb5b6c1991066090447569a6580d1ee58ac9faa337498e62a7c9c43c40cd17c5260acb7447fb2fffb88d93002a5
 EBUILD italc-2.0.0.ebuild 1665 SHA256 484cd3c70b9b92441b7703d173fec5cb58a94760c808b66946ac66eac8f406a2 SHA512 d754e7d3141fb4cb5f2e5a0e007de4680058ea05a249c92052eb522f24f77447db78e363a78a63c3b51603bfc5ef529161133d23eafedf2274ba9d55fb6cbe72 WHIRLPOOL 312d70a67a98f99061ea09eee860f27e839f619e6631c389190b2e3d42133281e2f00ef3923b585e0e511959c3ffb3e7501eb4c1501398e9d4825b24ba65c174
 MISC ChangeLog 5121 SHA256 1dde818e0eb95bf2b1c297a39bc3ef6305875dfafe09f5db983c3fc784cd8eaf SHA512 ad090b7db2af755e5a6b4903375cc232de8a0224f36c9f2faa304aa0cbc78bd5a43502216c714925a84cc4a0c5be70b0229381b9c9331dc1ce8747ae8ccaafdd WHIRLPOOL 1a64cac1469a902f01301e5a20ba63e86303760fa3321e608e9f76995d44793121c081a1fbbc4c832eb1701679a3461b2312e7cd5e1d4dbeda8dba5c7e1e5d5c
-MISC metadata.xml 214 SHA256 0e019c1dee563e5b23815be471ae1b65fcaf721a91ec48037446d41ca787d3e5 SHA512 701b8c51f43f8660d40700929c243a2dae9f19dcbc7b8eca877e20eadc1ae2e0c84f7c7d8c3cb576055c1a49a55e9c759ef469eeda67026ce252d341937f6691 WHIRLPOOL 977119e736e0795137df14faae681f7fa07ba8297a19ef4a7d7b93de7efceaed16f7103f179a762be41b8849c33c535b55d16d2fd0ea795df0525592752e0156
+MISC metadata.xml 289 SHA256 17476c2ce34182203cd2992b853231ccfc51fbe43f71d9eca375d960c94a25de SHA512 169e05a25abfacd37338c621be6ffb058056bf60935962b1a1b105c84226cac7178da6124d857097ed8a2346cb791ed7d0ffe2aeee2dd16acdbca9c2beb01011 WHIRLPOOL 7cf294061b669db80959bb850a0ba56f06c25a57246be961afa0d8828fbc23281fe0567615c8302e2fbeee744f4340ee7f83c28ea3828f1e2bb8e3b5403d0028
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJRMoSwXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88EykP/AuBChJ4QZUSBEt2V8jMOPAk
-49foS/snYvtl2IhzhSKoGqw58hd7mWJOkwi7Tif3rYooDue4hBtHKOTc9HznoaE9
-PKtuYGzEchMYhhsN4LqOOk9poY2WQyArP7EaGqG8gfQf6CqzMt9wlYNPPLqca3K3
-E57gDipg/w3za+RfUavTVUWnFMvz5ZX91g18Rj/9r9955lmUnzqW57Vy6DhO5Xta
-D177IycX30HcE0XQGJUNAlDamtj+6b6VuzMzyuV/dWWaPilQiP2DNXiQjFvuKNYD
-RCrKvLompnJ7K5+e/8kWrEYvtyQo+lP9jAgZFZKbYATSGDIVAlEeL4KrygBd/lZt
-NlCOufATRcvd2wz2Ekuqb568xMInZ3vMDwhWfWMh7CxytQjJiGsP+E5aP9GcOTI4
-CASWcQ6XdFzyNg/e5iay9Z5/6ghcutlz2rdOHLK9sMbWQSmFADEUviCg7afCOcro
-B68PP8dolfyxaF5wUF43LicUKP2DerMrcxl2NMTrcUmYDnY3nxUBdUioFt6d343+
-YmL15fQcGsfhK9xLrex67QrDBIE84unm49zmNzyEVzmrtTafDPVLZdmXmgv3u+H4
-/CEI6Wlfak+f3RgLY15DOUp9qN1dh5S2KWSa4ZSK0ZNeK9FdOXZPvfmLUxvHv8ZF
-8Z5CDsUV6+4vQNcoNwUa
-=aooa
+iQJ8BAEBCgBmBQJVfxIMXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiZ1MP/j7/XgNKbk/R3yaniCArUS6e
+Xj3GCyblwv6eOtHsnebvzvBtQzPlRQwNgHpN9VnQRuqR5BIrROzfMih5q5ys7o86
+h77KJXftpLa/LbahHqvsTtawS44n6CGYtTxXeAp1wM61yCClDSAocV6zLfmuCscn
+aMehcLkbLyhictqMwmqM5g4GFFpqnXPqKgKp++oZJL2vn8nUYt1borM80Hl6gXEl
+j7Y/xp+FI8NrMKTOOh7eM53mfMdMIZZ+D0wvbc+vcIX3S2QrnKOO6dV/D2hIDDPe
+Sqvd0oclucjWtLwjUfU7AdafDjtZgYtBQAibFmP3ZAPla4RG0E8C7Ymp00Km+NGb
+Z75E4yHHcLxJd7jyqqvcYHI8nJTOzLw0Ib5kiY2LYjKiFk2Aga04NqXyLo1NPZAf
+WPI4uw+Zru4wDmy0cA8784t8phBGM5m86QGtBvxHXChqTLxSAD1KB2N4Drq8qUCR
+lwSH3v8SvuNF0KDxQaTkjpmH317IUxKAuKlJGnCk59zKi1v2sTF/piky/vZ/pw8q
+og5S1RH/wZlAZDT8H8ZGqEWoBCTBYI6kOZgZkqqf53heay2jJesNpR0wovXp89YT
+OMCJlZu/gwSg2lsooXfZfL97QU5wBYJMGlYed1ik4kqgyoB04W3kGGAoG9DmI/BX
+mFAdN7aTeW3koWg1+5LE
+=P46L
 -----END PGP SIGNATURE-----
diff --git a/net-misc/italc/metadata.xml b/net-misc/italc/metadata.xml
index 91f4e72fb544..f8f190542814 100644
--- a/net-misc/italc/metadata.xml
+++ b/net-misc/italc/metadata.xml
@@ -4,4 +4,7 @@
 	<maintainer>
 		<email>maintainer-needed@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">italc</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/jrdesktop/Manifest b/net-misc/jrdesktop/Manifest
index 5a7472be8ff5..4b0154f2429b 100644
--- a/net-misc/jrdesktop/Manifest
+++ b/net-misc/jrdesktop/Manifest
@@ -1,4 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST jrdesktop-source-0.3.1.0.tar.gz 228134 SHA256 9b9cccd6c62c0487bd2a124fb3ed9159c750340d6d7139a28df002e67c384f40
 EBUILD jrdesktop-0.3.1.0.ebuild 849 SHA256 154e010454c82c9a2df1f8fda04b1d09a60f3d40bfef6b0f290e0d38fb63353b SHA512 333c8991ace388325b95ce6c0425cd4798bcfda3e3ad8fc49e202a8496d46fb2881c8b423a9b9fb794507a36a70185df6b8fc02ef4ce3dfa7aa8a03af18a51b2 WHIRLPOOL 39fdd9e312fe166485676e948dd62a88e92db6e9b27f52c833194547c2639f24e23d697363e150b29143555cc0f72b8d31052b24259b0d65b0244930fa0cd5da
 MISC ChangeLog 1311 SHA256 829a11f6577c652c85f6b63eb26883f85401ca023b34b8919b6a65f5619f38a5 SHA512 e33f082bae2e245ba45edc8c89004c2f7710877ca923a65d413f0f0ca79c3ab0f428e1312afe62264431f568feb31f8bbac3ac8abddc70562feb507a83f9fcfc WHIRLPOOL bad5f7514d65b8ac09e8bf00e07410780b53fbc5a2863960f9985a3f514d6454e4c4ef6a595ba8a01769bbd5d5302cf01276493a913b6fef4de182953af76ad4
-MISC metadata.xml 615 SHA256 437b32acd9d78b3edb2f5025bb51d0221861b8a16304465de8da1bfd18bdd393 SHA512 64cd5b23d04b23265f21c7860b97277cce420297bf1e9a9d04028db0f855fb9e81177405177736f1c1f2396aed5e249eec43fa5b257b2f5ea909180e57abeba7 WHIRLPOOL 7e73ea4b30fddeba659f31791f93a992c7127364f861cad8d565b2d30cc6d3bce568d52704302108ec14874540aee6d7d5e9772ab6f9088979093549aba6ce26
+MISC metadata.xml 693 SHA256 fd9b3e75dfcd30e4f41afe5e4dbdfd4c20ee524941c07822fff1475a63bf8784 SHA512 afe63bc2b4991d2b439416c3d2b2037de6306e35cca51cce6d4250b03eb17d30e423eefc71aa5a4b57fca93f2860cc01812949df140329784f6c28e75fc6569f WHIRLPOOL 78cce20ea92ceb551ec4b70e0515357c5d76809250d8e4233cdba86ba0bac2c59dcbef3ee87d47a98fdcc0e8d10628dd0683b61b21022fdba2d9493fffb90e67
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVfxIVXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiDnkP+wX4KkkbX7WX+3qCgCnQkepr
+6kwIPxNEslBofAZyjkqQ/2h09x+JWoHpQHZCLGWOf1kixM2tSXv98X/AQ6LepCs9
+2bcmtjn7H4Z9ZFLmprE3JTGK+5dAmfVZTE6rQjMgpPtok3hV3NRYecuRc+eZv6Df
+E0IdfVIPS0PAPaTrZ7pdE6cCRHPz+9OaqUwc/FPMvKP8uMts5cFGAp2tDy50XSlE
+AsCMfh+ACV5kWQN/q4QpImL6elmIU66SImpGLOW8uaUzLoOXV4+7K3l5YfX9HXxV
+5tRoE5C/UqMYonnO7hqdcB8ZpJEEDFr9jdt5duIgjQB9sG4ljkP6H7DQn05dmoYN
+tF0595IErFYb0EhmZo6J1QqT3wiZRIOjULwmyoIfMDzDxYlRm1bz8LMepyM9/5cW
+wTqlVjXKFbYR9BlMLLlKOUNL+1tgJre8Sxt9n45SCxTXN5a1sZaA1ZPo73IFaSiW
+dvPxiNx9SyYtv6oqtUaL1OlRk0RJeFQOJ6Gk3ppYM24EaOTjIMZk+mAV4nnc1zdM
+dZTbf+htj5pxLhXCCkB2D2hEOQt63ASv4iRbY6zTOvVQucjVVyROSNBqeBzOGcQ+
+uacabPkJ19zL8h7TMA4U7SFsqjtaghBZdwg7ajzC7Rar4SlK3iK1yrao/wondkz8
+H3FNF3ATUPjSZswt0GbV
+=6mZM
+-----END PGP SIGNATURE-----
diff --git a/net-misc/jrdesktop/metadata.xml b/net-misc/jrdesktop/metadata.xml
index c70b52605b02..5db1b0e61f49 100644
--- a/net-misc/jrdesktop/metadata.xml
+++ b/net-misc/jrdesktop/metadata.xml
@@ -9,5 +9,7 @@ Besides then screenshots, keyboard and mouse events transfer, jrdesktop includes
 
 jrdesktop uses RMI (Remote Method Invocation) with SSL/TLS to establish a secured connection between the viewer and the server.
 	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">jrdesktop</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/net-misc/keychain/Manifest b/net-misc/keychain/Manifest
index 507398e29a2a..bb55d965267b 100644
--- a/net-misc/keychain/Manifest
+++ b/net-misc/keychain/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX keychain-2.7.1-openssh-6.8.patch 1829 SHA256 e09ccc20882c736e0eb71124871f8210fa9b8279991a71f15d0ae036e24a5ce3 SHA512 990353e6764f105c8a4167ac444f75a39ce4d839b4a4f2756a766ed2aefcab2e5b72f7799a4cf7b4d321ed09af0558818227811102da16b9e5ea7986ba56da39 WHIRLPOOL 6d7e0d3c2fdcc7b669daefccd1957fd73dc0d00eb6a7444a860a16a8a7b999975c0cccb0f80039e4e9631cbe6f7d6f28082f287ee88e0078cbbef0364f04a3bc
 AUX keychain-2.8.0-posix-sh.patch 1195 SHA256 51673bb69d198a9a4fea35658d1fa3adbb63725d0eb0f568b0a3f528b79825eb SHA512 cf786dc9902c42378d8a5120b9b7f581243ae83c0ba0fc0a0e3fea1f0916416a6977d71f2709def12991bfe57fe47c44597d4c8ef48a5a32ce2d83c4b0d06893 WHIRLPOOL cacbc169e131d271a3b78b5f18899577f01b2435b22f02e0f2c8a253cedb9b1470b13f379cf2c4d119bf6009cf729f5ca7c48a5c706883639d752a24efd1303b
 DIST keychain-2.7.1.tar.bz2 51379 SHA256 1107fe3f78f6429d4861d64c5666f068f159326d22ab80a8ed0948cb25375191 SHA512 03cbf86d39964266c0ad53cec6ac48ecb478b49b3b9a1de7c29ec13179af8dc0f4679a5ed6e52ed1fbe087d4d3a5d31174f7f793aa23c3c04fce8a3f51d13168 WHIRLPOOL 3b2051f695e888419596b352e8bad6e986d2088d651f260d63abf3ff7da2e116aee6fb8c1d6036780e6dca9be951b2c4ac122f715ed4c1b1f93547971cdece2f
@@ -8,4 +11,23 @@ EBUILD keychain-2.7.1-r2.ebuild 970 SHA256 c4423817527226539c6be1070598a866d3f7a
 EBUILD keychain-2.8.0.ebuild 909 SHA256 d3d6aae7fe804d3767378b0ebaec4bd52a7b4e17fe8cbce5dc3bd5c43fea167a SHA512 509d40065f28f9296268b793a8ffe886a2d546f5db007e371cb402d18ebd134fb99d8a5d4d99768c39bbcc7f41a33d61fcca632c01e89b00837b4e2e96064b51 WHIRLPOOL f741832fb6340c9d72698e87440828438d33265ad5ba92cb0029baede7cce20950e238f85bc50e97a19242bfba7162b9c98b3711ddcf5922dff6d70d97d57ea0
 EBUILD keychain-2.8.1.ebuild 830 SHA256 116618719c537da07e8dba7decb9ba206b42e94260e0931bba9b108d9dc72bab SHA512 f51d2a513c9da195551b1e3bd38f9e2c320ef08c560ef3d8e84eabec941a994d9a9df8926c7e861b47b4a84b63556342a7c29dc602b22c91e5cf7186da18353d WHIRLPOOL 81ef996adf24e414ac36c507f043c71be09e790b9ca7eeabf55d5259e9a99a0d270591525bfa572e44a194ff42ef7115cb22934daaa0553a3aca3d54d02850c8
 MISC ChangeLog 17975 SHA256 70d4f038ca8220b77334a362ec870fed3539eaa3236dca617c1d07b6eb26ba9e SHA512 78a29ff54f8e4f27dda295a9a8f5eab13614acd32c3ad06986f8fe6a628d2165be90f50fa9840f92047daae96770fe5eeac213ca827744152ecbf66490722c1d WHIRLPOOL 4299ac762726a41d88d980df4fc756e585101c9c3bd53030cb63d89929d34e90ec09b4a7aaca6f36b4a119214e8f09d696ae0f41d22890c455588e7c025466c2
-MISC metadata.xml 351 SHA256 b5aafb27cf1a947008c9406e95358ced320c95a9719179ae9948916a3f862bd0 SHA512 a8244763dfdb3aa322e5ad544400b0bc14c8ae1c0e2c2c867d38ccbd77124db5348e586cd0333b7d517593c7e64d39edf7eb70b6e1b76f0ad6a7158e6c7dea4b WHIRLPOOL 89017a3bb6fe865393f6c9769d3d232a88c9a36cb3e788c5466ea9e75fb09511ddeee1aa874bce690b80fa52c85b707f40330a1ed4eb1615c980022f42b73556
+MISC metadata.xml 438 SHA256 40cf626f82b68f49935268d6f6a307acf0af582ef2ae4b17317b71005eaff5da SHA512 c89ebe8f2b891b054f6404ee4c0e982e3a384a7d70ccc7428b8144eae324d1f2d6dd86965a07fbdb49f57fdc7eec6c23dab5172f2622eb0720dbf6071c69e3ad WHIRLPOOL 7b8c3c0dc793f1db05d1a5a7b5e5c316568dcce53ee281f484203bbeccde89852915904401bb980061c98be42784b1ecd532479b6655cbbfd2e1668ffd5b04d9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVfxIlXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmivpsP/3uHFw+kTyNtWUsDy8+KGvub
+EbrNSB3YuDjJL8I2MJ+D6ExWa/A2X49ab7CTVwwkV09glMmPapSjCzVNcOWHGKZC
+SigGfaqyeCBeMGhF7rhX32kHc7DSNHB79yegNOu70ag5ywDSdDDy0s3sfWxLT1Mr
+6G70NKOO23lPZKhywPQvsh9BQ4zMruE8kUIgqfs2flgKhfpHQSSt7sI85FKln8V9
+DRaDMmVZLNCExwTpbN25jKAkjtpShGw8/RSCv5CgxJLCQe824kkEAQKNKDK3LjGu
+aIYhbB4gnnGIAGivNRbC8ucrz61zXOcNCmoK4oidedZBliQn0qcW1TSRHu+WjvCK
+jVSDr5q58uFDBHCCjeddIjXpwCUV8uvUNQpRo/bAmzKqrWjwH7Np9DNbaL4ocCp7
+a0fPwtT1dOA770EV2Qm5WXrFCeHfa/4UZL2G32MRaMVLKbjaSLxGDjC2izo6nBTF
+rd/SBHneHA8AZF+62AZBXVEX8nvX9Gg8v6fMwL66raVdhItHKS4AyxzW2BQsvhVq
+qiAgEIf5oSfmvcsN8D4R6Cu78TiYdjYf6jCD6nsRNsdo/8qRCCjzGmqwKPRA15hf
+r+euJGUQqYnGqKhngZt5PxqgZW+PYikt9kkgDfh+w3LzweVSgq0AIb4xB17qxSg1
+WZqlBAE2abWMcLmE5oZf
+=BpYl
+-----END PGP SIGNATURE-----
diff --git a/net-misc/keychain/metadata.xml b/net-misc/keychain/metadata.xml
index 925860e5e512..373a5008f7c7 100644
--- a/net-misc/keychain/metadata.xml
+++ b/net-misc/keychain/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
-<herd>proxy-maintainers</herd>
-<maintainer>
-	<email>drobbins@funtoo.org</email>
-	<name>Daniel Robbins</name>
-	<description>Upstream contact, please CC on bugs</description>
-</maintainer>
+	<herd>base-system</herd>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>drobbins@funtoo.org</email>
+		<name>Daniel Robbins</name>
+		<description>Upstream contact, please CC on bugs</description>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">funtoo/keychain</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/kumofs/Manifest b/net-misc/kumofs/Manifest
index bb5fe9e713d7..2f8ab49861be 100644
--- a/net-misc/kumofs/Manifest
+++ b/net-misc/kumofs/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX kumo-gateway.confd 168 SHA256 39c10abe072c63229d640738995ff597997c2df9c794272d3fc456918f79ad22 SHA512 a1a0964b66482c749e7b827a50a1d496ea32bbb3a70ab0b68bd7eb7db7554ea990365469928be077c719878e6e89111a0bf12496799d5e9c6cce055a9d49271a WHIRLPOOL 4aa4b756aa9b15f1ce36acd32579551df2f69b8a572258c0dad98d307456fbcbb20702b6a28860d2e12567e1ed6913ef467467f809236db02c4dffb4ef91b9ce
 AUX kumo-gateway.initd 773 SHA256 35f3ea019bc1292aedcdc4a182609463c1db7a388d7f4fa0ac517cb9f06c5165 SHA512 47df4574578449168a86a8ff9ea21b4cf202022639cbd4cdcaeaa18ffef51b6ffc65c5de8f9c29f5cb685de7974b56a0d692f080768430a28792c5610434de35 WHIRLPOOL ba8151b2b8a970452e3524d19b25adb24d308b77301214943df15a40d483645fcf9c0d5b9703cb919ff1103c975d78644bb59b3cbb110532ab2569b7e83f08cb
@@ -10,11 +10,23 @@ AUX kumo-server.initd 834 SHA256 08e6a14d213ef3b26c87fe6c8c2307ad8ba9181a5c10e03
 DIST kumofs-0.4.13.tar.gz 534413 SHA256 18080ef4e3194b08a0370cfb66375bb8bcc0a8983ffacbe989310abe7fad68c3
 EBUILD kumofs-0.4.13.ebuild 1168 SHA256 e68538054b7c2f16ce435aff97bc60e523f756e384404c31b5121c44773ac569 SHA512 155b848f581ddf0235d96483093c76cfde5c20cc00bca04be5ecd61178cede94d304288f9e157700a69ac4434a7e8fe5c29f137232cd57a840bad5eca0713c8b WHIRLPOOL 9a478b65c492fff8c86ceb3fb3610d92fdda579560b93a84cee07bd6143139d7e0147b808e9438a06c5e28f9b4e5733307e32e027f9aad0d2725f0bd289d758f
 MISC ChangeLog 1176 SHA256 1b83db79b81e9919bfec0d6152ec7276cace45e4c325cc9335102a796e4f6061 SHA512 5d5ae1a54f2dcebe26b7b4d9fc17b60028f8675025d6209e3b82d525ad3da470eca67fa1a93f9280eb32289bb7cf06d72b433bb71eb0ea99dc9e61b33855550d WHIRLPOOL 530f1eeeccb984956a5f63db7c5f38b750d4924976c8c52c4a5d7946b52260a091df6dade9c968675f681afcebf3112457ff5474f54cfec4922fa15a35a8ac8e
-MISC metadata.xml 211 SHA256 a1bb8d76bdbe2da71b9cc04ecaa254f575552aaf5b7e94e9e04b131a32392c3f SHA512 0f6138e9843c5ebe51905db7d461da54073a88a74d938fb1d59d7f077f90002d0d785a883d70b640fa81c1c5b20dc5b9ffd969966f1cd13db71d697372e6f573 WHIRLPOOL 596d2e7e8e9245273188e0b865b481131f71853cf3313d58258266e461fde4ea22af8e992ee301e8f179a612e2a839f09f8ed504c7d086fde70f906d63c726f9
+MISC metadata.xml 293 SHA256 327ada136520e5dbb0b5de18688cead7ea44d6d0127d7f6d70313aa5cf5f4374 SHA512 89a20b43655d78a1d7a7678e90bce9fc11d2a338171cb218b68c0b5edaf6b975742a6856c608e6520d7a54068f72821f3495edd718173e19670331a49ffc60d6 WHIRLPOOL 928b062efd9f05af81550d65e49bbe932cec99434d3159fffe105a9e00ba2444599dd801500ff34047d4b641535b302453ee63c366bd55a8884e6aae71fb4018
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlEOWbgACgkQCaWpQKGI+9Qc0gCdFuP3R6wNn5teS98MXmKEw1G1
-ikYAnjaTYWdBmCY0Ubs05FBCg5qCc86J
-=oc9e
+iQJ8BAEBCgBmBQJVfxIvXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiI04QAJ7+mQlCI8LdfR8n/n0uDEaH
+9FSAHwCo7bcVH7JuytZ8XzMLMuAifh3F/eEmdNCLhGsRL5Rmsr1O4PaDl0ZGqINf
+Cs4n0YfxHqV1zK1MBxElA6SfLdvlkdt1dFER54e8GYT0325syRIPBZQMHmwSdGvL
+iUI2AMlHrp6pWykQVDXyaaTzwDmevmqe+9MXiLiSc/GjEq8uvbXysx7p9AVxJJqE
+TuAlGsNh3GJYfGwCgOTWT9Hrikk7miB8t9bIprlCv2j92m/L56shXPdHBtB8W+3d
+iCErV04upB/r9g5KkiKcagAP+qHDw3xi2zmSh1zxkFe+8/CcvtsT4E8amxy28GWJ
+6Cw9T3z3bOCE8F3czERyZ9SGFKePiOQ8mR91YPXDxk+4fHW1XOcr1zaRgVJJbe2m
+pIWHutMfD6vVg9HeVw9iCr2q6Z2U/VsTvKB3VN/+LrlRFms49Cq1CNVaL939tfut
+xnJLPlnIgIIEkoMmOWJ+BrHOaEWE00ojAfC3dKKMvui3gGUab3e/a4iBo0LuRDEx
+CgqTxpJASp3mbYulEXj8hgVOI+ouLQt2kjbfTOYTp7CJ+PSPVgS1pefD7KbNN+X2
+YsWIPoNWDLw2J4YY2b25X0YvkEGdDdh2seOYvr5LqRSG+0AZ+X8UiL0jRi2mSOv5
+vaLMStwgmC1TO4MQFbH8
+=+6d4
 -----END PGP SIGNATURE-----
diff --git a/net-misc/kumofs/metadata.xml b/net-misc/kumofs/metadata.xml
index 2e90b802bc7c..7221ae7341e6 100644
--- a/net-misc/kumofs/metadata.xml
+++ b/net-misc/kumofs/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="github">etolabo/kumofs</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/net-misc/l7-protocols/Manifest b/net-misc/l7-protocols/Manifest
index e92c251125f3..9a90e46e84ca 100644
--- a/net-misc/l7-protocols/Manifest
+++ b/net-misc/l7-protocols/Manifest
@@ -1,24 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST l7-protocols-2009-05-28.tar.gz 142050 SHA256 d6bf98a69268558543bd32fccea287cb3f14b37521d18c790e2b6f8dcfaa5381 SHA512 020730d0170537213080dcefd847439a2306eea759317e4054549d12e344520e9db222ca48f74c184cb17ba5ff244270b688fb7e89ed0dd21a196e02721e4477 WHIRLPOOL d40993652acac332261fba3555cbce1196e3d35cc52e68ac1fc71b6e5623bce31caa059f021823a6e8225e1d6bcf0a2f529921bd25a15403e912e8f11cbb6245
 EBUILD l7-protocols-2009.05.28.ebuild 1719 SHA256 5d676f07e1145abbebc8638c8137d1352c35f76c0a0037f0be21b9658a157e54 SHA512 b35f767bd0045c111b15e3557ee7823139dcf21d828495f905bc995439ac1c1fb30e876e956863f38f62d7ba858b8d6135657eb2ee5af361d69787c24e071b1e WHIRLPOOL 2c1ee15196982a0d6bde0e5c2f52e84eec2c7c2f498c1ec2d4f3ab3d566a91c5ad4cabd5fd6afd965cdbd27b8ed5ba320b82c5a8fa8f6683446b30577f3f804a
 MISC ChangeLog 12428 SHA256 b80bd7cdf31071eaadac4e0496cc8a116deac7c6a56035ff16abe28c584adf32 SHA512 85975d2b9749472be1b81003dd7a13ce3b57c855adbab8868720a2ecf15113a29cdec05066ee39447afc71dee1f9c6f88dba191d3f00be0efc3635a38ea67113 WHIRLPOOL a9c2b4e29a992c107c9f822b7e2967e19c32a41823733143c8affd4916bc50e235b494a0abc034c4411f959385879e284dd5f1876986c9f9c0313d12379a64ec
-MISC metadata.xml 568 SHA256 a66580931c9a6d865a7bc952ab346b8f77d637af7a23f14988421c33dc7e6036 SHA512 64cf7764fd11f6863568be38de7255832497b2abb183fb9463cef97b3b00faf440a0ac85d6793fa8c96362be38477c11d9b1a04cf788e9d02fb391bf92a67013 WHIRLPOOL 1efe49cc1730ebaf35f1ac768556904a41e391b50a395f5f81a884ab8ba8eae6a3c087c77191ea758b74addbaf2cc872c5d87fc79a44d629a35155814284245a
+MISC metadata.xml 661 SHA256 42867abdf8e82a3920072b83aff9f8656b6dd9ded9777f6a49af7da729a40e16 SHA512 ca5535b701d4e1dc6c38d363c6e21237e6c5de6e24ca8cde1469ca5b754a1043b7fabad93face014db21a06dd85da71ed6c98f0eb453e092e9b52f998f67653c WHIRLPOOL 80bd0585b718088885edd935ae5d34fabef8dc618ef4d7a0e29180ec87ac5a8debe27656bf713268a147a7c18526ca2fe14ac839c05458eaa57cf81846aaacfd
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJUY2F2AAoJEFZZU7lTcnVsCpoP/2is66Lq2JypR7mlUyzYMpam
-1qhAoOGSSjhV1lbHCveL5fOowyGoh+3Dskefc+NHeKtbZNIDWOIf0ZgzB9J9aEPz
-oZGELRG1Pf/zs/7Ichc5QH5NE/oP3gDl8E+JGpF94KBapArMIS6nuvvgGa5xGkGF
-BloWihqKS9nntC/YKz4GQ/eck40za9hdBryfIOZoqma4bMd8xoOmAaoU9JbRUtxJ
-Jow0L/SQwB+WqZlMyU9aVu+IfZij6vOeDxAP/Xkdk8HBHRX4d0SX3Fie1VZ5OGY1
-+XyCSGhWcb9XsCBpA2Jue9Xp1lTBUzkdqw2fR77cleiqrTOvM9nTpv/XMaxx7siE
-oiQyhMWVWcy6zReRyfr3KA2Ve/ZMJRfrmp2XpaZYrdxWzddF4UsgZzSnQE7IGn+D
-6cWk/PMfFPitoY5bcjvcZHAJN4FXJTqP4cDpqmPjQl2GW5uaN9N8B1qwXfPlH2Y/
-AMabzGMOSsliGhZWIykvVIcVhQggHHsSUhCaDNNCjAEA5kEG0nGul1kGXU/tFbsQ
-myaF27jeGiW6isS3LQOIgtG9+YhxlGnCG6Vys0BhTj9iuyeb1sgsmvObu6AqSW7b
-KcFlRaBR5BoZzrLXSE25E5qu371Wpn7ceSqxUtZyUVaSP125RIORh5aTOal/X+bt
-saClK8OfuUY+T8/4+sK6
-=kXJm
+iQJ8BAEBCgBmBQJVfxJBXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi68cQAIx1eL910VTzVa1PjEbEbnnG
+Ze1Vcej2SxyJ6ZCqQEmhYAEbBfsPaJMV35P4qYSLXQmz+2rV4JEKudtNVzoxpUbX
+ggLw6QiGQR1tq9s9piweZDVRnemwm114ungYgc52Y7lQ6/yOplLbT9/+h0A0Yr3q
+n6RoA7O/HE94rf0fkK44+9Vxe+arAnRqow3qsbSNmXP50KJtSZkCMaZPKTVk1rlZ
+oE4oL08TGm1ulRPdWC0bG8oLQiaF4N4lCv/kGCWYoer9vWS4WHymx79eHPTIxCcZ
+AD6YlL2aedV0tKBTq0hJ0m9itruR0mxXVIGNB1MbhD+dDtCx0jjfBT8c8vcQKiG4
+jwLHdHkwY7jQkD9LAZyYbYrnVF+fDmiAeISVKarOvJJnCVgQ8LVExqAg+22RV1Ar
+T6NX4a4JTDCJnXDJpbKIJo9gL0qDSN/AoLEL76LmfV0g9lK/v38V9EtVmKWM+7tB
+7/S56It6rgkXgasE/rh9tkZKLgVzQ1qF7LUmSz6YqDuRGDk9ukYg2ZnmFY12sUCN
+YS0ov9LsBRSSXRYfE1bISu9uu7fG05KNPdIJcLzJ5xI3NgNIzr1XsAmtLO2593EN
+x2/ryjh6Yk/Zbd91YSBxjy8QfTCogHpujgNwHd8NDTUrTxEgYrRhbQkYvOZgHkD7
+yTfLJHJXXEepLYt52xKJ
+=Bf36
 -----END PGP SIGNATURE-----
diff --git a/net-misc/l7-protocols/metadata.xml b/net-misc/l7-protocols/metadata.xml
index ca696464d509..125e82bf5480 100644
--- a/net-misc/l7-protocols/metadata.xml
+++ b/net-misc/l7-protocols/metadata.xml
@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>bircoph@gentoo.org</email>
-  <name>Andrew Savchenko</name>
-</maintainer>
-<longdescription>
+  <maintainer>
+    <email>bircoph@gentoo.org</email>
+    <name>Andrew Savchenko</name>
+  </maintainer>
+  <longdescription>
   These are patterns (protocol definitions) for the Linux layer 7 packet
   classifier (l7-filter). To use them, you need the kernel and iptables patches
   (or l7-filter userspace version) available trough ebuild tree as
   net-misc/l7-filter and net-firewall/iptables built with l7filter USE flag.
 </longdescription>
+  <upstream>
+    <remote-id type="sourceforge">l7-filter</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/net-misc/lambdamoo/Manifest b/net-misc/lambdamoo/Manifest
index af83c9bfce58..4ddf3d1a8b31 100644
--- a/net-misc/lambdamoo/Manifest
+++ b/net-misc/lambdamoo/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 1.8.1-enable-outbound.patch 451 SHA256 932f25662c080d66b6e60641f00907cf99a6397ab73c10d208095155839513aa SHA512 16aec9e348a2b6ae4d773f12d007fda90d38c0d7113120fcfd63d44ffeb8f2fbfbddd428e3f091581e054cf2c650b92d737c5c63178c6db526f7e2bff9a9c712 WHIRLPOOL e2bd8908b6ced71fa7484dc7d3c73cfc4026db627fc98e92505ad43eb754a7b898e8f6e310eb463c123a984c960d09086e48a44dbebc7e3a799818713169a3cd
 AUX lambdamoo.conf 185 SHA256 194961a596a12e76ade2fe83d4e7f3b2476b921da0c250ce2ba6ca5132e4de16 SHA512 fa96885e674b571c6eccb682cb4ab47d09a723a1dd82d6a11a42e5760c2b53ab24919627823ab9c4a2aeb5d3d2d41984df3eb9f3de382164b062e024639ba2b2 WHIRLPOOL 5c496df76586bea6a76b395113c68c110d20e0bd2f9f06c05d53927266f3c6eeed6b915ff49e65d4ddcff4cb37673e8df2fe98cf19e2ec0fe649b0ee4465f2de
@@ -7,18 +7,23 @@ AUX lambdamoo.rc 1258 SHA256 9de37237800163d893e0a876352636ff7d3b6b673fb51317236
 DIST LambdaMOO-1.8.1.tar.gz 363803 SHA256 1c404855e5db85224e4fec0667bbbb9b2a3e98ac82d49e885ddb4ce8c24f3e5a
 EBUILD lambdamoo-1.8.1-r2.ebuild 1070 SHA256 9969a4fdf1202f909b990040ba93c3ef44fd7227545746070575077bb994d0d5 SHA512 f8853b2e4f8d5406088732b06468f9770f39781c2646f731d2da87bd63e36aaf6e3dfe79be34301b0e45f20e62ea149f2cc3521e56bd746a10c5ea90e31eecb8 WHIRLPOOL 08374fd79b4df275968fdff5df08f349d8f69fbbdbf7f7935f410777827416585bb5eb40f450b92c5827300d8cbbe9aed282bf855812d00a33bc9c85fd4d1b68
 MISC ChangeLog 1610 SHA256 4c91ab40b4b3d721fe27beee2bed2af1037a02f8b5a83614caaab9e52d69142c SHA512 7122e5aa6ac273549020d01f016cd37e368266087cedb31610191bcdcb05151e350309188593cfde7d2196ae5f9c4d14ea5d0d00d4c76653554213c84b5af201 WHIRLPOOL 63c19332de2d9b2a413dfe8af152db0cb66d5050244b92ad5fe6c9c882185326e12a1e234ff88f3588a82f04285479ed0ba4bd81f75d56513969ea807fe3f458
-MISC metadata.xml 210 SHA256 90082fe26a119a63ca8fbe227f66c33ba74167b6cf28e2cef02dea6c4f656c39 SHA512 4554adeece55ce9adfdadba04443a3ede6ff910b96a11b77bb1f07ddd6bdbc756b8e6e1873660f8f54e67f46db1065980794a6136c6de7883b24d0ee13ff51fe WHIRLPOOL f546bd1233d5a9934ba0480881ceba944cb8ff1869c12ed2421d4ccbb247ee38dc0c7c8b979f10533ad0fc603b5e4829d0ddf174a83d0bda8e8dd62c1c873eeb
+MISC metadata.xml 293 SHA256 b150bcc046f87a721255030b3128578647206d7de29abf0c86007af58e5dbe46 SHA512 a29b10f4c056c2717633aafc0ad3e6071bd93aeeda2e54e0f1df8b56778f1832aa8076a8a5de35b4d69467362b4301e567df77f35000d750c99497ff72e2e4e1 WHIRLPOOL 06d26be4a267f70c205d27cb08bcafc8963731f769da184a11248f6949eded241e4be6d71b88b20231597b91d65d36ced60dd68bcf1da64fecab61cf20af7c0c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQGcBAEBCAAGBQJRZGUPAAoJEJQzkH1pP7W4M4gMAKVYhUs5MmpQmqpZPj6bRTlE
-DlxUwtItBRpn7bdiiVButka/PaxGr0vopDHxaFRvvBpiRgZKJTxeY358rXjA8rrl
-oQY5sqLWJVH9gwMMqFBXRU3EpTQQRj86WAZ+Ici/16YBxNEnrSzB+W6pUigdu4i7
-TvcrWm82yL9LpPhyI3dhkdz48TqiKnBJ5MeEbIPvBp4YXfCY/PJOo5wTeegXGriA
-YMSicAsTlp4v3VKAQAjd6VIEFxLZ5dmzAi/wN6K2FunVmDNJ3QmfKalvsxSp2ycs
-fnNjbxMwpRy7yYFmxh/45K+bhgZhJx2wqnJAxzG0iOS0uQGXhqTnIYztXZSQCPtU
-BnyAeug9HsGgI/VHrq4EdyKLvtmYbgkDEqbVaA0+eMQkKyOD9rLO8WhB/e8UMfSF
-AVCxhBW3KbA+jp4L6lgI3VakxmVxo34ZqhnX2NpPbTm/0jBe5uJF0XIm1F+SpM34
-s0hycJgBVJuuaxKcLbaetIhUszqppM5cOnLSsNal+w==
-=8wRU
+iQJ8BAEBCgBmBQJVfxJIXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiQS8QAL7gvex8KpKUNXFvv40Oics8
+2P4O2/d/1Pahm0Xnaju/C5CYSqeLx8Qey4SBuuQNtIkIUkpphct4FopF3fVW/kS4
+bpCqKiSgy9W4/6Ywu/Y18i3+sW0TiVaYi3p7GaYpkLn1B9cH8IagUkkq6Rs1J+/R
+4M6kHYCrlOFvqamKWff3gr2kZXZfLk4ErT3GgZFO6LPOd7fHsmG8OU8BiPZYYpR7
+qTnOeTG45+FdEqbbDSWk6kbpl6/3XCYvtQEL7kRIRPBDidiGY+njNjH14Wayhe8A
+jM38FPSjTKByNO3TkuPPgAsQUaj9dhUwF8zKvtIXKKrlfoeA/WF98SFgvoRNqKC1
+Y4pR8wIfcYvIyfNA7EG9xtTVYtvMyytM7Fjoth/zx3P1vfCs9TwzwJ4N0mHaCNH2
+3JzaFDsCdmacCm66thl3ZpXP2vDRzOWqQnFYX648MXYFIJebjusY9Pv2xVJLzWU0
+UPqjs5K6BeTKq8iv5Sv6qmYZ0BI+13mUudiO62n7a/k76726p8dtJzkCFpcWsjhy
+h9mW3ymOkt6sm0X9n8519qIgCkwlHquK3YHmMK1KM9eNqbrMjKAy3g3f2Cy+HwLz
+Q6luGF9mAGI1yDrh11YZNmhA1IX94hLsG17HG4puXdwizRO4neYPknWX4HixdqT/
+yNKQzp6XksTarhR7+0m1
+=aNwn
 -----END PGP SIGNATURE-----
diff --git a/net-misc/lambdamoo/metadata.xml b/net-misc/lambdamoo/metadata.xml
index d9cd2cad66c2..602d45342949 100644
--- a/net-misc/lambdamoo/metadata.xml
+++ b/net-misc/lambdamoo/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">lambdamoo</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/leapcast/Manifest b/net-misc/leapcast/Manifest
index 234b3e042e5a..a28cc363f41c 100644
--- a/net-misc/leapcast/Manifest
+++ b/net-misc/leapcast/Manifest
@@ -1,25 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST leapcast-0.1.3.tar.gz 13522 SHA256 0ef6535a18e43b61daae8ee9f9fa05f055f2777254491d7834e86c34a9482264 SHA512 03307f0375dbc49bbf20138e3c47a819d6832721a9fc9ae5b06c5886e8a3b8ff59efcd66a8ee5fed40e968eb014d664fd1890391fb22346d84a40bd73bd150b3 WHIRLPOOL a0e51c1d7dc01340f92c3685ccfca30e5add40a983a80475346cf0071d635935a14489590451e54389ab1125b979bd80721c104ef0da28e4877eb42de05fd061
 EBUILD leapcast-0.1.3-r1.ebuild 717 SHA256 a9e4964eccbeda91b4fd23c4479a92c209e09440640621627c4b867a75b6db11 SHA512 88da84bca0089cb2353a9d31cd05835614321cebde2de0b68fc63b002d7ad9754634f8045cbeff6b35798412b425c1eed0272c58729ea9762fbc216b170904a1 WHIRLPOOL c7dc82163b858fe3d3f3b02ce46056d378df9bfbd88eff53efc7151439c582c07fcdbfad677aeaa8f210f8a0ca9010452b91ec4fd6b80f254bfb43aa84cff7b7
 EBUILD leapcast-9999.ebuild 713 SHA256 bc8d2e376a26e29d6ccce8f09657d546f4be6791df3b8fa0766f42ebaee588e8 SHA512 4de837d6784654656502dba79cf40672b25e741cc8de376783874f7cde81a5cc770f3de4a731a3e06de6c8a84b5a083ca42528897af1122d2433c3251ff3db7d WHIRLPOOL 959a1579f9d2131d8fe77178a640aeeb41055823d4c304cf8cd08b7e203c50ca68ee60c4bc6b19d2780edf42ee61b75cbca493972675817e5e8f1ba5d6c1d56d
 MISC ChangeLog 806 SHA256 c3d1faa56b1b693d539190a51811315f5f09781f5489139b091491fa6c6d6657 SHA512 43f11f6b9632b2f45da3fd26e57c9691e663a7c4b84e3866dce8c2ff7ce66c29129eb7cd9e7ab3cbdbd6719d3675fc4a1cc190ec0ec571f10856429caced37e7 WHIRLPOOL 8d3153537d7bdd4c13a81346c33e12f6b4a28891e4634ac5be48714cdb44a0b4faf02b71a43dd3878467455030a67a0f32e884a66c865b7357e1e46335e50abc
-MISC metadata.xml 229 SHA256 0e32bd4374eb7ddef5d9d3feb500bfd626eae6f88edfe43ac3847e65dde78281 SHA512 8a66f8c117584e3d9b891c2813466691397dbd50388956981eabf86c7720a15b57bc4584f704211faef0044500106802d3ef1bed1592145cf3f8b5259279a43f WHIRLPOOL dfa20fb61d9b2ebb6e4e35f24bfb2e584706440d30fef2e82c463f5ef75df66d5ba809f0126f95c908a59627c59ec1971f015e5d281efe121061b7b09137c883
+MISC metadata.xml 308 SHA256 3d5d471482a306cda7757091addaa56301835497944afbf0160b348c8f0c1fac SHA512 687cf40c601e0c1096e3c8c53c2190f6b2aa7cfcf1ba5ee53bb6d6ffd6528b7ab7df4b88be8c239e5f3f72bbff570d7c1fa0127dbad7feeae7fffc1265867655 WHIRLPOOL 14348361059e7a66ce76bc1d73dd0abf8c715e8071a7540b32d3982c285ce0739f7d163f9144782c3cdaf26d1857473192dc0c67a921187980ca5b3668777922
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJU9VjAAAoJENXWzZRV2HNsMUAP/iQ/QC9GYF1ijBmRnyNZb48n
-gq7hGsHbJehQrEECzBOOWMWB1YJ4N54SvHmEZfG+FY8fQdcdrJUngtu7qFFMqX9U
-fR4V8S7ntaZ3mzcYPv3g3y1Tg2WkLMsOSmZ7iz2G4JGay+qQPhUkrooc9KQHuip2
-mY3yFy5TQYgbOW6K0EGSIzjO9/x88jebEViFzucgJ8vaTRu4JrS1AVRowVx/R6j1
-dRQtWdxfN3n5LgPQyuWO2d0LSkEH5ZVPggJPyt3xVKl/sZe/AWc+kjpFIoLPigVO
-rV7EsLKeDZSBGWSMuGDM4/26IPTWtdXlnyb30br7cEi7qQkcop9b+ec43cZZd75k
-HtmJAGg4ZMUKyn4hGVDpQ7Q/wOj62w7wTobaIFWh176NemMvV3fjTXOb1IJwrH4p
-tclUTnkBSnVfGL4TdxciWER30X5/UV2PvVYy+MpXkicxIKIJZ3Nzaf+ueOp5i8NK
-PUD7gK1AqcEoeh/herbDkQXrZlWDbe8V42rV+w2DIQrIQWXjCcNpkPFaUv0ZiRPt
-Kad7uxECmDQFLixe/QpJosu7/uieMJ5YWIkEWlvXR/6xHm7y2OxMB0m25yAZgfh2
-2SIBK/juDjTrc2OOuIOOlokSI0T/TJZIJPuJzsJwFdWihcuVDcfl5DvNBxAEAS07
-gwyJwhY/hNDpc+BsvgZ7
-=g0wb
+iQJ8BAEBCgBmBQJVfxJSXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSminwoP/iyqvTNGN5dQ7VhHo6HNIjrR
+V/JJ1PDvaGGmBG90pwrYDOe3nm9tG5w0coiZAXn2OKpFVphnvINDsIpXPPJJ+XMX
+5QdH0W77u6Q/q+YUxdy0LsQ/Lap3IOwCi0MeazYTImlfT7BqQCLxzY6rTngGJfCv
+NDXKO7rUJy2MplaNm6GD77OcAvhVhWoE0CzQm5jePjGpKY66j6Bz8p8xlzexFrp2
+/EtsbQ1vSPHxet/ojcnbxynfA/G+Dc0X6iegyCmmcH1rsv+4F+KfPP9kqZtooxli
+LRm0eeWJCMolmysz/x9fLkgXmwsuvctyX8LUhjPl4qg2Y/lJFVlc+5a7dq+9Mg5z
+A/+wnayyisRWG+PfSH6D36y3/M6ceO73RHhAFJCvDg7qqlS7ElSExQLPXyVFVpVH
+7NfqTum3XhtWnM9MFQ5BmsbSaj2f1OQHX0S7kRcKu85eilPxgg1qS1D2V/JS76vO
+0bvmBy7eAxtsmyVyzWJzdtJtRmek55yOtvVavdYEoo7VZL1HkQl1D14j+IoPaNZ7
+XTnYVxZ8n1kd1hWW5DO0AHv5qew4x+guxA0xVo5jLKnnkkFRNmCs6XihOQEgncOu
+5I7uy6JInyqGgmV6xg0Y1/nF+JieoGpVhJVcK/EigmPpZFTLTqWqs0LjDXINoO3f
+2mtfpBjIDqp8NEGXVd3w
+=yHlr
 -----END PGP SIGNATURE-----
diff --git a/net-misc/leapcast/metadata.xml b/net-misc/leapcast/metadata.xml
index 7516f758690a..b0e0a5887535 100644
--- a/net-misc/leapcast/metadata.xml
+++ b/net-misc/leapcast/metadata.xml
@@ -5,4 +5,7 @@
 		<email>bman@gentoo.org</email>
 		<name>Aaron Bauman</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">dz0ny/leapcast</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/linuxptp/Manifest b/net-misc/linuxptp/Manifest
index 3b6bdd4fa1bc..f314fd26defd 100644
--- a/net-misc/linuxptp/Manifest
+++ b/net-misc/linuxptp/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST linuxptp-1.5.tgz 139127 SHA256 ecebc8503a9fd2340299f8015e520527c32cf3760d34849fa0e855bbbf4b1090 SHA512 03ec0c3a283e08f9e62dfa7d059326887db541aa53b5c65e03534079083f39666a441a4303f428f3b972976483e683e603bdc2ec232495ccab46153531124974 WHIRLPOOL e5fb5398cf239221f08ec52830252aa4eeaabcef6341cc9c04a9ff3794d4d93f18247323b0a1fd26a088e00d6816087d7149e8625e7b25d91882be9dc034dec1
 EBUILD linuxptp-1.5.ebuild 834 SHA256 6dd35a89ce54ca7125cda4dc3527ce8ef8925777d453071f8780c43487eed75a SHA512 69826b3ee1c352fef007a586c94a824466879aece1e58480e95b4355d8dc03a76bfe0a16d76207fac40f2257263e189a87a90b4d1247f25556184f1fce8eda00 WHIRLPOOL 9b6a1d4fdcb942ff3ebb61284b9b3afabbafc39575a2d85a02878a8e9803ed21815a00eb5f106c2bf0bc08dab533eda45e9585256b896d9851c638a7b92b5c28
 MISC ChangeLog 436 SHA256 6bdcfb1f7bb1930364e4b418399f4b18d079da265beb1e10a1aaa2ec3cf09380 SHA512 dfc52c1aba243859ed527bfae57c4bd8f4f5389cd68e80670488243168494ffe6d1a85d84a35e082521bdca7e876d57ce1494f6f19c1c0222331ba7b72fca8a0 WHIRLPOOL 6e2eacc78d56221a9e3d30c55633691a9f714c068263b097c451d6bc27ae90333b4450c66f0ebc0bc206a1c50666eeb1a8cafbb2079c49b88ee97b686a8f4446
-MISC metadata.xml 349 SHA256 39924bc7a3fec1a964d08c7dcaed302899b6cec22bec00f447bb364a89ddad23 SHA512 1bad11b83f4b1a46aab7f5944bd8fee52feb87edfab10d16aaf81ecdcf701b0665850fe913d3e4db20e5dab5d0c3976d742698535db97f95ae339a0a926c89a6 WHIRLPOOL 44d176e2fe8775ffd6377744b190e7af7dafbe5d0561f6c4bfee4170e911737d5abdcb89a37b5dca60e83f99317158c07ae03227b2cc9ce37949df6b06a55455
+MISC metadata.xml 431 SHA256 5c80b4bc4ad366d6c5707ec11d4afc3b0e043cd6e298813e982afa861c778499 SHA512 c5bc695c2b6a7adfdd291eab41dd72e039e43aae21547309b84d7896b2e9f0f209c42b9c4dba6e8987e24175cf583a6f864934d692a16f6f35585e2a79639b3b WHIRLPOOL d95fbde865e86417055162ed5ce31a8785332b416285321f495b1dec5c1f59741bd679920d0555a10efe6032c176c9a71386806854767900df75b545ec39ba61
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlTotMIACgkQQe4uqXYgU9Uv7ACgrdXEGeXES6hQFYuHHZsXJ/jm
-X8AAoJRm8wynTvFEZtkuifX9ORB4wvqe
-=Y3rn
+iQJ8BAEBCgBmBQJVfxJZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmigGMP/2FQLnUDeJLQTOaEwYzC8yRA
+QHxG5NUj0ZrUjvwWfxOsq/rcdVyjJNy9ZN8Ype7HWXFmuO5sbY4PqnhSvTN7HjG7
+ldOFN7lLm4xui/gFDkA3ftXW48mfcxZHZGvFP+HGhj9Ji0INJ/7bx+Dnl5GGIYqX
+pW5wBKe7pKWyfxvjcCm5BdXICu0MoRPDQR262NZDLPdrwiupSfxvjiOrAHPmW2Ul
+ow2w8anjo9NwrGRiG/Hh7cTA+TtAFB3aSFPgb3b8x7hcoXk5omMz1bkBXwP01cAs
+kPYZ7GdmAyib5PvIPG681o72SI9C2XUse3zaNpAQj3Mbh1dUJeDM7ju3CwM2Asnk
+W5AfK2PhAwkiyxVWDM0jR4vBGo6C2+NLE2N6faer27n1MlKUU33xNTPhZefdD8A4
+ZsRkJgGwGdfe1k/hDsNM59/WE3gXqyc+MGgo6JLcIdkYSYoHf1W3W+oDpjT62sgO
+Fs9h6CQxj+4vG80TnGwpN1BCI9WlMVGCTSqOJXJK+oUnIBeZWmATSwZnx/WFbYvR
+DgR6UZ8867qasUuxHBc5bsrAVtpdZpmndu582KUo+ryhgQl1Mt5n40nl8fkQ7m9r
+VebkC/oXGDqCuce4HII8xZGi4OofHWYU+LArTKV/ARDItLiiNhY2DBfH/mI8dffK
+n9Cp1tq0OO6O5dwn46X1
+=ldhL
 -----END PGP SIGNATURE-----
diff --git a/net-misc/linuxptp/metadata.xml b/net-misc/linuxptp/metadata.xml
index 9f9188af6008..fb12766c5057 100644
--- a/net-misc/linuxptp/metadata.xml
+++ b/net-misc/linuxptp/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-	<email>tomjbe@gentoo.org</email>
-	<name>Thomas Beierlein</name>
-</maintainer>
+	<maintainer>
+		<email>tomjbe@gentoo.org</email>
+		<name>Thomas Beierlein</name>
+	</maintainer>
 	<longdescription>The package implements the Linux version of the
 		Precision Time Protocol (PTP)
 	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">linuxptp</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/livestreamer/Manifest b/net-misc/livestreamer/Manifest
index 65b08236a7e6..a5cd89807577 100644
--- a/net-misc/livestreamer/Manifest
+++ b/net-misc/livestreamer/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST livestreamer-1.11.1.tar.gz 864035 SHA256 69e2bc2a72fca682e5e328db18cefeef2f32ea59413fb0847dc478abca1f2cc2 SHA512 1edac388ee91540309c396bbc6a426b2008bbc0066fea7a5861517c9f0da49edc1a398e2bf3e8c9a3ab58bfaec9c15d57fff6d72dd8f9b8c8de9c4537f443429 WHIRLPOOL 393e20cb64873e84daf31ff543db7002306e7e37b68710729c024e78f9b566a75bae57220175fd3fae7331cb8c228d72698574c417ab0f93ea901601458e8f8b
 DIST livestreamer-1.12.1.tar.gz 873050 SHA256 3255bc78adbdc233b9586d3b5348134ab5ae656580c9f2489d03068c369a0fb6 SHA512 40d959c0b0884519e6a2a45e28865e76def1ce15d5afaa79e506e552e189e3187e98d26c8dabde5734c2dce7fe2ec8215782e3b4bdd63132b02bc37ff42a4373 WHIRLPOOL a6b6d1e9e3cef7e14f3f50dfbc87653df1dfb155cf524ef936a05a86805ca339035ed13432e1da7f75a1aaf2d15ca52ee9b52fe030f8df6f8fb28b19a5684033
@@ -10,21 +10,23 @@ EBUILD livestreamer-1.12.1.ebuild 1171 SHA256 bb270c09644ebeccdc65be48e6c6653df8
 EBUILD livestreamer-1.12.2.ebuild 1171 SHA256 ddd1ab823279b3e3235107a86443db9fdff44ea9b73f0b004b621aa2b6775657 SHA512 b6babe8d7a4df5f21ecdfbfffce7685450e02a9a0feff2a9482abbc1fe1a25dbb80afc617efc073594f1baf57bcfb0c628fdde4f0bd117502a5dc3cfccd7f664 WHIRLPOOL b47357e722948854b4b21b2f8bb3f135c511dccd592dd1a9a9215a862ab417ebbcee5b87748f88dd741b7292c1a46cda0d8138caf7bfd3cdbc1707670749e2f0
 EBUILD livestreamer-1.7.2.ebuild 738 SHA256 42f57f7fb0c59dea70ca21cc47a4185cbb0c48ab07aab997df073449c4f417ed SHA512 b8b8f7a6c4517d3835d1c1fb89632e77c7f487a718e0dbf4c6231c3c68c2e7066b4a40f16e2c288f8b4ef9233996e89c4639fe511473373275f64e13277c1765 WHIRLPOOL fb199ef46f033307daee3abf74c1680b63999aaa2bffe9acda0c1cda25618e8b6977124baf7eefab2cbb2e8def56b2849e39d7f5fbd869b2c76159caa8dfa6b1
 MISC ChangeLog 3674 SHA256 47b23fd02dfdb41392897719d053a2610d1b6e02408f5169202ec9dc3593774d SHA512 7b6cb484272e6b7e3fab7c3dd204719fb277d5276e9cb2dba295a1727809e322388ec093373c181ece0083fc9d7b25c4fb91b1f8cb56ebcb9d2440065f60c049 WHIRLPOOL 43758f6590ab2c5f3f46b7181b25ecbbadcf90075914ca2a3badd57d60a10f6b2bf4a45877d0f2d8a451ab421aead6d1e3bca74e0d59ed4cf6c2cc2567afcc34
-MISC metadata.xml 276 SHA256 6b03f29885ba28c35ae2f1c713cc645ad3d73b4b25841140d5dad9af2cc8ab4f SHA512 b3983c7e2bcf2089d3080275d3d38241e76006e0dc1551034ab46395de1dc62e60b4e3982159401db862c74a1b8ce65f9fa56b3101a5315ad3144bb64a78cdff WHIRLPOOL efc0f76a0090d8c2c52a5929a05031de416a15db0b460e0f9d16d4124960b114ac2be4b0f2dda8fdb5da374e789e8fac5dcd6364ed07b98130dde9c0b353868e
+MISC metadata.xml 361 SHA256 e9c806dff646d068f6eb8da7bd02a583490295db5bd0964450b4f39ba0f80037 SHA512 8b347256acfbc5aeb1eba91e6d7ec23568d8613124a1c6dd960bcec8f8f09d2a1749d99b1666b67fff9a92a34526a6be3b737074e7708bfe24cad7a303bbbdb0 WHIRLPOOL 9f0d5677ccf55c4be28f0f94cfd81fb9bd5a17aadc56fbbec6064231af22c2cd8e989464f5454faad6368c845ea8249eb58242d1333ce826fd19dd4ebac73327
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJVZad9AAoJELp701BxlEWfFm8P/iJ1f+ddyT8jNVTZR5ajryke
-PKH69be2RPky3YXpE0VIa8ZCY+7PxUiRYwVkXkAXf5e377uiXFNqojJcSxZ8ibFp
-/DP6TSNZG/zTbGFoW2MYGZsL7ELHJkAibUjquNtxSoDmCE2/8UlfH/+r1nd/7U8A
-12GBpMDxxcD82X5lmvbdI5pg7kRC2o120izAU7pguWkb+vvGNnczS5q4Kqq08I0D
-kadFWzvgZgIpBm1qazGpmgHK5QWt1UUoLOjorSATOQh7WjC53IPEkzTip9EAvOJg
-ZEtuHBnkwWl8B3Ps9J9zmUdMQXDeIBAAN3+fesqvSKd1MKc8NKchihhdMa9s9tiS
-8NG5CmB25OmCeAPDw64lSInG4oRgmcAkog0I+p9RjuTW+qUdWRusimfxNWi0v70u
-uu7MUZDlfq55/QyoEG0CWtcZgZnWyaXO4vMXOrGo2GQMgXBP5BlvlMVuzr5j1Owk
-bCMUX4sGibA31eCTh2GMavXKag1rQmBlH7bPmWUBW2LClV137kzVyQOEA4BHgQZI
-C3ZiED4ELDjs5w8TNGheNMIC0ZOF8ThTa0xNXguTbAZJE0hCKUgMKZkjiJLsO0ZM
-nO70rYqLNhvqqTXidu3y1UgmLWIc5d1eTMTW1PcOn6kiAABLQBXfBy4A6ZpjGdS0
-QGcHvx8LA3GFCdUvHGoD
-=/Ox3
+iQJ8BAEBCgBmBQJVfxJrXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi6XwP/0jYKe2KmxVfKXZqWylTG34S
+8hwrdZnjiBU08o0WSoN9+Dce92LC0oSV/GU8lUX1AqWiXMqxU6elHGDE15i6wIwm
+aMaAdvVGOckP5R0Sm0x21nkkBlaI5b0010OnP07VOcyPaGJCLqo069fEz/jiNr7E
+I/AZ6BO8pWlYodNGy9vJ7PGbaiPLH8QXak9ojscAsYqKP/awLSmC7oHbySIOmFSC
+wsxKADzlqohXzXL5cOFwEdnhzEyGbH2xPiBPbov7YXnrM1DHjKfZ3zc8D8e/S1s0
+QFUhWG/aIecUSFk90azkBeRS1rVoSQcqopSEXRAHAtLowR43ifqThx1idK/XmzUs
+WJj+seLqCErPxw9egDADJW8ZzXQh7YRNEcYc7vGkbNmO94yMDRA9/zqP4UTAHl7g
+4D266EvujF2EnrzddWvevyQeZX9+c1WRXvardKtd1PKyxBoYPdthd5Ti8T8o6j2b
+SMg5xF0v6kGw6lhf5ZjJqDoXLLQtttTMRs5pMCQYDsC9FHQ2YXOm1avot4yAAjsT
+uOhlC0VRETV2twcmnsApIgCJPX584IXxh2eganVe8h1CWF5V98Kn/c4e7sVBBoHF
+6sQXB/snvuoryYW3pHf4J0qwgNEsvyl42YAorQ4moz9H+1+PAiNwCHPIhaOX6L0d
+HtSTQYrsKzkmpCX8EbfQ
+=o0rH
 -----END PGP SIGNATURE-----
diff --git a/net-misc/livestreamer/metadata.xml b/net-misc/livestreamer/metadata.xml
index 73483ef147c0..0cfaa62977f9 100644
--- a/net-misc/livestreamer/metadata.xml
+++ b/net-misc/livestreamer/metadata.xml
@@ -6,4 +6,7 @@
 		<email>the.telvanni@gmail.com</email>
 		<name>Guillaume Lespinasse</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">chrippa/livestreamer</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/lksctp-tools/Manifest b/net-misc/lksctp-tools/Manifest
index fcaa5c3265ce..7b59b8ab2a4a 100644
--- a/net-misc/lksctp-tools/Manifest
+++ b/net-misc/lksctp-tools/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX lksctp-tools-1.0.13-build.patch 972 SHA256 76361b40420fe44775a620b6a65f49d63b07bdaaf1d6844c6d4b5ca18d8f6a2a SHA512 7db737b2e369e85f4e97c167bf8ca52d004fb19b3fbda7cc538cfcdbec19320ae94fb97e83451143eba91e1b44f11f11d4824511e203b85d2fa329d7aa66cba6 WHIRLPOOL 9b7e0408f91934807c6b1df8a05f3d9100ecb9d9f8844787660d1d32b04b066dded0346d8a11ae8b894ae4b856145ced90a432e1e739b7fbf6ae2b314306527b
 AUX lksctp-tools-1.0.8-prefix.patch 332 SHA256 0ba46873503b855e0ac2be948a9d5f2a43ae2298003cfe46fca60424ca483039 SHA512 f64962208c270fbf39ba73b71801c27f5c2e45e4382c53bf3728e14c1300970b0d2a86d34132a4e8d24f8eb694bd234b11cefb7cc31eb232557d090c34d830e5 WHIRLPOOL 64fa9a8da1ae199efc46fc6af677d7c0ec5e914255b409fbd49472f117a64d764809f0271c774ae6e3d3101d214aad6625db8aa0b63c431011be1ccc2c0a57be
@@ -8,11 +8,23 @@ DIST lksctp-tools-1.0.16.tar.gz 565446 SHA256 0903dd526b7f30a89d5031aa2c82757612
 EBUILD lksctp-tools-1.0.13.ebuild 1344 SHA256 7dfb68309c2bbbc492a68bc2cd91e6c3c9adf5a7775d863898e42fe66998a7f2 SHA512 51b00e1d9f1105ac28b40766eeb95f861c16a4362d0a414dae2896258dad4e3e9a146a6b51b8b65e7d6272cb2c5f79a1e7c1df330608e76f49f61653a3746559 WHIRLPOOL a330784361cc4d173f143bc19fb159507d7c2eb33d298ecc468b1512874e4f3c315c776e3e8711414a6b2e6415cc5d23b7b6ea63d1b8874dabf3d4bf6a6ec321
 EBUILD lksctp-tools-1.0.16.ebuild 1288 SHA256 04a7615ae87cf6782c82e991d12ad14f9a89b0e48985b30dc495c685bebb8e6e SHA512 3b0d4364eaa18e4ef985264cedfda37a1351d4e2018cc14444ed208d9146bb29459659f2fdb1cda2aaaa1ad1460b78f08970f449cb2ad450cc22a5f8d35a02a0 WHIRLPOOL be6b1a5a626620f259486ce061af82e3522460286eb037adcd7dea9254dbf591e784dcd885da0be6c719552eeb2eb5a8f9d7666b35a5eecc443ca84478909521
 MISC ChangeLog 6791 SHA256 0fbf936732a825bc17cd2af45a796c19fd0828d260bef58801871fcc38baa659 SHA512 94547da3ff2c1c79bb7d28e93babe5a0f232326171d5e6044595d435f1bc4952655b0badfadcc25bcb85d399c603247f90126bd89458b11fa297f68fe8350391 WHIRLPOOL a065573746d2df90b005aae209286e0901328e572142d512ed0d87fac3dabfb38534a8766b0061339419244da4e0266bf115bb9eb3a83d6ed686684c5f403f34
-MISC metadata.xml 554 SHA256 ac8d0e704a0abffecb9501933b76601e2062aaab14305def48e8e72c633c60d2 SHA512 6c7cad19bf2e365ed62f449751573cbb23c3e659af53e34c7950bdbbf789c5527f62ce47f8dd8072703ad9d0cd911551c9b2087b8f4a643c3991b7f0b3a70993 WHIRLPOOL 772705e64b55e49f6b53ab9caea64bc1e8e1414634a026295a284cae0297c37825f681767485dd5c686769cf99efc8d0be6d9cd64def79548f67e3b9f0313cce
+MISC metadata.xml 634 SHA256 368bf9d4c3d3f1c0b896bb953cb706ba9b91f5f53bc4654ae2ea694bc30da26b SHA512 25c68d0a8e96cb3ab8e90ef65651086b5c007da959cc586fed758989d161eb289c5c3aca88b0cc0512c986d74483aad41b33e7eb0503944598852f6dcc9e3ca1 WHIRLPOOL ee76fd8292558151ed619c533982058c7ef1a570094d1e1dc1b16379701e2976b662cca2dc7a0ab81b0e1ed465a365fb3919fbc116c21600765175f627e1c990
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlRzFo8ACgkQVWmRsqeSphM0tQCdFGcA9yhf8iEiX5+4aac7yDdQ
-3d0An0/wjSqCmui60JoiiknJ+QJg6iCZ
-=agWu
+iQJ8BAEBCgBmBQJVfxJ/XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmic5oQAKhrrwzed+Gc0SJ+B7rDi0yT
+qGtNm3Acv5B9DEqZlWdLD3MRSxz8Qg1iBA8eBwC2r3VLNaLdqGkm2Tbd+hwKk+zW
+cRyh0hP9YOUCMZuORsURkqT/ScheiUmRaB05dNJvRVOOlOUJFOO+36BqaeKH2K9g
+A4EgLRtDxY29LrstBPuNWadWZhk2rKd9yj1mpFuFH7Tap5X7YGGWZg4/PyLeXWDV
+GD83ddjoNhMwGLG3PXbWgk7Dggd0y1QdIrVDpRGV/GOviWsNSCjzsIDM1UOdrHo7
+Ucs6i7zLaSai4qpkDIFf34DoA0H0FoePmA2zdFgHMTPMb5qM0DgaQ2+SGcLJ52Cx
+AUwyR/I4YmeLUJoKDy12Ru0nEiMGMzhb+SLehj8N/fzggIfZ9iYrn/zukQPBumum
+4+JHDjmnK3WEz4pjMxa+V0CWrDTAr7WSeKQuSH9FFHr7B9mLuqjLg6EKE50/strJ
+62K/UIA1ABNXSCUPFV0NKgIa7HOeu3jzdP7RShfWCmVr5Za7iL71mup6jHA9NsJK
+3tkhkkxOKn8V+KViQiuXdehoyGCDjjhY+J+XmxJix3PJr9vslys+RXpbYcgFyaH2
+L/87PJ5ad39zBN/rFH7zqtgPaGXDuUpsZukTiqlqSj9b2PARWl5YKTnKZv02Jafr
+2vj5LWVqUR9b1bAZiGwI
+=PQzz
 -----END PGP SIGNATURE-----
diff --git a/net-misc/lksctp-tools/metadata.xml b/net-misc/lksctp-tools/metadata.xml
index c051fe18468d..18b686c7ac57 100644
--- a/net-misc/lksctp-tools/metadata.xml
+++ b/net-misc/lksctp-tools/metadata.xml
@@ -16,4 +16,7 @@
       if it works
     </description>
   </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">lksctp</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/net-misc/mediatomb/Manifest b/net-misc/mediatomb/Manifest
index f4fc87d3228f..d33cf641140b 100644
--- a/net-misc/mediatomb/Manifest
+++ b/net-misc/mediatomb/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX mediatomb-0.12.0.confd 805 SHA256 21b1b9d31a6db76c5c1ccfbf00e5cd553eecfeb0e2bb161ccc024eab2243293c SHA512 74d2866c749272fe71e97e73ddf349070c51879967e7fd55716bb2dfc49f89d80d0655ac05e01fdb107fb057a62540116dcebdda87840b16c7bd11962c12065c WHIRLPOOL 3b545b860f61c5a91db2d9ba0ee8a30b572bb073ae7a82456488a2d8bacfa03e89218722d6e072ed7ab32f995bc5465f8da53c5bdaa4a049eb5d7caa8a71c5d8
 AUX mediatomb-0.12.0.config 6180 SHA256 cb43e92639e5e53908567c050c9a2fc0e5c349fd11a149414590c2c6a402b4d2 SHA512 310f408d6925ac7c2a4b5cbb0a8a854ba41c8aaa678b1e1805649e73be86d9e438da2fce7731df0e244b78271da98751e66624af15328633833603f7645be081 WHIRLPOOL abc2ad05aa92fa540ea4c69db24e205fa84babd308ff769eda68a7e4d68c004b96191c63566db71a308a2c309b10999ab9925af8e00cbf9caa90e16d90467871
@@ -26,23 +26,23 @@ EBUILD mediatomb-0.12.1-r8.ebuild 4402 SHA256 197e6200e897d62274db820c30d88c5bf7
 EBUILD mediatomb-0.12.2_pre20150118-r1.ebuild 3379 SHA256 4b5f63050e4dfa78f382c03d3e6927692c9020c91abf2f6d53a5a5e197af1cff SHA512 1c8cdc322e15401a548435c7276638304f59ad0681443bc97196f449be3b5d0f06bacd282e42567f1d62ce1afda4d62cedb1c4149a8fde4609435e842dac4575 WHIRLPOOL dcaabf33ee5d55fbad0907627c33e0332ec8dd417057b45e5a021127e62fd8a37d038b10bf03c3b36244c9fa84a66ee8f9ce02d1d00c351546cacf29c00f06be
 EBUILD mediatomb-0.12.2_pre20150118.ebuild 3347 SHA256 a3058008ae2e9c4f48e57e67b449e193f545a3037c2bc2e3ad74f330c84d3e39 SHA512 039f3174af022cc892ed5735f52780bfe404b3291a7cf43d9513ca8db07451f0e0137cd55a77283b46bb409ef77beda68bb18085b849021a7f034435ba9a2636 WHIRLPOOL 341362f1011836280dd4efd2de9ebe10abacc8ede49e70b84bffac073fdb0d9f5e19a1a1cfd612fb79e41aa5868bb925099580a3c171e96614baa9bbc9bf3944
 MISC ChangeLog 11779 SHA256 540c4932f91dfc02cc15169cca1d0850b7a34c32334a3cb6eb6feea8dc74a7fd SHA512 3ad48e5ee61f984263320f8b7f42dcb6878953d97ef21e4d789bea4fd63597a6edf37227be94e442db89158ca93bc17c7eb07d78fa5ae44f2d5e2b7c259cbbc7 WHIRLPOOL 9f053d26641438c1c909da2ea8001192eef1a03f0b0f474bab59bc19b01b6ec873e98d5704b850421504c2f00ab19cfdfd74bd51f47ea4d0f572282533eeb944
-MISC metadata.xml 1118 SHA256 5fef1234288fa61e9617f7c3fc857607cd4fe962e65d6957b983f21bfaf6746a SHA512 81afc84f7f54de6565a2c3faabc7795516f47282eaf47151186929cc3e699e04537c3825d1972bef48dd897c3eef84d46f30c880a8e98ab95c86f79b640d1297 WHIRLPOOL 9ca2bf1662c76fc878a4a1c4d638de5bd01d80e22b5aed0667cf2c59a6eae685c420bda12373d3d6cc7c390447efb169d239f10d95fb9375181057ec169735d4
+MISC metadata.xml 1232 SHA256 42894c6b8e37d46620e6d86517c4c12a850737f32a0b0c956cee23593b98d5e2 SHA512 9cc11af476c39ea79e443d6d64d252ac71d7ca4dd5955943fa573c5a3e2a3134061c5540d7d1c5467a340013ae339ad4f22bd747c61aadf315be91669a6eb504 WHIRLPOOL 32d6f56669812299c8f855f6c50564a34e49f05c5fddee96ed68641233ee34e4e3fefd35497b88c3d80e5cecb3729409698c0240e9bdabaf33f5364df920d5e9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJUzrZ5XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOmGYP/0afFmCmixFTzeomu/BuABEZ
-PqjVkWSgXfK4M7CUTcHchm6IJsofCMjWlTHh5jLHQ/Du2Ikfqv64AYEMUG1yEcPe
-ZIHJ8/yMi51+Vw8AKR5X47+tJ9X3VhacOJBOYkE8BFprEcQgzqH/UwqKqY2rBhO9
-mxd7yygwfNqn9yYNUihyoG33z3nIryaK6edEi4rEa9j1QhDjGGKoH9GVbPHC+t3s
-2nA8+66Q0ZUGNT0HZvFhi69PW2j3MXWyRpwfyKvl5ciD6XNxLwjk1Bgsr/L83Rpg
-bYiyO/2OD9EceIJNoNpkXAk+220MHhQaja5qJRf3FOQl2dCCPlhErKD/C6hQwSSr
-KWfOcfK47B2R8R9holVXwF4SAx3eIZfNNNByGSCW9mod78YZiFrajZCBqmydI7VH
-Rd829NSUdFbr/Vti372WAYFqJoJH8AYr/ux2Jo9RZIr+sNsUREgJTE2ponCJ9HVd
-3+mbd3X35c8excElFSCjrEmsqsfBvoX74aN/r3Nd9nLQkIA+Gk547CY5hA4XezqI
-dvTM/LQynaYqVCTvdxknHgYnpT13CZ726/ihtPcyQAp0NzWJCOXykuNw6qmszPB7
-cATR/WWsWrAl55FA+T6pB8Ox+z+dd12TjFXKzQ/MisZz2oTqFUwRykrxkU9xXsjF
-ry/zeaGyVWrtHzLNmZdc
-=wiRT
+iQJ8BAEBCgBmBQJVfxKNXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi1n0P/j0xjgyrqi6qzjRYlBo+mTJ+
+QiOBKUxy8zadoKigrLvpYAlqz1JguaDJG+vtYjyz5MgWHH4xzMpdqXlq6UyPbBi+
+yj8dMQH+Gvj7h/I1YNUFmMl5M0EcuKmpau3azDZ0sni7plKzipSJMV7UzuU7R8a3
+yQTWQqvEa0+iXQd3FJFdKCGipVAUMJ5tDFOEuBxytGhGPJP0VPuSDV9dTAPTGMvs
+ZCZiiRFAa+VXjc3TW1FhyV2YoRB+Nb0DMm3/7XlEo4P/6cKI/yI3DbfTZW54ODKA
+ZGLxqFXToNYDiLWWZHYwM9xxMhOSYGauuV5JmB+baHr4jC2Ytgul9JPIQ97BPnsn
+gZELDpQLQFvd6k9F/pEIiMZSxzLbyLxMiR87gzmYAqvf38wwjdFC+/DqumGHNcMZ
+dBebfIm6uL42JtRFY+H1z8F6n0wv969f7EYdOGDmyHCDH6p7ncW1imueI3UcXcaN
+gVzj23lY/Ck6Q+CjW15Tg4TdF0gLFhEQQ6x7QySdgmg+5evzOJTGLioLKMS+fZaI
+bsPyuAWzaRxNH88ZOdIAXrBFbmTLSsWt1HBPJ3FoY4gIxwROZuonOOp5f7t2fVoJ
+0A0UohryeE6FPKmxasKqEW7F2qNFVu7M45tcCkWm1BAlRwuEHo+4HH7Uq6yxOScz
+aK8n44xZL2G3Ha/PXgIx
+=0bsX
 -----END PGP SIGNATURE-----
diff --git a/net-misc/mediatomb/metadata.xml b/net-misc/mediatomb/metadata.xml
index 3dd250379fcf..e72dfea052a7 100644
--- a/net-misc/mediatomb/metadata.xml
+++ b/net-misc/mediatomb/metadata.xml
@@ -1,21 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
- <herd>video</herd>
- <maintainer>
-  <email>thev00d00@gentoo.org</email>
-  <name>Ian Whyman</name>
- </maintainer>
- <use>
-  <flag name="curl">Support YouTube and external media sources (e.g. internet radio)</flag>
-  <flag name="flac">Enable FLAC metadata/artwork support</flag>
-  <flag name="id3tag">Use <pkg>media-libs/libid3tag</pkg> for reading files' metadata rather than taglib</flag>
-  <flag name="inotify">Enable inotify filesystem monitoring support</flag>
-  <flag name="lastfm">Enable last.fm support</flag>
-  <flag name="libextractor">Use libextractor to gather files' metadata</flag>
-  <flag name="magic">Use libmagic to determine file types</flag>
-  <flag name="mysql">Use <pkg>dev-db/mysql</pkg> as backend rather than SQLite3</flag>
-  <flag name="taglib">Use <pkg>media-libs/taglib</pkg> for reading files' metadata rather than id3lib</flag>
-  <flag name="thumbnail">Enables video thumbnails generation through <pkg>media-video/ffmpegthumbnailer</pkg></flag>
- </use>
+  <herd>video</herd>
+  <maintainer>
+    <email>thev00d00@gentoo.org</email>
+    <name>Ian Whyman</name>
+  </maintainer>
+  <use>
+    <flag name="curl">Support YouTube and external media sources (e.g. internet radio)</flag>
+    <flag name="flac">Enable FLAC metadata/artwork support</flag>
+    <flag name="id3tag">Use <pkg>media-libs/libid3tag</pkg> for reading files' metadata rather than taglib</flag>
+    <flag name="inotify">Enable inotify filesystem monitoring support</flag>
+    <flag name="lastfm">Enable last.fm support</flag>
+    <flag name="libextractor">Use libextractor to gather files' metadata</flag>
+    <flag name="magic">Use libmagic to determine file types</flag>
+    <flag name="mysql">Use <pkg>dev-db/mysql</pkg> as backend rather than SQLite3</flag>
+    <flag name="taglib">Use <pkg>media-libs/taglib</pkg> for reading files' metadata rather than id3lib</flag>
+    <flag name="thumbnail">Enables video thumbnails generation through <pkg>media-video/ffmpegthumbnailer</pkg></flag>
+  </use>
+  <upstream>
+    <remote-id type="github">v00d00/mediatomb</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/net-misc/megatools/Manifest b/net-misc/megatools/Manifest
index 959cd7397c37..aa5ed842ce6a 100644
--- a/net-misc/megatools/Manifest
+++ b/net-misc/megatools/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX megatools-1.9.92-fuse.patch 1344 SHA256 e3c703bd664680b1d676e299a2bdd5643a04b53e35961798c8b190a01f9b3df9 SHA512 4db0b53c3b14089d72d27727cae8bbb4ac241824a6aa374074a7a4a1b7333d4b606cf087ec06a25b8fd0928a022f27a73374334c90a381cd65625337021de940 WHIRLPOOL bcd0626b71178a794b30f75566304ffddb1a7d72344daf61edec7252cb6ad64a48afa16962a6f1c88ec1b8d47611fbe02ff75decf6c8fad0e7ccfd604ae96cb2
 DIST megatools-1.9.93.tar.gz 116391 SHA256 e744de3448fecb0d103a5462fa0f0ac4ea82dd780984180531425ebfc837f97f SHA512 71f5ba72e963e337da93cb3386aafeba4a6d58b75bbe848ef590940688e634c2b0175d6fae88515dd844fff6f789ba54618bc0cbba8f083432c0eac27d40df83 WHIRLPOOL 392ceb5d7ea62aaaccb203e884eee67bd203235370e6228466ac3a37714543613bfa07402d0eb92b261903850912e01ec29aa2aaf9f9f14de4e8aef16054f2e0
@@ -9,23 +9,23 @@ EBUILD megatools-1.9.93.ebuild 1089 SHA256 652a873fc726591b8af97aa5a42b5d142d34e
 EBUILD megatools-1.9.94.ebuild 1089 SHA256 da1b9407c12dc5a8cc769340fff08daab68538935b7e18c6558b85e19f475ba3 SHA512 201504298e413ba969e666d87f428d1d744c3f85d7999170878e34000594ba8be5186c74b360ed7ccea5ea02698d459a913213a60a27a20537b105168d1e1349 WHIRLPOOL 3def8b97e5b2690fbfc9336d25a0ad303ccc9133620a01a1c495382b2c16cf8e69941d94281bca1cc682798d2dcb11a8a9667868a120ad6e95e150ce8daa15fe
 EBUILD megatools-1.9.95.ebuild 1089 SHA256 eb2addade4e66fb55503d2696f30e6d8ff7238f70dbaf990d7928ba3ca793b40 SHA512 a785a8409ad00e70934c52f624ae60051dd1f06f49dd0e8a35294b2e90d422e051974fa7f680eed7e179c5eec9059174912cbea36028f5d79f5d5c85620ca5aa WHIRLPOOL 51a9717741163de1bb5156960418015b44a53d473e2d64058adf0374a9bfe99b638457bea422921052106032da1eb73a3bb4ec0fc387f140e4707d4c925a58c6
 MISC ChangeLog 1377 SHA256 15a0a58e018c2134cef10d17cdf4299fa28c9fa94448bed8a6c00977b0c9e518 SHA512 8139af10ac544b630c86663814afbbedf53b68a74afa7a677f16379a05028fcc5e807c3dfde1ff7326f591d3ef88fd5b3b2a9671932865574ea0f4347ed82918 WHIRLPOOL 4f489cd491559242941bf821ea50f7cc468c3aae8576b7b62db1d2ef02da01ceadbd2092961571eff3b446f2f83edef474dc76b9314be0406eb2f6da76bbc28a
-MISC metadata.xml 566 SHA256 e864b4b42c0be53cfdf22b2a3cbef6bca1a865e366435de92fe0979bb480cb67 SHA512 174d8ed243dc629eb08bbefe755c99fce58f9f3d19f36e36cde6ed821f07270bd7b2bb462291c412a5bece7fbf2e065400ce127f0333ad964fef8fcf83a38619 WHIRLPOOL 13b84f1f5336391d63ccb7bc881086386ff2850eeaf2feebb13cb55886d9bb4cb4f0450ffb5517c0a7fdd535915185d14c6f4c271db8a11cbceef2cdb3160c49
+MISC metadata.xml 652 SHA256 b6729850518137919148ee9a86d2db1d37c897540cbf83e4756a67c634878889 SHA512 d3bfd7d7b19cd44ac34e82d254b1b061524cb196fc8f0b85ad342392a4bbc2a006079117eb44137de7f161415f87b380a0be2bda6b3e605a14cccaed53de4861 WHIRLPOOL 4caf3ff3de1ea3b780ef347e5ae7935fb1a6da122e040cf0f3d744c0fac86c5c63794cec439df7f72e4bae907f2ba35f27c395a4ce4aa604b96478ccbb8df1ed
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.1
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVTN4PXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRCNUJBQjhDOUMzMUI3MTE1NjcwMjIzREMz
-MUFBRUE0NzU5NERCQkVEAAoJEDGq6kdZTbvtwRwP/i7F5LHWab3JlZV9lPsL0uX1
-zUXd61oXr2DGQrq7U6pikkSzFk1fjvOHECDH6MKp1aYVux6kOV/hRepKvSqywkNV
-9BVtJl6kB3Ie56g/FH6rGQCXWkiD1Ys4z84T8BX+QTMDsQBEeHXhreCPX2YSNTep
-j8QTUGgSh/ESlikJLmk7AnKrd2KyGaVKjMINUtiWk47OnvgUdbtlEDDlLqb+hL1c
-5VNg3sVvvh/ylFnZBNPQRSw7ATzQjEM3U7o4epYiZRRby42bhT6KvRkIB9SaAeCi
-LIpEDX3CvIvdSct0QDs1Rz8zXTz1iJLRxzA6eNiWrc+dxCdERIZ+Z5F1yYhr0ou2
-9ZAQK1tyamF98MXgb71QloqakL2qN4Drf3CR3HRNMn2pmMYwVfXBGMNEqKiot+n2
-0+7k8xPqNHfWAdDL13pDBY1bAU43wocshNg+19vfYs3cZS3YnR9bjKbCkYAHa4/f
-D41oqKQZnEB8IdT6mDUMu69Uig2GeL9RzJrSj1NMZy+g1hEA7oMalpwiiBYKceBP
-bUXgvJK75VmnO7k8fjTeW8Q9BGKF49pA0tifFAR5ybMsxSS60uF7192wv8uSKQvA
-fTcb8gQdNzf/riEeeXZtM6zD8UFVWBzekd9BdnSjOghDqH2gtLZPJfH+FJ3xxQac
-q8oCaVW8lZTLft7zhpLY
-=gRDS
+iQJ8BAEBCgBmBQJVfxKfXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi/kQP/iLahntQrpAVGo/zs/w8bTGf
+wjQ7P5EVh8k9VMu/2EwbX6iDdPJN+Fft4jeaCo8o/nMI72xzwWAROrk3DM4NOevz
+DQnXAd5wN/BeSp1GXaL3kfFIwTmCr6U1iDX5ai+clRwiznmps2Jn6WycTm4zUwlA
+FWVnnOF55D8XmrjdYMhCgY3ocz+15sGdqTLfM/e6VRh06qQ+FXAHIRBoKbhQCHc1
+9XhaLf6LNkB5oCLrST+eFCWjr5QfmJhTNSNuoYMkX03y3rfPSoEUctCkyi4EADnX
+I1B939lYaJoffntEslNajzGBo2+tt8ujd3xvRuEPzD5SIMiHFkZPZPz1rkHDweaU
+4IZRKElGs8rbj6M/b7VKXs0YElnWR+qOTAVDeO6dDxv2NJBSiQeYzClZGfIFNg8y
+/SvBvE3KrcNmXh05cV7XXfWg5dUUTijVoxI/rDPutzAlxp9GORumdEyxL/3wj3mR
+fZMdO84jdT/1QwMPPyC2XEKPpLPkeouQx9B8QBuv1y0RFk9HsikI4Y7O8439yuWL
+5CkSEPTJ6ygbaXk9AsvJeIKN4E98M11f2Vakct9vzLshEZrgNmuMVzH/VoHAxNKl
+7U+npn8Ok7/u32cfzZ1FaAIhxr8cnhmYqqFfSKTuAhNjQ22JGHRv/zI9POB41Od0
+uwMofEUXZ1OeptP4scvE
+=+U5y
 -----END PGP SIGNATURE-----
diff --git a/net-misc/megatools/metadata.xml b/net-misc/megatools/metadata.xml
index 40446d5a19e7..579df4723ce3 100644
--- a/net-misc/megatools/metadata.xml
+++ b/net-misc/megatools/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-	<email>dlan@gentoo.org</email>
-	<name>Yixun Lan</name>
-</maintainer>
-<longdescription lang="en">
+	<maintainer>
+		<email>dlan@gentoo.org</email>
+		<name>Yixun Lan</name>
+	</maintainer>
+	<longdescription lang="en">
 Megatools is a collection of programs for accessing Mega service from 
 a command line of your desktop or server.
 
@@ -16,4 +16,7 @@ Mega website can be found at http://mega.co.nz.
 		Enables support for the filesystem in userspace plugin through <pkg>sys-fs/fuse</pkg>.
 		</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">megous/megatools</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/mknbi/Manifest b/net-misc/mknbi/Manifest
index a03a1318af49..49940958367b 100644
--- a/net-misc/mknbi/Manifest
+++ b/net-misc/mknbi/Manifest
@@ -1,18 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
-AUX mknbi-1.4.3-nossp.patch 511 RMD160 8f9e6b565eefd549308395754e0dac072bc93393 SHA1 85462f4179a9f90a82e3eff9861eb8cd6bd8bdab SHA256 03a92c036fbaa8607b5d7bd3d2d0f8d2bf5c42118f8abf79c4502508b96b4fc7
-AUX mknbi-1.4.4-gcc4.patch 1065 RMD160 6515339316ecc6bdf8048c2b8c31265c4fe213f1 SHA1 4c5f21e1388012a8e492483d6a16c34f698bbcc9 SHA256 19c199a163b8cf67a7cad992dc75568449050fbde7e625b0a86bef648b6aa48d
-DIST mknbi-1.4.4.tar.gz 212454 RMD160 05c8ea64b57d83c7028a613cb64b12c0481c1462 SHA1 dc5d2c33d3b0bd133a27cc1b4995a0cbbd38f812 SHA256 e5c62131a79cebf31234af252975d4c242ed8face0249f11a5772aeff50e3f02
-EBUILD mknbi-1.4.4.ebuild 1396 RMD160 7cea8df20a40c8a778aea732f23e5e23c0294e6d SHA1 1dd411b07387a5541e735cd76849b184c50c1a8c SHA256 e5a48b5a3d8f5da4ee1afae87b421200824261dc0f2d665837b41aa179cc3769
-MISC ChangeLog 3094 RMD160 a0adaaf17e7bb8e0c741e791aa7d6da34c6199c9 SHA1 7727ac4e6e795b4c1f96584196527900bd3f251f SHA256 b31aefa3ac72a033481f8d8fabf3b2bb7b2027949d31a9c8434d17ffa76d6261
-MISC metadata.xml 214 RMD160 ea476e10a778f79d9273adbbc2403db67d025e10 SHA1 7f156558998e184ab8ea7417fd4739048f012a09 SHA256 0e019c1dee563e5b23815be471ae1b65fcaf721a91ec48037446d41ca787d3e5
+AUX mknbi-1.4.3-nossp.patch 511 SHA256 03a92c036fbaa8607b5d7bd3d2d0f8d2bf5c42118f8abf79c4502508b96b4fc7 SHA512 14facbf83e14c10eb249ae247c2418e1676197cea503815911512fbb0b9094062c239d60060af819774e1f50f979ed619337bf58a3278239111812960f6dced2 WHIRLPOOL 93743700e86ae69e7773af5e6f13bfb6b7467ed87b6afe50db2a7552641d2c483951431ed30b035fd10f07f6a80e3e0c1a64a6e5b48b234be08b053dfa81b9c0
+AUX mknbi-1.4.4-gcc4.patch 1065 SHA256 19c199a163b8cf67a7cad992dc75568449050fbde7e625b0a86bef648b6aa48d SHA512 88c83aef189e7901326328f24200fdee10809a02c13618f1fe8d76d77fcb2b242a67c03d0ad2f94bc0c3cebfd8be2c22645bd409602f16116aa2b9f0d25715e8 WHIRLPOOL 3a61bd8e4945b6e40d76b97ce38ea29b3cb98a7c975ff9130d71d6eeca0de0f7dc73953f224a6bebef9d8001f096b14182ed43ecd26a39f2b097a4081a8b49a7
+DIST mknbi-1.4.4.tar.gz 212454 SHA256 e5c62131a79cebf31234af252975d4c242ed8face0249f11a5772aeff50e3f02
+EBUILD mknbi-1.4.4.ebuild 1396 SHA256 e5a48b5a3d8f5da4ee1afae87b421200824261dc0f2d665837b41aa179cc3769 SHA512 f4950e7d18bb9b989f58d214f55aa4b6d76fdca4ce9b9bcbc2e6cd1ff500fc10d43cdfa9fa5d2deeb83d1b5695bb265eca89952ee5a32cd3f83938ecedd5a13d WHIRLPOOL 0170a0ddc579b31619657beba11a26c3aa87bb423f7b6de708ae714f73ad009caf46c7180b365b76a831d9b85b170c419e270a5155871eedb6412c1afd74ea62
+MISC ChangeLog 3094 SHA256 b31aefa3ac72a033481f8d8fabf3b2bb7b2027949d31a9c8434d17ffa76d6261 SHA512 e772bbd3ff66cb5b0f949d0d74ac06aafb7e331fa4e9bd9bcf5af9abfdd16387d04ae14bf8714dcd1e938ecd2fd30f1cf6f54aa817118d89f422e880359af1ea WHIRLPOOL 16c0ceb3a7cfbffff1814f34ccdb916ec0f5bbbec1efd77bd8f2804b12b26f0b4177156f96df903ae2dc14e1ff6429bdd940b25561fd61346858aa15690599e0
+MISC metadata.xml 293 SHA256 394800c966f2c819cb11bbc5960afb2366f2984c3bb139040bdc553e99c15bc6 SHA512 b8bffe9a75463eb72c3385e0ccb226f6e8962ea3219f03352e55539ba19e341f56d4f063066a46374ef7d099b06238ffba93090358c4274b321ccf23758eed71 WHIRLPOOL 0a91d1d3528e9c7268aa9857181bbee940430265d9fdcef8c55be3ce209898dfc1ff7be2c4c0445478b1cf0e32f681083b39b0dc741f5d8be9dff6140f28bac8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0
 
-iJwEAQEIAAYFAk59rRYACgkQfXuS5UK5QB0XLAQAqUMv5T0tc0iLpBOnzP30dOSe
-WohgVxNjCFcTyJCfJRCwvB1zcQO4W4RHxi8gnu10oKfvL8imzRZCxKPw7laNL2QB
-jKNvMmTvS9zGiUwLy7bqYXq95Q0AnGNRP/63SnkmwTSoFvJV9CpUaGc79Oq2h57r
-LbplVwqOz7ZY76Wbnds=
-=sNhY
+iQJ8BAEBCgBmBQJVfxKlXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi3m0QALrkSgInt8B9TMCr6wN8u07Q
+b9Gu4vSnhpUrQbkk1fr/c15QmLVpmsTpn5pPkloVPstK+EtrXnYiHlqXXKu8CzTU
+axZBwheRX6+9jJjtntYkxkjqT/yF+2fKIGkZYXxcDzswCTKEcTNUbEaOkbD6IVOM
+Sr2/4NRt0wFuWr1S/0CKihQucynLA4fTfGcQPD5BtHUHKBuC/4dNf6w07X9gweVl
+u4uQy610yHeGv+oOEIr0GIaYKXzIC+NtD9uFSydWOOuU4nSbNzoZji16XuiXMqgF
+wE2ndlvSTloZuGuY41sgpyJiIH3gdkQt44AN5Ed3LYxMiwIBZAYC3d9oECWV8xz9
+64bUrhz4iyvGGsIqim145IVkaitvEOa7nmUsHCKco4Wz3yJTyepeLmAIkJo5lp/a
+jaR8Bf3YYK1vPVDhKffN2zZzVorRzSQrEXk7rF2C1OUp5z62UAvWtaZ0Vkqq6+qQ
+EFfw5Wmo85ctCuzUOhxfdjy6D10ZHZNrDaBYpwRILCeZNOwFr8mdXWPV93RV9jgp
+H4QW1oDPPCGLNjC0JaDjLbStUMqoLeqLHj44+8z5UBLJ6HRVlLl14VUCxZlxcftM
+1lQ9GcVg8/Sj90WhcvVUoue+b2g70Vood9VTHgAwk0qcdOGYFzDoTdMcSat2vj5l
+mmzF+lvQUAwiP28jFZCN
+=MQRP
 -----END PGP SIGNATURE-----
diff --git a/net-misc/mknbi/metadata.xml b/net-misc/mknbi/metadata.xml
index 91f4e72fb544..adc9ebf47c78 100644
--- a/net-misc/mknbi/metadata.xml
+++ b/net-misc/mknbi/metadata.xml
@@ -4,4 +4,7 @@
 	<maintainer>
 		<email>maintainer-needed@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">etherboot</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/mulk/Manifest b/net-misc/mulk/Manifest
index 9e90f7c5431f..b6ad05bee099 100644
--- a/net-misc/mulk/Manifest
+++ b/net-misc/mulk/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX mulk-0.6.0-large-file.patch 867 SHA256 974b166c0ecbdd82f18d8200d09776e9a1fdd141dea004e0e5af0bcfce38eb40 SHA512 8018cacc3713474c5033aaafbae314136a448a10c13e4b49630a1808c2f1a14d3b22c79229a54e661cebfb59051cdbf29ccede72f2dc3265614d635d1ada16ae WHIRLPOOL 70b24fe69cb11f36c7f25b540f05c5e265ee874cd6905cdca6a9eec6f06724fdcf1048776855c8d8d45042f1f4bce61737db58dab69a2da12fde108d54deecf6
 DIST mulk-0.6.0.tar.gz 459141 SHA256 c2afee9c510cf9e56a92d911879f0c7f55fca1f9e5fe9615a39e5a71fca64312 SHA512 9e42add34305b071ac5132c645be75d3666e2a47b6b3a7c7eb46b1fbc130db85bccdd31dd54586b20c4d3629f000219c630511d6f2a59d241d60afce2cfeee37 WHIRLPOOL 50917be333c770c839dfc85a08a91f16eefb57bfa99ae3e951c0541d13c55df6b238d7b433c5ff26ef6c473f5c39762d8481548b53367fdff0d960ce9d4413ce
@@ -7,23 +7,23 @@ DIST mulk-0.7.0.tar.gz 487995 SHA256 aca61867fc0b93ebcd8a564c57394b97dabed2f9973
 EBUILD mulk-0.6.0.ebuild 915 SHA256 9b1563b54b0fa3a87eff1b9b79f99787aa46b6f5fca51188b0496a4eaca783d5 SHA512 7341fff63d6ae37787bf7c35de3ff4b11ad70d7899d0684e2696919d9ce77143759b87656d2aaf8e71e10d915b3165b600531e5f9efa3018ced1a209c6eb82a6 WHIRLPOOL 895e8bd4baa6bf83695bf17da284132c2f1ec3e976c46b1cffec19df0928aa5f0a0694f737e778edc31ea19300f1a77dbf1c09e2f766973e6679e5e15aaf8120
 EBUILD mulk-0.7.0.ebuild 865 SHA256 82e1fe1f37ffe1b6f132c4760bf5f1edff071a9054f337e52172b87e933dc600 SHA512 25ec1f9ea3914ce9ba282177a412459f9cd752e6a4a31ac8e8c3668d33920eddb1a874c3c8ecd84d5654643e5d310fb68608f14048d30a88beca565dc2d79b79 WHIRLPOOL 834c105e80799d723c8db5b4f6316342e45740b8d93b0d361ae75c8d0908708f73cce477295476ca25cf324eea40a42792ded99acdee212f796b27ee374a0d25
 MISC ChangeLog 768 SHA256 65b8c1e519c5f531a3cb2893b736adf00c2a68bd6778bd239068d5dbc909e00e SHA512 8c890321ca1478eaa6a640f76756feb8c62beee67fba344391e3d9359ca72949bab827126437676ab5f7cdb7e2a84194169a3a950d15b9d8bc31b49f9c01274c WHIRLPOOL f7f4021ca689f3c6b42e819a535c75e6fff530cea8b09ee04c8a3e161e38b779ff1b21da9a2549b9de8ffd5813b97ce9494851a1f5e39dba4481991e742867d6
-MISC metadata.xml 433 SHA256 52fba044f0e11f1a2f4be4c5347b5bcebbae7405d91a769f300b2e8df31b4992 SHA512 79bbb7efb48e22ab039eecbe82c74c231c9cd831407d7585672c3bdcf0bcfad3c274274feb0888a57044516d3ac640ce15a2cec8bf5a2f0840e5e22aeeda4eb6 WHIRLPOOL c067898c0e6e761b347eac7704f3bafc052508ed164e30c30c2e4c0fe02abae667fd844b53a2c6855c4a3a5d3c9399f63c7636aa04236a4e6909f345d3bb8d6b
+MISC metadata.xml 515 SHA256 639eb714354499e94468e3617480c8467b49c522635a4c6f1c4725f78b7bd22e SHA512 ef2eddfbb75681587f5a82e077ac2e41d8a2e16676d899570e92fe9faa13c519b9993c4a210418d3dd8713d342c87beaab24548ec1bb15169b57756b04522bdb WHIRLPOOL 68b3102e2932db0871fbf785e2c3e6a451d66515f63c38c1ac36b62b6b6d8762c78726a6f97dfbf5573d2655fcd8ed789f0007380267c70e4a94d55b9d793d39
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJRKAMyXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88uakQAImktrASRHSA4Ba3bUP/YuU4
-Z//shPMNY3Fj7bXB47B45pzKUGe5zbdWtxbL+L8kaMSwaLOmb6Cf+/Y8Q9Rikv+d
-AuS78zoMNiQZHKv7AGaUDzHRz4rlZnNAYX9ohrqBdTsvp+XVuszbGz15i9LJohsE
-IZAubp9kMe1GEbLqWpi9TKsjeDR0bSPwq2NGb6BxXJyGZd/rVx4GwBjSHZrmElTV
-3IC7BoOQRqb9MZNOnvtDoB+tMtd/paStqXjtVB3hWkWLQKVLZzgd0MNZBSDb9g3a
-DbQN+uOqbcAGhpC0T7wxWaQ7k5JDkuAWJhoamOEeGC/EpkgFmBThAwwjDQTJyVsX
-JAzR+52UtCizUxVGsGdq2cMpirV/TfYOCnB5z/2se+Q5xzqCvpQexv9+xDbtrTTM
-GIYmjcDvp5wJBQ8Pbqxw4SVgw8/JzttClPECCHszmXf+ENHvBYU9TJJY90zFfRO8
-9i2Pu1D95mUd1gPZVRM9u3LZ30mvjj6xB3iGdfgiz1xiqcMjNHxX/oV6z/KLj0Rv
-YhMRttNfBcaJVTa7FUwervgcnXobQjdLqqY4muGMFlJiMlGl9O6zVrcNctUmyYsQ
-JYW4/no8ZoptAVTUc4iIkRG4xf1si6eW/mFr1sfBVkwRLzdDp5IKEIfDmNYinehg
-R4gtqBdvv88XLQojgtT7
-=XHCv
+iQJ8BAEBCgBmBQJVfxKuXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiZLIP/3nLA5rAM3/UD1dbGj8Yovf8
+4tD46bP0Q9jBGIhhOHYY1o/tPrNF0x5xkmQA3niEZnvp128xn/sPVZ+nWZeYJpJS
+AkbKrzNt7nuCD301yWGT0xzKIg30A6NQQevhQTF5fceA1yOoKY89n1YtYznraAJA
+v2q7WYizcUeUp+gwaCsrJmaAJE5aa6z8sXYHfdgUkZjL7Y+xNJauknVWoPCtH7XC
+HM2DVomLGdmhdAlzpDpn4xGb8529zKDEdNAhselXSKq+8cjiqTA1U5iFApQLqi/F
+l1WrXFwTtM8eXVtUCOpvb1twnjORBUqSBPPHLOFR32BGEsjMmA4GMjpNEcGdCFX0
+hnKoHlYXjSRCWcqujNLBq+b2CAbNEr2yO/RHmwdWxS94i1NCCzCgJgRFM89v6C6W
+1xXnEBOadIiZakmD6IkJT6EUIm9tV/gSXATpOITQvbZicuYhzEQ+7r2DlhZkENx0
+2cmNHhbWfj7/nuZ19+UR+3jZiVoBr1n2kYUsrCBiLYcMwY1XnMkePCSYBMJN6eog
+HYcVKCD8Npgyn2u3UHgnpGYl/kT8WOt1rs5ZcTzTNQ0mmKyl66qoLOTrjkbLdBJ0
+Md5uGds9tkRl8P8bDKEHOvlWnHakP64uBodxa0JqbzcSQ3Ho/wh9Gcw88DhdmID0
+su7boQkCfORZwgCpHKJN
+=SvZv
 -----END PGP SIGNATURE-----
diff --git a/net-misc/mulk/metadata.xml b/net-misc/mulk/metadata.xml
index 8836ca7249f8..e6a7a27838a9 100644
--- a/net-misc/mulk/metadata.xml
+++ b/net-misc/mulk/metadata.xml
@@ -1,12 +1,15 @@
 <?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>
-<use>
-	<flag name='checksum'>Enable checksum verification for Metalink from <pkg>dev-libs/openssl</pkg></flag>
-	<flag name='metalink'>Enable support for <pkg>media-libs/libmetalink</pkg></flag>
-</use>
+	<maintainer>
+		<email>hwoarang@gentoo.org</email>
+		<name>Markos Chandras</name>
+	</maintainer>
+	<use>
+		<flag name="checksum">Enable checksum verification for Metalink from <pkg>dev-libs/openssl</pkg></flag>
+		<flag name="metalink">Enable support for <pkg>media-libs/libmetalink</pkg></flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">mulk</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/nemesis/Manifest b/net-misc/nemesis/Manifest
index 74bc22b920ae..9995ef52cf81 100644
--- a/net-misc/nemesis/Manifest
+++ b/net-misc/nemesis/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 1.4-libnet-1.0.patch 6278 SHA256 1e79c8c0a9d848a657c2e14d062f7c6d0a51fe66a7c9d56266dd65952acfdafc SHA512 c584afc645e64ac0f09907ba50a60b8ab10d1aad93749eda277dfdf645267a3b16a0617ca4b7812c8a1828f48170c0b7aa5f6077e537bb539e1fe8294efec6d2 WHIRLPOOL f7434c880efa2a040884cd68d5ae8296442c390f775539eb3a05380374629b23d0af2ed05df41b4f97b93699dab06e6e2441aa74f2d26028608c0f37ab885d44
 AUX 1.4_beta3-libnet-1.0.patch 6121 SHA256 f9bd73b5e551340d98b1c1bb4a8017dd06d5536e57b4ae62e49530243cefdd5d SHA512 f3ec51a24ba44078a2734be6bde3dd29edd482d0b1a3b19c37d1654f5c730917cc737cbb4a13b63bedbe371544217a1a428d8e12f3b8381fa801dc177d7e37b2 WHIRLPOOL 05c9cf9f23bba0908d38c64af526d5b5b17e500708963e654c68785e8a2266cacec38cd48217ef2126cf2f96977fe512899df1170afa71990ad6340b88cebbc9
@@ -10,21 +10,23 @@ DIST nemesis-1.4.tar.gz 144187 SHA256 803f5cf5c7c4af15128b8cd7f7610730cbed1427f0
 EBUILD nemesis-1.4-r1.ebuild 730 SHA256 a1e3e800bd9cb2211fff7e41200b978a8e63c0ee6d41267adfbb195129cb282a SHA512 ad0325f1fb09bb0276ad0ebae55dc36edb9e00944257a764ff1b67bc97728335d196acc1fc0f53659be340b87e3cf04e7fe5dfe544ec6eed2fc628c367751eab WHIRLPOOL 7f25fb61d0f1cde96a6dc250719e2cc0318d79d6e3ce46e0af140c0f69f52b0ca8108a596e01fa9a4ba041b2a25dc9df4d78d18f73c17324c62dbafc4a0feaf9
 EBUILD nemesis-1.4.ebuild 740 SHA256 72b21c8f81805e8032d405377e053a2ca4f4f4c534300aa07286670a7b9c42d8 SHA512 a37f5e1a1a49f8a24446974e5fdb8959500bffa02cb0cbdd426056919603f7645adf24f7b1a55c765e66a8cc5d34e9f8319226e97d3af99fb83f650d194f3a53 WHIRLPOOL 5cc9d832101ef853d3d36eed83eceddc09e0fbd499ae184504665943c81de9869244a3dfc42edc2e2b2abfa64dade42587b3b651d2e630bdff0cebd0845b8376
 MISC ChangeLog 2747 SHA256 8dbb96a50d9d7c6f173e8a4e63f7bf98c1a290c4ce40faef102576735a05f3b5 SHA512 4d02ad55e64ecb47c13050c02d0d1bceba34dc552e8aac9006ff558ce42405fc3890d77c353e98740e5b9368ff78bfc20274ede8ee1f6f2e7f34a485a1a11571 WHIRLPOOL 5fb61ffcdf6170379cc4350bd1e299a6c96bbeb3ab03b35348a27d01a63130775d0703b3c2842d30ebc67e23026d52ae587d7efe7bd24fc8c9fce7b102c292dd
-MISC metadata.xml 255 SHA256 fd4c9fbb5f2efe13681636d9fea42cd8595ad305008746edd70c0bf351ab8305 SHA512 b20583327a6c3219935474c6c998da3b5ce585f8d4e6a1f6ed2229c45dfae8f88a72194bb8cedbf890fdd02c2baa98a002facff4d22ec3b839a1e1372e3deecb WHIRLPOOL a7e2e42203f9b226f5f0e835d5e4c2dc12e94c78abc358209235c831865b23711dc8cfb8701c879cf9e6b9a797dc2620eb8ab00050a9adcd04307c895692d2cd
+MISC metadata.xml 332 SHA256 1de659ed98dac613308e660d31f600580fd9d2614414c05916112483458e0ad3 SHA512 613a753c9ada723b0010d52b683bfdd563e60d857980bccc367cb096602fdcb97a4905e7772c8e88b5fbae1b95cc411e4d3e306e780aef25e6e2b73eeedcabe8 WHIRLPOOL 6811078e17d90f25d9cedba6f88f95bc475e3b1dea8fc66fe7b0e31d332ff0fa9218dfdeb2733cec1e4fce6570d206487126054fd74583ee7d97e070c169aa44
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJQxvp0AAoJEDxpGckxwJCBohoP/0Yp+c8PxDLQEIQXHe65XlHg
-MllZIN/urkwtlR7lHamZrjJbCc3N7Jk/bzQMx4LuE29mxRo2sQbNyLzqIMt4DLqa
-gzJqFfnCholoFrhf4W/5myIBdqt/9C9rOL6QAP9TfNtBhtNDdz4btNGPrnw3ddL9
-GTW6Tbs71eO2bx4saRg9X7J1tLaTHAuqWEZjRBJkHtdCbjVHXoH9FPWZKoK1PYFf
-GyApOzOJf0ERHW7EOao7bKZLbDRhWcIw7gVpDb/6cbY3tt0dvTDiBR1AyRdpWP0h
-teygEIC1rX4LIknNRZeMLSDbKe+PKy7Il9gcLkikPqRtpuOcTksn/tOLuiLnoOcL
-ByXyK9jvHwO2LcKMJMwfSJ8ib68sSj9n4AJy/Su/25yoQSiXl5h1JmKQ8yXv/Vob
-lzhRTgOI7F9ULFcS8mmVuM6ln4kim9U731z8ajQrvxE0aQtP56M5hePZuJM5Ps+c
-iTVCSrm2au6lwDd1hsqf+xJBCLwZI/HVm4NgC4evdWZtmvvrn0J5eQU7dx8v9T20
-0ramupvjIbammx1flLOW/kucPp9G3pnlwajVXe9s3feQ+iTKBrN8Uap1oVo6B2tN
-0/OotzRJ7VeHZrwEVW5CdtcV6TzxGqfKHxQENO7GeoxEZt46WIl+iCFHglr7BhEE
-948v5efRkQWVImvfYvoe
-=dP9o
+iQJ8BAEBCgBmBQJVfxLDXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiW/oP/0SgYmPEGrmBKPFJNKdDv/Zt
+OZQ0mLs+C4bHb5ugyRQWsDxn91Yczy0s23nv+dRa4ZqCvEv7MuEzeIDPyuK/6fki
+RGZx9wRJYXAjk5vnaTn9xASp5MdiY48fUyNeE7COrRiMnUd76pVHEFxX6Cl7jgPd
+y2peZ3PX5W31jNTt73WjmqHwawQZuH+dVqoOm89VtPx5fxBg6Bh59JjKwik9XNs1
+qt3W434rpPkA42AQOJ1ENltiXTyE5NUMBIuufekq9bHFWz6pUlMmEPOOFsXhEgy0
+5TMFNH6pjaIaA7bB70NGgVlrYPH6H2xtYDoko4PQNwWkuDVVMB6xTj1EJCxPybj7
+GPVjEOvWWvyxYjkoYZJ9N+9f6kalk0p7RDbBtekem/Gdxr9R1m8Ng6+RMZf/UCeK
+m0qBXfCVb61Fox+UtRcbHJ0bQkCOLTcg5g1t8kuLAGuGGEzj7UTVZJzMx0psur4q
+ICp6x6N7j2zd9xzFQY7taUabKzZkqp3u2yR1aQT2ZYjcKgnvXFz832UcL0C2B5/L
+bDxDpHfNBLleAp5YFEQLzLYyOaXjsUWAUWErbObnAENP8zjNtTVnIa9rqZQjKfKP
+N8R8P4bueQATgaKfM5SD9rsHrnD2WpUvTL+SGQAgtFutxWo8NJb7XY3pXbQjeLU0
+Cxv6/HSNh4h+qNDaP7/i
+=qAkv
 -----END PGP SIGNATURE-----
diff --git a/net-misc/nemesis/metadata.xml b/net-misc/nemesis/metadata.xml
index 28c31257acd2..20177dc2b05e 100644
--- a/net-misc/nemesis/metadata.xml
+++ b/net-misc/nemesis/metadata.xml
@@ -6,4 +6,7 @@
 		<email>rainbow@irh.it</email>
 		<name>rainbow</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">nemesis</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/netkit-telnetd/Manifest b/net-misc/netkit-telnetd/Manifest
index a9efd01f1a43..800ebcf6e3f6 100644
--- a/net-misc/netkit-telnetd/Manifest
+++ b/net-misc/netkit-telnetd/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX net.issue.sample 117 SHA256 14c92d55c12c680c69f557bbfbeaa4d03e652d4e06d1bedd8fecf7faaf076706 SHA512 f290b0fc214dd58acfb186c269180aae29c42768bfeab21aa72604ad8ce50c354f18d9b568d04885554c5d1c27017dd7132e406933050450d8605d16d9263b79 WHIRLPOOL 776ca20ccc850124378750354c44943938c8f7d93e2aba30793022b267c393bd17c56cf9e3daf979d5b4fdf98c5909a0efc4fc05034dd1e5e6c7ce0c853e5b2f
 AUX netkit-telnetd-0.17-cflags-gnu_source.patch 830 SHA256 14da0f4796691e0a7e656e72cb78bfd599d5f83b1f6aadd4c2870bcfd6e1cfaa SHA512 881065a2156414381e5cb3776ea91e4de0ad2d09065ba8ebecf8001b7f6a87278e6724dd5aa6d43f66554aed38fb0eb1b9103c2720ccc1a6aba4f074a5ec0f8a WHIRLPOOL eac690495c1a05db7da5d7d715a635987a6340afa9f8db9826ea530515d606840b249619ba17a6a74840e0388a841af59d8137a596571e98acbbef7f5576a83d
@@ -9,11 +9,23 @@ DIST netkit-telnet-0.17.tar.gz 133749 SHA256 9c80d5c7838361a328fb6b60016d503def9
 DIST netkit-telnet_0.17-36.diff.gz 27226 SHA256 cd192e3acbef83a3e8fbacfa26e1f6ededfe50587e9b372b5a38ce5928d746f7 SHA512 7cd1ec5f96fcacee551700d65f62b6c217e0d9b5220a218aa60fceb3883d0754831606a247355dc2bf6486a02175b8d9b27058d6bc788de8e1b80545fdedbf9a WHIRLPOOL c651f4cacabe5b42fefb9f9fa1f306d5aafad7c8b3e0c5eb6afcf15609487ef726991a1e5eb88c7f95364a1e166b26f01814b3671b72ffec14673e5927898a7b
 EBUILD netkit-telnetd-0.17-r10.ebuild 2598 SHA256 684b1152ba94a6823c8d2efb21a7d737c27ec8ceffbd532ec9749f07119a91e9 SHA512 4700f3ba6c6eb85a8139df1073e878ccbe2bda7794360a05db0eb36150acaf40da0a9f0fe701d36f72e6728dc266a8b34ab5bbfb7b7160334bd3b73e4c21b9bd WHIRLPOOL d4e3be6b3c9d6e51b39eb596f6e4126069e83ef0dd22ad45112a3bb5cf25c0cbd75e413d6a86cca1a19d4b1143ad55cafb0394d99902cf8ccf255b35ec3aa7fa
 MISC ChangeLog 8046 SHA256 d6934cdd7fa4d95eabd9b6274adc813d691f92edf7fee91b994fb6e03c99a436 SHA512 dfff5f4d755a70a09e7f46c4b66530c1acb1116a5bd9707bfff7f8acf44df806a2f8c8fe6952f5c4963b504b9ef668f67b19907096ad3bba28bc3bfe99fd5e42 WHIRLPOOL a102f6a3aed0ea8aef09bf2f89f9f3ee082facf8a4047c18026d42811cd679a66d03ca4e8a2459e07bcc168b07c866d8059d4571c6d86cdd51880a395dda942a
-MISC metadata.xml 350 SHA256 e4bacc5f03d58201d0ee79c3f03b4546904054429918c5cff698a3dd088fe8f9 SHA512 a05e17cea0225a893e841758de22e03fa27bee510b369b51c68f8e23df2d46993a33aa11b6058c8205f3d8b1ad1dbb87a6f963f0b5a3a21580a3e9f48ea60aca WHIRLPOOL 7e2c50cf42fb5710765ad44367a4871e6324c2e9883ea38d7390a8b6806c20aec933b4d90867b4d29c30d27b8d31c5d50537887f704f8e59fe867797cf7b71aa
+MISC metadata.xml 431 SHA256 b4d80d37c1b5a1886c46407f22a4d9ab0ede74e09ef1cbd32291229ed047af32 SHA512 a32f162991410e879ab2396b8c90ebd03fc4f86f4f35dd5222abfc70629de38f18fdea13f95e23d18c3c8726d2245e187bdecba17226df91e233b8be64c339d6 WHIRLPOOL 545ab9b247144cf545b58867726b6986e413dc06909d133189e078c940398daa31e0be4348cb0e744de55d4446fa4be6e65899204913367c28d4d8aad9306789
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlJaqgYACgkQCaWpQKGI+9S6+QCfUl47Om8G5g5HP3H0iwUoLG2N
-KYEAmwQDbKo5mT0eLmoe115sxZ9uCOkZ
-=2HXj
+iQJ8BAEBCgBmBQJVfxLUXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiEw8P/2KibI+7SUJs66OJRNFEoRt9
+aXOh7Zy7MiE/Gzvzyjj7eoTyuhOvAUf7FMfrTGG57mKPGjMKN9LG2Nw4ZmOJxOHU
+FbKV9Z4bm3mUH8p593iWYI8NG/Ax+8LEZksOwXztspVulhjNdD9DxHq6eMhIlbFY
+0OtDW4aaZ2dZGFHmgjPPt+0O0SykJy37YqnTp8Zl/PTWzuBECU+2ipXqO7jvQ8jO
+mDmGel+I08yQWkfmMAfqdMvKatAsopgVjouC0ctqrAR5IkF3R3AP5Qo1sWj4Ncya
+g1jSNYHS5fbrealJ+4Fy/1kFJs7/NHBjcpmlh3Sbj8WsGCK3GgIH5AC/ZiOq0E5w
+pQaybvY5D8N/R98342mK9QMHvpOwy56bP4+FAcYIevjsOoHRjA6QNAD5elvW8a4Z
+jRE3U1cLyYFHK5EdfWbrug74OvTHHjn1bgQT3rVeNYy/pWDTadoLEQrraFt8Zbed
+Z0qdJN+QSNiC6mGz5pek94bkCi5YRXY6YpWUgrKyUQwhgVS02+ZCfRJ9G7KwaHxv
+F+hseHAtXqctptbFJhKiaBLMJKLMn9oypZSbR0Czmtt3oUD8kyPiizFFVKv3n1bu
+kciamJjg+dP5M6PwAGir0bUSOKniGHToB0+DnfjrZDLeH2xqKBkAi9UeR6w2nOiN
+OH9LYmc8zC6HhM4nBgaq
+=V6wT
 -----END PGP SIGNATURE-----
diff --git a/net-misc/netkit-telnetd/metadata.xml b/net-misc/netkit-telnetd/metadata.xml
index 66218e4d92c8..2df74362e718 100644
--- a/net-misc/netkit-telnetd/metadata.xml
+++ b/net-misc/netkit-telnetd/metadata.xml
@@ -5,4 +5,7 @@
 		<email>maintainer-needed@gentoo.org</email>
 	</maintainer>
 	<longdescription>The telnetd program is a server which supports the DARPA telnet interactive communication protocol.</longdescription>
+	<upstream>
+		<remote-id type="launchpad">netkit-telnet</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/netsed/Manifest b/net-misc/netsed/Manifest
index af07b8a8e577..24a7bb420b1e 100644
--- a/net-misc/netsed/Manifest
+++ b/net-misc/netsed/Manifest
@@ -1,5 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST netsed.tgz 6352 SHA256 a04f6b235d787b1efd96ecdb398e6c8456301dbf965840e6fcbad36c68372dce
 DIST netsed_0.01c-2.diff.gz 3140 SHA256 90799c1da3a219e61b12e4c19810b6b5558de3760ce75e38c592b8b423ac7426
 EBUILD netsed-0.01b.ebuild 766 SHA256 30c551375ac54d4aa23acad191f4297efaccb7f80246540cbc912f746b6c3155 SHA512 46d95669de0bd470b4900be8eb094ef179a4c7c333e33d7e9bce27b6fdd891e0f22df1962965495b07c281f457899f3808ccdadaeb1b675f21b457dbaa3df2dc WHIRLPOOL 2ea4ecf04620c54d0a1a7ef3e06388f9dd700b10e64319f0b939e0107d564f50dc3c269f3873b627eac54cf79ac3f12ad00910a02c334ca52a84229762a2d12f
 MISC ChangeLog 1105 SHA256 6cd28ab0631190e6d4094e64ef041b94999e7dc365743e2dbb1626b94c82312c SHA512 dec517950ddf5eb40283f6d5ce27d0932e892a70dd25dfceca1d4b756640eec05bb3d95b3fab62c12664f6c66e2dfa2c5e0269aa7a865dff595a54296c0516e7 WHIRLPOOL cb6ec527d16c01726859f80840f10004ad2bdd0a7aa1760b9d22e0e1b94efa8f2ac8dfeaf3fb4a1ce661c78a4c59933578135c6722ebc87501646c9b894130fb
-MISC metadata.xml 213 SHA256 b46ce029025fdefca9eb3187359fbe5a4d2b322d411b67bb51aa1c9feb9deb92 SHA512 475e646bb0717bc79fabcd9258957cfdcde77b7f3e7b11c7987014d786a33e3af1045acc2b9b149951359a334bf9b6f69aa5d215b3064676d503b13dfaa403cc WHIRLPOOL 0f8a779d8c2f2bbf062d039f391bcb3e1a6ec418f0bf1e11f85e7dfe564df34e7f57aa8d8237acb8c22808c9e1b4283e24a5ea45fa00212130dbe1ef6eaac9fc
+MISC metadata.xml 296 SHA256 90f5085e912f96b28c9eb72c4ffd71d77eeb5b93caa6cee435e8f9dfbc075d35 SHA512 64b2a7e4426a89728c09f17c34eb4c1c8769f7713f34c336d812ccdb2c1200c063be1d3baeae1e22910fb932f2dc4b0708b3857a60aac70d9891cc76f95e8fd1 WHIRLPOOL 68b636ce732b59e09a158bdd7e489232e4848838c0e1cbfd6eed5a1629898b94d8e30aedd185917e41f0842ee999b5e5393209cbd5083dc212649a184e95b95a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVfxLcXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi4qMP/R5CL8DfgiFE5l4fPv1omxoU
+bv7OCv/OHsm0Bca5KgntmN11h1vQF4XFETp7Ej/o2LNpmIaV7IU3xrnMnzW/z+Ah
+fpkvyUbmcdCkzD4DPydm+Y2hoOm1wTTM4Y3DH8dSdtQ231UzAIfTALXTZ29So2w7
+uI3LbR0wra5fefhjTlrcFedW+29SWjDsFOu5/33UE5i4adBfVJpe86vw4DDK9Aub
+855JwN5dCvhfWDU1kvsKkxVqsx7rOtySzF0jY7MFWgHYXsWYJZGcJ4+H54Ki7+ED
+5z6WwKo03Rv7TkUnBRLJyoA93Vg9kEw5R9H7zRtT/KYviFCwDtR4pyKQyG++xGEG
+xY4mwDQ8YlRhAJNw31YyvgKF71C5dax9/jIzUurPK7qwO02cXQCEU35HumLqqaWn
+kgSIQdFsvl1mI8bh6volIpAjLS4Swc7y6/otdNhUXPArc9r4o0cELCg0loXVLZe2
+GvanF2xwxSc1mG14cB7GiXC0kUqh7nlMLruE46uN5UGeHaxmrZGrsISq5cD8117f
+EUphieWb5dZeOMLvya/6r6gIGLPFMl10Cp9HzBaKmyrBtlXzls8R2gqv48qR27J+
+bWAAX5eFgyIA5er0ze8ABE84ELErbPmVnqNYq/POgWOuL0BdHb03dVAML4vEgrXC
+krAOJjNLH4dBF2B9lKpu
+=Jrm+
+-----END PGP SIGNATURE-----
diff --git a/net-misc/netsed/metadata.xml b/net-misc/netsed/metadata.xml
index f031b496edeb..62d3535dd72b 100644
--- a/net-misc/netsed/metadata.xml
+++ b/net-misc/netsed/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="freshmeat">netsed</remote-id>
+  </upstream>
 </pkgmetadata>
-
diff --git a/net-misc/npapi-sdk/Manifest b/net-misc/npapi-sdk/Manifest
index 14bdca60530a..2388b8cbed73 100644
--- a/net-misc/npapi-sdk/Manifest
+++ b/net-misc/npapi-sdk/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST npapi-sdk-0.27.2.tar.bz2 65811 SHA256 01bf34bdd0fcaa546ba3d5c96f5d91f91dd117d4ed5ffe13f56bbd5aa566ae77 SHA512 827d52fbc8eb601ac0e486aed267b1ca6cb8732c92f1224f4b38e039288b77d07d47c5d4cf384a3114403b85e7f086f345912f1b20b41d27785c9bb367514842 WHIRLPOOL 9de6204b6112eff9a2621b3885475b0ea9fae9fd5d9d36200583e856126b6170edff5f7cfcbe21bbc5b133150479e7c2f68de7fd0b5b1f5e50c5c19542275bfb
 DIST npapi-sdk-0.27.tar.bz2 64040 SHA256 6c674423bdea1ea8a60ac6009bcb28c3343f1a5abe727cc0bbe869d5eccff15e SHA512 12e28c354cca36a15578cd507d78644e016dff03e4940140d11ecb598a89464898e8be9fb17e7e86a696906fe9992f3c55da18c41dd1b0b8d33cb049e2056607 WHIRLPOOL 4a00c1927f15e99a4ae7fb2483c578e9ec152d36ef447d14c5e5b2f24b1d4f1aa99888e90ef413843a8dc21a78a52c70bf0998dc64079b87d0d853e1a3760c15
@@ -7,11 +7,23 @@ EBUILD npapi-sdk-0.27.2.ebuild 537 SHA256 19a35d52eb2a1f84ec6e5ecbf5f0818d521b33
 EBUILD npapi-sdk-0.27.ebuild 534 SHA256 2b8fad33d131330e87ae573bb724078733a8a88e68f050a27eb0c4bfef572420 SHA512 e0d8cc0f80a740b6d4dce2488ccc9fe2c3a4e6a32c10c4d9d3e3bcd183726d6b2d443c9e298a883cbaf2341f94f20796c774b11af060d8a1d978016d00edb0b8 WHIRLPOOL 7170c5e6478d625a89b58a6be18b07e88ccfe24ca7c86a678615801757a1fe301935638fcc99b59744baf50f97860fcc487472cc2bc603b2068d3412a1bcfaf5
 EBUILD npapi-sdk-9999.ebuild 693 SHA256 5262cf5ba12ba9baa30144180c767cc5facc0ef3eae668f6bc5c8073d486547c SHA512 d45552680d97c5eb1133c9a954ed2a3d50993225b9904648a1c2012b89a74ec723eab698bf33ff7e0416e5bcdc2533dd028455885607e4c0b88a22b46d47baf0 WHIRLPOOL 89d107296e835881504cf2a4161dc176008841b5837d093b454f8125d2a3a28bc0c6d2f5e4d73f5fb1e9f7e5747bc9697155ec56232f772c4eba16fb05d09bf5
 MISC ChangeLog 3810 SHA256 42f281d75897962b218458beae31987032dc8ebfa92c14e065b416a39fe1c518 SHA512 3bfaa814b9ded57767067070d6822bd0068ec8fb3fbfb02a2a71b2361719bf8065dcc6c2c33330528c2465490d5ad55601f9c7fdd28d90b62edb020b5e008d6c WHIRLPOOL 97efd2116aac9a25e9f38d3b79e34314386c56119ba9547d3800b0fde1f74ae0fbce8eda5ec3bcfbef5c223f82e0012a755367d3fba91a121184e1ecb42e443d
-MISC metadata.xml 349 SHA256 51b13299c5332aec3e17631d74815a09b544f87ddba085c09e81e8a3607f83be SHA512 9fbe9eac7c03247ba88f5b002e29ec61bd626cea649734d7762fd256d63ed18856a53f6072eb9d7e8e6249188c2230860d3d25d1e95dbf906fd05c85f5513b50 WHIRLPOOL 0d13ba1e64723bdc622bf8b3a6410c9786b53da000a6a0fe14a8315126e0cf18ce84aed3a4eb0dd5e5589fcb8e56862cea61d00cb9cea2c43d197d4bbd12cff3
+MISC metadata.xml 433 SHA256 1c6d3a292376ca4954443acf19ebbd35550b382194c81061101aae592a109f81 SHA512 09b1ce6fb55717a7a3a1ece44dd5458ad4766342f9db3def4df490ec21e8e19bfedb909185e6531891ca69509cefa355ca6a039819781be639b7383ed448df3f WHIRLPOOL 4951e267631eb9481531b608a3236aeedff94a5761b4c4f282121db056afb61c9260dc1ae5701bbcb78679b94cc0885b4838eb4faa9346c39be823ab7f1c93b3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iF4EAREIAAYFAlUJw5AACgkQ2ugaI38ACPCeVAD/Tc5dRLuzqmzDP0HKhz0ff3jF
-stJO3oooW3W6Bm6KP18BALNJRE1p4MmcZ2k8jX9YZwHSmZfzAYFqaSMdEruE8Y+c
-=nfcx
+iQJ8BAEBCgBmBQJVfxLuXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmihL8QAJBggE1xasHWLc5+GOSt9c5u
+dxda16J4wZ6Ib8TS86UaIuvXhu1F1xwkKPcpeKAFE+nGy/Etg+HkNunKQGn4zjqC
+hyeCF8rid3WzwyfV7JPtpOegnE16d5GKe5AEqH3bjUKfRVw8tH4YHFrJqgnmKrX+
+1cTrn6IDNCGNfzznmwOxFvwnKMro2qBEh4Ds3NDF+ScvRvuin53LediHeimGkTkE
+lhOGBbmQIamtbEdtYs0t0sB6hI576NqDUUlH9Sm5ROqyEBdvyYpvkzrD1gTgUa+D
+H6uzEJC30ONOu1IhkuaIBcHzXLLINYlk+moyIec1j4SO5ohBbBSO6G2hEoQzv2Gx
+VMO4CCniWZBr2kNdleWNakQHPSp4eJ0qHMAwkyMND6iY4rJE5fON2TwdTmeDDt3O
+s79oXDNpjDvQFpxpQdAug2rsItKsfehbuRpIxKJ4x194OV+RuIB7erOchKq3x1Dh
+WfHJX+6PWvH6Sao2kgW4Y/qE/VrLNH+sXuMeZGA2uo6jhk1AIHwD36tnoks5ROUQ
+kg5lJl2qt5nEmuopsPcuehiu8CkX8wkn0JtqDW7m9GAL9Gpy1cMyK1z/SASDLMWy
+imA5KqtbF8kHD5M1NgBUVcooFeCB95Ww85wc12H4sTtyLBZF6Hgh9ZI+sRpoNJQB
+wV+d5CuYZq9BNGRxPhGI
+=6u+T
 -----END PGP SIGNATURE-----
diff --git a/net-misc/npapi-sdk/metadata.xml b/net-misc/npapi-sdk/metadata.xml
index 7d8fa46c9c52..185e561eac9f 100644
--- a/net-misc/npapi-sdk/metadata.xml
+++ b/net-misc/npapi-sdk/metadata.xml
@@ -10,4 +10,7 @@
 		<email>anarchy@gentoo.org</email>
 		<name>Jory A. Pratt</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="bitbucket">mgorny/npapi-sdk</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/oidentd/Manifest b/net-misc/oidentd/Manifest
index 05a056925408..17361565bc0f 100644
--- a/net-misc/oidentd/Manifest
+++ b/net-misc/oidentd/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX oidentd-2.0.7-confd 67 SHA256 acdd88d817474e392e8f07b0f00579007a71340d00a5520d7a2661ecf4a7e5f4 SHA512 d3aba90970df7cf9869934380267b3f5c687a86ad532fa854728e2f7506551254ae4bda0a1edece24d26c4da6c29d7e9c44923a29fd67016b88a7766c6e6a050 WHIRLPOOL ce8a6c4b1893d83313c16070461fcc50ea39970d7bace72df961bb655734f78e3861fe4abd2389b8cf09e813e6ac0ac4b8d45709dd47820c20cf24da77511ffe
 AUX oidentd-2.0.7-init 954 SHA256 23237b6ebf392182e40d6e68ee44f505e379a28d7cbdc8843570c2d11a227729 SHA512 0ef1a607a086e4045808ad5cd6e4985238fbf18a3dddb238f794957f70c4ccf33dd98c48de94e28f25a34f062006e47c83b0c251ef102255d56bad049ed53522 WHIRLPOOL c1b6648453127b66d4206ea20484fbfefcbc9dec5c88677460f48808619d79f62b33beb387416534238b04afc2694becf36aef8102e54fd64b2d3baa1777af33
 AUX oidentd-2.0.8-bind-to-ipv6-too.patch 559 SHA256 7b1cb031b353b60d14c932c3c7a9f3ce040a47107df857e3b250f12eb0cf34d5 SHA512 be618cb58942e8bc36e42667735371e3e41152c15bb22573ea658ced86af8b63b7e1b6987ae112de90fd35988d6d9386d2d8f01908ec58a86ceeae7e65b591ad WHIRLPOOL c897185a2e97719375dab0acb3fd70492d659bc34a2f03c89800cfa1495df3fca46baaf808ffa126214b0ad1a3919c851f4ec6c97ae7519b6fc2998ee9eb21eb
@@ -10,4 +13,23 @@ AUX oidentd_masq.conf 429 SHA256 16b94239221e63abdf38ce59e4b9231622f81bfeca643c8
 DIST oidentd-2.0.8.tar.gz 212354 SHA256 a54cbed187281f8d5a301d1d8fd5cb0f30bfb13a5a8e9ab752ace76c1010fb6f SHA512 86229a4ef9892121c25a7140616e180f862ca34b73ea3ad9f0fbb008f657abb17e9f14c2c25ae14c14bfc14bf1ea10b50fd68318631a9c52227bbfd6e6d43288 WHIRLPOOL ac36130273ec6a4fc7f715a9518f99445c3f4af50b03e647846b152800940fd8f83222b78b7a12385a0c722a8d89b6bdbc557812d0b64e3253aa3231f95215cb
 EBUILD oidentd-2.0.8-r5.ebuild 1257 SHA256 3242f9193adb94eb37f20c6cf7212f4ba98079ad98621e18c038407b01196f2e SHA512 7251307938fd52f94e6112378926ba8f1825fdee05952c5cf7ceffbda601d06647e9dd70c45454c51d651c5bb327e8682262cd62c8155212deb8dd21dcc35ebb WHIRLPOOL 4a51af5e4f5cf11adb0dde96c1a7b03830dea69cb6b534046adb34d79cf68c5c28e6183c8fca8e20870971fcff4bf9a796e301194bb906cc26f75e185007a9a4
 MISC ChangeLog 8297 SHA256 754014d897e04563fe85b4bc5d88270c23cf25842ec6aab471350b4a8057aaf7 SHA512 9be7c930ce0de6a8791757077623f0d46662e38246e2225c5c0d5f5c38211fdb0b4b42f85851a64d19df98628969ddc744ce333f33f424c727ad895b77efcf77 WHIRLPOOL fbe06cb1f0904b252f4bf6534aad0942e2ce33f44e2a9561f229964ef18924318e31c1b62e4213ae656b28bd45eef79ef6a1dcebb5e529a383b07852791e5766
-MISC metadata.xml 340 SHA256 082e0b94faccd1c24cb7074e47d399a2dd2f1dabef837eca371cc1633325fcd6 SHA512 ecb09f2367ababa14b9500152c6d6350c1982f803d26e6ecf22840f6a757a657b39ac1887c87f0e534b500cb23ba04849f37d4302eaa0e9f2a2aa6a2ede0ff10 WHIRLPOOL cc90759cf7c367929c426154704a7a94cad7a2f1e8b6b913c3f2b7a931f01a43d5eeecb95e7b481d06777278b972c11ec5be8733a5c84a3e1258402e1f0c4dbd
+MISC metadata.xml 418 SHA256 ff3dbab32c2486be6f7efe3f3027325004163ac0fd10ef62624f353d1f332ab8 SHA512 c728c74523613154b2475405672e9665aed3d67c8a0ae583d8fd331fe6aecff40d270ce1bf1d5a8654324a2762f3917d01ab201b62e0ea215238a68c999b7961 WHIRLPOOL 18ea24baa72ffa3efe2bc3410c06d177a62ace1720f8488b703ac512bcdd67f244eafaa22e34e62849cd86dd8b90bbe27b3cd61c393bbfb8f6ce294d600a8c40
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVfxMCXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmilcwP/j7Iv8dsJqSDMJPj7gZNl7Wf
+9gdlO0m1grBbYm8i6/DunlPkVv3Oi5DLp0oKdWD6xfzSpWZlt5QpU68zBJu5PB7S
+ReL+seBnvK2/iVTU9wNog3PU4L9PjuXjTc7jc+steq/tPwMyYWzbXa28jcioJatp
+ie8kmfux5aqR6bqXrZ/7nBN/YNoyEYoB+EK4z6TNkwoNM/FagxI12tbEw8P3FieZ
+Z3pWdtaFYI4A2FnMQ9Gpc9KGmjt39QBJOtpPMfkytFPAMfpwZcOtUpDqlGUXlup1
+m+IuiG+MCdswC/b/SoJ5cLbmogP+ZqumrjZkL08wgjYJOEzY+XlNFFXqfd6NBouh
+/QdSU68Qk9Ma9LKibiK/njAVnBtrD8NFUXrUoPPNiNC0zw6FaKicW41G0QE43pwk
+JsL9DmrAH9fsZS0RVaLVsrfX1bM2CDNgZVPoqZQotOLrxJz0IQbPLA+qDUPv0Nm8
+sfkijQBjKetsmojfKPTIsNXNEyOA/+rhAxmDv/z0mLIWOQ+hSnQ/6XL+cgjfp5hD
+etnf5V8yojGelL8jnaVJrCGg8XlX3JZaQ6+kZuU4eo+r6L+9KZ4gzG9hLFnXdsG1
+/XXUnt5MiMtKd4fs1KuFWyPaqj8TppHC5uBkA36Ty+f/2OHVs6HFQbwvQ9PYAjqv
+F2A3nW3aHdCICEX1LXXM
+=riww
+-----END PGP SIGNATURE-----
diff --git a/net-misc/oidentd/metadata.xml b/net-misc/oidentd/metadata.xml
index cc36e44c26dc..aefe4c94ef4c 100644
--- a/net-misc/oidentd/metadata.xml
+++ b/net-misc/oidentd/metadata.xml
@@ -8,4 +8,7 @@
   <use>
     <flag name="masquerade">Enable support for masqueraded/NAT connections</flag>
   </use>
+  <upstream>
+    <remote-id type="sourceforge">ojnk</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/net-misc/omniORB/Manifest b/net-misc/omniORB/Manifest
index 371eedfcc325..0e0baca73ada 100644
--- a/net-misc/omniORB/Manifest
+++ b/net-misc/omniORB/Manifest
@@ -8,23 +8,23 @@ AUX omniORB-4.1.4-openssl-1.patch 770 SHA256 0a27f1476347939ba24fce9d0f2e0246164
 DIST omniORB-4.1.4.tar.gz 3093814 SHA256 84fb9790c25d6e46248c9773747e393b429573190da2150850d4a49debda4e8e SHA512 0ed989dd9a8c024a575ebbe1def137d11c4e52297727883d26cb1fdc87d2965e6d0152ee4b7b90097f2d97eb22501bb968eff0d070e88f80a9fef6b7439e1a1c WHIRLPOOL 16b12ade124e62b57d8401c73975a4a0861166f080b0f735e7ad363dca1a7387d807e5c8bf4ae9b90b70f41a03e9811109bcb917e78b833578e891b78c9da55f
 EBUILD omniORB-4.1.4-r2.ebuild 2244 SHA256 49f1719a667bd758790c546158e826248e5daa6912960b5f55da61d4961a7867 SHA512 34add6d896c2da7e4756e5ccb66bd03aa4ac68b524415fd2cce1ff3c7c6c96240f39a46b4ff9c99d5031282a32eb2e63c161f016e5ec4dad0179611ec6b18e5c WHIRLPOOL 6da31e166399965e017149d5ba26e71342eab151b7d74cb7053ffeb1131055fff2003bccbf942bf11cf717a4a000cdee1294477315ef5266e25c50499471ae0b
 MISC ChangeLog 11791 SHA256 e3aebbf94416d2b2da1a40fae1993cafa19ecec2538bcbf15eb1c0ca9095ef3a SHA512 f0981e39ac1f2e4c61022f3c53ac9ab83d2d4828ca34c87048816f51bfe48b0de744aec3b35f3ede29f24e2290d8c6d8b9daed212a51431fe13742fcdfabf487 WHIRLPOOL 270d919bd2a0ad6ada2bd170bf24f6ec0fbf4620a0f7af404c91c0b11613cb28985d047f340187b80ed2e18341bf19ba253eb79f8259fb6fc98afff5550f5a5d
-MISC metadata.xml 207 SHA256 18888d950e65829e52ee5b469eeff81ee620812b80b8d2850ae87c776e59241a SHA512 db557ebf2598d640d7c211ae896d8a9d337e1a8f440118df9c5593cd405309faef24b0017dc9969c0c28eb047f237bacf57f59bbea008230aaf97ce7a9cadd00 WHIRLPOOL 60ac4459f2a5e88b41e326eaf17503ee5089992be6d648dc503ff52b6543f5778b1b06fd177a9e5bf907b98ab0499f549f64b05a536ecb3252c257645fda1fba
+MISC metadata.xml 288 SHA256 249b268d31d6bacad0661c46a212ce6d1f19a4500b6be7f2d38f97bb764f967a SHA512 058c560b064bba05f7dd202ee468bb3d5b515c7a946801b41842cb7b4d833866166ccfd07c5b8e3c16ca05f897601abae8087f00611fe88f0950128a7324c271 WHIRLPOOL 53bab0a23b60eb9f185d14df9a8a6d1e9ce0b939b93cc483372751b9079c415a021a79600cc7ff9d6e3990dbbb9b65fd3048a67c8cfbf8dc8e6fbf12d73d8275
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.1
+Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVWYc5XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVfxMRXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiCNgP/1ORA6WZ3CZvNHM6dicfVL2s
-Xgf7K182lh9m/3lHFALumUT7XFYJ15B/YCER5AcRlNPuX6vHdN72d3jA2KqnYNmu
-3gtxxn0v7J9hQgzSNkNTQ9JdjQJ1L7HbSSn4KjKbLQJa5WvgxDssi/khPL6abTqH
-ak+lqcd85fmD1+I6FUBqiDmnkRkCUhnXnO6YPy4IYIePfRUwp+QwvlL0ATxbWmAV
-oR+vfHwxnr6w2CviH11jixWCB8dZKDaHuccC3lFti3BtEi3bf13jy3vNzrtHp8/t
-wMgXm5SqZ0gavW4Sc63gpsb+8Ihqhe+c/V3PJnOVJzq0YZA/bmzcGALLdKICfAex
-+ZPrJ+JLxJGvaFAJIfYV4bZ2d7bb94zcLncH0ZWVBFcq1ioVksJRYPQRc1UXzIDL
-B0GMYQVn160QWScH1pgNPp1XM8fDIWBM+nFTLN5+oTg0EwrlWOs7ctcWgu1lrIe5
-qz7PhZGcBG6Ooany2Ck8xfQPXM5mg5c+nxTqYctE8H5lolecTr3jR2vriMCotbMT
-D/jo2UTq0iDtVFOxr/TDKNn9Vv43uofUcAgY0bfcgzPDCnlFJ6vBWKmWZ9FFLBbT
-JyDTGxL1pmC5ks4D0+nz+BDWaPA3GKzTn492lHQKjTdvsiqjDnDXCWShTf3iC7zG
-gi6ilgjjz5MLcKMXSh7p
-=QUeH
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi9uEP/1H4sC5cmRK9WpxyoDHx9E34
+Y8ADVjffZWWGmP79NKYTJvTbeLum861Czh9nj3n2Brb2Pf6s9tpmRyuzu6gKgl35
+pcmR0e2fBGJVBv9AyvwvZRdZEGJkL16giIaAVoGuDBrz00f0MSBrUIFo0oynu5FT
+3gACRrolLonlCdI9JH9vFMUpG3tzZmsDfjrFMHkYc8jO9ex0ECGndzcIq15id12l
+z5gDSE5oEWxYL6YoMI7PPh6Z3U95k8d+bAZLLy2GZq9XvRZC09vN2Y0JKX9iAkBK
+bhLy84LGgblosj+MlMjDW2WREGI37/AW8PCzV+m7WeyoKHHvxeITZu8yUYTrNWdv
+PzdQVMVkCeAvXqmCfOFmPf7k1YG9RqP7jYv0THGEM+VJya15inaUF5VMVdMKGgBC
+uyPNv9oEiHbwXfDw0LxDx6WMwUocmAr7DPdO7acrWRX/zdgX7aZK6SIXL+2FH84W
+/pO3zNIe61+EBU1JInnmBgc/qZxECH7k3Tm9G7mO2aS3FdSQjQ0b3GLC9linTg7P
+h4pxz7h2qmjQkY6G3j7Cl7kZmKZWrNatn2KfjzE8mSkOhvTWvuMzdIMue0FECiJW
+Grt/XDynvLSIZogVP6MIhaSushKPyPS5xH1UBkhcXvSUH0GcvYxHEOf3dO4X85Ls
+yzLB3B3xp+yt3LfcyFCy
+=rAsi
 -----END PGP SIGNATURE-----
diff --git a/net-misc/omniORB/metadata.xml b/net-misc/omniORB/metadata.xml
index f2e06f38585b..47c52c1154d4 100644
--- a/net-misc/omniORB/metadata.xml
+++ b/net-misc/omniORB/metadata.xml
@@ -4,4 +4,7 @@
   <maintainer>
     <email>caster@gentoo.org</email>
   </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">omniorb</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/net-misc/openrdate/Manifest b/net-misc/openrdate/Manifest
index d9395138d161..f9891eb33d1e 100644
--- a/net-misc/openrdate/Manifest
+++ b/net-misc/openrdate/Manifest
@@ -1,7 +1,29 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX openrdate-1.1.3-rename.patch 670 SHA256 4e3647ca891ff78a4f1ef479ff330684589167a29a53a95dd6a2a1fcf8ee12bf SHA512 5f370bd4b053fb822e946fd3fadd797a4f13ce6bb3f2b47085060e7262a35d453b5562ccae68818ca061f7842d462d62a30fa5d926cc67ddc5fb7332c23415cd WHIRLPOOL d7acfe6a28262d422783a7d01bfa5b09cf32912898e7b4bba274b1dc63c1eef117128da423ad4339a7483272c730aeab86af9a48f2c8d4910c7473a0a0290106
 AUX openrdate-confd 583 SHA256 530a3c700359d7fee40b7ea1707650929c5e2ba230f81a00cb4233ea34f11b27 SHA512 d918d8624e639cac4897cd1c31481b7b899463510c0e9a79d8383142015285162484e8cdb0b94fd391e9fbcc2b23fb7ecc8945ca02ed85e43afafff2bfcf96f0 WHIRLPOOL 1848df87d5e96426181ea0b599683aacdd7ba16df0a8b79a9b72f2689c71e7f7b2faee5b59761766000a869d4d7ac78dbd33d80ecbb513fa8e2be30d01935d4f
 AUX openrdate-initd 650 SHA256 07577b36ccc71ea23a7a8cd4cb649db1f051ae48b5493d24c9ba75c1a3e8fc13 SHA512 cb15d19408f973b60e3b052d831f04db7a6cfe2ca7e84d977f0beedbe4b8d2699bdefa78ebcda0f9ea81f8f0c28379f3e40deedcde34671471e4477240546717 WHIRLPOOL a607ed618280ee35e5ee86e5e2d557b4ee05ed341bad7cff1c93e32613b9f8394822c1879f2f6847b8a01ce2dab6325b1193a46a2ab43fd7a505d5047fdea396
 DIST openrdate-1.2.tar.gz 118030 SHA256 2921fc96d4ca676190d6ffd45fa80e107c1fe12291c0c4f64827c29639863332
 EBUILD openrdate-1.2.ebuild 846 SHA256 747e4da99f3d39413d713605cd732a99a6b92b6ddf24c74148f84ee07123541b SHA512 ece02d28428cc0ab492fe3becf72a7cecd9e6daf604dff400af8da1ce2c12f80ca2f42bf242c4635e2d5a0c91bb1cc8b4f15cffb00b84c26195fdb2dc3214f44 WHIRLPOOL a9a4dde52ec3ee8f3334866150085f364faab693a11ae08f76b516a1ed64282fa11843116cec73820f3f0010fc1c6c21960914cf68f67d2fbaa1ed140403cbf6
 MISC ChangeLog 1396 SHA256 e52ddbda8bbfc3948ab642b439bb99c93826694c9386bc86cd1f21e47f32a6f6 SHA512 e7e50a722e476fd5c8006f6e5280d94aecdca7984f623fee8bffb99205bdb1971cdf45c4f0bcb2062ec76a4c82d80b9af421f8658c54c8f24902567b2f595e13 WHIRLPOOL 85759dd0bb4844a325ad55eb4e605dc1fe2475f42d5e776c01ccf59f6ca7dcc5f700f31d402fc68850523f17e0971b9157043e9a222076a9985bd80f1e64109c
-MISC metadata.xml 202 SHA256 76dbb4a720140d78f0ddfb2b2782c03852169c201c1f507eb17ef4d2a82f212a SHA512 bd1c14da72bdd52e3bea3056f5b9f908c31d6915b651d15d80a0a7d26778c97cde493ae9ca4352bd313eb16ddbed9b169c6b620c7f4a9b77973f7077fa8d997c WHIRLPOOL c073cc4c903e3377c7aee652c5661a1657cc5ba70c3deb4b2d7b2d0e31a78fb8b362b2f255de3faddbf4c46250d14d2d5d39a6a13b910ad18f8d53df362163a0
+MISC metadata.xml 291 SHA256 6a3fff25034b596e016fe2320e01a21f6719d6384f0a7180f3aa05034eb44e8f SHA512 7331565d8be356caec8f29f2322e3876f5b1be4c29674311d74d64b16e331529b6bec0e807d9cf630a07c6a42d16503aaa580131b12a6b33fd8837d4118abe84 WHIRLPOOL 96d0c699d0738c5dd73d948c404a2a0bfc8c191a14b98a14db281316f123d06c8bc6bfbaabc4db1afc6171fd9d3fe5ed35f6797649783a6e3f564b87e39d7780
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVfxMeXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiLkMP/12G3ZgLnQVI9nQIzMdwa9gi
+ng94t7fgIYxcX8KLexsRbaNGu0qpOp9Dif2l4hRWMQ/Ekfl096S++Og09mG0p5xr
+jY1lKYfFnnM8hOPvE5ndfzaVkLuuP4KXhFcH3s/WXSyP9cqx+iR1hZkpK1bcwfzv
+IIBcHTsVuA8oUoGZfKFdtbcTI35BHepVkDjT3ihQWoqwoYRCemF35z2W84VO5E/P
+xRamq8CgWqbB827aLvaS1kk3ASxlFndlZcYMBjtIgErxHM4WkGqDDeEKfKTDm30z
+kCFzT+szCI/alWC7DdzWRtJyAoar47kp2SNT0728NON1lHSpMzmCo/3N4ao1W+NT
+0c4TlpySnnRpKuzYRtjJ0jiHULANKKisctSaPmo9xlQm6zpm5EUgwmwSrQAsKh+z
+7VpXWF4uZoIvlCBocCg+A1ZV7UctdRrwh46D4xHxAYUdEmflFsN1p9BK9bLuVAKJ
+HzCr3jrV6RJAE+R6ZoWxW81ZVjLuz0m6lvngEgEXUHZTMzVkyojg6EzUH/SX2/EZ
+aoWpJ2Egxf2GiszbiOx/nmbBtgRMGQk92PEvU3vQ1sJj7e5clq2uA7igrVhFjqCk
+gGvk6KUtDE7T2IUOUKKqzZLWSC9qvw2DM9wNzMmEyM0ruYpC88hwx9WI0wao6YV4
+4JTB9ZFqcQ/Xf2/R9vPO
+=yiH6
+-----END PGP SIGNATURE-----
diff --git a/net-misc/openrdate/metadata.xml b/net-misc/openrdate/metadata.xml
index c6d862855eb5..3aaf73907939 100644
--- a/net-misc/openrdate/metadata.xml
+++ b/net-misc/openrdate/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>robbat2@gentoo.org</email>
-</maintainer>
+  <maintainer>
+    <email>robbat2@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">openrdate</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 112a725446ca..7b6f1dc0d82f 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX openssh-4.7_p1-GSSAPI-dns.patch 4494 SHA256 88a08f349258d4be5b2faa838a89fe1aa0196502990b745ac0e3a70dda30a0d7 SHA512 4d00a9ed79f66b92502c3e5ee580523f63d7b3643fe1bd330ff97994acce527d4d285d38199cef66eddc0ef68afabf7b268abc60cba871bac5d2e99045d4ac11 WHIRLPOOL 2f118fd2f016c529dbc31e8f2b6b418931e6770ab02c28b7feeaba93e84e7fcd1c742f4420a43a9fec0bdfaa4d4bc7cf14fb860c0a56c68a30e7b136fb60bcdb
 AUX openssh-6.3_p1-x509-hpn14v2-glue.patch 1451 SHA256 d7179b3c16edd065977aaf56a410e2b9b237206fb619474f312972b430b73c8d SHA512 02577e3f718ff994bb4e962189f17048b4c03104d0a1981683f3c6a1d6d30701db368e132102c8396da2c0f5eb2f6602b26f32f74d19382af34bd9a93fc508f3 WHIRLPOOL b7d224d71634f380bd31b3a1dd3e588a29582255f717a6a308738ad58b485b693d827a53704479995ec2ebca53c9dc9b2113d8de52a1336b67ce83943f946b77
@@ -49,21 +49,23 @@ EBUILD openssh-6.8_p1-r4.ebuild 10246 SHA256 a4dd9eb1911a2f73b7352a9626134d179de
 EBUILD openssh-6.8_p1-r5.ebuild 10577 SHA256 7ad36f2bb01a24c2421e76c240c151c4c3bbcb0e99b5780e3ee4a11a1d9b1b10 SHA512 f301ab241cf9fed3612d6281143376e118f0e75813cf8c4409af4f76eb2a259272f97c072d178c6ae10cca9545ea12d1fec31ac5c4959ddc7b75fcbcfb8dd850 WHIRLPOOL adee554a35cb545c192312f9731e71d23479d89d1b219b945e59b50b94f887e0371d8580688ea5406ed0085a65dd7696a9ebf0ce10423edbaac3466b5509306a
 EBUILD openssh-6.8_p1.ebuild 10045 SHA256 13378c09cc4ceec7cd1b8c12ad925db87c9d37910edb679eb2404527226ee18d SHA512 daa5ba19f6fbc0ac7104c8c7822b22745736bf864999ade1e205d1b7184e0fd67f997c4635ab2335eafdf2d2917cf677764080d3004b24935f4189fce338010f WHIRLPOOL b8d40e35bf44bf26296c8d87e3b293b31f767920afb288a10deff8a9ceeb1c130b4da2697d7ce970091d0810c5d1e3839640e2ebee2f0d63b8ca5b0f430c0c0c
 MISC ChangeLog 93690 SHA256 c9a6925fd765c10c0185186bd15457d9a5cef41c6e6e1dc23083fc57accf4171 SHA512 a2846b7f1a05feec7cf0636cf1fe5974de0a44a6bcf878cae3db381cc89266bb0ff2938fe87767bb76ad0e720c05a9c0390994b859f414ecf7f31bd93b55ac3a WHIRLPOOL f2ac21cd1f92cfa6226a8f559c3e906fd3a50cd942e0fc679428630baae17ab341a6d168088e9ad38e52089f9a45bff16d01817d3d436541ba172be5ca9c4966
-MISC metadata.xml 2049 SHA256 db7830f81086b967b8212af7c318bf27d22ac7db58b1a4d9c80cc86453ff03ab SHA512 3641e38203376c78fddc11b9d5861bdb629a1f9faf2768be5dc35f62ef3d37636a2f9f990e3ade1de2cec45d33a5fcdf7bb0dcd5f4376d40753fe29b354da42e WHIRLPOOL 6a7497491a150ede87bf20f5da5ed9003d545c9c376db7b78a6c1db66b1b90213f5f97d9211fb8b1ab204c1814c1a90d7be77a2d83cc045cf0762b4d2708c56a
+MISC metadata.xml 2129 SHA256 f786d2849baa9c48bf58e1e5d71dec826998961dc96ae13937c2853900b4a289 SHA512 a8ce6d4781f98279cc7666a36f0e80229358d61a2ef9f7486d26233b523780963d43b2cca332301901a22a15ac2e79d2abce399028b47c95d65bccc49f609376 WHIRLPOOL c59d747bc802dd8e3c3bcc3d0e7168c1ad00ba48f74226e5da5dd1a1ea769882861c0bcd9bcb117fc92d8fca746f7d69a39b77a4dfcb5c0279f672bba2cb3eec
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJVRt/aAAoJEPGu1DbS6WIASt8P/ijWbSAr0gCXLlNPIZJApToC
-bBfg8nyojqOh5M4Hkbhp72eycoGotCNNdKErWxj7osZyFreYaYBW5ODNsQBEKFWz
-ihAY7LNw8dmHx2NksR+MaLgqY1mhFexAjBD8q/8rC2Rp/+QLDnovq3PBW/bq03MV
-oa5VlChKUoitlp74Xs0FLAkL9pg15zuHJHhnA1QBt2M9FBtVHpvcmwwEfmG6OQ9L
-Qs7tolO/jVaAkzwXbr0PJArJ+kFVEPP4GTDJzXKiWqvTYInc2hkxocMplQIqgL5U
-/XZb3d7U4Vl6S0J2cZFLl8zIv59AsWq5DrTFWhJgiHF9zl9W9UNHHZ/8TOA6s3hT
-l6HOu2pXBxu4Gz3hT8Cna7Gl3eZX0x8/JTU8lvPPxkt7NSNmtTH1X5tidUB/JeaH
-OPRA6fh0iOjW1qwLlwR7XDQ27Onw/5Z30kwXIplI8FIcKIaqPIMGlwn3E5XNcIKh
-JnslZ970KHhHxxiie5x8H1rNEUCBsIRYfF4TN/BohkHrUrdiff25Szi6v1U1ALbi
-I69ugjahsF3jXguR1+fS8pyet81GQDf9u5Yyyojd7cn4T6A9whuqCr7ERvxmPZF0
-JjWIGBu+gLvQHgs0BwqpH0k85V5JxtPLZ3tUlrUQJR7fSpckcsbyQTKFheDXkcLB
-fzqhSmZGiRMSeKksO6qD
-=iOel
+iQJ8BAEBCgBmBQJVfxM6XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiYz0P+gOeScjAUXZ1oqNNoI3I5vPD
+khNwfYZpKVgOofedo/YiplSv6qi6gW0oG+wbfPVrzHej52JAxloMm9XauEArLedd
+tiZt2GuHpUrxaqfHsPkxVagZqfH6r47HkSDYqtjZt/bnZlTLVmDGhqfrQZQHFSEq
+Zw0XuPOhB5OhZl1YuVb3Os9iwm6F8lb4ZRh0ZJLa68w1uZcMJOc5J0WJ+n8kwLH5
+lhY0oTgt2rECXrjzRpRXN3hpO26fmiLXGXhAeyBWAddsPAzAyHcEw4XkKKJnBRPe
+E7dlsbTwRB1vTfJo1+q5+vEbnTJfI29Izq15XSFQyOPp1ADEHGWbwV96oHtJlFgm
+wrl85FDjmg7WJrEX1NkNznlIwTLSbhFg8knfAJMDqmdr+uDAkmJmV0lMvR7XhYCQ
+J1MqJXf6EmQgcKgyvhR8nY3hDxVJflDYw8ebCx1Jh8DSD+AJ0ObUg9HzFmDcpdnP
+20uybZ5u2AALf+wTON376eWDuZ9D53QigI/AvYbSqZSHZUXoFpY+oLuHJ/diDc0O
+FDQZFm2nTM2EXXy2fsoqWnHQhFiMV7VgtRna5FV2As18U9dHDbf74t8WvHywwJnR
+oc3qC6pRVLYhPMEQ5je8sXZ5Xj4FQwl9pWmfSTX5VJe7uTa5hzzdshfrLCq5XQKZ
+ZaMnwklEvoe3LgrwflLN
+=KNdh
 -----END PGP SIGNATURE-----
diff --git a/net-misc/openssh/metadata.xml b/net-misc/openssh/metadata.xml
index cd16a1391834..ec8bad168c76 100644
--- a/net-misc/openssh/metadata.xml
+++ b/net-misc/openssh/metadata.xml
@@ -4,7 +4,7 @@
   <herd>base-system</herd>
   <maintainer restrict="net-misc/openssh[ldap]">
     <email>robbat2@gentoo.org</email>
-	<description>LPK issues. Only assign if it's a direct LPK issue. Do not directly assign for anything else.</description>
+    <description>LPK issues. Only assign if it's a direct LPK issue. Do not directly assign for anything else.</description>
   </maintainer>
   <longdescription>
 OpenSSH is a FREE version of the SSH protocol suite of network connectivity tools that 
@@ -21,16 +21,17 @@ the package, and the other basic utilities like ssh-add, ssh-agent, ssh-keysign,
 ssh-keygen and sftp-server. OpenSSH supports SSH protocol versions 1.3, 1.5, and 2.0.
 </longdescription>
   <use>
-	<flag name="bindist">Disable EC/RC5 algorithms in OpenSSL for patent reasons.</flag>
-	<flag name="hpn">Enable high performance ssh</flag>
-	<flag name="ldap">Add support for storing SSH public keys in LDAP</flag>
-	<flag name="ldns">Use LDNS for DNSSEC/SSHFP validation.</flag>
-	<flag name="sctp">Support for Stream Control Transmission Protocol</flag>
-	<flag name="ssh1">Support the legacy/weak SSH1 protocol</flag>
-	<flag name="ssl">Enable additional crypto algorithms via OpenSSL</flag>
-	<flag name="X509">Adds support for X.509 certificate authentication</flag>
+    <flag name="bindist">Disable EC/RC5 algorithms in OpenSSL for patent reasons.</flag>
+    <flag name="hpn">Enable high performance ssh</flag>
+    <flag name="ldap">Add support for storing SSH public keys in LDAP</flag>
+    <flag name="ldns">Use LDNS for DNSSEC/SSHFP validation.</flag>
+    <flag name="sctp">Support for Stream Control Transmission Protocol</flag>
+    <flag name="ssh1">Support the legacy/weak SSH1 protocol</flag>
+    <flag name="ssl">Enable additional crypto algorithms via OpenSSL</flag>
+    <flag name="X509">Adds support for X.509 certificate authentication</flag>
   </use>
   <upstream>
     <remote-id type="cpe">cpe:/a:openssh:openssh</remote-id>
+    <remote-id type="sourceforge">hpnssh</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/net-misc/packETH/Manifest b/net-misc/packETH/Manifest
index 7a9b96cfc276..666b9d98340c 100644
--- a/net-misc/packETH/Manifest
+++ b/net-misc/packETH/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX packETH-1.7.3-libs-and-flags.patch 241 SHA256 cf8501dca140d9a99c4aafd7b38f63a570f76c4499fa2ad3c4ad2e19b9e29da5 SHA512 ec4daf8f0b13fe65273ccfa92237f9578fba332516ffba5b55e60b4c2888f8f620b93de28449dbca02da9fe0b106023d5ba2623cd2f73c142680d3e4894443b1 WHIRLPOOL 8a7d367b5c8a84e60cc63dc78dd9e97ba34fab45fb8095acf7632775afb5e655b3d1458181fe83eb63da09b628575e84793e420344b5dd3b4909ccd66e9ce100
 DIST packETH-1.7.2.tar.bz2 403655 SHA256 3bccfcc2fad3c68ae1489f73944421f438635c152c43b968dd0c20899351207e SHA512 110f66ea130a20491648df603bf83f54bd216c55f71bfa19e8e5d7c77fdc616a731cc5d540dd9b5c5ac6e762956bf4cff08d75d3b848a3714011162079a3ca78 WHIRLPOOL da05c1a2de0cd551c2268124b6a41eb06e4b8c83a10d5a1a38c21cab082a53638338955211e680e7920dca3f4f1c5643701f10e1db7c0661dfec7f8e284d0842
@@ -9,21 +9,23 @@ EBUILD packETH-1.7.2.ebuild 657 SHA256 3abded66d0a75b961a140089a80ac94279749d93d
 EBUILD packETH-1.7.3.ebuild 669 SHA256 e73927e781e448b109abc967e98c6e4f9a1c594847d19795b3bf064336fb4d67 SHA512 3b083a52400eb5e8a6dded97665d3759332c5ac54c859cce090f3bf04c05ee971eba6dfd0888637d31d2d2f3028e783cf7434388c96eacf6dd3f3473767ad429 WHIRLPOOL 9eb7c536e60ca78897975ae16eec41f2799d52d11d86dcbca4f635cf132881562ded3ec60fc85065f3164091908cc350f60de6bb805ef9a04e700258f937dd79
 EBUILD packETH-1.8.ebuild 672 SHA256 f1a4f11d946f910894dd70fae470f4bddd221068b60c9410d3ca1a91fa10c2d8 SHA512 89e53cd3c45d21f64bd21c6d4d96fe9b0d5cd7f6f51fcb56f1a048a052537935226751e3bba3afb9a8eb6e8ce3ae7f06ed3f5b624e05604c102f993a2a84e9a6 WHIRLPOOL 696f16de17c25fd8ed7fdc5f9abe6bae8d2d69aad967555fc0aea854020c1d80b4e508785039601c0bcb6105a928fcbc1518fecb1d17ac1d39de6e2acb5be4ff
 MISC ChangeLog 3763 SHA256 5bb2f25b7ea0e8ae1d8fee8f6450b2822045ee036d6e13ca366e9fd5d00c7b9e SHA512 4db1ac96237a9b75abe5ad7b16a2545823f1bac78e81747642cea01222d115145694b500e723fc88ee2bc8487dcc16a03735ef4c2083bdf974694f23d80cee58 WHIRLPOOL 2c05039979be2b090f9ab3e08c8a90885c85a06e6db82bd4d511810e527438941ff967bb6ed96fc285776a32c2f0fc9419a1973c9a30822a2372f7529cce7550
-MISC metadata.xml 159 SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6 SHA512 2c104d2a804da0a38770b6f1ec26cd5b0a49e30392177d5794734a3f4129e82fd0971e5a8a1e48913bfaf1bab57e7bac1fe5ce4f5c618ce057aa5aaf9e59113b WHIRLPOOL 044dec64f8899582332d7fbd7612d2a7c5c7234c44bb9fc51a56f7d6400cd3066a154c3c49dd3f4b468f11e029aa24ff0097ab1387b9f322d57f1d9876afd601
+MISC metadata.xml 237 SHA256 9cbb0d3b495de6b058d3cf66a2de49688647b290e28b9777114bc5f2b83b623d SHA512 24d3771f11f37a4af48c93eaf551f9232c6b2a6c2ae09b46e5019737c47ae077cc2d0e801f3e92962a8e103556b29049872d7011743d17d468e9f0159ad38aba WHIRLPOOL 6d8d273a4a8b1fb8aba6e59045aff70441f3148fb87d9beebe731ab6019f5cbeaeb1091a410526799f38698daf5cddad726c3dfeef40f57da18f0c15475a9e47
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJUxhPnAAoJELp701BxlEWfk0kP/3+9osYW10U6CGSljFE6E3nF
-vuCFiWfhndiOt3G7wU47Jc08zH2ml40ms274jX712MVxme4r4ul75Z0lYllw0sFq
-iKyYUqApRyAlkWwJEvu5VmFbRYvnzzTe3KQfA5gJjuuhooukoPQ+o8abjxfXaAvM
-3aQtSH5Rz541ImeqehgFDuDyB0dc/347zcbcwMm7uRMmwGyo1Sso0g8RUu/z53tW
-owdJcVnUmLXspNXV7hBEFkJRljejuf9FmBBk7MD8xW2h4Nwu0tubKYmqc0aBGEC1
-r27a8Dq2fEOFFbWfhQiYchToB7mELT7FVJv9DAsZ49wb0RCYyxWNTBX94e3Z9TLe
-TWH4VgOKB3sb0HvvhvGlfd4VNtikqSMJqC7bQjTYTsyS2Lzb/0UPDnET6GxjyIpz
-KVFpkWZ54aR5n82fVk+4CmW3M3TjczT5a22lMDkFgntSr3qs/9Hu4vZhSLCvFjsI
-iuYCxoOu6X8/0AV348uqRfr7SVPzFAw5GYALoQ4aWc7bQA0GFQ1bekir8srP+HLC
-EYJRzMAzQX5R+htZ3RQcNWxkDUNUQTKHnivF1fkZo9INyU5JfRXqDnGGMD4CbFXA
-pKOxKW4nJTqdhpqhSHfYsGRoHqrgXk2rhpyCVyfoxBlypQK7n8mAYghaKwH4O9zc
-hPCVwT/nQhS5s78aUGAP
-=QzYn
+iQJ8BAEBCgBmBQJVfxNIXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi5eAQAIUtJdaEkh5SqPUdVTQPOx7z
+OD7YJZUtUe68QrG2ZVnhLoKXGBwnO9BvtzucMVOIH3b2M+KmY3Gc3GR5HFB/q552
+TGLmROIkr3/nZVjnV6YfcLIksG5mrwQuDm3+ICJsRDBcFwp1fWFy8pp7NcmgQAkw
+r9Had90BxGOM8PyIf6RYFHEvhSeLeT6fpYnfixsYy28IxzwS79Fko6KgGuXaKZ3l
+ictZwd96y9qAZOxEhq97FKwqcZwhKF7bQeblfKGEEzC0maJyGJ2q2aDGBT0e33gc
+emtB0MFFaqZymAnGumn395po4YE/m+bXMjTaOh5oLWDuLxKzoihtn+ubVtAbaIPV
+ZAYWlFSa3+M/b0MfQCuy4/AMrrrr1LSt0YjDfsBVYOQ1C8IMEa+GM7kRdfeWkLgp
+B68JyGkchHTQ+N5oATbpgDx8ylZpt8zs3EEe+q7bGmBABlSUg+lv4eP6WQlW3vI0
+IWLhCyauzagBgxVW23XAVI2evu8mI0uaJTkFqoXgSrjCcTcFEt2/xyhXKH2L+Ubu
+SPfUVNUO+kUW9KhQiFHhg2gYVnmIBICmwTuYzVb3e2pOo8tiz59HtAhXbGuZdwka
+GxqQ8j0gglJ41/Zu01iQhB4SSDP3FgiKygblav6V1DaRfSQaOH930hdc1u4vRQ+D
+nl7r+UJgdihKoKQWraHU
+=nIvR
 -----END PGP SIGNATURE-----
diff --git a/net-misc/packETH/metadata.xml b/net-misc/packETH/metadata.xml
index 03aa50bab7e3..c5d8c73e53a3 100644
--- a/net-misc/packETH/metadata.xml
+++ b/net-misc/packETH/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>netmon</herd>
+	<herd>netmon</herd>
+	<upstream>
+		<remote-id type="sourceforge">packeth</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/pmsvn/Manifest b/net-misc/pmsvn/Manifest
index 5b88e035f772..b0f446265e9a 100644
--- a/net-misc/pmsvn/Manifest
+++ b/net-misc/pmsvn/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST pmsvn-1.0.5.tgz 5867 SHA256 f97b2c43eded8948fabf203a8e91dd6b70c52fc9875bc211804b32ee023c6b8c SHA512 0fc9d06a2911d361d004e7f809bce7292f4fb1ba79152defcede426a15a7792d70c05d527d7b1627c4094bcb3e180d77684e9c55aea7df5e4e1e821d943d0221 WHIRLPOOL 10d8466046aff0e6f8af9353d6f43ba1e091296b30db747df6a0e23efa6c536449b4c08baee735bf72c7849d38ac7f00f35040040c4ee2ca5b8556b7ba564228
 DIST pmsvn-1.0.6.tgz 22021 SHA256 6cd8498b6d80e1b2d6aa10adb3e765fde03d219e9e1149898393b542fee95c89 SHA512 e06ee3f43468a0fd71799b08ba3f1dc8dd26cfb1ea8d1409674418bfa27db0f095edb2b60f61ad6aeb68a9a3f76e987b52fb9b0c3d9d54d82c790668af68b541 WHIRLPOOL e2fc1ad5756a0b8f98bb8e0fc87fc4d8fb6ad79a812ce6835b92c21cfbad7521bd0e0dbc9f1294f7e1d16c003fba27ee33018e6b15294a1af3971c743453e324
 DIST pmsvn-1.0.7.tgz 7565 SHA256 945dc86b1276719af5e009fd9d38ac3a555fc9e466f98b189a16f20b0d954028 SHA512 1bf205ec142c6ea018b9f606a67fb97c87aaefa56e0dbd848db6c09f6ce6115856b94c2b75cc4e923be8d66b322ffd8adeca88bfe1d3cdcc72377adfed3976d4 WHIRLPOOL a4f295e63d9ae0932514b932e19bacc58c34ced52e0019bb82e58be27b95b32f57033a0fecdf5ce2b64f06ffb108731c638d99aee8e1d2093c3a124010795964
@@ -5,4 +8,23 @@ EBUILD pmsvn-1.0.5.ebuild 1002 SHA256 d2d484ffd76900197618c78f954d510e9e5411be82
 EBUILD pmsvn-1.0.6.ebuild 955 SHA256 290e737caeb99abfb906abff20bc3fc6d8edc5c5e2fc4edfcda1bf130e7af88b SHA512 9f53c918e9a1ecdb94b0d9d229ec5feb93025ce1df55c812a1a40f2f30051749bafa4eea6fd8e49b87ec93a6e86728f8dce66971e84a6b8f54ecca924d1472a5 WHIRLPOOL 8650df493e8e21ea5be0bd1399b8be7ea30e6a57148b96bf3bb3d03bd015a7aa47701b035456d662600f130e5fd68b2d9a5e69fddad199b1bbc52a354b000a9d
 EBUILD pmsvn-1.0.7.ebuild 891 SHA256 2e8962d2884f3c89fb5f71aaced364548d84fb723ab9dd1c6db3524577f7d1f8 SHA512 bca1b7b378ba6cab663e40eabf3a27fddec7df960e95738b925740f38fe38e122f1a6d5e96c205de62c7f2caea71d113400e3e1e0ae6b9df75a18f60700dd2b9 WHIRLPOOL e2fc42fe13b2fca9be38934f0125172c6b999e402f1dd92379f62e901f28de3fd9dd621c519c92aaeb282623f6b94e4dd000d434acee8b9017c721fa6e2a31f5
 MISC ChangeLog 1730 SHA256 78e89ef2e84ddcc5e8fb7c7453548f12ac447ef7bdc5661bb3e0b5706d9b5eb3 SHA512 947609e83756b0f3294021d07407c7c67255693f908fbc0a51bea17d99c725d8d6b1917e1548a7e21e5a1c67827680657f1127f23ef8febc4a3af4f550ea5b7c WHIRLPOOL 71ad0f96a5fbde7fd8a319127a9c0171c8c8692b50827e7640ed830258cabf38e9c856bda1d4c1908968025df2b9bca928206e17a3c30c9497790684a827747f
-MISC metadata.xml 233 SHA256 43ad332e7effbf9d6556a3aafde9d0b5feea0771da3fec9bd59bd8969cd9c249 SHA512 9e2ffd03b249ad4b40eb25e93e73a2e6722008299375e9a42799cb3886072c1f2fdffc9ebab218af434c7c6fdd43c2a9ba5f748a9a440c0d6f92ca1ba1b78c5e WHIRLPOOL 2a2b6f7a818f26558a2959c3d17a1ba3cf1ea0ff115d6548db0c1f6b9b0a4e2cbbe7004865fe9b60cc338b9775aff7a81604b3e9b186eadf1fec7f26d5f20e89
+MISC metadata.xml 311 SHA256 682baec5ad9dbcb0279ad448aea221a78642c009e90704c46455fed0db2732a1 SHA512 249652bb8b13302f695ab67c0353eb17f3863cc32ac31fcd581389297f106dd4f8628afd6badd6eef5c6bf7263cd379ba69b6071c12fa969098603783e3ca460 WHIRLPOOL 8979c6956c757d999d8f8071e340120786bfaa7650c438c8d7dcd9f9e2d17b2a38a5c934589d9deeccb49b47c68e1e1f2a1d161e55159dfa84df1f864cdef364
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVfxNWXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi8b8P/0lECuNPt8Imc/cX8nZAEm6p
+dADbMKlLBQzJqRawmI2kh4Krq62nwWLPMpzq1IOUBY698NEklOJLbHd/IO98CZoG
+WNY0VWtFI/R2YsSav865vTrO3MBNu/5vdo2XvNAiHdyn9++hEXrVkJkhTN9laJ0R
+cDEH7uIoJ8hUnosExUNpq5AkI0u6imGOHEfMbcsob6bBopkNyT0u7mnohghEWfcj
+i7X32nxVtswvI9F+rPL5eb+eOWbTXPyyZaMrP5k4OdyguoysCW9BY/bqTenuhudn
+8J9qGhJ2YsmMOAmPWSXwEeftMJ+ZVtHYYeY1MFvVoOyrV74EGOFmyOwTSh7d628t
+1CREEOV7HS5NvAd8YIoFdgfXycIv93M1sYKkCg9woR1bPbUDaycPtb6xpn8EjoY/
+D6WP1Bvcj1HNd/6i5kgHcPk4jJ9KaEZcOcuD2Q/S9RHLjBrTs+GE74RZz5AEZ4bz
+6G+ycuMaP4tnrD9sBUq/t1e7xfN7yyr8GBQ0c0bkFwCC6Ll1mu+ejzqSItxGXiNr
+knEtRMnje+jx3+y5/+mrwQHzfGOI/HTOV7Xuo7X69AqiiTA9eq+lgwxqyIX2iE2m
+rVpLQ/iAV+ha6xrrJJR9Q/5UKkDAA+Sv3MCQ/Do5Rv0JLvtHB6ESfux4hn0rLXqH
+Uq2Q/NvAwM934LHScNDj
+=Ei/Z
+-----END PGP SIGNATURE-----
diff --git a/net-misc/pmsvn/metadata.xml b/net-misc/pmsvn/metadata.xml
index a67345be42a1..b85ed6c47c45 100644
--- a/net-misc/pmsvn/metadata.xml
+++ b/net-misc/pmsvn/metadata.xml
@@ -1,9 +1,11 @@
 <?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>
+	<maintainer>
+		<email>hwoarang@gentoo.org</email>
+		<name>Markos Chandras</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">pmsvn</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/net-misc/polly/Manifest b/net-misc/polly/Manifest
index 300d55a464d8..dfa5d19bf650 100644
--- a/net-misc/polly/Manifest
+++ b/net-misc/polly/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX polly-0.93.10-desktop.patch 234 SHA256 ef6b660e0d04f93dce331636338a9b66ceb4082a6b3895aeeffbed367164f0b8 SHA512 5141c4f63fcf6961fdde4192de63294ab1e6a43e53a0e5c3b3629043bc4e2eac0928cc00ccb4a5c22acb5ab7651e5ffe7b8ab3a28562b4ba0df1bf4a0b31827b WHIRLPOOL dd9462ad6f900ff6b0812acefcaa8db4edfc310a4803a1f71fcfd35c8bed393fc084c9a608c3dca250cac5beb8de4aa6bc786ad5fc4385afa0663feb51454904
 DIST polly-0.93.10.tar.gz 466937 SHA256 629c2d04cfd9b925029090799093a45be03b7d9cd2bf2cbd37027ddf7744e5dd SHA512 32076658d33c1d5d134a31fd50297ce6af15c2ba05a7cbc1c4a536819e4c51b9320734bba5c3c928973c14aad1d53b86761b830e27bd01f78c644cc93122b75f WHIRLPOOL bfe67fb0b391a71f6ad2f97ff72764e3bfe0c9a6b4d99db2be50753a46237ff5eaec68b1b33202d83c36790f0e18a0b1d535303b4ab3d1f976a4e5749a92507a
@@ -9,23 +9,23 @@ EBUILD polly-0.93.10.ebuild 1480 SHA256 cf2ca171c737f499dc97ded53d942060609f7baf
 EBUILD polly-0.93.11.ebuild 1360 SHA256 cdc6c073d951784181725ad878ecaf57ad9ebfaf17f8f9e16fe6e33847526b82 SHA512 9e3610afc9cea76b60b56118b17effb038b3a2e167f683e5fb2c163708346d3c495ef8e60101b9eb063c90a1d6ffd96c46160a9938cc5e9e9c713037ae369413 WHIRLPOOL 9dbadf2052b39d03f06139b62dd6d514b08288c0491530ed9725623d8f5fcd96abff6666fe8f3fada118c52fa95e21e7bb1e83d97ba3389a9827b88e2a3f134a
 EBUILD polly-0.93.9.ebuild 1478 SHA256 916ebb5825e1b02b46bb45d573126c5aa582439116578884dc63a5e32aaa057d SHA512 bb2ec107ae2c50bef59cd1efd2d3dd7a13bb60994808d8001855b4b7e8c4cf2e65a0641b416a465fcde9959ff5257fc53784da0caef65d15e197c75aa43c7e4c WHIRLPOOL c6c2e47a22931e929ec7167d55cdbf191998c3e75efd2f894c164e326e8b57f04f472207553936d4808cf2f838298466b09d37c0a28cbaceb401bee798aaa72d
 MISC ChangeLog 801 SHA256 31ce541aa8aa3b57fcee1668731dc74887310bbcfbe5dfe4278bc000a0b95306 SHA512 0f79007c875483b38c3b454b31f869ff30b26653ccaf18d099168e65428b2b70272ee5d59ad2ed47e27e41d3a9adedb7e86361daaad2cfe2f2876fcdbfc1d11e WHIRLPOOL 19d5d77aa22df4069e589590193433cdaaf81f5854bd6d238766892e3ad74c956f519e9d63c1c73a3de43de411053f05fabcd7e62cd07d1642add04ddb54cb8c
-MISC metadata.xml 245 SHA256 aa387fbf7f90a39231df7b4a86e289d949a9140ee9468675de3e9631542c140c SHA512 500537466cdbef3d2618c92e131d7a1b2053116e5b80b841685849f54b52a98158e0b03451bb05f88e894a106f6efc4ed73dbbc635959b09894dbe001bfba0dd WHIRLPOOL b540e97ca27f95ae19134f1047b85d153f547a2674c25d4edb4e56fb7caa0495c7b0cf743da902528e01135b9edd0f0e46bf52fe5cbd8b28fe1fe0127c874ecd
+MISC metadata.xml 323 SHA256 b3df3f785683d39b30a3a493162b8eb81b94cd83be06a827efab8269ec443314 SHA512 7cfab88ec2d2ef9108dd8029948bb0aadf919a68cf450a27546343f35282b6870e10620c95aad7887a7b59fd3756a461146c2cabcb39040de96abedcbe67804a WHIRLPOOL 51d4079903a326ba9f325c2119858938c2bf84c159dc309ac3ed29a96f72cf01d57f8f7ca1cf48ae573f787babdd014184a9bf49b218706c9e3f3fc66da8b2bf
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVJW3QXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOML8P/AlP5cb85Q4qkpSDqtCGaiPT
-lYIdjlFtHpEqEWN3PpW5vcySskRWluRbOOtYTxrme/7U1g/Ws5Yghr2P4bZ1Glk0
-17IMS7iqg5B0j6VG6csICPlN5//y+LR/nzXKX5Ovjxp/2K03oyPMexAP6Q1d6o19
-iGHMqDU4Y5nrKHmbcww4zqs71OPNhaaihrYV8DUI3Hb3XQdRBeYIBPWmGZ6aWmLo
-lqxDAp93xmV4zJevgJNMWDU+6Pg5rayOMFbMnA5o0MdipkOyoo4NZ95ecMfUHidv
-qW611kPCbUVDs5jKeKSv0db/pPEFg+Teze2zU49m7NzRyCTu0MR50gq46w0Zji6q
-Grbsu5BOamNyI4+e5QWHl/pgDDbNLHRslOkbPjWNP5ZWKaW8Xt+G9i/UNOLfGiOB
-95/RznXeENVvHFMujWUrBu7U1Dxj3AnlQh4tVbIeChO4lVMrzQzg3P7YX0TUVHDk
-npO6mZdsg+okICdy8R2CbUKoWg5NEDp7vJxVZS4OxdCZkU+/HP6oyvEjG/1RxxhR
-EZlJg/9RQKoTAd6Flw97q2NJbJkIUh/Ewy1sC+oblXjUJzpCks/8yPrtANMXpPic
-we8iLfTRTVaKgsflmQ928Gu2BCmLAHCfXRmpcV/yqw9pkdp7iE/SNV68tiAexiMU
-Z6jJJijEOLQnQd+c+fya
-=lROg
+iQJ8BAEBCgBmBQJVfxNgXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmivLgQALwMeLdoadlgmGBkyEuwMtQe
+9+I8cE8JJh6PMNx2bqlgIQLJyb1MH1F326W87ejvNH+lcwWAthnYKhkzVPo7bmu7
+oToIAm9Oar3Br6gKEBOjmXHa0J6f2X/310VAWmYxYli3++yf3lGcYKD98XIuwbV5
+jAcIN28u24nZfgGCUA7cpJ/71UD4LRUltrcdrtWEINp5X/+s8CbK8L9DcO98DfSc
+sEvwEUFjJ0C9vTqCE9ipyCVQwPAJnwA7uufU0vCixW7CzAy4dSqwaDq+HwrvZrWr
+R0lRL5q5QjznGrHCnK6ZdSjgAy0FCrNNva9xDajC/7oHPa67ZktZhyNYfogKdSHT
+EJwKA0gaGS/Bba49jGlQOgW0a6eLluAEEOCCwR7vdTwn66DIY9UMPNIXXvttZ10p
+SGqbGkpELDz7wDvYbIi6p8mt0ev7V2YzLRww+NUlpwUEzV1j4dVLHSe9Jf9IUGbl
+OCDLDNFBdxxhEwXZfJVdxzAmwOtH85ZBrGa8UwSYf/KSwfZtvKwetx9bukDjojx9
+iljRMARuJ/r5i7tL6HvQvDTfw6d868AsXAg+4d9jfYfVNLBI+lSTrwrgqYoJ5TOg
+puzUEmqa+SBPx8vZ9StjhoAWFlPaMgxDgCUBNWAQPw4zJlm0Qqq98W7HcfBq0jW/
+Ic96XwxyS9s+yZTNHxqa
+=gac1
 -----END PGP SIGNATURE-----
diff --git a/net-misc/polly/metadata.xml b/net-misc/polly/metadata.xml
index 9e396139c968..14d2eabbeacb 100644
--- a/net-misc/polly/metadata.xml
+++ b/net-misc/polly/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>python</herd>
-<maintainer>
-	<email>xmw@gentoo.org</email>
-	<name>Michael Weber</name>
-</maintainer>
+	<herd>python</herd>
+	<maintainer>
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="launchpad">polly</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/portfwd/Manifest b/net-misc/portfwd/Manifest
index d170ed7e33e0..3be14ca658b3 100644
--- a/net-misc/portfwd/Manifest
+++ b/net-misc/portfwd/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX portfwd-0.28-64bit.patch 816 SHA256 77f2141f9bb4305f13770ef44e3de41a4d30efc4865ea8845877612fed16d624 SHA512 a1cfd1dfb1aed057ca87b7b70f2e780bc30d96942826ca81af1c662b3026adeced2db27f2189d8c4f1a852d2970cef3d1dbeb537e478cc079e8798d91ee5ee65 WHIRLPOOL d54acc31efbe83416d469bd66590dfafe67a187249120aa51ab81dc504f0bc21e5b9e7edabebf4f314db365d3b9cc68106d1b4d139891eb62d4ca4958975c09c
 AUX portfwd.confd 55 SHA256 3a76b31f281da7c6489cf1523ae91d7f3ce0020c05f65ac8b1e958441f0d67e7 SHA512 cd9332cd659982fb2d8b6d4c27b75814d725aad534b2e72c4e287b6aac4595dae8a11bc711592e290919a3959b7ac5d9c1fc4921572593ff80876630d6b52296 WHIRLPOOL 7b3ea50d241d230f6fb115a426fbfb4ae0bace84b9a9794677663e9231030f7cfa683bf3ee62c550148dd7b890761dc0f193831748478f93b412bd805c58e78f
@@ -8,22 +8,23 @@ AUX portfwd.service 128 SHA256 f887bfa02621610ef2a6a477aa29fd57e0163e5641b2256bc
 DIST portfwd-0.29.tar.gz 168318 SHA256 a880cf57ae00224c470c387cf2de8abbb53c4d761b4d67be5b0c9e15c3484066 SHA512 790d30afb42eb5e03846534e5098c7d1cb4241758df77fd56fc3f4fdbb05dae88ef84e16b27434035dd39a7c82beb77d490f64741181c38efc3b3928face51d1 WHIRLPOOL a83de6db3feab5fc03f3115013eebd650bb795be91e0b674ae102c9c59d260fd7faa5b8a738e5eb9ad891103bac0c91e3626b7ac6cabf6f565e936403d8dbc17
 EBUILD portfwd-0.29.ebuild 1337 SHA256 60dff94b2dda28bf2daf10fec4d8d23b5611a9d646d04ddbf9ac8eeddcbb4e9d SHA512 c50eef17e535f51e7432de79667eeaf4274b235eb84226da304f2cb1d3dbcc28bdf0f845a687619cb87ae23d8897740b5c9063d2eb68e641c28ed8c0f9a92c1f WHIRLPOOL 45f237ef423a45492d3f0a28af80fe929160410d956a0e1716efe97c2fdfaffa363a8b358a0c22ca93c9f5ba441b144bc3c72f72176fb68ce611e0b0387602d8
 MISC ChangeLog 3672 SHA256 6069c9c9f7ab6e20c19cf6b93d34cdf564935c1909abcac334358bcb5e14f807 SHA512 66e065213ff9d3c775da1a4ea844466521c70da55920138f1a17b6cc72fe4e9f6d9ceff07369422e7480718b033964f2293710e56bcf71cef9aa0b9056c4b8bd WHIRLPOOL a429cf65168b81614e010119c33c96b92ec6ad006a7e0bf24b983199de965f0cef221135fbd3ab632e761339f507f4bcd58116aaa92ac85f622a55b38ad42aef
-MISC metadata.xml 467 SHA256 99d50956f82e1cdcadef0199830ff15b57a540b3c3f5dea0e558da004404e435 SHA512 cfa78b2fa3ef8fe7b004e408dfaf8428572235a395f4fd1437e23335c0e9f1c8e6155a2ea7da978f660779b881f876e24ac3d266b45069a1e739fc09d73a54b4 WHIRLPOOL 623d1bf9a20f0c114507ae4dd57577bcb71bd26511995b4dd5e4c4f24a32bb4ce91f95aebf056f5e4048da23a4010acefdf564dbc1859b7a53e27a61c586785a
+MISC metadata.xml 544 SHA256 4de0b4bea25ad31e7e0aeccca9f02aed7a26e519ff9969e8cf1da024d00ecc8a SHA512 baa4a076f77247128b9f32894bca04718cef9e897047daf67309125ba6defe3dd8acc5d780cb033d4e90f2c548d11b479f6e858882a1618f662ac357fd8debad WHIRLPOOL 1988f0718100409df2a32fa5bdf17b54a00897438c3eac4e3abe69b9bcc21c8d9df1f4798768ef4dfb69c0df95eb497396ad952057137770d149d8ba1519c9db
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQJiBAEBCABMBQJTFtYURRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
-MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
-7LCYEACtiIaqiC03nMHWtxEvOHptNdsO+2J39p/diLbp2Si9ZN8d1penLhdBkbZ5
-grtZEgyQD2iSzexRHwV0ZFH8di5+OhopzLe6eWfHXVho/raFRhQB1iXCqFsoi31V
-G+cg6Kbmjb8KLJ/YGJiuUTLvjVYzHIpuJhLjTLaquIA90smZXeIyMJDF4i0mhdeV
-CmdOK9y+nYhiqGUXIIKdNvi5KrdbSE5kkSLwtdWeGU2A1eaWZgFR5CjgzA30ddO9
-Sq0zKPBHaoJjNZlR+kmtK33fXMNL9lwVmgzlHFlkPtiIRkFjJkuj7Du+3dxXqaDx
-mEu52YZUE3ifJTbcX2UXuQ5nA43HSetVb1o0lEL3s+mcdAQB0zkJ8aIrFof6Tpso
-ANwJWaeEKIAhB1UlCG/sNyGvcp+M4ejpQ3D2kcOVjWXAAXj380c3HU0ovgQ+c1bv
-8VkZ2y+tPJiqtBZ3uYT3eNgwjewXRl6iW8XEG2NRy5zQr64j4CYoDTa0DH6t6x5H
-t/uyP9Bv7UhdNqKruarMpPxlRQoHpAg5HqX/Lt7cT11KkE2EaXH4ah1Q8pYzlpyn
-Lc8n0xDb2pgkakB/xyypzmota32eQdeIQv/tDR70oDp6jYzCLojWXYD4vW9ueUWo
-khNkjXGpgNpCIF5Hj+B8pf08btlNB0K2NoEArVeKxmFCGtfouQ==
-=izT9
+iQJ8BAEBCgBmBQJVfxNuXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi0AwQAJGR/8dDcIPxQSIqSCQVxYd+
+DMQNqZHw0DRczUhW6uJ5Kmrp794IQY44j5SyuntOR46RhC/O3nx69LZXifyKn1LI
+wPDLYK8ATznbG733NWB7uPtHhxI28pM+S0wobPQpKmkAOkoCx9qgNoZUgrDqjMwT
+SY5JauyfewwUWXvMLbgNf/mo8nNBe/0iQb7l0UbO0j+YVXwiVn1l48QH98gMLeqp
+FSoJ3Z+4i3whtDRn+0G1Y59zzeRgOz8Kzm+Tn959hreVkjAK0DTomGjw5ccaeGW6
+zDIUioyhYOIjDrrHRGt1NQA8jPxqR2w+f7jLxsRNKcJ0GOM9sFmQKob7+Es0T9SI
+QMBHISe+lEIPhHuujOD0o4YaxtMb1ueMFaOj50dyWosjULxwdwd6Y+LNJxOeuaNx
+n8W3N5x+cOucRHZWFLSKpbasJSUVa4mJ15nQ6wQ/kFnvnAKZ8Cp8046Y44m8dH4Y
+CN3Czv8hb42PU4e9aRraG13oWbXzWYIGpD3Yh+gHkyjulBbmQnFvp3+SDtrrQAIv
+QBQ5hydJh5AZKQasinVmsVt6dbtHUUVY6ebOAtMCypLz6PYSDHR3ivcZLYlKpoJ3
+0C3Ca99wfrcYhYiNxpq5yDOrN1Aql6yb7PhPAjhhrL89Mox712c5ZgtrH1zoUgPJ
+KMU5XMZeiZ6WSZAn4sxM
+=GjC0
 -----END PGP SIGNATURE-----
diff --git a/net-misc/portfwd/metadata.xml b/net-misc/portfwd/metadata.xml
index e2106b099e4f..ff96ba5a06b1 100644
--- a/net-misc/portfwd/metadata.xml
+++ b/net-misc/portfwd/metadata.xml
@@ -10,4 +10,7 @@
 		which forwards incoming TCP connections and/or UDP packets to remote
 		hosts.
 	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">portfwd</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/portspoof/Manifest b/net-misc/portspoof/Manifest
index 46771f4ec289..572f878cb88c 100644
--- a/net-misc/portspoof/Manifest
+++ b/net-misc/portspoof/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST portspoof-1.1.tar.gz 399119 SHA256 84e07ac328d741c1ccea3847d413d01185a6a2393f8637e67178f984703ef613 SHA512 ff78058d66aa142e34f70c6759bf04bfd69c5149e294803c41837276646fad21eea2d20b9eb1ba897e2fbd5f57f65b3a86fecb8ebbc25cdec7d31a2f7997f91b WHIRLPOOL c736160d3643fe96bf50e392953a8e78f2bb792211b16f16313ddc8d21906fb4afd02079a9d45ca22e32b550819357bcfa7413b99cb1510588ddc20e6d00080a
 DIST portspoof-1.3.tar.gz 401187 SHA256 56287536b9baf71d8a9f8009f9ce1fafcae85587e881da1ce86f7f46bc8afc8f SHA512 8d537ecf2ae5de8388c2b9b7210a2d38fe614e525a2ba286321fcf3b237f0888e59bb79a80056e49cf7f850be8ef274e87f04597a50dc1b86350bbc094e8be6e WHIRLPOOL 683f4cb89f2ba9d4ba3323161e9847638c6d6ac7a3a22ccd5b2c61784f9a43590863484aa7cbd5004a24b6d143b001fa50c27e351bb1df23f9a8e94d30123cde
@@ -7,21 +7,23 @@ EBUILD portspoof-1.1.ebuild 705 SHA256 6bf300474046b1bbc52f3c768c595f695817ec0e4
 EBUILD portspoof-1.3.ebuild 1030 SHA256 d86327ac10b5de19696ace7a7f73a716d270245f17537603dbc6e0918fc4e6ac SHA512 a810bc4b397594ef34c3982c0ddda8b68f31e5f5f8c616e51e62b6b65375aeb509b91f019bc507799ae3fa44c2d1c884f391ecdaa57c4bb3581996c745482a6b WHIRLPOOL 935dc8302cd871cc61ba89d7a16d7ae2859d46e730276a7fe29adff4391eb87d85d8fadb44d40884d3f5a8be69e823efbbe0b90e43a61ff318f609cddebc77aa
 EBUILD portspoof-9999.ebuild 1031 SHA256 4803e18526648bc722302333ed2d1446abc02789b0563f41edf72893144db61b SHA512 c8eed6718ea5dbb16f0208806d78e6a3c1debc04f200ec617358ceae0c6396bb19832beba48766d6330723cde1aaca70feec5cf91b16439e0011bf51d3968c65 WHIRLPOOL f32e2a7ec9a0cedc0941c0d663c4bd93961a041c0521216a443f7f8d6c6449e46e11a699371c684168e74d26865c57ccdf03c35b11821a00c3f8989e61646df3
 MISC ChangeLog 830 SHA256 4eb63309fcf388333b89167cc5ac79224cd4640a6471137be1c9083109ab5d22 SHA512 3813c61dc412d0172e6f6988c7c759fb193523cc0c00ea3cb596273d7f1fe3f5b7bc7942f2431408ac0a47e495573d606db7f58dbb68b190832fd630148e3c2c WHIRLPOOL 02c7146cb51287a0c66be4984e22202c5389ea4eef318280027ad90076b64d10da57f43dd10d70715da2a663429f554a5e1da6793c96953e7b0b7c66c6e1ed0c
-MISC metadata.xml 274 SHA256 fcdb6e69f3adb718ed543a83635badf4e360a57c550760997c4c5f8ea5c7193a SHA512 8b3d3358fe15d41a5bae960eb75727923c05bab81f63ab6cbab1134e9f49fe69c7e710edf051765950c57a2ef0025207d5f7c129b2bdccfca5be3ec042cf458e WHIRLPOOL 152e28545dc06eb18012d2545644b8bd223c546d10524a7c879573fb1ad265d75ff1ae8e3a95ee6777dbff155ff4ab6795841a884d3dd722579fa8ed5fa6bb49
+MISC metadata.xml 362 SHA256 8e262dc6796372201337d9a7647bf97604564671d6c5fef97cc99e7373b1cef8 SHA512 4d5cb6567e9aa885e927cc27cc06b08ea4317fda14f5dc7f3a666b8182b1e50d78251dbe116de7e2c1dcc8676a09f07bc8ac616d78196e76e384635df0d21781 WHIRLPOOL 1f5fa57737268138439f4d2f2f4f0aab0447be2781f978f4aeb1890e7f804ad2590e3af8e7d398f8ded280997ef80169372be57344af9630d356f554189a9e02
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJU/wpGAAoJEKXdFCfdEflKmRUP/1TF6KIhv8QZWXv4P4KX6nbO
-xUMK2CUbb4LD8CBr44x5Nrz9auD2S3FD740X+Q9wokiXU/VAVwiI5hOjaHfoGGGa
-r6lOGr/lfP+kKR2GcnhtKlMCv+3jAADk2//V5/RfpiifB7L90W3BWmef843eoT7i
-gQyf6dZF6gOJScVB+aqXm21Na8LhL3LR6sdiuluRT+z4Z0DVBIZckXGfo9HB6Io2
-QwEqKoqc1k5iveHP1K+/SpvbxH/8U2b1uXJ0iXqmCbfnhDJ6nZl0/BOe3mlhF4GX
-2fvpRs96NSMbIQwJNLvrTklJMYWbitUc2jzkXuLOyoqf1LthHMQx+Om5oLMJW9lu
-JC2woxY110hhBjSPLR0Ef5uB4/f5qYiWAzKDctDIcu7YAZzN2JC/ImFlHool2TTo
-PJe3gL1ihc30WFULGFQo9eIZ59BA2jtMrAHtc45f8Ta+EzQu7BxdZaZswFkctPHt
-FOqLCw71coMXbjYfHV+lsenSN/Umvhilg27iCFjpW4jR2U6UHKQkB8cjHCvuv4Iu
-aIghCrVfStJki7O2oISq/2IS5ti3gcHWeNA4ep7W/+q76RwFcs91abUEdAnHSszX
-OkUhruzPvtznc43mCSriyyCYQYT2dn0PEWpiBB1WttN/x1Tkx0/mnFtoxo6A+GCB
-8qUy+YxOyqnlyHsDr8tF
-=afYj
+iQJ8BAEBCgBmBQJVfxN3XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiKPYP/R/gAoufAvgSaDQ4hzHosk4U
+aGj8qw9BDUby9RRlYMtfPdWOe7Fnxan22HMWkca9TXrMi7wiFTe0rPSXIWhtSOVG
+0kUiYi9lwU3oMs/dTp8ajM1oF6C5uHXWPxFQ8Jiy/QRFIWWu7e3mOuEkFKyvwPY9
+YzMA6gjcIRo0lC0xbFe2jixtCSrTUCiYbmrQyVnvPajf88QMqFjvO1W/vGCLbFrF
+y6qYcLkRF65hqVtK9d89pYskmbV7WarrPukGabffT1jPqhu0R8N9uDUY6GQcHhE+
+yisLfj88VKW3r+kqYp2xCyC8CEcSyOZWlMiqL6OdJ0gGKpQ63KJn8u2oZtGjG0JD
+HegrQALdoleLNXxup+jHSD3JfquCN5ZB1DoKB9EJVygW8sDbYQrvqaM+pzYv8G/n
+0rlolYsrPZrdCqUiGs51cUAWZVDFWtFJQPiaQkUnUgDW0TSAjCmBTwBhKLF/XfCd
+0HvmzL9Ie/YJHIU5x4hxgdhtl/si0ybKeeoUqiEgQSpf2H3+Oe5iT6JBi2JEb+3d
+bKl4RgtpvBrDujX+uUhOJgNz8O6SFC1TrDylHpC2w56+AkgNHpXs8MzICkxv9Bf/
+IO1mZqxbIPe1zwxt/yx9fw5UiFfz+umya5v2nXHwGHM9oNQz15qr065360nTxICT
+gNzaRX6t9vLYp9UrHIl9
+=pzEp
 -----END PGP SIGNATURE-----
diff --git a/net-misc/portspoof/metadata.xml b/net-misc/portspoof/metadata.xml
index 4b6b68191d89..adaca1811357 100644
--- a/net-misc/portspoof/metadata.xml
+++ b/net-misc/portspoof/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>zerochaos@gentoo.org</email>
-<name>Rick Farina</name>
-</maintainer>
-<longdescription lang="en">
+	<maintainer>
+		<email>zerochaos@gentoo.org</email>
+		<name>Rick Farina</name>
+	</maintainer>
+	<longdescription lang="en">
 </longdescription>
+	<upstream>
+		<remote-id type="github">drk1wi/portspoof</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/pps-tools/Manifest b/net-misc/pps-tools/Manifest
index 69dda38e494c..e04d61ed438b 100644
--- a/net-misc/pps-tools/Manifest
+++ b/net-misc/pps-tools/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX pps-tools-0.0.20120407-build.patch 1268 SHA256 825557e79c640edcf92e35986e51c74b609f549b08d9fd4b22c56e262c5ecb23 SHA512 942f1a94e4f0811a82e7b15905c84050e9990266690bb26f4145ecd5c29a9804dd5917158f925cf0df3908f3d2eee67c7df6daef32e745cec574f9169c6f0818 WHIRLPOOL 5e2d560e7477be1fa63a22ccf463907725f37c5b156e31064a18c21fe38ad7b949def508731ec6408acd4f5ebec9c608443facee4c54c62270ecc1589d9a75d8
 AUX pps-tools-0.0.20120407-install.patch 740 SHA256 95e567de9cc958dcd8b926d91bb35ae5989685593dfd288a973101edb990a8aa SHA512 0f08cd8018ec279751d297c0392bb685488e44aea0b03f754e7f81cc020a5d8872b4aad362c59eebe857a3ea0127827a66567f70f269fcbd0961fb4fe284dce2 WHIRLPOOL be1264b5d2f43f33b1537606526c06a7d1993e361ac38bc9ac7f0e3794b8bd5e3a87b873428411c3924b46731f02f515cbf662a1c73e05272403880651d168b4
@@ -8,21 +8,23 @@ DIST pps-tools-git-0.0.20120407.tar.gz 13619 SHA256 eb020d40a3938546620889bb6ecd
 EBUILD pps-tools-0.0.20110710.ebuild 901 SHA256 7dffab94507b00af5f3aa59251f8eb62362f2f5d5631795103777dfd60b17283 SHA512 f1c019262047b5a830f1fbe6af8a8451adcdc2ecc584008f8d3cbaf117ee1cdd544f8d1e7ab3eb08c3f5d5c272fd5f03f3447b792a2989a4e7f957d3f49fdf77 WHIRLPOOL 5761cfd031673b741517ebf87f4ed0f64ea01ed1395c3e0861abb3d5ac53e72a6b482052b4e30231e7ea0f631fbc0ec821b8a2fbd9013523733031debe56d35a
 EBUILD pps-tools-0.0.20120407.ebuild 759 SHA256 ee64e59a953130855c9dd69b3fd1a6c79c0a7cfa279050b3c19dd2ff0c4f30c3 SHA512 9c312f7e5776f543f5fad1cf91f8c9b812ce65a66b9722f35223c866c380891eaf916da2fa2a29d980232df718d88da2b830762c9fd5f0a724d5ff6e6a3c48f2 WHIRLPOOL 0aeb86418adad5c50ef395839f6d9d4b1279104fd1fed51e4c67236a357465b4dbf0bbd5f4d5516e51e7a8cf81056cc416420bb8628097db8af7aeabb3869564
 MISC ChangeLog 1273 SHA256 1690d73a6fc856daa756ef6edd964d0c05e50000287c353e4528c73b39cccdaf SHA512 df57b5b31c187d47531afea58db95659705d227f9d0605478050e919c5446304693bcc9069bb5195ef0461210e547d9758508905036a5c106768703cf64179e8 WHIRLPOOL 9133660f5baa5b40c9bcab0cecfd790ce78ae9efbbb1155aa970091abb8d5e660ed8ed5144c74ebcacd84d323cbc627af673f2be1d0088f2fe57cdb45a3503f0
-MISC metadata.xml 167 SHA256 d3704c8af84e3a392dd37d96bd7ca1a56ae51411130c41ee5a6d121b2b80b7e2 SHA512 d883fd4119c9391790d0e53fcd1fb3135877a9769e465a200a3a21f52f72edb592faa8d2b8de200221453f6f608c01e71a1ce1e6e7abbaf89cc146769fadd276 WHIRLPOOL 88c23a399f46fb9f447a0b33b5ed1570feed6d20532c0c91945c39231ef00a61673fd97c2281816f460653f8faf4c509ec7d9a599e2fc85897b1fa372698049b
+MISC metadata.xml 248 SHA256 23f0b80373396d8da354f5c25e29f5dd5ce8b007a3f4d755ebae9d6560d91983 SHA512 d6712cd12d69622e8314c054c781bfb8fe9691fe474d3aa45493196d0fbfe2d9eb6095cbc4b36cf87c74562a506f4aa0ead380d362322c80918f31009f414386 WHIRLPOOL 37a005b886d6305c8b3b2c9ee2711473a218f903db99f1304a9afb478ad27fb82b337dd6695b02dbfaaff78d051e880361fcc0a07e19dd76f48a4b1c8f58fa7f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJQ148uAAoJELEHsLL7fEFW30MP/it7du1bCDFdXdjgwAXyPW8p
-Z39URIcIDuu6VEJYL4eefBLBwwYus0jwYuCJujG3NIPzVrpSDl507q3g4bwzuBVn
-RFItGdZgIg/d5jVY3PDiq6WjJAmghvRqgZ6PS6xbfNmh9ym4sD6jaLofsFQpXujH
-UrBjivpak9iY3KjXYZOQbqfTjQQDZSB2U3UiFqvC4xizyKmQyzmliUyuHplBBEi/
-cp67PeEYCG/sy61A/ioR46VN/7nYgjX4EB2Y4yZekeXWq38JO2UIxbn4rNzswMLj
-ugL9/GPFvOMNK437ho7LG5ZvVOeHWfU4Oik7mNBLE9C0GEk6FZ8Vg201eS8kR+Ws
-aM2Frd1no/cHmkoZa5lfij5BNxlcgYKmpk8Q3R5SXwxaYCGTjseI29u16wTWOFkS
-MkCnGRPgHi4v7XEEBfyxdUaCT1uV7KQ1zArEpZLMNNkvOtif+Segj2ASU3BJqRxT
-1po0wuWyxHUYh2lBpV7+wkGEuEpUotEJUa0bxKitQvXl0OGIij+GLGtuRFV2lNJA
-VnxGNckjrb+tQXZpIa+oAdfgaQPUCg1V5rWIqwF+tvYaYGQGN5pRqBNbBRdQeE+d
-7snTPrY4i4ZlaWxWRtXsPNBgezYQpthRampnLGhRbp9Supefs1vDEGjzwGcAd6Ap
-86TDdINlH/gbhptQ5Hu3
-=xcr5
+iQJ8BAEBCgBmBQJVfxOAXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiWwkP/191Tl8nbSkbNlnN8U6sX2xy
+qes1MLRe7RD061z6zSmobDfVQsUuUTUtIhCjJCIB057RlKYiLZNp7J6TYS+JMUeb
+pvG4Adr/CWuwWw1/SVdz2DGQ4qz7ZiZD8O+Q6hIsgZtNg7Zdk3M3Q/hJ4QNNOEUY
+f8+AkFXZCp+zr7e9TbdG1gVhuXxNBc3o5G4dboUen06bCmIEEs03+MKFyz9DZS5i
+oOCD4sxcO9QEVw8jq7O93fwHA4YFY4GAhRC8suU3FVWDwP7TmNMP4ODjoB/NAcJE
+B1FTlr/j8/jfFxv+6lSG6TQfz2Pwuhfu0iaiFN1TyqOcrqHRiM07Etgng1/EC2N6
+CLfrBMTuwEu9pfYLY7oM0zS86txqcDopItjBjBnGBUVtcvu6VS7cvd5U3JVgrLX6
+A0q2qQnXrlxaptZwbokalyY6v5J8UCO27/YtYHbmq3dd2K4u6zUtWFgq5fIAnFFv
+fiWlgVuP9gHDy7cyT12UB4aZKSO0elfsChINnJ+Me+DLv7P2mwYAUwX+YqtuCe++
+lgF39Kc6JQ4EOTAm/WggqQy3RLfsQGMDKjBWwhUZZ0GfamiU36HyRK45E2vEjSok
+0/39cIXQwpCl4wZbNUkk1c8/nwIERAnCzMmPZPNFAAMAhTjLkx7Y+jfW5QoI16MA
+XfmSRP9u9gf+dxrc7ta3
+=MLXe
 -----END PGP SIGNATURE-----
diff --git a/net-misc/pps-tools/metadata.xml b/net-misc/pps-tools/metadata.xml
index b87b69a7d04e..f493acd58653 100644
--- a/net-misc/pps-tools/metadata.xml
+++ b/net-misc/pps-tools/metadata.xml
@@ -2,5 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>base-system</herd>
+  <upstream>
+    <remote-id type="github">ago/pps-tools</remote-id>
+  </upstream>
 </pkgmetadata>
-
diff --git a/net-misc/proxychains/Manifest b/net-misc/proxychains/Manifest
index e9e28eb06fdc..8d503c71a21d 100644
--- a/net-misc/proxychains/Manifest
+++ b/net-misc/proxychains/Manifest
@@ -1,19 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX proxychains-4.8.1-makefile.patch 1242 SHA256 b3ef56a983f3728007e81d480df05cff269e8116525522f79177ed2247dbf914 SHA512 5858d4852c244c737d063a3598d3fdf28cbdf594515e02881fd5c5623d4612ce645d92f087aa8f8591f1f153be9692ae1cf224b2690790ae8ca0b4a6c2881aa1 WHIRLPOOL e7d597a213201ed4dd0bd4c61c329b138a68c362598b509d0c9d4b0a0df4caa9969da8c09597da1d15ed98f209a4725fe5d54cbebd6df9a1a95b74c8eafd38b7
 DIST proxychains-ng-4.8.1.tar.gz 32701 SHA256 7b0680e7f60637e674f7142433e23ccb3cec1b478378a22a335c074784bab4b2 SHA512 1e6917d2aaa69d6d1d1bb33267a72b2efeed6216b06f203082b055650b506dade654bbf36a3dc2c52729e64265880a39d9af8a5a1e5cbfd27e8f52488a9a051e WHIRLPOOL 8cb009beb8e709a78a70b234dc37eafabed83cea904536ef879ab5f2d1d3eea7b2a33c247d51f8e4197aacb2116d2c273774be47dc5cc9e03f63a99898a5c2ae
 EBUILD proxychains-4.8.1.ebuild 1169 SHA256 621619519719d365bae55f84a4e956790d9a881e33f1dc999bff35f9118c225d SHA512 d11c4bd8d9cc7ef29adf7b610c48bd0440a864a4e7b8f7ebe9b97d3931587113b5ae8863ac5a9006016420c91cb800577cb11d5b47736b7f9d2bd9517d3f8446 WHIRLPOOL fbfd50887ca545ef194114d26662ebd4227c2578988d2d79512d55f42ea2c84128e87b07a2c1280d927db2eab3c0c07945b9840ad66f7c2b1efc5e3621e0d21a
 MISC ChangeLog 5195 SHA256 9b79eb919b91feb9d57c4ebd33be56ae7e8d4ae00889ad7ebda066a37be945ac SHA512 fbe0920258581de19f93f46376997048f7f3a82062c4cd19a28fc87bd6af7a93c06eaec3324db9b2f0474f4f8e74b01e807c3e175ca607b25d5644dced649242 WHIRLPOOL 03b3d930fa4544ac03961e7c524e470411dc963e71d0778e1bb22d57de7adf98dc252df99d74398feccf2296c19f3e62708b9278d8957a3b016f6c97b8f9b9a4
-MISC metadata.xml 232 SHA256 a778e40f66cb2fa35529e4f45cb8356c8b1b109163cd939396f02e8ea6aa5f1a SHA512 6952f63da1c92a4ed7ddb87b5eb4003d123f0b7af6ffdbc9118159c97ddf18917e8ac7727285a42c07c64e52a40335bc2ef9f17261557617beb8c2226a391873 WHIRLPOOL 0a4441f075f8af01588da2aac3e03732f93463b8bea5e46749d37e1468452735d15f45243b930b3346c93734f8aa235a492030445fee471a95d2c5998f08e7de
+MISC metadata.xml 318 SHA256 f59a84dab33c0d57ec29c6e06109a071ef9d1faf4e0618d980c71d8baa2a42e3 SHA512 24c09c5b2b6a210d5ec8f3f31aedfc4f60f83b84d714b1053b7a221cbc1653796d7ffe4c2116a12e1ec76dd5b9bdce0fc9f13c0a338bd41b53f362ae4d822704 WHIRLPOOL 9772293d10b0646582c282eff50117976cdc30b9c58445da64247d22bb6e38454e54503606d2ffcfb3bd38e6fa0c56145436c0fbd7dfbb9b817713485c2a29d7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJVV5qNAAoJEEqz6FtPBkyjQOEIAJEfDty9ptD4DUm074ibp7Ao
-ylosPEUSaSmq6+7Unf2lsr0frv/gNXO6vKhBR6JjFsi99ZZEnBGaal1sLmw4777P
-h60mDcKjds+N0LEnUdsZzkmnmpUFlc8aRh8cpjLnqFaIla7yNrK65NMK8WZYiD/z
-YIr0lSU28bnZqpgcUPsg6C7YYLEO5n2KqDzVeHaI8M9SNUWq0RS1xHBjrlTV8nl1
-sflwH2t+BijF9t9mFg4zRv+xUbKw6zs3nXqT/xuBpPseh7wogXc1bYz9l61SeQI5
-nQOI45g846ZysOqUglxuJAC/yDbxv22AZYRipPhHPZ4+e9qM5SwrfK4wk5OaFDs=
-=U/UK
+iQJ8BAEBCgBmBQJVfxOPXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiPkEP/3mGvmoxdDF5KG1OX/2cgwxi
+IdbyJHPihfBQKL+GJJ8B/IITySkVS8lhR9S+nXWfPVklGBT0x5r6WkPqxfjyITso
+vurz1VN7LXfMp0j92ZLZIGp3D5Vctr7M+IDt4n1Z7wrdfMyIRKnYIVFZ6G6XL6qZ
+gAJzgdvkni1ztF1cw8RyyIhmXU2qUztdYUgBarGGt0ptbwfqp0mUokZZs4FyXULj
+Dd8hicMCjQttLy6Ut4DkME/HuUDN0lJJZkE7P/ptPdJPbE1v6BhxgH551GNcrt3A
+0au5AWZY2UfTFjc/Blrr/B7U7WmS5LelA6maUQHASicH2nyF+Ime3AOLF+xy0VBp
+LvhCVPIiyeM/ZCnjYNuGbgOfYIC4J6ffUdfxD/jbQLdPq6pc1s/avY9ByYE+P222
+p/9IJIpjBvk6ANcwGqsdMC2ga8v7qYUX07EZNp5CZxfodyIaGa+P/G67sLRWqP6Q
+kqv6IpevwFfj/38a/oXiqEVzmS4PhOJ1PwYXki/S38k65MpVQZmBYQPJDeNa4ESf
+qLMPDjkFWRPwZSESu/mfS24P0nqwQCF2a2iQdb70tmY7l0xQNQMwdwNVriBW4q0y
+g+Vx2iUU1Geja0+pVgIE8mlK7pAgrTAPPjgMK5lOf+OpD1gLT8Vh6jdTRuMFmVvR
+Gxp64Qry6BAOsvHvNQIB
+=qtB4
 -----END PGP SIGNATURE-----
diff --git a/net-misc/proxychains/metadata.xml b/net-misc/proxychains/metadata.xml
index 157326a7e891..a22e34547027 100644
--- a/net-misc/proxychains/metadata.xml
+++ b/net-misc/proxychains/metadata.xml
@@ -5,4 +5,7 @@
 		<email>radhermit@gentoo.org</email>
 		<name>Tim Harder</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">rofl0r/proxychains-ng</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/ps3mediaserver/Manifest b/net-misc/ps3mediaserver/Manifest
index 161f87babc90..ea9da01c371f 100644
--- a/net-misc/ps3mediaserver/Manifest
+++ b/net-misc/ps3mediaserver/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX ps3mediaserver.confd 295 SHA256 cc648aa4ccaa6e1abcfe96570f53f539d351415f0e97838e216c68c97d898665 SHA512 51ff3de39598b2d1c98d94f31dd02eb7c702589d22faf8d085ed51a7d6d7def363a91a65895905f6dca05c7f3805043b6a8047b3ce5efef17efbd47a55183714 WHIRLPOOL a0cb1788b57d56640c44c756f9313ef3f960e19f38e5dee5a56aaa150d7b6f464c89db92f15be6bca4a900761aa86a36c181f3e130fca06478ea89bcff36b32a
 AUX ps3mediaserver.initd 524 SHA256 750d8e1c0ae6b3e6540475fc085f4efdca99302e9be59b4bb95e926e87bd2ee9 SHA512 038e0d582bac73b5072c22d7034cee3646e41e02b526a631bd788411c6e271408ad6537f717d4e816981b8e0ed934b6b4082d573defccfc2dd0353c97e76da98 WHIRLPOOL 16b12cf3824b43289e1b7b5e346e1c1521299c103afff4f132d48f51026c9cdf39faa9af505118a98bc7e7d56976d5a8ba010e949b90fc83854b067549d54451
@@ -10,11 +10,23 @@ EBUILD ps3mediaserver-1.82.0.ebuild 2195 SHA256 72927868e7caabc537787babde0a5314
 EBUILD ps3mediaserver-1.90.0.ebuild 2179 SHA256 68e4ac5cbab261b9453db3b9aa3c43fbfec509360b399e6882b41717ea6f6cd5 SHA512 53a28704d3e5c9ef99491483bbcf489b9b276440a8751360b30420948ec876d8fcb748a92373ac0504e40d5d7eed7866266dca10cf337a77a01771726154674f WHIRLPOOL ecea51345eb04ae4f7589ba942d19b53653fef5c3ed0f5b8630592dde036950cc826073caefc120f6400881058cd8fe15a7850e5cab32564cecf94343f06f5c7
 EBUILD ps3mediaserver-1.90.1.ebuild 2179 SHA256 d23fc24ec6b7794ac13e8afbfb986a56b0d207e0337d3a5f3e121a622d16bf75 SHA512 2e4e638aec8fcbf93de79f2486062f6da486200a9d5f4d39a10400b3c470bee62209249b866cca7c89ceb68496b41de734acaf5b5da7c240d984c30aa01bf568 WHIRLPOOL 9dac454b2b487cc40e19699330e3a8aa552c69e7aea6fed6e96588cf114f9d53866a4c7fc5bb2122488e6df871a98dbe10600f5a3b882b280e0a698622ebbe88
 MISC ChangeLog 3755 SHA256 275a97d1f99adfcd2500c7b6c14828e91b00744df4d498f720c562e7c3167858 SHA512 7f30f529a7bc6df4934ead2eff01950930fe84a22f3726549d91e9b712efcc3b773a4c2ae265f9bac83b8f1c95b4d0b6a557c14941bfcdeb3310069b60c15638 WHIRLPOOL dde95987a0ce7a5b55b8ab546dbfaa0b6d280271e2974225ddb4707f75a4c88940dbdaf49225bb08cd9a3341c323c2260f9f791cd2f20325b33b241e6d636625
-MISC metadata.xml 684 SHA256 2c8aaa6e3ff0785108a219b59f94ec2a36af829c3e9a14ef411863675965ae3c SHA512 2c532e0fc065e9a0100711b373f3adc9b8fe586faa07ef0f5273876475caa056b85855eefffda9b89bc415d55526a54fe0843404b69cdfc55d1de203de1255c7 WHIRLPOOL ee792dd477a3446e8c4ee45e49d3e672fdd46bcd9bcd8c1e2698ed2262eb233a211248e6526e8b748419f7c48802451cb716319d2f6c6ae9f9e74e9d4731bc14
+MISC metadata.xml 743 SHA256 6f6963d2c34c3d38b9093478a828f5a4528aca028c91e40fa3db4c59f76e0b94 SHA512 da3c73a75896de9d74f26d13c2fa6a8a10c8586868ca510902e283122e81ac5974db6c655db064af671933c18fefd7c41e0faa27524cef62dd7a17e10b8b2a7a WHIRLPOOL 69abcd3d51cc2c07d8010e0c645f88de6769749b11cf7b536c42b8dbfd26b90fab3f433a2be3586563ea0e23849a287e4c65999b545e966d094356e6e7ac51b8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iF4EAREIAAYFAlLEMSgACgkQC77qH+pIQ6T99gD+JqRSNHbiKRFb2NiKiKelt9rD
-xfTT8JolVhAQp3khyrAA/j/K9OphYtOdQLUmzhGzqbS1WszgrYFErpkbGIcr6fJU
-=3a5F
+iQJ8BAEBCgBmBQJVfxOXXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmilwQP/27W00j+lXfx2M2gtJ/uHL42
+GNGqmr0VJ/TlpoCam0gqmdACvNJ4MfjsZGMYG71WJq+soBX3nfLgBQPRWXVVlz6/
+TXM2+6JW4DV5GYVTOkLfGuarPNV/w8qmeAOap35ous+s9SN92L4aCxdaH6+BxcEN
+pmiKOoUO9n5RUlCm3rZJzxCxOJEgKJYGJCD8YIf45VtJ1GtUW66IRZpuN8adwBwY
+cq07tXUdKM+ra1npZl2wcwkGIGAP8dslWKcKu+/xS07U1q/CBdKhLjj3tYxaPLHI
+JLvuC2xRZfr202O13j1F1WEY3UvxVZFIKCEmpvD7cpj3NzqjLxtWNXf7smXO85/Y
+kHsosgQOLwBylLF0JIgNDdvTFTISLk5Cu5fnoeyZhS47S28QdnHUrlNsR5bnYnxo
+ZemR7ODdWRADnImeHfarekYdHkg+tw9jdvGhquIq2jMzCuNQbe3/ETRzOCQDDQVn
+KcM7qaF/AbItyNsFEb7QiCRdXFTMPNM6Agl85avvu4h+Xqye6m++J3GjM8c9keAw
+dpuwq+iVTc+/SG96nfC2cp8HLBwcwVykfk9mXlqx8G8PCMVYAmqYLbv0v/PZTrDk
+HmYiIzRw+CPu0ADVI4YmF0/9PQeq8eYbr+1ca6IKil9GvGoV6UVUZWz+XFSAWNve
+07Vdtz+aEwSD4Xh1cufV
+=tCeL
 -----END PGP SIGNATURE-----
diff --git a/net-misc/ps3mediaserver/metadata.xml b/net-misc/ps3mediaserver/metadata.xml
index e5169ca2fa79..b4d63de760df 100644
--- a/net-misc/ps3mediaserver/metadata.xml
+++ b/net-misc/ps3mediaserver/metadata.xml
@@ -15,5 +15,6 @@
 	</use>
 	<upstream>
 		<remote-id type="google-code">ps3mediaserver</remote-id>
+		<remote-id type="sourceforge">ps3mediaserver</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-misc/pycnb/Manifest b/net-misc/pycnb/Manifest
index 57c7bcf7853c..7627e70e3ac1 100644
--- a/net-misc/pycnb/Manifest
+++ b/net-misc/pycnb/Manifest
@@ -4,23 +4,23 @@ Hash: SHA512
 DIST pycnb-0.0.4.tar.gz 2991 SHA256 11cbb9dff1dc79daba1dde2a5d2f5db9283614a00166bc505cae41006a87bd3d SHA512 e127525bffdd479a5717230f520602cd1dd587000a1adc398739399530fbb3e06d7bbf3e4f7b24c7bd145f2424427ddb6fc86d6bc597d2cab3cdfc6d554cecf9 WHIRLPOOL 2f11c9020b6c3e2f2a00835e8b0307fd7292879a104f37f0b38e77022eb504211626f51584b1560a81a97ed7cb5ab65e847228667f79d0395753ff179679f6a1
 EBUILD pycnb-0.0.4.ebuild 623 SHA256 5d8c7dd1caab3b448895731ac0de46379067c11c4cba5bd32c723e2cf7d63605 SHA512 829ef6e8134bf8bf48f9cd5571ef15d2dd9cfe5d44a0b1644fb6a3513d6d239d0ada530ac353e628a1044dec00fea6c5847f1de318782f1ee6107e08a8757ad4 WHIRLPOOL 9e7b52daed399821a17a0efd0d6cfffaff022be69dd3d6b8c9bfdb2a80527f9d6831c4782fc36c530ff1cd3edf2e32d2bd27d0c5a3da2680914ba234fd48c677
 MISC ChangeLog 620 SHA256 548709f7c30fe27a587e9287b7a19f4a20d9d912bc34eb7ff42b2bb07f8c34fc SHA512 db2431e89abd5fc0887a1e32be6925691564eaa2fcfa190d20eb8a40532ea2d8ce69dde3f215da109c7d5be786009ea0b581c28d2593f943c2f052d0c47351ea WHIRLPOOL b60339f03aa1e41b1de06354a5186e37c50385b42f49a0749b7d5a37a9a32de354e133d89100592e1730b9a78f0c265cc9150f49c55a8f7f08380d71f6651d2e
-MISC metadata.xml 377 SHA256 c949ae524289bde2b12d51d5dc73eafac62bf5c6b6d818d55b5d6edf3a63a514 SHA512 d8aca2286963c6cb414c65c3ec652ee963cda4a9eb559e784a631a50f0cb80d9bb56d24022b4215fcec7dec7ae46f7d751be6fe8ea9396bd04c76e8fade7917a WHIRLPOOL c18d57203619df5da700325e00f68ed096184b479a53250103cb04a3ca85b5674cbb809f32b895ac8b1ba91276e48b1c4ec7c1b4a56b0e839f394d6da3988668
+MISC metadata.xml 430 SHA256 06c21cd0c3aa2e4d54b191b13246fd66afbecb5fd942e551904270e9b5a8d0af SHA512 1b407d2a35586f84815081b6e8dd8dd62c43ee08259214c989674eb7cc22385380af28ea370c71e3f3c2616d31bb05c24c25ae79fc4b718619e63b06b73d3285 WHIRLPOOL 063d6484a82fce27b6635964d1069c1b4aeb2ad400acf1d7b1b680614dd601c3e5f68d989afabe74e11be8eacbf9fcff4cff99272dedbaa260b5f15702f0fa3f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVcCzcXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVfxOgXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiutwQAIbvAmFBz2HK4pgHw21s98QT
-wWmhfmLNzHzI1FTI6bMwL5wPc2B0QW16OV83N2T0zhy9eH6JAO34LjqX5tiAh+5Q
-PEzZhXEuGgb22Xu8H+WHnCbpNsCfqLQzZwR+RY7w9rPK5twp3T1nQyQI1ZS9/jVM
-x8lUVWWmPG/1gYvlHlUR3F1aFwMHZkWkiXk8Lq9vsTsoekCYSfDCrujSfAON0bzy
-5Qrf72NREPVzsddvebcBecaSBulkw4hxquKj+S2R59cGu2e2+L4BdgQvKxLOZr9B
-MXhJwLaT2jVy4uhzBn/QXrq0QRUa/e5cYG54SZN1k1kEB/sNsa7DujAfkLGweMkW
-R6OFmHKxTHvLVROaMGaywa/B0MQZKSCZuP0vqEPdfdbuqgvB5WjNpTcHI88UaEKy
-0NBsVtAviGfrqZFKt0IHJdNfRYuqI971YvAPbQ4gDBxPdSut9Dn7CpXUAAu55rUV
-Vr4VZZcPDvoKQQlOSi5pXOWsk9V+ygXE43GJ0eCRnc2vKA92zNd4vE8YUcb8VnYb
-H6+rTb4OyaxkjFn9NjwsdD8q+GL4B9BaXYuuqUo+rn8LKJ+7/+AhqHvGeV4y9526
-B3o6ThrPYXrA+QrfcS0TufCyMS4JHNP1fn/q2EboqaCHrWKbMwxEqE4YgPU5dhii
-VG6OycdZ77RD383iyDBY
-=lIzp
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmigwwP/2YRfiLItu8/TSxn36boCwIa
+peqkK6ytZivcfuSpv9sqT3K9urROdH7vGS36BUi7G4RF7b6Y3w5j0rUYIRRvVAXu
+FM4UvuwgzEBuwvkrczOpnzl7E7laM+ot8/+jG0qX623h7gdVYJ8NXpWHaQRQBZFI
+NUWVKdHalRcg/JF4XnKRpjESMSBC8++JAzAa67BmT5Sxm2ADRjJQmU0glQudaVog
+6HiOgtqH0BL8ji2HtMZd1BlmxDF60igDO/CC6lzx51nTSndNn9znBwGmBSy/oYp+
+6G1S68rnfg46RSzyFGZYdjobh2hZkBoqqZMT2c4xF4TmbHlIvJw7b2cghlWfrhdb
+1/F+wpeakHaT3MH7WiBIL1+UtkMQCEjmznU6dRIY7GRWvCGdRlpOHGZTlOTMWjx6
+VQyR+BMvF5boM8PZcL990yU0FyFZHzHwYyQ3UxZx0XcDMfL8wkN4RTH5VnOw6aYo
+P2lR/1cNGJY0FBObY5ygotG34nqY5Z3Dm4gvoMt3ItI+ptqV2nuWqHx4qJdvz3qs
+0S5Q+K9Ljx/zjobgM9wPj8CPVdVPs38OqJYWeSm+zT3mOfWp0uz1nPhHntNGhOfR
+QlRmql1brWC5lq0ZfUGBCRSXfDn/FJwSylFe95GLCH4GIJmb+NjzBIXPx3LTmDiL
+DXx3T15fPhJKHh+Eh2BF
+=+s38
 -----END PGP SIGNATURE-----
diff --git a/net-misc/pycnb/metadata.xml b/net-misc/pycnb/metadata.xml
index ff4e29ac5e02..d26da4036070 100644
--- a/net-misc/pycnb/metadata.xml
+++ b/net-misc/pycnb/metadata.xml
@@ -10,5 +10,6 @@
 	</longdescription>
   <upstream>
     <remote-id type="pypi">pycnb</remote-id>
+    <remote-id type="github">yaccz/pycnb</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/net-misc/pytvshows/Manifest b/net-misc/pytvshows/Manifest
index 4e50cb98203d..81266a8b1ab1 100644
--- a/net-misc/pytvshows/Manifest
+++ b/net-misc/pytvshows/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX pytvshows-0.2-ezrss.it.patch 1334 SHA256 20495d584e9d3cec45d75286c4bbce5b653f7b88644ab4d0ff88f0ce513679ef SHA512 98953a5916989d3afa6f1ce5f877dec77b4b0cd0563ecc0d3610af659f4bbfc1b4f67ae5185fd6e05e446ea57ed7db64baaa4a6f5bfa518cadda4c23ef8d6f82 WHIRLPOOL d204049cb343dedf87e5916ed4c7a643a7c72292677a04055e3b548560e511305e0108d36e9f7bd29269d9a801cc62c576328a6e0889beb2dcaf92b877b2883e
 AUX pytvshows-0.2-feedurl.patch 13077 SHA256 fdd5712fbdca64be57f45ed06f1e4bc72270c420acea9296822488f21cc3fb0a SHA512 0be12fc6d4762306d97da38921aa46a28d8b123ed9c1980bec4ff226f66dec1f369f665fc11adfb545d86f47b7f382b378d45337c4bdd433d3efd5c632e9042c WHIRLPOOL ff51bb03abdf7452164db88f4a5f6f5ce936ca60b8e40845182733a90f64b1e04d35d3a9c97947ec64f2ede9f80a804ad8ee667771e1b7fa92ea6fbcf7a42c67
@@ -8,11 +8,23 @@ DIST pytvshows-0.2.tar.gz 14156 SHA256 f5714373bedf466313f99ac8bc184c27d824160e0
 EBUILD pytvshows-0.2-r1.ebuild 833 SHA256 e118f728ff40d3d0ab055bd1aeae3ba7fc0707318f2758e0a13a9b09d4e5962e SHA512 ff6ca93eb59f032263788b075b19ec11ac67a87146733c157e18f4c7d7fa4d3860859cb6fa82ea5301440b30a30b404294540c8c77ba8ce83717334ebb924d4a WHIRLPOOL 09884736223b43cdf8cb8bc02e6d86c8cf978fff986d0a5674f0a1cb63d15b0d63b2ad3e833320c310d3950dbe62ea159bc4cfc76c76c1205c53345c178a0da2
 EBUILD pytvshows-0.2-r2.ebuild 781 SHA256 68428883f0652996cec13f79fc95a5adffc10d68ea74bbd75ac3143fb89ef584 SHA512 b972bf9dc8ad751d851352cb66957ab5377e316aa79877a397bd6a2e9be9cbfc10b89250f03e847a00247c6af851db0b315a91100fa1db23b7962422d280612f WHIRLPOOL d3e75de132f8bdbc8d45c0fb35c9cd416f427fa189937d698b9873e9c7704bd0506c44bb02374a6d9ba97fd611bdb057eb3c62f3958f902e1ca843f383263190
 MISC ChangeLog 2055 SHA256 99dc0362577ab87e043a325588cec612211ab5927c57a63ec6cc0c8ba41621b3 SHA512 459b100dedba1d68ef08139eecf9b6684fa76b58d12aef3bca66f2ffd85816f7eba3659ece33b6943d21253604e3520292596c90283cd2a3adb66f15caccc11d WHIRLPOOL 53860eff6f7887299d9100231630d34ad5316e950dc3d4ef4d504fa9ce3908bbb091cfccf5bf2f6c480e2c124042fc22060fdbf2e6c7ff56debae17f3ffeeeb6
-MISC metadata.xml 211 SHA256 84ff2341253cdd21a6782e14ebc076a8bcae11428aacfe2454f4b32165504727 SHA512 a9385b7dc02a9537080a9b1bf59ae2caacd84cab2e3ef1fee15e4f10d5518ae9f71e4ce07d99104e643d18a79ca05116d74e97ec7d230d21b340656701547078 WHIRLPOOL 4309ff085fbfd1a91434c0a9dd4c23b7ad8b10b0559beedcb4d911745543745691abe91bb1e361dd88b6383678f020c95deb9359876319a6407ac0ef2dcbd221
+MISC metadata.xml 293 SHA256 85554c22b5a1b3ad609960bda84c08a16038d1a16766d7941c1c08a055e39145 SHA512 7ca615de79dfeeb53a2af92d78151d9e26417b86274c18d71fd4d634112ef0ed14a969bb343cf56cec4f4404a4b65f28c27d85b1649f6a6e8ed0cfb9a942f6f3 WHIRLPOOL 25a4ff1d9c86e6366989fe2ff60e0dc7662a582cb7d2f2742e1075607d90309c2d4199ee09234fee3b837093164b6a0e2644518dceb791274d9da82ee0acc2e1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlT738UACgkQso7CE7gHKw3eZACgjgLxHk/8ZnPfiy4+iVIqzZ0l
-tQIAoLLn5jW+J2h2TpSkr7MecpjXeb8b
-=+uXw
+iQJ8BAEBCgBmBQJVfxOqXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmibcYQAKq280Div7Dy8h4DRxbiDQd1
+F1E82+bpVsYm8cdSQNjEZUDSOdyB2xzQDn6h+NzYmt+TwR0ablzAKOefaHF7aH+u
+XlzmAZBMi9KCNkTKtQ+AI1VUZ2iT4Oq7fWibwUgmVIF41kktcWnDZI7xlrp1HXRj
+x1wbapqndFBSbNTYw5irdTXLIX68RThWFCGA1wFY7+OeEPZHmwnrNVY+5ReVfnxa
+bL8J2UtHyhL9/fn2uYcCMxTqVyRF1NAPah6ptvLffkJKB880MMVBTFBDULSjQWzl
+8q8Okqp0rzvAzVvlEFhPKE1Tif/6ga57sGJiok6Unh0nTIqLKz0mnONz7aKL+Aeg
+CeSMCKpzQCkcGMw8sX+4Ge4GkSlrClJFt887Gd9vHfpkMvA86AxIT9t1p9H0pH15
+FMf/mB9+pqyWi5r5/7NwPUw5REx8oI5EEqZkXiGfxAmU1szAViIOAb7mHbZ+335f
+NN9GTyGjrBmmylLXsSTrIZ/XUoJkFc5jrZ06zWtya8se79XzKORMAuPK2EzaHDL9
+Jgj5mbFK77mtqvTzgHgkC3ivgUyySkPpuc3AYZk8a18ann9Xc5hqm6/FsNcAW4tC
+iSQAXURpVZHWLK4QabHaBvqG0Texfkg3TROvEQ4Pr4pITw/6vtPfNpUP2L8Xjkdb
+iNBMaxKLIR5VX3ieS96+
+=WhYo
 -----END PGP SIGNATURE-----
diff --git a/net-misc/pytvshows/metadata.xml b/net-misc/pytvshows/metadata.xml
index a40624fba8f0..67f1fb4b8163 100644
--- a/net-misc/pytvshows/metadata.xml
+++ b/net-misc/pytvshows/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">pytvshows</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/qtm/Manifest b/net-misc/qtm/Manifest
index 15512ea46e34..35c4fa5d0da4 100644
--- a/net-misc/qtm/Manifest
+++ b/net-misc/qtm/Manifest
@@ -1,26 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST qtm-1.3.17.tar.bz2 185310 SHA256 c5cab3e1386e1f7b49cc6711252b1e311a0872e1888b8bdfebaeecf61b52cc85 SHA512 b01568cec8e1550caf06958f196c1d3558511b6dbb32209ae83c4aa401f55fbeff093431103b52aa7ffba903afebd32906008c0c021565df478c2281010d921a WHIRLPOOL a95f1a37df357360594fb19b603ded8654ed086b4b8b65649fb3f739c4dc96079c7b88e31f8a053d722448574cddc11f32626afc8d4e7f7e7460512cb42ca291
 EBUILD qtm-1.3.17.ebuild 1045 SHA256 ee68225b91cf21833319adc2af28580fc9f8d6be48db3dd317572437ee364c57 SHA512 6e9a47c861fa92097aaa14be10e56d5cef0212a647d69b14532dbaa68613749923950fbba31165e31ca915446b578773c4138153db4ca3132e6ef588b34a3981 WHIRLPOOL 36e83d778c9ba3a5847970b75ae4f595a0c58c59cb3b02caac92f7aecbb448c2bd99cba27324cd9b5e58ad84a2beba03ce426294e3f5be40e0dbbe2735581fc1
 MISC ChangeLog 4903 SHA256 1f100700cb9eb8d966eedc17b847171441dddace5440100e82595b34422d399b SHA512 dd996a180963d63cd3cbc35f3606419cdb88390f938ba0e92977104a23081022e55dd40bce4632b1d1a98813d9d6ab37971cf0994c0614a8247e6e76d75b9ff2 WHIRLPOOL 5dd1561ebc7b026001d79545a0184b57646cd06b694b944e522be055f03ff762a824f3f517e34da67e4238ce6d0058809b241e6ceab93c2da7a1b60943948022
-MISC metadata.xml 253 SHA256 a4cb0f81da5c13f3dbb2a58cc7edc9a33e4a454274a03752ad3b6eb72beb2669 SHA512 1228344706ea2d6c640b1dc6a2f5ff29b5ea1a2ef1d480b47c8acb4a7a9fa369a98f37628d25947e542fcf28e705fafd586e9d92ff7b8eef3b83e004a025ab82 WHIRLPOOL 40cf519baedeb8aad4cf032a8a45555be8773a9f3a327d04e77f7364917ac2a92534e1e4aa28b17014f40c0eab07852c1da9ab3717997f971f44a03d63782b81
+MISC metadata.xml 329 SHA256 32f4b86a974439f398c26aa5c5c7ba3e55b6b73645fa9b42c8aba0e8639dc6fa SHA512 2b5e16add6e75e24785f2e27baabe08da150b185ea2623861c106527b63606ac9ba94d4a8bdb0eb6a7dc861b8e6eaabdf606c381515047e640f685167ce5af2f WHIRLPOOL 2725dc9916c14764b64474fedec87817c029f7e80829be7422e341dca50692654cd6eb0517cf2fabbfea8d3fb9a6c851b927d4ce532efb228711e47196c5a2ee
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ7BAEBCABmBQJVM45pXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
-QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV91rEP+MldKnuYP7CjkvAVjpBV0JVP
-mZrnEMJ/pZdt/s1fFqBTcIe2uB0KvCfl27JslP67jhnktmvPLt+8JpQhvYT3CATu
-nl9hvlFv2s4DVkOT/6dXmQgft7c++1jFFIEiPsPNV7V04jFapaA1Uh1cEVeZAD6t
-fgoYSpEwe1LCdqeAxZNQzbK6dCmqCjtPrNRuOBHLjPoGBm2U4eaBpSf2Yw3czbYv
-ePPuZw2CBjy6lWHfTknPAXOhCg31h0OoJ/NkVJ40tMVePRKIsQB9qK+yspxGpIp3
-EZ1qzxrSEA6G5nR4yjZG2VLX8k/x4lQ+An7mbGqIWCLibs753O//337ob5ZlTtNi
-Nw9XPgoeTFf9FfCbpaQldFPdt+HfIK59AEtnTctYY4i+NsyPd48N3mQ2SXPBxh8D
-UcGKHJQ6ID5o8iLbTwpxSwSAx0jzJtc2N6IHu3Q2oCQq6Mj6RYz/G9UsLlrhNKAk
-Z2Z9SMerBol9UrzxQO52hvPp6Qdt9BKGUDHASny/ACy8ZSvmWWVGZ19uk5EXVRf+
-A5PSD231/uVT3VCvZrcO4d8WmjkxoQnWDDqA+VjnkRP6+e+l2wXwFEa3ZRPs2C3W
-NlOlG8+fNmZgPx9/vrdE6chWSrWSC1lWWbl/i393K9afzd6RUwnjM87AGiC1n3HD
-4wmy7uD4O8hqbObINsk=
-=FVt/
+iQJ8BAEBCgBmBQJVfxO1XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiUUUP/A7VoXDERSYvd7qVg4Q3oGrf
+i7qt2hLvFmTU5FgrwhdBWKSRq++7XoWtFymiCmZ1HPbqeS1Ht04sTs2b3cN305ir
+yf599g13eWs7ZOCIScPnbB71P3dN1bxS05ArQAZ/u0e5sdDOnb5ErHTYnw0WfRdS
+vkkTYvAC/tlMPCyb6RDPm9D2VZTdNrPJU1uf+pdvDfcCFlIEyJKVyAI5ewDAOv+1
+8SfzKfZZSzMI9iMMMiz0hFFWF6hIe5F6iRYYr0uDoBrcm7EOtmOiSINgH1WkjzVu
+5DenZssDD+CyaDHwQp5FnuywREqrVYuI80sSBVpOwvyJHZkwaZ06zYtKiWMXHyTH
+SLADB6x0zlgXl9EPIOBCRIylHIfVbANsWX64vseb2qALrJsiANZSqjiMLYYb6o++
+k3nvmW8lSk/4Zxnz8x/mQIoiJyTD1s4YpLOAaoNwB5842RGCupZeOTi6jqoU1sqY
+fV4qZdBDHL9N5BJX8dNwvBNvMTEA0qMpnG0gGpp0D7YaCwaLparPFy8/zOOvOj7N
+ukxD3Q5Ze0ZBgShy0pU0lRDTtR5Nn81zGuKeprtoMmPhYPiDH93fSeZGdrR4rZzH
+pXAf5m/enDtQs67+TSUvMMVstNvl3syovs6W8GhMz5CQnzSt0+98LKtC0XpFqBsp
+CcWoejqJgD38Cexdg//g
+=A+bE
 -----END PGP SIGNATURE-----
diff --git a/net-misc/qtm/metadata.xml b/net-misc/qtm/metadata.xml
index 134a8536dac3..a796a4ea0f0e 100644
--- a/net-misc/qtm/metadata.xml
+++ b/net-misc/qtm/metadata.xml
@@ -6,4 +6,7 @@
 		<email>hwoarang@gentoo.org</email>
 		<name>Markos Chandras</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">catkin</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/rancid-git/Manifest b/net-misc/rancid-git/Manifest
index 542565600973..4d550636a231 100644
--- a/net-misc/rancid-git/Manifest
+++ b/net-misc/rancid-git/Manifest
@@ -7,23 +7,23 @@ AUX rancid-2.3.8-mailprefix.patch 5878 SHA256 1703c25a50667c3f979010e883da8a83d5
 DIST rancid-git-2.3.8.tar.gz 388121 SHA256 c90c80fb25354c6d7a8ae7c4137ca96625338a8cbe6ad5756b073e0d4f257b31 SHA512 14a4fa097a31e2772d83e72cdcfb5488bf3e1c69e8065286c52eb554a392eb4257a0dc38fad5d79819fb417e699fb4e2c265ef5cfbf018418d9550eb653fa551 WHIRLPOOL 513c5f4ee27fd84ce12dff145652802350a00e9c9f9d3e5b5fb906a3f03d617cc73459dd658586dd5f81e21e7eca3220ba77890a59c4b06fc928fae3f0b6c123
 EBUILD rancid-git-2.3.8.ebuild 3294 SHA256 6b905fccc99588523ca72a944e46099aa85048269b8fa009c3699a3b79d341aa SHA512 0f5a2fb15dac02ac5600976ed2615c1179146b009d1e0cb7510b6d8f57f3442b179d0a51c5cde80b2d0877daa3733ca4afe99b727c476521c1d578f44138e679 WHIRLPOOL d0f66dd31d42d969b1937e06e5f5ecc916dfef7bd38653ae31419fc61d38ed3a6f5c869c6ea48c767794b5de2ecf82e664bc5ca3ba4e4575382221f6af03bcb1
 MISC ChangeLog 674 SHA256 0ad73025fef3cebad9b82aa1ad48d5a74f39a1dc282c49872814df95890982de SHA512 dc6b3d5ba3bb119c6e3b8aff6d1d41aaf4f81eead82d0b18f056e67074b1c0fd7a0611d171f25b8734759d3355a4ccb4b2307f2b686ba3da700ce2b321ad98a7 WHIRLPOOL f9e7031a1d8d036a396b9ca5445bd6b59ba16edc07b8ac7543e0165c2c66ecebb8462b05fa36ed17acc85a93d30f181a05c09e66d50c72601be06af33c7cc9ed
-MISC metadata.xml 336 SHA256 cfba0cb489803a2e989670e3b135122c9376e0f907a108f78abecd6f0e68bf73 SHA512 ab81ff1fbcac89af420a108c921473b04d45b0c0d0fb9f81b6256c713c3944bc185bd449751f63854667ef523b7729ef4acbacee172f3cd6a6f53b2dec05d9f8 WHIRLPOOL 163dc95a0e314f84057cc7109f711fd153d59bdb5486cc912ff8da6b6b56eee2f50704f40aa435ad36ee6055ed700fa903d073fbdd51088b7aa8b69d2a6335aa
+MISC metadata.xml 431 SHA256 b43d83a9def451814901e367ef775042c4ed64ae6e098fd5b4ba96f6dce4dc8c SHA512 e96f78aebad0b576f3b33f83a5229afbb983905ab4d7a9792a83a447541f999477794bdc47ed116b08dbf4c7c8ce9c6c24d718e90f290ef277b2d3b239ab4fe5 WHIRLPOOL 2612d07a720883aafa264557f687b5f836bc0771a5375c56683a59a48d61f5d692b6e7b0e9ccebe449dce805a8c8836b5cb9ba9eb3772d7fc2337a96d0155238
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVDEPAXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir79UP/iXkjQ83njjA43SOWq7Qk2H/
-DVc4JJYkCyewUO79YBeyWAwhVN9fYVseRe2Py0cYPoqdTK6FbDIPJWpPL00l4US2
-GxR/E8IG6y1we++MrahKCIZyVBkRIh4DlTH/j5n1gWGhWC+gybhAn15RqsgDpI8e
-Qxuu2U4vvPRb5RU3d7tBZXDFTr6Hxy8ZBZDp11Mkn/zXFaxzRhF7KmVjVN3SI4k5
-kiaT1QuHJjb+qaK+y5/P+hCbPinH6RX6aKWJZvmWQhcx8pd/cr5+WZUf44O97o8r
-JHnHMuLzslyRWmIHIJnhpFbxEu+8DiYIIzS++rs/61RujB1b6NhyQtGXb5vnMSRD
-77NMHNAMfSYyEgOdYGSgj8EQ1pEwxJM5IwaQhOwvxGLYXdbq9xBZkhGolYG4JIKS
-h7ALEysWx+Irzi+Kj6SGACnIEt8mGRsuUZdZ9PhoA5hkXg+ijmONT7UNJzp266XX
-Fkzh1yTOAcrTY43SFZAOcMGlQ42DfGENOrw5OPO2aaiHeDoi3BkwLsYCavnCgfBt
-UDm2q/CbgHb6xuBbZmxkBJhAIYz/QEHlYV6keuNjmZFv1ArhuFh2taMZe3t1pSV1
-6bt5JWseeYX8JRaugQ/1MzdTuMlqqpbOWSpGe0k3mxnCfwyiZnd89GN6+QOLOKZc
-iHKR2DQBbvzymqvv2/I4
-=ge4a
+iQJ8BAEBCgBmBQJVfxO+XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiNqMQAK5B0XUwSWVHXy9C+xPB57sj
+TYbYc6npcjpvvz82CYmaNObjFxeVWWB1DHgZ99Er/1UiCnD628SMEfTS66Gmv7bB
+2oYVX0TIsu4UywqPSZuBmnqZI2ENNExqe98i/R/Map3zfXr13RYgXO9628zhXT5Y
+u2zw8u1YVGQbSIQfi1A0ERuXNChwP5K6J91kYRyeU0o+cGhqqWi9HjoHykU4WKpj
+yGqBsrHzSmDmNcFbx+NFrdsY9rTW6BLYAyjT4rBo0gDb46iA0uRo800FY+hDOb9i
+jacEPUdZabFtwCyLsBjx8AyvBlwArxToqzT2KA/E/bdUzZrBF7docLgCfN7FVpIQ
+TrhEHAalgQ3Uya6YjAm/EtsQgAn33EyCXJvQdOJnyjtSVewf81MRNEelVv39O5zd
++l94t6XlMGZaecfz7o6YZiHXu0HnynCSEbhUPs7XXeyy3rce/2yI5eAUr6atTwq2
+TAn27Z5ObLN/9JAJ3nkiq0z96ZWklIWth0USpUW14VDhLORqKVkl3/gCOJmz2jrC
+X4eNwOkoBRsYJZacNOjjr2Mu88Ue6ADPexCfP/G9cpDRvoQ4J5Rd+f5GJsdkQJrD
+pHd5CXXh6TWBk2NKDPRLHrrXjFz1WjAejr6mqFIozgOuO5isKk81qQVSd+Jjpi12
+w3C63eAMyiNj3/g1y5yS
+=u7gK
 -----END PGP SIGNATURE-----
diff --git a/net-misc/rancid-git/metadata.xml b/net-misc/rancid-git/metadata.xml
index 5293b5f5bb8b..175f3d5aa56a 100644
--- a/net-misc/rancid-git/metadata.xml
+++ b/net-misc/rancid-git/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
-<maintainer>
-<email>xmw@gentoo.org</email>
-<name>Michael Weber</name>
-</maintainer>
-<use>
-	<flag name="git">Enable git (version control system) support</flag>
-</use>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<use>
+		<flag name="git">Enable git (version control system) support</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">dotwaffle/rancid-git</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/rdesktop/Manifest b/net-misc/rdesktop/Manifest
index 3b92315500a9..3c9678018fde 100644
--- a/net-misc/rdesktop/Manifest
+++ b/net-misc/rdesktop/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX rdesktop-1.6.0-smartcard_configure.patch 616 SHA256 04130d39c0472eda28600fd24592cf46ca0c222ef6c40d3bdd141670e388f365 SHA512 6f2651f5863f03bdecfbd59921f6031a72bf85f8025d72ca5f9dcf4231055dbb2436296684a647c72079df9c499bcbfb4d9af9c2432be84de41f70299b900544 WHIRLPOOL a298c5750039aae80a61242f25afc27e4c637be5ec1b66363c9a167560e2fdd2fbff00fbc4e6135ca5e084a16da5c79497081cc1184c1e078989d5f51f4fbd93
 AUX rdesktop-1.6.0-sound_configure.patch 799 SHA256 71db62d88e3c3bf5cbfceeddeb33958b2f24980ab3d7734511f13fd48a43e119 SHA512 d2f5cf974b042ca752fc5f114c7f3c87647cbf757c986bf163b183b19a1072942c413827331f74847f4cd5b3aa1d91a0a1f609fca8440ff0dd791a44ab74b888 WHIRLPOOL c1988ebf1e32a76df3e7b9ab1898c0ee66edb6a75cd0ec7b84fa1311025147bd8e7368a5bd61ded9af664a6057535f4b8bfce43d343e8707944ffe8d3243f722
@@ -16,21 +16,23 @@ EBUILD rdesktop-1.8.1.ebuild 2352 SHA256 4c0ae6fccb2cff351bbc4c5aac87a2f62ad2155
 EBUILD rdesktop-1.8.2.ebuild 2347 SHA256 d97b5763325766623928f8923cefe5586fbcce754f07aff4bc6fe97ab126a51a SHA512 93b9026c1e7acebac43d1d036cccf34ab5f51b0f4ce4778d39dfb86379272fc2b10a5a10711be79bb68a4bf46ad2421f2ba7b179306c84ad483eaf5984a7101a WHIRLPOOL 21d31ac4e292c38371404fc83af1bb3d74416259ca157b333a8d4b321e29886e30f0402a4e4e95088b6e1b22abb6dfde9f68ee6f9fa589c1a85ea372ea129ac9
 EBUILD rdesktop-1.8.3.ebuild 1939 SHA256 26e6e0862470b760d58a06ca901d9175b0931ff1ec8d4ef7e9e075b6a6a654ce SHA512 2fcac6dc5e997197db6b20f079f837c9bfcbfb2b4756a2317e74533da7350b43de9d3ee432ed7f1a3e55d1a25d77850e661b03267eae9d4f66a76fa839cce4c0 WHIRLPOOL 433590289b6a803502a56193a8f4e5053092cb0ebaf75672a0334225fc278335428a01d038b417f017a9c872ea47d8745a0fa16f80c3115538f9f4a91bd73b4b
 MISC ChangeLog 23375 SHA256 1ea0ea03753896a2a538542ff44fc2da59f181460151efb55d1ce44dbc9baddd SHA512 db78d2a6d30903dec5eea6dba37ec0a2b5d75195b63c3b6a8ac4e86b6d2e499539b299adfabae39f738121472f04cf4fa49e61f4748c96bbdb902227b287af9f WHIRLPOOL 1a09be0e31c84f1ccdca49017f6557a688efc5f40f0e304c242130a4b9fc976ab49062cb14bb1dba9e50ebe2bf759422600c975c8c899ab7210012393fac9e76
-MISC metadata.xml 767 SHA256 c8739a800839c735a9cc89c8f603a785aee3d240ae18112c5d504c9727860c7f SHA512 ebfe1c8fa5e5f236e6d3701a7f497a6d11b90c91bbd2c4643789697081788884a4b7922b181a17a5105d580d40fb969c8c8d150fe09ab99afc990102e9dbe49a WHIRLPOOL 80e72ee5b49e3aeac93cc80224dbae7890ae9661e1cba19705bee108035eebc6e45a7e2418162fa278921ecf90f51363d00ec02c7d23e51c1c73624603fb5dd4
+MISC metadata.xml 851 SHA256 96450f52fc2ed835466b0f5095241600b126cb91013427c5100221250fd88c72 SHA512 6dd3df645908c79b738a291dc9f9738c9e69b18d3aa471dbb3bd9b810fb8d2ef685adf127cdd813ca5f43fa098789160ac313cf3a465233946d6213485fd1c6e WHIRLPOOL b33d3c6f0611e803d8966ee673691a19bb427ef903773ecbc67bff8b6fd583dd0f5dab2fca9167bb37992029fe693bf8855076e4e18adc55b9fc42a984fdd794
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJU8cypAAoJELp701BxlEWfiM4P/1U3cT721S+5yKFNmnsUh1EJ
-jas6MX0h/ASaBDIteLD8B1GN2pxwbEintQywjo/DK+R5CRS0fdzkTADTPuNwZb3S
-hzEh5PXB5hv8tI0lPM0WLhlZAM5C9TAvH+rLLTOnXcRSQNgQE7t4KBZO+TMTHe+f
-3+FhOFIaid5ivsETGNoSUjtYt5vVRxZz7ou7GNzGfgDP4PGblMFQjKbWDWPFw23j
-cCRuXtzPbxe+fAEiClV3Qs6v5KWliKPhyX63ymHRHL1T0zt+LL5CoU9gG6xQTKXA
-jS/VNH95BZgtO6pJELHkCqIscN1yGmYp2ao8C0Xa7GMZKPWL65rItYMgLTyOwDeu
-w8zk5PkQY2T0mZ0ZE53iuSYuB7pDHLF19t4cYRDRwPeHjGZ+onKDWpXnVtcEpR0b
-Nt603Be0WsbsKaK4Eb5CU17SySmX5+EysyREoqJUrBc0jrvAH149CvgkME2iWLqZ
-kCfrB3sTTpapWM02IeH76DyE4lQTaIle6opQ4cOnmUbScTwpmg4qZG3V/sX2H31c
-ZWO0QH9+VR6MLkZhCh6v+/8rlDpQIUDYNaK2HDiAPcQcrmK5mhwYj+LGiSGQ0mcy
-NSiRzyggj5WReLKVhXD9mMWOf280Lx2eNgw+3ixBQIqheqr1BhHbU8as4Op8FQhb
-2bo1TTo6WigU6eJv9K41
-=sT+G
+iQJ8BAEBCgBmBQJVfxPQXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi/G4P/R9vvwZqPCahYqjS8SAo9L8+
+ZYQUh3StD+EExe4vaL6ps9jO7Jq9DM+Auzk6yHCIev/0AdOWHHZ0VhflDK81E7sT
+Me+0VTNh7S9WgnqCSZ2qVVFoluFeKkTbhhRwXdcE3DZdtubGBksjPa3jpw6TYgQW
+tgkl4hLc0md4mIwMFeyMKbXTRB0suhuMVzv9WtaFd2A5TbGVsVkWCOH2/TYbe8R9
+CSKBuF0xNbx5fR4gb3UThO5vDGh7Tv7FQm1YkF+JBxPzxEq3NvPayUo0ukcmIHCP
+ZWzlYItJyDdw5VGqB1/D8mY3Ir8XNJBP9Sy68tJwnWTCM2c6uejrUITLgKL8Mhkj
+TpZwr8Gi5go6P6NVq+aH+BT1DAbtLKuHx2aFZUyaB4T4l4NVGlIJB/0yCaEhdtky
+DWD7D8rVj31haTf+RzaulDt2EvoD2S5xPJ2ZfjHGdpYbWKFk9OdaQzhnqNpUJzqA
+lvKSt+V0umnuM/gRTr2pQ2hqEuiUXPRsBLtbLubncs26xrd8B7tly9BQvocuIe7Z
+kTdn2QUYqpOSlfHDaNyM2k+5HUegHfkFBoin4gk6TVJ2TGzXIEdyAXOurjzt20xH
+TtVnhjMcU61mndjQCvTsIlmSlljqZ36Rvq6IgO5Kt69uTQtLWkx6rmi3WLmMkdRv
+a0+F4d8ViDAg8X+T5Pgh
+=PiPZ
 -----END PGP SIGNATURE-----
diff --git a/net-misc/rdesktop/metadata.xml b/net-misc/rdesktop/metadata.xml
index 7203d86cbcb6..cbeac8797d75 100644
--- a/net-misc/rdesktop/metadata.xml
+++ b/net-misc/rdesktop/metadata.xml
@@ -9,7 +9,10 @@
 An open source client for Windows NT Terminal Server and Windows 2000/2003 Terminal Services, capable of natively speaking Remote Desktop Protocol (RDP) in order to present the user's NT desktop. Unlike Citrix ICA, no server extensions are required.
 </longdescription>
   <use>
-	  <flag name="kerberos">Enable CredSPP support + Kerberos authentication with <pkg>net-libs/libgssglue</pkg></flag>
-	  <flag name="pcsc-lite">Enable smartcard support with <pkg>sys-apps/pcsc-lite</pkg> driver</flag>
+    <flag name="kerberos">Enable CredSPP support + Kerberos authentication with <pkg>net-libs/libgssglue</pkg></flag>
+    <flag name="pcsc-lite">Enable smartcard support with <pkg>sys-apps/pcsc-lite</pkg> driver</flag>
   </use>
+  <upstream>
+    <remote-id type="sourceforge">rdesktop</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/net-misc/remmina/Manifest b/net-misc/remmina/Manifest
index 4862dbcae901..0f674b00e67f 100644
--- a/net-misc/remmina/Manifest
+++ b/net-misc/remmina/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX remmina-1.0.0_p20121004-avahi.patch 2446 SHA256 78cbbc86a21d4f4a0becd6a607e49bf96c10e61881059c4b3ada331b1fa49c99 SHA512 2f7494d408a94b2257d49044415041d977e24d973871d5d37a42ca117799692b6794da7e407245c5fe89372fb33e499449a81ab89b880d00d375be2eee00cd15 WHIRLPOOL 0d624b2b931b4f73b59f00c2629afac33c37b3d442321ab94cfdf2594da92593ee32e424863c485cb2129a56828911cb516167656fcd6d0692aa250c161e62ab
 AUX remmina-external_tools.patch 307 SHA256 20586020f951cf861397a82305cbe0bea373220e19c6ca0c43f18fdab253163f SHA512 89d1d952d253518b0ca3a0b0debb750c458eacf104ea38a91824fa68fb07d1d67a8a212e23d47e18d26a3a1939abe0f95beecb524c8e35fc63dc5dcc869e5bd6 WHIRLPOOL f8d6246453114d05ca7909415da4d999a79cae73ed9124688efcf57819cc78161fa14263474ec0e40ff78e290b125ef5d50673235a1bd7294223ef83dad3dd0f
@@ -13,21 +13,23 @@ EBUILD remmina-1.1.2.ebuild 2146 SHA256 dd2fe1a1a70dd69e3661e9c148ec2f923df74fa2
 EBUILD remmina-1.2.0_rc3.ebuild 2178 SHA256 b25b83745204ab8be25a4b0ede8cf9fcbea2e77de63a21543b29b6691b5601be SHA512 8675558192b057ddb696eb02d41bbf2d5e1fa6306793abd639a7450c3fabbd5c143a59943b67c74c08f202244366bf02f4da4363b1c893bdee30983146fb5216 WHIRLPOOL 9a8aecb147e70ce5aaf09a9d30642c89898ed4ff46cc340bf86c9a963c9b95366a8d3487d292bea42b95cd3ccd851c5848102c0b36f01836ed4a3c6b121ab660
 EBUILD remmina-9999.ebuild 2106 SHA256 6c7c806dab611b4251692efc10ab4913d2dfaa1b4fd8a0282cf46e4ce02a9508 SHA512 fe71694d502651deb8ed3116211189a40521b0c3e2010c00dcee9d0ac8a4fa290a657df587e11afc31384f845a3bb10bdb06ea90f5a5a788e51132f0c9bbdbab WHIRLPOOL a86aa4a5c596c2f5e52d8cd365fc6d4ecb5da3cb8a1dd6a14f9866d4fc1969f7ebd4dc4c31ab5389be634be0de90de0a4992bae2b1a8a2821de6896997d09e81
 MISC ChangeLog 9985 SHA256 eab7fd33caffb1587ad50d8e4b5045d3ae8838d43c3bcab12d6a501889ae878b SHA512 9f8975961cbcf0d454e866619682c5443921db015ad5df0869666c379a558f4e241555a4d75be93fcaaad9e7a9c27cca833db4e870640e84d466d7fc7ff52776 WHIRLPOOL 2b8d6b906e127ebe13bbd3c308a0704d96ea3cc481ccab62366565656a4c434171daddb85a18e0e38abdebc311a327d2374123cda2ed8456a1a3514facca5552
-MISC metadata.xml 541 SHA256 470b3760f3377d6d98ea0fad762c8754c12a997e54fcab30ddfadf30fd6ef5e4 SHA512 c15ed6f1d21c253fc0d6ec20721e24d7e92cd3ce7f7ddcd9349495d28da788aa1adf7f6b696eff6698054f34a05baf66b09b80fc49764de73e25e97d7d5c2ebf WHIRLPOOL fba96dad2aeb7f21c5e2e4807e8836b54d7acaece3e0e92b0b01bc6956a9a2249577f96f2ee5a3fbb57800a335f04d3f944a8b8e1cca94f479f6772a3490c689
+MISC metadata.xml 621 SHA256 54fa871df39a68011093e34cc1fb3b447b825a5873d54c4a020db8325db0af02 SHA512 73fcac2a2f8a798ae3d1ad2d4ecf9d3fa8aa098fedd29e41e7e8564fd161104af84be9a14c51108726ba0698515947e9f07fecbd3569e5899015f36ba1f05f38 WHIRLPOOL 318fa441e82cc8269b571083f62055eca10f438e1fc9c17c5ac0b0c0ea41e26779875ca4bcc81d36b7660acc47cad201b79adf6383bc8c0bbfda34da592dcd2d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJVUbyqAAoJELp701BxlEWfPq0P/ApU5wonKBlvOMzhC+BWEeBv
-LDoPtulqK4+BMINEMV9IQ4QYfTYbyq+NOno75peQAtW8n/qhk4Y5V8kInfOuPBEf
-LTh+D4oFP7Sy29UkWsLGma97YlGkmLQFSxlpGaivelL8uIb76cRxNUA2y6cxPIKW
-2drePn+WwRV5piyR92+IxM1gV1S+FSJaMY6upoHakq2T2waz74MQBb94p7w/oaxz
-/K/uLUsJEC3SfCNBNZsU6J3wrnTYGu+ppdAgUaSnv7uvw1vwYuUgh7ml8/gBSHyW
-TETJA2bE7Qg+YbFzyaAeD4Z3DmBSww0mUZl62ol4CV7PuiU2S6OQNs/WBsWgYFbK
-4073R17l+IB6xl+ipxr4qbiRMkFv8jGCpi24u/m42Awb/QovuRdDoiWdg2JrSvjK
-rOw0waRHXdxERJBoY+2jN5Q7DJsqohLQpiSW9GoZi0k1a8bnCfe3wF3S7zqnZ9Me
-KAf+RNzqKUEnKhilxjuYv5SqzednEpqJ36dD+d4ZqdAFETXFDJcHxyyWtwdkKKJT
-w1KAuiBMNe2306WfwkKXQ4I/Y1H4OzGe5AjBvJfYoGPzsQbM64ZQQMPR7wHC2Ggw
-GYTuEqxT+kM1Do14mMtIouSQFHN6CkrbEDcsHT56OuAPs2f5DPGZ+JqV00llmKIl
-reL0z0yd2AiLdOunMUqk
-=69mG
+iQJ8BAEBCgBmBQJVfxPcXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiEV8P/1bq3LWTnESHpwXb4tNN8tTk
+lb3atbcJoHB9uh2UGGnLiVNOe5ZIEeKoXM3rJWPqaPokLmRLYl/EPVSmh9XE2LRJ
+zPs4D0RK2vtQ5AvPvgCyDgjrsDTn63jhWgXPnbxLWrL5vRUvs4/REXAxksR4YTzL
+0EU+8XA65vMNY9k8Wj5vEVxHRS47Z1D9vU6wSRhtFKzVImXIkZidW4ajeTk+a+iN
+73I7+Z1dQdj6iC0oD0kYlS4eyvlhPN99tUTcdIBVdfX3P+2IrTf/NHU9JduLOZ2z
+JpFII02SEGoLSv6SpjNEXu9AMmrz3gDgdmUQ03zgbB6twI3MdIa6y8dMOE4ZqQcV
+lIbx7UM/RA+QoR/1ck0o9mUlaE3PyO31x6BsJ5oDrayvtzspkON2E1/vf0sf7vB2
+9EFYg4hPPuxMwfRfA+60gACNELsCjMAS/jUXZOSmFZVVF2p4BLjrdj4lhDsRqxIN
+rBwS3axlKdwgNdbFtc5c9VbqAxaTeD6F9+zv7uoTNv08Ee45A1XMoT9iDX9EzNbL
+xcayR4geBehU6Yv+gpw9DXsvUvEovbeXXZcWD8p8xSyxck2wk/EKAk6fQRc7DZwg
+MOhnwVePQ4VAtu7CfZ9LcOeGpZb14SQsrMqADLO69vCqcjmzM0fTOhMrYup11XNr
+5rQrOHFaA8/ueC+edPfU
+=QGvj
 -----END PGP SIGNATURE-----
diff --git a/net-misc/remmina/metadata.xml b/net-misc/remmina/metadata.xml
index 1b2d5e7acb9e..d332d42c9d18 100644
--- a/net-misc/remmina/metadata.xml
+++ b/net-misc/remmina/metadata.xml
@@ -11,4 +11,7 @@
 		<flag name="telepathy">Enable telepathy support</flag>
 		<flag name="vte">Enable virtual terminal support (for SSH sessions)</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">FreeRDP/Remmina</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/s3cmd/Manifest b/net-misc/s3cmd/Manifest
index 454388cab833..84f1baef92cc 100644
--- a/net-misc/s3cmd/Manifest
+++ b/net-misc/s3cmd/Manifest
@@ -1,16 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST s3cmd-1.0.1.tar.gz 57594 SHA256 d76826ea9c5a4789044424f1a50abe83523ba5d12a9185c7a6b7f4c86984bdce SHA512 daddb6c49a22cb2c9196d69116abddc639ab117b8a21413068e33e76f67dff5a21d6dca9a9d385113651fa996ace2359684709b2a3be33f4404ad79ed3d44814 WHIRLPOOL d151d9581359fd8dcc23550bc45fc972ab349153e7488d8d9e28c18857e5d550e834ae16274029797a4d2a096aa988e780ad82756f4f1b2a936002667ac96186
 DIST s3cmd-1.5.2.tar.gz 94760 SHA256 ff8a6764e8bdd7ed48a93e51b08222bea33469d248a90b8d25315b023717b42d SHA512 6493d1c2739c79611ab986882842c4c161a466fdd91a6d48b68ddfa14d7743a9b5dde77902efae336bd632827497ab83962d5835c89135e8f9109d45e14b1e9a WHIRLPOOL ec5fec5e803a87b75689f4bba3f5913c8854d6035b34f5267e4da80a47c86925fdcd053eab24f4bf35b8b1ee2bccd41f7882b6c9fb3b6fdb0257c5ca492dc805
 EBUILD s3cmd-1.0.1.ebuild 721 SHA256 7f9def16544ec17e9799b8741dc5cfec073e5db51c0084c70dee81c67f8bc014 SHA512 46136a2c1d2f90773f6ececda5c988f94b23d036ca23e76623d783331d6e9c11f58351994a481fa2dffdd6c87976f711a110e548320dc38667ea2527932b40b5 WHIRLPOOL 5d12e2126c3011c1f577e2baaedc29165eb9307149d27273f6d3b80e8c30b863c478541b6ccbca7ae181230b5a479d9ae845533b42db1837f23c0756a0b053b1
 EBUILD s3cmd-1.5.2-r1.ebuild 833 SHA256 7fe320c0887a2dbcaf1d0dfdd44e46f513f0da45e29de49f62e25b3da358b310 SHA512 eb06d619235ef1a7f6a9bee234e45a6718891744e9b2d5375ee362643aed0886e919c22ca5451cb09e43b377f17340f3fbd7643dbe8cefeaf8e5380a8dd844a0 WHIRLPOOL 8bf96f2576eb6fcfbf58a2080d2cc1c64395f5a44f12ddf53dbdd0966c4c43bad02c9ec1cf5212d6e46e90dbb89dcf533ce402a4fd73261c326ee42ef4e9b8c4
 MISC ChangeLog 4059 SHA256 22ee1dbb547cdac78298502de7c2b48a44f06ac03e7472a67503176dd1f728c1 SHA512 5fb57277a2e31151b0a983d76a00625e85165f56ea304ea4cca2881fbadd4246e45322eced685ef1895d9d7cb19483e1f16425e15ef0b264891ab1d02ebe52e8 WHIRLPOOL d0752f160728e7745b64b6cffa3a6bd79e822dca34b889b085d938fba154e5a1e540952405c25d75494830fe1114075a9df0ab570317da948bb6b5573f357d33
-MISC metadata.xml 515 SHA256 7b58077daabe00c6230da6759ffa7e6605402ed6d4b6cca6caefbda86c16ce2a SHA512 92f91cae1f8ac2f97d86bdd21e843639b2ba1702ef95c05ffe904f8ba70c94cb0ad91d560a84357be00cde716f3d7cb635b7413f7dd3b1b1a8bb5ffd1239e40f WHIRLPOOL 2883449a979cbe7f6653508bb0693cddcc8df6f028ad32a6c8bb0afad9b8648753dae8f23d2c2a986c5522a48a2c4c1a7e1b2baf072e34aeb0325081b4237b9c
+MISC metadata.xml 596 SHA256 61fa8c7942cbd492b16a513d8a30e6f1d4f3638a53794fbfabaf9f1057a20d42 SHA512 2c8038291a1d1fca5c93916e8bac3dd521046ec0cb5b9f2481792157012a5c62468b5e1f17b8775998695b2969f17849e8bb83cb9c9c84724fcb1ad2dc0f527e WHIRLPOOL 18e21079a2cc4775c762120c5c07f180690e8d4f757a43dc29bd78aa89c95390f084f5e619b7566179de028a70da3800722cc89fa0889c85fc00914e700c7aec
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlUZ/ccACgkQso7CE7gHKw0sqgCglpfkzmA4V8qnrUb0j/R9KRjw
-EwUAniJsDVQIF8QihUahxOLiP4kMAPCf
-=DOOz
+iQJ8BAEBCgBmBQJVfxPmXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiz2EP/iR1rMswaixr0mZJVRKt3Fsa
+H7NzWqwmIT0AJuQ1lDVQ1hLfiCBZNLCkb6ekSoSo0b5hHT2TuS5Gr8xqodzSJwxc
+oiDc3QwJAymk6nxchNk+HbYjzHY0FO0mcqj/DuFgmKHfgxpxjfbhDSMftoI8Gv46
+A2OVg8tGNEPQAQSC3eaokezY0VVGjGgcMcPws2UHlQ47SZJh6jnPrDCteZ2EUt6g
+a834Fodq6Exs89LtHCE7nzd93i3/r1nQeJTYaNXsIHmgxBAk7tiCoje0nisSrny5
+wLZumPidzWK5Jc8wI+I76hgfQdYBErhC+v4Ls+4MaBxRLgAaZYyI2bnFbgSGnFAd
+J0zaZBpAiisQznwRvPIGam82/kHAZG1uj/rP5AanB9C9g1H1+4CJOj9p6c7PvCEw
+uVFdg86IuR5qItPXSTirJ4HrkpY0R/Lz6tk0OgnH+fq84VB4HxdYvhxe6pSV5sKD
+A1XXAK7M7qWeE4S/Rb0H4Wka1t/nEeEGzjrRlF43S6WFiEFnK+CBVxPcVD7CH22P
+D7Re0oBrMbNmtASFdbpaxLJZWFvRcczDRqVtuQBkLJyt4AXngQj6ClRvDP9V/Egh
+SK8kjXjEQyewEvSWeD0WWm0oQ6vJENjY6xYeO5NDP9f89sdnyI4K+fQeWfal7LEw
+Sbyuo795yQyqdbLj7E71
+=bKAU
 -----END PGP SIGNATURE-----
diff --git a/net-misc/s3cmd/metadata.xml b/net-misc/s3cmd/metadata.xml
index 0e6ffe277a1e..06966dc83fc3 100644
--- a/net-misc/s3cmd/metadata.xml
+++ b/net-misc/s3cmd/metadata.xml
@@ -14,4 +14,7 @@
   <longdescription>
     Command line client for Amazon S3.
   </longdescription>
+  <upstream>
+    <remote-id type="sourceforge">s3tools</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/net-misc/scponly/Manifest b/net-misc/scponly/Manifest
index bf84dcb7d2e0..ed5525366155 100644
--- a/net-misc/scponly/Manifest
+++ b/net-misc/scponly/Manifest
@@ -1,6 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX scponly-4.8-gcc4.4.0.patch 571 SHA256 bf89c4b56552654140c93b5cf3090370c24ee20e5870f0cf0df76218e52e15b2 SHA512 2e215ab2c39bb0550345725d3d509354be88144000072e5e14eda9f0ecb1bcc4c418e76d9db85ef6d6568962efc4472fe28d855e15adfe2bc5ba78c69d293a12 WHIRLPOOL 9853aa544070fae241e48da11821adccfb87d7229330dd01d72ccc097ae2f9bc57385d1d1739c8e9f2c5e4fbdcd7820ebdf8a18a74129ca4a57a067ff4956dbd
 AUX scponly-4.8-rsync.patch 7838 SHA256 bfab1408ad8cfdfd8fc7f9b583c57a5c6b73be36cb3955db46e4c892acd7e55e SHA512 37885c9b46422ac034182f9c9f230b4e806ce8c894ebb6c621f0e2b3d5f46c91db902c2dae6aefe5471907025d400320e4eff37cc7c5cc4c6f7d8c88a38e53f8 WHIRLPOOL b5114140169e4937f45b52b34db8de37aa03685a1810b47fcc1f7f20136f500551e2673ac8396d6c059b78b47028730f901cee208500939454e3333eb2fe5eba
 DIST scponly-4.8.tgz 101687 SHA256 1693dd678355749c5d9e48ecdd4628dbfe71d82955afde950ee8d88b5adc01cf SHA512 134c008a7377cef7b8e0be483df8413e162a515967147f561d23b72bdef3dfbe70a8313811dfff6372b88f15c1ac8a4385831fcf329261276993c64d5040f29b WHIRLPOOL 31ed4fda62484dbaa6eb678635a916db3e191ab98bb7ed0e7f6e794ef7d0dac0251e51bf7e627d48c00b17d550ce6dc0ed196fdfa3c2379ca7feec5544b200ba
 EBUILD scponly-4.8-r5.ebuild 6965 SHA256 23f772635bb392e769eaf2b19475502bcc1e1e0fdcfd85e29c5a17c97a7bf1f4 SHA512 525127036933b364e471ee72d0c24faa304f5daa9c7014d114ed12d466b6bc84bdbb61f907e6ce82714a2b74dd428fc6e0fdef89136a65dfc58617c1b2d2f22b WHIRLPOOL 23f4d5112f195a4bbd71032c912c2f7da7f2711242753e7e598749e9f1902f40005a056b6915f293fdbe4caadc2a2d394942f9c99e18a852e7ece95ff025b6db
 MISC ChangeLog 8674 SHA256 2ed92598aa1083b9cf7a1efae52ac5fd6489230e2b6dde7ca5278c0644fd827e SHA512 2f111af972a3b390ed4c5756984d1017db5a171e49d24d3a35559fe7a9fae6839c612d7cc128de8187da71c7c66c0f4e239803917a17aef319364c448de31ed2 WHIRLPOOL 287f7ba8e861194bc0e2b8c91ebc6f070916e0a39e210bf5d662c08d8aac639a201c65d0a914466597b40a35b76cec2a5d0aece84f7baa51189906c754f0594b
-MISC metadata.xml 1412 SHA256 c252f2a7e0b4bc1ffd8eae587ecdc6e049afef2d8e5908f396d0c1af17a3e38e SHA512 4e480de498e90bc616f88b5a9323c619b08cbc9b3e3d42f6b6984cd9a1ee6c2f2792eb3aa943e1f35dd901c0a3d5019e132f1171a00ec22013e64fb24a58779f WHIRLPOOL 02d7339c15e4b70e20eae52d785de0592305847d496fc9e87fbf4bc626d9ff2c8b6445ddeb0894eafb6b5b8534439a166c3655fa1975876b4885b4ffd63bd8e5
+MISC metadata.xml 1490 SHA256 cf07dbb75ac054083d19b79b0e6ed481b4b18b6b552ac4152d185ab8dce0fbc6 SHA512 41b30f281e879efb58e04d03cd70f6fc063006ec07f21f96d28b639ada2f7f63183b23453fe16e229d7753747b751f666103fdb73d736fc79b55bfa397da2caa WHIRLPOOL b810257101c476b9e7bb8ad7870006efa7444247f3ce1b9ef4f7eda868a178d054a8999f3a2fa1000faa045e917f32f4c4bbfeed91a512e65e8ff30fd4d219e8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVfxPxXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiAVgP/ideLKZJHoP7Bbc7Fb/9D3eT
+SmxNun4M+GuWyICTNRvdV5RLshp0jSg9Vi0LGyCS76LnMjXoGsX5RzbGRRhfxTmT
+RkXrE3RpLwVlY8Bnj+3oKgGMvkN4srTH+qYhDDD5TYkrIc9wzbDTrs5oGlos5x8c
+b7IY+tsVnrmPEqKlNOP1cKeovy1u0QoBnUb1B24/Fu0M9I7AbWAca8jiNxvGpYZV
+oUauAmcCcTYNj+MA/vjTSYPpg/ojD94vjLFNqspuwpWvCHkhOAJ0Ax9iP1Lm9sLi
+VQ4bOar2z18AxvPhSDYPd1c6qX8Jo4EpAIL4rosZGXh2vNCJYsGIm8RUMTPqr6GM
+GKZp8JU2yx7CtSzK1OB6RJm9IkbRu8DW7oa3B01bpRJlwC9Q1oN35KDUGD7fnjTc
+Wd62qK7R9a7Cr0n0XG/i0nkMxBS7QNt0w7OmiW7/NAQBslDahweb2f34TBzoZrYR
+0Db6O1Ljd4VJsy5hI44nbVaE3K+qyPdunx5Oik//zrY7A7gY0hESP1xCOIWJsHNd
+XubhFrS1mtCvVHg8MVRpv4kx1F8uYtYqM4A5qkb/Ozs7UZkWRJ06TZOBLXiEv8+5
+FvVGVX578wpHaqnltf99BE7gZNA5amvILvT0YJqUCtZDRmcMgZAcv5LqyIdbJyX3
+Kz4nUp6vqfNhiFmZeoW8
+=XE47
+-----END PGP SIGNATURE-----
diff --git a/net-misc/scponly/metadata.xml b/net-misc/scponly/metadata.xml
index 85b6693366d5..0237ba9cc5f0 100644
--- a/net-misc/scponly/metadata.xml
+++ b/net-misc/scponly/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
-	<email>maintainer-needed@gentoo.org</email>
+		<email>maintainer-needed@gentoo.org</email>
 	</maintainer>
 	<longdescription lang="en">
 		scponly is an alternative 'shell' (of sorts) for system administrators
@@ -24,4 +24,7 @@
 		<flag name="logging">Enables SFTP logging compatibility</flag>
 		<flag name="wildcards">Enables wildcard processing with potential security risks</flag>
 	</use>
+	<upstream>
+		<remote-id type="sourceforge">scponly</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/secpanel/Manifest b/net-misc/secpanel/Manifest
index 9616138d4a10..e1dcc3701168 100644
--- a/net-misc/secpanel/Manifest
+++ b/net-misc/secpanel/Manifest
@@ -1,16 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
-DIST secpanel-0.6.1.tgz 51417 RMD160 eb5c05031b5c9c4e90201987bbdff2ac2a890c76 SHA1 77a9f65e1370b937045eb600bb2a2ff9b50f5605 SHA256 d70a0e7fe3f0d64b4fd6e9d9bd726999e72b367705e28a2980d94a5d45e1bbb7
-EBUILD secpanel-0.6.1.ebuild 1389 RMD160 ab22b103408275ef8be59bec19a5b4d784bfc8b2 SHA1 8ef1a944b1ff150dc658c7b43c5ebe73d887c109 SHA256 b07c9844eac9cfc85dfa3385cfc598766416017fe273e06c3501c2df39da9271
-MISC ChangeLog 2850 RMD160 c1ac814031087c3a20c666b799271cd8028a380a SHA1 de42db9bb161e435d10f47d559eb248217342b86 SHA256 2e6b688add58560fc2ae3894dbc12be8b93c8694dc9de80f1a718d068040f54f
-MISC metadata.xml 407 RMD160 d7bb38f4818975df5cd45fac60dcdd9260c074ca SHA1 d9f4f0a21c7df6eacd138f1e15bfe353f9321be7 SHA256 883b7ad1f4b799624617057f3050449fb8613863fbf54fde1d83e7d1c8cdb2ec
+DIST secpanel-0.6.1.tgz 51417 SHA256 d70a0e7fe3f0d64b4fd6e9d9bd726999e72b367705e28a2980d94a5d45e1bbb7
+EBUILD secpanel-0.6.1.ebuild 1389 SHA256 b07c9844eac9cfc85dfa3385cfc598766416017fe273e06c3501c2df39da9271 SHA512 6f42ea9b1114d33f1e73be6d29968f3d3f06b75530377370eec5f8c1f454c1933eb85c213101e67cbfaa523f9f5d831581b4274a4857e5d1ab256481123f6e15 WHIRLPOOL 19737f5e51db84ae29e88887a0dbfbe3701b3db88b11267ce7a3e9f493214f5f26c1da0b7e62b34cf91e702bedbe4b65762c3bcdefb542fc5dcb7de3adc5375c
+MISC ChangeLog 2850 SHA256 2e6b688add58560fc2ae3894dbc12be8b93c8694dc9de80f1a718d068040f54f SHA512 db8ada60563ea3f72691de158cab45502a92df769ab584e96fc7e0fd5f86ee6e50d26a77d7783146a9907ff0c66612ccc974db7ca7ba999eecb5cfa21a4d72da WHIRLPOOL eb790218820b0b0d74688c175db126dac141c9b4fd17420d2214af5b99dabab3aa2db7439e35df3bfc856f980934898423842a136ea14d4148541521652abd6f
+MISC metadata.xml 485 SHA256 daa5960fe0f1d7d8b461e3fac3102a201485439b61e961d8f573ea063dbd049e SHA512 3b68c5a4d7b419aac35808e937d77840098a95864493f3793e19de36c6504c590b3a408825cfc4a06910d2da86ec88b6da312e983db7aea56b2a522a32e314e3 WHIRLPOOL 79e63f6cc7223e443c407115475490a032c99127fef41455bcc22caa651fc7c8a010198140d2ada48dd19577f160ba97520812a018d6bdd1bb9cf28747497d5b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0
 
-iJwEAQEIAAYFAk59rRsACgkQfXuS5UK5QB2PcwP8CAdf/b8XE20mFCCwe2i+brYW
-pipMt2tTgL8yOnw+V6TUbGurR3H02XToaBDY0FEwLgbndij4U+wR1qQdHFtlRenK
-JNhNM9HzdaQI/ikH4aL21RM82s4u3FKzOUavlX9KEk/sL3jMGvJd8dk9EGGDhFkA
-VAxjJTarQfEyxrRiyxc=
-=EOMl
+iQJ8BAEBCgBmBQJVfxP7XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmidQIP/AtHcUVnTi7bUKz5K3mFSTM3
++625f1VBxi9unaRxPvMNyDQrsihZoXjjzgQZgCRWnZdRVjMq8TzKYrzKkIZXpR8i
+PmF/8qbGTlAdm58qo2I+uoMrg/C4H7ddkaTnGkWmgJVqIxqnpcyzhwK6U2y5LTWP
+2igv5EFnhrfwnGbQ4q4iyte6mb3jMGF/uLN6/tbTub5iDC/w1iKpR9i5yYYoDrJ+
+BiKt7lpQXKcwArwzf0nz7MpbaEusovw1tTsBSyp67HyaWyHDoFIVdZ8ptdWsde9r
+e7ytA4Plrbez3soILh1MPmywOo/am6XTJTSzZIIGdgpIATa5Yei8DsjXxBnetxzH
+TjThFwFt8yLPuHVYLf0cFuyNaf1EqKB+jNMap9shk6rBd7SrWnon421glVWsGbnz
+M3hPqHzU/pXizK0BbLQky44uH4cNkjnVObFtM3blao+3mJK5rIl43NWNcELJeCh2
+UDh1fzF2e6d01Dkpu3/bkESlBDVjNMqKyF14O+Erhpb8IpkIHIPAOT6ExExltx8K
+RGeT6dPoNySQ4wid1ZpFB8nBAZbphdqqdIUzwOTGpDXPmabTK6Dv0WG9PYX7SkJ8
+clC/otTtK4qAFiDA6WsGJiB8YO0efHcHmUqCZ9+RIJeks0LJn7MPjrzjYV3Z+SRQ
+1MvO4cIZQwAl+Z07yQb9
+=zzRi
 -----END PGP SIGNATURE-----
diff --git a/net-misc/secpanel/metadata.xml b/net-misc/secpanel/metadata.xml
index a50a8abf3dd9..5506ac77eb9a 100644
--- a/net-misc/secpanel/metadata.xml
+++ b/net-misc/secpanel/metadata.xml
@@ -9,4 +9,7 @@
 		SecPanel serves as a graphical user interface for managing and running
 		SSH (Secure Shell) and SCP (Secure Copy) connections.
 	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">secpanel</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/selfdhcp/Manifest b/net-misc/selfdhcp/Manifest
index be73b1efd3e6..2e735140dbec 100644
--- a/net-misc/selfdhcp/Manifest
+++ b/net-misc/selfdhcp/Manifest
@@ -1,27 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX selfdhcp-0.2a-buffer-overflow.patch 576 SHA256 6c05dec7fb57efeea0cfe3fe7eb7605dd9914fa3dc23fb9065875e7e4eaa613d SHA512 c0e6315d316d4cfca150c31edc7bfa613b0089580bba5ae67c3023b501558b943b68cccb24e95aece9b6b2fe26b4c63bcce75d9e743fc19f5c90b2fade7004b4 WHIRLPOOL f2cda1ca26f5d5cb2da84b6637387f8e5200672e7008b7ca609fe845c7e88f9663e89364abb540ea7f8a409229e36d2a930b5dc6b90ec821678985973260d6ef
 DIST selfdhcp-0.2a.tar.bz2 162803 SHA256 b60d37b288eee05dcaf6b14b1bba184726ec2e3af6dddfdad78f0627878ec8b6 SHA512 3ffb8a6115502c201b37a6c4179f498d4847d469f5d271dd9408d7fe5714d1ebe10428c890d8ab943a6753f3fbc650730139a78b1f71c9972739ea4b886a53bf WHIRLPOOL 830e040d3fb7c0650ed1052cb768e243b7568489f312941fb28fb743f0fbac134b003e83c10358d88202e48deb4b8a318f3efa2442575c8951640491b1164bb6
 EBUILD selfdhcp-0.2a-r1.ebuild 767 SHA256 63977350cdbd0a878691cb943cbf3627e3c5def3c0ff651f69e993edabc45be5 SHA512 d5bc1e2831c2fff0b14759ee8331a372a184843a84c9b10ea557169210c84972e143f3ec16041172c5cc3b8f9d70df1860ea6fc2264f8150294efd47eb01ca41 WHIRLPOOL d804baa9b4d032d18b3af3951964bfbe2de9f36083d28802296fb14b64b576980335308da8f0155ca227b71e7437cb703f4e6cd1f148884dcc88513b8b3c321c
 MISC ChangeLog 1628 SHA256 083e84172498b710022369f12b5e5f8120e173b39dfde6371f0748956c0c398c SHA512 6ab0259dd209acef6cb3d37a51b39ec2b02a12abbdc1dedd8854fc87e37546c3e4ab8b891b7683c3f0f0655bbbba004adda535923bf334c74325ab12670244d0 WHIRLPOOL fc1ceb7d14ac59e7f62af03c8aec79d56f027333c1e4fd968a4e3d3c21accf32aab7f0ef69a6df89fc4970e827d2e70bcc5431e319d951262a4807ca63fa53aa
-MISC metadata.xml 292 SHA256 ed31222caf411bbd2101fd43f6b711048213b7ecf27ce7f1643eff0f0ed5f2b3 SHA512 0ec4134c0758cff77acbf2579a2643ec60918c78442908c6d9fb905aca1ab933dba831c863409d34b535f7f8f20cbd4faaa5f9e9914995814d5192333eaf7497 WHIRLPOOL 5520ce6a1c103e5a91a62a5c3a38a9b2dbae12991be718f2104e7fae4f0122e9a6bee61edb5b9818c0234b908de9481316b0596b9084cd54c2d36774541dcf11
+MISC metadata.xml 370 SHA256 cfff29790adec768c05d5c44fd70265a0294f5d306f67b9a02ec5a3e8e02247e SHA512 9f17463db4fbbdde7748986e90fa98d35fc5e9d7ed20e60395ff4c5701fbdd03f7144477f788b5bf2366998bd38b6a5e70fc73803b4214f8aa81ab6d881044f7 WHIRLPOOL 36749d6c0a27f17a262dad5d17b5fee54acc4fa17a433c890bfbad6899352bc0bc898180b920044825d85a5aab6e0d75742275ad6e363c625d144ea8e58e8a58
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJUAcWDXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOoFgQANxhivJmd2xqGWstnEZ5+8aL
-wfcQ+Lya9VZUczI2/68mZYhoRSSe+2YGo8pz5Z2sZ3A09I8eMGSJ1mKcTM1ybG3V
-tgNoVQKmn64oxYoY3WNx1wE0qhaKcmcn2pic/X59ZpYnBVcDZDaRnnEnqBUZdTwp
-tb7TDY5n0yb3z0A3HqI4N2NpxnmvTuMHCPVTijKdIN5ptTgicDWaIbIT9mr0K6ID
-GLZcLdZh4Q/uYncsaWgnPiqvHnO3VMgwTn1AVhFWfwZNElLCVM1gsG25G+xaQBos
-Hhcv4s99BdeaugfR50Imt5AgDfbjm0Lmg7NXr8eCGdEvZzc53LM8GeW3gt8y2eFL
-eVpoHqx5ZTU/2xuV3rXaP7Ms0SjF9Sascx5b1QYVMO26lTeHhlejy2GCnCST/0DR
-Q0AnP049v990fmjgbAEYZdDP1JXopSBkL6EwXd5b9hPVo7PYCOg7CViNqG/suOcK
-r6oP1VroFFsTSybRBlzxPRi/CcyEoHbG737QYgcFcDrEBkNxXvnu4tb3bBCO77hT
-2hoVc9uDba/VIjChx9uTRKb1E6XRt5b75DglE+I1G2t85aATgXr72aH6qioGtZ5h
-J0pH+TIJsgDJROmnHtixJgbWwfjMQDvgv5KhX/JFy1YTXxs/kBlhkYzxVoE5eUBU
-p4ObZzOXuP5Dxw4T40Mw
-=JN+4
+iQJ8BAEBCgBmBQJVfxQFXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmipGIQAJ9yL/+FgSx2SL5H1SZMHLgR
+7CQnOk9KTt1XM0i7kTdPPw7n/8iU6yT8s2A10Ts0E6LrEXLk0XalAe2XXtXt++fl
+xIor+rFPVPsR6CvLlgrWybIZhYCobiVKwJ5hyk5ovC1NnhXRfEAA8PExtP/qLri+
+0CZbVv6dO0L5fdZ6wz6XIuBCUjiZMTsBHSwgsN3++xbtahkOgKPfGZrAnZLhL8nL
+3kLVIxNAbuEndnPhzVwX71f0uOyMIw+UhPcCWNwj06/CdZ4ZEe7pqhJ9PUu/hygG
+5kYuwXKdirrYunE1KPOnfwC6spS+6EpcTrcg7Bb0fbhnn8wHZXsCWt1C7wMLu2F7
+GTN/gc60RT2vTeziZe8jffx1WX8t2QzW4jwt3LhsGfdzij4yZbyhYnS8PW/XMNih
+kew/aOb51DmVnruGuuwthLCWrYom/vFI7J7aKazFePhC7algNvtfFMRxaXg9gJZl
+yhf9AwK6Ti/N3nCazv8h/C1eWyB+cEpYxd2Kr4D9szIVAisIMBkj9K/x1qlR8T0I
+Ras0cQ19Fg+kRXoXCm76utLfDp0+4fBD3N9Ki22DTzkpXYbiMafjJyJIdwYIdLwX
+4vSHFxJbs1dQx5XeNMWMZOKnpSSNVILngmV1rmgLRJVhsQ8ckmgxpvW1a8zajGum
+HypAVuL8IPrMD1Z34YV7
+=RqxG
 -----END PGP SIGNATURE-----
diff --git a/net-misc/selfdhcp/metadata.xml b/net-misc/selfdhcp/metadata.xml
index f9d50da18d39..e36ea64d1158 100644
--- a/net-misc/selfdhcp/metadata.xml
+++ b/net-misc/selfdhcp/metadata.xml
@@ -5,4 +5,7 @@
 		<email>maintainer-needed@gentoo.org</email>
 		<description>This package lacks a primary herd or maintainer.</description>
 	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">selfdhcp</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/ser2net/Manifest b/net-misc/ser2net/Manifest
index f8b7b6fbc70c..a6c562033b3c 100644
--- a/net-misc/ser2net/Manifest
+++ b/net-misc/ser2net/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX ser2net-2.7-b230400.diff 754 SHA256 14fe4d7817f3c202317a401f69141dff3f4d1c4eb13a8b357bff685b94b17b38 SHA512 47f369b23c6f75421ed143abb75a0d9b46e7ca1ee2c59f17e6d75f98bb61d9fdf4e0792367e732ad60fb0f6804af6f316b291d7743d7807df8192bbdef3363ca WHIRLPOOL 1269a8aaf4fd521293689023ce0c3ba3fc0f497e06110d097a3d64225c73226e97c71be83f6aa95aa84247c65242efbd0034f18e1e3b4e28623c6543ed8287ea
 AUX ser2net.confd 879 SHA256 3058368970e77b8b7fcf6fca9f3530b683d9e9c27c431531f8566dde01dab849 SHA512 15054f7aa604f93bd5a54c2bb96c9a3168905be5ace50bcd2ebeeaf9dc9ae19426388e6118e9e4850125349090ee29542c24487e64c349593a76366be4a5e501 WHIRLPOOL addb450a10b026ef4003ee05a7b1c4dba7c294750d6daefd885d537636d31352d529f73df6cac7693ba940b41fc6294bad0f92cf30bf8265450494c4ed2bbcd4
@@ -11,11 +11,23 @@ EBUILD ser2net-2.10.0.ebuild 740 SHA256 14d3a333c6df5496178bc455ea8f3558a4ae59d1
 EBUILD ser2net-2.7-r1.ebuild 963 SHA256 6ba27e6affddc6e481402b32b1a9d5b742c32881b942ee65ecd5f30be27d8998 SHA512 0ef7c6b46fc168100fc5089f4cce8652edd17e789ef1c69af09d924345e23a84965c68a267b94672a0b4ad370a1508929370e9f2639662c1c6692f40ded25759 WHIRLPOOL 4425afe872ac0752248a4522a2aa423de868d6051cad37a18562deedb578877936e44717164ab4513adb42a045d2d1f1f1a6c40fab83fcb1f6645b342026c60c
 EBUILD ser2net-2.9.1.ebuild 736 SHA256 a78793579c16f3cfde4ee2aae2884aefe79f67862eeafc80ad2943c737ad7dd3 SHA512 8a43df01a95d6f73447d03bfd328c53f30629813574170280ab0c4170038c9c00771fa191760e0e4a9ef758d742742e05e43c04ebe88f13defa406eacda2af3f WHIRLPOOL ff3b6e2666dee27c5fceabd8ebf8bd28c73eadb8860f9113fe35feca1d83712a65f1bd6a845e13911b9f6b850d13ce070b0b6739b7fa35cc9754c02b51e693f7
 MISC ChangeLog 5280 SHA256 b327b46f50639920cf1cd7c65a988ca4504d6c149765716fa2242416c0ddde20 SHA512 acd2e9673d6e9c9e01a9d901c13249db7342d2df51e9ab64b15cbeee622f1a2a2479c8dce0d249d2f1f755a3d00285b21505811adfe64d879a5a6a96ad60f196 WHIRLPOOL 35f7da17473839ed2e7332aebc49806b71a1571f704b1c1b8ef9b060668af6eedf541d4ac7dfb9085e3689e55738ebd57cb8e56b794e7e6d7b609098fe6820c6
-MISC metadata.xml 263 SHA256 bc953e95b44b5b99e69bdfd27ce018a9c19fc5a8848a487d744698f0993aeb55 SHA512 43baf9cc93bb7cfd77b46ab6ec4f816131426792f43471717afd11e1cbb58014710c15b7ef45991dd2b5c045f7b1f0bfddf8175f847bf8f54b3dc6d13b40a189 WHIRLPOOL c7c4c61ce9a7835ecf309490971c9652f7aab0695ef3c8e40a291cf1d29f1348b2f57e922c612f69941468385b4e57e7f5e218cb13e17deb71a76537e8afb739
+MISC metadata.xml 340 SHA256 7bf864666bed2bb15b3954200846b3337f7a99b50223301d6c1bc10691e17385 SHA512 f362f48df03a5f300bff2cdc961e4c9ea75d0c886ff1d7934049b8dcc3a85ce032232471bfb31bb3e3f9e0fd1e96ff156722955256e20093f57083fb0e0301dd WHIRLPOOL a3598e00b604bb2c23ee0ba1513893f3ca9adfac611af66774ec1541f2287d4b040c808b880080102839ae7657c063baaf2dde0e7722a0bbaa9318a03f14d46e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlUzdbcACgkQCaWpQKGI+9SRhwCghD1loeDarXYsBiySEO4/5Xtd
-Do4AmwYbWQX6mkqTkU0gZwR7pxgH6UQF
-=0NwB
+iQJ8BAEBCgBmBQJVfxQRXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiCbcP/3RFNFrW+b04mO+VpEZVYBpS
+o8VBpicsg5rt6CnjCfsUG300G05tkneSgcokl2UU8w30BGH0dBi0RkQHKM7turUk
+UfwNIQMO9pT3OArGHel+ConHVfaNi7B7R1iTgET4RyOKxAGy/UzVALZk7Lirw20m
+35h0Ew+96sNOm5kVqlHTEP/DeAaLJMo6v87ww3/1UFGcaSEq86Efi8c96tP2gQQG
+8ceYCmdDG7gp4LsqVJ/+b4wedb0sN2aP++La597rS+Fwrxr3tMMl8uj6Ichqbsxr
+vJdf8XqDwlvzQWI6tRY+zxG9WchN9g7yMj2AFlCsgojzL3jv8JZFZSmby26/U3SV
+ZcSzPCd4qGSnZLIR8FKVbr6ocFY9TR8bTOFATmLCWtHvcuKUU6T010+8PTFKliJu
+hjiQT/6iEZR3lNK1d68wDJJOCeIcvLB3wqobNN2WCoWZS6Tk6j/9YxVDXh/ZjRmA
+qyYxmqf560HWPBa5nQgElG0mio9ohfi/FomcFBVo+WxFPuyrOxjtHhYY4qDtdWXs
+fCABgdnjcbfrIbeoMiMFy2RV0eeotMlI3s3ZtDyDd90AF78UNWeANDZDG5Pv3E+2
+KxRUgWwRp/dQBWvuwgc43dQkaf9q7ADfqkifBxnu2n5uD9Cit6xUb8XM3USk+rLw
+R03dnZs0U3GElHlprYHm
+=f9Ic
 -----END PGP SIGNATURE-----
diff --git a/net-misc/ser2net/metadata.xml b/net-misc/ser2net/metadata.xml
index 05bbab6b6c81..fa93e6debbf7 100644
--- a/net-misc/ser2net/metadata.xml
+++ b/net-misc/ser2net/metadata.xml
@@ -6,4 +6,7 @@
 		<email>brendan@horan.hk</email>
 		<name>Brendan Horan</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">ser2net</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/siproxd/Manifest b/net-misc/siproxd/Manifest
index f90b20575711..8ca16e9e8602 100644
--- a/net-misc/siproxd/Manifest
+++ b/net-misc/siproxd/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX siproxd-0.8.1-amd64_static_build.patch 1280 SHA256 37cb3e54c6bb42ad1ad68b46f53e8b66f1d0d58af70af0017edab4693762457e SHA512 d29f9d48127fa10e17a50c364ca2a50886a88e3b449ff2ef68ac08596d8f1cb84a5b088d888a76c79391c571ed506934fd2add6136ba10ee6718ce686ae99bd7 WHIRLPOOL 304f80a82b0b98f462d2bc20b0240f074c4e0bed76d43b699faae327c3172c7b3c02af5f764b7325464fbf728f6a9008af279f751f7a9e2dc096e37feb0c2df5
 AUX siproxd-libtool-2.4.patch 412 SHA256 3455d3a324758d2f719f515a5a1c7950fb605502c5af2d1cbd3cb49dace854bc SHA512 7ea24a99d65ecc8586473d49b7d485f27634c54290b23821313b1698bb495cf96db0b997d8cb48673a6291a538d5d31d1ee3089187c3d4f500727bc857de5f0c WHIRLPOOL 9bc6ea1b01c4726a6673535026ecba1fe2b21e2bcad459d689825445a1485e0f52d89034e8485b89560f89b28c7b3965db56bfa7237878640c45723b1159ceb9
 AUX siproxd.rc6 691 SHA256 b0e41722da2ce7b97abe2663d1b83fe764edd69c810d24708a8ab7f938811b26 SHA512 40fd7f0fa25d4e20a2a66456b516a6f1a1e139ba993696792c1f88e672860fca5f92966718b77ae2a253107d180dcacb3e12c026708a703cc6e93bd9729986a7 WHIRLPOOL 7e4136389a15be0024772ef1a38fff7031d4e787275172c91ab6dbd5e617df091ef3dbc63a0638715ed8f6a8714cbb216007e3fbfceb3a022cd0b01b99210520
@@ -8,4 +11,23 @@ DIST siproxd-0.8.1.tar.gz 833170 SHA256 df2df04faf5bdb4980cbdfd5516a47898fc47ca1
 EBUILD siproxd-0.8.0-r2.ebuild 3649 SHA256 84fa3e42d4c0ae9307350660be08d417998c672bd63b8132a31a622ecae0550c SHA512 3ec533aa08b8c23f22570c6c21c69a1dfbeb0d705b337f40a020f0b1f82ba077c3c02ac362c7980e86790b57b4ee736fdf1d74da8b0d511d811788319a467aa0 WHIRLPOOL 287e9a85b773848187fc226560873d1571a3a3e3faa56c557c609fb8e747f62c91af8387bbfd92dca436b9950abed263bd187692a8268cdcf16110eccd7a65ca
 EBUILD siproxd-0.8.1-r1.ebuild 3533 SHA256 540fb41a4576862ab1cdaa0cfd66de651a7f068d19f0363fc68d857cbd3ad826 SHA512 d2929cc59cdcff61fb78648793fce5ca544352cf384f29579f548fe41da744606a756c9ed3159e2f9da008a8d2be66ff7f82e7741fc68daf05b75ee94e093f96 WHIRLPOOL 9c24a3b9d2428e741208b6c617df8d6afc9ed578e9f018b399a415880454577341683548a5e6e02c30ff60bd0c0ab51bc6bf903351869d94da78a551edec7e8a
 MISC ChangeLog 4845 SHA256 2ea9261bc04119d6d66e6fba0dcf24ec3f9aaa5398c33282cda61d927f02ac2c SHA512 5b6e95525dc20b5c4a026e727cb6a9039c2dbbba2f0e1e80be6a14407d29b2fdc198b9a5f3eeb611e7d03468e071db92c757ae4220677923cff8dd0b64f8bdb1 WHIRLPOOL 5489b0d06082eccda705b7b12767f344286618cc747c7021d8b13c975dfb7c1f371159d10255035089a346befc1951d39f1a4f748b73a226582e878473a40bdf
-MISC metadata.xml 208 SHA256 98f8aa3fb70533eeab6b09d5bc30bd8f649ec13d9b04363490082fb87bb6032e SHA512 d5a7f3cb2fe57f8d7783ba358068648b122d9f5de81a17bff61ce600e42b6487e6f7e2a62c8be95cc7021cb3ea88716824b1ad0565da922ea753bea2417b3d3d WHIRLPOOL e38a6cdef2acb3efdc182efde482593790f773ab3bb9b66cced3af47e4ab39368757e17c4352c6cacaefa338341db88c3bcc3ffcd32aabd7984c5b19051a7bb7
+MISC metadata.xml 291 SHA256 945182aa5491c5f05a55fb4513e68ccd1fe77fb56935fba27c5bf5881ce5b0a0 SHA512 34e569883ab780dbb040f3b89f85a2f2c9940355fd72cd2f22fb4601e3dcef272479d0ac8c5498561092fbea8b14825b0975657cf5719aac610546a1d2d08181 WHIRLPOOL 2eea11cf136b92df29e004a5bc961a875458163c4e800cb4464c5b3351de6dbe667b360e5f8a00fb3866b520935064f4cb1ffb66c8a5b4bddc6b9622c3f5f913
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVfxQaXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiCa4QAKIIOzOHWDQf3WMBQP59/f8u
+hto6t2ye7INwRH1CwujTZZte66mecga8KnBE0/Y+xQayaW/HU9VXh6Ps1w47bYIa
+cWkqY0vx2dOMLLpuHxoG32iHEDbLm/es7zfaTKotzd2iHHbSrNH3ZdT1L4WrW+qk
+sSTRQckCYTlWZ7FMOP16KIvZ/bnMPQTzzjz6Z7lU7jLlQDJSoKovEnNbNaNflB2L
+SKqjKeon9RwQ6SHft53DM/AoF7nt8DriDVFpcZVoDh/L/a805Btr6hFQR1i0Nh3Z
+F0rA/7cKhbiBrmY+7l0ImIbYSadr2AAoNKiUNCvnvQ4x12MilqfTYx7NBOHoqUz3
+66tgD2psc/XksPHV6OAPPb5qyXpUifAV3DsTVz5YVvBmI9Zb/hYskFqODMu4ndH1
+Ssjhdm4cmcI3/oqP1lNLeLMYmSbGAlddSduJ1UUehefCqATtO6hgeEmsUMv2GAa4
+S6dUbB+YBa/nuxmqBlpQHSfT5HlNEYkCdvcAY69DfSnaoq/1YiLq5296H6paEkJW
+GtulLm7LLx3NDGN62ouX6/KYewKPA567k67a2iD0mdHaAUDX06hSbVaA2j0AvJZk
+oJoebhfqX+yX1/cRPFwcTRHqwBawKhPcU6jR6MZr8n9THcofH4EEOQ7/ECgNzrcw
+DZWjbv5WE/qP5MzCT2Ec
+=rsJ8
+-----END PGP SIGNATURE-----
diff --git a/net-misc/siproxd/metadata.xml b/net-misc/siproxd/metadata.xml
index 4538a68724a6..d2e9ec4e9775 100644
--- a/net-misc/siproxd/metadata.xml
+++ b/net-misc/siproxd/metadata.xml
@@ -1,5 +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">siproxd</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/sipsak/Manifest b/net-misc/sipsak/Manifest
index 28e749f81d06..c29a809bdafe 100644
--- a/net-misc/sipsak/Manifest
+++ b/net-misc/sipsak/Manifest
@@ -1,16 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 0.9.6_p1-callback.patch 490 SHA256 0ef5adc2bae0b45a3bfafab645625f1071094329ba0d1a3504d13534cec8ae8b SHA512 c10dec8410143ae5fee3b78fb65a83494e5b2539c41f2424455fdabce73a780e78ca159ce2e579db5e2344882e7472abd3f884f76863241218745451108fce4a WHIRLPOOL 12c41fb6b1fa5f7413ff607a7c4d34280737e71054169c2c900d891c4872d5bab5b610dd00f0b3e5fc2dc2090e7f5b52680bb906c6d3d5a74411602f3c022754
 DIST sipsak-0.9.6-1.tar.gz 158776 SHA256 5064c56d482a080b6a4aea71821b78c21b59d44f6d1aa14c27429441917911a9 SHA512 c2d62ddaf2ecc9616941cf002a0494d2f9c43747e6b527f8b1542e9b5ae143fc69b18fc140bd3f255896b0e8eb02f7d198cc1799a4041e2d0c95d90b653591fe WHIRLPOOL 40c5f38c429703c0d3063c2c1bee8f0195b3fb0e1377b29350ef1b566c55960679292f245720d77203948111df8e3914b9cb82d4c6f4a74581d29f0403c02cb6
 EBUILD sipsak-0.9.6_p1-r1.ebuild 847 SHA256 3ed26e3ecf4c4c5c9d8701f9e661cede454dcb6bd9e4b979ce5fc99a0e80896d SHA512 e07165789391a7a4e28fc8671c9d49818af4c6475f3ee2e751ad7196e4d10bea37f9f545e9d68b54185421c5515bf440cf3ea222bdeb33e24166ae5025603de8 WHIRLPOOL badecf9875fbd74de9c2fd1072287e921a41c4acf265f8bc2a4a781faf7e0a95fb9442206c680f2fdc2f52df5ea442e5e6d084eaebec5599783c77989f76906d
 EBUILD sipsak-0.9.6_p1.ebuild 752 SHA256 c29ddec167860995cfb99e9b84e46d749d655c5b537c2c43025873c99cabdbaa SHA512 d4c6d2f6e48ab5c83ee54f175eed9887792c3c45b212a9c578d321379f820e3c30daab9720d6c9bc3a9841112e8e28857f7a90cb0ead87f53e85f80b7dbf2ec0 WHIRLPOOL 357cb83e0e5cbe82a7b4d55e09cc1cfb56c3d7d770714f902ac00422f11c88046b00ac1cc4e2cf7e8796d7a1286aa2c1c8114fcfa347ff3ec95608c89a8a98b0
 MISC ChangeLog 2994 SHA256 47f3eee28a9fbcd4931ff94dfe8c662860db43913b7b9c71f86035bc02954987 SHA512 bce3fd57a086aa816c19a6a5e6c9c641747b1b07ffd78f48c7e57fd37f9d25d9f897fd9627453bc333eb92e74330e46124bcc31aba55fe4d5707b6ffa1a96b24 WHIRLPOOL bafc4fdc53b1cd2a68e0bd93fd740408abcb378740af1f21ed742c8b4a937c56d92f63c2a97ffba277c8ec1b870c823859d22faf7fceb3d548d128e24ebee1af
-MISC metadata.xml 199 SHA256 0221d723d795a0c2a87a73390ac40f0ea3d6344440e8164e0cac6575ac5ee664 SHA512 6e66cdb81069d40938e73a3df001fddb1f3ea31912cc779b1f7a6150143be56e4c541339cd6a2b4f77ae19531abcf6d44cb8d9105078332074e40cc188f8bd1c WHIRLPOOL d159c3e98e2fb60490bfbb8d31e755234cb95855cb6155748ea906ff3638435cbd4bf5ba2d3e8f8c947d1346be072429f6f24c0cc66a9a44bd1f7a6ba0edd0ad
+MISC metadata.xml 289 SHA256 0ecc198ba91fa717bb7be21f3b43dda2391be5e191789f3a6bf335e8ce449742 SHA512 4ea3b14fa4c5aeec1d5dab3c388bbd1be3872cc30dd12f0487b8ea7772fd1678980db40b3079b9df922c21ace9114c28a1a6633043d5aa82711913ab5ccd7dc6 WHIRLPOOL 5c520827e77b7d4c890253f92691ce55b8b945a01eaa11e1b30aac5a9186505c541bbfb873ce61e60be8ed771356423c06a144ba3ddb2356deca431a175bc570
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlTHn1cACgkQp5vW4rUFj5rOCACfeM+FxE9cA11ibbSQ9Wgzw8bv
-gjgAoKMFuZKpWE2hQWHQALgyT9zSGTeO
-=pvNZ
+iQJ8BAEBCgBmBQJVfxQmXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi8ngQAKi0b4JoklF5UhpObeQcpcXg
+W31+cy2FcKBvAgTBXM1JZVg+43sba51fiaDEiEbT7UeQ0DcAmRFHXWppcLP0WcAI
+OVwapP2ad+i8RWSKpwZsa0DEK5fwkA1jd0njJmOZRnCmRwftVLNQbMMCF+oMVHUE
+CW/eLl3O9iJ3VptvYDRGx2Nj9kqhtMm0FYj5dnU3wSi2wN1ETxhsPJBKvQbIRv6r
+IuhK2wnQh1yujpbCd4ZJAi/0wV6KCUuaXpLjs+GGOFf8fhRtymlhCwctlfMPC+rx
+aUJuDzH2jyVpaw93LwKRp41JgHdLYLmlKDfifxTmsArT5v541KyhYBb3gNk5fesP
+sUvjkJjy01eDW/PhBFVSTuZ7uO+1jYNWHPyjEeIuzEBXSYX8N32TuoYhjI/u5naS
+W2K5DpsejUKPWTO07ENEGITMuGLA2HaVyYgcyLo2wVrRuud5CDAatJtIeMEY97Sv
+eEkNjpZscMlDmeX5ijEehN3K5AXhgTvOWrPh2SXUJwGhifvPwqiyJIYNeebtci59
+X6a67SqaKSOqUD4F7M36Kb9Jb+vd4Eu/T8Th2u3JByIQekg9yBupc7TDsu5LW1Zo
+dUmG+Bt2fPJ1lk6bfW3wUvVmnhvr5VnwwGSwFHo1xi50ZVty0XVWLRDAVzmWquJT
+cfe6aR8Y8U9qpuFLQpMr
+=KM4l
 -----END PGP SIGNATURE-----
diff --git a/net-misc/sipsak/metadata.xml b/net-misc/sipsak/metadata.xml
index 1db71bb6e0e4..7e6b8b37f4a9 100644
--- a/net-misc/sipsak/metadata.xml
+++ b/net-misc/sipsak/metadata.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>chainsaw@gentoo.org</email></maintainer>
+	<maintainer>
+		<email>chainsaw@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">sipsak.berlios</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/smbc/Manifest b/net-misc/smbc/Manifest
index e8f26f25d3d1..a81b011f7c0c 100644
--- a/net-misc/smbc/Manifest
+++ b/net-misc/smbc/Manifest
@@ -1,16 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX smbc-1.2.2-cflags.patch 323 SHA256 f27a257816ea1aec34fad223f5c5d9746f64888587af04cf7c4e706180171583 SHA512 c9cde82726e201c3a9b118ef5c34816cffc82c00b6122352797f57f5366bc8fd12d4827bcf0f895056dd8417f4ecdb48d1e607046adca62fbe2c5fd8adcc75f9 WHIRLPOOL 2a7cd544149f842246727aee09c39e100ec4d6f9a2d45514c069715074be5f607b1c2729ca19ed89082386daf8bf9320a71f084dd30bb40691084c149d1be5e8
 AUX smbc-1.2.2-size_t.patch 551 SHA256 175e434e59d7ad5d9efa692bc51dbc584a1276d173dea58aa2e7c144501091b2 SHA512 f445ec293a0bda038493faca823266aff96d4e2f41cf8ed5a64beae2b4e1e941ab8de9dab966328f77be9199ba5f8655006d5aabbfcdbd28cb842966f068fbaa WHIRLPOOL 79f3d0c1c7620162f8fef2f2cfff878708c3c035cc85f021aa271ee7c1ad1d7d0ccbea5894ce25ad3ebf364d9abf7bb64bc251984c6558415d609e4685b72565
 DIST smbc-1.2.2.tgz 977908 SHA256 1059216f727bb3284eaee3daea5f868e1158b0db63f29ad4a392501c5e3f3f25 SHA512 4625ba6bb6b3ffe818826d4af4da0fcb2e516e1ed62ee15ace4cf04d5176d238c5107d349f595809048bafc38d571448e1f1f170ed061dfc8f698836b52e2b84 WHIRLPOOL a2ee73214a68ae02f5abcf842701ba88b4d80c0d8d67b12bd9d6f412b3ba6e345b83a82b7ebd0343411b6a17439bb65a3582621e4c3f5f20740897a0578cfaf6
 EBUILD smbc-1.2.2-r2.ebuild 962 SHA256 f7e7a4844910d0a8dc67c78984b5dd18fd04066afcc503214c268955928b917f SHA512 a5e3499eb4504e30876eb4e04ac0f4573b1d5fb41c08992f59ce66b7f633444cefc8f5221561c311caa41cb52ccf3887cb9fc40f53d7d49df84decd3abb018e3 WHIRLPOOL b31f9c603074d524a17160d1ec043ad66e54c7dab7093e71287b724af997593f0adf4733a32090ae5c516904bf3fac0baacd3dda87ccbc7203274fa991d7539f
 MISC ChangeLog 2422 SHA256 4e5781e0cb996ce7d125e27d42bf5ae27f4a99eaa72b6e15bb4d0ae389608017 SHA512 7435dad7dd575082101e97c061c8ee49043dcf25c315ec4061a7fcfd1305ec42ef442f6fa051ac1b1c927edc225b1f329671c9cd4e74634d15a3d11d1089d567 WHIRLPOOL 5308e7cda0d7473a8a401fcea5dfe1ab39340a8ad0aa2efadd2b839b342fdc718e4f870ff50d298f8775f03c9228957466e1a5b478d433cf260399b8e3069571
-MISC metadata.xml 496 SHA256 ad5a615c78cd4bfea8db16558c7b2927b4a3616bcd66cc80d733d5340b216c7d SHA512 948b672dc635c7de34d1c2c3787dcb849b016f97d56d9433f37c9f9e176d627b82aed9ff50bdaf0ce839d2cfcb631735a1c18e98dd1ffbfb55391ea568d46cbf WHIRLPOOL 2722df3a1f90e6872680785b7efe2befcbd3f7e2e9bb0295bd987edeeaa70a92979c422698363d0d152e50d42180bdaf3b75b6124467b52682b5bb7fc3c4ba3e
+MISC metadata.xml 572 SHA256 603f3eb5a9c962323f643af0f6680ee2d045554186b97f4bbe598ac04e55e036 SHA512 dd7ba68ea1facfdd92d66f71613c066474ac9f9aeb6cbc51bd7b0124e9c25eec2702d1d471fa065c4535c7f2c3d38fa33c8021e5c39da39073096885ce272c4d WHIRLPOOL 13e4deee2294ba4e17fd235118a2b20876d78ec03640e095348f68fcdffc06dd9a3d2fa2794dcc18b5aad0e7940e7de017c30f8be2e0637872f442f4471e4285
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlJz2bIACgkQVWmRsqeSphOOBQCfX372f/iDjSUHJnOqUB+pFoh+
-hfkAn29lDwUhXcXGB6ZDACSrJKgyMdzP
-=MrZF
+iQJ8BAEBCgBmBQJVfxQvXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiqwoQAJgYLL3HuRrJMZpX3OlkqVq6
+IVvzlAAogGeFDJNDkpW57ba9RH2Tv6hsKHrG3Vp4qI0yeReAhYBSbTe5kou54Adn
+9gzJa/tioODk9vpPBMzMh8bmNvoapLV6q9pJ1zVgatqHDkkdUc/wAMMh8univEMr
+j5fgRuGDXoU54t05IH1aBfkMapnub7LXtM1BhgWCgpZ2eVuVOu17NAtj91d3mQJ8
+TD98QYiWwNYCjqVuA/iOVKu/gd/8cX7RbgAShZbpkGOiYQ1SQc9AmSWzdwI+Aty6
+vDQpNFq3owwuKB8x7MUkLP+FnqSZSpN0X4Byer+29Ier9XQFWxVCluw7CzmF5v7C
+jxQf2zPJTqf+xeLo5TEkakTEzgdbfCxBZ77uabO7/0Np7FL2Aq2n4LCutpRWavzb
+uqbKdbsjpjyfIRELR0HpJQnTB+Y3kk9K6tuJzF+jIJUvgs0raUbDoBJ9Hsn9UYI7
+1rzgLdI419ZB2k9BFOoQaMMZM7udyMIuGV/lVFLJ4fyHSEnU1bR4xC0gVyJR59pr
+m9un/BQDfTond9tkQMXzwjy1h56p/lvVGCfK8h3zDcz4BYKpkZJ0vvjMYvi0Q8PP
+hGPVCSSvKcKXPxEkDah6LbG+VGH3l4xBmiKNn/tX2IqTi+ZAgVGiesnY9RTaw+f+
+QcES/pNcdNteBHXjqgUA
+=2Lvp
 -----END PGP SIGNATURE-----
diff --git a/net-misc/smbc/metadata.xml b/net-misc/smbc/metadata.xml
index ebdd1282ef25..b5da052d4760 100644
--- a/net-misc/smbc/metadata.xml
+++ b/net-misc/smbc/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>samba</herd>
-<longdescription>
+	<herd>samba</herd>
+	<longdescription>
 Samba Commander is a text mode SMB network commander. In SMBC, you can browse the local network or you can use the search function to find the files. You can also download/upload files and directories or create them both locally and remotely. SMBC has a resume function and supports UTF-8 characters.
 </longdescription>
+	<upstream>
+		<remote-id type="sourceforge">smbc</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/spice-gtk/Manifest b/net-misc/spice-gtk/Manifest
index 5a538a385f2a..20d7ecbecabc 100644
--- a/net-misc/spice-gtk/Manifest
+++ b/net-misc/spice-gtk/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 0.12-parallel-install.patch 723 SHA256 8205e16a007ebb481d5cf9ee66b4c698be408038798fa7176287c5c529af572d SHA512 c6928e2e4e52e65760d7c2d69a44750d4756fea232288835d91eed9ded0d2770d062232283604163a5002565e0c4fc87b776693be5627e629ae588ab0710141c WHIRLPOOL 15af38b3f8986b08e576691fa46744cb42b3ecc51384e86f7f9c1ba2b8a40727684cb8e2529cd748c006bdb8be0bfe93604fb0fe3f90e0cdcc726bdb29f2ff61
 AUX 0.14-Deal-with-libusbredirparser.pc-rename-to-libusbredir.patch 2405 SHA256 09c6ca9e8a49f8c0040f83be35223319efed658a02b3838b55ceded7ce74e156 SHA512 28d6b25796f428bd00ab76502ce714eafaf4395e8855b89a767adedf69ff6b981f90e44d4f14465e11d5b62ca6203a51673206d880aa3caa0a8c10261c6dc59d WHIRLPOOL 04c73ec53b733973f4433e86b3d711e5c32cc3849588973b86e43080e96fabc4a7308aed3fc649eb7a84d2ed1f70f74ce5d6506704bc7b2ef99b03432f4b414a
@@ -20,11 +20,23 @@ EBUILD spice-gtk-0.21.ebuild 4242 SHA256 c013b67187fdcf3133c698549c8f3695dac102c
 EBUILD spice-gtk-0.25-r1.ebuild 4475 SHA256 fa6aecc16f88984b5cd458ed450b55c12098e7ac6f82298c642777ee3d446663 SHA512 38a73f6f1dc956f6e42db1a685c9be8ef94c9487c68d3bc0d4437113b88c040553637559a53b201245c2f3314df365ed10fd23d05a233b65c3f83b459eb5b4f2 WHIRLPOOL edfc418314b7ad6e7ec7d9bf0f86eb1406e7df8ad192b71aba15dfad64da1e85668a06cd882551068ded768296bccd1861db5f83fbf8c50a8656498dc5c787eb
 EBUILD spice-gtk-0.28.ebuild 3991 SHA256 30d1a21cc9acd2e9ec6ea8069d0dcdbd7e03fd861bfdd5ee795e2495642e71d9 SHA512 89194020b3c15d505eb2de320d81ed977cb11b2559c48dd51b771892716e7327357827f2d96ebab4957532b7d903dfc58613cfa7734cb775170d451dbc6939eb WHIRLPOOL d79dba877c528faeadfd05f1ba0c44de59113036bb1dbcab9198a8d9fd5b591c841ce7fe1105c2affd8f882b5af83fecb510cd4fc9db36f684135f5142d69866
 MISC ChangeLog 15269 SHA256 0c898306728657f3bcb7bf33f87991f5d4c7a32c9e45dab6849ec7ab15908ff7 SHA512 6443b423068d9884e86b154a891ccc476995f028d759d76328325cc343c37173e9a116459bb5681aa89f89afd5551db4a71092012c209c3fa258c2b8fa7a4ff9 WHIRLPOOL 59dfcb970cedbfee82ec9057df9cc364dd391b069208d3ff11c6a0e45209f2f406b0ff19eab030bb55d63a5a0dea16c8e154fdc194107ed0c8368c2380932cde
-MISC metadata.xml 1091 SHA256 dab8ae41616d0562dee4b5ac03b887df166a4f0f1fc9db6a3a1f1282f318f75f SHA512 88216ca755471711ff9fd9371a6a32229a0dae1d846f61b1891db001dabdfeb3a32b2cbf9fe102fb7534aa73f9e53d4642bfd08960b70ffa304f41c0d90b9668 WHIRLPOOL b6f4263e18aa8e7705e313d5dfbf9e51a24ae5495bd33e964ea882576c12c42441a27c5574950c7a0538c7458d16bdfaa5391f01ed7500c999422fc2ab2d910b
+MISC metadata.xml 1175 SHA256 7876f4a43be0630326aa598acb11c913ebe23690d6a149fa49137c0fb53d57fb SHA512 ad866577dbf7aec303b6674dc2d3d26113d21816d550576632f55f8f8ae80036b7c4f0013477f109c4e23e8062958195eca7606264aaee435753e1f243046e7e WHIRLPOOL 09e494a15f19cb3f23bcad02bf3c68a4e44ba162a5435dfbafc6a29c26b015a74c8a390803f4356d5e3945cae10b4d17249b875be1643571c53917fa840f99fd
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlV8VI0ACgkQCaWpQKGI+9QYsQCeIoo9s/XZwm2nimQnrvxWaUhz
-m3IAnRncpKJi9SNe3j9oL81FURQHiOM8
-=Q3tj
+iQJ8BAEBCgBmBQJVfxRJXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmijiQP/2uLYnCSYigsOwU2jWBG6jlq
+eak9K6176anaMEsQaKWCgt+dl5ri5rDMLqef9Js0FVhuqeQIP9zjcb3j8vo8/7xA
+eYTju/SKmyV0LqIWsBWIbXaV0sgG+miAf8QTfVcojcVqUdTSgnGKQlEHUxdSvN3W
+VhTID9dF4HKwnhAx7NHL6g+dLJYEbdBjumvCqoziiOBIQFkOxe45oBH+rQqTzz80
+Bf5j+XY8SWZqMHnkcKPnBH2j+G7daqS8Lm5nAAlqcYq3RUZ8NBCruW9KnL5rqEK8
+UcqmustOmtsJEGe/KFEL8+6yD/7KTwh7zKUNmPWJvGAL9sRf4MY/udnUvJ2Qa0Vy
++su4z1PogYhL6zoC6NbL0HMP0AfxZ7v8+fKf3Zb6Ozg7QtnnP9HfSbC7uSaqZnf3
+xA1s4R9zUur6XA38XR89VeuZRQGeATKazrfGU4qMOLWvb8dPTGp9aeL/aXEX7abr
+i9n+bFXBbklFMlmX0i2pOe7tSYbU9GaGX4236hCIulgawyZmqZxVxtXhS3UUne9w
+czebrE+SvrNenW6GtgSmkaToM72d1DGrJdtN3sGwSPmXttpZDaKjvZDK9dH4zgMq
+JTjNYB+GH+iwApQfULLVDuiMC2w0VsRnpeuIR52+kfwGrCWFoim8y60qx6P7fZFn
+MzycLAtguRBXOLcfI2Cf
+=ahdp
 -----END PGP SIGNATURE-----
diff --git a/net-misc/spice-gtk/metadata.xml b/net-misc/spice-gtk/metadata.xml
index fe9d14acb5bc..ef05c1f54b7e 100644
--- a/net-misc/spice-gtk/metadata.xml
+++ b/net-misc/spice-gtk/metadata.xml
@@ -11,7 +11,7 @@
 			automounting and other APIs exposed by your DE via D-Bus</flag>
     <flag name="gtk3">Link against <pkg>x11-libs/gtk+:3</pkg> instead of
 		<pkg>x11-libs/gtk+:2</pkg></flag>
-	<flag name="lz4">Enable support for LZ4 compression using <pkg>app-arch/lz4</pkg></flag>
+    <flag name="lz4">Enable support for LZ4 compression using <pkg>app-arch/lz4</pkg></flag>
     <flag name="policykit">Enable <pkg>sys-auth/polkit</pkg> support for the
 			usbredir acl helper</flag>
     <flag name="usbredir">Use <pkg>sys-apps/usbredir</pkg> to redirect USB
@@ -21,4 +21,7 @@
     <flag name="webdav">Support for folder-sharing between guest and client
 		using <pkg>net-libs/phodav</pkg></flag>
   </use>
+  <upstream>
+    <remote-id type="gitorious">spice-gtk</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/net-misc/ssh-askpass-fullscreen/Manifest b/net-misc/ssh-askpass-fullscreen/Manifest
index e5e9dbfc456a..5f786b362cfc 100644
--- a/net-misc/ssh-askpass-fullscreen/Manifest
+++ b/net-misc/ssh-askpass-fullscreen/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX 99ssh_askpass 72 SHA256 55a188f761477509dbfd52e539434375acfcfc9723bd53d676d0aabfb4a4154b SHA512 9aadd36d92c4b8acf5ad5c0a63c017d41e8f164eb5eb9fde6a96e5e136976581de2d5acad6b20908d10219ba91cdefb72ef359dfa72ddcbb106b2ae88b525103 WHIRLPOOL 51026da0bc332842975327632ff228bfe599efd6c4c7bbae703ec3341bf5e21e04fea633fd81178fa75b2df681a0591f7ad6da5eb443c8a5964348fb0e5f68ed
 AUX ssh-askpass-fullscreen-0.4-fix-grab.patch 686 SHA256 3c25a4a639e3a30b7bcab033e9f7f5f06934f7553ad7b7ee44c1f31ed60ab42f SHA512 ab9df2b005be9d98637dab2457070a46aeabd87f1bf813bc6948d897c914778f02b0460ec5ecd849bf1c2c1926482f3e5eeb1248e75dceb7b530fae516317cf0 WHIRLPOOL ec24955af973324f2b0a788334f044d69606241f5ec0b4a1a63fbde656d311d3b4d6b7f8fba8c91b70e89f0b2a1f7f0c29afe84c52934badab30d1a1d7cc679f
 AUX ssh-askpass-fullscreen-1.0-libX11.patch 845 SHA256 2c567b1269cc1ab17fe70fa1802163ca93f60fc9c65017f03aa1ad733ba4f6b7 SHA512 cbf89dba7398f735807f841f4df8534e8918c09e95bca43d4fcfe451e5697194712f723a081830eeccc01e5e389cb8ea319401e80d68365c3763c8294dbd69d7 WHIRLPOOL 9ac5180929bf73cc36ae21d1b2ea2a6c36ed7cdad5727be13a01afc2c09eb49ba5e761267bccd68c61cf7eccf433bceb25fa96efac0631bd660a4e4057ad6ea5
@@ -5,4 +8,23 @@ AUX ssh-askpass-fullscreen.1 2542 SHA256 bde17cd9bcb8b1c6d9cf781118c2ce51f0d5742
 DIST ssh-askpass-fullscreen-1.0.tar.bz2 69301 SHA256 5843f3c580964be64aa40bf20a03d4d7de326fe8957aae213b38c405c5d10b9a SHA512 272b7d8bcbfb997530afcb6c619180b625e6753e1dc86cba30f30fa594cd71ec8bfc522b0fb8aee5842cb7a4532a00fc1e0954def9ac81a1b521360d7140f52b WHIRLPOOL 029b152835dea0f67636f3781cdaf550aa1a3cfb905af233be80a7333606a90a6c635220dc7baf598acd4f4a6b4a66aa07ec4627633c9a0a7ec194a72ef8d2ba
 EBUILD ssh-askpass-fullscreen-1.0-r1.ebuild 1146 SHA256 ba09837300e6dd0237059d178d61b3d04859897fd5a4bacf1aa2143fe7abaddd SHA512 d1be732edaf33e37c9c3bbb84f4f4fe9788c784961d56c24b56a446b7163b0a09afe2b2ac6d405583fb099928b9e058cb49dfa0066207f8ae4f541f734decdee WHIRLPOOL 51621e8441f5b747b45416422919780675e367a9f0e5a855da6257ae7d2c906c871ff94628ac58d63b11993799e90f86c81a80623eb48d682c79cdfecfb3248a
 MISC ChangeLog 5719 SHA256 0e82183b1428bdcc7f6770beece4b91aaa7552c4866699d111912164667708bd SHA512 1790667116119b05688edadba69908ba8716bfe64d1afbe9855bf2f408b54a8c23be8113324d54e727e1d7d137325456df870be5cb567ed104af28115e942b2b WHIRLPOOL a7bff2830dcf46aa3d710db940e1868274cdfd580691fc6d7fac3b0e749a17354e1c3145388d8a1f6b3cb548821022d73c3e65ff92999fa953365f08fe73d21a
-MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
+MISC metadata.xml 250 SHA256 17826bccbc6efccb660638700cf965955171880752792314747bbfeb2b99b9cb SHA512 761d26340f1a58184169a5edec2d6c9131dd413e92833f539c5c0b32db9cba14de55f056f6b12034af64021a4b13864c4b125e6c4d185cddb06efe6c2105746d WHIRLPOOL 8b0242ccdf63dbe9b8589cca3bc37e9727a3244c62eb26ab5b02a84cd627cdf6cad6375cf34b0fcb51bf3c35f864516f7001212e138246cd381978b39f56e8b0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVfxRZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiOqAP/AvehchdzjxZKz28fQEtzGNj
+5mNanSp+n+Q4+NB+yy4Mwu0ylE9H8GnZPC3hi4NlqpSuB21L/ZhRi6XO2Wn7viIn
+6CcV3C9xQ8BakqbfsnZSMEAl4slXUtq9BnQUVs2uSjS4X6rAHMn440zjW02OG8bB
+HzU2c6ytSpdQ1+1axaIzDO1CoaADPr5KrryZSH7jCuiKxAXkqcaslZWMPbs+NY7Z
+fIuqXAJxqg/iODG8MlPGcBIqWXRDUU6ZMgqaYiXwNkFVs91uaBH0w2WJcXjweLJB
+GT7tVA7n26RvJ32d3vcfXYv5OMKCCZthEMUjIpxCM1da8PEKMDT22DyYDsQzmMPe
+gVlj0cXfCm4vGE7/ndxQkM7N7EmAvDOJD331lkXRqpxEf8Mw33N7iEzyDzLHEr/U
+ARIEVCX7i16h6lAVvC/IIGtFJp/mFciSdi+tq+TfMZ6cJ+fmAUValwo/HMTZyuGt
+/CnLWWr8WRiSscKI8gkjF/bratrAjMzeg3DoIlelEyvi8tGUtcDF4bGbJ6ZO7/rU
+Vk4VVUjOQqi/6bp/12Z3EZRPO6WSUfB8PBZ6u7uU0FJN+pklDzwQl1w6rJaH4FG8
+u2mkLXxQ6kN8bsdU6/pyQdYpSIFSXqJPPcSHmYUW4KVQFVBYD+o1YaKgLk7IMgbF
+Cq4iq8RHOGUcGmLoFTA2
+=pUFo
+-----END PGP SIGNATURE-----
diff --git a/net-misc/ssh-askpass-fullscreen/metadata.xml b/net-misc/ssh-askpass-fullscreen/metadata.xml
index da6fd63d0085..9724727cb6fe 100644
--- a/net-misc/ssh-askpass-fullscreen/metadata.xml
+++ b/net-misc/ssh-askpass-fullscreen/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>gnome</herd>
+	<herd>gnome</herd>
+	<upstream>
+		<remote-id type="github">atj/ssh-askpass-fullscreen</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/ssh-chain/Manifest b/net-misc/ssh-chain/Manifest
index 7ab765ebd7c4..a8d6bb81063a 100644
--- a/net-misc/ssh-chain/Manifest
+++ b/net-misc/ssh-chain/Manifest
@@ -1,18 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST ssh-chain-20131217.tar.gz 3956 SHA256 da84435531a6e22d167fe94c64b193fe8424ac35f40923f81fdb6650dec93f3a SHA512 7d9faa9bbce44a50ca56d65fd778d35f79c7ece982e2bb0e424471c866f9cc584390484dbed73447473016fe5de4564e22883d3dda4aa54e167853a3e0ce2975 WHIRLPOOL 5cc066e31372fe61b3b72c72786f1e6351247e13c643598c78e875715e64cfee4254b28c21d1facd33556241a26614c92670cd5832714e798b69d4db4a6c0819
 EBUILD ssh-chain-20131217.ebuild 916 SHA256 7abfe1e1d907ab41b3a32538acd234aa23b9392741e951cf62ae952d3a4b460d SHA512 749691eafbba4d76b491cc0fb0e68520ab5eeff9a87239290ff77f9fc17bcfff66ae97011bdfa0733bc9a90df68dbe75118cc6807862807690f6062b6b52d237 WHIRLPOOL c66662ea046dfd0690214c10bfcd46ba05caa81c37c0632481008f22485354a7dd752f34bdae8d8d767e473209b91e971e7874871c4d8572525d0ee959aa2ced
 MISC ChangeLog 360 SHA256 ad50eb4f0c199b753f42aaeeb7fc1fe2c83ed08aa8fd7ef5dab28321a8c35fb5 SHA512 5a3d9a28fe754a22c71049c22ebcab0633248dc446617563d38b9398479fe9438d43c9377d218839b75b6b3be84ef7a23523349df251c6ac12be03c0d8cb2d7d WHIRLPOOL 3f03395d954d43e997c92cf51a4b164ce4c363b1e1b3747f0e808dff12e82b51e66485b2924bdf90c399c378516bad409107f889c8eed50318f5b5f3c39a4ea0
-MISC metadata.xml 237 SHA256 7b16ab35f387f952afdef31d1d5d20f82b69ec2e8a55bbe7215cf78ea322755d SHA512 52882e327ceb9391938e5b9fdfcb2f0d9c7380f71bed273c84357ecb0f1f0d4e704d9c53e4791dda1d7eed5df2c4c029281de182a5076849b26718fc83462cc6 WHIRLPOOL 1b5ae26efb6a0d0edd3e21494e52dbc7cfd1621316057dc8d876280444ceb302c94109b4e780982943a7837f19de8f11c85f49b137d31f41d7c79db6387dab90
+MISC metadata.xml 323 SHA256 f65ecf8eeac9cdd73f3ca7833e2f27340b1a8dd0c98d9e48c38304d51f8e5e4a SHA512 75a0b504a2b9eb4b62f0e1142b924fb9deefe8e88b518ca931bade716f3d26cbb52268b94fade118293c7dcdd67ebb20c5d06405bbd109a9e4133d47b1bd8a5e WHIRLPOOL 3b728b0a303a4733dccb6bc0fa79404b148b0cc2d392bc5c4b301c51378ffa48a33b71db7119785cebef01db7a330f9db2ffff959d0d079bd97fa090ab94ddf1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJSsen1AAoJEOeBhlrCAAWGeoEH/Am5jZlbE0nSwFjyPet51yMw
-hMLdqAaPFw3wnj4ee5qzBRoOJO38RA1sNKZtr+fa9U6YdIJisZbPS0ns/G33FrDl
-ed2IqYQXrf6PInqg/moFfSx8MDCpMAbwbUHJjDYUzrFUg8hGGfG82Lu4T0RZtkJx
-t04/3H/sLCduuGeCUvKiGlkwBQLzqD4hk0OviFSfYQkkfoiAHtMiVhJiA/0fJLwF
-JigZEUxglkmp8tufJ8r7d20zkgi34JnPpBsF2JEtHGSIdaj4m31u1/pyG0Esluah
-pja2i52KYiw5oKBrlynNr1+6B1KDRBlzBIJ9sAMg+rCxtvaV6kLRYZHYEKCZ5cs=
-=+33R
+iQJ8BAEBCgBmBQJVfxRfXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi1hwP/Aot3TuMDzLmL5LrMZLEelna
+xC7fjl3kqCDMVcyOYoW4sXKoxy0zB9SyWJY0AbAVsX7bfST0+LfzCLfMpoiBc4qg
+aFLRhG4KXuRgZjF8aOK2Gcle8ci0KMVmoeGag6iSkwMcOkb3mD8EuO9OhnHX2xIZ
+KuOe6Lpp96KD0mRAIFvktZ/OOX2ZXAuPTtDIdyq2aQq8OLEnsyzIqCGljkcT9SWd
+ZctlosK2E7BeWK6ljdkuIGMnan08hFSPjtEQH10j23XmIO3xx2z4jxWtPNwr3m61
+FPmsWjnfdIT0WbZVCE5/OR27mH+NupfTRHXaC2AO7ycximdg0Q/bldkHxyfc2k2/
+iwG17eP15/yrRDT0+Tnay0u/xvmWEr8He97we6aaCsoRoWc/DP8eHXx/8uYYJJIC
+bqy327RjbOxWQfNuLlGAFy8b6cjnBVmt8cW7cLEy3MNUZsr/RBSO7OB8cs6QuP9y
+nbNN+7s0Pkq3UDAV94UmoITxC0n5l0BmTlCBPrZYaPxP9yljUU/C3PkukbgMd3M1
+SwlcmJl3vw3jZbzCC05GYU1N5rJFkiX/BJ0uT6ANd97ppManlRFLe4SfG3o/Civ4
+hLV9qZoS3evdH1NRg9LbzZzFramXtGogAnOdF5AcuGcbfH5ldJ5n/v5KQO4tc5hi
+EYuHz4+r45T0MRhJBxLg
+=BsOs
 -----END PGP SIGNATURE-----
diff --git a/net-misc/ssh-chain/metadata.xml b/net-misc/ssh-chain/metadata.xml
index 745b9e1ce74b..36555e712fd3 100644
--- a/net-misc/ssh-chain/metadata.xml
+++ b/net-misc/ssh-chain/metadata.xml
@@ -5,4 +5,7 @@
 		<email>ottxor@gentoo.org</email>
 		<name>Christoph Junghans</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">ryancdotorg/ssh-chain</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/sshpass/Manifest b/net-misc/sshpass/Manifest
index 1fc85e900a1a..a2773d60d98e 100644
--- a/net-misc/sshpass/Manifest
+++ b/net-misc/sshpass/Manifest
@@ -1,5 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX sshpass-1.04-ssh5.6.patch 534 SHA256 2dfda173d1dc721367cc6503a9116ea28a94c280a7ff34c50dd638de0c6ec297 SHA512 a1b44a03584092d2816a2d8958c81910bdf7eb8e5e7b12e5978a5bdd3d78103bb3725cfe79b3baa94d7eb84de4d77a7c28c38ab41fb1989cde89c176a59006d8 WHIRLPOOL b1a27e4ffa70c02587b5f34f86f623054858583e6f697947940d026cef1176c7d5ac236babe6abfea6101110c188519afbfae5307d25ec8934dcce1007fe6a71
-DIST sshpass-1.05.tar.gz 98362 SHA256 c3f78752a68a0c3f62efb3332cceea0c8a1f04f7cf6b46e00ec0c3000bc8483e
+DIST sshpass-1.05.tar.gz 98362 SHA256 c3f78752a68a0c3f62efb3332cceea0c8a1f04f7cf6b46e00ec0c3000bc8483e SHA512 92ff3428a3cbc2b517e8ee0a6676b409bac3ec0900bfb370cf3882ccc62017edb695ce00e025f73680e9718e1b0213b2ac1bbd2a2558fe43f0f5a7b0d690c810 WHIRLPOOL 15c951f1c7e66a3967d5ed2c541862b95056faab108976206d6e81e76d6234ff116e7f490925305482238b5c86098a6783a691c8f436d8911ffea159df275ff0
 EBUILD sshpass-1.05.ebuild 521 SHA256 7310df1949774b49aad6879ec336f7e3306a0de90666430872c6eaca2abdf1dc SHA512 89a81da7fa40ff99079d1f038960ceaac8a2311c28af905681ba0e354b3479552174b5e2ed069163c7188770540d1f814b6b5077ba127a12f40b51a73907ca1f WHIRLPOOL d0bbe96574be893a0d1c8ed552b7c297590c0fed6b15f1301bb4af1002f7282e5f492abb200febcac40b3d9688699bb290bd5ad22f5a28574baf446674d1bbd7
 MISC ChangeLog 2086 SHA256 7edf478f6d22ecd04243b113a337dc8bd9a0323d82239aeb380a9b2a0ead5e54 SHA512 a5765075cd3157db6646130f461f6c10e47d73ecac6700b6ddc084ceae17aaaf7e8e002c02a33f84922fb822a835a5f2237f1dfa25a25997066807560efa2b8f WHIRLPOOL c00476021390ed91768294ce027b62dda49bcf187f5d828d27f552bb8d5af93ab1b5f5e8af103dae553fd7ad0bb94b11071c4fe9026a8ab1a1312e2e28d5bc00
-MISC metadata.xml 475 SHA256 fab0bf47a1431c7735975e691c0caedf7ae83ebce04e354917758b274b5baafa SHA512 ba3a5967633b7e2be9a1cf97d7f0072be4237e006a04d3857d013dd3ec03501052d1b76247c59f8420005339fafa5260331cec0067befe144dc553fdae836157 WHIRLPOOL a633baa41506f9270150179c8fcec828e82fa3d4b091e0cff48182495924e335c562282d2470ede35b2a4aa9ca33cc5ab3942c25c8945fb80ba810976b57ba29
+MISC metadata.xml 563 SHA256 bff81d6032d6c73f8b17d169424b0e37b6d12335003d7fa90928a8e54f98eb97 SHA512 095d1b2420da54f71fb5f4028320835b8b58e1a6475f1bdee833248cc05707156103a3a816fac60d181a3a86e077c6e6d3182514ffa3a385fe12681dd0e08e25 WHIRLPOOL 75edce22b305a92db0046771681b0ba862fb5c16999b30ea99a9b6eca720fd9caa81baa9c1f8e86888cb6137e3ff53388e965b40f7d910ba16933c3b03ebf370
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVfxRnXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi7aUP/2I6H5sRSZxVQdfwZaNi2LaB
+zNctaq8TAB+m/JJJCku09i9/29g+O8YSKX/HM/j9r83rD6GxouBT+jjrIDNZ++AJ
+oSNxVu+GsGDyBYShQ8ppsYQXfeAJN8S1ZdmbBRrgPa1enHfdLMp0xRQnUiGDbz8z
+nWZl31aHsJmkQ5wotnO3fo7MKpeNupc7s/pFSYsvq4H0JW04tEH13gcdd8zIeri5
+TzBUkDi6gK26m107peN+MyvsImxA17w+FdbT1apE4NfK01K0go89aW2tgrQ4ptzj
+y/6yeql8hpxQgECvnFGQ4A3sCerKvdYGXOMzNTSgr+6x78S7GYlBGXDNIbRpyHVL
+AvBc+GedvWAdsV9FPU56mcGS8Eecdigx6t0iH0Y+SSPpQG+hpPFxX22U2y/WbiM8
+g+xmEod5ly/oMIBdekhyPpcLx73Z4vHYVQmMNE3Zue++n6fltMphSb2591bg2pdU
+58P/EgJiMUEZar4u1o8nxpfJuEhEe+In+UcK/C709o4Z7MDjPcreIhg2NVM2GgSc
+3LiWz27axy+G4GwddV60QT1M0BbLUaAHxETs1GCThjsXx4CVpKTq9Ab8OQsk65th
+nFssEuhJbfFizjHjlRZUoR4SCsDk3kix3PVkwC2GD8CPmhf43W9wkW4b6axNJDed
+PPBCCf1cEe4bPdeE2Dmu
+=h9/z
+-----END PGP SIGNATURE-----
diff --git a/net-misc/sshpass/metadata.xml b/net-misc/sshpass/metadata.xml
index 3b49f8ecb369..2461dd9ed7ef 100644
--- a/net-misc/sshpass/metadata.xml
+++ b/net-misc/sshpass/metadata.xml
@@ -1,15 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
-<maintainer>
-	<email>hwoarang@gentoo.org</email>
-	<name>Markos Chandras</name>
-	<description>Proxy maintainer. CC him on bugs</description>
-</maintainer>
-<maintainer>
-	<email>jingcheng01@gmail.com</email>
-	<name> Jing, Cheng</name>
-	<description>Maintainer. Assign bugs to him</description>
-</maintainer>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>hwoarang@gentoo.org</email>
+		<name>Markos Chandras</name>
+		<description>Proxy maintainer. CC him on bugs</description>
+	</maintainer>
+	<maintainer>
+		<email>jingcheng01@gmail.com</email>
+		<name> Jing, Cheng</name>
+		<description>Maintainer. Assign bugs to him</description>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">sshpass</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/sstp-client/Manifest b/net-misc/sstp-client/Manifest
index 0e422294eb7b..b2cfa72d512f 100644
--- a/net-misc/sstp-client/Manifest
+++ b/net-misc/sstp-client/Manifest
@@ -1,18 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST sstp-client-1.0.9.tar.gz 3243308 SHA256 d3d8a26485b2cf0b24e148301b94b3ab9cdb17700ecd7c408b8fd6ad16f7fc4e SHA512 28144552b4ae36ff56c202f0f7118628035d6583863597744a670fc769c4a022f30649348ff8e1e4ceb5b68712916f14e220a8bd6e8a8bab36567998f2e087c4 WHIRLPOOL cfe6476d558954083daf9ece8e4efb6df7be60e38fbf62bcfd44e012fcad03f157e976c1c9218b7cc448e0f18e10be1895ec1823a98e7858dca0d68292f4e5f9
 EBUILD sstp-client-1.0.9-r1.ebuild 1449 SHA256 09857b1ea7234287ae6dcd25b30f2b7f1be0c38d0fc8e2ccbfbe31ea69712ee6 SHA512 a53f765337e05eeea42e6f8dbeb9c47802742bc11b9df7bb7717a5b53a7c1ed5b0eed2a45708b954602fdaf1099a050674a602faa1c3fedfe18bc58c5a86f342 WHIRLPOOL e4c498a541b3a86cce08f90e38796c9e831e2655d17b295a43ebec31c6b08c8a833ad681a7c48f48edaa93387999f89c1eaa6d82b065e6267a53b5287afd414c
 MISC ChangeLog 758 SHA256 1045b21859fd650b5eef8ecc59a463ca1f3b9d9ff0dcdb7877d55e770f2b9a33 SHA512 eea61f59db366d7e170c8ab0f6790b8f269223a73ab24ec14f82c651d9935029683c4e44c81c21a128f92110270dd975cd6d53b8260641d04e25e1504915f148 WHIRLPOOL 6cec749749abb4d81e82c21f3ed23890ff5ef37423f7d6d0e3f1add7386d2b2baf8212470f3876ed02bf15353e0241e02d4c658bfd46404a512913c6800f5969
-MISC metadata.xml 369 SHA256 fbf0c047dd8f31baf2319b73779aa528e5c22283e2eb6f1b68a826e42b7eedc7 SHA512 1588487b3894d396348e5754ae1d9f93a0a7b2e72b87f59c4ce6ec6ae2564b6c7cd7fb40c098009989143412cdd3affbb6a7e07ea10f7955357d1c8b2fb41377 WHIRLPOOL c686ffb6a35eeee66c8316d686b1066fef117b216b264c96a84d21eb8d79718456babc43db707af119c84bf3f99946d64572c32cf5a05ee82b65315448255bd0
+MISC metadata.xml 459 SHA256 ddb3ffac2207c7b94c8ac2598ca0167d3b15449b4eebc1631f06da562c159330 SHA512 86526ac444f2f90c14ccb8912c49d7992ca836d3339cd0f81f23d74e19597b6d8737b1a5350e97c9c617099dd47abc57fe9ca7374679ab1f58c0da8a98f8aaa4 WHIRLPOOL fc267eb2636c04866f93b49a16c9df5e18a283e886e64c09b2eccce56e7606b71405e56ff02620ade65110671c468b82270b9c9b7b87ac42997bbb79478a0b80
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJVRekxAAoJECo/aRed92672mIIAK+ZAVhFom1POSzlTTPkEXAW
-thP8lnTah4N8nV8uDAO9lL8nzt2C1a6dsMKt2lcZNmFWr2uM6GgRBPYug0TQ+byC
-Bl6N6x6gmLvIaVgXdqIWN3+y+rUW3iJzfOXROBmT2+Qng3wMPjgFaypuLoVO+u8t
-rfv+teKngBjxOVYkAuRsNx06HJfqQ1/2h3lEOVE370D95wQA+ZTHR69s5GnTTkMy
-k1Szrs+x2d6/Y5hqLG3lwS3FcfvjhVZbbmgoZSIjDMW6VPEmnfdJ8qYosZE5+lHp
-FEP9nERZDocfUJ9UfSJdLN52D6CD1Vgr4o/Zrrgs1PgASCUfZW5VA5TJdpuwxyg=
-=enw4
+iQJ8BAEBCgBmBQJVfxRvXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi/XoQAJlHjsq5VLE2QC5ZyvtJ2pLg
+jD1sJKgccu+v4Q46WRekdf+hyumSWiZAHc8jxcy2EaY+O0TZkM/FXsZY3rOh+Eh8
+mzLd0rvSglnWH1eVlFuupFxOwIsvkxO2C42/PF57QVeoTZC3vAgT7d+Wt9mHEtmQ
++VCqkLWXqjBoWBSa/VhWMcBtTK7DcKJcU4tXhKPau/3O5HZqJCfgr/QmfOD9/LDz
+YSEA7JthAkGQDIXHBB7cTFNdZzgRu10hKzjyT4RxjMcSjY0fy229ONeIvXsLwciO
+iymAg36ks4G4b8UdMttooVumd6rNtRY4xOPfZeuI+NPxPaYxn9eGnVz2eCyacSsm
+q3wIE/Ya11TadRaNbC+XaAh0BK5+vE8iuIbRzENXEmogFj+cTiZ83U+vvNNLC/wX
+2Vlf5/GT0MbqLM5BnoevBNx6WtWiQkz1nVWDrsqXeZqfaXsdtKNHW88TdUHee60k
+QRjLAULUytUG+M3kNseWFW4YUpuUF9EiYXE8YnGl8E13BUd+agwQsuZuNr+uoLT7
+294AiFNF16kuP4PKRLIAzY13pXzZlJxd0Z4fqodf4iQ1dpZI9Gb6iqwDL9U1O1Yr
+wA3tYT96Vo7uPMONEXcKpUviQfEN9ftGXsEpQl/7HIzMfGbQ8mHkz1fwF+NgAwPp
+ziBpiIbVr4Pg2iN59vQw
+=s5fo
 -----END PGP SIGNATURE-----
diff --git a/net-misc/sstp-client/metadata.xml b/net-misc/sstp-client/metadata.xml
index 60c7f53239ef..470760d0de82 100644
--- a/net-misc/sstp-client/metadata.xml
+++ b/net-misc/sstp-client/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>
-<maintainer>
-	<email>andreis.vinogradovs@gmail.com</email>
-	<name>Andreis Vinogradovs</name>
-</maintainer>
-<maintainer>
-	<email>maksbotan@gentoo.org</email>
-	<name>Maxim Koltsov</name>
-</maintainer>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>andreis.vinogradovs@gmail.com</email>
+		<name>Andreis Vinogradovs</name>
+	</maintainer>
+	<maintainer>
+		<email>maksbotan@gentoo.org</email>
+		<name>Maxim Koltsov</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">sstp-client</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/ssvnc/Manifest b/net-misc/ssvnc/Manifest
index 28632ee36ceb..a9e2dc8cff3c 100644
--- a/net-misc/ssvnc/Manifest
+++ b/net-misc/ssvnc/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX Makefile.libvncauth 140 SHA256 323eb71d93404499b1234e152db9b4af4e02ee04590f49c8a09a2c910ea521d4 SHA512 7d3a8833afc2169ab6440763680b24550fc16a0c60371e8b9ceb8eca48217638cc5e0beb9bff5d6c65fb81fe0bad77b6eb7b71c81195fa70b8879e45967852be WHIRLPOOL ba3f0dd338e76bdc6a1bd82a0825aa01074ee025ea807c3a34f755771674a18d78bf165573adf3b5d3e6cbb148ad68c0719d7c8e57f30b0b899a0ad1c304595c
 AUX Makefile.vncviewer 295 SHA256 7793e2e7855373a2ce255d603e1e13c47668db0cf24bc0cfed3d3f851abb24e6 SHA512 1161a2612ab2d3a5e87efdf144baf84d0b90307f20c216cb7c49a6b13e0b8da4eb3aebc1db14192672d796cd92db6e7a6336611e07405b1fbbe2d2dcc5374625 WHIRLPOOL 58e1a7a156cdfe00b7c24d25f96eb09a017a5ef965d47d6f73b742c730cf8153c383ed2b1984e0dd3fdef9e029dbb0d4c5627f8f367255f6a08b7c51f1393a70
 AUX ssvnc-1.0.27-build.patch 1393 SHA256 87217a491943208b30bcb7262af1a80971c3dd6fc05c5378435c52e53e296afe SHA512 2cc49d8c1e2c8db02f0bf680ac80f55595b606796e1501388649ca463b25d1a2a98bcc8646992f3f21c22ac775f7a8667951002ca03d40f3042ffb3c7c432f0e WHIRLPOOL 0107bf9e81c720790f966abc17e44a1fd095a8370a9e96b6ac0229cfbc0b37c9ecf5463e955d059113606034317d120ea8766e892fade755870271e42ff5ef72
@@ -7,4 +10,23 @@ DIST ssvnc-1.0.29.src.tar.gz 552796 SHA256 74df32eb8eaa68b07c9693a232ebe42154617
 EBUILD ssvnc-1.0.28.ebuild 1489 SHA256 dc04348a531f79807a5e906fa9d82038d15b218a12b8702d439d3c6cb63e90fa SHA512 9183c2ee4a63360650cecde5dff8a636ffbdade917b4b79fb341a67021a9cea35a6b1060321dc921af0b9dc3fce260d9a4aefd4372b0347edea823fed1b77bd4 WHIRLPOOL 04c18cc71113b4240cb5b3cee1d931534e2989d390f079b8cadb862667a386c2330e311c2977c90e3bb9116460031e7d0f0328123107bf8e2085c2c7beab2715
 EBUILD ssvnc-1.0.29.ebuild 1487 SHA256 3d55153b9b97ebfe209c60c294ee0ea4b9e8903fbb7f4d2f805dfdc79dc925ab SHA512 42079f37671ee77a34df5119aa858889cc6fca0866fa548f1cc08758fb1caec0433f3b92f46675c627501e2f1bfac3c52de5c6df5bffb982ca573f9a5bf61ce1 WHIRLPOOL 7b1088b0eafd34b6e54d43fa50cee12a2bf3c75d168db53d1fa4c5204275f06eb9db584e0c26328092ab4a8e84df18302e34dd9cd7a699cb83a9e57c6f89ff57
 MISC ChangeLog 3837 SHA256 54d1a0a77d57de8703af648414050e5554447a2fa21419651dec7550eb01a144 SHA512 4f9084d9548d6e372122f0d97b8f5008ae83ffcdb7aa4696c1ad559923dfad2e7fe38c3960687d499fdf2656352ef0cafbf2be0286b09ec7bd65ff39fb1755d0 WHIRLPOOL 5e20aa149b8cc88b9da01d70e62864fe9e65612cbdd50b0acabdde90c0e34bfc73f35ccc764234ec0d1b58d2018ee9d5b9f167e83a8fea69704ce65996ab301e
-MISC metadata.xml 200 SHA256 eb63f2affd0b8e3f5149df2f2f964910eb2127b650919a9e7892fae011e2b22b SHA512 da94c752d3f451652f15c0c459caa079e1d11f37278f86da057ed915ba167688ea62ec62c3c6406200fa951f8f495e9dd782d0e12f9e315187ba4de305f13a1d WHIRLPOOL 80bd517227281caf99e291cd59cd6e5deec972d693473727c7dcd6195450ea9dca63a151e52111c7c2456831f19113008ec60a5c1a66cc3b24f8b17c74e2c373
+MISC metadata.xml 278 SHA256 c63e3cabad775a24f7d88c59729e4399ab63df89098a867d4b63c0dee1809a77 SHA512 f8d7266a7143d23b4356496543143e5d5ccae9f0c6aee982cf8a2e2e59a48781a0b6cd2b3486e0e822ff5b1976133cc4b0fe51e6854956481a30e9791f5804e0 WHIRLPOOL c711123ec69afd6bec840d5a13875b99473ad2214e533b30b3094ae4f7a6249e9f0bd09e341c72cb481db1cf578be4bbfb1a68f06d517a3f26299d834ccc4691
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVfxR4XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiFoQP+wa+IB6wsg9841cJXrwTblJx
+LG38ghxf8NTqo5+AqCui8x40r9gtFVbwWDZO98NV/Ak+bAUv3CAXfHxfKW6ldzb9
+QyjSnMYaxhwF7cGVseRKgbbcSY/KIWx+qLkWwIyECBHsFndRLkqltYwZ+RMMx14K
+dOpDa84cwPPf6me0Sv2XeFw/6Ry9dYTd1NwFacEilGCl0wQVwIDqS965A1kMIkdF
+z8gJCHLSAKoy0r69qzOdPr9XcEzucBpttdFpt0bnOnLCoTLWBv88ILJ+gWb++xcH
+ZdxEapOZCEgwJCFQkS435d0O0M0CU8ZyzLULWzdgE4nsFn6pN6eNZB+sivnlnDqB
+PMxWmKNnRwFAbO5Bdc+TZJnS1osu89F+zeH2JkoYkw03YD9K7E7ORRx4+rXiQs3z
+G0JZFwyB5Scko2u6dRHwjuH1RCwrebQzM2S+vKFNZfbpEQiagG3EQOW9dqQPOu7T
+7FziShd5I43A0suAAiKi05IKLsWaOiCygrJwi4YS5l/N2nef047l7y++WAkEt2lZ
+t++rw2i3GFKn3q0BETvCSupODtesgd3+ccobP7FFFeczyDV00VHOULmD5M43a3DD
+i6SQ/2e7WCg8l9ndGWKBzf7SSJ3fHgUFX8wBMPZTMeJfVpp5kL5WPBnlp+avKFB9
+2zXgc8GmrHDMyQriuQyj
+=JmjU
+-----END PGP SIGNATURE-----
diff --git a/net-misc/ssvnc/metadata.xml b/net-misc/ssvnc/metadata.xml
index 7123fa8f9ece..5bd7c8a2a1ab 100644
--- a/net-misc/ssvnc/metadata.xml
+++ b/net-misc/ssvnc/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>vapier@gentoo.org</email>
-</maintainer>
+	<maintainer>
+		<email>vapier@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">ssvnc</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/suite3270/Manifest b/net-misc/suite3270/Manifest
index 41572b35d8bb..aa93bd2e5cfe 100644
--- a/net-misc/suite3270/Manifest
+++ b/net-misc/suite3270/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX Makefile.in 288 SHA256 c562d7dd6d1396a7fc1232f4d780d4eec4b95640e55a329f32918d20be789482 SHA512 e85cf2775af99af4d004a18f3580748866786544b69ca7191c0a2bee0ebb2a652aaf3024f9baaa029e9c730f1765b37ee07d6f8430649f79607369feca862d2d WHIRLPOOL d42368f46f433721c4ad6c24b4aff659c308d497ffb5f450578fb6d6a19a6fc8fe18481fb323c59ff0021a7669af69cbe988fc3ca3dfcdc03c33373a39e4b156
 AUX configure-3.3.5.patch 2695 SHA256 7cae5b1c5223a80e6cb9f9bd11907ff797ba25c3428041d1ac3770f4c3c504ed SHA512 21cb462459f1c3deeb54262c72b485308d1dae134c69654f5724e8ffa1e24edcae7d30325443a8d0398ef320d1c105fcf8fe16ea3be5e36b78dac87c53914a80 WHIRLPOOL 40c0325b76ceea362279c98e026805f2117a60a94b2287fcc9289b7cb6204034d3d576e031de54bbb73033dbd728a7c118d4382af9b82defb4924320f7a766c0
 AUX makeconv-3.3.5.patch 3467 SHA256 320821f1bd97ecc585eecf1aebbafa876bf9280ee9ca740b9696826ab4493692 SHA512 b9338a042ce3132f2110b760b1db01d225e67d29811e82dfd6d0cfc316822527ff92b42d7b88e420740e5b8df8f00325c7698f1ab91203e1a2a39ec805539f08 WHIRLPOOL 95f48e129b855935c0091f9d607b363eb752cb6b99ae1d99c6d12c47341ed971fbfbd4e6badf9e20337eaf264bb0c2ec86ffa8324697f4c6aac5c65ca0eee162
@@ -40,4 +43,23 @@ EBUILD suite3270-3.3.7_p8.ebuild 1977 SHA256 edcb1814c0c7cd1702fceb8ca7da968b704
 EBUILD suite3270-3.3.8.ebuild 1949 SHA256 fb4d949b9317e0fccfc7035541f59331dee7cca2aea25a9615e1d80582e34ece SHA512 91c9a2fb59f66191ff4b49564ec0bb3cbb7c63a48b2a7756414381dc785e5c6461c392aad2a7b4d77fab77a57658afc415e537824db9f74dd0c8912fca13dc65 WHIRLPOOL 5fce954d5b28244a407acf35875f9c53b3ef71df3e4924211ba7ed13611c976c3a7f1bfe27b18685f5f1320fbdfaad8583c0d6770a93ba24a2d90a1edf77226c
 EBUILD suite3270-3.3.9_p12.ebuild 1982 SHA256 0f90911418b70df785525a4bf76dd5a0e82e8c9bba447648db0df49989f80038 SHA512 62bd2ddfe30c06b11152fb8de76fbe050404dc59b4f16c03ffff1c88c51224ec2c633a2ec8e59f6816644711abbf4ed8b63aba49548065f4cb88412c9a42099d WHIRLPOOL f31be09d9e56630d595fe726be6a06b58669539c2b2242b735b07fa8d6b857f141620c47acf92a4c9f566e8ac092799001c2815df274e47b1a9a03c39fb6dcfc
 MISC ChangeLog 9252 SHA256 55696120d14ef4af5091004e6b2ac35a3bb0ddc57189087c6d7e0f6193cea0f6 SHA512 896c1c74d44d4b5a00e16c4b78958fa56fd74690a118ab73b6e9a7145414319c68cf570c965226cb8e34fc555d76912fedb05b3fcddd189f6cc41cd8bfbc6e93 WHIRLPOOL 99928922fffaed3967ee6374e2f857d81b4c12a7aed656f5726ac73f2a0b585ceb4287a0cf8b77f0c5fe65922649df987834e4c8a7596395713ec19e1ca273d8
-MISC metadata.xml 512 SHA256 768b28537450a311ce210d5faed94b3bffaca34bedefef2efb797db466070150 SHA512 fcb1a41a0574709c48ce15c0bc4910d1c7890214ede9637ea4ec2e1bcc7b3419e6fe7e6596e69ca2b0438a97e80ed6a0db7952fb19d323cecff59e31f17fa743 WHIRLPOOL 39fd53d6f56a7929cbaf5c510b71f0751d3cc7ba592067770ee4cc3419ea7b477afa76a6e6bcd44079d69c146e530c44032d3f001b1d1300d2c955cc4210b294
+MISC metadata.xml 591 SHA256 47b859b13c4127ab0f7b5cbd8a1b30f9b205c3cfd8b0734166f109a1529977b3 SHA512 51ef398c72da261c371e2592ec68d7f286ae5fb16d38798982c956957de4552b5772037d99fcccdd8281a107f6855d833da95e30ee0c4239dcdeafcc7a510b4f WHIRLPOOL 17328a179a341df37dc94029073f27a41d19cb99d7209d8c61f87f26b7f2e0126e97b1cd5e529ec6c48e614ce53b456d1221399f80ba9a5a98f9815049d30077
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVfxSIXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi9wMQALFvsHdmld7zZTd2/tgWnOkG
+hQ+BeVaQRRAWbnZwryRmRmeFPG6SCcmwoEGvx/lmaQNhJUaRnoSLTgSJRoq494MQ
+6ECILxy4H7phe5mZF90wRfrHD1oAKiume1aHo50J8yx2lzL/7qtc+PZoa1CEXKfv
+kAtVAQBdnQtzavFi1EttP3CymSVK/Hf0x0enV5zG8ovTg4vb+o6r1G61121VtcIC
+1FEdCFmu94D/YRd/57Dxy2TB2j/+/tpX5OLst7gkkVE7vIQPuafu2FXxSkSEx54q
+k+HRiXvXlHCk8x+bJS7bmdJ4ionCPKaS/SZW2zJvUZrumW+18xTFYm7r3IPDYNRs
+Bwk6Qhw6cpFJ38N9Ip8QC9EpMiXaKE5vIhfMaqTFt36Upzh7rHWQ5RgbyDkGdMVQ
+ZiaLyLuCFJxZAGPzHlT5IZQsqD3NSip+cvQWNdfpIet8JGScs6WlpPiR21S3sJP6
+cU6KZ/2YRk2C3wszDOvPF07kAKhPxSve480HAUcYEkw8sVbdFrSGyt/ufqqWMQ+h
+/P8AVygWnhSFSQfbS4O5AnxYYT/Yk9M9IAbCxysskVOxezHoLHTzbgqobvNK5hSJ
+JT7jpSYH54E8+xtgMzHI/PCq/CmIPwzVCQxMTM2b3jtsGa8NBe5GENkKl1Bjy4ge
+EYAWH3cpR/xs3qFFBcSI
+=9/04
+-----END PGP SIGNATURE-----
diff --git a/net-misc/suite3270/metadata.xml b/net-misc/suite3270/metadata.xml
index f8c26ab6c5f1..82aa620760f7 100644
--- a/net-misc/suite3270/metadata.xml
+++ b/net-misc/suite3270/metadata.xml
@@ -13,4 +13,7 @@
     <name>Jesse Farinacci</name>
     <description>Maintainer by proxy, please CC on all bugs.</description>
   </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">x3270</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/net-misc/switzerland/Manifest b/net-misc/switzerland/Manifest
index c6543ca6eb9a..a5e803548266 100644
--- a/net-misc/switzerland/Manifest
+++ b/net-misc/switzerland/Manifest
@@ -1,15 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX Makefile 178 SHA256 72028f9bfe85a24cb1ea7b6b9cdd20e6cfab677b43c0bb0c43fd1156a1976ef3 SHA512 5fd441aa419dedef9eab6848a1a5c6bc9b4748a9e8a19680cb110833a9cae58db1f810d37e2e6c383edee3c1d439e7f3f208a8bfa3bd6d3b2fcc8c26d2aaff0a WHIRLPOOL caaaf8ef68c53e1b8995276aeae6f670c3b2a59253f97c7956bf7f3fa6b285ca08c43e0e80080502fd5855e8aa62d785d97de4260e1abaf3b385d8e62e127bca
 DIST switzerland-0.1.0.tgz 592922 SHA256 759d7a3dfda9e71ee309410c741342393585e9a0328d8f0d7ebf2049f319bd60 SHA512 3a5474c005bf45cddf8eede7c1e2faa5855bf9017f5c732555cfe2c8b7b82381ea25c2ada000a9945a330ff3af19f1e861a11508ff057c81a78eab53de1d0cdb WHIRLPOOL 8ac597d03a7ab39af9aad817ea850a5376e5fdacc4879df97a46fccfd97e7cc418dfc70f964873e618d8e9eee967b37fa1de80b5c75def0eb768219103455e0c
 EBUILD switzerland-0.1.0.ebuild 922 SHA256 8a93afb08cc2afd6c5649fe119738876c8a63b8059c524b0bee09bd0019baee0 SHA512 15af5c8b935031c26a98b0614705fa2081760d07d1f7ed7817d60942a5c3d6f9ee1e71459a1ca22764b040b6cd741919cf9ae3f59229388c3dfd9f51575a119b WHIRLPOOL 3c6ed9fb840bce5a8d36206cc55e8293eee5a7ca2227efcae3bb71d554de73b7ed59ad23e3ad71224c03dea2cc84121523dc2fd78bacca705d095a9d64885dcd
 MISC ChangeLog 1010 SHA256 c08e30f1b38ac4853dd4b741362fb6187faca0275c57bb899e8e3f2d7e93ffc9 SHA512 6d72de7c260a309268e330f68eabc374beb8a2aecc1d515ca8d2d87953325566349b2c7d1e9eb12be4e7873278e3f183dc1ac1c5f296ba0fd11a252c1b751777 WHIRLPOOL d13f0c40b1d18688d1e9b5cf9c3f3407388ec6aa00819ff2791a874bcf6fb8ef0380c56249234b22e73f882a85a3d1e30d56b0ba67ac2af3040f8ef1e9433624
-MISC metadata.xml 473 SHA256 4af1b831c61811c23c5e55156fe1f4972fede8f28608d570586e9a6fa0a9d477 SHA512 8af5af9ae5be34e14bbf8c866bf9769afd7c6b6a1ce9c6c8234c1662d1f15f9636fb951a9d014e5c856e072112a5595a4d1b322186b8b5b2fe3115414754e83b WHIRLPOOL d74938fa092f762a3b08155ca54f754907a18baf2dacca7358859a703f1b852fff7195b3b4eb1f149ffe2bccc4b22121c7f3b50d217c8554cc14032403c3ff86
+MISC metadata.xml 553 SHA256 4affdaa63b85f6bb834a1cf4822dd84ce1f5433e27bb409ea4f15f15ca5a7658 SHA512 1096832753d39934f3ff07835164637fa7203d40a55f35a010a89d0c5ecf2f831f91c4549f774e90b4661077eae4848906c7764769d8877ce6caa9567fc0c97c WHIRLPOOL 0328c90f65b5b6c5dce80b4db2bc0f2eb09725c99e473e073683fea5cfc602370a2eb441334f2ae486f3e4ea466667102a3dc89789f9fadc5cd1b95cc7339fb9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlPJjkQACgkQVWmRsqeSphNn4gCbBaF+tuzSwGsvcDECpu6JB8Ft
-7YsAnRb0qSaRg4X96QjBUi7MIBPpecSz
-=i1yx
+iQJ8BAEBCgBmBQJVfxSRXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi+egP/159KLtLZsTqkNyzfoQskXQO
+tahRJZB2soy94gevrO7IOa8gDnqFpQFwxnZs1qG/c3zEP0LDLQ/pAIAVyxCtzcGr
+zLu83vdvHZ+zIwmDNkkq5XkvG1L1hwwvUWe1dAvu6tC2pGmwIJ4pa64JoRlWcP2R
+3sCGb5kYC9WkNvp2hNmSQcVYmO/TrdsnIjyI5JHU7gzWQgtFumrt+1X7B02PBXId
+pKdmnKUHmK5/AV2kganbTW+F1JQj1p9kfa+WduymDx4aa+onbK9HTb71IswbQRp2
+yz0HsESHrjouZzcPK27haMohzdqEd3pFunUqGNdI98ag3Fm7yCXoWSmwISsPe78g
+4JncMMjC8COjDD56SY/2/OSZWi9y+jVAHSoaOHOqw6SAnLyjix5chZxuALaZPenb
+VEGpgk1fR2lNB+eIFb8c4pNslH5hZCP38RpcQ3ds/+dpiQW0OyoHmZL5sZce2hJE
+B3MiIG8mSFsEBSatNYGaL/95JsKWXKeRmQL8o51jjKJex16jTZ7sVMBuZoJm7Jmk
+zEvEXNxWd6wnqNdNlblY+Qf32pio3kPTxlhDY5Ljxa2eHHKSaF7/cfW9CxCnj70a
+jS1+rdtcCFBt1vGDQYBti6PGVSd9k5TXBa75zxLncqWkUN6j6KWcgQd1KR1TN1bC
+6uzvmAdXLc+0HiCpmNBi
+=2XYJ
 -----END PGP SIGNATURE-----
diff --git a/net-misc/switzerland/metadata.xml b/net-misc/switzerland/metadata.xml
index dd24b6c34144..f1752c727383 100644
--- a/net-misc/switzerland/metadata.xml
+++ b/net-misc/switzerland/metadata.xml
@@ -8,5 +8,7 @@
 		packets which are forged or modified between clients, inform you, and
 		give you copies of the modified packets.
 	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">switzerland</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/net-misc/termtter/Manifest b/net-misc/termtter/Manifest
index 9b36217bc441..a4278c4fa9a3 100644
--- a/net-misc/termtter/Manifest
+++ b/net-misc/termtter/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST termtter-2.2.2.gem 1506304 SHA256 2b91e872f6dafbcb7128352b3aa95ed8397c20dab872026a3e2bc4b582a25a74 SHA512 f3df3ec14172d1b6235a0acdfa20fc8fdae0cc9151d7b887d8f60355b064694ff69663f54a039e0e075067baeedf804eb0d583dce616adaa62a75db9f44d1cf4 WHIRLPOOL 1afc095b87ae2b20397d292ac84c970fb1bde9174eef8a9e79671c822cb56d5372ff635d6458d3a9c2635901f248be7f77a63f5353909d85f8521f6b5611bbb1
 EBUILD termtter-2.2.2.ebuild 836 SHA256 5d7d071df37a8d781471ce3ab75cebf2468307713c015a58a5e5c2289915d6a4 SHA512 d4130a87896b27090a5f5f4b6a73b69ba8264019dd6e3a23c8a47b23a3288bc87b6858021f08972da1991dac91bfd490f12e0fa68c27b92dbaf6cbbb9feb9641 WHIRLPOOL ee18061bac18591de0ff943cb0bce30ecc53d41771f0a3b63d26698d5d4416f889d100033e7423210fba1b20af0e95bcda329eee50a9f86424c2e7afdc57a23e
 MISC ChangeLog 727 SHA256 27843c49738cde857112527def0bc83d253d31048b076d699cf1d27e018ce797 SHA512 62f2082a79e360671d6ebef0ede44c0c8f7cae1e96fb3397ffa74a09949ca212689846549eae71715b06eef7f8c288c4c7c55cc1ab00fc6f46d501bdd75281a4 WHIRLPOOL ef9f2208061ed94c788c2cae11462af69256fe702f3eb11dd53726202a27b58da79ae96a601ed95c6f0cb5c5a0fdac35bf78c6d4ec99a11df723d3eb3dc8598c
-MISC metadata.xml 200 SHA256 18465d6d340f50cd04424fa8fae519ab58e37da2a4c4bdf318a9467e5362292d SHA512 967200ffa0f8608e9f3cd7a9f07ebc35f549e00ae4f1589149e39340b0e8b5dc4c473c896e8653fe0313aa134e28595b74d28a38204ab0448fe80c33ceb3f948 WHIRLPOOL 631cfe7979649bcfc35cb3cf5eec6c2d4526063dbea437c4dca72ce9e49aa0d86ddab5e36a5ea8b87a2df421faab6d12afae16f5511946c2a6f97eedb7ab1b21
+MISC metadata.xml 292 SHA256 4d20d0efaa2f340d156992d9ac033941401b285074a8a6ba39ab74f78129f91e SHA512 d481155ba5bd7158d2e96ebdde7c53c1a2db058d7787bb8bc42f0522a8048fd596fffbed6bb4b2050eabe7fc7b7e8a9d4589d488dade99fa861d66b841ed3b2a WHIRLPOOL fd20e7d828487308a2384f3d15f75b269c30787d467edd0b4372e3618b43b0b1e3dbe390ded8af73a3526585271febbe11ab1a529da922a162d4d0440ad24158
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlPn2ocACgkQcaHudmEf86o4PwCeLBl0tn7c//m0gTB9q6Jhky1M
-hD8An055jOJFKBySCIfUUmIZoSnj3/9S
-=RKYO
+iQJ8BAEBCgBmBQJVfxSZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiq8IP/3o01bZcqff9xOjDrC1SwTTW
+jZCXnUv+lWmwcblHNJdYudIBqeWsiNx4GQkAh1/16fLk4qHBGjyD+DY4mNXvlAwR
+dx49yRdhPz4mnbs8BrSsQb4KKZ37OZ2PR4HEbIZyp+m4fnbyk49Y+0iCu7VKd8we
+1WBmHKrBDxVu9LnK3mJvf7yGRcr2BUMo9lwX7P2xmGtlFpLTRaAu38a1XwJeWJCM
+XuN+17FUtM5ECQ08acljauoSTyUn9qmAcd2A8yrDU4fa1a+QA4TiLw0vtoOiMY0q
+W/4Hn7Dy2oppKectr8p3Nb2yqk9xDtasU5Yzrs755S0B9IzA9h+IC0MZ1+9SlBVn
+vvv66wN07oN0Xd0++L2kt+RpPZiJEyUFZF08XVdguJPqXlMzQR7iVYWEKDx+Y81u
+GI+KpE0ZteLqGZLHOgiJn9/D9X2Bt44MNJEoByZUPPG/Bkv2u7WBtcMZMJ0t5cAQ
+4apMQLZ338UKZHkerQeGSBql/GyFagqa2IcsaZ76pn3d/NuGxuT8wgjjzyyd6gT+
+9lRtEvu8PTft8y5OVKHEjEnBVCy3tRzpOYnPxHlAELbczs+Ay+TU+QHzl0FwTuD8
+9shx85eBMP8agMhhpUpHPiJGjQXyTyJ946r+F/cqVv6uIgP6d982mVoUfN5Crw/r
+yX9hE5daA6UMsAi+nYgS
+=BSR4
 -----END PGP SIGNATURE-----
diff --git a/net-misc/termtter/metadata.xml b/net-misc/termtter/metadata.xml
index ac07e856ce8a..144630fc407e 100644
--- a/net-misc/termtter/metadata.xml
+++ b/net-misc/termtter/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="github">termtter/termtter</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index b96574b6c0e7..e6861339a29b 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 1.3.1-CVE-2014-8240.patch 2541 SHA256 7df6e5e361f90c9f07fc9aa0fa1e2f930e99672bda8be4ef7e8d73d1c5cb3d4a SHA512 ce968df98d3ecf443ffd16463db7e906b56eb625bc70252377797478a0277d6ec09c2e38f68f5406c5cd434471df5b9186987a469f350cc5e0a1d32706a428cf WHIRLPOOL a065aa26340cced6e9367ccd9731ef6f88a6fc4e7f79e2604adfb533bc58d3be22ad2ab79d30f471c1e8a34a541201043b814dd8df1cde50d19355cd2cbb2a32
 AUX tigervnc.confd 346 SHA256 48b6ae4f3e9e528b3cd4bc1349ceed3cd1a403ab0f3a2a8dd57a4769f88ceafc SHA512 204ab170de8b76d72d6fd2c3fcfab19cb2750eca231956f53cdfc81270baaef9ae31b08ce53b103a737045ccca8ce0b7f9649fb7cbd582ee0acff437ff5c85b4 WHIRLPOOL 9911713196cb57057b2200c0303b832fe7708520453cbf4ca1b9ed945738c734afff3f4d1f96e361e487e59b39f3ef44ac939234e1ea56e2e9e4e612cd5d70ee
@@ -21,13 +21,23 @@ EBUILD tigervnc-1.3.1-r4.ebuild 5026 SHA256 834f698d3b27d014d0f610744c4530715579
 EBUILD tigervnc-1.4.2-r1.ebuild 4999 SHA256 9f7d466d16642fa8889d9428849a69397d4de3f10094a98717d0dd23a9ba9f31 SHA512 55f50b8de715f258801d1bc91597312ac2fe268c2a075707f7b0b53eaf005b84193cb6f7894e29b464f090ac676dc2610d937096e448b20959cfa07868aabfb4 WHIRLPOOL 63683874cee2aa5f779840982d352b13d348996b93253a60e094d195ae77c5367be60e4914bdb155b23e4e2d84f7381f90d099ec5710ebfa61d85c459a26b4da
 EBUILD tigervnc-1.4.2-r2.ebuild 5060 SHA256 5d9eafe2db14bcfbf9db95827140e93d7609c54af020976bf69b48da81bfdaed SHA512 10fc3592b861b5bf684969a005cd7f4ae607f041e62391606c7202d7012f9276047c9c51b790f24503b37cd83f52a0b8dd8ec879734d1c562c1e7f7b6307956f WHIRLPOOL 9dbd154ad295d490e76cb72f6e15cd70e9af197dc2564b150d51f02576c787c61b11327527242995affe34be27fbfa4ecc47043effa7e91cac5104b55c0651f5
 MISC ChangeLog 28816 SHA256 2accf9b750570af369f0a2b8bb23db0a4f032fbf9ff5a8761ddbc604ec74d281 SHA512 1d645ee4e13d8639b6e27685b78e5b0a41167bd76ab5e4375404e6e106548dff000fe2b309a249557afdbdb4dc6dc7dbaf3ba15c3acb9088a71d9520490f1b68 WHIRLPOOL 20f0137d3ef189d90bdf7663c82172cb54c25149539e709dcd4b1201edecafa6256bb20097d3081d77778529f22c120767b7c30cfcf4abd8c2b33cba325d63ac
-MISC metadata.xml 335 SHA256 821ea06553b929fa98b219ad2f17ca84dda361965182f46e030ddd3b2d950209 SHA512 206ccc0af085090fd0381f6e088a82a4084fe5e97a64ff6bea9f2ceb7b209e42acdff2c779621e3be77c56dad978afcf498b8bf1b16e9ff1bea447110ad39e83 WHIRLPOOL 8bc100612b6eadbf295f8cd008c67b587cea0e852f6f8d6dd61f9476fef560d9c2393b206239fb26c88cb20840e4c0e6222bffadecfd31ba8fd934d0437619e2
+MISC metadata.xml 421 SHA256 2bf1774e03308ea66cadab31978090ba1f841c0952b67ce0c80bd855e02290e6 SHA512 688c07897f4bdc29e32157ab6d5b0c485a9839853e602339777e21e01ae9958f6d38aa7013a438399e3de4237b4373aa37e6d679413b00ec4a132386b29c7db7 WHIRLPOOL ca29424ae548b3604f365b9bed56bf07e6454c67be780526816a353e2e75905d4e9485aef46807e8bd2647edfb282b009c4c910cbae2fa2fbbb6ff2f004aaec4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iJwEAQEIAAYFAlU9C+gACgkQG9wOWsQutdYTHgQA21wevbXUE0WsjlrncemgM5q3
-xoqNQ68Sm8/p6RlK+QEZy1JCmoTd9UKXcCcBsv2hYv4Fd45MwkHWRRtqnyo6jE9X
-pXAyjSVFonwE0faDKHGrfcGHWJOEeYhxRwwvkQgVwhpl1Z4IJU+PSJTBUjaVbIAj
-mpKL8Nr9VBi1dCC4sBw=
-=NHRt
+iQJ8BAEBCgBmBQJVfxSxXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiJSMQAJUq1D4RkcUDNPxymWPvgIvX
+teceM/OTIQtESQQAQoaI3qLAs5clzXsmmcdIhG0vieAr0Qa4OtC5slAX6DnMOzCy
+GNZKxHViDuNNz+njiL+6npv9cd9t1FzS1YzEEmU2TS5uy+XxailsUb8EE9OyniCi
+RGpb9EkjW1KifXz47aXCRLwAG71BGOb+to07PZd5EvQ0/pL4Zpw7UEjOxDej9h/q
+i+os41bwE6JemlxgG4Ny7XOqpHq+u4EPCuX4rax0xpqL6coHpT6DVo47pjHiyMdA
+Buzv9ktddCEA2GMN0HRU1ZOznUqXQrY/wayqt44zorJMCL0z4TGDRL6W/3gTqFIl
+cOihJjdo4oMG39myTYR1qjCkM3Pc2o3KrehXxHQr4f2raflE1YmbXxzZmDcOmgL/
+CmmYAXkQlMFxMqzad5laVZXNifdneIkmV2sjcuJEzUnZWJEtAg9IiSZMhTd5YbZo
+GanR5w7XkSxObuEwN8Q9UN8ISEgpfRh9yQ9qqi+6p2tGtsivHQzOwQcJDR0BCFBz
+ycX7YJk0V17+WMyqbGgAoRQkMojHu50yJPBxZAF3Zsjcz/zNxvNgPHC1CcJRbetI
+Dg5xetUZaz1t53IC0fkb09ZPovzpBl1NbK3e+tMgNadsutLZ+SjkP8iaIT+AI3FE
+ShkrcbKt23x03dssYBMo
+=DBDO
 -----END PGP SIGNATURE-----
diff --git a/net-misc/tigervnc/metadata.xml b/net-misc/tigervnc/metadata.xml
index 2a0e1487ecd0..f555d69f5e16 100644
--- a/net-misc/tigervnc/metadata.xml
+++ b/net-misc/tigervnc/metadata.xml
@@ -8,4 +8,7 @@
     <flag name="server">Build TigerVNC server</flag>
     <flag name="xorgmodule">Build the Xorg module</flag>
   </use>
+  <upstream>
+    <remote-id type="github">TigerVNC/tigervnc</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/net-misc/tightvnc/Manifest b/net-misc/tightvnc/Manifest
index 747c4c0f837c..2f7c2d6d035b 100644
--- a/net-misc/tightvnc/Manifest
+++ b/net-misc/tightvnc/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX 1.3.10-sparc.patch 796 SHA256 cc5f97b95eba18649fb100083704b92530f59f288c6b9f216b7e6ed83d2a2dc6 SHA512 4b9d1ccf4ba10d25c60ba8bf7db3f72a1303eb1cc529a8c15f4e289929f2bcc977910402a9f168e1a12788f003574ba6da66d8f94ca2f6340b182f2550b9f36e WHIRLPOOL 6f6e7330062fc12c11bcd701c274eeb7ebf322ac45003c69104dd0dc64603d302a0883c6ff0fa851dd09d497114ed387644ecb15aaf6704e0b7e8cb252539e4b
 AUX 1.3.9-arm.patch 429 SHA256 19abda69964903c1947b55cbaf14e0238c1fda7a5280b5eff2642c85c78d0514 SHA512 bd90d139be5d49af01b7b7630d0362ab19a0f7474d07c42c154ff67ffcf818a34d2f5a4ba51405b1f6d6cd965337e820d47c46d238688abb97c589ecdf106811 WHIRLPOOL 71269b950b4dce68ddccda9d78193871bccd6dbc0bec4f6107a66dcd01ee8021d2c4b1845d986f0440dd8790900dbf17cdbe01cbfa92a03048049464c3adbe69
 AUX 1.3.9-fbsd.patch 830 SHA256 f465693797f4631f7d845aa54aa48febfd1182a0472d18e5babf3127e57be0b9 SHA512 c80ec8644cb4aac726372df15bfa1989b8dce85b9f5b646b084e4f1e417513c4ba2c2576f427225b8e306fa7ddad4ce5d25db26b2c28bfa98b9720d033a72f82 WHIRLPOOL 07a97c6a5d453aa3077d1dbd0755f6d01800eb02ea9aac6987d706e2c534bdc1beb1719dff2e0cdc999c6554af3ffdc70182b872d1b38151cf194e917d730fdf
@@ -19,4 +22,23 @@ DIST tightvnc-1.3.10_unixsrc.tar.bz2 1780510 SHA256 f48c70fea08d03744ae18df6b149
 DIST tightvnc.png 495 SHA256 dfe4eaf3f68a4905b3ab90e7cae528449c7d13a4f712f97d8855058ed9cc3fc4 SHA512 a05f8cabdae9625718d1f9cb52c0893c4a3cd784cb074dee51b68bc617eb59759a4e8849113a4b385dfcea9d3e3b099adb564a6655d6b7f4c5cc87e275714065 WHIRLPOOL 152fcb14f72a2907d3a0751f478033a3c3d0d9a73f6aa371315cd76d73ccda32c4e62bf005828ccb19926d813bb9f65cc8cd27575bf63ebb280377b4412ffea9
 EBUILD tightvnc-1.3.10-r2.ebuild 3766 SHA256 c196e377c510a7c98fca64932e785a3f0f5ea4d97a53fe35e47399619f9d9ecb SHA512 b4d8f23f3225a6bf474f2ca29468de477dfbf1b9010f25042cf4e0e45aedf5c3223173de31e226a034a309bcabef4c46eb443004787dc789321ca6ba5139ded3 WHIRLPOOL a48725f8842f035d12a7466eb192a4e70404ba15837d2591f979887c10bc11c4b02febb560cc3ecb1ef1e244cfa384d0ab0184ddc960ffa4d369f1742e5f309a
 MISC ChangeLog 23551 SHA256 79099d2ffbc3c0c425757d9fe2e341a57bf8755cfbe6d4970a160b23bfa4fbc4 SHA512 310187a92dcbe5f59ec11bf63cac2cac97b89dd365063b2bceff4a93681cbf629d18c9dc8b4f1db80550bfd7c8e6a3c8169bfaf1184b80e28f7e568c975a5aa8 WHIRLPOOL 9d53d2543d7c7275ea81b723c96aa1fe5923844bad82f26b0c6974155696c4f5cfe9df49b4904eb9312429c4797093b9c9744024e41e574b3b356f35ab607d1a
-MISC metadata.xml 278 SHA256 bb79006f6a44972cbbccc875bf7b606e0a01b35817d5be7ab44c4c2bfa7343ae SHA512 6feeb76d2d3aee6d02fec1398516a4a5268aa4e5d0f274f6fc65f66ae1db8497e26847ec10c16994b03aa64373886e4ef5bec4f6a38693a89a198c26c1853d23 WHIRLPOOL de12d4e47420ad778cf0794043624465e2882a9fc5ba02245393303bcf9aa2642cd0036425bd06022812ee6590016ab8a8528ce6eaf7316aa5f162d2bbb978d4
+MISC metadata.xml 361 SHA256 be240bd616bd60810bba3d4314b7f290381396e5a026f6c62cb602af8efe1bf6 SHA512 184d13d7ec9b1853f28d9a84401fa1a1c23ebae733af53121ce96178b955a70e3ae3752513a1b3a95cce6ae8190e54a584e891614f3eacca706973714a98fbd5 WHIRLPOOL 3ce8d97fb9dc349469667a32bf477050bf9b552449598708d37a1ddf1713acc3ff77d13eea12a04659984684e1208950fd4a5a999da3f0cadf0514508f0c4db2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVfxTAXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiRtYQAIvxtqYnVHv8Ue4KJAoN62XP
+lZ7drNpNDeHaHMKmehBjU3weagODXfAHFOCtGZc4LdSV5KNS8CecQAoDulcrCvsy
+3hTdvOslxQMigTK413pcrymXE8tRrbIz85U1ITFjYcN9NYv77/nuczgWbdLlu50o
+7O903KPmKUA/jl40uF2hfcTq972z4PU+Y2HC7GgFjoTxYYXztumlJPVY0NPLqB/x
+gC6h4EDeIH3jOZoQ9x4lTug+Y9JQLgI7i2gKbMHMi4nwLQc/iKuw2jNn+w7cVX+x
+K/nCEbQGYIkSSVAFPjhVJRiTRYGNG2Iqdv0ZhS/z0mMOSybnySGG0ufS0pDqlvp8
+fkyuSOgL8varj215MLLdQL+6bEvgxFsQ4IxFczsW57yVh/DSVOqOFPzUncoXUGMG
+IYtC+lkVnbF3VhNc3RglYZBCH36YNK3kyAthMNw0oiz9JHiYn/B+wEER0blm0hPA
+QTJyUmn0karoOPwzAD0BIpQRMXSy/Wlh9Ikm6Jr4GyFSuRueDjWPM7q+liRniUcq
+QPOrZrYFs6ZFvBTqGdcmKJPFE2eGDsZex70MjJRzJByof+Pqob05b0wDMr885d+V
+IiBC6IDKQowXgSqNpM3q+PB+e6yM1yveMRwcVn4j4OfxzkGlTrUtRJX+Q0I2Eft2
+EVcr2AVBinfcz/k954aC
+=h2tq
+-----END PGP SIGNATURE-----
diff --git a/net-misc/tightvnc/metadata.xml b/net-misc/tightvnc/metadata.xml
index cb1831fd9204..d1dc499dbdf8 100644
--- a/net-misc/tightvnc/metadata.xml
+++ b/net-misc/tightvnc/metadata.xml
@@ -7,4 +7,7 @@
   <use>
     <flag name="server">Build TightVNC server</flag>
   </use>
+  <upstream>
+    <remote-id type="sourceforge">vnc-tight</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/net-misc/tlsdate/Manifest b/net-misc/tlsdate/Manifest
index 2d6f415ff0a2..70326055cc6b 100644
--- a/net-misc/tlsdate/Manifest
+++ b/net-misc/tlsdate/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX tlsdate-0.0.4-compiler-flags.patch 2881 SHA256 2b5228ac980ea94374d25c0f731b81da678d3ddc5e139ab08508b88563e0f5e9 SHA512 19e62f532183b0332e4917b316a261951918576ec167fcaa8d1dc472bb1e040023390b61e2e73cb6bde86f4580fb548aeb46aeb706d7441e5a055334fdb67de7 WHIRLPOOL f2b603c620c61603e31715e7b34788bb4c14f9e1e5de6cf1bc08b6e473b0420a99c3b5d93fddfd0997ec4fd9037d85387e4b16e7226e52743110e6b98f686226
 AUX tlsdate-0.0.4-configure-user-group.patch 2293 SHA256 09d61bd739659a6659e8442171d4f18d1224e684ccb035eadab406fdc45c28e6 SHA512 ae0113faada376321750e5ef0fd6506d8c29988b89cb36df35056ed77f7718fc94cb0b3453241c1ff8feb2485c650abf93959c747067fe7cebc4e65f4295c0a3 WHIRLPOOL 5cbb21d9310411683a97519860145201f301b07ae1d051eef76389ff1de21547a0263356d59e1790be9e3711a7d145f919929fe9ad9fc19787a3b16efa00dedb
@@ -24,21 +24,23 @@ EBUILD tlsdate-0.0.4.ebuild 840 SHA256 76e109579758587509b13e6fafbc6d5b6b0863ef5
 EBUILD tlsdate-0.0.5.ebuild 1174 SHA256 ca0e92e579f6597e047c5d153a0ddaf7af8162ea31851536c181cc5ec9d58830 SHA512 7f9ed89a30bfd3783ae0e28e09e664d583bfea7d4922a3176dc0fb7c0c624811435c50607b514ca8074b967451463faf44e9dd29f71b3205bf124008d3c3f3d8 WHIRLPOOL c3f0c18f929bf393d40cde8c783b1ea2faa05a01a015c21f9ee8f4d16fbf017a86665b2a264d6ed59ea609347c28c80eb73db7e4c2c9320499154b8d28bfb895
 EBUILD tlsdate-0.0.6.ebuild 1171 SHA256 b8e4f14ebfde58a0e545d8ca50312b697c737389759cac2bb90e7623ca395a82 SHA512 c164a7c08ae58bde44445c77b11a13ecbfde951968fce2e817caba2809649f98d91ddf2c1eab37c1fae274f83821824635d68b5625134a03918ea3c0a59bbcdf WHIRLPOOL c4a4e80d0b632d859c5fe47d69bc7adbfbfa79b1021ebe2cf8f59e370d039bfcab8eb2c15df2aedc6988303986933dfd04cfe9771bb561c00b82e566a820f4f5
 MISC ChangeLog 3317 SHA256 d241937c2626d09abc8fbc3ccefb758a628b9f4040bae8c17fa39673a3d0f3e6 SHA512 9a5df4f364675a8afbd5b0abaf243f21d46d5a578e65b7c1f883724d14c1c32e447d7e4295065ac56ab760bf2dcca8ec3f964cf3a43794bef80612777fd80e1a WHIRLPOOL 00f714847ec604e2f4c5d01febb2e95d6e0598f43289c2d786d11c0af4946b6de4aed95cd5437fb0df95bc04aa86bbc5df75e4bf94211c52db8982833775f288
-MISC metadata.xml 252 SHA256 2a38c106b603692d0ae68df7f0d23f24f70e2b5854d52d973444c0e72efb3e77 SHA512 6dd814e063e3d7fea47648c0adfd8ccffcc2e67d8589c8d17b185de71df6654fde870c9fd80e64a1d18fba9a66de679d6d2891d0f8f8e118b76cae16f991e3ad WHIRLPOOL 0c30c3f9d9f17f49fc51a91995c87aaf2ee256191d6fda8130fad4a8a4d9cdf6c30b999bffcca50f207f3ce70e84e8f4edb5569ad3ab0d11ca3ac24d8fccf1ab
+MISC metadata.xml 336 SHA256 b4e8149d05b3d481cb2a482446c0c684e1133f0d2ea123ed8cddabc0c90073e7 SHA512 9246fd8a30c3229b683f299c86e143b5b11a6615b426095fadc939b773282eece4f6ea8537a7acd9225ce3457ef6db10055e9e0cde6c38a3a3e57ac394b70d3b WHIRLPOOL f254f56e3c42bab55b173b0ef814f820cb642ede15e68d9eb913026fc2778dff8d89f734a4bd70daf4b241b727a54fa33a2aa1aa815ea35f4fbd68072d2ab5a1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJU+fZtAAoJEPGu1DbS6WIAORsP/0E29ucxrnU7HCZQtEJyeyGN
-Ob897RLTMMAPAbVuuMmjQB5B1X1HFKi6g2hFzfNF2op/w1pLStr6tga6g7oq43Hw
-bhkH0/P75i4uyqhGUGg6bV+RTCY0Qs5u2q77amDE3rKItPJnUvQEh6gDC9IaMJAV
-UpvDmWH2Ky3zbq2tfyHyBIwCBRyyxORz0IzyfyTaLhcHcCiX3ueLWM4KIKtNEOgO
-kO4p5dtM8kevmogE55oitb7CaaE9NI02LEcYLbMnw1T+ITcaRsp8MzkkimIuQ70R
-PB+3p5hxc+IuABf82GFZiS/YTfW31QrkCOyBhfkAjrGzLDg2VrCLnIRwpSlL4VQ0
-U7XpYvL9EBNSR0jVg/UwD3ETZsPiQFL5wiVwEoGDnDqKpk58ha2wP1YJJUqNNczX
-84qwmZP9kzVxVHbKrTu2AytSDVw9fUWCUU+RWlpn46vZwvwJ2y5lSk07x2KQEKf8
-eF37YbWxkekA0g28zigXMXj178NxC24dBbh3LubQOT4WMcSK+M+MJvW5O7TBWyNn
-JPGdc5Eo23YJaWH6LR4AqDsKwPK3WRCiYwnaCEwB8N0sGdpPKWAwzf/bHPBtEoTL
-HVlCX57g93rMZ4tQ/3F6Mqs2u7UownGXnb9/iOI5ZK7GzVJqIJxYzXZkkKHm+ILG
-O8wzgONoYfW/PgOc3nh7
-=xivk
+iQJ8BAEBCgBmBQJVfxTLXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi+nsQAKR1HIPK9ydCq2GD87ozs6un
+z0rVsKEzVQyTBD6vsHLYe0MmXcLmZEkKrbmEbbkDptEEweX0KGOm3/ugd96k/8Mz
+M0uVScMEVBd+1VpcqaGWTeKTjQYGDcvR4r3WoqR/AvUmNQ5mm8wcVnDPFzxNeXMQ
+Cv5wHuu+IPebZFXGWYJWLetOr6NNy7Rsx63lh4ORg/XkxkBkGGCBtDYQSosCkRaI
+8IcjM/LbD3ek2H+317l1w6Arcl1XP/FzbQwjM4yW5c8pHtDNBKeCURGXWTjp60vb
+CAUizuixOcrvckkIUVNOviCGElkq3Qqz06txMXt/cQkoocTnqlVIoIsWhMBwEIGL
+Gau/B6D0bWcaELP0uiYqZV9jpNZCQ7IwZ/sSOzGDQbRgFQT2KjynHtxPiQD5YwWt
+N/B/AI4pnAtgwrp9tTQ9army+E4yXK+TmusjCWWhtpEmSCSYvnKFPkXPT7a19F6+
+CUxNnRuhrEjEa1zWLfBpTLBsuFaHFOBQ/E64lFgcunio+G+bhRyEANy6S5i8TibX
+4UlGSgxLZkaPl2dMkaGUBgpFx76JIKBnbQt+3/t+meycqd7slh9X4ooUlm9wk701
+qfS+fjZLEtgulgcjAjS30JMg+TqJUZwQVb3FQpzaGA+Sz5KdMGDVcvXrp/bkD+XR
+hMPdt+rHGZRgyVtY8HWy
+=eRqz
 -----END PGP SIGNATURE-----
diff --git a/net-misc/tlsdate/metadata.xml b/net-misc/tlsdate/metadata.xml
index 2be9152ce039..4fd0b3758172 100644
--- a/net-misc/tlsdate/metadata.xml
+++ b/net-misc/tlsdate/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>vapier@gentoo.org</email>
- <description>feel free to fix things</description>
-</maintainer>
+	<maintainer>
+		<email>vapier@gentoo.org</email>
+		<description>feel free to fix things</description>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ioerror/tlsdate</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/tn5250/Manifest b/net-misc/tn5250/Manifest
index cc5e73910dc5..bc5ac409b0d5 100644
--- a/net-misc/tn5250/Manifest
+++ b/net-misc/tn5250/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST tn5250-0.17.4.tar.gz 648452 SHA256 354237d400dc46af887cb3ffa4ed1f2c371f5b8bee8be046a683a4ac9db4f9c5
 EBUILD tn5250-0.17.4.ebuild 1333 SHA256 d7b3cba8ef5c73e5be04ee1d70f8021fc8584125bf64f32897ccde71551a8030 SHA512 2b761bafc5fb8600a9eecb506255596cbbcf69871cc928e3138ba36d449fe7ca7a823a04146723f888e44721956c946704923bf8cbb4acdd3974c32847a13943 WHIRLPOOL cfdb7c87209495ad8dac27e32f5730f65f15c56a2eb0538c1b4e5739c6fef42727f4b797ca94c1cc7f76cbb4779aea30bfc6ced9987e4e48e59b77597ec2e71a
 MISC ChangeLog 2851 SHA256 38ea2bf6199077353b18854e007b8a4dcebdc9ad20c4e70296c01ed31cbe4be7 SHA512 4cc0beeda93a95f494ecc395f87b66bb09cf8bed0a5ab19fb1c0c66cc9f2bb95f4b32712db6a7751be9ccd716ef48e1ebed8799dceaa9d500416e4f3ba7e5e63 WHIRLPOOL 1165be6e5dacbfb98ec004d02924eef5a2c345e51ff465a24a531fffd139acac38afa3ec41280fc178aa20503a473935fbe33fb47a2c1a23adbbb5185e9b15b1
-MISC metadata.xml 234 SHA256 02f0cc57d2e1027d594d1686ac8f5d9cb992854b3e895beb7bd4c16d67cb90e9 SHA512 211ec5e95c3c4e23bcd28ce39518ffff08105334652f58ece6768229bd06623b5b6549445ebdcd2bc787f1be65e05d79f7fab5a53e7cd69774be22b593b7c71e WHIRLPOOL 1b91186683e7f17c9edca1c2bf4e295c6f5b3cd3e5179df4afc254e6efcd1d957b3e673dbee3666b01a627634905426a19949b755b18d18ef3a46864856b57bc
+MISC metadata.xml 310 SHA256 319fd58718f5f42c1b9867e25be3828e3c6eb36982bc67be8d156fa246ff38ae SHA512 22829674e9a496fa538aeb9ace320c7a54861d06db479a31bdce8c164551138ef4d2cc5a804ba747882e49a1cdb31050a3b6dc77e5ad444d305a09915d456b40 WHIRLPOOL ba0d0fc74b7b28386d7d869983f2e0fb80ec51ef99088096df443af574e049deb0f3d1df6b0f53a3d3287395f66806261558b428198e4b04e2175b9d22f20658
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlPn2p0ACgkQcaHudmEf86rRiwCbBz8yx1AflDWoBAYC0n0EqY5C
-JakAn0DG9Jp2p7zcp6UgV6nRLI+9oEL2
-=UdwY
+iQJ8BAEBCgBmBQJVfxTXXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiTjYQAJr+pBIb4ZEzER/rUCiE3QHc
+BJ2peC6hIqCkE86TDKi4rR459GwBHhcEpQRtzQpoVJ5lxY2a9xmf+fzHAmEODCbM
+X/5NckcH6m2rhimQpJHXpm4G3qPdkqRZVOhdJLabWURRASgMdefFe1fFyUtL39AP
+VIjo2bJ+rJ2zTwLtv1scw4as5vhZws/RrMRw8mOyt94b5POYDKNDl46X3qMcGjAg
+zvabrqOhVc8OXftCJnca06LTBYkM2GnEaTqwqcgEckmgxN7LsQxv5cTw/7i04S/j
+r8SaBp/+nwJyyCk4Ee/fmr5nFbMLRLyDNyaG4b11mvMuYzKcZJtnDvuWChSf03vz
+ES+xbVlUnK5RfegPHoq0khfR0z7EDarXd6uLvl2RDD/Y4iiJ0KX2LW3Cenj4umhW
+UNagFIObcgRAvY5MmuZJjTKRmYWLsRG/kd/GWZ1wcOzo0dr9x/Cup6f+rwUtWmv6
+p0rMAdZxkHSeZ7JsoUHMIYEvgnLMsyJlVhPpKseop1fvqIhFoo89BR1NoHvwqsnU
+3SVxR7EVEZ8fzgpbC6DgDmyfVHDyNm5lTmQME+iaimi+WImyKTFMmuU8MmKvNtty
+vmadCeBpIwAknMmcxVUn//SPGgJWAenXTrpQxZgAWSNSJdGIcBRGYG1gs4FypOHS
+pkJA7fhmHr3Yeuxul08L
+=+tw2
 -----END PGP SIGNATURE-----
diff --git a/net-misc/tn5250/metadata.xml b/net-misc/tn5250/metadata.xml
index 5215b05de14e..5d6ac4ce30c5 100644
--- a/net-misc/tn5250/metadata.xml
+++ b/net-misc/tn5250/metadata.xml
@@ -5,4 +5,7 @@
 		<email>neurogeek@gentoo.org</email>
 		<name>Jesus Rivero</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">tn5250</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/vde/Manifest b/net-misc/vde/Manifest
index 07c756fdb98e..32119f4fb259 100644
--- a/net-misc/vde/Manifest
+++ b/net-misc/vde/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX vde-2.2.2-gcc43.patch 1867 SHA256 313a1c3477241adfaf0547577457de669b369a1e83876e1c494d64e0524a4463 SHA512 ae35ea5e651542c980fc7fa09a6b9e2ee250d7537396677f973c819e1be5ae30ed4b38aafd718299ac38369cdc5a08ecc99fc650e3c3d932c00b1e488bdd869f WHIRLPOOL ec3b00ef37a93f8701022e3181357a829192ce84488a7ad9c5247ce60e8e2d7030bb187021b6565274dc68294fd4ca9ce22aa9ebe4b569b3cd7eb4a3d173b3e5
 AUX vde-2.2.2-slirpvde-buffer-overflow.patch 1427 SHA256 4e21492c1ca73bba9adcd1e17f6b51b15912631ce18042bf9d2a0b618c0056d0 SHA512 dbd324250e2ddd76486c67f50f70764a617dc183cb34740b0469d99215efc3e0fdd84d8bf24e2b846a0e08b96374f66042e6ca02b9273d641c74823462ddb46f WHIRLPOOL 44a13a53651ca1173ea5fa3a10b396ccd28bf086f504069ff17476c842cf540c46e3e1db3f62e3be2bb00ecc77064af63baba49af4641e7862007869afd4e28f
@@ -14,21 +14,23 @@ EBUILD vde-2.3.2-r1.ebuild 1497 SHA256 70286290bab13fcf169d2475d05ed33790c760425
 EBUILD vde-2.3.2-r2.ebuild 1572 SHA256 d596cb32c2b27494f5592d65b748789c542bc8736361ac49781df441dbdda16b SHA512 c95bf23faf0b16ddfc6f40b96f2d2cc4c1039c31eab2e43aeacb8c5feecaee9dfe922c27230dddb985aaf045b30d58ee808d7efa0ecb50dbd4a31cc49c12e7db WHIRLPOOL 74bb7234b919ba85d18349a3f95dbc4c7fc7bd5928b0730a3570dddb4d0f3a016e7136851de3f92a30c65ae01b30c09ad443863f11cffdec73d1db1a58b9b783
 EBUILD vde-2.3.2.ebuild 1473 SHA256 625bf9c4abff5e03dba744feab7ae1a1e19f7c33ee130fc56010f8cf79776a78 SHA512 fb58629986b64caf9d683c94fe5e2be58d0ff3530aea4f0e0f25b4e46771aa78a07efe5cd5a4bacb688f3ebf87e299ffdc456752552c518c55560b879b1ce8de WHIRLPOOL fa02ab7b06c143617d44ae358d8000baadf9da8550f6651e2a92362cc2e8014fa2a44645d91cf0b42d1d736c017b5b03650e0d676d3c67a3fb53afe86bcebbc2
 MISC ChangeLog 5943 SHA256 656f4d50a1c88ac48d5858dadae8c684574bb409c7be76ce4e438b9689c25904 SHA512 5e556ecf28fd68783408dddd9d964f368109b1b02ca1733cb3932cb016dd8326958d4b168839e2aae55884c058ff1e7823815e7b268af89f13326cfa4a7822bd WHIRLPOOL 066119b375c0aae13475436517d1917e18f3081d4537dfe79a0826751bcfdd1475228f25702b2cef080ccafd72fe761391b7500322a7d411d4d8798f39f516c9
-MISC metadata.xml 598 SHA256 4c7340eb8683ae93c2a871375beef9a23c6d5bc779ca2141e278b9040515ad27 SHA512 8405dcf535a79f6c659c621e3ef043e67abee8c0ef40eda0c898b331254842756113ada50d7fa5c86c34feaa1744a250ac971e59163a2694d54f55e4e5a9a655 WHIRLPOOL 2deb1d495d6dee79e37d6457794c0043ee2458be7f367abc5bcaa94c049327712440c75b865699a0b50ac57db7f87ad2a80ca4f394c5f5eafc9a5fd6486cbe43
+MISC metadata.xml 699 SHA256 5da8b152e1fcafdf54fe2d4ba585d525317a235cbc2a9b84eaa40613eb1cc67c SHA512 61c3d205a82f6f18de043a6c59dbb5b658ff12c2a70e61a40ab01efe0bbd56cc49521b02d9c1c60b0368ef34ed1d8ce5c18f9e02700002478ef1ebc410bc7593 WHIRLPOOL 0a8e537b9cfdae4d68bbc7f07f7b7f3a95a31ae1e2db283e315dfcddc397d418043cd948d8443c26f7690e3228050c6175c4bee59da5099dc3dae59d806ccea1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT+ILxAAoJEC7dUkA7aK9HNvUQAJPpupzGN91sMO9y9YyyOMBm
-UWM2H8noSzRqyl+grzE8J+U6hWU5Oe25AxRYq47muyqcZyoBdfrt8GtuFtw6PjMt
-ljK9MPZkL5DeXO8OeR0LXPVrbPsL0+kuCsTahm/zpoG5iRth+2ReDBioufkIk+6t
-E/xx87x/RocAImlmusbKUyQWuEz1yvixjCpZy5/IXpX0hX8CyIJhIE2QspEDoXSw
-+LAsAbjNq5bd3nzmUsH0vozMOUDXxJLIdZ4DiuFxOEac0YdKbi0TipO2mpEZRKZ1
-HfzkYxzxYLDHZJjR000WFHdYLRmHPDl337XLj/ermrEiuVl+8JHKP3JYZNKs29BW
-RpVP8JAc6bGHzDB4zkhkcqSjK1sAqKMxkpKRjcMpYd1LRaq2t3kiNOQ3A1sQg3/G
-hz6H7pYbaoVg9OqvHAyLrcxlw32BFBzgwp66a4IaXOcQOg3+x94g7PGUOCuHu5Z/
-ruJlZW/4RalMCCOdyywwrvR6K1RccOhCamu6IueuF52QjZwirQ7+nTi8vV/d/QGx
-SKHSZFWPXqn/k/2gOUcfQtpFz4a6hTvUd+KwbCFBJ6mQ9zLDsCDRKV/NPNvxrRI1
-dAmpadrPl6KRu1tUzjHOqxtmCkxUpX8zwhbBJLFcE4ysVld6TFGiLn0nKpZVLqC8
-C3EgzrZthG6APsbYiBXG
-=oq6L
+iQJ8BAEBCgBmBQJVfxTmXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiG3sP/2NhYXYNA7i27uTH0pWNxiW5
+LgaFb90OCHm66ReEWIXpIvksIqZXI3PVbP7L4vLJIvijORiyyJiZUbVhuPRkUlaZ
+36nCcZBjArN7/vp+F1GRwddAbIHkckiadn3HlZ8CzcZa9jM85yceg7NpaSSp8YLi
+FvzsQvPicJhjxMOZmhMII1r99+/DmWPbc09E5ey/Hkasc6DfFtiAZ5YmVHzfZhu0
+ou6K7AdULmLc+1hWoUDSwdMl4JJUQOD6aPxZfyxhHch/tEQZ3jqUvuA1hMOrVSY7
+tIn7PuTMECp43RSGEaNu6u2nexjG36aT5UV1eFwK4PYep0gNdeXScRY36iUrkrpF
+g5X8DZz4BwgTns4BdkQ3NY838/9Z4ziLi64F1dAnt/i1eegZv1JPtxxqWgXN5tXb
+a0eyTcbKK8uNzWhkXEXkOafLpjOZsh/bVcXP+XzC69ZLpCFtsaRMGiYmb2nywoJH
+HUhlZF5fCdw0FqHTf4mQt5IAVP8soDGeMcds0dp1+KTk2i7shEMXT17M0JoGW/+g
+jUfJgyFJZ/U4Ph4sN3p68jBxshBWu9h8LnXgJaeC+TB2gXn1NKeq2/rS1G3WA0RN
+gyrxa0S+z+HMbB6u+lHZqf5dxzZJHFu+gtRyodSIj04bG/+BIxFigIBehEPazRPd
+roDUFVo9ZAxWCSup45Nb
+=WXJs
 -----END PGP SIGNATURE-----
diff --git a/net-misc/vde/metadata.xml b/net-misc/vde/metadata.xml
index efafaa5b7bd2..8ea7011f3c7d 100644
--- a/net-misc/vde/metadata.xml
+++ b/net-misc/vde/metadata.xml
@@ -1,22 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
-<maintainer>
-  <email>mlspamcb@noci.xs4all.nl</email>
-</maintainer>
-<maintainer>
-  <email>jmbsvicetto@gentoo.org</email>
-  <name>Jorge Manuel B. S. Vicetto</name>
-</maintainer>
-<use>
-  <flag name="pcap">
+  <herd>proxy-maintainers</herd>
+  <maintainer>
+    <email>mlspamcb@noci.xs4all.nl</email>
+  </maintainer>
+  <maintainer>
+    <email>jmbsvicetto@gentoo.org</email>
+    <name>Jorge Manuel B. S. Vicetto</name>
+  </maintainer>
+  <use>
+    <flag name="pcap">
     Enable the pcap-based plugin that allows creating a switch against
     a real interface.
   </flag>
-  <flag name="ssl">
+    <flag name="ssl">
     Enable the cryptcab plugin that allows creating an encrypted
     virtual cable.
   </flag>
-</use>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">vde</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/net-misc/vmpsd/Manifest b/net-misc/vmpsd/Manifest
index e20978ab00a2..67fe6c462eca 100644
--- a/net-misc/vmpsd/Manifest
+++ b/net-misc/vmpsd/Manifest
@@ -1,6 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX vmpsd-1.3-64bit.patch 910 SHA256 e6d57def5aff4389c656ef0bb32b10a028a50ede711ea88d5c2edfe125a0533f SHA512 45fc49fe1412760ecb45811c01e86406c4103492c5a29b99d8953dcca388c58ad157b4200a2fb9adaf73488746b8d16b168cad9dc5ae95e1e618de7490fb8b7d WHIRLPOOL d809fc10de9f1bb1ab3822ed6894330da4073e02ae52cd7f8ce9166bf63812d0f0d1caa8fa3165994d4516bafaa5e57c98aba31d2cad40733aac9507cf79eee8
 AUX vmpsd-1.4-snmp-support.patch 2237 SHA256 793afee5e7d6c43dc15bb33c7d9afe2b8c1aabf2f936f8f0c2878d74577e86c8 SHA512 fd3b9327b07d87d04d9b2f407ceb1e6c1ef64fca0ba63ae040c10e1c46739a487423a3e54fdb228a3210573fbe76faf5a0d4c7f3a4e84eeb80fb74543e42c027 WHIRLPOOL 5fd3079d82257d68aeb3ad04f5f0cf08421962d755ecc4a62698f340f1844d1ac73875c502d408cfae5b9965afa2bce8d00467b4a8a040949af8c00837a99708
 DIST vmpsd-1.4.tar.gz 92138 SHA256 f9f0bc2f7b5d81189794179b4706015ec01ce5a2f2c87d2d086538754559da7e SHA512 341a86f8db28f1f7a03b5581ec8f8319a175a2c5dc9c7ff5df880f4416cf048ef9e32afd6600220e48f8713d6c72c4ffae7d1e8d31c73ded466f084711580efd WHIRLPOOL 1ec27dfc0cd6ffc2c9f1fbbd6db716608af04ac8a972518e6a5ff12b01a05443b2665f3a27e7e0835d22df1ef40d0b4eb5490ea0bc2a5f60859df8c83e801837
 EBUILD vmpsd-1.4.ebuild 1092 SHA256 5695e111a0d8421800fac652330a937d3fb9af1b430566e4dd62f28e660a5f19 SHA512 0640653c2313fb432ccbb0ac848b070a3d22c1717ea24d4f937cbcdca36ab3c3f121c7c0d079500593411e332d777d270eb89a0d6c2de1eafe48ce401d0797a8 WHIRLPOOL 1fe836680740e9bf7e6a1bda33a11d6ad8ae1f20006a383bcf53f6d5020d572ded21976acecfe6f86887fde65ea65c1f9ee5d4ae41b48e492d484f16483f1a14
 MISC ChangeLog 2398 SHA256 7870bc253d508a202f90719d5f24d8540a47805223a0b82e1050e834bcfa940c SHA512 7fb03199a47600c551537468594c743b0f05eb61efe0d0e8b0c043f1ee66612fcf61a229d5d504d1073a63b82e1ac7571a346a3b43887ab4f7e7b2faf34ffe2a WHIRLPOOL b7fac8e8b1291a82ae8264e9e7c9ff629d97e74a780e8d0b87d047ffbd0e50aa7d41d3f632fed8ab2f8c9467b2fd64bf9e7a6ac97941c135a86ab6216ca3ecf7
-MISC metadata.xml 204 SHA256 b28c87a01f0b869865644e5a7d958e19aedb2e9b9c48d9313de11e1720b15ecf SHA512 ca28d5f3843140041c0b64739c3188c3d42e815fecdee7c7b5fc1679594d1440683e60e5437313cb04db611389ae583fd9e14435e511a1b897db5232825cccd8 WHIRLPOOL 2dec8b6fe5c4d6d258ca0820fcb6ac312745cf96642ac7ce72cf996213aa579d6bf0e435523e436f5ec4d8f39adb480cae4830091f9d23c87413ec15cf150d5b
+MISC metadata.xml 286 SHA256 81dfa9844a425812a0276bbd05108abd1da29d5873da46a66de6a82ecc3b84a1 SHA512 10433a52cf623733b1dffcb36ff5d2445c7492956efd87a7e8b2b64bfd00b12d08db4e8398382dd4376fea8dc98121b8d3b301b96de48d3dc645ca943fde7152 WHIRLPOOL bb7082467443fe12e6e5b6a24d855201d0be419d06d0c837a946e62f094e46c1c3c1a483d639a7233339d450aaba9e358c22a49bd44f070436dabc90a8c277a7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVfxTwXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi9WcP/iaumhzeIj85JP/26FsnimKY
+e34SIkVvaxVtkQBTT/nLzLWHGFnr0ycRQDke2nOUssrsl8f4NqU6meHkWNbbC0nG
+jGcKrfdL3xu4r+Im7pNp3tJUF+TNKc4zIQvfZ8ORPG7w56bdP12Pq9o0sWCDreV7
+jU7IinurukemdFpSKS99aRy/YzOajku6RV3kbO31Alh2SE5jBo4FGKtZavif+p7y
+VGsbtztEeav+jnrP2Z0sq9aiLmRIiKGxBvMfKzw6j0+eIAWwiaKkGbMa8RKwnzci
+6Hst2QCpRGmnc3ydMsU9lEPDse1yb9JMF3Th7rmNpGDzhFIXU3nH51KoG+9ShE5/
+zKdtoQFeF9WJ/JT6ai3yofi0RGokf/mhSBP0ws8xYZDJF6AK2aUa1/49igJhJfsc
+8xx0UywxLV9O+9UljhyP8r/qAi1VNlN/uxctlMsqXxKn5cR70Z0doShjw4sQvGpe
+X9y7bN0RUkrL7B056Mhv4wGvqEPHsPaZ/e/cqmlneftxf3q1NJnVn1suCh1H91In
+CRgavrVzRb3QeVjb/t5VF5ZaGFXAivxllXT1u4MKc2qLACF2p5QrMmwT+wFZnW2O
+hdj9UP/tmFIG6Pp4VOcQgZ2Ja8TR5n2MqtpNBzFvLVJtSO9ql2yig6Aati/ulPNH
+Ri82NJ52cWTDlL7jy0Ge
+=ySkf
+-----END PGP SIGNATURE-----
diff --git a/net-misc/vmpsd/metadata.xml b/net-misc/vmpsd/metadata.xml
index 64b02271f478..f1d10859a0d6 100644
--- a/net-misc/vmpsd/metadata.xml
+++ b/net-misc/vmpsd/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>
+  <maintainer>
     <email>robbat2@gentoo.org</email>
-</maintainer>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">vmps</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/net-misc/vncsnapshot/Manifest b/net-misc/vncsnapshot/Manifest
index 2433a7efbb6a..a45b7cc86b98 100644
--- a/net-misc/vncsnapshot/Manifest
+++ b/net-misc/vncsnapshot/Manifest
@@ -1,16 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-AUX vncsnapshot-1.2a-amd64grey.patch 408 RMD160 16c4a65f8b4fabe740cd5a41b6c502eb7be6eccd SHA1 6d45d4c64754a7480c7557e7e38b6e72aa217242 SHA256 04f97cc37e33d0925521ab9b3551db06a1cd7e0eff71c5b2eeaa7528658e6318
-DIST vncsnapshot-1.2a-src.tar.bz2 70121 RMD160 2c79eaa84943efbfd8b6ce5d3e935e08cdea8261 SHA1 fe948744a320fd6a52efdc8a76b90f41ef6f295d SHA256 ac490c4b3810d419c65cdfb48d742ca382218c3c0f04e7868520ff9a06149ca6
-EBUILD vncsnapshot-1.2a.ebuild 1106 RMD160 a48bd85584c7b0ab18a95a73143ee4644866666c SHA1 8bdadabcef45e17ef471e5a3af345862dc894ff7 SHA256 c6758d4ca422c70b5cfae257e8f67b06129c32fb48c7ecfbe634d3c63aab906b
-MISC ChangeLog 2008 RMD160 943f87ad3d4b0b4ce0ec9930cca56eec944b1b25 SHA1 e5e149ce86409041daaf98a64b8c76fe0bfab247 SHA256 4f8435ce8c5b5675fbd1287b90927b670c37ae74e9c73e067c8b29e17530f66a
-MISC metadata.xml 268 RMD160 01696164cd82ae0617304a419940adecf5a9d222 SHA1 b52a9b90dd049bc8749bc0d25cdfddebd447860f SHA256 2089ca59285b2836a6ec1d5aef27f83d580e922212301f0b1eadb04400eb45eb
+AUX vncsnapshot-1.2a-amd64grey.patch 408 SHA256 04f97cc37e33d0925521ab9b3551db06a1cd7e0eff71c5b2eeaa7528658e6318 SHA512 b5a90a5917c71f5d30608bfa8316ac052b377e024d871754fefc7f1fa13e29eb49be587b5c99d65e9058c65a914120c646194bb25ad114220a439642f3e24ea9 WHIRLPOOL 2b2c70b5ecd383abd362de0441173ad40fa60ef3e33d3e47c7995087971996a8cda41bd4630cf4aac3ce7ec817eedaa8aad1b8b5372e465230ccbee15c22c0b2
+DIST vncsnapshot-1.2a-src.tar.bz2 70121 SHA256 ac490c4b3810d419c65cdfb48d742ca382218c3c0f04e7868520ff9a06149ca6
+EBUILD vncsnapshot-1.2a.ebuild 1106 SHA256 c6758d4ca422c70b5cfae257e8f67b06129c32fb48c7ecfbe634d3c63aab906b SHA512 c53d2b75f2ef77c5c420290c06161cc3a0ebd6cc16ea3c44f2b2cac25276ebdf3a8c774e22a52dea0639e45e82f8fd62da295166a2f7ab72c311e2ef57292928 WHIRLPOOL 492643a7cb7eca1626bc4ee1cf7ec575296419869eb08bd9e5d9c18eb4e698fa6d23f11a5c84e8a21f2e32e617404965cc3cf3f30ff36d4fc7ecaec078d1095d
+MISC ChangeLog 2008 SHA256 4f8435ce8c5b5675fbd1287b90927b670c37ae74e9c73e067c8b29e17530f66a SHA512 c27ab37942be94d460d7f09d75c4f85f17b50c64eb6946a56385fb1389c69595f7326f52d9493e6fb1080d98f4861f55c8aeab71d506ec554060fbf0117b7e46 WHIRLPOOL 1dde9765ecad71d9eb5d79427fa69ceff752d47c23e777d8ee2da984566e21064bc99619f6e540597b09e4328f1fbe9d0dfb6710150c57882fdc035d4d911281
+MISC metadata.xml 349 SHA256 6cede185e4d9fca2a0cbbe80b7019bb200aa159313a05a49bf19199dcec07aff SHA512 e3b7edd993d888c6d866f7dc69593861fa1ba69756bedd4643e7e07208a420e03c5377dfe2c9f8bd1a8f09ab6f8464a6aa3e7cd1bd649cee2a87b21cf171dae0 WHIRLPOOL 4124f1cce52a616031a4b3be3648a2d63d36b95cecbea0ec5c30b45b1fe75f7c31af41afaf777669888df831cc47d6b1acb5bd9dbd9ef2be5b10ec19f36c615a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-Comment: GPGTools - http://gpgtools.org
+Version: GnuPG v2.0
 
-iEYEAREKAAYFAk/ooxgACgkQgAnW8HDreRYF5QCgrfctrjjOmoLG03sp6IXpHNUq
-LIIAn2P3DpCsLBZY8Fp7owVUtKA3Rlxl
-=tAN8
+iQJ8BAEBCgBmBQJVfxT6XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi7JMP/3Amv+JbETi0muXtJ+i1i3JB
+X+kCraj5nz+zoRBuwpIUFK4GS9MnbGOejwIrXhUDp4H39ONnTpBPNwbzPZd6ia8N
+FAlB6pDQcQG6UgQxblJM2eUgMqu2n8fmJET48TLuLzgd3LwH3Jxagc4nCjFOP9SA
+Kd/CUo935weqAom0RJfBYjmvYRCLkH0dde1mUqBXUYkpM6vRX7kow+ASukBOqhdI
+G/3r5FDytnr+lBXeczEbcmFW5j22r0+S9Q7/PQNPxu/uclWfARBRkrpQqiakUcGO
+EfdWRjdghdF3B8vBXRSJF5wU/T8RzvaLCvBfpOa2fHOkvrc9uZ7bHtetlks8RuHa
+++6QW5HfVWDmNXNlQeJpBhvgxJaNKRXouQaslHQCC5W1wWgiQieLVYk6HUhtB7tX
+l2/7sEncIIqBpZXM89bs/OQ2DNRXCor/JIzs1XaPnMVNndxSFAdDQ355gkIaqCFn
+z9j/d1wLiycp+xAwPQTIOjMv9LFYSQ+jGh/VvFk4FmdYKAq1wZMeU4bkkINxYOOA
+FxZ3HaOS9+qVxYfJshsBCozgFID786EOyr2t0XiwRbdqoxB8UD/AcaIfqulSXyMb
+wEGdGAgNEIX3lVr6pGpxhuKNoARqgMaTbniPQHq50TUJXgGrTPp41HvowdJv7gf6
+CW/QlbV4PbKsU5EoCqG8
+=Z7Xf
 -----END PGP SIGNATURE-----
diff --git a/net-misc/vncsnapshot/metadata.xml b/net-misc/vncsnapshot/metadata.xml
index 59e2b8f78cb5..09b86bb5a8c1 100644
--- a/net-misc/vncsnapshot/metadata.xml
+++ b/net-misc/vncsnapshot/metadata.xml
@@ -5,4 +5,7 @@
 		<email>maintainer-needed@gentoo.org</email>
 		<name>Default assignee for orphaned packages</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">vncsnapshot</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/vpncwatch/Manifest b/net-misc/vpncwatch/Manifest
index 224b885bb30d..333ab1a9f371 100644
--- a/net-misc/vpncwatch/Manifest
+++ b/net-misc/vpncwatch/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX vpncwatch-1.7-Makefile.patch 504 SHA256 30781bf43fe67e82360b7223b6d46170eb66e1a65612f3294534486e6e1ae085 SHA512 4db52d9907d16fcd6c75eba0c40f7a01e50c2f7c0d52e7c3e8347891520d36ebd3d05d3a608559db5af782c59e2c60f553dfb999ad2f6d544ad6a4dc271a842f WHIRLPOOL ddcc30b0d4fec67b7f21ef6673219831705d00e6a98907f0145fd94f8ac082d11b6f249c33c25fcfec34206cbffa4cd36d7b381d13aa7304ffde6e8f08c0f038
 AUX vpncwatch-1.7-gcc4.3.patch 247 SHA256 91cc47c5290319693dfebc3a9e9427ca204990367f1a3bcd5374dd93480f1578 SHA512 dc8daba5cb1d69234cc838c1dcfa4516f4d83ed01132a7c4f9f35c034005ad1c744169310f31d53da6b463bb40d10242db41300de93aaaf2626a77adde05e8df WHIRLPOOL 6e75505b3bda0e02669fcade67bc1b48e5a427ecce8fa4a16ac6e23a18907ecb7fe8a0d7823d5102aab358cb8d47bb42bd64c6ca677f278cbc2685f584df1fa8
 AUX vpncwatch-1.7-literal.patch 419 SHA256 b62d7776fa68a83ae4d0022ed8751eaeb731854f1172401f36095be012238a32 SHA512 c0d9eed8440c28df0bafc0938fedf731f7191a9de2d32d4e73c367adfdd3cdd0a1e5e4a54e19d9a0ce95ecfe57b2958fdc6f8cc7dc4b1d28f342dbf16c4caad5 WHIRLPOOL 8d714c7e623fafb9e44d6907e8d6d09d311a930445aefb722d75454e83529bd28237ecac8733eb2a652cd078227db3c7b7aed0e5cc3d8a1455168b1f6bc6161d
@@ -8,4 +11,23 @@ DIST vpncwatch-1.8.tar.gz 16356 SHA256 bc5ea19ef4020ed7ecdff3a7c4bdf981590c1a7c6
 EBUILD vpncwatch-1.8.1.ebuild 660 SHA256 a94bd240a45fb0030893dac4dbc724d1f4d57c38bc4080da77dfb1328d7ee2df SHA512 dbe31196439dabd3f6ffc31140e34570efce13b61c91b85aed1b67fab45d5b8b9c1a299bb50b5ff649017cd7dc1feeab5bb4a959b0fb08bd68fec11e91d46e41 WHIRLPOOL d129ff8486a4d324780022b0203dc3b097ae58e2dacd38ab1afaf06dc6180c702bfe1b616826e2de3dcace7a06a6ab80e6ecd7ae5964ff380a9bb2d863383d0d
 EBUILD vpncwatch-1.8.ebuild 660 SHA256 f0b6f1863a85f8932faf212427d907060112cf22a615165bfd8efad32bd6920e SHA512 971fdd014ddb8d5de2ec25498010b5dff6fa92ab904e4edb02b0376ad9b9dab129f311cb6546e4d2f0bd80d9976d147a27d7fe66d0a61653df26998c6694209a WHIRLPOOL 8413d96e1172008f5abf63f19f17a79b6f13b777543b952e036f64b6d77c65abc229842dc292f5bef907d2ffd6f85acaa2957203a89dc78291808496c3cfbf35
 MISC ChangeLog 936 SHA256 a1fb27cb8ef3e8fbb2181b7f91ace489041e77261aa3908d809f0715ab4077b6 SHA512 3b93d4155695e3194e6102cde8fdf52efb2bb9574c061ea26b58b7f7c9c3a8943b0260369f9dfe7bba9d75283a55b876781051812fa901aa03f74031253f8ae8 WHIRLPOOL 867efb181a338f7658399b4941a5c6f5c229a78f3702634609c5d01b5a47c512348336858ed5561aecd7facbf3a433348ee75feb8673dd221b743c9bb7cf8122
-MISC metadata.xml 205 SHA256 b4660d1f4b47c8c40fc6f986791c6da3f0d7513fe4489a0d2bbb83346dcb1f5b SHA512 0e0b6e89b125b4849b4164e7cabb5297ae930c4db499c6685c3852a60e209418c26eb33e452a0a78e800c960ac5032f97d436bc3b7266a0ac76092f6f2595d11 WHIRLPOOL dc3dc7c840a6640b42e3fc981c95d0a8e43d3b5834f447a09deebc1b35dbb26e48c3d85db73725c42d2036edd9f141fb02a3a9d61522861f4e97e3e974987473
+MISC metadata.xml 293 SHA256 2dc6facb80799e277d2ef7677dd7d86474d7419091d8cb22ca27d4ddfb7fdbeb SHA512 ad77d78a63d0ea674a6f3577ffb39155fad0b4057f7dc099a1fa3d2975b39d57a0815d0aeb33a8993d2ae2e3416c3d15cee9bf8559e2d2e8a8d15d0fbb9684c9 WHIRLPOOL 227aa6f60a1bf8d76e71c6c3a9be7095a35195ed9e949b33fc094d2cd44265c1d631a66a3acdf42be06d89f84d10a65f9f32ea2ae6e6a5bd4ee0c858eae25381
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVfxUBXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiZ+AQAIhIPpKU8cHSg33NTeCS4PpE
+cXRLwB/iegtF7ZGZLAWm/FfHzPRUQp92p/qlFIZ0S6mIBvjIIeTCbI1Ar45K28Ed
+oHFbkpUO4bG388uCrKYo8tyR7L8IopI9R1Q2zbOh+3Ip1v8kI0Ql50bGeWWqqfvG
+V3Ikft10iFB4lCW2bEgqqW5caV/mytEdzeOsedroWrodbMBUaPvF+q/KDbbiZYEF
+No2uh5AJ3yN1rXBfkmsD+AwB2DoOVo1rdBvmKihMwZo5Yo7FciLeAQ16c/WJ2zds
+B2GuClFiSjD2AGrATBhPyqf2dBaYcpjv9a1vljcAvW3+TPrZUlXU0DO246dOuX1b
+XxsqeYkFnw5aQe3VDCdgVdxpbOn61gWKfDpKsaNmazEruKtipsUMzr+uyJKMpwfn
+/JWsyOzp7TYpXVc/8QNljtt0WQDqcInL0hAkLwQ3ezFwMs2F+m7a6Ucq5buXVBkX
+eAwvuMZU91Pf3sQraSySp0BDLPi72NVUGMZGdW6wPRm7hbe4qdCK1HIYxn1d/s1L
+RU4gDgCDlhvUHNt2VXwTtxhvtAXsy/EBIx8w7P5h5s5z/3gjRwnOg2rMBqM3S0zt
+CELiCnTENH9MU1EigMd9NOsSykscKmAve14RvSb3a8Qsh2zd8vLYmesCrDWQ1gC9
+lOKHRiS5lT7LwF37OAwM
+=u4z3
+-----END PGP SIGNATURE-----
diff --git a/net-misc/vpncwatch/metadata.xml b/net-misc/vpncwatch/metadata.xml
index 4a00a64b40ae..128fee4d65eb 100644
--- a/net-misc/vpncwatch/metadata.xml
+++ b/net-misc/vpncwatch/metadata.xml
@@ -4,4 +4,7 @@
   <maintainer>
     <email>jlec@gentoo.org</email>
   </maintainer>
+  <upstream>
+    <remote-id type="github">downloads/dcantrell</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/net-misc/vrrpd/Manifest b/net-misc/vrrpd/Manifest
index c3567b54e6eb..b5699ede8416 100644
--- a/net-misc/vrrpd/Manifest
+++ b/net-misc/vrrpd/Manifest
@@ -1,7 +1,29 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX vrrpd-1.9-rollup.patch 820 SHA256 0fb9cbb55f72a738d77a443413a875014712e333ab59b9ab169fee661b22a1e0 SHA512 20dd64876125707cb0cca6c45363a4db05a9472a0bec7bded2665229ee9db44a8429703294cf39b53a703fa9c66b6644e89edf98d1e87c090d763da2a3b07b7a WHIRLPOOL 0eb6c9a134c2d16f99b5c5d990ce6875e88e34ae004793f5fde21e5677a738aca447bd9e4a3b582c21001466e74cd1c4c0b5c65457f4e9a03269163691023b4c
 DIST vrrpd-1.0.tar.gz 68819 SHA256 5d49eee9ecb3ceba3a35182930d3d740f771c8f7950b2327502a79c66bca2fd6 SHA512 bf855d4d196fe7ee2d6fb8db02d86941ce6e0ddac59896c649df99eb20002d23a42a60dc11ddb1a35da6bb6b20099df81e2e6114915e71d06cbc82d93a0ff82f WHIRLPOOL 34028a5bcb28645840cee636c22e647972b9f4c2ac71369168131a5ea191c39d23d0ac49850c095091542e885649da93d7c1c2bd35e8d0575717cecca892360e
 DIST vrrpd-1.9.tar.gz 542249 SHA256 b505adad5c4c8972ad2a0d8012d8193292a4ddfcb9cfa854a416f1da64c95e03 SHA512 8c719cabbd6a799e4e439dbb698af9d6e24cf2635cfbd71a204b46bd2b65c1384e53f130b663d0fcfc903d89080ff25d9c97ae4cd9f6b2434d5462cf678a306b WHIRLPOOL 38b3c21df58096473ed71e7b8ef8241ef72948758273313f39eb5052d7304cb311c4b94d81dbf3988b54ac077c929e4788b9bf73a2e2210dee728104a2589ebf
 EBUILD vrrpd-1.0.ebuild 749 SHA256 ff7f93158e4e63daa5ab3f26a3cea2b03e2a9b353bcc2a52aacf9673ef858a37 SHA512 24db56593a958a2c6c23e88561547a6f3ed2b6870224c9a1995229264658e9348e3929e50b7ba04ee569518e0776a77c36ed38eb81ad4267a1af0629546d00a3 WHIRLPOOL fd11fc166f6d0ab12fbf8b1f053c8f2ea7dd519e16151e08c506543a4750cdc12494477890b60f72f6dbd05d0a0fe201e293e25009af6d53fa798a0e4a49999a
 EBUILD vrrpd-1.9.ebuild 971 SHA256 482cc3debaa5c95a1e3ea6b2e099bc69161b758cbe19801986a5f21e64236b21 SHA512 849c7b00958b0dff240cabfd5f6289d70943f00001274bb190811dc97b1a316dbc8535c64b4fa4f03e38463fae72ee7c020b82f1323cc2eb8ed751af46eb6166 WHIRLPOOL eacdd37f98d6f15d412d6412b4aeaadfabf448f7eef069e21d5c76dd4dca1b23973bb0b2b076ac947cd58b8f4336531df85e09809e461697a5d06a62bbded125
 MISC ChangeLog 581 SHA256 cbd8b81de4af63375956949419607e09e245bb9463d86a2f72c8a8902fa0202d SHA512 62f4003f95e01d44e6b15b7bacda838b5694c2ad7de59b8269b29cf1238167f24d604903611840c8ec6730948831a387ebd2694256c385a4053cbfbdffdc540f WHIRLPOOL d222a7d67f6a7f568a82ac21c05b9bfbaeff00fcbbdb91d5a452341d7b6bf540a8e7e0db2d7a7bdccb7ed9f496b72deb23e2a425aeb86da40c8cfd9cf642bc62
-MISC metadata.xml 254 SHA256 01e5e65407b8647d4a3ba7fc968e271368b319b1b34a2df8fa891c70099a3e63 SHA512 1e5e169b9f7bbc60a3b0e19a0f21d108b6d5cdea4ab299817c8d157370f8a6a876c901aa94e4c8ef817f91fe53fe4cf029d72931d5fdb15b91b8119dc3d78e55 WHIRLPOOL acd26f78ca257d987fda8fbec98f3a9df754b8470d36fcf137b219760e9cfb5b95656fa104847c8e3cdb5b1f284ad97f3d6924ef8343c763e83f942abbeb9f23
+MISC metadata.xml 326 SHA256 14b6010d512b3dd65bbc71a3534d032288036f07dc6646f54491d9df9937081e SHA512 a1e9b73e2d32003ccf1aa5332e02972f8bf8307969e74f2b715fd8810084c668935b513560831798198dbb58a94f622aff5d988302439c22aab31dd565201e48 WHIRLPOOL 533e8209ffdc02d87a84b4e959a5fd1c61289a102251f92e6553822591334767b4f6c0490f83d3fd9cb83f16a3cd54305a798dd47c762bc1d6ec886ed69ade85
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVfxUKXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiESgP/RfvLQ9E8xMFnFKu64GUwIdg
+lHKM6l+d1QpHjBdtXcb+crWz6mCjsjhydCyYxSrCWXaJNP+hr4S7pykWxVyqj7LM
+Fhu6JxGUxXJZnZGOOQYQ+nNSZ/K/g5vCIjJSi31ton3B5BAfimXvxd0PJo0gupBL
+EFMh9HA0iN6oEj++H+m+FMWEfC4xl+l4yVTswC7NkTUAtdB9W08vcI/PNw6hmyJg
+ms0m0jkyTl/vwLOWhaTXNgYBLWiZEy8GBN+LDfLbRkfa5F29f4lzqM2Dyw70Z3AI
+J92uYAPPa2UjujKeTSfzTdr3difgZ+nYb81OB+LoosaGGJHXi4/vfCQcr5Sx+QpX
+hi0DKCpYeDiRvGqm8xM+fuznSdi2i+S83KjzSle5ib8Y9xytNw6mLa1ut9LL/8Zm
+sBZsjc6klcG2TwFq5Pn7sn0z5e2vhHBMzQTpUVLFhN0duFi1XQsglJS4bVzx2uhT
+RYsIcv9yGz0oh3ultJyvmXYMGMIwu9uDarv7fb4f+nLqkUYY79GvNKfKCIs+i1Bh
+3z7rpsIEiE5Kr7ghXt3JPAeVv3wtHdHZq7Thu2HkhKQWSGWLXu0KvIr17TSqD98a
+BO3oe7d5iJTRjgtOa2tzZM4VeO9N2T43sZ2fiVi9gU7ohE+ZHXbv255HQ4NXv1Vd
+s0TRfzsUtfR/kkPlWIlR
+=/sTv
+-----END PGP SIGNATURE-----
diff --git a/net-misc/vrrpd/metadata.xml b/net-misc/vrrpd/metadata.xml
index a732fd8b2f03..61435d907770 100644
--- a/net-misc/vrrpd/metadata.xml
+++ b/net-misc/vrrpd/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>robbat2@gentoo.org</email>
-        <name>Robin H. Johnson</name>
-    </maintainer>
+  <maintainer>
+    <email>robbat2@gentoo.org</email>
+    <name>Robin H. Johnson</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">fredbcode/Vrrpd</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/net-misc/vtun/Manifest b/net-misc/vtun/Manifest
index 2a68f388a46f..ac894a2698be 100644
--- a/net-misc/vtun/Manifest
+++ b/net-misc/vtun/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX vtun-3.0.2-build-racing-condition-fix.patch 563 SHA256 0dc70be4d65a3253e8eaecc3b5d0d0dc8ef52e023d9064fb85b488153c9ec92a SHA512 0a218bf157fa7cc20b7aa12c89e465453a80d497fcfee312b62df40c13954276a0b3b31e0929f1ad308512a799543cbe7b1ca6fff27b3c031e91b236d18597f2 WHIRLPOOL 41f3aeca992d1f4076593ac69a8a81e302d5ff3efea3d7c18f65d2cfe37253990af5a20d5ae7c764847b82145bdefd81a44ce279cdb82ff6fe15f62a679afc63
 AUX vtun-3.0.2-includes.patch 2020 SHA256 8dd0204c480437b0c09488d6af70c36ded639bf61eb1aae37e82e0039f39a915 SHA512 6a85c05ae7ee22fb576f2d889af75823a2ddd696f2271bed43fab26075443a0dc38b4132ffd69c5c2dc9e9333e73415c9311d5a183cf549fa2f681ec3bf185f9 WHIRLPOOL 1c25e86066ead30bd31ae0b7bddf1685b93a4dbcd8ba23834d17919b15d40c9365b72fa72324af311606baed7aa75e26a278497dee1796a88c4d19501187a478
@@ -12,11 +12,23 @@ DIST vtun-3.0.3.tar.gz 130051 SHA256 69dcbe4f8c5ce7d91b4150a6309e536d03b61841169
 EBUILD vtun-3.0.2-r2.ebuild 1423 SHA256 6f66472b608530b64e3399784a98206682332569110bc01e057156b20e9d05ec SHA512 99eb38d7bd2d182344983137670f8e3a0312c3a79e5709dfaaef51e5ab3e3c71037c29fa47e3e8e6b62158a322ba7337211292d4f308062c43f6b4095ce4b200 WHIRLPOOL 868276639aa422aa7090abf84b39b29f9de12d31481c173b7da5c8f6c8628a89ac9b77c93f00d5b841623ba93b8b568cac742e0c0d678a82bc0595bb86aa4116
 EBUILD vtun-3.0.3.ebuild 1416 SHA256 17839d47be4040335bf9e20057339830bd3d400ae3a087b5865ee7e7402ba8cc SHA512 9e4b341f5de20d6c50b980baa3727d0b64ebc8880b18d62f754259ecaf9ccc3b2332a7f066813f4eb6711a0dc86f8336d5b39d99b111cfc6a4b871e7966580b5 WHIRLPOOL 1811f0d26443d18eec64ebbf3a90c6b8a9992939bb21f99b8af38f9bb10efa87e9b3bf39183fa9bc312cb6a27de9f53dc6c9dfa2418cf54464e45bde9acceba7
 MISC ChangeLog 7546 SHA256 9fcd2c422ef5d7fbccd5620ef6609f60d7788fe2177995131a913a12b8f54e9f SHA512 1d3bf761ae55971cfc5b41e0af8fc0ecfe17532b134612ed018cf955df5503de131802f6d025d5f4aa255d73a70731151fa93ebdffd196da5c2b1725b365d2da WHIRLPOOL a3afab3b61bfe69d0a3d5fe65089f581c81733ceb19af360541e5be7b8d03bfead2c0b9534271412ee75bb5026cfe7d4cb8846d6abdbc26bbb877871c60d91c5
-MISC metadata.xml 233 SHA256 a93cf5c4e554b97b2a48b92f801e3a3d87833cac311db0160a387a757ab7054c SHA512 704c94018edcbc53edcf0a41c2603dd59ea217aa5871f35d4d17f7df26156b8fb0a735d2efb11b74256565db01e6790a833242de39c29a9e46ed8ed96d505334 WHIRLPOOL 57f455cf256b91fb72e642f5a861e7367961775f2ab992b8afc798ff376c9a2bc8860d09f2bc43c870531248484128c966f25a081b7789a31ba9fb4f52b5519c
+MISC metadata.xml 307 SHA256 272993e7f3319208c9dc5000a8ad79dec2c8882dd9c74af12b0e38d27a22dc6f SHA512 81221d3317703c78e53c18b397d2418b25dc1ad26857166969a5fa85a32259f7650b26cf27c1497576aa435c0bfe9d098fddedec2b5527eba5d7e0f0a93095d5 WHIRLPOOL 6905b3ccb2579c4e507b6e0fec1eddfc2abec3273786c9bc566c457b9a25799ba131f1443e4c7aca8bd15d92a49cd0769aedd093c9c5d2929f6d84e9d45bce09
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlPn2roACgkQcaHudmEf86oCAgCfaEB/u2LtCJGeU9QYyDbg1tfT
-g5UAmwSdbYOmqZj7c7tTZL8D+0GVO8oY
-=sX78
+iQJ7BAEBCgBmBQJVfxUYXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiu+MP9iFmoyuSh6RoqyK23dtdUKja
+f2dntwBTosgHA690g4DhCDTXiXphIqVCeXyl9ue815xe3LdFGaVFdUVZfuQlw8gC
+ar9uVVt0Zl5yeG6AsgOfqIjPmBzzs1n2O0dCmgD8VJdU0HL2HG437MqwjncYrZ0o
+cNrqm5Ajz2gwPDyx5cd5xQ55UiKA/PrZF3bRL5LKW7mkT3t6V+XOqPpBIQwPDPI1
+7yGouHTWW7Rz92zp2ALjAuTlu1mJFkVP3Ju5Zzwe5fICo6eGGaO+xHl0/+b+X8Ck
+MWGQ9cmzs94jNiWD6bDO/EScMN3TrvYEU/J4ZOBlK3p3bDw5GzTwKj2dI+l6vRHM
+B1Rd2wbS0SMRWh9/NK7/laYHonILKWhPnP0WQQQEbTovZwy7cPnVmfR4YUT0BSVl
+08+cyaz1uDl2+KDUmgq3fPWGepdcIiYXWJPt9xil6qj9HhV4wht2RzBnDgzFzi49
+w2ZNMKYsYgpUL54UuT85LTSZV+xS2GOulcd45aUvFGroQEF7jUreDK9//njetbdo
+RNLQcOqV8TjwA0nusPHgLXHO4KVCI+IYR5B7SpYSMq62mKBCcxPT271sSzffsBYd
+YTVXioJ1LncMHCM2m9T2OuXPw0DX49RGhAyN0yerRjl618fmyvNo0GLoJisdaBQ/
+XTz3QS8I+Nc9cfIoW58=
+=DcnC
 -----END PGP SIGNATURE-----
diff --git a/net-misc/vtun/metadata.xml b/net-misc/vtun/metadata.xml
index b6b8956cde34..433c591e0a01 100644
--- a/net-misc/vtun/metadata.xml
+++ b/net-misc/vtun/metadata.xml
@@ -5,4 +5,7 @@
 		<email>pinkbyte@gentoo.org</email>
 		<name>Sergey Popov</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">vtun</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/wicd/Manifest b/net-misc/wicd/Manifest
index d2ea03b38e1a..560495866684 100644
--- a/net-misc/wicd/Manifest
+++ b/net-misc/wicd/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX add-wpa-psk-hex-template.patch 980 SHA256 d5e45971adb2cd8649c81ce3a4edfb4bda954981767ff8a95374b062b460fca7 SHA512 ef6666158ee059a24ef41b6151978acffcd347c36f7c818567579595f9a22c4703ffbcb15f5cc37fd4c26802eadbe1575de0d3752829bc753ba0ec6abc5b95d1 WHIRLPOOL 70109df7c72d328673f67bf8086ecd11eb89dcc61cc65c7aea3ce0e6fe7b0e737dbf038e9934e9773fa4c5449f99b2d752eb3ad79200b4f099a3c970af65f4c5
 AUX wicd-1.7.1-provide-net.patch 327 SHA256 9da2b1ccbc1c363466048bb1adf91612dd68b988bca96daad79ae1f81a89e09b SHA512 7f1d9d70513a367db7b296608d9864bfc105d44204e051c4c1456e5e7dc995b1c73399e8fd5fdd6499538568dcca2b1b6af928519461abd92734d1b16d3406e8 WHIRLPOOL 9314947dcf5fbf17164b5201c7cb8a78de86143c8c4f455b31dcf16141e6f401786dedce1ebdeabac202cba9e2ded8e33edb3ca32214be425f03fb2d60c27e72
@@ -20,22 +20,23 @@ DIST wicd-mac4lin-icons.tar.xz 53136 SHA256 4c48c769c71f962415e3bd3573557e928835
 EBUILD wicd-1.7.2.4-r3.ebuild 4796 SHA256 afedbbaac9a5db98439c8d64133fd2a83fface12cba314a992d08c970bb9780e SHA512 a1b16dd3fbd1c854866d6f67e6e2e56f4a67591106cc00bafec6add9b455f2142cb58a27f903141d339460d051d049aa5023db59bab4b9fa8a54c5c65f9b1545 WHIRLPOOL 5293e720ca55ce171ec8dc8b8493a65a9e52c43c982f6a131eb82e1402db2cad54693c2a14fb127bf52329b2185d129f9456a3fdf0f0593efdab71d3d652a395
 EBUILD wicd-1.7.3.ebuild 4672 SHA256 981115cabaf17ea3bfd7689257752dd511a0fb66337f417232c195bb229be769 SHA512 f910e7a8ecfc0dbe4578b13b024c3bfada44402ee860ae31a7e09581be6e8dd5387bf41a0a07fc21b4ff45d422f2fdf862c8f059a60cb7b6aaa5ac065ab81daa WHIRLPOOL 5d2a61268a5785062194cf9b82d6f4a3aee5ae02203ec43f4c36d04ba329c3fe156a6189b5d34b0887b27da6f4e5e787b55172a0cbfb71876b75dd6f39feab83
 MISC ChangeLog 26179 SHA256 de1988d69d05efdb7659335e628bb003bde82ffd1cb903be9586cddbd37356c2 SHA512 077f44df4764372962d989902bef36ec89cb67ab8dd1cf3d4e2e484a624d91938419c05e0c009aedb6f57b5aa6a846cc99fbb035b0a0d28748e4d0b5eac09dc1 WHIRLPOOL edd6ef0fb345f1bd6a9b36f1803e721e04d6d6f2acca89ba07575c3b7f9b5bc1887665bb9bb6d6e1d02a8356b2dc53929a1c38ab88092482448b95dd43e6f4eb
-MISC metadata.xml 891 SHA256 3fd1a6b6999cee3066c0512753841e4d9c05f1ed4480de0dc95c4b81cbf90404 SHA512 9bf83fa6bbb8e77b12589f9ebff0a5b8b50004ce6134c9cd7f4a552852892889ee9c5a007136b2ce58f59a49be0b1ae5e10e62791a556edb60e9cf9ee4799739 WHIRLPOOL 82c8e541c1dd5edea8afd36a1b070bdc7070442d3bdc701ba8850f9ff90659d0aca657c458858e61b5da934ef9444e8953c5d63f4a9fcc9d1de2e72a15f1c72b
+MISC metadata.xml 976 SHA256 79ceb489ca1930b68699287f4ebb0b39474b8dc6c395cc9041a07102030dded4 SHA512 0e6882c1c6e7aa6abd423510054373866c9797ca3c7f945c6dbb6c24f7f9c68c71d4d8c0a4c8ac3cc2ea310e5e12c7b1edcac18b16cce7118c7fdbd042456879 WHIRLPOOL 703ee6a557a8d94fcb2fb9d18afa249b8105d9cb1ebb604d6975ed51617eaebcfd0b298aad3d1851fbdfddd1f0f9b3fa1d0e1a7f2a83f36d399f6d6cb14f60a2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJiBAEBCABMBQJVcKFxRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
-MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
-7Pw1EAChLG0x4L4W5rG4FTCV/tSrHRfxbZs56+cLPcbKXT1EruYrnfRBt9qhNcpd
-UWsZSmi1qgYHxYa8KwXyMCNV2ZW6bzYXWshPe4tlK00McTYIItAHWBLsI6xpFbWd
-LO8ZximCZEAmAnZA0ziydwcZxInUOumLbZOGD5vRI8Yld21pRUQBqISY2u0b2wPZ
-CJJK626TZBJ8+q7JtUoN0hG3H3G8UUGy3tY8IZpZOKnhcKW8hdlqm/3elW90pDRi
-MyfpS4uJwNHI928w0w6MYQienFv6RB6lK0haF21Fm7nxTPZOqmCvuxUoW7sHp6xo
-U8fCwF0tpl1yLZZ+Zxv8FIrBJ260luy85Un5Dhrv4oCsAO8gOfyOu6mOW/V3jDJw
-bO9n9V3rsCFcONZ1bqbKm76Eo91pd8Z54ahB5LOAO0kmsul+qy1bgBLwfQItkt7J
-IlFZ8SFpMfkNt5yKli1ITZlu3ihmwa4xQyA/g+105sj7HefwlPspGfKvWwCHg4wa
-VTCSjdkITDrjIBjGHzbo1HmNS4nFij4JSzTxg5x/6YJoZFdCFh6hk+Arqr9lq6p8
-iL42MkyHP5K7BJJ+Koe2sIwmYmUAfE7FanwKMD0x+Iud+k/4AVQBNCfviytyQftg
-5IYZhDOdvESVt5DY/sJafgzSBvmiq8m7/Q6qa4jFXzVolFk7wA==
-=aJV5
+iQJ8BAEBCgBmBQJVfxUlXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiUYoP/RjW9P+9dLkaL9O78NEflpQg
+KWRQVZ9BUCCGk8Ft8gGrzmqcPNg+ely7E0GhzJ7WkQGBoQDqJfmBP+vG3Cuwmx3K
+guJjOB0600ybsxzYp9pWlzfh4QLhWE+kEYZ65rbp5XwgqheDI15mzECbevpOSAJk
+N9Cdap3U/wZ5P9+nRiFQLdRvnS4JeW/iRQ9CWiAfMHqhuIcBIO6URxTQoqWmkbjr
+MnqFaiLvmBSQiVNxiRT39ZhSpCi0OSC4tCc14surknA5O50GNcJyuml5grTCEVGv
+h99bvja8sHs54rW9eRLu4S734ET0JeQikC7BP+7ol2WUmTnrecwXjtzOqsCB8Yup
+a6EOTpXkKt8j7ZzpGFEkVBpjY/8NVk97gifNElqzeINKGqx7UBX2AqJQP3A1aMoH
+zhBHWahXIyYqhegY7ux8nEh0HEMO+kR3KuaxVYEl9eWh0bLbwGCtgmBKkCbRd0/V
+yjLnIm1c8I7ZO6qPnlTMT/YTw9B4mGA7gVhWoEM+ppoj+FcVZrMVfsynCO5bFQFl
+FgPJziM9N27NIezJIY8x46N15xYsUskNoyyuTzqzgEiig6lq2J9Joy5QzYMjNeI/
+ImrAs2UHqMe6kryIbPn8/JRY+ik3R4otpyN3iA7w/tms5K5kuZydSNRMnYP993EI
+ZSU04On0KsLc5NJaHycD
+=c/NV
 -----END PGP SIGNATURE-----
diff --git a/net-misc/wicd/metadata.xml b/net-misc/wicd/metadata.xml
index fca7c0953231..15db7c7de815 100644
--- a/net-misc/wicd/metadata.xml
+++ b/net-misc/wicd/metadata.xml
@@ -1,20 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-	<email>tomka@gentoo.org</email>
-	<name>Thomas Kahle</name>
-</maintainer>
-<use>
-	<flag name='ambiance'>Install icons from Ubuntu's ambiance theme</flag>
-	<flag name='gtk'>Installs a gtk UI. This is enabled by default because it is
+	<maintainer>
+		<email>tomka@gentoo.org</email>
+		<name>Thomas Kahle</name>
+	</maintainer>
+	<use>
+		<flag name="ambiance">Install icons from Ubuntu's ambiance theme</flag>
+		<flag name="gtk">Installs a gtk UI. This is enabled by default because it is
 		intended behavior. Requires <pkg>dev-python/pygtk</pkg></flag>
-	<flag name='ioctl'>Installs additional python libraries to use as a backend.
+		<flag name="ioctl">Installs additional python libraries to use as a backend.
 	This will improve speed but is experimental.</flag>
-	<flag name='mac4lin'>Change default icons to mac4lin icon set</flag>
-	<flag name='ncurses'>Installs a ncurses UI</flag>
-	<flag name='pm-utils'>Installs the pm-utils hooks for suspend/resume and
+		<flag name="mac4lin">Change default icons to mac4lin icon set</flag>
+		<flag name="ncurses">Installs a ncurses UI</flag>
+		<flag name="pm-utils">Installs the pm-utils hooks for suspend/resume and
 	requires <pkg>sys-power/pm-utils</pkg></flag>
-	<flag name='gnome-shell'>Install gnome-shell extension</flag>
-</use>
+		<flag name="gnome-shell">Install gnome-shell extension</flag>
+	</use>
+	<upstream>
+		<remote-id type="launchpad">wicd</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/wol/Manifest b/net-misc/wol/Manifest
index 370fc891cec4..6914f36c8d3d 100644
--- a/net-misc/wol/Manifest
+++ b/net-misc/wol/Manifest
@@ -1,4 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST wol-0.7.1.tar.gz 445648 SHA256 e0086c9b9811df2bdf763ec9016dfb1bcb7dba9fa6d7858725b0929069a12622 SHA512 233cbd038633c4b04a22710c04a8349d7706c6b4ff0554b6899ee3309349502a318f6fb05a4ad4c80cd373c362b2ad8818cb52a432d768f569e80f05658615a3 WHIRLPOOL 36f9e9fdfe76846e9f65a2c7e83530532dc24c8dff6fe6f5e30c53659d59be926aaef13e028f23f325564a4d7b43dfbc9759b5ca9d354fb61edcf5ca46cbf7b3
 EBUILD wol-0.7.1-r1.ebuild 505 SHA256 a95db0b28c1f8693c0d3e375f9b9210a59be5d8d1098cb5ee3274075bbe0dcdc SHA512 6f884999c33c58aebabdad9c485f5cf14685aec863fc3599d36d2042f997a709763924be6898db41a7959fab779f348c2927661b2ae8ff9d8a10e6d2a450726d WHIRLPOOL 479496d78281a5f4bd692f256724dfd8d881f9590b8011c677c541d89d5515140e3525ba15bddb7f04b0b26401bba3421fa406c697576cb4adfb330932e19557
 MISC ChangeLog 2396 SHA256 64d2021e7d14f999426a4814d6396d1a109a6708e93f8e6fd2751203a2eabee2 SHA512 63c3bb732ba30c9945468ca4caf75742ca298c0c8c9ee213991bbe46bcd2f4c2c44a253766bf54dae5a413b61543ee73e2b357b7e37162b94d545fae03c3d31b WHIRLPOOL 8c7e8f87bcc5a241fa51ebf7cac2ab97a8ad3d86d184378cd830c7cf7c6069d4589984bec391ef6922b11c50e7d19b252c76235e0c117e27caad7815b94d3de1
-MISC metadata.xml 558 SHA256 a31b4a94c6f814375c9d85b823f3dd44cebc69da090969abc8020b4e0be396a1 SHA512 564b8bb31aade54139c4d78f0397bd4c35995ba51e396adb912f83020061691843a9efaaf62a5a6ee96e017102dad9fddbd995e0e7b114d75180fe8affff1985 WHIRLPOOL b07787e89d1c6375769f5ac063ab16cf81b052a1eb9489f1c83c065bba9bd0bd47c735ffd28b57ad8bacdf006caa50bae6041e3013373296b685bd7ab6cc2ed4
+MISC metadata.xml 635 SHA256 1d1aeef3861694934b9f880d005c5d5889bbd5039ce2f9152e80910725b72f18 SHA512 2e2622807ee26c512ea33ae7ae4c0d4f2259c2c4f93108aabc2ead465ae52203259de1ae9dc0e77c6dcdeb7fe7f9c612018a58a4e92218a04d90e13a3b638dff WHIRLPOOL b3f9b76289c3e02bfb1a4b3a5e7d14726bdc150ae50e5630a25454f58a11eacd67d35daaa844dbdc1f72222b8d359144b840dbca29334b0b2d75e5d54ea226f6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVfxUxXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiVh8QALKIh+fy3fIBIMJW2mDob4SP
++jHO/5lb4Mr2z5kQ5wJFbbz2Osg7snS/zSF8Fysfk39IkcvK4icyTJImnAVhlyh1
+8ZZpHyxECp1CKhScXI6eiab24m7jVhPMvg5VQb17vKu6PJWBytaw/5yD2Haecxlz
+h9gRJaakXTwpMb6s+d3OrlebMFNc8rErPOt53QBfhuEfHLyjQeBy0P9Ki+NmCI+I
+E8NClPOZ7RVPV7TvkoBtgQJDhucD/jSH0jejlvycZ50cOZEaptRw6LkkbEv6HtW+
+LikghQEntzhgsg8oLMwf2nl0EMhrru0qFLGBImiS19N60rI4/aOMRjDDmlcIllRP
+QOTkfwElOng3MCq1h+gCbgpN2zhLpgpsG8/PuEGAnnyXylHJugmFzwZMDAsa4I7c
+b+24JpB16T6NFXYLU8bvyt2ZV3dlizZi3WxPUoILgA2DjtHmcI4PAnt2u0+XYgpq
+bm9pqXMiCH1l5uDy7nXZdgOQgRDd67P/Gg2yTUE2QBpEX0cv6EXhuKOFDBBsOn4z
+HHockYZdbWG1vQ53CH3DIhHD/4coaRiuzjM9rpU8f87DTA8/INi2hW3fDzlOrgCx
+Qf2qw46/M6Y9bqcqFfahdnQFV5u0B1PK6QOIDQi2dc3FCvf2gS6tDuarG8ypMC4+
+/LP1dajjlzAMZ20Hgu2a
+=hGWd
+-----END PGP SIGNATURE-----
diff --git a/net-misc/wol/metadata.xml b/net-misc/wol/metadata.xml
index 39933d970cd6..31f0297e3ce5 100644
--- a/net-misc/wol/metadata.xml
+++ b/net-misc/wol/metadata.xml
@@ -10,4 +10,7 @@ wol implements Wake On LAN functionality in a small program. It wakes up hardwar
 Consider you have a sleeping or turned-off computer and you want to remotely wake him up. Just type
 "wol MAC-ADDRESS" and the host wakes up (OK, it will boot ;-).
 </longdescription>
+  <upstream>
+    <remote-id type="sourceforge">ahh</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/net-misc/wput/Manifest b/net-misc/wput/Manifest
index 55c5b1f23dda..6d31a23d727e 100644
--- a/net-misc/wput/Manifest
+++ b/net-misc/wput/Manifest
@@ -1,18 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
-AUX wput-0.6-gentoo.diff 641 RMD160 e725ce22fac960e6a14a1d651b9791d203c12d72 SHA1 3783cbd0886d6cf9ec0f4803fce04c6119cd4331 SHA256 e72d178f76b6f877ae4379f6c729fdb95267f28e9efd887c29abe862957c9c40
-AUX wput-0.6-respectldflags.patch 391 RMD160 e68430076fca2ebba4435e4641a3eb24d7d2e252 SHA1 0014904099a917127788fb137ba307d2a75421f3 SHA256 27ca4093b3abeb4ba4bf9c201f5a0588bab5af991d1dc7146b0431fb8fb43b59
-DIST wput-0.6.1.tgz 312342 RMD160 7089af96008eee036ba027e05d0936ba51d07993 SHA1 1c11d831b2403d838babe4416d4c7af434a7e300 SHA256 67125acab1d520e5d2a0429cd9cf7fc379987f30d5bbed0b0e97b92b554fcc13
-EBUILD wput-0.6.1.ebuild 1078 RMD160 dccd17bddda4d86b2e47de9c273fd008ff6d817b SHA1 7d0cb337d668084ecdd4e380a73aeb810164a47f SHA256 206eca7261bd1cf7a754fbf4eadad703cf21120e92d45dd4bf414b76b9f2fc1e
-MISC ChangeLog 3101 RMD160 07f315686f906b703503573c2087a2695e2ee8cd SHA1 10e3ffdeecfb2c7215814d199df37b7a33d900fe SHA256 d6256dadbae1e382f1b750b16d616db139351d55d2675988351c2376cc3b385a
-MISC metadata.xml 232 RMD160 a43d44f1c7a2cd6f915384f35a0c83a16612c092 SHA1 ba926fb9d41c071a3490c191743a3acdd1708436 SHA256 f59a9f25283f4c8163747c326349b600e83094f77fffbf99c266a8f82252d6be
+AUX wput-0.6-gentoo.diff 641 SHA256 e72d178f76b6f877ae4379f6c729fdb95267f28e9efd887c29abe862957c9c40 SHA512 7fdf3cd385753dac4fa219aaebde585427f9b4b208252f36f48132b850f28cf58934d4972cefcaf4a1f8b97eb02f32ca1b60eec2ca68f2fc3f1a623f6bf4817a WHIRLPOOL a3114f8d6b5af69e5f4024041b7e4f753655557e584c931728f67898a68c1db8e0ffae5d82e092ef541da90be10229e550d6c38a261d10c59cade2ada54a06f9
+AUX wput-0.6-respectldflags.patch 391 SHA256 27ca4093b3abeb4ba4bf9c201f5a0588bab5af991d1dc7146b0431fb8fb43b59 SHA512 3ae0d882e94b23a84b40b3c79a793dd21c7a070019fe3003f6aa213e269eef455826830e316483328507c359b0c27e5723f919d383af0a73eb0d8559954db146 WHIRLPOOL 13aebcb28c3d0d97a49deaab7d7aa60b7555c8f022ce14bab2650c3025a6cd5c0f16d06513aa74cc1f3f5fb4a5bb7f23934616b94b8d057d9a065a6df087d71e
+DIST wput-0.6.1.tgz 312342 SHA256 67125acab1d520e5d2a0429cd9cf7fc379987f30d5bbed0b0e97b92b554fcc13
+EBUILD wput-0.6.1.ebuild 1078 SHA256 206eca7261bd1cf7a754fbf4eadad703cf21120e92d45dd4bf414b76b9f2fc1e SHA512 53da9628059ab0fb1813d5cf17d760c5cf50b0c60eb57ee9e7e8345636341f1afb6f5aa7ffc18d7b34cbb3292d6f9a28f0217148cf3f11adb9a185026a68a691 WHIRLPOOL 91ece134372d131ba93a32111006292f329feb312ec4a5493ff5f62e3b6f7287ef7d41ce5a20e71443ea131907a9b89a9d05634c5bf4cec0fad60d1c120bad51
+MISC ChangeLog 3101 SHA256 d6256dadbae1e382f1b750b16d616db139351d55d2675988351c2376cc3b385a SHA512 a58822aa1fdab542d4c3115bfe4f86845f3b5ae3233e5bbb79b615581506c1022b4bb2a9a5bbe99c4a5c74d7e837aa2582d95eeabbe29f24c2064ad0332e1eb4 WHIRLPOOL b85073996491b418250555955ddfbcecfb3611294cfa1f41d420721e81f8b274426106e757528387bd3fe07d21dee3394e5ea2c77230bb5e194a71301635fa68
+MISC metadata.xml 306 SHA256 3e891457c0b6d2d2d6f80487f6dc5e4bab3a8e7a93e8d976fad624303077ba33 SHA512 081a906821490ae459cf849057506e8f4e38987f10d6767fd65eada4eed81f515d4b094532d8788e0e2e781ca1a620fa34c38a569fd7f63b3c176cb95356daf6 WHIRLPOOL 1a124806119e0f2c74a813c7964c4816fc1fc25fe71c7ad68610a31ba62dbcd18fd40c2005b94cb1c9d464bb7d25cba34f01bcb86a07f63e3c36c7930c905420
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0
 
-iJwEAQEIAAYFAk59rSYACgkQfXuS5UK5QB0faAP/azH3K9JdlNRz71bWfZGbW4Jl
-9JZYHgKUZIugV1O6tJne7YqAsIVWuOEVisr1Tt47feOTSrI6VhYR4ks8bVfF1Yxj
-LhoKi/r8YvqDJB2rnPGrO2zwwt9FtHbbPTHIQ4CTzSe3l+t5rFuEJKRyGhq5zk/L
-tsNl6V6ePxVslr3mXGs=
-=90kd
+iQJ8BAEBCgBmBQJVfxU8XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiIogQALK37X4Ufjq9I1H38a06x2yl
+iguTDqu/IPAqCGZr3lpiO/mW1h6vRmtLsmsXSvbV0y954a/eySyYphiMtLVVaPxM
+2GKp4ZNuGLP8IekywrmFypbaCheGd9K0F1Q/MJsNIlrrc0nSUBUeume/PfHqBX8N
+94ujBQBOhy6M/8V4/ElQqWOu5jpXNhuqNiG6AT5X5LNJkt8kQE7dBqBiADsvkQP3
+Ib4NvpZKjlMawv6UNqJZFAtm3gVzyurhQ3Fd3hwi7AJyG+rBq4rfGIsJEWFuphHL
+MfQB/YdXxY7bCrEBiP0pLOG6Wjcl3+0WPQV+TVJt+9s92sFdoh7JNSniQleIJmnG
+mEVpTItt96+1kKnFTxTkt8RF8TvLTaa1gHXb266YqovozlcOP9z1z/sZ+7vM9JAa
+yZkERTTReYYFFK8fxbR7aC5X5qt3U17fPaCLNvhpIlJH/Chn5H2XC7l9tZuhHvWF
+Pmjx+ELSG6GT5noRtnA46EnTJwOJXSgv++DwJSATMSf1Oxtm4jHKSyrAcrUq4jkH
+TN7SkMCs9jlgyaLmoXrwtOood80K5Mxtb2MXlz31nlBKZZdJeb2QOOXS0sJijVvb
+ak+TY9aQ5XXCPtv+WdHAii4z/LSYcw1a+XDinkKVXubKQHOG4eTM7xrP3/6XegLW
+bAC2NXaybSew6PyC673q
+=CCxo
 -----END PGP SIGNATURE-----
diff --git a/net-misc/wput/metadata.xml b/net-misc/wput/metadata.xml
index a15d7230bf71..e705eb72f8d0 100644
--- a/net-misc/wput/metadata.xml
+++ b/net-misc/wput/metadata.xml
@@ -5,4 +5,7 @@
 		<email>wired@gentoo.org</email>
 		<name>Alex Alexander</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">wput</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/zssh/Manifest b/net-misc/zssh/Manifest
index 219d3977527c..87dbe1c62298 100644
--- a/net-misc/zssh/Manifest
+++ b/net-misc/zssh/Manifest
@@ -1,19 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX zssh-1.5a-gentoo-include.diff 321 SHA256 afdcf65f386cdac6104b595a82869279db79fc26b0bd318cb3986843ed43e51e SHA512 e26c32832f537311f6804936a2ca88daf403ec5e8d263f3a84f29fadae68b0d35a514c97348867bbab584cbc845b1dfc5fb83fda7edad0714091e11165b965a2 WHIRLPOOL 0ba4715957677c49482502f73cdc80e25336ee925cd9becabc1a11ba8b042f874975bc38c03742f812e74a1835c5efae0d158d3876c097aab2df8037d2540ace
 DIST zssh-1.5c.tgz 344964 SHA256 a2e840f82590690d27ea1ea1141af509ee34681fede897e58ae8d354701ce71b SHA512 799ce3bbea5e94a800f61e6c38879746a579992396304861b7584b6bad967214b811b6bf9aecb36d9d60a15857377cb2fee80b495ad69778903fc45593efeebd WHIRLPOOL c0e8b06f04ccf0522267317308d4b87cf78eafd6fafaed1e330f9fec7b59561defd1a74652cc53ab2a662a299c021059fe49c1c252b50cb6dd6735086bf0333b
 EBUILD zssh-1.5c-r1.ebuild 1022 SHA256 39315487ec94fb138fccb04500a8a8c0113e508d9197d0ca9bdf7157bf294430 SHA512 881ccbf418365d49e581379cc2ad622c8b833b8ae4a50bf9a33489771be49d3de2e3809040411f0585d1670cf9580e656b3629b4b80113af3fee38a6f1a67f68 WHIRLPOOL f953bdf7ed4f30210b353c978178f197a37e240a2911643df0afca442bfe0412b92fc70f79350bff57c2c3b3369885ec84526e8c395b2f32b5790dbdafac7ff0
 MISC ChangeLog 2880 SHA256 c23ac6d51f780b2297616923f448674dd2e42364ed26b0027d30a4b673ec8e90 SHA512 f4fc6cd6fc18291330fd45611fbafd5f48e9fef69699b1d4ccf94f5e61ba9e076ded68f25027567bbf1ae0a5e2d0b543e01a08f1b39fe749075d29ad2f2276c8 WHIRLPOOL 6bef600c32e4d28f733ec7ecc4d672be1b375dc0fc4b34248ae08ef4fb1158ab86cfb67d2181865de16203d8564b31bc509b6e9f7f577ce7ec03e2de4bc2eaf6
-MISC metadata.xml 327 SHA256 9ce81471fc97a3518c41227e76f281105d88b6cab340fcea51999764d5203f37 SHA512 172dca345d1dcec9a911e3d99a062179ed3c1273fe4d2b7e88489d4a6248acf66475a70734fcd205b5011a628e392fa31ef2e984009116d12d858cd82952d069 WHIRLPOOL 9ec04acebcd4281f63b08acc4e67b99533363cbb858860ada0df43d971689eb9846dd6e39fb66f93342a8be6c22143d534a5bdf07957542dde35649b0910c3cf
+MISC metadata.xml 401 SHA256 0723a642fb79cb70f550581d4c9da34ead4a437624cff4a21734ede47649aa97 SHA512 be8a2625538b34d5a47ede4f1b69d5723ddd9a915d680df82c2a6f09421b812d8c843049cc9cf036ff744834c63968793e3f6f6e8c85b337c232a9ca76cc57c0 WHIRLPOOL 43aa1e4fd1a67db1e554c7cb36384ae74be9d4480e5aa1ed33308298c763cd2e931c37c72cba59fab87e393d5d909da1933da32d1e189a8f1c0f2ae6beee6aea
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJVXsfhAAoJECo/aRed9267O/UH/2/18toneayZfQ7bCjIdz6D9
-wrmhh7w7xkLnWgcyC4kENx+bEhXG5jOOCKShoYreTMiRDZCK2qLsa5XkiP+qDnuB
-pyCJC32WBNUa/9Wdxy1i0QLuolEO4tpzpcu76N2aiqVdquKO4U1oVu72OLB8vIuL
-I1ETohp1p9Av83T42m6qA3RVluoaJBoLcsRLThJht11QBtLv9flNjGEv8fKmn1y2
-LR5XFbVQgXupBrSIf0p1bscpJ1kSJxI6KyUoCW+gqIqEH9+VPHS6SOSnNZ0I7oLu
-5KUATvg3JMU0dQK64DpBna2ONIjWotO1Iks6axorXRsclz48PWbOqdsqBLoYUik=
-=dCpI
+iQJ8BAEBCgBmBQJVfxVHXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi/uoP+gNPKCSt/x1mQPmFMFO4jxQ3
+I7ct0b0u1R6IwXMn++HMg44LWX1fgXA22mcCwY4f3x2AB/6YAs43DA7hIhb117KF
+NH7vyXzYrBwi3Ri3t3bm2B1BcgFEAi5GJKW0grjtw+6pZlmCYBkXxYz4Qcn2/jhw
+W/ZpSCQencRodKjFXkB5RjsB1P6FA4AaDSNFU6d/qhXd8gX+iuweBRq2H/8IJyzp
+rQOjtJmeCtMsfYW6Zzc5D9+oAbd7FpRMJSO3UKh+uSUhFoc6CEFdn2xGJuuA3au9
+UqrwGyNAGSnXBZEfzpxtKVQ7a0/LEt2G6M8LdoZ7V+2l4YTrG9nyP4fHWhEJahWI
+NfqeK/0dvM8mGyIbeZbqCFZ7Tp8JqC9UsfAhL8HWXGTtwPvoLS8jzoNDYMd9EPUV
+hkA48PXZ9gCQjWRhxzlkn6q7oOaswqrOcGojavwYQzXb/F4jnc858fes7WO0FRWl
+7kSK9PQfgjdsL2r2fiwOymJkaTTluw0jK1V3e0QC+2RBXBaeq4avwn5ZeIjEgLsS
+8mIa1/jdh8U0uTWPIb2CbHew+FMvo6uq8f3bFsVRcozHE4uhp6IMi7AZ9JC91iHU
+/ZFlodUR20CrpYqyHYG8+BbycGRhPLaoWfznxroNndiqtCG5xZbuzDyX6Xte7NdJ
+dldqd7KJUj4Z0FnISTru
+=i+bX
 -----END PGP SIGNATURE-----
diff --git a/net-misc/zssh/metadata.xml b/net-misc/zssh/metadata.xml
index 1b9fb5b7d4b0..39a20f0e4817 100644
--- a/net-misc/zssh/metadata.xml
+++ b/net-misc/zssh/metadata.xml
@@ -9,4 +9,7 @@
 		<email>pinkbyte@gentoo.org</email>
 		<name>Sergey Popov</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">zssh</remote-id>
+	</upstream>
 </pkgmetadata>
author	Justin Lecher <jlec@gentoo.org>	2015-06-15 18:11:19 +0000
committer	Justin Lecher <jlec@gentoo.org>	2015-06-15 18:11:19 +0000
commit	17d0dbb5a9c2e4ce963f9768c5def4683db802d9 (patch)
tree	c4c3e5ff32935180a2623e74449dc048243e727d /net-misc
parent	Drop old (diff)
download	historical-17d0dbb5a9c2e4ce963f9768c5def4683db802d9.tar.gz historical-17d0dbb5a9c2e4ce963f9768c5def4683db802d9.tar.bz2 historical-17d0dbb5a9c2e4ce963f9768c5def4683db802d9.zip