Add github to remote-id in metadata.xml

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

24 files changed, 248 insertions, 179 deletions

diff --git a/app-i18n/ibus-libpinyin/ChangeLog b/app-i18n/ibus-libpinyin/ChangeLog
index 92318b911262..fcc5f80dbdd1 100644
--- a/app-i18n/ibus-libpinyin/ChangeLog
+++ b/app-i18n/ibus-libpinyin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-i18n/ibus-libpinyin
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-libpinyin/ChangeLog,v 1.2 2015/02/16 05:00:44 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-libpinyin/ChangeLog,v 1.3 2015/06/05 14:13:28 jlec Exp $
+
+  05 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   15 Feb 2015; Yixun Lan <dlan@gentoo.org> ibus-libpinyin-1.6.92.ebuild:
   drop in_source build flag
@@ -10,4 +13,3 @@
   15 Feb 2015; Yixun Lan <dlan@gentoo.org> +ibus-libpinyin-1.6.92.ebuild,
   +metadata.xml:
   initial version added by me, contributed by Graham Ramsey
-
diff --git a/app-i18n/ibus-libpinyin/Manifest b/app-i18n/ibus-libpinyin/Manifest
index e5c320fdb7a8..2593a2121e89 100644
--- a/app-i18n/ibus-libpinyin/Manifest
+++ b/app-i18n/ibus-libpinyin/Manifest
@@ -1,24 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST ibus-libpinyin-1.6.92.tar.gz 1686249 SHA256 e611cff47b84345e1f60b8e94f74811bcfdf53b6ef7436b5cb5aff47eea743a3 SHA512 b4af0083c9c1dd4273c75372acf5d74ce317effdf56d8a0de8a3e3cd24f40b1b2dba91786d0a1cd72c9d7867b9ae630c4f69b04b378529dca8be0869e91d322d WHIRLPOOL 5dd8493bbbaa0f3d189a825bd4237a56276e88b8da91e75c1e3d49c1c1b2050ee2f9aaa4524ea00418690d8ff2085d6b6f686e60752e838f2515ca9d780347ef
 EBUILD ibus-libpinyin-1.6.92.ebuild 1188 SHA256 80724277846f636fdf2de82f8f43761cfd3099199106310e8351114895ecdc78 SHA512 c42efde19d0709c3cccd2e8f66ebcdd6290ac453eb82979b8d1b7378525a343601f92f914db0db48c5666f4ae648910406a1a29d936adb0a597a077ed3553bf6 WHIRLPOOL 823f4ab298c40ca6e2a1e665724b0bb3513948d54ef4d7968a487e35e61280e7c0c9455f3cf0c4aac54106da38767961f5536e5d55437a70fd93893db0816f74
-MISC ChangeLog 509 SHA256 b042e41b7544e54bbcefd1e50ea273f740874de94b6a1ea23a61095e250261e4 SHA512 47add2b81088ca1f9088033325545cb684dcd92fa11467409670cde67f3d9d068306b8fb401757e5a115053270bc7e78bb2babe57577ce826c86c93f806c5ff1 WHIRLPOOL 9a5eeda4270e8dc7a3df7637c9c4f8d40febd833b1c3b9c369af48c30b65ea5f2bb19c9d80f2fa6c7013bd380a3f9ebfa70a812a3437ec0d5417c9db383a7312
-MISC metadata.xml 585 SHA256 ab1ba83957c8a138485e789031984d258ebf15f3362399383f6277b337c5d2a1 SHA512 801b5b9111a75f26dc0dcece1e24d7fba21529e3eeb4e497e660631393c940bd1a48aeec19eacf6fcfc9b125191bf101940259e8db92ad2f79e264caeaa2e8f2 WHIRLPOOL 545e044f3626ef186c8c223a4372a67a1100bbb6b15e2117a0a1a5bfb1e9b7b5b45c83f53d75727c36eef8be0fa1de631964feb4f003c90f4e44ac5a4bfb0ca7
+MISC ChangeLog 612 SHA256 dcd73351a2d701a45f6f85c36bbee140283059083a35377e17919216b654bba5 SHA512 4076a12d878ccb804eec45983597f1d260b9ab795cb0a3e425643720841efa9e799ba9a033dc39ed146a019f8ee39b8a23135b187da911fb802b3dcc25eabad7 WHIRLPOOL c60fdb85d5ae37f002d228576f257700963cf08f16a7fa0c3f335de5a51020135d41325d68e010df25aff8688c6f21ad1019320ac35470a4d0ee9f6103971db5
+MISC metadata.xml 693 SHA256 075333ef078f54ed9e7645375dc5a9c8d8f8444916bcc8f8bb5888249ff0bde9 SHA512 fe335a9f07281cdbc5280930d4c3b7eb4551c476f2285c709d17f581b26cdc8b3ff5de6bac38d9e4a10da5ba8b9f17ae10f9bcbcda17e5eb731bdcfd7ed2938a WHIRLPOOL d2c7b08103a94a387a17c58221cd6f34dfdc7b2005d69fc048436f82454ba53bd46b18f586df2bbd276729304c6c014a9195632a074f990982f0bf22c109e79c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJU4QioAAoJEJIMDbyqvv1V0T0QAO2NJVObHdHiatFFF11Nq8eX
-zyGcDSoRa7K05SEcsTc4y9o9pnK8GFz0wzDKcyCoSOttiSFNcqXAEjoxXSUNO74s
-BIwObUMyeP89/ra1Cr16qTE0BSJKhbt+m28itPyd191goDfoxdy3Fv/za0iP/q8/
-czpiqCqtFAlYdkA491WZyDx0FmbCmCzYlkC43RycRraWn/IWxsupTsBoti5Q5iuE
-c5k+2Yg/AkQOsO9DWTwvqGL8qJa44XcvBDaOlEk1uaUS4tBAoYwH4z9rsIPD6e+C
-N1+pZqy8iAmMHL8I8TFCJLX7akGVxD+lxTuWxuODK9lfzHZtolDOBHN+10EBV/K/
-Mxu2ULpPqWoLpBZAiupwZmhj74BcupaMLALcvbCO7fsUjjxxd+uqAhVSjD28B+xf
-5iTYzGcJI7IFUCFzPbYqnupIJj+x+HvTHe4f/tO8PKWBZ7cjH8dY4+tjmvCw8yea
-kZJqEU2OVtCI2YimXbXIU2+prMR/gqgerECg6AOd5qSY7YN5zDTUGtLhDjlgv+Ld
-kEeAHk/lWyVctY9w19Va5dLdRGKJmO+eAauRrsYWqBE1mM4nDC7O8zbLGU9rAigs
-Fbl/yG0mO1Nf3PsfV6JeSNWdkurE6SAZX/VjH1QoiO3Q7eRQALmqmqNRw8Gj+261
-ipOQIA5asyRBureIZK95
-=f9lH
+iQJ8BAEBCgBmBQJVca6JXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiEcEP+wQsVnXBUCl5fMG9R81Fn220
+w+Z4fGrBMRp5NcrHACp3MEr0ogI4yvWFxSvK3TyR1HkbKzDNEG80RWs7cWJ/utXB
+xh6zI39CC+exd9rPAayhAdqa+N2jO+YorTEXa51jIucA+RpXWfO4ff1Mw9DLvvHC
+omPe1y2054XgTdH59Rp9DUy3ceD5gnx2s3t5OF3fNMUc2766OLJ5NqHrVx6CjDId
+obtSIOqfUgFEMiBVQsYWsTRik1EjjGiTIPu5hvBT2iEfM/oQNRjpVz1X23I6LBI3
+c5xGzON8A6gYOhNF9hUmEOa2jiiPvwuImfZAf0ht1V8WkXLKsrCXGMZw8/OKThRP
+45Sf2JB+H1KNHowCnHTnhtWkfA25cuG510ouvhTnDl8oC+cmOeHmJsc0Oe3lnRlJ
+jYvhI2CMCPdY3FebcHPreOuA1JrircXvFUtUT7JdbT4k4kbWWRWdrQKy9CjDqrdl
+5wwGr4bjkcipQ9sL5MYzCOstarh8EA6ZTrYs3MNYt6qwP0TAm1vJl6zddkw58Oi8
+c+ifloYNliB/dZ6qJzzcQ6ZW4lgFplkYbzrDbZfERQ1+TnlzgR8Qbt6x8c5RE1nT
+M93KlG/a2XUGge79Q8t02MNtakxoUvG8kYyV/43PRimWMyf6TY7O25QhsiMnawwB
+7UmOzg/UMYWdH1UcEM+H
+=TSxk
 -----END PGP SIGNATURE-----
diff --git a/app-i18n/ibus-libpinyin/metadata.xml b/app-i18n/ibus-libpinyin/metadata.xml
index a451039c23bd..5188ad1e2c5c 100644
--- a/app-i18n/ibus-libpinyin/metadata.xml
+++ b/app-i18n/ibus-libpinyin/metadata.xml
@@ -1,17 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
-	<herd>proxy-maintainers</herd>
-	<maintainer>
-		<email>graham.ramsey@gmail.com</email>
-		<name>Graham Ramsey</name>
-	</maintainer>
-	<longdescription lang="en">
+  <herd>cjk</herd>
+  <herd>proxy-maintainers</herd>
+  <maintainer>
+    <email>graham.ramsey@gmail.com</email>
+    <name>Graham Ramsey</name>
+  </maintainer>
+  <longdescription lang="en">
 		PinYin engine for IBus platform. It provides a Chinese PinYin input method.
 	</longdescription>
-	<use>
-		<flag name="boost">Compile against <pkg>dev-libs/boost</pkg> libraries</flag>
-		<flag name="opencc">Enable support for <pkg>app-i18n/opencc</pkg></flag>
-	</use>
+  <use>
+    <flag name="boost">Compile against <pkg>dev-libs/boost</pkg> libraries</flag>
+    <flag name="opencc">Enable support for <pkg>app-i18n/opencc</pkg></flag>
+  </use>
+  <upstream>
+    <remote-id type="github">libpinyin/ibus-libpinyin</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-i18n/ibus-skk/ChangeLog b/app-i18n/ibus-skk/ChangeLog
index 6b7dd5e0f3ad..dafcd95df4c2 100644
--- a/app-i18n/ibus-skk/ChangeLog
+++ b/app-i18n/ibus-skk/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-i18n/ibus-skk
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-skk/ChangeLog,v 1.28 2014/12/27 10:56:52 mgorny Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-skk/ChangeLog,v 1.29 2015/06/05 14:14:17 jlec Exp $
+
+  05 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
 *ibus-skk-1.4.1-r1 (27 Dec 2014)
 
diff --git a/app-i18n/ibus-skk/Manifest b/app-i18n/ibus-skk/Manifest
index e19e57822174..eda38307cf07 100644
--- a/app-i18n/ibus-skk/Manifest
+++ b/app-i18n/ibus-skk/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST ibus-skk-1.3.9.tar.gz 459987 SHA256 67c615f6e070673e312da50e1125f2f0637b40e0eca4f6ea34325f41322b4ba6 SHA512 f68fbd82d087f7bcae50196854cbe650f8b4ef936238be170d74c33ede4c15370d0f0a8e65216a6ab2547bd2ab7a4b2a4f5a5ee96ed81b0034fcdff6872528fe WHIRLPOOL 3d026b36ee416fd101047b9babfb4cef6dcefb73aea2b359ce01a93fc68fe0e29ac0ce3a21094d0c087623d118730b6abc4aaa7d0062cbddb9db28914b8a4dca
 DIST ibus-skk-1.4.0.tar.gz 478964 SHA256 bbf4309215802dddc41bdb7dc0efad91da99957e07f9216193345b149e43b4d9 SHA512 b3c9520eeb139a315779cd12a3865935ac92063dddf7920e63bcdd9670041e9588ae3858c2e8f0f8f77fbed545630a6021e3296de76a239c4bd75e2927c216da WHIRLPOOL 13f56e9bed96d89a4e015d46e8623442efcb63376e4f42152bfe48809b53ffc7a08ff61311d5321ae1c0c6e6f653a05034085a7887faf6db454128f349b2c60e
 DIST ibus-skk-1.4.1.tar.gz 478018 SHA256 368b114a07f03d5d91cf333215f9429995efbbea73ee7efe2e37fb3bbc6d81de SHA512 d8c0bf2c92fd96486ed10e9dcac861b4fc16e741fd96764671352e9e67226887ad6aa4b76c4891411029d3f5bf692de1162f996a294cecc9e5231e90ea0df5f0 WHIRLPOOL 38f029ad775870c1112d7277337c6083a03008960c54a0a9e09cb2acad5e3dd7c56583645aab9d597870c4a27c4e6c85a11e9e0c33a1533d51c36fa301bdb094
@@ -5,5 +8,24 @@ EBUILD ibus-skk-1.3.9.ebuild 943 SHA256 00d19ffd0ec1e6bc70874d2de7422c31fb3d0841
 EBUILD ibus-skk-1.4.0.ebuild 992 SHA256 8dc69085613a4852065b6440c7a64006a1c06478e9d0a89355046af4f8ae0f13 SHA512 77b4965499ce7a2529032b06459446239776de5be548e7f44c27828cf3fede8dbc7371e59296b0eaeac6ea07d9816c189918bc084569b78ae73184e54a90a78d WHIRLPOOL b2d3fa15e89ea5a030d1bfda558a23b2e0adf02983f8b0fa0511d28782cd41c6e87f6a69e383acc127c24d1e811ebd17a05945d588f7b27d9c8fabcf4348eeae
 EBUILD ibus-skk-1.4.1-r1.ebuild 757 SHA256 bcfcf7fdf65abd7099a1ad8225399019b7a9846668eacbf73b2ea0a9be1e745a SHA512 55bf9ab91b242a53bc2e301686724a922ee4ae8d2351e8b253dd849b2578212321606891e94784fe341b4cf8dc05b7c7c094d09af6dc01285748b03400c0b1a0 WHIRLPOOL 4fcc8533891a6b4eda3d66dd70f998879247ae01fc4a59276fd9236fb6d77301c1d76e2ffb2f4f8dbc67fb414800a8b8b5d7bdac5536043fd4c0a66e22c37f0c
 EBUILD ibus-skk-1.4.1.ebuild 1000 SHA256 92db03d3da3c92caa54ffa4f117eca1d44ee03de9566409fb17cb40afdf96757 SHA512 65721e6801629a1f2963b2dc398ed5e5b0c7e056162713b9a20b0368059b3827496135bdb9762c98a8a6fb17537318b82932f85f511ca9a7714529b57f2ac4f8 WHIRLPOOL 057b08be9937fe89e58801551b710304eb7d165ec187fcb1f7d8c72a561c9d83adce31da559b4e95a4813cb21571bc05683b7c1590ffe887fab30402cb45a1ac
-MISC ChangeLog 4335 SHA256 93f6dfd07ad1d8effe82674a216988b5148507e94d72e19eb34d2d59feacf1df SHA512 e5378f7909092f9367570bf720ebe88a40dc25eac6d6cf454959bc71b60534fe4a21623f7365c3929a6e70ef380739e0a26e8786f63f86df60baa5b1338ce4f9 WHIRLPOOL 3e8663e995c906e160e3010d857ca158468903982cb044aff21b1269a7889723cf25affe8b25cce999a2b70355462143206ca48bfa5e39357242ebc9fd4179e5
-MISC metadata.xml 262 SHA256 695292fff6e9312cfef529fa3e499736737cf93066d4ef5d63215d45cb4f50bd SHA512 960b21f6b1cd2ade92ee90cf121e94066a843178b4e8a9fc2e4baf829f7ed024ea7d204bd67d3c2002471d32db61f295038674d2cdd181cf9730b54b2785fae0 WHIRLPOOL 3ee53b1e0b0fd92a5cc7725b7eb0961124fa7553c8353c067540e8eb845e29d0b3359f95dc7b6be155ff0eab29f14618bf3aa5c219013eabb79c68fa2d97f3d3
+MISC ChangeLog 4437 SHA256 4611a2bededcf24b0886e74c1e2ffcf6c5533fdf3c294880e41ba768a45d71db SHA512 af6f2602330ab06f818af9c390447b4f18d2a044d32d9a377ad9db3546da60d226305088ed9feb97241d288724310d359792c026aba29748d7c7050d0f92282a WHIRLPOOL 7b93c1198ee9f07e35853b6fec52ba97dc44ee86a6b7ffba0b2a79418c7d0b7fdd0d0c65cfbe6117607d99c071e3f1260fc8263a0245291c499b6063b9090bc6
+MISC metadata.xml 348 SHA256 e1a341eb35ee2031e4cb452a42ccacebe57749e92197302ba6f45a90a3f0196e SHA512 f157ae5416d8e1908c1f0765136dadc4ed5449747306eb0a736562ca51aa182c18415f8b0a8e9760916eb30cdc4d73495fbb4b5313ad2eff961626b59e391da4 WHIRLPOOL c49f55f0bb6e3cd28d330198a8a63555c624da67ef4f1e3c090236bfc01d227c94ec4d6b7a1228bc88f6012117f14faa0701205629a56dee8c0d3ca4a838d230
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVca66XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiqnQP/187nb56621kmSzCsWB8/QD6
+8EsrTBcHGvsW7Ef9PzXrruceecRL1/xWjm1XwTYhDTIPIrAJBkHqe0PvFME/KW79
+bgpWC5BSFh/PeGVbj9UHq+p9C3JWzwQW///MeLlvjuMacC5C0UhMKhhgLvy7+mkv
+/dnl9N93TdUF+x7qV9ZBgkMel6DEcOD5+KJH1JTKkGdyo0R017tvm6PZB/MazOoR
+bp9JKE6rvemRI5LLlgsqZFsmXW+vrAE+yKu2kUTuIGn8nC7F7y9u7brSfQRPQ/tG
+AyXa59mATlJO9I5XkOwQnY/D8oIY0fmM0t1+JOWCbq/utTy0OZg5616CoNAFYrxM
+AUmDdAvMYjakw+VpPMVgWF31Or5/1cIYB0V4OFclCkFPXOTrvdl0ecTIKXxot62K
+kN0H2gtG3Kah0cRras9dfBNT8vNOP8x6jDiFjSubhQkaVmh96PyIG6g3KSrOuJsb
+ZB+110CYALQyvK4I51AKUh5XF3WOIhGsyzCaCYlagzBZ0/R0pff7rorFZmPmk53h
+KQk3VD3I/yatHkTOQ/47mU/WrOXImumNcgeOISsDGEgtASKNGsgdv9FrStCAyXjO
+e4NmpfqS2sbz/zQ9ZJm29uoMnmsNdWbsP/05oExnoHfDlcttwN93kcoIJFTkN+b9
++YuIj4GIyiCVwv38at81
+=bnqJ
+-----END PGP SIGNATURE-----
diff --git a/app-i18n/ibus-skk/metadata.xml b/app-i18n/ibus-skk/metadata.xml
index 8c66433901bd..8603c718073c 100644
--- a/app-i18n/ibus-skk/metadata.xml
+++ b/app-i18n/ibus-skk/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cjk</herd>
-<longdescription lang="en">
+  <herd>cjk</herd>
+  <longdescription lang="en">
 A Japanese Simple Kana Kanji Input Method Engine for ibus.
 </longdescription>
+  <upstream>
+    <remote-id type="github">ueno/ibus-skk</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-i18n/ibus-table-chinese/ChangeLog b/app-i18n/ibus-table-chinese/ChangeLog
index 7044d036b1a1..3d3c32023ee5 100644
--- a/app-i18n/ibus-table-chinese/ChangeLog
+++ b/app-i18n/ibus-table-chinese/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-i18n/ibus-table-chinese
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-table-chinese/ChangeLog,v 1.3 2015/04/04 15:29:11 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-table-chinese/ChangeLog,v 1.4 2015/06/05 14:15:10 jlec Exp $
+
+  05 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   04 Apr 2015; Michael Palimaka <kensington@gentoo.org>
   -ibus-table-chinese-1.3.5.ebuild:
diff --git a/app-i18n/ibus-table-chinese/Manifest b/app-i18n/ibus-table-chinese/Manifest
index 95c61cb8fa91..b71b4d0bb157 100644
--- a/app-i18n/ibus-table-chinese/Manifest
+++ b/app-i18n/ibus-table-chinese/Manifest
@@ -1,25 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST ibus-table-chinese-1.4.6-Source.tar.gz 7604868 SHA256 5e3422e59417e70e65cfd342cc3c0627a3b612b1405c493df0245a3841bd9386 SHA512 52a72c388ad287572ae334bb25537b6054f72ecdd641aa1c539b85a5e9a4cf97801ae38baa8ace1caabca95d845d2fb4156eb174ac7ad1c9123409749318d76d WHIRLPOOL bdfd4203fe8954bb02002bfa3868e67f9b1aebcf1a416cc281381601ac42020b98b344443889c7714ce456a171710f00b1f0c0f34f7eb42867a9da6382d7a174
 EBUILD ibus-table-chinese-1.4.6.ebuild 642 SHA256 265000df144446d302daa2ebd6ad196dd6bcc4854322c1a9df0bca74b48824c7 SHA512 016a5eb042dce0173cc85936be50e9544965896348328e40cbe579c91f91b517932ca31d87ed6668d36539284ab0ff25d24f3fa021d628a1bb778cc3e8510bf5 WHIRLPOOL 0eb818d7e31bb38fa1347a47e5c18ef47c3a7b4283ff963b59e61cedb78c10efb3a2815652dcc57388e06479d555ca2d58de186dc0aa54211d5ab41ebaf9f8f4
-MISC ChangeLog 670 SHA256 9dddc5226f8635f0b42323c2391e441d2272d6eb9873bcd0f3d5f3dcb0f48a47 SHA512 7610d5ae477cf08d5a44e079685959189decc8653b2be3161bc3bf942981d35603247d6075062c460a74231670e41c9a0e7bdf32efad436a44c6947e17a74698 WHIRLPOOL 035ad15f5c61c0968b4cff1886f9e0da4e8753cbc9c7f0788448735cc5df86344906d5c76155e23aa87499e1ac67a4af4c09d40ae19683415cf684d0be530b23
-MISC metadata.xml 292 SHA256 18abc778c6dc9f37d96cb53a46b78c61399b4bb3e834187950cef50770be6001 SHA512 3f27544d22f26ee572ed86b54ed728f12ac9efe68d434f14d5b2e79bdb9f9332e4510a0c14c2b1db3286dae3bb58de14e2d7b51008f88e2df7bed4d3f8ae00a1 WHIRLPOOL 7620bbde9ccc2f5a52634a145f690053b00bf6c593e1044a410783a2fa205dca4756a2ea4d637b8075f3bfecffea7452df0a427b1440f4e70a7eec917731f80f
+MISC ChangeLog 768 SHA256 1d3efb4eff8946b819ffd3e347fdafff0efc81089911a12371ae9ebd3d9731be SHA512 870ab671818ca65976398a4d949c51b3fd2d6ca3252cc287467b5716e69f169258f0564937bea88e9dbc0dd60c62089486dbab773d6fc8c2890276e8ce8c449a WHIRLPOOL 9d1d66131dbd5299c106fbbe3188f2d56f90fb61355935efe49af731caf92bd72c86cddbd224f77cd408032ebae76427f701a47f401597fe6da26ebe8ebb9cf7
+MISC metadata.xml 370 SHA256 db577352ae13a516e074b66ccf6ca9c05d4c6556cb2b7381c66200e7c3d6f680 SHA512 3782720777340797bd1cfee732001409ac1270f6102ea0419ad9b64347f777e80d2487b86d045280b61aace4b38511e5857a9dc4d217587e53d7bfd52b98a3eb WHIRLPOOL 2c74e333497767531bfffdc6e67dbf3e0c2ed9b0bdfa0e854a50550d28ada7d4f71b836006351bf8d4a6c8ba74c339c35d1dbe641f726a95571608349e63628f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJiBAEBCABMBQJVIANFRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
-MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
-7BTrD/9cnMgdOCfcw6XUAOTfH2UMjIXGfPoyMU2Fj8FS3rbebbnywz5OvcEc6/D9
-T9MgD3EweV+zds9AJbhfn5R3SbNW2DR285IYEci0i+vypeQZNTlVOLKuFDeXeVZg
-5CD1XpKly91cZav3UaU56rd9sR2zUnfVuWilVuhtvEVO3EFkTaepKkgsH+vrgg9J
-TeFE7aIJTpIUt4ZOdozmcuewBXxuGcIkkuYsoMsKCivMzUT2FMgiqU19GpBS5UOu
-zPfiOk7+JOPDmVolMAtjOufFFr8E3lJhuBEPhocuf5QXuBvjEf4kM/qGA0CL43Ih
-hjUR0i7N1TjcvbgDHCg514AsyiWEpyTYwAgWbsY62SUyhhA8TcPQZaignvjmvqfg
-NtgHlJ91MiCLg3wRaymifVxnXDuYjfW6HJJSzNXIZADPyHmeGs/vzxGspCDp/GeD
-VCw4SCVJIeh8n8bpqvsdcbwqT8WsVZbOfINxkLF04XcyVA7XRwVVp+ebSZRUkdHv
-BvkRdpYla+0KZu+cU22jHqu5x8yHL49wCz3sTiWrIVQdGMsDIkeaKtl14dpOPzza
-BwuAqcFWMpzFoZUXW1yMDOPpqroniOqsRElyukH8ODK0yVxI+kUB8be7aCKzmqV7
-2YaAQ2EEDzi8YSBEaZZOWOnsFvReuTT9s91a1gMbg5hCL+hreg==
-=keq+
+iQJ8BAEBCgBmBQJVca7vXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmib2MP/0vRMHHgynZt7e4kfGY4g/sB
+7mq+ZsxGO9G5vVm5Ffr8sGK27+3sg6iFiOwWBq82Tk1W+X+Q6alnREUYbelPz25L
+G017HytdMaUBepMrLFMTlALvHnldWxWP8sWnvqeubB5dmekVWmt1wE1PNZbqrnH7
+FOVvi4W+g2AJqzDRYhBcwzNoIadJoVCg0A8wrbECZPDeboVr4FtfJFftVBy1XtyV
+3Uy+4/JCXYV9EBfXPNkoAVdBk0dGWZZ0rLUiHGN7YTKhBOz81fwMNaRCfBmf1W5L
+YQxKknyuJtPEK7WWsJfCM27luGqPXaTwUvMheXr12Ik33Vp8HvBMiYXWJUWlypcV
+AXEdJYraFUBDX2ak8MpYQqXl/OhDOS7dCReH9yxM1cjsJ5ydphzC1fb+Xt+Ye6SW
+221bMVo/GnZdH65eIVhitZuzeuvJxDPcrIfSHi3b3Wn8G6HaXB5Tt8Y+4XogkR3H
+LyszUCAYhSoY/Ge+kuJ1MLgAswV3xjmY4lMBYPnsjlekS7yiNbc2sobT7kE11KRS
+glGO/tNMXi/czZVVZJUuPv5Oi56OWGIw4vXb1Y2wycpZTGY4N4QGKGxb2/lBb08n
+tpOENgthHTUQvqh6jYPICrhIi/vTnCtZGOlFFpUstvwE1w6Cl3CrrdoMlW1S9BkU
+P2cdniClgCPO0wG6+3ze
+=H3f5
 -----END PGP SIGNATURE-----
diff --git a/app-i18n/ibus-table-chinese/metadata.xml b/app-i18n/ibus-table-chinese/metadata.xml
index da7a6f9be20c..90760e39892f 100644
--- a/app-i18n/ibus-table-chinese/metadata.xml
+++ b/app-i18n/ibus-table-chinese/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
-	<maintainer>
-		<email>cjk@gentoo.org</email>
-	</maintainer>
-	<upstream>
-		<remote-id type="google-code">ibus</remote-id>
-	</upstream>
+  <herd>cjk</herd>
+  <maintainer>
+    <email>cjk@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="google-code">ibus</remote-id>
+    <remote-id type="github">definite/ibus-table-chinese</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-i18n/ibus-tutcode/ChangeLog b/app-i18n/ibus-tutcode/ChangeLog
index 8504bb620242..e6409c21fb4a 100644
--- a/app-i18n/ibus-tutcode/ChangeLog
+++ b/app-i18n/ibus-tutcode/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-i18n/ibus-tutcode
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-tutcode/ChangeLog,v 1.6 2014/12/27 11:31:15 mgorny Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-tutcode/ChangeLog,v 1.7 2015/06/05 14:18:21 jlec Exp $
+
+  05 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
 *ibus-tutcode-1.0.2-r1 (27 Dec 2014)
 
diff --git a/app-i18n/ibus-tutcode/Manifest b/app-i18n/ibus-tutcode/Manifest
index 433dd660b2ec..bc643fb5a4d2 100644
--- a/app-i18n/ibus-tutcode/Manifest
+++ b/app-i18n/ibus-tutcode/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST ibus-tutcode-1.0.0.tar.bz2 216599 SHA256 d0d15f43960ffa0af22ddc7461add7e08f65d3006ed75de35090e5e42419d098 SHA512 36c5e0b74c5cefa221fc9c15ba3b334638044324730887a4c1b70a8c013d7b7651832503339edb28a15929e052d833a6b3f9cdc104a47b80ec62a38413d411f2 WHIRLPOOL 80031d2a65c8be9272f804b641488028a04025fa4f3ff2c13a8dac5413ac770ed0de40fc51c81a7eff2ede95652ae302c1bd5757e1643f7c66b457e8391ae294
 DIST ibus-tutcode-1.0.1.tar.bz2 217017 SHA256 5a3bd8a941602e33799dc6c8b09a38e0009b98c004ebf4557cc6391221909900 SHA512 2b0245f5188b91d668ea503793acbad149471300e593e13eef6f433bdc3e5ba89dca52cc843751c5be1bdfdede390c9b35ed8370d4246e06f3261b1fed31f0e2 WHIRLPOOL 149c7ca6e1b98068aa4e67132d704de8d7cca0b8f5a0edbb621f53f69aa28c665265430053668de3422648c4a11a8aec6595c2317bca4b00c4ed459ca2a96706
@@ -8,24 +8,24 @@ EBUILD ibus-tutcode-1.0.0.ebuild 601 SHA256 9bb4fd67bbd6561f4f311509e0dcaeb6e9a8
 EBUILD ibus-tutcode-1.0.1.ebuild 601 SHA256 3d414c85ce3abb7b0ba4f365cb74cddc46fa7deb1dcf9273b6943abef02d2f1d SHA512 8804dec17fc82b72a800abe340364c499453ffebbd2e360b2f0745b93f343ba081a4ee4e09fdbecce7811245dda6aa9d15a17db3670013e6f7baf5e4b213a791 WHIRLPOOL 67b033d3aad1a28d9db6323fc43548ca8f2fcada4552c4d254c3c7c75b9bb51d39479b34f7199ed938d0ed9dae006e550d4717ee502560c297c90249adc5e956
 EBUILD ibus-tutcode-1.0.2-r1.ebuild 843 SHA256 cc7d96744448157513c5bc540dda31f2403ddea601b7541f5255e287a2999c37 SHA512 7eab87377c76ceedf37eba471d66719dc38c5b32aa4d15c07e689fc1c71a8d6eb99c93812d3eae6a91a3a7c9fc27c657a39d8b4d58b86d4630d2c376342255c6 WHIRLPOOL 50f9246d2ce35cc56c0cf1494d6bb60675d708800853987a70698da5913cacf7faac474fc3351bcf556f089d0dd22529cbda95f0c1a2ded66085e8b1db9d2b3d
 EBUILD ibus-tutcode-1.0.2.ebuild 669 SHA256 0204c93878620caed6b8626c52adb7d58519e31a6a67da8a75996147f0959752 SHA512 ca2ab2d9163f909eb8d321989394c6ccdc839727a7265bd4d46b8635497ae8b046973ebe3a25eae9d09640cc3959808f443f5fd704f463c4c2ad1fa6350f9cf9 WHIRLPOOL 0c0b7f78427c49db0a9f28feef36af740c099d67d6bc179f76c85f793fbb61273e597c011635ebc8e8efbe2d1b67521591da0930d84b24ee6469a70303b26255
-MISC ChangeLog 1090 SHA256 e5c49d396e2e9c3f0212288f3a18e00e1c971d6430643eb13e44513588f7dd82 SHA512 466eb2976be999aa0c51d158d39487bff33d9d373b06336ecd1deddb6187a830ac6ded0b71bd4d717be330882fc31f0adf335291c568da639c8ac546ca223e3f WHIRLPOOL c93e02f8a31a424a1032836903c42736f154e1889cf7c71e68caffb45c938d6d3e8d7ce5a3594cd30ee62845bd28c43a836a010f17755f6e17d1cdf7a3421ef8
-MISC metadata.xml 217 SHA256 e87abb87cd7b5d06ca0690e7e16b1f4a97a2428e19a8e0242cd9ae37acf660e6 SHA512 fc101f88e14870518577f0443e90a328eaf1f24f13f8b3a2db1613b4d44bcfa16d70a557c0e1e18f043f0d53e6cb9109cae1a06a68671f9eafa9d20049ffddce WHIRLPOOL 2da4b603753415f4515f9bcf0b2b5784da41bac87a34fbf2d864d878b6b972ccd51e84aedbccabfae6fdba4d8467e8ed13fe5223c4e6e20e337cd1411861248d
+MISC ChangeLog 1192 SHA256 0dcbc1ed32684333e2b929a30d47783bcd1e733c9d02419d60136137ebd55bb4 SHA512 769da1880e9ae88ee69a6bbed570b52fbb2ca9e5770463421b3b8e9471627f876950592da3b2ba66bffd6600c2e67d628363535abc6039d952212fb94ea6f0a5 WHIRLPOOL f3ce745e90c536595968100ec7483057941750253462e28a8f558c31851590d18276916cc6f0365ceab3d7b7ec3e481e6156dc8bb4a80f262ac30ff589288b1c
+MISC metadata.xml 312 SHA256 722811c423a87d8089de395e8257165e64e83d3560081baa11d4780cce812157 SHA512 75e1913fa5b771415e1ac278ce596732b4107f6f57505d85261386f83b838f96629405fe8003bca489d6fce653647c3d7c31a3d0848ae6f65194cb280a60e331 WHIRLPOOL 57712c96a3491326aa0da151ec8f5b2614c8698fb842755c0e5d40eb3683d35e03cecd33c1ba18e5cefe8c2c395da1e0203bd9738e623826ff64b51302552b67
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJUnpiEXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO5DkQAKjqtzH4A0dVJ8dZnq+P3XWE
-aA/oFbJ68DkWAjxHY698eAzbL/sjbsGS4Tjn80aFAch3TSUdeCvXo5jS5hdpyChm
-0y3SwqdxIIO2g9AwWbCCgMJ8dc6jXEYn3X1b/hWIRE2auF2nVlUkZ/WjSzK0nJNy
-qkK7zxkrYiYHjlISO7V7hO3ZlPsisCIvAEovowU8D2Qx9ClBiAdDVPmcRivvBysU
-Fgj7wn94UAVwriCGOKCv7iCtjzDqqfhHk8Ca/dRdZnXm5zvEIG/X6C5i/3iiyQtp
-/ZSi8qR2ThuMyK9EShpUru8d/mYYZ8Xn6wzFIt9UnldcnmxbClvKCql+AHKkUsAF
-se7gBBeRZ+4TSCgBdPVOyPiH+aSBns3Oh/GfbMTw1aDOMiZX8uI9Vug81X2fYLsP
-OzKEM25cwSOoX6fYUf1la9UZRyh386Tx48zvzOopRkIb313h77gotq+vWgaOYUTZ
-/HvcetHdffV4jVTwYN8xyPgb+lAJMsiUXSzdLrGDCexjpiTOcmuvo5UiDCgLFvEi
-TtzblwTiSF0/HY/iGS32tbrW9Q6lZnduaDX3JW9vsnC+nGM3aDv/sFsiWhbEcKGl
-61juVGV7osw5/RgujszM58PWzuGBLAut08aTK64wrACVGeKt/zpD4QSMNHC9muFI
-zWyPnGQuJ4zNztahxL6w
-=dWW6
+iQJ8BAEBCgBmBQJVca+uXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmigBUP/AttguKyoPt7fBEpvmaCGgmm
+sKaFEy1QA7GoCUN090YjVQcjqW7GXEmA8KanWMK+J00KR5pmywvoPiYOkVprK7vR
+huGl53ilRvqNclWFcDBAeS3dPJapo61PTxzq+y3pU9Jtfo+C6yJWUFX+P7sOmezO
+MIn1PX7Pgt1JwvQKs7ielhK53QDHXew/5wTaKwxHF4nsmKmHRvwGJZbFWb+9mjVf
+JTvQ2TOj9AoxiSgfg4+I/cq+yPUXCMktDvLj9Jp2LH5OXvSlh8lRnz2qs0yGx1xq
+IecOiKhK99naJlp4poQWzAGaF2sxGkIBMWc8BBdzoW/oWyR8qW5c2pZ7qUGkEd1C
+EpVVXouLzr9DuMCpwe79fxnClbI4hGkpgbeYFn1Uh3gKKVlaFPiFGGfiujQVtX+H
+phuT6+XIHWGck5EybN91aGfBuK1dgB/6MeSS3IvCAZa+zepKyLMT4IjJbxrl2ze1
+xFv9odikL58I39tkn/QgxW21aVL5HI7vap4gdOUvEIuXB01h68ZeZNQMiEhejq9J
+BuXLtOJY3ZWPmU8LwGzNedO43YVjmV4/jfmDS4TgSWMELaIEXSymS9cMlnycJNMs
+QYXaSDw6LefGXDBKlCXlpvR7tqZMxOLl/Vp9cKftNDmypg0G4GCAel41LSRhY/f5
+Owcoh0vJJsOMswQLrLER
+=9Fau
 -----END PGP SIGNATURE-----
diff --git a/app-i18n/ibus-tutcode/metadata.xml b/app-i18n/ibus-tutcode/metadata.xml
index e54e2c67e341..f18ac2c4cac6 100644
--- a/app-i18n/ibus-tutcode/metadata.xml
+++ b/app-i18n/ibus-tutcode/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cjk</herd>
-<maintainer>
-  <email>naota@gentoo.org</email>
-</maintainer>
+  <herd>cjk</herd>
+  <maintainer>
+    <email>naota@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">deton/ibus-tutcode</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-i18n/kde-l10n-scripts/ChangeLog b/app-i18n/kde-l10n-scripts/ChangeLog
index 176cf79607c0..66ce2121538e 100644
--- a/app-i18n/kde-l10n-scripts/ChangeLog
+++ b/app-i18n/kde-l10n-scripts/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-i18n/kde-l10n-scripts
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/kde-l10n-scripts/ChangeLog,v 1.8 2015/06/04 19:02:18 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/kde-l10n-scripts/ChangeLog,v 1.9 2015/06/05 14:18:37 jlec Exp $
+
+  05 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   04 Jun 2015; Michael Palimaka <kensington@gentoo.org>
   kde-l10n-scripts-9999.ebuild:
diff --git a/app-i18n/kde-l10n-scripts/Manifest b/app-i18n/kde-l10n-scripts/Manifest
index 98b73ae7cfa8..ba71c3f038ac 100644
--- a/app-i18n/kde-l10n-scripts/Manifest
+++ b/app-i18n/kde-l10n-scripts/Manifest
@@ -1,24 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 EBUILD kde-l10n-scripts-9999.ebuild 777 SHA256 bcc914aa40436d90ee9885e961fdb175a83e9b7673393466c6513595a6cde9f5 SHA512 e577bf6c0c64cc45e637e61d532989233ece5f51bd38937253a2bddb07548ff8de473d9300310b5716c064d285bd433e239e774448beaac8e0877673ce8d8aec WHIRLPOOL 91bd190d4f6ee8aa843776334b10b91cbeebe21c81b964c28696d21c7eb140236e6697a232cbe1217f2412add120681fe46b0f21eae1cced8ca1a5b99599327d
-MISC ChangeLog 1357 SHA256 54bb8be72ed167bd8322274458ca8639225affb4e1e415e1ce7c67aa58ab6552 SHA512 9e29712a162f4d58b3e4c4fd6da0f6bfcaec97f2eac567066399315a56f328a7656dea7f78a36d7d47ea6b20657425c73cb4fe8f34e9a41154ce144f9fb118a5 WHIRLPOOL 9a3b2b225bf9b70bf3c79fad671bf12692a4249a889718710b86bad36d33afe9bda6e5404ca848cfa6ef0ba442c70af3c117ac862b04bb0358718ca6908585b3
-MISC metadata.xml 257 SHA256 8f74feeaabcc9a4fa0a5eab561524fb5a1b3e38911fd704ea4ee71ffc212f135 SHA512 47e383325335d1dc78de8726f07032f12a2bb6e0a1deea7ec69dedaee90b3af314da4516a41130f88bd60c31511d8202763fce67d2e0427e02bd5c06f007cea7 WHIRLPOOL eaee25577d8298214d6f4d520138835d25e17ac266bb45f19afb10d31d7a60d3b543ba6367a6f29b785378aaaad80cad301af95efa41d881b9ec6e368198c807
+MISC ChangeLog 1455 SHA256 27f6cb886219f09ce00f0e490a88581bf91f04747071a73b9c3279e8a6c9fb2c SHA512 7e02fd075ffea387f36d8a556e6ebdea9f5ba6df8a07cd30b253a14f70a59eac0bc24f61a8e5041cb42cbe830723a72e72f37b2dc2298f44e00acd83b7c0aa8e WHIRLPOOL ad3a05f430ea0c3aa21354ce6f731e3e46a758ed841b34ac58e181d6b926e78965c19fe6dc41f85cc313e0e1a60bb3e879ca56849785b7c7f1491391353c4210
+MISC metadata.xml 351 SHA256 43d82f0ee2b88bc7c75128397e4ea49906a47743be862dfda7873b5e62dbaf66 SHA512 40ca180bff6d096f6647180c016a75d943ab6d67f7efca239d4bf645c622dd27e05ff7a7dc8c31e808746a2a7adf4b6a385fba4e1b8c69abc79520ee26a7554d WHIRLPOOL ca449ceb4d30c9755dd782bd05915b0cf1b7cced394f03756fe5eb45d4bde768465c8f02dd45eed0c33894b8094436c4f6ffb70830a408a6169980cdec1c84d3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJiBAEBCABMBQJVcKC5RRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
-MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
-7GoYEACYDErRXM96v2yy7r/F8nVEPdyNXb+SYPx368Q4n1S+i47ALUW00NBWLzaV
-5LHOcXwv4UvZN+Za13PTc7KsYy81Nj9aFHu8dUceMyk8Epbjiw/kkZjtPH0DF781
-bqaHMqaIkx0KKOF5mu7FymCvyFNMM2u7YEZCooy7yZHhvyAKmBt+xg5uL/uTND6t
-vqs2epBCPwKBnVg+fIoy5dGSqABx9/HGJ/1O2Dj+fC0cTFSSkoXir91WLiLkQcX3
-OFJ/yw91XHcfoh5xd5eDdSo8bi+MHS3vMRJqIaAUnIxLHIWp3DWNS8zYMSC4Mcx9
-fgzogvhu8Vipz7iAhLFfPuJcFAxOTRjHj73FErVcrLlwyEMex4mriZn/eAmoI/0m
-ey241hgLOixLAFxoqWPvPzfNA7zGVUxBkwc/mnmBDokah/M0ilU4lnj3jwVoGQI2
-hl8DVSF0eN9oA4BtiEcVGWjbq558hJwDTIxe2t29OW/aBTUAExi2zTuFZ4n/f2w/
-olXEAcnZK4GP8DleaSTuRwOGqWfQsl0YIp9wf9BydSCq6U+5CrpJfOgFLMIeMUkO
-JjB5bE2BkNxhgnuqM/sgeOIAVEbclSE7FY7XOx3B1daMICodmbmMnwCJMigXTJGv
-qa7EFncQSwx+keLHpdF/aRru4N3wS1y3vKPFDIkwGx6EjcynFg==
-=ts4I
+iQJ8BAEBCgBmBQJVca++XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmid3YQAI4Hxy5t0kJHU1TtWtLPAiWS
+azwitM4v47UZLAW0ydUgWpk99zhkPZr+F5hz7QVOJhpim7eWUrQ2DyQE4MOuroMa
+I2Iguxa0SFqZ1jaXo0oFs1PhX+rkTfIS7SFZu/JME+1pBI3dIMGi1HEWeHxB0VK6
+mnfILYvZe7t0NL59HQRbWkIc9+g92Pa3H8zNScF93EahN28JlfaMzK55fJwZVLnE
+xy5SqIFuztxfxI9d8gX7a+yPuNVb3WP8UHjau60+bsMgNrNCWepQUZ48eVOIadxS
+FW69QwNDDm/X99K5ph570QIhRtaHTupTMa3rZBcewk15wyHjrrzlAgUkGnA0pvo/
++HL99ljTyCrya+qt77FvbcQKpgD8hvkWZT2psr3IMitkW2ZvlL6EOCG1ePIurejg
+3f0clIvad7GoReeZNqLDAlDro+X/vRCfexnBOyZ2A1lDju+xbfufYP8YBDl0JyGB
+dF1Pan0tlECHqM1F5G4rlBoG0qZzZ9r01KdZfDyd3eR8GjHRvVYaYhYypJCcmSwa
+pau1Jtof2R582lGcEtNWL5RBtNs8UEHgcqhwnm0jug/xjVrorryLWWO2dlM7kaqG
+0OqJWmvo3tQLCL1K5+vYgUlej7pwfP69p87uWaQwwklA43do58S785vS52bk/A5w
+K9gTpJP9iS7e5ECyx8G+
+=cFWa
 -----END PGP SIGNATURE-----
diff --git a/app-i18n/kde-l10n-scripts/metadata.xml b/app-i18n/kde-l10n-scripts/metadata.xml
index b411ad45d7b9..c8d8de0993a3 100644
--- a/app-i18n/kde-l10n-scripts/metadata.xml
+++ b/app-i18n/kde-l10n-scripts/metadata.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>scarabeus@gentoo.org</email>
-		<name>Tomáš Chvátal</name>
-	</maintainer>
-	<herd>kde</herd>
+  <maintainer>
+    <email>scarabeus@gentoo.org</email>
+    <name>Tomáš Chvátal</name>
+  </maintainer>
+  <herd>kde</herd>
+  <upstream>
+    <remote-id type="github">vpelcak/kde-scripts</remote-id>
+  </upstream>
 </pkgmetadata>
-
diff --git a/app-i18n/libpinyin/ChangeLog b/app-i18n/libpinyin/ChangeLog
index 7add45a9a025..38ab630ea450 100644
--- a/app-i18n/libpinyin/ChangeLog
+++ b/app-i18n/libpinyin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-i18n/libpinyin
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/libpinyin/ChangeLog,v 1.12 2015/05/09 13:31:23 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/libpinyin/ChangeLog,v 1.13 2015/06/05 14:19:34 jlec Exp $
+
+  05 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   09 May 2015; Ben de Groot <yngwin@gentoo.org> -libpinyin-0.9.93.ebuild:
   remove old
diff --git a/app-i18n/libpinyin/Manifest b/app-i18n/libpinyin/Manifest
index 79a9c847295f..46ae03b3c584 100644
--- a/app-i18n/libpinyin/Manifest
+++ b/app-i18n/libpinyin/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST libpinyin-0.8.0.tar 2682880 SHA256 42fdb08a880a8c42a25712267463704f988293e0bec20871a306022aefb08290 SHA512 762686b9e2fc95e8071832735764c54cb6252fa40bd5d3eb1e15445a267795b775288cef41f671bf4680f13c0a8b44377b12696ade832b80684300e1dd8787a0 WHIRLPOOL 0be6445e6e39c2f8f9124d0f549d11421092364d55c9345f2862f465ba78044b01df9e338acba055818a7d735e0c41e8e71b3f2f03830a14dd196a9dfe2c9107
 DIST libpinyin-1.0.0.tar 2744320 SHA256 ba72c5a71f373771086198b844470d7384cb25b293f962212b02f8f4d718e40c SHA512 577d6d3d3e647a4a5047e3fc019d0e5b7778f49a229eabbf71da9ea73f6d8b935e6ca673698ddfb7d677e1634e05fb2dd0d3811f7b64e7b1184504160af42b87 WHIRLPOOL ad0b975b17010bcb5481eb3aa7304880fe97a682c8fcd0944a9070cf5148130c90714205fb16c440476667876b9f30834eaeec0ec6ef948a5dd59a1bf8a10454
@@ -7,24 +7,24 @@ DIST model.text.tar.gz 10285854 SHA256 a4924c5b5923c3ff9ce55456a417486d07d3b2f7a
 DIST model7.text.tar.gz 19666966 SHA256 c9a3c38e6439302603b5c3772ea9dae280b4ef46bd6e8762ed40452dc400af78 SHA512 74a56a23cdca24124037f688ed85a921089155a1b9a0b61e646f805b2bb698c56682c5d6a47ff86657c8b131a831dbee9d5cc5165d4c1f235b77fcd5b2e480ad WHIRLPOOL 5285398bb6bd431caa3449b9540a1c08dad785456d9152fc44f6303866891de5538da4c5945eb8e8a0b64a081a58e7e6d25caacd05e2e3a7219e4335f0414986
 EBUILD libpinyin-0.8.0.ebuild 840 SHA256 6745fabb7938220cc9eac7dbe4db4d747addd064d03c1af588a882816ec5afa3 SHA512 279ed6c104c75998ac82d0a96aa6b54b25b73620e0de0067942c1c03b1eef2411b3b572d946cfdb0cdaacf194f874d30c47477350ebe0c187e098f7f7b9be28b WHIRLPOOL a55556e4b3dcf72ba84bbd665784d58b154fbc8b1f6ef74d670cb19f8a7d484c953bd5f501663fe0a65281b1e680c207a0be2847724e7c4ca4e4b2f093eeb4f4
 EBUILD libpinyin-1.0.0.ebuild 881 SHA256 ce92f633a71eccc9f1e442d3422b1cb4c5c3068514dfa0c079e390bee8ae7105 SHA512 844fd5255dbb2f26d46e41b3212180245a7d903247e253f17c8ebc9db03747547a903687b53faf44fde88482604177c9bf5601949e875ea9ab1946d9ee7a0614 WHIRLPOOL f39d8f4b1dfaea96d7ea2e24f4d574ccce6c06571e049511efa23c8e42dfeeecf52de85355432c0e0fecc70d06cacb16c7ab24aa0da702dd0df40be182027efa
-MISC ChangeLog 1664 SHA256 ed2556504fe1e8a75be024e9eaf261854138282763739a07172070ab6f52094d SHA512 bae65042eb11546f9c327dd7225889f9c560ac3514990e9aa621e6266ffa4a651a127794c77fdf95d0c9a896fb5d325e29df42a628159384b02b8df51167e7d6 WHIRLPOOL 77360745482354f42695ed50680428974539e0543a9a898c3e6845912b0ce6e5d79f7884c45e5c40083a978e592d2093c1727747b3a57e7f54954ef0f5a790ce
-MISC metadata.xml 158 SHA256 18d71c580f82a389887f4970802b5f40e0a2e4c6019117e64268e008dfb81fc8 SHA512 6198c41a4d69a5ca0029aa9a593cc0ea553dc957fc0bdcd7bcd3bd1af7f84c5feaaf785160b60b8ed75282987818a6367f6092523cacd45f0c35494036043550 WHIRLPOOL 478bed9e1c3fbbcb13f17ffeebc2b9da5f3c48368e8a95c2802a88dbef4773f992fa254e4dc460248d5669021fe4e37b37be522d186da9d97321a58437679662
+MISC ChangeLog 1766 SHA256 b2552097a14cd45dec03b2413140eee82a2886a97e9b7cf8c3d6095b19d2e011 SHA512 0a78262279dabbba9c0d2d76be69e4be81d1991949ae80e287813a31993910196cfe6a43b45ba448f5546b36c88ebf37f6e4c763723a0c3f3dca10815e8ba215 WHIRLPOOL b5ac68f61672058b27971bc436a987c3fa744b0ff2af427a419313477e63c4d755ac9666cd80308c1de213163a6cbdd30a27077075ca2e20d46f989eb9d3b0ef
+MISC metadata.xml 246 SHA256 d486f17b4d4147eb7e5aad36480c4ea93e4cac6a92117e89d601b4e051516535 SHA512 03ed27a2060d0ea1833c0e5506c16727ad316105ee9423755d4a3fabaf2c9498e32155055d30fd511bff7eb764cb2f8058f39f6eccc4716dd938984875f64d93 WHIRLPOOL 556b6ca2a5d5f6ffc9b754e426c9db853e4cec48ecbee397bef0621814aa4d21795efd00d70ffa236c03a3b8d04242f6a07ae6835069ed463bff425377627145
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.1
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVTgwwXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ5MTlDREQ0NUU5Mjc4RkU2RjJDNTAyNzU0
-RkRGOUNGRDJGQUM1MTRFAAoJEE/fnP0vrFFOe1YQAMCPZH0hyUa0jMDFKzjT1L+p
-Bl7pgKp3jrZCv3PvJNxDCSCu3LQnkwQXK130pRHQkbPJlIYbaEvxYMv2LKglHB1X
-MAPcn6EKoGd7QPgdRqMZ1o+jatUrUw4EyKc5VTgssdMexhK9Oa1j+HaKongzySrS
-C/3H0vDes30BfCQsdAHCb5PgD3GViBpLuTJa9xayMiBWKuNbvjBY0s4OIJVzCfhT
-SG0X6R5cIfeeuK1hQ8vN1bkxDSZyVl42w5Oxidt9IDIJqIk5KtbFDdxv/bK3Ro/A
-xLlURx7uBdkVXxUexEOdi3AUcBG6iwsH3iuW0weZhIY5QDL/d2FqcYZzUNd9rbQt
-Mnxa3+Os7QszBdHBpnIya0bePK71p4voCmpES2FNEAV+GiW5Ij/clkFAg84CZbLm
-lpS3+zUVMrv//k51s3YI2iq1lt90WepcOI4QjCMG+lKqblh0UsYjgsGHfzIWOjqX
-aJNnEuJLyT9Z5nMXaGuZFz8ZTAJohCtZFanTfEXaKYl5OhJ1RlBLuX7p6tUUQo64
-wgdfkc+Zhn2YI8QK3XBQA2OPRJJtYDOmXBbJhLbeD4OGMCVCVd5GA/tXGcm+8VTx
-OO1rWIozT3BSdwtzC43qODKqKKIo5L/dk7UFapjhHH2hV7za/TIejbrtFUfUXCLH
-f4UOv3VuWYzJsZqWnoG6
-=8JAy
+iQJ8BAEBCgBmBQJVca/3XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiqxUP/AwkDIstmG+FE1SiWB32hCGP
+XLOUF+CmhUEhxnRbUyP204KnPtGuKtSENghLN7kbYO4DoYj7arSRgPYwY5Uo5N/P
+ChtWrHLunHXp86RDjh1BXwAbeeNx5TmCcQJWmfSwl/lDh309ZGRgQowj9EbHD2ik
+Px8NELqVI5b945x4TKNL0sUF7/1jVgrCI65o/caAMoDkGo6xb+DUzQAivWF33cCw
+S6ZN0LojUFf8KfUjN9Lv23MsLgAiXLUsmZl3l2W2Tu1MY4cKDUu2m4G4ydT2v8Po
+FNrsZ0VkD3t+7PxxuaRfXWyKb0SljYRy5KS0UlEATD288y7VOJbVnwJhqI3LNMSF
+vBx6pgHZ15lsRa51BHdfYbBClJydFfCILd3nJSknH4CBLP4Ht2aHkaoRVF+bzNdn
+Ls7yaLg7unLc+r/yPIi5A09OyJs6Q3xJaTQcUKl2ePaTo+aq4lr0QieP/eon2B/+
+VPypQ+VXGyRN7wkvFoYH9gt7op0tnclETUGbS/t7qwawv3kwwboMbo5YCj9zYFU1
+qvyPDaW5+fXeuKyICGdWKuqMebumU/Gk8re2FArgQL8IqBGYOKm2gwA17hJwONnq
+DqAqBRvOZfMp3GOsaU+glEyOG6Zvxc25vu/WwRcmhFARlLFBZwhYR4l/uxom04jb
+qUNyU61goCXbJ5II8ff+
+=/MJ1
 -----END PGP SIGNATURE-----
diff --git a/app-i18n/libpinyin/metadata.xml b/app-i18n/libpinyin/metadata.xml
index cb36a2fd8c76..97e3d7dc9360 100644
--- a/app-i18n/libpinyin/metadata.xml
+++ b/app-i18n/libpinyin/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>cjk</herd>
+  <upstream>
+    <remote-id type="github">libpinyin/libpinyin</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-i18n/libskk/ChangeLog b/app-i18n/libskk/ChangeLog
index 7a4025bd2a0e..638015a00fce 100644
--- a/app-i18n/libskk/ChangeLog
+++ b/app-i18n/libskk/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-i18n/libskk
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/libskk/ChangeLog,v 1.8 2014/07/06 13:15:18 mgorny Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/libskk/ChangeLog,v 1.9 2015/06/05 14:22:28 jlec Exp $
+
+  05 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   06 Jul 2014; Michał Górny <mgorny@gentoo.org> libskk-1.0.1.ebuild:
   Replace obsolete mirror://bitbucket with the real URI.
diff --git a/app-i18n/libskk/Manifest b/app-i18n/libskk/Manifest
index ec0a2c4c9b48..e735fa57962a 100644
--- a/app-i18n/libskk/Manifest
+++ b/app-i18n/libskk/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST libskk-0.0.11.tar.gz 840232 SHA256 ce4a7ce8072481461671bfa066f7069c88696e6475dde547c73efb37c310684e SHA512 6c2f4f03cad0b464237d0352d7cacaf1a10531847af415b7a4e1ac3ff0784d01fa8895e46835448a2c3e6dc6a8892331ead8a09e075ccf6fa98e0c8db5150c22 WHIRLPOOL 501096fda5cefeff92a2b90815c895a0511c1adc75cbc39b7345d31fa15520d079758c927919005ee768e3884f2784caf7323e18f25fb754881aec48a6895bed
 DIST libskk-0.0.12.tar.gz 847745 SHA256 6d2eb10595cf810c2f31258505cfbb0be41f44b4d8541b99402ed47e71c68576 SHA512 7489b7475f7de4f11fd4394e6a916fd96cd3197e431a325085d2888f69e6afc27eed8ba6989829e98617cfb811b36c83b188ab4475398df83b0f7c46fb3e5360 WHIRLPOOL 32d9c3b6c652a8382008c621763354436a8f373e95811def17ffa116c020aa2e7e524ea62251b9771dc580c4ffeaefa7949e1b5dab0bdabd6a6577eb03e3668c
@@ -9,24 +9,24 @@ EBUILD libskk-0.0.11.ebuild 1112 SHA256 58b55318b1ca22de46e0908768a94683bf262ab1
 EBUILD libskk-0.0.12.ebuild 1112 SHA256 698985405a41afd10f14f867161533dc6c32bf265f4cf3db0623328223da4dc4 SHA512 fd7bdc93bc2bc84345c7c9f3a69a29f43a19fbb3e5b7f121a150637907db19390d26cb76b22c0f9263ac1232b043d20b38a49c0b80c201b0b9be00a9db9c23b5 WHIRLPOOL 5a3c17e9abd7445bdec1f46fb24707d1ab946ed7210df8d3a9f38e24addd6f94182ed483f242b40fc860f9fb1f8bf54a7d99a4da173e2814d3719a9278f46c3b
 EBUILD libskk-0.0.9.ebuild 998 SHA256 c17ea662895337c50e783fc10485d922f4e74ec3d77982df00488d059ee30612 SHA512 2d475fe607b661573283cf4f5246492d43e7f952179c440682bf5e57cbf5f04e5de1a6de7cba941ca2aced9101808c500091ab1a9c0286c78f2027930ec38b30 WHIRLPOOL 6635c985137afcd8611d6aa56558a81d420fe1f4e99623bdbaee54bb14af6d672597a7db955b750c96b91653c1fa898b853761d914456aa30ffb3a027787fcd9
 EBUILD libskk-1.0.1.ebuild 1137 SHA256 1e48f1ba8715e135b581a0f0b9229d347becf45daae762711584d934d95b3820 SHA512 7db862612829b07e24aefe75bb4654e20ba86a3260e96daf6c27cdaa97873dccdbdbfa53a2182bd8ba451c96326e602baba1b09a4ba9805bc028b5c8b24bbd7c WHIRLPOOL 3374ea5779200b48726a2c8031ff8d562a3c58f0e6c84a4bb0397ec1f55633f2ebfeed184b4bfaab121dca076f0d1a4b6cf2e75d8536a217057c36359f1173aa
-MISC ChangeLog 1298 SHA256 405c2dad057d4a37cc33e64d176c2724380490bb7eda55ad6d859253577b3d5c SHA512 2c96158d809d9bc3ecea974324bbdd02f358c2900323dcd5453c65680601920354d5d225fdc4a742fd2996772e3070edf85a57fac3e0454e36a4533dddf1d4ec WHIRLPOOL 31e7f1b3ce178f15a4f7134785586fa9c3d2746bfdd32c5c8964fc138a5183bfa8cc0a3e27c38a10378d388d068b8a8108281fe6c4f99c29e7a56edce9c52327
-MISC metadata.xml 277 SHA256 cfbd274fb3b2be52a8ca235ba8dcf750a3c7302b0126d66b250136a6310f4e83 SHA512 8b1eed88496087d1faf37aebba7ac070d5106f4fdb4474eb588557c3e4b7fbba09636329f912cfbe3db9746a739c7e9dc96ec74826a54a34935554988d1a60e3 WHIRLPOOL 0073dd8c2fd1ff78ceb8cb31cbd0488009de6d57c9d4dbbdee61798644f209ef53232c68510c43b74e590df5a719265b37d4654c81a05334868d45841c0d03d9
+MISC ChangeLog 1400 SHA256 b2a1b9c9ab372b1a94777fcf1ca0d8a3e1c8cc6127a70118bb33579d9dd21daf SHA512 2a6a0323fa46fdd0f79f5b1b9014ddddf791f13d8c9cfb009d9a9988116bdb37d434ff4a2fadbc8d4f0abc2ebbb3babfe4b21d86e4616ee97a63655246b5699a WHIRLPOOL 94cf088ed6cfb8abdeba270a7325aa567b49ec02dee4c271e7ed7705436aff28bc2a8858a12085d49c5643f27648b5d18c328d0a61682be968ae0d2241589da7
+MISC metadata.xml 357 SHA256 713d9bd38c521240b71cc716cc6ce64da09abcb46aaf0cd545d5a686e64128d7 SHA512 db6a92ca8ca7a82ee047a2d214ae3d3b58eaca1997c95b6188a914c1c2be7810dd4a19eedd1049fac36c1ff32ba8549e0becf7f40b755eae2276907817edc504 WHIRLPOOL 307aa8483421e4c2f9de8a0f8f4f4e3bda57c5748e9dd6c308b459c35a7055efb785b3bd31496eadcbaf3983f8174ca3d343dd2516e200d92a08a20ced6972fd
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJTuUvpXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOhUEP/0zh8FxyShA/RgzIDo/6m9l+
-pNMnZ7oBMVHwmcVT+lUB4B0ADgxJ8IbK6O7oqdh4ZcQyceJv9SuXLu/pKUph2jDM
-I9la85OjsAiaDqQsbw6fXaE0w9VvEI8/+Z51nGTCnX55G6fpHaGD8S+lymIzy1YN
-Phfud9A+9y3D8TgKeBcZMnVpsfbjcOq4B/z1KZVfx187syoPpV5n/heX8kcNgWjv
-nKRjVk3QsXrsywkydArSbvXRwCVEdls3KyFnpNYFxe1WvBv2UUA/+U9h1xqvtyhq
-RRV8vEC96XHlgPtBFRz1n5vqTvcA6NE490Cn2cTM2le8ZQhvdToz3VtFt/LIV7JJ
-gL4/TwySvhSMWyynXJCgvw785H+r/mC/6E0nU6EjQ6LXIIJDJUTCTE7pqw9wjCDo
-H6hr0+0o5jVZck5kjtNQj0kYmeWe3pOjjawOVaPYt726GBA9vFeLBAFqbpp3BYxG
-U2hM13UOEL0NAMZqBa+PPH/Ej3e0Kni4gc12XrY9nj9mj6cgh6JoFSR4JP9I49WG
-RIktpZu8nxoNdNmpgJFcQlADRjN6cRiuGH3SS/UqPtSDg/fsJlXESDXuyrIFpA5c
-1XwSbzUQcDlIgDPq/LFgX3YAHrtvfarYsBkiUCEI644kuMLiAPrd7XR4WIbigKOT
-l7VQgAXnsv6ptIdEJQJG
-=eMgv
+iQJ8BAEBCgBmBQJVcbClXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiQmkP/0GzvfnXTyAXNN3exsWW+pC9
+d3yXYTU1RX50oSY8LTqGAniGgmb/SMISYmwlVovX2XbPVS0i3nPUZ8fY2w8JN1W1
+8eVyh9QmVCcuA6Q4RoL5KOksQo/Za0BeDgVA/3PHHVQJAgDb8IQZlKknyxV5BOxv
+oZMSIK3ApLz4MlyKiIp5rjr2x+Rhfh84l3Oiq3U9MBFTEpJLEXUVoY7A+a+8OY6/
+DAUdAOx56mXsj4IOZfNkYqys3rAXfMgRloqJCZL6nzyIK4fCByiHx8+BmcYwM+lW
+X7afAEekbQ5E0u85b4Q9kFwBEg+QQxXk+bbFaY2MVJcyZnqm1PUylr3FISzGOCkQ
+/rh4R3z4hjbLTXLQJo3KXCKTYdeA97jTbzZb8eOJPMC6AZqEeNQMVb/gNKNJGlFH
+lc1+TJdPUKoWd1S3g6KqRMTG6hHYAfO77ds170omUhsvruOoxxR4qylEN3rbEgec
+01R3OyMJgYrMhqyg84nmf8LYY6/sdIXYyJ6eVJr+INyQCVY7KJcrPNK+sOHUg6y8
+ebg/04+Xi9t1tFmssX17d88UiEX5lMaFOlqu133R6e61UIF/5/is7RDILoVk/VHs
+N4sCkGWppdtZh1RK9lHJUi+tymDZjJvVkk9qlNeNbZ3safUpJClwupQRuvmhE8If
+5UTS2DqIOIC8KuzQLxgd
+=/Znm
 -----END PGP SIGNATURE-----
diff --git a/app-i18n/libskk/metadata.xml b/app-i18n/libskk/metadata.xml
index 4dfdbd3c8463..11924c6429bb 100644
--- a/app-i18n/libskk/metadata.xml
+++ b/app-i18n/libskk/metadata.xml
@@ -3,6 +3,9 @@
 <pkgmetadata>
   <herd>cjk</herd>
   <use>
-    <flag name='introspection'>Use <pkg>dev-libs/gobject-introspection</pkg> for introspection</flag>
+    <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for introspection</flag>
   </use>
+  <upstream>
+    <remote-id type="github">ueno/libskk</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-i18n/pyzy/ChangeLog b/app-i18n/pyzy/ChangeLog
index d6d41fed2811..f95ee1d33f9e 100644
--- a/app-i18n/pyzy/ChangeLog
+++ b/app-i18n/pyzy/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-i18n/pyzy
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/pyzy/ChangeLog,v 1.6 2014/12/27 10:31:39 mgorny Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/pyzy/ChangeLog,v 1.7 2015/06/05 14:22:50 jlec Exp $
+
+  05 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
 *pyzy-0.1.0-r1 (27 Dec 2014)
 
diff --git a/app-i18n/pyzy/Manifest b/app-i18n/pyzy/Manifest
index e70b86b8c6fc..964a03939b21 100644
--- a/app-i18n/pyzy/Manifest
+++ b/app-i18n/pyzy/Manifest
@@ -1,29 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX pyzy-dont-download-dictionary-file.patch 581 SHA256 38eeacee8e5d33ca3bf0bec5060650c55fea19cce370252c0f5610bbc54ada97 SHA512 d27bfd031bb1eaf5b0e7e2ab9957eb4255a50a1724b9e3772c06a152bc75449415613d8467f74a989595769800955c77222e9bc22c18533f8244ee7227a2661d WHIRLPOOL ef25ac625e7c94c3528d77983f94304749e0067e630db807c3dee8e2bf2ca373db571de856c90665c7bbe974246f9a825be97226ef081ff422087ef7af79c0f6
 DIST pyzy-0.1.0.tar.gz 1571946 SHA256 fe468a4372473d85a56f05d55b14f0e0201fde6f9336a1a2322cf79421c84d9a SHA512 42477152ffd6a2f7ce0e8f920d98e9dc9c7fc32fe9e93a2a4de75c791e70d0f08c30eca0244dc2b87981f6bfc4e635234d62720aa19358c8f80a84e0c371c662 WHIRLPOOL 8cba6d647ee9f4e4f3ee22922245fc9b67fab779ea4381793eece9171d6f0cb4d0f325cc2ac1c4ce7ff6f47d383f6c02d0b866dcfbdc841b6f84ee6dff6fe0fe
 DIST pyzy-database-1.0.0.tar.bz2 9977983 SHA256 32c7d07b9f41e1dfc0f9008f54eca8e6cb367e7f2b19ac94c49754442694c321 SHA512 5a7248870407f7f92c418ada49a275062325f2eb33a7eb4b91492e4b706ae70ba931b04377a758ce429fa64cd22e8bee2ac4279d4f205bbce406248eda1decf7 WHIRLPOOL 07043adf9d83eb40b1a53409a31b3711f041e2b4dd5cf3f8c2034c129c31270fd37f2e53ecf2da5503562cf103ccb0a4487fa606928ac38a8775e90ff376ce3a
 EBUILD pyzy-0.1.0-r1.ebuild 1218 SHA256 f9d9fb71af63c416ae58d6bd6df91b4ed8382ec5b4356ba4706746802cd75374 SHA512 f903f320c613f07f3c503c0909500ee0afdde301a1d30b46ced70ae89b407a5224d5178c54890e009b2c72e63766070607a3462314472ea93c88f1bf25fab65e WHIRLPOOL 600653499eadc69565d9dc36595c93efac20ea34982f16912ff51dbf9786f9913e32831629a1420904ad0dae125fcea5103dbfbeb96d2a68af53f5f30d2c5955
 EBUILD pyzy-0.1.0.ebuild 1224 SHA256 3393704725e515ba41abd48f98e2411896dcb8dbb4bf6c015debcd28be6be011 SHA512 b68365cf451cc8ad1c7953fb55bab2d46230c2c44704fb66097df4dda9489aa35aa3f81adb3307c6545fc621ca5cda8b693fdf10cafab0690f418cfb2e4dea38 WHIRLPOOL cb6c16559b06173d5df789974592fe4c38e92b02af1f6704f58914571387e7edd22aab9875f4ed2459c4a9f125d11fb3c7f01561fa1fa57833b08bdfbb0bbec4
-MISC ChangeLog 937 SHA256 0c1f51c919dc783a14a6e162a7046a5d819ff6c0facaa6e33c99799dca34530f SHA512 0960b034d56aefa03360cd63a427fc37f58b354e829b2390e9bceafa58be31a26d37312ead750bff0818c67b9a65f29dfc309bdab3a0c532d39b5fd38e403f57 WHIRLPOOL 077a7ca2a627b8463179420c8a296e22547560688190c4e56171badba45157898486fbc7a965995960d8f243979c93286011ef58f0fce0afe32c5bbca727722d
-MISC metadata.xml 463 SHA256 9b2e67cb0a37f298ab69f634dd989d944ce05859dcb1ca6028b6674a9871515d SHA512 498fb02ed1b7f336d67a443216e781b0311d1b7a276b0bb55e713d92addfef655e6283c56d9f748a1b530236eb543fe4e52bfe1750ed409cbb6cdc0846df4671 WHIRLPOOL 74b01836a2e1aef104ddc1f11e204d2653a9c7a52a127ae16146bf8bc94442a4785624d3e03d80ddd34ebad9489a5dc7657ff0d2c80943f8e0f9939240069db5
+MISC ChangeLog 1039 SHA256 1b735f05953abd9d7ae1a00a177c388b024188bea277d3c489d96f2dbc476e81 SHA512 7aa0d495c91dcc135c83f6b0ac0eff69dce71d8a2166dfdc90b2ea9d29512c0f89dbf870d5d995725b4af17748f345316ffae0685dfa5dafc043a8eea710b5ff WHIRLPOOL ae4d599c8ac5af357036f099b1feeae962c154a341f1cd86c0d6f92e6230c23b91b09913711d8fdfd661633e631f9ebc7df7e905c12bac1ebaeb38a0f093fa88
+MISC metadata.xml 545 SHA256 87c2b27702ae9afdb7719e21796e2d152382287dfd352dcce65b920de079782b SHA512 b644bc8c512f7111919a95f05da0dd50ad2c78c0f4c7a565421376e713cac34732cf9f24112b18efcf50f5471354616554b443acd5338668165932d70b62d388 WHIRLPOOL 443348c8aa2536b0b9db67c6b5d1c014d338e5c6094c3bf682e5bb8014388e326a1428a68285a899dffacc5c88906dab87d5a040257c65ecce89322a97557bba
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJUnoqRXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO6eEQAJvPUR82r2ZNO9EJVb8r2fSg
-xH0UdEwtWbkqX2raOTdNMEly+5ubHurTkk6Wb8ibRcyO//POnBw/T7QeJln7Q3ao
-jbUeGd/9nGqNTXEfm4LOXobGw7bwwKNFSKeDZ3F21ux18dZaQfo/mcuh4A0AFLY5
-9IQwRmC8sBL6RzpzHtpFjoNcMuOsC/4bLPhgBn8cnwaRFeloykWrepNyTfjVpmV9
-LEOdhGHQl9PqGYPgdcfCaSiHjwzy/QO3pvfAcsCal8Hh+5yqUo4pvXfchG1oIzC2
-CK7ftxi6zRZBMSSBMdshReqSyD6PAth+Y4oOEfYQ3fwnbMtPg5hHv6oKQNYRumeQ
-GIii7e7IeEUyMZwBADt+S+VAW7ZKmJIHooOC6uscmuESCYPV95n/HG9QNgAflGga
-kGonz7a2l8K61iQ5TpctFv0bFj8TwXzZ+8sTXrloL/L2l8Bqq0d5YOFeAeV8JaVT
-ijZr8rmurP0ugV27ibedbdajSYRMZDNR9KkxStccePhyVrbEH+whgyBULFvM4m/r
-G86Gz5Ot9x3S8SE682/+Mh+HKmklaufkqaJSxn4NR/KtkycL6rFkeXu2mGaWTTHM
-AzUivofFRyLI6qnQ45PzJWjcvZX+pRtU9bTlRfFzXAOeufrbXWmXOS19uI2iV2Q3
-Nt3gqWFzXv3uyDqCNFaD
-=4RLx
+iQJ8BAEBCgBmBQJVcbC7XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi05AP/jHbHiyS0hGrXTwLIuMMOs5M
+/Hu4XU83narZ+m36s4+tVCckqb8Pb14lTdWJq7TUF+nhYlaYIqxuKcLiKXtjNRUE
+XypOIlRsP+ewnlvoKcSUUcBxSKzMOlXNFZacbXSkCLvWSV1ATfrwUHZb/yq1JM3y
+be61V3VPByF6svnWGXUjSTMom3HkbIg/foSI70DgfZoktXION0hdQfephB48a2Ky
+9ojBFV5DIZrbupACiUx8cLEEsGNOIxifxcqlnZ8URJO85acDgRQGx8ox08vRqvmw
+liAkml+DXSnbc7tdH8tsyzEZH8JdCJ2EnWZ5sIyAUt/jTnUUBzkjcHi/JxwF6Xk+
+jCQywpKRyG+7j+cb5EbtOVwVqOE3CtzJF1tYREzrUz5MlMuZQdzz3/OhQQ31w6hP
+fQPv5bnTEG5WGtU5kEX8CvVhGIEaCiWuYYCOFYR5T/i+UVSUHW5Cntms1R+kVNPx
+4AXqN3g9wV5ZcTyMX09CO+izFyyTp6xLctDH2xxlmRRWvsChI5YyTvhJLxjWXGXL
+154pusAgGvnggLxqmZSYILNaE/r3+SH4wC68+D4L4eZxuLtYM8BpMzopdjswBcvl
+zrfl+FxQ5XFSjEFC73y7QNgyPLfgDpqe/z5OdLo1Y6HJJqwy2y/uuhj8nKqhc8tU
+K/0OB8qkSl2ESYdIM3dW
+=LVUB
 -----END PGP SIGNATURE-----
diff --git a/app-i18n/pyzy/metadata.xml b/app-i18n/pyzy/metadata.xml
index ee40e6fdedb4..2c7a02c007ab 100644
--- a/app-i18n/pyzy/metadata.xml
+++ b/app-i18n/pyzy/metadata.xml
@@ -6,10 +6,12 @@
     <email>dlan@gentoo.org</email>
     <name>Yixun Lan</name>
   </maintainer>
-<use>
-  <flag name='boost'>Enable support for <pkg>dev-libs/boost</pkg></flag>
-  <flag name='doc'>Enable support for documents</flag>
-  <flag name='opencc'>Use <pkg>app-i18n/opencc</pkg> for input</flag>
-</use>
-
+  <use>
+    <flag name="boost">Enable support for <pkg>dev-libs/boost</pkg></flag>
+    <flag name="doc">Enable support for documents</flag>
+    <flag name="opencc">Use <pkg>app-i18n/opencc</pkg> for input</flag>
+  </use>
+  <upstream>
+    <remote-id type="github">pyzy</remote-id>
+  </upstream>
 </pkgmetadata>