Updating remote-id in metadata.xml

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

22 files changed, 245 insertions, 139 deletions

diff --git a/x11-terms/guake/Manifest b/x11-terms/guake/Manifest
index 75935ce8a2fd..a1f7fff06106 100644
--- a/x11-terms/guake/Manifest
+++ b/x11-terms/guake/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX guake-0.7.0-desktop.patch 491 SHA256 74b8e9d7717b116eefdbdeee60496015ee7cb6b831ca3f5ce3775783ada4f566 SHA512 881d550981bbe825f1dd5738f0adc1be4750467d971304878ec776ec9fb8aa9dbbeeddca6823299f0d7f135d3f9b21165e1798df29cd5ba7aad72a9031f5c9c1 WHIRLPOOL 54a85cfc67d17addbc6a2965551d14af315e1c034a1f3930a3c7ada79633320bec0d6107b6ac5f70ee7ece345c1bccf08e65b81caa1f7d5cc62819a50dae6662
 DIST guake-0.5.0.tar.gz 307488 SHA256 08206d0a003f42194a3779094e78d46b116829c258f5261d31d862010dcce0ca SHA512 8de0ad2ae13ca1306fb32cc3d889091fea4c190fcaa8e4068077277e7c851c15f7c52521272e94d663332bf400648a1c94263bdc27b903b1b0524559cdceb5d0 WHIRLPOOL 27f75440f175cd03038b17e86914cf4e5aaa7be2a31df297dd2d2e8446c718d7701b57c26e88297c71b2645331131548b89b069ce6af328777a1d789135fdb2e
@@ -16,11 +16,23 @@ EBUILD guake-0.7.0.ebuild 1055 SHA256 ef3b3ab3133601453cd3e151786a88d795b08989ed
 EBUILD guake-0.7.2.ebuild 1006 SHA256 ed79a349d5672619068259a1d66188cdffca30c03b72b23ad4b17dbb77240ed8 SHA512 41ba9df7f933d59739e3e817a0da286987f4fa802433bcb16bad9b8ef5772a235e77b088776c56b37a09bfa97e34bd75653e654ce330a58cee46d618bc1c2908 WHIRLPOOL cbd5c82a2d80b955a55c842bbb9f99cfb61e5393efa33ee11fd6540ef01c8f27a4956aacaacaf86d6245185c2374f72c7367e2e88535d150e35698f15aa156cc
 EBUILD guake-9999.ebuild 1078 SHA256 4a030a7fd9840d5af4ba6947d6fb34293f0e12f7c947d630af141f742bcaed2c SHA512 2889def2aa262aa3dc3114e0689fa6be75586e3251a721f0af3bcb909bc9bed258ea486caa36b17197c4027d2ea0b1299afa499b0c437d80b23e02755eaae752 WHIRLPOOL 10d0613241c09b6c1e13c8578fcde0770a677aef22c37d4a5c89ed67cac3298e7374be97dd0d2b298cc216dcbeee95b4ab6cb886d2d297695c82970fa3c7b70c
 MISC ChangeLog 5673 SHA256 d68984cd865d8e72a8305c6fea36ae3c344806dda97a6592131c31652b0ba7a3 SHA512 80c7180d0b525843ce2f5ee08fce77f1a75853a9bbd0f54ac77591cea94fbef2fd66d4a53a454273cfa45b31153beb84bd69111dd5fb9d3966f01370b2b96ef6 WHIRLPOOL 1db1a0f75ba05bd233c82be5047a69936090387b38b78caea2ac70dca7b793338ad199a990438912bcaa48134d0a878a9f091dcd5052bc654440dd79a37cd53a
-MISC metadata.xml 167 SHA256 63163ddb9082af2890999b3c825b2d21df911f59611694e0e077e75a12bf7241 SHA512 381c3c70deed443ca617d0535541542579acffb8dde5f577acf789380f0cdec6d395fa6a45483978648fa2d4e9dab13a441ebdc95664f5f414efbcc812705754 WHIRLPOOL f4a9e5a69adee7e8ee1e5e7ba1b4b860c5060a80db845e0c7f12c96ab44a86dc81adb6aff76c5130b4ab2ffe5ea18f0a5afc9d87a61177d99a8fc9f49d7e9d6f
+MISC metadata.xml 247 SHA256 04ce471e701108e8b8b51c579d946839946b06cd735decf8b206bd1322727ea1 SHA512 63bb1b249160bc1a900de3bf8862ead3ec2714669da605703b20b2026b9a5b2936f4ec90d6754402aa2c79ecf86370dcbfe7c87020dae8e4f79d9aacea416e53 WHIRLPOOL cae57ce9558d0390105a500cce178b49e70fc0650aa78098388ff3a209b2dfbad831fbd3cbf9cda5900f9cb9a5ee33a2d35d6bee733e35c0d0e3047b90808da9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlVf9msACgkQVWmRsqeSphNJbQCfcPa2i4scHmmC3sK7Arq6ZrpC
-fKIAn3G5R1jcC3lWVNGTcpPYmEATjyTE
-=MauE
+iQJ8BAEBCgBmBQJVf8QrXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmif6wP/RSIV/fXehY9SrwiWxjc+Fdl
+Ff97mA56qtBH1RIHqcl+oymQ5ceA+82d+fdcO3T9Zpv8voazh/V2oWV4aKerjSKG
+rX7dmZNWiwjS78LLg8ThE30aHM+kEAFBlrqqHDJ0S/1UHYmleSWL/mnoX9J9/M9U
+eKpUs0lvnZWWoxnbxPhYkfLbD7L1cOzhg3THz1fv2sz9jbt+zE6kA0PlQgGpit5R
+YJnsVvo9XVbztmEmUqPeByWKXgQ45XPJ1BvaJ5v2lhbXJ3AA+li/JPf3go1iBaH6
+8VKSil2pWLQ0sZJfLo9bfxWgIzIEEWH0P6suYllPra3tkMO/KpY8sbZS8PKieok0
+R67JgFQYt5XeW7POsglLt++huLjE7tHObyBORqVYT3avy9N3qTbfx4KG18qSs4ua
+eSvnXXc3vdNL1cVf4lKOau1iij9CG1MI3GTUCIjuJpA4MnTFwuvG6wE3m8l7t/gv
+H7mn02DdA0033I/R83ARnxhlgOakwIfCwbq+jJrQep2mRJ2MhlGqOHhExIIVz8Xa
+qWX3G7aoaYRudLHUUYOg7PVN9eUb1lvAzfr73sJ8M7DhBl76RMDgva1XhrEPRomW
+w6EkYgrWN+Y79u8B7hFz0T52YP8GB0BwMkx8jkVGDav7W09/juNPmftkkqrrWSJ+
+YtQLH/6s7GBmccgo85g2
+=VeJI
 -----END PGP SIGNATURE-----
diff --git a/x11-terms/guake/metadata.xml b/x11-terms/guake/metadata.xml
index 540f810e069d..41ba86c657b9 100644
--- a/x11-terms/guake/metadata.xml
+++ b/x11-terms/guake/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>desktop-misc</herd>
+  <upstream>
+    <remote-id type="github">Guake/guake</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-terms/mlterm/Manifest b/x11-terms/mlterm/Manifest
index fc5368a3b589..1fcbcfaf7272 100644
--- a/x11-terms/mlterm/Manifest
+++ b/x11-terms/mlterm/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX mlterm-2.9.4-uim15-fix.patch 404 SHA256 6d1522e4afa3205a7dc7e0ce12dbd1eece9f11d753ac5ca771b2e2f0ece33856 SHA512 89482ce244b25ac21fadbf2abe5a96bc0ff90d98ba57c721509ba0076a8ef52c202e7777f889e62d2a18c13f60c28159964b886dee11a22a158669a9d3560dd7 WHIRLPOOL 52c3ce45870068eac3f08b4d9fa47f40acf474a3cea33f9292b44272c515c142db2a0c8c74f9f8135fccf3ed82318092ef1f988c6ac25f4795f16da3acad4845
 AUX mlterm-3.0.5-ibus.patch 1894 SHA256 d33d803ac660f6a10e330ac106400f00d4dd666cb027fd0c31718cbf7b01fa42 SHA512 8a0d67d32737324a0b7d50d8b58f8903ac3c5f1f15abb5879d1c627707ad5e2d9c35f46e07b5d39950837febb1e45fd6a201be88177ecc0f15c94c20c1c20e76 WHIRLPOOL 809e843b0d7e58337250a3af0db96918e9598a534f88c2dfdd236625cedc102ac9cc3ea28f6471f2c00e5abc68002f6c0fde505c781f97dd3b4a4873115e3ca8
@@ -11,11 +11,23 @@ EBUILD mlterm-3.0.11-r1.ebuild 2200 SHA256 875f28732940b8722ed57e2e3b0f019ad9664
 EBUILD mlterm-3.4.3.ebuild 2512 SHA256 c635750c2c2511b5f064649c92f0bbcdb1533075395720c4098422ec235241e6 SHA512 ce5dadecefeb46bc8945817935e9a67b5f7c8bbee5990afc86534b0860821959a1fe7bbe5944c9ead0c37aa871f8b805cc2430caba5222274df2af79b92ffdc8 WHIRLPOOL 199cff64e67140c96272bdd2c3c7d66cf98d557f014fe7577a93553cacc741e9379e7a279995a0d73e25de17866d75640509a9bf00d633fa910b9e2f4a7f329a
 EBUILD mlterm-3.4.5.ebuild 2552 SHA256 f066fcb1641966cec5a077bad7268526deb7e559f413a6bcbb1a7b60d15f619d SHA512 dc1efaab176b5d7c1c8ab516a129b57c0e531ff8347929f8ad1ddccfbacd23faedf739535f43a9e56e71dbce06d57e76566388145492168fbd1880b661271f1c WHIRLPOOL 554ed61c05318a7da5f45a638850d1f3c74a8cca8f39486cdc7caaa749e354e8853ca41752cb3f410e6a81b5ef843ebbcf34006e441927df223eed777b6f639f
 MISC ChangeLog 15048 SHA256 cdd54df01e61bf39af7f77a28a82f12539147489a3bd10922005fbfb900cebb2 SHA512 76a06832d488c3df0ecf022145b9bc50ff50e0a9969dd05fd09a59e2197c33c12971933fe1db8466f6356588598ff55420b4b969697bbd12714c68d03fe52470 WHIRLPOOL c1bd51d9806f62f51acd45cffecb3bdc12143c3241331a40b086e8062ad47397691355b54917d35d8fa8670101993f466a2cd33f0887efd9e23b9de67fb2bd51
-MISC metadata.xml 657 SHA256 d32008152ee024e568c936348db7461753fe40fe2d4148b7bb07f38783daa3ab SHA512 dda5b1e5f3aac3a030a5d9b6c51497dd6f57ee8b053918d579f094a06e151634bd3b76494bbc37fc495d8ea9fe425cb05cf600994b4bf722c948fe9796035369 WHIRLPOOL 3b3bc084bf23c40573e71788f3df30c2ab8e347c0d6e048715ab342c2ad1fc7cbd615c77f8206e3de7804b55fb3755500d9293641e2ed359d665dcdf93cc708c
+MISC metadata.xml 737 SHA256 fd00e85ad45fb1cc2c6ffc9c535e3c01b34b5e6cf6b7a5df6971e574353dfe6c SHA512 00e86396f84cd0c8cb7a0ddca1dd54512d05c227032d18444589f9733011be01502e5b72816204820f8a6121b26515e9339ffde8b99a0af93eb0e0f644f3ca32 WHIRLPOOL 567590581e5ba71310b96671fc47e82baa3f9ce222142935cd3dcc05ccb2ec0316c8faf8b5919a028682cb9bb2e36e5c6de8df4b09a8cacc72d8abcb637b839d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlUxGi8ACgkQL46suuyRem3kPQCfZD8YlMJfZrGLdRbKFLVPOECY
-pTQAn1lk+Zmwx1Gc5N+Ha7QUJq9OC4Yd
-=paTT
+iQJ8BAEBCgBmBQJVf8Q3XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiK/cQAIUkM8BK+vKgESdZ86KpZeFO
+PQ5mxrmlhn44pOXpJondjWjlLSzjz+YVRDA6dIjkP4diociWBE76DlgbRNJvWuOv
+RkXINKwHamRxdXLCMXVTugle/BITZNSnWqIcCw8V8TmEmhx3AlcDz1xAatvYWS4n
+QHWtmlTswkoXkI6NkwmURX/OPs/WRpd3IbhOYuXWhdH3p8PJBkrkXIYCJtouWTIM
+hFOGP2FrGMu2sbV3B6TBNUS4MXxdrehEbzfs1V/4DDZOOhU2mjtXyj4mwMEI4qPR
++xnSL0Ff3ErjElVnd2utSsr8BUvMPL10BFrUECPmXQTMl0n0fjMkSEdAwHRKdc8f
+MR/T23hrN84vY2Dkj/s1BUe0XjB7bew4M+FVRG1KltOBAP+D4N5LNg6SUcUkNdaP
+RLglw2WNbP5ImmXoSsSmDsKFnhbTMWMgfGb0LWK7v+etOeTIN0KGYRrYy9n44ZAW
+xdG4Xv4xmQHmeoqnWpf9G1VuBs2EzDfEplWz50OUZ8/09yn/wzCPXIeRy+MWPsfQ
+p4DBBj45mA9sDhmHTOAdPTRTR81kSBFhvdG2l4yPSS3SWILZMXDzavgfz90BpEYO
+PJEDqDParGUkowurdI0UCwZuSlI/i5VlPxGKmpj49pt0pK82ve8v49pfLVfPrkSB
+kMEgraibKRvSsJxZ2yrA
+=g8qE
 -----END PGP SIGNATURE-----
diff --git a/x11-terms/mlterm/metadata.xml b/x11-terms/mlterm/metadata.xml
index 498ce9c8b363..1ca794ab6c6c 100644
--- a/x11-terms/mlterm/metadata.xml
+++ b/x11-terms/mlterm/metadata.xml
@@ -11,4 +11,7 @@
     <flag name="uim">Enable <pkg>app-i18n/uim</pkg> support</flag>
     <flag name="utempter">Enable <pkg>sys-libs/libutempter</pkg> support</flag>
   </use>
+  <upstream>
+    <remote-id type="sourceforge">mlterm</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-terms/mrxvt/Manifest b/x11-terms/mrxvt/Manifest
index 34957a0fe947..979db433975c 100644
--- a/x11-terms/mrxvt/Manifest
+++ b/x11-terms/mrxvt/Manifest
@@ -1,26 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX mrxvt-0.5.4-001-fix-segfault-when-wd-empty.patch 380 SHA256 1b4e5c18d5c2ed6c9e1f198a97e058016b8e6589e1690d494c01bc899c010f30 SHA512 703d32e803d73e21ba5c746bcea94331c43e53e6f1b84a86271e94ae4cc59e6c4e8d4e86cbc3e29d594aec04881db57f587b1e94c42249b2beef08e718b69a36 WHIRLPOOL debf23f883f87477f770659763100e655520c67941552900826aefcbbaf665e5e73098c7c902dbd0890b12583327c17d04f5d2e02a30eaca481088871ee9f51d
 AUX mrxvt-0.5.4-libpng14.patch 841 SHA256 3d37317e91085a8e0ae080590f41bbfbc8159a6b932fc6bc0b9fb6351ef28ba7 SHA512 469f2f40b5f09e645be2f59166787b01eb76215e2810b9804d088ed271f743f8d1850e4ed60795674e5d041364e465da8e1f2159131a5b48cab015a106b383c6 WHIRLPOOL 89f50ebfed2760ff395d403edda2616ed26504f028f04d14a15d27ac54645d47c8510dd5abfca6937fef954bb6588bfb0c9cd5520e8da599b487bc403775ca50
 DIST mrxvt-0.5.4.tar.gz 603978 SHA256 f403ad5a908fcd38a55ed0a7e1b85584cb77be8781199653a39b8af1a9ad10d7 SHA512 572bb4dda9f9b9dcb597f3185922646523bce34003f536acca82992f68f8f7c1a5f2778d626f805ea2cd061e8451fbbf12010e5d655221f76b83440825c80992 WHIRLPOOL 770acc0b03e13e113bfe01f56e9ec58ddba6ae2ee989236836f4dd557dfa89334af8404e3fb5a08e1ffea989852f89871004eb6bd46a2d0b2b9830aaf1dc0455
 EBUILD mrxvt-0.5.4.ebuild 3582 SHA256 ceece615544ab9a59c039dfa9aab66cd7cc03f064c14921fd8c1b863f3ef507c SHA512 d63f26a65341a2147f33dad957471e0ba8c0b8f71a61384ddbdda90ce2c51686b3dec7e1fba053bb41d2956876619be07b4829f1cd84aa06b8daf9aee1ee022c WHIRLPOOL d5dbc962f6e81f24c9f64ef8dbff89c03c0ac47da7a036a9665db5a7da1e1eb94785afa18bdd59a864b26ad072e9a45fd5fe79e5aad54c95031892d9e41aca9a
 MISC ChangeLog 11302 SHA256 218e53716e2fa783ac471cd3fa520d77694e22b6464f9685f8fe36160f7da41b SHA512 a726c23ce34d629d1bc7d134da10d07cdec430812058d4f73ac0e9d83131b20bea57103248658e08a2766ab84b848252c3b6d031265fa86258970075700e2623 WHIRLPOOL c75c3c3a69f582c2c7f106c5416d99748f0af285b4e60b8304a3e3ae3f2a0e5cc75679e1d5aea67061672473b9f8ba64a69d9d79e707cd7d8745b857d1d0aade
-MISC metadata.xml 388 SHA256 0551ba584948704b099788b77761b8c885ff8915f2822e381804fc647f432710 SHA512 da16d60974fbc8bcf31f580d6b4db8773756306742dafcae1d73a7b3a8e6344e0faa69aee38ca264f6ab6e9e9bb87da103f5a38ea547f2fb5f9d501e84355134 WHIRLPOOL 84f324c215030c40e8fd7f978c6e39a68e03f714ee9a6a17fb71502da2057023df7813c5b4af6c349fdc19d2473bf749eb86ef87434659352210c3ca78efed6f
+MISC metadata.xml 464 SHA256 c86cbdb85d84b85663771bed1fee64dd73f4103b6f8e8f78cf88084bdf5ced98 SHA512 db53c2235ad343bf51b62145add5cb7a0e9a7332551a475accace660e0fa856f2ef40e2d837280db6e4b937872050acd82bffdcb35fd91d460e17b33de30c2bb WHIRLPOOL d7809889db859d33eeb7d6b37d09e96c2df4beba0ff74d94e072e1b78caca1ed9e2764e47526d211e3a91ba2819f021f4d95661852a4c0614149af926a8d93c6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJTwGS3AAoJEJOE+m71LUu6vj8P/0xrJ0I/EuFRBxe6iTY+D0gx
-OypY3TbJjtkzfa4KoctIe+EpHs3GpEEHXpy0pZzqya45F677E2Fu5IC1cNgDEtHm
-unzHEWDiFAZAHXMcsK+CF7OOcqVGYvJ5T4lXWXHW9vr+3VLqCnpYTSSPVHpC8m54
-+GG1nwf0FFqkYToC2KzW8GDgnykdpVz7vQY7LayI1M6Nk+5bnZhfpKPKKYK1OsBB
-utC+W/kD0AYSFnvGjy8X5aOnZBDCb2EWeor/59jCiuQ+ASvqw7k42Aq7Ykrlk2wK
-GT+JmkT1CJZcrRfVlXdz1VZOUHr/DIbElDW+Wk1ZGR1+Ry1tI9aQY+HVIocIlZg3
-6GThM2mD5DAoP0CGBNUvtMXdClNDtG07dJ1IhmYnSj9Br6bc2nYM3RA0tVRtbvTV
-HEpY5NYwc8uP6Os6DMWI2VYXNUAMn35J0ni5ARFt6nos8ZAhTjoRl2gykAu4WPfI
-Ep1U5lX3GLh3fjcUwMi+kbTxWz+ry69qxbYYv2THck2UKPd38nGNxohkGSiHPyCJ
-kN4zzzfaU/oLg7wlv/Gfj+NYyeHXlTKh8c00z83cQI4t6l/jr7RnF+wKtSqW/q/t
-y0EHdKFzZU19Ry0hCwX+yAxBn7fwcAQzJENM8PJHa7FtmxqrQhenCrfDbf1pP8R5
-QJyD7FFf3YzslfkrUfYq
-=yMnW
+iQJ8BAEBCgBmBQJVf8RCXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiv44P/RBaAFrmUIC77GC9pWoS7RK/
+KL/Xmh4o/bF9RlRuf4R/u+yRcymNQkyRar8KSRS419VItCDEVwUsma59pwQna8p5
+rt36rtEusWzka20r2IQsYaPwEFln0Paw9EoC6kKEsIqd5TnWDwbd/M9X/Bqrnwhi
+KTKpT3fgXaS/dSRNizetI40Ejd+2Y/kpelLimbbyOwG1zyTMOnpgM6qpdkCyN6rD
+ky3Nezts6t173Srm3S9v6ow6XvnRw29WgrdKlQaMe+LPfO1uJHajzezJhwsHSQ7T
+sC0AfQmx8S5MXlnPoAo+H/v3nbOYNXnKF2QQVAIT0Pf/7EHIK11KJkirCzfU8sRe
+/9IbofHOwq7oKqYjaXbNFVmkAHneQjgvTF8Svme1EbKHXSkZ3YLA3FCwGQ90j7fw
+YSdWTfGoLHKBzRee5NidiNXYGIpN7FGhRRZkgykTcZX0pQ5RS3wLuVbgGRgfmQTH
+MIpy+WcCy31df+4d3cEE7mn0eLD++/qEGxOY0N1D/WHkRmKR0WVq87bNJ/ynE1Ng
+HlNDXy7dpBlw1vMzdmQTqOoesNt27mkl1Jkd5hoCT4+ON28AupYk5pd/cN3dWZEy
+ls+aGM+nbk7bAMPgMOwtL+UkwPNHIeoWOXh+e//eq/OvBEzKF0/c/K1+C9N4aRmI
+8q8QSBItAU/Gruz2uu6K
+=inq4
 -----END PGP SIGNATURE-----
diff --git a/x11-terms/mrxvt/metadata.xml b/x11-terms/mrxvt/metadata.xml
index d52d275f2421..295329dc87ff 100644
--- a/x11-terms/mrxvt/metadata.xml
+++ b/x11-terms/mrxvt/metadata.xml
@@ -6,8 +6,11 @@
 		<name>Anthony G. Basile</name>
 	</maintainer>
 	<use>
-		<flag name='menubar'>Enable mrxvt menubar</flag>
-		<flag name='utempter'>REcords user logins. Useful on multi-user
+		<flag name="menubar">Enable mrxvt menubar</flag>
+		<flag name="utempter">REcords user logins. Useful on multi-user
 			systems</flag>
 	</use>
+	<upstream>
+		<remote-id type="sourceforge">materm</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-terms/qterminal/Manifest b/x11-terms/qterminal/Manifest
index e524e6297058..b47fdc17b4e3 100644
--- a/x11-terms/qterminal/Manifest
+++ b/x11-terms/qterminal/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST qterminal-0.4.0.tar.xz 83256 SHA256 f939358e2a31aaeb656d59ca919bbdba2fa78c2b99e691b9cfcd8259e80a495e SHA512 ac858eaac34fc346e6498146307c98b95f133df5a435af01842427f06362c5afb8817197981a0d3aa79f25321117050c80305a978260127a23a252d3a98027eb WHIRLPOOL b78eb321567803cceb4579637ead93c3bfe2cf9148ecdc9565b0a34dbe791a77eac3f567366a1e5152b17181eb7447b734a81ad3cc4b7763c7ca94d0ced1c0ae
 DIST qterminal-0.5.0_p20140913.tar.xz 99988 SHA256 965ad96262d22fc88a465f60f5d0f66d650fa8380a906dc70d4eae06b874430a SHA512 8f3a360be2e173c06ab454f0c6e9ac71ecf305ad46c9ad16ff37b3174a160624266ac2c2bd5588a805bcb72aab2c9774ca159eba7e3d2db85a970350fc51da09 WHIRLPOOL a3c7011e75d93888b9de95ddd25bdada4511bd4bd0e02e8af3f1413715efaa7cd9e2d77f8739fd46c5484c2c3f930e8dedbb2ef7a80feff5f97e5ef31d2f03b1
@@ -8,23 +8,23 @@ EBUILD qterminal-0.4.0.ebuild 540 SHA256 1b2c1053d0e7b0523c58995cd3bb8a21dfa86ff
 EBUILD qterminal-0.5.0_p20140913.ebuild 611 SHA256 944cdbf25cd1846bde11ef25a509421d4764cf4b7a9bfd8177705600737c1f15 SHA512 cc6fb7152263aebf692e25bab9fd3fca8857a694a72daec9661a71d07d8e8a2713a36f008bc343a1bf3ced747ca73d82325a7ff078450aabfc7d1d77ff91f76b WHIRLPOOL c689ea3eaf4eaeece6f9d3cd0f213c956da746e95f67f4680c03797ac318b2dd86f0f11ac939b7209d0fd2cc4a50380f77c6f6c90dff8cb20ba4884e77bf3c58
 EBUILD qterminal-0.6.0.ebuild 921 SHA256 9e7132536a2f31def9d961a31cbf0231cfba20cd5f2ee65fcfb05b5c89f09be0 SHA512 a586c82f8f0d6f1b226a0ff2aae8e2a199169a6bb4133cfb90f1bf60514c008c04a77cb77756b4f1869686a923fe129569bbe6c824044fdf5f97a149e5e5edaa WHIRLPOOL 6f03672b5ea687d74371f79583606fdbbf80f066f916f68cce9781c81afb81468ddac5324499d264f4cff58660dec8c0211cd7b08aeaf343ab0232e40d4c9e91
 MISC ChangeLog 1159 SHA256 39bfb245d2dabab0da30ea14704c6bccbd6fc324c802cf23ccfd9976aa584e5d SHA512 9d0da85b387c98a9ea34c2f978528a93c7edc4bb269ca2dedabf7c727e7e49e96c2425bc325ea361622d49b3321cb7b5835bea0f12512f20e6a706a47e9cbc05 WHIRLPOOL 89d05483f8b9d88a58b331fcbcfd47b5a01854d27f9d0a927d6ff90f84381566c25d12782765101ce4bc7b6e3c196701f77477d2592ffcd403885edbafae0bfb
-MISC metadata.xml 156 SHA256 2bc85ad7339ae0191c26e435f2da777058779a7ebf73d14658a6ea7bfcec01b2 SHA512 d9991797d488000e1b306b9d97982fb862fbb44d72d4f7560e3ab12ba2022a7abdd3a71bd971a18f562edefc6948e5d5db0972425f7ebe7208696678f1c17b45 WHIRLPOOL aa1bf1df6e2bb4c13c1eae59bfa12dcfe4b81794562c52538f037c75d706f415fed1acc302501cd5f3017b13c910cadbbb9b823a0625cd3b64b29b860259492e
+MISC metadata.xml 240 SHA256 c57fc84e67566c12cedebd5cdb57df03b5982baefe42a27cbd6236bd07d97a73 SHA512 bac27ccb00b55893971123daa21de5e1e0eaad430170aa7731e1f9c842dd0076b708bfb020ded46aa207d5d892bb7df4d3429ccfb3d37aa9cd0d462c1bb5b868 WHIRLPOOL a0f38a538f59c4836430426a1a0bd51c9cafcddb0d7b5ed3340d77ffe02f523adca50b0a949b94f6cb102ad27c11b73248fc5425bd0042dc9faee45b659cf20b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJU0I9CXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ5MTlDREQ0NUU5Mjc4RkU2RjJDNTAyNzU0
-RkRGOUNGRDJGQUM1MTRFAAoJEE/fnP0vrFFOVbAP/idLgi1N9mGN1RiQMRofo9Y6
-ganfIX4Yr69jt2ttYjLsUKFBs4UxtLt3OPk/d3afzT8NX2TQDrda2qhebmlMjdZ/
-26Z28QscHCOWEeO/MI8Rz/D3rUFJ+1fHfvBM0/I9SKlYJDY/Bx7xgVJUvsGYdkYc
-CNv8S71Dy7FMzKzUwUVMAGyZoOSVInBYfYPVMurWryVUH6H/K+Yc71EMVHVC1KCN
-q4toLFW4/5O2Wt8f6I4IbTn3itpDK23fUiD4kupG/HSQ6eah0RL1Gfzubeb4Ac0w
-jwm3eC+DE/2Opmjo9sxr2lZcod91UlOp/z3nzixs33vSRRkWIjnto2obpb7zIfd9
-oJFx6mDU+KE/e8fTfAsGnFrPiePezG26ZTw1Z0jIMaGc8HTqPN6JdV8RqKcOk69z
-aU7BVRAd7KoUtgyLx+dSmdeZUn5tZ2wT37zxdJhr7Is0ZVUarpSvRBbVZnxqSlf3
-MchPZz48BPzhT4rouCb5vTSYevKkZjIbvjXqQrrt09NWy5kT4vEuDyTRMlyUZ/ti
-hhVhcaA6SOeCB+k1eT0wBQ8EcnStUHvskWvlhA1Pvnr9dxzOy6Zr6rdooAKyA73+
-+N/uWrtX5q0cQuKIsDS24qlu1NOoNQrXLoR4/oXrlCCK9pRWXC1jGhm1+lnAMAtU
-XGIKgrloxzOe/sv5h3bC
-=rj7I
+iQJ8BAEBCgBmBQJVf8RKXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiw5MP/RE1eulRUughfO9UOwJfaLdv
+L7kqeTQknq5/A3Qi3P5GfKEEWh1c80Mcftfjk0VSzd77qco/OpqvgvYnU/g0+UmY
+GBYJ0jb9Md+IlCXP+OxZh/H9TEQNH2KtRkBcPNinPdp6qJjlVwxmg5V6lveRBfry
+oBFQqODy9oDDG7h3GqN7alY87EaQ9Q8ZW2HeySRcrbZJ2J1yokJ2KvB4SRfyojm6
+Hkkeqxz9Pd7beLRRv3RWPZaW3zuffV4zRl9dUWE9VxxZDGR7nMpFIG4XWPer34oR
+TxPVQKdHO/gJ6xC+3HHxFaXwvksaGOMvXqApdZpgygZZJyBQEIWiptb+NG1HRr0l
+ewGWE+vKZFIWFKgkK3LHlCbDDyZYTw+t+kQX/2voMa4Wx6/b+o9WV2gmWd38Mqn8
+Wm6vq15BIGlicoEUp4WZGyAhiDImySAa+K6rsilQJAB4e0FZEKHtnOACHwpEZJve
+olUCwrHE4nKSNbgX3iRdO6tiBYZ0MgZXcyIVnlvaOhAtgVLHHYcxhQvfBtZyNGX0
+D8pJNqtlEatN1wehlhrSn+ouuohjqxlR68Zbqv+WF22jxAUrhhgO1Xsqvy0ONpLt
+iPIkp2uAZimgsKfMX0Lovl6uD4RrZTX4YPkwChlDZ/XJivK1PwEJHJvU5QXIWSdG
+BhSx/jnAdCMVjjKVL7bk
+=HP6G
 -----END PGP SIGNATURE-----
diff --git a/x11-terms/qterminal/metadata.xml b/x11-terms/qterminal/metadata.xml
index ab02f994fdd2..1a44f652bb9a 100644
--- a/x11-terms/qterminal/metadata.xml
+++ b/x11-terms/qterminal/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>qt</herd>
+	<upstream>
+		<remote-id type="github">qterminal/qterminal</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-terms/roxterm/Manifest b/x11-terms/roxterm/Manifest
index 538e35d70dc2..b68ac8e25386 100644
--- a/x11-terms/roxterm/Manifest
+++ b/x11-terms/roxterm/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST roxterm-2.6.3.tar.bz2 301226 SHA256 0c809acbf31f5200594c7c992239f5e1b87206d96ab8a61ef2ee8d81c2378e69 SHA512 9adbb64a1b5c2cfb861d657345dd7d84e804dc55de1ad58dc8a4d9bdf04617f88da4d7de6bfe679345a30d291b10b00a32df0220776fb430b30551e4e6d9a2f7 WHIRLPOOL 35dae640675b036ed3a0a616eba4e86dc65b16e2cca72876eab9fb43508364bb7df2f328486adeded852a6775853373b2f6a4e8dadf80f02245c27fc924ffda5
 DIST roxterm-2.6.5.tar.bz2 300892 SHA256 e8b2dd5ce320b763b66590ebef77c422ab90181bb1a84d30fea8c47da0d46cab SHA512 a614680e3c3139342552ef01274635409d9618e573c575dbcbf2f80e50922dce677fd7b7039c3e2af034eb1950933a1fddb189c65cfc89fcbaf15fbe677da71e WHIRLPOOL 6e473149e2d3341d9500e666cc4ac27549c813b66b1eb0a727d24ef182b6ca26466928f72c533b99e89a4ebc768f12a2def20ba31f9793016be78a9c2e5493bd
@@ -8,21 +8,23 @@ EBUILD roxterm-2.6.3.ebuild 1827 SHA256 45790412d4c6b33698f077fb1a53489acd2a2fae
 EBUILD roxterm-2.6.5.ebuild 1466 SHA256 4f56f35e102eef35ac28ad1d5ceb75e34456e7b9eee5e74503de5571f34941fc SHA512 ba0ada2d10666c66324400046fb53ecda1293ad5ace058186971d8fdd626f18fd47b665fb09fd1b9f8f519c70f24c463842f8af88dc7a4e491f8999dc87f33cb WHIRLPOOL f49724dc56649093d0787181bb659c03f0fa3e88a5ecc3db3fb7f8652342a86c5581cf1144dab4cee1e8016350fd7c98dba49c6eb30f215d71e9cd466e7696c8
 EBUILD roxterm-2.9.3.ebuild 1463 SHA256 f7d5647c7b8bd56b00f5af7a6a88dad16143168999291d07a4c644371fcec093 SHA512 75267933f9575d01715b08a7f0078b755177760ce3b2c0a3faa8dae321659512f308081005dd8a2f1ab65fc9929f9842e52b4c52d9d551d8ba5a777b1fe132e5 WHIRLPOOL bfe59fed643e2ce46e9071faa2d4f07308fc9a8ff0362cce383bdcc1004125579881f0d566bd161fc8d07a76848e6775907f10c3a4268082b8054ce90f8ea0ac
 MISC ChangeLog 9607 SHA256 a39f9611514fb79bf92aa48320bb200cd1cf34eb0a7b776dd747b7d94e6d69ec SHA512 8d40a4b0130fb611243a1a8d972f9af0ca410b638cf11de6e9b17c9091eaba5465a09aad109f17d3cee03bc183dd4343b2fd24e8ffe0527eed8be5b12463d778 WHIRLPOOL a6e6eadf84e5290777d46020befbbff4fc3cb6a6618ee915724a7ba45a0902aa29db7c0f8fb9a4de25b8929bd28855c2380270eda8d2e654e64869a49fbb8075
-MISC metadata.xml 271 SHA256 cfbc7fd2930f22e3cba8362e6f7e9fc68d93c5532b68563da51006ef30082661 SHA512 5aac232b8f5b3d73ffab14d04fd44a9d624a3d315d750982f0497008ee6a97837a90efb909abb440600da6d5b2d97b26d83e4d772dfcd5cc9160591359ad8fec WHIRLPOOL 3c48ea1dfa7ef196b70710f46035d559f2a580abba0f985955d545e007930e80db8b23a2c506eae3dd470473749f0ec8f2a6a3cc1190a56bca76f9fb6b5a1d60
+MISC metadata.xml 291 SHA256 65204a14674bbf8db59bce1b39fbce13dcf331961bf80706e99ec4babb557366 SHA512 c3a12d5c665c6f1f52128b056170dfeb1872d4b38cea0e7b47466e51b1006ce902d5a56f22af585a6148ff48d5093951df1dfb01ace97474e26b2c85aeb7eb1f WHIRLPOOL 352a25279d2fa9da76aae9a4925a579faa8f300672147c3896f2bbddaaa9fe8e71f900f572d9171195066e7f75c7d8ea71993d7163e0493a166302091c9747b8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJUCZWMAAoJELvuk32y76HUZUYQAK/hnFz+VBmTqcKhUP4c34Qf
-NdDrExLkx79X+5TDPk/MAE9heSwUi4q5B5i/nzScvmIpkzZQYn6vokClM8nh+0hw
-zzaSoYJTjvdfO6HYXGuBrR3fn3Mwe5ZsX05Ajpw4xUc3Yz1feg2psIIQPc7/nOmz
-Dui88NvpoEkB1fluyctAtLhDuwkfg2n+vwqfydMZ6Og6Ax7MXOKwch0ISdaNVk69
-wxRaZfM7Yu8jvtL0vQaMv7nA3veZIrHgWF72JptLfot71KQriJ3DobWMpDbuU2FN
-/z6CMvbbBfzmwrrRX4e+rBpRTFCmZtmybBQW5usivbrxpJcpCUDi5f2qY30Tz5Wm
-FcxB1MAYqycnx2rgf5V08/xIggZeV5s2OJRQ6JEqpLHhZ9EKiJurULglJ6O7wDxj
-h29f787jgdoYKFzQin/rumGpZht4EC/tTo4yhQ2pesLbTae9VrCVrvkkVJ1Wrqqn
-EwWW/VCjWuh1fKrNJXRJ0QZ6Nf3/AtckM1NBZF7L/dQ396yxqhb4O8xjs5Rnd5q8
-SrAIa4TzLJx9YgL7T5nS/OR13x+GFGxrHdsjO9+pDIko3KUjqoyqPv10IGcO94N6
-bBVbGp7s/PexkMmFTrtoB5hIWAonxRnfVIiEhKhyfyYvEkLpQZYAtYMuYd+xybwp
-Pq1TrBVPo2WJa+p07MiG
-=ZDBL
+iQJ8BAEBCgBmBQJVf8RUXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiOAIP/2VQqLgFVqzRvab30157WPIr
+a1OzCPYs8HTdODUdgXiD1+M5upEjhaokmeHhmHiwuGJHJx1Ifbs0nqQaCXvpF9lk
+7irC47QaUw5OmW/MLGH+DhGfn5d3qZV1MGzkzkqRyffTZyXUQYJqGr2lGjiqJrz+
+6zzicTTTcgYX83mBx99pLn50mFrHNHF+M9WKlF0qbbBZvM220XM4kXxLkDREWDGQ
+LVfKnU2B0MvF3kPNTFw6ghmUD9MeVnmjiAoiIgwgrAktA0fBkTjGJqS/+fFbuCpf
+KBKC+TM3hCYEediqn0eba5q/z2VkAusb+iQuWSqQdZSPPtsBggmy3G1cz9/IZ5oC
+U1uN5zvMfEOv7WXgeykhP4JrB+S9x6HCMWPmlHKmLlwvds1amhwfIj/FEuzZmZT/
+ZdyMA1QWUdJBg/VPizFWNWKj4ROHE3CoGhvwQeWuaB50ugX8W/4NahAp25+k+Ea8
+MiWQ5enYwlr51mnLURHHbSQT16thsx2XGOh8QYk5SINot+aR7I5x6pC3Q949faSH
+2vJ2yb+YmtY9OtjyjKn/oxsx+ti+suuCB7iibHJvpFxkRiXSNaGtK/07t0D8O5sC
+xVGKHk1ymm6w4llOgir2c08VvVTin6e2kO8gb6EFtKXHmDPBU1etkcUJBNN9EYNw
+V/IhYIjDJJU0nGHL4fJt
+=4yI1
 -----END PGP SIGNATURE-----
diff --git a/x11-terms/roxterm/metadata.xml b/x11-terms/roxterm/metadata.xml
index ae7a94965b32..e1f135a3b2b3 100644
--- a/x11-terms/roxterm/metadata.xml
+++ b/x11-terms/roxterm/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>       
-<email>maintainer-needed@gentoo.org</email>                       
-</maintainer>                               
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">roxterm</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-terms/rxvt/Manifest b/x11-terms/rxvt/Manifest
index 2a9df8ef49b4..dd786ad7265b 100644
--- a/x11-terms/rxvt/Manifest
+++ b/x11-terms/rxvt/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX rxvt-2.7.10-CVE-2008-1142-DISPLAY.patch 1850 SHA256 bcb38b2141d704799ae88ab1ba5004a4d4cec558d0f5231cb2eac74ba85f2c5c SHA512 037a7a2b3ab4c748ba02e8cb661d3bd5a40c493597f7ea8c0fe1196ab9c2f583e75bc77a0c6c44aded298fc37dd473313ab7fd4dfe33bfa4c2b9d1856226c14b WHIRLPOOL 75f27ed954bd63b287ce7b87973b34f9072b914aa88bb62f50e3aa1d96ad4cfc205b924757d1314a1e3d760858a80da281a21a447bf92f16c54f8f94b025b1b2
 AUX rxvt-2.7.10-asneeded.patch 631 SHA256 a0e1c98c38affd0f1bf7275927719c488f997d456596c9557cf7484b1c31f69d SHA512 4ac46ef7cd18f2bf8743cd84590fe38fab3b7b3f97b34e2e0d3346bcf768ebf291f0c9d84806ee4602739b1194611282c249ab87efa4e2146f6cc2664fe5d0de WHIRLPOOL 392d1218c64bb3e5fddaf1e7067370e310968ef4898f30435ad7ab5af0618cba326b4963dbf07162bc0f8567aebf8908558c776a05c7e7d3b665dc1d29e0fc2d
 AUX rxvt-2.7.10-azz4.diff 5072 SHA256 7add72e2b7c28b7f21c12e66a32e3434df866ae2b02b429776f37f39925a2da2 SHA512 15bffbfc82ef94a2f9c7e6d36363181c50adf3ca252b23fe5687f00c8f4358febc90230ac626de9b4225acdf500311097ca6bd166df5da9df1fa059dc6fbfc0a WHIRLPOOL dbb45754469b0c88725435e10218094abcf1a62e582a9e53a9d8de94d2acdd62f5e7c80ccd1277313d800241dbfc470515df5fe9f06bf3320de7a8ad353e8b7f
@@ -7,4 +10,23 @@ DIST rxvt-2.7.10-xim-fix.patch.gz 602 SHA256 09ba6a98927e0f60defc399acc0b0d4debf
 DIST rxvt-2.7.10.tar.gz 595073 SHA256 616ad56502820264e6933d07bc4eb752aa6940ec14add6e780ffccf15f38d449 SHA512 cff86c2f94c533d906b412a949fe754726a0c67d87534b8f9794080898aa20744ee5de6f9109e9de1db14291cb6de7c1c4c1944ec9192e4ea42b0a3fe598b2a1 WHIRLPOOL 5c54110bd8ab79e3d8c23c447f5fce9631a9cd2492f816a1732eb8c2aab09eb1b31f61a0a6f0cfe3a456953fc4a3819b630a513cbd4b3b9f3fa4f95d526818fb
 EBUILD rxvt-2.7.10-r4.ebuild 2266 SHA256 57ba113726a44b1b74b6ea7d816c781bb40ca06caf5a46a71c8b755ff84a1089 SHA512 ccf44e7183ebbb90ab8a4ab98c8fec972a9443074d85f5dda7d7d0d78261107c5f412d5d26d28c6ed6b1aea0c86d98004b37ddd5c73c47ea78fab24cdfc573a5 WHIRLPOOL d9e663da930cfb525dea10511d3da9edb32b1c22ec1de83b0ac789281198ac5423f198feb7ec15c1cff369d367b0796da850e6d91b0d7cb74de5c493b684e81e
 MISC ChangeLog 10784 SHA256 5eee143de8dd052fedc068ea95f60e83b31a3e08a025f92af135241b251347c4 SHA512 ce220dda3e43c8410d8cb629b1be042ea6cec972e4124177cf46465087cc90c05e417616ac58c733a76290ad0885c997f49aa7ae9570ff6dcde2cf7500349429 WHIRLPOOL 88ecb2e8cd31ca94ec0605c8f7767756bd3ca125779a5430d91f72869e3a6ea0525ff8b767af7696305e79831ade376e97b9dd31e86e78c397b748c3c5ca50d0
-MISC metadata.xml 676 SHA256 6add43917581b9a75ec7a46ef31e0341b288ed9b4cd06b4f15ad37cbde304ea6 SHA512 43b943f7f1b9f4714172d720e88108a4fd31758d5e2cbef5107a6076ce12c62e166b3deeefbf4c928011c9f19207b8dde73236982d0a1b74f3e70be6feceaa6a WHIRLPOOL 325a5a22d8ee55445f35eaa75cef55727b4e7bae9f4a67eecaa29666c71bbcdace4e54406ba07c3d6b2f7c64d611335c12221480e5f6e4766b9b909594ec924a
+MISC metadata.xml 750 SHA256 fdaf3ecac2571eab044f991add9d299fd3fb4828bc6d5344b196d9dc071c0d67 SHA512 7e4d246ae2d2ce0eb9ab146723265c1191ddf09b44ecd0e5351a43fbc08bbfbabb1846f6dc375acdac49f8ad429f48bce6bfe5b375e2367375eeef1b8024c541 WHIRLPOOL f9223c3acd637af418b66de2433133523782af308652bbfa93505197bc217f5655ef88d717489840d69920edffd0a7eb646a0ca4007ea4e9ed4688f31d9a7295
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVf8RnXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiAYoP/0qB6Sl1qDXGGnxndTbnqGfE
+KyOQfupOxoERbwszTxBMlmH3If5OOMpKsPd2utJssIvB14a3PY0cqqlKg806Rshn
+yUPDnv+J7ergwNNd1zB2X+IP/i1ctw7RpUwHWYc7yktUHXCp/y8FKks7itO/oOiB
+ZdgpoKp3ojpWATZdLL9N+iNiqKbr975YfsgGGEaXtBRSfJpbdlit5NE28aoL2I3n
+Em/mDP5NC6zWBMk0bWMd9l3aJjMHKKd325sEuTrLjqvleHd+1mOwQ2k9g/9jVX0Y
+Owv5K0bMFIclFjSlLevLuFYzBivFoOMjq+5OCQebe7BBnS8BvYZTJsq1E5mNuJ0Y
+/pjUdRR4h35iChG5Iw1SbH+YvLroG+E3VfTXy5rV3c8b2KsPBjJrYprkwMarEEjN
+jMEQv2RVVb0vCdSg4XqFrMpGAhl8tjZivLDVF24l01ce3jWUVFiGpnIGcb4rcYzE
+z1LqvL4BlBjwoBmc6lf2yrVz99I+e2H+0e4meAKnPfiqng8+rS47jradkBqOXQu3
+RDUOOxncgaq1xFkaIfqvgTsQTKAYDMiJeCjp9wniszU+ao935ETGQ9+YuUjktS8m
+f5kkBDP1ySxEyj/iN5BpWea7m2LsxKR2pjAb9KfY+KbOzXQPH4tqC6HhQnBCkSkW
+Pi2K7Kabs11mefiU62JC
+=kNIO
+-----END PGP SIGNATURE-----
diff --git a/x11-terms/rxvt/metadata.xml b/x11-terms/rxvt/metadata.xml
index 59945ed4a36b..0d1ab3f43671 100644
--- a/x11-terms/rxvt/metadata.xml
+++ b/x11-terms/rxvt/metadata.xml
@@ -11,8 +11,11 @@
 		uses much less swap space.
 	</longdescription>
 	<use>
-		<flag name='linuxkeys'>Define LINUX_KEYS (changes Home/End key)</flag>
-		<flag name='xgetdefault'>Enable resources via X instead of rxvt small
+		<flag name="linuxkeys">Define LINUX_KEYS (changes Home/End key)</flag>
+		<flag name="xgetdefault">Enable resources via X instead of rxvt small
 			version</flag>
 	</use>
+	<upstream>
+		<remote-id type="sourceforge">rxvt</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-terms/sakura/Manifest b/x11-terms/sakura/Manifest
index 1668c4c53c43..1133a4d49ce0 100644
--- a/x11-terms/sakura/Manifest
+++ b/x11-terms/sakura/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX sakura-3.1.3-flags.patch 626 SHA256 072f4d0329f9667d235ef656c2d934dbd851ad9a8554652a94925d1bb11b13d7 SHA512 007a2f2ab722bd991cee0da708efba301b3c69bb86eff25a14519008ad485e8e6ed1c8e2ded6fcd88ff7066528ff539eced4d105a84d6774aa952150beddc57f WHIRLPOOL 674d9d9b915ee1880807d7aae90d05907c69d7130cd880c45a56c35d9dd0efd8582a8f6526e19e72242532b90a7973ad365f62035a968eebb87860974d1f9cd9
 DIST sakura-3.1.5.tar.bz2 51293 SHA256 2e305aad3640c92f1674c73d73951ec66896d9d2286f8d315e95ae4d6c44322d SHA512 00c75d40f116d17e91e674e3b18b97814c98dcb3c6ec9dc72f78cff89f4e97bc22912a8823eeb6952c065c8c6e5dd62a1e593eaeba3c93135de3e30ecad61ef0 WHIRLPOOL 43f1e3a058ecdd83b7af328242b619c6e0a9b7e9becb49aaf40b95784231f5fde5cc78d1d55e12c61325169a83067db1adf8f7800e591a4dbc2f48c266ca588f
@@ -7,11 +7,23 @@ DIST sakura-3.2.0.tar.bz2 51651 SHA256 20d166b038b5692b7a34e4792daecba264cae084d
 EBUILD sakura-3.1.5.ebuild 1023 SHA256 1d53aaec192c9e530ca7b871f38737d506a181cc0dd9f18786b799284749cc9a SHA512 cf395a7726a500e94548d363c229e23b3c7a8e6bfe22062ad1f619ec5e253768bb881de6de83c9dc4e8a091d74b90103a07dc1a718574e23d1cd75758807d778 WHIRLPOOL c205b62f895b29214444351c265e0f14c269134c632b917dc5cf1ea476191d0df969c6fda75fb20cb8a6b8da9f6b9aa3cf36e49001ebc2ee982266e8c87dee98
 EBUILD sakura-3.2.0.ebuild 1025 SHA256 20dd0fd6ad93467a51eef32206780e84eb219970a120230a9cd02c353581b63a SHA512 1063b6b3dff503be45faaa65443ef919d17a6922009a0ccb52f458f9fdf88e8966ae44cb406eccf0d93a5a39e72f3a1419decf32ab2f9e9556fbc92330e9f088 WHIRLPOOL c65f75415e0b389432611b6834a76c1e1b3a75dbde2acc276f4b289651d7e1014430ba3317e0a64fd830e7a1714bc6e5acc3813ad2ffa99174bcb2309990d85a
 MISC ChangeLog 6851 SHA256 db873a5c68b4ed7dacafce4d3571d458f54b74938df716f79392493896ff32dc SHA512 a90f5c17aa8e88d76578720ca42780afa3ab4d840e835aaf39e013170fe60c3e14ed30e5252ddbfa8e4f09eb3b43ba4bcf9d530f87eb17515f9415d2d3814b2a WHIRLPOOL 71320bd9d4004b8420e6eea71131d295faade5834a1a2928949f3e333b823ad7e5375406c27c85a0122e42ebfa21abaa5e725f835e1820260907effae1b19805
-MISC metadata.xml 735 SHA256 89272eb4dcc3113673afe305e02533f347e74b2542ade53e8ced86c58cbd604c SHA512 58de54dd1313c95df795743bbe27ba849050d72dd0c9a1ec26a85d60517a26ccc106ddc59063200207081afeab79094a21aa4df951901fbad9c311cb553c35bf WHIRLPOOL f6b5db6ec11e3b8743f6f4c3031d3d86839bd09485f7feccd0e570621790a68a2af44875ca3ca41b8396611a31ff8525e8942bcae3dc0820b396be05491260b1
+MISC metadata.xml 813 SHA256 945defa60e6a4470e6e93790f367164929764ac6cc6391aaaa4b350cf5f6c075 SHA512 7455ce5b059ad4c835f248f72034d7599fea02d243b819c2eddf70e6075bf3bb0d044606b58cf73f8380167edebb621b0e0d4236053ca8c5dad7832b5ca2f995 WHIRLPOOL dc0d9bdc221eba64b32b0dc3dffd86faf7d861afc0f03898d3939fe1612a8211e0fa26988cbe0e8a13dda1524a97f67f3035b15726788f2ed6f72ccc0d44296a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlSMBbwACgkQVWmRsqeSphO4zACbBjGOkDGiPe/Kzr730HzYqVwX
-4gcAn3JFlEXmsw8MR2zcaLCQ9KyT6bD5
-=ZF1G
+iQJ8BAEBCgBmBQJVf8RvXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiXgcQAJ1509Y3IsfqJkRnMZAMliqi
+qJpJjk71zNB0066MbLha/SdaZt125VWWky7J5c9Iu1Jiagv4RxgaCgAfxUhXYFLo
+S3XBU1YbamFSalamMFqWlopG1oKNCZCi6xVFMM/AA8v5gEkBBrv+bACAMwn8YB+K
+Btve15LhJUZ+PkAd6ysL8ifzqX4bRxkxZSlfa2+OruelJC8LJRA826VqNr7S0IEa
+UcSMDZDG/6ZkhT3AZO94/i0syi+cUs4u4BPeXZoQD7tUrPf21+ue8NpQH9A/Degg
+emKOcMOwi3JBqmaVG2t/wXi81i8nzyP/+wD3TM8zcWTyCKyXE8IJmxJ7GxD2sHv3
+FHls3uIOi5k+6EU+CnRKrqSRlyEMteB+MzhEEcZGBkJQ/8jI0mSt7pT/IM8EPwcm
+IJA7nOY23E3vhuKdfJ3hRKPlg+9L2peE742NW4Myr1VgTX7UDu7fQZxCr43hUQef
+C0neUeBM4XHYGiI+F4CesA89vNEwyvPFiCB3sY9JHaxfayGt7FzYECjSmU6T10n9
+81D8zuMV9ZinTEeA4PrJxyvLtp/fOvMGt5eD4Nw1iEFx5s5R7ssK7YTT8NdtZg0h
+UWrURHdL2iDWxELrPblPATJoLDCfOpPi3XORc88SxkYo0hBG+V/VKVOjZ94X3LLX
+8EH5DoS+EEUEgVELjagA
+=jqRO
 -----END PGP SIGNATURE-----
diff --git a/x11-terms/sakura/metadata.xml b/x11-terms/sakura/metadata.xml
index 6bbea73287d8..dd8e5f462cab 100644
--- a/x11-terms/sakura/metadata.xml
+++ b/x11-terms/sakura/metadata.xml
@@ -11,4 +11,7 @@
     notebook to provide several terminals in one window and adds a contextual
     menu with some basic options. No more no less.
   </longdescription>
+  <upstream>
+    <remote-id type="launchpad">sakura</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-terms/terminator/Manifest b/x11-terms/terminator/Manifest
index 0951397b1e22..02c02fb598b8 100644
--- a/x11-terms/terminator/Manifest
+++ b/x11-terms/terminator/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 0.90-without-icon-cache.patch 305 SHA256 b20fe414e6a443c0cb52c4da0da4be5c5f8ac8af90d5e9763b43c5383623978b SHA512 fbe50c186f67610b084d3a02e7d398c2bca668c63107203af0b59f49fd0491efd4922824fd0a78263b433877d1736d187deb2ab9f29c243d913fc3908d3076ca WHIRLPOOL 3d50d9de569a48d4097cadb6b73525eb5b7fb4895eb917d92f219615072f65097e5c3674fd6356e5323fe9779b6e2aa4528b6aaf82844145f752497a5f6af5af
 AUX 0.93-session.patch 505 SHA256 977cd4f3bf3cf1f044cb044d40328809836a2414a80af514bfff6f7828f7b7fd SHA512 d80313fa7f5ad81d162fece87d315ba6d5254f1e746b929578ffa2f1288fe1ab89832eeb324eb496a0347ec7781e8dc1e4011ac8e3b1303999745153e1e8e5d7 WHIRLPOOL af4d52de55a37d4d0b9dd4c29b80dc2c6c697eca4252c152b35553c9b789cd36082e7085b3ab12ed8293f178e14b950d975f75af53cfbb41357b61ed676b72df
@@ -13,23 +13,23 @@ EBUILD terminator-0.96-r3.ebuild 1367 SHA256 038858f6b5506bb04351de3746227496ba9
 EBUILD terminator-0.97-r1.ebuild 1420 SHA256 b8a163274a1ebd24d2e42c8009ba783b898563fc0b31aa1b104115a460de2187 SHA512 3d29787c9d214e6296034c7dfcff55be74c3db29f1436835820a552831ed64bf9f633e5a810d0f7087204f83ef1622ca5843296c3b43efc43b69e703a93eef7e WHIRLPOOL 9ac2e8f1eed845e15113a42784246eb511a10d4a4d99a6d279823d9f42866121cc57cd0dc1e871f410b04e1ee8ee3f4d51a72623cc1e52cff7c440da0b1105a7
 EBUILD terminator-0.97.ebuild 1379 SHA256 e577c15c86c60436c6766179907d136c66ec1af711e8b15855b314be84108bad SHA512 75230c5fed05817f65a0d5bcda60704ecff3f10c9661516dabc8500f2a54add51c455fc3728333e4fe7afc7e58efea41ddbefaaf7a2afcbeacbf2bb1a63e1090 WHIRLPOOL 30a48cc6cbc87f0645096636cbc2d0078e4404c8f532902e3afdd4fbbe1b8cfbaec2bf1f434dddc4574cc46f34b125b72175a6715dc315f5c68fcb5e5635a728
 MISC ChangeLog 4636 SHA256 af8bb2028471677d4a3d3d947628e240eab3e6a211a999dc55b21cbbd055a29a SHA512 cf5360c1d39e83187083125f9b0a555a5efcf49258ee2a20b0bb2d9c44d599d2b724ccac7becf5b780a91ad9bd1e68b24e6859737a38ab7ff3f54bbdc1af56f2 WHIRLPOOL a2c0bc5ecf1413fd2dad71e6c112b031b0558517cd6473a601da05abba7a82c0b35cc6036dd28b42391d21420b52d8117248d7bcb145884d2aeb7d2b089fcd83
-MISC metadata.xml 687 SHA256 c12e83902509b863524aeedc9c275a3d6305a660c6ad70bb17bae0ef5d8556e0 SHA512 a716bb11c90ec827f95ace222a8b5ac80334592a8484dfb6aedfc4bce98ec49eec8c65a1de999fe457e3ee7ba8c4ee9ee6081d60821d52a6c86c54beed86bc83 WHIRLPOOL ed7d59cd01aaef07d8bbdb2f8d3a52678436f93d5705c66430957288df934deb129e5c27b0d8041ff4fe2bc79994e245b69663c0aeee898a4a8b4d6936bae098
+MISC metadata.xml 769 SHA256 2a7e6823c843a8a5f96a637ad880a5b3f2d75e7e4ec31871a8b0b0ee7ff4b2be SHA512 e0d842530d5d9504ac02064f7bc404989b15fa5166916b6fbab956168ce1528182e6dcb3897e36129f37fb2e1933a91c570ee6052d1ce5359c99728b67950a7e WHIRLPOOL b3315884f25f88f4462eecc6d9a43f863d15db38b53e4c8d7ec4d24c7797ca3a0dcccf89728519718f146a3c659d82148973432f97030e348e57f02b03f1c336
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVJWTJXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO6UAQAMSxPz0OzgnmTt1SGny6WGJ+
-8w0BrDdmFpHYT3EI+CdaX1ZQDyKTXMdymnPdIjqSxgkggOeUIYm6NRx8gxV/IYnb
-YfP3RkLIXHUw3dgLVpwqaZj1dQmfNZSb0ildJAziBTCBWazQnfVy0gyIl6le4AZB
-6HexSaICu8ZkwalYylG3Qnf10s+SIbhoGz6VaOuEZ+zj2AAe3gOaWHchA3hD67r6
-2r4YJSZTvfNriBlTMHTPIZb47fBFVi3Cf8VejecYkUnsvfZgZVnhEuNvaZr6LLcY
-9c3zGle5m3t8FYfIk+Q3lkTV/EUXZO+f9CKdg+8lI97RkoYnvPgmpX+S5U3wVmWB
-N0WcUm2OaMdtJPuvUQ0s1h4LILlWMyNIikJ/ffl/2O12XJ7xwGMJRdtwE/oRwo1S
-R2EvagvOhI5WZ2nV9DkxTxpYqX4of8g2VUi2LGR1vINfzeRqqfadJqrbH97fQrWy
-QWlQ3wObodlD7t43VeqUEJnFB8JJ7hZKLBaBsN/ma1cS3BltyWT7qaM1xvvII4UK
-fKrB1g4iIEaZKU3x1wjXPRlBJV4+q+fj+Dx03Jug34nVtoRKjx9obKWk0qQPmHGN
-T3z5+VaOmyDzbRpLBOW8WO7eOsAgQ9UlEtlBxZaxmdwBEVEsjhb2xoLphIZtrOae
-KpUtM/7b+0yqtfpSX7tc
-=g/Jp
+iQJ8BAEBCgBmBQJVf8R3XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiIjwP/jezj/luzkZUq9nFC0dueS56
+Aw5IBLcggB26CTQ6Gbvk1FeU89w8ln+TP7I8FaXTAkzcMz1rojeZo2+R0bZfIylI
+SHwz4j94wx39c65o7v0lPslBQ7beD52JhYLWmdiaEZ2rAqEDT9OVeF0sJG3z/PKj
++vjhi6OggQxPAtmtC18rMtYW/gT1Ucr7Zk7PN8B3E6Qb2dlA76i4t6NFIu+qM5K7
+6hmJc2gbStHWZwHMqS8Gl0uJZ0PdLCbc7HQQ9F7JyIYqLsejnFhn3AcsyT0UQdrR
+32ikIGwELVVELdUb+357BBNxSk6DfC2pS43B3sSuGRmoSTTiXsoePkmu927jB4MC
+JfoBVOrOyzOZ1SB1gNeHpeAzB4h+G2PewcS/3a8fmbabXeZlOHq7VSRcyk1i+vBX
+sQoTP4ZEtaTg+Jy01yLWD0MKZHa5dd9Y5EdcX/xs/9hyBfeD9gIFd9ReGxdQ9LM1
+XeqLHLKqqaxaCP7yjEIz/lWiTgWhC43jFoh0d9IOoocaYAnqDqqxg+MUV1kBzBBL
+I9Wm4cNxlTG1tkYDG//sIH8yb7oCNO4IV5zTmLgnn6YZr3s6PvxyWOdc1Fg7HWo3
+Vq1ibqkeOQK6KSnl+s9bPg6owv+4TCmGmCZtcvKqi50ftwujYmDc3U/ULPGbYzo7
+CWs5eLaqHZWHwbm2fkep
+=SNlH
 -----END PGP SIGNATURE-----
diff --git a/x11-terms/terminator/metadata.xml b/x11-terms/terminator/metadata.xml
index a2b59963a3c9..0a689a803c06 100644
--- a/x11-terms/terminator/metadata.xml
+++ b/x11-terms/terminator/metadata.xml
@@ -14,4 +14,7 @@
   <use>
     <flag name="libnotify">Enables desktop notifications via<pkg>dev-python/notify-python</pkg></flag>
   </use>
+  <upstream>
+    <remote-id type="launchpad">terminator</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-terms/terra/Manifest b/x11-terms/terra/Manifest
index 0bfa1d444741..20127fc3b56a 100644
--- a/x11-terms/terra/Manifest
+++ b/x11-terms/terra/Manifest
@@ -1,25 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 EBUILD terra-9999.ebuild 807 SHA256 f56b4fc1e877592edfc20a9c8c6a6ed39c4a08e0e98570febfcb14ea4c6b08a6 SHA512 f9a0776fbfa1deba1c9fe0d6a1665fd89fdc5fce1d5c00c2f3e8ef460534e929f16f06b1d3fc464d66cdabdeaa4ca03f52aea820f1424070f685a824b6f5330e WHIRLPOOL ea11b5afb4d33bfdee5e32b08d70465f2fca082d77c7077a5fbbb65cfbf30dbca57bebfb0329d679c0b1423b2e30c1a9ec0bddcac1dae76d20e0b53454aff0ad
 MISC ChangeLog 636 SHA256 24f56de193a2966dec41dbe68ed0d8f6358b452e6494f02e4384cfd73dfe2572 SHA512 785b7e97cbf20c1b70693c8398d8b90dabfb06d5fe8a379df2e22cadb6b8d80aec5388d71446ffcfe6ac0597c996bb68842905035af5bc85055e116d297fb7c6 WHIRLPOOL 992dcd3204a1e361fb5dbe5d463e4deec1c149ac15f11809b690366a3d00b82c50598a435977afd0e614d7037541496db8788838811b6fdc0dbff0abd9b0b836
-MISC metadata.xml 235 SHA256 11ffaf6c7e9d3f8dbb48fb60cd443d87b61015bc3197206ca230f5c2b0c1e013 SHA512 8ff2114c96567a53f83cd07149d1530286182f54b3d1286b9ceccea41e85734be19d0f60876c73880d76baac48e698de91114bfda459e2ee6ade9c3237847133 WHIRLPOOL bd4bb26791fe245f1c2407aa690887524eef3e76de87b4f2b7049f436661ee78a669e4fe4415e227aa50ee404bbfbaf1822fa648792919f93cb3674fa0f55858
+MISC metadata.xml 307 SHA256 7995ed62e4baddf7bd831d8321beec48bb345f92c78f2d719ecfc732960930ed SHA512 3844247c95aa5944ab03d2ed75e0d9152af11e99cd5b5034f6297c3a423fa4bf195afeabd05391489746073d4a1f98300f76045e57853820ef00b78cf1920e8b WHIRLPOOL 2e97e27b74d7ecd81f16069864a98e337e1a23e16731ab25f6f11ff75d4093ed409340fe7245797aaddf11f20babc4b34d2a7a57d1f1a3237c8e0d932befd570
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVJWTJXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOCZIP/19hnCyGqNLCSpVK0BeRQY6Z
-Jz2trsnOhkTOCOjJxTtn8dOHxXiCgI6bhqdt2Evz1Sx+vDCkzs4CMfLj5N4n/1wh
-f2XHA0orpIDlxDcrNvgd+849EG4WV5/v+w+eiRFhpW8Ms+F6aXkc3QrUCLa4EL0t
-hroWWkfeKt6Bt1q/UwvU1pl6WG2a3//QzPPj0SQUWcrbYcJWKeyv8FneUYSqRy5L
-v8IdoZdyFgHNSnr6KmDxM7c5siWGx3/4uCw4Yj6qjL/TWYInQMwT+r+xOJixJw5b
-Kq9N/zqSSWGpGwnv53Adsr8ZlqNzRARORom+6Dx98hKeklA07KbCRP+MkjXe9ZuM
-bNl17aZaMy8b+ToG4SjoCEQnnqLmNQ501IXMHIYnqLxIXeUPqAy/bcPhyhfMAMki
-LXlEOVbRph1CjaN0IPRX6vuzhPvCeEbX2uw/EZU7GGhyrD+tOQ+suGcxEFByY9/L
-zlMxZl+cqZxmtFMCPjIAOy6fCgRrLAdPXFC/Jk5zqvoYxdsd/oEoGRh0f1I07pEo
-CqTYojf6uA/DzTyB8VHskZ019XG4QKUvZAJ+AAODMHOMGZIapPnyGis/xjmI4WC2
-s+SKySr1Qh/zaca8SU2Os+XZ3jRTSBtDkvMpNJvvc36WWxC4G30TKDuwddYmnj/z
-nCgB1j+Mk+MEE/BhO9/x
-=YqDo
+iQJ8BAEBCgBmBQJVf8R7XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiY4cP/3MH0Z5lgnohfbei+mzcVSLX
+/hkhUSFQKxjf/aqJ4sWISMwZG2he5Gxv1ymK3JNJDls/PAp1bH9WknxKFABZMiD6
+JMrMvzivybbFL7e53tbrhRjgNBvMU9OhV34zy8or7ZjJHzFq492L5JQiVk65pAHd
+6exE7HsfKX/GHhKGLzqF1yKX5EuuG5ZnSsMpbAaLoenFskJgDBQzjJ4nMp3HdBsV
+97kUKeQUbpGcqOfCc76taZDsXi0rqKSUThUikUQiIZ4V6djWiFecYbq/QhB8cK2+
+wttVOx+NZMgNouAFfPMtdbyB07A99tm4rPw+YeJqRElWJzSxJCrBjL26QLXG4IK/
+G1Ligs1YBA3py6fygdcpALQnEjyaeNXKMmSsyPLLf7yPrFcIUlMdZNu9gtkUXVub
+ceEHSa4ba2p07ZlAz5k0VULWHSODFHuoSSH5eD4rbWmxtZEhzR+U7AOrmMe7tLbz
+p1HL9ojZ3BRIRmLs2uT1aby+iXBIdBFO7QM6+AWTEViuX3L/4JifX52vP0Xk9cd0
+21UP+6iXSdWWg7xhMzX4oTkBxm9YklxJdWV4ptld9Pkfo0U9wMYDNzUH/3AkqMCI
+0jS1U5sTPMqYj+oZV+FHVCh4Qepvav5GzdKza6pOpZ9DoOP64bCIVKwOgURygCao
+j9RU0EinSuHFoTpGcBc2
+=Gqfq
 -----END PGP SIGNATURE-----
diff --git a/x11-terms/terra/metadata.xml b/x11-terms/terra/metadata.xml
index bfabcd0164b9..0adcfc7b6f3a 100644
--- a/x11-terms/terra/metadata.xml
+++ b/x11-terms/terra/metadata.xml
@@ -5,5 +5,7 @@
 		<email>hasufell@gentoo.org</email>
 		<name>Julian Ospald</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="launchpad">terra</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/x11-terms/tilda/Manifest b/x11-terms/tilda/Manifest
index f41cba4b972b..1b127688b777 100644
--- a/x11-terms/tilda/Manifest
+++ b/x11-terms/tilda/Manifest
@@ -1,16 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX tilda-0.9.6-gdk_resources.patch 624 SHA256 39f255a190218c2df0d202dac94acc3496936e22ee24a0dd0484d1f8f27bc267 SHA512 c32268a172c97551debcf9c5b57159546b5657f6726998bd6fadeeab1ae6a2e05d1efdfd1f61cae5f0d0972e3ac8c4d2b7409aaac31df921c417c99e22af9fcd WHIRLPOOL 4a0091e53d05012f8d28160ea5fff3de2fee480bd579acb1dcd9ea824b6acaa6c58fa095af542be3df59241e7a78932b12a35a4c6e971d93b5aa57c92c7f32dd
 AUX tilda-0.9.6-glib-single-include.patch 338 SHA256 c387b349e3971320dee3326d5bb9d89a577a181b84b61982fb1989fc7bc6d1f2 SHA512 e161ac8d6ac2e645efcdbed7247baff2a360128a7c5dff3aa9ecf4fcfe0c8e05bab2276fbe5970674f4b59385515e4c9aaaab5619687e41c1ab9390d34b93500 WHIRLPOOL dd81b5eb67929ebb2c22c52fe7756e12ec6ab6f1d62f1390c6a150c0f1eb33d9accd032cb3a806852aa5a835e54d0fdbf1af836917e6691ca59fc70316a86e74
 DIST tilda-0.9.6.tar.gz 307517 SHA256 b3bd0f63eb83a5001ef26056ca116e5f8005d454f8f82a94f334868862068411 SHA512 7d0ddaf289de2c3f9f48f5cce3ee71534b9fdd91f79a4e56a32a301fd8fc82c4a3d760cfcd16d8d2e2d9f0d963b8130547720563ab15c2bb2220ff546ea562b0 WHIRLPOOL 1f3b25f508291b79872947441a981d1582bdbab57996f1e3673c1b575079fadaf6f39912f9e94cfc8559fead39615383c3515a3c4a8f6178e4a568ad7a67c088
 EBUILD tilda-0.9.6.ebuild 789 SHA256 bb90c25685ac1df579eaea66f9cd4f8ef3da1e166eaa26ca8fd76867c614c976 SHA512 0ec97a7484f2967370709d122768dcb146e10b1d843f60a56b14a06ffe2f757e8a9c717e17c467ccc99b84b88ced8cba1c0a143108a627655f0774cb70d99e50 WHIRLPOOL 2bcb9460dee61e69fe6f1889ac12fa69560eba504a71e1173c50b5bf10072cf4bba57cb5199a50fce6e707a556f429beabfa5763a42c9d624cbfc7b70b6f6f9f
 MISC ChangeLog 4157 SHA256 b8075a89dbf73b017674cb22403e2330e561de4a4d449477f5757dbaed664378 SHA512 5b3b53fe470e79b3da6abee66d8123cff8df9f22d62e2ad78a1037e1b765670a712aaadac080158f52c2b93ab4494f8fa31247fe6779ed4dcca1882f587f5fe9 WHIRLPOOL dcf5e34c63bd6ad062993ccd0e5ca8d849ce04093d775a89ca97d701ff4b813d9438dc547f9cf3c4a07015f63cb4ba6f458c762872edabcd66a2c1e47113a4b1
-MISC metadata.xml 200 SHA256 c533d875f5fa74bd08653f78f7c7a5b47de14a530ade976703073cd4194a31fb SHA512 909981bcdd86bf989e0b7c56cf22e7b227b9b1622e863ef94f0f284fba8ddb20b9e0921e5a711056931bc352ecc3f043ba9a5b3e393d023344a714fef5f37c50 WHIRLPOOL 3f1aa54df18e3682976ef437423cc6f68fbfaab73807e9b1e3f201234164368b9d7b2c28a7a1ac2b8548e1d5acd4b254db27a1f6f22e392ed570c55270aa0358
+MISC metadata.xml 285 SHA256 13641091a0cd06231c858de000b85af6a7430e9b7c478291deb6bf76ba250e4f SHA512 34325e3dfe14bee9534987ec2cd9dd2d66b35d74e7f7f54c2fdd203a909ac2d151270893800005bbd43354a4f1c34b6ee2e031aa5c0f8269dc39c95fa7097208 WHIRLPOOL 06d543cfaf7b4f54ebb3743aa162d0e687bc0a02185418c3875fe04aaf7fa4376388cb584d95d0617707963e709de05061453ac8fa5e69a4bbb70e4a6caa0bd7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlAKsTsACgkQCaWpQKGI+9QJiACggKYQbSWhHmYhG1kclSP4Zdtw
-IaoAn1s+gFepHzgSTDATknc0yk2Oqtxj
-=W2OY
+iQJ8BAEBCgBmBQJVf8SEXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi6PgP/06LTb5l3MVjKpW/FOQzjDbg
+IYca6ZMUelYNLJw79UM45CXpbNhRg5VicPDT+X0tkWTR6ItXBgQ9dXrYlofvJwLL
+y/xmhGTNkXBZALqmfGnr3p5+7BoSMbCslAose/0wN4LXySndS7MEq5reYVsrOSri
+08B5HfpchUuykqtpKNl0gvbmfPJ11o53W9HJOJdVR+078/laoiCkr393cD1oWPbR
+fIaH3N9L9aMnIw5e9kxyk7wZL/MdiOWTnxEj6vKRbTTu9bTQoWoKUVLHCFBrMur1
+6TPUqHd2fnwAMsQX/F/oevMx1WaFxucpBhjuUtwyL09+RwcAk3q3t7ot2Qm10oiy
++6U3CaeBi6Fo/X/0QV+GA3oxZnnwMjR7IE4aqLQb7yNox+C1ZRpNjmcjGikQ0/82
+1y1z5jCoMBK9N/Es+22cZautYFhghm3AmkHiq0mkKgYTlLHwKshh0qyjRpES3R2B
+nlzcc6Z4y+d0upTE2u651t0HKt2pIBVAHz65FIRI4NTpF0TnheryadCfb6gCUu3C
+3NLCst7nkpulPFypX93b8bfxcuXq7lvyjf6oIzyEazrrFdG7dJSJmw4yrszoYBui
+1xkz8TYjfxQjdMiD6rFP6ZuIYV2cYVATyHFdFEh3IDmNrYA4QZxCBZX5DOx+g+Fj
+asFGrqpm9bdT5L3SkvI+
+=CTWH
 -----END PGP SIGNATURE-----
diff --git a/x11-terms/tilda/metadata.xml b/x11-terms/tilda/metadata.xml
index 82cb68204676..d19d75f8fb73 100644
--- a/x11-terms/tilda/metadata.xml
+++ b/x11-terms/tilda/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>steev@gentoo.org</email>
-</maintainer>
+  <maintainer>
+    <email>steev@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">tilda</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-terms/valaterm/Manifest b/x11-terms/valaterm/Manifest
index 59a789caabfe..e57a5e2f6b7b 100644
--- a/x11-terms/valaterm/Manifest
+++ b/x11-terms/valaterm/Manifest
@@ -1,26 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST valaterm-0.6.tar.gz 173874 SHA256 3220bb1ec444b339c1c46d3922fbd2741a34667b3ddf744e70b3c30e84bf2298 SHA512 a593b28e437287869020150314e2058f441f0435580b1d95cf2652b81f60fa9a11d59b8ec2dd68801dbc82d1ca070c9135b805c4d771bb4f099f13ebff243ad4 WHIRLPOOL a3822ef2f7479f297cc9a36750f8787988fd1c715f938c7b4aa1dc61533762a3c9da24e63d0db588fa3b9b8472653b345a34f60d5c2939a17eb15e6a4f03e830
 EBUILD valaterm-0.6.ebuild 961 SHA256 f481bd5936e32d55a3ec6f67dcffd22da22dd34ad22e5eafbd101eb947463d42 SHA512 911d533025d0badf8f57084847410369c34135e5691e3263e2c66bc6902b2d9c448202f9dd8e3aa571b8fe355b7168aacd8f210add38e081609ddbee62e99854 WHIRLPOOL ee93e0342adc09f7726666f418228d998ba03627bb0f27db92a3a59dbb359e5d2db2425149472df3051ce1a98fe628f9936de61c2da14620ef85dea4958e1db1
 MISC ChangeLog 1753 SHA256 614b2bebc2cf20f1de978aff22cac31645730ebe3e5d5165934601d88d61e557 SHA512 dac2a8af50f5ccfc4760cce71ab48c4a1a69db9f5462d7176a26925e49391645d84a2d350cb500011d43b0c70370b2c9068248a6ba1bceb47b247eb9b2b69bfb WHIRLPOOL 60d73fe300f0cc37ef4115e70076d40fff0a938db25eb8e2d2f29654c0bc135cca327f05205144d5dbbdb26c222464177b0fd05cbf086b8c295422b5b02fc6f6
-MISC metadata.xml 243 SHA256 d3e33171a7887443d3fe1cdcda61f2bfd9373ce3b9a1cc79a9d5bafeb743a8e4 SHA512 45e29d5263504bf64983384b7257ffd437100ff7f5afa3467ce0b5e47fb9ae2c7d60b3eea37ac3769dc2ae2afafb9e056366e1bb1dccadc843e74c859374cdec WHIRLPOOL 2020b6f02f31279c404e29c083abd678cc992f1f59245892b8f64015e50a768d0e59c7d90bdd3da87bd76ab0e042ad05ab6979a493f43e254ca1b842fee982df
+MISC metadata.xml 323 SHA256 675fa4f6558208be9b4f218bb475eb8e55f672ae72272fb57139d1f7866f97c1 SHA512 a096318be8e9bb7b15f4915bbf8428c5c6a525bf0599047aa12cbb7525d140e618e0ba5f419c418ddbef5f25f71cf476916b7cc7aa1c7235cc94ef6e71bc64b2 WHIRLPOOL bba071b248917e31b8d543f53ee45b7514c2d9b529fc62c1d96bd933eadd987bbc602bcfd76250faefb40be473c3863eb9763e0d15dcab370ee90bf6db5b459a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJUp/N3XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOvwkP+gNrw4VsC7hgYHHQkRdC5+H1
-AMTzJfR2i3pc6m+NkjxCl04m7wCtPh76/zuvHQ3CACaNABAMLt96XNjr6CFCYy9z
-qRfy4BlX1T9EHLvH1Tv3YJYJMVAU5rpFRgZ+VQG7lglCUFgBL7tLuni20JT03Szq
-37mEAGcTEqcYcdIS6F4T56it6jhJGkghUOx+thVnx1dN5NHV3AHfTfFulgvM5LJ2
-aXrMB9qt9cpYd3oMrIF58mNJ1sLs3Q9MtHj3v0dCCv08cmjdkCdYO1KPJbBqfv0M
-qDy1vkO7ZHHI7REvI1Qy8p9u5pF3aVJMZ5SiTkx/kmBrrKYG605/N69UbJbMD+fh
-XtfZxa0kWtGQkcBffGPp618Oh9nGdBnhR/+MedXmpDswCsyYCLyiCj5lf5BYuJD4
-2Q68kZrkGxm2XxQBiOrLsC0ZMPRoWM0ZTWkEVY4trH/YnfpSbXUhFXdYKDYgtYLj
-YxaOMzUA7kdnBphBTHe1iW3qFU1TrnLUa+7gGQJvhfCJqyqS5zszCEnhDlsSGgL4
-kiWGWBAEh4ndJ2LY+coQwY7pdlinvm/dXxJf0s98gxi+G6J7ICFKtg3BT94f1bbJ
-0/9OwzGIb3fJBzCptu6rVbpGC1mk+Ba4nbUWsbNMhYe8py6bR02RGGQ9woErv/i4
-vNJEjU6HPWm+LywcxvVZ
-=ZyW/
+iQJ8BAEBCgBmBQJVf8SMXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmisNEQAJ6QiksLaX2ybTlaxfMZ37hK
+zMTsQqEDeiBBb8C8mQVa08gHTG/aJVnFKpvjeAGRhksO3adPCoimt3xrN9JD2ZN6
+vEpHjoB5LRohRWGM8jKFrOaUDYSdOx3UFcTh6/X5xhO1fHmNdCVKfqoyv6WxsVzY
+k19ueYM9I1xkPnQ3bq0rD9R/D/CATL3Ag6jc8Y6cs9ad6U26lEh92/FbyM/D4jil
+A2Zr9ebUyAXzxu7JBiGsUrkBt2hhad8nOQMXRYiJkKc7GV1BKc//WFTjhsPyrzDU
+jK0C9DE+IvlOB0Xsx//FjHahqJRaU+K2U+WR9ucTSS1JI4msevNS9nnkFcDjtwHV
++yJnS7tUioUhgGgMZqXMdW+KP4zZ6PchAaACIsebZ/DTk/LbVo39MvkcwBP+DmUD
+bDG+OuPd+UsVFxiBVUhLtnH7YwdVQ+2k0X2HIDXga59mfaZoJpMOoSDUqadZWuZn
+ozXsYLA+VEPA6PL5GRLEnSeqXJpVzKXykqViNKFDut0lcNzpLvz8qgglBXEjjXY1
+B6v+CTmIJnJjb7ODN/qFFtETYi4GduwA5yGBUqAG7w7f3w5XMbR1MYYolJTjzEnY
+V/BqUJS61SsF925jcP2cE0HBwpcF2BzibAOuc4R/qAXdDUI3esNAKDyFBdKYJ32k
+QTAhrJhdJbCJy520ucXH
+=mWnw
 -----END PGP SIGNATURE-----
diff --git a/x11-terms/valaterm/metadata.xml b/x11-terms/valaterm/metadata.xml
index c2d865517c00..2a3ba4a1c032 100644
--- a/x11-terms/valaterm/metadata.xml
+++ b/x11-terms/valaterm/metadata.xml
@@ -5,4 +5,7 @@
     <email>ssuominen@gentoo.org</email>
     <name>Samuli Suominen</name>
   </maintainer>
+  <upstream>
+    <remote-id type="gitorious">valaterm</remote-id>
+  </upstream>
 </pkgmetadata>