Updating remote-id in metadata.xml

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

36 files changed, 460 insertions, 250 deletions

diff --git a/sys-block/aoetools/Manifest b/sys-block/aoetools/Manifest
index fb3a698afa7e..e8f72bf1a640 100644
--- a/sys-block/aoetools/Manifest
+++ b/sys-block/aoetools/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX aoetools-32-build.patch 1095 SHA256 993c5427f2b96efe00540031952c92cc7e1fa2a149115d3ab2a7df584ac8ed0c SHA512 a1199dc9f34d6e88ec40ebf022ab802f61946b111585518542d897bd6cb3fa937abd4629e41805b36dff0b98dda2bcf36ca1be863d1f1062e07582e8701ca22a WHIRLPOOL 51e58a9c877d271267c9a76bc3446f3221b38f5efe8a48a591e050c3e3d8e6f9e91aab5f625f5caab165b043fd3f90456f10e15f226afa7608dd6166e0412b7e
 DIST aoetools-35.tar.gz 35500 SHA256 837684fd8c5ccd15ce82d8e01e5e68e59b3045df200d5d68dc09f458baf33c7c SHA512 1f40cb33a613953d05314037eb8183cea6e95f973b61c1205260cf48f97e3f10708c1e7c558e7732b89e6cfaf9792ea8e432bd609431af46eadbfc3595709f5a WHIRLPOOL 090e8218b7b4a7aa4c002986354b188b97d95122fe42ff21f50e33b4188b60c118dd1a5cce76ff7c55e05973f0d3831a0d3b75bb6c3dc947483efb1efad1743a
@@ -7,21 +7,23 @@ DIST aoetools-36.tar.gz 36650 SHA256 fb5e2cd0de7644cc1ec04ee3aeb43211cf7445a0c19
 EBUILD aoetools-35.ebuild 590 SHA256 3744f68fae28e4a1f66508675fe490206e537f133a7a89dd9166c65244438dbc SHA512 f736838e180764a0e836d21c4472fdf8bcf31f206ec2708c74c3f314b588308daad6118705409021085b8a3641fd30eb0bfc5ad892cb9858f310769c9515d252 WHIRLPOOL 180b69046629b03b445ad6d6883adf5b71ddef34b45ea6640443c84caa4a53ad625853a3783ec69c7512de9d7071adf20bc2bb9b8aba7dda3fc7ea3cc1311003
 EBUILD aoetools-36.ebuild 590 SHA256 a5ac2a92dd490d229631990c518ad646aead5669ac20fc365c92899be1d592e2 SHA512 86f1593a2c24858a0f39eafe3225bd17fc40e4c7e38d7990d174a12d81f88c816cf6aee32b46c84159a8de89150531dc631b705d4119a2ca8da6b7611cab7b03 WHIRLPOOL 1ee748b59a6d17d3b07634de3a39acc90025dd112af710becf9dc1cd10a30ba1641c95e093e585531c2876a4aac213b1ab006b2472161ba239c4406295b98b84
 MISC ChangeLog 5984 SHA256 60a022467929bac16f3b31605fb2d23dc67e1adc7ffc457508c9d32942414859 SHA512 8be3a985e3402d9ac9b01103a11039f6a3152cb645b37bf7fab212efc8b5e96665f38dbb9b1b145fdfb3278a9acd059488d7310ecf6103a236657f2427f38970 WHIRLPOOL 108fa3d1a8ea62a3dff15838a079f9559e93c8c0944847a5d3080c07719cfb40046adf63306cb0e130d806ee8e32cb6c57f84c7a0e31fb5b5a9297225273a9b3
-MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
+MISC metadata.xml 243 SHA256 3e01f94438f6df18cec974d0ee31068d82fd4de93bf657ae1c9c93d480468226 SHA512 51d3838a6c7eab863761b5fc743a81679bd838129823fd248a7ae6a117323319035b0a9c771a030df9874f8b1dac3096c9a130e9ccd66b648fd066b8f17b3190 WHIRLPOOL 1ad3a95b886491dcd86110b08b5b565b29ae929ec80cff1fdb86abb6233d1c5b8e37732a5da1656bb7413c4f181634747e6b90e4a27404343369ee3f41235856
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJS26i1AAoJELp701BxlEWf1G0QAIbfa3jo/7vt0KofOJJuohtK
-k6mAW6DAAVQh34ZmrHBE7d5ZtI/CXIU+FEZS4rIxbgUUUYFaeuSm53ZQKaatyr+D
-CzsJkOYlM2T+KvWj1GFzZxPPBj6eOaskyfsLjr7vgivNgM2J4ssCeXa5gC70YxHz
-uy8KBH9hcCIqxRp2bmiAAnF7XR7DLtmMRoEwmDyh0nx4B+zBkx72oO6V8pYR08rm
-dYVzyo+0+xd5LplOYbF1siesosD+0zWI7oVaMwOUVXYLszeknUGNL+fijLTswlU3
-xKsHvS+KGsOD8AJ3+yv/p8VHo/9WXHACcF9ayYNVFNXhi4WaEQicF72aKDpXIc4d
-V0GRWROXWKoz+ABkEh7Vt1O1w7ij0x+er3BbodGtrCBdzLwq9+Jsy3k0BB5yQgeV
-tMqF2dQOjfoEDuqhwPmv5bNYdWlC90z876u9sBuSBMrA6E1Wvc9yRJzLWWqGBRV4
-U6Qthda+I2ghICOgCQoZ5jOb+7Ohcu2EpqrLNo7lXpapMIIubZr8X1KRGFQDxWKX
-Ned459qSSz31wpfYQi6zvRPyFfY7dfFhr7yKN6UPsjlDKaXtlUiLiyk9vfYXkLqe
-MffvEIu2f+VHTH8aOErqLRw3g8NvzfORtW/A/g2N81AHS0j4UyUQHPXDLpLDufe2
-h/jLcnIyrlE6k0kkaM+1
-=H590
+iQJ8BAEBCgBmBQJVfya9XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiZpIQAKWOPOKHikzrUoxzUy3CpmAE
+53fMKCiPDVAkGA94hPviKWzv0e9jtu7rRRCQLypn93vV3NUS7NqcjXqF87iowNtd
+kYvX6j880inDPkeWiQJiXWFbMI1LAbxZzwP6hnpulgI4GCbJMbjwlXx3l4Zh9Nyi
+0X7OzgKdc0oicMNRq0xoCAzueIdz5b9DFEaiFz73N0fHNrfvWcWynYqE/Z5unTVq
+3wWBSHPW0Tilq+MUUobI1dMgMbLvWk5d4kbwSWpbg4wibrSr1AXrVDSwT5RLAuFw
+ZYlXIrQqX4o04zG7JkhOVYliTufk6bl9T+FDt2+OwqQNbzGjoGGbSYYjBLWAcymZ
+15Q3UgCo1EMS35/oKlMGw9345RyCakFUTuvfLV9NdMYdmzNyyCcE6i45clkQWfQG
+xUB+SNsCO0MMLLjJGDT+dRztuBQcvBWfRtEVl5c56yMcKvGRVxtRof7fMKMdHQBd
+I+75ABujWFZOBVaS8rcjrLgwk1oiKNHlqrk9tdznelTKImYHMXhX5l34Y+sZIHrj
+/peWAGigB++xj2gNdxyyJuRGhR2rU/JQcY3/PVIqcwC+eHCGPjMeOn5AYQP5RpHl
+ntViL4EGYW/oqpIwUtsipgviLSV4xd2o2vD9K3QpK3WmdyMBakIul429Y+MLpKTI
+2HgbCcbuk1RutCZRj4FC
+=JYxU
 -----END PGP SIGNATURE-----
diff --git a/sys-block/aoetools/metadata.xml b/sys-block/aoetools/metadata.xml
index 96a2d586367d..1154867b1dab 100644
--- a/sys-block/aoetools/metadata.xml
+++ b/sys-block/aoetools/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+	<herd>base-system</herd>
+	<upstream>
+		<remote-id type="sourceforge">aoetools</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-block/blocks/Manifest b/sys-block/blocks/Manifest
index 4daddccb5c53..91e0d156887f 100644
--- a/sys-block/blocks/Manifest
+++ b/sys-block/blocks/Manifest
@@ -1,15 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST blocks-0.1.4_pre131210.tar.xz 33684 SHA256 0e44b6b17ccf3e3c6ad79f5990f167bb6fa6355c6d0020e3bac7a5a926bd309b SHA512 05ad49f2ece5cdb92097f60b5f69cfbb7d409ac5e1ffb98488f26b51ad07ed7dad8eeb3fd302a06b3e199e816e45c2c69daecc13a19627252b8245372f324a58 WHIRLPOOL c48876b36ea51ae8ff8f85785a1fa9aef9264136442e13c198b58c0bbbbb18ef0c866c5fa53335f4d9b35052a77d5189470f1a64d08cfa0552da0a639dbfdbc1
 EBUILD blocks-0.1.4_pre131210-r1.ebuild 1441 SHA256 e5ad5307be5e7fce63a051fd72c69f47c38fb27983e35d0674dfe76edc660edc SHA512 364ae02d11736fc49ce0b4875a4440c39297bbd5adcc65651d72d8227c3bd246df51f252a810d003d6f59781a21efe9e670083e40b361245e4fdaaa43320010a WHIRLPOOL a4f715da294965664a828583c7d1a6452e01bf51cc219dd4217a0c0e47fee425ced589fd55de00a71d8a908669052f451146569e1c890e5decb93e9d51380211
 EBUILD blocks-9999.ebuild 1400 SHA256 07ea8c2669193a53895eb8c459a4d935746253e8e233f0cafe57fc1381368e31 SHA512 a55d2a051664d319652ebd3173bbdd2e1755a37a72206a7c45bce7eb13f7b2f040a2e233f982a57a3782ff6b81cb27b5a47654279dcfbbb66087e4c9ce46bdde WHIRLPOOL 9e9e1e2ab0e4b6a2df5656abdee7784762309204694dc57ff70ba293f132ef7f3e4ba7a02d60542b4cbc4ed15d3935d321727cd4fca6b20df3e8e2628646ef3b
 MISC ChangeLog 828 SHA256 f9a219e708acfb46828983c40f9dcd9f282720f4d1bc50eeee34e3d46755cefd SHA512 83978bbb8110a2a7e3855b037fdd0c4184671374019aa1331e638093cbcc5a609638295384f664bab397af22a70b4194d37c4b0cf834c180284d4da8d0b6b420 WHIRLPOOL 4319a792c2939d38333192b7c1a5855d8482a680b1d1e4347ae21da9a0c32a751363219559ba38d395131f74f7c65b98617753ca1ea63a20d75f03ab0381e829
-MISC metadata.xml 382 SHA256 a37f1863a2a48270558d1575a0d81be153abcac47055f6657aa14f13a2206167 SHA512 aa86fb4e06de5be9149dce27ff18c0ff5ddfc0cc66cec9592dca81fca36048312e75cb3281676484ffd3155f49039b9e231d835fa49a966c934137ddb7c1ea1f WHIRLPOOL 57b77ca9d4dd3b0fbb6f2c848a49e2876fcddc93c92df45c5f050df53fee9152fb1e36e57d154da54c8bcad76e43bcca1ef4956d9a8176a29998cc137cd57ad4
+MISC metadata.xml 461 SHA256 a4c62b474e71d8ad1583e95eb8e9ffb16c6bb836764f6dabf8ab125f7907699c SHA512 93cd341a2bc91b7f8b263af151a21f6b043ff9e8ef0a45c0ea3c21da79ef711a9d840e5495215215503ee2f88517a1d45844a3bfd340507a3b92563a89530731 WHIRLPOOL f0931443046dc45afa67f566464c8a68adf522bd4af330477a9280d847dd6298a361c391cdff497f4d4ec3b9a12ec5abd3d6cb26049fdf026a2a24ac779cd64e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlUfxn8ACgkQCaWpQKGI+9SakQCfZDo5w/TW4DHyhKZuONfAmUNP
-edoAn2D2e7vlPIaED3JLfzt48acaCArs
-=oFnm
+iQJ8BAEBCgBmBQJVfybFXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi9dsQAL+mDqiWZepPEwr/XzhQSyrb
+weiDAaXk0bLXs4zbwKb7JVBiJBaz+guDwuL2W737aO7g48MgpLJywQto501gt+yJ
+skX30+sJTvLYaB4q9OzWuf4dj9/C2gfB824dn2btOpw8n0W4UerWbKmzL8LrOpZU
+gBEpRAMuiSlXYwvtdyUw32T6x21UT20aL3NHewNtB4cxjbOYkzBqxInLrB4TJb3n
+q4wJxRuJaNjyWLfLeVSR+DjJsZLTl2u4W56Nxm4KUqLr2+BMrxcptW115wp3nHHS
+HSYqi8XMxWR2SskSeQApZXiuYCyuSEASCDXShy4rnWBHAvIptp8pe1Z0XQNF/ASA
+0pK9U23l3TLO5y/5DlV9dVwjaL5AxioerDHg22kvEDyrL5k01xKcvtJuOdvk7LVM
+i8K12+9scevvzcactGxt+2VNwtqf+lwbyuR0YObmRb7Y+h9zZjbNnMr/RlBxMMSq
+Zyjv2JUfsMTx1QAvO69kosag4e5nQgH4m3POn0l0hXEUtjTe7P4ir0C2K+Yqs0BH
+hT4q6tJSoUEa/73O4EEwM2Y5IsY0uzQn2cTXg2BPsYlejtTge3PNbLFwJ4Yd/FYb
+utbQ6CuQ33RYgUks1+HuQ3USMlx1Q2ir/QhOjBQ57/lkV39FBYCz/IWTdaPQ4dU1
+p3EKZE6zJ6rL51S48Pr1
+=SESV
 -----END PGP SIGNATURE-----
diff --git a/sys-block/blocks/metadata.xml b/sys-block/blocks/metadata.xml
index 234dae420388..25a6e85faa81 100644
--- a/sys-block/blocks/metadata.xml
+++ b/sys-block/blocks/metadata.xml
@@ -8,4 +8,7 @@
 Convert between raw partitions, logical volumes, and bcache devices without 
 moving data. blocks shuffles blocks and sprouts superblocks.
 </longdescription>
+  <upstream>
+    <remote-id type="github">g2p/blocks</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sys-block/devio/Manifest b/sys-block/devio/Manifest
index 268738b516c9..02c762dd6eae 100644
--- a/sys-block/devio/Manifest
+++ b/sys-block/devio/Manifest
@@ -1,24 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST devio-1.2.tar.gz 88650 SHA256 a71e87f49f52cd90dbd45431f65e83d18e073fb2669f91c29c59019b175cd5a8 SHA512 7620a5144f13fb66252e9f689df2a790d3868877184d0a013ada6270b6c3fc4a87f20ed283f2a017285d0219418f87c6425b481f397f46f49fc1ebc374aa791f WHIRLPOOL f07bbcf76b273d66e689ae536c6b6f7a94061d492b8764787ac124927088bafcf9bd90033e8f57a7b91578b1ad813db41a7eb6750e10c91eca501e78d23d7412
 EBUILD devio-1.2.ebuild 535 SHA256 3b63cc5196e17f984faf018f4dae832650e97c23e0574b281e7b45df31c6f391 SHA512 9ae21124b63e74bb228754b97c4dbc6fd6478bef94095251a3036d9dad27956450b33307d42214fa305503b4198af5ba04c016cb19b9e83d82d7283bcc706b8d WHIRLPOOL fbcbf169c9d533153e846c3c5a52bfc69e5b2503341a9e71a9cc2f9e7edede1ef08a772731af5665a47e7d22cd2411e537851ff84180f75c878186768d78f5d5
 MISC ChangeLog 628 SHA256 da36be966d0ad252b940bbed5527f64f9dce7265d90f09a19a1fb5baa7fe4b0b SHA512 78a2ba87fab3cfca2a57b185ab5b800dad4a247341d977580e67eac272bf17973efeb25c48e175a0292981138f75f1fd30769eed2f482cc5968482dc3d37f080 WHIRLPOOL 18c0340841e20f7083eacb5736bd4be1c0a20372c7ea254cd0e1034066ea52336bb3d2c655e5de820ebf0b74b8f95131dc143402a27c8b4695e69670d691f9bd
-MISC metadata.xml 161 SHA256 a11fdd02015a232398fdf22a20d26a95fc34d44c54513e6b26b6128d0b76122e SHA512 4190220cd1cb5f6413a85fab4eb59eebf03d2a63f066f811b76bb8afeb37eeadbab8ee7143970c5ca186e983a46b7e1aa158f5e4b2a3c723fce3112f69969e5c WHIRLPOOL 0f82255faae8b5dfb524458c156619f17938ac8f5166339e4a3ce9d3312e7466847bd5cb7e0554d6ba810dda68fe414e5cda7095eb5629ec2aeeb774b432da30
+MISC metadata.xml 237 SHA256 5b455a25242625fd67558cf9fb074fb0db898ed7400e4e6365e9e269da7e9492 SHA512 8671d2fcfc794c886887ff310524afdeba51b25027313af58a2d1334179b73fe7d6e717469ac515154f18bfe1d234b475600f93adf62db7b7000159f72650c58 WHIRLPOOL 642bbd7050ed7eee5975dd4534c95a00bac8d6bb4b24ffe2cc74a10d3e25ddb9c55541a41218a19b9d90dd7128d5205a3bc065dd57d7481628d7877af43652b5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJQmPvnAAoJEJOE+m71LUu6MHsQAIJ6gm9XPz/ly+fg0JxFOB4y
-/5xJbo3lnr5D2gnHQCkzr4WR+1AE1gu7fGcnqL8FefoFml59T3I6/hVH5h8plBOH
-c22wxTn9C1xe5y8XL6W1UFnFxZpFh2QX79XZSjEvkqAft3d1CLphfuxtFkxCYDV3
-PWHZeyjFQXtwHq34zVeqAZRTUCB5l3VBkRXOoqQK2guA3boeUr418yi8xoE5iK9U
-xQIzUCo87HpoUwgim66r3fjzPng1E2yIeLBa/XW2mUJOVhQRMwJ5rEq3th+ZlGXE
-lACPqKgxIe6xiJVy+YxIWgyDVviY0pm9yPAJDBE/fRnBOWukpBk3tZaY3ezTxpWl
-AR1odEnGVcvQmmVzg9Qyma7owFF8jJnQ3zFh1Wa+bON/EblORdjwnFtlMDYt2SRH
-7jMLHfozjKI7czNmyTtme5fUHXChRaVsCpuJNTs8D/RmS+XSUtu7QGR0OQjv6thg
-UMC9ZcgAPKR+DeavSKYStbOOkQg2NYaJazQJ7IV43KZMjyEtr792KpbXVmGIH3dR
-l0jAM9oCArMED8dzxhvcpDuddhIgNb8E9kP2F6rfbj8PF7DwSxLM0uYkFnh+WQjS
-KK3w8PsKph9uB74xligGm6/gbB1J+DyEbJrc8+zQXdmZ52/sGb3xe091vaOmj0wp
-qGdicFL6CojPloLBoPnH
-=ZP8r
+iQJ8BAEBCgBmBQJVfybNXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiwI0QAJxV2IqFIZwRylRBEsBZACQ9
+WNXKBGspIvqt0DPqN07nT7/HqnPfm67IkDOQ5CF1Ct9yatnCJL55mYw2SIWe2IFJ
+0drIITtrfP0+XyQ7DXk73/41iAVNDM1uf8Tec628AqR9jnN7GZizQtNnIE9EhXiN
+TERnPnK4/qX4RUwmvxP190DCVJyE7fEQnQZnNrgXG6Sk6eMpaGr6HVBmOu0P2U++
+pjpWjeXfpIVQHnaUoNC7NkxreqIqZmcGTWQC1velPLX4Crm13UcJydNbmPlQP5hK
++wSzzXGhFClSCuWTh2OGLHcNKpMOYRDpQAUWNySe8v/ok4/u+3804GmTc8G7wWma
+VM5gS/6sI4V19q3F1LeKxFiVY7RDCCSwlsOPx4zaUkqgmEO/Fl32332SOjBgWvzo
+2JYxtHMV6iCoZ5OxRvADijDq+wo3nwiCiHo5OpxU3qPMKBhbKPGAQLSDQOr9SqHV
+8Xtywxn29hLAguPGMyzJNo/+oemoQkkSHHCGkHD6emSvsBjgSKfs/gCYjZv+4v6P
+rX+nMjeR2qTsMPEljpOTi+nwkWHqvwaSF1OFlc9q704dBe5igUSAl/NHPkKsX4qu
+f35y9BuYlf0dzSE8Bew+GSN+Jylo9G15nYTdLFIIyi6pwDROkhdkvejStTLx19Vg
+ecN4QWH4nGwu+ABQhwbJ
+=/W7k
 -----END PGP SIGNATURE-----
diff --git a/sys-block/devio/metadata.xml b/sys-block/devio/metadata.xml
index 5c40e771595f..b147a1c47f71 100644
--- a/sys-block/devio/metadata.xml
+++ b/sys-block/devio/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>embedded</herd>
+	<herd>embedded</herd>
+	<upstream>
+		<remote-id type="sourceforge">devio</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-block/disktype/Manifest b/sys-block/disktype/Manifest
index 50f65e0678c7..eea556fefa06 100644
--- a/sys-block/disktype/Manifest
+++ b/sys-block/disktype/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST disktype-9.tar.gz 43809 SHA256 b6701254d88412bc5d2db869037745f65f94b900b59184157d072f35832c1111
 EBUILD disktype-9.ebuild 646 SHA256 621de6a3c0317d524f43b6f4d10b666d12520bd2f02e3cfb3b2032276c087fe8 SHA512 8e42ce138274a784ab23dd40ca7e3cbfa316f2758465d21cb00c321b01d18eb734ffa73809e3839e5e564e408f3ebcd58cef577e567610e913f5ede3f2d2e682 WHIRLPOOL 7a8e1dbdb8a2c9e8c2cb17ad72f1013e708f81274f16d8e37bff871a0e237a08f8363b45536556b9aabef0b9e36f27e17f03f4e11dd4ef97fd9a02f72014ef60
 MISC ChangeLog 2269 SHA256 40ee00d709285eb4e6df3bcb1edb7fb50b6f5a322c074c8bee198648c24d138e SHA512 a485c4357acc17a88f001d9aceca226c2ce35307b55b93d117bf69696eaa7b5a6836f631d7de826298bd9ca0102e2a6795cefa6132973963b4f5fbe57b960397 WHIRLPOOL 1f02389d6b403237ee9c8555b9b4d5782eab3d06828d2c412b1dcb4111e64fc74050579bba54b0b08021c913d58ce34bc8726854253fb83fbfaa4397ff41166b
-MISC metadata.xml 1275 SHA256 3ec3f3dbe28be4779ebe1a75d1b497a1457a75c50c43253c58277ce5b9683d0a SHA512 9242417c3fe82b0dfc30ccc7581ef214ee3fb5759c714287004f51249b861c4538fdc5f25f57a0a624a4ed84617d6a859b6e89196ce3ebb9219b58a7be99cb57 WHIRLPOOL c2876f0b5b3f6e18e560e99092a253e42f74ce7356065c09e38d704e5fab1bc4c813914d1a6c3a48e00df7da915d2e1a3b3ab83f57c7417fc78f6a37b436edbf
+MISC metadata.xml 1361 SHA256 8ff89ff03bdd6b198d10c96ed25d759bf71ceb980a4852e643129937707599d6 SHA512 f75374e03a4c6f171c76e683494377b4493422056fe9f4aab5e0a9be5d58af741fb55b7e42c803b9f7b34c8eb5ac34407f02de399d556b9aff6561d12bdc7f67 WHIRLPOOL fd222aa485230ea66c5f5c46c72df2cbdb56e9dc0e3c17d01c0d869fd48db08e0ba768ba67a93df31edf8e5cc810d77a1053ede4c220cfb092ed8229facdcd02
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlPn1FUACgkQcaHudmEf86oREACdGUQCiLeKxRCoW9AB+b4Tu+Wa
-N6sAnRdhdGdGcaOrDoUO+bIgtAa9pGRu
-=h3ds
+iQJ8BAEBCgBmBQJVfybZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiSbwQAK+dQII1Uyt+MzTDPppLCCdq
+HJ13r0mffV4EYDn/XZ93Rki7CsdM5HVeeZBW+Ll0EQsdO0Otx41wjXvM22qfvO3O
+ChxMepGo4/U8BbGg2iONF0nTt1cF6iUWEjVySrHQ0r33E4YSvPRYEu/iJ7T5Rhzz
+UOsrcX6UqPReD3FK1pbcVeX2W+E/8Ju6O6s3NBF6MBsuyTM+FX0qeqLZ95jFZAqL
+9vcJuQbm3eCZ5uhnQE4S4FJ6cIjYTZdAasdUuVVP5kSTkx7AwJB0NUPiDiga/el5
+Vby21CH4JcIBQnwcn6cCjadNJnAIxdGK0Fv1aGt62ztJi2M3f3yeN1Xv77gPRWw1
+T0f6c3BfoT4mP5f/zDRkYmVFV1Sh6uyHd6O4CQyVTkrnhtouw6JBIiN2REfVPpgH
+is1N0svaYNZXeoE1rgo1njMzH/5/48/4pB5sF9OutvgZ0Pqe0ndPGt3oGYwmUqgh
+Z5TGiaNWk/N6myl71LhscjhE8wWi/h+bua2QWS+8DItT3Y/1M/1doKcMDaDWPXzp
+AtVUxX5QFgN/CefTQ/PXE7dF7cVNQDe1c95ibkn4eEgrMyNtSlPtdyUbkCT3EEQN
+hcmaLhSRM8d3LCOvCaIpreg31jRcy6kKct8BbWmAMLlb6+gHEGH8kwYiik7vXXdv
+QhVh6re96V1T60ZbyxWh
+=eEm5
 -----END PGP SIGNATURE-----
diff --git a/sys-block/disktype/metadata.xml b/sys-block/disktype/metadata.xml
index cd2a092e2ef0..f27b7d146f9d 100644
--- a/sys-block/disktype/metadata.xml
+++ b/sys-block/disktype/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>forensics</herd>
-<longdescription>
+  <herd>forensics</herd>
+  <longdescription>
 The purpose of disktype is to detect the content format of a disk or disk image. It knows about common file systems, 
 partition tables, and boot codes.
 
@@ -82,4 +82,7 @@ bar
 dump/restore
 
 </longdescription>
+  <upstream>
+    <remote-id type="sourceforge">disktype</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sys-block/gparted/Manifest b/sys-block/gparted/Manifest
index c78242a4eb7c..e40d11b22896 100644
--- a/sys-block/gparted/Manifest
+++ b/sys-block/gparted/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX gparted-pkexec 42 SHA256 c666be6fbcbcafa660e3b875a31f6f565989086cec620ff675f90f7d19b814a3 SHA512 ecc34719a6fdf3739f87d3d2174a56b02c33c69e77d9811f4a043024d2f0479d077214e36fa6081d9717dc55d51dc3b8e0b51f86d95162422438841af24f7b35 WHIRLPOOL 9f0538db9d9008ef6fff9855b3fffe654614a27be9c318005bde49f85a7303110e9ecbaee9f44f34d53f722ddf33063d1be13e285e71a5b43357e000b5024869
 AUX org.gentoo.pkexec.gparted.policy 815 SHA256 8fac3302c7c4daa670656212161e79de0c7485c163534ba3ab50d9b9f570c6a0 SHA512 56a4c6906c721322a2530de4832f422f1a6dda2a049b8fbbf7536cfd798e0f1557148130af8f489c12687cd301b11563667150e3a703e8e3b01a4e0135ced845 WHIRLPOOL d6a098aa8e44ef1d48ba83556961892d13c939088e23d8c06eb11c09c1e8face1dad1f46ea9926a9bb87aceb2530739f1e6aa6c3e0dd4a08f26c64b25d8048c9
@@ -8,22 +8,23 @@ DIST gparted-0.22.0.tar.bz2 2185652 SHA256 aa755e1a6e84c8eaac8b3c44416cbe9c202a4
 EBUILD gparted-0.21.0.ebuild 2192 SHA256 6ecc19ee9056e3e4a28a4b95d4afc699d18fb9a30943374224492411e23a4634 SHA512 8c088f49d87c2277cab727924367c0193de8ddcb55b63e9f99667d70881232ae1a1d98868e4cf559685f0f29d1c41c20f8bf9e45fbb511e18cc210e288db8afd WHIRLPOOL 2360db96b1b2724643a767416c5b73df2c31bc3b5275ac5879fcf4c8b346db0352c824e1c38cba841f67c03a6c72287502b6a4107257b9a240ca03365930fa98
 EBUILD gparted-0.22.0.ebuild 2177 SHA256 91e95c42933fbc424e71f5331740222553e476eb3c6a27646b3041439ef86e72 SHA512 290672945c9f5ff0f6280d45c6257d2d1ffed21c01ad685776ed608064b2443c3c636761da8566646500d0726a53121c787fa4c6513d7690b598b8af53a73cf4 WHIRLPOOL 25bd848c38b3b8066281e3262938941a3d26b533315dea46872db574f750f81b530a436bb8277090f9f2f8b130a71d1ab5cc8b16a44a8fe64bd99b440711f1ff
 MISC ChangeLog 20121 SHA256 2acdc152235e80b012f3deb06f818f66de5567d9f4d78120d53aab68ec7d52ed SHA512 ba4aed0a5aae7f7c353663e889217ee96dfc576fc7d34cfe6fbfd210f2bea244697dc8942a9bee85a7757f0324837074ee96385231f5e2ee2167b15c4458d079 WHIRLPOOL c2b9e1ac0d6e437cff20f1c10bb5a01b7546eb90d6f8cde6815378b85133dd793cd81ad789db3e972cc9b25d3a868372ee28d275f09bd12c6e6bc44e5d31eac9
-MISC metadata.xml 1483 SHA256 f23215e04a4f162418a2f062f019f462ecf9ddb3784cba552941ee45fa98e62f SHA512 e94525eda47b517d93d395bd80bfab50ebfbc9f3214437d9725a17c5e4cbdcca50f9ebe68a16c24eb6b5bd525da15e43576b90854536690bcf61c7685ce289b6 WHIRLPOOL 0d71af39b1e627c41e9b5d26fc564ed71aa92606486161878626223fff2f91370c132c67ff20044200fcb289ca689bd83323fd5adfa03c41597fe163a76fb9be
+MISC metadata.xml 1579 SHA256 9332659ca2504bb63973e1e356d0e4be1221b214a26737e3cc55776ae0f8f09c SHA512 61ad9c5648d4b3bbefa1f1f24ebfaa2aa4d8af62eb9bd25640d58aa14568de61720cd292f5aebc45d258c6e4837aebb1fef50810fb0729d3f2b20b62b37b20d0 WHIRLPOOL 20a0951d3f8b554003e1983f7a63d48e167f90a720f62d5e480f6c6df6f9b17f1008676cc0c9743f51509baf089d1303f43415f9eebfd96c65fa97a8d1e8d7b1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJiBAEBCABMBQJVcKGIRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
-MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
-7HrDD/9oQuJ9menfg9JU51UImrsLpCgMBPRRNInKocs/7zrTQYJjThP5bPkMM0DW
-dCvdwi93A+peozefkfQExbmui+F4EHXwtWC23g11dlBb53UakakMNgzVAAyAw66O
-522viWMZwqtOA0nXi4hyCvJsu19fJCyGZNH1TQBRaMTSWvzs7z1zqjMWlrcEl4Ej
-NuG4+YmvjKBnjh0ewVR0hATCj6qaJIrTBCr1/4L56FRZR/wpi1Wn2Kp1mX6HCmwW
-ImEiyCIgguH++iKNH0XEhZ40kJHpGrb41TWzB8DqzHyOj8f/gjhGTYOQnS251nwH
-7PLXPsdtUYehYuE9+sMN1S71Me1XmgInKKRxQp3kqULsvVbD/KnieVvOjxWYUTTT
-9o0r0DoapK87U9ARBAu9MK3XAzzu4/tqW6EXgPtwBJ3xdP8Js989g8sNxsknwRbt
-LM4nxUtdGGonN38anJBQXmBZa+vRzN0gIBYi0fODAwCHPR2bDG00/o2mBI9LdCUg
-Gku83dYikwhmnVzjRCvG1P8x9NZZGMd64RFbs1IN/lJ5/2U49Nbd8U3BB6Ukyv6d
-wKWK1rNXhbS66NmvsM9pj1KGXIc9aSZmzFuZRMmHddlWnDyvbxcaJnY99CHjMkuO
-tHD3ppah3puDz8YbhXzHppl0k3lZ14u/HxN+HvlXKecMUiDxgA==
-=ymrW
+iQJ8BAEBCgBmBQJVfybkXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiSgUP/RIYRPspKhmP5tkTs/HybMZP
+OHCtGTUXQ6C+snFnAA2onn1LJmlxI9tuAFmaGi4e43PQYeUGBkbNLWugvibeS+X5
+HJidTb2NkQZqKsgPlODDosxdK+jHRjHVMR5617UtMJxxFhGR+bEsRdrWhMuEgItF
+yLe4Sv5RGPV5nJLgwl+LGAa2cBHQYWZC3Qivrf+fuA+xldFRcTQDIolod8UfjcoN
+CGUSE4agiA30qjaogPA/m8rxGLq3/gcC1eNSeA9GmN0eCICErrA8WxUlE5N8RjrA
+VLmZVtOTe64QP517Tv0TLPrp3DbSpb7c5/6rL+lMz790/4mkWFVxARqjBbl+zXN7
+NfvQaFRGC5be/bVyOy5MCXeGK7bDHhyGolYC2ewST8T3BUkBREip5A2+ica+ALJ7
+1Ql/YVU28lAZoZHcxPsOfVIkfqMsWa3lfgD/VrVEznaiax8GM1O/AaxSneTFMImh
+EJAikf1Jkxn7AzJuArQzMeWLr/l9QCrTA7KcnjBET7g4Hb+ksEHO7F1RYAZ3jhuk
+ocGxGwMckR3L0B2cXQ28hvzQeIySsUsS8s/HgCpiMUMbXZA1GGR/CGpHIIHcFa//
+7z+erZdh0ULkgZqS7TKR1Y8GRO1PAGnJcmvRVxEUzC4slDn/zpNItoZPdnebcJ6C
+YP/ksUfMmQkiSMOUu1Ry
+=PxVJ
 -----END PGP SIGNATURE-----
diff --git a/sys-block/gparted/metadata.xml b/sys-block/gparted/metadata.xml
index 81e46c544076..e06bfd6639f4 100644
--- a/sys-block/gparted/metadata.xml
+++ b/sys-block/gparted/metadata.xml
@@ -1,35 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
-<maintainer>
-	<email>eva@gentoo.org</email>
-</maintainer>
-<longdescription lang="en">
+	<herd>gnome</herd>
+	<maintainer>
+		<email>eva@gentoo.org</email>
+	</maintainer>
+	<longdescription lang="en">
 	GParted is the Gnome Partition Editor. It can create, grow, shrink, move and
 	copy various filesystems.
 </longdescription>
-<longdescription lang="fr">
+	<longdescription lang="fr">
 	GParted est l'éditeur de partition de Gnome. Il peut créer, redimensionner,
 	déplacer et copier différents systèmes de fichiers.
 </longdescription>
-<use>
-	<flag name='btrfs'>Include Btrfs support (<pkg>sys-fs/btrfs-progs</pkg>)</flag>
-	<flag name="dmraid">Support for dmraid devices, also known as ATA-RAID, or
+	<use>
+		<flag name="btrfs">Include Btrfs support (<pkg>sys-fs/btrfs-progs</pkg>)</flag>
+		<flag name="dmraid">Support for dmraid devices, also known as ATA-RAID, or
 		Fake RAID.</flag>
-	<flag name='f2fs'>Include F2FS support (<pkg>sys-fs/f2fs-tools</pkg>)
+		<flag name="f2fs">Include F2FS support (<pkg>sys-fs/f2fs-tools</pkg>)
 	</flag>
-	<flag name='fat'>Include FAT16/FAT32 support (<pkg>sys-fs/dosfstools</pkg>)
+		<flag name="fat">Include FAT16/FAT32 support (<pkg>sys-fs/dosfstools</pkg>)
 	</flag>
-	<flag name='hfs'>Include HFS support (<pkg>sys-fs/hfsutils</pkg>)</flag>
-	<flag name='jfs'>Include JFS support (<pkg>sys-fs/jfsutils</pkg>)</flag>
-	<flag name="mdadm">Support for Linux software RAID.</flag>
-	<flag name='ntfs'>Include NTFS support (<pkg>sys-fs/ntfs3g[ntfsprogs]</pkg>)</flag>
-	<flag name='reiser4'>Include ReiserFS4 support
+		<flag name="hfs">Include HFS support (<pkg>sys-fs/hfsutils</pkg>)</flag>
+		<flag name="jfs">Include JFS support (<pkg>sys-fs/jfsutils</pkg>)</flag>
+		<flag name="mdadm">Support for Linux software RAID.</flag>
+		<flag name="ntfs">Include NTFS support (<pkg>sys-fs/ntfs3g[ntfsprogs]</pkg>)</flag>
+		<flag name="reiser4">Include ReiserFS4 support
 		(<pkg>sys-fs/reiser4progs</pkg>)</flag>
-	<flag name='reiserfs'>Include ReiserFS support
+		<flag name="reiserfs">Include ReiserFS support
 		(<pkg>sys-fs/reiserfsprogs</pkg>)</flag>
-	<flag name='xfs'>Include XFS support
+		<flag name="xfs">Include XFS support
 		(<pkg>sys-fs/xfsprogs</pkg>, <pkg>sys-fs/xfsdump</pkg>)</flag>
-</use>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">gparted</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-block/hdrecover/Manifest b/sys-block/hdrecover/Manifest
index 6b067167ff01..7a929f736a63 100644
--- a/sys-block/hdrecover/Manifest
+++ b/sys-block/hdrecover/Manifest
@@ -4,15 +4,23 @@ Hash: SHA512
 DIST hdrecover-0.4.tar.gz 85409 SHA256 609a0755dbda744e3dc89bffd1c673fd5c370448aa43e426d90ff35faa74a20d SHA512 280fb7b92172b3f92d358744d093e17462e2b118d2bcd7707cb9e1ceaf89010d565f60d490d8fc247887b6189fc76adbefd8d4aedce452e402d09fdde38a130e WHIRLPOOL 842384aad30072d9ea6ff5ff3991a19664a1d2c349c04310d2083e2b0837066f7d255b475da79521b98735a9fe7c5cd6a5ff750993e2a68872ec64bd458e940e
 EBUILD hdrecover-0.4.ebuild 587 SHA256 54eb95d224c7f12e9ddea2dfa111000f43508b50ec8f8c86a21ab95a21ff4544 SHA512 a0a257b2709999daf85be1d0f6221332918c8e266c6bd063d41013262fd3de8a1e5a705e39024d41b0e18a0b93f02d3e5e7f509ed69a777865da00df2739a7bc WHIRLPOOL 222b9e219edf94e55ff5810a373b80dd57d18c1cea06fae624177dc2504bab96538c0bcd51c04bf662fd467128b03a0cd641f4436839b2ccc3f714d3685519ee
 MISC ChangeLog 443 SHA256 5a7429754c7566c4361406378d2a33c20479f38d075406d37094f61b968a1e50 SHA512 ba2b77d7820874c8b14cde254e5c1dd9320130e61ac9c28683f026f70b3dcd8a0f166ad521b4c471d1b1852b703e5f5ad156ef030bedbc3c92706e08691abcc9 WHIRLPOOL 0a153bce76a9f58dae6c3bc39a2fee70d65724eeb14838cb184f42a5375602445732f2efc03046380b087a7d8efc45c062853d2a8f96b8c317a3c6596fbc71ee
-MISC metadata.xml 210 SHA256 033e97715bc19256fb7c105f739eeb5d7e58c4556fdb08face36c7270ce0c82a SHA512 e75fe043a3cde9b1ada5b898aea2b39f952dd8075f8cc158c2177a5d088e98731401482bfca552bd25a9e5b0ed995c9a8afcea783b62ca6b61ed22b3d287ab2b WHIRLPOOL 1d9f183be62d7aa946de6c01ab2bd0ea3e61fce56430f0fa72ee57f38c61c60e9d14531c19252005bfb773cf773fc1380984ae52e2d6233f883c8205fbd47976
+MISC metadata.xml 293 SHA256 a458b3280002adbe558e592797bcbae4a8f2f5c821d5599a9c824b32d4b895d7 SHA512 44725153f9c4a14684a06b4ba142332f699d1587adb3fb3d8f1b0d07c458570d194ccda0d903995624a3864b85886be8235333e142d3c63d193bfb934c05b1cf WHIRLPOOL 3899063daadfbd0cfa93f4a7d3aea5d077a7bb4e06491e90cf489acb2031af85f99e5ba87b21e4317b59f48e3fdb167d175bef2d253bbd0fcbcde3f3e4846339
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQEcBAEBCgAGBQJQ6jQrAAoJEPUd7O0j6ekAZ1YIAMZXM4JzKzEg9XCi/zC/GUZK
-6Bppmok6y5qthb5JQieuw2cpYzoZiRZR/nQSI0adh17oBIXiQcHIDph1Cp67MKEJ
-kQ1E9oCX25krJiY3CdOP7Gy3BEuoxegBSRq7AES+dvEMTyq4f24GAb5MayxuFjAd
-toMA5OOJM+3TqdBJzM9ZucxE86O7T6CnfpsJTie7jem6gWekw8uZyZM3a8vFLta4
-0ZPr5Iv7eOj/aaAKkjvrirKjCZftpbsUwbIdur0x97vY5dIxE+BPf3srrES5S+WA
-PlMym2quN/tWEnJX5opc0Bmjxpyhse50Ozo5EI69CjjODE5Sp2ddH2X9Xdmcv0o=
-=UiCl
+iQJ8BAEBCgBmBQJVfybrXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiAUAP/3wna1hiq89gVyPdLPyGp27i
+jQnfye9SPUlv7QBlfURUnQLw1w8u5FitywqkqedNEF4YHwNKQqbFiuTM3x5iB9Hl
+0thMPZy0anmp2OA2sBKGW0p1DLVgXzAV4eLbX+IHioGQtkjeYk4WY97o1/a7Vssj
+t7DKCEqZEWa9+dxkTsSoSkRro767dUdPq0F0o7BlE1fMfwiUQ904A/GoNz7JCTXH
+mf7wu7+NJ2F5TTZd+GwD7qhk5YHx8z1oAlEGAiob4L3H8Y7tRZfuIgB1n0QX2JWB
+YPBJXCNqrgW/I1GLwnrNxsYpQnuaSjIzcePrSgJ17BWZZ/N4aGutcZ0Y44UB76R8
+CYqaj01/Xo5ajimp7S74uddZcRUN0KRyehgxjhvF0+i879Xzvt1c/RBPyoIwk6qa
+9ds0gpjhvR/lRPnJUsQK4PN14gXl+zBywqGe7BKNG2CRAW1AXB1fyL5bDxBYgky/
+Zdht46AFg/wG4NWZzv2w/Rb0ansomFyXLdvHGFCHlL+uiFHCcLG/iLu/0u2b4CqG
+CQ5ycRUobOhJZNB0r1ygr4+94uGpEmFv+fjzdfx6N9oln37hbQr/y4UBDHhdGhSx
+kuPruZjcN1PyZnjVwb1ERJkHr7uyJs4HsVd/DAFDPkd2qqTj1D6eSk6x7gk8Shuq
+5reXpcJPSnvJXw5ToKcq
+=p7aH
 -----END PGP SIGNATURE-----
diff --git a/sys-block/hdrecover/metadata.xml b/sys-block/hdrecover/metadata.xml
index 63ac5653603a..fb6e5f5de2a8 100644
--- a/sys-block/hdrecover/metadata.xml
+++ b/sys-block/hdrecover/metadata.xml
@@ -4,4 +4,7 @@
   <maintainer>
     <email>flameeyes@gentoo.org</email>
   </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">hdrecover</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sys-block/megactl/Manifest b/sys-block/megactl/Manifest
index 83e786aa58eb..ffc4cae277e7 100644
--- a/sys-block/megactl/Manifest
+++ b/sys-block/megactl/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX megactl-0.4.1-Makefile.patch 829 SHA256 adc9b926c9914bdf5f4fce787cd7f20fe764df9f5858398873bdf19ea74a8020 SHA512 1e458f68149fe4d1bfd9f77cb76adcfb3202f05b7c363ff1a73803db208493f901de377b65938c043245fd503410905d03b06810eeef6e2fa0039759797497a7 WHIRLPOOL aa1e959b55cda9d65b3795ee58b602a085443d68aa0943cee9958e6bc0588e5dc5aa54f1f37ceb704043919134054f9a4d64cecf17b10e6c5614ddefdc146a27
 AUX megactl-0.4.1-gcc-fixes.patch 2074 SHA256 651a116977589996194c4b728bf96a9d968d4615ce755a31d94279d5e6ed20ae SHA512 9e8ecc86db0189c6754b23da6126cb236d9a14550126efb9a86b1d7432bde0d0a68d2fd7f04e224e561b4ba04182768ae684bbf39e30b1891c0c1c0ad1c294c9 WHIRLPOOL 9814e31beb056fcfd2e6b92ac78e5be3cfadfcf0d2e476595f2232feed133a9999b855658a8e8ade88fb8fdcb5e3a50ad81c50d44926b3c7537f8a6da236acbe
 AUX megactl-0.4.1-tracefix.patch 6650 SHA256 1f2f05185cfbc235085ce263cd0515160ba3eeb42a4524c48327acfb5651ca5c SHA512 c62bc15b9fe29b38415c7e632686f842fac2632ce7be5db5e3132ae6f024f43ef813133fa2c9038dba43ee70b322e27768e16054df550c871f817f827553c526 WHIRLPOOL 371519da996e329d7eb5eb29c6fc455cf119604262199d4eef1b187857d0d7d6b91de6858bfb23a3d176ed94e89017ef485442038c9ddb7a25097edae79a4fa0
@@ -6,4 +9,23 @@ DIST megactl-0.4.1.tar.gz 179173 SHA256 d7aee98035c97a1ff098450192f073565c4f2355
 EBUILD megactl-0.4.1-r1.ebuild 893 SHA256 2beaf2276996e76fe09c96698dc262839967f8544f46e0ee67331a3bec7512a4 SHA512 7e6d49d4df7ebbde6a92c74c1d532578897444f7b1957ec6f02c6e946a95fa25d4712fe5688c1c7bbde7f3873bbe0b60b824e5f66466beaaedabe6a660f1f5b7 WHIRLPOOL c24682ecb18838367c50160cbf05d747c39ce00c0736190494a7bc21adba4088adda7e476b35b4d511a5719886d2b6524638ba57b73075877675862feee5ef2d
 EBUILD megactl-0.4.1-r2.ebuild 928 SHA256 e9eae6981289c4f48b6bd8bc86dc7c645c0cfda34fc7c02c17adb8521e94368c SHA512 d275d669e97661aed94e2e203236f37ac33a67ec64d1bc93019320889b7435faa05ea2263131182281e37c7318befca3cebce5392457cfb9eae8e76e5cfcfb47 WHIRLPOOL 27dd762e1d3d5d8c7419856be5ea1223acc595668447369362a052106744365a35680a6ed90c392776b69fbbbdef64022950cce18cbb629f2bc47ca1faa9febd
 MISC ChangeLog 958 SHA256 125439a973e7d06f1f79c7d246a5b4f1b6aceb3a879108c7e9d03b252b496cd7 SHA512 8c916232bbb86625ff798cb96548b96d13da3fb5cfdc88d866d5be9de955361c04f879bde51916290c1398805339c6b93789639bd71e465d5e1b52f6a0b2699d WHIRLPOOL 484d87c8b996633cfb5bf74904307e729099f5d79144972db8d79f999aee586827ec628ffef2c971e771464716ca39c167ff5097a6005b4e82e30edcf8ba58be
-MISC metadata.xml 436 SHA256 f6c31cd2da8da478fd3bd454b8c55d91d4091d3b3cc06a656c42a35a264dbd57 SHA512 e18822e331ca7bc7d2922bc2a222cd7e4e3dab354321f3d504e17bfb81eb2ab3a6bff946b9de668c7d28ea3bb0cadf3dc5f33c7591fec85a3cf4d87ff612de04 WHIRLPOOL 73ffe4572ba91c37cf5bb0c2e1746d74fedceabe0f73517608cfe38a1e7187f57acc31f95bb2d75a3b9426a60f00ab66694ad24d8fe76ebea6cf767e5a5f17b9
+MISC metadata.xml 514 SHA256 f7340c107e934c9ff5e1ce2b6c9b04472a570d422b25be68292d77c4f9e09797 SHA512 1f3fa16726381d514e0690bb796fc86950886f9e4d5d47f331a400324e22d8a88e913adaaaec18ff5524afc6c2b7d1f3754077dc9d258f57041c36c19180ce45 WHIRLPOOL 4d275845821af9bf9dd213ad9316d2ce1e640482f80cf95774092e0a06f318e9ce4b0fc1b7bdf893046e1526584b0c6c8aea876b55427d8a2bf9d4af8257d9fe
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVfyb0XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmioToQALLJ5i1xxTMh20RGjAZnc7tw
++QNhubzmCzzuTUN3wHNDqP3jyRrI5pQMjQrQcMU7oWrZre5ROWJ7bQvzxOLKTKy/
+TopuQqqIGWwncS7OBYFx0NE1/pv1N8wT8tGYskZD5hTWfbLgqWogoLEegRcshGl/
+7kdl/DMIxs9ig9mGyYgA2EpNGRpz16/7kCPEMkqglvTR5O9HMaY9efjo9KDKnhQK
+10PfW6iulDjRqCMc+RMwkCj66mlybpsZhX+3aFaf9l3SeLOkyWjkz8It0q+GrRPF
+vh3HZugFLkVdH01orY/7/ZgfcVCbAVwg9BiJ91Dv1WR9qQHxxcVbpQdxxGBLNjlh
+eh0EM94wkxNE7CIu2V7TrOQYTpwtFqPm5pe7hCWYB1LWf+3E67mXfRO0CwByJIF7
+c/wMO/ugJYUa5vswEeowJiJjZyyABFQFD3NDOVIWVx5017G85kOs7AmPmdEqhupK
+rMijkNVqlsYy7xi1MhOdFD/XzzA1cl2/YIHornknTyQOpPKuToHdUedBHznVi+VY
+rw4iqP/EQtLgHm9CcpBWm1JfxIUmEv8xEZVD5pnZLAJuM8wo0qQDECRvGuam1wV5
+pGCFKkDpU6Qx7TV11KvmnOahaZrObbwIjGFSkFJdJA56pg8EUkUVR1A275EE3+rG
+2FmO48K6Ne9qO6zYfpBJ
+=NSNY
+-----END PGP SIGNATURE-----
diff --git a/sys-block/megactl/metadata.xml b/sys-block/megactl/metadata.xml
index 7cef94fb7225..3591081b02d5 100644
--- a/sys-block/megactl/metadata.xml
+++ b/sys-block/megactl/metadata.xml
@@ -3,9 +3,12 @@
 <pkgmetadata>
 	<!-- used by infra, please do not non-maintainer drop -->
 	<herd>sysadmin</herd>
-<longdescription>
+	<longdescription>
 This project is a small collection of programs for examining configuration and
 status of LSI megaraid adapters, especially Dell PERC RAID adapters, and
 attached storage devices.
 </longdescription>
+	<upstream>
+		<remote-id type="sourceforge">megactl</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-block/mtx/Manifest b/sys-block/mtx/Manifest
index e05f761e173b..3a226f40dc99 100644
--- a/sys-block/mtx/Manifest
+++ b/sys-block/mtx/Manifest
@@ -1,6 +1,28 @@
-DIST mtx-1.2.18rel.tar.gz 167728 RMD160 f0f9ed6da5aedf66979040dffb5f35613e233c29 SHA1 071229fa454d2ef3f5e29c5eaedbb4e9df31a619 SHA256 d333f7bcc37029268fbb57e64ba375e849d348b65391447c62e7e153ba55eed2
-DIST mtx-1.3.12.tar.gz 235214 RMD160 7c9a762b489c1923e5508225cf8a5da8c53cc50f SHA1 9823426934261c9186ed5954f67068e44d3f7cf3 SHA256 0261c5e90b98b6138cd23dadecbc7bc6e2830235145ed2740290e1f35672d843
-EBUILD mtx-1.2.18.ebuild 803 RMD160 c1d87ac83d482e1c24f58edfec865a26dd034ba0 SHA1 7f95a47d02948647b0818325e046ac07f6f70abf SHA256 c96dfc386efd8c9babbfd03bdea40e019fe81a0ab4230c4b21c2e269fca23609
-EBUILD mtx-1.3.12.ebuild 566 RMD160 e1367c90460be4be3c986ed87c7496a96228672f SHA1 819020a3aa8d5bd045e2a2aca5e58a0000439539 SHA256 9345a45f9a86d492efb57cbac1ea1dca45141a48d6f3a09679bce5d59a5ed47a
-MISC ChangeLog 3450 RMD160 97da7529aa157cfb337c3b4db67f507648b0b6a7 SHA1 d477452ea532fc16c9a59d67ae3692bee6f8d295 SHA256 806759ed9916f9232d2810921bfa259f76cb24adb03ec651dacd07b9f9bf2da9
-MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+DIST mtx-1.2.18rel.tar.gz 167728 SHA256 d333f7bcc37029268fbb57e64ba375e849d348b65391447c62e7e153ba55eed2
+DIST mtx-1.3.12.tar.gz 235214 SHA256 0261c5e90b98b6138cd23dadecbc7bc6e2830235145ed2740290e1f35672d843
+EBUILD mtx-1.2.18.ebuild 803 SHA256 c96dfc386efd8c9babbfd03bdea40e019fe81a0ab4230c4b21c2e269fca23609 SHA512 a1dc93772a6bcc7ac96dc1de35866648fd08d43d0da56581f7f6c250324c32c78ff4c29aef3eea0efee9785e0fe75fcaf9cfa255ea0ac2d43f3bc426e658e6f1 WHIRLPOOL c312a75ad7bbd5f4b0352f431965e222ad4915ebdd5908eaba72abf2f8c74d76efb2cc3fa0bb550e85adb5ef11833a0ec88e12f0f1c9c22ad7086b9f1d66988c
+EBUILD mtx-1.3.12.ebuild 566 SHA256 9345a45f9a86d492efb57cbac1ea1dca45141a48d6f3a09679bce5d59a5ed47a SHA512 bc8bf68bf7c11171b9720ac2889e7d76927e90c8bb86278750b1e6521fcb9a4d504fed7deefdb7e2e97d123984d3a621dd6c26d4693a1e287cd8c419bb73d75e WHIRLPOOL 4ce27ea60a7a311c2a833b04b9f78991b61b74e366d728cf72ff73f8057e3aa8ee87702eabe678f30010ee4446d9472618da0d8505b5556aecd99f9967aa523f
+MISC ChangeLog 3450 SHA256 806759ed9916f9232d2810921bfa259f76cb24adb03ec651dacd07b9f9bf2da9 SHA512 b26a76285382089c39e200c0b7be303533dd6f54b2bd9470579267f99ed6e059d804c9375390d0a174c58832429538640fdb0c71f248d20b78ce6fcb1699b1bb WHIRLPOOL 41c10d1fad251a27183a44653993bf3c741210c917e8aedac6898edf6e353d371f637d7483190092a31f1194385b6f200c3f4825255ef7f87c75c8a415057295
+MISC metadata.xml 238 SHA256 a0215b0e6d1ede5aaab650f2272349bb424940c4bac7ed3be60dbde053a8b13c SHA512 8d4af44ccac24231fce3656edf93a0dcfdb6b08036c7e98b22341ba4404b55d1bb431734610f5b67da505c9a6fafaad3357ba9c9f2973a04f08b5c0df2c03ef0 WHIRLPOOL 590ca3dbbddfd10508739d5b87d9233174112b360ad25a3aecceb5bd284cc26eb1f131f46568756eef80e9554c80bb9f1d58cd971ca0f52bcc54d6b032366426
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVfycBXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmihlgP/3DVZHuMAJdfOBqs2slSus3e
+tXbcuSvTBcm6V/kbL1RFbqjWBVRczLx5PJ3yQSDnzNrYFACV3BYJ/Nvb6FeUNscw
+FYv62Qp/znCVeybq6eM2vLhFt/X7m88Zw5ZG3FCJhs8P+k0KjfjvjU5IlYlxU26f
+tJM4XxSaNSfhhxlTWEAW/9UuZiUX8oOms78ILSYurOTBBYvU4eKExWRMY7vlZoeg
+1EFCTaP8w0i9ekPynn6B//uZ3G88jFcJ3egbwrvfNs2fGfmjHVzrD9kMSmvrzXdL
+xWAGDTaxj+S0QdbcMexf41ARuitL22icrz13PrYj/09aZaLIXC7XD5iz6PsCLNGv
+I+nrn1HHWmxky9LLthDEPHHvjYVSZD5FbdXUKcxQYzNqiG1X8u8CkVfCW6ufBT1V
+S8M3xCQY+bgf0YER1gWq9B3G3ColvUTscevc95PuIXCoKh/0zsT2Mlxs5o0AXDgA
+PKGA5F+NOk+J7W3FJzTY44DlTH5BthAmUrzmxzTG8Cvet9hl5BEVt554L2+hEtB8
+tMqfUdRMoolaRy+UhURwTyQBc8o8r0LMBGkUiOmp1bMj6jb0ApuwZRWtRT3lsV9C
+RStymzaH0CtK8xYw+uHwM4gNnvQjRlKW9C8GNtj4pGctqVG+mPSaaEBasTMdrDIn
+vOghJ52jBrkEXGLA9qeH
+=nPcU
+-----END PGP SIGNATURE-----
diff --git a/sys-block/mtx/metadata.xml b/sys-block/mtx/metadata.xml
index 96a2d586367d..153df0098213 100644
--- a/sys-block/mtx/metadata.xml
+++ b/sys-block/mtx/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+	<herd>base-system</herd>
+	<upstream>
+		<remote-id type="sourceforge">mtx</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-block/nbd/Manifest b/sys-block/nbd/Manifest
index bbb6cbb02172..5f8f731b28ff 100644
--- a/sys-block/nbd/Manifest
+++ b/sys-block/nbd/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX nbd-3.5-gznbd-printf-u64.patch 1702 SHA256 5e4c20f060336688a6ba704e1f5184e2d119887c427b2f29e2d597a3b3eacbf3 SHA512 d6b49fc1b0c0433bd17e5ecd246beacc8e251492b0f606294495494e492f2b0dbc3ea0f34bf40df6c0dc0ce4a0a156096fd8226de181e30d117b270d20514cf6 WHIRLPOOL 9bd2291f006a3969c4cdf9532a7afb16365f119c4ea7a202d6994f17e42e3cdbd7904f84d8baf67c1a02d9ddaef8943c2035fc4bdadd1756ae1e1ffb7a18f0a6
 AUX nbd-3.5-gznbd-zlib.patch 1232 SHA256 796763a8e86ed9ae1f78c643e9b7e4afa06cbf1d07796e699cd86ae1dd3a6bbd SHA512 132cc20ce52ae8a6db62530edb77cc8a1e106c819861dbb9144dd9c2c5138fbf4107196932f5d45da75b4a7b6288f9956c6e04b9938fc5036ebe6d0270893a5e WHIRLPOOL b05b4da4b3748a13474ecb05aedc46f4965b450669eccef7ad83e51d02c0a8c5fd148b185757844c48c1c87110fc463f13459f91de30a060abc39faa017e841c
@@ -40,11 +40,23 @@ EBUILD nbd-3.7.ebuild 821 SHA256 8f2b8b7381e6425cae7c9e741a766aa98907a3fdea16701
 EBUILD nbd-3.8.ebuild 821 SHA256 1ca60265a2993cadf6e76a4a34ba9ef0b04f53586c2020d92abfa2053049eda8 SHA512 9488404a0caa6b501f4e0a936c8b849d38cf0a1c02e34c6de6e6e988d5fa4a1e529947c7490e820c7405dcab5c67a46fe4e3b9fecdd02eada9afbb8616111dd2 WHIRLPOOL 99e80a0a3f0cc53378f5bc04f256cb718cb05b2099ddf14b3eff16f7e1df63d8366fae009b6770901de445a06a1311333ba3b078c989bb4d666201d804e317d6
 EBUILD nbd-3.9.1.ebuild 720 SHA256 7751b5061ae40f51b7d0bdbc7e7f1e982eecc9be241145295d05d4bd2d0d414f SHA512 0147a4d3e4be60a95ee4b9dab4eba02ec281d3cfeb993bc590776abfab5903442b85f5ece882e9c8c051e8d4d8acd88b4fcda1f2fb212279c0e8941ca110e3f2 WHIRLPOOL acfc0d6a9530147f42114af66f59956c93be3fb82efbe889e28b404d132cc1121937685be1a7bc352f8a3037c6b563d979b4cec6306423981d5e5bed86ca9678
 MISC ChangeLog 13591 SHA256 7a01e013024f39b50038695990cea45bc6239f086d1f788125a5e7e3e6fb8f0e SHA512 ef5b3b281b615df168f2b83f288082c045eccecd2dbeb75556f12998c4b799282855d92e32950a5c677de698730118799336b54b98251823ee1f48c943e0feb3 WHIRLPOOL ffea49ad09a9a0048ef3a021fe7672f7a5d7c82d935af4c72766f9f0cd9da7c90a493ff1900d5e67d95861a7050395319e0d6f28e6a9d64d5d69b93c27e4c857
-MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
+MISC metadata.xml 238 SHA256 623a3cf3beab6343197b37a3bde17506a2c522b0100b3f7dc3defe8e6da18192 SHA512 1a2a644b5b4b30afecad1ae200983cef4cf9e26338147272cbb687f7f22fd840a7472b595169613ee0b95d0eb200318e372654a3a6a0b1631cead473d33f6efd WHIRLPOOL 4fbf0dc5ea6ba92ae3fb9bb8bd6df57de835e0988e01e13fcee5f0bcffec68b3fc7f76ecea3b283a08cc9ddb4a5c25b40f2d0ba4efc12be10dead85b85a09649
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlV53TMACgkQkKaRLQcq0GK8PACeNYVVo3RvZF7b57Wy9mvK9rG3
-v4UAoJJF7ES3njenucaoBx+XzUB5W3ea
-=SsMj
+iQJ8BAEBCgBmBQJVfycRXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiaeYP+wUruk2gdcg2+oZE6ufC1O4c
+ZxhIYg/oAtaZAWlYQdrGjpIG7r9z3/0LTMtirf/9bbNB5pJH64S1SwFys6yJSQGn
+rvpPeR6O738D20ht25pXmMuOWoP5Ty1Z1j/quz/XR/deCxprQRb23o9iI0q5EaS4
+8Eoky1k4Zl2eZOfo3xr5lkWQnuymGG/Eu+fSpcPOpWVisUcslFnzrKBSCHTUWHSi
+3Qu+zKOi+yCW2KwwA/cGu7t75Ko6gltWLk9+hfb7zQsOxCeRKXo9PHq6m2GTHgXt
+2Yitg6l3LT1XpRgX6U4qXiXjTGrzcOszOx1e8jDDvlTlkxb++4YFy/pPD+ZwF5Rk
+Eyk7z4rlaT5pj22Fmz2qimKi+L93s20+qAqLWdcNG2MLSLmoHk4SRmK52DQWsCR5
+7LIgO4EmawURykcAu8NnSUiGHtBvZE1VSdR6+vyf6673JG6I8zDDx2Ma3fHFrnqT
+zcp0AHrO0GmlBFQiHvxAtTzIbc5oFrc16STuZESULHwYj98iEQSV2wLAUS0i9WKz
+JDQaMLPQnaIkCPr9XwvrxlMMusuKk3y2TZZFUDVLEdGZCTk03Y6hCvI0TPoL/wfS
+NiHrPRY8EZQzp2dHBl9c61uLBFO8FGVfVkG6glaMZc2urxVDeKY+4sy8aJhIseIJ
+Pr4OfZv80zl3807j7lQD
+=rco7
 -----END PGP SIGNATURE-----
diff --git a/sys-block/nbd/metadata.xml b/sys-block/nbd/metadata.xml
index 96a2d586367d..8ce88b90af59 100644
--- a/sys-block/nbd/metadata.xml
+++ b/sys-block/nbd/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+	<herd>base-system</herd>
+	<upstream>
+		<remote-id type="sourceforge">nbd</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-block/noflushd/Manifest b/sys-block/noflushd/Manifest
index bd0c96b27dcc..5604cc911df1 100644
--- a/sys-block/noflushd/Manifest
+++ b/sys-block/noflushd/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX noflushd.confd 356 SHA256 524422ec5562c0beac78bb01e9d9f094e62a3ae5940165d0b55e6e2d84df118c SHA512 ce56777dbbc0917b6350ec8122c310bbf02c9aefc4236b6ed33f5c2fcb3aeb2c563f91c76176a4b8781e01dd6cfccdbaf82fceb42561ce9556d5c8d373df07b7 WHIRLPOOL bee0d0b17d70b6172bca739fcee13312c3900d64832acccd9adc6f6ffb89c8c13fa592a799f2b220b63da99f391bdadfe6127caafecfa2b9a967cb25956da210
 AUX noflushd.rc6 776 SHA256 6a5782efef04c2ae0953f2e37f634ae64b3a4aa1ce2f71ced92e7266aa206b52 SHA512 8e3c9f61145ca57cf80887b3074575f7fe81e4cb58887127b0033b3ee4d9908b08d9377bef67dfb1f0fa5626f5be5ddbcc81e3352e7e3e680ca833160fe6a54b WHIRLPOOL e5dbf74d24e1e681ba1fe8989088e2bc9aa3ee23702e7cc13651254c2cddc568582b2a4232197889eadcf0e823c4d86f8f6f22321c4835123721a951006df9f9
@@ -12,15 +12,23 @@ EBUILD noflushd-2.7.4.ebuild 1072 SHA256 cada3e3c6a9fb7ed1eb0197b489a5f890e2e462
 EBUILD noflushd-2.7.5.ebuild 879 SHA256 a54c63747e72670aac46c8bce1eaa6c19fbf5a164919998c3d3b5e4127bcfb1d SHA512 99586f3f94ba4c08d18cd29096957a2726295cc920fdf2eead5ecc159f895ae72cfdc0d075940e3b1a7d17f6f69b8a1218d15cc53b9cf6b6cf2d94081f47686f WHIRLPOOL c538306ab54334b530e2d8a2a6eb6411b4e1208e90384de3399478552c6582b9f62eff429a0bfe7e4d9b2686621b9ad9588e575ee8a1148bcd08b792bc84d384
 EBUILD noflushd-2.8.ebuild 850 SHA256 7acf8f44d5b32834eab152e5929f07cfc9e2ab3e69085164ab489cd6b3818bad SHA512 a39cbefd6b41c94b0cdf69944da64129823bbe7a9c753bdd72b62e865d62b2f843dd6241e2045c453d42122b6eb113a4910978ab3516bda23a8a7328881cf2d1 WHIRLPOOL 8b70fac7bfa4cbe76ebdd1f4344899a3a7d166c0222b067c42bd9d6bbdaef96a05db7842ace879dfa4ee71937f833de55bb3a1bf402769a20ce2c09e12987a65
 MISC ChangeLog 3740 SHA256 ba44c2848007c97a5488cbb018f06e65b1e9e86c91e308e3cfee02d02c2d69b5 SHA512 6718d16d0af0ffdeec72759e21c95d5be0c45a087b63d48b27ac689f3fecf0a742acb2a5183b5fb60424e16d9d46c118dd35a8a5efbd5a086a8141818387e237 WHIRLPOOL 10bf344c2654b21bbf80c3b3d157a1143cc3cc08a8859b7935bcedfc07851a38b685b2449d698cf694d7af0654657e52f2bdd66764694912d0eb245bdc9e385d
-MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
+MISC metadata.xml 243 SHA256 3eb6415d91b93f799111dccf22c641468e9634458dd59f693a0ba49a8e75c90b SHA512 40b53ce6cccc09763584fde477e8d7b358f37e3e61c7f428e9f5711987f1eaf3c0720ef170668ff2e008962c6b4eaefb0962e4fa01cdb8aa31c1a24eef37a8ac WHIRLPOOL b3c09531a6290f576717b5b4a4b5dea2c6c425b27246353f69e22d79d88e725d1dda09479cfcdbb524e8d414eed4aa4c778961a170c991b5054148f2df2bc630
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJTHZpTAAoJEEdUh39IaPFNJS4IAJK6w1bjFDG1ieHTHjUFG30A
-/OruYQJf1EzvNBaGNo1vbahCjJkCdwIbHBnH8AdepnFiK5ZhZIl3BnawLKE0wvmO
-VJ7roeEEtbH0asuyQSJMxz6G7eeJ1T8ie2uRJx37wZjGwIHlbiQaXsOII4XDd0pQ
-olhBcTg9qN48Zxj0yv/+xOwOG6j5K6ix9zQnv2I5daLjggSgrH/zmrfShlpi01WS
-TrhpXvYCvOgOWvol8C996zoq1Nc7vXjuz+yyxCieznjbQlFZUM0gHcDZZY9rTxja
-9Z/zuftAq0p+TWeb7Am2S0H9gRsxHbTWnVzi/c9JXjMHxvMl34rHwqqJ8z7l+xs=
-=CLCh
+iQJ8BAEBCgBmBQJVfyccXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiJQQP/0+oIqLJRL6hklXTTkPKyc0v
+/n7JP6BdSTRSqxQDVmOnY136WAY7NZkdDGWLoOFZI19TqB+HvrN2aXH32Fw3qJNC
+ucjghVtuR/BzPujde1fjyvWmpvqi90xK3DOg9msux7sQ2wgBnUtRRRlLLdaqEQJu
+0aKJTx00m++akfvIlu0kaFqsODLU1FgvEtoq8SNGSnesPwpvWFjUkvJk1z8JJESh
+GJfGnorFr9PPwsKEtOtBsHh/EAxNGROq5a15DZ7Y9hBeFAoaiThdNgREdbLfTjE6
+3U+CuiNnz+MAHITyygViEbnbmo14+lBL1ifGnpSi3iS1LJrE57SOThxbZZaICwm8
+7+4DMgiNbDuqSUE5R8XpgQIuQaQ4B0BXgy/GNYA/Sb5UPGT3yMDJirwJlGLDoJvO
+dVwN90jzTaSPtU3S9N2VX/EwdMXJ/+w7+/oVBRYyM8ZcwJqE1FSHrLj90hBpff7z
+vonBaPe+zbK+n0dveYwum0/MET7Aic7H1FpfoDNOnBFxDUWXDW135qFYwLee7pFo
+6eY5oORY6of/gXI7YhoXEhATQCCYNP9qTURsFVPBODN0JC289fkRtXlrHQ/SEvNt
+Zb0k78pm/UtivO7y7pMbnYdj1hsg+89zd/xHP1AxGsSNUl/XYrUVmgHqXlyjeKsQ
+YYw6T0p8qeauwBGbIfAN
+=QuCi
 -----END PGP SIGNATURE-----
diff --git a/sys-block/noflushd/metadata.xml b/sys-block/noflushd/metadata.xml
index 96a2d586367d..cab7039c0aaf 100644
--- a/sys-block/noflushd/metadata.xml
+++ b/sys-block/noflushd/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+	<herd>base-system</herd>
+	<upstream>
+		<remote-id type="sourceforge">noflushd</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-block/partimage/Manifest b/sys-block/partimage/Manifest
index c99af7cfb3e2..dc96ec98ff68 100644
--- a/sys-block/partimage/Manifest
+++ b/sys-block/partimage/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX partimage-0.6.8-destdir.patch 562 SHA256 ba51a0397ae9e220da4a76d2f441c96e1327e9bf6a696f44b6d01baf31e4603a SHA512 aa57ada14c2a5c39bd78e804ee63f8573f90b59cbc21dad3b38426641ca9dde6b233e6cd31b26e1b14a216f8985f138920c8f86cbed1976bf9d38991302a6d4a WHIRLPOOL bdc9ecd47e57fd8f83cc741434d13d6233b6a4263c4cf43577713059f5177c3a04a4ac93c22e6d71eb935a4995df7f19d6054e6747024a10ab0b392481cfbec0
 AUX partimage-0.6.8-openssl-1.patch 593 SHA256 179e0876c29bc619d3bec50565122681f36396cc68cce563679e82d04b31671e SHA512 d6a11b1c90390e223eb81ab7983a41fdd7a07e06b8eb2efa4c63c5fd753727d2c06bf56187fbcdb5c8367670264a1944d4362420a246728e011411fdab3e0f2d WHIRLPOOL edf2bf4d8307954ba387bb68e54fcff9dcc0736839a583bf6cdda5ec9b3ab6d2babeaa42c500c3d0c2deb142cd63362eeff89318b59aa1cd5dce45670e9ec0e1
@@ -15,11 +15,23 @@ DIST partimage-0.6.9.tar.bz2 666522 SHA256 753a6c81f4be18033faed365320dc540fe5e5
 EBUILD partimage-0.6.8.ebuild 3716 SHA256 438c5fe92f6d189bd4ad2a34a6ec392b8a06cfb8fd38421f9cf127657bc2d73c SHA512 b3b0e73abbc2f839ca62201fa53d7f22c9ecac2341aa2a5978ee7a1802992236bb411dac90df2d9cac84f4a95f897ef221d3e166be5966d20d3c90f29135e893 WHIRLPOOL 84d09d474574ee74d7cf4f38b8ae85c489759ad6f70202a0d8ba901d96fc2d6486be1bdc9dae08f3306395948447f37e2b0ee5d0509fa2941e8b0e46c9ec6a9f
 EBUILD partimage-0.6.9.ebuild 3514 SHA256 0cf44ced9b969b255502e8d776a127dc30f4f02543df2bca26933bd1c0e7ce2f SHA512 d918f4658852f6463baa38c8d953d7a3e91ff6a6cb005b07e8889f6b5e727606e7159964eb22f729be8ef10213e8e35fb99bd8bfd6abca69e9339d80b98d4b49 WHIRLPOOL 42c16743ca4fa8da36c641a842a80c7f099bcef8f15fdf2cc69d43e931c9a8483b0e868bc26e3ca03000071d252e8c4cd6ef5b4584664273605192efeccbb128
 MISC ChangeLog 13701 SHA256 d6d8fb937cb07ca292abf08c5733b2e405ef57824ae9c8dad90a9efaf380bd49 SHA512 e1a8a2aa9e5556fe814f4da7d7657e38223bced354ff656c23100d9973a328e9d33f5497d44693ea38545d3613dc1884376d8b56e170ef1f61ea41901f684a8f WHIRLPOOL 31d2217709d8ff2fc2b8793672cc70206663bca28dea8fa951c41e53601a5028d0f295cd5600015f74e50285c2e1cdebe659b806b21c7cb92403f1e9ba6d9198
-MISC metadata.xml 263 SHA256 1067ab0115fc08e2b71da0707f6cacd6a229d6f1ce5ea3a57c24dc1c171948f5 SHA512 f2a1b24464978ff4b31b75194060a91689478b6dc2ec3c89b75b99217854efc1c5dd519db276d4fdc9067ec15987545a0e06e6a3f7ebb79d7c29dcec1e01b850 WHIRLPOOL 3216bb8de6640007df8d91fc60820e25b53d211a1da8f9bf83262377c3f72fbc2ef6668920c54cb496b73213413056ebcaa2ad4652af8ca5f7d142446bd36a7f
+MISC metadata.xml 354 SHA256 2597ffcd5462eb4392fcd19960f5aa22e809743f800f585c25334d2e51741871 SHA512 86ec7396abb52d762b18ab7e05bbcc5855eaf2c23b253cca1655e2b44f89800f98f46778f06f5a9e601b4651ac607a29e87bcb2c9aa0a7c68a4643c3617a0459 WHIRLPOOL f9d1be98e74033cad231c7725988e6cdffc06cf821115aae4c32ef0738fab0fb75a7714704271e6cdc4be69363b68cb7859002c83a1c241cd38afda08c661738
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlB0eRoACgkQuQc30/atMkCU6wCfSzu1/J969kTJihWFHJjRY9hT
-REgAoLpqLFFadvwEDgtThDkDuJtS+drd
-=OJ/0
+iQJ8BAEBCgBmBQJVfycnXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiy6oP/AupTOhvtMqF2obUFxQgcbrL
+qSIHD2RXfsANHoiBRrKzpNe3g247P+W0ig+DkE12eRs0aJUBZoNM5Sx/M7MeUBea
+d/2HXW/iQbJvpg6uePRUJcSKifmBBjRLbAsa6ErmkjIA34t3VppmclLbLFU8joT1
+sqD6GGOKwyQKCf2dJPzI2Ab95RnJy8cpxofUfmS8o0oiI9hpIGx6c+83iAVat382
+W5m5w+kypefOurKcpr8gjScUO03YE5Sjuu/JBAghAWH/xW6+iCjv15If/WgWZ/Un
+7PWn0CafJK/gt3TW5T1uH9H4HuGFONVccZZBJUeSBBrfMQi1ygU62Zvm/REoY3jI
+1986/gJme3zGiuBDgQ2ziTgBDwN11dTrywHoNc1WJNctSXNX2Nl9jrlyMsUcA8Ox
+8wVlPG3/HaFhNrNXTbXD+qqyZFKhasB8xKTrd57zQ8dBGjWZij6zhL2BuqcQZ78W
+SZ3hizM2Op/M26G5rtNFNkNWksXQz9E8gbHaMErniHpLtlCMal8iKSZDeUSDr70H
+9ssQJEVHjx8gqMINPkkcFsoPjSTo0eIIJ4lno7eObHAVFxe52Zj4lKp1wuxFtbcD
+PEeKaLG85bIEeO24BCdpT7xqlGTDF20NdoD6YPJOeIJPAtmPNey5zTPtnOb726GY
+WUyNEd83hUPyL8MPNrUr
+=eY+4
 -----END PGP SIGNATURE-----
diff --git a/sys-block/partimage/metadata.xml b/sys-block/partimage/metadata.xml
index 86248d061495..fba1621be868 100644
--- a/sys-block/partimage/metadata.xml
+++ b/sys-block/partimage/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
-<use>
-  <flag name='nologin'>Do not include login support when connecting partimaged</flag>
-</use>
+  <herd>base-system</herd>
+  <use>
+    <flag name="nologin">Do not include login support when connecting partimaged</flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">partimage</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sys-block/raid-check/Manifest b/sys-block/raid-check/Manifest
index bf9c686723bd..05baf4322ca6 100644
--- a/sys-block/raid-check/Manifest
+++ b/sys-block/raid-check/Manifest
@@ -1,26 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX raid-check-20140719-makefile.patch 1451 SHA256 6d3e6711e91131f4aaa54df478a49adafc4e089c650094b62578aadc863cb35c SHA512 50ef4c4eafae33a0479d06cd162b54bd89c3ce89b92fb48aa286f9f1fb322ecb6c58c58d29ddbe1b7a42813a2a1fdd6ae4f65242215205eab5acbb0e9d9c9ed5 WHIRLPOOL 434bdcaa89367019b15df8fba978f8a549583c4aa0dbbbe2efb41aac5ca51c26a5ae0ad4c058d7d6f1dfb2949c87f8edeedecfcc67ba56ed8d8fa389c4652559
 AUX raid-check-20140719-path.patch 293 SHA256 894b8622eca9955071afa8af1effe2055d17bc4594311a5eb331a56f3a22ee22 SHA512 7b9939b9ac05d6c04af5a1422713a316ac18826b7d6f9ed1d5b66e4d557e0069f91e4e04e627a827070c676a845af53eeb2ef7be8bc15455229117727bd4e1e2 WHIRLPOOL d115f0858416c68f5c06e2612ab3eb1e869d2e54ff834bb876f75e3f2504d52f2a3b347177c844822812daa1c2920cb8b9f7f8bbfdb2303dcd0820f67478f06c
 DIST raid-check-20140719.tar.xz 4000 SHA256 6da3e52012411fe2de109f83f2557da21b2975060e78d992a9475b01a5de6348 SHA512 dc7b4c6e784b3ef2ca89e9dac0bbe3e47056439dfe48615b79922b47cb3b0df7f157ae52ab9de0b9abf5373bd769090088fc8712b492b0aa5327aeaeaee52edb WHIRLPOOL cb09a9d5fc17d68ca303c835d5cc458cada860f7fa6f9149f24fca31fc23f8c52f37b06bf8891beea84ac6e4e27dde83734309b4e2c56e6c6615837b85d1f88a
 EBUILD raid-check-20140719-r1.ebuild 693 SHA256 723a8d236dee0118abf2a5b6ad1206ac5aefb5fa9ca785b396767468f0f21c5d SHA512 82573ed0feb01c2ab6d140128f31d40d1c046f4f6b7a3e0a8e6fc3bbb5014c619afd8344e0c245491a3b467636c4f64c284746888a2f97d54ec299934558e786 WHIRLPOOL 59165a80156441fbf3744df823310e737a6f1a1d4f7cd201d80a1f89b82267085742518cba37773ecd67e169c3b659c9cc63ef67235a7e787ade76b063c6a789
 MISC ChangeLog 729 SHA256 913edd0724c384094daa19fcb8cdac773451d0226cebdbc76d7c7ffb114aa60d SHA512 217e16883d0a838718a886787a770ef65780ab6481b847200c112cdf0f728ad934b2223a35f014310468374ef56b4a35c3d26392363e3ca50554185652ca5898 WHIRLPOOL b31265314afc12e6d71c64b4d611618577f2f020a28bbfc2af0224c221cb48f18e10070a840a3d187995b8c9a44ddfb8288023c802c43af7d26b6a981263b307
-MISC metadata.xml 442 SHA256 7035f64f2d64df8930f4eb7f0d1f72ef8b1b9ecd6807dd80c0d53361685fdc3a SHA512 fb6a790cc70b321e5cf2fba4b0b2b2aa7ef58ba123c77da101730e11592a9650ab3d75daeba99aa773f4a65cfd95e238d3e6e37a893ed49547b5172cfef4d079 WHIRLPOOL e496b85ce98a1f7174c567f311a376fa06a82f6daf33874fde70c0b014893d6e227c8c736a5e87889e47143ac63dfc80706855d26b09b479bc2107203bc63284
+MISC metadata.xml 525 SHA256 3a9ec6f8825de40684366ca8309acd661c4d4adc75e83d77b295d0b70426c94a SHA512 6bcf7b38e991f366f9bb8125856535bf65fe5945528a174a18039372b375cd44d82a82ef62667cd1d86b34db0e6d56834e1f2373e12db432705d77a68e7ce156 WHIRLPOOL 27688727524bd266314ec8595fe26318cb6a4b6f5fe1fb80066420eb67ce160dda3ade28d970e31af1c23aad2161e7c72922fc30a2ee9f4d26473c337d935089
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJUQWdAAAoJEHy/RO9cNQiDiE0P/2OF5jA7EzVRktGmDu/Df7h5
-d94LwFwof/PuXu+55B3MmxefMfecWVvE3PDSo1IrmKkc1proLnsfpLlt+B6C5yNG
-xPhFOa0ugWJXn1ndskQAECHhHyyGYxW0quckUfkSAPoqKLCaDQ7Jtp7U+kPaK8O/
-DDWyiQ8D5nM+x5qqO2C40iOrpiW4v18ULQX5Jgeg+rjuKBLU3QbXkpje98lHvkiP
-I1Oc6DLVk7VmBp7cMUmbNYzOHQ7CVgy4UkZ3VEAAVMyPFujz8qdvM8CqZ7qfOf0H
-Sb6s0BqcSaSU7th8P0kdnU97hffxh9W4nYufBN/5OclgbeOqDU47UZliaW0CyZoT
-n1bovYbioFIaDWdjkvvpaBE8oNvG8WtNsral0zjah6+fjaU0FrCxJzCKknqrY11H
-QfzxDN1meVOGeWQqb7Bx7JBC1toWsnTZH36gArRWt9oz4TjMjK6skfha08/IGTQV
-Nrtw8kMn5EgjL1ZzG1GnhjCqrGxzO2IVWAPQrI/B1XpTxRLpsCimOIydAyuFXnGj
-hFwBfOE1njbCxMWbSdu9gDSxfpM9WhmTicyxURwgtlAovjA5Va8fIJdYWvzv1TV9
-P3x01BxmL2LRWF4dY/A+y1m+tTeS5g0cy+nq29X3TXrixYVb5J4ytxtK5iVnUSct
-PS9iT80dVHavADL+Yr34
-=l8PB
+iQJ8BAEBCgBmBQJVfyctXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmisyUP/jqPn7SvKkEBK5TU5B80D5sC
+FTLSd9FXRIoNLcg2VdYyrLZS69UiLkRCaw4DvkwHZ+Lf8p6waDQNgNJwECiyo8nI
+cRx7R3NV7CHO2UfvLT0eEUpGv6YT784EoquAaJr+ptsha2KHA39K9D3V0pTI+dII
+/5BdfW/2hCIuh8Ip3VGFpFDlPlv2egoc7DCcxzB1vqpx0Zt8l0T9FKGXUDFIWI9C
+PvUEzVBEGHl50jhRBOVwrv0UkcDm88NLqIR9oB6T0lh5QFYtnbkLKqWQq21/MOoi
+0dZWFPuXvuGNy8W6HbEP5Q4nT4M2D9eqTIuJqAOz2lPRrtZIBntIDSEKYQS/99Na
+WPKz9BAUKBlM6IQtBKZ4rPFDAQMNm0AueG5JNLgb8t0OzDpJwkdaCKXEXUhQCeHJ
+G3jmUNTwPp30I1cO0yhKUl/vQz4J9qfc4RJuQ3NFuasBRSrzzvYv9OfTHZFR/zi8
+vpvJ8eZM6JTHsK631bmG8+YBngS8gJ+b6A1fs/WKTrsN/AG8K0fzntgOTjjQPE3W
+tbRXgSx3zQMxvU9RR4YyUzGZGtYDWvIGiO5f+jtz8UQYPEfYL0oFH5BUf85JbSNS
+Qy/G37xU77IgWZJWKRMgNEaYv1WC+6pUpe8UkcV+Cye5JC+K3F8Lj29DU1pB2kxp
+EHFKqMPZpOHE3AKj0qWS
+=CfEf
 -----END PGP SIGNATURE-----
diff --git a/sys-block/raid-check/metadata.xml b/sys-block/raid-check/metadata.xml
index 20afeb35b830..35f754ea2cec 100644
--- a/sys-block/raid-check/metadata.xml
+++ b/sys-block/raid-check/metadata.xml
@@ -9,4 +9,7 @@
 		Script that should be run regularly on systems running software RAID (mdadm) to
 		perform "scrubbing" (http://en.wikipedia.org/wiki/Data_scrubbing#In_RAID)
 	</longdescription>
+	<upstream>
+		<remote-id type="github">fukawi2/raid-check</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-block/scsirastools/Manifest b/sys-block/scsirastools/Manifest
index 7c48af00ed11..9f7d7452aef6 100644
--- a/sys-block/scsirastools/Manifest
+++ b/sys-block/scsirastools/Manifest
@@ -1,9 +1,31 @@
-AUX scsirastools-1.5.6-glibc-2.10.patch 3881 RMD160 f31e3d706a9676841c3a25ebfaa8e99be3e29fd3 SHA1 56dba9da173852eaffcc882b7a2719c7cdca9eea SHA256 61de850cfca403beb76c2cfaaf3a9c01b45bc5a6a0080c1e4ccf799975df5fd9
-DIST scsirastools-1.5.4.tar.gz 632340 RMD160 6e3d797b4c0d3274108ce65e3aa60f2f4da559e5 SHA1 93c5f67fb10bc0ea7c8888557b0afeda21bd6bf4 SHA256 d22c4917d8d2277710ea6bd4742874a62fc5666154ee6715966216daa865297c
-DIST scsirastools-1.5.6.tar.gz 549895 RMD160 1ec760e644d43fb9d31204b79075df66511fc95a SHA1 a94afd4c8666cde2ccc5f4c8c985634ead2d68a9 SHA256 fc3663bdd78ef14c75cc45d1922329a1be80a433627b4936593175f728b5b48a
-DIST scsirastools-1.5.7.tar.gz 677348 RMD160 bebd8f413a74ac835427696893c1b557c38b1733 SHA1 227faa051c8db9849e460be4f63058d5ee187566 SHA256 0b53e731cb03b4200e5f46b5e79b20e329939c276d65b15835ceba0a1fd4055a
-EBUILD scsirastools-1.5.4.ebuild 1584 RMD160 adf49fc146658d39402c41e1199f6a765fb47c33 SHA1 6546473a07fb25111967d4430fdc398db4cc68e5 SHA256 352a6a610a53e68ab7440c9ea578467ee9ea9732864d9c3882a3e8b50a7aaf08
-EBUILD scsirastools-1.5.6.ebuild 1660 RMD160 88ddb1668752c9b21435e542994b420dfbf85cde SHA1 8bad1b4122cd9bf4d8d5d60f099c36e292562166 SHA256 9d5cf27f4f60136962a86beede34b7cf49ce6539336f7b5d6133df6818380a7d
-EBUILD scsirastools-1.5.7.ebuild 1658 RMD160 184be5058f4f163ee788df5c2eb6ebf89b57bb99 SHA1 cc83b6ba55ee4d4facc3d4bc46a077dd31bea4bc SHA256 59b59a49b5ce4289caf7d67c9c75bef76003097d1f4dec56635081746f0ab160
-MISC ChangeLog 1651 RMD160 4f0bf9b7467263a110647374a57e5daae9f7a9a4 SHA1 ef4c270239be7c454c25bcfcf4358ca6fb419cc1 SHA256 48eb7c0420dacdad84c6e3545577952b73c32d2984aa66fa516694d8ac816bc0
-MISC metadata.xml 202 RMD160 ca69c6e7044d6681415f1e86a1c084f890ff08ef SHA1 62ab18bf0e1da311494ca0912e5a79daeceb46ad SHA256 76dbb4a720140d78f0ddfb2b2782c03852169c201c1f507eb17ef4d2a82f212a
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+AUX scsirastools-1.5.6-glibc-2.10.patch 3881 SHA256 61de850cfca403beb76c2cfaaf3a9c01b45bc5a6a0080c1e4ccf799975df5fd9 SHA512 6c09b07e53b9c536338123ba3f6814ca225880c8f5f3e7aac2de7d11212bcc2f8918ef40705dbc1d419bdb28c941a688aab41ae469be1e6f50939f7277b590a8 WHIRLPOOL 246a51f49f6682da002e95e500c10d902f727d8f04147f9b295bfbe38b456096ae306776a03753dd7935f18a15edac7aafc785958bcd6179d9512ecfb92d51e6
+DIST scsirastools-1.5.4.tar.gz 632340 SHA256 d22c4917d8d2277710ea6bd4742874a62fc5666154ee6715966216daa865297c
+DIST scsirastools-1.5.6.tar.gz 549895 SHA256 fc3663bdd78ef14c75cc45d1922329a1be80a433627b4936593175f728b5b48a
+DIST scsirastools-1.5.7.tar.gz 677348 SHA256 0b53e731cb03b4200e5f46b5e79b20e329939c276d65b15835ceba0a1fd4055a
+EBUILD scsirastools-1.5.4.ebuild 1584 SHA256 352a6a610a53e68ab7440c9ea578467ee9ea9732864d9c3882a3e8b50a7aaf08 SHA512 5f0c84912fb8334a67c19cf5f566e8d4e06bf1e3c2b3efe278e5a83f97f41b6553af09c03df3d2613a5706b328c65f6147a753d10e84a03ae1001df217538408 WHIRLPOOL d242359e03e0532c4a5ef211b33f4c67ac43e97cfa19f417630e791d15dfbd1e246489a32fe558c117e2e8a8d686e7dc4e688855f5a48d27abbb2b41627bc851
+EBUILD scsirastools-1.5.6.ebuild 1660 SHA256 9d5cf27f4f60136962a86beede34b7cf49ce6539336f7b5d6133df6818380a7d SHA512 82d4c2f8be3a0087affc8efee094b22881d32003a285313948718b920dd9ea0a3ed7fa5540336209f1bbf280e9dd05d28642a4173a7200e0afef9d1c11a4bfd9 WHIRLPOOL a55f36c53d2800bc285f26b142b09c25f39b89d73027b08e0f5ef34721a6b12e2934e5ff0f8ee24bee193345220e9b997203e6f6c1699c644bdc8281119eb280
+EBUILD scsirastools-1.5.7.ebuild 1658 SHA256 59b59a49b5ce4289caf7d67c9c75bef76003097d1f4dec56635081746f0ab160 SHA512 51370f0afc707f4004b83ca21e7dde75ecd02cc0a49c7e4cd0f0e25e7a8400ec912fbf77434b1940b430be6c66cc93a00359ca0b71a52bb167c9222853a5ffda WHIRLPOOL e447950d4e729af9e9d082aed96bc7559c552b0a47f80c798c40457cab7bf74b2a00dd4455c5ec76d39677709c718489b4e1d0bbd231aacd27d590d5d76f13e5
+MISC ChangeLog 1651 SHA256 48eb7c0420dacdad84c6e3545577952b73c32d2984aa66fa516694d8ac816bc0 SHA512 2c16e2680b92f6641ea4bd14f3377f89036321e9794aba5db0ad5ca5c5e577951b9a0d46c9f0a71d31daf26660fecb2c3eb2c1f521f65ac2bc043d80ed92566d WHIRLPOOL 08a9591607ac5a4817b8c76bc2ed32c1d792fd1e964e7deb3990e1da094d80b3fbf64f847e3f6672d7ad7a7a049ae675cb0c6941e8fa51a305ef86af06ee37b2
+MISC metadata.xml 294 SHA256 d74ea07fedd76c219a522bb90c1c5953ec5fe787822c2341a188892aff914ecd SHA512 83fd5008a0bda4f13d60be50d46f0decafb8c1fc2de3f6cd655f6c9e6fa2f8aa33f60b96205951b769b0b467fcdb45cd76f4467638740f931c6d0f01aab89119 WHIRLPOOL e14a0662d9f892c622eac8d950bed052cf80d8d187416618b81cbefe6a9a22eb9ece2af44ec2ad87b00f60979b099ac5abbe62e83bdcd63a6af6d621e83b6d06
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVfyc3XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiOhgP/04ik/0HnS2tEn0N9Jk/XlCT
+MKot12MtQ+tVvSg4cpRFyRAauYz7bBHJZvN65971SzsryAtImf0OWJhSqziJ68FX
+zUOaVZnbFpYkfLH2bChgyD11OOq06tC3OYwfVGHJlF8dcI5YHZ2S2oDVrTLRAdMS
+W0RH+ORU/Gt836jQ6If53GIvQKGSVRWKvDwVmEoUagFrX9TBKEW7vPxRqRZ6kyqS
+0MmgyXHhLA6QUardvEYsZHApgixLo8Q7j+ejIy9x9O/xjPPRrMzLYGd35rHwxGTN
+1UM4qenl8QflaCMl/d8wFKIWwXFKepgLEtBKS3xK9bJTi43SshJTFyX5ifPBq5K5
+HYUlOexWnIRo9zePLYfuCp5M5KEb0enRSQCv323jGapwfyP3nkiu5Qjkpyo9W5Vk
+vBsMIw9RJPMWMK+8p2d1EkAEf4DbmWiBX6YhjU51zB6c/NNMZy7EKqYAVw6FJjbO
+Hmvw2gGvKKZM5omhlFkawrEKTymFQg2YPQV2ey7RQeAqA4M4j4FwXCOoFjr4yVBV
+TjLHFj12IX1aLI6skE3KySsJsLIOFuGDKMllWMZ2rz059Skw3FihJKnQ1Ql4Hfra
+lwCINXaixqlP0RmXM5yJU3N0tdJiBVQz7EQQgQ7UrdIhmzQmfq5hPM1gqMRIYVEy
+LzvcTF/Vdk9vc1TpjHP/
+=+7QD
+-----END PGP SIGNATURE-----
diff --git a/sys-block/scsirastools/metadata.xml b/sys-block/scsirastools/metadata.xml
index c6d862855eb5..eba19a181423 100644
--- a/sys-block/scsirastools/metadata.xml
+++ b/sys-block/scsirastools/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">scsirastools</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sys-block/tgt/Manifest b/sys-block/tgt/Manifest
index 83db8b4158af..b848f064f960 100644
--- a/sys-block/tgt/Manifest
+++ b/sys-block/tgt/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX tgtd 3532 SHA256 a7b64cc3b5d6cd24525ce7939e460ede9860845b2b838e399eab13aa573d5248 SHA512 e1f35c2f619945847108d140a5451a64fba63964217fa9cdd8186b58b3a71da4ce5af3b3d875419344fa20e09e21b4fc95b26c0df6e40a01ab3366151b48348f WHIRLPOOL 248b7680c8bc2f5b8b7c8e045bc3359d702ba5e654a3415fa6f92996f073b2dc7c9d9e9ad4180e079834a1676a4cfed65ea9723cca315836d58ec7f91d4ef097
 AUX tgtd-1.0.24.confd 108 SHA256 f1bb9173de8b392116da455fdd45166f9088c7740867ac1778fe161beebfad3e SHA512 2153e99e3f6a2178bbbb2bda1d6af9a67d6080b36e7c5cbb4f951b10324c80a24fa224a7003c26b3b51d40a77bba97856bc009bbb0e664e93625face723edc91 WHIRLPOOL d1868d82c473b4790c506e6bc8b1ee03adf6779b4d848bbb7c406be59f0b30c4942be13057f93a112e784281937fc0e50f40ecffe0f71b641e407d1333000ca7
@@ -11,23 +11,23 @@ EBUILD tgt-1.0.19.ebuild 1277 SHA256 252a906a117171b076b6fc034def605e8ba45abed06
 EBUILD tgt-1.0.22.ebuild 1505 SHA256 0482adebb815e3f1a1c57575c4fe85b278576012f779a0c0ac48afd7e70dd982 SHA512 c9a25fe10307eb662f8a3ff74cb953efbc8247277cc750211e9d1b7e0595cba46067a6d9475a3e793c3057dd38f6195255a2f45caa07719ee745e3cdbbe42999 WHIRLPOOL 633eaa4fea93c3cf9ddf9ddaba3b3b092d40d2f1d68a477006e07de3c70d0ebf11ecc10ac1cd5ad3c165ca90d13eb98cd218876ad89b28e7b36af13e21fb2b1a
 EBUILD tgt-1.0.24-r1.ebuild 1653 SHA256 75b83be5e088639c5d6e81b54dcc080ba03c6c039e3cca66c0f07b55bd399685 SHA512 0f79a4cc61f019c0943d1c7b24b1e0965ef571929dfcdcf25b42d62c577f833993f473daeb33aa5ef6f75b5364c6f7111d526ff7096b05e904a441df5c0945c9 WHIRLPOOL 8e0d8b24540d4f1b933253b067318b4ee5c5bffed56345205edd4d259735e0b1ec2da10e1a08169b765bee6f2d5c918e010d6f2051c2c87a54340c22fcefbcb3
 MISC ChangeLog 3393 SHA256 6ac06e443a8182bf24847ba9bf3b2c796a4304733ea2f7472aeda84cddded4af SHA512 a2c9d52af86e48c2e403e3997580521f53b413a00ebb8fbf6e3ec77b69cdda12fa7c1952f3612dabfef73bd6d3f66117156d246be2e661aa81b884690c653629 WHIRLPOOL 34bb11700aee014429c66d41ba13c31981970aafaa48d57e277313412f7ef11d7a7085248468c86a57e92028d0bce47c3392bc205040eb3dda252d34d4b165b9
-MISC metadata.xml 421 SHA256 a03ba54467398ba953ea6073808e0f9d240c6a3da753d115b9024d816739ece2 SHA512 158fbb564f28dd4b2168323204d0d20650ba53cb92e09c9b306bcd6d84f32b3b1f21f80a7843755a91feca9f78bd1744236d7f1202b468e8dd0ddfd0a877c5d0 WHIRLPOOL 2d75d73a834cb49216ec7ae9f24b5d4279a206ef0bfc1a3a4e81c9d882f2496c4691510afe7602818cbcdf4b325046b34a02ee817b4c9f5088196b08cb1253a2
+MISC metadata.xml 503 SHA256 69ae8442c13c925901cb9152876ac58b692d59bd2c43aace727f700dd2b26b3d SHA512 462c17411c41df02788fbcdae40563c71bf48fc64dfb054d9b63fa3ea809b98063ae2c94a2a463fe9602e0d96249eeb33383fc11db9b698c92d4676c24281c62 WHIRLPOOL fcae761d5edbfd51b6bd173f08914024955377bb7393e58057a936c0bfbb83c5fb315e19d113b83e12e5c77de2db0d1ef893e2cb49769fbd9b86e9cd99c163d0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVHHA5XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0RkJDMzI0NjNBOTIwMDY5MTQ2NkMzNDBF
-MTM4NkZEN0VGNEI1Nzc5AAoJEOE4b9fvS1d53qoP/ikDGMOlHDOAIGJQ6tkBfiTe
-aQv1AshRtiovLCZo9T6U693IOzDZUnR7VFzWwZ/HNfT5CZwaBfBcjcdwG15pQXqe
-hVQhb+E43PKf9S+SKzBJIaFIac/su3CwIgZjtmA+bf4CdS5dUM/szbQxlkm3ZlP9
-z/AA0dsNMWjgzncQ/oNjIVoOLwhqtgNcqJJt206u+trBgbLlm90M4Xi6xzDTESBg
-ey4AiTJYR7zickl5sfWbHJ8OxKskWnh5BxLJZxe0602Gur3cyvnpqFPPrUO99dgA
-O1A2oNefcha9qgvsj40umqZSpAGwPQ2YWMdvbUcarOutwek8/Igpzq0AVDO3rRLA
-nacw1AXB1zA5wmbaDfvqSPhlz3cj9k7ikc/uMe4NTCPL703DAMnJcI3cBmIefyVk
-DdirNlTbGbK6JkdsKGEImBjYPy8mgq/cjDCpoxYKIJe6uibuzR+rA7x4BgJ2mm1J
-w0gtDVMxNb45elaz18xbzDDdfhoQqsmFcrUYwu+bagRrz4ciWg3dsuNg6d2EUZ5u
-6NBGGekW7EtMfAIDq6qIlsDJ3q/3OQP2OAuA4wxxh0G1iDR6C0snBPF/tnPU2ZtX
-CEBsFzbxrv+LU8mKGPjCpX0JYGCH+QuKOBswd4vVkJ6HUECCx6XjGtHFoSY0hIYR
-qm2jwc9FRYooYgL6gxSI
-=/BnA
+iQJ8BAEBCgBmBQJVfyc/XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiBfUP/0jv/DsuepJMYl2dU/Hq/BVc
+Q1l2k/39IhhCZY4Gn92BBikQyaJcumXl89pv3crIt3iM+t8zDj62Vf/GBLV29M8W
+0g6fT96KO3cf4asO42nNUryfUxGzhhTpcmTjKU4XDiNYtd1u6YxWLZJhDq7stZGd
+qdv81aVfcGj6L90n0WmYds3plEjVMkeOlg55iCFavJpKu7HuqZTF+mJTzgVrrQuG
+otKE5khrVfnPtKkUXeIA+xxmrZs7KOF/Calp4Fv/x1mRCovDkLKjDHVPuEtGeAGW
+E/v2DsmPyyMA/bpjuUgxAEzyDgIhqP4ijmUfDvjZLTOWTJyCuBepY6wVPB0cSg0A
+QH6ACehRIaEMrORYv3tIyiDHS9rgIUCVdfvXFLLumGm1I1KFAQMCCA+QU4a21nCu
+AMhtj/Zx3ZlZgq+bNxQVY4QXL/y0sYWl2kBBHNF6eiLF+CRVcIleuVwTR1I/9djQ
+OnPWM4DFncIfh6f5UCKx1WHDj4ioHq3ovHh22Dw+q8rijI4bsRY+NFJLYxQth568
+zxeoQXotAOSvcCsQrps3fHvpBS/mIuVvqkk1WTxN8p2Qq8jpjqZ+y6ro7m7C8fmi
+n94phMRJs0DDlOVcVl6oIQgNAaPh0HYYnqPl4LuByYQMCjwujVx3+qkxeW6CXhvj
+S+vBqOn6AZtBsugMs2y1
+=R2oY
 -----END PGP SIGNATURE-----
diff --git a/sys-block/tgt/metadata.xml b/sys-block/tgt/metadata.xml
index 22e6df9a23c8..edb8de50354a 100644
--- a/sys-block/tgt/metadata.xml
+++ b/sys-block/tgt/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>cluster</herd>
-<longdescription>
+	<herd>cluster</herd>
+	<longdescription>
 iSCSI Target daemon with rdma support
 </longdescription>
-<use>
-	<flag name='ibmvio'>Add support for IBM Virtual I/O</flag>
-	<flag name='fcp'>Add support for new FC protocol</flag>
-	<flag name='fcoe'>Add support for FCoE protocol</flag>
-</use>
+	<use>
+		<flag name="ibmvio">Add support for IBM Virtual I/O</flag>
+		<flag name="fcp">Add support for new FC protocol</flag>
+		<flag name="fcoe">Add support for FCoE protocol</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">fujita/tgt</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-block/thin-provisioning-tools/Manifest b/sys-block/thin-provisioning-tools/Manifest
index cf0dda3b6584..d3b61f6fab29 100644
--- a/sys-block/thin-provisioning-tools/Manifest
+++ b/sys-block/thin-provisioning-tools/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX thin-provisioning-tools-0.3.2-Remove-ambiguity-between-boost-uint64_t-and-uint64_t.patch 6866 SHA256 377c4b1b2caec23243e3cab6660ea736006a3c859e1a1b49831a481b631b230e SHA512 1f52f99d5fe41718b45558270b59be882cab54c962db2048fdb934321b5753957587ac62a9507fd7a89e45fceaeda1d8f2189af28188e2c8742783be1dd1421b WHIRLPOOL 0d5f856f23e023a696041b28b7a1ae39b28bf6bb7b2a82ccf30db98ea817fd5bd37676c7f046d0451db303fe2ecc54fcb5922da02856cba13455d3c9d275659b
 DIST thin-provisioning-tools-0.2.8.tar.gz 158332 SHA256 8a5d87b929095a383594b7141b89e51ae42046d7dd254d544330d789b6744344 SHA512 6534bf42ae936f6f32ce05b89eaeb731938b3761e74366d21282a69d74875d1f9d5084590b19969894c9908726e96f17714f051f050a040dd934533830eddfa9 WHIRLPOOL 16bcc268b450938ccec450323ce6dee97a4851c97438115c250c674b930ef8dfd0c7f6507d6c5204b72250da685d35ff57cf72f297abeec6704fb09520307ef2
@@ -11,21 +11,23 @@ EBUILD thin-provisioning-tools-0.3.2-r1.ebuild 1496 SHA256 9225874f0b7f0fa26a0ce
 EBUILD thin-provisioning-tools-0.4.0.ebuild 1498 SHA256 350701659c7095d770ed3751c6366403147bcd90231ac73213ef5c3fdc61b206 SHA512 2c998bc904fe2ac0d2fa5450bee18e56cb60232b33914b2a02fc510e35a191796c4c137849ad44df627e3c483546b05f2c7f9af987d3985f687aa81ebfd62406 WHIRLPOOL 268cad25cf49475d487d6aee208f4d7e2af0a8ee0aa31843c15918e2b3042b3b13362cafdc89de5ba9d545898fcb347b747724c7ae8b1d5a8c56654db0bcd94f
 EBUILD thin-provisioning-tools-0.4.1.ebuild 1498 SHA256 330a69d4931a6d334eb978eaefee19ef60bf6d241dec2d8f092b08e90d877761 SHA512 70627e81ece4ac4760d4849926a6261ed30c89c6b8182bd9ed431077d67aef01befa6a5535fd4044afa74436d43104bd24b09ea98e3af8600171efa7aa9215f6 WHIRLPOOL d07a15f1a278adee4235e40c61ac5fe88633acca28a736818ea700540b6b82ddfb8282438595ee26f0b524f3b53bdbe0289b2a13f0ac02bb0c6e65637f6742b7
 MISC ChangeLog 9259 SHA256 0ba07ca6bcc6e03696bb3a415b9399e73e107581445e1d12f8bde5f6c9bb6499 SHA512 26ad4c81231dcfb308f37b1489bcb0a3b07fb0110796ce9f74a3d4d6b4cf87177f1b57b5e30d2e2d2ed8d2380c2d90ab7a41feb29f08bcbcac0bc2d39e675ae3 WHIRLPOOL 95d66945491ae298f84ddc451d4ebd9eda1730e57c2d9874021c823a6d254038071eca7df3f704ea19923b02d007d4d4da26eb56a2f11d403183eab1fae7618a
-MISC metadata.xml 352 SHA256 5c0043176bb3aa5f86c10eda3e3aae3d71374de82b47f7cb07cc4e76337ad4c7 SHA512 8356301004ee2f61b15eb94aad63d7946af41d1171b9b95a4a4bbb1c1bba7670d70b47a81b2003ea80fbd6a7378c2eaedfe4369cfe5520e737324223546dd7e2 WHIRLPOOL b0f917ec1b54c8f3c20bdf6fc15d9d5f23273cf37b09a96f0d06ed315b22c7218ddd4b3523ec8b93ae70bb891202ed72b7fd53741c6ce72b6b4f216ea10dd884
+MISC metadata.xml 457 SHA256 8283b979ca234301828c060894ba654b7731811ccfb860dde7cba90dafd05ba8 SHA512 838f6d3e2514c91dbcef049b0dd866fc71c8a0040c1bbb128a2613063f298d40dfb63391de97016cc768811c0cc19e93b89ff8c2061f01cc044048a8c090e1ce WHIRLPOOL 254971786e417e803815d12032e5ebcdcbe533f719acafbdb0b8dd75521f33e085f5f4a501379a8e95e739656290f12a37ed29c3a4ba03e98cb57dc5c32d1698
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJVZ/hNAAoJENNAYYQy1of1wGwP/0tGLqCG/Bq+lCopKHDwDfeS
-aM9OLpvrzTeXgsFRb2+OgHnT5KUOXKuM3le1p+c7lcCiKKGT/QJp1fxfKFX4ff28
-27zHwBfQwlWoRA1nFtOxIGNSmX59ZJ92gdR3EwMlKZED7lvAKD20wJU8PU47w5mt
-YVT1Rd8dK7fLYO5QiGCn/EcFskWnef7v52XxmOgX13Bpi3+kp03mEwMVMhN9a1P6
-rbhmE5zRyYbMOeXznG6CMrGeOC1doC+F+vg7cj+ucL8lM/AZlHMqALXzQy3O+qTa
-wVDYmqSJZWokKkUKLhA9q+R+vSi7RtAu9+IR7X9b51LUqm7JHAMVEyb8tCCrW263
-W1tOQBPPgQ6NgBbnpIrC6eIBspyr//NIcXcuvZ4xWTejcGg9nuh5+vSMKmEKyx+C
-guI8Xa95p7rt0ZEIJmPOjDlQj023NP2etb9hnkr1QermXWrcGY/2fFY3mwlR1sP6
-vBN6fnnArxKZXKfp3KCMgr+Aqh93LvdfHvlQufGlfZ5KhZ4T81MW3DSscSzbFyYE
-Hj4it1qbKWbsDpcgP95S8PlqvMXSasANVqkf9bFr6K5HWLhGj/QnhwEk4apGOVEy
-CGRyptakLuoRQfrAVBSXZRYCXRvrCC+7GCJEqkl0uEok3VJd2av7G8nOnRp3ujHK
-lrOb14QN/ENsb/JaN8kJ
-=TZO8
+iQJ8BAEBCgBmBQJVfydRXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiK/MQAIdV2B/QvFf8Z0YSKFNHRPnG
+mc+KOTP5kWiIkbB8cbC402L93yZA8UhFuW0mqTRFG+yqYchJ57xCzsW1kirmfI26
+7uTutQAuDjlE2ogKriAdf8qvGFxaNzVs2f1H8i+z7rEz+yqLrtkFY9XfMm6atvKb
+J9gI/Wi7KxAdGxNgXokEjRfaggIqxJ7qMNLnS7NTttdTXz1HRQ9RUNBBsVDSs8Ft
+e5+94MNDR1nzldFtnjb1mBc60AHswPVg7ZLrkSI+1A/O9q2j/Qsxluzr8ZANWe6m
+bIW0G34J/Y0mVzCziLpsWl0uSGvso2CPjSE8q0keNwaNmL3gjktHSuS4wCity8ZM
+KNihtW+grHR/jcniUE+rqafTFniBNt8rfsoATIlpv9TdvBsdbYxACiqKhZdsCL6t
+JNYCk+QiIn2mCCSOLCO+BUioXNDqMHbvc2CCx/VC+B201XIfT1tTBAQumuExX3AE
+FQQEysab0go/D7xOZouGnonY/iidCcvHhAcEDfijupkBx1LRTiLKpGtagUfLXOsk
+Gdrsmek3zoWS9cGEECXKFbCorZDz61dHjR339u9w1QJee1Wvv0DkNivsoD+JHA9p
+rr77mdoEHgvM8eEQBTgBkefpP87l7UV0PtSQ2ooOqMgh3kdltUOTHzMIrhbaw+yi
+YrtXYF6ZHAW91+T5b6N3
+=tuDJ
 -----END PGP SIGNATURE-----
diff --git a/sys-block/thin-provisioning-tools/metadata.xml b/sys-block/thin-provisioning-tools/metadata.xml
index e7deaa2efa74..659c8f53d7d9 100644
--- a/sys-block/thin-provisioning-tools/metadata.xml
+++ b/sys-block/thin-provisioning-tools/metadata.xml
@@ -1,13 +1,15 @@
 <?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>
-<name>Robin H. Johnson</name>
-</maintainer>
-<longdescription lang="en">
+	<herd>base-system</herd>
+	<maintainer>
+		<email>robbat2@gentoo.org</email>
+		<name>Robin H. Johnson</name>
+	</maintainer>
+	<longdescription lang="en">
 A suite of tools for thin provisioning on Linux.
 </longdescription>
+	<upstream>
+		<remote-id type="github">jthornber/thin-provisioning-tools</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/sys-block/vblade/Manifest b/sys-block/vblade/Manifest
index 517e9912d405..aaad3876892c 100644
--- a/sys-block/vblade/Manifest
+++ b/sys-block/vblade/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX conf.d-vblade 929 SHA256 959b212244647776e04b1f28270b8a7fc2a6717326ee5b28e93af472f25dedcc SHA512 2dac6f0386cc0afac4668d8f13b4897687a27cced312c6066c7c71f20505b74bb7768dc24bdbd234fcfd2bdd23bb4f89952b356c06599c0ddbb6635c56990710 WHIRLPOOL 83731700ab2240ca657f3ae944dac836ecf50f5bf23b6e8b3089a1dfe550b9eca73ace8429626cdc01da9703ad62cb82f35774cc5f3736c899940946f0e019a6
 AUX init.d-vblade.vblade0 2784 SHA256 b51205d40461e75fc0873f116992dd15151f2efa9bec38a0e897e6717709da1a SHA512 5f56aa0416e128dba4b294f56652300ed646f24da98232e853119d7642b354c6516914f1f6b3e1b941a37566dfc47dfa4b7b3d25b0e99950c3dab6ff2042be5e WHIRLPOOL 92ef964b19249ee63326a17a96534bba9bbcfe855e36491777e650583733300abe00c9899dbce5e7d0d3aa7f22471d3648097c13179874c32a9f378a42adb518
@@ -11,15 +11,23 @@ EBUILD vblade-19.ebuild 1015 SHA256 1d9a7f08569dc23446037a0a1dbdcda27dd557bd87a0
 EBUILD vblade-20.ebuild 869 SHA256 5bf59a8d9deabca6fba71abbbc2b0cffd52de5e8806ece28df84b9c8a1fdef69 SHA512 852eaf324adc0f7501a2fd0e5bc37ff8be5b936dada8754e685c55b8cf0ac407f1b2df55b22017edb08ee6753989e23c9ee8f4c4ec78c0a1a11b82b579a10aa6 WHIRLPOOL 1bf0abbc0a90c4cf062096d3d01900182984a0b098bb6f2f03dea95601defda6448959e0c4ed4429604140068d7f687ffaad5731c5e6c237b0562c0c8647ba28
 EBUILD vblade-21.ebuild 864 SHA256 6d0e4735714bca8ba2047a1276c50fec086cb4c0e4f15ac9a212ab3e32867c80 SHA512 f7f74b46630625dc5e45857189c70afc303226d76eed09b9de71abe909ffc5c5016d84c9e071c2316f8da939b77ff9e4c89eff059629dc465238c7f0a58666ab WHIRLPOOL 6a23d4d718cd0365555acb2555c5fb533af064613a873fd0248a4f661efb6511c8bf9b7780cdd45ab74f2e97b17a287b75043b6382936c00a89ce7a01f92d336
 MISC ChangeLog 4998 SHA256 850d0cf500e3b546f40deeb281d18b5bcdcf1ed060f3c989b8cc2eb4553966dd SHA512 a3ec3288f6fe0156a9eebb10dc55f960b8db4d060d7411c62ea95ad2ce975fa4b9a48aceae61b032c32d64267dedb2586fec829444434bd51e77885c4b53af90 WHIRLPOOL a0f4e4e90809c20cc46312424ac7d388bd054094029c7b6652bb8f7e77632c092048a325263da4c3c1b04906d248bc2707fef6071e4128b470709eaab12a940f
-MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
+MISC metadata.xml 243 SHA256 3e01f94438f6df18cec974d0ee31068d82fd4de93bf657ae1c9c93d480468226 SHA512 51d3838a6c7eab863761b5fc743a81679bd838129823fd248a7ae6a117323319035b0a9c771a030df9874f8b1dac3096c9a130e9ccd66b648fd066b8f17b3190 WHIRLPOOL 1ad3a95b886491dcd86110b08b5b565b29ae929ec80cff1fdb86abb6233d1c5b8e37732a5da1656bb7413c4f181634747e6b90e4a27404343369ee3f41235856
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJRnFh3AAoJEEqz6FtPBkyjTBcH/31QcNsvFLS882ZdzxOShuTC
-Yo99lefiA75daaB6cSvIlyHpIiyLq4enQY0orkyEWbm2zBkLlEQGucQM1DjqP+VB
-+392g1w6glZqhnbd+5fmeamy22OvA9kXUkT3yFiPzkZhK4dZG0OTNmLq/eb70RVy
-7NQ3xzYM0QmYIf/Ic1nGkGBq9t6I0EdJFlG/CCxlzB8XUXiQa6jeKmX66+wXZdCA
-pa0pa6e02zZp0OqH4Mhy9JOMQ31PoEnpV5nSh5wai/lV2lzzhHwGC6+d+zAo1LSd
-XIV6l/D85/X5xRaJD8Zyk2DOS86ndCu/p/qDy1oF7u2RO2D+1BRD99SN2ReSJiQ=
-=pY5F
+iQJ8BAEBCgBmBQJVfydcXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiBpkQAIje9rxG0Lc/WWLq9SB18GPw
+GYXvK36F69ixaLbXV0Lbyryjd0WGU+d4vGWlfC9BNXI5/x0mFI6sok8cdeBWIEZk
+vvjFhnn+4Oq3stjbsLiuHQf40gFCDUTGonq6weHGGV0EXRYQGSCprI1TMpV1BUAV
+VOx4/uhH6Fdkt4u8W2jFJGyPau5U5aD8ywnjuMsxbExIzozpEQRw04q2TMbOg72w
+w0DTq39XPSmZ2+ejtImfOQaL4wwXz2yM0fwvYsRVgAySzOJk7NmQGWt3Ja1jn8fx
+itmSK436j8GwWgj8B/kDvivnB4w8ZVtlPoJ7HSoQNCpMG0uXqpQvm6n8Tgwy1IN3
+/olmCpYgW43ts10qXPR8Jn1J2g3CbYGA3gC4DM2bur2ThLckIUDxsfQ/6QLw+HzM
+3YKGn1bwFrJdWpzf8SEVQ9vLeIDczVbvdzC90UTmQi/48Lsc9ukaPr1t4+5cs+G+
+z7cAZ8B6JIhJUp2Gwoa2EAPDjUGnICuAb2uEBUhpavVoVTOBsBZMieercO0ZJ1ew
+4glxgzqyfeAmQo7ZWyjIjjmduj37POUjdc5PD1JKNyf6LcghyfCeEzeH2nXRkxGo
+pfbqu9X5cjmqgrW5hN02QKSyKV889JKHV6CF9VZL+DMl7uqM0fH358aFnV8ogr1Q
+VY0WHQVaW2ULy9RlFmIk
+=S48x
 -----END PGP SIGNATURE-----
diff --git a/sys-block/vblade/metadata.xml b/sys-block/vblade/metadata.xml
index 96a2d586367d..1154867b1dab 100644
--- a/sys-block/vblade/metadata.xml
+++ b/sys-block/vblade/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+	<herd>base-system</herd>
+	<upstream>
+		<remote-id type="sourceforge">aoetools</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-block/whdd/Manifest b/sys-block/whdd/Manifest
index a159b8d26583..5a488e7398d3 100644
--- a/sys-block/whdd/Manifest
+++ b/sys-block/whdd/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST whdd-2.1.tar.gz 32363 SHA256 a5cdb289381a623b4f9aad9e8a736ae206a91b3c214942f2755e83865b2d4c7b SHA512 a43796acf359069e27c622b9816de3d041f87ff77a83167020796c445e65ca0c728c8fd3418814802d84fa8cb594a72c764dd5b11e85771a024ab9c8a43b26a0 WHIRLPOOL 6214f10c223ee661185954b2adfd7df2bf8ac60f19af638b6ccdce170264e03df6910e48eeabccc958a559cb3f929a32735a79d7ca23567bb1e2535c9eaeb205
 DIST whdd-2.2.tar.gz 33317 SHA256 49d615e46117f1271aac22a063703e87fab749e5357a0c5bb4a369e39d7c9241 SHA512 ab30c1e418cb7ba9881b1a91b99d0b1d5389172c4d5802be69d98cb9c16f1282ff7808e2b40bb937987a9d3ad9fa7f20e630d19307eb0aa1090cff531a904d4a WHIRLPOOL c7d9eee7a21e6390a0c1a5befe5bcb17bf326c0b17ae89164452d5e70a94567cb987ecaf17c90ca0631e3ef1f0d958f8d46881f65169179202c84bedb826719b
@@ -7,15 +7,23 @@ EBUILD whdd-2.1.ebuild 672 SHA256 f2915d38d99915494cadb683e8e7e2b83668fd11d61541
 EBUILD whdd-2.2.ebuild 672 SHA256 32d7f9754357cc45b9e8db970ed62d66dc9c3729f68704da8b639488be171335 SHA512 31df4d60f23b70ad536c2b25b3939c8d1e697d0935a33b5fb1567119a83dda46c75507894e851ff3e3f122d573cdd38c7d6bd1556a0b285ecb212ba7f7b3b38f WHIRLPOOL e7a4990894f4dadbf4bdae5584fc3e3dab835a636478aae54154c3e05e6c193e9f54ba27ce3e31b9aeb187c5064db3ac244ff80aaab9dc3c69d849557435c7ec
 EBUILD whdd-9999.ebuild 556 SHA256 94251077ff22e5e15e04bdfa4857d39bcf3fe4ad7181384934b433710bceade5 SHA512 ed9cea87b4f091b642dfec6ce59a9a34812981925eb21c0db4f225c0adeff01a98ebeb06042ab56b6cdfd6ba803005b4bb01ff89319004b535024724ddd9a65d WHIRLPOOL 652bf6ce02f01d90060be11ecb9508f9d89747172ca2f98e97591aac4d1a36241fdab56b3f9d7af6aa8a860e61092a919b1b10390c069c7ea047b385f010dd4f
 MISC ChangeLog 1103 SHA256 930911515fb65defe2f3130548aad4309770596db731c40a7f9858bc1de53d5f SHA512 4e9fb4009d38bff34e3eb95e74e9ac0dfad3f1164c2e0d8880ccbec7be0c20aeac1dc17c757e30d599ab5d4b89a07595459d673e6d39381dacbb8db68d871efe WHIRLPOOL 58ce54b4ba26fc0eae2e67883da3dee7baee78cb90414b9c3f9e371238d3ac60cfa2e6d91535c64fe891b33d5c376dde014c6e4f9d58a838e9248e069efddf2e
-MISC metadata.xml 363 SHA256 bbf07a64deba81f7f661d33738ba7b8cdd985960b51dbac405610a6360ca27d7 SHA512 17214952e4c91bf48492e5e14e638fe589a37202a3fcb41bfccdbfdef8749d1b9130444a9c35890e4eadb56231cdd9b9fab54a7126dbcc56b551742c45a93b12 WHIRLPOOL 6ff4486551ae47d960e03f53c3c30745773c8bec244d52bec01615ac8d2aa7e672427fec13ef52693835a53faf0851710e3a2a6857938bcd32e9a5a844a6d816
+MISC metadata.xml 452 SHA256 6c33cecf87073333e48ce6a3429f914cfd30190770c2ba2bd1596093d14c1cf5 SHA512 601559f7caa579dab40b2c19d6c2eb1c21b774107cead7578a6d4d91c44ac71f4480db6bde4019ebe1d040cd18c2922c7a1c8b63980124f17f0817963b6f9c4d WHIRLPOOL 69fc497218e5a0764df11c71a4cbfaa15042ef8bd3de78afa0db37844f016a4f4bbdb3704e0866f5a466324fbfad25b180e06f9156f317343268392d20b58eb6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJUVlAPAAoJEAmJmMX429reO68H/RC0aml6eqZfnkG1uwcx3+Kv
-2jjQJhuV1YXWK2gRmmp8/duqPVfiQbqHVPWEak6WHsy8p6AKNiGlobOkCwCGtZHL
-r/Vosho7yHm5m5+Ja1HTNEODHDfCj0GUgIEhlwJn9yKQbmoFForiQ+BODF2Jf43P
-RpLzn5nu1ryNa3Gy8WWaxmB2k4ztGQ/D7r/ykQCjDqbDHfJUmPZIYgS5innrUMXR
-kYNE+IfGqukl20bISY4nhbOBTWhndn90cC1xh7QH9Kwrx/G54sQ+a+RwuWHG5kYh
-b5mxQBkoMKvbMpZ2Sx0JkHgVc4tuOZv8pLDLUJBq3u1HadwTjSgJNQaDdkPugPA=
-=ldm/
+iQJ8BAEBCgBmBQJVfydkXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi+FUP/jyqMyhoLC98Qrl4rAs64UgM
+fX8ZexFUpqu1Flte3pyABSv9Q7EzFDV60fIsandPNr3pZBKYbVWCD7Flj54dqFcD
+GtlVjcz8x8EW26F6eoaMwGw+avzUi19nujydxhr38aiScgN5BxqXjevNf8yP+8A2
+Zz+Nex2dtdIUgwaGPoV+IEzuR0SkW6mXU65Q8VlsRx6MvP4RwXTIl4D/sNlvdlda
+kKHjvZAm7j/dYvC8xTA5PfHtDPUg6n2/ge89BiPBnUCII5dR6z8E6jpFQLjqRU2/
+PtAHxXEhCfJ8ctGmzlL9F6yDqyApobM2rIFRBJ3FBwE6KdhTDFx1r+P1ISFHWVx9
+v0rFL+3bdjZ7P10VQgLqcMcqn5gDLYVWXDDteTGkY+DVvhZd1IT4Soo2uchFh7dr
+WJw08Rg4WRxt2+Xxx5dbSVseCR53EjeZykBVmSYBCWtG3w7GMGmtns1aBleCSoSP
+Q481NsufbH/zgVjazL4t940TIaNnc1ZLFOzVoddbpGnTYn1O8e/3smvtZ4x8G5LI
+dyvMp3ePNDPoswbjv4EdUsS2ai4sY08KGXEnf0gHPYZsTYJb50zSsJRyoPlt6I7a
+lr+/jwQS7bFGtqgaHIsOTrObmEpIUdx7cDilc1sHFjevYTkjMjQBgBIXa0AGjeKG
+2kFhaRmyNcsEwcgqZPqb
+=W9KW
 -----END PGP SIGNATURE-----
diff --git a/sys-block/whdd/metadata.xml b/sys-block/whdd/metadata.xml
index 4e0b6596c9a5..514413068c26 100644
--- a/sys-block/whdd/metadata.xml
+++ b/sys-block/whdd/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>andrey.krieger.utkin@gmail.com</email>
-	<name>Andrey Utkin</name>
-</maintainer>
-<maintainer>
-	<email>maksbotan@gentoo.org</email>
-	<name>Maxim Koltsov</name>
-</maintainer>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>andrey.krieger.utkin@gmail.com</email>
+		<name>Andrey Utkin</name>
+	</maintainer>
+	<maintainer>
+		<email>maksbotan@gentoo.org</email>
+		<name>Maxim Koltsov</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">krieger-od/whdd</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-block/zram-init/Manifest b/sys-block/zram-init/Manifest
index 9610ef8e9394..4640f855641a 100644
--- a/sys-block/zram-init/Manifest
+++ b/sys-block/zram-init/Manifest
@@ -1,26 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST zram-init-2.7.tar.gz 4821 SHA256 205765243bd36bf62c471363c4fddf8173275d37f5f919716b5b71afea0fe94d SHA512 db8dc5580b8405752d58996e5927573b687795b598c94948ccc51d038f7c7dfc47b64651d9554c1807d8f6453498c3f1efe6f2d34b82eb6b1df2d8f7e84980a5 WHIRLPOOL 1c677453567836db416b933e675df9c30f61797f8c5d32570693372df85729798aa3aa056dbee78ca5a3cf2a44c80ce4f8f54481751f35e03e01dbb0679dfc79
 DIST zram-init-3.0.tar.gz 5578 SHA256 a1b4bf7f90497a44388f349c3c766e13e575ff7b52168f74058e9b352244b71a SHA512 f962aaa9c5d7f8f7566e9e405de4709fcfd0b659c7dcf79008ca5b7b18ab44545f363e8a695bfff07068e0889ec79ce54af578493f82be3848ca306865d6555a WHIRLPOOL 6304d5192b81490e33962e3162f18729e5a8438bb3f10b90744045014c3ef91a18c2a65538b97f02811cc793d88fb7eddc7efa3129c3b150e70cddfb3694305f
 EBUILD zram-init-2.7-r1.ebuild 1166 SHA256 79eb3efbcf39ae87029fd822ff51c502b78a42569ef55e51519481f114b31a6e SHA512 780450df02b06be7f308a30bd1c914f300b91230d575695b98ed7c456f2dd7957e8e0cf881bca2efd13d1add8f3e4826d6f49141a5c10175a9d42b4b9b2614f1 WHIRLPOOL bac15234e25e8d5426d1679afdb1a83f56feae45fd71e156eeaca67aa3ff7145a998da13a4a15fb84f6891a02ddba9d162d5742e10d15494535283bf14718a28
 EBUILD zram-init-3.0.ebuild 1531 SHA256 f298d42459108454bab9bc1db39563fe6cb83123028486dcb1d13f5edb9088f5 SHA512 10671fd807099fd2b83d93247ec8bcd040e103797eaaa439638c00c6f98153a3055371550df7d7cea3d36bb417444721278fd41e1d8a264d385d0008dff44181 WHIRLPOOL 8cf2fae35b47114a3524c0961ceaafa7869a4ff6192509d10057acc5442567f0068d2c3a0656af5c532f623961eaf36607468014048319e0f94ec5019784b907
 MISC ChangeLog 858 SHA256 fbd86570f02e108626a33456f2239a492d90c7b049e2edb14b601fcfd2678ee1 SHA512 fbec62bcae8fae2bb7fe382d13257027e382def32b6fd58e9d9b22c54dc44bf29dbe8f4dcdb9a20a9dd9906753a8ab70c5f7f8bee7e14c78f57795fa87feef59 WHIRLPOOL 77d81ac4eb6e98b00e61801e78cc1dced17d11b6d5dba3a5792617898adbf0312cadb7e189698be8f99dedcced8417d6f0f49ab3eb411fc11be2766393d753d6
-MISC metadata.xml 237 SHA256 8e13c073e12cf0b49b05616a5888c8061d12b859775f92dffabdd6715338323b SHA512 8604e6374110e1a73b398e1a4b6d1dfa00d83814f62175143b4605532e4aff00e3aa49c33f3c2ea1d3963329dda904b6d844799ae3404f9104a237097a44d77a WHIRLPOOL 0ecfa39b24359d2ed12af3759e848f2bcdd29f61ae103f7b4a609d10031229d5f50a169f22fde02970a3ec153223609e6fbf9b0cd9a8b9022831017745288ad7
+MISC metadata.xml 317 SHA256 f9a0b7f7c9beda97d7bda01fd29cb103aff5621397563f94b99c181d66703867 SHA512 91b8c71f5aa4868a39f5f8c0d9937250fe89590063de3abd58fcf6f98b93db14a65e76d8cd35a77c80713f5d3627299d7786c9b15393b42867282bc199f59974 WHIRLPOOL c7216210a25bf2b453c7945f542ec51f180155d073af847d885e86357c33ffe89dce05d6b406300c980153f7068c22be8ef0d2411e0c87dded3ca1874fade772
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJUPEIBAAoJELvuk32y76HUWTwP/06sZIMw9BiEpZYaM5AnT6WK
-Z3vO3TkQzMufEwoXVJy+riS8VNRZh8nfY/4wuVKSrVKFHr/ZBz9RGNb67dRqNNUW
-R032LCQsDWszDl2clYChfJVHR2YfoyN3aNxC2537vhGDNXQ3KuDKOY+J3+mFIR53
-JumeSdRcXnj7TORJu9CdrnBcDOeN7DC+/EJxtI6wcnLVjDWS8GTRjhXE5hC+aa9/
-DUVb+gAWEJFJHY7CXMhJs6QbXfHsHk487FQyvqBzL4bw5ppW2CQ3P1jN0Ur/yiOf
-vkzKuteadP5YjDzhOPhifuzE2KFXhWHFUdb7VwdlpSvrnNe13VzLE7r3l/vo6T1c
-H+QowjpHOubmSOhhcD4aRSblz5QYGVfUNvPi80JF4RKHXKP0TCnG3aOapvKp4t84
-DxI4RGiYuQ+bcF/0zHmP1etno2bjyoiasGQ0CG/MNJW/hQUI7U+IpUTw28aPG+kE
-ePhtmZPTVh+KR7bGSxaJOMPodTs5lyASZ2ESUg3VQ7d42+ozSowKhJsSmk6Dj2Bi
-sL9XO0uDkhkGEYR+2oDnzMLKMntkwwVPw444ArZSQLTCzv/ng0QF9yRUPc0rkhWD
-/HuLXp4kJO/gJrO9y7oWHJEqvr4sL78uAQrRNtEkmfwBi8oi7KcnIfU/Kh3cO+BU
-kbrV2svu7BEZgr4LBK1M
-=bkJD
+iQJ8BAEBCgBmBQJVfydsXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi4YMQAJydH2PAMVFyLQ+EAkOnOLx5
+TQaRfNCo5ykwZX71LmMf5au9KdfjwNdLZGMnJCPNn0yXH1lFUKroIZJdmlYN+FMv
+EmctbaNJ0cF+GkZxIL2wvVGGQjzhcHrIj/7/964yftjeIqLzyoLsdGkkWfMO65T6
+XoWYWoc6uTyzPfitEbvJb/AWdkMzJ5vM3u2jThtdFskEXPlIeGF+cquEzUrufp6U
+sdAIw2VAtjsAOSpHgSVpkyQ7e06OpKkyE0RVEYPDW7qfDMpk8NWDQmxgNFEfKjMP
+weG6icr+xeraO347BDdRL4YbfjL6ceuxyCuScvwy0DX0adBz84WMBkhacZpBIk1S
+sBQpIWZr+D0zAxjvb11J0WB2R+SjEtuuaEa8yrYkDX98M+85JsuNkg6CmZQ+Jd4y
+4wkq2WSxC++T6EfBp4olfdzWFpvKk1c8Jm6m0XQgvCoeBDmAxW/onIROE2/sD7Qg
+iSelhuYGwI1HM0aJz73N8D9mpJ53s+PwvrtVIcG1Z7dG9BV9lVTDbt+5Jheges0N
+MDza8WdJKi2mAhaHAMfKZt29c1j7QbvKseZEzNauifetk8cQFg/gtUrgDuzeGTaZ
+6dWc31H3/H9UsHkB1Ptm9Blk/kQbnpEThMv6hwPaeL9CLA3wekeEAFc9XICYccpN
+YFnYEX7+m8WF/lBA65Jm
+=+ESE
 -----END PGP SIGNATURE-----
diff --git a/sys-block/zram-init/metadata.xml b/sys-block/zram-init/metadata.xml
index c8398cd239b9..664106308be1 100644
--- a/sys-block/zram-init/metadata.xml
+++ b/sys-block/zram-init/metadata.xml
@@ -5,4 +5,7 @@
 		<email>jauhien@gentoo.org</email>
 		<name>Jauhien Piatlicki</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">vaeth/zram-init</remote-id>
+	</upstream>
 </pkgmetadata>