Add github to remote-id in metadata.xml

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

33 files changed, 320 insertions, 203 deletions

diff --git a/app-emacs/circe/ChangeLog b/app-emacs/circe/ChangeLog
index bd191d9c3bd6..b59b12663c90 100644
--- a/app-emacs/circe/ChangeLog
+++ b/app-emacs/circe/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-emacs/circe
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/circe/ChangeLog,v 1.9 2014/05/14 16:37:22 ulm Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/circe/ChangeLog,v 1.10 2015/06/07 07:48:42 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   14 May 2014; Ulrich Müller <ulm@gentoo.org> -circe-0_pre20070805.ebuild,
   circe-1.3.ebuild, -files/50circe-gentoo-1.3.el, files/50circe-gentoo.el:
diff --git a/app-emacs/circe/Manifest b/app-emacs/circe/Manifest
index 21f312956383..522f568942e6 100644
--- a/app-emacs/circe/Manifest
+++ b/app-emacs/circe/Manifest
@@ -1,22 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 50circe-gentoo.el 84 SHA256 8ad7e92e41284874da456b1fd93e8afdbe95ab1bded7196cf137df832152fd00 SHA512 3f3c92f02e0a6ee760e83b83c4685a6b7f3268d0cb99abc9be56bdee8dd794d177f865582e45e90f895d1a2d9bbdc2ce39a3a60c7fc4eb973021eab66d8dbe47 WHIRLPOOL e2a40b7697540b9aff5e292e17c18972431b389a2878280a71984e7e0ab1e38a95444483daf8310b99a5e913626fac89a0f9a56e870b6502270cfe933a882c92
 DIST circe-1.3.tar.gz 118776 SHA256 02598a9e1e28fffc526fa81fd5350622af303f766a45771f99d0c0df08e294f7 SHA512 60bbd752c73e875f2306877591ad8de324db0a7446bbfebf460e44ef19c0c28d40d08c8ed9e0caa4062859b07545d310d86380377a479eb6bc38c72decfaa213 WHIRLPOOL ac531d3f5aa4a5697c2927c4b33913101383ac92ff61f159505935d33bf0b69e61db90a975840d55e790209355a4e4930bab6928503a12698558089a0cd39a92
 EBUILD circe-1.3.ebuild 582 SHA256 20d7039560787ed670feafc8cecf3a23a5fef17571eb860e1eb6f7d9f4465e3e SHA512 c55858a8b629a76e9baa7bbf0c76d93b2a60e01dfee993ad249f018df899ef413711bb58ebfc9f06b6b3808ffa8a3e38da6123e8097e64a22709f405c2b57107 WHIRLPOOL c2da72b849f0bb457a885356e6a2daa6b09ae1a320189db80766cde450dbfe59a9caffebaf7d858fcabbd397989cfbb7811433a99d1b2e9396278628393ec6c2
-MISC ChangeLog 2117 SHA256 d91ce7709504c76d3ca3b1e8b860e96bf0180ac857773f0c15e742de265d7f25 SHA512 0b5adfa4064dfe67e2fd2a78b81a9e608fb07ab3d6ea9b951ad3448199998e5e9bc09339269f94d4ba50d0fb0b1c2484944e1bfec25fea3ac0e8ac549a597bde WHIRLPOOL 17ff71d3cbed548755da68f756a860958e4d5aa312c6e435213acc5937f5023fbf47cdf58f11070cc81d5392da4c66cd55a2b69cc29684174921e789ef82f57d
-MISC metadata.xml 158 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab SHA512 e55d75feae933ba948ae987305ea58e36f5880f18687e8acaf91237e33e251be3ecfd5be27048f4907ea6799e0bcf784b602096dd7e2bc9c450eb5e2bb6a73d2 WHIRLPOOL 1d1676172186235a3e99ca1d148298fb24f6a089f9b7908b3c28c246c8854969835fd3742b8b81e0a30b63d76ee0be0c42bfede2416a30dfc3c8b915a147340c
+MISC ChangeLog 2223 SHA256 930a7e03159069a6fa27c8488207aba00818f4ff54c039c9e694a37077d565fd SHA512 22f313024edd470c50e7eb49d80eac300f9e03361becb5b9f81178e1fa1115b216ef7e707acbce05796acba24f9d3692bac3feebaacf9b821d377aa89742c5cf WHIRLPOOL c95500a9e1ef9d4a5db2b2d6bca6cdf9a07ca2d1a21fd6f56ab2640ef20ceb7f4d39260c80ce646aa964faef97a40933bdeada988ef7909d570be0236bb1c0a3
+MISC metadata.xml 249 SHA256 937a2611ac4a5e73f50422d8eae74f6dcc55a386cbc44ab39569e0dea2c83189 SHA512 80423c29f335acdfbb0e2e6609c5f68a2fa52c2a7befcca14328f9d55147979509c642f4a49c3b457c0a3c8952fea7500614ae9a802567e93257f1752a294599 WHIRLPOOL 57c794762d5458ffd6c279ab7075be14203629025a36c0a5c070c92a6adb8f23b633ba63157515cbbe9dbfecccdb6cbbfc97552714ada4fcc44353555325b6d0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQGcBAEBCAAGBQJTc5vPAAoJEJQzkH1pP7W4nLcMAK5l16+8B2DytHZcL7YG9cZP
-4HSRMc8kp12xGNnnw7rY7CC4xwRQsqvVZnuZ0SvpTV1jJrJnByR9tXhiXwSfJBVh
-9Ts4FtIgbOPtgdP3nJagxDak2fTgtImoRrtPmZFeyZRvU4p67noe7qaG0E0a3x6q
-+j3Em7W3FfwR62HFxl+3qim+E2ubOdYCEwHJCB9RAKXXDaEPXu2zk/UoksOxsI9K
-qnPG/DLe4xhT/pHcnCwQuwm4lhe6tSu28TxTG9uaEp4wu5EuTTTga6TwF0i1dRvs
-RU4NYeVuc4r3M2BTdusVCjuzR41wHZOhFNXrun/+P8DRzD0+9Ks5qorCV4A8MtP8
-YC2wrMdGghdGNBwZ3EN/szoB3e310IkzyntPw8RM2epIYb2UTavgBlLpsRDPfcKX
-bzWOZYEQ2ROVplUHMcu8LuXDU8iHpLLre9RK/5hNpOqxbnxsWuHpgtVz2ffD1yWy
-rjcndxVEzlBxskzWViuxEOSGcLFZvgF/Wuj0fLyPyQ==
-=Mvmb
+iQJ8BAEBCgBmBQJVc/dbXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi7PgP/1/9xCCzwPoeR7iEAytV8rMz
+DJLjg+MRtaCS4u/oyCESgLbdKcPuwPSTFKWCET4Du1PiaAbbVJJUZoIr2JDIMbEc
+iEFG3dLJrxFQZDAtadSNIBrTPTcLwkxgNyxrVHHHUCKJhjZN9HyaGwD6ejD2jBHD
+EfsVmebF23ERhflhS7qJiMUgKInlScmME6+uwLfJrrwo+ParpOjVvqACncfTC7ko
+ex058io/s/2Jq/51KRvLuEFCXAOHS8UkYG8lEez9yorFgsW84k/xPo99feKc7M1a
+F+KxEm4OJGmeyJpPL0OaszXBtZZ9gcUYOrPVRCi+S7dsQKDeKvaHpF04mXmcCvmh
+49ZIaSzsVxz/zEJIfUx/oyga4xiyodF8y6telAobh+bYzL7CweGn3VCM8OGndl18
+S2znILpiJrybQJKfubmlTNuNulL7fZakYrFFD4ubx15D02kuvqAc4ACC0LYiVJoc
+Ih8zSutumKZMZLCAY/sb9wQtz5phnLgAr1PYtJSwKgCm0EmiyBvfTCFAF4QjNbFW
+mNUSFCh+M/x5Rx5TGzp/BcQ4430QQLBuTSjl7Jd37yBCSx4P2sq9hVWlWkCuNdU4
+wKtlooI8XA+Z+hKJa/VsDrAt1hgNKznJhZqcjbFI6+vyys6WM7Cw1P1cIISW4RtK
+sk8HgyvxDCu/L7zYPZ4h
+=idsP
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/circe/metadata.xml b/app-emacs/circe/metadata.xml
index bc306fe58224..d7b8d1827421 100644
--- a/app-emacs/circe/metadata.xml
+++ b/app-emacs/circe/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>emacs</herd>
+  <herd>emacs</herd>
+  <upstream>
+    <remote-id type="github">jorgenschaefer/circe</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-emacs/company-mode/ChangeLog b/app-emacs/company-mode/ChangeLog
index 4560175982f9..00ed562009e6 100644
--- a/app-emacs/company-mode/ChangeLog
+++ b/app-emacs/company-mode/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-emacs/company-mode
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/company-mode/ChangeLog,v 1.17 2014/06/07 11:05:17 ulm Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/company-mode/ChangeLog,v 1.18 2015/06/07 07:49:01 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   07 Jun 2014; Ulrich Müller <ulm@gentoo.org> company-mode-0.6.14.ebuild,
   company-mode-0.7.ebuild:
@@ -88,4 +91,3 @@
   +files/50company-mode-gentoo.el, +metadata.xml,
   +company-mode-0.2.1.ebuild:
   Initial import, from Emacs overlay, bug 226031. Ebuild contributed by me.
-
diff --git a/app-emacs/company-mode/Manifest b/app-emacs/company-mode/Manifest
index efa6a065385c..5959946bc104 100644
--- a/app-emacs/company-mode/Manifest
+++ b/app-emacs/company-mode/Manifest
@@ -1,24 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 50company-mode-gentoo.el 79 SHA256 9e50754cd23e5babffb29c4c93b4df8c34680fb714f6fc36a73d5c739cc4c3b0 SHA512 8c3c1d4a50bfd4729f8a06f33bf9d754b5865814cf15eee1f3c84c6726734f8ff26c21547f1453f7417a0b9d008fe7804104ee6e30f13c54625d2b4b6faa7e99 WHIRLPOOL 6f7259e32cec3249764b5c1858468f3625f7084b8b651392574a9ed20a9b42ae00d6abe5c601516df5b19cf934859237151d388b365bf5e0ba713d44e2a37bbc
 DIST company-mode-0.6.14.tar.gz 51776 SHA256 5472cd634bf09da4557f055d3615afdd5436f814f63923ad94ccbebe60ab5e08 SHA512 7b8c0b70dc9c010214e8671fd7393faa9d1dd0839f41d532eb93eda91c77b4c93f2145ad2d688011976bfbb45282f35b937f195499f29cda79147ec2815e94d9 WHIRLPOOL 1aeefc6e4a5d7e3696150c38187131811c88fd3e9478a401400a31a7f7f7e3aad42736cabb093398470f9b20041639143665bb9d7335e2ae40ccfab8d2ab91ce
 DIST company-mode-0.7.tar.gz 54670 SHA256 73d55d9288537800c23f5e9e5b6208dd5e36e29271dca1a6c3840ca20142a268 SHA512 375c8541a0c5b34fba37ea136c8549e6ec916c238bee8115f036d88f273d6bcb0c0f436a6193d3b4be6528945d8f85c605de8d340e903a9764f5ace664f8cf61 WHIRLPOOL 23e18a37be0a2c1f4c7ded455557a5503c8f25b910ce5c0f36d8b09a22bd4aa96a944b0363750fce6b111dc3854c896f1800ac4dad20f99c76d7e0c9829e6014
 EBUILD company-mode-0.6.14.ebuild 1104 SHA256 4cb0f249a261e1d01d5ccb7c88ce188b83dc4e429343a2c2a71290912ad68936 SHA512 1571251ccc9dc8ae11c6e779440ba2de01070b6e468ff9796b2a0349ab3261fe14a2d716ad04c0b08d87b27375423d4531d8b04a35a5cb704ed82d6b8304af0b WHIRLPOOL cf04e7ff832afb307b352d15824c1565b432dc85f140efbdab39ee6e920a3e74a99fd1f8d8f0e55d94695804563378dff543bd582bc27c30f41edb845db5c686
 EBUILD company-mode-0.7.ebuild 1101 SHA256 9ce2c41641075d750c48cf65d882ad3e8e11c0643bddae44e2ab041821e8ca90 SHA512 2a222a3f33a7cac569ff37323e165db1b8d10827c7e448840939b2554420426c891c525f775febdd437337a2bc38e35dcd1acb976d88afad8757b64e394383d8 WHIRLPOOL fe1631651412d82df92c27700addaccd83cdc129516b37895f558785646ad27260a670e46552b25750c327cbe4bb4c37bb755aa6b9a3532857e3a51d47afb5f2
-MISC ChangeLog 3319 SHA256 7a1f58e202281f8361773f64126a53f19a5cd89028dc60cc6392487c3ed4e1fb SHA512 1139262c93a47081a115abf76e6228935028c869071c572f5813aab5d6dab5a0068a25c0b4636cf4b592df9afa9742f623948016d01bb4d01fe09fa91fab63d1 WHIRLPOOL 54bb5fa4db593552ac376d708dcb50e5de54a1d2489f2bff957fc473d7f3310fc0976efeae8a35c0270bc45fbb6fe89eb2fd3269425a5c5a5118b19a57cfe85a
-MISC metadata.xml 257 SHA256 22b05ef4f0f70c49603c2e4328764c6f16e4fd6fcf652dccec0a00d2499cd6b3 SHA512 f703e7649827106c5d1493b33a2abd5e40518b9b5dc02824eefe9b7eeea014437d57bce3ac62048cb241de3672fb0de2b250b0caeabae9017de02627a060a848 WHIRLPOOL b4c68ac74c3a12a90f9f504005e639d9b1663aba8faed6a24ec78c79a3da1cdbca3163368dea30fcc7b28d871f79d88ed4f994fdc1d24ad53b69d9575bc8b7c1
+MISC ChangeLog 3423 SHA256 e8bf0d3f8482cd2a8ec6e94628aa0d59e0c92a50cd4ca9f95291b303ab35ea8c SHA512 a0b77f5e626bedeb3a4030bc126a49d6869bef1daedc5efd51d75457d488e99c5a1b28d2362c9ea65b00484f060a90412303421ab0fd7372e73d06712075c749 WHIRLPOOL 0df18fbe5a148a549abe61ccd8584fbb10b1cbca929278f6246db04759de54c25626942df803a99304bacbceb541e1b7e901aae0bb7fa2ce7400ac8b774a2944
+MISC metadata.xml 359 SHA256 73a76fb0dcb76c2b7f69a7dfa78ff618895aa8909dbb333ff209f07c2b8db1d7 SHA512 c34c8880b11b2193d1c0aeb5ff2ecf411fc7327e5e93a9673d96ce3c1e96c1680a6e9ace7d863934eab75b78c65a9a76f6ec6b9400eeb9a654726e2306a7d6d5 WHIRLPOOL 02c37d2c6804ec0b435a78b66e935b7d9b9f25a7aad5bb503c3f7c876ff0fa29233b9983f9474898784b7242a1a520a0d936022a7b3a298b8df0126e559d9e01
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQGcBAEBCAAGBQJTkvIsAAoJEJQzkH1pP7W4BG4L/i3o6jZqG+Z/EUV7BFzz/Dod
-1QAscOVkFjvNKfdHC0W3mI9KbDGs18XhIkb8sXmA2smzQ7RxCbFOZqemSkJUifWl
-D8io4duE5tYZWDrfHU4OhAfTFLX8dNcEcYo6j1D1wQeqrWCGA9Ggw+TXsLezesJ5
-d9YtUAKkDuWsvVeIwOERfS5e28PDy8/3X2vpT/jWSKC2eiViInfqRB/w49nhXhiL
-kA3L2ymqGPEoepCb7ID7xfBK+ngiW4+e5LSLV5a24USGD60Paek5oHid98wlVpk/
-N12ylWOJ+et+NhkAJfU4I7yYOlXs7HRlLTOjs2I+K8QAQlz/qiDrrwMbURTZvuf1
-KrX3LvU8qV7FKlJuFioiRUawCPBv5ruxqcnFzD8lynbmhl6BOLboqOyCWr5OIJEJ
-/8ldbD8cn5lKyAWtzVxD8UOcrBn/UVxuaUG3lBaMkI/2KWPV9owO/4hRhbK9m/hB
-LCv1m7NTrdQPMvIy8A8jbfCovQhumU+QM6GfVs37iQ==
-=eKgS
+iQJ8BAEBCgBmBQJVc/duXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi450QAJKY/zMBVbdKn7cWBK58P3Gh
+gxsguB+QaG9/4Hw7qGW8uGCKUhYpENDWcm2kJSUDoUzM92nvmsTv3gaquc5D78vB
+BGPv2EzhVEQC+Dcmtjh3Yoq3cHEWU3GdK5vw6AE8qVkWr1tfOKZ2rpWTV9Q4PE6B
+uDp0FrGMDWlaeYW8FgfT8xG0ixdkPnaKJ3O3thntLLrue90pmZ+q/jygs3ZPs6a1
+layFjqFQ+X5ckhuj7nJzh5HIucVgHb4XTaEIT2z6/iNxavVb2xxwoj6NAzz28Z+6
+KihcBXNxojldyX50qh1foXR53bNQ2gxg0xGTzA8gbCbC5Y8DhO0fq5Wj6CX3tFUN
+ctajNRAuza2L8EYE6DaA98ZhiFvFQGRCdeU4FfIGqSq3QAGRNOEXLmackhc0s1Ps
+2UC56f/MeXyQcSS/6zvPAbwUyNdydEDxKjSU+cPDcnp8BG/4g1JWssIobY2ixi44
+bT9HGRY/CpV+XUWZfyKwZ07UleRemdItcMaBubZuLQ0kzx+tYodqRVHhFWVy2bsh
+quQbQxzbBD+iAI79gtTe3q9utM7VAfOHlZSkf8fuSWE5KGJGWDdEFeocnS/P7mP6
+eTreXiyNmDWTkaitQ7hBE86j0WFcrZ8DGTqX2fanaeKeXmzo9PLJJW6QQoidYteP
+j6dKFu7EAo4kr7ox058Y
+=X0A7
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/company-mode/metadata.xml b/app-emacs/company-mode/metadata.xml
index 3474d9f23212..430a27036cb2 100644
--- a/app-emacs/company-mode/metadata.xml
+++ b/app-emacs/company-mode/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>emacs</herd>
-<use>
-  <flag name='ropemacs'>Install backend for
+  <herd>emacs</herd>
+  <use>
+    <flag name="ropemacs">Install backend for
     <pkg>dev-python/ropemacs</pkg></flag>
-</use>
+  </use>
+  <upstream>
+    <remote-id type="github">company-mode/company-mode</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-emacs/distel/ChangeLog b/app-emacs/distel/ChangeLog
index 759c3dca3c70..391fe2c37261 100644
--- a/app-emacs/distel/ChangeLog
+++ b/app-emacs/distel/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-emacs/distel
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/distel/ChangeLog,v 1.6 2014/02/25 23:25:00 ulm Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/distel/ChangeLog,v 1.7 2015/06/07 07:49:18 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
 *distel-4.0.6 (25 Feb 2014)
 
@@ -32,4 +35,3 @@
   +files/50distel-gentoo.el, +metadata.xml, +distel-3.2_p20071103.ebuild:
   initial import for bug 183482, based on work of Justin <justin-gentoo AT
   openaether DOT org>, massaged by ulm
-
diff --git a/app-emacs/distel/Manifest b/app-emacs/distel/Manifest
index 62d0438777b6..55623dd9b4d4 100644
--- a/app-emacs/distel/Manifest
+++ b/app-emacs/distel/Manifest
@@ -1,22 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 50distel-gentoo.el 197 SHA256 da2818eabdb810c1a762814765f39c725c4b65c5350a935c24bb0329d57ad725 SHA512 1ed45f84dde596713c8f14b0eed011d9e2f073196f55cf355f3ad8c4b540aac94d7d4a1780a0020719b74f4eb3a610094ab5ed4e1ad142604937fbdaf50d2b6b WHIRLPOOL 187f5e493b98d09fc41bcea108f4271085203d2b72113913a32ed898548ceadfffb02534fbae5d63fb1eed905ed044c4350c073de89ea496d32081c413de02f3
 DIST distel-4.0.6.tar.gz 210257 SHA256 a80538fab51008f4821f687e7bcda98b7ab9e6e3ef7d695087505a2e40caa1e1 SHA512 510f82b6794379d89020d234462e09251e0db285ebc111eaf096e32a4e3619384650cb2b47ed68d38762a496504b58981c73ca5b930bd0eb1407aee9599c149f WHIRLPOOL e8fef7f804f98fdf7a1bb97cda97f7d4e471ec5ca01d112d80c1ebd2cede5c0bb8f5ac023407820843a61dec959f31755aa50a2faf34021c9b8aa48d4fe0bf45
 EBUILD distel-4.0.6.ebuild 1027 SHA256 d422179beb82bda294cbcfa718aa5742ac0c7e293442a2ddf5818058e78cae5c SHA512 6c7835b9293466a419b4e949fc542975ec3ccb9d5ded2d49dbd96adf56afcd0afbb48d0191f83a6bc3505023e82eb23f19d2b8ff260b4c7fa0c0115b8a0b07b8 WHIRLPOOL 80ff30f30f9ebdfdb47fb2bb17d9670d6df10387279dd35fab6ca95b815c9cda7932bb0a7ec954ddc3e4221b07342491d3cf12994ebcc8f9390fdaba80144f36
-MISC ChangeLog 1368 SHA256 7e5e57315d850a9db41873f2ad951ff9bf3ca641ef628e047b00e16eb0bc4c16 SHA512 8348aeab2165e26309eb206eac2522c90fd85705b32d2e8e3c9313554e369cdb0ad1346cf7c7e7ca60900ac5b30bb1d898227762a1bc52a294ed85d14eab3e90 WHIRLPOOL 7fc946675ff3cf4adb5d33154b5b5554b8c428fb83f12bb7f23969003b4f6424b0066b7cc1d71ee2840082477f74ef74c6234a5c46e18851d4c9c0e828fd1501
-MISC metadata.xml 232 SHA256 5b7aaa25f22af9f71a5cefff6bf72d7861c538c8a7870838aab3837219d1792f SHA512 fc48e01b70a11b5fc07e188f4f29c8e35cac6fd12058e370146a28835778f283dfd4872598df7156dfa4b21339211b07b6402ab452d931641a78c9dcb505c634 WHIRLPOOL 4b332e8e897503fbda5c7546e6815c0262c2c97fcf499711c65c7a55cf964339f9b338e8da2509f3793fea85d13ac5d12301e849fb53266f17e4dffbdf7a3f6f
+MISC ChangeLog 1472 SHA256 a654e71a167d4b07ca1a89b7d46fa75cb6d010a7db7023c374f1b2b6235faa30 SHA512 16fa1cefce4b31b9690d94129d56ba21ed11fd6a0a4f3abcf9cdbde70fc479f7a033c65269551e44d616a6882991f287a1f3f6224062e5b3ec0a9a95b5e64b00 WHIRLPOOL aea6ecefd926beab94996ee6933a7f33e5590e4194942cbb55d408abf4cd577a2071aeed6c4431143bcb18459776064f0c28890cebc1bfa6a5764731c639b73a
+MISC metadata.xml 299 SHA256 b0b45becc811e0112f7e33c5dce1059e1b0c3070bbe431dca7503c2f63d47e86 SHA512 617db1c03fc582d3e8d4f17dd2ee07a2c29130845c5f44b98bcce6c9aa0cfae3ebd82a3d925f10eb2b95510b960390d5b55376f9eff3f3f8577f90b566d2d812 WHIRLPOOL dd590426c077deebabedb8a08ba1826714d0bfae7a1bc6426e46b8199ebe245a902c00d9d0eb612300dcae9a3a440d91e36e0dd5556ca10911cdf2f3b4c6328b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQGcBAEBCAAGBQJTDSexAAoJEJQzkH1pP7W4/Q0L/AszhjgDsJG3pSy9bH06w9Hb
-dRe80AF1cJQOo8bZjMFkd5zw0JxDHI82leiz7/mWyOMxANohxiWp9NAKr7kpULFO
-5KObToLNAxxSSRThZSVCBiSBGHPLpOdMeDSXSfDU/KCD0BuT33q0k0zRpHTxbq5H
-VxiF7SM1rJnzECRFSX5zb4RBBunddjVNKq75Plm/a63DcDwPxpavY/hrgcNr6jzh
-kyTEewuw4pY8s5c5UphT5acNvZthCS++IKrMarboZ+q8WesRAvAup7esGg6W+sbJ
-Fey6plFabLa0hNjD2tmpPNVWcoionrPi+tYn6UXwL8wKImgZ/SgdWNP0KSSzDuMM
-O7fCKIh82X8Qd3YzDiUp6s8mZ8eMT2JHGKiSaHoymkptWgNMSGNcnoNnV7miMhcJ
-gDuYoPY3iQ5MZAZzx2+DBeWHONKb7579ELrwlxMM4Uhi+QfD9KjYlqJKI8k8BouU
-xa9Vr27Ha2C9rA8hHwymQz8x5e1WSlzL1C1INvbAew==
-=ENB0
+iQJ8BAEBCgBmBQJVc/d/XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmimE8P/2GZHjljDw6bAfUqQ0UX808/
+IDibnFkMn8X/H2G51zWiZIk/RmLTlQEGE35QwbAyl/ckd6dtNqn3NxK+MCsmoo7A
+2oSst3kOXqEitBS6PcbGspsh1JsuUp6W7ie0XrAqghcq90BdxnXcYtCTZ90++zmO
+B1PmdoiCGf72MKW29bwVw4aTeNAep3b3D279GpXcZNkGtWba8RzATmh4g02UfB1T
+7rx+mPiGUBuCZ1ej68SC50F8L6VpEQyYNraBdI2z4+GKlY878tOF5ECoOXyRFtJX
+XwWucinMbtVpYQXEaJ8RgZsmKdi2QkFCE6R40FJbZlI/sFSM5dIhnXECsP8nDQAV
+1rGE3QWYuS8KeH8MpgcOWs3NIzMYv2VOQqbKwXHZ7dqEEjp9j9Xwx2m+ZtnDSsqe
+Wwq8bZaeGyZf23eTp3a90GizUiIGa5BF0ub2GQpN8MzA2RfoZ14xaDdoN7gdBto+
+QHbOwFkfnhrTappzMO77khzycIB3jVdAyogoH7W7L5GiFzivz+Iyx+dbh3leEps0
+9I9NP36v1vwKVyLT8fyCAVzSimEpXU2wNw2HbwpeQRwf78lkH3fjTmZUAgH7OrTs
+HU+LHo6/HGrwgvLjcgyRl/z8cj6JFg1iX8+66Cj5eZvWfbQvkk6ERPeUKOOeaCjh
+GZPkev08SjKtHRYmnw9s
+=dnAi
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/distel/metadata.xml b/app-emacs/distel/metadata.xml
index e589a5797e52..8a99032f2b27 100644
--- a/app-emacs/distel/metadata.xml
+++ b/app-emacs/distel/metadata.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>emacs</herd>
-<upstream>
-  <remote-id type="google-code">distel</remote-id>
-</upstream>
+  <herd>emacs</herd>
+  <upstream>
+    <remote-id type="google-code">distel</remote-id>
+    <remote-id type="github">massemanet/distel</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-emacs/gnuplot-mode/ChangeLog b/app-emacs/gnuplot-mode/ChangeLog
index 4d1858391dca..041eab768776 100644
--- a/app-emacs/gnuplot-mode/ChangeLog
+++ b/app-emacs/gnuplot-mode/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-emacs/gnuplot-mode
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/gnuplot-mode/ChangeLog,v 1.25 2014/09/19 09:28:00 ago Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/gnuplot-mode/ChangeLog,v 1.26 2015/06/07 07:49:53 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   19 Sep 2014; Agostino Sarubbo <ago@gentoo.org> gnuplot-mode-0.7.0.ebuild:
   Stable for ppc64, wrt bug #508216
diff --git a/app-emacs/gnuplot-mode/Manifest b/app-emacs/gnuplot-mode/Manifest
index 633802bd8e69..739c7a700f7b 100644
--- a/app-emacs/gnuplot-mode/Manifest
+++ b/app-emacs/gnuplot-mode/Manifest
@@ -1,25 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 50gnuplot-mode-gentoo.el 347 SHA256 31623784370f844d803ab4da2c866200f721dbacded3d7be2617cd616076b3bf SHA512 eb342c60bee1a9e45a50373093207545b8b37888432b082afb7c4f0911eed08481379094ee5a73888a03a12898c3c41016c2d9161f92a1a7cf7be7f2010c1c83 WHIRLPOOL 87d5f6fa02a06fd2ab2161b1ca7a55ac853d0986c7d6588bd60c2ba8739bb732f66ca3c83c300953a1b16d47336e8fbe1b17757159e763f7ce3a3874e39a1d75
 DIST gnuplot-mode-0.7.0.tar.gz 373475 SHA256 310018d8c313ebd817e3e6116ab28eb2b848fa0992917b5ee4148d6073f59f3e SHA512 fdf04a3a32755892d422de8a535682ff44d1b635ecdc814738564376f5c7027a82c23807439835f2b7bf959f4f8b7a7d38d07a643f84ab2056ba187f3558e596 WHIRLPOOL 77f98735fd0fa6e1379278aaaeacf2834d2fad3c5ed3f56b4232215142a1c8336c4d7375282856fa4fe754dfaae2500027f9022f5c2799e90571af57e8be783d
 EBUILD gnuplot-mode-0.7.0.ebuild 1121 SHA256 91e3203bdadbe1241d9e7bbffff0237119e356d6756bdbb7290dcb9d07b28b24 SHA512 a0218d525688b3e9561e3c4ba3914ac10d71a4053812237b863584b354bf37e353c97e7e23a2bda14a9540ab04fb7c2bcf5ab1e0a20011e9fc324ef784b3a535 WHIRLPOOL d43a064443dd526e4b8e72d44c0eaf86ceab7f6e1e9abccb0990947ea3d9d593c226944204f38a6930a46cf2233586ccd3acb86ff0939ab3d4331980e4231e2b
-MISC ChangeLog 2977 SHA256 70a7c8c28badb63e158a31040f4be4489ef8e647610c35198975c243cc98337f SHA512 bc6fc9122b62c9ed23366a3e6f219ac5345b5fc873c5666aa07b027fbee29f71459250c4d9cfe475f3142cbb4780ace376258a007e94fa15e5a7a55f7d41f05b WHIRLPOOL 0d24e4fb4ef49e94e4b9854e6e8b583340219d2e3f0beb554559025dd627bd152af62632942f53a81add5841998be46710188f9d4b36311be25835411c7c7c21
-MISC metadata.xml 158 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab SHA512 e55d75feae933ba948ae987305ea58e36f5880f18687e8acaf91237e33e251be3ecfd5be27048f4907ea6799e0bcf784b602096dd7e2bc9c450eb5e2bb6a73d2 WHIRLPOOL 1d1676172186235a3e99ca1d148298fb24f6a089f9b7908b3c28c246c8854969835fd3742b8b81e0a30b63d76ee0be0c42bfede2416a30dfc3c8b915a147340c
+MISC ChangeLog 3082 SHA256 78937c95b042b446123997d87365c4a865704233665bdf88313fa1a5f0bd492a SHA512 8c5666b1b87704c609abd81f7d66289c93f42813b7cd582207b1642fd563098c53bd48afbccda1dd796beb2d084aa823cb4b2715e8fdceeb4d14e3f146c7dc6c WHIRLPOOL bb9b4ccdf5959648b65a4455cb703f54f1b5e7adea7cdc87e36e1257ac77119ba756ab86ef86235ded4b1a8a3bf0d91b6cc52a9e8db6c77cf176a50485fff2d4
+MISC metadata.xml 252 SHA256 667ec182c0d7924c82b97b657661890b2ee6a9255b3baf29b19f6072285a330e SHA512 2141a2fbcf10605b76737597bf7e17210f91714c00d82cf7c02003ef236baf3e11a2a841062e62c1641f67af9fc1121c18bdb9392d5b2085476cf873f69cf06d WHIRLPOOL 16b66010020760ea933f73933294bb78e5ac9d83fc6a940b2005380098f22dccbfb010cb14c43647236a9db53a9d07641ad8290f5c9ed9283328c54cfe7448ed
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJUG/chAAoJELp701BxlEWfKN0P/04yNNOq9Ir19JvIMCt8giXv
-cYvStNd5vP2hKM9DfGng2GN1sCrtF/9/GUtgZgAqgZHlldgbG848FBB467gjQWvo
-80G4LV5ANOZ4WrGzYirnFbVJx3gy+JFG+sL7DKaGB4eqJBJLNmpgZatOSGlvkn5k
-ImYgw9CzS9AXIGjPb88QnVqvc/HcZlYvvFzxRayXsZWwPRpYfxOjThfG/vSO7vhu
-PDOlMUfDev44LZ77G15Ea30es+CLGKzLhA5WUpwKAFNQ8kfak8dSUh9sHtqRay8I
-f2AktJKuwpLNWAKlxiyZVbN079vCeGV9eHUXFkYFCmrrNRKAXX2+WK3K9bOE5Sba
-yXcjXAQ9hKjsFJ/34n24FfYe2cSpEVeKrtsOqfWkstVQxfOWLEDwXB1zU2u392O1
-cjIzJJ8R0m4nKxBJcXxU8npYNn5P228W+/hkTb26WaOWYVIe6H37zNWkQgNq8rfy
-tIOPG7WOTOQ1WuT79T+E4bsnxRPuDyl/b1/D7NlMkUOeQdruqhcJTXvXOYhe3VK6
-k5zAGDEI+16UgBzr7onkYVKyCa3D09WtJpd8y3HVq8mDyRaaSlhuLVkF5JQV6NiX
-gLjm/sutopNxKb1fIyzsHUx9hrHrFqWVRBVeJ5Fcqgl6tDJfrFo06bZiaTk4oow5
-q3atAqa7VtEXHx4/foSz
-=E3R6
+iQJ8BAEBCgBmBQJVc/eiXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiyGoP/iePfSy8e2yLFrs3aolEmoBA
+84jYgANDxrgqBfeY9TuVj2+FQItS04czSO3r3Tako/IQ4M3TLOvYQ/i8AZjKHXlC
+L0+Wzl2UGU4Zl95JQa5lEmDiq0du49JtetwLnUguWCzQ5R+nFb+zqrNJMxayfjip
+0Y8sIkMbonTHgRGEdoV4JjNJ5q4SWca9iIbpUntEeyvTe5DovLvEbvCC/FH49ueZ
+qV4Reg0Fsytj4rTh+FIi3U3hfIFu3ptiIrSEtIw4nOEuItB0ERyRaeqczB00bDAd
+kfNDjAyxwla8OXcdMTgZdDlpUoV5sT6s+oj2yq19cWjhw7v/4qipBYy1gDaz6s+F
+PfO/4oQH7nAQt/oJOzLMek8FPPRExS9VojhK8xs+2VjzEJUEmYTxHLmftIdykRex
+1QIexQNoORHAqx8FWT4bYcQiX0ur7fpyxB8dCiob4FSAR+DU66/ZMBLiEjSXuXQe
+6lZVt6OMy0b2A2pOvq01PoyacC0KKZkFVdL3nlXeEMpSy+dOtlJNSIYVCVo2gc7l
+B2ppSKdzQx1Op82vxT9cwUyfcWVJO1ubmnkGCWjsxtRlRATI9PGtFptDEN1kuvfm
+pgZFWFtqM1GLzty+xQG24cKp5dbgmToB09VHkFCuzs7ZAuucJtlW066KFKM7UG7X
+Hjw+cjuXPIy+k1Cf33gG
+=7zPR
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/gnuplot-mode/metadata.xml b/app-emacs/gnuplot-mode/metadata.xml
index bc306fe58224..78f1172a2fd3 100644
--- a/app-emacs/gnuplot-mode/metadata.xml
+++ b/app-emacs/gnuplot-mode/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>emacs</herd>
+  <herd>emacs</herd>
+  <upstream>
+    <remote-id type="github">bruceravel/gnuplot-mode</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-emacs/haskell-mode/ChangeLog b/app-emacs/haskell-mode/ChangeLog
index 5d058ab2a543..fa37cf1c8b7e 100644
--- a/app-emacs/haskell-mode/ChangeLog
+++ b/app-emacs/haskell-mode/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-emacs/haskell-mode
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/haskell-mode/ChangeLog,v 1.53 2014/04/13 16:25:34 ago Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/haskell-mode/ChangeLog,v 1.54 2015/06/07 07:50:14 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   13 Apr 2014; Agostino Sarubbo <ago@gentoo.org> haskell-mode-13.07.ebuild:
   Stable for ppc, wrt bug #504840
diff --git a/app-emacs/haskell-mode/Manifest b/app-emacs/haskell-mode/Manifest
index 1c2e20495a32..76067b54aa7e 100644
--- a/app-emacs/haskell-mode/Manifest
+++ b/app-emacs/haskell-mode/Manifest
@@ -1,27 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 50haskell-mode-gentoo.el 44 SHA256 1396f18ab3b90d2c8175a48ea562f22481e22d5288cb00c808a8599fe7815ded SHA512 3a4dc946f9f5b5e7dfed41d19b8e576f3d164d81049b7bcad08791803116104f0450634569ee60a65f78e42b2153b925062b05f31cf8b5477160a73eadbfcf2a WHIRLPOOL 1b307ec7ddb69ba898de4b22bde2a433a27c90c92d66efcdee8f730d4941c6ad33a4d69e467abd6dbda1cf6e95c07cdca0b648259cdf34cdbd27612fb61184f7
 DIST haskell-mode-13.07.tar.gz 131102 SHA256 7d16441f67e027a9fccbe58e3d8284489f811f4914a9e07fcc73fa9a24b38895 SHA512 e19d55a99f4d9a571c1ed0b095254e4d1b8080d9ba671461aa228cbf8aa7c7a213e19e588c0f69450a1bd4ac25793b523415a6f11bfb5dda7706dc35f7beee68 WHIRLPOOL 56be74675d47928cbb149515f796f7e45fe5238df26021510a140c1ca0613ded959b2891525350a9eb4aa39bf2a2f1e0a890e9a5cc8db35ac75c1ae37ab2761f
 DIST haskell-mode-2.9.1.tar.gz 123579 SHA256 cac350804a89d0f76fcbe8c2ad10e4b9f83d81242dbd4927b546248db9477348 SHA512 7c4cbdfd0f9e43ab3efd39c8ca7fcd941538865fe41522703175b7ca8a67276945ef7feef4207fa66aee156a028cb52bb96593867db0c777baba9f59415ee979 WHIRLPOOL bb31e6cb4e7f12c79ae4eeaf55cbed54bdb814e56c691d87da4612f884de7de018796d85442ae44f9aec323815982154b95d4555cebb7198820a639edbd03e7a
 EBUILD haskell-mode-13.07.ebuild 1256 SHA256 78e39028524eb02e574514bfcc79369401b43a5c0412ea89663e9efe9778fd7e SHA512 d9633ce1ca0bae250ef79649b434e780206f7c83bc2862cf61ac090f78540cb5388ba63434073ac8b3c9b422e61f6f401bcb8a92a212442625d7c29932d51c9d WHIRLPOOL d215d2b0424f1f70bb04fc6ac6f96b525879deabe9ebb802632f8891435bc5dccebac241c1474c6826e494007abf13c547195bfbff866025c068b50d72636d05
 EBUILD haskell-mode-2.9.1.ebuild 1145 SHA256 223f167fc1550d411fc90fcf2b7a01924e829aaf0414e3a606280d3dd52b8ef9 SHA512 86f54eca973712e1832ddae136040dca755a1bbf88b6de4dd3cb05eeae5417b4fe111592cc406be08162e360f1ee2a1a77694c762faf6448f89eeb7a4df7a7cc WHIRLPOOL 17fd4ec82d13aebc01306885abb41206e2325efb44c4acf39801eaaaca9737f2c5f0173b490f902f4c44c2da0f6cc147ffd46d5697e17b8345c5d377cb39c243
-MISC ChangeLog 7955 SHA256 3daf497103701a5799945027970fe57a57e75cd38484b64fcd0838dc9a7fa77f SHA512 f178d5e32e70af00df5f772f7a3bba79104514e0a10e94b1697ed2be5c974cb32bf30460d332af08810eaa2fc8019e662f54dc6bd58b0e47b2824fa83372f5e9 WHIRLPOOL 4728ac23f63dbfa0fd5433928f563be711fd24921f4a05bbc4b7a0c0a7ceab0184dca7ab214d923e5d2a5aa7508aac0e5a3e2bcbdf6d042e8267b971b884cc15
-MISC metadata.xml 158 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab SHA512 e55d75feae933ba948ae987305ea58e36f5880f18687e8acaf91237e33e251be3ecfd5be27048f4907ea6799e0bcf784b602096dd7e2bc9c450eb5e2bb6a73d2 WHIRLPOOL 1d1676172186235a3e99ca1d148298fb24f6a089f9b7908b3c28c246c8854969835fd3742b8b81e0a30b63d76ee0be0c42bfede2416a30dfc3c8b915a147340c
+MISC ChangeLog 8060 SHA256 c43dfe4673003910d15b8f2bb4339df6feea4bfe8551ac83e10113636df05773 SHA512 05fd8eafa6a0fb4c7b5b5f82aceea15c2d7f8157b9f064f74e71be2bc22ea6f045f41672b930c2a6372f3f65affd03ee6efeb80e545cc631c1e814c15385c3e1 WHIRLPOOL 78ecb6b2c984df7de7762968ada66de8a109bafe4e01cebe092b67a6d9bf7fca177c97ee40c4a020f1ff53b4aa0e3f143ffd42d543f6ec8536d7fe290b10f372
+MISC metadata.xml 249 SHA256 9641baeb8f5dfce1f9e0c4e6c6e36696d27d4043e1cab68ea33c24a0d41838e4 SHA512 6caebb9a2ae907ecf26c8e0758136cac98d5593ab32d77af856c73367e53d225dbbf0c57eaaaeea83e951de7ed9221e0730170d3cea57676685142c446cb632c WHIRLPOOL c6f8e76e2f724398de31930acb622522fc0aff433ee377fc734b7b3796b6a96a0dc5e8745c49e4b4cb3e07561e4116954cbff5eb7644152125f07def71e62e8a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJTSrqAAAoJELp701BxlEWfaxAP/2nWe2ccpu+1gSADvbzj66Tv
-qW7Xze+iMxys9mLYB8viNv/0mH5qLqKM6x7c/EaZOIqqeG0QZxCBlWc8u6UBDNOJ
-Ntvlz1b49y4uFqlqr/Ato9G0aQKMHIqvsXnegatmb1JdZ4/X7Eh1uGfDz3uUn+Sc
-XD0iASNA8yF1VU2lkpe55Cwq+/KpocfU4RNt0jxtJKmTlNh9LusVwgdaxD/LtKL/
-4s7jmPBStXhRUkjLd95twWZshruugGGp0QjyodRBLdUd4CQD6b5NUROw3BfjE+f4
-c3Z3HzfBGRs8X/n9KnhYJ5GsKzYA5swWJ+1DqTwDNGYiBqzjXgo0G2o0hv0bX+3u
-MW+eIU3GeNlMQD97mL2EUv2mcTnvQWboZ91IOZc3m37lpj3FDqgovAgcRh2m53pg
-PO0zHVTjx4ek+0EHqlFabuTsZqImHat7JSBwWkUqs9ZF9c4NlA1fV373YRtvdF7L
-eFWLjppvDqM6olNccudWKag4J8LtMKK0KvXzPt+dFgcoTVhuI6jetHCiJ9R3ON0F
-eG0A0heBKu6UCQl5uc1vHA9V3pD0BoGwwLhISftHVL9RXiWIrW5butxFXA8aeE9R
-aKGj6GMOPhGoivc8gbslpOqyubC7cE40ruosonP9uhVwIQ13UFNQ7SRiqWcbO6Dv
-j580DIDNDOQgmoq6rsd/
-=sI/x
+iQJ8BAEBCgBmBQJVc/e3XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi6CcP/2ruigX8ZM9tzRz3ce2WNQ3B
+3rN20ZE7D6fENpVZ9GHH7S04EkC492SVmMobfjgwaPlUOYFfm3ne0msmfe5MR8OH
+4O6+4s+0rquHQWBDi8w36f1mBNhluYnoUauxFYrWy6vxLODcG7LD6/bVFs4j6StP
+/LobvkbnHLWmJ6tzx7I0P8gpLqSOr1soI1C8BEZj6UAYTPQtsxgOrSnYitIkaybV
+UkB27kzs9GR7UmI3ZYWg0w6SV03lTfFY3a7edu+aSFw345Mo0o8DLb6ETyO7HvZe
+mDosYwfbwGZKMSRMEGpI+jjBuMCbfxKaLzwTyQXAEEXtKIm0cuJoh8Gd6e6xAII5
+Em1sgd+xL9ITei3YxdikeklSGP9DTpVqDa5fXgAw9BWMF9qDjq3AweX8AjdOrw7G
+uVLSQmEuNgFsmCWAkwOEdpMOFvxMwBhh7ezABEHzNE6md09H1q3pkOfbc1snYBHE
+sU2FTvvALt+aLtpaqxt5K422u9KeDRkKpbbMcxJsR/WbunfcGDDCURdd2c4WdxED
+dPhmYBNmkhf2YUSNArCuidILCVvKsI5p1H2HKrLT72+z24q566hQLmtZRBfA/sJr
+KPz1liaEF3DVVhEEriXecdp53yllfWNflE1P2jgyPvlx/9ehzCpRgNyffZDUiV+f
+YHJsJnDhYtPE64oxSd/4
+=n/Gq
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/haskell-mode/metadata.xml b/app-emacs/haskell-mode/metadata.xml
index bc306fe58224..95708cb1aa97 100644
--- a/app-emacs/haskell-mode/metadata.xml
+++ b/app-emacs/haskell-mode/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>emacs</herd>
+  <herd>emacs</herd>
+  <upstream>
+    <remote-id type="github">haskell/haskell-mode</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-emacs/icicles/ChangeLog b/app-emacs/icicles/ChangeLog
index 2c88f280b393..e01af4f0ad48 100644
--- a/app-emacs/icicles/ChangeLog
+++ b/app-emacs/icicles/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-emacs/icicles
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/icicles/ChangeLog,v 1.7 2015/01/27 18:14:43 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/icicles/ChangeLog,v 1.8 2015/06/07 07:50:40 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   27 Jan 2015; Ulrich Müller <ulm@gentoo.org> icicles-2013.04.23.23400.ebuild:
   Update HOMEPAGE, bug 537928.
@@ -34,4 +37,3 @@
   +files/icicles-byte-compile-without-x.patch, +metadata.xml,
   +icicles-20071205.ebuild:
   Initial import. Ebuild contributed by me.
-
diff --git a/app-emacs/icicles/Manifest b/app-emacs/icicles/Manifest
index 353f43adb70f..39052900dac8 100644
--- a/app-emacs/icicles/Manifest
+++ b/app-emacs/icicles/Manifest
@@ -1,22 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 50icicles-gentoo.el 112 SHA256 9aac68a9080afed725ab5d886dca6c3d2046c6b477b03cb318e7371109d689ce SHA512 dee9b1945ea378792e71efa674bdeae5ec82eaa8f8ea07fd7859ff3e48d812fc50c8a4809a2a66c99ffe08c4b2b71a107245970ec2cddbe0505b63999b62320e WHIRLPOOL 838b997bfb1229a5257caf83fb05319714212d260ccb261ac49862466f2787cd8c396bc9444845c4a298e8baf6ebaf6b3477937f5dfdbbd8bcfa52432a5f10d8
 DIST icicles-2013.04.23.23400.tar.gz 886525 SHA256 a7d80d6d8b8150dafea8cf2f3e25ebf3846091edda9fdb7e5910986fffbd713d SHA512 548c20fe83f72d03820d620d0d5f9feb6d249ca96c8f951ddbf650691ad30649d28d736b7c01677e260fed0490382a5771c0e88adef6c9c0089ecbd225f9acd5 WHIRLPOOL 11db63085253451f1e84e371ff47173db2fb072060afc8a4db943907d53daaa5247036a4a33a9aaf09cedac557fcc185668a47e28b844e70714b9c6f92644797
 EBUILD icicles-2013.04.23.23400.ebuild 521 SHA256 572cdf7313ed5813a5f83fef127c88940c6a66c3bc3142305b7b7776f76acdd6 SHA512 fdf4f2664c573add10c32a11582326fe196b3f76f5864e14f9363331827ef7847077ead37abb75a4c75986ea240bbe54b9dcd8f2a512a2849d8cbc65e127682c WHIRLPOOL e4f23d44928368ca9d8d5617c1bcdbd3b2a7607f5b47f3c81279dc41ad1cf22e3e9301ae644a2d317e4d30d583189e3fc756ec5142943d29b094306d95cbcce9
-MISC ChangeLog 1346 SHA256 7749a8efbac1df29b85ed511adeb38a2d4d8e986cf1573ceda2a68aad212d09d SHA512 2f2f81c5146001c538960d6c580583d2ede42d5293eb53509008e8afa1ce8c44b2fac484495f715217889b3f1b7f0170a3983fbe41d477a0f8b06a831e7e7490 WHIRLPOOL 3492bfdf98a283f8470c0169198b61ff1617795b8ce3800cbb176e84551300ee1d5934125586a074b511fd57efb923e82908e83a115f00267632b7f24ce23bad
-MISC metadata.xml 158 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab SHA512 e55d75feae933ba948ae987305ea58e36f5880f18687e8acaf91237e33e251be3ecfd5be27048f4907ea6799e0bcf784b602096dd7e2bc9c450eb5e2bb6a73d2 WHIRLPOOL 1d1676172186235a3e99ca1d148298fb24f6a089f9b7908b3c28c246c8854969835fd3742b8b81e0a30b63d76ee0be0c42bfede2416a30dfc3c8b915a147340c
+MISC ChangeLog 1450 SHA256 04e1fb8ce018681e6bbb8b3d1269192373ef6a6415e2a7e5e5397ecd0b473f81 SHA512 5fb6de16c19dc2dd86b74ed2c8323c64550e3394d9431d8c4119408fb7d71f68aa879574c771a78d1021b8aed3a51a31e9d03847cb25d4f0baf3a2b960f686b8 WHIRLPOOL 4d46c2722fdf179f78e4c6bf2d9fcdd091585026a661c5cb7c3ce9a7a2ff7c5f269151b6a2b10efe5ea02d5e48efed460ce1da1a2f21eac237c662947f891e57
+MISC metadata.xml 248 SHA256 8aa46657cd0c30dcb9c96b9cfedc2a40ddc96e8f0d702c129a69d18d6fd94398 SHA512 433754f395171ca675fdf9617e20649cb55916d93a710984d512d74d5165d0d7362f303963b1d94a619f14b83e9ec020194f0be221d0b99800f3a2ebdf287f9d WHIRLPOOL 5c5499e7c95db97d8bb2a8c6a8f5d18c60cb77532021ec215fc5e63bd028b01d6459129433c378a4d2eaa641955c72ce5b08b010296710488de486657b42e72a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQGcBAEBCAAGBQJUx9cCAAoJEJQzkH1pP7W4KswL/29pDM81KQAsxkRcZTpsGUnD
-MS4La+QBD/6tVX2KXidnQcEOfrGTR01zMLdX/klHUiBKNxSsLHtS2KD6w3drGidr
-AeCZYJD/tIP2x2MXT6hNT5Ku/Tkd5m1WHyrad/CqNLD2mnilsJGEpFs7pCpffgqW
-wnA2UWGdnFOFPpvS5VBdvTsUM1pqcn10nyLIOa7xfhtyMHA/TH4eSN6FgVTtK0Iu
-jWsYQDAwIaUd5svkagw7Hz54Olpll4GBDjTR+2JlAVD9PcwyDY0f4HR3e6lLMQQ3
-O2eicazcGHRTmKNcde5iExN+LXqPUR0gxpBIVFX6IntVEzFF1AWPP4XCmNnk/N17
-YW/ZWJJ0lcb375Ll1qOPABFdd1KHZcvREa7jdVdtcOrTuOIXlViM2MObgmdl8x4p
-qZF0ionisLCl2lpbfqtrzWuiXZ9/lTrH0ovYxDq0v0VI6i16b006yiG8iUWj642y
-2xajVuaG6unFRUMzjzwd7pNrlX8Z1a/cIf9oG5+7jw==
-=KCcl
+iQJ8BAEBCgBmBQJVc/fRXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiUyoP/iQNmZbOZ+klG5h/VacBWt7a
+4i5EgWYvxlIDm0VRRiRjFXkUAnynfGDo+00ahBbaNYlsLn2mU0BCjEAc+zF71ERQ
+SjICaIkwYvKKTV8xNXTB0EpnOMa3Fw6jNAdtGH55DAMT3WUqN35JRSEWQRIVRIiJ
+JzHPRB7ieKJZ6ZcxxEVW8tbDluINUNbf1scnWA+K28Z9a4x+9bl++pnBDebuRV78
+66mqCvmoUBUVF5hRwk+hn4DCcm/yIMJ/xfaYz5BHnVAW7aO/bnsLfm996L6dyaGx
+1LW0BfD/MyJNJLdDimrtaWo7yKE4CNVu5qzfTK2rSPeP8hmcQVY7cAqWut7OTpPH
+wJ2RU7tZ7qmiKyzhciGJWftptjfx4ESQTBCuUl4eN0dqpJ+DZ2viu5pzj6DDGZRu
+eSnAcTK6zrF2OiIr6sf5nVgYFvs2uDGBvyJYaTkB3FzMVZsPHNvYnV0OFRXeTl+G
+MBsXxW5CPMl3LtF66J/hlrAkEvbcw08LX/BbqUWg/CyktSVEvM73w0aJLXJniRhs
+J3oMMz9BQk6Qk/kP2p15px+aYiJng+fQwRQJSOGKy7FyLWxDtqLON8Ts1NXbpZyN
+oCRwDb7nqwragRkvb8rwoQFu24QDn2qRAYK64Vr4h9I36dGdzlCE496p+AG+59Jg
+epyhWbIy/2Ua+mIg8dvg
+=sPOn
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/icicles/metadata.xml b/app-emacs/icicles/metadata.xml
index bc306fe58224..053b89447874 100644
--- a/app-emacs/icicles/metadata.xml
+++ b/app-emacs/icicles/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>emacs</herd>
+  <herd>emacs</herd>
+  <upstream>
+    <remote-id type="github">emacsmirror/icicles</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-emacs/lua-mode/ChangeLog b/app-emacs/lua-mode/ChangeLog
index f07bdf8772c9..8566ceece701 100644
--- a/app-emacs/lua-mode/ChangeLog
+++ b/app-emacs/lua-mode/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-emacs/lua-mode
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/lua-mode/ChangeLog,v 1.56 2014/02/14 08:01:23 ulm Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/lua-mode/ChangeLog,v 1.57 2015/06/07 07:51:32 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   14 Feb 2014; Ulrich Müller <ulm@gentoo.org> -lua-mode-20100617-r1.ebuild:
   Remove old.
diff --git a/app-emacs/lua-mode/Manifest b/app-emacs/lua-mode/Manifest
index 531c96b2fb0d..4c71fa14ead5 100644
--- a/app-emacs/lua-mode/Manifest
+++ b/app-emacs/lua-mode/Manifest
@@ -1,22 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 50lua-mode-gentoo.el 206 SHA256 a1819d365cb19d2133500b9364714d5dd8976d038f336103e54f1f79494e9ca7 SHA512 b062343ab77dcaa50355498a63681c8e5bc6f209b1aa5ef82d65be8c19aa52d58c2efcd481f091804726b095a02b97de5b6cbce232ee5d9f328c5e3d888b496b WHIRLPOOL 8d3c4aa62a920240729a78fc512677ffa30deb67ebf3304e09785163fa1d62393f13e6842b083c4fd12a0f49b7f97e6c65cada3ebb64c2028c331a9bd378a11b
 DIST lua-mode-20130419.tar.gz 26236 SHA256 75c1696421983fbb58946ea649d2917f0deefc8b4f1dbc16b819e0cd603e396a SHA512 1fecd953b5b08dad26345c6e0d2006f35f92082d7cd244e4d668808a2694271605f10eb15d7b62ab8fbdf029fa6bac8bcebe8c8d4ef782dbd63ebcce8abc8439 WHIRLPOOL 4477da3bfb707459c14cefbc55ca7303b1774627c143cfe1d2dc3e70a7843fd7f9d0090f4640b934482a39b020afaf09b4dfd0b8ef10fd46f71b3d2c799e6347
 EBUILD lua-mode-20130419.ebuild 674 SHA256 3283ea6e2b901ac327c5c3d52fdf67f1659208e6ac7bc4058b3af17c856c2c0a SHA512 e31a474c13b15da37679f30f6c6da07a019c7b5bc79dfb5eabb867696e82fb2eaed461a7c9f906f6bee074547008bac32b17ad5dac95fb7d1af97f3b47564bd1 WHIRLPOOL c4940ba1aefc513cd8fa92ca05f38579ba2ba782f69ee5904db48fe69624e4641e76c218076fe3c925d26abbb9208acef4e838c659e79d3d9494f44055a1fc97
-MISC ChangeLog 6629 SHA256 b9b5511165be1ac88b6845117e0400ce9e4b87b126730c10fa54d6a689f2f6d3 SHA512 4f6bee6bf7deaf5aa89e1b0085adb3db41b55ca78fbc675a52950f42160e8a4591cd2fd62ca1f80542b6c12822212dc4f23e68fa663a4a22d66c49371d217420 WHIRLPOOL eedfb215938e90251862722688ed1d0202c06895a2586dd6d9eabd0dcfb5ef2f06f824915f514dc2a0ce8320eb568d007b3ab67db9be278b67751c26023a1ade
-MISC metadata.xml 158 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab SHA512 e55d75feae933ba948ae987305ea58e36f5880f18687e8acaf91237e33e251be3ecfd5be27048f4907ea6799e0bcf784b602096dd7e2bc9c450eb5e2bb6a73d2 WHIRLPOOL 1d1676172186235a3e99ca1d148298fb24f6a089f9b7908b3c28c246c8854969835fd3742b8b81e0a30b63d76ee0be0c42bfede2416a30dfc3c8b915a147340c
+MISC ChangeLog 6734 SHA256 77fabb37b15e5e3ae093fdf7aff04b9701e02ac5184c3bb8d02ae48a06e743a1 SHA512 8d26678e7d4c43c570b6852df4db6ad7bd96f5474f054d4f62129561a1e6e266729c9e99d003109a25f3546904c0d113d15706d170bfd3082b259201fa31a2ae WHIRLPOOL 3bc6319e04a62ef922275c609ec978c59d339e5ae113c2bffb6a2d2add4aa59df6e224359d1e84f31128d4862f92998218022ee95defddd86e6be5fb9de75f21
+MISC metadata.xml 245 SHA256 bccda7c290d2a0b65765ecbcd2234afe9893544a34ecd968a4895b3fa5fb315b SHA512 25c4ad7d4766a27bbc9ff00f505133d5879c94817bd4a6cb5efc45092b7b48d9997f4e06db8c5ed9f6ee56f1578683a931d4b89d119e1f7f08d6b7aa8c8e61eb WHIRLPOOL c5f9d85ed07b357c600fbc0ed316897440d21925ab3d72152f6116314bf0c58554fb97488b9cd4b079183bc2611161d2282cbf046a2b803438f24c26a946c83c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQGcBAEBCAAGBQJS/c6RAAoJEJQzkH1pP7W4YKUL/39A93vWPYdSEvFfG5Hn1j/N
-vC5JyCUDmrWXbDYc8+lJleUt0/L+3vXSmGKyaEOCaBfuWCJ//BZszQ3EH6jXiITs
-O8KOst0BGWs9DnihdwzKZAgLaDgLjL1N71ChK+TRaAx+mFqjMDE4SZ2nVzy3LAqe
-QuP33jMHk8LdMsHvZPY3FJB+gR0yK02j6huxMNLh8dyeQKMQk9dIMIgml7rFDLAh
-wa6/z2m7oM/pVyjIWbg9YrcY187l//xseAIRIyCwKetj69qgulb2ueukZ8Z86NNg
-EVEY0rF3/XtQ5aU/rXukFw9s6ot26B5+nCMs31tDNqdVsItwPHeVSuEnvkTZDv40
-XAbrjuUsNBrJAGATveaCcbbcAFDR9wyo248ArceSeH1JjYBjeDenkVu2fL0IhSII
-l8QEWKPwQLLbuVQ92ATTZ/fG/esGPD+H54Ob6toCqDTe6mF+O3URrMDL/26LPIeJ
-7oJ87D0S6CS5RURxbIxC/8A1hT/QBy6KUBl9lo9ORg==
-=fVqT
+iQJ8BAEBCgBmBQJVc/gFXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiLMQQALcIQjDaDF0rYtLlN5PSf4K3
+q8HHz+lGAP7ZrPfC3k2zNik7BpczH1XSWbGzP2y+xDZ7NXwnES9ByGPm40DmPOjb
+ElGp+bV8o9xyqo9xUDqJxpGQ36p1RGE57gcLEQLIv76FdEtHxDkWsduLwZfOfTHo
+dCiS27CcRZgy1zJqaIWiKCTj9iJdEb5nLrY31rbQCz9tavw6wFbgqqKi1muz7it8
+iC+0RCA8EMQSrzdV9nsvtDhhrO8gGQnR7qSdGKpA40CRKKW6qzKfOkARsaV+uQmG
+DoqxoeDQp4YoYwvXMlPSxdUSbgzkUrGhL/h7g9LoUaH4HHcvhiJpfOWqYbE7Dm9X
+KEDhDS4DWlaDDNVaKpyiCFlST1enGTma4e/dBE4YaP0lnmZi4ZARHpN73WaKEg5W
+u4jBx/ffFk3/TMRWxvO/kFS+RlKWxFlPAYrZq9uqIXXn67ubYr5G9h2+mbybrxYs
+fweMoDKuEffOyAUbJvDFRgQlqokNtnTcGMV58gJW8zshhwOBO4loB0k4wi3S/5Ra
+c9qhK+suJFhEy6a9XXHIryUmpcpI8xU9bMPg3usvOyJ3w/2pp09P+zbvsu9vzrn3
+FupmmX0dvRWVy8AT6yP/j+pONWTf2rpNZzvG2zL4B1CnqV4y64CAmPRlZsIsQI2l
+MfW0IXOC8aTmdXklp6Va
+=lYjb
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/lua-mode/metadata.xml b/app-emacs/lua-mode/metadata.xml
index bc306fe58224..cb01c41894cc 100644
--- a/app-emacs/lua-mode/metadata.xml
+++ b/app-emacs/lua-mode/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>emacs</herd>
+  <herd>emacs</herd>
+  <upstream>
+    <remote-id type="github">immerrr/lua-mode</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-emacs/magit/ChangeLog b/app-emacs/magit/ChangeLog
index 5002251306ba..62941d53a65b 100644
--- a/app-emacs/magit/ChangeLog
+++ b/app-emacs/magit/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-emacs/magit
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/magit/ChangeLog,v 1.17 2015/05/20 21:09:32 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/magit/ChangeLog,v 1.18 2015/06/07 07:51:59 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   20 May 2015; Mikle Kolyada <zlogene@gentoo.org> magit-1.2.2.ebuild:
   amd64/x86 stable wrt bug #549892
diff --git a/app-emacs/magit/Manifest b/app-emacs/magit/Manifest
index 5df2536cf04e..9a7385042587 100644
--- a/app-emacs/magit/Manifest
+++ b/app-emacs/magit/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 50magit-gentoo.el 77 SHA256 f3c97d1e80e018ed8338bdb9d1f7a0b8be54ad3e84a590680c2bc0422dc3caef SHA512 ab812cd1f5451868dd62a4bd3e87b2d5061ef4e3010a2a4c63396c9b797fbfb45c02d045dfde55de1b7e91c98375ba7a56b98f65beaa697d35228b9c870daae6 WHIRLPOOL b84bb8d7ca0343774c19c7d604778cd7d01fff37a0d5cc15696002ef335f2acaad21a96084e86d539b13c2a4f589a20b83099170d2a0bf8a67627b07ba98cebc
 AUX magit-1.2.0-delete-directory.patch 1315 SHA256 b283b6742c045cfd0acd92d74450adb4f0aaf72eeb21a3091dd572c2b485ced7 SHA512 498d1d0a48709e72c1023b3254019c035c42fbad6f43ae8312320e28180d7a81d8f4c5f14d59e2faa6e167494d2b6e2b6420b0883f2c52542c0377d6b6c8ac55 WHIRLPOOL 53557bf1c929929b3e7caa7638bb336f7ce4b4587a20b9f682c505dfb9e7f74bee97aaedb658ffba0607f34f1bea2fcf595e7a6d3dd179d682ca4c0d2c5b86d7
@@ -7,14 +7,24 @@ DIST magit-1.2.0.tar.gz 163318 SHA256 ef535819b8ee32c53ad38efabc82028f62422f2629
 DIST magit-1.2.2.tar.gz 111245 SHA256 8ed300887909d0990cf17b1f4a3b902944db2471ca93dbf0202724b3f44e5d0c SHA512 c7817a5231485e593e8f7aab8c01db19f433ff9b77d6635c95eec6beabb45901f1dbd9d02fad718436f9e25516df14714e7ca1b05b53244e8465dcc14a8cee7a WHIRLPOOL 4b7116bf2568f786a859299ed8039bee32fda51322e29f7ddd139a9ee5e3f3a3caa9d245fffed3e6c28f11b0e068c398f424450275de94a4559a9812634639a0
 EBUILD magit-1.2.0-r1.ebuild 1126 SHA256 67fb8784df391e0c11c626038587ffe0066193c37845a69d0169c779a4c122a0 SHA512 8e34befab1f721f37c381ae8bee2956445a1659de172cfdf26a7aef458653a3cdb5f4888280d0365547968065c268cc4d919a1c560943987ce06fb22ee2c8db7 WHIRLPOOL b771ab764e6452d894943c43522b7ab249bd765a9e4e1433f2394ba3d61d4a08e36abadbfc33645df6e330a985b561873e37bde4e8f309a161c12912ec985ff1
 EBUILD magit-1.2.2.ebuild 1073 SHA256 5971ddb16a21a950aac2ef4ee3093819a738873549b28927b53366a9a17644c1 SHA512 8f3a97850736eaee1cf04eb6cf34de2d0e7da08f668853f39ecb1d3221e72d2fb34f08d4ddbf9072098f78d41e841f741abf2a634215040dc436ef4e5a9d380b WHIRLPOOL 7ed2a2bc3575fe836aa31d4e04b546858285b19d30141d440fbb1098c57b8287b69174f12e940ecfd1a26e7d1ca041ae6332bd60f71472f02006f52b0ceea9e0
-MISC ChangeLog 2636 SHA256 3d67faa815cb9e0bf7ca8dab41c9f046d4bdf14969bd5b5b1b4f86754479a1d7 SHA512 b436a767a09bbdc45737f74861a44b472ad0f933d62cde73a2cb6edbd3de380d7abcaf27b1f5ad261e74b48f00d1322f397bf16d66c6af47546380013895c126 WHIRLPOOL adbeb82ffd5a0ed86d41a66b133941950c81e5ecdac98c667a786f3e3b400f91292b8a3b26b09cef0449a5f7f061ce3745e9302b39e6f55476d433e4db3b2f41
-MISC metadata.xml 687 SHA256 fb8fe91baf6aa372bc0b888f7f1714cc8b315a8c51f19406981df02840a33399 SHA512 3b455d672fff7a9d8142cb22284863e545246ed940223b4b714f40833c358cc188ac1764dc355a7f23a37a890d4d89a2d6734794baf748e0a35470deddc2befc WHIRLPOOL b86a97a4694c65936518b9caf8da015f6b123e1d6df9384d3b4f1403305cc409f224804c34a6e04469d322da81ecf3bfa1ce741fb2fdd5789ee09d58f79d255f
+MISC ChangeLog 2737 SHA256 67253fab4226703bf49906a191e2f90a32c07869b8aadcfdc3255958d50ce799 SHA512 abf9bc95ec6529cb651fb9e657db2a95fa4c9742fddcbe26fb55feec5d7a8e6780766b1fd283f1a64f472385f50523dc26846c976d0bd9d79fa717006dd729d2 WHIRLPOOL eb6300040ba05c6b185991179def1495e6cfe4fba685a46e607edc3392a6f6989cd3be2a7de0cb63909d6d4833ef189c3cca3bf382780592558cb6bf6b9b8f46
+MISC metadata.xml 777 SHA256 69237dd726329b2cc2b67f6b02c175456d87b02cc5976b7993fa713ea6349039 SHA512 db76d32f4a191eccbd447e066ded33b5fa6e165f65f3b5a135f1c118debd7c7c45d96ee8940384eb4a0199e6e62f93f076e2afe98d8aaafd4790683f5f537f44 WHIRLPOOL efaad8286475ea8d6ab2f0b9fc0dccc24ddb50744ab85de857d2418a278c411b1a6fd4aa19df7c1f1d825bc4d4e31c57e6dbd911de1e454a955e70a9313f88dc
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iJwEAQEIAAYFAlVc95QACgkQG9wOWsQutda9AwQAvk9buyRlMj+hOtjWYnQiu7y5
-asSYarVFkBs9X4Oowe6Q3TMhD+gdTxlNYoYwXSJduUJwxjEN/dkaCbPYIzL2UQl1
-WFG4gKRl3wy5kiON/Z06HKW+b4/VrXaMIPQieUoqH0gxFgNbLzz9sAWU+EQCBwr3
-WyAwe2wlonyg/5eO06o=
-=a7VE
+iQJ8BAEBCgBmBQJVc/ggXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiYSUP+gPy4wNikClhdk4WrSVsdxMJ
+8kr/j+8/6Q1faqePSa8Gcb3Bx5A9PqyMDX0aoeGQVv0agBCDmiKIuhYDt0cySrsd
+3HsMmo8/lxrHu0hCeoJT9ixIiOHKwnRKboP9IwghCXxOgqJmaUVYghuHVE8knZGk
+iLXdcDmx5xd4HGDIs1PG/JgYzcGSvIhymdJ0eelaP3RpcOko4sjNiD+eJOmFwKp1
+OcmBOyX9+Xe9BSmKEVb2VfQfVGUaEJmWlOzwDrVRsnbIxq2el2NxZSNgJbg0Gw5E
+lLUiU8qFXT8uBmPzdaJa4/2cCcOR8SfZammiULfxcJTVepg6Axp94cT8mOSsQ8yf
+OV/n7Y2N33y8+XZzOdm0kgZ4JC5KjoKecC0Sj+goom2MNqPnvX8TtmzN7uyCpmZ+
+hzHxNw64jWIlXzBahft9v0xOZo//H4/Z7lZEY+LE8Wsw969PKnswMKjinCAGWDh8
+AiNuBkj1zx/B7Eo1wLML4Ub1jmdTm/KogjqRa56bxGmqZIMRQ7qpUtPcNO6xgsya
+I6398x0VQI7UcoKrkl8LfTavaebOzNY9rn/9e8/rDb5O2+BqAxUYh3lDCu+VPfnE
+i8Mr/y9fASBwmx+afX2dSKHV1uu4DK/ax8hspJhizrZm0bFlpIvORoNGr9AMaIyG
+F/lOLZ/NkwwwYBjN26Iq
+=/MIr
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/magit/metadata.xml b/app-emacs/magit/metadata.xml
index 154ec09c4e81..49c6dbaaa580 100644
--- a/app-emacs/magit/metadata.xml
+++ b/app-emacs/magit/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>emacs</herd>
-<longdescription>
+  <herd>emacs</herd>
+  <longdescription>
   Magit is an interface to the version control system Git, implemented as an
   extension to Emacs.
 
@@ -12,7 +12,10 @@
   support for cherry picking, reverting, merging, rebasing, and other common
   Git operations.
 </longdescription>
-<use>
-  <flag name='contrib'>Install user-contributed files</flag>
-</use>
+  <use>
+    <flag name="contrib">Install user-contributed files</flag>
+  </use>
+  <upstream>
+    <remote-id type="github">magit/magit</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-emacs/pymacs/ChangeLog b/app-emacs/pymacs/ChangeLog
index d4e8dffaeb7b..d1b8b7cc9e67 100644
--- a/app-emacs/pymacs/ChangeLog
+++ b/app-emacs/pymacs/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-emacs/pymacs
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/pymacs/ChangeLog,v 1.68 2015/06/06 10:33:06 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/pymacs/ChangeLog,v 1.69 2015/06/07 07:52:35 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   06 Jun 2015; Ian Delaney <idella4@gentoo.org> pymacs-0.25-r1.ebuild:
   reset HOMEPAGE wrt bug 503240
diff --git a/app-emacs/pymacs/Manifest b/app-emacs/pymacs/Manifest
index a3ea50597d4d..2926357535fc 100644
--- a/app-emacs/pymacs/Manifest
+++ b/app-emacs/pymacs/Manifest
@@ -1,19 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 50pymacs-gentoo.el 183 SHA256 99ea80acd692dd6fd44049dfb5aa80bae00a3abe7b7da3a6fd23868756e64b98 SHA512 f59fed86f859b796c901088b38fb570a5e5527d774a15456105ce75598c31fd20d0afaa62ad9cbf12063810fa592dbbd7c33aaece5871b36b488e5af6de0fac2 WHIRLPOOL cf845dd35dd09690b9fe6d20cba8dcc821f0fb4df28070d10765c912c04dd7967c01193d5c087ec59da0d6d6ae105e320555aa58285770bcd1f40fbb485d57b9
 DIST Pymacs-0.23.tar.gz 92161 SHA256 eb419e307c9670ac5ad76de44c8803bd91ff0a1a8d6b6035fa4d0427a85f5163 SHA512 c07cc4fa75ca3f03a517563172c9647f1f8402bfe7cdac45aa285c838fe15ab4fd08cb2a0364d985fc4d0ad5670436c4f2c6fa81efe1424b10d2a430699308d3 WHIRLPOOL 5477b4eaf9c134f80101be9a83c2285d8105aeaa189e4f39190abb024073e942c660fe74eff2defb42f5422d64fe73cb24b8e206c53f624aec0e1a9795db4f58
 DIST pymacs-0.25.tar.gz 120597 SHA256 51dc21b33316e6e244e78e5e88d8ae9a88afc0dcef34ba702ea9be589839bec2 SHA512 e17f7ee754413e21403d23894ee263fb0edae180a60c746b02cf101b2f0c782116e7bb61215bd0a8c689a991e211d780d220d4672b58f43108e7218a6f0c8dc0 WHIRLPOOL 90a211d1b62387e05deb759786fd82eeed23c1800307f1345e1c06c579c0455480433c24fda34a881f887595e169076a6ed56f6e8774933f0431aa96940e0152
 EBUILD pymacs-0.23-r1.ebuild 1326 SHA256 6b4971c90a8f5d22c397f973252bc941eb79a1e895b6269431c3f0af3ddf389d SHA512 9d5a1087a046e92503665a27554281d3f1f4fbd73c0bf4c1dff393c56f45bcad0af0e873f4c2c6f48579434a1445ccda947b71810565270c11b9e1b0e43646ae WHIRLPOOL 2b905936f68f02e005761341c1362a5654e4a4b3df771e921c4b4fa344437fede0aae4395a58de0af06d4860256f479213328606f3240976724ba19fd83d12cd
 EBUILD pymacs-0.25-r1.ebuild 1256 SHA256 931261095a197fda8af1271ab77903aacca1d86d376ddc524efdcc2042c269c0 SHA512 ed60134f75961c2646717127cccbdac639286b964d0ad5b83fc3068b47fdf434d9c94b7e95fa2a855dc2dfa937ceacbc1dd4f4051f2192b39dcefa18374b8742 WHIRLPOOL 68afe12b4bd17e87baba1551940bbd1460af4e4c692245ca00876ec03781ab911a1a6a7e998b53567187282171099a7c0157508eb66bee0e837d7633cf1f7cdd
-MISC ChangeLog 8516 SHA256 393cb437593658d1fb319bad6c90b1b66215c258c24fdbc408030e4517dbef66 SHA512 72d91e17fa9fa10447199697c2c35fc22debf8e3408ea4ec17c33a4dadbeeaf32aafe783147a52790f79dfb949fc33873eaf5443e0a9b8526ff26d3974f8f139 WHIRLPOOL 9ed748b729809198813cb32bf4fdd9b71899b377f51938481b1ba80ce89cdd00b1ac6a2dbff8b573280a1f6654db227ce9f633e7b9d965fe37088395eae81073
-MISC metadata.xml 178 SHA256 daafd22b77c8b0fd1457997b066b4915417db72b755712b4a3e65d3c91b884e3 SHA512 6a705222f8c6b6f78c244ac4b4d344a415bd9694ec29bf3d029737365fbdf199959e610f160e846b413deeaad49853394009b973c572b9948f87f55d0075507a WHIRLPOOL 84b156f2788965f73ba9073906058a6123ac7a3b3e1ebedcba7b5fe052d52a4fa204853d2957e2f1a9c632406f9435c4a907189b800a31cd2db0a9fff37db6b1
+MISC ChangeLog 8617 SHA256 34729b122970c456ac7d75fb299f6f247c323f7f98171368c688aab4393a71c5 SHA512 53f3d2cd84a784d645301f2dea07fe8ebe1532d4fd6271abc046036108a5db315b414e057af7c7d6685a697297dd77ecd5fed5bc11d9febe63605965a593a7c8 WHIRLPOOL 3bd63dc7ebf8cf30aa0733bf99555bd0282a8c3115bd124d6bc9e1f4ddb00999f11a37c015d2ecba88e63318bf86f0f048dade9fd659a4b63038626873407b89
+MISC metadata.xml 264 SHA256 ea9f6cb18049bc47fe49a7b8bb9faf4a45019955824eeea699355bc822cc6621 SHA512 81847f4b2df09dbe2d7b7958a92d99196159596ff43241471a818ce4b74e850bbcb94c562ab997a2087a0c82cccd2b06fa3558f55055483fffc8288a064728ea WHIRLPOOL 06c7e85c0c00cacce3fed691e88aababcb16647efa898854b468c309ffffda819ed44dffced0ebbf0d957669558ac81fa7730538e820179d41497130ea7be251
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.1
+Version: GnuPG v2.0
 
-iKYEAREIAGYFAlVyzGRfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
-bnBncC5maWZ0aGhvcnNlbWFuLm5ldDdDQUM1OUY0ODkzMERBREU1NUQ1RjJBRkIy
-OEVDMjEzQjgwNzJCMEQACgkQso7CE7gHKw2tswCffXoH0G2XIeye9OVyH/z2+BxP
-UGgAoL4SHxM9PhE4Tl8cSOZtbjYdu2Jb
-=U5sQ
+iQJ8BAEBCgBmBQJVc/hEXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiX9AQAKbmeFBsuNLIRXkcw5Ny05P9
+61m9duwtaPllbzlZkR2MckgHNPuquHIBXQqNHvIu/ZpdY1vp6bJ99+y7HXnZoAvf
+FY643eGBlW6UJdECm6oF7wf5A57jwDYexLE10N1VXBdOKRi6LF0RI9PjOrmOOK3y
+6kuTwTVeOyG5D7uBrX9H7l4XwXOKl2OsRqOYUktx7Jehc86qyjjCFNWcBqCpX46a
+s9W4mh7Gtu8YUnsjfIMUTSiJEsKn83651zsngR018lxlYDmAKMVVN8P5d9tdtoQr
+GZm/m64nv3fb/l9jKOFzHFX4KyztniX4amFTEPGkVOuIyys6P6Vvfn2RfZ+ht6uN
+2FiThyYM0zcfBpAPAzndwb+u0Yh+hnqvnJcMHSf6RyufS4Vit0w4ONmC9tlVo095
+4VM0Pg85pNrSH0UI5YPo0PtvVyi1Bnhb6rzyfExJX+Tyhx4grThE2sfSMTzah4fD
+OxDSIdg8EMHrc/lguJsTgmk5zwgx6yzDRi1H2F+ucEX9ZPgZ6ZZIJfCGglOgOrel
+hrjn2GZwjDcYsMfDEsnFF/uupA+OOTMXR5p5pbBPDcWa0b5XtWpDnt7jNNQkkOj8
+ZQyWrrT6H7MbfScrOGmTnVY7Wjz41ReC5ohbJLJwrO5sKoMLL4IB7nCUwqkM4dwv
+k5xC2ODlawAG+C04Pftj
+=vn3y
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/pymacs/metadata.xml b/app-emacs/pymacs/metadata.xml
index f65b0d259bdb..4f7be8f8a824 100644
--- a/app-emacs/pymacs/metadata.xml
+++ b/app-emacs/pymacs/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>emacs</herd>
-<herd>python</herd>
+  <herd>emacs</herd>
+  <herd>python</herd>
+  <upstream>
+    <remote-id type="github">pinard/Pymacs</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-emacs/slime/ChangeLog b/app-emacs/slime/ChangeLog
index ee9f38fe4125..652ece7dd642 100644
--- a/app-emacs/slime/ChangeLog
+++ b/app-emacs/slime/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-emacs/slime
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/slime/ChangeLog,v 1.77 2015/05/30 06:40:13 jmorgan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/slime/ChangeLog,v 1.78 2015/06/07 07:53:04 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   30 May 2015; Jack Morgan <jmorgan@gentoo.org> slime-2.0_p20101103.ebuild:
   ppc stable wrt bug #511170
diff --git a/app-emacs/slime/Manifest b/app-emacs/slime/Manifest
index 1f7eafd2d596..19dd21bc59c2 100644
--- a/app-emacs/slime/Manifest
+++ b/app-emacs/slime/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 2.0_p20110617/70slime-gentoo.el 573 SHA256 942bcba3b2ed32191f7e531ebeee15d8f35389adb7d89fe6c3e16088a59dab1a SHA512 022e0934c8dcdf208bdfed9810200c8b925059b75e87697760b7e8cc926569da607dc3b723988e1ec49d584c92cdea96afd46642090743e4e593c860a058523f WHIRLPOOL 8293dd3006ff1d63cea569f49bbf86a5c83c4fc780dbd7024070471cea8629ac25e716fc0e9dc5c9ecfc8e9f01a717b762f2aee622ac9b52c8899053c41583e6
 AUX 2.0_p20110617/gentoo-dont-call-init.patch 638 SHA256 ebe27ecb8748a26d943ac480e56a5059fc56ef18816359f8728c909c3875ffd4 SHA512 b99e0dc55e61fda9f21bca9661854b84166834b4330e5f46b10bfd2c3fb61f092046fe8553fdf2d7a7a6350adcd3827315ea681bb53a3ebfec3648b25ac72b84 WHIRLPOOL 8aac59a44df9a7bcb2f274c0262fd6a44fe2be7434e9d7e4e7c37e820f65cda30c237307d10fc992556542c4f8a1a14867846c551d8f129a352fdd6e663ec113
@@ -20,22 +20,24 @@ EBUILD slime-2.0_p20080731.ebuild 2525 SHA256 0ea70b38c2277ecec6dfb0bcc174c40565
 EBUILD slime-2.0_p20101103.ebuild 2572 SHA256 8c3276507279f6e7e9cfb72ea9f9466bcc7033282d58678e714a7bdd752176c7 SHA512 ee2685d36701833863c1ea0a3f7c6073ea40609e5ccbd526623e966764e70d1c0bad2e8bfe9bcf320c54523f27ffc049e00840f3152cab200d5457f71b51093e WHIRLPOOL 47094bda8bd6b1890d5d5e5427c16515f5d6f436a203952a3b2a85e4198f08b9c79f2e42692565efe08302342f029ef27a055e607355acc4e8a53153fc7bf684
 EBUILD slime-2.11.ebuild 3807 SHA256 4b9ba483df21a3d2e0c140131997cd7fcdf4126fbb3fb20bf4a88aaeb9c6a252 SHA512 8bde739a0169821ea1b12f84e40994f94130c7e63f30ccd3e38491385d2e53d4c175cde6e38b756c8c7c4e7d93ebff14d8a23ec12bb2c3d285c9497fa06b2f48 WHIRLPOOL 7b1fa9c93e213b9d82b5159a6de029332f6f089f4c0e79b9b5684f2d4978c270cdd67a8889da80d7cf97ac4ee11f5ec0f6fd6046d956a02de9daf849c7aa1b03
 EBUILD slime-2.12.ebuild 3807 SHA256 21e0c5b71a7f7e813f7ea83d60e55818cd877ca2af32f569fedb731e73c2b1ec SHA512 4183305e04cd156611cb477fea0ed499557e3e0f830397e3cc8e59fe9f09a16451457076ee41516937f983c32d9358cbf152f2dce13f2f155bbd391c8857f7ff WHIRLPOOL 188b0b50d0d1e766375dfde27fec97040aaa0d01df7711988c6c3e256f427be34bdfb50aa24a4697ffa6d5fdedb83ce8a8cc90349f892c7942373d02d71e8514
-MISC ChangeLog 17951 SHA256 0e9d102da2b2554b523757ed390650fc9a0b2563405f09c0149b1065e93e6436 SHA512 7c94f3d437e764918e55028016e4db2c94b175087be42c2993f08fdec11e21ac335709a2805677c948f3bcb4ed7f75a054479b95f9bf42e701024f454c51dfdb WHIRLPOOL e3b6e25078d72345fc7b9048ede641e04a1cb4372cf25b8b6997cee02cb36347883cbdcdcc3c2b01665b25faa60a508e9296906fbea2ddd5fd6fceef6fa96067
-MISC metadata.xml 1348 SHA256 d2fb2fdc46daf7c6f59260a6a05e745d54f1d7292078fc21c33bec36cda862c1 SHA512 19751b19a1bb3746c214293d5c6640d49a69dbdf5a48138c37de62b700c7feda094e337907c315556a13660a9d0dfc668fc7193ff852ebd327b787c55f96b47c WHIRLPOOL 3a468620bf40acb162697ee0c9869607673a28e2c5190a373bf30ebb3a91ead7084786f21898b9d3e65d46a8e5f57fc5e4fa4ee88bbf05262a1f23341f4cb38a
+MISC ChangeLog 18052 SHA256 d5f2845d224c070fafbb70896aaf73fd73609994093d7687c08a5fee4ee0f9db SHA512 6b5ba76b6bdde9c301bc089cf7982b5009636a714386ac766126e164790ffdb53e686d381c7d4dc0b0d3146cfadd7645f566cda2f1424d45f3b61874c0e938b4 WHIRLPOOL fb030dcff0451ed821e49642a3daf18811612ec28c1c5c95dff1c81828861ec73b39d48bcce372f40c4876584f355505dab1ba4afb4514063c70c49409d92a51
+MISC metadata.xml 1440 SHA256 cfbae15687b9555c4cbd9d2e23b7761681bab7fefab0d13a47dcd67db1c01258 SHA512 6043535674f2a054922e34e9aecf57347b541166c4cc5eab6aa7edf6e41d6c4cf4058407d72a8ca674b75917890c48e9767434de65fd745d2c716ed8b062c4d1 WHIRLPOOL 608b144fb559b5a2d582bea8382e39512b49dfeb23f36c0400be6ca9634574bf8675117bf076621bfe134de88e02418d14b0bed3b6359ec8734fa22f65f0d293
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJVaVtJAAoJENNAYYQy1of10nQP/jqXOwYKjf1A+I/aP+O/aXV7
-+ibvhhSA5CLFhBE7Jk1AZQr6GPxruJ5xfgDBBWDw4skbTlKFHCsIsDWXlJ+u/uUV
-mOovJwbszo+OJhcTaNoLD3Mul2b81//UW81DmNl5xgmLFYenxX6oFtkrvd4NoUUP
-1ZHiG6SCtxJFwcXMyRas+BMSW5d81hkOvpsW9961CqqWGaC1T/L7KF7izJfuVXPj
-+tUae+T9lX0SB89zVBYf+AR/GkX2hfbEIVGMqsS1LWhfsfJipGDLbfyDXocOzGPV
-saMj1FmD7q5uqwDy7BCWSiHaOvOBJJLR46RjAXu3iRFzDni4kv2qwTzCsCNOar9K
-A+81s9xMVrPDDJk4kNFRzKelUMSVnX1zgNwyzqEKbvuJcddoqKXccIapLmEllgup
-GBaP4w4FSpIkoun8E8eq80Sd/d7CX7Ya2DUXD/mRDM2D/9+vnuG0yEXYyi/3ZLq6
-8QLZX7SQR3rVwO0vsaZIKKaek29Yihgj3qamMs3KYgGoYaKsSAme8N7ooOEFyOpH
-+6NteoPw9U3qZEXtghBCm6hHeGCB4P5jJeyPrO2AfIvBTLI1ol6M33CZDbxocEDg
-tx2hVkR8/CBIYxXVYtwguSosoCXK/mIeJLYoO5MjD4sR52TpflJ2WCE1QuGjme1c
-zHdGqb6NkZDtF5AIApAj
-=8p+W
+iQJ8BAEBCgBmBQJVc/hhXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmitGcP/1loPXNDWeQ7UFS8OXr+SWAC
+isimnYk3Aoie3N/qHkP26H4cKT3NiaGyljjHxiWyMvZVbpJsLTPZ0S5Uf/l1LgtM
+JlaOaQ1UcF6H4MAA4xyOomNhrJRps+0e8+HQHcICSLv7gpM46Othphenppdb9vfI
+78zEZYV4rq0ojGtfzQ+/vTJgKjY2pU/6h9zhYJwsirqKPuyL+ZfPY6UkxGeoFAbz
+KhAMSfrU/o+FthaNQ1tW45MvYIXgTir2YveCqEgWb6pTkuP9JBZdSVAox7LsnOPm
+fyohqwClKGTFRABJ30ygJa4a5YfVHfM6yzNL59u+a/uu49EooMUsOmjcKRghj5Wm
+ZVHtqvggQzS0VXiVSuZ3FFNL+CVwKbkW+o26jThehQi3K+4eUGUFqrONJgJWfEcG
+w91casdZ9GoUgUsysJIMr/A/st3wJeCd9Nd81vxjjOfOH4dDO14Z922HMIWhF+o2
+bINbEx8b3+gGlx3GGgUFpR62gOv67yhbT43ea7qKhuxr4369AIUGBwncMIPtCKyK
+3o/MAMTyODJ8u2JloCZCgbSH1qIEI0Il+xroU5hXSCT/aDHv3490RZkuq6tV7e1v
+gTbv8jAtF/hdJEwxqcfFrYguclioRsntSsuMsQv6ZzVH2vagZaz3qog/6E/lMwm2
+G7Iq4uAUc4RsCk7WZF+2
+=us0V
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/slime/metadata.xml b/app-emacs/slime/metadata.xml
index d33d27c275c4..0123edb1a997 100644
--- a/app-emacs/slime/metadata.xml
+++ b/app-emacs/slime/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>emacs</herd>
-<herd>common-lisp</herd>
-<longdescription>
+  <herd>emacs</herd>
+  <herd>common-lisp</herd>
+  <longdescription>
 SLIME: The Superior Lisp Interaction Mode for Emacs.  SLIME is a
 fresh, new Emacs mode for Common Lisp development inspired by existing
 systems such Emacs Lisp and ILISP. Feature highlights include:
@@ -28,7 +28,10 @@ systems such Emacs Lisp and ILISP. Feature highlights include:
 
   * Inspector: Interactive object-inspector in an Emacs buffer.
 </longdescription>
-<use>
-  <flag name='xref'>Install xref.lisp cross-referencing tool</flag>
-</use>
+  <use>
+    <flag name="xref">Install xref.lisp cross-referencing tool</flag>
+  </use>
+  <upstream>
+    <remote-id type="github">slime/slime</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-emacs/tuareg-mode/ChangeLog b/app-emacs/tuareg-mode/ChangeLog
index e10835507ec5..1dc6065b22c4 100644
--- a/app-emacs/tuareg-mode/ChangeLog
+++ b/app-emacs/tuareg-mode/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-emacs/tuareg-mode
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/tuareg-mode/ChangeLog,v 1.48 2014/09/02 13:19:34 ulm Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/tuareg-mode/ChangeLog,v 1.49 2015/06/07 07:53:24 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
 *tuareg-mode-2.0.8 (02 Sep 2014)
 
diff --git a/app-emacs/tuareg-mode/Manifest b/app-emacs/tuareg-mode/Manifest
index 0900dc506d2e..463dd800463f 100644
--- a/app-emacs/tuareg-mode/Manifest
+++ b/app-emacs/tuareg-mode/Manifest
@@ -1,24 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 50tuareg-mode-gentoo.el 343 SHA256 254de1abcd93c5f7054e8108308b1e4232ab50309a0e3ad50c310a64a875ca07 SHA512 41cdc5aa7c083afbe044c730b898e06817fb8c5d9799d0c88be9ad15501d4135e16597623b66ae65a40160d9a04358392a98e03646ba2207e0f981f33e28750d WHIRLPOOL e43a1cbe471138e76d62c3ac2165d312b7993a95cf9ee7ed886fb178420ec6dff12306cff2f13e4b548a99189bd1c85ce675daadeed98539f672e46ceb7c627f
 DIST tuareg-2.0.7.tar.gz 57999 SHA256 7ba8016cdd2195d37ccc1c0e300323f807b8bdc6d3ce9e622ae9a36355d3a9c9 SHA512 6cf290879dd9b7993a046dbebb9944a245fa82d1e7849b46f477b7217b46026ce5195e40e4d9b990e047a03680197827334e6d54d82610da6fc2e62386357d42 WHIRLPOOL 19b6c8fb7e7b6427499aa7aec0b22e0152ca35e93c042c2f3e4a760a76ba4c89c7951df25a128414a2f7df5aee7d76aea255c0b235065c9dcae4e62ed3c05c86
 DIST tuareg-2.0.8.tar.gz 57777 SHA256 13da95153d6d50ef697878c45d81302340f97a42ab14112c61b8c6b0e891512c SHA512 c9e268eb550fd36614e6632335b623a0916d64dd84a0259fd83c6f08e3138196d3871bc7664d6debe62732d4459130ef1e9271b24982138ff69d90442d031990 WHIRLPOOL 08e5f39111e8770ee1e4c8d0fe5104b20a3bcf89bb08a7acac0758d7933243cc55f6933e838c85aae2dadd1836301d3e9988fe38f7863fbe39410f879d17a67e
 EBUILD tuareg-mode-2.0.7.ebuild 623 SHA256 69b43f2fbcc82fa924904a360c2cdf9bdb9c53fbd3cbb2c0191919b89c31a8db SHA512 7068a1e388966c22d8bc4f74657b51ae18e71ea050b1f4fc51753bb58f67990bd5835f5987738b16c9acfa0f8925848119071b7a7a9f34d34389229f3ee0d990 WHIRLPOOL 0a402f1412994c87e7f79629ebbe13c68e991b596c014183fef2f9d02706af189337a2916801980f7b62206739e10d1296db5cffec67708955b66035db995fe3
 EBUILD tuareg-mode-2.0.8.ebuild 636 SHA256 2c425c4f87564ea0447046831a00754fcca14db4ebcf65c96c7a34931d530dc9 SHA512 4601e7d83cc1eaa8724ac4ad7bd0a93b2e1c9c8ca1eedaf26d8bc3ebc5cab5ebdc33c0c5dc1d978b240203a370ae30c6e789b0de551adb827144e3f68e8d3eaf WHIRLPOOL 4a4c83a5565a717d783a81878d957a3b021460c0f72e739eb7818b5827f3d73499366523ad9db3d3391adf98c46373570a40e0aae359ecd2f7b83f8a87a76d4d
-MISC ChangeLog 7641 SHA256 8971a7d6f0abb07b103c361e4d028d6842dde5f06af292d1981c5577bd76d54c SHA512 c286e342cdc1d16e3426c6ed9d0f329292a7dfda914f4cc8974389ffd118102e45d62ff93442ff549facb7218edc67ac91f518f536d210b35b87dab5b92b93a3 WHIRLPOOL 51dd07bfc0f762786dd14fb9557a7bb3f025bca95a7906649a3ce6795448a12b9b34c1794c33bf05e24ed4e813b2e73561b34ece909bfcecd54b9f12e33493fa
-MISC metadata.xml 486 SHA256 1ade28881788ffd0d6f0b6f0c295e8be0d6c5c1fc33fdf9121843d41a8161bf1 SHA512 44bf5792c46b739809d95b80f518cfd4b7b2b9cb6d44553e48b211f1c777e5072e02b422d33471783361cef7d1d82ee03218731cd79e1000ca833a3439fb0d5e WHIRLPOOL 458509e219849adf44d881e85713d31085b27a1c5e0bc2e657b641d6d5fb6286e4e588e6c3431b76872098ec28324589c38245fe88b2721637d52c333eb8236f
+MISC ChangeLog 7746 SHA256 7da591248b414efe9d2726dbf9bcafc7f4b7a873123036a1d8fd937ac4a97d6b SHA512 a5b5fd95e6e5f057d747851cf3fb280b303bea4b4fee2b4ef408a2692d374490d212d03f7cc3aa1ae41282f8a9adc61051dbd6344840054259869cdfdfd9c109 WHIRLPOOL f1975f29c5f01089c7ea9604a5ef62184a2a5433e13db1c331fc9763fd9083c4a9bc8a1393a5f80ad215a6842b00c7c7efb38f50d3744b70f45eb4d487f520ef
+MISC metadata.xml 573 SHA256 6d28c587d4ada8ea0b33ca8cf2b26f49554cc2ff448a7cd39644ac3b4eec7f12 SHA512 264213bc5fed3053b31a42dc1a9d2c7ad23105b66a5fe55bfcb89da25a8d8150a0124433da063bcef6c4f96e4304f3be7442ddbba108d16c1954a9b28568fec1 WHIRLPOOL f6db57ecc6f6485d7aef595670bfd6462cbc24cfe310f88f7b79e45e778354c57b47a7bd540a02e6a3fb0cd243b8ae23f4523ad9c6eca093f5484ff6485cddc2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQGcBAEBCAAGBQJUBcQUAAoJEJQzkH1pP7W4+r8MAKVZtcT7jz7FSBOPqlwFHt0E
-EPjb7TJ+eOtCQThdVnCOl/jr08IFtqN/Q0EOvdHJjos4hlk6x6k1P8KQXvzlBd/X
-1uTEnu2dikCyAu8QKSEFlMcmqoYSc5fL8eKNDMeWudy80wtUAA60eDZjYTjkNy51
-Hs+xjrwec68ZkgW9oZfrAlo5qHK1j2UKrNZ50AVBVO1jsWVHKBtG3FOeXQk+xxnP
-xdUIT7HZ/Y5gbqCqWDt1aIMlIhuankH4dUVpkqS6wkYBf7IcBnNjO5Xu2x/WX4G7
-IMdIr46yzQ6oY1WwHi9FABLDP2xgUweNRhOCIXn9iCAyA8Mge+lMWkB9XvF2HJmO
-gwJqY8+AcD/Tw5FoazcR3omDtFfqXIRN1bt7C2fv0xEiv617Ysv6PvJP/84Ifwbk
-qmNZfRAtOOO+7a4l/X/wk6uaI98BMcu+8q6jDpzPvQHFK0nkvj9wGPpDUomnk7Qe
-Hwad86kCuJJNmYnSl8tuxeWifjt07QseBwEjqj4VwA==
-=sYY3
+iQJ8BAEBCgBmBQJVc/h1XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmitf4P/1TKmYabslaohQmUhDUydKt7
+NhsbbiehYWrQ2LdKhpyMVpidYEMvAA/acbsaBYKjYDOFLakCdEYJIaFsOGhaxLc5
+mzQGdjhzY8GylsqBxKb6hBpW7kiloQZY7VzywbqLw8D9qHnOp/1waj2khVRQKNwV
+I+Wb2OWEBtrSFbHqqInJUe9Sf+kHcQ1HQy807xxh/DIfU3B2bAZ4qahvSnxWJnkD
+uZW9sYITKY7zyUtR4tg1aQpBEsf/gS6dCF1qG8Sm6lRpDs2kMU+JQZxZTHQEoyAq
+FOhhiHp09VijKhDewEQ4GRLRsbTWoQVpxIihUvoeag50Oyi5YIKUR3t65mm2KW6u
+r5Kvr7cWBOWq7t8FQhtQKx9ITKkea0f+7J5St/sHkVaK00HBJmUY3U5ZxpCtKkvL
+E7HyHEVt7+O/zAIEsLGP/phcLyvih4Ll/z39eDCsNbnr5JYpVMfyPLW+xn/jG4gA
+J47eAk8hL2+WjLV7tdPEcSirEz36wrcpoihUa3Dafg2sPNstsGYQuQ2sqr0cGJzf
+SX13poID8y+qu0TMMEsmOfbXVAYvgHAPPWBpVwZ/2RlLR5oQaa5W9xQc5TexD/wz
+id007NhJMBD2+H/B2h7a2PymP2AcAtLqf5wMO2CwGFW7zeIBLtl9phoszjYzcaIU
+EePKiq+bExF0kiRcvUTZ
+=4dpW
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/tuareg-mode/metadata.xml b/app-emacs/tuareg-mode/metadata.xml
index 5efc3efe38e8..d377beea954f 100644
--- a/app-emacs/tuareg-mode/metadata.xml
+++ b/app-emacs/tuareg-mode/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ml</herd>
-<herd>emacs</herd>
-<longdescription>
+  <herd>ml</herd>
+  <herd>emacs</herd>
+  <longdescription>
 Tuareg is an Object Caml/Camllight mode for Emacs.  It handles automatic
 indentation and syntax highlighting of code.  It also supports an interactive
 Caml top-level and debugger.  Tuareg attempts to do a better job than the
 Emacs mode distributed with the OCaml 3.x source.
 </longdescription>
+  <upstream>
+    <remote-id type="github">ocaml/tuareg</remote-id>
+  </upstream>
 </pkgmetadata>