Updating remote-id in metadata.xml

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

14 files changed, 153 insertions, 97 deletions

diff --git a/sys-devel/boost-m4/Manifest b/sys-devel/boost-m4/Manifest
index 64b956974c24..219467cd38e7 100644
--- a/sys-devel/boost-m4/Manifest
+++ b/sys-devel/boost-m4/Manifest
@@ -4,21 +4,23 @@ Hash: SHA512
 DIST boost-m4-0.4.tar.gz 38871 SHA256 abe1fbc30cdd1e938cd5b00cbcbfc370d159404f9014c6dce1976b093cd242e0 SHA512 f0ee9edbf20043679339bcb46a912d460a787635106559780d6a9a08dd685051a58667a0a1e26364709de10dde49f4b2fd348dbd6199a9da3099d75e665c1e95 WHIRLPOOL 8478f8f742004f3ef8ab11bb27c1c2d172fc9060a0ac6041a131f90369af9a8cc6db6ae0e1f108832d5e2c262aba98604b32601a89afecc4be135b7e1b4d18d3
 EBUILD boost-m4-0.4.ebuild 954 SHA256 de0792bf9dbc48ad793d2361c6f17f8df65265b013c67818d3135f102ba05adf SHA512 75ccf22c60b048768711dc00074f655467f92270e25da6b015abf5a08acb6f5e8f57a08f96ea4b5baf1e0f20bdc2fe6c5e78982823175d20f4f10f6cb2d20898 WHIRLPOOL 858a97818db9ba42c79ee3fa0c490c9357d9f8fc142f8d0dea33799b0e8663933c8227389d3393171ba398f16300b63b3e24ae4dc853945ad4a457f1ad133fd0
 MISC ChangeLog 3041 SHA256 7c970e8f76384902e478453ec584c07dab83893d1b68f4e1bc0b9117fe8e47a7 SHA512 6680dba14cd6e7085e52e15c896b6c0a846efe7d1329ba15108f64666a91bc64049cd2552907cceb34468370f865bba350763ad91d85984f664e574f44a71544 WHIRLPOOL f73e7c237d97ff7977af33da56de0fa0b4d24cffff2c3753876bd38cbbb86c502f00f900e3447a93c997dde2e17c434b587475a84ea6181222ed1f2596b8e000
-MISC metadata.xml 244 SHA256 f5bde347c36c74889cbb32d29f06766c08eb3df6e0c468f00295681382c48457 SHA512 100f9b2326c73dff673bda4c5dfc0dd28bc756d80a039c1d3ac19124599a99e18b841ab28da191a79c6498c2dc157c0fed7639c855e2520cc3933f03e3de8a21 WHIRLPOOL 409c270895ffd477768bc9c329c9297c106d3f9572b84051ae66757f4d87c6f0a0b7d71aff602ff41b14400fc0afbf3990cbf1768a63f01fda6854043b66a35b
+MISC metadata.xml 327 SHA256 5a562d4cc30cf92d3193d21427e4bd5bac94b1baddfa8a0bce9823966c9a26d2 SHA512 3d73734883ad1aa07a8bb40e92676c2afd5f52102b4714dbfdcc041020dfeae764975a5c151739217376cdcff508a2d0958b6d0943506419605afb2b36af1c19 WHIRLPOOL 26248bf308dda370713b4616d005e96b2ba04f9b5ed7d54ae5a661bee712cf533e98b808b7716cfeaeba2bedb28efd1f7df053c12b3001d91a78eab08f030ede
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQIcBAEBCgAGBQJS5gmKAAoJELnU8jG9FVirDzQP/1kMP2wLKrm961NUJb0FOH64
-nBnc01N/pU9D9etbV2KOUcuaTTSA1BLO0lNK5YBlGxoxZ/AHm+yHI8pFE1o3CbcT
-zsAa9wnQubDvloYbGbAD/JeWMin1YNuA7TpX1hGZvu/zBc8o7o2cQSirHHuZ8nd4
-F4zsW6ENOptks/rbE8k0XHiAOo+wXQPwmO3AUnickVQkGS9GKe3845FyrDr29Zym
-lxG2wISVRtpIQRhU+Vs3V514USSqRL1QAFDXoSEOOnJ162aG4C0bTyt2jfJcqFQ8
-8NH9xaPKjWnKfiHY6VNDbS0tADYqsR6i7Hu0BBDWh+KGFrR8MCPUEqRaEqXqzNl1
-RYttsf91zn4zIhiTi8wAj+HwbkqJMQ+TWfD+wL45K5CTQHgPd6QyO+oE8rHf7zB9
-9XJjd8DNElbBG+usJx/hntExDo8DLvNA2E37NRu0Fr5chfC9/UEB6GAZ8wiKxKFj
-956ByfzI+R1cI4d1elLaqOAZEgpVG0ovF8MW+IkEGJcsrRr1BsHNBpFHB5iw1T2U
-blKE4eMJbT9NM+nuyrUzoXXxHCvhTuzu51bf7YD59VQeNuIBR5aPMdutfidKfOvp
-aiQlrk2cl4nBOK3gM8E/cIAJrGIU2bkA8VXryXauag6tN2ygKD6tvPSzG8HIJQc9
-U4DO7MzTXkL+mHs0a9oE
-=CRJG
+iQJ8BAEBCgBmBQJVfyiHXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiHvsP/iRc3E+Yjpe8c0S9EsJZl+fl
+D3hi4prYzdYWmVQ8kZ7SiJ7pBr9dkV36CMg7R9J9A7khnijd5Q1NBWvcMVW7EEli
+ReIWIQDQVDfx3HvQO/JgKjs7dy8iIowXySKBc/8YAay4rIsdSK4GnP0rw1KZA0g5
+GUabcE986l/TVCqb+DT9cB8zt8FCg6LpsCHb18RVEEHa+OtKt9fkoL0lg1fVpEbc
+jSaJYyTHEsMeGv3fqEbPLGi6YTPsce5tug9l5srPkYPCUrtDtjy2yph1qTmySAKz
+ube2iNEd8XhUt8jYMvLbJoeMMup6pJxGLepgHy17e6QGnfesPpQXhMPhp/a8QbKR
+XVstajhmIHmiT1U/6ooEJCclNxjtbY4VbTrgDjHetovrD6h8dv+TKEuat2VFRsgf
+jDUWaaMylWwoH1tdMI0zyspmSHjFhKIUiczb3D76H3A3YTF1knp5s2TdiuvHvTSH
+HaYTILsSWgf/AXoJNpC8KBpSYD+Eg138FdjfilA25vfdETHFr8nFJPzsGBMSfuwL
+ECLmBa99WS7HaguoAiHfLhEgjTlSh5BoakZYtR2zsFgY+vAHu9KECO7i1UgnlE+Q
+86vZ7Xj5VeUkPrsBVwz35lt2DpQiYUqACGOM5ZRWJC9OrpI1v08NBcScAXnzyw9N
+SryZYTixlA++6fW7GCWZ
+=vWPW
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/boost-m4/metadata.xml b/sys-devel/boost-m4/metadata.xml
index 548448307c18..614b1f21a1d7 100644
--- a/sys-devel/boost-m4/metadata.xml
+++ b/sys-devel/boost-m4/metadata.xml
@@ -5,4 +5,7 @@
     <email>binki@gentoo.org</email>
     <name>Nathan Phillip Brink</name>
   </maintainer>
+  <upstream>
+    <remote-id type="github">tsuna/boost.m4</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sys-devel/byfl/Manifest b/sys-devel/byfl/Manifest
index 2a7004d839e5..7478d8fb460c 100644
--- a/sys-devel/byfl/Manifest
+++ b/sys-devel/byfl/Manifest
@@ -1,19 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST byfl-1.2-llvm-3.5.1.tar.gz 509555 SHA256 ab3325dcc71a6bbe4b0f7cdc75a8522cce29cf60e73e11b9791360a89c684b39 SHA512 a0f9a0656f70b172f1304de90312e5fb1fe998c9315463b86db35a2ccdbb45ded75a8776160a35223a24d0fe89a253740b1acde58ba2f1b77b9f27c71d5150fb WHIRLPOOL 6be2f6812fb33f72fc1c7a4664aadbc17f4f1872052e7a01269ab4921a744afdc5716a12cd2bd12410722397ccf00bc5994627f14932f442a5e4ea2aa806c6d3
 EBUILD byfl-1.2.ebuild 1290 SHA256 2f0d1f57f78b43912cad791db19a9dac47c489693ea6bea3dd08da50ea7d4639 SHA512 564237c6b48084eca30f8943c49b71f0a42ecb3471fd900f20c150d82ace069503248b4bee041e22225960f97dd44558f4df35f391c182d601ef7ce9d951ceb1 WHIRLPOOL 42a4258378256b6bfea5420c8bd2a78f02276e38b145a08a1ea92594e6409e59dea5dedb50a874279e4e45a8fd08b067909786ab6d9daa37981a365219b234a2
 EBUILD byfl-9999.ebuild 1292 SHA256 e6e66217d87c8f0f31a4f7a0c52824af7ccf56a6c5a1ea43c35512725070b635 SHA512 db70d7c75082c113ee1a1c21239591c446b27e6e12f7d1debb3e7bc6c911636cab98cbd69a32004db715577443a3fd649476e52261779efbdf34d0f00e58be86 WHIRLPOOL 7704505594b47272f57550b237afd90ab5ca9355a10a47c874e9af72e1c02b2d583960b10e2579d664f81be0bbe532c81b3c2b720ffb3f719bb8d2339d9c3d62
 MISC ChangeLog 1549 SHA256 99dd08fd0aa2d9e908e8b16d981ca6327a40459914266a74af45bfd68b64f3e7 SHA512 e153dc67a4d3ad878cc2c2cffa87c592cad99c1bf1f5a176e880f529bb50c4947cbf08bfd07a8867226328479cfd5bdaff90451af3517a6b0f86f88dc485c4ec WHIRLPOOL ec83b5613e9f8fbce3ee4910cf7deaa823b1c004fb00f6a7d0186688da1cacfeadb8451c65fb0a80773b2dbcefc79656305f83d2231affd8519d080142f8fc1b
-MISC metadata.xml 355 SHA256 7427185079b3a19989f338f86144b9ad497c16cb2437d8bc7912868806d61a63 SHA512 b796683171fef1220a24ec5e3bf9df82ab0cecb9817f2f03b2823dd4c20a2871ac4f0d49858dc003946650b7ae96a1f2bf661e27fd33ea73fea7bf7d454183b2 WHIRLPOOL 629416b482097fb8c319f03c7d76e1ff1ee817985ad7881e0e6a7f44d810bd58acf323fbf12d5e4d0b5f83490649744beedc077b4b2b470e4b7d9e9ce3496fcf
+MISC metadata.xml 434 SHA256 eadc5a22795924c41d7597a0e6fef43446a7ca1e2871ebccc4b8fb6989e87aa1 SHA512 5089313aec4579567fd4d241cc3eaf0f2041315ac76a1fa2bd3b4aa74f0f23add1bec1237716bc5d870f1d6a7e51089637391f8a5ff1ccd3921a8cee56cd1474 WHIRLPOOL 56e6b4dd5f23be7da0d7744804c1433c228a21e745b1970096518a6f286d6b8c3649361f5aec8d94ac95f75a063ef52cf2f612db0fab3c6c2c0c5ae848f1c351
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJVHu4yAAoJEOeBhlrCAAWGQyMH/0pgguDc4hslH6vwkfRWNNUi
-pFkJJEtvQQ6C6O16i57qYwPNrzvh7G6PRN4itpCY0cEA1togW8NzrlfQG44HnJZd
-tvJnnB8NkAGU5O4HEpzJHxbm7GmSwQf4YkvtZaUxkjzgIkZS390pqflIH2xQ9jwo
-/oSZR4RRBR6weg0CZs/5luV8ijBHjfDBWx5OU/h0rMxyjqp+ZTFgoo8PM+xP5yWi
-w1q7PhkcyJN4ttgTwVQrX6SATZSjsWA/cMlD3GNdQ8q5zzgWmF9Y1m2TU74YRcD2
-Wmm1EWTS9Um38IXysp+j5U/VyuwLww5gjTZjRIlA84KnHoVNi+FyhDTrf/DDuN4=
-=Rh+T
+iQJ8BAEBCgBmBQJVfyiPXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiaNgP+gNjAin3JfN8yBRY2mUI04Tr
+TpPpToZEqVmyND+06Q4HzQGTKuvgvnoCR3xmDZdXKFyJBnVRYubnS5A2EIsstRwG
+zuRGmHer67crWCE+OYgC2TQ4JfKU0/6BcVvJJyfKKstvl5x9M7/Y1MVH3LKQ9Dly
+BhjQFUqx4u/KeGRqbvH8kexLvTR1qQzllMZRQ6tpc2qW+W5WdkOL3ECvQS69UVs0
+elldVZCJuRQTK4WxqfeGmf4xpaAfWiTbOpBr0x2v5rtX/45KKBDWP1mPY5cKDYqE
+KKVkKQ5/py8iJMEmZqHmt9YoSSL5DhvgT7sJBqQCjjjPKAa7np9EEpDPF5KAzbEg
+0h0Rm4lkMRRYOKjxr3TmCQhsZdavhYrYoq2gbML2PAfVx9Yt5VPw3BRsaCUtFi5T
+L3IJIEjRGgyKD3EwAtdQnpS6xybj2vE/A/9pNkny2q8GZ6x8OAZPlGn+2c+47ulE
+cRrQHMigign1xyAUG+P8yJiOiLKv/UJWtCJLu5ZQFIdXK2yFsXwbNnCHM8L89Bn0
+RccqeyOuy/93fzBMNOixWnXUkRp0KXYdESNwuauQhfYsqDT/DC8bgqCxEfBigEk2
+9zwF5aDNTIa7w+utlNOzVqpyb0aGU5LS6gnWHK1qOHPhhBQYuVPSga7qe8E+yFg3
+sizszc6T2FDMS8mxf/Gt
+=Q0Jp
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/byfl/metadata.xml b/sys-devel/byfl/metadata.xml
index de52c07c79f7..38efabe7241d 100644
--- a/sys-devel/byfl/metadata.xml
+++ b/sys-devel/byfl/metadata.xml
@@ -6,6 +6,9 @@
 		<name>Christoph Junghans</name>
 	</maintainer>
 	<use>
-		<flag name='dragonegg'>Add support for non C languages through <pkg>sys-devel/dragonegg</pkg></flag>
+		<flag name="dragonegg">Add support for non C languages through <pkg>sys-devel/dragonegg</pkg></flag>
 	</use>
+	<upstream>
+		<remote-id type="github">losalamos/Byfl</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-devel/flex/Manifest b/sys-devel/flex/Manifest
index 62c23143ed20..15c9e505380f 100644
--- a/sys-devel/flex/Manifest
+++ b/sys-devel/flex/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX flex-2.5.33-pic.patch 531 SHA256 c37bc0a3da23cd523a115971dfdda08b524107e4a67ef507887b0c4eb9fd565e SHA512 0921dcec0208c861ab74fc497c139c0253c8014b71544388c13ed24a8e297ac093de593768c69904535d654110c45cd83ffa2d8d821eb13fb08ed94bf7077e11 WHIRLPOOL d6484c20e394ce1c403afdbfda2382115435879c5f90b81b0ffc496567138c317af87f01367eed85a55a3ec6e5b9daab2074e8ad9b6f7f716602539ac4346678
 AUX flex-2.5.34-isatty.patch 1221 SHA256 7b3e8e51dfb91de195eb750f610516cbc9a9b842334a79ace6a6acef45b457db SHA512 efcc73d6f2f07555eb8de062d87a64f462e2c42c401cbb8742b404fb305c248925af9d29c12633d7352cd33ebed899040f89418dde0e021a1d5b0da94bfdb631 WHIRLPOOL a01a174dffc60a58ff840e198daa181156def72244d8a5c2cbfb748496a02d70398fa73ef9c15b86cf7c19d57054507381ef89ed1c20427a46dfc81d8f90b778
@@ -19,21 +19,23 @@ EBUILD flex-2.5.38-r1.ebuild 1298 SHA256 7000f4dc8554dcbf24b7c86607c22751ac64877
 EBUILD flex-2.5.39-r1.ebuild 1758 SHA256 d49a2a114387ae89735b545c6053baec3b4bd576717d910090d1de5efde170fa SHA512 d4f83c124c7fd5f59a23eaccf92107f86c1102443b3454bd1b7c765ad92bb9c959c1ed7ab54707fa66690be595f05a6c3811e8691fc4c9c981a990e093211b63 WHIRLPOOL f52148bcd6cc09c9945c97ca31ecfafc31656faccbedaa7f7261fb932ef52ad70fe355fcebade0bc7a66fe480495fee99bb9dd6eb474405334a8c96aba99dd40
 EBUILD flex-2.5.39.ebuild 1298 SHA256 6d3d9e8cbbfe3ed332048d426e294992cc57b11ea0a4d47e6cb3b43852a0603a SHA512 a5b2ae8c8d7ce9264a02e11e979e9036a45747eebb5e2e12c8a932a56405313ed6403b76a124b42748a76b41752e421999d4a38003aafee03501dd3b81ea811a WHIRLPOOL 6d4286c28626313d1d8f2125a39f1ce7caefda1596ebaf183798ddc1ac15294f7f81ca694c1630f760bcbf433f2fd9b422572731291f9af9c0bea2ae59474b13
 MISC ChangeLog 14123 SHA256 559935be9fec248b903e470b5e311f39e4e44790aad69495b78410e469604fc1 SHA512 673d316fb9a79bb40b7e241a2653009fecccabcefb7c159b078a31c4b8eac8755c8e404bdeeb3f4d871e6cef63faf7ece9e2b8625331a06f4c618349cf1102bd WHIRLPOOL f12d6b587e8cd44f7b17741da51db8213128f9a9a562d19aab872dba2b20e54e2ebcf35b74b0e195e1faf884c1abca0bc584bce66fceb14049d53606f691bce7
-MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
+MISC metadata.xml 239 SHA256 9191a32b60f7cf9040766522774187dc01f29b73989f2314b8f2303e7b086426 SHA512 f0992b9e4940a1e6ecb8bdc57d58e7804d5c6cf52b747dbb481da3e9766ef4b105f69d0eca27da8a71665237c81e64eee09fdd3c73f02b78af8c18a1e23f92b8 WHIRLPOOL 51905e13379584f65fac5ecdc499831d8c5b64ddfd193ec2887755db6631c68943d4ab58c99fa93765c343026ff75964b6aa9ea5bd0c478f711e86469a241d8c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJUTaOEAAoJEPGu1DbS6WIAOi0P/jHzd1vtD9KjU/IRYz6+Gku4
-LTmtCaK5Ed8yhb78UkYUP3OCOBxqP/fdOKA730vROT8HYvfMMWfP9QzF0mc0Q0Z9
-Kc42QlgcmDPfjGfXYC94LFnk/6pOvTrECgKOHw1Vl80cqfGcxaAMONaCpWuHwJOy
-n35KE+2VxafCeNuDaWPJCVCFY0iG5oZ0ATu7Y8n015kErKKb5jI7Lz9cLjgdtqx3
-mLbdWAUBe3Ecv65IAsrZBJhtJpEPh+2tQK22Gl9C3Tb7dC5Avd5MXIfoopOnZ7Rg
-eZdzuVXbVt4hvznZXjuwXARRUo0hSLk8Zlib5Z1sa7+cZ+HWS9WoyYSiFcXKg/L2
-c+XscLhzp/4gjunlkoIpcT31dMYX++sFod/JgErNfHQJwt4JUtF0RoEw2iik6rdS
-REXVVSwANtv4FOuQ54hXu1+E6DCB2wRr7iRuCBjUg0DXTeRhjNyRqhewrB7eSQDE
-Pu8XyKa/pcltzQesCSNkWaBLqET85ZKxOqFZTVgw315ZgBIapENNIIfl41rSMHJw
-KrjhOnDeB02jxy4KbPT0IPUZCQ3XqgfME8zWaLrVYJQFFAU0npnJI1XTgYtBhZ/9
-UJIwkAkDnEdcuU5is9TeFr4AcfVgRo8v6SUuJgM4DtnUJzTQETj4or4BIdEPARic
-VbO8rsazqvECmOdaoqJO
-=2I4+
+iQJ8BAEBCgBmBQJVfyigXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmirCEP/RtpmneAa3xoCuam81lnGm5f
+3qhe5Y8sAxEk/5tIWb+hn9CY1TOLy8zxWftRg9CkFMdamiK2R/HHEtwMobHKgFXQ
+LrPgjz6j8pdv+Tkm6ySGMuOwHtXaqovc4HET9S7aT/jecJReU3yDBR5yQj2HEK3T
+utzReXqzLHF2i4fxP8NALW8WgH8QIuvuM/xu84rIh32ACQxpRmxEygaW3l+N7RmW
+8Lj8GO6b/sP4ERLEQcN1FG2GIFXmRTXUt1ag5M2vGj95eEY1+nPgIAupelgaEHTL
+7M0kup7t+TLVeI7bydbcHkO0d4jkzvl3fYIthCcUJ8bVIjijot3k4GyykKzAHSZB
+ppWl1WBJcPMgdD6SCKaqORXx0K1ZyxgtQd2Nz8fW3OSf1JNj0KwUoQeAjLngPNGx
+gRyv1YRfkADOd/FKF/jomAyLs3aLAkvPmiwrekqmwqI3RWicqijzisWq3nawq0un
+c16QHu4LCZdUwRdtrBGF7TNbsejqQtWVkWe02ad+m3WL/JZz/5oHQuJMrQwqjzYt
+tMcfaQqXTN0dVBgCBSpqHm94Lj/Lo34KGmt6n9i/Ushx+YB6R1nlf9bOSR5plAZ9
+A5hBOa7xTJ3gvn6JAwtePeAxcacQ4JsGxsyY4x91xd8dgYrDXtVRbH4V3d0jCqje
+Dey8kDDSgGRtwUe1TFHu
+=0A0Z
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/flex/metadata.xml b/sys-devel/flex/metadata.xml
index 96a2d586367d..00f4c58c1f89 100644
--- a/sys-devel/flex/metadata.xml
+++ b/sys-devel/flex/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">flex</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-devel/icecream/Manifest b/sys-devel/icecream/Manifest
index dfc59d2dab31..6f768df9822f 100644
--- a/sys-devel/icecream/Manifest
+++ b/sys-devel/icecream/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 0.9.6-crosscompile.patch 471 SHA256 b0d4f69301cac95f5e3a7a3a91b5470769144e0deb33cb1504b70ad29b8cb783 SHA512 5c33cd6a1aae9b628e6308a4438355298ee0b4217d8561aaee9960c816aa336aa62eb2e5844f8cf756bbf3731fda4c07ac4c1bf30b2ef93c45205dcfbe8a7ae4 WHIRLPOOL e3bcf73125e91ca9d5d0e1a8b314d042734ae89cf4d2f77bd44821ea6fa665dd344af9049eb88a3c0f593e71f22ebef6a5ccc8a42fda08a25d8e15c82799993f
 AUX 0.9.6-symlinks.patch 614 SHA256 4100330fb48453abe7facecff4eb199e5285093df49d082e14050a4c30cb2dfb SHA512 739a683cb9142fb2ee52ec73194de03dac8815103fbd7a102cebabefd649c8ddfe6121649727de2785a525493a5f244352aa5a18796361014e6fe6fcbfe92321 WHIRLPOOL aab994500630cfe1b498ab3f870c45ae1a9745e3472c9d0ee9b50f42cb08312754768a62ee035d913853e0cfe7ce05c9c90772df238e68b6a91a2d4ab1e67ed6
@@ -17,21 +17,23 @@ DIST icecc-1.0.0.tar.bz2 485534 SHA256 c2897fac52711b8442ec40403c874bc50a1018413
 EBUILD icecream-0.9.7-r1.ebuild 2827 SHA256 b88511bd637d17e0bf3c99324bf3ecfebfc9c1602874e97d6a5409c42f1044c8 SHA512 25887c8c43da612e962b61af8b4cbf859583934230d2e216b770dd72e18ec0e6ea5766f21d6a983cabf86ba6f3fc8b78d6d61a059947d50c6b3ebfb1adf9c289 WHIRLPOOL 5dd6a5b78c81f98a697d1192f613fa4474ad5a900da89ffbbf9fd1ef30e304dd08ac15c5729bc779d267432429781be488fa176f9b7b86b3f953ad952aa5ff27
 EBUILD icecream-1.0.0-r1.ebuild 1143 SHA256 07f5f034a48e06f91f78125e5c17c2e7b74cb42da872707b4d86114a38fce752 SHA512 19db9bf32df8feafefa92f294fb20499726469db0b2568d5000d0d5dab785518f9a19a03eb941b9cfdbb2c9473b787ff2c74a4e9886609654c01afe023a17599 WHIRLPOOL 0a22037428d433605011c9b851fdab6e606a9457d269bfbbf05322f4959bda1c62772ede1132e48b26050b83163367f766ea4c5eb88e61fc5b89ae21574e1501
 MISC ChangeLog 9891 SHA256 1dba523aa0d2853a582f1619aee32dbd7d5444093f2716c43567dc3d67eacb40 SHA512 6bb513845fb4f0d54361925c370c7f555bda3664d6d879d3ece49c1d2f8dc10fbc7e833b0f216de42b08a8152a8462563fb03c48c16e5656e8b692a75bf7cff8 WHIRLPOOL 91305ba08daf7571c5ffd2e45b87f0beaa8568c238fc4381c0e12675b91bb75f288940e4264722eb8a3f4f2703b16fd98c21b5eaa07f9943c85189261d241eb6
-MISC metadata.xml 178 SHA256 613b9c271377b46c41653afc4671eb277ba48e03b2bbfe36a8e88afdee00deed SHA512 315c5565d8b476112f3c19d5520800400ee46edd330de2f784bf5eae1f25d0716e3a1282dbd4c1f09f5ba52ff30d3cbf3f6ce153f2192e633eca7f089e73b691 WHIRLPOOL e08dfc27ce4623680136bf86364292a864a38c53d2c2920bdc26f06487de638b20ca1742630faa548aac3a7323aa16f8c0872f94ba6b1e155df1aa90cc85fa66
+MISC metadata.xml 259 SHA256 2b1369029a0cc6a498e37816cc39dec18eed27b7ad6dab162520122507d140fe SHA512 e6e44e05b5e27d627875caab50d6d209d1ce5d36a50d1abe35c742de0a7ecad936df65d1e1f04b952bae5a1a09747a4c0d0dec94758f455bea67544442e63813 WHIRLPOOL 954066b73e5383d98d98a576a18970686fc242bb025e2b05b75a9ec645c6b687013049d4a13b89ab5e312736a56609b81e958f6fd63ed79a47aae988744f9fc7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJRanaFAAoJEOSiRoyO7jvoD40P/2sZN1632yLTbRDZ8eYgK2Rw
-layiyO9goWx1/foxdi0XV1K9uX7yAF6itZWWeV6uAyIYYq7szmus8UyqxgJVLeku
-LFLc/a6nYL4Xp+lDGWvhZ/b/g+dMA963NbkS/2S9E2hgQ+sm30Z7dlbJu8bqfdvR
-2bGGkDIZa+aK04j9cIVWJbO/MItBJmlkuYtBVkl57Qlt5dJwBkRrPePILqJ5fbA4
-zLthIJ/EqxGOt0QD0tdfpWOz/NpqcDnPNo7nfqx9zNXcmJ4Yz1H5av07S1BzfzRy
-sinTxMMq4JntwKJjSrBAKSrCL1W60eJc/Bi8LiEReSZZKARflyaoQbbXh/by+1TE
-EWEvD0OqYlTntw7Qf1O74CiDKqvpvXWPiPnUbu4igg+nALRJnJ/2OzmnbGMLq3Mq
-hLNP/1v85TzXxCNdaHnoD3SUb+jeyRFt6mQ+pQuk8UDad+cRICIHZyTdMcWdAFF/
-MKMdKSAjgTgBqLmcCO19BohDk6ohccq0HgaOpAoArVcWAJOOYgFxqdMsTr6FJ82R
-Vez+BC0P9T7J2vFDM31+RE7O/K51gbDhtX0afYIiuhla2SYA//ULJFOWGLYP2uYY
-C7GxH+0+c0WeigO/OJs8n3ziilh+8pYoXpEv0MughJTSyu7NPDkfpzENai8GyK1G
-AQJYssPIvij4gjlWAU0z
-=P7Gn
+iQJ8BAEBCgBmBQJVfyitXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmitcMP/RAYIO3yLSYqDLOWDLjJ90Rr
+qDzEF48QX3YpaOIAoVWIAEIiMyinkE4zYXW1LCQ3Xv34WM9OcBPi/geQoxqrZ8dN
+ZflvYRzj+hUEsuYn01l4k3sc1xEr1Gnp4iiamNMiNnA46S6WhE56qqGch/fePNSw
+z4JlVGcHkp8E7z7yifFBCH22x3Z+tUwnIIGL4XCemwxcj73CK+Zr/sB87J/WsiRL
+Z40uMlLhZFmkKLBr7mkFXtdyADog6nWv9RFfxTJylL5HN6b8zjD0e3NdM8BXYcK7
+REFKh3aJBcMS79eMwhxzmmF6/Ib0BOlwO6lN1qxhsywMvsUZKDVX54aNj/AC+lL9
+6vdCEcpIujy7FfLqtMWxZE6xxJkdefXUBiSwZ3s1waJfX580/WsPgHwHcgPndOnP
+5sh58kTFlUApeXH4LqTDxzCC5dN1uew4tcj2Wzew3WQbpofjZeu8R5ELa2fMrp1m
+cbIoU1OdEqTLZjDhT5zDzMlIJwO01NfyCdt/hiKyCRzOaLu+eFG0kW4PCxSxgsRh
+ods5+tvmBihM+dXetIulqzyE3a2zZUoDq/ac+dLCwxXTrUmcNfPLL5GlsL1gPyXA
+oKaTgg53CYWOmwMFhoVKmpcfKPPB8+SDQAfYnbkehwuy3ML+t8wwQ3jHUUAOEUyB
+4xFSmUXb8SkQx2AKxch2
+=9Kf/
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/icecream/metadata.xml b/sys-devel/icecream/metadata.xml
index e09a4ea6ca94..64c49c8ac03e 100644
--- a/sys-devel/icecream/metadata.xml
+++ b/sys-devel/icecream/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cluster</herd>
-<herd>suse</herd>
+	<herd>cluster</herd>
+	<herd>suse</herd>
+	<upstream>
+		<remote-id type="github">icecc/icecream</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-devel/parity/Manifest b/sys-devel/parity/Manifest
index 8fcb3afc92a9..9562325c27bc 100644
--- a/sys-devel/parity/Manifest
+++ b/sys-devel/parity/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX parity-1.2.6-debugging.patch 431 SHA256 dc502d3650a887807afb52474fc682003d9c28afb1f6bdf91a66226884ef2a43 SHA512 da62fc499c5d9e25c3373d8f3529c8dfb0c26bfb08bba851b144d4f2f0b98e29fcf2d1e11022d10412b67afad84e70bcd5456842f4beccaaeab1bf1091e9ddb9 WHIRLPOOL b0cb5fe0e187521e3f6d503e8ffbac4238f7003119b1ff5e2e35a982e88d4dc25965b46dd050962a9ea205593353ba3b9d01d2cadf5d2f42d1a80374ac2410ca
 DIST parity-1.2.4.tar.gz 456408 SHA256 13d781a5f606244f53d980bdb362f30bbdb67d29e8d93075c893fc7ee13fc496
@@ -10,11 +10,23 @@ EBUILD parity-1.2.5.ebuild 1967 SHA256 b55f4db8629d3475a5bc6f8f5d5ad5593d18bf8d2
 EBUILD parity-1.2.6.ebuild 2038 SHA256 decb759171c2a97d1755fddbde92d27576b91c85241b41808703b1d2997115a6 SHA512 505c1146d4dff1f029a7493c4210a20b38c773f3ad39d1c866e185f414d679734abebb848bee928ae6fc1b06970eb7118e9ddb95c2b29f273688c82ba53e98fb WHIRLPOOL 883bd3891a3391440fa18e54cfa1649d0629ae9abcfa254dffcdf3dce3ad429776e4c4bd85f510ba54da6abed0da856af54b0fbdd308ad73d5260d4578b8f472
 EBUILD parity-9999.ebuild 1955 SHA256 e9647b501121a830b5aa5516b1a9837cc22c439f1806b2e975f225cb357cdf40 SHA512 e24868083b15bf067aa0383a85c45ec14e64aca8fcd8eff0fa07e813fcf601e18d838aa7fcbe61da2031346b64faf938409a6b5b9cb46d06616b74942168f049 WHIRLPOOL 72a037bf3e3582a1368a1c020f60512c3a88ddfe4e1eea35e6772eb6f34c00a400f186e13fd3dbc37e528cf7587e1eb0027d2b1e7f026ef183aa5970c9959494
 MISC ChangeLog 4528 SHA256 a982a82513eaf4b84253bdf1c33310e7d382a28c96cf3582dd3beabc0d652f2f SHA512 ac131d0bfdd116ad4d9375c307c1f9e112cdc1dbb543abc07dced49e6fc4ab40f7260ec0b8aedb8b5be0dc6eb778c5edcee94625ad523f43a1d642d02f0d676b WHIRLPOOL 0eeb0e1875fde614cbcf4005acefaeb9b18839140a4ebd6d6d6d73da25bbbb53b9354b2725764bdbb6e9d7b8695b11d9e6ff67684b1a8cfe088c431d8bd70cca
-MISC metadata.xml 236 SHA256 dc5d81d600a4364b2d652c79f9975ea82f403041c89434d0f6d2d73461808b0e SHA512 1e491c0ae6c6ca0825013e432bf357b071b12812f3773315a5d906a98ddcfc855c0eff2637c37890d500df12055c2f99d3c1a8272d5571c56ef8f6f5ff5d2624 WHIRLPOOL 53caa5474a7fe1531431c6cfc9e2df7c43ab3ae7ed54fd992c44e16e7159b457644b61b491ad454cca4ac904850b0cb0c77f03c81c835dce86e3437e20e7c491
+MISC metadata.xml 315 SHA256 c7439e976d5fe42a01002343d08af00447f638010893b9a6470c2ac5c8602914 SHA512 17735ac9ec04dbc7d945281c01ba77323229d05f87221978bd1f86d2102539224c1bb7150aa8b084933470ff1d164ad81132e8d95377e7dadd085ecce769ecac WHIRLPOOL e8d481a118d63368ecaf0e4456a54eb857ebe8c4f13432db1472f2973d75cff42104b32c4ad7372a30d939355ebd0cf20f41efee6688acd7e6ffe62352e4567a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlS+J8wACgkQCaWpQKGI+9R+8gCggCCWY1EqWs2Pk6ZZC4bI6gfN
-UycAn2zQjTY5ZAZtGVox1e7HltpXvs7B
-=jy5F
+iQJ8BAEBCgBmBQJVfyiyXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmipioQAI/4+BxJYY9FF3fy/ORLyorm
+BtN5IU+1huGibRky1eTuA5VsDRGsZZlmdBm0M9vb6N//DuYHdM8wD3wZ0A264qJA
+hNC77ScSlLVnzA3AzaOhNZ41LIV9bgDdAwqWx3wovr+mAZpZBYVOR8xnVJER1pby
+LFUwnK8fAs3CVE7meXb2/ZXg6WdTwBoAmP1ivrWQs9NVc73RTYhUduLvg2lBbBUp
+ZUyXhhW1SIHi/hn3gUjL8mGI/66TrWDJJ3e6p8ZeZGfYWcKcVCH09c+W/+rl5qE5
+FRg+r4vdFPqRv5FAQ+E75UlY+Rj2V0Ehf8gwg4dEzR+OjZMiD40AjiYMiKRZ6A74
+uJ/HlGYUyoewIg5am1qlhhLrE/HR3a9l071bwNlvix2VoTkXJuYxzMAQm/ETkquM
+sKCFZJzO5fcQmPL8+GP/lE73KRz6YtHHIyAUT60LJYzNcN66aJM98ThkcPy73lyx
+MEPVrwCgyth9lwKG58uHQ6Q2wPuxBaLdYWTBOJTwFoB9TMEODuRLl3MN2T3VUP9u
+kNU+cUWOv3TeJK605iBlt9chvWF7Yl7zpTYA2IUlfO5YxcNqtF25R4ygkgA8NgGv
+X2Er/Vhybuvk0gxi6hF5nv1UlEyJJA5DAtAKb0c4Tq68MUo7fw3tPP+DViDyPn7T
+VDPsOfAezsayQlvR1rHy
+=Rvcd
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/parity/metadata.xml b/sys-devel/parity/metadata.xml
index 801a8b44d732..8aa8bfe87304 100644
--- a/sys-devel/parity/metadata.xml
+++ b/sys-devel/parity/metadata.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-	<email>haubi@gentoo.org</email>
-	<name>Michael Haubenwallner</name>
-</maintainer>
+	<maintainer>
+		<email>haubi@gentoo.org</email>
+		<name>Michael Haubenwallner</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">parity</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/sys-devel/remake/Manifest b/sys-devel/remake/Manifest
index 19785c04157c..a1fabafc5b1f 100644
--- a/sys-devel/remake/Manifest
+++ b/sys-devel/remake/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST remake-3.81+dbg-0.2.tar.bz2 1311308 SHA256 c7600bd96084e7fdfd667d50e889b652bf69f933799ac207def021a1820c5097
 DIST remake-3.81+dbg-0.3.tar.bz2 1078924 SHA256 55647ac9d23ca6f634c77eeefacbb45dd0e16cac50b402d3b35f0d44e71745a3 SHA512 a86ed989ed6c616da0a9850560b88c1a2f8ac277fa4c8abdb2a40543cf63c3180810d5c6a822d7dd6988a53cd36eef18d857e4958787fca2ed616d14186c36b1 WHIRLPOOL 79461f07dcbbfe7178b96f10bf6513c4c53a38c417e0119dfdc25ecd2539ebd3fd6ecd3aa8affaa0b2cf74e3416334fa23871fc738e4cb1dfaf09729be704db2
@@ -10,11 +10,23 @@ EBUILD remake-3.81.0.3.ebuild 743 SHA256 e8c8f9634e8fd8b41d9a723814681649f24d9f7
 EBUILD remake-3.82.0.4.ebuild 792 SHA256 0ea7fe60664537361efafb9f9ccee4331ad8614437818ae40130b5ca122bc7b6 SHA512 67fb4b56b034f8cc0533e5ce2371844b2865c77482563cd0b10a77955b38081c24730d3c1f4d5dcc7e9ed7cc7dd12e06e6dd51e8a5f79d023041e45fe8f2af1f WHIRLPOOL cb49a807a5555b6df1ba286b016af9cf59ccb2918bfbc68e813d07b07ca5b8c4fb2ac9706bb8e108feb3baf5fff5adcf090526118c85f13d47497242665241da
 EBUILD remake-3.82.0.9.ebuild 738 SHA256 d2e18249e2e3f56394c390c9204c1fd8cf4e397b7abb3e3ff14cc7aab405ce05 SHA512 c07365408854c318ce0d4a9b82ce61c67b5df0a10d68fa80e8393eceab8fd360f791b2d41e0297af5415eb105e9e59c98db684eac0dfa20c3c1862475533b985 WHIRLPOOL 733211964992037ff7349ad98b0dcf1f87455ed54d5b2b552ef5179447ea54508b0cdd69bcabe888aa2ec1470ccf88fef405bada52c37996f5bbc42208dc7241
 MISC ChangeLog 2016 SHA256 1b6d43605d525feec809b4f973eb0188d75f5cd1c09f3cc995bfb6e336510700 SHA512 06e9cc1f040720c75069718c0f468c2ebee45a5677833e6790fdc088a9ed801d3c40b9ccfdb4087b3720cf93d11be3af8a8ab6812f6244d706007932839a22a5 WHIRLPOOL 9ab1670c9dd883f86f4d7ebb5217a31e8252136fbfcda1259b3203243c9e97de4670c4b308742939843991c8fd05e33784ef6fe8d625aef9287b10bd64d7035f
-MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
+MISC metadata.xml 241 SHA256 cca2518b36ce3662b07e77980a463683df14fdd35e19a569e00edaa77c3cc01c SHA512 c6271b7bf4e98c027ff31e5dcdfad38db886f627de0e7b2a93b4e334d530bab8a4689a83b02f54cce2f3bdc5a7b89b6b84726a04744620095b22ff5f9e11a0aa WHIRLPOOL a7fa5165d0e23e629342443e3d1b4dcafb286445b911561f0244f775f4f6f2c72e5fef36d18f04959a955dbce824065f81b0b9a17455462e9922f3218975337c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlGzV7AACgkQVWmRsqeSphPQ1wCeNpNN7pVgGpjrqDH9gsDaseGJ
-7msAnjsGOnmHZnEtw6W1aH8drpLgqqPo
-=rstP
+iQJ8BAEBCgBmBQJVfyi+XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiP1AQAI6gV/afxEFt3OUns2E8+VMr
+LEn0OTDH97GfKF3pzIPPU11HOm7rr4/Kb4C4jBnYIz78kW/VYeLDs6w4lpAhJjxJ
+zrBBTkSzYFjxdX874YHf/rQk6+3WKzEG7x7DtsZgMdVZLwfhcFDoAHfcc3ItBvtW
+VtvSEpoPuN2Bs+z01sil2c1ptqMlkjRXuHX/JdaF+4mPlkeS9xJve/0YoKEKo1Y9
+Fw2k0EhXBsgjyJ4dpOuD1hHfUf9ba8l3f8NpACIXCe2fnUV54UWiV4ybZaM+VTh7
+tmZuMJ6+amDJPMU+jCmNo6rnYDXxkkptu/Myc0MZTKJ/1H4ZyXkvdIql3wTwLyDh
+rrbQ4v2GeNv8cdiNOsxpr0OzhBzo+YMVp2xC9/NR9anFsJZkzq6Ldrgs/XHtUEJN
+E+ME/UHYno7dbb2czippwRIhYsyw12k6Jp/2FRpnIKkfB7MGVtpYuV6M+k2O0iTl
+YOAEK7vfxQ1ZVCs006iuAj04S9n5qsJ5POhgQjr8eV6/uxXXfBS2B6anw3RLrtYP
+eMpmqQ82DZrx5Ouhkz3SqBEnqZ0pMM6UNp0Ur7ZMaXmxbPS5KxgBGEwJwaPIL0Dy
+SRfaG9B4uqkuWBPpi/oWqH807oayNmJafhPKqAyXIQYjohuTaco5dsE1jWvh8S/i
+1MuBClsc/G9FAKd4Qd9n
+=Z8aZ
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/remake/metadata.xml b/sys-devel/remake/metadata.xml
index 96a2d586367d..cd565ccf05d4 100644
--- a/sys-devel/remake/metadata.xml
+++ b/sys-devel/remake/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">bashdb</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-devel/systemd-m4/Manifest b/sys-devel/systemd-m4/Manifest
index 3af423a2eb28..2e9c7935b11f 100644
--- a/sys-devel/systemd-m4/Manifest
+++ b/sys-devel/systemd-m4/Manifest
@@ -1,25 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 EBUILD systemd-m4-9999.ebuild 645 SHA256 2bc9efbdfdd1fba9a96a55ce54c42b63c0d1b2a4144e27eb79d975bc8ce7a3d4 SHA512 ba8d15fb731956141e79e1d50e901df0d4e772928bdc2ff91a72bd0b40b664d5eeeff00db5d3ad4eaa649496aed8618a6fac332331883ce4579d0655862f0c75 WHIRLPOOL 5076cdc9faafd101f82195906af77ff06cec821faa036d4f8ad478b9974b8c8a112cba1a23082b362252b7bd04be40e77ff539fdb410ad48d131d35b2ba3d3ff
 MISC ChangeLog 713 SHA256 fc5f589c7b600b8579929e2935aae3a473b9d968b8b0cb45e36213a448869391 SHA512 f3b5db7ae3d009e1928d62c6d4ac0868dc5807adc03e1b82bf5802e4f8ad09aaf4849ea34c974a5c593751780061d60a331e687926bb8b2450199e076b727226 WHIRLPOOL d668b0ce033daa47d0daeb601eb08e1b0f8f970b3d89abeee9df31dcb597ef2025e685a23ba223c370c55f4929e5d5bcce53f251e52cceb29d12b5270b1dfb1f
-MISC metadata.xml 441 SHA256 78fc9a84fda6aacf792fa81823dac2af358748a938af3cb29172d54b2f9fd533 SHA512 f4a4799ba60c10c8a46d74d408116ec93999125d06e08b6544609c0ffc6d98d666b6bf11b9af5fc6b2f53b6551ee734eb9a10f87daf3b4c5046b1cc9b9f9bc54 WHIRLPOOL 82b9bdcfbf884e24b206039982eeafd03901a6e17b2bf007d96ec6fd1ac0b49a15d96c5247dfd8f07b10002ffb12691be412d1b613d3bdab405bc548e75fa720
+MISC metadata.xml 501 SHA256 9fe44d9864dcc01a7ebd2f343c817c2389dbbab34f208d3c2f9bc76afab1ac5b SHA512 1a9c19f40c0909fd59f82a55f26c5e037be526cadbe726b6398a681b2b086487e8fcd07321044d1eba3c6e7857558d4924953c99a695c5ec50f8af0bb7fb1672 WHIRLPOOL db62d417aa041d6287c241adc02d539edd03fe56ffbedae401be470702bfe355eb7fdd89f0e7138f041ebb2a732d7c9c679448f07de6938d8f153728082ed8f2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVUR5FXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOZYMQALtpuVW1vQgXAMUZ7boSTdsY
-ysQMjVWZYxmYu2w8jYCBYldXGBVpeEisS30bt9tVrhG8/U2SlpMAk52/vUPOU5ST
-z40omAekwfKB5n20www514L3ZODHbksulp3nZLptirt4l6HeFZuwFRX03nkaS18e
-O/JQHfRNdzWVjljbu0tE8I1uMC1taeP0fVJ2lGh1JaYd/dxOXzuUKnBTCUQxHtV+
-FeV6kz4vsP5sKaooXg8PJLPAA1Ol7yphzssxYudWgSZ5udL2Nmg8quc5XzMmArhv
-+eMCIIyJ6JMjQSM6TAteeRcVkD8x4QiVYaCNSfbjDbeAFKFoFLaZIb/o5AIgT14E
-g9QLakOqLLqA74SIX1g+089ZQtdJuTCZ73bceiBXGF7bsPBB41RfA9H5QTYR1k58
-F9lCieUM+QBXeNehjI9YA9hUV17aPh7nOGRSaTa98UJcRT/cc8g4qa5Wov9dB1je
-unhqyZ7zUy9EDnoS99rdNvEYztvAzEpfK3VJ14Qm60NqhZSUodjgoOlNT4VKi48Z
-dXdy2I2yT3nxrKMLZ/wSZO05hr1zMbX7AJ3oO0DZ09uBbfB4o9lJYtxXakfceMmT
-uvgsvu0K31dR61XQsKw4y3yraYJeY8mikS6xwlkgZzyAwj6YzLLEBSK93/z3GMMb
-IFZQTT1eP2GWGnKVKEwT
-=ZYhU
+iQJ8BAEBCgBmBQJVfyjCXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiDNgQAK7oNjv2ghsZXPH+SNKFR03F
+xPMWIF78dXV0YuOyVBjGiJfDh/WzwxrmdzCJuJEiz3i3VRo6lGBv/JdIWU9N0ai0
+vxXfPn0/ePDfbP/cFq0VRzHUz7dduX2UvIK04lr/WHC/oWos8F2k2g7H3Dg8wjZy
+i5uYVLW8bfD/W+CEiCLC74MH3mzIcJWduv5oL3QeaTTYKm6Tb29Zi6Ks0T67S34O
+V+KP6SxoueWMYD60OSnPwBX+sgD5I682YEd/44eiia3mxRTMW2HUhMNFwAf7MiCV
+jWQE+HuEfK7/E3a9bTd91YPQp8BxtJzCtxTBNTOjq3whRzaWvuwhPmkFHODoswuB
+28QtceuSKrnIG4/ccycazPHEM78lWJIEAovpc+8mfjF+j+0bL3nwSeNJ01XFre4/
+U8TBiXDuJUVRX8PmsMFVuPFttUD4oCfqefhRjKVd/g/R8oESIhQcLEl3BOYJ6CRn
+4jDZLcv5IrVgsyqkzsov6HUye27N0CXH34c5wl1wiv7062xjKUmoVct0LMsv9Nte
+nU019WU5AjM2BBjA+otOORqUb8Gpxxs8F74blKe4keSdFvdBDz1A18MIsAurlS+B
+7/WiFcU1UbJpBmjOLur5ohpdimSHiitBuTJ45956AtNTvXLGIrMn/fFeeMj7MTnK
+xs4WvDqtOThEkAEORTGG
+=/OY/
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/systemd-m4/metadata.xml b/sys-devel/systemd-m4/metadata.xml
index b97e7145a7bc..1971a4bde18a 100644
--- a/sys-devel/systemd-m4/metadata.xml
+++ b/sys-devel/systemd-m4/metadata.xml
@@ -11,5 +11,6 @@
 			<name>Michał Górny</name>
 		</maintainer>
 		<bugs-to>https://bitbucket.org/mgorny/systemd-m4/issues/</bugs-to>
+		<remote-id type="bitbucket">mgorny/systemd-m4</remote-id>
 	</upstream>
 </pkgmetadata>