Updating remote-id in metadata.xml

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

14 files changed, 164 insertions, 106 deletions

diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest
index 67790dce9ba3..a1b8c6ece4cc 100644
--- a/sys-kernel/genkernel/Manifest
+++ b/sys-kernel/genkernel/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX genkernel.bash 2438 SHA256 e7de9771ba79ef878e2c9a21a1c1720f092c6047d3cc7d4a49ff6b90e7e2c248 SHA512 2bfe23606f919577bb2d174ffe18cd00fbb4ce642fb8860b319e059745d46ff8459b99374159f78af9f3aebb0a352a74ccd74c3be581980f5e298293b96e983d WHIRLPOOL 71a6be56d38c24c3032fec5f4016c92dd0bc8140e5204db9d97c5cc5be42a2465282f36e213858b528d013ff74c6bcbf9aa443a77a8ed3ce8174baa79afe6004
 AUX initramfs.mounts 816 SHA256 57ba8450e3f09edc9a4e5a1be15d49c77e4e014e27c626e9e3771167cbb54e49 SHA512 97e5f92d135cff3911a68c7f1afd0f781ec1c1b794cdc824d74f8c119104ecb40bd7180be8414dc72f3a5a811143d6b4bf443ac1d3ff7a71b1e88cbf7c179665 WHIRLPOOL f39d27de6e69b3555f81138a59f25b104f9dd6aa6254a5391d3375b15acaac48f0e698f3e6f96ed88845b84fbf8fa2cd64b98281df977c12a99ec7d9ddaf2a10
@@ -32,21 +32,23 @@ EBUILD genkernel-3.4.51.ebuild 5461 SHA256 cdef7f8346c8d1ad81623db937c52340d9f39
 EBUILD genkernel-9999-r1.ebuild 4704 SHA256 d25f2aec0ac3b741d2a36763d48c80d000ab6c1f36bbe28610693ee75413c365 SHA512 1651831aa55e36c161c3d267f5850651cb798a597a749f2ad7952a2ae66d9fdd333b0980b7058b52824cee66d621c7be6a36ccf9138ea2f537d1c23e929397d7 WHIRLPOOL 47a249a7ebbef3649af6ad538921157d5ecad758a673fc8064354da0968412e0e9cb4d1efdfdcbc876c698317c62c0f9366d3771cfa6c353704aa33c95d643e1
 EBUILD genkernel-9999.ebuild 5236 SHA256 e978a0094dbc1508fafe9139fe6af3c2c2c4da290a51948e772c4a154b0082ef SHA512 4ae630881f91147661770f5bd1103865c55d8e878faa50a051bce567997f321f2a47e526bf0150dc8cc9a61b28ca5fa19ce7faf5b7d6597fc3e31d646022c115 WHIRLPOOL 864d8bab2bc821a3db1fc2c716948b91002544d67aa78543082178c9a634887d975c57d5e493d7d521bfc5582d75fc9eb2275907c773021411473b83ab44436b
 MISC ChangeLog 73595 SHA256 4c9c2fc25f661b12a13dce934aae9a297ae33ad17e8b5dcc7152b29224d49c3c SHA512 53b99e7a97dfe52f3a776dd5e1ab69ffe48c4214f87e3deff5bc5f53aff420251020a7f99e9d0aa6f7ee9ac42510189c0e5581379d77c359eab9d9d7a1053151 WHIRLPOOL f676d597f0bf03ba55840b290905a4c6f5dea8d35072fc4cfcab33b57fcb0115474e7f02f96e4cbb99cc7c8e3b43851380292cec7ef0a90bb7f30b8fe6b67380
-MISC metadata.xml 418 SHA256 f91e9ba1b91a9fdde45041ae7557aace44c916ab51caecb6b1f49e115510f2cf SHA512 ae3e50da1b8e3f40e88e0a9a735bd736910ffb926f2a16ab34414b44d90d3399a6aa18e7c472194d4d1f9aadad934532a40a2287f41f442b25ac37835c99dda1 WHIRLPOOL 4a540b3702ac7abfdc275dfe371de24de378fb29c9ea3ec878b33edfcce9f1204b255c93373867e74c6d204e44c5ff1070dce0e96f527ef099914519800a51a4
+MISC metadata.xml 498 SHA256 ce52e0c21fb98fe6a8e5251b5306c5fc8681613cd1fea3df971ada64d05d6ebc SHA512 be4ab429a92162dbe922828aa3556840149f3a35e503c4429a7a27041ac21014ab346e8e7d6b0e61fbe473c535f314e1b0c2701b078a625f29971ffa62964b6a WHIRLPOOL c90be274208b385492ae541106cb04398e298602c8477ab081c93008ce4f431eecd42c4ea609f1729e61760769fc43053ae8efefdf55e5efe348ecec90f81105
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJVUvZqAAoJEL9Txpt2HY4K9JQP/1pHh+kUfMB1yVgy8LBNUeNP
-O2r1n8LGhX7pALwnkTXO55QUoKCLYgOsHmdQlU4wu2WwYdWCuOme1FUzeeI/X0HK
-oxekiUMkPvUDy3XVWnR2QX3kOeQiLXtagG59f96rKKPhIjHcWhyydantv/Tm1Rli
-ri9cL4rQZg0+InIwLP6KKM7gaLYtS+qmDbmbLur0qITAILOnX84pAe3rTcsFE4bt
-GO+Y6+R2VFIyrcG0Ys0cYbujqSjyFeyJH/EtLPzoW147F0u92v9zN9u/Wdbbmitd
-/kuuTIqGqo3qtiHVSeDQFtM4ecWz3szhh1UlTAL2XqWchtQun42zz9CqzgyD2rWx
-Gv8/m0A8NsksjACFDuhdwFoh9FjEPCeR3e3LeBe1oOZaYAO1PVgcgz7UXXsvvFIc
-wTpsJGuQ9vBAl1S0tOef3Z7EDcFBnlMYzePmRZNLlTg4c624Y0yJFQonla/9XaBC
-7ERHYIhzrs29QA4wPAx7OBKJS3wm8K7YDajfV7uhGwknnc83w3gY6Vekmn7PDTmX
-g7NQZgVZih/PyRSc6AmA+Vvwh2LHmvP3SkasFhvpTLhiXUfYBzIfMl9rLKi78htw
-PCcFJi5tpUzLn2A9nA5JyHRZG0VSXvV7dqhinUkHZE6g0BzxIFquvPsrgfmhpAZ9
-C4q1+/1CqJkaf+1TPrcn
-=fuMH
+iQJ8BAEBCgBmBQJVfysnXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiGmkP/RIWV7rQJQXPvlsuNg4T7tn9
+p3zCwi6hGMXHmAAPHrmrY3oyHMRXOZwJuVnCIwhm3eyLGFTCCtpHOJld4PPUaqnv
+o/WdZ+SGnQGEX0d4JUu2MuXEtVdrFYx6Mrq2m842eXasq6JKzn9OrUv0uZCUtILQ
+AYkoMoAMwQOEO7v9dDFBPkzuOrMpmxOjHdlYZTHTtnAZ4zh9W5f+nKyFOCJENinS
+QuhhSATu9OC5DbSl3K8K9smXaM7+I/aSnNUEBsnks5Ou41OJ2/9Ow8ga7/a75g36
+yz26cuP6Vo1gBCRMeacROcxKbElZ/rdQJjojUox4EfRFJJxbT6Sw1CJEcZitjm15
+VMbxnQq6zsaTq8a0jlDhOfSBFE/+DeIjxjn3aU3vlxRwq/k5LZ7kfnx2oWc3peiy
+nuCXAPKTMgk+7Y29Ui+/RB7n7h5PXm1/rH2Fa2TKUFfLOMLN/R0oiR02FlOv2vpp
+cc6SZfb5BiohxPmYdbV6rn0R7WHjzO4pP10OxIydjTIPMFjscnAqGV73mi2B0c3p
+MO8kW+fHriYYASb0VMwQ7Lr7UllBg9YUBgz49jsI+qUVdW6tmSX/xvFS4Q7Cln63
+Kqt1wkJTPPC1y/mZIEu85PtkE+zjQbIqo7rC7zSGjv2fRzz0uCNMiSgRAOxdBFmN
+4XJs0A7xWlAXqASbBEvS
+=2cpu
 -----END PGP SIGNATURE-----
diff --git a/sys-kernel/genkernel/metadata.xml b/sys-kernel/genkernel/metadata.xml
index 090099f68c3a..8bf1d5c6003a 100644
--- a/sys-kernel/genkernel/metadata.xml
+++ b/sys-kernel/genkernel/metadata.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
-<maintainer>
-	<email>genkernel@gentoo.org</email>
-</maintainer>
-<use>
-	<flag name='crypt'>Obsolete USE flag. Use cryptsetup for LUKS support. (bug ##414523)</flag>
-	<flag name='cryptsetup'>Enable support for Luks disk encryption using <pkg>sys-fs/cryptsetup</pkg></flag>
-</use>
+	<maintainer>
+		<email>genkernel@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name="crypt">Obsolete USE flag. Use cryptsetup for LUKS support. (bug ##414523)</flag>
+		<flag name="cryptsetup">Enable support for Luks disk encryption using <pkg>sys-fs/cryptsetup</pkg></flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">fuse</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-kernel/kergen/Manifest b/sys-kernel/kergen/Manifest
index b0c37860a5ae..9f20fc85cfea 100644
--- a/sys-kernel/kergen/Manifest
+++ b/sys-kernel/kergen/Manifest
@@ -4,23 +4,23 @@ Hash: SHA512
 DIST kergen-0.1.1.tar.gz 109207 SHA256 a618cb8918fb4849c76eeb73211471829633d03ac36b31d6bc35cafee248a5f9 SHA512 6667b630c850b93d1edca554d8dc22f834a38d7fcdd222721973593c4272d65034db4bfe3983b53135ae02e3fda9c29af208168e38ea82048792c6a791afd4fe WHIRLPOOL 1acb14be792554682dc93b9712914495d9ef4013bc68317873d8fe97ef6147c1148dfb459e2ef0491d6ef2a699f15b25cc60025a35b5b42d7c1e48e4fa6421fe
 EBUILD kergen-0.1.1.ebuild 490 SHA256 1997a463f09cb9eddab6c95897b9b8241408f027e59aa02d69021c58d047cc77 SHA512 901b9b5e8f1afdf70e2306c8063d03d0e2491a7206fe2d9a212089a05e871f90acb7118270463c66816e46ae54c16c61f0c464ffd4075820c2ecd6e3814da113 WHIRLPOOL ddc85164780bb90b1e7e450e6e6dbb49cd3eb6cf23eb9e91f8bb4d1b5929dff2ed39702d1f18195259c965aa6a09f7fe7508a48b1cee667e997b5ef7640cac67
 MISC ChangeLog 510 SHA256 20fa863af17d6abd781f6d7c05d68b646fc0e2a734d582c414e6ceb92a5ead62 SHA512 5a01da451141c888accafc0e55e4b6a52d3af85dee576aa5f65d212f00bca53c677743596515c43098a00ae1b1734070e9af48aae940bc52c79d13420228bb4e WHIRLPOOL 835d974ef18477148523ef51599664e9dd82f654044cecbf71f5a85e611cdf3c33365751b14dfdc947288a909cbf4bd3859e8765ab3d3ad0e2b54e9a74d2ed96
-MISC metadata.xml 236 SHA256 feedd499ae6ddebc364ebb0f38d08bfbcc6b5d499f805a307a9367fb82dd12e8 SHA512 02882c2ecdf4fe400bf3e4455df1feae173e12b6fbb09181ea50541bb9dbf43780a0ab00fa799ccf5b7f2c27dcf9d854e16146cfb336ff3270a7b4369e451860 WHIRLPOOL b6580a9428931142ea961e985e6b5c736ab716eefb85706692c780c11f97d6019be488493c2e2a51b7ae8b480be80276edddb2858fe19684d48df64433475e06
+MISC metadata.xml 320 SHA256 5f6b373d920216b437e880aed0fa8ae8a23c295a61db2faabae3c757cc525f94 SHA512 2192fe757d6a654d8d2fc183f8a1ee72e7d5fb3ea9730ef9ae6d94c535ecb96e5d07da192b473d20b37f856ea8cdc6d89b0f08fd0702dd48afed1dc9b46c93ea WHIRLPOOL 3e1ce39ca0830bd2bad3d386fc8e9fb5088d04f3776f6756403d8ee1c610d299c23ed055e81c492276f2ea7ddd0f05ee26db06b7e044b0ff91720b9d1681174e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.1
+Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVMLBVXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirsKgQAIii1HO5srcWHuC/rhIyOzRn
-in7OZDbWgOpo+N392IdnDgaN92lP8TXdU5HEQQns0ga0T/vBN9wXVw1veN5LPZNP
-hyat7fGtSuBHCvVqmucIJAaPgPti7pBmNp6yOcCXRKxS1DUJHaqCmmwBfwAJa/C4
-0fIHwQjPz0GtN0iBisrSiaPpBbER8zVZTIhm22AXoSnDebs/FST7NEyopxp+H1Ke
-HSUg87HJ588ZKlYqIxJw7xhOvVclm05xNIXqGQtOOwCkzIyEpQU1HmwV5TAztdX1
-v5jzWwtoubyS4m/rfeN0uskEVTHIcUgysec2T8Jhhfxx14+K1U0tZJiFN0dHNlKB
-TSIQT8xB1CSk6eOvEND9807L41O9XPjrauqvV8h+WRFT1kVpoy/FS9dyd+4QW9L2
-J1FF85wN3fESbo1+rcQFbd7BhYo9tabClSVXnfeohxyKyxRfbEQ18sj6U6XwUHuD
-TJ10HTMC/vdgXtNzQV+CkkqPufHEYlxnB5lKNDBOk2gqCTJywv6hQoBuuD71G8Q8
-+mbnpLyrhPWjNT4KjenxMysSKRzMNrGb1FhhcYIdCoPmO7z0TYSrMYeaTNEm9y8g
-Pdf3Fglawu6LpKNTVTOLxnPM3vf54wzagCNOpHrAESkZ6mZdu42xmqjKHf6uB3eX
-e+HMUPZzl1nhFhKR9vEh
-=HARO
+iQJ8BAEBCgBmBQJVfysuXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiFFsQALb+Yhbj2WSKu4Dv038DmHpd
+dTwIHn8IpfWn4XcVTmK1CjHYGrSBIy26m676sneP3u4PztvdFHWxbed5ORAffMIs
+HaDdwvSOYUcooDGgQ03jX7uo7q0lJiqvmUYT4GBzKgqptGeinsPZjs9NIjIiJ1Os
+5qHxXfEdNXlf/w0KO7A9lvTVZFZGVSGysrQZYImDn3DzdJpWjqk6ZCoHcjW65+Vr
+e4OqxOWahO4i78OTNnLySfN4krlDHF+7TS1nT8GhjiWgMgI42KX4JulrqP03FGWC
+yATJjbtSs90yBFLBOa0i6f8bJ4I/yRYRq4F6DCu4kFPaiOEUSFKbFUFU15eCc6DG
+liXHKVFFSBZAD4iyKYznPt5WaOpjmJZrt89Iguajm0yeeNzG0PNwwl48WIeZxTko
+OWPSpJwdXpxNfFORsFSZVYeV+X6ck0rVdbKkaX3H9c4fjy0+5KBHbAm1mEoPB8oa
+Ub7wrVUoMjphtCtDZkJxqy+0xhxo8yDz9XB347Tchv3gMuh7MW8hnejiKzipf1XU
+2bq0gmqhKwBZ0f9ItfBGSgngAD0EO+yZ+FOQq4r5d0E4X1s/BI5eid82t585Nc2Q
+e1avMszRe0XZdV8UlEA810nZ9B413Y2a96nYrMrpluUWWARh+h9xpXnuNLcAK9ow
+0z4f/7x3ox8RxplmJRtd
+=ED9O
 -----END PGP SIGNATURE-----
diff --git a/sys-kernel/kergen/metadata.xml b/sys-kernel/kergen/metadata.xml
index 7bc6ee8ea837..9be1b1b5b835 100644
--- a/sys-kernel/kergen/metadata.xml
+++ b/sys-kernel/kergen/metadata.xml
@@ -5,4 +5,7 @@
     <email>jlec@gentoo.org</email>
     <name>Justin Lecher</name>
   </maintainer>
+  <upstream>
+    <remote-id type="github">nichoski/kergen</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sys-kernel/raspberrypi-image/Manifest b/sys-kernel/raspberrypi-image/Manifest
index a62ea94897eb..1c1fb5db2cf6 100644
--- a/sys-kernel/raspberrypi-image/Manifest
+++ b/sys-kernel/raspberrypi-image/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST raspberrypi-image-3.10.24_pre-r20131212.tar.xz 10686516 SHA256 0e9b4af7ccfdb9a9b80d3a0996bdd522670c00412af3dd5b301fc47c2ddeaa50 SHA512 5001ac5722e91528a1c8fd83fc775afaa5d0917d4b19e0b07870c34b102de0ccae6f52eb734e2ec7f2a84fa6a6b47c1852de505382e6027a5c048dc310f7d961 WHIRLPOOL 531ae1c94bd4c0e71eb954dce64c7b8ac50e63447c2e9ad19802280b0ac26acf43f6df0eb3269563866d57a66d03e18e95fb5290e03ec43babbc2ff05047af46
 DIST raspberrypi-image-3.10.38_pre-r20140427.tar.xz 10834816 SHA256 9f00d57e4f14233329f713110991b62b3c4cb22ae5024e82dd4a6856b5667dc3 SHA512 d61c6698a4b52b77a2967ea80766519db84f61388e7e32018a3ceb5f77d8bbee24f409a79bbbfbdace2dc154d873e8a5498f3b957db836fef43f6688de84d95d WHIRLPOOL ba21788cc709e0b6e8c1f286c8e213fad6221b6ef97db6ea3e80cf08370998c0224b0272216685eabd5ff2efdaac72e256655b395a5e3f1e7a4fce6691cc2d8f
@@ -19,11 +19,23 @@ EBUILD raspberrypi-image-3.19.3_pre-r20150327.ebuild 836 SHA256 f4102f6981b3e174
 EBUILD raspberrypi-image-3.19.3_pre-r20150413.ebuild 836 SHA256 83520ac309a87bb7f601a40e761162b58a7706c3b6ca7c4c95baf69a9508e44f SHA512 a953d3e19900c8d6df4c5647765720ec09d4062e90a2f1e8fc6b462a27757f426fbee21e7a7e2f91044896ee90dcd51897aaa1e12352ebf695f403252ecbf4e5 WHIRLPOOL 36cbfe8d9785f257769ee0557c24147305543f27256ea64952bc964e9b6c659f096399d8a0677b25eee4a8f923c7a3e20e44726a9e4e458a020203cddbfa12c7
 EBUILD raspberrypi-image-4.0.4_pre-r20150523.ebuild 835 SHA256 765a50752a30a90d1bd18891f53902a7016c58d45f33119c88fdc2ffbd6c577b SHA512 f69155c5b358286e01a62f92023c377a79323a3bfb2da03a52f0946f9f45c37aa326c51081117a236be0deb562900082bf40d04cc87e34a3a8396a3b14f972a3 WHIRLPOOL 35e2c6d77b18c32d11c080a9a8aca7e7eaa857dc102b3120c00975f6b59ac14834ef19550250a1f3353686531781e404f53e98a4e07a66038d41b06a2a59d1bc
 MISC ChangeLog 5930 SHA256 a86468fea53e26055d648951a7ba850e36510ca16a94853b1c8af124c4b39a2c SHA512 fb127aa198cc9d59a48f31a487ae1a91ec0d9d3599878e198874cb2deca26d0bd2e12f195156242aeb149aa1fbd39d4f5db0dd98c8a5d153d0602ad84f799a3b WHIRLPOOL 465693bae84d6ee7001cf44f36fb74e5cb27e69d556cb288a19efea49a41dd93bdf45fd32a62146ef86b4467133d48b8031090434ea1550dc476da87f8500126
-MISC metadata.xml 223 SHA256 89097f936927d56068988263e382edb683f359b27293955708e9ade4d256220d SHA512 c9f6a48b2aa05afdf73b8bd824c65480d76e54b659ca39928398c66f764d34faf186255d8aea034737424a962cf35151b610d078a01f8193b027c63e1e3c51b5 WHIRLPOOL 1ce20c98a7e177b8f510ef41f3935b0db5e04b2ecf465a683b2f2515f6a3043c33e6e9efc87f5aaaf59b2ed9be376d9d16bc8beff66b11aaa50ea899bfdc1f62
+MISC metadata.xml 314 SHA256 3e44aa5710bbd49a035e8ca7f376ef8b6a8543f727a0af57143d8ee22beefaea SHA512 8d374b275a5c6aac359629834cf4db54ebec27ac523250126d5a682cf255fb1a6f4139af32c5585698558caa7de572665560c159c6b2bcfa606355b784eb085a WHIRLPOOL 27d03712d723bd58af1d7890c827d936f8f0216b4815e25a861562a5fbd93a74d0f7d4cb6c55ca4ac03324e8476da6de73130cf84f915115cd156275c2861aa3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iF4EAREIAAYFAlVo0OoACgkQknrdDGLu8JAdlwEAiDsT+HOy1Ikr/ULpia5yx6oc
-Wx7WFBPJipDvbXVL+2sA/jftzunBlO6pNdWMOTtYBe/7wmNn/+YbQQEbxlGARK+1
-=Hr3s
+iQJ8BAEBCgBmBQJVfys0XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiyzEQALdaIOie8DX0/CjJOR5SomWN
+d4zhxCzVvgkZv01XyU1jE6aSZ0C4XOZqekvMDEyzsgARrpKvqERhBy/U6B015HbR
+TCUt+CJpbgmp/AKyWwvsh7i9g9LBo0GfWlFNENxvnvDFJkvtAC0x26ngQH5gBf0w
+Giy7jwdDG+tjHQQb1XymjsdiCRTurvgseyARA3midktChClpNQANBH8VS8rMGvmQ
+MJ/eAmotMmWauvZVs9TtUE17OkgpgzMQLT+QCgHF/CwD09JNyi1f9oiZPrvgidvn
+73P4WbEouERpN5jxNc9L4FZgBEOu1w0DZ5mWeTLxdg7h9Ek5uxL6NieLLzjJC1gI
+J/BTdbo9Uc4LwZMar2wcwEr3aK612pIQ0C7GWQQ8XLe7a3muat7kMWFhx1pC/gCb
+zTkDCUJr4ktw34aa0cO60+bgTwI+ye/+/vQ6+hKj4bAF4FY4SgAQRg2Eg2gpuSb1
+UoPJb/2CXeY3cAOdujYiEGLzI7bVr8/12F5oWwPPc+vJvMl+izRNU4oW0AEW1nym
+QVwLqAQnbKuHRIBXI+EOrcZ1gUduicS+TnmfTTwtsts2bFjzgLkqqq7zaSsQr2l5
+2OU6YGXpp389rzo+zqZLd94LKxgaicM46cBJKq+hsnkPp4TDxrkq67qdglsQ3+dO
+9I9LAl3DvPwIZobmyvDV
+=n/Go
 -----END PGP SIGNATURE-----
diff --git a/sys-kernel/raspberrypi-image/metadata.xml b/sys-kernel/raspberrypi-image/metadata.xml
index 5b80fb94c393..30709ceda2f0 100644
--- a/sys-kernel/raspberrypi-image/metadata.xml
+++ b/sys-kernel/raspberrypi-image/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="github">raspberrypi/firmware</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-kernel/raspberrypi-sources/Manifest b/sys-kernel/raspberrypi-sources/Manifest
index b4d29bda833f..e5f01659b675 100644
--- a/sys-kernel/raspberrypi-sources/Manifest
+++ b/sys-kernel/raspberrypi-sources/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST linux-3.10.tar.xz 73175088 SHA256 df27fa92d27a9c410bfe6c4a89f141638500d7eadcca5cce578954efc2ad3544 SHA512 5fb109fcbd59bf3dffc911b853894f0a84afa75151368f783a1252c5ff60c7a1504de216c0012be446df983e2dea400ad8eeed3ce04f24dc61d0ef76c174dc35 WHIRLPOOL e7c0ccc2231e430b831218fc66f1940d095d2d5447d391329c6a7373d4a1d16708f64778b32e4847802ee2dae4fcf7cb67a1238fd4eb204fd0c4bce2d8134053
 DIST patch-3.10.1.xz 5716 SHA256 1ce8533d0142acf9bb4c2167f0317580735a3c335b7303acbbd8127d01fb73e3 SHA512 6441aacbd2a3d1f1c2925397610e7343b7ed4e6fe80d64c52a261d12bb5cb7c44bcdc6aaa8aa975eabd90d8558820dad943fa2023451aa05825979af2b026ece WHIRLPOOL 3ed54bc6ba5741a884ec098a397b251aa610aa466090a65650b233baadc8627b2898f18719e2c91a087b0d5e3e3d20735eaf7d9c4e721bf7bd672ad4b9c1478c
@@ -11,11 +11,23 @@ EBUILD raspberrypi-sources-3.14.9999.ebuild 733 SHA256 531b604281b473993a44fd866
 EBUILD raspberrypi-sources-3.18.9999.ebuild 733 SHA256 9b57b59ab879ccbd5ede766a339b4d9718cda6649a82f0ce6168cba7edbe179d SHA512 f7cdff24fb117fbc486caa771f8a48c3e103fe43f5f9885b619547313d2ff94e3593152ff12b57605fcc97eee80cd5e4213b1d59074780fa7b03dd2471bd9069 WHIRLPOOL 9ab60ae9ee8872658aa331db160834a7fd395310952fb31fad8d226d935e52bd9885ab5154a2058984f0cf64b44067271972bfec4058da6c5dcb3342b44c8a34
 EBUILD raspberrypi-sources-3.19.9999.ebuild 733 SHA256 796b03b8414b704c744fd4a706ca144f54addd1a255f24b9835e45610a082698 SHA512 e816f6bc2445bfb631085299c712db704880c9d89e5313a7d150ccbed2a1f8ff739d0bcc6060700877c79db562753324191505854c809797a1738327ec65c305 WHIRLPOOL 981c3fb4fd44b7f7ffc02b6529f845ac8c8766f6a10f58d3a87345dbe5dcd3421c1ecefd6b8bb6fbaf32c95d049d2a69e039077192b1c575ede6e2308cd76664
 MISC ChangeLog 3332 SHA256 c509dca30baeb481b010a26ecddf4e4921a172c2c9b06295723b6c740cebf202 SHA512 d4317ed4999f6e59b13933648037b1aef339a5bf05916785269e1489186739d63836864b774faacd571ba50e476cb5b0b6af7738892df099eebcc1905c52501d WHIRLPOOL 9baad12b27659d6b6834c8f034cf8f80b2bdbc29c35e289230fc3d5088117fe3d8d60d060146cb33a5afd1d443c8cc50a16f89a7c3f4a19a97c0451d600a08c2
-MISC metadata.xml 223 SHA256 89097f936927d56068988263e382edb683f359b27293955708e9ade4d256220d SHA512 c9f6a48b2aa05afdf73b8bd824c65480d76e54b659ca39928398c66f764d34faf186255d8aea034737424a962cf35151b610d078a01f8193b027c63e1e3c51b5 WHIRLPOOL 1ce20c98a7e177b8f510ef41f3935b0db5e04b2ecf465a683b2f2515f6a3043c33e6e9efc87f5aaaf59b2ed9be376d9d16bc8beff66b11aaa50ea899bfdc1f62
+MISC metadata.xml 311 SHA256 532fa1d4388b0db3c907f5c8cd2cabdb46e9ea5894e87d50805b5e305859014a SHA512 f69587272609e8fd6cd93be12761c092572210a46d1dd18afb17323fe4293392aa730cc2d438c519022cb77887e1ff8e30d75a481b873fbc12e2c88d05820930 WHIRLPOOL 5dc10c5f347dd474bc04e032de1581acb74c0043d42a5d40f98f86bcf09ca7fa9ef856183767901962550f8874414f79626886c44c5e8182726bf5f2b7866944
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iF4EAREIAAYFAlUbOxsACgkQknrdDGLu8JDC6wEAhJoSVdUIln+xabBcQSL0GLGV
-KbRCv5n0Yqrn6W6N6qgA/2vjRxBpnVh+El2AuAq+V/8u8bLyEow0qX0Gx6/Wx4yr
-=LTyN
+iQJ8BAEBCgBmBQJVfys6XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmilt0P/0W6xMipgyIxBaZ7TF/mwMMx
+D8bCh3mcNd/3/NDkD5zR8a+trUQii2D7IEcy6KGKeZDJrWGEHV8e783LQUJQ/4zs
+G739jIGxQ96DSm9vWL14DrdDJhpwMe794mEGdrmUwqdC+wvJw8R/nw4hTc20fRos
+qkoBJwRoscP+I+ZDHrlSqYldk4TLlf4aRM3q1QAHO3bSHxgwh5rgdWu8cYXSZeha
+eh/8H5sqNLBOQypujNPExRLR58llwVZMVh3jCFOM9bnQy6KsBPx44NQVYZrYRVyL
+7YGDGQ4Y/fx2ru84MWNJyZweoInmzs7Psge3nFKAZaqGXC0QHy3tcG9/PArzwoKo
+HTgnh+WMVWDiUyJ/Hk5rgssKTUL4mCQbQO+DYhkiAOgPLeUTkB+UwuFz+qEp+Aqw
+4w3m38yuW3xf1RBw5YrBD+6fM+oktNPgtdSMJqB2akBMqm4DNx1j97Ix5u8FBj3H
+W8rqhFLrOkLSAB0JTanGZnohk56fZceaCNRfM7zB00deIqYNJvZc8rtf6ItR+zP7
+IyPB9pacbcWXbz9hbasSTqkVhy8EnRgxmn8ffaMJqLx9djwTzNz7qfZnEI6zZiq5
+vN9RMX7AFkukxJAOnChDwq69Csc8LFDnVHR4Tvma1C+CK8k/5M8woRFRjGnS9RHX
+37NTTPDF3I4OnjVekWrF
+=qtnL
 -----END PGP SIGNATURE-----
diff --git a/sys-kernel/raspberrypi-sources/metadata.xml b/sys-kernel/raspberrypi-sources/metadata.xml
index 5b80fb94c393..0f40772b7fee 100644
--- a/sys-kernel/raspberrypi-sources/metadata.xml
+++ b/sys-kernel/raspberrypi-sources/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="github">raspberrypi/linux</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-kernel/spl/Manifest b/sys-kernel/spl/Manifest
index de67978749a0..c7a6961ae3eb 100644
--- a/sys-kernel/spl/Manifest
+++ b/sys-kernel/spl/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX spl-0.6.0_rc13-fix-on_each_cpu-autotools-check.patch 1508 SHA256 1ef61882e689ed1182b0e77a3b27ba108f18fccff7311462d9c8aef29dfa9056 SHA512 b9bf99b52f3135cb5ae017409ad773e7741536ed6c7181cccb8d97aa627a000417b24971818894dbfa0158a81f4a1be7a9627896b69d4f13988a99f1a39c0bfe WHIRLPOOL 9356a518a1d4a661c4a706347d00b2ec2873198fab379d5a644dde0fc4749f43a9ee542bcf65884de25b97a0e75668a2bd741ce4878ac80c398346eef4b55884
 AUX spl-0.6.0_rc13-fix-soft-lockup.patch 6154 SHA256 85173dcdd261f6aebee9e04098201c58164a74ba01d4a8775d6fb3c7c197c69c SHA512 bbc4d30be0f4425cc1f6076f1ed8d572a8255052f194ad47bde7a9b837689786dcf131326d50f8d4e23d8f0bbf79ce438c273fa33f7c98cdf0bb94c4673c4a0d WHIRLPOOL c4a7efb0858a92da466a69db14f4559188a7f731da7eeaf4f17470a17acb60d81da41c22b6801116d23eb71e4c449097f2ce2af386fd6c3aa915ef7718f49dae
@@ -39,21 +39,23 @@ EBUILD spl-0.6.3.ebuild 3014 SHA256 8c6e6a13b16c2b68b34a3db453b567b59536e00a5fea
 EBUILD spl-0.6.4.ebuild 2907 SHA256 92ed4119b6bcbe8403c2339c58e6f2b304b1ef9086b90b8b13238700a20da591 SHA512 e52f7d77a4e7c04da5366cbde1974d6dcf676c3fa5be927a6c44cb9783004d286e2255c067dd55f138b39e44533bfa84b8bc9a07aa52bbddcd61642da8a8fc73 WHIRLPOOL 7828548a70f3501ff9a7164c071714c399f355d7fe97134519d37f768d3b6cc63be08d301a964e904196b584fa8ceb93606d6a3547f8aa283b71eeeeb65c760e
 EBUILD spl-9999.ebuild 3014 SHA256 81b6368772b0b6d099de880ff5b29c529e4b09f04e587f00222f01666803ed68 SHA512 30ac59097ccdbd10e496ef64c1a77c97d2edfabed2584c7daf486eaf83af4bd043f5bb03d846c9bcfafb873a0de0cea613ba11fa69d9a622f273a9e7bd6b36eb WHIRLPOOL 15aedd1f1dd6c0a27137bd16f64d14763adbd27b35dd40a132850a1eac7ad443f1a40a61211a8446429c72d073ae1f0562095c7f9a277fec1fce16467a9e8c6c
 MISC ChangeLog 16098 SHA256 fbb1c5228937e1c3fb4842326cf520626408f5c0c4d08435db212a9418d5f63c SHA512 8990e1decc3138642f444cf1effda2ebeae0e5c3c8c346c0ff66ecc8d770253d364baa0abfd6a86ce93bfcba1a23f8422d39e8857b45409f3bb2edca240f36eb WHIRLPOOL 9b897b4cddbf9627bf4a6139bb856944340ea9ab8e48f1a45fd29635d0049f418b80d93775264eecd2e024987b423accfe5d22d8cd104022cbcb9f663337da36
-MISC metadata.xml 305 SHA256 1379ed630ee72009790f82073e4777a26ca612e0c023825f4a2648266422672e SHA512 ec56bad42e58b3979698fe6607ca1854b018d2292f02f79f6cda070cfe1489b31d9738cfe886597edaca36dbe839a8d909c78f8e4c47b1764b1a0d586df75d33 WHIRLPOOL 11016324ed29ddb27d0c67488e24d15d8d34881a20d21d2807accad014feb4e5b29ceb8d72134f7d8c58d5f83b91c157290c51ea883a5f8007499e73d02acbcd
+MISC metadata.xml 384 SHA256 52e5b44296350e7d0d7d16d4ad9203e18dbe69515e94b3115ac900ce6dee61a3 SHA512 1c52572b659ab643345bcf3d8f7189e101e104c8aded8a62f71fb447af597562ad4a5abc602161c68c222d00f754dc2ab278aea9687b7e1bea7144824b3610e5 WHIRLPOOL c4640fd4fa590a63df262a6233f5385a9b1865d25e1e7117dae7096763d6c253d25ca629d4b43d92cca8020ee921106b710518d38d89e33ed5fc29fd824b41ef
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJVVjpXAAoJEJOE+m71LUu6G5QP/RdomVrb9xGNcHRjwfXoTuDW
-JnU6Qcz4W6Aglu4+Sra140Yehlvev9MzyX9pfW4KwbRm75uMX6scBwxi4YPL+6Yn
-K07D+UbVWowWdRCozSzqTD8Wc875mbw12JCQwDwFv0mwEeSWWqjkJBLvYp66QBGv
-oDeMAUwcM7L3iaSVXm90kBGbXn202Fu6BOqm1asx704cyxCpAhrdq9c7C3kv6exU
-MSUGXmDOpzRgq1LnfqlreNiOAL5lN3uN03pwoTDJP968I7pK8Z3jAwoVeNL+dLo7
-naiKmiXoAVxhCoEcRL6UqxUvAQqJNyUilnNMqohQ/q+6/NjLfVlI8/MCCC5Y1iK/
-IaaI+pOWo+iVpg5JgUnGIwyjjfrAPfaV/QQfJjUtNijQ7wC05dYiY633Cki6l3Gs
-cX4PTgBgH7sZxgQB40kGYU1T0SUWG7O9tjfz7RN6HEGG6XhvZoBZ633VjajfJjFH
-Fsk1uKoq1pfUcBJjQREIlsQokYGVKcw4xpDc3+7py3I79Aa7mysiTf/Rzsn9qqjJ
-nAVeqHapzJVAPa4Ktp3cZttBrri0tzMvbzp3xSDYi1N9zPoC8I+nyNC6UdkNGseR
-BhbjGbMu3sCO49wDI9icOx6IbDO24hfp6NVz7zGImPRZOKMTOYEdJauDJ1TKS+sd
-qQ+tdmm8nLN9zpcpcM0M
-=fkaQ
+iQJ8BAEBCgBmBQJVfytGXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmimasP/i7IIZ18DVPs5N6m5aDldxa2
+zmMRDu6G+gAZAByAhziKQJGGmr5A5VztUM9/fdnV0YEl0O+T2Cpf3gwJ43WWj81/
+QMkOTrPL1INcRRXtylQb4RD4x9VoSxrmDYodqsduRg/JGO4BvIAyclM57/FXQSUV
+ZTyPqX9QzzbKBKCYQEJzbsurBkOz5VcfBx/yfCofDNtdYJVu8ErdA7nk0WgoQmko
+e980vM1F/pCLgCwuHvmxqDouaNV0NnppW8KEJ9EO7+JZMXp7dFGxKOgO+ZGjQqKC
+xuXwb5Vt+rKIZhWf02uIcN3+ufcrPKO1JdvGkrz0oYD48QXIN60zXhDxVxfF1fuh
+ksXtyXJOGIX7ZDL76LYqcZpS17GO9DGohliedLR47rnEh3N1qnE9kA+kl3W/rRF5
+cxhyOBi6f/zQNKJuJJuyr3Jcj1rXyPDX1vXubTfH7HjSDPbBAYG7zQcb35hxDSia
+0ExAMB7dsxRXXohG17JnhQ905OqvsCLb445QsmbfoWP8yKk3Cg04pvoFXLSdfjY3
+niEpub9AC8RBeOF7Wg6jZ31S+YakU2nsSXFnv3Z/c5+cfwZm3DDX+nUKfDY7w3DO
+j8qH6bQ8iOfShV7mfPd4VrUTNk/agW6ZlqWkRw+qj4Z4WtuV1SXAQALHQKVjgq2V
+FbtbiZv8ZLfSBNEcuK6X
+=MIAj
 -----END PGP SIGNATURE-----
diff --git a/sys-kernel/spl/metadata.xml b/sys-kernel/spl/metadata.xml
index 20d06cb3fd32..a446f2c2fe48 100644
--- a/sys-kernel/spl/metadata.xml
+++ b/sys-kernel/spl/metadata.xml
@@ -8,4 +8,7 @@
 	<use>
 		<flag name="debug-log">Enable additional diagnostics</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">zfsonlinux/spl</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-kernel/tuxonice-sources/Manifest b/sys-kernel/tuxonice-sources/Manifest
index 5bc52c62af66..344dd922b27c 100644
--- a/sys-kernel/tuxonice-sources/Manifest
+++ b/sys-kernel/tuxonice-sources/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST genpatches-3.10-85.base.tar.xz 1204840 SHA256 849c94f434934dbfc1df7d3f5704ab3619c7b1515ffea3048fee7b7a17313694 SHA512 a2f2b57af757f168d023372cfb988fbdd4ea63ac21bf8a06916db931f03c9eed50dfa68376285ddada122759a065564246210a94236c522c858070527ebf7297 WHIRLPOOL dd601821923364be9df5ec35dcb61215e54ddaef9f61e2ceb8c63f8e669df66c863cd840d6ad5d4cbc804bce3831a28f0b86d095bfaa78fef903249a2ab1974d
 DIST genpatches-3.10-85.experimental.tar.xz 60208 SHA256 a4d594ab39de091f851e1bae26f879907073d05f5498ad7b1169c3039da8323e SHA512 b9d28ff600c5a0b0477a2b79cb6c2ac6f1c6704e64ea20832fb2dd65942242f5ac62f3aa860b2a548f76407441ad343eee1ca2897eb76375c5afeae27474aa5e WHIRLPOOL bf270c888fa18c52e7fee5b170fb2957caca169c5faf28da8d46eb447aed398c7ed67d13ee491b7051d1fa2ba6e1fbb43cfdcbfd536df250eaa16cce81b29648
@@ -58,11 +58,23 @@ EBUILD tuxonice-sources-3.4.107.ebuild 1258 SHA256 ab748bea2dc7ac2f501196ab79a17
 EBUILD tuxonice-sources-4.0.4.ebuild 1286 SHA256 fc52a3be03f8fe438b93eec78b85eed3c05cd20c4e6d026323a40b6c47ae1bc5 SHA512 5ff7b6bc58a642fe67f0eb6898f6bfee00ec0c8b6a428dae45fddb006875f788d4d19f693403f314aa67b474fe67693faf50e3f3e7c27403dc92ed22e171795b WHIRLPOOL 2d08d3c2d50ae564cc7ca75e552be6c6dd98dd8176293a2d84222909e48fb855a5bf22cb22416530599283d64127bd8ceea119ab240ed72b68c48483f8896701
 EBUILD tuxonice-sources-4.0.5.ebuild 1286 SHA256 38b2255248f85c68a5cd42d182193a6362e2366c6082658b5aee3262ce72b0cd SHA512 a88ff4043ed255e5bf410dbe627555de03b8d8e4ba00c6e682b535480b2919cc9b1d6423c0cd671b124331e01954f5af9b92933c06f9ca72c825a11b0abaaa44 WHIRLPOOL 6944d6ab241d3be2b340affc0e746bb355299dd475e77a83b42930bad84c332b9d3a76059e9a0c900f0dbf2e90e84f9b212cfe98a864ae852c32adf4c1c1c027
 MISC ChangeLog 89302 SHA256 7a85e69313cb72fad083039784daa78e8913f62cf5dbb87b0e89255f0699a1ec SHA512 4397ccde6778b299aa24e9aae8a403bbcdf02c383d695187f661ba3556d846f23a7826e32de9159b1b737d6f5b948d2b5c0fab8268e1951cbbb450ef704dc96a WHIRLPOOL f04bbc3630dc5ce6376663a1f13a36afa1200f66da428aad92523f3f7f3a39d2b7635d9a87b9bda3d9513d802c9ad80b1999f7b8cf9c5d0fb1a2c99e4cbd6185
-MISC metadata.xml 563 SHA256 1bdc900c350a1a3b9673c7aabcc87407d02042e7c35c6e7b4c10e43533565f4e SHA512 a7c2dc5666e3384b65063d2fd7536c704afa667a16592c517a5f04f0ce535ee3c2568aadcc8205486641b93667d1401c8cda3d01966daab1e75169695877488e WHIRLPOOL 5f0c5be1e23086a781755f5ed209e6f7048ed5c2461585745ead9732118f990f93e96dec174e53696b13ebf3fc3442d45bd9023a9db4f71397b77c972b2257e4
+MISC metadata.xml 634 SHA256 bbb526708f1b2c00c91d7fc39aee6b8649ec40f58f1d0f03eb045e300739067b SHA512 9fb817f6d8ff543c82fd1b99f2e778881f8bdffbbfaf596bd5f50c190ecd198a685f4cc8a27c8ab92ce922113aa2f93153b29e2ac1e525246a8fd21d346b2d40 WHIRLPOOL abea5f586d51358dafed4ed10bf55bfc205bb07e653ae4a65855eb477e7a499e8e9673e6b1f9d758ee768c3ff3319d8ef1ed93c434f924ffe574b67811116bcc
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iF4EAREIAAYFAlV/J7AACgkQRxvnM+8pGj/EJwEAycqVnV22eyFCbYPuoyhlou/2
-iDg2zLrARzS8Z3DzluYBAIXHHpEHBF7K/HuDkSBKXJa3XQ+6wyP7cXy9uO9frdev
-=Z6BT
+iQJ8BAEBCgBmBQJVfytQXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiyJUP+wa+THyMjukQ05gqQoK64J8O
+vmfs2VhM1xpQQ2AsmjbiJUQXAnEreAP6CLguWEa063glGGbk2xx81fGTyGCCddD+
+l9M97vHedCTWJ+XaQhMx2MFBGgnrB5hOKUDsbeYcBjoGF2BxMrZpK6XptLMqGCbD
+RXxojO9/KJJlw2wZCxxJanU/fI8lJdj1FbnPYXpbFMNaK9vIVIqo6+tq8PWuF3zI
+Utrgj+nRGlX9T7Dk2+3qbOT6ptnGRK1rVWfTF9c6MuZpX9k3ELEDEhRXN0yEiYkO
+yi4/Ys2IHUDOU6VNlbszjZkmSTB+yd2TPUG9EAa4Zp+aJ6bh8rJwxImc9mSH208g
+4QHUrP94BniSKfi8IYjGzeE032stGCuXAs4Ft5PP8rveyKJEqlZMpPf8UE2aKNLE
++Ku37B95CAll8RLa+56BWHx8nXL59WKuIWtIYxP3xn9l+uvyBu1AHAW7PNMRbL7o
+u0Jh7j5EnbrHwSgccwua8UfZrM1ksD/xHUTxq+MuUQHZ3WiDt2+caopfTqOtgSTd
+xCaK3y+4yrTpaEf4jjs25eWbynlYbH8FySjkXiP07mZMGND6ewkVZUb79BZIWwNR
+g6+vRxIaxSja1m3mvYXE5omotfI+TsDcRRSOdy7n5uIw6YJuumuCa+eW5S/ehWmr
+00Mj81Byfc8JHi4szthD
+=XGTG
 -----END PGP SIGNATURE-----
diff --git a/sys-kernel/tuxonice-sources/metadata.xml b/sys-kernel/tuxonice-sources/metadata.xml
index 723f2cab5ecc..e9ef9a6c3cf1 100644
--- a/sys-kernel/tuxonice-sources/metadata.xml
+++ b/sys-kernel/tuxonice-sources/metadata.xml
@@ -9,8 +9,9 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="cpe">cpe:/o:linux:linux_kernel</remote-id>
+		<remote-id type="github">NigelCunningham/tuxonice-kernel</remote-id>
 	</upstream>
 	<use>
-		<flag name='experimental'>Apply experimental patches; for more information, see "https://wiki.gentoo.org/wiki/Project:Kernel/Experimental".</flag>
+		<flag name="experimental">Apply experimental patches; for more information, see "https://wiki.gentoo.org/wiki/Project:Kernel/Experimental".</flag>
 	</use>
 </pkgmetadata>
diff --git a/sys-kernel/xbox-sources/Manifest b/sys-kernel/xbox-sources/Manifest
index 2d60c75f27c0..95f6e27e6112 100644
--- a/sys-kernel/xbox-sources/Manifest
+++ b/sys-kernel/xbox-sources/Manifest
@@ -1,26 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST linux-2.6.16-xbox.patch.gz 114525 SHA256 c8c3bd4b506f2c5a534d43efa6121e701aa5268a63ce4f35855c7a00b4d4f5f7 SHA512 003fd833a5fe6f96f6a3ac187cfd5083486ffa3472cb73f118b33b74a0b236a15f1bee8b28f7a08fed508ea57d78717f5834de8b77847a07c3a14e8b8ca9d076 WHIRLPOOL 1c8eedfa5263a9751e44c14239c9f9e6220e485182702c9f965297cd996edaa7d22a85513b0fc79637f2d9d33c203e7834c9752f6598e07dfc00ac5d482bbd79
 DIST linux-2.6.16.tar.xz 33178492 SHA256 6851eabcdd9da0d79f6d7c62da941547da963fa916c3d30ac5e8d70367cdc75a SHA512 7df52017beeedb9c0abe2f3ea0054141153d10acdd20935b60f357ee795c04f4235477776dbe6b81f34e33f4451325202c5f6d41201de299e69b653cbef7c9a1 WHIRLPOOL 3ec1f4cfd265b1b177d65959d24b89781af471f8a6b7be616ed8f88e7d531e2d25b6e7a8626bdb4ada5844843a912bbef37d9a5d25e283811cdc7803351fdb50
 DIST patch-2.6.16.26.xz 58504 SHA256 b280b662a3bc92e11b28a825582d7046d8064c30c342707e76f7f0c5a3ab7715 SHA512 5c088557e788a25aa6dfe4b60e80af0cb0a1cb09e5d17fcdfd7912dadd7810381425931ac42de35e13c51b8349cf5c134dbb2feb5726131725bae99d35caa4ce WHIRLPOOL f1383cac82ce5dd4a6767bae37ae3add551ccb3cae1e8583585cb00e276ec6dfdab7cec5d6f55e8cdc304801dbd8548569572914964c67c7cc2d147a667ea767
 EBUILD xbox-sources-2.6.16.26.ebuild 666 SHA256 e245670a0da462761b751b9b36512abd5870b005c0e9392e7d1de17d36901fb0 SHA512 ca82d272ccf5bbe50c019628f5f82e805df34540ea1eece517ea4c1517ac8579aefae43a6733dbd74212edc230b8550bbc673b071afc96592ded1558a3f98a9c WHIRLPOOL 96315c461ebafa84e600a73508ea63780855a79d1c736b313a1349e0a6e2e7404517f4e8c22494baa2fc180cc928c7aa87e607a60c589e7645edae4f9070d4ce
 MISC ChangeLog 13052 SHA256 c4857807b0467103787c4dd04ea31fee263c6e06719164d72624544f0e7f81f6 SHA512 b902de42e1d9ea30fb2147d55b45a689f06c6a93c54132a09aefa6ed5ffc4a5598da808177982bda5e3d6523e304cb47b96114ba7e118f851f1046f38ad9550e WHIRLPOOL bba3d52dfd6051e5b449f01d4518f0f82ce9eef98d6f127b09fed25c671c551e092c74f268e62cda7704e2dd67b0eff2362dda501830592ceb3c1136df98932c
-MISC metadata.xml 335 SHA256 5028e40e9f6e8979c999d8e4e524b4afe2e1084b87f88da480fb846e0921ffc1 SHA512 d6c60a471d18a8dc818327f409fc9994fe9adc82e35ff9b3de999a6c6e2160e158a1368dbb88b82e8dd700186bc5a875fcf14ff49ea21ded08f1e1384cad5507 WHIRLPOOL 35631973598771a74ded8b8ffe5aa965c82a89f5fa8c641836fe464b52348d65bc2f52aaf4468bd7b03a5c16f4eff381dbb013a251ef840da27d8c5d95605d28
+MISC metadata.xml 396 SHA256 8439d301c0d155a7c54bab83c7e92e9464cad659cc8bd8cb153f68393b27ace7 SHA512 145eb9138a93fe397053063ad01d908b18437ee028393141c362b4bee4d5d53f787e99f9f5d0ab3b414f4b44db9e953d8040797e05949c3bab6241e7ee651c98 WHIRLPOOL 4e0f7c60405aa6ecf9b27442136d7978280f0b03813eb0713591c3097e5f85cc2975150522d2cef7b87de067758e76f10dc2d91bdbaec1cfa1133a6bdb73ffc4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJRtQxbAAoJELEHsLL7fEFWI0gQAL0FVl6jQR5D3DKWM7P01bRs
-pCX/bnHTsb6y0GseUfcaEUomNuguX4cytJpwOROG/uR/5VoHbAFUrzNKhS8Ox5kW
-1iR+O/yCPBrqXWlb5+QuIKm0DWzzV1xeJ7o7WIsuUnjJ4yRoJeFbnPSwomMGKavX
-wYrRyodW9Lda8eC9Y/OLgg/K/fMdbwTxt9vDRrk9kjOB+z/30qHmPpXBT/D8GYgT
-AoPt+nIJMD87NlnjydcPdFDC0AwoFktM0YQZ8yJCtRcYgy8bRJFnuiEe3Y4nWpTI
-i5FNym2UQsA1J4Bq+tI/N+ddpztbKKrMKz3nIOHiQPzi1y5S7VR1EVhfRLtHpmcz
-c+tZxBggj+zCuPtdZbZHZlNWsRpI0VsDer8ugUTBvNC8KpMgXUq+Pm6IeHpYA9Hs
-5A2f9TIlwVcPMhf/EPiDxNY6PlpRDyWRb8UE9OAxUufuay9efbRSTIb2n2Q1RMKk
-bdGzmBkeix+Rr2pM6hGIonGboMgRvo270ECBoa8t7xoIQd28eq7Ha5Yg/GVgtQab
-08DeofBuiM9ZzZJsV21kSIDruNYofsYF2w487lQS8+sZi2CqSkKtJiSVM4MDazjs
-cJDrR4SwT5McpJ9PtK/dtYmYca7p78vpjBLhepBt8+oRxekzoRN+ouwmCXo+EBFk
-8wKOLrt8soSK25/Bpr50
-=6wUP
+iQJ8BAEBCgBmBQJVfytWXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiBwoP/ROksgvqex4DRhSI7YVwr1TQ
+ggGmtYzeOl2pujEpGDLYrTxl4vG7iJynQPvO6b91MTFGbMCI3rjvGXIe0UyjyYYo
+E0iormWmzqrHrwhT23x0Hqxs1ICpfbxIY4YPBPaNbxAgYPheEBxnvpx9fIT+j2yb
+aYsVlv/0cJHlpbI7ePgBmnEkYY2CmS8dRmuArXUEghz1HPt5pkiouDYDFUFaUB8x
+oxs+cmv+ac+NAVv3Bf1eRiiCq87r21zebWQQF5/0NRCYvmwIPN/BTNCobzed9UtR
+KAVyQUI6FeMTuGBn1ON0ZFsH7vww79K3cFfgDwaWXounm7RdD4mryzeUn93d6JK5
++ScrVHs6j9dGiCQoJT9SHrynLhKXfz1l3nGRF0ibO3eqejGDdF3YIDBdcNy1xofK
+RuJ9ZbVKqloBXoRsGlAWTlfRtodhTxCdLoaQYDo0BznCK73k9PVwLjpxJyUkjq3W
+PZ/oZrqTOGAx2SgdoOOLutrvzTEORqvuSknTBQ9kMsBunnlV2WGyDeMrdePYgyYj
+DTdu98Ywu0xV6v/MTJPCLN7FAJ02SQ+gpIuP1yqJ4O8t+9x8ba+491Vtgzx9/JLQ
+lGMVc1GNuivsakDGHX2rmqSb/daq/hbUewmBvUgeasaQLd9gZF/aOAWByqijiDyi
+BXN4yNIJ6IkQG11yv2FM
+=c3Sh
 -----END PGP SIGNATURE-----
diff --git a/sys-kernel/xbox-sources/metadata.xml b/sys-kernel/xbox-sources/metadata.xml
index 9d5290ee5377..413f9bdcef93 100644
--- a/sys-kernel/xbox-sources/metadata.xml
+++ b/sys-kernel/xbox-sources/metadata.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kernel</herd>
-<herd>xbox</herd>
-<longdescription>Full sources for the Xbox Linux kernel</longdescription>
-<upstream>
- <remote-id type="cpe">cpe:/o:linux:linux_kernel</remote-id>
-</upstream>
+	<herd>kernel</herd>
+	<herd>xbox</herd>
+	<longdescription>Full sources for the Xbox Linux kernel</longdescription>
+	<upstream>
+		<remote-id type="cpe">cpe:/o:linux:linux_kernel</remote-id>
+		<remote-id type="sourceforge">xbox-linux</remote-id>
+	</upstream>
 </pkgmetadata>