Add github to remote-id in metadata.xml

Package-Manager: portage-2.2.20/cvs/Linux x86_64 Manifest-Sign-Key: 0xE9402A79B03529A2!
author: Justin Lecher <jlec@gentoo.org> 2015-06-07 16:36:52 +0000
committer: Justin Lecher <jlec@gentoo.org> 2015-06-07 16:36:52 +0000
commit: b081a370f90ec52fa779c40db736fa24d66fa9bb (patch)
tree: ec53b38dc5f7f9ce0818945d7672c58b5a09619a
parent: Add pypi to remote-id in metadata.xml (diff)
download: historical-b081a370f90ec52fa779c40db736fa24d66fa9bb.tar.gz
historical-b081a370f90ec52fa779c40db736fa24d66fa9bb.tar.bz2
historical-b081a370f90ec52fa779c40db736fa24d66fa9bb.zip
243 files changed, 2101 insertions, 1393 deletions
diff --git a/dev-python/ddt/ChangeLog b/dev-python/ddt/ChangeLog
index f084dd1b5541..e23b5f0291ee 100644
--- a/dev-python/ddt/ChangeLog
+++ b/dev-python/ddt/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/ddt
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ddt/ChangeLog,v 1.2 2015/06/03 15:04:17 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ddt/ChangeLog,v 1.3 2015/06/07 16:21:23 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add pypi to remote-id in metadata.xml
diff --git a/dev-python/ddt/Manifest b/dev-python/ddt/Manifest
index 692f84559ea5..6aaf05ab1582 100644
--- a/dev-python/ddt/Manifest
+++ b/dev-python/ddt/Manifest
@@ -3,24 +3,24 @@ Hash: SHA512
 
 DIST ddt-1.0.0.tar.gz 5535 SHA256 e24ecb7e2cf0bf43fa9d4255d3ae2bd0b7ce30b1d1b89ace7aa68aca1152f37a SHA512 4afec9fca19479acefb4f01bd550d696f437e53bf8e63cbb9dc16aa0b7f6c0214f5c7dc8118044b2d6e794de54ce3bac539f8de58202df74619eee1d8c7f85c1 WHIRLPOOL 0c6d54566147ce9fe9d2a0a3004f1bc053854b97048264442573102494fd8185f4d0f60127ca576b3a066d25756902538400944620745144e6042d4c72c25e71
 EBUILD ddt-1.0.0.ebuild 580 SHA256 480b76510436eea1f9ef72cf6e36e74c1241c353d58e8bd4c71f7e687b64f4f1 SHA512 ded454731f5c1156f9eaa2852e60279d1bbb2a8c6ba7cac2f14beee60738b71344706551e5e80cca2f8a0c337c0f714546510358f45ed38f73369531c3ec65db WHIRLPOOL fa9cd094b23aa53b0dc9628e93af6fc7d2886a3658c3e4aeb4207eb91a94c852b470fa45e84aefda69122f629bd0d661d15cb684fe854e6ce531490aa81789db
-MISC ChangeLog 451 SHA256 e843bdd2917979bef4e025d5e208243e07b17aea0264d55f44c3f03201981d73 SHA512 a57fd648f3dfff28ab6f8eea4b2b925cc4bc482116ac3c1ad6b8db67fd2d3b89c94ff01aacddc0903da81ce34328d7c91d09df1bd7ebe87ef8c537899cd3e563 WHIRLPOOL 4c5f22b88589d2827b5a30261d66f23c69e04d7c1cacb92867622e194904c162904ce4d32ae1b46adb7cb51f468b40ab849f7c82b618bc0f0008ba0afc4f005a
-MISC metadata.xml 493 SHA256 fff2455d64155c10972eb5bc2c53281becb027670560927b07b3beb78e9c1010 SHA512 3eac8cd32ce9b961f0b4909b4dd94b8750e34320d51770fe2f4c0fc6b2b16597a0c455c3831298bda91a6af4dd5a3248c43f2e40e3b40d5be1bf277982f3b2a3 WHIRLPOOL 1172fdc25e205d268bee7b9f4ee002a0c4e3226521c7896b113c1f713340d04e5f9a3c5913ef36912ab262bafa5a9f222c12070785c7a541994437e2d800d074
+MISC ChangeLog 555 SHA256 fe4f9c54c16f33b29c7043ce437fdfa490b356e130c9dbd15f69bb522043880c SHA512 a9b79f025dcd288977981c0a9c04462fe34197cc751c26d163e38b3badcaf4df84cf1c015f1c746e19cc7e4a0e09e70f83f1bf2664c75a94beca9a8af3abf897 WHIRLPOOL 153f8d904bf4a96a10a3df328a5c4709e4f14118ada4e3f4c6a9a8f08710eeb3c60728a5cf0201e379f25a186ccbe37b3a5a0798e095fc2bd7e5fc2ff536b05c
+MISC metadata.xml 544 SHA256 bd3ab18dfad1d7ef0fdc54c7657c74440b478f5793cafd06374314491b8882cb SHA512 4d854ddd18310822bc4c8b6bea0f500238a03198e7cf2511ae9d625760534df82743f68927059bab57e96b20b1d8be36321e10710fe4af0ad9369cbbd8c2dedd WHIRLPOOL b536d71bfd75c7d29430c701bad945fdd4a3357b8db54263d7523b653acc13cedd9e78f72ffe5e8ac528a931f893755d699a5d2c742dcfe49a1ed1bb8c9c04fb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVbxd2XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ7BAEBCgBmBQJVdG+EXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmidtMP/Rz0fHHL4IrOk/ZzVNCm9dMm
-bb6eL3AZQwbJB+BaW4arngsbLytiNzDoRiI3mhwWTOzok90FxoLoAgUtXyvVHYc3
-ugxrxTj5W3JkgtOWWhz0YMUqtVh5WoKBqvWc9HKL71OFkNcPNYNK93Hd6Xdm2RaI
-MN/AXkmUmZX0RhShiMKqFxaFM5VEOL29WUFGIpyp1LzKX3SxX/9NZ78sFXPvFK2C
-W8ZgXs0z+5n21awnRdVGPYSXuOTQ1UAVaY1yqFXUjE42rlC/A/o6dr3vWTTi23QK
-co9d8UN0AR7vA38XmFICGzKcGWq/ICpTEdyP+7cgWon59gtDefq4HhLv/ey15ZlL
-oDOi6xiuNOgO8nGusqMvFB3vBILsKMLz+S684NScvFzJ4AwBjvZJVqmR3xFRh1GF
-It+esrHT35NqRff84OPV8W0Q8h9Zjf4RXieC95miXiQlCIvQLtgn2yPxRePawL3m
-w9SchqT9CpDacppaVTqfIHBT/lnld08LjX2H8ADUSa71UmjbODKpMiPehN2memjb
-LCqB1SLTbMZMQ+RdjUteZ9zVmzQqC+A3KAduMPGl3h100OZuOO63nBc4WiW08YXv
-0V7vyIcKLr0XjkZpUVDR7Pmmf+302Z+Eo2zJyzaA5YSBN0y1sVQtuPa/wU/GnOy9
-6J7jlc8fihIWOHS+FOlL
-=bpBV
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmir4oP9iqdqvWTirSGIOLGmONd0UN+
+FuJqyF544RpMBU399lfGb87nTPj7Y31mbOW8P1osAvKsBUHDSlajIf3cdFLvihHV
+1leqJbgkm/z5sMfWtK57PB882vovAIwZhC/BYIvaHAfVZCXgAHBwnXFkJbbb/nBa
+OC3wLZjSOob8CYl9wy/6ZINt4SZPCwNQ4N/gepJ9M97ABNtmC318DZnQ2/vFheXk
+3qX4D9TsgGAX38FCPPyHvDZurYVDcfiGXD1sXN6DF9yCCdqYe+Kmpj2vxK4tV2LS
+pTpseqSfTUcZl5Lij3SZ/Kh8Q0oknuRs+pemN2eJsZIlafqtUYYGSMWz1z6J35zD
+LPV0jOBfnkbrFRAQAs/78NFj3YRACH/oxuRFHb8S8xdFy2Iueko28RGoioGNqrXJ
+P6nHzHb3fbTfAP5rxrDz8aDQKH1iwGSNQsyWYea7fbMGnhvSI/6NrdH7KKW51bBy
+VtvEYFJr9RhoiZDKJTwCA4b3xIQFupFpDJQ5Vd0GKJ/Fu4x7I9potyxK6B3jZd0i
+nIy9v4ajZ7P76gZIBXu3U+RGELT7uf+zlzqg6hqgnsgZK7EzsOCpxAgByI/kt1eA
+vhMCyLPQEe98qZ3n2iyuiyxLIWf1tz0kbtF63Q81kVWjizCXcORraujEPQiW23c9
+HDMTYJdcXSHGyZzJf3A=
+=GjDd
 -----END PGP SIGNATURE-----
diff --git a/dev-python/ddt/metadata.xml b/dev-python/ddt/metadata.xml
index 7eae51e00a30..a3ec71bb61c3 100644
--- a/dev-python/ddt/metadata.xml
+++ b/dev-python/ddt/metadata.xml
@@ -12,5 +12,6 @@ Data-Driven/Decorated Tests - long_description='A library to multiply test cases
 </longdescription>
   <upstream>
     <remote-id type="pypi">ddt</remote-id>
+    <remote-id type="github">txels/ddt</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/redis-py/ChangeLog b/dev-python/redis-py/ChangeLog
index 23686d2db5ee..0f1652fd6a22 100644
--- a/dev-python/redis-py/ChangeLog
+++ b/dev-python/redis-py/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/redis-py
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/redis-py/ChangeLog,v 1.56 2015/05/05 09:03:09 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/redis-py/ChangeLog,v 1.57 2015/06/07 15:59:18 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   05 May 2015; Jeroen Roovers <jer@gentoo.org> redis-py-2.9.1.ebuild,
   redis-py-2.10.1.ebuild, redis-py-2.10.3.ebuild:
diff --git a/dev-python/redis-py/Manifest b/dev-python/redis-py/Manifest
index 415e6bb1330c..171536a7adb2 100644
--- a/dev-python/redis-py/Manifest
+++ b/dev-python/redis-py/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST redis-py-2.10.1.tar.gz 84143 SHA256 644aaf429e666d2254143a6a02f3b1cca2806d0cd52bb130c8f879d3c8259d62 SHA512 694a687e22654631fcf7b0b5884c2f3b3f804befe8080a1a27f08e212afe2f64c36921e025801d67bac1786b105f23565f52768f5b62ed1d18038be8dba9542c WHIRLPOOL e1b76cf47043d3d5317fc4352c9b52598af119a1501e4d6af1615181006afa658417002fdd8e206e6d5d5556df6dcbdd34a74b89918c513802793bd6ced4cccd
 DIST redis-py-2.10.3.tar.gz 86532 SHA256 a4fb37b02860f6b1617f6469487471fd086dd2d38bbce640c2055862b9c4019c SHA512 a6dcb1160f91c444a6fd107761b2701e7d8ab2eed7b9fcc00e8f0bdcefe46c2a626611f36fe6bf520fe3cceeb509562609e6dba263e1508abe285a6eab73963c WHIRLPOOL 2b2fc577ff752f71675cade7c591442526dfbac07495d1cf61b14ac21371e76aec2d008531bb8729eb5e3f3ffd372d6c9bf9f7554e51f8076d2d79c07377d33e
@@ -9,12 +9,24 @@ EBUILD redis-py-2.10.1.ebuild 1980 SHA256 166620fc3cd644d3f86e530d41bda054422c5c
 EBUILD redis-py-2.10.3.ebuild 1605 SHA256 58cd93c70efccd1fcf4b970d9901023b6829b7f834d0f8fa0caf4ca0bdebd3c7 SHA512 b6a49a480079b6f664e02f387c00f802f91d6facdc9aea8df15f78d3d96bd8b03a38d9902485fc3be7a229264b211d3c3d04d06bc0830e4ab25db6ba728c4cba WHIRLPOOL a26da620d2d79f9289c4963f33daf3cc6840af4400b7f3b63582e4f0e3e1be526917b4762cfe85713b598929af7016caad0d13aafa9c70d95c6aeb4f91ec85f1
 EBUILD redis-py-2.7.4.ebuild 1711 SHA256 c40caf47ff7a98570b8d3075548a1c8e7aa2e255880f9387fefd1b6fd61d6339 SHA512 2d016286de45ea5b1864337ae25d602e9b7aa4e00e4e433d9ed7704771efc6a6d7576a1e3e97764ae6363cffae8fea5e6fd671064310a46f8ec1ab9e79b6466b WHIRLPOOL fa243d76c010488cc9425bbb8f803dcaf5d023aa48b1e68b24d0f71b2594926db0ab673fee04142823a865d964c299e925aacbcd67d4028c70aa2a85951b328f
 EBUILD redis-py-2.9.1.ebuild 1717 SHA256 10ea0cf0fa1bd8473af49920daab4fb7bc75fe6ec03e2209bfebcf700a619fdc SHA512 1713da50d72a0b967e1eecf1cbb0aeed62ff76f4965f69a8c6ba1d79f08b25e240c09d4daf14a022529ec8681afb3fc08b2f4ced9d6c79d352a7de220a0010ee WHIRLPOOL 26769c71c3c84d82bc00cad032bbb7954bcbddd798a9fb317b5d1f5a190a7fae506c363d7da471f8186a13ac3c51a472f5d68ede7bc69a35714f283db1f5e5fe
-MISC ChangeLog 7477 SHA256 984dce69eaf408571bd5eb8c4faa7aee304441e05bac4b6c696ee5cde7ca868b SHA512 a12d30b84938fa1fcd3cce30d246b6af2b9c3164e076f2d5abb678791c06e9a024fc99f6632d0e005ec73985ad9e35e812fb6a0efd5f4bd0743639a5f6cd5c88 WHIRLPOOL 1578163dc89f951e201e98e79126d1f2189d9f0e625df88a131994f7c11cf86837d582ebaca2f2a22fed22a993c43b5e524960c9c74c34b9245a17fd0055806a
-MISC metadata.xml 233 SHA256 4bd1b6f493a0e22eed218abfb9305447fb0b91b68b97177e494587202690d474 SHA512 3667747aa121e58c82f1c6e1f617425c105a23b0c448aafff82cea74074cb6d309502c4cc5892c3daa6925e2c364a88d1f0a027333bbbaf9b35a764de17e9840 WHIRLPOOL 7faf147b4036cb7af89348d628cf7a4ed6e2cd2757868c53438af98c3a967505776c9fd4ef5372cd48b40fcc68cc33bc18e3001f0413cfe58ee9524fe56eb9aa
+MISC ChangeLog 7582 SHA256 ea385c0bf4cffb6974af68c66de233fc43232b4aa00a854073b6e47c9692ca0c SHA512 5b316f00ba34c72a08cf678a4a5d07227aaeb2a7dde8772831979aca8eac34cf35f8e91b407c6f607f684b76ecdcf7be2dfbe633cbe17e4af5553f88aecd4971 WHIRLPOOL fb8796574ecf98de6ff3ae9dc9e8f43530b65742d7f2a1039384ff0988ffd7020d5854f65da0a2eeddef217912044300a9044fbf384a7fc939f1c8dad649d913
+MISC metadata.xml 295 SHA256 44c243e0274005bdae23d4cadbd07947147d330ad86a6057c3296f70da2abfdb SHA512 b2b049c2e3a2544609a358dc7fc455f0cd69ebe2b7fa18696d7cba0b478f670b17786598d02bc45c60d6a25029c92806acec3f7f139814158356a9756bcaf7e5 WHIRLPOOL 10e9bf4b6cbd713e609a0699761b76df2ea13fecc50fe4bd8826fa47c2a394b842d5a01fb1fea057642b1eae01f03c5758d1508aedea68849980ae589a7c08fd
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlVIh04ACgkQVWmRsqeSphPznQCdE1N7+6HNgofVltUNKsdspHxk
-XVMAn2kzP6s8bxQbTTykrJ4wGqx748bQ
-=KEHq
+iQJ8BAEBCgBmBQJVdGpXXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiGJoP/18Ss/8TgUTZITaa2inCFwiQ
+wcdF8qwrJCKWAdzcyBbuCluxmOEXboU47KbRiBPSvSxU3hpU6MZ1XY1hN8p3KU6a
+4m9OHIeuaUUeyShhX/duSYimgfR9JpfhsuU928PHFX2VJileBAy2tjBSS7ZnLZ70
+IkeWH/l2X/1/AM1pZr/OkMOtV0SOEgslZ9phZEnUPhS/sFnIUSqB2FqkndlX3kKL
+L83DCXiFdF6Oi0e8ZGoEBzndTg0vs8uPIRaL1yT6W8Dxew5LG+wDTS8qJ79LldNq
+OGCUatf0H/YKBREajmrME3LZx9nMDpZE0XO9vNGNdN9vMrR0pQEi/knjBZivgYlC
+dhanNw6FgJTbD6ravixXiRyX+GyF8PDZHVa64yfTCV0GZjWV5wOpCmpiN5fsWtRx
+APaFen57b93q7aMr0puWo8F21TNGVJRoE26ykaFGBGaR0jtBrqFFcionnkN0Ab+Z
+DlKwCHu3lMgnahKQ/0bkBYd1Z4pycy5k/4xIaaApCgybav8gCXqlou1HQyjJh7mE
+uU8hv94hrKLo2zpuCtRs4vqy7QOEfLjejyztDQ5pp8VvgxO72I5k6SnMvQRaNdi3
+7GbAkiUz5q8d1AFxUkfVByujdHvCASqs+W8ZydonasyxpiEX+qLTCrpQ4W502TDM
+FxxHeYC6modoqz21DW4+
+=ZeEU
 -----END PGP SIGNATURE-----
diff --git a/dev-python/redis-py/metadata.xml b/dev-python/redis-py/metadata.xml
index 4c39239609ac..b6916ebdbbbf 100644
--- a/dev-python/redis-py/metadata.xml
+++ b/dev-python/redis-py/metadata.xml
@@ -4,5 +4,6 @@
   <herd>python</herd>
   <upstream>
     <remote-id type="pypi">redis</remote-id>
+    <remote-id type="github">andymccurdy/redis-py</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/remoteobjects/ChangeLog b/dev-python/remoteobjects/ChangeLog
index 405ba419f072..592c741eb435 100644
--- a/dev-python/remoteobjects/ChangeLog
+++ b/dev-python/remoteobjects/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/remoteobjects
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/remoteobjects/ChangeLog,v 1.4 2015/01/06 13:32:56 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/remoteobjects/ChangeLog,v 1.5 2015/06/07 16:00:55 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   06 Jan 2015; Ian Delaney <idella4@gentoo.org> remoteobjects-99999999.ebuild:
   conversion -> distutils-r1
diff --git a/dev-python/remoteobjects/Manifest b/dev-python/remoteobjects/Manifest
index 41d9b4165db5..ea3a9d56c730 100644
--- a/dev-python/remoteobjects/Manifest
+++ b/dev-python/remoteobjects/Manifest
@@ -1,13 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 EBUILD remoteobjects-99999999.ebuild 1009 SHA256 9c02abe1a393f13422cb41ab1c97c4747640917356b8fdcd56e4af4fc4b9bf82 SHA512 f9425736f296709648dd338f92aa4d4f9bb36492e1829d0afba8224b0b1c6e0e59c1fb5c137ad8dcc42d14d810b89be2a12507f2e2130e4d4e6579de8ecb6d75 WHIRLPOOL 572161ede1f3380dcfbd6be9ef9087a1de17513a26aaa3f58388f36632947d45936dbc7508642af62ffc40ecde06d6e962d496c00db09463104c6b83eb8d297a
-MISC ChangeLog 727 SHA256 30368f7b3cd83e65cbbaa3d325611cacac55895ef4d87643cbbba6edf0e17823 SHA512 d5f8a9af746ba9eae0007d6c4f2297e4461814b4b985694dcc6ce89da2995c1c02c4d89239ce56b2ab9925f0a0c52b199596005b93ac9a6b004e391b2568affd WHIRLPOOL ac45596258031a7598982b03504799cee17c856f606d3d7e3c391ce8084ada3748fd83676a0dfbbbf40713c6afea4918ebcb5b6c7fc32bb1c549ac2bf094ea8f
-MISC metadata.xml 212 SHA256 70bbfd181623c884c763902ca127ef24c917b2e55cda0869e6ffaa6c4ebc5757 SHA512 85ac7770baae8cc7c2c52dcd077a448cfb394ec6585e274ffa01c8f92a862d22c6ba0553b71cf2ae6b6f28f6faa5c3d615537f35f9fe0da9f43a2c9043953784 WHIRLPOOL 221b2f4e9b984954eb7268028287339e8678c794c7b4e40ab2baaa037c8e87bac30c8b64473efade9b3ee1ce226aab4ad36760147eee5af7cfd7c081473c839b
+MISC ChangeLog 828 SHA256 afeba2883c662652a4030ed3b90865985b2da42e5c2a282f866ffd862a46ee3b SHA512 f704acbc26d280b61e6d06c325070b887f201719f898bcaa1faedc317d5c7f4effcd5a1edae201b9789eb02f92a7759690c975d4314f50a82d0750fc238298f0 WHIRLPOOL 81ec53f14d780eb67aa95cde986799e7665966da8f87fb1de0f07a7472d14aa97e90a8fdd56be9da9520ed58543909097296aa7556dc5bc1d8ea0cd38cfca390
+MISC metadata.xml 309 SHA256 cf688ad1b11fbcb72f488e5aeeffc230e613aeea7e82b5f8caefa8cf5be3a934 SHA512 225a1fb452cbacef6dfde034f4b85a5eae332209329826d645fd2e63a9eea74dccd8d8dfa5d11072064187f755725bdca5a304ac2a479e57bfc5d4d43204e723 WHIRLPOOL f9cb2a049076ac0d25307b05ce69e6f08dd73796b06e3e3c91eb3042ca106219efc5ac69b3051d3c95bbe8ae4e0b71b593a5ead115f22c0756ec955daeb2d26e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlSr5BYACgkQso7CE7gHKw134QCgi3XDM95XbCqEe3XvfL1s5NXi
-qjYAmgJc5ghUu+cVFhdkrLlle1UxFFgP
-=KyiZ
+iQJ8BAEBCgBmBQJVdGq4XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiol4P/1o0XUCrctjmVtJW/6Z5QzGk
+wzXyaEwCDiw6dKJ70hraIOyxJSyIHLD8qTndr4pC6TdCXcogAdPtCgrZCWPvi+06
+eTg6PzKxYyDWLRpL9AXJplDP5EeOTlMU0MfqREL5ASnVqKUF4BCH3CHWEs9BtIIO
+xbf6vhirbBZeKWFLueSyN/mGnWJellSN7hYiJMjeX1s4GcZjvmukRdWFMIjtnqXi
+rmc7KtS2KEIjIgTQJnXDD18mLhlt/+GdwHzIF9IOPt4i9wY0bwIsWfy19JN8WL5v
+vSgXd5nkEyCC6Lhjonp9ij3j0YWT0UiNz3eK5Eu/ksyekji+aOsNMJIKGjZITfcu
+/GUY4LNs6ZUGvDYScH5jGle7PZdHjmbhtvVGnf2l/U4xebcgoKhWnIcyYodFE5VX
+0WFqom7riUynrR7CZo6A4iwN9vrHWCWKWwqO3ybGzfo0ae36c2gNuc4gD/r9FAlg
+yb9C59LLjfxQh0VkcYBnftpwwvlSbNPaR8Id3NvezWJKEsx8erNClbft6U2OQ4Dj
+aqFJ/eWll9mT529oxtXP/ujbkn/ENAiSju4tkrT4oLCNGiDnTqNx+1AxGqBxy1gT
+uychqP3pZZYZBRRCtmOi5088UTo278NeN0TMEpq6YNROiS3uNmkBfCodQ7A23DDZ
+mDiOGTi/6wyK60hGd2JN
+=zrz5
 -----END PGP SIGNATURE-----
diff --git a/dev-python/remoteobjects/metadata.xml b/dev-python/remoteobjects/metadata.xml
index ff62877c67ae..94cf84d4043e 100644
--- a/dev-python/remoteobjects/metadata.xml
+++ b/dev-python/remoteobjects/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-</maintainer>
+  <maintainer>
+    <email>maintainer-needed@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">LegNeato/remoteobjects</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/requests-mock/ChangeLog b/dev-python/requests-mock/ChangeLog
index 912e5f5f8e7d..77713f92383e 100644
--- a/dev-python/requests-mock/ChangeLog
+++ b/dev-python/requests-mock/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/requests-mock
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/requests-mock/ChangeLog,v 1.6 2015/06/03 21:36:40 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/requests-mock/ChangeLog,v 1.7 2015/06/07 16:01:17 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add pypi to remote-id in metadata.xml
diff --git a/dev-python/requests-mock/Manifest b/dev-python/requests-mock/Manifest
index 583bdbcfaf4b..fecabf035bd6 100644
--- a/dev-python/requests-mock/Manifest
+++ b/dev-python/requests-mock/Manifest
@@ -5,24 +5,24 @@ DIST requests-mock-0.5.1.tar.gz 29729 SHA256 b1b1b864e633418c77f33d333b0fd88cb61
 DIST requests-mock-0.6.0.tar.gz 31645 SHA256 a1f10ee53fef6aac6ca54cfb8fdb1b7ca6da59d68ea1a8c21ac513211842ad3e SHA512 5c23c1fdd3746f2b3b49508b7f05abb365e0608a32b6ead5d0ef18203bf75ab642626229e96b2e8826216d0f090f1bbd41bdfa78dd56f305a996a57f1e16179e WHIRLPOOL 65af690e429a09bc4358f1b0c387e3fff3faaf962cacd247c11c01ba84f79b3fe06b0dd801e9dab829550a5a340e562aa3ceb6a61e4307c14b5a16fdba8a1a7a
 EBUILD requests-mock-0.5.1.ebuild 1153 SHA256 ee8a631d05484539357675021f0ab249ea0d4be12846ee78b15d5b2771e363d8 SHA512 ff71ce6dfea844ca42f5822add408ce691a88d9493ef9e482239c4ecb274cb8c3b077fabec5b6e8939e2b3344adcf2ecd218401c68cd437f6a2398edf212ac60 WHIRLPOOL 4c86bd7c741b0530a8ce228ce9ab4c79475817a4f97b32a1d1c522c8837d09569168fc015ddcbb24ea0adee672a48c4ca4267a12af6f6d224fd240a439338c64
 EBUILD requests-mock-0.6.0.ebuild 1215 SHA256 cb8f667688d3392caefe3a300bb3826898233f3ca6b143672b064b4144c9c37a SHA512 d3472a880bd291ea29239bd468480fb59317de17f3ac0c4ab4742dd1c7fd18559adcafb4ea463f1bb0cdc04749e6d3f62142908236e2bf8593bb011539b31b0c WHIRLPOOL f43151bb2c6a5e70ab17c6ef12911822a0fc8630829e699ae29e17b98b84679bb136fa1c2f6ee71d3587e0160a79efe5a15f5c020c54e92673b236c132bb4a5b
-MISC ChangeLog 981 SHA256 8e07b58998125c6491f33797dcdb461d1ad6931a52dbbea5a6fb2cb75bbaef60 SHA512 c808e03eb7f2ae49509bec2fcfa8406418dd92fd5dc9af340d6281b55697cd540ff8a40973ad22e5c9524961bce62bc11d1e735290c17d30388a066089ce6836 WHIRLPOOL 47b59f7056bd0b5a84b5fba0d135b36d0ed2d74371919b388934ee4a405ae769206bf37a47cefdc74fed295fa3625d87d12ff49aae8083bb43e3b0869e437278
-MISC metadata.xml 390 SHA256 c87b9c9b0777b1b298126264a1d308512c49c83f45defd489ae4c0579965b458 SHA512 ff58fc7cc04ff7728e363ae64ef5087e4eb4f61d908cd0737af05cb6001300a052e7a5797096cdfb2f4cf4cf2ba0e7670cfe77723f775c5b075ce5766c1c7d46 WHIRLPOOL b3650f54e79da5f52871ff2176552e889b7cec98777e0a7003282295c61d6a2ddbbe21b8a4701a2e00e4a131be78756cb9025fa60e74ff5dd3f2eefa00558983
+MISC ChangeLog 1085 SHA256 f8aa1d66940d7a217d1d819db147cc607f291862bcb25a80a76a51686e998fc9 SHA512 26dbec89c601e2bac0457432e8dbe6ad7ac20c399c5a9d1b1407f7caf418f5dff4876bf9ca2aaedb5b03e6d94aad178388b6ecd6783b0496a54f80d84b3c15b1 WHIRLPOOL 3016311ff3011e6e76bc8de2b22464a19baf97cd410b20a75a273ac615c7a17290e822b91e449647d2efb1a44dfbd92447694c9467bd462fd1f955365e44e6cb
+MISC metadata.xml 443 SHA256 61dc5f731029f6b05131fed7b4c5ea26d289b455389a1da398c90b7c8124fcb0 SHA512 a95fdcdc82f54e24f06a110789ddaa32686ca51fc3edbff282eb0844fa4307d34c68824ca0e157d38998e697c3bf166e2f27c925df9df05ba4015c2b736089ab WHIRLPOOL f9c9f18e098cbcb0a41e22bb6993fc9c8a4af1f2160b3d3d8b5f04de6512198b28e8385242d8bb37a323056fa6e22482362994430fc787aff6076d099d6b1bec
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVb3NpXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVdGrOXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiLsAQAIheU+zS2JkhYP1nZQUPQ33Q
-3M2OWsbakf52kgBXwPmKjvs0rjdhnpz6+yrm3vnHZKqrapV9CQmP7Df6nkzPZtig
-3/kx1sVOJbK27SlhUG+bgdw4c7q9xpbflFTgr//Dm3+kin+YyXRCaNmAuvrNWg5u
-EP+ZVeeKv8K04e25kZ+koQk77knspRLOiGIQ16M8CWlLkHwg9spF2Cr5NFJtbqnp
-LYdTukgsBBX17dgIf6468aHksU0N5htxEbt8RIGZ6uuev+FHH7f1smrtBCELT+BZ
-oz5amMbulD3J86LPT/WQRY+GPiLluYTgIzmwMe3Sbi6Ux0hniozP07sYOsBpNqt6
-MudCqkp1usprTzEmfhKRn/4q0lQ4WqMfoFbM9kgBVlCQRWHhpCluEFgXUqHHLCHE
-CW5Exlp7vY6QNvRRxwScogLgK694n4ytsKWU718B+cUcGii9KuZgLp8g0naqoM4p
-5libafd4eKiI5paqWANB7X5ZtyWRqnxcQIzWM3bxJoJ3qF306zVAUm59IjvFp54V
-BJy5eBOO7LpV+5WkAttv8jIIDENjFT4TZbtw2fdGfN8Of0jS5vofCtF9WA0zUsTO
-6T6WHArXT5VQkCdryapQuZDFkQPCtCSKFh4wLyJ0MlPkY5PE5vXGv4LRWrJ3OFww
-Tu5URmyBV3qWVV2kUUZh
-=XwXH
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmitIYP/jGp7XhLitBFKSSsKikgZl2x
+b7jQfVjewUeurxmmKW5uiZaRj/D3MBFJsyNpYSu+YRymU+Yes/YTcwlffm/0aB6M
+Wey/Vpm4g2E+L2EUUrF6krh1OXcMBLOcsPRlXozq3tc0jEeklD3EyI0fC3A34qU7
+Ie23vMEh3QkLAOM8iPpyBWPNBH/NQQ/c8bbXVx8ToHWtF3gOTnmrH6hulyu4LdvP
+HN1rgfMZZQklNdc7WqNZHieLzpT/tPdDFcV87oanb9glI6UTOy0X5dU3c6Hlv+9B
+TEbzUSDtAqOy6SqZkuWeY0/46YJ9rr2WNLgY9dD0DrheB1y44wGPO6rHUGNOXP2A
+994uwW+wZqsUX3XRBQJMeCRrpfOJjrnd9queTtJV3+MY2+cQLMSfX2LIt/ymaU8x
+PXjsIWxRayU9GyKeRCIZoaR2ELJ0wBDufi9dKHII4Eyj6X6OO/8QMz3pNzR2QX9p
+6s6hg6v2C3yxo5PbTQreHLJC0Ntwtzw1DZpJuD+JRu2zuSuT2Wd2RgIfsrLiFIv2
+l6BKr58uszz6m/dD2MuIf6mwoWmOnW4NGTBjHPmOQsmQ5gAmG9IZsd5uFSRRyKSW
+C+LhKyDkZsjg4fhtObyWKgCyh+EGP5zixj9wDRDsZs3TlFHmLgjYJMlUUUQpdpte
+aGCU2yksqj+CUseOf8vf
+=EfaB
 -----END PGP SIGNATURE-----
diff --git a/dev-python/requests-mock/metadata.xml b/dev-python/requests-mock/metadata.xml
index 33fab11376e2..fd6d3b64fde4 100644
--- a/dev-python/requests-mock/metadata.xml
+++ b/dev-python/requests-mock/metadata.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
-  <maintainer>
-    <email>alunduil@gentoo.org</email>
-    <name>Alex Brandt</name>
-  </maintainer>
-  <longdescription lang="en">
+	<herd>python</herd>
+	<maintainer>
+		<email>alunduil@gentoo.org</email>
+		<name>Alex Brandt</name>
+	</maintainer>
+	<longdescription lang="en">
 	</longdescription>
-  <upstream>
-    <remote-id type="pypi">requests-mock</remote-id>
-  </upstream>
+	<upstream>
+		<remote-id type="pypi">requests-mock</remote-id>
+		<remote-id type="github">jamielennox/requests-mock</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/restkit/ChangeLog b/dev-python/restkit/ChangeLog
index f3ed279653cd..0ff4b6391bce 100644
--- a/dev-python/restkit/ChangeLog
+++ b/dev-python/restkit/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/restkit
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/restkit/ChangeLog,v 1.28 2015/06/03 21:37:09 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/restkit/ChangeLog,v 1.29 2015/06/07 16:02:16 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add pypi to remote-id in metadata.xml
diff --git a/dev-python/restkit/Manifest b/dev-python/restkit/Manifest
index 27fbdbbb0d04..f5a68c5c41f7 100644
--- a/dev-python/restkit/Manifest
+++ b/dev-python/restkit/Manifest
@@ -4,24 +4,24 @@ Hash: SHA512
 AUX setup.patch 843 SHA256 0499f32d84001db049fbff5f1737bc0c4e23624d161e5090ab022225602fbda1 SHA512 200c112cb264271d8c1f043acb22ac476d09a0fc325b74658a950939f71edb8fad84a0fbc5f11335152fe5591be98a14df63f57458b84d35c2511a2079778387 WHIRLPOOL 930ce34c70d9d2093b2002e8e97bf8a9603eb5965211620552d7684da4a0a5578cafe873190914cdccb60eaf72a41ac16ed6bbd449a8b167dd03bed94073f13e
 DIST restkit-4.2.2.tar.gz 1275904 SHA256 c0bda8eb7c643b5e818b612dab49121393abc8589c6cbe9b84085079d598599d SHA512 5ed08535e1a54b5594d97b059d8662ab4bc19c68e71a30719c4a533cba0f2d0e18872119752c62136563a32281e8f747414fbf843fd97dba138107ffcb5d1e4b WHIRLPOOL 6a6e336fc1ce5a6499a9886d6a131d7b9e117323467da62ff11278ae1713254d7ebc05a71221ccb9b3f092999902a94282397b9aa983c89758e39221d9dbee96
 EBUILD restkit-4.2.2.ebuild 1402 SHA256 febf14e7048f6058a4b64d7771b60c305e0a1f1284025b3750368bcf0f718483 SHA512 d504675ce5ac81ff3494720041789b3e3709dee189a410c75367dd435ebe3ea8babaeb819c8cbd854dc589342c341e72be4074178ea31fcaa38da4cd41841029 WHIRLPOOL 665fde27e0059b2d5b3220061a268df3281771bb725f20ded33cf8f36226823f1a38d6a9ab6f4f1a9eece6e61f352a40533716d852ee859ac3d8bb4aafdca208
-MISC ChangeLog 4127 SHA256 65e2716cc727ecc2a27b5aff11f098fbff7b508d5c8a2dc6ce8a7c18b7b0440a SHA512 1843040afb1e6a7c34114bcdf796ac1de751d9c1475fb1bbd34c8ab1379ff8ece2102a86ed2f149ed4c69f941bfe033cadaab586b43e028e0d360daceed95b32 WHIRLPOOL 41fc15ed8eebb35d0831d57f2e68ddbbe6da867a263f79e9dd97216364968d83240df16f26a3759de9a1c93a95604b9b5c79e0a399d6bc4425beaccdc5db118d
-MISC metadata.xml 449 SHA256 099d389f4e8ed407311a7013b12cc996dab060bc71b4ed07ed1dddfb421b86ef SHA512 eba73b2a6a1a4499aa7b3a3e701f4e4e9ce6b8f863b23afc30ab13c6c7f6d0008a2b2da1ebbc5f679344d636ebba0300e80925d9f48e83cb070b18e68eb044b2 WHIRLPOOL 7da7799ccbb5ef5641e091985809d9c2537fe4cc993101246c5a3144bad33cb08890d4727a9f9d99e2ec8379d80dca1ee1423bb4915e8c8341292fb3bd0b7705
+MISC ChangeLog 4231 SHA256 f17e70d999b3c94a6582be714d49ca1ace33141c184bbd05cfd551dea5744995 SHA512 bd08e6328c8eb034eb739adf9479d3150dc0f4f5b8e309fb751204fdce4604b0bae4cd970e524c842544bd8bf93349479dfdb86440c7d9b9c9d87f5248ef1f93 WHIRLPOOL 5290cbf4da5ccec6b8ece3467b4438a96f472930ed675549574ae00d54f8f05aab5688fc8b8b8323b639078c2cc5028399c6a1206bc0f8e34d22a9408f6dd6f9
+MISC metadata.xml 506 SHA256 36a1bf303fdb1e79ff8a2ea7296766f133a7d32f31792962e82908e72260bf53 SHA512 24a1ed05d3248065d13277326e07963700001ae29e715262e90cac3de65ca7b15cd5bc4ebe88de11cd693277033e9c7bdbcd698d44c6524ac493f64d1aa42af8 WHIRLPOOL 4c60333bd12771e3be641162e8074e382a277170875d797ce005cf81cf0775ba469be65782f51225034430979755882646a2fa965604ba90261566a10ffbf4d5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVb3OGXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVdGsJXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiHtYP/AjPYHUHNP2ONpg5dW9dWG3x
-0mSBSblDAOQJ8sqTbh44aTZ4WlJgpxbVCVTOwoxmM6BUS5KXKhK3+NGESnNmV01U
-5qDbg/uH8BrKOMyWbdAic47O2csFg7n60vA4zYlm65Ss/HqhbU88kdN9OH2QNGWn
-xDtXyq2qqbffWM4vSGyQ1ehhJh4xQOPtgBhDMkAsXL5mvnzVK+CGLiQx4cv9EKqg
-yDJMgAlHu+tjMzeHasaIT98XA8elKOtSiRs10R8LcHsZho5hnSOb07zD+HksmO61
-hGg/+yKadmwHwbZkJ6rzguy/Ls2tNebhk/du1hngyVrB5VceN2DQhbG6LVBu4ggv
-q3SpXzQgCdoQOi4M1e0I+c6aU5UWtKd7aQeKe5P155ejbnECLQCT6x38CjJuqImb
-p184JHSrtAtFkipnEbf3Ntc3YRBV4sA6byXqkgGZGhVU+csPES10xRXPpJgWPQ0P
-GkfS8s7eQ9voQDlPMS/dmxi4WSyEaGvmpsJEw8UVe2Oz+jcgWXGdc6ULGbg4eqCz
-f0w6+Vf8HIPn9QWMQm1Lss5MZz8UWn2raL9zYpRCawVFn+AI2iqTq9oaRf5PwgzE
-rzgSFk1Xd3KIaHyV33tsoorHHedumed1PTkDP4Q0CIsB0turAHHR7I4U1qwlWAi/
-JvaWIJSfM5b8Txe04Fn/
-=6EA9
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmio9kP/3wlaH6PRGKl67dpVv/v+fOD
++lWTbG8IkCbTOp2qf6i+euhgxSQYU1/vM0Rdrr1kG3QdzygZ9eBys4Lablg+Sm+H
+/qalegQcsC3qhc2hAMF1ZyHix2N46igoI98SPW6yiOD/J1uXKVq5YN8wlJXve4TB
+4PicjS+XRUZyvcsnxPvWtmV1nKhhlCIltEDV4Kt3T+hdkGq7CKqV8gvYG1mDiC4U
+nhTCRsYkQ6WtTjgIm/a/3Re5ofWEcStuXEivpXXBNO9lcwtXilWb25IbMHOSXwIO
+t1oyLfWtcpHyUPc1xjHrH8qj/lMlb3I0Y3gGWfHWoB6HggLcNxXSRTPl8pzNbNFI
+OlIwa2iubAZ1Q7VAzU/kstqc5Oxu00fdr07wds6ZLOrSBEkG3FzZWujXvLWVTSur
+QoTOW8rRmQcD1Rn6hOKN+WRf6f+GZHPN/RJJb5XsMQ9PMHVDWciDY8PniyUnJ2sA
+gJ9oqKpR0UdkCtJQbyf6g81ViEoTKgB836Xici79iKp8obOtoyvGs9K2Mtsc2U2d
+DkOHVPETfsb25V3/kN5/HBrbuvlRiDNm+HrW413JMNCeexyWR15u6p0s9j5u5x9Y
+ROajydxN9lGZzoru974rIhdHDVeYTi8fUrEqsNPhMObMwykZhOfRBbO94CyTmcXf
+metm9yet7TcUfVvCDC0P
+=MP9U
 -----END PGP SIGNATURE-----
diff --git a/dev-python/restkit/metadata.xml b/dev-python/restkit/metadata.xml
index 7f8cefd1a346..b3dc00ef318c 100644
--- a/dev-python/restkit/metadata.xml
+++ b/dev-python/restkit/metadata.xml
@@ -10,5 +10,6 @@
   </use>
   <upstream>
     <remote-id type="pypi">restkit</remote-id>
+    <remote-id type="github">benoitc/restkit</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/retry-decorator/ChangeLog b/dev-python/retry-decorator/ChangeLog
index eee7ee22e210..5cc97dd9ace4 100644
--- a/dev-python/retry-decorator/ChangeLog
+++ b/dev-python/retry-decorator/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/retry-decorator
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/retry-decorator/ChangeLog,v 1.7 2015/06/07 09:25:10 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/retry-decorator/ChangeLog,v 1.8 2015/06/07 16:02:37 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   07 Jun 2015; Markus Meier <maekke@gentoo.org> retry-decorator-1.0.0.ebuild:
   arm stable, bug #540290
diff --git a/dev-python/retry-decorator/Manifest b/dev-python/retry-decorator/Manifest
index fc4c7a4ff492..777441baadf8 100644
--- a/dev-python/retry-decorator/Manifest
+++ b/dev-python/retry-decorator/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST retry-decorator-1.0.0.tar.gz 2835 SHA256 95b8861166e162e5259e798eb259217c59bdb8b21f055fd7f5bb4b7686fb5eae SHA512 f650740dd6d05010b7418b4d5ae7351058eb4418dabf7329390eaacceb72db60363bae8ff0bb15284301f0b5bfd9bfb731e71fdffb7231065a4db7ed6ce86da2 WHIRLPOOL ac40c8276423d9ad50e1b46d1981dae0c61e15309d1d217c4064fd0649b4fcaed940d1fd736c7a74da8757ecdfc87debe45bd21310549d35809e0da1d7da57fd
 EBUILD retry-decorator-1.0.0.ebuild 687 SHA256 7d36da25f729b107216eba9999149c32fd332a87195ddb79bf3ce7708244cb03 SHA512 085bf3f9916c0d0bb11a02d8cb93726bdc45715976f823a145ad40e97b163264af5ae1096608ab0d3f93a1effea99b4714a0f444cbf7d4ba6d62641333b3a9de WHIRLPOOL 658d641222fc1e0afe3586921f9fc15354ea61507f6905b9878a8f11237c5b22a7f1fe9e3083dac38ad12af47213d08470780ee219ca2a13a1ff2130291b8abf
-MISC ChangeLog 1057 SHA256 5b7173d954b4ae33f245bc0cdcbf1ea6e8f650997189270ddfd5b8f3f54b2b22 SHA512 eb6637da1e5950f6d251b2e01b83f96df9fe512f946553cc0ceee6e9dd1b4c8af371ddb10b3b396a049af6724b5d4e32de9b8d39d3e1739948edf4f900892b75 WHIRLPOOL 7cc7f6fa40c5dde054b9618b25f51a9a5a2ecbf96920b8797f25ead0049d939f4fd6ef428be652bf587f20a71f51cf0503ff8f5a7fc84c2edf0fd92203e0eb21
-MISC metadata.xml 159 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4 SHA512 d5a29b9f6ecddfc368dc0f1f8919cd3c3d6ecf2c7a82bc8d4c0dd51b7aa15561ed0462acb8ae39bc84f97e706e82d9b4b06357494f164f1648219f604b473fbe WHIRLPOOL 36e19b63a1b307cc200e1d73499b7477f73799db3909e71b5a0916084728351c76d400f65e2c8b3f8fffb2c9ba54c0bd235f785b47414178d98f11d64a9420d7
+MISC ChangeLog 1159 SHA256 ed073459e42ef3919a4dae0c2e5db348890ee348c8b09eb9f8e1a839151aa91a SHA512 3bf822d887dabe282c64eaa6c22dbb7ea83da83bf1137019864ba6e5b7254b8ac8598cceb8e0084618e77332ca9b1fe4e0131c2a2344a00929fd4a5ee0808186 WHIRLPOOL c8bf9327d3e16b851d4c814074034ed6c6b91c0645c2d38e8c1c2fec2077949907d8ce32dae13b4815b674ec566a989bf33625174a8c66e88f29a13de94adf99
+MISC metadata.xml 252 SHA256 f5e6c24c55cdad71b23674d45db3a7a991d6ce3a37f2620b4317892369747d72 SHA512 f3db2a27813a98296ff2fcba413d85f801d0448228a02979f7587abbf53a0b5e7857543c6090eef6271ac75a08273f9cb5d534fdd136c72226b0e122e9e10f44 WHIRLPOOL ded249dbd5937d0a8edb3eb25e422c3812e2b65bbe86b636b133f5844a6193330d791802bb88e8724041efbd04ba4fe3d22079b5478c1d1704abf5e7a52e5ce3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlV0DfgACgkQkKaRLQcq0GIUyQCfWy5iPQUg7EaR1/jmPKbmwO1t
-sFQAnRKr/WqzQIseH+bhXsPssGItOLOC
-=caEr
+iQJ8BAEBCgBmBQJVdGseXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiUQ0P/2U+z0FsElnr1BEduaxOr8gK
+o0ET4WF01oHRJXeYb8DTECOBGOMXrmXk+Ot6arubSW7Ob+5U1k7cVTU7okzT0Hik
+IEO55fZgUDbYWZuXiFECj9UeS+V8PTz5LXfoZwqmSRln2nTq8Z88+JKpopPxjT59
+rZsgWfR2e2lIaag7mWHJCLE8rIXXw0hIWpu3Jd0jgugLQVraUehpWPwmUnRURab+
+iarB+97/AAgHrhxzUrcntJL0uFw2snKPp/j9uZJwCyy8sYNAAmqUf/kMrM5neSKR
++C9mqQonWKB0bIIPXwm+erx8xKEsb+52CyL8JSEuRbWIDrH970bGrykolFOERSXE
+yh4pmbmMtNgua2tkByq9RH9vBvsT4pIRsThqRiJyze+K1Hx3V61P8eyWlHXM6OIJ
+PT/wAGdDV+N4OQ7Pxx8dXz/ZfpfI7f4a/VEFwxgORJpA41OzYuyV/vOKkkp0BvRp
+ebiajhqO9Xa6nz0d4oZhwV3tqs1EOIh/ZUWQEBESh0izOl/lBXHwAyJI44t/6mjH
+M7tMK4gqL3K+iJQRLcw11I3kbDKqxhkm0OykarOEy3evrly7PEcYKVsMjk7aoTb9
+DWzvq7X4e/nZOkxOmvnv0KaVg3l2QUr1xrw+c4vtxx3xXU23xqNRXOxyGdKfk8mN
+hKv5wps5okOcHZjwDMZt
+=ggRY
 -----END PGP SIGNATURE-----
diff --git a/dev-python/retry-decorator/metadata.xml b/dev-python/retry-decorator/metadata.xml
index de483c53568f..d8910af20cf0 100644
--- a/dev-python/retry-decorator/metadata.xml
+++ b/dev-python/retry-decorator/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>python</herd>
+  <herd>python</herd>
+  <upstream>
+    <remote-id type="github">pnpnpn/retry-decorator</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/retrying/ChangeLog b/dev-python/retrying/ChangeLog
index b0cd5fad5d77..8194d94062f4 100644
--- a/dev-python/retrying/ChangeLog
+++ b/dev-python/retrying/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/retrying
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/retrying/ChangeLog,v 1.2 2015/06/03 21:37:29 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/retrying/ChangeLog,v 1.3 2015/06/07 16:02:53 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add pypi to remote-id in metadata.xml
diff --git a/dev-python/retrying/Manifest b/dev-python/retrying/Manifest
index b2477ec85293..82081939ba0d 100644
--- a/dev-python/retrying/Manifest
+++ b/dev-python/retrying/Manifest
@@ -3,24 +3,24 @@ Hash: SHA512
 
 DIST retrying-1.3.2.tar.gz 10811 SHA256 320c4be55bfd9366d67c17beb09c9ac9624c7fab1d59e41641f37ae3b2b1f5ca SHA512 1209ff3f45ba6d3ae1f8ea2700cc1eab406601954e7317cfe6fa5a448183efe9065a6bd11fd4560d0cc66ffc10c8e7b29652e515dd95a1f14304dc4f4378ace8 WHIRLPOOL 5c03ec7993f8f946d5b953f8f315fcd819d3be379efcacd1a91424f682260abb77565ef9bd3327a03de82333f0a5a6f0d9fef25091f8b4b03a92d7328f1a4e61
 EBUILD retrying-1.3.2.ebuild 632 SHA256 acac4c006e81589a2c843702d797742bef78eeee9734304999cda6fcc3f5f7cd SHA512 e3bc73060c94df3ec8eafaaf107b8a0dd6f91a2053e2e11607bedab54c15df6ae66c0e4dd47db4865c0cb3750c3453aa68b781ae30ce52ad0957b68dadbc497a WHIRLPOOL 4e752ae09cec73defa8c06e58d8674ce69e8cea9e14aea302bb65b52b52ffa93ed6a499a56e33e93405666eb6ff37655fddc1a83080578a7b016542ce3796edf
-MISC ChangeLog 460 SHA256 c332a745103d41c55f5f32d183c131ccd6a16e439abc274c2e32023c1d377e1a SHA512 92b90ff35624c2e2a911acd2ebc305b5940fe9f51eb6c0ef597254740b282709cc861be355f5da025ea9ba5964532d1414a19350f1df867e75708f7ef4adb8d4 WHIRLPOOL 0c96c1b6e86028175cb2b68f7901214ad5d5168bfec163a3f2a45c60b9c3a1ddd44deaaff8faf26983d6b601924223fd5f840e89eb42e8f523d9dec8e14e4464
-MISC metadata.xml 555 SHA256 93333304787f7b037d93fb849ec6a35a24a2d4624f1735b67fa80ccd31446abf SHA512 8c42f5bf2647cb562e4b014797505a15343a6fcbfae6c664938a3ea8810d741faef281c5842a5cab29482311a610e0ec2fc081db3c4e2394e5ad91792d1d5e5f WHIRLPOOL 179dc850d04f176c89898452523c89c1b402b9f476543c8ceb7fb9daacefbed8827b5dcdb63616171ad9d2346f2214ddaa9d32825e83cce6a2725308521df396
+MISC ChangeLog 564 SHA256 fafaf2c2b15101ee55fa2a60fb3bc83dbe1764fe5df059f72899a83e01bbf39d SHA512 54fd3417e4ece4e02a6273e5565bb18de8b0640b0bc20e1e9292351e85dda741d7b2ac52439a72e80bad608863ad5a814dc89965c40efa52767801067692aa79 WHIRLPOOL 41b87d8bde02e7f876b21176b00f4f2477496944a4532b6bd2d514ced36dfca5697920a1f6e8df34c52e260519a91c4f25a7303f864fe6845005274f0ed82844
+MISC metadata.xml 599 SHA256 3de61daf82257073546a0ace1fc1b9bb2da2b9c712a3d2722bf2eb85637fd128 SHA512 b4dfe5be02cf71c0d373087e8c8a244e258d6638bdbd49ef780c4c3133c4ff5147df1baf64dc3dce1e1ad282480f70f1a967d8709f1f2a565abad6774e229260 WHIRLPOOL 53eed03911d57106d507dfc5003874004010e638ddfaea2eb5003d7321a8515d4f68fe8d7d1ca7ed7418d9569840898a9589ded3cfc1c0c6f7268764adbf40fe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVb3OaXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVdGsuXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmipOEQAJfhAG6LyPuQD40ASDXrt8F9
-SnVUl13UbF2P2DZ2hoDwpJQ61tdR45b28xVmTQ7KWCtPdETG758nDZBWCT3HJMPr
-5JKs+yfWtr6FBsLfxZXKprthAk1mjx9qZV78xJJhXAVmuClrcgIXWCtmtrWhAay+
-1/pDeY3g69lWTN5U3OA2JCy/DdopbR12BGI7zGCNjP2w8vjhV2uzbadQa36Pp8BM
-/Yl1VNmfUEXy6ZJMNktksfZV8/fsulw1AZN2pEn6ycP2ypNLFZP5sry0fwqII6Mm
-B6gZu9YeqyvHmL8Xv8AivpKMTQr8Xu0f8dWjCov7gX5+DZv+yggS4LwcRVG9wMP8
-O/PnSKood52QbkHORNDaH2b+AbqsvILqH32uIp9sugeL0RWo+4hsci010b+NqHjw
-uN78btOiPHzBMctMMkpSj3FdEpgvuPDs47G6x7LfLMyK722WEeS+m9W5BzgRs8OA
-saOzx5W8jZmgdQFLZklnFcOBXGClSSYiNLT6nKPuRs8sIGuTzRCYt8OyZ5VHeWn1
-jlTYX7Wxtqo7Dozx7nc+qP2EHoBgpifZQQFe5dWbFDD8S4dIJ9QvqsQBdG1FBHZK
-PY/E8EAtdQgpWQbdzLgkZUyemr7toS30sdIUFveK+41bo4ERBh1IQO5vmY3KgBCl
-E4Z8kQU30RkKpmWMlb0l
-=Ce17
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmieyAP/Rv95JbIxW+mICm/o0+qC8DM
+ooaPAJzu3/7QpCnPjqCsxvosUASkzKaXbZZv5gvRwJhXvqfJMCeQTr7WCdpJtf3f
+tOr7B26+8JPCmBSI+ByrV1MNWUcve83Kw/wLZYwXnQzq8eTDAKjA/+KIirQt9qCW
+cCEtvdRfOPJKIO2nKYZ6FCyo9nW6lHA1UTe81a42DmyC6wxsJp6QHVI3PLkqhe5u
+Oc9/xUv/BuWC0uMR3ONrECkG+W9dorHVu3efWAFzg8w6HrJr/IH8VkyVRztsvqR5
+9vgRUQ55nyndtcB4Ld6MhzSelq9tegvDtBOQi3W4yJ0eGb3SLI5AO81uS/Jc0WsF
+xuXjUCn2YvhqEdVLoknTN3S0+QHep47zyKS5EV9eXJBLaWbyKgZtyy2NW4LX08eV
+W+P8XcEp7MwvxE/GusDTRZ8KJwefeQb+9cV+0vRCyiE6FiOl8QD9W9korj0Y1hMD
+w1qZvE3sbA6feOTggs6CKUSU/5G+rlxtmpERwZ1ZFolexLV/6I2WU6sVJkaoj9X1
+b75qrDgjBBNaQQ9LKyNXtIpG7+YSWArflMnBLTJoDMvxjTQ7SC2SPQBqBXJ1w6Iv
+2yLms3BpgUEMCtG4t4xOVp7S5x01H/d72avQNeD0qqBRLPltyit64iEV8nzcm1IM
+34yf/bk+jyhGJVP+1Tuk
+=RAYp
 -----END PGP SIGNATURE-----
diff --git a/dev-python/retrying/metadata.xml b/dev-python/retrying/metadata.xml
index 204d68e4d324..d97f4a44bf78 100644
--- a/dev-python/retrying/metadata.xml
+++ b/dev-python/retrying/metadata.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>openstack</herd>
-  <maintainer>
-    <email>prometheanfire@gentoo.org</email>
-    <name>Matthew Thode</name>
-  </maintainer>
-  <longdescription lang="en">
+	<herd>openstack</herd>
+	<maintainer>
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<longdescription lang="en">
 	Retrying is an Apache 2.0 licensed general-purpose retrying library, written in Python, to simplify the task of adding retry behavior to just about anything.
 	</longdescription>
-  <upstream>
-    <remote-id type="pypi">retrying</remote-id>
-  </upstream>
+	<upstream>
+		<remote-id type="pypi">retrying</remote-id>
+		<remote-id type="github">rholder/retrying</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/root_numpy/ChangeLog b/dev-python/root_numpy/ChangeLog
index fa26aef3c2c6..4b31397df00a 100644
--- a/dev-python/root_numpy/ChangeLog
+++ b/dev-python/root_numpy/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/root_numpy
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/root_numpy/ChangeLog,v 1.7 2015/04/08 08:05:15 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/root_numpy/ChangeLog,v 1.8 2015/06/07 16:03:11 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> root_numpy-3.2.0.ebuild,
   root_numpy-3.3.0.ebuild, root_numpy-3.3.1.ebuild:
diff --git a/dev-python/root_numpy/Manifest b/dev-python/root_numpy/Manifest
index 298a507c7b37..093252900dbb 100644
--- a/dev-python/root_numpy/Manifest
+++ b/dev-python/root_numpy/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST root_numpy-3.2.0.tar.gz 316240 SHA256 ff64ebd9c4b8e99703bed8541bbd5f69742da0e442f8ab0833319252a0bf8006 SHA512 da08a33eeb225a57053eafc6247e55fec8c56e231455c255d71d3adfb6119d35d0b41fcf54d5d99690743a525e9d5ecfcde7efe53fb0551e38affa10e336485f WHIRLPOOL d0a105dcc4c03f33d3683fcdebcf8d140e9a6b6ea4fa7f7fcf4773b03dffd4972ff571aeb8c6e85caea09cc4df0fe3e73c9853d980cb0fe944dd7255e07a2e7e
 DIST root_numpy-3.3.0.tar.gz 359688 SHA256 f658bdecada912aed0b92ea84a2e5a64660b28f1476c2387d1e208237da34e5a SHA512 97a75ed46cdb25ff6f7c680c359cc84cf1a9b0f6204d5ee9e7cf0d1bd0847910be7d0599e9a38df42593c56842d7cf6ecd982c2f3620db5c9162442af59c1acb WHIRLPOOL f03a0cf935e4e3ca55cc1d8752e29a5477f4e13972caa3cbfd09ef6902bf059d592af381d232a100cd3e25453def6e8b2530a0f5cb29333d5523d0159b315f7d
@@ -7,24 +7,24 @@ DIST root_numpy-3.3.1.tar.gz 361107 SHA256 932de8dea0d1586fe73c07b1a0859032cce4c
 EBUILD root_numpy-3.2.0.ebuild 912 SHA256 e25dcd566b3df0c29eddb4d4d3dfae6758e56c20a7aafd106f1767d4a6e78605 SHA512 56507f15fbbf6347d2251da8a446cb66280f62bed1bdcb30cdba379a0f2267134d6361969f1f31bebd6cf15c2e997fdbec68bf6fb95a39820ded8700d354df32 WHIRLPOOL dd14ea77c70f8a0d9a0664e0a6d4854e1d3de2675f8638b4ee7de698eead0b471500070df99f62793f90a6209babeb86dd6e5f5a4fce891743bed4ca569a8436
 EBUILD root_numpy-3.3.0.ebuild 912 SHA256 c31f34e7febca3e0d11db50a4abcf86c0c85ac49e46c5b1b6daacce6be2a7e46 SHA512 60bf58ab342607c42a3b93ffc8798acdbc5ac2ae11a1b2a3ee6a17c1626e8779d13ee9da404095d9cf362f1dbb7045f521dab57cca320f6c87f1c179593ec542 WHIRLPOOL 7a95006d527eac7ea0d15aef5994bf8269c585bc1bb4e63137bb608d8c6757efde67667e8841e8b515aa5c238e205d0a2e27a5919af59b3a06f89e3b8bff9326
 EBUILD root_numpy-3.3.1.ebuild 912 SHA256 4a3283378d68691ce4db6dcc16ea3c26cd90c090fbea39ffdaf6b510a2be195a SHA512 1aa849eb1b5a4596782513d1372d0782f3c030b014616f33c610de4a9a213ec070f204547bccee867a9c101036b2bcecbc55390fd63bd579d5c09580541b3dd2 WHIRLPOOL 886a31f9bc7aec52e4ab69f6645957f06ed37e94b0474898b6490fe4e4ac443fa8cb7071b862814eba8373c628b9216f61c444eac9c2e69d62657ca1ea8d50fe
-MISC ChangeLog 1274 SHA256 4f6ce3ba7c3726ba29785e409ba14e96e01cfd4e270c1f1961a9cecdbaa8a284 SHA512 193e38b80cd4f9d45dfae834bbadcd42658f034421415d8b6e10c22d628d882853760ef5f4197194b26fac05e01ab3a5181ce285bcde22385d315a191ffc9ae7 WHIRLPOOL 8885ec392ec847adbd46bf82553a7e7379aaeacaddb8baf2c9e36773496e2097869f29fdb27bf1c57d35893c19b9dec7ed16a142d8f2582217b54d3adb46c358
-MISC metadata.xml 728 SHA256 6f3969a5bbe69d7e787e22646386d1ca7d486ba0f1802bb30baa861b8744f026 SHA512 09dbd7690d5af27d92da72d14647e7ade9ad1f26dd385226bb8bf7095520f8ff894ef9f6459cadd9b79965d082e1fb95b0673f9220c91769ed475f6a45053e35 WHIRLPOOL 78408eaf76730f754805fc65364b17ca853d0301a265fe098cfa22135586a4a3eac4d3ebc753e2706c102ca87d85d518aabeacabcfac8605dee6bf14888f6640
+MISC ChangeLog 1376 SHA256 f08b8424754ee09e1f924de67171102d987e0fc47e3703f731c5d10ab2551868 SHA512 634e9db06394e337aa877df85a9a3ef0b248167d8f7612a17d226501c868f0957d4677d8857a684860a13ce6d0b07bd1cb76a5a48b73b20a58aa386caad79870 WHIRLPOOL a27cc877a11275396d40587546bc87a6fe78f72ab7541d3339bd7d4cd6525ea249a25f4e1559322a6e6d11fe3c0a06e166d528dcb48c3a46fe128fb1bef3704a
+MISC metadata.xml 797 SHA256 9771836166575af2ff2e82d86073032e87bf554ff40e147056eea9ddec68d17d SHA512 57166c3ed705a22728b75f2eb899ba965cab69178481fe7bd384021bcec720477410fcedc890cc0e03f2935e47057e82e30f6268a164682cb0919d1bdb2208fe WHIRLPOOL d07803279f572bb6191250218aeba39ce5a05915b65f60353ac5e7ba20f04737a1450504ff58fdf2af64a493e7246326b1621cb208b3fd928fde7f45c711c9f7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVJOKRXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOjqoQALZnKzb+ypQNiAko20kX2URe
-7TA6eVLL+CJLZrvcchAWFA8STl1PN6l2oahComfaSnAOCS4b/4aFFDn0PoAQ4HfF
-pgwVRWfZGjE1yfRxb8n5+Z+wr28pC+9WvGSW1cGdXBSo5rOsRtsoNFlrM9VhpzZd
-et0aVZVZdS4MV4gfPDC7oPBbwsa2VInkOPOYqX6C0Qyeq9UOFW5VWheTzSfzvZc4
-VIm9RytpArzl6GIVlNc2WT1aHTTIN6YQtCW4nuVaRJq1mJ3uY0xW3qRw2Sm7o/rH
-HusNJVf61c9vPLQCxp7dFxnHsVV3c7X3MRUYIaUhEkww1epjh+NiXYXpCLUAXH06
-Uy+B26Yjr4veXm1xz3SQk1Ag93yObHOD75s4Edk2r7V1xU1/v3ghRgbZUQ/pERVl
-h5o59vPa8BVi6tt4qILdoBrLzMrEH5lLG6p58qpMvOq/CviSnTAk+KqZThAEeRCf
-zGPHrNJvyURmI8xfDO4aLzqUOHoga/nlIGLtZgeR88pNZxTrXqL3ymcMdSRC7Z5f
-XE6NanWQ+zV67KIGMrtrerkseQBtDpHHLSe3Iagnjv8x0p9AxltnrDKjGC2xUMBN
-PLrcbFw181MC2POE2kM15jOgAg6uNoDYK49qweN2r5Ktgz6SYUQ53xUr+HACU8H5
-/BFOwvOictY6dP1kDAUo
-=okeV
+iQJ8BAEBCgBmBQJVdGtAXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiinwP/3TEVAaYEtdTRpPKR5ES13x1
+IRL+dFRBeexmCMGm+FzQoKmeJv97YDKUifzJ193v3RGp5Muhw98ADay7xTv1szZ0
+0R+b7olaU/11qRD95J6neOHcIY67S3SiPyzGvuwNTNWpzvEQcrV+1B17p5yGrG6F
+wPvqxPFIE23E9sHv2ssYWSuq89nGFGBfnXP7Tfi2D5EvIlbIFFW/sw3hAlJKu8OQ
+MhOU3SFHNurirUdrh0BVf8yuGAKuUYWfhBa8k8uBXqRQqIY17BTYIGZgDz4yja27
+zJEBuSPVeDu1m7BoLltAM83rxBC7n4rzgxl6QZCw/bSytkpDaQGqjkcVcpYEqeCH
+nJ+kyjO/LPb93a21+s0BC+eVYpkViAXGsqKYL0TKMDQ3bovWTxtUZrjHO+NPflmf
+rC1b+pHdj2g22uzkv54idoFgTXyzZmtr2Va2/Lqj2M8+iArIxNlUE98Gm8aPsTiU
+vAqDdv/UU/P5SH1RT7cOomc0Q+X3TIDJBDovWzQNEGiXDvQAUS36lgj6Qsj+HAsK
+oUTtYtHm3I4FXLbFAQYCfMRy6JmBQs9Cyp275E3Jn0D2IfElfFFIJyVylvZlX1L5
+MD4yRDwoxinvch1q1Ru6nlIyddoxMOqr36nIfiLMRhbDkN5tv5ZJvLNQRtomxc7S
+uRl8UToPblwPUkLyUh+L
+=E7Yi
 -----END PGP SIGNATURE-----
diff --git a/dev-python/root_numpy/metadata.xml b/dev-python/root_numpy/metadata.xml
index 75c53d963a5f..de695cc31797 100644
--- a/dev-python/root_numpy/metadata.xml
+++ b/dev-python/root_numpy/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>sci-physics</herd>
-<longdescription lang="en">
+  <herd>sci-physics</herd>
+  <longdescription lang="en">
   root_numpy is a Python extension for converting ROOT TTrees into
   NumPy recarrays or structured arrays. With the core internals
   written in C++, root_numpy can efficiently handle large amounts of
@@ -11,7 +11,8 @@
   powerful scientific Python packages or perform quick exploratory data
   analysis in interactive environments like IPython.
 </longdescription>
-<upstream>
-  <remote-id type="pypi">root_numpy</remote-id>
-</upstream>
+  <upstream>
+    <remote-id type="pypi">root_numpy</remote-id>
+    <remote-id type="github">rootpy/root_numpy</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/rply/ChangeLog b/dev-python/rply/ChangeLog
index c58724ead008..1063a046a5b0 100644
--- a/dev-python/rply/ChangeLog
+++ b/dev-python/rply/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/rply
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/rply/ChangeLog,v 1.8 2015/04/08 08:05:25 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/rply/ChangeLog,v 1.9 2015/06/07 16:03:30 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> rply-0.7.3.ebuild:
   Drop old Python implementations
diff --git a/dev-python/rply/Manifest b/dev-python/rply/Manifest
index ae9b85f8fe0d..6ab420f2aee8 100644
--- a/dev-python/rply/Manifest
+++ b/dev-python/rply/Manifest
@@ -1,26 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST rply-0.7.3.tar.gz 27346 SHA256 708f94da2cf5df72b0d0fe73a44a6f2310dd74004b0e7ef6bf812f941dac582a SHA512 45f8b2b9fb84940c1149b43ffda070d7ded47a5b8d8e86cf030603cb0fae78df954e629d9e6722e8f4d5ff2a7a2d516a92cf320d438cb6b1595d110e06dfc351 WHIRLPOOL b1c55fc76f0f6c7afae5dbce336a6a7510ed38ecd3c81ab22f19d9657c9f3547c8297028c35a60931db0197fdc0fee7cb1e7c50bad6769bba413247d759508da
 EBUILD rply-0.7.3.ebuild 980 SHA256 b63179f26f68c9ff60271f7b75371fac779eaa5b61ffa19e2c2b4428ca35ba8f SHA512 605180e668317a15a837081f12f16b4b2db483ae58f3022e73d0c00342c0a3df08486f492d0c72a9e92d5c0f6815acf0465d4c4159ff2b7dbc7e45d3973151e3 WHIRLPOOL af2c9086e9f852a2aa1fc1b73a6eb83e61d36cdc4fdc80c56838d6c6627e673f3dce36814f4236f89669e11ba7d28b3f292546a6e43524bc6244b6236a3eb47d
-MISC ChangeLog 1220 SHA256 cb86ef273a63249ee8eb2537eb7e6c393ad15e36b465dd7b3e9ea9ae87af8f05 SHA512 f8872cb29b95c554b7653f5a77947a9b232f75e089c660d1ea82f4867803d66679a3e1b1e9aaf42a1948177cc4bd6903e1122073bd21a46021287936bae460e5 WHIRLPOOL d11a2e7acf0213c5faf1ab6e36a74bfe6d862ba9c28fd6aad2cc803ace6a4313f82e2bed9cb6334871386633f7ead889c070cae48b753f16633819fc7df86acd
-MISC metadata.xml 159 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4 SHA512 d5a29b9f6ecddfc368dc0f1f8919cd3c3d6ecf2c7a82bc8d4c0dd51b7aa15561ed0462acb8ae39bc84f97e706e82d9b4b06357494f164f1648219f604b473fbe WHIRLPOOL 36e19b63a1b307cc200e1d73499b7477f73799db3909e71b5a0916084728351c76d400f65e2c8b3f8fffb2c9ba54c0bd235f785b47414178d98f11d64a9420d7
+MISC ChangeLog 1322 SHA256 ea00440a0e4105a05a78bdd429c5e291fa9c1c7eb096aa875859c48c409a4b12 SHA512 b431cf54849e9cad1fef50db50f932fc0c045caf35b2da53884e57c62079f197a442bae0dd45f31fe3341c7fbf80418c93523b8355005150b17b230a568ae76e WHIRLPOOL 893a5d7faf6ee2ba85c784720c33d3e655d142459f2bc20782c7f928f88efee7e608efc063c5d5c421efc971c1fe03a9b160a84ee8c6b1fa727a9fad40e08adb
+MISC metadata.xml 239 SHA256 3f2b36b570ba75cfb9cb947eff162bdf07d6cf322ad2f340f6584660b16a0965 SHA512 b36d81ea1fd505fc0da689b5742f67353aef363982bca355e369433a015baa90721f07a9882f1cfce66fc1319b6e6a8c86e4dabad64516bc6f81b250cc331fb9 WHIRLPOOL db02aa639747e2668fba9b0015442a784069aa806e01c457a32131e8248500ef2f386f74bca61a4bf1bbf51d91196e16718593b73d5bf3b22b9c2ae3d4688657
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVJOKRXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOQIUP+wRixalSTU1JfmSdVRr7hw/g
-OwjjycA7QA+4kMkkk/YPf8SK1MbZkMJVxXbRS28lLXTXWEGdNm5QKtvrZPu+5wpG
-YYi+EM6AQ+wZRDidy5kWYckwT8BVNBuEl0OxCamXCbr06qxEhjA1Q/A2L61WQYcE
-ecMMCr5u3/C4MG4EwLOdppmHHWpkxX7sdUX1EeL788l6vDBH0MJTCi3gJE+7TOv1
-WqaY8rEMhnh2hz0ePt1INqKFYUjqd6rh1wutbiLUPmwMzmTTxALT28n4qdiIYFgK
-QQy0Y80opjcCWZK2WonXEOERUJg2RvDPYrdr0X8jPSXi+7BHyzVN8y3A5pIFz6YR
-9WjpJyR3N0h0Ky1NhG+kHD5UfVf+kEHyuPhGZrcrFRBkSa/XcP/96nIqvPSXpuay
-5CpcWKXH5mq+OW51vITxceImvwiJbsUJnGXF9CF5q0gXfF+c0OC1dV9GYB7U/dg3
-k+voZ8v7jeC537lXbB5ANRAIM+uj3bFTaX2d5Czkr0aJCZtoGKfss9JWy+8AJWHI
-qyJdCsjktRfeIkJuEYdywCh3rFsRdecr4e9xpgPX1GV8PLHe0WAKO6Q55jnxC41n
-Pb8bVmanHqcoTFfOstT5J3q/TO7OF+Ol+8qfdq4X0i1yyMYU/slsCVHjgIw2uBVG
-3NTy88C/DwXKUfU1gG2+
-=tqpZ
+iQJ8BAEBCgBmBQJVdGtTXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiYdEQAI4v39RDpTFXhgxcEBUdyr+8
+uzyEwtlF1Bk0PvZpz5ncy+9ZFlYUiOvrpsQXlvKcoWl4982vxGiaazjCFHkj8H6m
+s0J86/0rJwsSH1inhGbiM9oGpl/Pq4vYIlP3vH9Wz3DYr5akIMHwuXbNRaZ9yr11
+3Ga11UQyYnPyC3QajHiLrJ57cdoZU1IsUqQYK7zYNe0iJnCAf5msyw5QS+61hZ64
+JGRxL6VtD8LW6K7tPyitkQgzTN22Jc4UgUACvhQzVOGrbN+L1UiexSDKCbHv9GDN
+9YwKvJi6wbE/hCZrGOrITjjciARsb/rWgV2fTrKm7hJpMW18Rs/SowYem5ZZLm0P
+zS4YPmJKVrAlZ9T/ACgKruwvTqXGZmjHQF3Nzy9gEHDUQiYKhQJmJsXcMQi3AcEA
+sc6YZ1L5NNEtiWnAvZVh66EKFPNorJL3wdj7r6LAwayHcz9HWicbNvqMXDzpiD+n
+sdcl4SVt+7JbcU7VgzZKEPCGFIjMIzku2l4C24/Dl/BTTR9MSMOBiJEOll/nF4TP
+XLbGBrDuAGAMVqIm2ObV4K3TzOwj2UaRgOFQF5uIzanWsIZltLbaHugq0nFpJ/hB
+VRLs3LZJSkekVOb2TNp1DBewBHTK3RE+GznJvLZpUOxkDXAzaDJLWy4uNICPjbuO
+6OKQSsFP+BMsZ2Znbscd
+=L1Ud
 -----END PGP SIGNATURE-----
diff --git a/dev-python/rply/metadata.xml b/dev-python/rply/metadata.xml
index de483c53568f..b1b5e025f67a 100644
--- a/dev-python/rply/metadata.xml
+++ b/dev-python/rply/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>python</herd>
+  <herd>python</herd>
+  <upstream>
+    <remote-id type="github">alex/rply</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/rtslib-fb/ChangeLog b/dev-python/rtslib-fb/ChangeLog
index 06a7b94d9548..1899adaf4fd6 100644
--- a/dev-python/rtslib-fb/ChangeLog
+++ b/dev-python/rtslib-fb/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/rtslib-fb
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/rtslib-fb/ChangeLog,v 1.2 2015/06/03 21:40:57 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/rtslib-fb/ChangeLog,v 1.3 2015/06/07 16:03:55 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add pypi to remote-id in metadata.xml
diff --git a/dev-python/rtslib-fb/Manifest b/dev-python/rtslib-fb/Manifest
index 4dcb691855cc..021e3d0c57f7 100644
--- a/dev-python/rtslib-fb/Manifest
+++ b/dev-python/rtslib-fb/Manifest
@@ -3,24 +3,24 @@ Hash: SHA512
 
 DIST rtslib-fb-2.1.47.tar.gz 27131 SHA256 63348b0c88b542caa0729f8d3fa94623c4c616ed8e22757b41acf456928e576a SHA512 ada6a7dba7fe7172389c53f72e9941b715b2c49487acf32a66f247f5d258bc0568b6dae33fcd27f869b910c504ca434e85f8aa0cc670aeefdc4ce76d8bb734f4 WHIRLPOOL c613fb816f016f7867fc105ad0a2722bfb33ae544ec8ebce1adebe654fa2c200cd1ba848db302ab3eb1808705c0f5e9352872ecbfcd66def6ac913fd3269844b
 EBUILD rtslib-fb-2.1.47.ebuild 615 SHA256 c8a9a0881d8acc0986ade8ccaa74181573c4558aea11ba0248617b693e95dade SHA512 c1672c4b9ee8e282c1c9b203ea77608dad0ddb073662a3eb0179218bfb108ccacfc09a2b9da346f668c09a7232cc2b020d91c08b651138ed917a599955e5ebda WHIRLPOOL 862651435e6ec5781520f81cd34542fc3a2c02a3e4dcae2434bd6959de5f2fdaa31ab00160ce4f6c4cb83985d2850af568a5baee16393f0a766f0a333349bea2
-MISC ChangeLog 458 SHA256 9cf8c71fd432fb1d909d16faebc56f4a8b4c67cc44f2b8b4b8245b58d24caf2b SHA512 829f867b290a85a145b0ad1825851ce9df68cd8f7aa5a8ea4b4df1786bfc2b1439a0c7e2e81fb0a266b30d602b01652b1b9c9f77604b58839d4b24847b1469db WHIRLPOOL 4e9ee756124248f7bed08c71fd26f71798e4cb9fb805525204b2917e1f38bfe252723e2087045cb882e23f462bf85cdc6d14cfe22f60114fbeab1c3557781496
-MISC metadata.xml 464 SHA256 b77e5728a5dd22a036b9858eba011a197f7ef3efa9ec1dbdc4de1fe11049fe1e SHA512 5c02ff3bf8122107024fdcc75cd81a1901aa78faa38d2d5100b818efc44240cce11f0498c04772d9d1b397ff70ae9481c5c1797e4b85a029247019c6dc4b0246 WHIRLPOOL f84f98ee9c633b8c74084eb3c91606d3d7a1f4123033eb28584344a31ba8908129e8d08515f14fdf3b78849ffa1300b9e25cc18227e9a045f5de678e6d27ed86
+MISC ChangeLog 562 SHA256 b3a5ae725509047b8bfceef648bb24bb4fdfe58eebbd72ea5acd9940b2bc1543 SHA512 1ea9b94d9c9e0fc8e27da026309b3f03697412135584fa31f65976e51e376605fbc1da699a224cc9cd3a4d01355dcec57edcde7bb995d1e2edf6cf3b1c7de1cf WHIRLPOOL dfebf0cdc69dbd78235e3ab511a0cbfb1c9e1c1fa1022f114caa614215b700f06e0c4ed2260bd7ce3e04a4bcd70e785cddd6c38fc356133901d7bdc6dce7f49b
+MISC metadata.xml 523 SHA256 e6e6c429e1af7c500a39e5cd8394a5b6aae42cb083e4455c78ac7d0eb67f1b58 SHA512 421b05e8b189570f4618ab96c0c867cb513aec2832477b3a0a38d43356da95908846e94dd4017f33286c6ac640df713157c51c881b5d98051aec4cc38a49c46a WHIRLPOOL 1adee5c40ee9b79bc0688be220fa6df85e323f2bf0c2158e4dde69e3c3e2a7c0d393f2aa1ad599c6d90524d06e806eb3d57a1cce9ff19bf4c36a21e406588431
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVb3RqXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVdGtsXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiHe0QAK1GnHX1kzvrC35eRyzfDDf8
-GqUZ+U+HFgjcW4v2WZijv+F1Dq8/RHR8O+Iy6AMVUK6stBnzcxiCXF4j3HHPnnkj
-/+by4xbO5afNHYAl6RGShUAEKwuFg9FkbkKU7JV7eOXyzOqTjt7W0yb/4JhlzvAf
-wjmcCoFNGjoPoZovvDYb/SlH8iT6XsHWwwnHo4mPoOe9hzpkHy7xww000yMp4328
-Blq5iBTX+jM5fn2QS0sAoBFynx2MEE/yA+v/mfMHNc7vYYqT1B7P3kOMUuK7oNXm
-QCdf0lazQorkPFdzPcqouLVlYgG5xOgWEem7KjGBwQeHdQ5ccpfoSuDZScJMGdPp
-NRZTo9CvzucteBYb63gx/As3uSQjctnsroPPK8mc7zC6r5Ux7I2U//gHnRlB6IN1
-IKcztemkwYFJghmpvEJmoyPxQoDEol0kmJbVyvPdfliJ5LzG/9ctTeKepK1vuu7R
-ly9Sm/fCkTNHBZ5R3lTkMWS+rt4Jj7sbIpJ1mtK+cb7/ZV8A559ULiuM1JDp2fvL
-fJX9TUtLJrdPlVJN0ILexSY57TgbKOZqOUwpwKBFV9/2aNdkXmS2fFKdr9lva2Vy
-fyd2ak0ZSg/hLculuydqGZ6J9faw+QRYtZ56qWxSki0mdPkwYbNrn11FHLxJVmbK
-sl1pjFiW/s7uVJTIib5v
-=bR/9
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi+ZYP/1hd1pqmIiK3qGtPvbS4Jf33
+opNzqsPN4tkkGQ515VRGZz9/QFNTJop0cv8GhCW5A/OzBI/FnpKozmyz1UwKyOXk
+/DAcrLIbMYrJsREznK/AJTu8udv0bdbeuxbhGXQp2DLNCflqVuAN/5gVB0Xj151a
+scIKLlwenOT9jFh0FMeW/IR93s08lpaz7NVPa4A66wU7jDx8D4rK8ji67u7ufOdW
+cLhq6y+sZ0AVGfFDeqhknSnhGI10O/xHDSXYj2DWJ6ksB/pV82JEW9QI/TExiFg3
+5Xn2AHvYlMv62v6zKjkMyNVulFrBce1aHXUbjBHNS48D+f9M927h7p5pv2fkl0c+
+F6DcgLslP2Ut0NtnKwJvgKhJXx6sevJSHgH0nF2lXYD0FNElZnlu5ZNvpJNHqhYn
+JCcIV9aJrlmMBNoNJKX4PlON+JQXEQxNa/zg1eGI71qxHQGlDafv53Q9TonIAZyY
+oIRifLq0gRARxVCY3Rl+98KGymlp8dgO3yb7Q0uU58Xpq+He5TZtIOz46+jRI3if
+MsCISbsHe2JIXM+QU5+zbwaEBUkVhq1qSKXNnBjlhg5yopQ4Ku0TPRcyNriCLx5e
+9W3j0jGXIiFl/T1tHrRbeWsqIN2x+wwKVw4DQ9e3h/tyE+dD9m7BTMoe7O8X34Ur
+9Z/Pqcy7l2MmecSUEMge
+=UCi9
 -----END PGP SIGNATURE-----
diff --git a/dev-python/rtslib-fb/metadata.xml b/dev-python/rtslib-fb/metadata.xml
index 118159b51c6b..42140b4d7f46 100644
--- a/dev-python/rtslib-fb/metadata.xml
+++ b/dev-python/rtslib-fb/metadata.xml
@@ -11,5 +11,6 @@
   </longdescription>
   <upstream>
     <remote-id type="pypi">rtslib-fb</remote-id>
+    <remote-id type="github">agrover/rtslib-fb</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/scrapy/ChangeLog b/dev-python/scrapy/ChangeLog
index 50a8f3ff51f6..089d537cec4c 100644
--- a/dev-python/scrapy/ChangeLog
+++ b/dev-python/scrapy/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/scrapy
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/scrapy/ChangeLog,v 1.29 2015/05/29 21:40:54 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/scrapy/ChangeLog,v 1.30 2015/06/07 16:04:21 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   29 May 2015; Manuel Rüger <mrueg@gentoo.org> -scrapy-0.24.2.ebuild,
   scrapy-0.25.1.ebuild:
diff --git a/dev-python/scrapy/Manifest b/dev-python/scrapy/Manifest
index dce36fefbf98..17bcab0abeb8 100644
--- a/dev-python/scrapy/Manifest
+++ b/dev-python/scrapy/Manifest
@@ -1,5 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX 0.25.1-setup.patch 1007 SHA256 18639ad9193a13e91b593cc8ba23fe21f88935f758d7aeed570b6bea96a47e61 SHA512 dee0457dcac114c2a7872fec4b33589fb1fd4e061d98b79b2011014dbc1e0124f40f43b80069e1301e67b62359eae3198ec4caec91646a6fa9fcdd3fe867bd0a WHIRLPOOL 5b842a3dfc4e982c3ad7e60704650faaad567120594f238c10e55dad0e2b822cb01f989b01c6e2d878587c3c7851ff9ee3c75ba216a1ac99b417b9f6fbd67245
 DIST scrapy-0.25.1.tar.gz 986555 SHA256 11e6496b7196239f395c977c432667466cdef6984dff164337bca7aa37049ed5 SHA512 7c1afbf942c06ab6a849fe609ad8d582de5d42041181bb22b2388bfe13ce23438c3c6ce936953f819e4b897aadbf682cc04f8cd0805f44157b10a583c668f924 WHIRLPOOL 692f0e11065d9b149d7bdcdd9414d718f05986767a5cd3632ad3f5db23904b42a5af5609468f2bc321f827d6e3352eb0ce36cb797d68228c608ae8fa57f940c4
 EBUILD scrapy-0.25.1.ebuild 2088 SHA256 115e0a214d643a809e49f548ceac7769116daa584993c03bfab2b5c5ef89c70b SHA512 1f06c58ec14251e471ceb6bd8e36eb18d308a8d38cbe138476bc20488e89920b850bf2eb80e59ce201349c67c9b503f4f84d4603ccad1e8eaaea9656259f5e50 WHIRLPOOL 399f000de80d9067119b04ae631251754bd90178261ef87375ebd16c4944ab8760cd0a1d88118176be6773945d5411872a995482d847f7b6c9cb7ec93d87c3a3
-MISC ChangeLog 5004 SHA256 4dfbfd0668db7230b6c8c0986f2f982d0c84ca5dfff2a119017179c30175e80c SHA512 56a2abc21a98ff5a75f1701032d902d8b595ac7239a3c6af2a517bafbb1f58ba32f88e81d4a6c9be947f8546e05dfd79f9ec48735f4e0813f89646f39574724c WHIRLPOOL bd0b1f585d10dcee3381f24e5e098acfb47b0b32fd5653c341fc30e0566f6881045901dfd1d47a809649951aff2aee8048a3946d8551c9d85c5310a385ef387c
-MISC metadata.xml 415 SHA256 6cbf7bc902a788f3aca1fc94cb2451399e088a2f696f1d1a724c296505b54655 SHA512 9320286bb847c00d744e558da90f14ed9c2dc853bcadb32152b977fd4b28d2b6228aab5ed91a6ea23ad77a33d1c4713d7b7c17b8a33a8c1981267a2b9b30521a WHIRLPOOL e348fd491bfe49ede0792d9e88a8ba2caafdcd637a5403e19459c7774072cd197301fd7e95f204ebff20c02bbf8beb1516fc15990ae0a36e9439cac7d9871df0
+MISC ChangeLog 5107 SHA256 e3c43d9b41479860430b2930f23986a494702fcc75ebeaeec4c89fcd28ca91eb SHA512 f53464f76c75ef864ace53fcf57587353c81499a0199fba42e16c3bf51344b5c60d40c6e07cebed7c3bb086fa76376a424f0a72d9b78e52fde42e1db7263ab88 WHIRLPOOL fc61bc41efeb0de7b1c45b1563c3daddf627f99f82a97bb78e7ac1ba8a3037a0a69666dd296e9b2831e5a19405e9d992c661ac2659a6192e6a7113dedde49660
+MISC metadata.xml 513 SHA256 7c4be846ba3954f072aa98eb88613071b4e548257fa08e003fca3fa6b571f56b SHA512 6ffbe1dd5a1faac584c6adccdc26e5946ee6814598e640a78bbdeeda94120a6b2ead8132f785e34b4e15e6488e675b1c3cc70f999dc846d5c275fe4bea975366 WHIRLPOOL 984531daf1b43b4d975152177469d0ebecd9454ba136922de86740b28dd795efaab1835397bcc6c9c61a0a0aaf8428f2bfa114d1fc8fec3a2a63b899ae52ab43
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVdGuGXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiKTsP/jrGbwP2WnQIkWhMBtU23zoo
+r7blmWJaU/Dwjmb2M8r4NNqCZ+oDGJecM/J5/EJhIaI8ywthEJjvJpy1Y5dSQX56
+u+SLJnVxDHI+KKgPifdp0BoKrqmC/YDyPJCcvS/RsHnZK2GHAS0L0oZB/5GGwnEW
+7RG7I/EtoUMaKE0k4kkY8fKU8zjx6xO6p45Avcxeeyio2PPqGXfc99tXPgurEQtI
+jPquHqvIp8qa9DFHA717lywQ//T5TQqsE89MdDjLDiqgoAfuE8yH/mXaIlX5gSxA
+RPFD5Q4bYDQAZfvQ+h7IRtICecbo4pYPVaU4RMgqLaFxk1h+5ryMR+rTCOTzk9Js
+0AGMwJZBSoN9LzvH7Y/JTTly5mA9+34FkozgDWIiS0kIBCtFzOCNMR7TYk/sXTde
+gg3H8ZQqnje/lodV0uBO4FHPxSmpgyZMjoGaFzbaNBLNO2pIQvj1VELGVHlf/pPt
+/bwNqbHBI7Aq8PNoVeknHrDtAU06eAcj6KL2SjT/e2v9+sbiKbf2DpCZjR/cQ7oh
+hjN0a5RCIBtRnkjJfb4DeEY+8byoYZzJtV8mMI+i3fV+Et6Iu64NlthoXWWYpZPc
+ZrRyyrHx4iVdqcXmpNAMSymWYvjAZyQP/szEHAmnmAxEB2/5TflICRIzG9qsprdc
+AEMdejlgVHZgBRVtAUz6
+=yP86
+-----END PGP SIGNATURE-----
diff --git a/dev-python/scrapy/metadata.xml b/dev-python/scrapy/metadata.xml
index e7ca305deb81..df98447ae231 100644
--- a/dev-python/scrapy/metadata.xml
+++ b/dev-python/scrapy/metadata.xml
@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
-<maintainer>
-  <email>maksbotan@gentoo.org</email>
-</maintainer>
-<use>
-  <flag name="boto">Add support for Amazon S3 via
+  <herd>python</herd>
+  <maintainer>
+    <email>maksbotan@gentoo.org</email>
+  </maintainer>
+  <use>
+    <flag name="boto">Add support for Amazon S3 via
   <pkg>dev-python/boto</pkg></flag>
-  <flag name="ibl">Use Instace Based Learning alrogirithm for automatic
+    <flag name="ibl">Use Instace Based Learning alrogirithm for automatic
   extraction</flag>
-</use>
+  </use>
+  <upstream>
+    <remote-id type="github">scrapy/scrapy</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/send2trash/ChangeLog b/dev-python/send2trash/ChangeLog
index 83399acb8ab6..3ff2e4b48a66 100644
--- a/dev-python/send2trash/ChangeLog
+++ b/dev-python/send2trash/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/send2trash
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/send2trash/ChangeLog,v 1.10 2015/06/03 21:43:24 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/send2trash/ChangeLog,v 1.11 2015/06/07 16:04:37 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add pypi to remote-id in metadata.xml
diff --git a/dev-python/send2trash/Manifest b/dev-python/send2trash/Manifest
index b40663f5b9ae..9a0642107795 100644
--- a/dev-python/send2trash/Manifest
+++ b/dev-python/send2trash/Manifest
@@ -3,24 +3,24 @@ Hash: SHA512
 
 DIST send2trash-1.3.0.tar.gz 5563 SHA256 33f4461eae831eb09a21b70ca202c2a6dfd83db6bafa1e1ca11b5001e22c58fe SHA512 d308dd06ef7a11ad7bcb5d9195fb52aa0c0b8e76590ef11b1576d14815501c32c48b96167eb0a325e4f27d0dbf77f41c012a128d30c8f05d9d5ebec9967e21f3 WHIRLPOOL 15d286964183ad44ae51dfed29aa97456d5460b68fd176dd021f7d093d8e6e213818df2fd4346554601b5f87ea1f95727248544e2e78094f696dd7d50d0e89cf
 EBUILD send2trash-1.3.0.ebuild 744 SHA256 06113830ca3871c9d244852e9aec211a4bdba7b8bac4b817e62b13659d60afb2 SHA512 6604b6eea160f8cd705dc4432558d4ab56df867967fff01335574475d02057c67dc6c77f50aacbcc67570007239aaf8b4dd1acf676f8dfb62fe8459e25307eb3 WHIRLPOOL 77e0252f4990621970899d6b31b238bd8da4fe6a58da831526abf7c311981c605d060df8bf4d2fa3ea4f88153d6a912d49cd78744dfe391247039db4274288d2
-MISC ChangeLog 1452 SHA256 b403268d5c12d70117b60c0b06132b230d1b24ca38e31fbe9c9d3610d78b09e9 SHA512 6505bae417e7b57088dcc3d239ab5ecc129ac469055753c732f30ff5ed7020997609ca837f27cc0541424a5e13783e88095aadff73d2e0f35d6c616cd168e585 WHIRLPOOL 1591a073e2616c7e18f5cc89e4a2d31e95fe52142fbd8ae0a8f57260264d9f74af59102a178b67416ba8879a55d1533f8398bb792fff14b0530129677e1b6fcd
-MISC metadata.xml 238 SHA256 b9fdf7cb3bd57e3fce2ea438ccfa0eeac4d1127f50a6178e0313ac7db66ad871 SHA512 db9659886d624f43de50e21c7addff33a657f881c445df7562cfae9f6c240876d05819d72aff8c6e0c0fd65647f60716ec746dfc779322b835a9cee3bfedae24 WHIRLPOOL edee7f60718685e62c72afaf0d834ca16a63f424f6330b7896589d524ece805c42aea9d35ee062bb8cc28b492866c984644e04845c3423fc496ac2e1a6ec8282
+MISC ChangeLog 1556 SHA256 18ee416a142346183307c78ab28e05cc86127e2d7e1c9bbd65fa81cfde9fec26 SHA512 783cc17641302105ae8de1ed31f1bf043d0844f1a9390b8f38c501cc91b9284fdab73ac83365ebbb70b5c8b3347ce5229ab5fd5e8ec7d4e57fdcbc74d51251e8 WHIRLPOOL 09b89d1e1fb9c0b51872f209197f664ca41a3da3af987709fe0fb1c2a97410407bb35db2af064b90613c905e223e74d170310f238c119cca045a7c0e38ab303c
+MISC metadata.xml 296 SHA256 da7a89689aacc3506de303a54dee7a9c3829b8ef2bf65514dad82d7f84f7f1a8 SHA512 9019ed3ccfa6ff4483dc47da314c1438c608fa4d609611a2be087a2c750ac16067d0ca4f824aa493c725853903626daa9bf6c93dfc5d2df6ffba016b751952c1 WHIRLPOOL 459122353a3fa04957652f530a1679f7d2f428b78bf450a99de232ac1e8f2c61bb7faf77b5308592963ed0fbb3dd6d4ce40a854c0a54808f39b65ecc9628f370
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVb3T9XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVdGuWXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmifZ0P/1xVe9ipgOSwzMg6SUUe5tAg
-Buwi1Jc2I3QfOU9hMI4BhAq3zWE6H9iWz/umQWP30OW7oL3J++es5w7/iN944rA3
-bQmL01y3q/ftk1lsvXEru82VlCGlPdqPkDel2f8FJjzpvfvzsNWVtnQpWay1sh2w
-oJCJ7r4pgG/1sjqBvxu+WERR8ayj7oEpdyv9qa1D4TCyNNL+QRlBsshqVR3RjH/s
-5Dzdp3UEONRxFx3oB782rpmDZO/NDevEL65l+o4FbQhEmG5tP9D17ufv9txQBvBC
-vWoChbFl/kCRCGq76gVnXau5ltntSTbxMG+zuZomas7IzRnbZn8qPRwLl1KS31OC
-hvEYih1sTt/iXWqRHB544s/IlipMWlivRf/kuYZOisMtyAW0asW69UcMA+c9YJST
-dAFDgai0aywFZILAv8c/44KoDAQHQvw2jpLpdJGbcPwjI49LHhQpWk7aTxtEQ5Px
-nz9Im4zhgSruANrgL4wsACD23qJLbEWkRV5GYKHWhtxVtQsyxChwGIM1Tpk52SXD
-nWebDQUYW6F1f+tWBeRUOLCVtMVJuN6e+wqWHdz619MqJfH6AqMGCMfv35t+IB5G
-TzLARU+w9SSKQcg8OBvCfuJns4PO8pxBZoFLUCLoDcRqzKV/vqwHjgdOTnVVKFZL
-BZao9YfXps0xE75BKPEi
-=LjDv
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi3X4QAKTRAgByFSxLrKJdddplDD8N
+/xQgIxGil9KCnDJoBdwcq9nEtfQQ8pYqwzItas0qVsxZGXex1ycy1IJYRgdQym/N
+qMiVt1N4Bt8gCLG/sd6QMjjf+qdJ/QN3iZUCO8pviD5h1/4oZzwTw1mdTkdskyaA
+TwRh3Qyvdk+2R7kl7rkRvbnSL0ZUXFnfM//AfJUdtpBo5zTxOKC+AVSWrhDXiOqa
+lrGz4FkRdeZiUCfycbKwIK9ZWF+XQXMqIyAZP6ETei48udunMcDpIegbw6qNgsyC
+EFBeW6QMnX/Mr7BxHgQE+zgwk6RZLNmOh1FoZs3WSsdS0GY7pR89NumwjjO0m7q2
+uLgLdhCO4Kz3kElT889kBy0WlqmTo/vnaWVyMp2wbcW0BDImPpudCmUFHrlLZ5Bi
+Nx3KHpp0F3TrWaexV0myvZyUXA1iFrjP79Am5cNixqj8PpaSz9ysLX64m5x04yAi
+HEvYbPKsy83Wy5yg2p6ahrd+xKUtCSqt+2nEXowx9S2LZs6OGiWU5Qfq3SsZtaxI
+ppY0hmf2NUxOMqhmr41OpGD0OfJoSf6vWUqwVXto32brXWlPsoXNIjlmnJZn9sE3
+XBJlDUv2ltP0lNwOXGjPY4TrO81QfWOk8X1p0Z5hHRQJPiypFWq69MQjN3MrAgXT
+MAtcyiKM/LSc6wkNap+B
+=y06B
 -----END PGP SIGNATURE-----
diff --git a/dev-python/send2trash/metadata.xml b/dev-python/send2trash/metadata.xml
index fba2deacb1fe..149121d3eff7 100644
--- a/dev-python/send2trash/metadata.xml
+++ b/dev-python/send2trash/metadata.xml
@@ -4,5 +4,6 @@
   <herd>python</herd>
   <upstream>
     <remote-id type="pypi">Send2Trash</remote-id>
+    <remote-id type="github">hsoft/send2trash</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/sepolgen/ChangeLog b/dev-python/sepolgen/ChangeLog
index 7c56e219d081..0b152b2b0030 100644
--- a/dev-python/sepolgen/ChangeLog
+++ b/dev-python/sepolgen/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/sepolgen
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sepolgen/ChangeLog,v 1.51 2015/05/10 09:02:56 perfinion Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sepolgen/ChangeLog,v 1.52 2015/06/07 16:04:55 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   10 May 2015; Jason Zaman <perfinion@gentoo.org> sepolgen-1.2.2.ebuild:
   stabilize selinux 2.4 userland
diff --git a/dev-python/sepolgen/Manifest b/dev-python/sepolgen/Manifest
index eab5989c5e8e..16ec33aa3e10 100644
--- a/dev-python/sepolgen/Manifest
+++ b/dev-python/sepolgen/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 0030-default-path-for-tests-also-needed-bug-467264.patch 891 SHA256 9e8627ca85ce1ff98933b9e8c8ab00c6ac320ecec3d082a91b790f9c1cebbf31 SHA512 d4e6cc6084bc76ac1394392a8107b2432ca885b88d8b3252507d28a192022e6252bce7d8a666edbc5a36362ceb76a2157008fc3a110a892964c40904607412b5 WHIRLPOOL b981c25dc65e63f72d7646eaff77b8de92589548c272906f73e1a729b7f54ecd57f0502ed453f95bbdf6d9e85a1a087728ec2c5ec3e2eeabc61bd36487fd4842
 AUX 0040-have-test-run-with-PYTHON-variable-python-bug-467264.patch 436 SHA256 9d83e362673c2c192f38838a5c5caa285528124a835c58b8662b5b75e6c11952 SHA512 1308fa2ffa3eb49743dfbc27d3a0696d86ab4a3e6da81953783a24d2c5b9b951d795eae628e9d42cb86b6baee4f78293ad94a09129b7ee08f6f4555d42780930 WHIRLPOOL 3cc30705a01f1850b382604019d5372da412579a057225a93b3314ca2d9e4c5b27725bc784af7d731a68882c6d770dfb3d09595d8fa2ae143bbc007cae0960d5
@@ -8,24 +8,24 @@ DIST sepolgen-1.2.1.tar.gz 366214 SHA256 438c246bdc6b3cf1b12116831f4c601aaae6e93
 DIST sepolgen-1.2.2.tar.gz 366343 SHA256 bebda8eeb2d386d26823d724ea320508a02b50828d44aff47c3f907cf54c2324 SHA512 83d56c31a87da8e271d6f436878a61f21c508ed8e26fa71f57ef109f432b10e310520c45bdb027f89a1edae12568d827ce3159bd8b6b9cf07c572b9a7225acee WHIRLPOOL 449f540caf2aa653bf2b2638ef310d2b710503744e1387119a66d3039253f537ea7ba987b0e5887e004f76485b1ae2e4a84c192a2e0e3423c9c8e61d8bb0198b
 EBUILD sepolgen-1.2.1-r1.ebuild 2132 SHA256 aa02397c0d01f62a5c98bc42618aa077150c01983cf3a41e94d079bd127a8005 SHA512 7de4a5160a092cc8135d5fe9366d7ee980a18f1d33c9ca4ccb5ff52aed5866f5c355e36851473a36952c333594fd2f5849ad3c3e3b9309b5b3ae8fa8b45bb4a7 WHIRLPOOL 8cfe0ba449fedaad08bc724e1858c01af81523eb3876e1dd5ef7e07c55b53e861f67c107b7874a1d9fb9b9c7c1e87ea6e7239d807c759e90166e4916c2987330
 EBUILD sepolgen-1.2.2.ebuild 2053 SHA256 28ffcfd49f642fe0d670fbe2c6369478f553ca392a45d5cc566ba6940eb828e0 SHA512 3e2125173044498f9e5a0a642fc06634a5649c08b657e0fff8d55239ac510b6a5760d67cbdba2c8ecb113b4daa256dfd4ca0999de713a922d7967aaa46807e37 WHIRLPOOL b6360366f780640f5c5fc07085ba13d13669450ee4ed1a05cb97a0a5720867fe3631d3a03183eb363f3e1f07d30dbb206f6ce0e34f847212cb81933ce14222bc
-MISC ChangeLog 7965 SHA256 9c72c6c40b4633e457d2a731c2fcb3a13cf90f2b3ee7827bd71971f709a16ace SHA512 a4302d64ce669ea16e850d00795c31c399f095265c654f0845cd53710cce311bd4b1eef00288041558160ab9d8bda742126e9e50e40f46d8e3e20bd4d44318e1 WHIRLPOOL 01e6e15b5303e99594ccd8ade0aaf3d211ffa30bb4b96fec35ddb10c173626478226891f8f48dc4c765bf5c14b52608fba91da79a43eb5560e06dbd3a9145cc0
-MISC metadata.xml 234 SHA256 8ef796ab0656738628f6238eba20f70298c2539bf4dd24f7a6f042857176c5d2 SHA512 4d8a7927783ca9cb1a86933d5d611a1fd6194b4de9c5ecc44879b64ef289cb0d36fe7382019512b16d23bb09f94780d5a9aaa523da244928b4f50368063cb460 WHIRLPOOL 641e9b4f445fad1419f1de8fddb2667ed69e167367ae8c94fc88e3a7244fdd968b7b0f4c28e0e13fdc593973c19a0f2451548611515a1b457fdcbcd8c5fdff92
+MISC ChangeLog 8064 SHA256 88722525c7f66f8468ef01976bbfd77c3b834f96a7880c005aca9f8ed40a2b8e SHA512 c0ff477e6dd5df79b26d6cb49b4e1163607f2b1dbc21ffe5db5ca985d90b0a9322015effdcc490b80351eb8827043a1646f4c710e4b03ba9fa8174841fadf25c WHIRLPOOL 7a2bca2b00fe0d2e17047b28b92fc1afe695bec58ef16ecb53cb2cdac3cdf56784bbf642cb2aa15df2372de11af77e33a0214847ffbc30731ba947cb616b73e5
+MISC metadata.xml 332 SHA256 7aa8a9b408e9dfe3d4fe580972dd27a95664a7e503da09f310432c03f4e4dd3d SHA512 09df6645c6ad8f86607a7d1924629ac7e603d1c80422aade4303cde2bb4368ba09cdcdd79fc8093f5676de9c68a4bfdbc201557b8bd8fa4fbd8626699605a027 WHIRLPOOL 5cadf7c2df5f19940ec7a976c30a26b4331aefdc6b2e9462981440b2ec994d87afd83ae4e2e375f8de0d48feac9f2acdd1cab96bf5a5bb1d8b952ad81330964a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVTx7CXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
-QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9VJ24P+wXPTpvDMalRbWB4DrLXddSB
-q6nN/2OOmNhaPVKbObUnQAhBd2FR2IXyqbaDmAu/DUyZe5oRVQbTjYO46/CCHDrx
-6sl2B+Mbt+BAGfByQTLwXmboQkbTdJXdL+vgmxQ1+nAfSsPmNNyx5NaEBYPWYrai
-IjE612vgt1Mr1xe9Mi9Z3xKRv2mFC4jgGwZdmBI/0AgGC5Ewn1cwSY9ih7t2G0xz
-lq3F5gLz3Wtyuts3FeL8cFeZCRBgY8yf9ZGT/pKZMCcgY9xqwtXb1zn8eID1Ekh0
-Qp5n4AovdiUVhAlv2tvtibt+/A027T+s1wnkyLpCYSVRV+lDRdVuty+WIMBzfEss
-8EiK5QtN2NjOpCBPyCGw5EJZ/jqn1bY43kAwW4J7H5dvDN2ToYx9sf52YrYF9Ax5
-KwR/WOnmzxfEfAO/88tOMH8OmORZ9N2Ipl9OtwJkaHjLw090kLH5heCR3OUvQ8XK
-UFW9iZgsjQbM/ZCddmrRfjoycKgKAcMN5vizd4E8Gav2PVM+xNo45XmwF2XKqIGr
-iVsiVHT4rF54/N/OHd3gKMRyZ1nvRMobAgfgO8ti1W8I/MQEq6X3Te1AqXy0fSzQ
-5hccqPqtoMDkMJrClPvhO0tjnCvfWQCYTfLReB3qsSiYVRFgjxbcmZ0qAbz1zMFO
-q+uUaCMAwlxCsYLebBv5
-=FmHv
+iQJ8BAEBCgBmBQJVdGuoXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiUqYP/R8NWCBEaTJkeCTrbNO4woz9
+vCrjrxZrtOxdCniBj7DEe+B38pVHyYsxLJY94FUFDXfq/sMUycUA6XE+OCNDa8Au
+Vyn7pmYpzrElrbcXh9TE2WaH+1Kq8KIsEsgGDXPC2aad+FzsbtIbQtg6IM/gBnUr
+LQP0ZfigYqo0G3/+lTNmuvq35hQliXcHWHGTqFJr9PZrVvFBLDIicXyRnY2z/Mj4
+HHAsYDMeqEtSfsSI+P/R0XxpSOOrfz/jodSHRkRZw+TvSzQX1bbvbhDU3Z8Z5TmJ
+kSEVX2W0vr3jeH4HZoh+ziNByV9pyIHoelvztC5um/KKQqSZyq0ZqA0SfY8fAQFs
+gEcgm/WtJ1sMeGtLiC+U2GNiu1z9sEMeRc/qi4mReneQsBegMjK4igNK47bC+DMd
+1zdt3W839UxldeR2/Me1uAh2VsqVgByG2WQX1VEVh+AkPCIZ5fAFSX46L2OzMpIg
+5SUS6S5ZUyxzme7Mzof8S5wklis1u+qfHin0OZyuWSruSXWZ1G7Rgj3TLDhN4EFN
+GahEXBrzZcZX0jOLLCDpTx82FRooXfD54xBFfHQwc8t0sOEA+LJgdZQKu5CqX8/m
+MqvxZi/9MhrJRXGbuoK8K5VGnAOiIVbaiAeOWDWM01A8yhmVoh0gQvtJywMLsh1L
+jI00csp5zvjOQPKDvBYK
+=ULIQ
 -----END PGP SIGNATURE-----
diff --git a/dev-python/sepolgen/metadata.xml b/dev-python/sepolgen/metadata.xml
index d75890e32167..a00109652258 100644
--- a/dev-python/sepolgen/metadata.xml
+++ b/dev-python/sepolgen/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>selinux</herd>
-	<longdescription>Python module needed for audit2allow</longdescription>
+  <herd>selinux</herd>
+  <longdescription>Python module needed for audit2allow</longdescription>
+  <upstream>
+    <remote-id type="github">SELinuxProject/selinux/wiki</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/service_identity/ChangeLog b/dev-python/service_identity/ChangeLog
index 5ce3b6ec8a07..8b0f0ee7f08a 100644
--- a/dev-python/service_identity/ChangeLog
+++ b/dev-python/service_identity/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/service_identity
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/service_identity/ChangeLog,v 1.9 2015/06/03 21:43:57 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/service_identity/ChangeLog,v 1.10 2015/06/07 16:05:41 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add pypi to remote-id in metadata.xml
diff --git a/dev-python/service_identity/Manifest b/dev-python/service_identity/Manifest
index e15976b14caf..327739de0869 100644
--- a/dev-python/service_identity/Manifest
+++ b/dev-python/service_identity/Manifest
@@ -3,24 +3,24 @@ Hash: SHA512
 
 DIST service_identity-14.0.0.tar.gz 26033 SHA256 3105a319a7c558490666694f599be0c377ad54824eefb404cde4ce49e74a4f5a SHA512 d504ad388defb38a86ca82c8ff9582dbb664a929e4b4ee7f6732b2da5326c33b1764384a8d849972f83ae7800c775daf90c1f3fbc61b8d2c29294f44c7cd36d2 WHIRLPOOL bc6f3cba3e3bec83c527df60dc3cd4387d74baab5a88b5c2cb731661804139c78c86074902060b64e402364ac641b4b2617c98448d4a9e6b367dc0f9d6cd5dac
 EBUILD service_identity-14.0.0.ebuild 1488 SHA256 d50de9665c85e3c4f74827b7be8125fc2c494b37cb2463d6b9eeedb44a7183f8 SHA512 1ac70f26a9a7788a727dfc1a3c7aad1907a397437e86f917f3f4a4ecd51c6b78835afeb77b7bb911a50ca6b8f3dbd1df8369a699cb79e4f6ad9ecffd8453cfaa WHIRLPOOL 12927c1dcd0f0e2654d27823015e0d542ff6474c43cd7705a24b45e27950142ea325d0448eab14c0fbf587b988690e69be9fd2d99bac10f3de8e6b861e24cf5e
-MISC ChangeLog 1310 SHA256 b22fdeea585944fca711121c1be031a0b4d708f5dd1d7155ee9eca0ab2151db9 SHA512 d34365cc08647482df03a78ae90e57719d6a9c14eb751a1fbfcb5da28b50bce8f97b435e4ea8ad50c397dee445a0ebd95ebbd7e56b20abc36e49fcb14aff2c0a WHIRLPOOL 56ce6c8fa3636dcc50875a2d7560c98658751c19c0b42200424eaa17cd8fe3225aa832045a0367bfe49192141524c4222079ba8e15e7d0b648e9b6190a2c690f
-MISC metadata.xml 244 SHA256 4c42d0977363d736ed47a4dd6a616645245cb9eeed3ba98d5db6d5dc9e1178f5 SHA512 35ec164bc3768a622edca29f76416b27b636b055f20e22519ded1a1d5aef0b29fa497b2342a3160058ee23b06ff0d10a1e1a067d638b5849e2faf64e7454bee3 WHIRLPOOL 97027798b581bb1ba59be2024c0126bf90e4db8f5bcdba0f0b5c458e1ae4422fd56a3cf15bc008c01b11e5e8a831a94229ccb6184bbef175c26c1220041259f8
+MISC ChangeLog 1415 SHA256 dc7722de65b1fd0f20fd4ec2ef6dcb8dd90ba6b7cded77cb48b628f021331dc7 SHA512 d6662eb1c232d94d35322e76ed763d77e8350ce8fdbfa9532e93376a461f3c5139c59daa97a1d86ec73f5133afd260dee45e8ea59f7cfffb7e4f024bfd1100e5 WHIRLPOOL 54bd08ccb5babd43be6db9fdb7434b1892220b56c512b8c214a2fcbb9e82125e29f2ae421a9f6eb2aa3249d73af0422626766eea7029bc8c1faf8a07113cc62c
+MISC metadata.xml 307 SHA256 8b674e2ba4f0dde8a1d1cfeac6bf1b8a58a7b132fa5102ef067a71c456f03d02 SHA512 0bda78719214f111141123f9fd340182375a8a339d7bc00050674cccfdec334987c460a11cef62a4ffc0025fd18d45ce882ce80911a6833fca69a68a3ee26368 WHIRLPOOL 9f5d856eed7ba5c5a154e96779908c53d9a173e506b40b64af029f3ff16f5e2a23a1803237ac4cca2ba2923576a7b5e8258ce9d18ecf0b730f8a026d7d26cc58
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVb3UeXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVdGvWXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiQb8QALqoMQwvtt+qDgRxO9M5pUxI
-Kc8PtjbcKTuWgnvuFyaPftZa5WufuzIlrh+orr+p07M2702lGBIixL8qYgVZnRrs
-esgg5EAfwSuLOEiZMGN6tXlnQ3pHPQRpjiOfIsl88kTbYlocMBFnmkOJJ0ADgC83
-qdKvALLsKLDCh7g12atzE4Ge5zhoc700NRNUSuP2vrO4Y3uTnZh6Q7I7wn1zGLbE
-DTBvr4OrBdRz1gse6D3+LqfBjDn/o5/EvXluDKdFLdXD9OZ1GIUAj3hhUWnRezDL
-64UNqHj+q3AnJA/bt06LRMZlP0UJz61u0XPy4SaCkWQiLOl09vC8j40fwbX5qkDg
-nTdz4zudBEvgPl0oPUofoiYEPXru/RutQgzEjpxYQoegA5JloqzCxjDL4Us7tvWx
-CIsJTIBcT2sur+Ip89/YlhA1yOCAvEqi3uNx0n9UQcfjz0k9OBtthf0hWO+7myYv
-lZuCHbJa6eGCn6AYfhieBuc0VPLdZSxIm8dgYNT11hQIux9IgwSdeThQYFpM1rWN
-L6tCQlJ6SeJtK/GLcsE5gDbk9FvRLcNXMeOODca95yCtI7FfBk1DE7GgLl6gmS0V
-VSiKFyAddsINK0PKMJ50EF9i4W2A7xWbtduFmyM/t/G3pk5hupy5Gphjz3CDmU+I
-juKrakZHDmf5OVIt9dgw
-=Qwjr
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi0IAP/jsCTp0GHHOec9CoYL2heWxP
+hEc5vP7JJtxbREC87VFcLGbnrQAmXhwvXGFSbvVCOtfFotYtN5zXmBGZj1t5w0+e
+oNKDIfOkR8oa8xj/lLjJ/9254F6iPYshr9oVsqPdStTqyeIvIYpXrNO3z13qI9gB
+XIMRkqrgY+Fa/Lc9JZwzTM8T4TZQodC9h7yj4SIMQ4nUPMAhW6FJgFfW3B0GY0qx
+fHcZGz98WZbz6uSAA9TK9Ofp5j+5lrrIfySD/ZzvXhYlqbNNy48AQMBmxFNZQXXJ
+szNxpttYEQGxTU0t649vNYp/t/VLDVY81hSkyAqtphpvTUsb1Sv2OrUw6T+HdU0H
+OA8LHSJP+h07SesnFJNDaVWxRxN4Lqt+VwueYYfcySLZRZ1BKE0c50fn5eDSotAE
+Z7OUVvDABYz5ZQ2tOy7Sg0+zU4H66Z146fGGnKVrf+JlxrWjxuC/xVNNfL/TJ7OR
+ZaQKbx8XouOQHWQl69jSgzor9LgPppZmPV3NATNcfIf5rvrTorCyA42tigXfT5VB
+HrZ4lqZ9oAmt1G961Olkmieq0kw01wRPLNb/vaaDuXDRDA+dqB+gulaZZjCGg3hq
+FWW7c9deNzE8HVMp969NK/THJL2swDDm9K7HEhkql30ljGIFBqo6vuCgntIs3Z8B
+q7eYS4Zh+AllQ5ks7HsG
+=zC/p
 -----END PGP SIGNATURE-----
diff --git a/dev-python/service_identity/metadata.xml b/dev-python/service_identity/metadata.xml
index df78f2c40fa8..9b8cc20e2223 100644
--- a/dev-python/service_identity/metadata.xml
+++ b/dev-python/service_identity/metadata.xml
@@ -4,5 +4,6 @@
   <herd>python</herd>
   <upstream>
     <remote-id type="pypi">service_identity</remote-id>
+    <remote-id type="github">pyca/service_identity</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/setuptools-git/ChangeLog b/dev-python/setuptools-git/ChangeLog
index f4e6e00bf213..af0b4deaa446 100644
--- a/dev-python/setuptools-git/ChangeLog
+++ b/dev-python/setuptools-git/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/setuptools-git
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools-git/ChangeLog,v 1.10 2015/06/03 21:47:36 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools-git/ChangeLog,v 1.11 2015/06/07 16:05:57 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   03 Jun 2015; Justin Lecher <jlec@gentoo.org> -setuptools-git-1.0_beta1.ebuild:
   Drop old
diff --git a/dev-python/setuptools-git/Manifest b/dev-python/setuptools-git/Manifest
index 2afa10b82b82..4297476055e6 100644
--- a/dev-python/setuptools-git/Manifest
+++ b/dev-python/setuptools-git/Manifest
@@ -3,24 +3,24 @@ Hash: SHA512
 
 DIST setuptools-git-1.0.tar.gz 8561 SHA256 eb75844bd56bd33f7c461246cdf99e6fa50b6a8dde2c56c967db54cd47b51af4 SHA512 be83dcbdff84de808a3760710ea2bcffecae2ef1fcccb67598b29e273a47d56d689dc97bd8f0889df5f4181367314a680e03030ef21d7c05dd3126789e344fa8 WHIRLPOOL 6a01a4219bd50d22ab13b4f8c97d8d3e2ebd71319e375f62d98215b62e3809d077d6efb7bb009316f3578b8e91fac888281d6e9e5ec84d3b6118754778078fd0
 EBUILD setuptools-git-1.0.ebuild 601 SHA256 629e6af6571578f987b6faf20bf06cdaa0ca4ea2cac69fecf3f4a7219bc12abd SHA512 d6027544411d618f82a83758c8e00cdebe9579910b55e000fabdd876190a5a2cfff9fc3ab496bf3ecf9ad4c474a155ef9ad739466feae9ae6fabb8868add08c6 WHIRLPOOL a274637cdab78483e27cd1c8b9a9a794ac3e4b0cedc9bef895daf4855dc553bfed0c8f51d170c908ebf2bc3323c3114bc54fba1ad6f36f6a1207d6be1529f8d5
-MISC ChangeLog 1485 SHA256 8c201f0eebe473d678b4f47889ca87b3558ff8cf14facc3872cc2d26ada8cddb SHA512 29b18203b8abb2899ac18fabe73b924a3b2924216e210a3610cd51acf9f87d150535a018e77a83671dbc25dcd14666f17f727ec2fdf0f4c5febf079801d39803 WHIRLPOOL f9fde8e14bdb8954c2e0309155ec8790bd04b0a8345d199de19dc3d69feedacd04b328551948e727a9cd82626950a5c685338b2cbe167d7f94befb64af1a6369
-MISC metadata.xml 454 SHA256 61e6f317c2b8edc4d5921af417d5c34c6511bfa38fdf2718b5e0548b3635ee8e SHA512 c9d0c398e62e66e394f1b7a3e36aa1c962b66b4b4f24c0ef29ca6c5eabe82e5f60166b975e510a80e62535ad54d9befcc6ceeada7b2555854024f58551b909ca WHIRLPOOL 1f28ae1a716852324e2ada41e7471b1e639701cea2dbe2c72de028a5a23d5b97eb9ca1c2724557efd8ea767fc2935b6c8f14ae8757e3361194a3a5244001591d
+MISC ChangeLog 1589 SHA256 81f6ec54c30aa33e33f51258ae02db11d11d1e5fe6a14f0dfabdb6f21857c1ce SHA512 5fe5be0a8626942cb4926b2e62e51c2bcc97ce593e0939813e6d97ee5999697491f5009ce2072c16208202ff35dfeba71ffacbaaab9eec8efe6b23ba2d5e12b9 WHIRLPOOL 48d14cd8e2b1b30c31bfedb20b7f3125d19dbf70e6b6c4da764dd76dbafc73073b0b1be53ee4a7e540ad484d693592c2d4354d2071463613ecc7066eef438358
+MISC metadata.xml 518 SHA256 adb090b82db4bcd8f6833df6f4d514040e383a0258ea9420a29c753be8e3c8aa SHA512 4f5dac8978400954609b28facf6b4611778e8b7b429c58b462c7d5d91216e4a0488e4f9c086c24cfd9720c7fecbe224c6a79b015ece56bf86dd3f70bed87a872 WHIRLPOOL 87aee27d645a12f35a718dc3956a8a0b7cb3dbed669cf28b8effb1d2bc4b6f8b3d6f3528f64adeb02a6859261769f4f417031c65e57ee509370ff96eb58b21d0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVb3X8XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVdGvmXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi7mAP/3aNAvABc7Wxm4wcjCV2hagF
-fb3Vg9DSXnCfstRkB1dAeix4AYNDLdmwD83MR8wWAs4GrgJ/0ZObMYgLCKURQbn2
-pncZyZdDNWdiNm344JpGCosBsb3yLdg6kIQ1RWhr4Dxx770fBRKI9J62q6fg5Xgg
-dw81jsYcbKGioOQ437E1LcOUHIh3qbQHEx8sqlOff6cVexPf2v/H9nA1sUIhUFLl
-gLq/vgO5g5FD73wEYioIGV02L6FSDEjFgDemNjZaXS7SmygRBHvAlmHr43WGev/X
-ruREsUgw92xbuQYTgZSrJVKzznE3jEsip80jBMA0u/eLD6irR7ctval24WlQjPyk
-gdxqfmJU6RsLf4cXoYls+fQWd41wfXXOTAVQIJ/2aVk9rW4SfOMfpVqUn7PAswBW
-7+GdEsZaISMfEDXImMEhMV5kOVGH0eNkGBKfIKHUlf50DxUDuyHcyk4W8f4+bgoW
-i7PLmtF3uaD0xs3Ty+x3LVcBENksrCFaroTTZVDBph768q3Bx4rsXcENj0WnqvSF
-dRaCYSpOlwirQXNbHK50DUavD6FD7HZm4pyZY2q0gwolLUU+Mp6gjsQiNEO8RCGW
-FwGjF8qkJtdQvzUzOx0bTPYEiJjrc5cBzesss+68tcrWFOwyah+qvMvt5Fu/4x5s
-YquN4vJlh5JWSlSth4v1
-=vp8n
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmir1YQAKowjKaJm1258aFd37FOTJuV
+9P3R5AVhE5IXZAF4B2v5yQIjPgi3gtE7omDsUQY/2jOTDOZb2MGkRXL804BGmybQ
+mpi3Gpw2jlqEytUsLV+ewducxplMfX8TUPXazlnIZ/wPIBtB4CIjvtrz6dG4Nijr
+6zX9GnbzWqxcRwwinszAqIEiye3K5Xm9zqHZbhzwrgblSuPeWdypg/XC/i6eXFUL
+ejpRGe/7T4ipdTSkKJzMC66o1ZIEDOt3zCUr89Z2/xLmprdlb6hw8wS/eukSZ9dT
+HtlHREDAVILl+gjqm/lR3aFxzlcTSFnUuKod5/S9Zehp6hHTElASNE/weOKpvvKq
+apS7XpAmkKiuXvrxIgdeVktb+aLdRpNtL0GHZxlK3mc9dC8PUqtuyn9AIOxB2UMe
+3wY0yaCemSpNxMWNXmFliGnnqW9g4QJkqAcViy3UkmXrf1szc0que+bVdioSoH+I
+L5godl+kRRYUtCR/GwfUQHEAlsXOzZ+KlzM/pFGRNxBU5zwDI7NAoIquNsHPq68W
+xg5jQp6q3OR7iWN9DgESQ0FhHG58ByPKkcYwrutdpEXFQpRzTlahfquQ5+w8vHFv
+SVI/Sf1gaMLigfkNE3a6i+cfwVh7I10SBvB5H12E1sTL+f799njsvJtxdDq1U50T
+255YiCi7C4EGyHGFPRgM
+=XMKq
 -----END PGP SIGNATURE-----
diff --git a/dev-python/setuptools-git/metadata.xml b/dev-python/setuptools-git/metadata.xml
index 64689c0b93e9..cb6a3ae1a4ef 100644
--- a/dev-python/setuptools-git/metadata.xml
+++ b/dev-python/setuptools-git/metadata.xml
@@ -11,5 +11,6 @@
   </longdescription>
   <upstream>
     <remote-id type="pypi">setuptools-git</remote-id>
+    <remote-id type="github">wichert/setuptools-git</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/sexpdata/ChangeLog b/dev-python/sexpdata/ChangeLog
index 26c429fdf20d..8dfdb6078d61 100644
--- a/dev-python/sexpdata/ChangeLog
+++ b/dev-python/sexpdata/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/sexpdata
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sexpdata/ChangeLog,v 1.2 2014/11/24 14:05:07 jauhien Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sexpdata/ChangeLog,v 1.3 2015/06/07 16:06:15 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   24 Nov 2014; Jauhien Piatlicki <jauhien@gentoo.org> sexpdata-0.0.3.ebuild:
   update PYTHON_COMPAT
diff --git a/dev-python/sexpdata/Manifest b/dev-python/sexpdata/Manifest
index 9080da193797..ff56749c0b60 100644
--- a/dev-python/sexpdata/Manifest
+++ b/dev-python/sexpdata/Manifest
@@ -1,24 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST sexpdata-0.0.3.tar.gz 13105 SHA256 6cfa0ddfd69410599d143a5b4fe8bf80fafbf325fd10ec86a0ff49eda5cc2afa SHA512 03d4d1557bcc950124e408d6870894c8ee9e72a2ee83c881adf48f8e53bdf3744b4f3e3e133a74a195d236424b434cc690583a68d8395324ca4e84947e548501 WHIRLPOOL 654a37e8352dc947775e9375e929016e9074f17d4625037627e7416637aa38cdefd4d3fed0be4c388b28fc3a22a89122a028896c5d865f3fa54f369aba273390
 EBUILD sexpdata-0.0.3.ebuild 546 SHA256 6cd9ec5f838d6898aa581f6c67c55d8a2c28211c612008c0823be9e3879474e5 SHA512 4c75463b8f4dd8e8e8bc17590e3b75b197d5975f6b916d2eb45673c6fa576db27b327a670f84d79039fcbd716570893e62534ccf7e8e903e8a7a60c29b91f7bf WHIRLPOOL 6c900a98e84634ab711233b2730661bb062f8143b20c71761406922df44054c9f535ea6070754a43408f89290b5e531a3c7761c8088df8f6cee7770a38b1d777
-MISC ChangeLog 456 SHA256 5d22b3b3b2e1a62b510b9246df5c687cd54c6d7f71f190add57f940037fe55c7 SHA512 80febffaca8ce0318427aaa3a88eb9494095d606553749ca6f92f1df3160e81ddc1b36cf5e1cc8627de70689bb6618b0e22ec7972578b40c0ccd7a07e4982ee4 WHIRLPOOL 96df63e2b083bd9ee71055f3c79027f4b44dfdea352b9c7080fab0fafaeeaa80513736a55782ab54b8074ffb4d634512bb9fd6993cafc98a6253380cd1c59d15
-MISC metadata.xml 238 SHA256 c0b360042763e00a4c460acf951a4c3f414d8ac1c35e980c36aae2c591ef705e SHA512 6acdbf22331938d77c02854ec0dc4fdbb1a375d94ad2cb6abc148a65c996aecf32925b695a561ff664b837f4f1c028dc54d3785f26816e196307d1389b1cd305 WHIRLPOOL 5b91f56ae64d5796bd8f59fbe62f366e50fb4b60e2db22f40bc090f90ebe05d92775b4eebd3c5840e8006f665d917800d4cd86999d14640eb3d0c4867ba7bef6
+MISC ChangeLog 557 SHA256 958cec19dfd29f3a23abe11bf418f4753233338dbd7764f45f877ddfebdd6004 SHA512 8781652b04abeca859eb5815223c42a9f06a787cb04ed6b46c274035326fbdec94042586c597da459746415db80124d515ab259f97a0ff765bde8b8885d951d7 WHIRLPOOL 572138032ff30b6a93081025b182ae03ba0201041f3ba064d91632fde5695ee8a3cf6cae21db1b23a3d7afe6a6aedc0a67ed0c17e12d5ec7f93ac469b9d83d20
+MISC metadata.xml 324 SHA256 afa2e448d132302606b3c07970b24e74432d47d36bae18c3c50b04d1accb32fd SHA512 1d339c98890a982d2c91d2036901945ee8ab05af6bdfc04669a9eb0267b010c5fbfbfa1ba32e57a87fb36eb5d8c7d52573564a465a810df06a6a27c6eb57edda WHIRLPOOL 1febec379e082309ddfb76bf7d2fa8e25d7f9d43d73383192e6242ad6896ef73f283fc0f2f4668c7397f179dbdcea31b7c8f7a5c2121ef0cab68a9dff81ee969
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJUczsaAAoJELvuk32y76HUucEP/2/oIILVwPkSOJ1LsG9lvh0m
-gq7ggHG3yBJ0bNP1xxrstwdeuf6LElnRv64iXN5GtUCNMmpKAy5cNQbfgueWvaqh
-5hKsm2uTaEs9Z/UoKrpEPB8T2RCMUH4ms/Ctgy3b2lLEDV6y19Eu7KjmmfkibHE8
-vas3GnAeAxjMs6FRl6oiWQZPA7YTMjYqkmrAJI2YTXSGTOB7Vx5k8HrWNq0UfN0V
-Wy+6puZvOz1TvuhspE/o93MD9hzSOS1gVRSLtFTCAKAb5ZrbEP7HDIXBMxjRNREw
-Yo5qwywWzkHwQlSh6u5KU4EspOjBNQc1+Fb6mjS1HelT/snmI2YEqROQOrrCheCX
-DKoUS/c0ysCpriw13Ef9lAoprbut9CTkmsf2GKadgShjQW+2E+8YEu2gmodLi3iB
-awzGUtFMQjcTpeYCLlcHYWOpV3xk025VQuUKmz6/so1jsNt1TdLwmru0XZDjrM8b
-14wHZCp5KCZMrAplH+DeUAwzGnQY6zt4DHNiDEXDBTOYcO6vL41lxjiTtFLG+p6K
-bfggHQ14FqHFgbGTR4cf4ofmcK9pWjgYeud9KDQtmJApCkt13ljSGPLHgvXBQPAb
-FFLQvRT1SUMvHDqDf30fX5jPK4ZnR0M9l9TwBYBObVM9cQqrM0CoglkugBgOkcJk
-H+kekHCwQAZKxw9Jwz+Y
-=aH1A
+iQJ8BAEBCgBmBQJVdGv4XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiNEUP/iT5m8i391+pU/FIR+dUjuBW
+AnYg2Mqn9Ma2GLvmf/6GpgIvbhfeB6A9yxJa6Z3JyODp2lFZLeCQWtvtIWTh6Ugw
+q38t3KFCFQXhYa8jM6I/bZ5/ss+y8rB08KRxtbT6xHTlDL9Ny4yhAAzsuZpSIieS
+b00EOUkWe9cm/XacTloR2ldQESI5qUrN2PS9xtomsvgx79CiEQdogjJhAvK/12XS
+qunaLCYU5kRsymw3YtqgUvNyvm+g9b3MiBvxTdXmubvsZxmwr+nmXO5pmitT0BW2
+avTxvc/d3YaUopmWGE00D64S4Rgk589Bx/FxO7+zuuHA9NjXdr2KAy/RDja/DXZi
+Z7/jW3577evpm2vsepD6c2Aj2iRixZBU+daNkJydu3MBNkLykPPw+ePESztC20mD
+XV/xHczz1MJDe+pCxHB0OqRIviQDUX6EhoxQW7EwXub0iypLc3oOU+/BykA4UUub
+zpIa/zsvt/xOp3GA+SLGQgCw1E6kC9NurmxZW7Os/lS+Y9KAGMKkUz5BhvGQf5a5
+i6l5dPkAHET1S0nSW/mNwdbZLSst6hyGWSZ9QjJ/BJEX9hCCZtKjftsF5a6iYOc6
+rCmB5Cc0CHO3wSsbdrE44/QmWwsnJYyzBLAszPG4eDO8XBjjaa1uLf4PZVb/aq9P
+vpd97Wi/Zp43GT46Z9kc
+=PODG
 -----END PGP SIGNATURE-----
diff --git a/dev-python/sexpdata/metadata.xml b/dev-python/sexpdata/metadata.xml
index dab02051efcc..aa9397ab302d 100644
--- a/dev-python/sexpdata/metadata.xml
+++ b/dev-python/sexpdata/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
- 	<maintainer>
-		<email>jauhien@gentoo.org</email>
-		<name>Jauhien Piatlicki</name>
-	</maintainer>
+  <maintainer>
+    <email>jauhien@gentoo.org</email>
+    <name>Jauhien Piatlicki</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">tkf/sexpdata</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/sh/ChangeLog b/dev-python/sh/ChangeLog
index 0f3f2cf4dce9..38b39f6dc852 100644
--- a/dev-python/sh/ChangeLog
+++ b/dev-python/sh/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/sh
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sh/ChangeLog,v 1.10 2015/06/03 21:48:38 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sh/ChangeLog,v 1.11 2015/06/07 16:06:32 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add pypi to remote-id in metadata.xml
diff --git a/dev-python/sh/Manifest b/dev-python/sh/Manifest
index 693f721b1e60..673c1131148c 100644
--- a/dev-python/sh/Manifest
+++ b/dev-python/sh/Manifest
@@ -9,24 +9,24 @@ EBUILD sh-1.07.ebuild 558 SHA256 ceb17d925d5725cf6a8b816699c30cfc37760baa14cc7de
 EBUILD sh-1.08.ebuild 627 SHA256 8550217e7772f751b5db2f536d14e95edc909b9b8e14ae8c904d8ccf6acca92c SHA512 f008c9093197482ece4c0ef638d305899dac634ced03ee860142a9e5b62e852b1471c430aa8fef356f1f549c77737567ad92e53f4c48d33b9419606cfd90132d WHIRLPOOL 9ca05888865eef8661e952a2e14c3c1d24c186254582cbf133fee9ae8df5bac47818071e5afa9d6bff4fa6f56da1da5d6e5d0b0d206d69898c5b385fa6b17ee6
 EBUILD sh-1.09.ebuild 610 SHA256 24c91071fe627ce98152750b1ae8d4fd5bd4caa6f995de6f2b659e02c19f1d88 SHA512 bb822324cfaa50df4ef180f3428c59bbdbff2903effa0de023011d683a6024da2cf17eaf547b7658c681c67fa5460f76f7f9b110722beab3ff93595c2355c7a2 WHIRLPOOL 981ecf33b473bb04e4ae540f90f13428eadae9f7e78e809d8f5c5aa2279810932de42b59754a8993be15140462b69e6d3a7d39eabe5bebe23696491a84fa5e12
 EBUILD sh-1.11.ebuild 615 SHA256 191728ab05daa5387c3bc8ceb0c4244ee507e45f37c3f93c2a70fe2308a2ec1c SHA512 36743f7b9d018ab1b9249b1539fabd105bf411c41b54044f2c5feb303343b395fe740d57c8dfd22f11e5473992c6b98d1d6dfe3ea7f133ed6853c80d88798a70 WHIRLPOOL 61b39aced9db61e10b5fae2fafe472906e9ae2df303cb253b3d6c0877574446ce62e2fa62f8229cff3a86e019fa0653c0e390da5f40f7ea9debb67a78ac7390d
-MISC ChangeLog 1367 SHA256 d5db3d65ac6af63a356644d5a1367d9d6237a30a8fc110b3a3c6860fd45614fd SHA512 03ae70a7d2fc7ad6a6a6621a6085d150c2b0b3aa1fc474e528673a316f07bdc9ca78275938bc97c26140a71feccf3869824b2858f10427931200d8b7a2cce655 WHIRLPOOL cdad0ae1bf09e6d8eadc88fd597ecf3c5b39fd534faa7ad097def89f38b6560aff5dc0baab9be173c5c69fe187a120f926345620d7cbaa8cd8ebc4a824028b19
-MISC metadata.xml 623 SHA256 0e30ec17b624cdb4e7a098a6e5e44a2f059bb4b6d45c916c1aefd1bdfc082342 SHA512 750aeebb5b862245597312d484a05489c550f68ce5b6b124cf05a02e4834a7c931802af6eafe78427f67fba365b29745fdcc28e83d6b3b78495c3bf1119013c2 WHIRLPOOL 49808d28e97f9e47c2d0abd3abc82ccd9e8b17581d5bcef1bfdde5c03494cc0e0fc288bdc3b88bc06abe16a1d24cf7c6d5083b11796f0e67a5ffbffa8b034dd5
+MISC ChangeLog 1471 SHA256 552ed9f21c629cc8cdf058a5b7744498db1791ff4453a1bde966edae8c8ac9ec SHA512 bdeb7cdc37a57754fb106f5d3f94e0cef1ec34df4d65ca9168b3bb5160ca0fec2926e6ae056d35eb1c3bf730cf48c8c7aff46e3c9acd67f76b8309cddb27f5d6 WHIRLPOOL 75e950d9fcf054349b8de67ed5de45b4ad694cd89b9e4fa041e0a4820c16b02eca74b2ab31812410dc81471b0e59169b03f5bcc7495cea10c49de6369803033e
+MISC metadata.xml 662 SHA256 50f7c44fbd30d2232609e6b8a2a9d7efab0128aa75a5ecbd6260b6794220dcb6 SHA512 30a2a061cbe5e30167d6f2430809847cc0e7e886e8320c3c64bd77ba5c510e1c6bca768c2d377a96ee2c15b5bd32af95aa015877ae97ac6f7e544d83db2ece82 WHIRLPOOL 6e61e217993da5b58a9b32875d88a5a7504c7ed68a12b6f4670017fd72e81600b60a0280ff49491309713b8a3d68faf59351251e2fc93e1e1b946a6b121c7a4e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVb3Y6XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVdGwJXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmirqUP/iYKuLnVSkmmwQGKziT6x79b
-VBNYPNMwDwiCvoqoJowra9SyehFrEcmOcCMC2+Z+fTcCLXNYQmQIrMjfSkHFg3z7
-1K5lHEawY8ubrZwUahIKyPn5NKnm3LkP2M9lh/M4PgNFcaTdObYaIpU6o0l39irx
-iX5cOhPilIopFxTIv5wg/wt98QADyYiLkgl/DQj0OWBrp/LqTHdnRnCYfEOpVWit
-5FiZwBJCl3ddGB+cBfpDLB7g5BqnLV7BzCMYMn4p2xDC4gtiuqPgz8Mg/9i7ISUT
-OWIKH+xHeGyWEKKbrs1RysG0Myz01ZClPFCfHlll7WiLcQAh55q4GLNdUOpC45aT
-Ya/ZpsuDtoPos3bkG3PDM6O+jLBA51066lHhyMG9SF+EtmXNsZCzzNj+2EffGVfz
-xNEapidYh0JFx+jR2h3CT2+Od/CG+ovLztfcYLCNBmfyF8Xtz637hg/EJ7/Ax/3t
-LU8VYuBoi7k+z3xRp6Wgib0zoiUDisq98/w/n50macMCON0AYg48Ew8FAPHeMZnT
-Kr9jd4GYfBBfV1Nc5M0SfOxhydW7Rsf9Su6QfBTfWBP30DHVkqXfE2TMJPjMKScR
-hPYFkgxqF0ZuUR4VSuv8FLs5CRgkFm9ESf/9HG07891b/jFko9o8lrM+2eTw5o26
-j961yhmw3XaLcbkEvQt0
-=v5RI
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiBCcQAKrhUCMNLtsfFSOG4RVgml81
+Pj5Rm8Co4e74e6HS09fsNKdLPncDQyN3odUwiGP1Qe1IBkdYjm1sU0HqBdPwVIJ2
+4E0rb1v+Fu4dLfSQjpN+kHOauc64GeeKLspjQY7Aqb2Ydxuvz96T9+s2Anv75b6X
+A8J5JIHHAKNWldSnYyjYDdYLR6GYpQhX5uJ4+LcZCgqJbxEaTztO331pDOlb1kai
+h2U+qIDebgCHgZjSvI8WwyvQ7r/ijx17RcU6QaFhzHgrqboTGEKqOjA8VAaFWDBK
+1t2ep/de5SMesOdDd2wazRSXip2Z/OeHhfl+yEh8Kh1rqblLw+w9yN+V0iRYUrjE
+fhmSOnEbFYNOA2c7U7IW5iJ+UQp96qGmOiKVQbw2sqJRFw1+EnIWtzM76AUDh6DJ
+NVHxQ/SuTSAgTpXn05Y3qTb1dpzypYLrCtCGshqO1G++niIYYhP7UaIE8/+b2BFj
+y7PKbO3skoY8JUSUwQQ+4gS3/VdcgSXUDvsJXbNVnOCCSkwujIuKSijzg+WzBYBe
++2OgLoGGU2JsFMB7uqnGxT49/lgYmyhBKRUMBwGDEL+myQhZ5tlOG10c0ktFrIod
+CdojHmgyAe24pgjWbXyybD42/jb7EwKTonFvZe6DTAAGEaZ57oe0sKCahE2TIGOF
+B/GVKw5hd3oyKAlToW3D
+=yAF4
 -----END PGP SIGNATURE-----
diff --git a/dev-python/sh/metadata.xml b/dev-python/sh/metadata.xml
index 2bfd562a019b..c8283ffb27ea 100644
--- a/dev-python/sh/metadata.xml
+++ b/dev-python/sh/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>chutzpah@gentoo.org</email>
-    <name>Patrick McLean</name>
-  </maintainer>
-  <longdescription lang="en">
+	<maintainer>
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+	<longdescription lang="en">
 	sh (previously pbs) is a full-fledged subprocess interface 
 	for Python 2.6 - 3.2 that allows you to call any program 
 	as if it were a function:
@@ -15,7 +15,8 @@
 
 	sh is not a collection of system commands implemented in Python.
 </longdescription>
-  <upstream>
-    <remote-id type="pypi">sh</remote-id>
-  </upstream>
+	<upstream>
+		<remote-id type="pypi">sh</remote-id>
+		<remote-id type="github">amoffat/sh</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/simplecv/ChangeLog b/dev-python/simplecv/ChangeLog
index 68944357d425..f5d5d4c1da06 100644
--- a/dev-python/simplecv/ChangeLog
+++ b/dev-python/simplecv/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/simplecv
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/simplecv/ChangeLog,v 1.5 2014/08/10 21:22:08 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/simplecv/ChangeLog,v 1.6 2015/06/07 16:06:49 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> simplecv-1.3.ebuild:
   QA: drop trailing '.' from DESCRIPTION
diff --git a/dev-python/simplecv/Manifest b/dev-python/simplecv/Manifest
index a1a70b295407..13e4a371e9e7 100644
--- a/dev-python/simplecv/Manifest
+++ b/dev-python/simplecv/Manifest
@@ -1,17 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX new-support-for-opencv-2.4.3-added.patch 4889 SHA256 7ba7671ee56b81e69d38a022cb4f2a5efa540c5c97f88a07f85e4e4213756765 SHA512 248a0cdaf74af780c10bbc805aa286c3dee4b93456cb2097460e5916ac94a791665355d1b814f593ac5fedbcbb12a797eff21290ce4db8a04b7c870b82db9293 WHIRLPOOL 38430e0d353961b8fc2be1f3e08c77fb904ef9aefb3110eea4ba33f37a68586757878174e11e50c67a390007670856a8a14e20fcbc86e4700f1fdab71bbcb464
 AUX remove-failing-test.patch 1476 SHA256 9fb4e06794b72f63c2e78ae12cdf87748962ae6222ed0263d8e7a5c745d585e0 SHA512 d07daa7addc1f824a2e7bc70e51da05917e559ace9779035a032ce5358b1e0dee3184e44f9eaab137bf8f7a261a136f1f909ea1617e54a8eb7735876b5e74316 WHIRLPOOL 5d36fec3ead4f7bb25afec3fc6bef7172c48b2ae092e077598fd324ecaa0a928090701ada332eb9c0464e6ede18c0d347c42802a2d7788fb5458879ace3a3928
 AUX remove-failing-tests.patch 7650 SHA256 cdb82deecdad621b57e042d4badc124b72a03575e00f0b9889bea7b29c75e644 SHA512 23785a60a7c9250ec61b2ba8f9e17137921208cec90cb57ad6de071105366739890b1c7a453effcfa1236d6eb16d04f01da6c0bdc338276c44e1d1508a96c575 WHIRLPOOL 1c2dcd06087dbc11fc7ba46c7318ecf46288b8e704f69033b5ad09b3c2c97d488018bac6e5d89452bcfdd9d21b110c418ad717b46417d622f3f0e00dc899fc96
 DIST simplecv-1.3.tar.gz 42860284 SHA256 3510727fa5e219c811cf89bce21ecf29647bdd4ef48a0a78aa29b10b9f583947 SHA512 47fa3c0bb41057ae17323aeb68711ef4716c4fe6607162218477af9070a1b1a03a7300f38b2c2a5c54ff69b916267504aeeac7c3108d6a45045a1469a93005b8 WHIRLPOOL 0206dfc06627b78e96aa7487b6c3450cde043e1527044e413b6111831aa48b32dd043fbebbb33c61ffb1aab7683187bf76db4f0a641cdcd0c3dbd6c8d36e1b18
 EBUILD simplecv-1.3.ebuild 1345 SHA256 9e6d346dab8a46695b94cc813430ba66dcc653218b2ab5be33b2ef3a1c03a11b SHA512 da9ed6a4bd5ebcec0e7dbda3a8d7de193851ec9b65d8266dfc4d7a6143abf83793d412196ae362b29fed1ae46f5d9dbb02e77d784e0587c8a74f5f0dd34c2f45 WHIRLPOOL 0c3eb9b491df390e37e125e3b02667b774c66774198d8954657c1b260e0dd968ec1366c25e2fee3a040f763b4ab7cff9555b3d6dad67a57f3cc5d149b8849f37
-MISC ChangeLog 991 SHA256 0bc6cfb952f0e65b4e8dc6769192d5d3bd6c35b9d7df330c1f0a3ecfb2fd9ec0 SHA512 6fed8ae51f5cfec057b59dd1a3601438da75aebe4d15625cd0778cd54d25002aff03030c3fc61159d0e0a448410d16f3a6901392931fa0fdce7878687839ce0d WHIRLPOOL 61a752fa5c2d3c1bc50a67eeba09b7d8953bd67390e60dbe674ae4446674a3f76546c1d1e81e1848777da7585eed0d6e1a2a770063a236e085ebe486a51cb3e1
-MISC metadata.xml 291 SHA256 14c21c550d35b5fa3ca3f41ae523e91341dbcfb276f8015e86b54be81898e362 SHA512 ffd8e4dcf1574190caaf1c421774737e046c287bd7007c09f9097f34bdc739584a982915950da094484fcb1c7f6922bf110c465dcd6cf8a99badf417e927a6c5 WHIRLPOOL 163eb230766f110fa34b046750801d29b3f5d4a4311667cf8a111f67bf797a5236415f75293731a2d767889931808f852c04b96590faa216d541ecdd9e5cdcc8
+MISC ChangeLog 1093 SHA256 3b905dec992c2a4d5575b8c763c74d8e056e8ae1dcca92695be5ce661b61f595 SHA512 03358b60136b5abeb04a83a2fdd9a04d74a783d22d3ea8b95dc2c3b79f07b1179d678e67b27626507be1a7e2047be3e9350d05892ef1144031cadaa42dd9de58 WHIRLPOOL 3e79638f0e2d2e3c3ec2517ddb47e980d2863b6fb6f5e6d891f525cc44ed2aa717bfcb6808a688c1287aeaf96d4f5e62df0fbae61624d6710ed1b6223cd6d292
+MISC metadata.xml 381 SHA256 42916037b592a1b0665be46e12ecc1d16ee08c0a8e2aaff89bfff107a3645c95 SHA512 6386cc99d1067706bf4bd0334e826ba00cc1e6a84c0e2cef406e6c6350553ea9426f87a2f334610227e3e348a89f40e640cb5f0e601c16927aa0ec40bd583aca WHIRLPOOL dbbe694d5e10d981ae9db132697cace55e83833d551e59699e834b545875108418e4d42cef458a580b675e3378f445a159cec521a9c17c5ba56def29350d5d29
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlPn4oEACgkQcaHudmEf86oRzQCdG0EWAttFtzwfCl9BQLRUEnv+
-GtEAnjc3ZTIcX+fBkTVDSVxJsu1oyda3
-=LYyJ
+iQJ8BAEBCgBmBQJVdGwaXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiUJAP/1YuTb+4EEXkjl4iFz+Zjqk8
+1pz0Bs1rF9Vt49vqemiRXDmOt3NeoEjX+jsZTH4eRf2qvi+BDjU7W1iqJzzn85MO
+IBuLmXxqbhUd+8Jp3Y9GMc0ax5qC8o78MLN9DmNZQLASm6JkCsl3Mf4/lEsTC1r2
+AfqAE6brl5jW7mKmI/pglftk1XzhR+SFxgby7jclZa4IJdABJKhsSwJDfWeZsBOn
+E/HYoc0dNJJSXi/uiVPvcuaiFi7qsBgYT4aEfNw6AtTqr45RCoFAnpya3rVuB7mh
+kHUvHzkKtSAIK3/E3aQLKowhUPb0K7D3+TbPkX9ZW9IkBRATAm9N5NgYSU5cOkaI
+RPDim2PMTV68n03/EvDDFY0em7OURx9ot2TGX3BCrj7tGXIiTSUAlcRCNaz2IuQO
+4HUQwm0jEN4Fgxyz5257HpyN8k7hCx1f8cobiNEyqzIy3ZGPHnGr/b1FihcYXf74
+P8pEALC4Hm+Rf0rm40twkoB9m3bX9wLEFJLOtWLUCl9P9baKsf6anV9hZChFwbbA
+2GZY5pCzwGNVWGu87VFTubnSsiUUZRdMBoIFktKjssFFX//dDNz7Aqfc74Ii5y4+
+PVncyWgCs+mxOALvD6kzuirDflKdEBXKwWwYRcCtAd8DDuf2MoEpyD0p0QB1pQq/
+yQ7/fTTgaZuRBbeazKRk
+=zBav
 -----END PGP SIGNATURE-----
diff --git a/dev-python/simplecv/metadata.xml b/dev-python/simplecv/metadata.xml
index 4eb8773f2248..204edf0c7382 100644
--- a/dev-python/simplecv/metadata.xml
+++ b/dev-python/simplecv/metadata.xml
@@ -7,4 +7,7 @@
   <use>
     <flag name="shell">Enable the iPython SimpleCV shell</flag>
   </use>
+  <upstream>
+    <remote-id type="github">sightmachine/SimpleCV</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/simpleeval/ChangeLog b/dev-python/simpleeval/ChangeLog
index 313dcd3caf6b..c52487bb7ff2 100644
--- a/dev-python/simpleeval/ChangeLog
+++ b/dev-python/simpleeval/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/simpleeval
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/simpleeval/ChangeLog,v 1.3 2015/06/03 21:48:05 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/simpleeval/ChangeLog,v 1.4 2015/06/07 16:07:21 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add pypi to remote-id in metadata.xml
diff --git a/dev-python/simpleeval/Manifest b/dev-python/simpleeval/Manifest
index f878480f094b..c8f2c73be343 100644
--- a/dev-python/simpleeval/Manifest
+++ b/dev-python/simpleeval/Manifest
@@ -3,24 +3,24 @@ Hash: SHA512
 
 DIST simpleeval-0.8.2.tar.gz 8282 SHA256 828e79056ae2083ff6091dd8d33855974300241c3dd7d4a173faf901a17c7b09 SHA512 288d597c646ee0c70e3a6e04fd8db112b7b7a00ad53101114cc1724110c2f71d7b5f382f9052ebdb8dbc6b48c1391c870966b72df368701548d513d3053c1759 WHIRLPOOL 88edf67da8cda1bc1ab0c66a908fc12b2e5a4b14db9f6f0e8dc771c53a4c731c38d2dbad3a8d2c2f2d8efc3b3f86ed7be1eceffa5c3d5b8cd5a096ee99c87d5c
 EBUILD simpleeval-0.8.2.ebuild 564 SHA256 44096b2ee7213bcc824d0ef8af4833736174f28ed397244bfe45f43195e14ca9 SHA512 7c6344f4c31880bed489d93f4ae010458717522288c5463ee665462d88a9c4e64aaa2e6c1bae2fc42a87e5c3131652218d2f8a224b1699409105b179b6fa6700 WHIRLPOOL d306a8af3db5e1051d29b9922229b63481631892145b5b8af5d4dd5c546f162f363fa68f2a8c16f00a51a21aa604bc87d0a4f7bd75ffc4ec60c6017b43cb8161
-MISC ChangeLog 576 SHA256 7be5d14ebb3c206e613a40a208588420009b8c555496d6568daa2156362930da SHA512 9ee1b6d877139f6bb553fbe3807f3f4f4cb83b7127910bf20d990e643279414aa9c189af9dc3d438d23d2e4525f39b647ee8acd66d7fe708e6bf097423fd768f WHIRLPOOL ddc4ec88f3d76022a1944d821bcce5bc7d680990498a376152cdffcbd4ae3b3de8061e13f228dbc152a6176f70a89a2d376ef26127a644cf5a07782823263dbe
-MISC metadata.xml 417 SHA256 bfa3d8221e810f971eaf79686b00d9f4243829f37eb1dd03239f9148e023febb SHA512 371379a867aa4b26c75fbe354cdac8fa9988edecc674b6deb677f74801753db583b93c2284ecdcd88dfef19cae8347d1666b8105f449bcf253bad18031d375b6 WHIRLPOOL e9d4907f0da0921bdd9ebd452a0cce46a370354268a2c0d85b71b4cb43fb1174e2edcd4ff0e56070667e70add4b656353dde32a9643161fae220f687f5fa3f35
+MISC ChangeLog 680 SHA256 70eeba063a889f2ad818f451533eece714d6cfc55dfde360440a9a7debaec53e SHA512 63d50209f6b1e29c95393acd783127dc6e08570de3fd8b4e992c799e6822a667edf34cbe2b9b1c4759aa646ca48c4c6a11ae61857720c26b9e8d19eba15c7b7e WHIRLPOOL 5c0f1a224ca58aca0ca3584d6ed8aa4521565235d7f793c0d77f9a0f5f26709740b073fda9937b8420f5e6c1cc43da7bcf2dedae155b2952b8ce6aa9f5b2b0ee
+MISC metadata.xml 469 SHA256 7651d615bc19076dca78c8d146a42c5a7bb46569274d122f53c2bd8adca643c7 SHA512 f382cd2c94162801c93a985fbcb747bbfe9ed15e6da5103f273f25e6e63b26db2856801040964f32ea7e85bdf4674139073abdaac9169c8e83d1a9b96aef8666 WHIRLPOOL e5767099a46f7f80ce47918c922ee012b7f83ee90ba066d5285a1420847f12b0f7e746027baf133e4f84dc8d26e6ae296efbc055e46c0ecee8c368bd5b326214
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVb3YWXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVdGw6XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiQwAQAJaEJBHUFGxwdOmn2Lty1y9r
-2XqZF/isWFRIFWcxWysVWsyF2O3KSqkcMDv3hWdqJxbeEObn+qA/9RQMWIgXklQ9
-Nt2D4cSOnmi9KYha7WIzZ7doQalf5vPU51L3IwnhgyAkxuctsqUGeBmh1anqEKNY
-Yzik9gEeXcq1NfLen6NKMRejuYcaXOXIV7IE4DX2Bk0rY0jLS5P3ViPgLMfsIELB
-aUEVXJDeOD0ZxIvzd46nVgO8ln7az07MhAF/Ewz9spaVdiuLO5BbWLOLJp4FDzRa
-5j3SsIGx96n7JIhVmdXzR9R8vbw3NwMhD1r2n4em+wqRXFvUSFA7XGMShEO4EPJW
-OG2FMUAYdKRyS69JcMs0TRTL5w22bO70hNz36R5wrKjtGeqq40Y0ipO/y2GHlsnx
-MCY0FgeW4XkEf8QMxmokzkJYJdfVwA+gCH9OlHFETYRxAoeGTohFO1R9A9JK2qhK
-YhI47casPYSpEwVuq4UUMoccNkx8DjBvUJHdHoAJopP1bjKBfA5Ne99jVjVA9fsV
-K/zAQNzG/tGSUUoIo3AhXp3hltnhW9+iTqLVFeZ0+lHshhRIGgStXjPISlKCuQJ/
-OeYrsiX8rmzDJNtJILL0c3VczZV42TKukKHsIQ6dtET0LL7gCfupcurzg4R5Or3g
-FIgXhk1nHlQtukRtAaXI
-=OZIZ
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi+J8QAKzRmJ8rtJ8Mn8qgBDiPJFMb
+uYJwbUSutIQC0lgiwy3xlpRsz0FfLw9UeYNDrMNRjBdKj2/qy1NoH/c6GGfpn7pX
+pEEOY+wbZDL6653EHGzZ3P/ToqBanNgA8Q/GPw3tjWuTpN6Ie7UZmeBsDiltZhJ8
+2Re8cv7QmXYi+CvdX81h6kmrMoloSs8Nb9TwYx7ZzGu22MMQM8iz1JgcuybyLQDZ
+tm1SoZcRf0iHU4ZpeKkW+cShnOm78htPwXgWZmfHX3+k2dAXeViUv/Z40fM6BcH8
+DhFit7EIWSVD9hvZ+zPNhVkZnE4FeF2p/6BPC5ZQiPODFw/dUE8ump/LZRzBSTp7
++JIXSMh0DaksoN5bNaB2KtAKBijkeO5kkbcsihMtKyYwt+X6IoEVbLljjbskcZvO
+92PBwjSr0nD1xhkzTrxwCUECyJt+5JarsAP3Fdv/jNr8czP2ADMTVGmDViWhu04z
+9X6Fa35lqdd7lGA1TG5B8yN/CBGv47jdkSr5TrPdac1z7ZT8yigR1LGKYrYPyz4R
+czRemVLP/WDYWefmj7eZaeZdlwt6AcPK2TkjADAJe5B9Kw+MSloJrVtayfNDrPQZ
+nyaxhXdfuxP3bcseiCiIRrWJw982oOHO+eXFxbfh7BmiNFWyBeMXSDOm1GfMuKbN
+MJwGdZWB+CUD8I+96EOK
+=fy/P
 -----END PGP SIGNATURE-----
diff --git a/dev-python/simpleeval/metadata.xml b/dev-python/simpleeval/metadata.xml
index e89aba3d7989..235315bac19d 100644
--- a/dev-python/simpleeval/metadata.xml
+++ b/dev-python/simpleeval/metadata.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>cedk@gentoo.org</email>
-    <name>Cédric Krier</name>
-  </maintainer>
-  <longdescription lang="en">
+	<maintainer>
+		<email>cedk@gentoo.org</email>
+		<name>Cédric Krier</name>
+	</maintainer>
+	<longdescription lang="en">
 		A simple, safe single expression evaluator library.
 	</longdescription>
-  <upstream>
-    <remote-id type="pypi">simpleeval</remote-id>
-  </upstream>
+	<upstream>
+		<remote-id type="pypi">simpleeval</remote-id>
+		<remote-id type="github">danthedeckie/simpleeval</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/simplekv/ChangeLog b/dev-python/simplekv/ChangeLog
index 0f348a01452e..51da9df1326f 100644
--- a/dev-python/simplekv/ChangeLog
+++ b/dev-python/simplekv/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/simplekv
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/simplekv/ChangeLog,v 1.3 2015/06/03 21:48:31 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/simplekv/ChangeLog,v 1.4 2015/06/07 16:07:34 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add pypi to remote-id in metadata.xml
diff --git a/dev-python/simplekv/Manifest b/dev-python/simplekv/Manifest
index 3c06725523a7..4fe5374f21c1 100644
--- a/dev-python/simplekv/Manifest
+++ b/dev-python/simplekv/Manifest
@@ -3,24 +3,24 @@ Hash: SHA512
 
 DIST simplekv-0.9.2.tar.gz 13750 SHA256 448608199a9f76a25529005b5a28a4e548afd623e2b7109563b9ebe6ef4f3aac SHA512 cfa17cc0920d4a0513c56443c30ed07a77130f689d71130a058e2a46a5b9dbfc22b1fd21d6fee973fc00242c6b9391143a4db91f9c1937ea7f64daa898a8f045 WHIRLPOOL 40f62efaba344aed99b3e6bae80eb22021a93958654a2fe2d881ece808a93f830923fbd2f00d96adb46442d6bcf3c66a71fc805a49f46e331db10df24c1b2621
 EBUILD simplekv-0.9.2.ebuild 562 SHA256 ba62ddb6cae4263309c704e95cc67bf114c68ac05efbe2b7fc01d67ce3c97904 SHA512 d9d18f20df44bf5cb9d1564922f3e69ae54b7e6c4084557c68b5c746d306658b533e4f152852739fb20d08467134aebf6d0ccdce9fe29f82e388208e0c6c490c WHIRLPOOL da6e15cf4677cd6bc5b2ec4a94ee330044e2cb50a3064f81339ce396533f0391989ca20873b144ac482fc288d0827e2313cd29e65994836770e926316c624500
-MISC ChangeLog 563 SHA256 d3dc47ac04452e652e0df3066970ccd21411c0ec25ca3eeb7ed864aa3ca9725a SHA512 2576317a3f8fbf170f53ae9568aaf66f09144b6453cd3b276637a04e6a1bf8883c2dc708a779dce8571876535f64aa2b8a1e794e7c1b5b99e40801c9c848bb89 WHIRLPOOL bf3e62b5308213a21a8d3ac312efea2e4f6701550f5945926336705d506c4b9cd97d0dd149d2722238e594e0981895d9d95e4bc125fc0e3ce4a3229bce6e4cef
-MISC metadata.xml 416 SHA256 bcbd7b94a1518e10fc66f77b31775457fb3ce566499b6876609015ee1710403d SHA512 6d9f8ed5ba9a175030154d514b1a67be240ced331a16713b2c99503770ca48ceaf98c8e90774cdd043d184929aee1bd6118b727bb32afa671c8c103306821bab WHIRLPOOL d2519a396410109b68f17f241b63733d8c7992d6961978e2d18f9318732e4d832d1a58f5af24c83b406650c1d8018c7a4af2b05dfb89dc5cadb40902ca9be2b5
+MISC ChangeLog 667 SHA256 dea82c50ef3014c0f70cb0b76468a92c6a27a747de77a1ebdb7306b9da8ea0b4 SHA512 2f9ab48399dd9c873fbafed53b4ddd0d36214419f59aea23f7a948574fea6e0d6202b05c8565a51e9b9741746fa67f9c1167bc352417328afd3c49e98b38ca7d WHIRLPOOL ceb68b855a576e48e6e702d03aeae31537b9639508ea167b0eed397c4d75180755fd85c9297b51e425259ea57f6c76d8a764517ba53f3451d050dd6f39efc6be
+MISC metadata.xml 470 SHA256 a8e114cd4ad2e0c767e652832d3dc79836266b6657a980a049743445711328e0 SHA512 a4c2919dbeca11cb324890247c354b1f2a40985874665f948045f8abc1d4c625bf03c206f8aca7e61e777d9a86c63e26c78de9ed3e7a69fc23555f3b119737ee WHIRLPOOL 541661d21aa12a642d7789a67f711225a4e3a7d0578b35341d6fec1114ed4be50465da252bc040c70a28ecba3df95476fc070eff59e3ee6d9f6c148142fed029
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVb3YwXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVdGxHXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi0zgP/iuHkEUoemN7IxgeP2Azn73H
-lno9NPy7kRtR0Dx2EsNXU6O+S7WY0GNoDc632O1Dpn92yKDuyA4xR884NsHpZMmr
-rD6Z0HLmIy2MYNi3TtuaEzhZ2atoVK/yhN1h23R7DJQjCwSoF4EDaKaTy8ZOlUuG
-qk9GDHc2eAb1Yi6wqPE/zqsBamSCNYWl28lRZ9Y9LAt5mXBSdE0kJn4f0dEaSgV6
-roASih6ertdvh1msEgTZO6lnOHOeKVHat1fauAXnIfdJk9KtXUWNsbQgciX0qBTZ
-uXctvtuSeb5pZsdDVao1M5N5iVN4ylEMboflgqEBion0xgIMr8r2XekYx2skiEqW
-q165u2GvXkQy3Ygawq/dlrjDjnbUiyfWDSXSPpGSelW7Oy9YqXYMXYuGIT1PDndQ
-HZwTNBfh/cYI+VY+OU1d6Je1L5/1eVKKa6Vbt6WogG+WxBcJEi5vt6lHIh70hQYG
-7VJX5ueIaaIf9sH5kbbjtygxfmss+U6KY28OSfpmpCA+BWtMlp8zwfntel9rbcFH
-4w/2R0AqqVVCikrdmfSUvjzD9d8OSlMYDfBuelJS8WB+/WH0TWwqileyLsLUXIYn
-6TOp+gpdd1oapMtjHyY6tupAdSlt7GU46lCvUp4OsH3tA+yzOK61VmzyCttkwhVx
-Ul07cS/xbkhFaPDIlXtr
-=Zoc/
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiYcQP/iMW/xtfK2hvM/6RGJUqiSsC
+YB8VwVqFApODzgU8f7e9wQtqPuCgfGE4hh9lUqa75SL+SNCVeOd+w0guxXX7U5ac
+ZXWj5NnApRduatC9V6xmmjYSZc8MtuIL8wIG2LMmtl5YBzWglphSWQjZ/W3rqPXI
+Hu/IbWm0N6baK36kNnX4ZbwoiJvJrOlXTN/RkeSPwvJRVG7XEwoJbRl8VbpOm1mv
+Nx8whCbakMuw6Yhn6hfb4+5pSGWZB2dTfgSdwnNsvnLK957Qukg0gNWmLLL9w5DY
+tOhOlT98rUT+hQZllR7RqATYSxBkDvE3UR1wnoVqzLeSuTCK3Y7KrUTmE7r+IBKL
+5v5LLwBwSAcYEqai/SNIxwjtg03HI4nfMGGEJJzaVOymqmhJ2XqyMlOTo+8VEbvH
+syuoGXX+biQCce+XrttIz8Svo2ErmpCbBKqY7jUhtTjXYjTTtGpoYFnA2xucqkhy
+nDgFsvlbUtkkbGYYtrvOe1JTnkpb69E2zd9xeTeMdH4JFuxbOkRmuo6kIMXPTL7K
+8h7foSRWFD7M6ZPlLXB7paDgzdvU82ZMkjjVHUeUFMhBLeqHWtMlKUAVYpnwWoDm
+v58Q6Eee7VbUYBP1h3BTYlItDCMKdqDLWvCaXgxnnY1qISVKoCIX14L0dZb4/s4U
+NFzU/SUQTdsWNJB6x9TV
+=4w3E
 -----END PGP SIGNATURE-----
diff --git a/dev-python/simplekv/metadata.xml b/dev-python/simplekv/metadata.xml
index 2744cc3ec849..4b9133c78f3b 100644
--- a/dev-python/simplekv/metadata.xml
+++ b/dev-python/simplekv/metadata.xml
@@ -9,5 +9,6 @@
   </maintainer>
   <upstream>
     <remote-id type="pypi">simplekv</remote-id>
+    <remote-id type="github">mbr/simplekv</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/skype4py/ChangeLog b/dev-python/skype4py/ChangeLog
index 1e876ba71ee2..b85746a3960d 100644
--- a/dev-python/skype4py/ChangeLog
+++ b/dev-python/skype4py/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/skype4py
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/skype4py/ChangeLog,v 1.21 2015/01/19 15:57:34 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/skype4py/ChangeLog,v 1.22 2015/06/07 16:07:53 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   19 Jan 2015; Tim Harder <radhermit@gentoo.org> metadata.xml:
   Drop myself from metadata.
diff --git a/dev-python/skype4py/Manifest b/dev-python/skype4py/Manifest
index c8a9b347c23b..2d276ee6a2b5 100644
--- a/dev-python/skype4py/Manifest
+++ b/dev-python/skype4py/Manifest
@@ -1,18 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST skype4py-1.0.35.tar.gz 143453 SHA256 47b61664a47d29f3d5d4a3d6f01a7c5c13c1610767b6ed9e48c07439003533b8 SHA512 daf07b08e5a3dda47f1e643ebbf6d8d01175e7f3a23cf6daf852c75f4b2552b8c68f255e27c89ea8773836b2b154193fed1b3b5e28ed07b503b5c2f95ee4314f WHIRLPOOL 567aa5247959881277449a49f3250831fbd3ce416eadb78f3931b6b2a6a6812dbf2bfbf4cff3a1bef2a53791aaecf124ef152146de0f1c1c22f62047ea6da964
 EBUILD skype4py-1.0.35-r1.ebuild 760 SHA256 3105fa1d833e64f58916912158dd7586b779a4581511125f7437efa7bd8d2bed SHA512 d6b0fc6f02ff2a6aba4e4ada9acf05f6759a51e7249edc627f1711e261dc27e296c05717bf31a13dc6b9765a0bdf028ac0006b7f78ce98bc1b0777e81aa95983 WHIRLPOOL c42fd4b67cc3f1720d4869a96914a8d5ed8d87a4162e9c0bf726604149651dc8f5fc6c48669d0f771fe3fb34936328a4dd460682c6ec87ef7b9c2d35b19e0c21
-MISC ChangeLog 3415 SHA256 c7cceda4a0c7a75822875f01a2f7ab1f8b90a12cedb3bb6a43d8b12ca0667369 SHA512 b10821d23b103bfaca8c872054d75b1593debff79ac6840dd9bd906cdf34e15f8e71d18cbd30b2943e3e59eb850a4c6ca229460d9834c2ac43a54c9658b5b6cb WHIRLPOOL f86d7b4e17cb3757197f0688f56bed75ea199c0c6de95634dd82d76192f94941dcec5db0f0aa6f722217df0a7b113b1c22f5f059d25ebe53047f7c5bc553fc94
-MISC metadata.xml 285 SHA256 46b42ee29be02e3a896db138bc7bd1479ec8d3479fc1ba057b5eba90e2ab44a3 SHA512 3caa301ef7e40460a7d72c3f81695cbc328004a33a944fdef59d3c0b91ade5f41f83b04e632c17cea1cc846281efe0881a6463c49ee457c39b157edc57121f42 WHIRLPOOL 2e81cc90ade66674d84c2edc68eb4dfabb59580a51e57f681bbd4fce50fd8bd3db74cac4f83dcb4af5ccf4efd8afe69850b074b4fc9017b2f83bc599e6e4ef1e
+MISC ChangeLog 3514 SHA256 3be41d4723c90aa54baab05b1557138283c654243707c8a187a1730c88de6667 SHA512 537718ce4b5382fd3513a7e20e1d07acd2976d9892a806b94548214ef8bee4540fa21cf0c241d6be5adea51b5c800b109d10f2d8642ca60a487ea53f603537d3 WHIRLPOOL 98343d6e0718a6a45e64d0c80f95a77a5b86f3fb89201d5adca4e328bb1eefd87d8a11a102717466fc8901a9b0c2dd08de6314d186bbf7b59081093a9ef6195c
+MISC metadata.xml 351 SHA256 88f586b6ac040b3226819a285f56b47cfbd04a399a8b012b42930475a6801ecd SHA512 23a36b55aeb13b7a67c7049edc855d15c605c3331c5c21765017dbee5c8ae5b94dab25739ee7434065b819640dfe2737c56df1b63cf55aba45710f92c697e8d1 WHIRLPOOL fc76150936a944205e0269205ae7ce4f41d4ebe35839a0e3529d11f6aa254962719ba81746d3386cf5848f26345292f9199a2b234f7ccbe5db6a0a5783557f94
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJUvSlwAAoJEEqz6FtPBkyjSzIH/jdHqBrxV+9IhgLM4u4+9VNP
-RCgamzds3pdzwrZBOxGPvTGH+QrmJe1KDGFEOQ4nvv4CoNROcmKs4GMIZP2xzVOy
-URNnbyWtBdaaxi586R1ay4hkCu8HLYlz32q3aUqC/HWJd+RLUd69306ME1cE0dKc
-jxIgzqV98NEh8dS2ruwbUcdiQaXZqVPwGvNdM7RILPNHZpcTH0vVFa+bwFisXrn2
-SfEAS22Fe3jWH42mJxCtJOfiM1nsClYk4MK0hxiY3tcv1kkGiKB0ldBcPSvu5rHC
-exmo4KiSLnoJs5+lXb1U2Zgxw7uaGSJclDcTVoo7ItEoFF/Y/GVRjTvmBdOmo5Q=
-=1ecV
+iQJ8BAEBCgBmBQJVdGxaXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiKfEP/3o1e2Nr41MRKni8Ro8V38RQ
+K2uXj4P2mQvFZegu73UtSphWbdkZJkqek3h7hwAcvGPPmKR3biP1HQKm4FsG/qZg
+HrhEbp9E4T/4Qn/+ZTgogG5QxMoLevq5ZfKHuPyD6exDy/1JIrVUoUMNfksQyjkp
+zSLThjS1aQgzOSryfF+X8sAKngWl9xBJQsqBJy2dtAulMHhz+TUaLiiPTWxX8TfM
+BzldJsLcI11y/17bIGXPBqNZcg2GLDSBj7khLEKhNMT0KIfxrszOZ2rucKMzAqLL
+GMKwhyBP9bcvglYkXRPj1V8zRInzptEmbvGqC9dawHcOkzzfL04Y+VORVsLMS7Kg
+8imZphqBlUb3G0XOBNhL3WAOsw0/+mlxL8xVAYA2dudbdj5gCJzzdQjwgfv4OwkZ
+Yz77KCLwC7V/yUM7fcxQthBR3hb/IodwHhbQ09pOFFWy36op+Q8HoBtTpSj/AONe
+mpnD+5WnCTMVRrNZrAa9pp4TP+CvpN862w7FDqYlSiIecOHCQwWO40VdtMll768y
+W9lqBIDGOuky6zeLMO+C3GGZiu8vl8jlFTJ8Vi8CdpxUyTrvcqaLxufN5Wh1ThIH
+foNdF+PnC1uZ/iiTUejEUTaPlaelSh5NPm/wP07iv/w1VT+ybjdPbHE1pIv4W4iZ
+ZI4yXWkEretnugqio372
+=LMK7
 -----END PGP SIGNATURE-----
diff --git a/dev-python/skype4py/metadata.xml b/dev-python/skype4py/metadata.xml
index effdfd6172d3..75a0c402451d 100644
--- a/dev-python/skype4py/metadata.xml
+++ b/dev-python/skype4py/metadata.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">Skype4Py</remote-id>
-	</upstream>
+  <maintainer>
+    <email>maintainer-needed@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">Skype4Py</remote-id>
+    <remote-id type="github">awahlig/skype4py</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/smmap/ChangeLog b/dev-python/smmap/ChangeLog
index 21c313557728..6bb9f4958c8e 100644
--- a/dev-python/smmap/ChangeLog
+++ b/dev-python/smmap/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/smmap
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/smmap/ChangeLog,v 1.11 2015/03/08 23:59:02 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/smmap/ChangeLog,v 1.12 2015/06/07 16:08:14 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   08 Mar 2015; Pacho Ramos <pacho@gentoo.org> smmap-0.9.0.ebuild:
   x86 stable, bug 540290
diff --git a/dev-python/smmap/Manifest b/dev-python/smmap/Manifest
index acdcd94d1dd7..8e8acf170946 100644
--- a/dev-python/smmap/Manifest
+++ b/dev-python/smmap/Manifest
@@ -1,16 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST smmap-0.8.3.tar.gz 21787 SHA256 9b336afff785e8934afe22a520d2c88574ae716aaf3ce8290581af943ba6fdde SHA512 dff14f25487d83ac348d3f4c9556f6e972c4e1166ac70cc9ca0b70a7e210750a67f4ed85203bebdacc6e8f912cabf55135a0da26c7ae2b017caf2f1682b22608 WHIRLPOOL 3eb3979877ff43c1c518b9313228f52627621ac187c416b61e43f1be1dbb1efc5661ba62a4d3088ed8143a780404296d26b729dab9ff6e9432f78069dfb95b1a
 DIST smmap-0.9.0.tar.gz 22082 SHA256 0e2b62b497bd5f0afebc002eda4d90df9d209c30ef257e8673c90a6b5c119d62 SHA512 704e1c67b1f3e1303578cc26d4af8296a11b5f5013e8e8d933d3096e588911b801ddfb162d0e35a49c00256032824386d77e4f38d58704cd57baf21586b40e03 WHIRLPOOL 9fb316ee42e7d0e9ee46cda05659d3abbe1c0b17917d675c774b1b34e35e16497afef97b0575478bf7d795c6242d77e1456630b3d7739ef979ca8d08ba042498
 EBUILD smmap-0.8.3.ebuild 750 SHA256 49c50b2fc6940a707d46324bffdf758dae05ba74d17a46099da337608f9e50ce SHA512 481dd75b76587664806bffa33bb4a136b2d428e7638ab3d8a8423ab95f034cf12c1b405e6326b5bd789b97002505de71ea62e4076cd6e677e887feb8ea2ea613 WHIRLPOOL 14d52ad89566b8bb5c7fc1c0d4b79ef736545caa26a6b239218e584ccb91909733ec0e2a5a92f687e33e1bb627766e8e6c22b7551b5f5a1e84c17129a7e4deef
 EBUILD smmap-0.9.0.ebuild 779 SHA256 e361895972e59e6acb99487db5a3a0234277df9c7cf5b73687725747f525dab8 SHA512 32835102439411449e5bedc25dd333c0d90141b6600521fce6a9a4c76b342a68ef7a1f100ea27a577bb3dabc1734ded9bc09f171a84e6752cbe67960ed85f610 WHIRLPOOL b0d28135ffc3545f7ea951086ffd77336442af7379f5609bc2d488d37a41f644d10984e8d3791c6ca1a50322fd35c79723e8ecf3426c90a17924ae3148fb202b
-MISC ChangeLog 1546 SHA256 59ebda151501b5279faf41347963ef01698a0a97fb64da3d146edb86aa61c853 SHA512 d3ad9c08032880522febaf05565a13b308982104f12a910c82f67fef60bbf0eb5c89f769ca7c81e7eddf3b04ee1953d0d0bce4c34e29c07202f881e9a6573228 WHIRLPOOL 20314d41bcae9a127bbc33cf39490824f848e723024dcaacdf33a459885c16f3cc7303ab1cdb1bac34c67c81b5cd7654436246e6bccd49e6bf7952406bf5315a
-MISC metadata.xml 233 SHA256 e6a83d8abd091289e3f42159e07d316c1cc11230180402be946c9cfeee0fc999 SHA512 3c632d23861e965941a180802b1e5b3217d5d28cd3e1db5309714d359105acc7e593a2f3e8c4abb54e7b608beaa3aab860cd6425bfea164f51839b4a77f4c6ce WHIRLPOOL 771e1bee72437d229f792a54115b54f0f35a0eb40c295c99af41e3d3a550717d257fbcb1453cf62080bc39bb60381d1ce499b5bce5df59e077281032ebb0ade7
+MISC ChangeLog 1649 SHA256 cf8dc74978108a9a51585b5e34718707d1962f8066a0c6b5afc1dab84eab7321 SHA512 0c6bb7bc0fc62d53f7c943afa67f57bc80b1f378cb3cab18746d096cad7ac65e415efd9d43d93b868b8f11869a2be5e2bbee9cf0846ba4c3183bc3420c2d40b9 WHIRLPOOL f4de6e608c6b8e2546934eda35631e5b84b0aa28c8357f308a8982433963e01e3c57682236b59d4e3e618fb62fae3ff8df867ea3adcb71b25dc75ac99f33351e
+MISC metadata.xml 286 SHA256 2dcf2db3e2aa28d59a27766cac4afb649d925f782b4af2035c721d9a4a30fc9f SHA512 f715e19410209c512e353b0d8eec8ff391fd6732c4b4e9d323d6007f30749da6840603950516beb4082946daea9493d3dcaccd13b0739004711a0107e8f155d9 WHIRLPOOL f6044973804de0c20503a6e1d641dbd0e0582b9de4420fafc60a8cf57f39bde89a5aea5d378b77e459fd3daf4b2f059287db49fa0efbf2e62ba76c611f661f4f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlT84kMACgkQCaWpQKGI+9Sv1wCfUgDwFTfVahoLgH0Whyrcs+Qs
-8sAAni5ry2SJycEclZQUBbaQU3qkrG2G
-=HGWx
+iQJ8BAEBCgBmBQJVdGxvXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSminNsQALA5jWGnLMZnqhiO88eKoNAr
+nuGaZo4rMy8/vNJ5ED9DagLBXDaIp6hG0c0LyxDQTvo1Plm5OKt4tA0in/ToVOyQ
+p1ic2/bAZNCVvIUtL1npziw/REvvqboq7fQzEza4HbRMzxwudlJblCdZLuWrxa4h
+0fwavYRoUh2NBo2Mbk41HBTbMlo3ct409fr0Y5gaPAvAMkJA5IK5BxHtbtBnK7FM
+fyYY+Zssi8waqr+HI6GKH3xD+CMzYVn3Mi/5qAnO82oOsjHWAvoqkL9UI9v0fAHS
+OMU1vUeKAqIDH8sv4mlfHS+z3VHDN2oUqST3UKNfe9WA51N2yIv84Ob+5fxK5oPg
+kSB1X7SvhwbiYFEiPIzfldz9PTwmW7BOyxqP9p37FT1W8gzc6wUu1ZtTaokEgUz1
+RLb+V4Ku5yLvlOY1+0kwpbneS/QE+f42ta90TRM0lvc/fixnMIJgzuScCMlmpmg0
+SZ7KUhq460YLnftXjLfTLk3jNDB6xNZm67k1Ps1benseyBGNqNTxX7lhfBs7/6lU
+7FtRxgkKtWydtHjUzwQf4uzOO2MwV2l6X9RapLGltYFUSrvhkqOtg77YxN+2GJtk
+qevbxVUZ4cBo17DrJ1UybHaO+vLovKjRYWDHwDEctsDyoYmqLRTl/2vzVivncB3o
+hJ/fMIHPCD2iZpG/dfh1
+=OInB
 -----END PGP SIGNATURE-----
diff --git a/dev-python/smmap/metadata.xml b/dev-python/smmap/metadata.xml
index 7527ccc1c0d5..e4c82cb2ad4f 100644
--- a/dev-python/smmap/metadata.xml
+++ b/dev-python/smmap/metadata.xml
@@ -4,5 +4,6 @@
   <herd>python</herd>
   <upstream>
     <remote-id type="pypi">smmap</remote-id>
+    <remote-id type="github">Byron/smmap</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/snowballstemmer/ChangeLog b/dev-python/snowballstemmer/ChangeLog
index 285b0f8d72a1..f619dea6810c 100644
--- a/dev-python/snowballstemmer/ChangeLog
+++ b/dev-python/snowballstemmer/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/snowballstemmer
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/snowballstemmer/ChangeLog,v 1.4 2015/05/10 09:21:38 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/snowballstemmer/ChangeLog,v 1.5 2015/06/07 16:08:36 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   10 May 2015; Jeroen Roovers <jer@gentoo.org> snowballstemmer-1.2.0.ebuild:
   Mark ~ppc64 (bug #543742).
diff --git a/dev-python/snowballstemmer/Manifest b/dev-python/snowballstemmer/Manifest
index f834a7ebcb3a..be01365396f0 100644
--- a/dev-python/snowballstemmer/Manifest
+++ b/dev-python/snowballstemmer/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST snowballstemmer-1.2.0.tar.gz 49639 SHA256 6d54f350e7a0e48903a4e3b6b2cabd1b43e23765fbc975065402893692954191 SHA512 3359657867b9478bb58e6cc67a08212a490d5af07fed7098871b1e6a59def0031bd0c2a846cc9a0d70c94c64ba4d2ccb2f41afedde61d4a7235d26f68374bd02 WHIRLPOOL bf84c482c35ef9e121f13865e43bfc4bcc6ed13959069d5da4f047309986795bcaf09a5cecaf16361d8ea8365f9bf26ca6987574b7ad2cc25572d0992946a44b
 EBUILD snowballstemmer-1.2.0.ebuild 631 SHA256 ea609047edbc344f2ede5ccac1d0e5ec888ba8cbd7ff611e8dbe2b3998b602c3 SHA512 ec42a87571c4388f9387617e8fcea8b954b6596618a674e1ddc55b943572137e6584ae61144168312e5a8e5134cb7e78593d2e1a64af647f89360cbb216f60a4 WHIRLPOOL 6337d59308bf16f49d799b8762da12d51d183c5c4837073df43dc3fcaa5866bd9a45a8cefcb90de3e6094246cb74bfc58bddffa01ddac3e21147ed7bc79e67bc
-MISC ChangeLog 740 SHA256 eeb4b43f74216e5d18e55c6ea52671a55c4dc349eaf52f45e2d2a2b36d12ccd0 SHA512 2c997bb9a078e4b0b96326c38b2e07f8f212370bc48244b7542af89f03a6b61fd3f391e3e361264563bad8881a52ae77a31cba278f084d70b919d4c02a6d6adf WHIRLPOOL 343d0bed2a6288694f4fde4fa236e6e9b723e301fd72ca1830ad142e1848fc87755808e612ca9a507383ac394f91de02651dfc9bc4ac8f34e61eb12bad2f0dac
-MISC metadata.xml 243 SHA256 c0e28c265ea7039bacd84a83f215fad652e9a82184b620acffd50e8730e244c9 SHA512 035b8e560b2e6f41e73459387dd5357adea86226f0a702d8c2095b032034c13bbdcfaa721008d1f51afd7b6ce9a82a1e607d530962628506b804eca62d1ff3fe WHIRLPOOL 1ee077cf03b0d5254dab44b4976f1d171c4b33a6cdab77f4abe316333bb460d14b4a67f1109ffe92cd0ec75f9e0237525326f8c75773bec3de9d013b6916987f
+MISC ChangeLog 845 SHA256 fbbc4809ce2d5e4bfe2361d71f397b772820b892c89980920492c762d2bc9cd9 SHA512 f4aee204da69b4f39b35062f259a6956fa32b3cb6e4486fab9cd46ebb5e9ccbd7b54ff5c21abecc6ad8784b0ffe51f266d1e328f746f9e3b4c808e90d5df7573 WHIRLPOOL 0f4127a9feee248581231a204553591a7055fedc04b950f1c5a340570f5e5bbdb63f4b85fd9ed75e098f20f9757eeb0ba5cf3426bc7a9b70e3f1b571368ff1a0
+MISC metadata.xml 306 SHA256 c6d0a6b74216e9b8b2aa264fdc3389bc30464d031100bc5afc93acce9f9e23d0 SHA512 80e437eb2a9cca29b25c978343ad80815e80463c34ec36f940d3533c5580121ac7c05541d8b1826b863bef146c22199ef6da4d2b99195b5415cd5abf81414847 WHIRLPOOL 2acd7e82f5dbdcca0f344506f50f7e0b2bdafb66ed3199a3ea9bc7ab7b97fda7bc0c719f3750bb99db3cc21fa72eac44f2f5d6c3a09a9f2265bdbd06fe0ecd4f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlVPIyMACgkQVWmRsqeSphPdtACfShDVhsoQGIDvqXltDDNKauDb
-bBIAn3LrMtApYGsGKM1VZXYl22Epljq7
-=P/+P
+iQJ8BAEBCgBmBQJVdGyGXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi1TEP+wbIukRBVdGrT7LgsOovxHo+
+XSGpbG8g/DiK/r4tbh6Es7j0uPCwMr1DPhTJMXIqz+lYeXXzaTK2aQvT1Gb9jz1h
+raAg8g6QI6PgLocP8XmT3axhuGJMK4CDGv3/JgJIivqO1SjlDv5orY/ui3aceD5C
+z/OM2iDNYaP8ihpepVutSACHtNx81hYkHTsJxZnVqU9h0ntP45kd/nB1Yf7Kc22Z
+/qA+lenSqaGYXrwNLyrTusyZriaIkH513vGYgQZ23iY5bZX3OWZTkaEaxa5Xtz+Z
+MzsuxuHTWilELyvJ39WQeCQOHK1fyrtiQOoFjylIfksOwdxr5YMjbHKmLLDNZ5Ch
+3jitu/MA/E+ZPkfpzJju1I9E/HX0o6SaHL8B+NI6uTdZcF+bpWzH1OUNE1wE5ru7
+kDfqZHXyGOQGts3P7Pmru7N2bt58EpuoI2gJiAGMOumm1MSwR0saQ8PdCOdLNZIo
+4hvZFTswFJ3JV0OGwN3MeOyihjvWTt3nhJ7h+XTrODLr3QeFve6bvw1kIcYzUbg3
+oKm0kcRZ3zy3W+y3cQr8uGXQsENrNLGSlKWxk383WsJbHWWgFQPnHvjAxdyhC8KO
+nl/AoCxqm18YwufBh2b2bU6HLD/SB6Nw12t0H+v/RT30SJxIl0VMcIquPSyhoVrM
+6KBPAEao+ktGU8CqaniJ
+=EbGi
 -----END PGP SIGNATURE-----
diff --git a/dev-python/snowballstemmer/metadata.xml b/dev-python/snowballstemmer/metadata.xml
index 931f925f6a09..b37f5be03c6f 100644
--- a/dev-python/snowballstemmer/metadata.xml
+++ b/dev-python/snowballstemmer/metadata.xml
@@ -4,5 +4,6 @@
   <herd>python</herd>
   <upstream>
     <remote-id type="pypi">snowballstemmer</remote-id>
+    <remote-id type="github">shibukawa/snowball_py</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/socketpool/ChangeLog b/dev-python/socketpool/ChangeLog
index 82a977e6852d..3f17db51ce21 100644
--- a/dev-python/socketpool/ChangeLog
+++ b/dev-python/socketpool/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/socketpool
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/socketpool/ChangeLog,v 1.22 2015/06/03 21:52:55 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/socketpool/ChangeLog,v 1.23 2015/06/07 16:09:02 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add pypi to remote-id in metadata.xml
diff --git a/dev-python/socketpool/Manifest b/dev-python/socketpool/Manifest
index bc06c78b5ff9..598cd9ffb946 100644
--- a/dev-python/socketpool/Manifest
+++ b/dev-python/socketpool/Manifest
@@ -8,24 +8,24 @@ DIST socketpool-0.5.3.tar.gz 9793 SHA256 a06733434a56c4b60b8fcaa168102d2386253d3
 EBUILD socketpool-0.5.2-r1.ebuild 947 SHA256 21d7c9e38335bfebfaeff5ad4d4c35d44246abd569e49728b2d13918c5edfd80 SHA512 e6d45e2e7d42b24f8251d8f08946ce4bcdc9cd496b0ca1c422c6b9cedac128492f4647604be508eeb319358ff39121d01810ca222b3377c28b78eca8853a0646 WHIRLPOOL 781ea4698e3cd66c9f63f39d66f1e8b69ba024f76587f3678a2764a875d529ea1a5396084f20b582122b1de74727f380a6c7cabcb5bce19de1b84057b55d5c4a
 EBUILD socketpool-0.5.2.ebuild 833 SHA256 d79f5c3fb09dd3559704ebd274c56d684973e8d018d2bd762a3e4507f317b83d SHA512 9d096ee29212d8723464142b1950cf9e2d4875ebbaf049c8fb518588903eae6afddadb5f48a4b0786ee047eae2539455bf156e00143792f26f659b7787d97fed WHIRLPOOL 70fecc0726a79efdef8355d21f0c03ed4df65d9995c813229608aa2b826a2f81a004c649ddda5499fe6da555adb8a7fbfe9018996e622324235a6d9abd2666f0
 EBUILD socketpool-0.5.3.ebuild 923 SHA256 ab9213feb0a827e9e9dd814116c161472d53508ac9c247c58638233ca2255572 SHA512 901b9d372ebf38f9ec8db3f61fdeabe03f8ae8d601322031593cc436f81d13baabe475cf5886b75302f20bc9cee94498aee59f2acfc087c1ba2464ce1bbe37a3 WHIRLPOOL cee342be4ece1dc95e7680e1da57dd96403401d770415fb456d81a9a7cfd0121270d397c2652bbf3be73307677e8b87998b2168ebaa8ab65599301f184fb3c4c
-MISC ChangeLog 3351 SHA256 8a0954c57ec8fcb653b7e349728fab3ff10cc90972915a4dca6e869f49702093 SHA512 6af1c8b4420f99ef12b5d73669cf0dc1492610dbe4cd1d4b71467c74b6ccfe3dc7fa9039bf174e44c74f6268b370ef3f2d9589e9136e23c4386971512f4fd3da WHIRLPOOL dafb66e6972d96c938699707eccbf928798f343e62a1f04464541d429920bb301a61e8ab955fa6c337c0ab8573db1b817e8622f402f58e3408eb68943ccc92bf
-MISC metadata.xml 336 SHA256 6d96a6b1e27354354451d9a7f0d9aa94599a4dfc7a8109fc1e51a93c18220a0e SHA512 42bb8765f93d4268fb7331e0c647bb25f581e1bdad37a4cb99a54264c73538d7f9f7c00f84fa6695c21d240cb120d08646ccea48b8f1b0dcd14b39c93ba90cd9 WHIRLPOOL 2bba7d9ccd1bafbd47d36a9b5e410b60f862b044085e49141b05a8a4ecca9ae915885427e35eb232a35350d9029875092b93242c6d0c5454266184838cfcbe14
+MISC ChangeLog 3455 SHA256 dda640413b16ac5252a44c8991aba0a289428d7dbdaed0f1a0248e187a57bca1 SHA512 bdbfcf45563b47845530a53a4b17d52eb043054aae4b3451ebba351656b6bf734860a6d62aad463fb2bcbc5d6b72ad1093b88016387cb6519a21fc6cd309766a WHIRLPOOL 2d559830f46cbc5b9ac282dab7c729fd37b05390fb176b585ef7dc17cea6fdb50939069a3a4f3c6c2cb7f069a1d0b8749461a52fd83aab16112535798fda808b
+MISC metadata.xml 396 SHA256 e32fb7bcc8339c5093829f9d5b5c3a3a9e227f8d526d7b06b04723f11653cd1e SHA512 40f59b4d0c6c2344a0203fdf264b97238f1876a9754fc03384605396b9e20c08c3156dfaedd37c3e3fa373f6f773f8393d1c79782dd094f9d953c51fbdb50f48 WHIRLPOOL af28f5854046249bb9e612c4888cbbbc1701a67e08fa8cfb1b88fadd526a390276e6ea28d192cf3ed8d0aff3c2fddf6025875bfdc5474d25a07150ff5bfd322f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVb3c4XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVdGyfXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiDpIP/3lndl4El0iPiioJ0j3mBwJ5
-/QtLtEpzf1zIsfYxA6i5mDqm+vut/AQ5jod3r9KH3/kRnvih6WlasbemkjjPVTh2
-ZLF/sbqITZHZ5+EvolAMiKhDQqE//mjPTOuyPBMylPdg/lkZ8oFPH+8SXMcV7Qrb
-d7vT7YFR86kZSAEfEiTTtXLtE4NY7sse7UMBfTnXfNZM/HpsO7TveMSEXajOyH2E
-EHdmP457AjfbJaPXGrDoNx/rcap1YKU9Mqiyj4QZso+QVP+XBdJNH/AQ+UZtIqw2
-ARw8vVACJdovI9bgvXKFhwpQnS2Q+OZ7aK2XJg4LuzoOyMLWWAGkWe/wMHQFQG0V
-uEKfX1zVTrN1Vf3LZaQ5tgPXUUxorYfVRccwYXsNg6Yo6NCBK6qJ+YTqR3/u/Fk3
-Go1pwopdsArHdHqLhhCEH0y/AmPlqLpXWdj8KlXZvXvv3iSCQo7lIo9RNgll3Ioo
-plc2s3c2URt1X7RXmF4w3fUMv7el1tJ08zppiLck9YEf+Zw5vFJ2wGpzWy9Kkaau
-aM8rjt9SoOxop/+1l/7pKRnT1vX0FqQosVrPdya83k987mJzPdznQXPOYIL/qhlD
-1Z5vrW0lqnJs5RemwkwUNLxLfvem/yEpDqk4JxPOmq1TJuay3KGZL3k9wlHX4yUu
-7EEBo+fMouPaiRXTO20s
-=XQpL
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiBNgQAKZ5lewYY96P5jSX/cOMNZEU
+vyWeNnWU9Aob66NgfdwqUivCnziFaO3kmUYhQ5JCs3MFB/empAXMZnvASTzliFG1
+eBC8aVTovH6vN/SfKYH1o1kq5V7QnzbFPlss0U74s+zr9aO+NdkJjX5CNG2DVoip
+Iol0eZoXVbXzd6COFPuJyOlUeGiZJjN3K7gvC/4NeQEvmESOacYM5YfgfuZU6RKV
+Ck6rx2nuw2eupos2YyxN/SrnZFvqV8uOwojUsRFBfPYR5i/Il8QX9hjQrwrwa+51
+4WJFMAxCYeKHUw4nSypzAQNuseVZO/SKitvtNMNEpXEjWIxqmSRLrjDfIQoc5f4A
+8ozW24PyMREiDcy1a9d95trHjYxk0HMEx6YdsuxBecx6jdrzh4g4BTUsedjxXRyu
+cDJHGy2cq2J9Rvi8c9igXdluqNynryZL7WwdwtjOUrujZrejY7SEn5cX+cJ10k0N
+QIGu14SW96Kz0iifOUiOsAHwvrZ4fnPhgQEBNTkyIZC+lFyBX3r0q4e+gOMZjuyX
+pKRhYxb2Xb3gGYdhtYWN2iWw4oPFuT/6KTEjBXO+jsei19/jQ0FO1UIZswjFqyxA
+UC+1Yq1FycJ7Ezj6lg4UICr4L0ukrMhxUsxI+9FRF5zqGskUkdHs3ZCyvhIoW5Y6
+llgbcJ98IZUmBLSSjiN7
+=N66u
 -----END PGP SIGNATURE-----
diff --git a/dev-python/socketpool/metadata.xml b/dev-python/socketpool/metadata.xml
index a3d56cef26a5..5d682bb96d18 100644
--- a/dev-python/socketpool/metadata.xml
+++ b/dev-python/socketpool/metadata.xml
@@ -8,5 +8,6 @@
   </maintainer>
   <upstream>
     <remote-id type="pypi">socketpool</remote-id>
+    <remote-id type="github">benoitc/socketpool</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/speaklater/ChangeLog b/dev-python/speaklater/ChangeLog
index 0a43fc311c67..37d026c7c248 100644
--- a/dev-python/speaklater/ChangeLog
+++ b/dev-python/speaklater/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/speaklater
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/speaklater/ChangeLog,v 1.8 2015/01/16 03:36:59 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/speaklater/ChangeLog,v 1.9 2015/06/07 16:09:19 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   16 Jan 2015; Patrick Lauer <patrick@gentoo.org> speaklater-1.3-r1.ebuild:
   Stable on amd64 and x86 for 527558
diff --git a/dev-python/speaklater/Manifest b/dev-python/speaklater/Manifest
index 630497184483..85fa816d8b23 100644
--- a/dev-python/speaklater/Manifest
+++ b/dev-python/speaklater/Manifest
@@ -1,4 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST speaklater-1.3.tar.gz 3582 SHA256 59fea336d0eed38c1f0bf3181ee1222d0ef45f3a9dd34ebe65e6bfffdd6a65a9 SHA512 ae137d94c497cd4214e230c8906f3ba40e092f248206d37b61de2571567e39e27b7f58bcf2145bd0c81c195c3c5ed03fc0428e0a50c657c5c909ec82719454ef WHIRLPOOL 9e9edc0f6b9943f515eb36a13b038402e4093dfeb302f856858000ce87316508d31aafaf85e67e332b8bdfccec518912d87c61b3e45c930bd22bafc3dae8e1f9
 EBUILD speaklater-1.3-r1.ebuild 561 SHA256 67e2857046896d9a0d4a156ee489c0730d6c0443b12e8b5bb69f083652efb674 SHA512 4d524446c8dab0eebba26ef39f0eb22c73fd4dc2379183a61e3b74e791fc52ab205150fca5d6f3e797a1ea32d7d28db2b6e1114182af253ea23ebce75384cd35 WHIRLPOOL ebb8e25d7d8e0d6654702455bdb4055c5f81d70ca50c7dd6a4a3fe0065d2f71e271a5b91b6274985c35080d973dc068a00a742345301e742ac77ccd3a5cf9f62
-MISC ChangeLog 1260 SHA256 8c19514b40bf93922c2b05f57546bb6008896e2003b9b7a49e6a529d74c9c88a SHA512 d289775846812f16288ff09c6cf00f99ac3a35799d1d765def7fb1c3a231b95e1bee4ad8a9f05b71cfac95e0167f531f4f28ec334c1df2a8960bebea4d59d1d1 WHIRLPOOL e4441b67df2f2e9f98b520c5e9aee65603ee11dff6b3cecc7a1d6da712b8b4d19f62acdd2ef56e4de9aa8b4db6d50d3040a87fea0070e5424cbb672ecb9a019a
-MISC metadata.xml 233 SHA256 947b301547b9917966ef0c7fdcd6e5fe56fdf4ac9a1d90a42e62b391597524a5 SHA512 4f8031f29e1a6a5c663ba7ee4830108dc505179234f11f419a25fcb48ef9e8084056b1a6de06680c6390f48f12d2511cbe05db54806460e7d031db16be9bcf8a WHIRLPOOL 86e76b0e4ba07fcd88f91d0212e9fd92cc59b6b62050520c1929bca11ba4c0699120009b515db186aa415054300dd42bc4efdc69c6ff0166ca88acda391c2f87
+MISC ChangeLog 1361 SHA256 d5ff6d09c5b2097f65c8e3b08c41ab73b85301a99c79ab3a33b7c23a5fb98a09 SHA512 2e4e763186acf427a2b9c5a638b83c1324af54fdb915fe85cf3506cb2603ecb3222c5c95f7c4061a9362b331caa929e25ca97fea56d40dd53ee8dae13d9589b7 WHIRLPOOL 00d7a4034e68e63c355a0d18b96d11621650283dd4ad113d023ee23cc8fe7148275427a735210979fa2edd2193159f7a570907a73d7db0f9fd19b107650c7d6e
+MISC metadata.xml 300 SHA256 fac4257951eec067476bda94613fd0c000cb29e981fac06a35473be454975832 SHA512 9994177b05a131af7fc91d605c46a4aad37ff133620a9126390b42f55c7300b4aad774e2047b5ca2f6c225fcd9fb2b39dc22c9897f0e9bd2cf73e13204bf3395 WHIRLPOOL c3bb2e36cda57d148acc39634a42f427baf75409227b52f019c1bbca8c93b38e046b7cea30636d561f87cd05afb16e7786043ea1fef3589d9e288ffadd116147
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVdGywXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmilCsP/1O22F+S/p5Itni+d+hecErq
+nauG2ZzVaYo3pn2bc1/hygVTpy+qmuuEWrkKodEi5VtvP/by7zfufgmlLPCLeECH
+zZnGw5FhMJlOvZwmmCgu+1xItErAMPnoLxESYPUkU4C9mitfIE08DOBbmXuHf/3p
+JSQZaN9IlQvwRXDay6gzbI85cpNNRA0g+CfbUs6O2InY8XKX2owInHdLQdCaZsw+
+fUTntLJWWsy62JWN9uknY7EkuCIFHBN34r8NeGFoLuE3yk//XULv8/zOmZllDkyf
+jPytp5MLt3AjvGI6PK/lMCG+PM3mlHHKvClzcfvyvGc2QIXRYTwWFg084O+K0gst
+p4Ols481figR58L+S7Vxjai+OG3LqgR3ehKV0ugH1+2nXXnfo0Y9HnhCpsmDZSLe
+G9i/dAyuZO7+ovW61OJtqMrwFYVeBaNWPgMdFLseWf06ETqWWGtp+W1e6dehZn8s
+ZaQXeFjBt722WqpycG4i6iI828k+ocKLvkuFr/6jD9ENh9NC6YYAnu/yUS+aMfb1
+eQu70Zf/IoAFWqeukpkmRD3m8lEpoD1gHNALJrRm8cl4elSdwUE/hTvItfM0Gb9A
+TOJkpVeaMO1bPNCWCyuE9bO2KYjhUI04QIo/T2p/pBJE/TYMhUpnhoj8PpRjQBv5
+10Gn0jsPs+1cdmmKQ1jV
+=ehAe
+-----END PGP SIGNATURE-----
diff --git a/dev-python/speaklater/metadata.xml b/dev-python/speaklater/metadata.xml
index 1f0be0bd2b8e..8ca5f2f0f580 100644
--- a/dev-python/speaklater/metadata.xml
+++ b/dev-python/speaklater/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>python</herd>
-	<upstream>
-		<remote-id type="pypi">speaklater</remote-id>
-	</upstream>
+  <herd>python</herd>
+  <upstream>
+    <remote-id type="pypi">speaklater</remote-id>
+    <remote-id type="github">mitsuhiko/speaklater</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/sphinx-better-theme/ChangeLog b/dev-python/sphinx-better-theme/ChangeLog
index dd2b75dd239a..bd742501ddde 100644
--- a/dev-python/sphinx-better-theme/ChangeLog
+++ b/dev-python/sphinx-better-theme/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/sphinx-better-theme
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinx-better-theme/ChangeLog,v 1.15 2015/06/03 21:53:37 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinx-better-theme/ChangeLog,v 1.16 2015/06/07 16:10:02 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add pypi to remote-id in metadata.xml
diff --git a/dev-python/sphinx-better-theme/Manifest b/dev-python/sphinx-better-theme/Manifest
index 170b130f1cf6..49f99b9271b1 100644
--- a/dev-python/sphinx-better-theme/Manifest
+++ b/dev-python/sphinx-better-theme/Manifest
@@ -3,24 +3,24 @@ Hash: SHA512
 
 DIST sphinx-better-theme-0.1.5.tar.gz 7276 SHA256 420570d80d8cab25b35cef2b79619104675777dff5a23deebe9ba2191d48c1ce SHA512 06e50079967e166d5daf58a44c18e477cfc71d326ecf2e0a5932200c911e73ee188f720fd5bd15c2e298e14f7e3358e02e94381470bb7958edb0b0aed334ef9c WHIRLPOOL 41d09f5c94d9473af8096896291c2ee464eef5a80c29dd4347b009da43510f31b1859e357b871cc598a3be0c66182e6d213c3755a63c3f9446c8fe6570a8e2a3
 EBUILD sphinx-better-theme-0.1.5.ebuild 710 SHA256 a6301ce2a397eeea4057b735f2f7aacdd6e7bd6f494d126bb10f2264aa34c942 SHA512 4620e035ac40e50a8148e02e79269dc565bdba0216cefdc1f8fae301bea9ef2cbde300f59b0f2581d5543f85a99672f3c95e0fcf20a6c64605af732e6a7f52a9 WHIRLPOOL d863170928f735bf6c2f2f823126d1daa873ce1b918c7f10d675f6d49313bb64a8de2076290efb3363ec8718ac848ada6cac280d3d2f474cffa82bafc52faeb1
-MISC ChangeLog 2070 SHA256 bd921fa3563365ca0cd20928804107c64e29eda44c564bf922a3121e1255eaf8 SHA512 28239bdcc4d0a917a15d0977e3786933e764cd19ca8c8246de0833efdf5ed0d1cd17df7703cbfb9e2f8b93af5b81e805f0b076b5a572a869273a72e55babb0ef WHIRLPOOL 6f4ac3cb9d1a0e0a657195b704450b8fc8784268117724769edd43ec3e543d006664ddfcd60a034ea2d4bdbb2ea97d7b5493e1cd586b44b391594b182f0f31e0
-MISC metadata.xml 247 SHA256 5287e2aa3a04c692616ac62dc7a3105933487701c2bb46032e2a73002cf46ce7 SHA512 4c2259dedb2ca0c67f6ba5e1f1896a92bec3a5bec108ace52c82adc20854d236842de9043c719e51c6d0bea0e176d51adbf08400fb0f5db89528c6a625974c1d WHIRLPOOL 788ba0cd372496ecf3a71ae52029ca22f17514c7a77fe9788b6f3052b2e4025d0d2eae98befc9f684f7d01c724ce4f88cc7c886b502132098fce19bba6f0540a
+MISC ChangeLog 2174 SHA256 b46d81a4bec05c66a56d0d8698c312eb55db16b07c1871b49d308fe9b59cd992 SHA512 9d7b62b8a44f8d063e114ba210490d8f83a93a8035f1ae2543861be259c2b0b1614d0a0adc8f2533856d7998f9a7b82bb1b1e7bef6452f2f94b5885d6650ec87 WHIRLPOOL 96a8f0131ab06b2f5a42d16add85337091ef1a7d170f574381f8f9e392a4d36e527e00e7360b474839996cb1148f8a936253efc22597aaccd260d99c915315f7
+MISC metadata.xml 315 SHA256 6e0722d4b34ff47256509af44295638b49f273e3fd4a56847fcfbd5302392bfe SHA512 a1c7437b4815594a6565a515c7fa5ee685af01ac2b9eb995ea27d47d6e87be5084e594cb810593bb529aa81cb76d7e49bacc7b6f7e11270bebb71af54532c588 WHIRLPOOL 1111c482af494a2aa866f4fd06d9b62267f39788d40a35b23a46da6420499e5b7801d26a3a6892292d725772d1789fe9a8204b25c83599661e91c1566f09538e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVb3diXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVdGzbXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiMYgP/2q9MXPVUiOKVH/n3ZZMxoXO
-Qyi8YDtjQKXj0GVehqJEIN6MCh5OTSr74KymPy7qKw9HPuOA5eGUoUNm1xurCtQ6
-tAInKJjEcaohVOfceFGlkUoEtKf02riFxqZBSV3qlcDP2TDa5lmG35DNpGp4T2Qu
-EwIqfE+synKr9HZU8wFka+6aQ3k2jSFJ33izPHo3kZnwzptSPu9gq0YLnWbPXsiq
-dhA+n6iJwrvdv3W9eImw1YutKEoTCGPEc5vlPjd/MblLf8vRGIjtwjC2USCWx5G3
-Z91+HYaqj48nB5aMlmm+9eGP1CKBIf/o2Y/Sh5Cmv82AW4IpIc4oS13l41vRB1RT
-SUfxi7o4vuosCTgMM2pGLp5TTlPyVCfF/xFfEpJozJOpT8kAFTyvuFYFjCMdyond
-wUSVSawaXPyNJO64QFYjVFQDmwYCTR6kCtjmEmqYreAfUQIJKRNTd75mDwwUL7Je
-0/0cwUAOvO3DyZ/b1TpKG2ULrzKlfISV12YKSHCxC6iVDlYiEOhr2cpm0NCM9f0G
-g1Go2NAjHTD4VRRXZLONlTuxcKbXhQw9iXRaBBpaLdNLeYcoGNIV+lkpKIjZvNrR
-lmKMceBk9a3KNRb4IGZRk18uIxVBUf/bsQyKf5oq0QE/Fu9pSPtckJfC26oOT1NR
-jX/ZxcF+30UZ/qIpRlFU
-=3rO1
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiBUIQAKwdWnOdMYpMRJ2cm8FQtFYb
++KcTLRQWxujvc87ZjkMHTp/RBOwSXvU8DLYy2hjW/UzMun8THb6voftdh7HGW895
+lLe3tLERs013A9ewiDDud9iY9bwBe3CX1C/i02Iws953fN8+eyOcEU5EHmYJWnqb
+ehR45JezBfZZtI+okwqGjecNOfyQY+s7iGL8a4/VSknJMCiskMEhL/M9OPxYePNz
+5WZUw/UFJspa0I7su6LA9JFyrLMbVEZ3d1PBeOsz/n0co8fbwypCymf9+Zfj5W6o
+lOuX+YNWDqpRIqhsmcJpqAc59uimxhqWN3A+J11EYgTzcz8aQ8cnvCVkT1FhwVQa
+/0jFkYUDU49RhhGxpDx1IP5uNUDz/SO7i27iho8gpLMKjMF8fxyglLE3jxGQIMIp
+W5VN4VXViZrCcFE+PSI5W46HntI9Aaj9sgkVsY95Sfq6mrQTtBnig5ruHPuHArvD
+L8JEYMepqY7k3+PnSyHHBgrMVD+qQnvAACzlAQtMtX3Gj0rv4DQ+b82M4qGMeIWt
+A1KxgclbjY3z5TgcDpEhALJrb/5p7SLhWK5YAp7Wh1rHv4t8BBzA3z1Lmh+MJKi+
+fPOnpimf2anzhqSN3msPvV2DtKXjwrDXqfRfMNwwAiKbHw+Yb4VjyGMVXgPhAEEU
+lp4tDEEfk4/HKnoE34nD
+=CgXK
 -----END PGP SIGNATURE-----
diff --git a/dev-python/sphinx-better-theme/metadata.xml b/dev-python/sphinx-better-theme/metadata.xml
index 94a021f6fbd3..3f80e6c2f783 100644
--- a/dev-python/sphinx-better-theme/metadata.xml
+++ b/dev-python/sphinx-better-theme/metadata.xml
@@ -4,5 +4,6 @@
   <herd>python</herd>
   <upstream>
     <remote-id type="pypi">sphinx-better-theme</remote-id>
+    <remote-id type="github">irskep/sphinx-better-theme</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/sphinx_rtd_theme/ChangeLog b/dev-python/sphinx_rtd_theme/ChangeLog
index c627983dc117..787ec58eb5ca 100644
--- a/dev-python/sphinx_rtd_theme/ChangeLog
+++ b/dev-python/sphinx_rtd_theme/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/sphinx_rtd_theme
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinx_rtd_theme/ChangeLog,v 1.13 2015/05/26 06:37:11 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinx_rtd_theme/ChangeLog,v 1.14 2015/06/07 16:10:47 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
 *sphinx_rtd_theme-0.1.8 (26 May 2015)
 
diff --git a/dev-python/sphinx_rtd_theme/Manifest b/dev-python/sphinx_rtd_theme/Manifest
index 560674f5891b..0d029744a745 100644
--- a/dev-python/sphinx_rtd_theme/Manifest
+++ b/dev-python/sphinx_rtd_theme/Manifest
@@ -1,8 +1,30 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST sphinx_rtd_theme-0.1.6.tar.gz 217067 SHA256 0f29f544f6d037989fa0c7729a9eab7e4d8ea50d6f0ef37363f472756c1edca6 SHA512 f79e8192264ef01675240853e9be8a5bd0c86808f0e918e60c7c6e0c078caeef87c76421db795149214ef4edc1389e7c2001a98436611292ff826e7b9b9d0f15 WHIRLPOOL 110494f3c9bb6e838557fa4bcb1ac8f33e91b30d2da780720e897cfc4f635c0a14f502d5aac50115495bcc591de79eae83a2e359b81b917e524c9459194420f6
 DIST sphinx_rtd_theme-0.1.7.tar.gz 220230 SHA256 9a490c861f6cf96a0050c29a92d5d1e01eda02ae6f50760ad5c96a327cdf14e8 SHA512 390f007ecba0a59ef92e1aab3457e7c09fa7ff45690f9351857d8aa635371c81329b12e7d4052ba9abaabb82a28a911334c4dc601105ee97cb0eb2b1be0ae426 WHIRLPOOL 00150c49a8e1a56aa378cac795b7ed7a681aef59c7a70294b1b3e582fa1d13ce7abc251567219422fa495c610dfda2a40c1255c2c8306af72188294fa1a84ec2
 DIST sphinx_rtd_theme-0.1.8.tar.gz 424804 SHA256 74f633ed3a61da1d1d59c3185483c81a9d7346bf0e7b5f29ad0764a6f159b68a SHA512 2ade6b86f88fa9e8fa3242b4f5fcf665016098a3819e08400fbe216ccb8ab6e1d0786fba20c1ed722525bc5fd088bc70ceb93c0ed4c5a8ac79ab6499a0a98994 WHIRLPOOL 7bfdd8679d4300a9cef03ca5bbff01cc2cfbc241244f26f08c0356aba8da5bcfdd2bba4603cc687ba5bfbc2b3c7dbf69a5169d88c215173d3dd686fed035704b
 EBUILD sphinx_rtd_theme-0.1.6.ebuild 642 SHA256 8dccbf44905f7e24ffdde24be1d006311966e3a69f1df4705032a519dc2c6d10 SHA512 6e68e231696259a2938958e3323ca0c767dd62715687dd306b138f46b53ee594601e94902c5a6a6b2b0f0046089b825da601c36281b928bc5d36f6cac603f0a1 WHIRLPOOL 3e2862391c43d706f5677a7bad78fa0ea2950aaf68f0721850a507152e401d67193124a506cfc43081ba84f5f688c593d0104a6a43e76635b3a6f0296fdbffed
 EBUILD sphinx_rtd_theme-0.1.7.ebuild 661 SHA256 4ff442a46f95ee64e7536a1835de27f76067ddb995b58afb32cae2d5cb31295b SHA512 b73077fff0486a693cc3efeed006b9615205ae16c6c3e0bc2d34ec920afaf47f17efbcfd01476596fc83aa5f4e07b88305b19ab3bd10d7535b88d2a4bf4da4f4 WHIRLPOOL 17073a5f916452d29c37fae933515f568452c3fc9e3fda14b299c6abcdbfb8854a5d52c8675f8affff0f87c7ae246f54a87aaf7e6fd00d57e84ed7fa67fad6d7
 EBUILD sphinx_rtd_theme-0.1.8.ebuild 665 SHA256 87170e94f0fdd6f4b43ebdc81506a48dec7f11101e34b61bd5f5cf635a5b4ff5 SHA512 961a2a7aed811d4916ded0c29dce2b42bada53fb805b5af5a9a718ca5c5f7b656eb6688f648418156db014013c4e883037b09141b7d15ffe9e0f43c150383306 WHIRLPOOL 503d0f73dc1fd21a4a299c86b27e4ee573f43aefed968360ec81a70fb2e2dc7bf70046f37df79752d98d635f714234f63ba1e8c211a9f0a4ea3362a9be772356
-MISC ChangeLog 1780 SHA256 c27c8f7d8facbc1bae683aec1c45e0a55a5a680471b433feaa76b20e5923ef71 SHA512 a715db75f708cd6f13f212595d78325bd9e4ec51d753fa725c4106fddd5e74f77ff34b4044292022257dd536e33404dd21cd8cc55c29162c1a42389d45630a2c WHIRLPOOL 751f4d7b7cfbdd2b509cf43e48f2f58b39933dd7108e13f40ed20368628b61e2b37ac08b00f5db30b7581f92205a3b3e68014cf6cba0d814193f2968c47ef7e4
-MISC metadata.xml 236 SHA256 a72f39924184e6706ca9216013f0f300a9ed8e91d10efd1e176c6dc0fb71f61a SHA512 431cf9a3ec54bd9bcba74a8ce412e9668445ed7079b8f76c8f35727291c21c4f26f4366f96ff95524ad6522d61027ba1afe77ca6546281020ef40f0257d01db5 WHIRLPOOL 647c517db904c45202ee064eb5677bab9599ee7641045e1faa794cfdb25840ce1b25e4d92cb12dd7c3d6eb7deaa884cf6d12cc79eef2e9535564457586187e86
+MISC ChangeLog 1881 SHA256 c164061b17c098b20c12626ade0b571d9723e9e3ae46638327efb82dd7227a28 SHA512 f6f8f43b78b48fa444598bd09533dfa9a6a8ab6d577430f091e418d527561f6c89731e84cba72070e6f7b3540b42d8401645820299ff42926bbfbac1d2615027 WHIRLPOOL ad28d993029dc8392135406670fe27e366642260582b5aed8cec275817175d4d716da8bdf0465e79115dc1d72c340135d18befcd603995091ce08b7dc65b107c
+MISC metadata.xml 308 SHA256 973706c8f6e8c708792749c7a298ae1acd71ec6d6c1a984cc537bd94d2f60fdf SHA512 2890f2d438419830e2e16b09aa2677d7896f4ff6bc4f9de3dff3b88902877109fe422fa49c9b7536a1d7f6ddc3f2b2e083109ade94e67c8a2419d9fa4baff177 WHIRLPOOL 96fa5a7b908d02b9879146d35a896dafda3acc62954d5a63811a7f898fa88e0d0150a779b06002dc2fa106eb16c888f6bfc37c7f3886c88bdaec103984e3f1f8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVdG0IXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiKYkP/1QQwSgyJnPx/CdM9Qf0xGRH
+Uppp/e5sKRJJurBxCnPXbSKdLgQp2IHMJh0uLJrDpb9mBGU+QixlrWLbsq+rrex8
+u2hPpEj1lkr0OgaAkXq/bdTVlzBjTXcsGAo0aUZHzICDkxVCYEt5J2ib7tAkcq4r
+DsSs73XM9CwyY9oYK8L7IFVGCZAp2fYWuYqNr3WgCr8iYB9h+3d1F8wVGFKyIvNI
+oRm00SIK7jhqSkdK+vKhQ2wEgdPiJprUWtuSkDhNSU/MzcX2+CBq0UwTUTK/OYqd
+uwxX9ukjNjvvk0+nRrVFL7f8IDjDITPq6AnEZopBDr/6Kbj1XvdfILB7VPSDtVx5
+RpCgXdJqT/ONcI5BiAneMSVl0Xr9KYc7BpN5whFkB5GBjspIdh0hMVYx0Hmgqveo
+PzNe8A2/rsThc0hLJrwdcxIuDHG/b4wLJKHWcaXR2lqZMAaKCYJdYYOi7ufqVXiR
+cWL32FqZry3Q0JeXgtdL6h01uAoTVq2vpTU7s2jFFpKvxne0lqR8YTusl9XaLzi4
+ExZzy3ZUFj5pud0xuINnemu0b4JdFCx6dxcsai6x2W5ld1+p/WasX5roFIwmyHpx
+Awev3Ehhp9nMtIBv9+49Pj0G//F/uxWIcFMjpfYg8IU3qsQ7LGGqQJB1W+KIaT/0
+PZtCLCvl+UUPU//5PM7p
+=hGea
+-----END PGP SIGNATURE-----
diff --git a/dev-python/sphinx_rtd_theme/metadata.xml b/dev-python/sphinx_rtd_theme/metadata.xml
index b09c6ed5bd36..f1054646c761 100644
--- a/dev-python/sphinx_rtd_theme/metadata.xml
+++ b/dev-python/sphinx_rtd_theme/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>python</herd>
-<upstream>
-  <remote-id type="pypi">sphinx_rtd_theme</remote-id>
-</upstream>
+  <herd>python</herd>
+  <upstream>
+    <remote-id type="pypi">sphinx_rtd_theme</remote-id>
+    <remote-id type="github">snide/sphinx_rtd_theme</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/sphinxtogithub/ChangeLog b/dev-python/sphinxtogithub/ChangeLog
index ecb7afe853ac..849ab2699c0e 100644
--- a/dev-python/sphinxtogithub/ChangeLog
+++ b/dev-python/sphinxtogithub/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/sphinxtogithub
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinxtogithub/ChangeLog,v 1.9 2015/06/07 09:57:06 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinxtogithub/ChangeLog,v 1.10 2015/06/07 16:11:08 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   07 Jun 2015; Markus Meier <maekke@gentoo.org> sphinxtogithub-1.1.0.ebuild:
   arm stable, bug #540290
diff --git a/dev-python/sphinxtogithub/Manifest b/dev-python/sphinxtogithub/Manifest
index 52561ba8abdc..642ac0c6ea85 100644
--- a/dev-python/sphinxtogithub/Manifest
+++ b/dev-python/sphinxtogithub/Manifest
@@ -1,16 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST sphinxtogithub-1.0.0.tar.gz 9872 SHA256 71e191b38defcfcff4acd918190a6322d8b7374fe84b97b6bc17d74c550c5759 SHA512 1eca486fc78715281b1e55fddabe2c161ca15d8b54981618de233e8eba9e14be575c5e3b6b1e4664186fce1414877d501c8f563c8771ff46c2d26ea96810450b WHIRLPOOL 0ac54064fd05e109505444fe9d1d3b8c12b7fa4b00dc5d6f7e713ede81a6ce6d723f2c983aabde5ed180467409234133ea88a4224bcc5248d7b33365c5b044a9
 DIST sphinxtogithub-1.1.0.tar.gz 11103 SHA256 15222b1ea55f83dfdf1e09a76d4ef1b9273a2590b73a5a16c4bff972894eae4e SHA512 190c57535c58f86a84a3e80bde61f99d35b8d3826d18d77d9eaf857be853c84b35e49cbb517fb13d8993934757892cbda4a820ecd24f3e5ff2908e814e53d664 WHIRLPOOL 232d8ecccab473bf690275883eed4e2a8bf6a10b8d3f52da56287fba8aefe9a75aee5ccbae1f70f9746d0732254bf8da7a953c65d10153f72a3a6377f674f7aa
 EBUILD sphinxtogithub-1.0.0.ebuild 722 SHA256 195c86c9b7a8b2a148893ca2ca8171f888fec500f05dedc981e2fc96eb4847a7 SHA512 1a29ca423deb7abbfc0717dd469002f0e1d0b40c8b2d5b144e42f8994761b6ae09f147ddf0b933c6387fe3ba4bf9bf7a16f254ec0bacb949b71746b6cbcbd2fb WHIRLPOOL 131d6f5898717c5054a1f7bcb3e297152d0acbb94218a6cde4c3ae4c01eabfa94bb827accfdec4cfb75220513e5361446fd268b0e609f00efb904bb62c4967d9
 EBUILD sphinxtogithub-1.1.0.ebuild 896 SHA256 ef488ca00f36bf845bcdee1eb2a555e244ab8b54e64e1c2fecce2ce3cc1863a8 SHA512 d0b84651cc49e6a44454a79321844b66e0d088fff324ef87a083a51dffc2bfe6c989ccd519769619a4d39de7f21edd652ae3d9174c76d144e8ab5e4c61629369 WHIRLPOOL 584ac80dee46ac01271e64b0df2e0d5dd0e2b549dbc64712f3778c32675a993a8cc70e338c0f3a0a7c2fd65b4c7a02016fa62e98dcc021d50ff2ef13f6ea44de
-MISC ChangeLog 1372 SHA256 4a528c5c4052dc44dd743227090f83c1f2bd158a3ded2a234ecd4bedaaa3e15c SHA512 710423637569b70e291d5534c29d6407ac1233cae390a587382adc2177e57aa1fe2ace955189e206ccd84e8907017f5ed454cee83a218f98a514779d432b85a3 WHIRLPOOL 14b40f6017db54a0c15c6b22ac53463f9ddc5f93056c9bca514628a80190d161fe14b86dae59e91ba9b768c5c39435d6423e6e0770d79168a9cd1c3e96971ed9
-MISC metadata.xml 237 SHA256 c5eb2f640a903ac82969888cb1d1a2dc99004bd59135575abc1c20724638487f SHA512 b3336e8a75a083aff4fdd3e9b91fb35da865be0ec2da8695a99cdf3f1bbe5b03741e7bc23ddcd072485268ebdc9df48dfa535ce4168cee619c42b8a1ca90a725 WHIRLPOOL d15e698f084567bdba21284b4140c9130f22e6732fd34cb91740ebb9115cbae962e61500a575847e1c52e5fb8de390d533770087e449fb72d7e16bec7c86316a
+MISC ChangeLog 1475 SHA256 d2de66a8395cedf01018ea6fd844cccebfb00f4960334354c25ae36f6397958f SHA512 7bc8ebbf749a64288d424d6c68409fa993fd1a5b0a81a8008cac83f81a148e2a15a5cf76b495e311d0b8ee5a7588395b1afdd274a521a2dd22dc3e153105a7c5 WHIRLPOOL aab035ee630c249bc077df2d1c842498eea0e661078691222fc442f837239a1a9192c7a101e3098ee42e1c3571b67d1db79b47d5bae3c328b93ce3a757579699
+MISC metadata.xml 313 SHA256 f6f9a01919705d2e412f1cd244f4ed6891a211888f5e9930e674543caa456d75 SHA512 517e7858832ed6e7a7a997e5f011e7995e8bcd0fdaf17a1dc03eea2526e76737d7a80669c73347ae3d3327d036fb8cd2d9a946c475ef5a7792188cc701a10bff WHIRLPOOL 2010b14827b20008468432f112d8aebea071e25a0c7d865af71d1d1992c67085246360040ec7fd5cc167272763aff92000464625b03c1994ccde5fb24286e606
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlV0FXMACgkQkKaRLQcq0GJ0HACgjR6jqoYJwzSRZ57kVqE87edX
-A/0An1GwK2i63xYckSFuXpqqOcDugGGN
-=rVEG
+iQJ8BAEBCgBmBQJVdG0dXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi7tgP/1AHKFTMuuSi6tkm4HMECslb
+xoukXDUspUx+Bm4L+hO0+IcyKofw8M3/0/tzXGpLNWIQ7E3znzlXTlFkw6jDWl5J
+rKV31k3DNVZg0QF102BbOd7jIMANgbSnHfD58iPLSL8PMp6FKRs+2F9Q6PMcrkeB
+LwXRRrwXT/wS4xnhu3maGvf1gn4Xfyryhkc25jaFpqYWUPqP2EjZLGFQDUTTB53P
+Kg7qQdNpz7euKben3+gEKH3ADtbbivhhvg2fNXpmRKhyOmo/JnRhGvsiyEOU2XSG
+P1VDm1k55Q/7RfE39ieYjDrU2I2Hib8aB3vAcj+3gMI+2nfnmGrDAFXiAGxL6aSR
+0MYSHM2TfBU2cHtUAqK4Y3po8c50PuMWJNUOCcHbIbR46deMuXfyqwhix70if3mU
+a0El2iMZ88h8gxQvcd/i0EwACseeU6H6Dz9bC2kZXWAWmayS8SYSLhh5OgUTIM8H
+S/GeA2tugs7eBBDt0GdFLtEb9HGekPhsDTxbjurv+a8D+INoKg08u1cRohd8BJNM
+9wIxHo7/mPcphFpTzgKXuBCyiETrMDSz7sNCxZ1A+EP9bC+RNaDuuwsVjgIVrLEG
+M7N9+dfbA+bWKWUcrEE44xbDr/XPoHuOEjebvdZ73SEhZC3t+MS8le+Ngd4N0DqI
+TULtLZpgFF/dghkOjUKH
+=9VZv
 -----END PGP SIGNATURE-----
diff --git a/dev-python/sphinxtogithub/metadata.xml b/dev-python/sphinxtogithub/metadata.xml
index 91eff68f917c..807e5f4823fb 100644
--- a/dev-python/sphinxtogithub/metadata.xml
+++ b/dev-python/sphinxtogithub/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>python</herd>
-	<upstream>
-		<remote-id type="pypi">sphinxtogithub</remote-id>
-	</upstream>
+  <herd>python</herd>
+  <upstream>
+    <remote-id type="pypi">sphinxtogithub</remote-id>
+    <remote-id type="github">michaeljones/sphinx-to-github</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/sqlite3dbm/ChangeLog b/dev-python/sqlite3dbm/ChangeLog
index 0fac7136458f..456cef9a6fbf 100644
--- a/dev-python/sqlite3dbm/ChangeLog
+++ b/dev-python/sqlite3dbm/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/sqlite3dbm
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlite3dbm/ChangeLog,v 1.9 2015/04/08 08:05:03 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlite3dbm/ChangeLog,v 1.10 2015/06/07 16:11:27 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> sqlite3dbm-0.1.4-r1.ebuild:
   Drop old Python implementations
diff --git a/dev-python/sqlite3dbm/Manifest b/dev-python/sqlite3dbm/Manifest
index 0c5166bb4419..d0e224e38b8f 100644
--- a/dev-python/sqlite3dbm/Manifest
+++ b/dev-python/sqlite3dbm/Manifest
@@ -1,26 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST sqlite3dbm-0.1.4-git.tar.gz 18962 SHA256 635cbf3f554c0cd75d68a6ebff57b2e29686bad1469a283a70f28ae8dd71c905 SHA512 1b420839482cf5881b744855393afa9eaa1cd0ea2195d03c6576f97804851dcfa5b5fe6a80d9d77eb00b9ee49ebb7cdb7ba7b86f57e4c700178a0bf46d598bab WHIRLPOOL 5e7789b042732edd8c4f3b06868582fff4164b4fa461d297f44ba2a3491a71b607f1b0b4b910e2edc1cddd1b86cc3c6a0bec482be7b36185d59d812a78ea7b8c
 EBUILD sqlite3dbm-0.1.4-r1.ebuild 1095 SHA256 2b1276c5ac28899d75353797a3eb1583eda505fc9a8e05079e887c26b5ef3d25 SHA512 5c85041f31e016570e824a62bdc8f2ffb32105cf140c475d858c6a2e8d0e271bb7c3414703ee6164ed88f4ba207a5e8a1fe84a2b762572fdc131fe8acdef2e3f WHIRLPOOL dbf166c85468d70c94ba7cdca5ae6d8f290e31126c84a840045bb3be7d153b74f0310508d70475b726eee33e35aff3f0c7dafc2f5e084292851f1387df2a842a
-MISC ChangeLog 1273 SHA256 4742c9ab220b8cc608f2b2bea4340ab82dd829141cd6fefc208c4f42d408248b SHA512 d0137852bb94d7026b217ef092a0406d48d1b8c80ad714767827aff234e68f0cc33d96d0e70d421cc94e2780bbb0bd839ddb4749f280b80a5348891f56c35455 WHIRLPOOL f7eca39df2e00290d641a99372048150456f8e98ff3e466f71eebf128abddf1bf021ad4670c4404477812cf2be6d45e6d28abb0b47d486d989d68a3a7aa79657
-MISC metadata.xml 254 SHA256 67863e4195f33dbbd393097ee6e5e4a75865cf0b5d98e17835853fd8e15bcc3e SHA512 c5e7503e5f95e68f039cea05d2ecf1c074d04b3b21202b2377a9eb1604c6238ba14c2d0a5b3970a8859bd2783d478adc3b6d8010a741a77c017e8dd31e6cc83b WHIRLPOOL 2f06600e741b3f6ca0247bd8c8bbf434a6fc46488710107b9fea7a5896fab6a2e825538681e0e9452c23f92ce8c8f939fc408199aad30b1322e575947db04d47
+MISC ChangeLog 1376 SHA256 f2a6f6fb552a337ad4bb67df0fb83d40f1e691a3ac697fde22f201998adf5b6c SHA512 bd130466bbc23fb78d6fd1dc3d2541a11ac4714fa80cb6e890fe91b224db73a30532ffb62431bb72c81a7dd4c74df5401e4de0727d7e793c3dbc47c9cf8301fd WHIRLPOOL aeadcd35af57a1752afdc724665e614c6211bc6aa9f8648c17c6bcc2b49c1a28bba2e5f8471697a51a5b186d3e19dc5856d653721ac8d81067f13faf321d0642
+MISC metadata.xml 343 SHA256 8d6e546e43fb992841883ede29d1de04eddd3e26d95bc6f0cda71927c2b418ca SHA512 f77d102edf688f330009eb5a396da23a596402b8a260bc6b7493db88dfa75e69cfb408b8ccc4675ee371051aa20a9e74ad106e3590b550ff1c351c24bfb70d28 WHIRLPOOL 9699cdc886756751b47265df8b62c8897034913b8b76baf19456b198e3e71dbf29dca5961f536dad9504787925458d6959ff1e10a049513888eb03cb94d8aa63
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVJOKWXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOLM0P/Ra9kpu6hPGbRStbAoG4w6FP
-x3R+zkX4QoZ9P9LgXtKy6dx2xYxlkDtAZgMCw6dmh9qYcraQpAWS94KuB2ClItht
-3foostICUkERqlALAMyqIdVE/GMNyb8fe5IfWodikO7HpAwswLhyleHdIW3NmHHy
-W9A7viK7V9JmYMBL71x74esqHS1VtqWMgNEhnDfGFKe6zCaxWq5g08ZaPi6DwJNc
-ugGoyTdqwrPrrx2o/2AE7ZWcK7mJ8UlaqvoYH2kHhWVIiD287Il38EjgByqcz3Ey
-UuFmwUci08d328QNcJyjnF8vJf3WmW/VPmJ/fDLKBMAphqzdMcuL23Z+wV3QWxlw
-8Vgp09OzYZNcXuPEkqhBg+uQwQUlvV+yXAvymOzqPtp+supwVkIFxhoA4DPCmcd0
-BoPoMgFalvj3MslOOiuIS/zQjJOjtxoxWDGHIqpYyDZeMgRCijFAxKkUA6QPcllm
-+9tdXbup+N5ul0npBaxTo8ElzoxSVS/NAwTjU/U+Alv9+iOlBfQNpVOaYGdsfNn1
-iX1KCDLDprvHrrMO5aODpMp005WhMgCFM63SE1oMH9+bKy6vZL1qMp6bzO1dxQU4
-3nSNs7HhD1ypJuKKrGbzNPamjA6R5kevNIFnUoQ4uXWh6XnmDW+UjW3t3ljkgQAI
-VdYwMP60Lpmtl6K/KuaS
-=bSC1
+iQJ8BAEBCgBmBQJVdG0wXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi95AP/0J6jpHDVczh0Notq77ka+t8
+Nc/WUmQW+atmSx+Xdr2wCANxJkCNOR5FQx48FWINrKV6+pCi2J2T36oWdz4zTjX7
+RymQKi4AOcyipo4vAgjsTgAePoDJIF4FZ8g6aL4rYj+hdO3n1JT2CfLzGTm3YKZq
+DbrfPoIaOl7/t5xooehOmEtivLZ/wjPGOJTJvmIsxMdC3ct8QeJIiAGXlRzoKB44
+TgDDTQVEMNqjS2BLq/wXbcVrTotPZWuQ3IaCy4l9fu9O+Kwv7N0yuAxF/GZYIZmd
+4VRwBmTJWpXrk0zEBCBkLJNSAyh5lcYEK+GLFB9g3Yc7zX7G6CxWX3hC0FQzB00z
+Hv2JEKVEr/7LuZJSlhKBEQXZUX0pzCrk7Tedn7axzY7j8ykkuYu7vqWVQfeDWRb8
+1H0xyD3pMM9cC1AwIap84tgINsZh5uCUbMoxqly2Y7RfT2MISATs6/EEk9jjRjnr
+Ijx8c6OlqgWdPRxbEnrWWh0SYxnzgju/KW4yIdZcpV6raWisnxFvO6duaTyAS0x4
+0voxSL3VQ14+SZqxMEQ8F0xDuwqjlkN/l6IzyiAiIf8xkHiST0wQY8z9BMs+uBjD
+wCJgEmH/ry2Jc20rePUP0FFw90TsopD8bhKq5/lGPeoPs59MKvW/6jQU5qmleNLp
+LCk4Ss7RgdSXNtOYDkok
+=Q+6j
 -----END PGP SIGNATURE-----
diff --git a/dev-python/sqlite3dbm/metadata.xml b/dev-python/sqlite3dbm/metadata.xml
index 780ec2f29102..a461b42c335d 100644
--- a/dev-python/sqlite3dbm/metadata.xml
+++ b/dev-python/sqlite3dbm/metadata.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>	
-	<maintainer>
-		<email>idella4@gentoo.org</email>
-		<name>Ian Delaney</name>
-	</maintainer>
+  <herd>python</herd>
+  <maintainer>
+    <email>idella4@gentoo.org</email>
+    <name>Ian Delaney</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">Yelp/sqlite3dbm</remote-id>
+  </upstream>
 </pkgmetadata>
-
diff --git a/dev-python/ssl-fetch/ChangeLog b/dev-python/ssl-fetch/ChangeLog
index 410829f705de..d9a81ceccda0 100644
--- a/dev-python/ssl-fetch/ChangeLog
+++ b/dev-python/ssl-fetch/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/ssl-fetch
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ssl-fetch/ChangeLog,v 1.29 2015/02/09 02:51:38 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ssl-fetch/ChangeLog,v 1.30 2015/06/07 16:12:02 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   09 Feb 2015; Manuel Rüger <mrueg@gentoo.org> ssl-fetch-0.2.1.ebuild,
   ssl-fetch-0.2.ebuild, ssl-fetch-0.3.ebuild, ssl-fetch-9999.ebuild:
diff --git a/dev-python/ssl-fetch/Manifest b/dev-python/ssl-fetch/Manifest
index 11f3ae65d93c..2b3aec03eb40 100644
--- a/dev-python/ssl-fetch/Manifest
+++ b/dev-python/ssl-fetch/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST ssl-fetch-0.2.1.tar.gz 10703 SHA256 2905a8301477cf309484e3beef892d68b33910db71be45c08720f70791690b9d SHA512 ca4c4d29463d5761fbcea151f1229152bd0092418254ce614154b012af9a23c0c52bb733f64815499b5ae0ae9325a808ae2157e7ff707345e92352b672c98966 WHIRLPOOL 4bea8540fce0a2bcc0f8d55b4d87e7c544321b14967af95ded400f4ae0af3fd14c8390ed808352aa89c6ba7d267536d2ef8956dcba4b871226e2be9d4e71a2f8
 DIST ssl-fetch-0.2.tar.gz 10945 SHA256 027f63c5797e0fd84d4ed2195e42141316cceeed0b91058dd700b55482e40a78 SHA512 30aa040503eb05d8b0a7775ce843215ebbc198483fba2133e78a5da57f8b998c65018a1241f4f7bb3fbf66045c45bf050b59adb94a68c694aa3aeb6c0b5f726f WHIRLPOOL b4442b55d98741906eb1f3c0fda80cfbb0be42d2d8491c6bf1b86c0833a021ccfbae2887d2f833e9a297556d25c49cb4d617743a338e02299061f6e281d3563c
 DIST ssl-fetch-0.3.tar.gz 11283 SHA256 cee2f05899e729bba8942b26d17b0a97ddfb0a5d0beea4123bf7f2635db088e8 SHA512 82fddbccd3a5da73e81803ce252171d42428d88d301a772127071130ce4336742e46093359f0a996c679cd12ced02d09035af283d4d2f505c67a551283328756 WHIRLPOOL 49938e39c386a83e60caa0260643c31d2c180e93f3be59757dd17c1c9bc05338d5c580e997a96f698d4e1f4cf317bba9f6738044696c6949fcc1a5351e19f6c2
@@ -5,5 +8,24 @@ EBUILD ssl-fetch-0.2.1.ebuild 1311 SHA256 121a7f3c46f376a18f3a3f63f31fecf738eec8
 EBUILD ssl-fetch-0.2.ebuild 1258 SHA256 2a8388e9972662fc18133c24eb133896471cf84c89c3a7ba81a046fd214fd339 SHA512 0f211860b2dfc7c884ab494884b30fb756c258aecf4acb35e99c17f6608929f4cc48c29a0ca768db8fb240b3cb20093e203655e18fd7c33d1a9d877654f63481 WHIRLPOOL f138541194e6759e39f7aa4497201ae911fe6fa60973dbb14b30fc4c9bd61f2d92d00b2da12d2145a452bcd9a62aafdbb9edeb23f3c500ebb8276e9f144a64b2
 EBUILD ssl-fetch-0.3.ebuild 1312 SHA256 7de6e43a16fe05036c55dae850edb42d536023ee6f0e10cf59849e25d11dcdce SHA512 0f0d31ed99fb583c19a9b4535f48be91a4c0e3b751f7ba75255f36c56ae07a1884bc05db3863ad1e948681b6ebd4ff6f3a2668e86249bb383280a1682e28866d WHIRLPOOL c95c6fad0c9e10504e9d2bb9d1a6a95ef204fcbc99c69e07cc2a1ae7803165c04757e2a7c682f92802818bbbb969f13f372640e83291e5d94d1ee4495eb24721
 EBUILD ssl-fetch-9999.ebuild 1203 SHA256 aaf78e46ec9231be2048adebebb07ccc7bb838c6d35bdab6379402306f2b91f8 SHA512 a8f9ea471e14fdfae5e16448de714a6126b805eb1d5ce079bc842c0b3acd00b3679ef32daab1877f27fc42a89eeef047421feeca1803ff2f4f2dbd74f31b92f5 WHIRLPOOL a844b7a7645c542bc2a8f00d1b9265205ffb41f1bedf8ff28a4a749d6ef33d718e2b1aa37dafbfaf60bf8d3830c460d30fd3987f803fbff208500721d8104c1b
-MISC ChangeLog 3803 SHA256 9f1dbcacc3c265df427a48c82b369e2e88c4bd98353d77666c022406987a1ca5 SHA512 4685130f4e2696ddb58e8af5b8d29805a280cf8e930b0c9a277b008e0abf7b7abf01bde4d93c12db2c3318d12648a48611d9b09f0d1a023d9e515f57f305b2af WHIRLPOOL 4a0430acd87f53316a6c165f81dfbd360b542d49710594f9b661a277b49ee0ce69421bf6334e9a9e23b0df78e2c897086e03527be51846ec29d7933c45e4cb68
-MISC metadata.xml 354 SHA256 7a6a1533bbf4d0cd1f5a427099c2ea147007e708c4af3fcc988591cd73c2a471 SHA512 39e9096ff22fdc955661c912cd44c124a254920c8a9c82cffb20c8932af3dcb5cb7f41566a36014d0ea45e880901bcc0759dfe4247ff6eb5e4cd78591f66fc69 WHIRLPOOL a472aecadfb4d45b566efea327321e925141ef556c0ebe2b8a22d466e662df2dc942f52edeb7a16f00208806ee117556819351d801a2625a34cfe86ed1667a15
+MISC ChangeLog 3906 SHA256 b1dc9b24505b51eb88d8db6d1640bb90bcc28c5663305e0c9da4d662cfb86c57 SHA512 eeb6000007ef4ca68e94d9dc93e8e5d7e1c8f37ede3b5e961ab98d4ff870a646d38199a7769c75f4f91860c4a3e4716b9d0b2a457d887b02526cb74319086729 WHIRLPOOL 28af4d0eb67250532d75c543b5d3546010ce29ff633b5832bb80630f7778c8bdae70638273d709e633bd95802682f01eb0ddf07107089b0565b8b933237d977c
+MISC metadata.xml 453 SHA256 b0ae246c8b6a882293edca8811f4690570c6a551166ee23052dbcb91da0d4930 SHA512 041df5d441377cb93072f3d809b3be3dd8d036f241a173d7414637248ccb0297b8e960ffdada4ba2d1797d043aac5c81a33de73658afa5cd443cc892a9f4efc0 WHIRLPOOL 85e9b2c271b86c113ab93d49357ba4e761bf3ecbabbf0603d91350ff003d3da42094299ece291087ffcfdba956b845c487db47469a400491a691db98119eca91
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVdG1TXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiLukP/iV0AUnjtWZO4myeMfMHs0l6
+B0pcewhGLuCbcBFpy1tt7e4n/Q1OSp4/NgdTkwc7muRDwjdxQHv4+ldhRqyqI3Ob
+fBNlHmyNOI0SOnhsJdxJkSpmedA6uTRZ+4GYbO4xMk/2gC2CBDhm3UcvLinLHhY5
+cjr7zjy0wNIy5OtEXz9ZrzhxDQ8qXrtaWqZuYL5WzOZhPyY7dqGWDbS8rPmjaSwx
+u71EMElG6zeAifyN2/jtIpZh1lDNqQhUksTdkOOe2EfZANrUuLmfmo/f4RaR46Yn
+tPvUwS+sNLaS42kWwA6dGJxJxDG+dFbi3CuL4fYd9TApSrtnVoJ1fvYvwtJc43Xv
+ND7DAY6fdcpv8kHGCfw9yXEm4tk4Cha/yLItNWXa9O2c0+DtBvhSR/4Oa8zgvmX+
+C0K1ssiBpUUk7nkSvirM0fzQ08XTFxLrQtehXp9lJ+vChdQGHq5VLtE3lr8XRxXB
+ngzhfTqBSh4lBMXSf9whPvUZSprC3djsQme4/OgAFko+E1BA/aXdMJs8L7dwGMTa
+NCl8JwScfbzEeQ03mqdzlrXHr/f732WDXY2UkxPKn1brgTbEc7bHWEY2ZdEePxh/
+UTvxcNj+YMMK8uVzs+27+8Hx+h2VvC5wmg3p6Alk8xmdPUCcAzINMyN9mB7yitU/
+IFpT2lyvhZDFpsP0q6u3
+=2CfQ
+-----END PGP SIGNATURE-----
diff --git a/dev-python/ssl-fetch/metadata.xml b/dev-python/ssl-fetch/metadata.xml
index 6c8fc7781bc4..8d318a8ca736 100644
--- a/dev-python/ssl-fetch/metadata.xml
+++ b/dev-python/ssl-fetch/metadata.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tools-portage</herd>
-	<maintainer>
-		<email>dolsen@gentoo.org</email>
-		<name>Brian Dolbec</name>
-	</maintainer>
-	<maintainer>
-		<email>dastergon@gentoo.org</email>
-		<name>Pavlos Ratis</name>
-	</maintainer>
+  <herd>tools-portage</herd>
+  <maintainer>
+    <email>dolsen@gentoo.org</email>
+    <name>Brian Dolbec</name>
+  </maintainer>
+  <maintainer>
+    <email>dastergon@gentoo.org</email>
+    <name>Pavlos Ratis</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">dol-sen/ssl-fetch</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/steadymark/ChangeLog b/dev-python/steadymark/ChangeLog
index 72e096c1d5f4..add98dfd0ee2 100644
--- a/dev-python/steadymark/ChangeLog
+++ b/dev-python/steadymark/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/steadymark
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/steadymark/ChangeLog,v 1.3 2015/06/03 21:56:49 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/steadymark/ChangeLog,v 1.4 2015/06/07 16:12:24 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add pypi to remote-id in metadata.xml
diff --git a/dev-python/steadymark/Manifest b/dev-python/steadymark/Manifest
index 2d3c4e5039ce..fdc2e55108da 100644
--- a/dev-python/steadymark/Manifest
+++ b/dev-python/steadymark/Manifest
@@ -3,24 +3,24 @@ Hash: SHA512
 
 DIST steadymark-0.5.3.tar.gz 8180 SHA256 1e38274f27516fe337279b41049603e18aa3383980dc2665b836e3e0461b7cae SHA512 c30971675216f2afcb9f59fba5239fd6f37bc0d570b1ab34820f2fb83388330886a53ff3a31bf96e07b455ccfa8df3fda5bcd3d2212360419ec2b7290d1ddbaa WHIRLPOOL 0b48afe16589aeecec5a4622a6e89f47560d4c989b326edf8803549fc86f42cd320e7b01d6682633999ca429ac5b657e22218f316a3fc52a9f567fd0285f70b9
 EBUILD steadymark-0.5.3.ebuild 596 SHA256 041709b3f0590c73c89fe4a3a98c005cb7dfa511b3bdc1535f7dc4dd33ef249d SHA512 7bd80d85723f12225a657a7eb7b5af119abbc500a8b52242004cc4ba6f2350c6f39aa6e60d75692032e67d0cc5f3a498acb78aceb85f4db3138ae3703cb2c246 WHIRLPOOL 30bc56a1b23157bbba4854aa02d908c0b693a0bf0cbf9093b96ea31977ea070d9db2115f3b5596a76c3de3a2c6a4fdecc92d9acac4415c31f8ce489d3817aa41
-MISC ChangeLog 586 SHA256 97cc92f06ee44a4f03341f4b85b636803b2c52e248f87f821a583e0cdc27c577 SHA512 a125b7558ad19186ce8bbb0bd58c87c40df4ca5470fefa0815bb770ad9767049a39ed9e4426bdd7cc47665ed908933c55958713b08989686014f3fa6d4dae55c WHIRLPOOL af7f1d87e1a85a70368b244da646399b741e47f1c408c0937a3968ad2903322333cdf5380e15e61b6c9d9e139d10fb55d85a0a3059b37f54d5a4de8cef008e09
-MISC metadata.xml 241 SHA256 fbee8b13ad1575932d211bfe6c82a2f0166ee4aa5c6695d03429c4b9694c2408 SHA512 693df38bd7ef9be60fe5cdf3247bf848128e118e4b1182ae14f090f357c816c17ea903e893105e9440adbc16c9204126ef7c11208e167e272fe0f0d707e62900 WHIRLPOOL 1cec967217fa7b2e52695f72a26480f80ca6789efae095ed15a6ad4c908cf447d16302b2117edf6e20fb920c0360df6e25d971928be60fcf3c99510be06fb2e0
+MISC ChangeLog 690 SHA256 b45875668cee44327e7d066482d56d32c2f8349af412d32f702930a2d7865bd0 SHA512 08a8bdae113f1e3f7dedaa645d496a95993a94a9e6466851fc049fd8bfe8451ed80a19ea79551cbd3dba3633b65efe3fe85f8749d647dd32385ab38e3df713c9 WHIRLPOOL 34bf9d1ec2972b3fb6e3ae09c833d127c464ad7d2175cdba5ff906836d843fd44387e4ad90bb85d2825310f1dca4c1511ac53d49df573e38ebe42bdf23f2797d
+MISC metadata.xml 307 SHA256 32c808c68b0454c1ef2744c3ca699b3e920533bacfbcbb49e226a18f83317eb5 SHA512 0b382df4900d885e0df10f4a559d4c1e21bf9d5903bd5db613195bd1109aa9114c49370d2020799304d4359b405beeda8bb899d46b09397269da99353a39372e WHIRLPOOL 89548755bbcc5dad490caa1c6a329a6833330e7bede66d6b40bcb360c71b60ebfc9d72bae4372855b0201bf5dfd55097f5da30c7bab82e990f7f6d83c737cfa3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVb3giXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVdG1pXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiB6cP/08cpEu6yhImj0Dicj5HNHcT
-ZpnmjyBS8U3A5C5FYHZ3JJUZIbnuVMJcd/uLk9uGrZ968BV6OUWRQ9cTah6WOMoe
-ozhT9fM6aiJ8MNOtUrfac+wqw3cCUxseCHM1hDxp+/CuUvddbhSJhNYA9NumfCtJ
-BHBduvY+Xm6pt9NT0IHF5FPy3KJ8q54tqstfE59vnGtepbjkL8ZyVYQ0SoYNUZ33
-PtxNHMe67MfIIDOZED19uj5ETETTrIaz+5aP92EW3rO5SYfynjnhLyJFa7GwWT0w
-bQrT5enAg0MV/PwU722LP8BOEGEIIdHaBtVbADeFutx39WsYF2B3+EtN1obIjN5R
-fpqIlLcGTsv3+YAl7qJFRdXuqB5VrZ0zbkvvHbT/ftzzMiIAuzJQiHRMqXTliuyl
-IYSfo9kKwpo4aJnCE0dpKc4czP61jmkQmIwgGPVCHiWgD2imC1a0JLqQDwIYc+wd
-E1nE/OwzX88jGQocmiK6kpeENSWUHvJ80pWm9a85EtDxRgqZngfi7BhbT1kkSkxb
-W0EG7N9czsQ40HMTCit43Ama5ToZhhhbynB6vlq/mdKIiHoh2kxUFdN1ImfzcV3N
-l2QDRbKHHc1fdK9RRe9Jv2WpSBg4AAYQ2PGwULTf83KVqM3N0202z7N/l6ufGDbv
-DrRqX4o1k3Xubb48CIys
-=Cr4u
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmicecP/ioII8Yj9CR2NNjaiRKZusLZ
+l+rmzwRGC2SVqc8a4gPCNckThg68xsC+tZP1k58aniktsl6JUTlJgpFk+sE+pVgE
+YddNei7Pga1mOp0h7Ny8JzOOA5G/Wg+0BQQtlkeE8HiRbUq5DFUwl3PoF2/yhMad
+bOv53Mv9t6GzitfitHa2IcL09PxO4wlbRoRUXNpoQls2sKMsSzFeLQg6cWLJ05gD
++osKbwtbXVA3LalBI2wrPItSfAnNyc3bmjPcrLI5+wiInDJfyvcoLbgIXwiwkYZF
+LWgzzhAVj2TRTTsAZ0L9cVcDn+AqxFjemNrq6XuR8cDx8aJALv77u+ulITroC9Hj
+T8PcwxY0Fp46J6C/9Umy9CKZMR+w4i7Kr0DtdoNBngFcQfSbhJj9rrJ3iOEODiJS
+A1dBLYYnQSHDHrpW8elMDW1G6NEoGLEE+eVQ6T5sOl/jgy2AvSmH8crAFRIMwc3N
++PgsNVb2HHVD2V4/3o5hD2W1Nb52abn5LFESt7pJegbAHXmqua4kz8DkLI3FXeei
+Sf4U2sN3gznjMGiUqx5heIgjG8gta0UuYEgh8RkGUa256fAdQzn9m57605QI8sag
+0u73VDa8BOJwaN1pr62/3d1LhNv+YHKE9+RWpkTrUS5o15nLP/qsE/Sj6xRlLhig
+wkbvMtl212UJ/NEwtJCT
+=NjPO
 -----END PGP SIGNATURE-----
diff --git a/dev-python/steadymark/metadata.xml b/dev-python/steadymark/metadata.xml
index 236af038daa7..8d39b56b2cd1 100644
--- a/dev-python/steadymark/metadata.xml
+++ b/dev-python/steadymark/metadata.xml
@@ -4,5 +4,6 @@
   <herd>openstack</herd>
   <upstream>
     <remote-id type="pypi">steadymark</remote-id>
+    <remote-id type="github">gabrielfalcao/steadymark</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/stevedore/ChangeLog b/dev-python/stevedore/ChangeLog
index 9247736de296..e4bbfc3221ba 100644
--- a/dev-python/stevedore/ChangeLog
+++ b/dev-python/stevedore/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/stevedore
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/stevedore/ChangeLog,v 1.32 2015/06/03 21:57:23 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/stevedore/ChangeLog,v 1.33 2015/06/07 16:12:55 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add pypi to remote-id in metadata.xml
diff --git a/dev-python/stevedore/Manifest b/dev-python/stevedore/Manifest
index 1546cbcfa130..665322915328 100644
--- a/dev-python/stevedore/Manifest
+++ b/dev-python/stevedore/Manifest
@@ -14,24 +14,24 @@ EBUILD stevedore-1.0.0.ebuild 1199 SHA256 5da184a05075aeef045e1ef0044e7f300132d9
 EBUILD stevedore-1.1.0-r1.ebuild 1289 SHA256 619442a51ee90d825bf367835fa5773d44f578c8a89e99464023645c41a6ecea SHA512 f609ba2f1e3784f0bde7b8ef63f41a8b36a9719c4047f4161dacb1ce62925cbe4ff285bee0532b0b06afbd94a7a2e2f056c8d721c02fd2b0c96d109ac0cbe33a WHIRLPOOL e7a242c5b51949b0a8d40d89e07c982c66f3679668d24c26c408116d73374afb9fc220912f27f660fc26d8e0810e732f8406aea2581e6e28e7afee02a3bee075
 EBUILD stevedore-1.3.0.ebuild 1517 SHA256 31152acf7821c98ed70f5dd2ea6c058bf9a075e391dadfe646f80d96c71a81a6 SHA512 08cbab3af5ec3a1360d735125819e79d9798e4efa1be478eb318affafb4da3f100c6b1aa3c67a8f95dc251277ad0339aca84fde7216823e60871e39d008b1acb WHIRLPOOL c33b35fc8c54cafc361e034fa5056d27e57240d3544b7ec3ec99c6d9f31d43b4b44ff4973b7b42418d09cebc9564b6d301ae29967672511fb01363327ca2b5c8
 EBUILD stevedore-1.4.0-r1.ebuild 1542 SHA256 c560bf4ca08db990fba326d73734fc97769faeaccc3df8062a65a3b75cd94f90 SHA512 eb5b62a3c29549b85adc080f571d5bf8354a70fa5d8298491a512042cd4da670c6d859455d0a549c170909f1bbff57c561216734f35839b2931afd83171d147f WHIRLPOOL 07cc81f8f4a2788f34cb6ea13ba379ab5a4f919483ee995738fc0e1ab7d359dcab5684122a8748405bab48546ab43eaa209518d040e6997188b5cbf42157769e
-MISC ChangeLog 4668 SHA256 4054dd4b9aa817b9d34464a8244d30c42d4ec715a02badd2c596293dba6a3cb4 SHA512 21c562ae4e701f25a5f931f7ec4cc0d45e7f2d7751ceb6e5c6410ad3bd328934bca0700537ddcd5af343b30ba364de42bdeb074d7cc9ff23549cfd78b60bfe8e WHIRLPOOL fdb3672edfcd1d565d4e81fca0d5123cf20a909c303ff58c81d3681f8e7254aa0a19fbfec256780256f9b3d279fb2fdf9da8cf8e6fab946a1a646e5ff43b6191
-MISC metadata.xml 262 SHA256 cc988a1c7ebb95dbdabd3f625bb45e998ac1d75e95b9c02acd84c7fc310f2b09 SHA512 9f703cb7b8a7807015d061c382207b49aff5f2b79b01220fd29a3dbbb275f219e708ccabd0ea9772696aaf9598a75be1b9d8a09d37399e17198cf68a6b97e5e5 WHIRLPOOL ba72d18bdf1b89784f4c21c214b421b4e76efaf60d9e27758656de665a1a92b21cf36ac905bcbffe91e5549a8c96d3dff931ae62785b0b1c5a9b1b3e8b2d8770
+MISC ChangeLog 4772 SHA256 cc2a3578794dc5091b0354a5a3782226afa0c7482a119cc9c456318695772261 SHA512 1f9d526be4c6c9fb70bfe463d328be3b6f6b36677edde1726616b90e7126193f00ba91a6825d4962b9de127e1b1f015e31f0135086b413306a64dc0ca7da9a5e WHIRLPOOL 08ee6c8eff07f9380524ba1ff065ebee4436d38e253dc8a6439c5823d33b7889aa954d4c8bf4906364179d5d674fa01a2b967628a578824c302a0172a16313f5
+MISC metadata.xml 323 SHA256 ee7ac94b7fb2685d8a0d74ffde682817ceb7a72d26beecc235883cf65ec2570b SHA512 897ba1cba638fd27883499b573dd8bc9519aaa3662fd7e9045148fd31b4ef165804b4b50d4a1d46e4adabe33fb85b76419e6ded048b5d6738f0bc977a8b399bd WHIRLPOOL 73077b7f20eee0faab4ccb18d7f13d7101b6452e5678eae9042ac3d6ff6cc30dc2c6ce6ac63283adc39cf32c91ed365a099dbb11d54124411a5c8cfba3ce96ac
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVb3hEXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVdG2IXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiM1QP/iX28SvWj2TQfdttMoKyrXeA
-K72C/iox6O4zVFdvzcVsWN+7dwARTIhDcFl5YQ/A8i1h5e22oJH3ld0EiI28kZd/
-9T2f/SltPSQgIgtiR1cpGGoxefIymTJeHukYee+9EQhnrDT9CRr/GxP28M/7CLC+
-ZvjwQEobBdld1he7pKbIBTZI4nDxUkM9Cx6yRQ4yOW3Gcsg2ONYy1zz/eYQGPq+j
-b/hZXcs7mufZ9SD7AvDt0GOu9Yr87VH3T2EMGXi01OIROtR6i7NFwM6RkWNouMgI
-YIF6qaN9vxyfDITVRM2o7i/Dh6ULVOPOUbN+G+XSS8RFAHz2uHElXavWYA7QKN+U
-99oNeRvsa0qZvh7r7gGsIQGgqWSJpiuwSb5COZU7UhCTf8Bgm8lNq4DM6QAjIWu7
-zUWItjXZ5gdJwNwXZlONu+eSuQ/C3m84qnRddaGCeRoec0JBVZFLY7URDiaYRTw8
-fVPeUkxcxrRfK7p8iMxNA4wjbfYxZ/5vEuXzBlctkyKGjObobwsiLv94hUCrJdvB
-AwzSCa1b/8qAjZKk85BatkL7eyChEi89RkEkhdicJSi3i6/2epqNmqQXObOgMMTb
-fNPLiPzX/usmN8Mzb8jGrCnOupp6UOXyEfM2is7xrIokSQ3Hh2I8zm2zpeadA5wl
-5j25ywyixBLtW5QN4MPs
-=gd0G
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiQFsP/RI8MNJXWh6xGXC7p1QqB8gK
+RazIdqeAY556KaPkHpbv1S4vS45sHptbZTQQa6CR2HH+b6DL5Ii7Ynb1az1k/ZM4
+Dt33CG7bOzS4bHZmgtvlsTJMWoNKjohd9qWqbyoyjy9iAFkA9q6BL8Gzd0/7m5jE
+V5Y6QOdnLI/9y27R2iX2AKzs1oUuuw57e+twJSYGelv9YL7GP12nzHXRrmqnCInk
+T5nL4YZvaa2Ho04yvAwWU9+kuh+a8pv+UB7578tA/bdhQykhAOmcGvHLtKNuQxVX
+yaykB2tqcxF9epqm1/Cjf6N4PEh7LVUuthXuP78AGtqA5Jben4eErcnYJnnQbwa0
+vVrVn5KPq/FI2kLYyXUpdx+V/wWRrCzfAtlvqZMa7/gA9RNGgIxoaMW/H9m+XQfa
+beOsvyQntp5JzESrBKsRNL2htccmh6IVy3Rs/M4Lnd9dm2V9o34jAy53U7XHGK+p
+Z+oUkbmF2iEy5r/jgGnAeghCC/U7uDjU8l+/Zh5TBDJ7T9uE/jiw6P2X/wbrCX5S
+gKi9egrd+B8KKBsEqYcTFH168KCKoEO7r0MGRVpLquAVsvk5mi/pJv6Hycqe/ZTN
+iqRCH86E65KA+KntnmZA8usu839E1BqaNDsl/EIYG7nm5CevzVbt1OmZbMCyB/Fr
+y/AhC70DlKlP9+xsdbij
+=ns/p
 -----END PGP SIGNATURE-----
diff --git a/dev-python/stevedore/metadata.xml b/dev-python/stevedore/metadata.xml
index 56db0ac1da3d..a93084d00c4f 100644
--- a/dev-python/stevedore/metadata.xml
+++ b/dev-python/stevedore/metadata.xml
@@ -5,5 +5,6 @@
   <herd>python</herd>
   <upstream>
     <remote-id type="pypi">stevedore</remote-id>
+    <remote-id type="github">openstack/stevedore</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/sure/ChangeLog b/dev-python/sure/ChangeLog
index 7de5a7039b34..7fd47d05d07e 100644
--- a/dev-python/sure/ChangeLog
+++ b/dev-python/sure/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/sure
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sure/ChangeLog,v 1.9 2015/06/03 21:57:42 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sure/ChangeLog,v 1.10 2015/06/07 16:13:12 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add pypi to remote-id in metadata.xml
diff --git a/dev-python/sure/Manifest b/dev-python/sure/Manifest
index 84d6f9995ce2..9a812cb9a045 100644
--- a/dev-python/sure/Manifest
+++ b/dev-python/sure/Manifest
@@ -7,24 +7,24 @@ DIST sure-1.2.5.tar.gz 19048 SHA256 63f9861f607c5a27d090edaf91e6c93421a11ae1c011
 EBUILD sure-1.2.3.ebuild 575 SHA256 d2b5cd2737d98d7932f023bf69eacef9e5ac79ab7151df64ca8209d702b9307c SHA512 e53d99fb4bedadf974dd2f4751776365bd58755afb52e008c672007763f8cc418112b2bc6c887697aba69b676e774448c251b14ad4613d5596ed789f73bcbcb6 WHIRLPOOL 110efd0c694a7b2104f5721b89087eeb6c12f015a54bc01206627dd541fefe641a10ab28fae6cfb46472e839e081a7d597d9bb60b859c74a727a2f4dfee3736c
 EBUILD sure-1.2.5-r1.ebuild 1084 SHA256 af1255db8491157635d4cb598020b62a31a2d6aac943aed958b8501ee5837a12 SHA512 9d6dbb76b589e868709f31e99c890d84bebcb7e48d75d808f2aba9a185a7e2ca869d9249396f7b525880b4aad1d4d54b03546fa790e74b64b57a3a03da51b7b4 WHIRLPOOL 1f01dfe5bcd53fbd96d2da535a4bf5dff903e45d7d1020d91af5cf08b03c6ba1eb1d0e417d7934a11111cf67e0b4a9413b3d47691a989b85d85c40cae73c2b54
 EBUILD sure-1.2.5.ebuild 575 SHA256 e0be11afa3a68a914a81671df850d10b4d5a9cac93a968e1c33492f894d7f232 SHA512 fdd0097e75883ee2c83f63cc67f2e5932a9b562cdcf44980792000d4213216d93069a0dce9045bcd54ccbb3f4b0397530a134a290a1c1a1559401c22b38151c7 WHIRLPOOL 26ad6a8305b9a96e8793bc2e83f888a4e0cc02ad2bc7091bc64ed2ae8d7ada3f1a8a5daca0a771b3ab14989d56a7d8eeedcdd378a16d6ca9c9d6e34b2a25360d
-MISC ChangeLog 1608 SHA256 9a4ba36e8670d3fc7f1681a4499b1f12ec1e48da5623af651ae6ce2396424b15 SHA512 a9686d21167fb371668969630d331ea4c9d6a335bcac6e83398e502ce0774b88315974e942c52fc049934c4d6a1d89d4748aa23aa61ac8d3ff1cb93ea9e1d5e2 WHIRLPOOL d34cd51547a3e7a5dce2ec0dba9cd5777b8d4f15fb7506c52467961d5b56128b878422881660591a8e20fdd60935e35a3df4d7dd1388c1142f8c1efb07d9a615
-MISC metadata.xml 235 SHA256 3150f2c356096975ce069b698c552d344feef3e8859c569e634f284a1d1c4b91 SHA512 eb4ed2fce73ef1a1de366be4636fa01ff1cd4aa4fc3c7365c13db25f158095a4d95050feb8b85eecc2c05e396886a280b864299bb609dd75e32959e38b0e80fd WHIRLPOOL cb0ebdbb7f4a4a9204cc19cd78066e5ac8dddc93a850a9d04417d948ecae0cb9742ed3e3a4bcd056cf829f64de30d173616e9417788775a9cadba7df6a7c8120
+MISC ChangeLog 1713 SHA256 b271d47e9ab03956d149e71a90b1eec5a5701307768590f3a369b62447603765 SHA512 7a624f0779616778ed4633fa867eab8ac45a28877150a6751f91d41129cb06b596aa2910a9fe9239f2ed4f386c8f972a5a388b2e02c40cf7858d37d222b80ebb WHIRLPOOL b5eab4f03e805573a1de1685ef11a990019bfbd516684095fe2d09cd055474ce50dd86bd9010825885136119bf75c13959cc416a5094944822591825a292e30c
+MISC metadata.xml 295 SHA256 9d714881b178f8ff56f0801acb930fee7aa9f52607e9e2b142ae127d3a00291d SHA512 a1c7e520e2801bed4f29f3bcbacd547b1ecb8f23dcd80b699a5b4dcd057594d08faf64871e8b1a034533934e42255d625baa3389bd64472cda2ef0463be8ef6e WHIRLPOOL 9fe4f546a0a770f657e8282f7a41d299a0739482a04ee49ec89e5c487aa5d84678d04e2d7978f166df73d157feff1ee1da7dea884b3f275b03c1fdaa7ab6bc37
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVb3hXXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVdG2ZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiPQAQALJTcGIjHDVcPir4mcyyL+vD
-kTdze06jBN6kaFnbPm/6lZ+dSZxOTDrED6Nxc+wuxZThZuQWgaNVGoZI/hw5jXEU
-HPxc5HmpA1pm57OJyonYoYkAkgHAJnOy3DogyvfI+rMYgS2pTOGyCVI3OA7sVR5B
-41fctJQ2MIbREte8LXQ4rkAE4rnz+wFO8T285PU1RJ09Ipn70epHAIBWwlVLD9B4
-5vD3Qrp1PtvIG5mYjWMzPV0SxsKPRjhvNRXeYwLQGYUGv9yPQCwzt0a0McU0NNAN
-bVFWVn8DlhweDryAiErDmljnof582UNcSJbxlj/GJ8+nzOJMSB1XFyyOaSvyOAB8
-M8BzFrSXWqrTQd7KDSDE2GTwpQV1c6dsO+fsyWZNDRq7YvAysGbiWijIKbjz6GVT
-Ubp6F2Zbc/9cqbCaSmDZEz3XWai7YVYifJcAOzA3QK+TEw10FUY7F9uRGbYSlRSk
-0ruxBb62KslRYp/AzRGmDn/gJC/9Zv71nsCOtaQj7kObDgDikPsyHRX8eYjK0tNz
-zYJNHupQDMeWVDoBSw73Zvi/64swVXgZ3z3/nuC/HU5rq4SL+aM8r7vIazv914uE
-1xi1Z8No5bilEZJdOgxu8+Qb0t3StIQhFkJg8fLL4R96KU1vVN8y1yIMk/OAyfcm
-K5iW8gV5hRJ/BAu2Ejpq
-=qkfZ
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiKbYQALoV8MwfDM9abIpBYcgXlu1t
+6vmpuGqVR4tFaMlFLw/ztMCf8KJzJcCLVktSGWrMLYuYZrzdS91vcRjZfB3gr08T
+nooc9tWSiz2CU//d969xOFkIwxOPXbmg2MyQepnOTYaHSXYgFfRfZFaAEsgqsE8r
+Kq8QZuT6zrAmcsi4DNoaX897b6pIW6Ob9l2eMKKAKsnlBgljaHaaILXmQX8Fb5UT
+Hg/8x+DrdzXVAUOuL19zuzK0zZ/IeixkYt0vGapNHf5ynBFaKZh6xPOwSexWiI1L
+ogLh6I2eEYdcV8QoGd3xboP9nCHyiQYTDhx5vdKQfF8K80OQ9mBOtc8LwJUjvVKj
+y4Fsu4ORrzLIHyho4VS9bGn7jbaxR6mvFw23nGEjUy5MhFVsnPs9trqAarRG1cqu
+Ub6YvRVEQn7UMSf7qAw/pnNt7+H75kfMYmIk2hhJ2f2RPWA0snzE3LJjeDZ0ZZ9F
+Tg9KaIgk5PLl5dYKKruKVhK9M6aHg+IpKgtKmAz9TUmdGufIIMc0zSbXXzt0ZFLk
+yjisGzuotTrQSowyDwl1UhGWMWDNmJNVFXzipQgqBNGaiKrKQSnERWqVXqLWEG6L
+fb4AHPTpt4ShWqJAP8N19v4Lwd35AXGUd+9teuxJXFLqY1DEMD7GUcutyLOuQL2f
+/0XP1ZHuYlLPRdQqaFge
+=UPzq
 -----END PGP SIGNATURE-----
diff --git a/dev-python/sure/metadata.xml b/dev-python/sure/metadata.xml
index 043272f04783..86a8cab220a9 100644
--- a/dev-python/sure/metadata.xml
+++ b/dev-python/sure/metadata.xml
@@ -4,5 +4,6 @@
   <herd>openstack</herd>
   <upstream>
     <remote-id type="pypi">sure</remote-id>
+    <remote-id type="github">gabrielfalcao/sure</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/sympy/ChangeLog b/dev-python/sympy/ChangeLog
index 01cae9fc0e62..8d0109ba23bc 100644
--- a/dev-python/sympy/ChangeLog
+++ b/dev-python/sympy/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/sympy
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sympy/ChangeLog,v 1.34 2015/04/08 08:05:04 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sympy/ChangeLog,v 1.35 2015/06/07 16:13:36 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> sympy-0.7.4.1.ebuild,
   sympy-0.7.6.ebuild:
diff --git a/dev-python/sympy/Manifest b/dev-python/sympy/Manifest
index 4499867ea3a9..f6e3e748e5cc 100644
--- a/dev-python/sympy/Manifest
+++ b/dev-python/sympy/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX sympy-0.7.6-doc-makefile.patch 573 SHA256 71206fbb563c6624e03450a701e42209578e8c34073c93462dedf8a73491b5bd SHA512 b5d3943da750bf37b2f193fd5458b3305000a4927112e5ff2444680c203c2854e75e25c5a109462eca03c6964b667d6b740f28fbe945c354064de284b2fb3573 WHIRLPOOL aa955e605055df3f2c2b5fe2f333ef64cc1d98f613d8777a5eeef5fb365017e23749316e7e9df2642a469fe50ff6d743a6780eacede73013a1a4e61be9acec23
 DIST sympy-0.7.4.1-system-mpmath.patch.gz 7350 SHA256 d7f2acd0ccfb06eb8c102dd7fae2325b35a5105a5853e01dcb863c0841dedc75 SHA512 761cdc6259101d6023d83cfea311a5547762c192b3c661ab3bc0ded20911ce464d0326a9b16d899ad35280a65046e621670e7de64ec40df740bfeb8bf667fb3d WHIRLPOOL 24693863da03dab6ed67131f46c4e18dfdc8110d0a23f49825dcb835909fa157781791680cfe46092c41c526fe281370aa7ce341f7fbccae02351d34c29bffd3
@@ -8,24 +8,24 @@ DIST sympy-0.7.6-system-mpmath.patch.gz 5030 SHA256 d5ff8ff4f79ed66714486954633d
 DIST sympy-0.7.6.tar.gz 6430549 SHA256 dfa3927e9befdfa7da7a18783ccbc2fe489ce4c46aa335a879e49e48fc03d7a7 SHA512 ce0f1a17ac01eb48aec31fc0ad431d9d7ed9907f0e8584a6d79d0ffe6864fe62e203fe3f2a3c3e4e3d485809750ce07507a6488e776a388a7a9a713110882fcf WHIRLPOOL 850c27ae73f92f224826e5c00e41a0d4644fcb290767963744a947b03b704557423c00ed9a14ad696630c4611c3ed684926d58d7873127de76530325aae08ae2
 EBUILD sympy-0.7.4.1.ebuild 2672 SHA256 4854b5554d3d6cb0945358bf0b93d015bd815ae6147fd3bf6fe0e838f8c0f0d7 SHA512 f8dc1a545972045559e8d088a9e68600bed4b2ccc271c30832fd9cadb2df6b8fe949d93f5fa8bf286722d9349dadc954feedff3e79c862e7f64b6c180fe43106 WHIRLPOOL cf3582ad29ea92c81aaa649e20826f57fe8d4f6803101b9158f9a580a30b61cf8f105f8340dd2a12c53ef299b7901508ca1dff9a3318b4f2b45cd6bd45b640fb
 EBUILD sympy-0.7.6.ebuild 2901 SHA256 2d8a13063d3a1a7a407eace13b61602b1cabb91a13fce4f6cb86fc8e18cafdef SHA512 661ecedfd0e6aa94581c38bb3f84ee06ffabca23e9e557ab41a7a325b90b6acce12521463512b6ddba75526407ca73f59d8a46c05870381ea5f74481ec1b7978 WHIRLPOOL 443363d4a5364c221b0d5cd87926fdf69be8f323739120aa75fec375b2b2445b5b2112b4d0a1e2f1b44145af301a8ac18e2e30561b6ed2b7f12e9f7f7ccc3927
-MISC ChangeLog 5552 SHA256 025accbcb81e32b2b652b042bba9aadc6a8cddb4fd9105556efdc4bd9127cac4 SHA512 2ee5a3fe3bfc356ca3250a8d65256f1934f0565a896b60b59d6825d421abafd14eb7d88864fd3317e7fa414be27702b118ab9ba5818ac4c35df649d821979b9d WHIRLPOOL 8b8e160b03b8c499c7280e66e34defa99e81a0fbb36b5cf1c17a2e6310cb8d2504dffbb31283aa12b188653e93d902c43783300f0f7cb0c7df5bb2205e996032
-MISC metadata.xml 1261 SHA256 9fcb134a23dc8003cfdf3032cb08378b2a8fb28700425da9be0e3e83c90c9703 SHA512 6c23548d85a0bce5f6b023e3ed835dc201d2ebcca7074b8c1ec538f1559deead44dcf7b9ffcff44dc4e40db9a85cb57dc4b8e366a56f32ad0ba411486cf0c16b WHIRLPOOL 3fc556df64e3fd8aaabab4c0c3759082ec39804f066f7c17bde61e7d6967afe16ed5057224f1485680a82ae4cb60ec1423c95303860059c720230b81fe32389d
+MISC ChangeLog 5654 SHA256 f499b420c429d816e180a6ddf0af3068262bdb5198a8dc9c49910414b603f657 SHA512 cb2b8de6abce4e10aabb5148a557cc87b65edbcbe64134b60bfefd7b68fce6036d8b6e5a5f446bdc76bd6053fdb8044e8eefce0083462c2138a0edba40bdab36 WHIRLPOOL 5560c892ef02fdb3bfc4408d494be2a14b2525ab716dd914ddf830a76d8345b3e21c758bcb3d7a77d8273a7e94537d8a09c3f9c63794638902768ca3835bbbf8
+MISC metadata.xml 1350 SHA256 26942d7eb64d9c8922b1a9be8cc1e39d3ccf82034c9946f0d146b705bd2393cb SHA512 0efb9e6ea2f2e63e5ff6ccf71fc61ae11d551ea13294e851bfb3b3be628c4f52921e6f4e0043591f74b85484eb41c0c3096727674f3ec7bb1e9e330f75905aa0 WHIRLPOOL 147a28ba9e709d221241118ddc6a28b0aa83036ef487bc484c07e2576d1d75c0b09e8ba42e96affef3e08aa373727198f91ea250fa72b9a7aafee886ecc212a2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVJOKXXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOxAMP/2pkX5dn+gOJWR40ADNXmI7L
-vQ0CeFrM+T6Wgh3QJs6FEFjBdTH0vxDpUYzoFOxYGvwhhsPXJC8qGMQtc6B4oB/m
-EqnFjXLqDihEzchWX7gwfzOr2OzxwPRGWWM07kt59eo+nvoPrOYdjpUzHxs1lDZq
-m859LajWelewb68OVLXabQhwBjr6eN1paDNeISPvLLjOU/yhuOvW53OmTN0bVAnQ
-xEb3xwpHzzSyA4taVTm/JYCAG4aN54vOSKgNaPlBB6R54sLTHs7sAvYD9hbgigov
-DyHXGUwew/br2IliWWw/+ZPJ0LdQJlKTeb9HKGrAl+74cFWsmAxGQSxInIgNiL/Z
-+Y3MfQZ6+zg1pqUqSZ7JlqIxLYewflctSfkLHrurMerWbQ6HqTBG+9R2AREaD+jm
-btZ3I+FjK7aaXftS0pEIq/FuwHFiwBaHTdo4w9e0SyUy8akCdtQYaNU4HOpL19x6
-X7IjnAIZfCVxqp/0dVb/8bTkt1Y+aBGgyrwxm47nMhyWD7TROR0SBIuiCkm92kgz
-VZcoNw35tlHySwTlUUB3KJFVPD2I5u9jkFDtht4aMX1OPdue4Lp0+aCiBsMLbbGq
-90nfTPrYetZ5RUZPWmNiHx7KpLIgmK0AXHByxBpLzfH9M5RiLCOItoiHqszYGHmZ
-V1XbaC25NcsY+oUNtQ2V
-=lTj2
+iQJ8BAEBCgBmBQJVdG2xXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiDiwP/RRCa58VaVl8mICw6QOvR5VG
+fGmhqBKjjqr6zulL/DSwmy/2sajAaKfSZnecscgpmw6zrBeDpjI4CGen6hlxA5gK
+U3Gd+XQTcr5XoAqNmzVy6c0nP5NAQpddEbIYetm5SiePgELSYTyK9nPDMxg7z+Rq
+hlePQ0u1asWgN3KKUMvhnvxGLOOysigavTZzpbhovP0mOKbhMGB760XPwVMaGtvM
+CjZQJC0h+Uh4p/PoLkhIPtDxzt1HJ3jlDk6CndZ05kwFMI7Yvzgitk7f4rSE/4wi
+kJt4CLwk7/HHliz/Vkx7qqMQhujxmRmIMPhSn3SFuLg+uRbToigBSsNXLImVrHS7
+nBXlykBfLJXqyE7YbdS13U4Ir7U5AsQsXJLhwQrswWRfUXAdiIOMhlcbCxS0bfu7
+T2anM803te9j4ebrDbCfbsduVeHAPjEvFL+B5oYDIZ+/IX1HGDGQ8rMDlx5xSby2
+GCDrhot7Wbkf3r73frOkcScZmxD2pBsC7PgkRnqBeE4MaHwndN7sUQ5cRmOPPD+B
+AwhHQ7tpFG0Wl1Joy7WZsqhR/NkHh5TWJCPdJSOO75ju3EiNYv2Mkwth5niNKLp2
+TYvInsfeVulYAu36r07vTo3hGmRRMeE2LkfBD2o08+5B0eUCoYi6+F1A4BR4I1EH
+51OOoLyWqyZGbobKnGyp
+=/zFU
 -----END PGP SIGNATURE-----
diff --git a/dev-python/sympy/metadata.xml b/dev-python/sympy/metadata.xml
index a3608fef78d6..6a28c74a99d2 100644
--- a/dev-python/sympy/metadata.xml
+++ b/dev-python/sympy/metadata.xml
@@ -1,29 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-mathematics</herd>
-<maintainer>
-  <email>grozin@gentoo.org</email>
-  <name>Andrey Grozin</name>
-</maintainer>
-<longdescription>
+  <herd>sci-mathematics</herd>
+  <maintainer>
+    <email>grozin@gentoo.org</email>
+    <name>Andrey Grozin</name>
+  </maintainer>
+  <longdescription>
  SymPy is a Python library for symbolic mathematics (manipulation). It
  aims to become a full-featured computer algebra system (CAS) while keeping
  the code as simple as possible in order to be comprehensible and easily
  extensible. SymPy is written entirely in Python and does not require
  any external libraries, except optionally for plotting support.
 </longdescription>
-<use>
-  <flag name="ipython">Add support for <pkg>dev-python/ipython</pkg></flag>
-  <flag name="imaging">Add support for <pkg>dev-python/imaging</pkg></flag>
-  <flag name="mathml">Add support for mathml</flag>
-  <flag name="pyglet">Use <pkg>dev-python/pyglet</pkg> for plots and print preview</flag>
-  <flag name="texmacs">Add <pkg>app-office/texmacs</pkg>
+  <use>
+    <flag name="ipython">Add support for <pkg>dev-python/ipython</pkg></flag>
+    <flag name="imaging">Add support for <pkg>dev-python/imaging</pkg></flag>
+    <flag name="mathml">Add support for mathml</flag>
+    <flag name="pyglet">Use <pkg>dev-python/pyglet</pkg> for plots and print preview</flag>
+    <flag name="texmacs">Add <pkg>app-office/texmacs</pkg>
   interface</flag>
-  <flag name="theano">Add support for <pkg>dev-python/theano</pkg></flag>
-  <flag name="system-mpmath">Use mpmath from portage instead of the bundled one</flag>
-</use>
-<upstream>
-  <remote-id type="pypi">sympy</remote-id>
-</upstream>
+    <flag name="theano">Add support for <pkg>dev-python/theano</pkg></flag>
+    <flag name="system-mpmath">Use mpmath from portage instead of the bundled one</flag>
+  </use>
+  <upstream>
+    <remote-id type="pypi">sympy</remote-id>
+    <remote-id type="github">sympy/sympy</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/taskflow/ChangeLog b/dev-python/taskflow/ChangeLog
index 8619ef4a9f70..bb49ab96f1a1 100644
--- a/dev-python/taskflow/ChangeLog
+++ b/dev-python/taskflow/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/taskflow
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/taskflow/ChangeLog,v 1.8 2015/06/04 07:08:11 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/taskflow/ChangeLog,v 1.9 2015/06/07 16:13:59 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   04 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add pypi to remote-id in metadata.xml
diff --git a/dev-python/taskflow/Manifest b/dev-python/taskflow/Manifest
index ec9dfd5be1c5..5f6895064bf0 100644
--- a/dev-python/taskflow/Manifest
+++ b/dev-python/taskflow/Manifest
@@ -13,24 +13,24 @@ EBUILD taskflow-0.10.1.ebuild 2266 SHA256 2ed7520ce4ed21f524d046528178afe2ccb801
 EBUILD taskflow-0.2.ebuild 1620 SHA256 0bd91c71784a2e26f85d557f4acc0abf58ecdbfbcd62f799a3fc3477a8ccf320 SHA512 b47e880b4b6478a01c1c86e794b4926d809e40bceea8b3dbb7d69dca5d41d91964b73d88c27b175e236038e2e1ebebbf34497a2e63f267d01421604213558f31 WHIRLPOOL 2f856d4f62282a6a03b10767f1882a40f88d8e50c8539f783188f177eb6ca923e3e0f5cd9e2461cdd9720697b4a6bd4f5e7714044eec84ec5ba2a3d1d27cc68f
 EBUILD taskflow-0.5.0.ebuild 1821 SHA256 0864ad7b3270cd1e1300b7b91da95ac6c5c8ffc9c1d0519947c8e4fbdc37fd5a SHA512 56d3e3f2c848fb558ac8728d2dcbf79e0a4621ee3a4b77f7c5a44f6d1afefbf9f37667944cb628f4bd51582bece8007b47f41df36b0a8058cffd2284146af348 WHIRLPOOL 8417fe5a8d177fd896018c3ee96228f6e078a7364c10b9cac34f9e2dfa6b180e4f7fa04687927b91abc8d808078d7b2ccf1f488ec23f52a4ffdcddb8b12d0be6
 EBUILD taskflow-0.7.1.ebuild 2103 SHA256 25dc87512abf4775a74258bf9276f59b0ff91f44bdc78079a5b9b77403dd79bb SHA512 29918080a2a073e72ae8b30a7064292a7ae74db4752275ab5bad068c3a68470e7aec765a472f2a2148cf18bb390225dcb1c4325870adbc2fd1b60c23bbdb00b8 WHIRLPOOL 84af102d193d8f258e9675a4eb8dc38a968b46a3fb176e12d183bafce0c89e338e386934e837da03b70af2a1518305a91289e7ae7af42db0069bfa90e45db08b
-MISC ChangeLog 1196 SHA256 9be51ccf5ff68c736301fb5d357cea0d76dbe57a6d4e7c7817640d2c2801d686 SHA512 558c0af473c9da80d9bdf50e850aa93b88096725c66903944c0a27bb72085a4bb090da15219f67368a11d841494a4b1b9c153b9fbcac432cd4bd181971816ae3 WHIRLPOOL cc28e9882d19f105e83206aa7c95a16f04a619e1965cd1a41e1c36871c9459f7226438b762da1466a4692987f1dd84439dabffa1df89a9ba24609591f466e7c1
-MISC metadata.xml 514 SHA256 57a4b4c8eacebaf7be30bf47ca10e711adea8b1b71a3d8c57da97c851da81533 SHA512 90f4d32a91f869246e5be5036d395de45272fae785e2060ff563698dcb821b58e41b4e59bcf9d812d6d8f2adbb28736fe3c7a86eb2fd04496a29896dc6761b0d WHIRLPOOL f923abc4ef46feba51f613aad4e9e455ac7f92ab1704d53402fc83ff868c18aca803b13467513f1ef9a1f0620d37ead7021e3c6fc36eda879ff71199a1c1312a
+MISC ChangeLog 1300 SHA256 00c2ff947907d1551c53e4831aa3fdd71123cdef83dfe328d929049409ac519a SHA512 887f956d6a2073ac3ccb8b529dd34e6554485201ecdf48e6d4a3484a315a35d00eac256886b5fc500eaec5fad7cf36c6118539ea0142424256d25fee62156254 WHIRLPOOL d3cae762351a420416314f0717b26f0b53fe292a587476cefe865d284d073590389cb34b2114c1eb4c7612ca9c96a2dcab6ebeb91ab7c64c20419db9e9c64180
+MISC metadata.xml 574 SHA256 f1d92c54ef0e34eb0266c1921a41f08dff6f4da31baafa7225181e2916d43a84 SHA512 89fd5d743dc2e97803c2df8c60baff2d788b0d9a603558f69a5f7263eab3f401a626c7de10806f36869ca912d6634b986876fc5fe897ffbcdae1f3152b6ead2e WHIRLPOOL 73881232875a04b9d07310844f5a421c9f9e15f5d54b9e569ddc8a92cf01bb47bfcc356e0c0edcda47c136f400edcc51a3e5a1d9c38e7e113600318b82ca65cf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVb/lcXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVdG3IXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiymQP/iaZX9PcMlkiZOt5B+6r4BOw
-0bYvp98Gsi8e87cfiA1z6xZanMd6mgNo3OSWR9iQukK+3nzySTmsF/IqZWBYO1Gp
-qvBaHGoHA0k2Uv9v4ib2ahDLMmgfLoVJrMhV+jQNAxD3hXcBHpPMXIL0xTewLk54
-rHip1BTnM6QXkptvU1hGnrcSlXSwz9lDskHa2L3LrUEeBbZToYbUWdEa+RhCjANG
-gQp9w6SmJAm4ofiMM6kHqazldZy2kb4K3keGfz8Y4cXicro4yOxVw1lDJZq5LbKh
-t3jNJ144WjDMhoiCCfVUcC7mEEjVIlxWiyws/2KbD+c6+3tlsriUhHJmtt+5AUWs
-dQYUlfu3oZIX7JREOud4n85/YMcG07gNcGf6w5cxlVBf6tz/18e7PM3ncgPJn+uT
-oFVFEJ3yj9BjKSAH0jRj9f7+S8mD4nFLIzs/suDaXeBTwNxksNntWC/R/76x42be
-3F2DYfrWT55uYk1FzKh8uC2gOJR3QzH6rLhOt8NHDw3kM662FsnnYpIsAdzKUW7h
-pI9Lac05xQATKHTm8JtyyNuibtyQrGZkJbtLPyYv34Dc9ZJoH+BlqgNbhWVCYlSo
-4oRd13WJcZ+dTlZmoTt+9Sks7oV9s0xEgowDqHkbWsm2e2up3RF1PekJIyebyui0
-swcsoqyIQUpdyRQVvPAG
-=8bXa
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi0fkQAIxf0nQCeF0bFIgFcuOhZh5k
+KKeEWJWdfEfz7rixlaBE3FUtt1YA9QHN9YbQpUgskW39C+/oiOAufPO+iFyBEywy
+No/daZkZyVEAINJQa0pHtzhXn21Aoquo1oyUj9PWcDEqUK+l+Xcmr/BoKFB6Pk/c
+XgkcWCGYCY7cZNOkZI1+0HDN7AsqwaPpir7MEtj0DrMS/iAC5o+efsbJ+myFlvJ8
+YU65y9anHizvRGKdNgLK+UA8akjeuHroOLqowyWtjoUB6yHJ9uVy0VUySS5tvNiX
+HNO6wkeM2PkAyr4iaQlfGr8oGOoCBv2tLu/7qHSPNS9MfBeivq8klQcYvcJKPkkm
+N065PYHRHV7hxkhewuTApjw2o68+hunyMqkEuswIkQYcQXABNyOjE9SRo28CFkXT
+N05gUdmaP4nAJHVq4/tZvUB21WyNPx1xjeZt9oooiZ+hQuG4pYKRTFJDGHo0bDqo
+mSL4OpkMix8wKLr9q+1FQms2gsgRHDa1patMtWgsZWbZD3a9Qw+slY6SbWJmILc4
+LxBfFDLtoMXg8W2pIlyNJSVuY+jXDbTpg6WYeEhmUr4QkkgekmHv+QYLOAY6v8dh
+uTFBL4X1sTb/ATbesOGN4EiM8dtoiJp2hkQAullEZKv04tZ0v8NVRN3dIXbweyfn
+hj/UkaEJDezNA4Vq2hKF
+=RZeC
 -----END PGP SIGNATURE-----
diff --git a/dev-python/taskflow/metadata.xml b/dev-python/taskflow/metadata.xml
index 8db1dab8e35b..1a22092d6b2b 100644
--- a/dev-python/taskflow/metadata.xml
+++ b/dev-python/taskflow/metadata.xml
@@ -12,5 +12,6 @@
   </longdescription>
   <upstream>
     <remote-id type="pypi">taskflow</remote-id>
+    <remote-id type="github">openstack/taskflow</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/tdaemon/ChangeLog b/dev-python/tdaemon/ChangeLog
index e5bd955c58ca..76122bb7f6f8 100644
--- a/dev-python/tdaemon/ChangeLog
+++ b/dev-python/tdaemon/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/tdaemon
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/tdaemon/ChangeLog,v 1.7 2015/04/18 12:53:33 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/tdaemon/ChangeLog,v 1.8 2015/06/07 16:14:16 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   18 Apr 2015; Sven Wegener <swegener@gentoo.org> tdaemon-0.1.6.ebuild:
   Rename distfile to include package name.
diff --git a/dev-python/tdaemon/Manifest b/dev-python/tdaemon/Manifest
index 7243be35782a..272d0e56d35c 100644
--- a/dev-python/tdaemon/Manifest
+++ b/dev-python/tdaemon/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST tdaemon-0.1.6.tar.gz 37206 SHA256 9f2ed243f1d4b20bd54da505912c82c65dd3cbaf3e247d17a15f42dd0a3e5d56 SHA512 b0d49cc3ca4acef8bdb38cde4c1d17cd973215a8cedeb5716831ea129e8fc69a0c890eda7740a35a238ce39272278d8a80c3e4fc26099317bd7b86e80b36def5 WHIRLPOOL 39f72d4e381cf836b1d288a4d2807383e095241268b52cc8450c2d118182ee3befda5f9b5138f0f3ed9e3998ef4b1718c1ac02c86529df44bd3c17f8a3771dc4
 EBUILD tdaemon-0.1.6.ebuild 805 SHA256 79ad419f3e1b18b6a0747e0f80b9d8851220e4d8f2161e67c913c91e987026db SHA512 e22f924d68eef5f162dd4a57409ed0ee8d26aa7ccfce884b3412ad54f8c120d5dfd5ed4cf360af2947a3961adf429e8e40b800a406621d05b70e4fc6ea7e4c9d WHIRLPOOL 1c4e755fc45c40b79ce787de316d2295093fe29f5d69157f02bc26fb9bf6e825895f23b439ff06f790f792f714640757ba8e657ff25c5118f5c2ebf2a5fc6bda
-MISC ChangeLog 1369 SHA256 19271582b064dd8ffe195f1d1575f4b523a852ef8b7fa8e58db06aac85aa3f5a SHA512 2449e87091195ab08847fe0f22c7442d69a3b98c374f1b78403d9f56e623875383ebe10aa247e4ea8e454697f231a6b3a94f0fe88f2c70cbd5fc28c790cf609d WHIRLPOOL 4dfb974a10804ff0ac4c894a81d7ea4a3c26a0b00e1cb546c1127793464744bf2ff5d513e6bc0e9d6e2597de556fa6381a601cea7b937013d8fa060efa025f41
-MISC metadata.xml 235 SHA256 981051bcbd8ad9f83963d426ddb6b6e511e04c1a31d8092e721feecf10393297 SHA512 9aeb5752c4ca34e7fea7f15345cadb92b77c426bb13f358f2007baf79f50ce160df182c4eeb0c978f109e7852f0f1e09e066f0506e591a83f39d9d8dddc4938d WHIRLPOOL af8c4fb0fa4780afec08627b6902a49634ce386a58d5c95329d082daf25ff278a54b94bf186191d9306b604bd8e4fa702eca893a7fe4b4f61cb191fb43a75480
+MISC ChangeLog 1469 SHA256 bc79cfdaf1340d735e49f172866d07fb226fd01d8cd1d63adf8c418bc9a0b9f0 SHA512 afabea76c23576a69ad09e322fb4b3fa38561a0979cfdbb44a16c43929e610afb73af2dc32dfd91142e7d39b63162ba6faff1e1dbb4e0e9a4c03055ccd593b97 WHIRLPOOL 36090509fadc3c87fe2a9fbbe566c9a9cdf30339420128abddcdc5bfd32d34e893141cf0da6756905db24cb3d470382c2b322b0e4b57ccbe806da43a0911c9ef
+MISC metadata.xml 326 SHA256 d35875c13d4419d53d1087a8495e51003b761e2455eceb71071112c314bcc265 SHA512 5d6bef92d5f54ec380cd8b20ef3890c85361caf00065272e00c5b674a4c8055d199af80faf58e5cf3a01384b8eadda762b441fc921f01f51c9270a874bf4a94f WHIRLPOOL 3001a85579e2823051c3592ea17649f814964293b480485f252ab70346c24ebf84bd63a0547f7982c8f23a131bdee7d4e48a529869667750f04e0cc6a7f333bb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlUyU84ACgkQI1lqEGTUzyQ9ygCggyDV/QmHje+1npVkmfaDP1/M
-eakAn28ZMgywkX70gfTsjsBpILRBoj/F
-=my6g
+iQJ8BAEBCgBmBQJVdG3ZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiFIwP/jQjFtUOFsGtqP054Qzjr6JP
+dPDiHEKJ2oGKgE614b4kt5kIazx1AEqiut3KDdaFuS+lN8mZX3Ge89ZBDwRD8qHN
+vEsuUZzNvWvhkBMBo1JSpok4nxFYs3y79XGDsmvtq02cJ7SCN0OswNgL4PkrrTac
+wnPAffoXzsO4+4s67J/3cJBjhdbrysoCOeubA1XlfuB7q1UFQyJmyEuY7QWoH5nW
+e7ybUFUquHSArTog575y1QNYvgshaslKnkai/R2kWTzIbgNGWYpcyXzUYxtf7TzW
+l1+A31Auwoc0pUSpTWM/3MN9oL92Qr1WgcSl8q/muUKAj4M/9oIZvEcy9SQcPgg6
+Jk8Bc8vYpZaq1fmbnU1BLqo+UHM1VHMgd9A1137oHT5lKkTzuzve0XEoFpXcZicM
+v3xShRokO47y/5worN0kheTmF3qOIEhJn93A+yoX2uIMapdL8i1LN3Z1oCVXr5AK
+3PHdB/PkAV+3oC5+XQclvnRiFTwpEfZiulCEaGGYmCkteHN/qbsC1fhu5Hskhd+g
+I00TdAh8maqd50R3gTqmkueUQHBk/g6EXegKOWdlB5u7PSsI6S6btb2lMZhZe+rh
+8vxpdFSnF5fC6NT3p4B5WtwXmTWvw2oyenELXhJzZnk0YYqyEuZZBWmSvU2/g8GF
+3b4G3dXAg+SOP+jmeKwc
+=w20q
 -----END PGP SIGNATURE-----
diff --git a/dev-python/tdaemon/metadata.xml b/dev-python/tdaemon/metadata.xml
index fe9771b1a65b..75c15f485233 100644
--- a/dev-python/tdaemon/metadata.xml
+++ b/dev-python/tdaemon/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>python</herd>
-	<use>
-		<flag name="coverage">Enable code coverage support</flag>
-	</use>
+  <herd>python</herd>
+  <use>
+    <flag name="coverage">Enable code coverage support</flag>
+  </use>
+  <upstream>
+    <remote-id type="github">tampakrap/tdaemon</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/tempest-lib/ChangeLog b/dev-python/tempest-lib/ChangeLog
index a7f99f491040..40b613451240 100644
--- a/dev-python/tempest-lib/ChangeLog
+++ b/dev-python/tempest-lib/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/tempest-lib
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/tempest-lib/ChangeLog,v 1.4 2015/06/04 07:08:45 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/tempest-lib/ChangeLog,v 1.5 2015/06/07 16:14:38 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   04 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add pypi to remote-id in metadata.xml
diff --git a/dev-python/tempest-lib/Manifest b/dev-python/tempest-lib/Manifest
index 6da50bc88caa..ffad5ca856fe 100644
--- a/dev-python/tempest-lib/Manifest
+++ b/dev-python/tempest-lib/Manifest
@@ -7,24 +7,24 @@ DIST tempest-lib-0.5.0.tar.gz 74579 SHA256 696c6ccbbe13236096a94176ba2970e448539
 EBUILD tempest-lib-0.3.0.ebuild 1860 SHA256 4e3cc1113f22117407a22081fe00efd860674fc70ad23599a2c55c5799bd3701 SHA512 d0c242c4f31dddc827b229f30b5b250d7cc424b9149d09397a98483e4019f98b3a0106644d8feb9f0bcb886967e3cdc1700a999fabe6df387a0e9aadbdfac7cd WHIRLPOOL f26fafd18dd90d56feb74fd58521e96fe70be22ad4a06ece681440740f439c263e5b9b8c7038c78d2bb89ecc0d14af9b244628e28eacf3ea05f3ffd0282903d6
 EBUILD tempest-lib-0.4.0.ebuild 1860 SHA256 e847ebbd87017f724cc42bbada2d19365bdb8d89db31935c73d964a53ea866d7 SHA512 c313fa7b0159f934a0f10a95c3a0ac5270a82119f21f49d69a198a3b5460074c034c21ea0753149742c8033f5804f83bf83597ceea063b588b74f76f06166c10 WHIRLPOOL d9c036fdf1d06f1c7054f357c01800c11e8bed9b9028d0bdb443c476696da6582b0ff59bc60a9e86833626708398c0adbfedd193decbdae6c9760c86c0a5d818
 EBUILD tempest-lib-0.5.0.ebuild 1997 SHA256 68ccc84f2639d3b417ce155b57140c8e9fe081e50fb57646e65d373d9967c39d SHA512 cd819bf1b5a48a38e4204bd6066f72c6436c14d996139d2f9e2ce68f2d157fbbe8c79c558ae5df8d039796b1467cb8ee54f60472c024985828bffa981249c4bd WHIRLPOOL 5756bba0b0a147452905671e97ee98cc3a47505ef08c48223ea26b3c63eda44119b87845975ca9ea5690313df751828b313c365f5e30a9bfd49fc8f44ff19766
-MISC ChangeLog 746 SHA256 bfb6bfda4e77d0498fdc46aa3a121fe536e0173d7237c9017114412e4aacf680 SHA512 c898804cc7f7dd04d746598dcf5246b0e3b5bf9ca4747847cfaae39acf8b3fd5db6eeef55ee6668db9a7d18d4f2df2c64469ff6b83072381154ebc559c2fcce2 WHIRLPOOL 46173c04be1baececb28baddf3879fca7be0d9c109170936455a87aceb7c5c895723c96817372cbf4eea260b018eab9d822fd795be443ea59934ee3856bd43c6
-MISC metadata.xml 533 SHA256 6b5887c1a8b2b417eab9111fd26895fc05a225a4cafc7dbb741e8858384ab715 SHA512 f9bb99d6a067d2b852bee928fb74e587426ae7ac36c4d3504825b6b3ccf84b5f1a995a701370dbc79e69a588445cd454e3c24e5df1eeeb4c4b69afe3522bd804 WHIRLPOOL 8db422b9cc8486323de3b5680ecf39dcf14341bca76b9c5e9df298f6e3fb4056e733ecf85dc8247ac91abb59081d00357608337a3cd247f5602063783f527905
+MISC ChangeLog 850 SHA256 266a37a9d03d35b157ee0d1b7ff79fd32fc0db0dab3144b423dbc80d32f92443 SHA512 cf5df6204eca484e2f0d897a2c8e0d1d653ae3082f69c6f64b3a88da085c5d4e67aaf3cd5267df97298ce09e5d0abdab3f36d1e864a0247c0ffc5cff7a4ed2be WHIRLPOOL 854e259314486650375823e5aa055a71df779d3689a23d1d0146482947dee3d37a3bf7d21b436803c695e516f9b82c26dfc93e6dd6b86df133182271d4cbd2a5
+MISC metadata.xml 596 SHA256 51a8c30770b70511d64bc72bccbd0df8338e91abe448a206b7efbb4fcfc4bd70 SHA512 8e701bc12e8288fc19805e56e9763679f689f4947322aa99b3ce3a07a39bbf4f740ef6689f27fefbfddf579da157f76ea34b75ceb83a8c32f977f06617a39379 WHIRLPOOL c9016d8d578b043c3f8d411d893d002cdbc8cb1080b2f0056e5d14a86d839eb904192ce8e87bc75b5827a463194b5b4558ec525dda7d90b45bb8779231fb6817
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVb/l+XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVdG3vXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiAHoP+gJjb+N+2BumF4kFigTZZV4a
-6VnL1VU6eAdMgMftiZ+w3xLYWs3OBLJ3nLLd12caF36BHmP/ahJyyrsBX/o/rPRA
-BLFDKyPJmMRUw6979IZH9gTHaYpzlOv5sqhpzABjIfFG97LJFp5RQvNMmd9Vh/kp
-g2ulclVo6fBFff8KZSq7Btri+oXuocqEDb8C68guDLP6SSuE4S8t4K10kTMHDq0K
-gx7rskrvAi8q1kDcyb3n/YfiDYzch1CgAiw0tTBT9WG1/TLGPpmF3KiR0P7GdNvH
-2bPALR9zPwMSOU6IW2z+GD2GY+Pmw6uJER+msbkhMFP6ZoPg/TnH2TnNc3paTphO
-SyfEVM2bCb3YmAp0eH6pyhz8/Jay2SUvefXqR81kFCMx+hE8u9wSY76E013Qe7mo
-hqhekS4D9WrESL+KYoq0wpNYe6e+w14lpIGzdNtCHO8IvFW9Lm7teN4GvGUnUklA
-fiiTkKvHGrvGXFIlkzUza+yl6MsDo60naa2GqN/mTaVvtSV5TZI6HWTxaRbaYfAD
-SnAGpBcu0eywWeCIdwj8cxuwQfgt7noBZnzYj5izIlt3KASFGUQG2bsTBmrTYct/
-5jHTUvwD0KxqG16IAmoCfD5jNmO5O0J1tlF9xwKvDjT19TC/4yQyc3c4VU5H9tdf
-cZhb4Y9BYzULLLIfgI/u
-=o4PY
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmigUAQAIhq2PeoLMuvuB6FVvtkUSka
+K0AqABFl5BbsZp/hy8Dn/si5FbXczFu0rPikIV1M5Qb3xlC2c+NwOJjwjp9p4cKV
+03WgWoVRJGJgIU0Rqu832VHOgmdpV/Vaug4F5qN0VjXVhgit9zCMEkEShJpvQaEi
+ZAQ2lXntXbQBCbT4uZQg6nwYQ0DuXLqDxrM7mGtfOQm1O0gvBaH4HPlJ/qG5/2WI
++ml7isEuGVvwR/Qtx0q/yio7jTaoDRGT9xRhE7KQi7WmKpYsADIoXQ1n/M2K/cOl
+8O74o9q2PeWYYPKvD4pLlcIcEUsPmJIBLlbFX0PKjdpJgtQUqPjHc5sM0h7KJC7Y
+LCouaPegBKLq4YHYHQ1feZTyvq2av0Gn4ltgHcSPsyxGzFKY36XCqlMNvGOe20pC
+Fg6SnXXVDwoB4FPeYa3/04opzfJKH6uDzDAj92qHPgrxMrPuzK5cxAHxGIns5xFW
+2xswwoawWzzNa2OWLHfUTwJqWuub/Lc7TgL3bi7BVSwunSpSStHq5+fGN3WhFPgj
+OTSFWZozdp1FCWPUdtOkLtFAqJaPn7TQ672fBVYQWl1WQ69JJgxgRBxjKpSdk3yt
+lE4xKNu+9omdOA/NeGEuyZIQ8hfiU7cjg5o8yXQCKBUobKqMqiF9iMOK/kXkjBBf
+Lns4lq7suuYtfI43bbaN
+=TnxE
 -----END PGP SIGNATURE-----
diff --git a/dev-python/tempest-lib/metadata.xml b/dev-python/tempest-lib/metadata.xml
index 8e93738b06a7..074404a5ec36 100644
--- a/dev-python/tempest-lib/metadata.xml
+++ b/dev-python/tempest-lib/metadata.xml
@@ -12,5 +12,6 @@ tempest-lib is a library of common functionality that was originally in tempest
 </longdescription>
   <upstream>
     <remote-id type="pypi">tempest-lib</remote-id>
+    <remote-id type="github">openstack/tempest-lib</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/terminado/ChangeLog b/dev-python/terminado/ChangeLog
index 5e16d4915482..0578159bbf3d 100644
--- a/dev-python/terminado/ChangeLog
+++ b/dev-python/terminado/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/terminado
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/terminado/ChangeLog,v 1.3 2015/06/04 07:09:49 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/terminado/ChangeLog,v 1.4 2015/06/07 16:15:02 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   04 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add pypi to remote-id in metadata.xml
diff --git a/dev-python/terminado/Manifest b/dev-python/terminado/Manifest
index b6bf9d98d7b5..086b96211c8d 100644
--- a/dev-python/terminado/Manifest
+++ b/dev-python/terminado/Manifest
@@ -3,24 +3,24 @@ Hash: SHA512
 
 DIST terminado-0.5.tar.gz 10491 SHA256 63e893eff1ba84f1ee7c4bfcca7676ba1de6394538bb9aa80cbbc8866cb875b6 SHA512 8c53e2c8fa837c171a8790744770f41d4fc8fe15fe8abd28af17317950c615e4c75c22ab896fd98984fd9c2bbbc7798e5ffe319827d84eb77889bca63660e421 WHIRLPOOL 0e603e49a754a4c5fa68b1df3416a6355357ab5af6801968385525bb2df2a558ffe73030f1789610b731638b57d9d5c1a5661c86de93984f8e2047bf205925b1
 EBUILD terminado-0.5.ebuild 796 SHA256 f511d029360027af6eb06b1050cf8182458e5716af3f92d6c6c58430108f3221 SHA512 1e254aa06d1c179e553f4ae281e19adfaa0ebbe2a7c03f8fb21994ecdfba3281782795123f87b50e0bf2ca0af5342da552d9032b892e0f25f3b48f92efbc0765 WHIRLPOOL 2b636a2cbb2775451432458cf9b8fde0951979b8e067bed275f130f56bf9a7e7ed92c7c875a9f1040a6f1e9bdc570afadf32ab47a916f9797f486841bedea833
-MISC ChangeLog 578 SHA256 34325240b32c00ec3db714d25f2cb575e7e11af5565ce92e6b0ff070d5bca70f SHA512 f3cd933941902dce0db55f65bc7a63c4c51ae105af6b02a2fa467aea9c54c1860e555d6c61e46d03b4c858f74a917b39a488c27d13dc7a0c556a8a121bae26cb WHIRLPOOL f18f430fd0470a31e193345eb72b6c62963dde3cc5037f89f7fe42d3572b182bec84e52e3ccc74c6598548349a5589151ec17c773cebf680a83b9138f6f87561
-MISC metadata.xml 312 SHA256 6f3e494040d9e0e9b2cfa3caff225156e8edb01ab2b656af2a660a5476137a5b SHA512 20ca9fb9bf235a1e6bae92c2721f874f3a4ee8bf0e6e39d9aaba380e3aeac9ceee04b82634111477306ef99679f9d705bfd0a65ae6eaa7dfd3ceb875e097d8df WHIRLPOOL 07a7f201ced320e26de88d0b96c22c45c437b48433a58b683149e7b80a80bf6ace23f003ab27b4e9b45f3eebc8a88bfde6eec86ac0ecb35611fe335ae80b9bb4
+MISC ChangeLog 682 SHA256 4189132bc157ede65c5d80fdee36ff69011db1c7ff8a65825a88e80e4b176047 SHA512 acaad72e5acc7895e49e8faf3896486a09dbc86c44bf0de1bc221c1726c07e3faec08c42f8a358b16efb8a8e5c7fa0f374ddfa9bbcd9cc4d73c34d46e9602e00 WHIRLPOOL 4e68812c2050ed0acd76b401df8ed113934add95753543bd6d009cb3d3163d833c32050ae30eceb234dcb75a4b32277c9d312bbc3496173d199aa5dc59851d7f
+MISC metadata.xml 373 SHA256 ae55820b3c0131702c7db9f3fddccb9d6e4e3e4eee608614510f11a3ef121ece SHA512 9b723d2e1069cb0feeebb39078c650585c0cedad85902293222bc616171de9e34b762feba487c0c675dda50248938b5c7ef502ecd84d41294297c3fcf2a687f8 WHIRLPOOL 3dbc2cf360f929218ba05d3c488f94545b43624514592dbc50a5c4b51cc7aa02266bce6792f5ee29118ce5be29832a6c0b65911eb6f367c43d21a6ff80c1d884
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVb/m+XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVdG4HXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiJEAQAJqTSQRjqb5Jmw0j/z6SI+35
-O/AMp69kW5NkamanQM9dPihEIDXMoPYqFkbgTXQTQwEZhxEfu8L6LfjNw//l+LBJ
-wSp52sxFzeOMpTfNJltHLzOtsMBpD3mnKlkT16Lgb4NkxvKfc7+bM+jQjEy4EWa2
-mOLJ+sCB4qzeWWiLX03hHW5VtQj0uR5Q4cFlYV+MBI0brUAjZnsTpbCw0KRAnpgh
-qwMIgQPutoPyJDM02qLEHZK5QCNymgotDqeOQgXXRXAFU32If1eLnNPj6LvRdgzO
-Vt1dsuLunmDHKoD11oomv3Ypsn1+YBx8V+uF6d1yJCD/5Xln27+jsL4QZt7nWqOO
-5Jp4KdoH7tRqluUtgNTBDPb/PW9P6JE9J4ZQJ+1+3iAgKdd9Ofe01DaGrrpaPzMb
-H1j5LIoHr7K8nZZYzvD/qQYEVatkN3eY2pt5cQf4MYQFT1gY/7RyTdM9AeAAgNGD
-j914xTQGmaLqyue1bAm8/2h4V0OVwX0pBYJB1OdEme/GzBGyh1pCSgt6SRG4mhcz
-zS4kKNBLIAYxNOi18sCfn7elRg5iFz7g8xe61CC5UOKkEwRr/flLklyvE1v3ucIJ
-Z997qnK7Zm3Ua1VBi+TEeshByj7G8m/C6v9lFGOTcoYR8QS2UCCEb9CEekVTQtBT
-J5nKQzTtfwoZv4yKSljQ
-=yP7z
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmim2QQAKyKm3lBTUbFU2z1G0pnY1oR
+VCxHXyTHjKDB41p3dY/OvfVPFwGitixlKP5BEkZstzho6dNCyoqm+JAXQXSr3Qh3
+2ujDPAIytMhoaWsjdLrwNmvBb/iPTve8tZCldQn9BAwXG+/Jx4pq3WViXQVt1yhd
++LuRPxzrkARLzYk6MQfTq5O2DnLdDshvpgMXakBhLrsJDJJgDwzpLMecXLoBIWfB
+SNlZmXR16h1YJrpliDgC4f7KoF/thiVV0Ro4Dqd1UpZeceBtfspWBwn8a/gYPphW
+nAlttG2EP6gJWpnwbtnJXabamBaUfc3LOxNmDj1aBEAesNOmg8WoQg9xy/dHgRWu
+LLVuZsAOEFJYQOph6yThSlwjysV40HyTCG2slCfpttHVG/FmE45bnXH/w8dN5ZxA
+Ua5wOtSOfTAZSX7fNXWkT9YTV8/IJPcMUyth+elzX619AUNV01iFrKJs29RKQs8v
+0C6t5FREl0l2Tykb2qjyPWntAPXflZF4N3cTTwBuRWCql9pBi7o8CzNeJRja+i+M
+DaHdz/dQ3FxsUzHzwPLVTZ8sw46oy2Ps8yj8NMw0nnbI4/ndIBtweYw+QcxMtxfh
+bRdQGg9qjA3/rC4VMg9po8U9hgWye2JWZfghmUZxRrwMKNOtZUzhEu/OhOazfiGE
+EM8wS7mxYDYKkhdc4LwR
+=JreJ
 -----END PGP SIGNATURE-----
diff --git a/dev-python/terminado/metadata.xml b/dev-python/terminado/metadata.xml
index c75e5209dd42..501d5f659b96 100644
--- a/dev-python/terminado/metadata.xml
+++ b/dev-python/terminado/metadata.xml
@@ -7,5 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="pypi">terminado</remote-id>
+    <remote-id type="github">takluyver/terminado</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/testify/ChangeLog b/dev-python/testify/ChangeLog
index 4bc1fedfb49a..1cbd0cfd61e3 100644
--- a/dev-python/testify/ChangeLog
+++ b/dev-python/testify/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/testify
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/testify/ChangeLog,v 1.21 2015/06/04 07:10:31 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/testify/ChangeLog,v 1.22 2015/06/07 16:15:20 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   04 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add pypi to remote-id in metadata.xml
diff --git a/dev-python/testify/Manifest b/dev-python/testify/Manifest
index 5cca6111186f..6e4ed5f7343b 100644
--- a/dev-python/testify/Manifest
+++ b/dev-python/testify/Manifest
@@ -3,24 +3,24 @@ Hash: SHA512
 
 DIST testify-0.5.7.tar.gz 166954 SHA256 153796d3b20b2d8554e52af26a8c891e6f02dfd6cc7be29f9241dad244cff044 SHA512 410ac412306c11bba992b882624fcacdbff00e2865cd986c560d8b50ea8dff0ead8603b18f40414d8dbbe1f3ab9426e0f61170dc450927f6d2282e389800ff21 WHIRLPOOL 2cc958efea71bd475c698cee36e4f1bdb7197c8cb54c38efbf66927d5abc60e769a8995ae7fb4107fab8b74e4b05afcaf16e5c0aec9db3471ddbd771bafa3adf
 EBUILD testify-0.5.7.ebuild 1355 SHA256 adafb0ede8ee4d9eaa7dbae19fbeb69e653af975b9b1dec2aea3913c4abda7fc SHA512 07df2c06e109278e2c99c88d080ded618c7099d583fac32ea6b41179f4fb1817837f1212d6f54ad803eb895ef81a9e2d8213e549f7894ccd2a728e29fd42fe43 WHIRLPOOL d65eea1497ac46428c02d617b0bb4704df6b53e9ae57e9f8a881bd1ddec6618bd9b84701e7a3970bba4ac98befe37e257f2ae0423cecc47b912ed1b87cfcea46
-MISC ChangeLog 3237 SHA256 67aa33406e61b8f30b8cc8d2b71ead35a113d5e10c217dee18f071817c23687e SHA512 5548deec365aeea779896c7286c0da7f37659b2aa8d0abbb8a228cf13d94aa307defa637d0bbd6b192db975ca5011ea6251ae683da7580589e3554e29729f96c WHIRLPOOL d1dfde146989f22453aaee1cde539790038e9254213d57503f77dbfc1407111514aa3098dae2d0fe891b083c6914114765b3fdaea51869dace7385a9ef8fad6f
-MISC metadata.xml 235 SHA256 33786efde642dcead934e5d9731ac232c8bf51d054d060cccdeeb15552ea3992 SHA512 af81c9e3072e78cb32236e867010618c34c9ee40877a7e1db6530185c5a5399039e7b88259a495ea559226fa7bc42178b6d07ac41e49b6ec7871873fde7ee014 WHIRLPOOL d843763fcbe467b424fff1171449ead45ed74c35997dbe98dfb17a1691c3af73e751e178bb8be64ecfe014e03aa6b92b1096fa0d39f242616ee0081129330c3e
+MISC ChangeLog 3341 SHA256 0b26de733d36bd3b0dd17a0b2c338260f0fb1efd0e4092f4750d600acc2697a0 SHA512 68944df2b9002fda31cfb5fc028fd300c1c7a0483b3281ec6195ef3ae4170813ddeadb4c750872c2077e177fef1075ca5522280509f257cb180404c3caa2ccd2 WHIRLPOOL b64d9865fc1d58be354cf46cc77f34a9e474d00db19c74922c99d086a5b57c14df853c61388d79c5d3164dd2a60016a3e439acdbb5b53fd6ded6c8e7482aa1f1
+MISC metadata.xml 289 SHA256 04f6fb135a884804e47a679382519f7151e8ab9baf8df98cf0f40263f53d2398 SHA512 182441bf93e79b4a1904868899881f8a100557b864f30e0c419739c60a886daddf12885970c14d920267ae3ff80014881f8e3fbf976bce8beb3c15450ba90372 WHIRLPOOL 51c3fd98778c3b7d515e2a5f6ea8ad39b264053737e856fd46b9a15e7745b1b64e252189d513aaf13e1bc3e99b81e067364e3c96ab4c2661dcd838d04ee3fb8c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVb/noXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVdG4ZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi5w4P/jUgZaWyWxo40ZG7CkNEFEJo
-N4YyE3bP0Mqmf4TieQgsbo/qK0VsGlMUd8+4GWVVtqMYIjhWoueeP8mVVon/3M/Z
-TbVghdpaJ1tWmHe79IijLYmUx4ZkJ/8Te7GOF0fyibhiwb68rKiLGxM2avwDAYTX
-bC36EDYpASQsbUkUTkNJSktdIijR5W90laaSqdGQwTRBP1RbMwksveEqxUdiMBCt
-ntM4YWEd7LQfeQApWlcgxxpcst1kcSFP3BwYA31+kMJLmTjywgyW7kMuuz19JMwc
-c2Ukax/W3y6OOV8j1ETgLhKetA99h1P3U/NyRjvdschWRczdKRAFTHTeu6bcGXxk
-mayj4r1B2tfj3uctLJJHV13xlgWlD3DXHUb8XJkjRI+xoUkZYrpeqnigT6l7nbK9
-j5wSmlXchiUaNsp8pLHoGRAMcCMNtDb7eigBoex9j/JdEkRi49JQySPMzeKm56EH
-Jrdo2S6y5xq7toCe+rE3lFvd9OF6jTjLeFHk8ZKovagO/UrNefdZ0g083xkQqNda
-ovQSFv5QU+sXTpwyucCYMFrshxfZ2kSIODQ5vMbRhkfWk2j2sdFuGVvs6yfU2SE3
-Hwkx2pGeJOeTgtydar+b4LSc1N+yh4KTqPMDs1aShdJAteMIJeUR0IZe/tn6Fbba
-CPUawvr1W3FfdYUrZc8h
-=4ZZh
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmipSsP/3Rly1EyaamZgXenJ0DCYdzl
+VJqyXjIvfyZ9MkugYG49mbl6cNPTC4dfsR2aPepBSduqmDNWwbB0hhZ1eeqjf14f
+lH2OUeonSfBZloh+sctcbIW1bhDVb5uq4bwUDLIs/eynZjiVt+QankRnDFD89XC8
+zPLT1WoT0TVBWGHmiM/sKx/1D+y2X9eczE4LK1BPX4FMMlBXS9PCM4s088/o6x93
+OOFf6ZTEvLdHZfqErmgbv+EBUIh0SRDKgRvO4mtC3yo4ymOQ0LxPW+dzufYrtGjg
+OEw7uxro1NkZPGV6zVpRo1CIK59Cdt4YN+eypSB3KAvhOfgsnvnLOwuL57HbIXI5
+zPATwjnCi+PWibdbWCEWiYUrcqJqoqMgA+YKh4DqzYGUrM2aN6rq0N/tbiQ6GqZd
+YVfMuAFbWoLPO7+wWqr0uGFZxt5o3QUgS3NrNG59/57T69wluS2rAv7PIQdP393j
+Jivo0ugkKqtUGwLaNtrrrw5KO9kiwUtqixYrwWMdqgZqOtnFh/+GvJtIua7ZLO09
+rBVcab54JVlWhhum6MLSQtDoZKR0CtxQG9CQWKz/lXNlxzy3ot9yY+2mxEemLMeq
+DwIyhpWMFnbJ0HJwLTNCAIQWreZdLpjO71tERSlhuNiwQ7ghYKULshNAfM6pKkOx
+hmAstLWDylKGmWUnqdVB
+=R+4X
 -----END PGP SIGNATURE-----
diff --git a/dev-python/testify/metadata.xml b/dev-python/testify/metadata.xml
index 603038a0ecaf..24da195dd289 100644
--- a/dev-python/testify/metadata.xml
+++ b/dev-python/testify/metadata.xml
@@ -4,5 +4,6 @@
   <herd>python</herd>
   <upstream>
     <remote-id type="pypi">testify</remote-id>
+    <remote-id type="github">Yelp/testify</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/testtools/ChangeLog b/dev-python/testtools/ChangeLog
index 258fdb5fd25c..ee8d48e5531d 100644
--- a/dev-python/testtools/ChangeLog
+++ b/dev-python/testtools/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/testtools
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/testtools/ChangeLog,v 1.125 2015/06/04 07:20:48 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/testtools/ChangeLog,v 1.126 2015/06/07 16:16:16 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   04 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add pypi to remote-id in metadata.xml
diff --git a/dev-python/testtools/Manifest b/dev-python/testtools/Manifest
index a40ecf5e45ad..66114f9de1b3 100644
--- a/dev-python/testtools/Manifest
+++ b/dev-python/testtools/Manifest
@@ -13,24 +13,24 @@ EBUILD testtools-1.3.0.ebuild 1280 SHA256 2b4f635e052d83a2d79dd9b74936dedf2a39af
 EBUILD testtools-1.5.0.ebuild 1170 SHA256 cdacccf6024c7ab52490e9f84d7463b1630adc29b1b49a463abc424dd5ef4b88 SHA512 ce8fb736f7bedb03749670814199909f53e6a140e0d7367efc6a4d4d132a81a1ca39472d34f8436a114d5a32a3a4d2a32cf66f74d713b08256c4a3b88165ee9c WHIRLPOOL 5d3eb80f0176bbca5b55608aee8d059641f75c11b61625a86bdb95fb7a4b51cb5515ab573948f23cf624a90fff8ece445e7b30d5217147c6fe3229c38cad7b1e
 EBUILD testtools-1.7.1.ebuild 1159 SHA256 40501f4a8404c416bd7002796d69fb8e43a1a2081bd9c43eefb61669bd7f0ceb SHA512 77a5f0f8ef2d785edbf001ad4307f13abafd0d904d6222d7d03d1169d083dcf2e4e6d60b8353ecfb375e97b4c3f52f6da231173a5d9d7bec05000caf86b754e1 WHIRLPOOL 551b54b00df913f59daf1afe1f32f9ad24dfe23e01b9649600eeb15d622f479fcdb525a5f3e9a2cf6e05719dab1bf0decb1c584d4755be020855104cc103fe90
 EBUILD testtools-1.8.0.ebuild 1259 SHA256 fb690ee6c990d043ebb1a0c1934fd8534f84521144ec76c5f5dfb0e1741a630a SHA512 d75c7c5985099fdef58b717a4ae5db007d3c9ddfdaa373304968d7a1eda5d36eb5a8feb7ce4d6a2420b586def9732bc641361b2f818ee3f8936d006a0b22cfae WHIRLPOOL da93d29f47b225bff4414e15bd7c74baeb8c6ea7a3153588bdd92e2b820cfadf16332ab66dd2cb13e45c57d83380c4c40019062c475334aab552cf485c911338
-MISC ChangeLog 15611 SHA256 05826903ebc7de4451111c54759797755c028383da3560a7b861b193cc0aa7a7 SHA512 c165c3f8d22f621c0065d40a3b6a2475e9c3105d76f07166d65e7ef2500d0eca276c4f71786ad1321d8d6959453e9ece5996e9ffda8fc89d3d8fb95a1de86b88 WHIRLPOOL bf7639e9df75f0ae2217afd0595b4a3ae890a124afb5ba88be0e11a2b764ed6da4add847d8d55bc3672292b261539de7553360e17bf62773cacbde3526d52823
-MISC metadata.xml 284 SHA256 64b731f4191159326ad11885c43cf72a3f4b75b4044d62e573171581e0242801 SHA512 85ca50048d3f86874e108604f4ec29b9527c35707d1ae74c031646cc29b06d47da9b8834123398f18429afa81eacea218607cfebe0bf87cb7e52ef52756e104a WHIRLPOOL 01892b26de513f749bf0e680087f0edf41583324ea6646df10498c1689c0151fb8738a0d023d8049feed6d01980cfd4a8d0a4fdb71e0133c8158698c5c4a700b
+MISC ChangeLog 15715 SHA256 a6cb401d40185b11334cae34310435998d962be8e0e505a57f3d22d92087db23 SHA512 5eeb9c0566f04aff9d42cab2d2719bf9bf0ce288a590679de32ea276e50df36a447d19f36c60c293278769044d67e0dc5f284e407fdc4994e4afd7dfcb9b6646 WHIRLPOOL b3343cd7f73280791e1e68107f8222f7c117817da6ed24b053c5a3526e1d0a59d468a6fab1761c52e10fe25f8cf7e8150c8fa82027f4d9d73e237d8b3cc0563d
+MISC metadata.xml 349 SHA256 1772ea512bf98b9179581ca94efab17e0f354fdf232f100f08d1c8c162699123 SHA512 826a93f98925efc260fbb02b18ee30ac2987ddf9ecb9f4836e402086f91c54dd32177a51dea191d56aa1746781bcdb650c0a8b40c5ecc405a4da8806ed86c629 WHIRLPOOL 021c8299e19a9b951f1a7cc1d2748c36a45c243ea43ff8c88161c3722ce20b45767f76844f72fe1cc8145e7083a3ac478cbb977224443a67b65fc8dfd669d31a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVb/xRXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVdG5RXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmikoYQAKIzeu0U6G3Z7mp8sz2H19oQ
-LGe0GpZOBsqks6+fakDCZ+6Q97QtYXhIasXH5FntAOEjECRGQFNtgH6NYljO1MnU
-UcB/PJwxfaVzX+hkD6UCt+ah7607CT2gjv1cfD72EWUtAqOB4Su2rMIMZ3uHkhT0
-XSGJm8Rz1VZYLFJ8fn78CbSb35ePQTiP0JhxK2Mdb21Jne75dGithNIoOa9HYPL+
-K0rCyXSYxCspnv4c/OckR6dj+E4pZ1YWU93DCwII1SNzkkfbWGCWzFKxwzOdn1Yy
-2xjCHNhwC7FvjZZD6mrv/60Cbsb7G8PkEQqBYMZoF9+MtiWOOS0hCqzh2V7W5G2m
-SlZvvqpDvcgWVxSt3urWnSYSEV9A5BqNnWTMPmbzskK17gN9lgXqxKvtgOFibwVB
-xdaGewshP3rdSPCydx3ZVs+uiI4ANCtEZcnDRYhqOc6uNJrsRqMPKcXQYf1ZTRyj
-DeE+eQbJTzVeruJTjK2nJly6UQE2/ofr+Sng23Q+4WFbKPs228UK42iqgnUAQdTm
-iVfVr1++WUff5Q0OON9LbVRCUiISf9v76942zdlP/OldYSljaZqXPp1plDGV6yKf
-kzOhxhAyVEw1+tjB24Zvaaniu3aNvAfCapqZQ4qXIbufEKmRoDqLAUcv2Q/6zFoO
-93RqDLoQKhKjR2wa+tUo
-=SHvM
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiF1UP/0WoQXP+CzuEIUR1bchOUZGw
+55sQ55bYRSzQ9Da90aQAb/OChckknxuWl+beAJmUVw31l/hFsz29k0B+QXQo1lCA
+nqysLE5pC2137x8KKvms9xmmDQiLazLc9vK+kkLiXaHLNsqa4OSSfym3JHHB7aeT
+Il+JLMl/U5VFTYg96GULbbP5QZxX2xf7eOZtYnkDHJr6/AgIzKOYd8e+VK40zC4d
+151L/7vfjf0DQI2lOJbgLswLBbLN0jUg7/aWW3aeEalH1KR+OVw73+x26tiLO2fN
+eAw3uE3C01J72DPXvikbieatHZ3lnynySACMzxBE0yNjZOmZkYE4fosuQ8iOkntr
+CpYOhhgGbOdvHR4Ubjp86f/eYJAaiS8Yaf5e1WJkDCBvdMezKRYh9liudVZhmutp
+NqtKpHzTb3gEZWTCo/JV9qHC2vlEgFtLwe6GQ3DgawDX+WnTSVvBNcSeguoZltS7
+Qp1rwZ8akK0W0AnvblQigBEJotIl91Zfh8FZoaDRWcGie11YZLR4uhJ0H7Csv5wV
+SjJYffWXldmE+NG1vlNxjJuy9vTf44zfOJ7VrpKWzjP04yKRIjF1muR+tcLDyHKD
+HnhBidSBPQdaerdmTl+iSv9gv4hKce0PJR7iehM4k8aJL3OjcHcb2uMRUmksrvnm
+G5pmc7at3CfogqvpLJj7
+=j5rx
 -----END PGP SIGNATURE-----
diff --git a/dev-python/testtools/metadata.xml b/dev-python/testtools/metadata.xml
index 814624c99a2e..dc83b4a762a6 100644
--- a/dev-python/testtools/metadata.xml
+++ b/dev-python/testtools/metadata.xml
@@ -6,5 +6,6 @@
   <herd>openstack</herd>
   <upstream>
     <remote-id type="pypi">testtools</remote-id>
+    <remote-id type="github">testing-cabal/testtools</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/theano/ChangeLog b/dev-python/theano/ChangeLog
index 1a0b0f184dab..ff2577f2409c 100644
--- a/dev-python/theano/ChangeLog
+++ b/dev-python/theano/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/theano
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/theano/ChangeLog,v 1.2 2015/04/08 08:05:13 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/theano/ChangeLog,v 1.3 2015/06/07 16:16:37 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> theano-0.6.0.ebuild:
   Drop old Python implementations
diff --git a/dev-python/theano/Manifest b/dev-python/theano/Manifest
index 735ac4a24c75..33c578ddc8f7 100644
--- a/dev-python/theano/Manifest
+++ b/dev-python/theano/Manifest
@@ -1,26 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST Theano-0.6.0.tar.gz 1763756 SHA256 aaa75f9a9b7bf50f09ddcc01fb993cf47513179d0a7bee3d96bfeebd66e76083 SHA512 6333c673df809bed3af952e0759cce4878ed21684367c6eb20e422363c7c5696ea59239ff6a448c6a32771b1069d441b0e3d049f9708ae69d790412303b8ebbd WHIRLPOOL 946fcacb87b7745e72282f5f7e6b67db5fd0e365f55b2c97a8e9e506e30986d90da7c3789636892ca316da33f4f064f99d31fc3771678457dd609fd0c43d9010
 EBUILD theano-0.6.0.ebuild 848 SHA256 4d0d2bcb9f2f5ef5a2f2c4e730e2a6bba1448950261c03f416c41e09ac0bb5a9 SHA512 c8378d6e410688468a3b178589ba39629c668c1d69722bba3cd9f990e7d77c01492afe34e5f57926602b5c49d0869d9779d42a3f1bfafdc04beb7d2257bae296 WHIRLPOOL 9ca9b9710e13c806bfc6dbffd44eeb78e95c16a25117dab78d54b3c49d1fe5c914627c465d73a690918ad0033f8ab4e3b2a2537a4f5d1fe73fdf6ff206a66ae7
-MISC ChangeLog 756 SHA256 ebf2740ec5529b0a95050225a60740620367241e11fe25fa4add7922618643dc SHA512 7a0dcbbdabf1629c65036afcf425f9b6c0380cc8c020330d5041212f35aa12af2641005903fa1a109ea3f3a33ef6eb47c2a0c8fd4d93a8c810a67797e099fa74 WHIRLPOOL bd3eb0c66d532ea56f5886655f7979fb5300d0a95091fd805a486166713558edabf8eacb3b804dfd6dbdbc1574c3b88586bdab4852cee06077f24d9716c0034e
-MISC metadata.xml 466 SHA256 8411756d6d628f1c789dc0c753a63f6c8b35345627efc5506f572cf20ba0f6f5 SHA512 11542e06f9e5f485115240e91f16b17826a702cd39b7184bb998c8eea23deaade2180253cb4cffa41cfe331683c34c0e14caf3e6df54424d2bf3c9b6e59546e7 WHIRLPOOL 14444b20da4c2d53690ed1fb197f165e70d40b00e1a2cd2885746bbdc2148eb7a7d99a12512635cf4fb8acd65239fdb0b1bdbc8a320e35bdd43960f478b43f3b
+MISC ChangeLog 858 SHA256 a07598e30c0a85ff7d5421e9f69ba27d2def28c80c1651b90ba61c7f901682da SHA512 d57f88a0637304344c8f572c2d13e9a960756dd013d1008820b4a639e917308bbfd2f24b6aaab7feae046f0c735f6e032e7c163468adee3a2e9627fa89a193c8 WHIRLPOOL cc446ff2e610f81914d78f87a5877d02ad4b5e73dc90e2cf683934db55703300fdcac27a7853a9b479d8c17ac6395f21707a444a6927fd5818e109155bc2afc3
+MISC metadata.xml 531 SHA256 51e74b1ccf9dafc058534419b617dad4b4304014be5be7137323c3b7e653778d SHA512 6ac9e09850f5bfff38370113b4631edec4b64a5d7607d78dfea7bc18b4ca038eeb7446d0687a63fef521abe5472260a267014ad2e297fa427cc71039c031c478 WHIRLPOOL 5f86bf21fe80f36db12cbab717edf7254504a46709d16c083b0237a601fd1816b4b36ccbdbe8a5bb6d146346371dabd23c6b1713ba967fb13ab80f322c11c0e1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVJOKYXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOgyoQAK7MPK3ZU6wJROQO9y7tRuUK
-uTwMCHtJlz/GGtWndkUQlAb1t6NxYW5SFlZGC6PmGP4lg3YjJKIWzvCSreAVMqJU
-LvBDcA5k4oRbEjw1x6DHfSmqg9qTvAW85QaHnAremAL7nD7c6duMKct9Mre8CcdO
-NUg5aqfTBYRsqYeDHY8M42mc/PKUV57kYUYutm6ajykt2Uw8NGl3o2a+t5hQVP1m
-ivVW900R1uR4dyuXtz92xgNOjBvHxqu+nxFp+aiy/hO55Mm8+jMUBaeRrxpjVlcK
-acrfCQxslP/N5Keh2/AWvWiDwyyBiySJetEV2FkJ7lm5fQmcQ1MBBwVpoNpJlEFk
-fadyyCGUxWb481EuglzG5A3QnUReuD/aXIXh1YHTOb02Ibn+OSIAFR3c2rELu7+Y
-7pSomBauDthA1Kj8FoAx5IPOrtRJdE8eF/Vh8bdEVE55pVAWnHnL4X8cQ8czRa2l
-8GULtjrgoOMJzuHenat2+qcAsR8ev6C8s51pPUs93FKQ8vwhXBYPgus69i9cjSEI
-twn34fl0PrNp3KiwXWNVRu/cZwqTUt8DHnVyGU9b8+cnvmM7Qjh31PuXJhU4s8Xx
-28qVVFoh8Cm26EdYODpxGCoVuh2jXlpvpx1II22QeT9rjLh9+rgHNZsrdVZt3/Dz
-Sdvbkv0tRSRRoBbeE7kb
-=RDME
+iQJ8BAEBCgBmBQJVdG5mXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmircEQAIGS5l4XkKxAT8ALUc6PEtc0
+ej7PgHuBNMwTGTz3sHspa7CsVRKFQrtxDVgOFpLhyZDXvqfWAMArlYkO649k1smv
+pFW1YXNxwJmpfUZLtK9g/x/2WCgp+wUzp/EWmyxiN9PgpYlzrK9BM19h7DP8H8Tw
+3OaN6rrZDVF/IvFoODVqVFTwlGkSSv9Hrs5BZ8dXy6YjM7QglvyWochi02rhWKrx
+Rw0eOXpRB+aVp9Bjh+mshEJfTBt1m8SShieMP061PKtRypcglRHkGwP2k9lLuSaa
+92EavbuekNpWlYn7aYhdgksXR/2M3kxYXzKqdFdEpBkZEmOPdwPDzeps2XhjEh0h
+WbOwDbck1GRHqGcsQo0eKZF4uc9oVCfLx9ImQo39p4duU7ekkvzy+xhtH+iG4LxJ
+hk8bSNM3KiAeBVflIJ7E2k/YSo9Bs2BYzUiu92880bmHAaaU8zmAeje0AWO526m4
+dSbB8yxgaQF5f6heyWZig8z0uvNiNoKHnLFNEKGDeOKDp99gDZpcwVMe+IgX2uyY
+MEaEhqd8mWpNPQh90kru2WWSaOc8rc/5wB9QdyIlG5/auTdJjWxe3pBIUkYeGv47
+iOnt1LOoCT4ZLBN0O4YmmBx9u6yPVmZj2fGHRLguR7WKI9CbiYpX4rxxAVEs6zlM
+tLDCRo6eXXe7z86SUm08
+=kqdJ
 -----END PGP SIGNATURE-----
diff --git a/dev-python/theano/metadata.xml b/dev-python/theano/metadata.xml
index 168f8cc1573f..e92a8dee3bd8 100644
--- a/dev-python/theano/metadata.xml
+++ b/dev-python/theano/metadata.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<longdescription lang='en'>
+  <herd>sci</herd>
+  <longdescription lang="en">
   Theano is a numerical computation library for the Python. In Theano,
   computations are expressed using a NumPy-like syntax and compiled to
   run efficiently on either CPU or GPU architectures.
 </longdescription>
-<upstream>
-  <remote-id type="pypi">Theano</remote-id>
-</upstream>
+  <upstream>
+    <remote-id type="pypi">Theano</remote-id>
+    <remote-id type="github">Theano/Theano</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/tinycss/ChangeLog b/dev-python/tinycss/ChangeLog
index 6f5e6fcc0b33..2125f6af8462 100644
--- a/dev-python/tinycss/ChangeLog
+++ b/dev-python/tinycss/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/tinycss
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/tinycss/ChangeLog,v 1.9 2015/06/04 07:25:34 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/tinycss/ChangeLog,v 1.10 2015/06/07 16:16:59 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   04 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add pypi to remote-id in metadata.xml
diff --git a/dev-python/tinycss/Manifest b/dev-python/tinycss/Manifest
index 442d861a059f..2160a2b7a980 100644
--- a/dev-python/tinycss/Manifest
+++ b/dev-python/tinycss/Manifest
@@ -3,24 +3,24 @@ Hash: SHA512
 
 DIST tinycss-0.3.tar.gz 72860 SHA256 a4adabd1c417080372c789220f7f9985995e74f2fb612848306872a232862cde SHA512 1fdf29777ee7b3ef39cf2169d8f464a7e5aea850de8a7976acf3ed9e73e831ea0d7ee52b4c8c9979b2263509cbffe1bde85cf6da178ddeaac9009ace7a2b4441 WHIRLPOOL 2fc7433e2410e8641f2c939f2d22ba3ab423908e20213559b34e8fb5002776a9ddfe7640c8a68c59af05b1c0e1493481c315011bef8055afd858e7a4c66ebdd4
 EBUILD tinycss-0.3.ebuild 763 SHA256 3ad18eac25c947575317550965fbcaec9c7b9f1e53ac629808dce4f6e7eb2383 SHA512 2276b03b5b439fa128bd7b3bb35a458925351e4ae8adbfe96801f5c8e5d923212fe13fa377296dd69ea70ec698aba02874ee20075f21099878d64fdb8be0f2b7 WHIRLPOOL bd31600d36565b890db018b98fc8c141d5e3af686a9488ca92d4b21658f8e2a8a6d93a132f2221fff55b5ad150d55beb721348dc7c7db932702e6d74dccdfef0
-MISC ChangeLog 1392 SHA256 199225e156b70515c99388e374ecda32d98d366eb219ee16e71ee3ba9064515c SHA512 835e516e925bdf5e36f462b993f5f2ae22140acfc33568e29a6566857e4af0455db7189dc41352d4d1c08647ffc62683c41f3156a112ddbdef27270cf34a1c98 WHIRLPOOL 53611d33976d4dfe1bfaa32bb87af12bc7dea9b6d02e479ce5446fd40fe37561d2ec4849983c6291ad7665e2ae901d10366476d304f56aa750ca846b81e39a1d
-MISC metadata.xml 235 SHA256 f583d01b20ab105a88950c335364693eda39857cf98ff7b5be46ff9f6dd85143 SHA512 f6432404904f26000ee4b12646482a6e6dee4d5e3a72e0947d3104b2471fd242978afa24a519225200bdd671f0ee4077d35a435554c6b2b083daaa5f681057c8 WHIRLPOOL 79640f042a41ccbdf9c8befd456a36cc26cff0fe3305e9dcb455be9ba2fa64ce05cb63369ef4287c6f86f0c3192fcfbae5da7e198b1f5b20350df0c67e81329b
+MISC ChangeLog 1497 SHA256 4ee3cfa767a95ed66e3001aedcd8a5b0f89a6129e5336559294ba23496a76fd2 SHA512 d6635e66dcf4c6160b107432abe5f7a6de86165c9123b4d50039dce91bb41da1d8642b3af370b3bdbe61ba71c7e2666057e9ce7d93e7444c78c911fd7d812317 WHIRLPOOL 1ab3cf69d0e10d98eb94d5a00b1d4a4f4f742a5eeee3c574a5b8514be3e54ab9b2d42551c2417f2263530067d414637a2fac0ebe4a0956a54b91d3dee8dfc40e
+MISC metadata.xml 295 SHA256 1ae30b241857a6cde47038539fe1d20d1f77c97c0b9d48089ef66d9f4d708c49 SHA512 c5c6b954bb2c11f76f6ecb951ea37e3036fe68430943bcd5ed11c869414220d73477a0a68edbd09c803114ba2eb94494055b6e3534d3615a5639e50650faecb5 WHIRLPOOL a67eb11fe7f7a782e74cfa03d7a1e76f8137cde9f1cda9014228b8aff4293297672c27ec0611d0700c3736300f1175ce91b2380bc04411051327e3e7bb1b8762
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVb/1vXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVdG58XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiqzwQAJkooZLf6Fu/6XEH+jNIXobY
-xMowQeAqrRIqyrW5BPz1prA8wi7jwNtFBMyJm4zsOqUPy8Gv6VJ2G5pHHfasL3Pe
-mR8+iusFwNOeDI25iLC/VS2iwO/vfHjlVXaHya6Hn+P8guWCpkhBwYrs4vMk2Bh6
-4nTKGvEBdsr1fXs8VcADGxSQXW/mA/lmydL4xLOsm0mhrBrlXCDIv2Qmpi1EEM+7
-CVAKdBPyizMDvzowgcVoQ3UTNWXXKaUDi29jO/mcuHqsVXgLvU+bkWQqfInhFQJ6
-HmFluEitW9HrNo7m0DwjmCU+qEWJBJyAq6CBptT2M9IGHKg0tccXFdDjyIw51fp1
-Z3mWTDM5jv3lNc38IxvZcStYG3HEy4XgCTwT2COTeAIrl24iqq2mNbPejHYNJ9Li
-mfgB8je4pkf8WqIgKD331+HAkrNNq5pRyF+uoi7ulkH7eovHTleVrAC7rbjeUtQY
-FyIFJxyTrT+uRwpZCY+knpZav8DtbbnIcc91Wiet9WJO3zLVY5AfL2IJh2rw3yxK
-BJkiz5556qeSNOAPSDbsklqRsdsogKf4YmOQrAlNuVYLMzjBlycN4TbhhNxFt1Yo
-X9eiAem+qHyCJihzLKy0DFpdLbbQ/liH8st1FMfiilvJJUkc0EQRCHhZxmGmLwyP
-gppSTRFn1UxcY3Ji/Bvi
-=BieC
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiq28P/jmbk5dMC2yfsLXZBilE1z3G
+e2jSOejFT4y/9gxTPDiL63/oiiBhCEEiPKpoEX5/LCPaYT3J8AT4timnYOsiqEMG
+b+DDBCnhBmPgOkiDFIWcH2WOiIzqZjM8of8umKX5GFfwwaqz7oli0VEElW5NdXQW
+va9K/kFhwhGvmAcSz7hgWl3vmemKVFHkr5v+6nQGm3ukOeZQ9WI3t0gwp+8lv/EC
+rYamdlC3P1rEdFJnSJMQthV6K0kSULyONPCIj5kQIw/9QK0MtxHKJ1HbDr9isWTZ
+vLH/TW67Xo6x2peSvWIRIRzT08Pl5cymJ6OQ6iJHELhpeHd5C+tuC4M/zOpBFQt7
+tzRBoMa+wDIuONW9FAncsp4KRw8zZlbBHUucjF+BwLk8+Pajbrw9kmFrhHpShUEr
+9uKJbBZ5n8VrgOt+uHX8LyJ9YZCaHdA4RgEdiAIIhQrPcpUbrgWHsRUrv217tbk9
+LBudLECRQcMiVFingThjPuevOECow5kN+f/AVDrvwMbHbUSaY1Uk/6Obudu9QsQW
+d82xxAeZ430F5+iNama4DxaVTiiTx+xbm5HrG8uQbVnz1JjbCyuyj6anl4D27fLQ
+QnE0VLDcX7/Gb8Hru9hayQP2Fz1cmE8TnELNYuDZxcGG1k4WDHG4eLA/IZ0pyZPO
+qUd/IBvI6UM6XhTl3XmQ
+=4yqv
 -----END PGP SIGNATURE-----
diff --git a/dev-python/tinycss/metadata.xml b/dev-python/tinycss/metadata.xml
index f8ac34638a51..dbd435291a84 100644
--- a/dev-python/tinycss/metadata.xml
+++ b/dev-python/tinycss/metadata.xml
@@ -4,5 +4,6 @@
   <herd>python</herd>
   <upstream>
     <remote-id type="pypi">tinycss</remote-id>
+    <remote-id type="github">SimonSapin/tinycss</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/tlslite/ChangeLog b/dev-python/tlslite/ChangeLog
index aaf8c89e6bad..232d44468116 100644
--- a/dev-python/tlslite/ChangeLog
+++ b/dev-python/tlslite/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/tlslite
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/tlslite/ChangeLog,v 1.29 2015/04/08 08:05:26 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/tlslite/ChangeLog,v 1.30 2015/06/07 16:17:17 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> tlslite-0.4.3-r1.ebuild:
   Drop old Python implementations
diff --git a/dev-python/tlslite/Manifest b/dev-python/tlslite/Manifest
index 5bc6a074a947..26f501dcfc7a 100644
--- a/dev-python/tlslite/Manifest
+++ b/dev-python/tlslite/Manifest
@@ -1,26 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST tlslite-0.4.3.tar.gz 562090 SHA256 6a67d8a0bec66183719c19c91f383bc1555545055aae4498af2e91fe9d79f813 SHA512 d1f451ebc2f7bd4d5436f1ca8ecfdbaa403f3dbbae9f9ac3900131e5d168e3267e22fcf23d85f87457f06468997cb01a51683d028a67fde58820b15f97689a0c WHIRLPOOL 555f2659f0bb5080519edd5f4325953e13109367ef21e1595816ab4f3956233bb541940f65f2cfa95c041b7f2cc080b8c4ee10719be79edfa11076a2c834fff6
 EBUILD tlslite-0.4.3-r1.ebuild 1115 SHA256 89c108f8c91de828be5a8b52853f0d652ca6c2140d0abbcfd1029b08763153f3 SHA512 96a4839f8b83f66e40f0c2806e80c3c2058b788c503a96df6e285633824ee288f6de04f603671c1c9e2b6ff64c875d8f24bdbf5cc888997023c7df51783b4a77 WHIRLPOOL f19d528798b54bf27d44b72669aaba8f8dc8fd78fba8beac8678630e71fd6473a09d10c909b6b44417a1c95971ba5a743bd275dd3584071141311306cfa5372d
-MISC ChangeLog 4062 SHA256 a6e61771f70478bdb792d3a81ecf440da56397d5da6312093206bfb7f177e86c SHA512 b032cd4f9da6f78608775227493b11313d4096ba20793d0bcd5c38c8d62169ffc923047bae41c5a5f8e7099e2fd9068793854681238d0b66332d23f83141fc7f WHIRLPOOL dcc2e671d1e7637a7d6ff97766425e8ec7a73854c4fa8531a1efb7616cbb2fd1994efadebad8177c547f24c5c692ce27bc05d58569fb3f1d8ed621289971ccdc
-MISC metadata.xml 659 SHA256 c6591d14095d3a60dcb7c26bf23fda5c54dcc99bb3565ca021d4e1df11519741 SHA512 e701be6dae73efe2aa57577716c852a104f190d965af79294a3ff332bb6f8adf3729a146310780bce8a83af7da199ffd62fc2611518d64bc792b12a08d5e4282 WHIRLPOOL 5dc784ef9ec01378b8b8ffc0f0ee8fafad06b8a10de8b1180f93bf77609b048d7c624451ad0e9218f7148f45af7607d3059b85dc02dcdf396428a37bae108c74
+MISC ChangeLog 4164 SHA256 03419aabe573830eb748165c497a844b58baa34dff183b183f165c1f7e65ecbe SHA512 382debfc9b241c3a672abc386a6d5f5589ebc106bad032f039ad7a89c285e052cc4daa2a4b98d28861bb2c641b27d778e543c0e9f86e94f2fb7acb31ef9733e6 WHIRLPOOL 4a467d9d1f934c059a9cb82fe979346ed4be4055813d95140ae035c313e6cc8fbb29174be38cd077d783bdf0638f8af48d2ed0b0ff275497b7fe9b016b0f425b
+MISC metadata.xml 737 SHA256 ba7c72edab019439b3a643b8ae3b474ad7c8302fd081eff26c086e5b9a8de7d4 SHA512 db18037c43e0926890a773e8e5f27a8728d8f38142e9258b2b00a3e43598839fc468d26a554ea5c62eb29b54746cae9a5eceeb40c31116b7c69f6f3ad08c3fbd WHIRLPOOL 7ab0a4812fe90d6731e9fd4a225dddc4acd00cd8a82e5eba55f05f4d889f3875d98e3983eaf9f34bdceb453b10296bee49daa998f5f2b55ba9f47619f363daed
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVJOKYXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO9RcQAJGLkpz47gvuz1kRhB3r+03V
-d9Hr78krna923FvR1ERmoKUIsXC6nHcT32UNb5JS7HVWcCMVHVjQNNkdtd39V84R
-gRUYF/cVnlK56nhtjBU/XmEXlmsX6lLcNrHB7tiR26ZSd1MlcCoOO/X00y3xlCuz
-SknapA9wqwyNWWFe3jXmitgA5h8IsyA0Rm+IuAK5XQ92TOiN926ziE8MthVl+Y+3
-0F2iSJhg7i8vjUlJr2DNVc59q0bRlr6wTQcJsx89SKFcqb2kvdTw1cAyRDjF0THq
-/hENGTMtV7jC3KuSzWFDSlouR47x0b8T+YqmMXDlTDctIkG2bZgKLIeK6wP0HnrY
-gcLSeLSecuOATxjRV8glEx9Bfs4DwKUayY7MJ90jJewE0l/A5skokKNR8N5gLGSi
-q6EPjHthn0pwb0MSZAbLJqpH2uUMJYFoXF7fGZ4RoFHl66LqEWYkzmKRaMwrsxl8
-5cRMDjUh4bdE/VwucpFanPOEYA5PVtbF+DqX8QAPZ332GzjlyJTHkubEsVNAMqqX
-nFqCryPziiDjyQBMvVKn2Urgm2TvevzX7tFfKJOfddAgSN8/ni8Y9gXz6SEJ6LkG
-2KffK54jWb8mQ8RB1S0Ryatk2tUWTbBwd9tVZxnWdmAL/7nHydtR+wA3Ck0DA/gR
-2OLukeUIa9r8VHN40jm1
-=f5+l
+iQJ8BAEBCgBmBQJVdG6OXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi/qoQAI6PwDrC2LvcZyFxyESp7rFC
+zNMsaW+fuhpWqeTI0KmkXAF5/DHkBiiYQBB3DWSYe84xhSyd417ya/q0aNZPTXRa
+6xmzgM3aa+QR9hVwHJMc5daAjjvEOZvfb84/dwItdKLP3Ch0LnWH5zyD2CYv+OsI
+Ac/yMggKKWV/AjEdsOVemsKCw1qLCwP616Nw9tIzlaqtHGS3YQxiHR5n73yQ+p2j
+cqHrspn/G6PtD+PMooFtv875QOw9jTSnBf8EStbogm4a3xJ5Ayz7dskj6Gxdoc3Y
+DTFptJsONDQ1Ua31xN443xfIJPYnFDdcywayBKVso/L2ebICvzjKbztKhxH7Y0rg
+imSKyFAQoe/Iy9ZvvvV4y00QROZxbZAABs/mfb9fiHSC13Cl8R1FWzlmS3lVG1dN
+vBV9sgg+Ae3rp+FqswMMPjo1xuIJ43D9/Ywq/PLG9rJ2X2M9gEdhZ7G4R6KbTd3W
+EJ5L8lLigDpO23bojThcVsEIndOAJFnzRpLFLQngemVrA2bfuSUN9ELdJo583vkN
+RRCAvW4gWM9nXJs9gwclRMyEejVuvAZNo6QE1T4UFnPJEbxMWUBBJ7JtuWYlYhZQ
+9gv+aJAPNa4F4tXryBMqMYM4nmJQeajT+fXq/FzRVvR/U091ffhVKhSE2bZArJ/k
+QDlItzGw1GAKN5TLfKG2
+=Jk4y
 -----END PGP SIGNATURE-----
diff --git a/dev-python/tlslite/metadata.xml b/dev-python/tlslite/metadata.xml
index 9456e5f32076..74bb6e1c1a1f 100644
--- a/dev-python/tlslite/metadata.xml
+++ b/dev-python/tlslite/metadata.xml
@@ -11,4 +11,7 @@
 		with httplib, xmlrpclib, poplib, imaplib, smtplib, SocketServer,
 		asyncore, and Twisted.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">trevp/tlslite</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/tmdb3/ChangeLog b/dev-python/tmdb3/ChangeLog
index 81e991334816..371534b7d5b9 100644
--- a/dev-python/tmdb3/ChangeLog
+++ b/dev-python/tmdb3/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/tmdb3
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/tmdb3/ChangeLog,v 1.3 2015/06/04 07:25:50 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/tmdb3/ChangeLog,v 1.4 2015/06/07 16:17:39 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   04 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add pypi to remote-id in metadata.xml
diff --git a/dev-python/tmdb3/Manifest b/dev-python/tmdb3/Manifest
index 52d3873d9e32..4d7021b399a8 100644
--- a/dev-python/tmdb3/Manifest
+++ b/dev-python/tmdb3/Manifest
@@ -3,24 +3,24 @@ Hash: SHA512
 
 DIST tmdb3-0.6.17.zip 38179 SHA256 64a6c3f1a60a9d8bf18f96a5403f3735b334040345ac3646064931c209720972 SHA512 ad2cd838a9127e4839572590d1083a0b1f3f23d5fd52aff2dcdc159ed189b4f73acad0b916d807c8ee77cc434102d7a6e99d4f7a0d560bdcb8fdbd1f9f6f4a72 WHIRLPOOL 4454bf25a4d6c073e4a469a7558deafb50dad2d55649ed2cddd3d40ca0e100fd4df00c89a843a7285103ddd208a1e741513217a10df62a2897d2b2dd8b2f6c29
 EBUILD tmdb3-0.6.17.ebuild 546 SHA256 ac4171c9169380edd19aca0659c4b7d0f9b33142a90212efa051798e98574876 SHA512 118ae9e2bbfb3489b530e045e6ec6b6bc02e1131e498cc80c0ebd0003079bac553082c203366064e2be51a4a8c23be22c2806a6338a7b9c491c477abcc811e4d WHIRLPOOL 863f1656663ab865d960a39f2404f34b70a15eceec5f6f84a5355c8a8ca75e068ec7794305cd1b205995789ae5ef4e0cf6299aabb1598000334efea80d145060
-MISC ChangeLog 575 SHA256 5628f34f9bd502d51d7201fa3d76bbe5798aa0f4377bd56787b0c91d39683596 SHA512 eb863b0b2d499498d91c3b2fac1ebf5cfdb889f2f069bd3dbfe1253d34caacb0ec85d8efb67067f09542e8ba17ec38050360ef78fd2cc3b7c3af5c2e3e7a517e WHIRLPOOL 0158b7c27bbd1b14ba5c9766048e1ab97de620cc41102205a6574b831d53bd2e60019fb6b71b76a0bddaf3379de2ca12c96b48f3cb87ab21092754997595c79d
-MISC metadata.xml 332 SHA256 1c3cdbfae45227214aea664e3349e942f52d599c64643c0faa4ad2ff7eaba8c8 SHA512 2f2da915f490c32ae978dfce22a118d91f4de9a9614802634a0ed4b8c95d63c58ddd298b606b5c1eae4540b6d2d9c681d675b3217dfed76a3fd43b46f7c6085f WHIRLPOOL 9753772355377a8a77e013cbc45d71a6e0d4f965c222cc62f1d98217025063043947a03b1d9506ab2a11cdde8707000a8eb047e7e03414e953cfcb9435d67fcf
+MISC ChangeLog 679 SHA256 2e53ed63cdc1e80efe3b244007d45e5d607e3f6368ab62070f9d9066cce24b0e SHA512 6f27f95039fec353e6e29af427a73b57be4f132f3d3f23576662e4a7e5d104758b2aab23b6c5d0124533b14669bd60e2874f6ce6a9e7b8bb295b731f55bb686e WHIRLPOOL 4fee7a94452fa62274a29c2423e45b684b70a5afc1a1f441eeeef025437a0e2d2fcfa14f80f02de59a8b6a0c4165d2b8ffe092a255f490cef12c4cf62f21efb3
+MISC metadata.xml 390 SHA256 f5257389aab91f2ff817d1b04642bbab7c134d2f5660ecc8bfb8c6691a6b7aa9 SHA512 d2dfff17b20412a53881f93896278544cafbd7f7cc71176e2f662327aed5a022086b03e79b0fdedc7e7f96593e39da245c7fc68f44bb3ac10f2977e2a58f5f48 WHIRLPOOL 939c4cac63c21b5aa7b988696a0a85eca5b26e5b9ce64231bdbd9cbacee47ef8054a5e06a34dc661bcfea801d03ada7046f5f7891e498b8a5248cef8429f5477
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVb/1/XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVdG6kXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiwiYQALpgUTm66NZrcJ0SLtd36JvO
-gln/hov6CH6wl81100UhMygbTWeYLB4V64PZJ0uwu7Pzp7O3wlnqOMtFmJUdAZth
-pke57/cYGsoYg/qO/xwFbbyqG5+OIXgE6S4y3XR3QwSIa6Wuq8VtkoU7G4DerZdR
-UTmt7ZQO0BPA49V0a6YU3IuVTSnUZerW65P4qGbJhiZXdTuNHRuPx9hSavS6oAPg
-CDBZBfxJDsCvI8r6px+wi8HAwDVheQmjF4v9jYOt79lft0pypmamXmpf5JTZNiWO
-Q7bu1eAbpcTX5HDkiXQUEWokTpBW1P9/m0S6P718D4mg0zxi/MoJMCdNYtLRj6Pc
-C3M+DwTr3GrlpDZJvqXAXW5nY+mJYlxEVNV9V4Uyhlymw45TtqC19xq4OXkZ/Dq3
-S3XqHlC438T8FHrGm5Y+HBpjPykTLTve6aQ7HRXYgxz7PPy7SdSewwbDzoq/P3+1
-QlmJ60gQNL4SsQAq0MvfcbMycc/nSnu8xmyabUj1SKIfgBy6nKiPAfTjz71eHiRf
-bT7muhBDJF6hfRyUufs+W5TpSaj+FjkDA6hqg5CdhT3geN0BeueImcO1FEv1XA+d
-rYJ6rq85RARPRtPLK3jx6bCtvdm9Aq6/lBMO/oLAW95ELQWFUmJZZYJsQd01EkOJ
-aBUoCdIZAxLvQnDcGhnf
-=/ILd
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi/EgP/RUcxVNZfqvGBdC6fR8Y5VVg
+EUcz8Ttvf+WiH2dsRHD59L0daxnvDZYWZNkK6R9Kfgc91BoKGyTIgwI9fQkD1gLf
+LmcF5B0XKnosHjricD2l3rbJf4C/RRehhA3wDn/QFYyiljdWiJdnVxoEA0SMOiAr
+Fz7NCkmozPJydHcu8QEssuATpxf6LbiZQsIpWJEVAKk68vfatsg9514zN6RUvmHZ
+bqN5e9WWv2k0K8S4eF7QoeNfT+u78npojToxURwnkU/juux44CsDm30vFQ19xCi+
+JM4MrpkN0jG54cSoIC8KH4autEddP7qoRkSMTFOZR4tMezkShWMCZ05WFneDrZs1
+VEV6vqsdf5piQ15ZBCMOp0s5dAOHXJqbI4Wh1n7G62Y2+TLCoFzye8IMpI7KgocQ
+xzlXWcIaVmoVrjw0oDjYvEp+CxrcIOZQXfnvlNvGnIFMJDKD4oOJJrQKjvgwvOK+
+cnuiZiUOypk2INrT26xF5vyoTZm8fsAhKTKcGFhkXju9KjEl4kw/+Trv25o/3o43
+ZNThbebMVje8qHqou8yViut47L9PdQXqb34q9ondOIFciFIBSCwh9WK4gN79fJL8
+IeF9IgILqDgn1Ta8g1eHjZ4hV2JgHbAa7R6SK/IXxwrg0m4lZbrRhw+28YGcQ0nO
+gpypQPNN4C1rwlzjTu+7
+=r75A
 -----END PGP SIGNATURE-----
diff --git a/dev-python/tmdb3/metadata.xml b/dev-python/tmdb3/metadata.xml
index 2880d56efdef..2878da44759a 100644
--- a/dev-python/tmdb3/metadata.xml
+++ b/dev-python/tmdb3/metadata.xml
@@ -8,5 +8,6 @@
   </maintainer>
   <upstream>
     <remote-id type="pypi">tmdb3</remote-id>
+    <remote-id type="github">wagnerrp/pytmdb3</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/traceback2/ChangeLog b/dev-python/traceback2/ChangeLog
index ecf3be965d29..b9e9a476d3f5 100644
--- a/dev-python/traceback2/ChangeLog
+++ b/dev-python/traceback2/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/traceback2
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/traceback2/ChangeLog,v 1.7 2015/06/04 07:26:15 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/traceback2/ChangeLog,v 1.8 2015/06/07 16:18:01 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   04 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add pypi to remote-id in metadata.xml
diff --git a/dev-python/traceback2/Manifest b/dev-python/traceback2/Manifest
index 2be99fe5f03e..da7c8bad3974 100644
--- a/dev-python/traceback2/Manifest
+++ b/dev-python/traceback2/Manifest
@@ -3,24 +3,24 @@ Hash: SHA512
 
 DIST traceback2-1.4.0.tar.gz 15872 SHA256 05acc67a09980c2ecfedd3423f7ae0104839eccb55fc645773e1caa0951c3030 SHA512 84c7fc291c8f2d4cee10441cdef1820aa453e631dfa91ed58e40fc205e97a9dd2101388d5689e4fdf10edfbf06bdb5b895d1635ae7218ba0c9b697d3f95f9342 WHIRLPOOL a2bcc135f1585d777dc94992bfb5bab3ce36f00f84ab3aceefba4a0864a1b51ee523d2095906d57321e8ff22ea534b1b559a192270a154fc7c674ad6725d68d5
 EBUILD traceback2-1.4.0.ebuild 677 SHA256 3994f3b8c1a0fe65f813dab9f7b123dd4a5d68dcff115d39a71179e7d761f989 SHA512 1be2eef64bff9d687fca04f1d65a0ab4c97b8f200f97a19e68ad166107011ced942b8e7f50db89aac9b9c3ec1c631d979b6593010f6e08082dd040cb706cf46f WHIRLPOOL fd8aad4ed15131399faf9b1eb13060ceb5b92ae4f114981dc9a9b50ab1392d5751fb2fdf758053e27aeffdc20e961eeb1d03334585c8b8118da8b009c2984da4
-MISC ChangeLog 1029 SHA256 3db5cf5b48efd62579d8da9922b963d5e025671785e259890b532271fc6ebaaf SHA512 0d20baca7b89152eebaa37c3c41fd52c86dc58be445c16d4ec236f45c2851be3dc1743c9911805a3b7809273a137ea9ea32a4f3f6fb490e2a90cd7e9cfacda9a WHIRLPOOL bcfd10c6469ab0c69b22adc995b2900be3ab5f7ea8e439ec04ae41707c3779619b3f32e0ffced85e9c7535953149cf92ac3d827136248de675afbdd425e06e6b
-MISC metadata.xml 365 SHA256 45cd1c3b05f9337e75624bd0b06f11f2c3dbb021bb85014ced29f32207d1c958 SHA512 daacbc690d6277422e9f8a26b5e6aa35a6727d792efce2bacecaf399295402dd30e44eaca4594d797a25f766d0219be6ca1da91fc3d3b7e7ad91d132c8869585 WHIRLPOOL 69a053f5ba3665877de0d2c8686cd2e01da02fc37db278b3e51a100c576fe8a2241d7c3fba9f8b932ceba53a3154b1048b833aa7092e8b864f5dcbb970cc4243
+MISC ChangeLog 1133 SHA256 902c602a731b85acbeb6a1df0ecc5de8eadb68e16319bf19a6959f84821e52ad SHA512 05a6cb5364b375982da37a420d737cb40ac379443f160caf922d39b2db14ab32f7568009f5c8ae42d6de514f7ce96096b7a863e7b8a2af9a9dcf47505d01d811 WHIRLPOOL 6a99b1947f1224aeb28f25affca73dd5fa3b494e21008a171c3654f79c4032a1565b01a1eefd5204ec6a38173e5cd82f4ce090ad9803cf190c0d01f3e27e39c8
+MISC metadata.xml 418 SHA256 241d26256c2ed1ee0e3f8f63e39c79fd747125407cb16b0d081609ae31963aa4 SHA512 c744a4f4930895b0f6dd22286419e2f0ca9dbd66f2356f051b66f646d9084f56b99ae78d4cae634d2ffded7e082d5489058559a02751fd918a4ba3b034f89583 WHIRLPOOL 94259ce0ec1081be2c6de61c0b436ee6ee0776caa40561d7cfdee2ad23098a619594aec01c852599a7898ca3ec317bb25f33e091389754c03259dbf335c6e1e5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVb/2YXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVdG66XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi2KQP/0R/CTs6xWqnv4W+Xpnlhrix
-22BWZJZJWk8qL6Rwtd71RvysMGk9S/JjAf/XQM6rZ1BZvZDSne45QCRncKuHqeTq
-Qzg1iXmTMlch3HJ13gzudqX7m00Q0QgKih6QH6wDUEBL7mUH4+x4MXBW5rn7clH9
-05EElFCViJO9i+0MvDlH2XMePnXm/ijSzXubPGDCkFNZGNgfFcPKnlvsMaKohn6U
-ZhmkW+JKYJ6b8WCCESYMPEIwbSs34qMuejNu5ph5PK3soC/lo6Lup7ZcXYIvQgcT
-4PHUgId5E/5hJmuGax7gc1C+4ge7MkIFyfZHAbHvzF6JzkvA1WdJMWz+bQ0E2u/i
-hUqas2ikg0nML0guDGEGavv7r9rI+8HfkOqhh9D9ZcgM953UZ+r7UBdI9IOZbMRk
-GE6J1t+l4Laeyo45QlO3+2BS6MaC2wr/LizVbkNxbq70T4KpLqzf6PXgtwwvkp8j
-so+AR2nkmuFr59eJ0yfqMuwdPNsXUMbjSdBgU/9MKXbCT1JhHW9wPYoNc6woqfa2
-yjqmkJARzlcnbkCQ8TVK7Cx4RXOJFggUaBq8YJ244BpYxxARbR4t3Zg6IyuAkeif
-w/yCVpNSikbuzMHDmwn++OAkOa5VcPSlVBisNhjD4ynJSio7lTvOkqrYO84CK16C
-MMXcv25CtLcsJXTc7/tj
-=C/+B
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiF7MP/02Tkwl/WmyN8sXKD8J2d4dQ
+cQ1pb8826ix4UcZN+dqNM9GiKMZOVCOseRJYKgXav/wf1K8/QFH5ZfrywPTDJDi/
+pzwDZ8zx1T62q1DXBfvVUEQtYNN5bhal25MBXdluqHx4GokqTG8dEs1aqY2ldkiC
+wXc54mz987U0zd3BT4F1hq2tl917XsoUAh8GZ1VfoY2bk5eYghCpLdg2u55Bk49k
+rl9j40FM9vxIFQVOYjxdhQBd6cvWOWB5GYkJxAR1m7HfkVZC0ul3F0pW0OTqtiNC
+cIuFRdZ7G+EMwAN8hJa3XM7OpD/jeuK43kTc0f/Pez0eYN0o22FwopcCof3Ml6Bl
+Hu9dl51u8zoblfj3IVn9THwkgqumfEfnrn4Uwm2LKuPcH6REmsXHdH8mjM8/1Mm8
+8gAy6YCbiFdzM3zA6plW9aK1skExy+PMWEIH0XRJvKLEhNdJJ3qYxywd9RxuOtjY
+ZbhrOpPdwe1imWO1RAu1mDol4uvV5C5q22Wfz/rsPlDe3nMb/zTZsc+dtFo1m+aJ
+sD2HO5lKp/thjPhr5W74l/ejS1/P7zntvp+Ql4LERBdZG7TEWdv8tD0LWW35wyQc
+uSsYomRVmGSqvJF2ALgcwqGZNMZ2VINPs/XgNQliQKATiCA7/OFBMhczUB9DI1S2
+R83AqbOZGpzb9v9+foaV
+=P2bJ
 -----END PGP SIGNATURE-----
diff --git a/dev-python/traceback2/metadata.xml b/dev-python/traceback2/metadata.xml
index e5547c4dd6d3..e1e19aefdeed 100644
--- a/dev-python/traceback2/metadata.xml
+++ b/dev-python/traceback2/metadata.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>alunduil@gentoo.org</email>
-    <name>Alex Brandt</name>
-  </maintainer>
-  <longdescription lang="en">
+	<maintainer>
+		<email>alunduil@gentoo.org</email>
+		<name>Alex Brandt</name>
+	</maintainer>
+	<longdescription lang="en">
 	</longdescription>
-  <upstream>
-    <remote-id type="pypi">traceback2</remote-id>
-  </upstream>
+	<upstream>
+		<remote-id type="pypi">traceback2</remote-id>
+		<remote-id type="github">testing-cabal/traceback2</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/traitsui/ChangeLog b/dev-python/traitsui/ChangeLog
index 28cf1f45dbc3..d37ff52c33be 100644
--- a/dev-python/traitsui/ChangeLog
+++ b/dev-python/traitsui/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/traitsui
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/traitsui/ChangeLog,v 1.15 2015/05/27 11:47:39 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/traitsui/ChangeLog,v 1.16 2015/06/07 16:18:22 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   27 May 2015; Manuel Rüger <mrueg@gentoo.org> -traitsui-4.3.0-r1.ebuild:
   Remove old.
diff --git a/dev-python/traitsui/Manifest b/dev-python/traitsui/Manifest
index ca483cac671c..b3dede0afb65 100644
--- a/dev-python/traitsui/Manifest
+++ b/dev-python/traitsui/Manifest
@@ -1,5 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX traitsui-4.3.0-tests.patch 1408 SHA256 913e3c0d8767f77bd53a6798bd074b1f4f9f9a5f75718da1cf206dae164f523f SHA512 1e7eb7e3f2fe0a07206833fa5114f3a75db0f2467dc1132d103199426b3e28a6b0aec607f81ce1108b9f34db9cdc1214421224d0a5559140c65e6de46d94ef26 WHIRLPOOL c736743f28d389a3d33497629e46bd8b1b00d8c6a09c7ede0648532e629cd4e9fb60a0fcf7c43cae656109f14e2bfef92f0ae44dc1d855d50431af1fa71a1ff4
 DIST traitsui-4.4.0.tar.gz 598148 SHA256 68a10c4f86cf0f5ba5d9fac5caece73e0a76256a4175efcded5edec03949cf60 SHA512 bd563330aa80acbf4087b54f42ffb94856495cf82da8b9c5ae54bdcda2d2544e4293a427ed3b28de7622c2fe063cd14f969b894735eb81cb4932cc3e2ad27bef WHIRLPOOL f49f6278d1b9ec0cc35af5f5f8b695c34082fd3ae8acdc0990634b15305d09b5f975f8906e568ca8ca25a746822c1d11c0c2c7933ad429856ec614fad51c84b6
 EBUILD traitsui-4.4.0.ebuild 881 SHA256 60fb385d34a3bc8979877fe40a585d22eca56b6dde066db0c0e838d99ebb17ee SHA512 6fd569081d660578365b559851bdd2ef9397592dc37fd34bee2cd8240a4e633fdd5fcc7f9fc81216846dedd17b909f80593d63543a8b9202293fe6f4d39a657d WHIRLPOOL f8c5bdec83e704a2405ec4a015c33f0432b46792cd60e400b808ab7bd3c47ea97856c15e696f87e017440332fa15136a739fcf4bd248a472fc2dcc0038332e56
-MISC ChangeLog 2099 SHA256 7a4d7ee2250674c8dbd19b957a3f0299b9271d7cb9f57ec7f4c154193d351bcc SHA512 a29c286d760e54cda936a7815a6ce40287d2d51328791bc16a7f67f3b8a31bbd5bfe2c58e8b897e4f3e0cbca1df12919ed28cb838eabcccc74173a85197612cf WHIRLPOOL 5b026e96d9d107f6ed4cdf72d4c6482afad064bf3cf7da1496b84d0372cf65cd24da49a573f20338c514e7a8ed86f33ee615d3b5b3aee8572a614ab529afe0d3
-MISC metadata.xml 622 SHA256 5cc031e6091469f629591a4bfb4b1285689c3c611a52cbf812dd71547dd59963 SHA512 69c707111a19606a6db6df364a01bd2877555764315c62c9d0b74644f44c562069590df8ea478160da3538bae68840ab9faf7019412b9bc1f149577939fd0fcf WHIRLPOOL 288350ddae3d00dcfd25541b5d55110105e38113749192295540972d6519354ded77a5496be1305d3d8b0885a8cea92c92a1120b51a638d9e94b043df9f6eb51
+MISC ChangeLog 2202 SHA256 33d4c8f15df55066cae9eaa694e0bb8edf54f9bcca580652571b98a65d119dcf SHA512 eada8a923a8f1073d9fb9086864add3525d576b4c118702fa18f5898e677fac690eaa7e2deb7e46dfd3daa03ba8ade27865022f224742a745d447873e8d58243 WHIRLPOOL 537e7298c70f86225a71c85ca185110958e12c420ad700833cfb0e8166d3ec4bebe845b0ef6e411ed00e4984854cbef044fc8cfc4e714cdf06cd88c5cda6dce1
+MISC metadata.xml 692 SHA256 d5cf1e533760eb885caa1148f5b324a17991125dffcc83fc4619c6c6510ec928 SHA512 0e0df0eb87fc97ae3f705d6fe02b02d41634bd6847d06520301e57e0e19b71ac9a14ea2b2bcfb1b086deb46886347e36817314119a447e00f0c35521eb11c185 WHIRLPOOL feb011b575e0120955ad036c3b99c37c5df63e16acc660c258756d65a94ce50cbb6a21cd7da9c8fd26a930092a0fc06b30c6e73d16157ded0fd76f8419d3a279
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVdG7PXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi/pkP/A/hM6TXVR6ualVzOC6BUY9a
+oE7xXYON5PLUOy/VVgxN6RRvHNnzpXEqRrhneUs+zh+xS421BpUC+TrC4aU+xN+Z
+GM/t8eFC+VX3hctKPdek0N0pQGe4bUV3tuXATb/La9mYXddj2j/DZt/jV7ItmjlE
+d4+Jq8Aj3DiCzkb+1Xw8BYQ8z9CLV0YDXKaxQWTBSSuPybNpRTuGdxsx4bG5YJCJ
+K5+5hoJR1ydiNUqsMrBb8C+JCt5pAwo8LZ5uYNs4bceffEYYSc2Aln8XzSYN+yc0
+KrCGuYiXKOQ6nUmion7ZVQSSdWz80vzjurYeuE8u3kptO/aXiK7Dn1IYZbGtnCp3
+qrUS8q3bRAkIjkEYpr2DU9L5hEl4xl4EZJYPhCW0uNONqeZalrngYt+HBb4UphIq
+Pa55PLjqFADY+hoqhxQmP7kLcb2A/J/ZLzephqoPwdEN6uvJ1qHr+huV4EgmRD9N
+vSeNW2d3n6EJU3e2ouI2H1Lp8hh6pFgFYqJZz+M82/BtZDeMtcQD+yXihwgV3Sv+
+lo/LQe37aIbAZH3OPsTio+5G1NOL3sAv7AmM5ONDEnwkWbcdS7sCziS7NRZV8VrT
+FrtF0NiNG+ZrV4J0QhCKY/wYAIqIT6K5byEWVWOVI3WxFHkps4Pr6IUnUbBh12ek
+amM8FKyVHvFudtAWA/Vt
+=HQDm
+-----END PGP SIGNATURE-----
diff --git a/dev-python/traitsui/metadata.xml b/dev-python/traitsui/metadata.xml
index 7b947cd6aa5d..89dc0b657609 100644
--- a/dev-python/traitsui/metadata.xml
+++ b/dev-python/traitsui/metadata.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
-<longdescription lang="en">
+  <herd>python</herd>
+  <longdescription lang="en">
   The traitsui project contains a toolkit-independent GUI abstraction
   layer, which is used to support the "visualization" features of the
   Traits package. Thus, you can write code in terms of the Traits API
   (views, items, editors, etc.), and let traitsui and your selected
   toolkit and back-end take care of the details of displaying them. 
 </longdescription>
-<upstream>
-  <remote-id type="pypi">traitsui</remote-id>
-</upstream>
+  <upstream>
+    <remote-id type="pypi">traitsui</remote-id>
+    <remote-id type="github">enthought/traitsui</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/translationstring/ChangeLog b/dev-python/translationstring/ChangeLog
index 458a93c732ae..57efe866ca54 100644
--- a/dev-python/translationstring/ChangeLog
+++ b/dev-python/translationstring/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/translationstring
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/translationstring/ChangeLog,v 1.20 2015/01/26 10:28:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/translationstring/ChangeLog,v 1.21 2015/06/07 16:18:44 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   26 Jan 2015; Agostino Sarubbo <ago@gentoo.org> translationstring-1.3.ebuild:
   Stable for x86, wrt bug #535382
diff --git a/dev-python/translationstring/Manifest b/dev-python/translationstring/Manifest
index 0b26edd05280..115b4a8a840a 100644
--- a/dev-python/translationstring/Manifest
+++ b/dev-python/translationstring/Manifest
@@ -1,24 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST translationstring-1.3.tar.gz 29259 SHA256 4ee44cfa58c52ade8910ea0ebc3d2d84bdcad9fa0422405b1801ec9b9a65b72d SHA512 deba5b460d9ea640087cff8b5d7b9256708abd4340a54556f1f0542e2e4f9f0ae0a3482b66a176712fcd6925c470da621adbc5e4c4173c0ef29b9cca5fba1102 WHIRLPOOL bfc0f2d469718d6b27083feb10189dcab4e310183604c550314f4ecffaf38a8738bf2213e03eece6ce52dbf914c70b0629a44e5d1d7d1dcc4dfd9faa55b75191
 EBUILD translationstring-1.3.ebuild 1241 SHA256 8204b400f96baef3a13b815eddbab5afd72ba8125a3c729fe3c3affb476fa518 SHA512 e4db70c94711f69e4674625d25273b7387d7490fa8c78c93bbd7fde84540b8cbce5679427789285db2a755ee99b391145f61f57a86c310bfc3b09a58c8f0a66a WHIRLPOOL ee6811eda2146d1afdc29f6f750fa6cf63f67010fdd3bef9dff3a30b17befdcd9f6d6c85634d64d7f9bedb1755bd4d41b956a7a9b5513cf27bb99668d7c5c47c
-MISC ChangeLog 3070 SHA256 476975c943e7d9f9962225d155c4317522f9895eea4a617df52e1553dfc6e0a3 SHA512 ff4f567d638b8e3e5f50545fd105499862f894359320437e32ddd87fd3ab161c36d93ecf192f86b06da6b98d08f48414fad3836bf028360b431e11e0aa5bdd40 WHIRLPOOL d36baa8b0f5648effe8a225f4a5665d16e35b2ac3175a8a2a601b7ab0c55900532a180527d1a579279893788eb060471dc2478a25e1dab36a604c71b4ef0890a
-MISC metadata.xml 240 SHA256 7a8989466c7f3eb1af37cb4b8f91f03c57137548d7dcb0498e502e100441609e SHA512 59263505abd30d68c2d20994e13c5cbe71c7488c4b8d37faedefacec075b51547010efecfbd0896b48002e45077bc42c886dcae67c014755f79770b2a1fea48a WHIRLPOOL 9dc20d5f667f366a5e18c6f0edb47a64695aa12a41f9fef61237861ec3037d99957575fcc3915bcad6337d6e7e22aee6c7fb0ef010c706ec89c209a9a89769bb
+MISC ChangeLog 3175 SHA256 98e3f91cc0070f540c0e938f3a78ea926e9e8dd625ee96c1d3f8681a604011d9 SHA512 e648d6b0d2b77fd1d86fbe2add9f4cb6ee2d1939362f1abd52b70f660d1da25546ab27a434151a09c8162900af4b2767efb2c0646dad998a07ad150d2b64be8d WHIRLPOOL f2761937a3860941517fab23ecc0dcbc67ae8894dd3b1b11566f276e271f971da5f6d737318487cca39aa8db4e3d95e7fc492385ad7d1e76464bd4b3dbac8ee7
+MISC metadata.xml 311 SHA256 4d38321e9d85b119c2e8d5760e6aea580b80e24e0ab3711c48f258bff3b45c87 SHA512 678a539b5fe082ed2e303379a581106d0bec27a7256c067052677709b50f04a40d1637b02965bd4f7f0f80efbb26342ab5f298f0fed1e11362b258d6669ace25 WHIRLPOOL 098ddb953463b579170c67c2ad8c825d75e95db8f1888c38e1a9e6da47808bcd3531a7b7393b3f3f506b321995f49acc60bb70c4650cc6fa65c4cff88cb36598
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJUxhbQAAoJELp701BxlEWfS2MQALcQqxsZr/nzo8G5R224axPd
-KEjnrCV95T32yxCuPtJrtUltr+aCOJJwylESvlgyaW9AyNG1F0hSZHTU7u0EUDqQ
-AtBXCJgPSOjw1LTBau+M3A7nPFY68IqTZcVhc5NHeTjzC+DbG3gfYmO7IlzcfN8O
-uMaawKMWwK7Qb79ZiBkO1ttBrlPiKDvGXv28eRDzJp13rpUZSuaQZR7tKsjeESCH
-TTV0DQlQVZcberl6rYyYl258QsPLKPS6eCwMT3KXM9uUgwyzFhxJj3jp2PEBZ54K
-yL9bshK5uHortNCM4waW8DjMo1r8jeSTbFTJOH1XUowruTdtI7voeJOYTgXTPjO6
-Lb8++EMyZkYYEnL2x7uKdIJClUzgPld3n6mImJ1rbCV1jwvsSZmBB2wFvbWMp+VK
-XUu4ynl1F/ZHnN2fO2lvOEBYQqXOUvCJIhUDtfCPdP//8yIvRQV5O3dwFGMABDS1
-LFNL8t+ODSdFZPN5mykQX4Z/dZ03i9RYJ0kTEvsq2LB6XpdCu41Pj029Z+E1by2+
-2beDni7f7iGZfuACMjPkK5R/qyEZVso3GnoCgloaMFQjS9v8tawyZaUpQBj4VzSx
-m9CEdrmNqbf8VNtq8s/2IM4dedQblgwdnomyk6UaW2W8MusnORqy6YJt2Aw9r13r
-PfaKFdW+Qtud4E8JPQna
-=y4iT
+iQJ8BAEBCgBmBQJVdG7lXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiJBsP/17LxrMhqniWbkDkDz8qO9xg
+z5Ey9xWfFY7PU9GI3W7PeswqoDJjcS2qmN6ykAPgWIu+e9LOQfRuMyDDqWrym1l5
+hdKJetb2llI8DKotpSTKfhPHV3JuP7eb11QVTpMNs+EhaVH2c8DwuIIGgnJgGY9c
+CIqocL8FUUtp8SAezIscDZ9ASk6725pbQQh667TTFJC/GhbK31hj+rWzqHQwtZUB
+rzmEvTqiETJNQqycz5dX8B+gxkcPEJY60JFVXpqb03O/pxKx56nqcrKgzBeZvmuq
+mKP3Sov22vvXZZYirZESyNPUM1/mXy3J6YJbpJdUWrw/xHh41J2fncfWrlDcBsWh
+2FmBKnxgZhqc00iWwyx4RO7lO8hvsfdasTF+ub4EtH0KfZKb0qRmKcVUi5VmVK0n
+KkxLEczozn9zOZo7mEVn1LQsET/+Ip3ZWO/MgpwLBGUQ5R8So8704a7g9mypCJWh
++sWt/SuEYF69uKLS3IdVMYIqfr9o3VPfq0MTLpYU5m6Uw+s5W+iWc95y7x2tnbgQ
+Ntwf6l9+0TjKzI/+JZYUbN6BYP6CyHTWlrSKODhQdDT56UjqOXyC8QmP/GUg8eWz
++tuKS3vpxdG4/Lj5FMG8/tqtq085J6PFI6kH3BSTtdZE0XbHgUMgcw4eXds8+yvQ
+97LZLiIkJksNfNMBeh4T
+=wa03
 -----END PGP SIGNATURE-----
diff --git a/dev-python/translationstring/metadata.xml b/dev-python/translationstring/metadata.xml
index 81c14510e2d4..fa2a3ed870b2 100644
--- a/dev-python/translationstring/metadata.xml
+++ b/dev-python/translationstring/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>python</herd>
-	<upstream>
-		<remote-id type="pypi">translationstring</remote-id>
-	</upstream>
+  <herd>python</herd>
+  <upstream>
+    <remote-id type="pypi">translationstring</remote-id>
+    <remote-id type="github">Pylons/translationstring</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/treq/ChangeLog b/dev-python/treq/ChangeLog
index ed83936b610b..a8429a960f66 100644
--- a/dev-python/treq/ChangeLog
+++ b/dev-python/treq/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/treq
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/treq/ChangeLog,v 1.5 2015/06/04 07:26:32 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/treq/ChangeLog,v 1.6 2015/06/07 16:18:59 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   04 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add pypi to remote-id in metadata.xml
diff --git a/dev-python/treq/Manifest b/dev-python/treq/Manifest
index 410b0efc6f28..ab7207db38ac 100644
--- a/dev-python/treq/Manifest
+++ b/dev-python/treq/Manifest
@@ -3,24 +3,24 @@ Hash: SHA512
 
 DIST treq-0.2.1.tar.gz 30954 SHA256 487b9a48f15c1bc482b9be694ad436d70ecdc7a9f0fd3aaf02a30b7f547d9b9d SHA512 d9236c395dca66d358fc9bb1b752e02a7d6335195235808452542de33145057c1c2e959658015b3c89c9a20c35b1a8edb752e151230e72edd313dde6cd6a4cac WHIRLPOOL 2d9b4d5bbf6c8a274d43be6c92f26b4158cd4844074f84d5cd1ef09f49e3ee41454b1b7874074ec3a8c8617a299ddf6d8df6a12d41cd660a188811ae92a44573
 EBUILD treq-0.2.1.ebuild 1143 SHA256 3296caee1a54516683840dda8ceb514af41ccc71b358a99d5cad8b8d4290f5e3 SHA512 1e64d7158e21abb7610dd94830f91001b9ff916fa78fb212254edbc4f2f65a2ff740c2e2a2abc7462faf296f6445c477359be267ba2c50d546c359e98b5fc931 WHIRLPOOL 5365f4f20dcdd7d0c28d9ad23533b4590fb91b2721a476fd1d2142c80c6fa5336a4c5cdf517507f69f453e8cc88bafcfa61c43ad94dfa6393bf4acc4721e6df5
-MISC ChangeLog 716 SHA256 15f3c885db90e6ed5c1a42d144b5b10d927abdc069ea2f479927900b3d6f57bc SHA512 f3c4b52a05a4bef7719deea5c0ae619c9a0d130e43d61497c5bd51f9a53c59cf710730b51d76cc93f83510781ea6bdbb5d77102ca36fe9fb55c5210e26456ad5 WHIRLPOOL 190799db198ca3e82c39a5af175b1a2eec4a3dd4eaeff922b4058cf0e426fe19a63cb4091d68248f734e72b15c2c0db668875753e3af8468a03909751c7aeba1
-MISC metadata.xml 305 SHA256 13baeed16272483b4db1a39f2b52311db9e8261276bf3d6ac5bf683d6e735d0b SHA512 ee875686c4655e189c67acf1cb9b4a43309a19a206b21a59a5093a0b235086a7d2d83df789a71e684180c6b87276bf62d4245c1d1cb9f3f878e4ed61947d7a0e WHIRLPOOL 417c22435bc7fa3f502d3a2716c065527dbf3e751652607124ea5f9e4ea6cfbb38d20888aa36b8058d28054070d4a399c475fd85d531712e767f84c6138c7e03
+MISC ChangeLog 820 SHA256 49c314d52f130f8fac524498b065e7577e79230b1b831b9d2d75e8038814adfc SHA512 cfdf44608ab4b77d652f722f563700a8be9bc7598bbdb519f8fc1bb9b14bf34442ff2c2150f4d426beb57ec3496a5cc014f8927d7c91791cb765ad9b98133e2d WHIRLPOOL a3b7579875ba1a8a9a93ccb1b159ad0ba30bdf9cda20341599f7c323f8952c127550b7f0dd1b8a3056d2f068698899c3580fa0d2cb3e05730319bbe754ddaa5a
+MISC metadata.xml 357 SHA256 5dbabf9e112d25071aa020d1b9d52ad79e78460ec40d492c08ab288c933e233b SHA512 cd993402b787c1c6307f2c0b6064543aed2bf2b6d6e9988ed0c8e527bde408342d9266f9ae2c834bbe711bc545281d0c36136680fe4be01114c759733aead876 WHIRLPOOL 1d42ce94b565dfb19ae9cd5d21b202f2685a95590e6765ae95e0720c22a44d7e20ff8ecdeaa4e192a55ab5664ac1fbe92efa50cf9f5763011aca2fad10e67bda
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVb/2pXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVdG70XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiqDsP/iSslfPiuEi5GjGlaBxwL8JG
-METcg7OfRF078AaJNJevAMYpxH09dbXh5p3UM9h+zWbNOvhAJqh84v81fy7hmkAk
-4YbixWLwdLkz5dGNc2/frf6ODUtmY3PDiO0iE4z9pxNTQ1ojMvdUxtR0ctJjG2Mc
-YslPShK+51btFYIeg6w9HjCB+c7yYfhWdzU/PfCj/e6cCIE6tim0Ja6AjIKW21aL
-YJvHdh6LdwySFIEC4KqK/Tpx3QMj8xmIW3N21mqfF0+4BAfiBI7qBhElzy3FhUu5
-jCgVmAZ5gJqhpzXYxJotAafrZ3i9EYvaBAPiCGmuqAfwypa8+jXicMCYBSy06TfU
-8qUJEPrBlDLS7TetGvzIgnfhzXNaReLB4xUofteTSxkj+kShhPTc2BK/tnhv7h40
-hcFL9ieY9Xx37mHHc+dF6Jial3AmhFpXShypr0hjxHNwiR0nlJ1v+STsFwDyCiDd
-CJoWAWFRnLBNVFCxjQ9mUfZ9uAJLNJbbdraOPFBoLtjP+m9IQcYU4hDpIzp5kkSS
-Lrtbu2FnqyQodU1z0UoAV30QDLmpy5YNUR3NMQgVg6qSDxPiXSBAPFNqUcYeUL2z
-rnwkcwUpTbT2VD5ZdUljElks4kcSrJRY+8+zrbt0XheSh49hWU17ylz29nHXnig+
-yg3FZaREKt/nFS5QzM5w
-=U3Gp
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi170QAKakiCDDh1ZA9n3WDG/mKQFa
+c8kUae5K6VA+wj/Z4l5y9oLKbIMCjVxf+N0tgcIN4TL4MPYA9hAktJJAzQElU/9y
+u039oyKIoGTTlyOrEoRk2tW/fG6UqY2UwilWw3Dj/D+rVdypky8u+SB9FPBKR8x6
+W0GtMRSVpIPYlPNz6skDvCr6y/m9YQFdiGwd1ZEZpeQ2hc+B9UU0MWujCY+0oCmo
+s84s2eUDfBWlToOMXCZU4hxqbaXbJg2bt8/pD90c9ynAbAh2jypsyPaY2aLPPX5d
+Ft4/21a+NJ15X+7oqRhaNBuWn8PYeipCjIb8wlsL3wm0TvU2iW7IsO74PARlD1St
+ZL9dHTrnrUitA18zg0qeFpmAcEnkLdr4ow2I4KousNjmi88ciKl9BIXYVqtYVvpZ
+rR8d1lxW8TLyGDziLmedCrCpNvaAZ2EwbnOS52jqZSPL61EviyAvf1UdEZjrWKqL
+rUFmPQ989HxhuhN8jKYUQo/CRQ9Ckq2lXsHM9jowatF2tLxZprgEzFHPltJgWqRq
+Yvfk9t+J2vPsW6iCqr8x9HFYHD2K5rsfhnBY97zGkjVzljcZIb9wAF7VaZNQsK1o
+UnZ++ExTtzX4Gc0Yr5bpW+Mxdd4uQ2kg51EnbHn527C+nnJ6Q41YqEU1jdcxP9uG
+8esby7Jyvj3+BajL+Zwr
+=bJDs
 -----END PGP SIGNATURE-----
diff --git a/dev-python/treq/metadata.xml b/dev-python/treq/metadata.xml
index 5748b826f11f..061624702a49 100644
--- a/dev-python/treq/metadata.xml
+++ b/dev-python/treq/metadata.xml
@@ -7,5 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="pypi">treq</remote-id>
+    <remote-id type="github">dreid/treq</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/turbolift/ChangeLog b/dev-python/turbolift/ChangeLog
index 762b969cf364..3c21a0e18996 100644
--- a/dev-python/turbolift/ChangeLog
+++ b/dev-python/turbolift/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/turbolift
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/turbolift/ChangeLog,v 1.6 2015/06/04 07:26:52 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/turbolift/ChangeLog,v 1.7 2015/06/07 16:24:19 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   04 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add pypi to remote-id in metadata.xml
diff --git a/dev-python/turbolift/Manifest b/dev-python/turbolift/Manifest
index 0b0858309425..81c3a9b62ecc 100644
--- a/dev-python/turbolift/Manifest
+++ b/dev-python/turbolift/Manifest
@@ -3,24 +3,24 @@ Hash: SHA512
 
 DIST turbolift-2.0.5.tar.gz 47316 SHA256 7ea374122855949481427201327f08198a5b164c59057e7f07f9812b9d0c5e0d SHA512 42b89d4dc1a4699bc4d43863f0d9faeb5cd1442222a7d93a008a8d335bee25112e16c2e0a05d05442e53a5e4e4f7a7012b420bd49d8d0e5668fe1b487b825834 WHIRLPOOL 9199fbdc62d15bd18227cc5deb84870f01ef8569be1f491292aa5c5c6b54afbdc5eedbae23a8eeb02f8bf92ca2694ec649417ea61f13a0fc2762a0790d24b90b
 EBUILD turbolift-2.0.5.ebuild 1021 SHA256 143d5847c3ffd909abdd89a2d49da0812267f5c59402ada6c1099828f0570fa8 SHA512 9bb745662578f6a6d21724c23f92dad5dcc29bd9c7b07840745e9eb0cc4ecc553c208ce3e8ffe75cedc65478e018af029f87a69b8165a7b5b5b8bc5daf28079e WHIRLPOOL 032ee5fa4b1796e9851f833e35d718d70a4b30b4683e228a364441133ca87b54fdb07d0c0f29748c3eb7f4b7767b6334cecec8eee49a2cae64b4edfe9d71cc7a
-MISC ChangeLog 1100 SHA256 ac7ad5291de0cf31949f3f75fc9147d6d47c89712d8abe12c255625a91b796ba SHA512 4fd8ba84238d83d7de2cb5b9ae188fb596850865f3eb5a589cba9414d5067c2f0864eeb3a1e9a758eb1cf4c50a0b4507fa5f37291fc335ea4c0da791e8405f15 WHIRLPOOL cdb026bc22077dca0b6a15b50525927d58f71bf10f59a105708b880a345bf82370d731c5a952b4276ce3ad0a176ba891f13616244105904f72095998badfe57a
-MISC metadata.xml 435 SHA256 67226601e38e326a42dda73f01725ea5214f8d9a23633c2c2a5e6628dee2efba SHA512 d893cc55f012addde0bfcb3f2bcfc6ac9f8bb7ab0e94870e2bb34e05167844e8c3dec4e29d7173badb7425417be319f6242c079f39efc983dcd263f894984b5c WHIRLPOOL b6db47496f227b15dd6e7ba1ea02496510c7046071f5bd62f01ce609f7810a946fd7cf9aa9c11db93ba1b119ace096753fc8ecd5e74adaff9d0a64f508e518c0
+MISC ChangeLog 1204 SHA256 e73eeb9c6ab97d17ac0a137f4d8f3115dd0c27b80b3e6d8f93cd991d68097441 SHA512 678962a5c134087e35f8817891a0fad6816fd0c1df1bde352bfcf30d76ea2b0419061a0b84c419e598c5ca0ff0e93c5934dd59d4817f82d6684b0b0ffd27e411 WHIRLPOOL 35f5e70a557005a383fa8c499f79147e4a78a3dd11ad55072d4ea69d6b98457d5c984943648d510522e09384cc21873fb2ed991ee4e81636b3b87c194f807265
+MISC metadata.xml 496 SHA256 012e2d8665c4d2dcc7eb0c07278b16ff35b9409cd0ec15da567364c7c559036a SHA512 7edb8d7a38b91827f7a94b26ea170259b71c350d252d91be02c008ff1a47d68663ad4ae5cd3eba3a294a26dfb2499260fde4a4dc07cd4c9a4fe4ea6b68e0597b WHIRLPOOL 631874ceb2760e67f676c6fc120d77a0af353fc0035652f1bb5ede62a46c4f904d07b2e2f40c2d1bf90a59ae3c2852f194f6598d71b23b733d96a61ce18a00a7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVb/29XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVdHA0XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmigEYP/1KbV+9F5CzpEOCoRAkf07+3
-GgRR4DBXlicLa4xWuG78P7w2zVVksTl9DgRL905a1mrjOHUqxcSbK9Xd/WHluelM
-uXA434k3qOFfoItowMtOTKr5NXy1cpvQJotnDMyVMPt2F65+ypJ8a1X2zPNzU28/
-02WoeyhyHx0GikTLoUAdXI2i1DN6bK9Ra5Ar4be76JNLHXq9YL+kZlEkT9qsXArs
-r9ZXh/xEmoD8vgWo29QL69GaoffE3y7RnYHU5a4tUMchJZMo66sIwhjH0vTC64lA
-9nBGtpvOa7vfMYRFPs+nchJ5W1hZlagGUKqi/yho4MqklQdSynXkeWTGnb6brSCr
-7AYerpMENZp2sSmvycOjHNqvugfg//XrqpJDs6oAz9BOXp7xqgfbZ5iSxhd+yaBK
-YHly8a2PACY4qa4n2wISOdFCYkRMafeKkLysxLZO2R5RA5JwbdZ7bFczNma+ymxJ
-TOar4b/Kj8K4svvRRgdyw4gJ8rr8qGh0inMibGvs6QDg8M0oEXHOVo95tZl5D/PD
-91yER3bFCgyDJYTO5+LgiClxOraXPsLQXlhudX58Wwu/CsqAY5vrs4nSbcbx9g2H
-LnCgLPYOML27fxAW86oPPGRO9+Zg2n3ipf4lc61/scMtPVNJqi7oFM8z3yNwd6Dd
-w3wBopwqQqFdEGbmYfkv
-=/4JZ
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiPo0P/RuebC6kdlrR1TDTjNrIVH/J
+7yINV02Pro0i653pvd7YqBDcGhmq/yhplNVDJgWGryWTWD+vmBluVjwwcm5hgklO
+/H9Kjw8It+UHdlQsbShO+UU8piIJTiF473+/20HsoAWzGHp6fYhPdPSLDeENilWL
+Xa4RXkYa5gzpFvnFK3H3F5Mwx73h6ZmocEQ+YdI0senDEDJ/IoZJgyYtfeWOiQay
+dc4HL41sfZ0KMp2MZNq0VuRakbcaM4SroaU73URDYzk71MttZUif2/usEiWPRRW0
+Rz4feHWQW1FBYobcGflcqkDBi5OH1PRNKA0b+sbiFGfMsP+E6U/OMzaixAVToZ5E
+tJ9InczBoEKtLYRdpnVtY3+Zh7fn2TwfPzaz+marpJCAeV+Y4SJwNAVeilr/RhdJ
+eEANXHFKW+bAT4cQg/P4r+UOc9e3kUwyo/Ty3hE3hzZzxwBYimsINL0XYOj4q1ns
+3S5uhVEspZPwdS3laFFxKhjH4N/btsCW6CIkIdMGiq0h+maLTvs6jU890Kofg9Mq
+3iSwXcblZTTeJJm/shCVyT/a89IE5SZubnvh3W8D/h/7GnwdB6q5eQWHOdKWAkKR
+XM4NTO7yc4T9r8JCcLTaLocKbM9icff32LcITw1BG7iniYHp7TUJfxZWy1gSXiPu
+kCODj7GZFpuIsohTnxdE
+=K05m
 -----END PGP SIGNATURE-----
diff --git a/dev-python/turbolift/metadata.xml b/dev-python/turbolift/metadata.xml
index 32785fcfe202..a809de117fa1 100644
--- a/dev-python/turbolift/metadata.xml
+++ b/dev-python/turbolift/metadata.xml
@@ -11,5 +11,6 @@
   </longdescription>
   <upstream>
     <remote-id type="pypi">turbolift</remote-id>
+    <remote-id type="github">cloudnull/turbolift</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/tvdb_api/ChangeLog b/dev-python/tvdb_api/ChangeLog
index b328a768b3ff..b14a2b54373b 100644
--- a/dev-python/tvdb_api/ChangeLog
+++ b/dev-python/tvdb_api/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/tvdb_api
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/tvdb_api/ChangeLog,v 1.4 2015/01/08 07:38:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/tvdb_api/ChangeLog,v 1.5 2015/06/07 16:24:38 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   08 Jan 2015; Mike Frysinger <vapier@gentoo.org> tvdb_api-1.9.ebuild:
   Mark amd64/x86 stable.
diff --git a/dev-python/tvdb_api/Manifest b/dev-python/tvdb_api/Manifest
index f67015d0ee9d..9fa9d0f5d75b 100644
--- a/dev-python/tvdb_api/Manifest
+++ b/dev-python/tvdb_api/Manifest
@@ -1,24 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST tvdb_api-1.9.tar.gz 32429 SHA256 516bd5f9150f7fcb1df11cd73b2af0e155eb8282e49c197449df295cd0e0f873 SHA512 6ce13f47275eb3f37897da1b9bfb2d101184e3797abeec965c170d9b007661c3e0745396bc93bf365d6a1552fb461a2fd7b33777b4a67e58281c8ac3efb788df WHIRLPOOL 596c680383fe43f4575e968358c6a839d070c1eb1561e7a7f673516d1fb445bc0f9927c22eecf2762be5d0fe5fd63c840ba95ff08779a218c1389b3d66ea8668
 EBUILD tvdb_api-1.9.ebuild 557 SHA256 a1e214ab537ceeac6b67c869346da5aa0f30bde5411a213bbfc3ff9ecce3895f SHA512 3bd1ea8e72cb80a79524e06b207f3ba2fc5cef8e8866a7eb6725015ad69f2d73378dee68c86398c9d8f737bae015f5cb4c80586f91569226de7f9c16061e907b WHIRLPOOL c9096187ffa2e1c93a8dcb0f402daf43878f1a9d10c9722b868e5b7df4cc64dbb0446eac460d803a8dd5f6e937d0a56a60e284b09739306466b7f580ccb9c636
-MISC ChangeLog 740 SHA256 5883b5953631f4b0809f5abe6b24d71db2d5d3913ed8ccdf195b7141a770798e SHA512 163bf89a498cd56c8a07f511879f9233db51090c3c052ec36c614537b93047f38659b741d2a1e38b6666828cbe1591da796337e552d24b95a059cf1fa9734fb3 WHIRLPOOL 31c2aecdc63ba05ed05126ff42ef2163bf9b58b906d5afd04c8cb5fe0c8595ae821fb6e6318203b5a07a5f12435d563b0abc4e6902e7d210a36486775088385a
-MISC metadata.xml 232 SHA256 3e0886d31df5e2b8735dfa995ed12280c69f959a90a4e9d54bafd527110282a3 SHA512 ffd6f191fa1e2510e4c12c4b6c0b2240f188577b38b6b4ca297be5dd4424b352b24b6ff5ceccd06c0b2fcf55b2a372980bf8b980e2915334ba820ebdcdc149d8 WHIRLPOOL 47858cf96e435c48f17bc5abc285679acfcc01927852d6809a02c7610b16b81b145f23673070e1f3ae7354dd3876f882f6f00e2ba7320f50150b5c13f140e75b
+MISC ChangeLog 842 SHA256 b9751d144c6a86786994bec455c7ed3a1055411f9fc887956acba47dfe1c4aa6 SHA512 14405ef970b4092ee8036539d8f1b43f3ad6d540eaecbf202803f68fbf00daa82d29ce92a651f4d7ae4b661fff805d93e946ea41f1cef8ca20eb9b3be2cdc498 WHIRLPOOL 9bfc4049f10142a9d490f1f7c015254841195be901d78a9b0519f2644bbaab8e0f86bdd44cccee7b74f2258643de0d56ffdcb86d685e94800968a45805b8d5d3
+MISC metadata.xml 319 SHA256 caf63fb7bc02115321a4ede6dec46babea5c48f6c2ebc463fd1c7b3ce5a62674 SHA512 06d929f6f33dd542de9afbdf7c64a00e9f5734a5574e24e23ebe14cd3bfc4470ac39a33887f7533efd2af663cc196a6c2b8169c54694514ab68c10e011e86c55 WHIRLPOOL db2ab2e7da7a529f991bcff59021a3ec036710c8bcd0082e76c3d559a3be3b625b9cff0c6447af49916ed76d2a9eefe2c40c3d8df4e4dab042070dd21ae1a5db
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJUrjP7AAoJEPGu1DbS6WIA+3EP+wWktkiRU0LdI1UiJYxVoike
-IetKxHX3XFroViF/cX5TSyDPH8Fa7mzT2jekHY8YXcqGLxiAGEZkPZbUadaU9s1E
-u32Qc+4TJ71LkSXPXSluCMylrmz2JGjr0PNr6Tu+7tOlpkpxclOHrzHCXQwmcJKL
-YOp/NvRFPpvWvT2M2JhIbuPawIjMdyVZveaGwdUPk0iJM+8pEeG4zcf6GArZ+8Tm
-IFPrU+XjzqD11aTAuyahK/xwFXbpKhRB2S+qMJfQH+ksjjEnkT9b/WCJgjTe+ucL
-DRATrVGOeUZo4D0KS3vvQLv2qW3FHODVZUa8H1Gza+3dGDIjRZqWKApLWZq5Eb8u
-eV37J9dHjeYoDkmKkSJPQqw37IR/BWdPITnL/JZT9sjPUnkuVtYaklj0OwiRofNW
-s/v6lUafAvSDaHMnaTvpZQK6/GexsWHjlv+R6HB/vZ6sAn0ZJTLrXNRNBU65pWYn
-/NQUwEUiQ0L24qijijcE4pJaKAMz4BYs2+MBw6AsKt73hVJr+uNLXJFS/fmAnslA
-R7BXLXAXctSf6/7JLqF1BRQH1LUvlEFUqVGN5KRrRdkRaY6tNMFqzz5llNduNSkV
-dullam8f65I6csHaNrW/ozyWoxSIk2Q8Shs8JqBpt2Oo90dStxBnvBerHkB71A11
-Bg7N280RTk0eJSudv43c
-=R7Q1
+iQJ8BAEBCgBmBQJVdHBHXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiK6oQAKvHiOMBkftgGEJCEFvJLpJf
+GKtLd3I1tg26t7Fhp7A1iejE7gG6xeaYYgDZdRcaNOXj3GjihlusMnDmW1YXDxqn
+DDylm3uA7ZbZLNe5HG182VIR2JmCSeXhxYew2SxzuwovctK71xq6iFsmixrttOgC
+GOuoQSJTzWsCukxCBxkTCXmFjK+GEdWmi1OFNtPgor5HOro8Ih/Hf0KtQ0Eeb4yH
+Ng3V1gkqpFt5zKD+w0URHN2rTplP1x6kP4ss97sGDmvHfl17KF6qAZEKsJXIbgRp
+5BpBlF6PuS0Y9owXLWB9+EypmzJJqNyRgv1e/2EUu+f+n8v4aqNOr8+JcO4qP5UC
+ucJkS287Z4prewcjCxIy06S+QcXqcJ/8mgM28nYCoGoHL9elNxojynTtKRPG6WhY
+uDTraTObcBv5Gd/6GGHMsZtuNef+2J4YDb+e84CIhFTmvXLkpD3mjt++ocs56GZv
+NTFSzKBcWakWnTozm7Pzsn+fmhD1jShv9vBOhJAZQEUC09XqCbM8weA/Do1T1m8g
+McPhwhZoLz0ukhkjZYHuHPufFJJFMwXRybB2Db+F2u6fNYf0pK6mTenLUkeIsTTE
+MLgiz5qkmsBRIVV3IfyKBWCPdR7ntSTHOGYwf3YamN9xwk2v3/UNPJOYJVjVRR/i
+L1fr02Jy2P6smIXvjhNe
+=Fhd7
 -----END PGP SIGNATURE-----
diff --git a/dev-python/tvdb_api/metadata.xml b/dev-python/tvdb_api/metadata.xml
index 8db32ac91dfe..7af64a5cd5ce 100644
--- a/dev-python/tvdb_api/metadata.xml
+++ b/dev-python/tvdb_api/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>thev00d00@gentoo.org</email>
-		<name>Ian Whyman</name>
-	</maintainer>
+  <maintainer>
+    <email>thev00d00@gentoo.org</email>
+    <name>Ian Whyman</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">dbr/tvdb_api</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/tweepy/ChangeLog b/dev-python/tweepy/ChangeLog
index 870e9b162ad8..42f1fc8d8c19 100644
--- a/dev-python/tweepy/ChangeLog
+++ b/dev-python/tweepy/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/tweepy
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/tweepy/ChangeLog,v 1.11 2015/02/10 12:25:37 dastergon Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/tweepy/ChangeLog,v 1.12 2015/06/07 16:25:05 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   10 Feb 2015; Pavlos Ratis <dastergon@gentoo.org> metadata.xml:
   Drop myself from metadata
diff --git a/dev-python/tweepy/Manifest b/dev-python/tweepy/Manifest
index b86b6d63febd..8b4eb333c8d8 100644
--- a/dev-python/tweepy/Manifest
+++ b/dev-python/tweepy/Manifest
@@ -1,24 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST tweepy-2.3.tar.gz 52352 SHA256 bce05e6375d03b42ba7fef2a972635be6841dd0f26b86bc5704154d248cd29d7 SHA512 23317a507174e108cf8d13232aa467d892aba1789ee4f610eef4f5503b045841b5c85e8ae63ddcfd1e07178afbf3bf9f4a9fed939426411a8566f1c949b9b831 WHIRLPOOL b9adc746e498a0bde90dcb0b4a3ea5c6817e41c39980436ca42364dab21493b0201de6fb16a196b9f9171150d46cc1ad5e121710aaa62bf16b0875d0c6f73cd7
 EBUILD tweepy-2.3.ebuild 1119 SHA256 32ae333439bf8862cf0a4ad7fbb2d7398a8952630b5008965e149dc776cd18ae SHA512 e419b0d8a484098dedf36b6c921e85097c3f93c41539f85d41dec685acf326d740c589b1eff1e3e13f39e15044b317878e7a48bea0963b3f841a72276c212b90 WHIRLPOOL 8fdfc7f29b77ac8173da17c4eddd741ecea24fe36e95326542bc907a44c117a89ae82419c140b9f3767949c4f5cb646b348520e640c9ccd1bd30187749154f28
-MISC ChangeLog 1504 SHA256 85b18b40941c905c9048ac262d7e6bf60660d37a3378d2e2d019a1a8aca26df6 SHA512 d8e288f0df6e6162442f5318ca4e25b0812457cf85947159760b6f02227eef99cbba2a376dbd424e5858726be2aa1dd2607fbf94a89c588a57ff1a8ab113052e WHIRLPOOL 72b71b74cf915bbfcd250712023e2904cacb62376336eaee021b4c5f484eabea0ccfd64874a9c80fe8bbfcab49baad122df699efff640f756407be3244e0ce98
-MISC metadata.xml 161 SHA256 6f41e9b782499f6bac80760066dc5ebb307e73d31d2080f2eaa383b8a236c68e SHA512 9d77a0cf6ef95d95fe0e41852a1ddedc8bc4a82d39fa75e8bbf760ba835deebe6ac3beddc83b9b70e381cee31936f54bb2db7cb88357ed2228c9e972cf2cac47 WHIRLPOOL 1f1ee9aa1b4b8747fb5f6c9234263952071a1a90100df893eb7fed974ea7c63639796521cfa1fde8929fc2f1bf0cc65e88ef6d703a2dff633816ff87cbf21411
+MISC ChangeLog 1603 SHA256 7d4540916d77cf3efdd5917906adfeb8729b64c7c260d91f82dc40e23b901f06 SHA512 9165e73a8adbd6bb9f71fb3e09115edd49e38be3b6987a7f6ba2357d752115c2bb520e0eb1bc261d581f4512c5a21b756b84df2c91ffd91ef53057b8db8ee8c1 WHIRLPOOL f1851dc1cd233f41031b44fd47b8e515587dab0456a9aab5680c9aeb18a01d35ac80f0822de5c5fbbdaa1ff7cd403740cc45bec6e626e03692fb30443ee07907
+MISC metadata.xml 243 SHA256 49a65a7731f0fe7c5a3961ed734af588a0e2b17965583baa009337a131a7d320 SHA512 c56b4497894b7db27a5fdcdd1ac15afcdfafc9bc36759b615e490f48e9b434d35e02cf141fab65df817fd4a87ee953b3d8eef402fe19f44ca138c500645e3c22 WHIRLPOOL aa4ed897dd5c47b922d2f27c002f25ae1053b4a93ee646a03336c900880f7cdaa3c8950dc643503d94d12acb2f1ee20ae3daffb67c1a000cd74c4600b10ad369
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJU2fhRAAoJEKMbvrI6BRdGfk4P/iYQYTB3u0hZZ4Cg32VUsiHe
-SAUAE6+ZSyhxiQvxWyXytvhjPMxmCRmfj4dZC3LhsHtwPjcGWPhppuxooJXPxX+B
-8Wn6GZKjQL02oNA4y+x3+anE/WC3R3NPFsEWymJzS4MoaRnRiQUneKGOHLo2NgDU
-NYdxvaPWVcrtN1rYABpqswr3L3c4ARdnKDHZKq+wDdElORAIvcZgRT8h3tFp6+op
-J+fc0HFSEzCVKYqpcV607QUmbgEi7Qs/235SkG+yGIvPS1IraX3r8kZhbVYztISy
-yZPi3jM8ntE+XobfAMsDDhQGdNZj6xOnFwaLdUdGZkenmRnSHopScUtRNMA5S/iP
-/TFbJk0Nld+oQiCweEBl7NgJ5iCD30dwCgZ8HpWBQeRSueDkVPg26OHop1MXPA8D
-yawN9u0QoX5LrAJcBU2y4Ep8EC6gf/h4JgEF0/pPedKeOZzgv8UD/FwSexSYtwG+
-Z4/rDaSy8FMgZFOU5ZOobMNOqYIaQGlIdMBCDCb1vG4OzVDVqBdZkKbZRZ5iYVFd
-5oTk0w9DVeSn614lZgV8H+NpVMNxXjyOeIJwM9GQfBRJKhQo3+zip+kwhqDm9vPJ
-SZICbhw1CXvc92xGotXHSyLdmwIRZmBWz98EQdLaFE9dMqs5F951b2v/QzCkOvIC
-x/nsQjmCHOXW1zc5On85
-=ZpLb
+iQJ8BAEBCgBmBQJVdHBiXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiML0P/jCshmVaFoAsFQbSUQPqWRt+
+37+y0xFyZ4SzcBM4Yc6tX/CzOWa//54o2Wv6i6uCGmF6XqofOBY+Eum6415fLbvC
+zDnnqvTyj25Vm7bThSe4J1erKXa9BQneFMPQT5sSSVEeJhGUpIFedPUU751S/BIz
+QU1otOQDbURdA/QcbejwONVoaJUtZ4XiCEhJfx5A/JEnGuGG6fPHg79F5dSlAYrA
+KhUaX/16q+j6qv4i8We5rFTDz7MpAwIstp+Ettc7V/SZWiWEkpOJxxFSAuU88XUj
+Qsa1ThV7fiMstMUjyiwe5Bn2+pmSTt1bXokfx0UguBErhMubrPavKNbcNQHUT0jp
+SdmdVs9/fwHATSO8HxMbmqDvQi+P+6R6O27NfzmSw9RODaRjhcoehoecH8ZEgNc/
+/zYJ0Mqnh+/sHjvymptPAr7j97lSyWT4oe/P9Hqxnm++sYndlm2GodDvZ08vzOnX
+vTeZw+SjFIt4BIKt8oHUsCa3LJuydx3L5oSZe2DqyBBWZmH4JtP5qp75db5aOSuI
+OHu1TekKNKh9UoYgJWUyIoMNCjixPxHwx6ovxqzgx4DqDuANyPwqNYW7rWDmuj7x
+uVJxDRKlX6bMMdNqguBgGb5APM90HEldPKVNb26pPvclzkqsFCOR+S9sZz/59cXa
+13IaKGtwKe+nUQ8Sdbe6
+=lPwE
 -----END PGP SIGNATURE-----
diff --git a/dev-python/tweepy/metadata.xml b/dev-python/tweepy/metadata.xml
index b79a85f89156..7e6b7bda29a4 100644
--- a/dev-python/tweepy/metadata.xml
+++ b/dev-python/tweepy/metadata.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+  <herd>python</herd>
+  <upstream>
+    <remote-id type="github">tweepy/tweepy</remote-id>
+  </upstream>
 </pkgmetadata>
-
diff --git a/dev-python/twilio/ChangeLog b/dev-python/twilio/ChangeLog
index f2e67be7913b..400c226957e1 100644
--- a/dev-python/twilio/ChangeLog
+++ b/dev-python/twilio/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/twilio
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twilio/ChangeLog,v 1.2 2015/04/08 08:05:28 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twilio/ChangeLog,v 1.3 2015/06/07 16:25:24 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> twilio-3.6.9.ebuild:
   Drop old Python implementations
diff --git a/dev-python/twilio/Manifest b/dev-python/twilio/Manifest
index fdc1003f6c08..82541bef133e 100644
--- a/dev-python/twilio/Manifest
+++ b/dev-python/twilio/Manifest
@@ -1,26 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST twilio-3.6.9.tar.gz 226151 SHA256 0a6ce201edaf9f79a376f2713e10f3fc9cb8b64c046b1df5d1c87c56e8ec321b SHA512 f4e0f13e3f12ae8e15817a285a4388859b458ba7759acce4d5f6ee425bd6a06742bf271a01e1cc5140d63bc599828b940f1e96a6ed7f5744c1c9eaef2dd65b29 WHIRLPOOL 95fc4864dc63a5f18a3108014aca831da36ebfb4d8ff68cd739b768e6df81c56de8a2e1f4b138f927b4c5645ad0bf2a9d1330b81e34ca0e60bf6041fbd7ddf3f
 EBUILD twilio-3.6.9.ebuild 878 SHA256 96036e8c284f69e8277d87502989f3cabfaa1df5ba948eb17a4630a809cd16f7 SHA512 3b48e47eb8030402f5adef5580145e5b28c0d40065074b98ec86ceb939f06cfc0ef3111ea2c844202b2a4560eb267257231d745ab7f5c06078a3bc58253b579e WHIRLPOOL 4e6c652b4083ab19d419bb4033849e2f0fd5b84e1e0116ba1e3cf1a5f73b025c23f27cdd6b989c1ce30f53eaa894fafbcbb3086688b99d7670026ffd55e85ccf
-MISC ChangeLog 465 SHA256 bf84185ecc70b2cd52afd27ddaa7e0caf507a71b8b794a2b299dbccfae97c9a2 SHA512 9856627f959d6842a1d95f0de29691fc0ad14da4f2efc75452624d524a0e71ef03d0d478d38670570829d20de9038c86e01e85e74c956dfc687b2b4296368af6 WHIRLPOOL 7a2ff0a4cabb240b222a04a23ff32e8a54a63c695f9989546dece88e266c3bb57f4c3e12ce4f8be46c9dd672b019a84b25fe94ceb77166e0d2d19fb7be789c37
-MISC metadata.xml 241 SHA256 57428c2797c7e5ada0398dda386d9c091a4679c8bce16aae13df7782244bdcf2 SHA512 31558a1bd015d093acee4721b82ef395a58332f608e114dd39bbf836805d1f444a4eaee42045803bae85a440e6d3c8249ddcf8f901d44900cd977da725f3db42 WHIRLPOOL 65ab0dc9665e008166fc775960c19685253a84aac56d6313701a093507c2f93974046215959cb890eaa75ce18e4ca5640a142063e0783f1126eba1e6d8161520
+MISC ChangeLog 567 SHA256 c8e6ae7951f616090831db6658dbda031a3df03333c8a1243db27208bcaecce0 SHA512 6678b544414eeb1ee8ede36bf6abd4b34f17802bbb1bc600ce735c0df344adbb36d4ee33499ab4772ba43102be0773f6b4bcc4489dc6ac3cce0905ae3aae110a WHIRLPOOL cfa91fe68c61649cb2d097e9bf8824272bb18ea709d493011a63d89fb7ed9b85a376dc90ac728ed562013c576d0d79babf5d1dc7997bb54eb657a036de41d3a2
+MISC metadata.xml 335 SHA256 6d39a3c0335be0c697011e0a4d64f166d7a88e30ad096702c26806d0728bd122 SHA512 e3ad6ddd29f4eb438afba5a78f2e3794500982d24f53df1a7326c273692c67ca121cd7d6f9c0be62f61527db5830029242057bd4458a09671dff551ae1d34bf1 WHIRLPOOL bfc70720a1d094007c28cc9c4a346a112eb31df9b4f3f875777a30faf17b57f50d16b6b795c3fa047c4c578f655bba9eac0ffd4125038634fa69916e36580332
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVJOKZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO7FoP/2x24vPDdaB2pfUDhYqEIqc9
-hZZseqBdfeKWRbTB8JG3hfX/lxbFFGFYgWNAqc+8dFev3WOzbTZ5wFEVklrfp+bN
-+kl1/glHzeluMC8Axhx0Gbfl1269zr02l4nYhn2NPJAgs3v2kRO74/enR1xvTIQJ
-AwTw5YMAlTTwwcvGGGq2Asm02Zru1UqrOhMqPnkg589oZqWuCcWx+I5rhaWII8X5
-KnCxYMzkWLJbL5KodbUwVlDLOMSIs06peNgtI7N8EchQAfChqlsMDjlHIXIqVNx4
-4ohOd95NpF3cXiOp6KfAtUXA3M1Svyj59jTVZSiS/8YqmXaKUc/+F8DHUtiWZ/6S
-J8GwRLfzsdciOGEKMbscHZmleo+KSmwRtjrdGiw0n+dPFf0L6ujUZ0VSPJM5cYsz
-K7He8uMhwK2/tWunjYlRDYa9b1BotaGare7JL/RgDC5Iy4d04XgJabwkXZc5j9wT
-QjmvYszngSdzvue7uNd0znjsEE2RU/DIsThMJu7oCqWKfhDrS/KNeuvbg+2Fmt7s
-1Mh3iOIcEfZJNtQ54mhU0WdL/wZR6FpHJ1P+P7ZzfKmwthOsA84vUHnAyuw8AQTg
-+MfAmG5C45y+qFJqxC8wyCaukTe0E/CR6P4+XQxCgbKYTpn5wm2FtRHcjflTnE3a
-IllNwUpxdrXO0i1WeTBS
-=Z5Ir
+iQJ8BAEBCgBmBQJVdHB1XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmisWUQAJyslaMLNJ5/G7Su1VXn0NGN
++M3W/SG3QE3DWdWrGG/RvIOB2VwTMo6iuSPkjaPs9XqoFo96ANq6T48P39pXFhPk
+3g55ev/44MaYey5JLHPztLPyh0GUTxBkQMhjuPYE/toow50u0DWiy2VCv69FMmVc
+Tyl+FdMMNehKWOeA8KWDpQHf4YKgbvtms36SmZy2jB1LyJ9wUQmdT4FMsvAzcYTS
+MXtHFCBbqQxXxscwiQm8BnqNjMy2HBbwH92WHpcCvTr0fP+bR9u+nPAAQpUEbchM
+FqTUgYoonigPETLST42R6DcD23XvExXugs0GvA+MV2sEEJhuopQd7bd3upYVraVs
+Le3OSVukBjVG1C5+y5Dx/BMYPogNl4NderjzMpQrc/rsU16sXy82Neb5loTa/OQ+
+2vYk6NyamUbt9rAws9sUSE1oaxT3BEi+LpET+NXylhHIw9r004g9iheOHK7hkdXs
+6ovStHHLVmpN6Nl8BZyH4w4oEP7gyBnRZylDNIefEWZ0OwLpUxNfn5AdzBos9Nfq
+ZBkzrbGPKjGKg34FAK/JaO6ptTJObRvmNK3aiqP2OXEd0Uiqp7Pau3Yp1OTQFGqD
+yu4fJ6cOkfvHgehhbM9kj7tFwmJ+7PK/MO2Lvhje0uY0I9u6eOfXgkIZfUbt45Lg
+EWXJprPiIxeJMufQuA0D
+=ppWv
 -----END PGP SIGNATURE-----
diff --git a/dev-python/twilio/metadata.xml b/dev-python/twilio/metadata.xml
index 4128863055b4..a38887dd69f0 100644
--- a/dev-python/twilio/metadata.xml
+++ b/dev-python/twilio/metadata.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>ercpe@gentoo.org</email>
-		<name>Johann Schmitz (ercpe)</name>
-	</maintainer>
+  <maintainer>
+    <email>ercpe@gentoo.org</email>
+    <name>Johann Schmitz (ercpe)</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">twilio/twilio-python</remote-id>
+  </upstream>
 </pkgmetadata>
-
diff --git a/dev-python/txsocksx/ChangeLog b/dev-python/txsocksx/ChangeLog
index 145dc99bff3f..e8b7eb9bd889 100644
--- a/dev-python/txsocksx/ChangeLog
+++ b/dev-python/txsocksx/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/txsocksx
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/txsocksx/ChangeLog,v 1.2 2015/06/04 07:27:26 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/txsocksx/ChangeLog,v 1.3 2015/06/07 16:25:59 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   04 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add pypi to remote-id in metadata.xml
diff --git a/dev-python/txsocksx/Manifest b/dev-python/txsocksx/Manifest
index 80df646230d4..e68f8a62d289 100644
--- a/dev-python/txsocksx/Manifest
+++ b/dev-python/txsocksx/Manifest
@@ -3,24 +3,24 @@ Hash: SHA512
 
 DIST txsocksx-1.13.0.3.tar.gz 19147 SHA256 df1a9e7062c7e3693c39953705b75e0feb7b8746a05135ffb2b8cd98708c9c43 SHA512 86621ea27eb0a8f2043f0ea0746a0716ca5e03d0721adb9e733d8398f105b3a17c37057d69cb3bb929e9348a06bc4064f8fb1149dbb0a06e9fd0f07eab5898b2 WHIRLPOOL 11d87111c06665b3c9330fb548fd9b936d2d3a5c82d305872ffc482011b38ec10624aac94603af89339949e29b5023dda8aaba4596186f916b9062022c70e662
 EBUILD txsocksx-1.13.0.3.ebuild 769 SHA256 af36eb232c64d17e124c3f898c8056689e002021daaeeaeb872b61db377101f4 SHA512 82bef858b83152e1631b184ccf6d21de88b79fe0de6f0600bb0575e3a92dec929a72562c6ecdf688d4d44f71690f00d79567551b174102efde904529b1facc44 WHIRLPOOL acac6300726cc5af67b6f8f7776dd45bbdcea787d17e0c1cdd8f233a2dc5ce88bdac6588af23e89c18355439bf9b233dffa57c7a1bf94a26830ea904de157590
-MISC ChangeLog 516 SHA256 88e93266571f93379d58767a7b1fe55cf5c5a565dcf860050720be997f0d21cc SHA512 7571b1242401805920055a32be25e543dce9d310d93f8cf6f786ea473dcfb10cc0b78feea37da34cf0ad42c55e7bb0072ba9e396b5ea06e911eb77a4c1efd7f9 WHIRLPOOL 66a9edab7ba2fd51b1d9b3956435da2329f72ebb004f54d3dba954380a68b90195a589404f3f77c26cef336aea7655432bcc77cd7d2c28e2b881527f463e8edc
-MISC metadata.xml 312 SHA256 90be75a5186f5fa19277bb211a5e73ae31398f482261da4d0928e7d951b34d38 SHA512 b53c16ba0fb0a309f957abdedb07c26dc215aa3869f23ece6d63387d08bbe6282aeda4e49aeb27e74bc0caf2017a22a0145cca9ba2ae0a45925e1bcb9ad49683 WHIRLPOOL ac20befc79a8cdb5ee7f58401e386feab8c31612f3f53aee11f758ba0a137dad0b796726b20b10a06ed91032ac5742a30526d68282282bece9742068f79b2660
+MISC ChangeLog 620 SHA256 b9281752373f1c0ca32581556174be55f0bf3c8799cc4dc27cb9d95c455c10df SHA512 e7285da9705bb6ff6ff47696fee64f0a4da5c80c206fa7eb7abad0ba76c9fcbcd33f39d6be08b75597022b66b888adce9f46ad3b0771af0aa7cbe7431f2a5a21 WHIRLPOOL 8d8eb2080bfa5be04fc5032da87e79bf4a4b40c699f031716b3c990554c9a90d9ba0607d49147ad1c5133f6fafa43475785fbc6eddde90f698ab7883c27db8ce
+MISC metadata.xml 371 SHA256 0061eacb0774782be0e035f0e207ec32ae8d554ce36240a64f0c8f8b4fa62ca3 SHA512 fafa5cc2858370da8a499ea3f2f6f6f155f3cbdd20c75c62a964792b5edc5074e50aade3c3965d98f1657efbc216c06c502287949073f8052eef0b8beb773a96 WHIRLPOOL 35e57a58e69bbbfad8830c74223e4e7de65ef256b677ce572c673ef8bbd1abda253a425b37d7f9a38d3f8c6ca9364464d7223c390844298581b4e3fb8e40ec6a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVb/3fXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVdHCYXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiRDkP/jOcyuFsTmhEQbAmMhTnwzk7
-xZ1ZTJO1J5CVqPB+Do77kRO9al9v0TV5tuc48VkBdAu6stGE2HFSk2VbyzqMi4+i
-fU4O+qH0tl2VXq0+CI6uL9/Nvw+DlaMROm8jrNmu+b42/do76n5MMTin1TIEzvYB
-pAlEclZFaVWlqvvQskSlTOPjYBAItMcjkon/oiW9XfbAMeu/MUrDO28DNsCk2Aa/
-91tXBoQNMG2204Mp3SEC+U8KkB0v4TSujLi7f27fvBp5rWKkiSNUqiMwQH/xHloX
-JaCFgmiwPJDWCUJYc9Iw/MTojhwdWl3sJMZ8hCVtOOQwHJKaY7dQNLIMqOMfA1UV
-kS4F11eDkKL8K31q7JNGn6oCfrpx8WUdww3RGrlMI8CeMYYHhGonP4pacHNa4y0n
-mj9c521YS+E/STQwJD4OHCOco8pTHOYhX9zkA9B8U753d6JZjtFmu/lngYKCjGFM
-S+yAxezSGvhoGmSW/dp+UMfa1cYacTOBewTqpqOtwXfSI2sCp1wkpiVhptY0NASf
-6lRohMBwAtBh5g5ae9vztRLIk0iHCZOdlnMST8WjJyQjKGjBUO8oJVucb1wzkF81
-wjb7b+UvgEK/qtNIYzgMyCuWS8EsGjyNnCX5vQrZ29jKRPZrOOFVsDZjbFh+uE08
-u0qK2fTqY/ok3GXAf7qO
-=Irq5
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiXBgQAKEGFvRiTksawKgRTIPGAqh6
+CI6ARGhBWraqCU7+FhkXqcFQErPX5Ab15FSXUZnaduSVc6Ho8bPtXHJhQTNdGM+n
+xqx9moAXlr8SeCc1HuINbMW0A1WTx1RTDc0BlsGjRAlHkn8iX64PHpfO4YW/wyOs
+KRLn/Y3uYoVh50WZPHOkXWJB+hj+mnKMRXPgO6smB8GNoUzQROIGqO2Ry/jp24Cx
+xfnZkZr9w04ZzgkFIMO8LVnsWs4DP0jwhsggm63l89rrZRl1SwB+ulcfmjnWLtFH
+U2bqdVA/YA+DrXwJQulpyN+dSYjV2AHU+KSLlOmSjENJBpq1KvkGWjsuLCG1F4BO
+TcnG+G17M5lbbKNBKUXEk0H/jiKx7SFqY0NL78cNzQnJ2jO928b6LSs7NmJEVT6G
+nc1oX9J3a36GzWzROwQjK2EFhDbPPXCbzZ48i5dFlbIgppjX/1zGeZdELBiUz5hq
+stRLrdhYfgfN/5MP4jSMIK15kBm3d1jKZ76Q7vdPWH4nihHgLO0aOQMvYoDE5Fx5
+cfYKWIfk74LH451+zw5WzIQVhizsxGU8GRoh2H3ufPNudfAQ4HM4AScj6zRAY3Rs
+4mYucr5JEjsOGBYYM4XSTOhivGmPPkOCokEsK3znDXSbGsUe5oHyoMaNJs0AWSxQ
+llleBNf3xamL8tOCWNzT
+=G4JY
 -----END PGP SIGNATURE-----
diff --git a/dev-python/txsocksx/metadata.xml b/dev-python/txsocksx/metadata.xml
index 5a604d54c46b..8ccefa5d55b3 100644
--- a/dev-python/txsocksx/metadata.xml
+++ b/dev-python/txsocksx/metadata.xml
@@ -7,5 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="pypi">txsocksx</remote-id>
+    <remote-id type="github">habnabit/txsocksx</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/tzlocal/ChangeLog b/dev-python/tzlocal/ChangeLog
index 9ae6d6c4e9bf..906d1be1fe2a 100644
--- a/dev-python/tzlocal/ChangeLog
+++ b/dev-python/tzlocal/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/tzlocal
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/tzlocal/ChangeLog,v 1.2 2015/06/04 07:27:49 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/tzlocal/ChangeLog,v 1.3 2015/06/07 16:26:20 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   04 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add pypi to remote-id in metadata.xml
diff --git a/dev-python/tzlocal/Manifest b/dev-python/tzlocal/Manifest
index 0b35c162e969..fd0a74425616 100644
--- a/dev-python/tzlocal/Manifest
+++ b/dev-python/tzlocal/Manifest
@@ -3,24 +3,24 @@ Hash: SHA512
 
 DIST tzlocal-1.1.2.zip 22504 SHA256 4d9ddb8d5eab086e3a7c504c6e994ffa85df43e40da4d6be776218be051c677a SHA512 966b56af79238332dd3d6c730d1e0a8ab3c7caa06755d9fb148473297a6ac65133e9d554236a7d09672a663266e3214142d423c62ba3444558ae81a12d21a629 WHIRLPOOL f95f2d0e4cbeee955dbf6fdcdc928d6514c8a76446b6c52349341f54a06749c2c3fd1a25f487bcf989a11c03abe0b870305f87eee01fc0ac107070c1e5a3dbd1
 EBUILD tzlocal-1.1.2.ebuild 701 SHA256 96d9495ef00df8484e6ef675a838cf84784c58c068f6db97277d98f29eccad27 SHA512 c0b89cb5e9eb69355b460c6b3ce2f86ee4da01f9e4e62bf65be6b83235f7c9b7772936ee00c64ff3cb63564a269467a1f77d8f6ec114c1375217111c84a34e1f WHIRLPOOL d9789899b72dceb1b3a7c834dcd86aa540a93538d29ac7edf5deb065784233f9cc657595147eeadb351ee652b2a418b298cc8ca9aa0548e71fb5ac39f3f6f3ee
-MISC ChangeLog 448 SHA256 90c80eaf122d2e56499f538c7a3143ae3971a01fd6c4deb17c1d1e293601525b SHA512 a15fabbd13fd725a2fe8cd9e686f81c445c05ddd00dd2733dcc851e99c3878af6793cad0eeeb3ea837f6f8dd0bdf8eaec9be95726d45b09276eaa3c261785688 WHIRLPOOL 91907ebe9c270ed569c1f222c4d7bce7fabb0b53c050e27dfe20b1dffa64b60540d9230dd8e0798b64d9257dbbf493987ac5f8e72fcafdfd563cdfde065cb9b0
-MISC metadata.xml 235 SHA256 20b315946d71fcbe986d33eacac8bc25b77d6234954e36d50ab63faa37e35ad0 SHA512 d9f8c1763ae10fdd48a76a5e45ed1796040526a1bfb260ff753af801d1cc380a5f08ef0be6b9f0d53455b52058419feca30df603983019c5f5e600e89c88329c WHIRLPOOL d748bd9a828f005c929b5ccb613abd9fe98d2516bd6253448fdd5d9a67ab363f798cccc6b7c231d118da3f25746a9e436d2ad7aac36f39e9e4e607b9bfe31fde
+MISC ChangeLog 552 SHA256 8b66f8dd1525cbb9d06b9e715aa339f69e08bdec25e16826ebdc86f597821156 SHA512 675b1c954192043000473483b626bd131ea4a5c3c892f43adb1fef02ca99a4bf3a3af8b0e374aa6044538316576433ed1d45d1f0316f89c0e1b338d351ff37b1 WHIRLPOOL d6a16694aa8ae50235ae053e76758dd8713f01ca1b2fb5d2adf3ba4c8dfc1e47187cdda0b9dfd47bf40ad4261a78f7d8dcc87db984e13592e1225d8a497fff5b
+MISC metadata.xml 292 SHA256 fc79a09cc73b4e843b812071fb3d857214cc41a2a559d3e81ac711252d96d210 SHA512 e819dd8d278cdc3c2265ff826c45b736ea2ef8b1cf5896ff511fee3f7a85097a04126dae4069f57dd34a8488fd538179c28e1b2de3ef9353bd29227e851cfd17 WHIRLPOOL 386987671c82352530ba15d21c1bdc8d4d6258536e9d2e17d4196ba2c74154dc46c6b7b4fa54c65b1c285fa5fd6d0a80fd24d02bdacb63a8a08f37b1de6c773a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVb/32XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVdHCtXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiKoAP/0KVm26BTPOh+EzbDV8a5m9h
-qRCAo8mVSgm3afK2pKeZs3+bsglGKNYpHDMNuZBreDXtoAe68ocvnDEUKMiDnD6+
-KfHMK43RclYshDzfGC8HzHWRZj1sQBMTgRRnXaXNeKnS5YBK0lE2o/TGP7QHpwsE
-yQL/EDtyAv3V/Ncm67kCVaZ8mG7zE4H8q1wjBCZ73EPjaOqmHAmL2IFLAVKrLXXx
-jI3rf95IkEovBkxvEHVZin5GaIyx0aL3qaOOXBzIelfMZJZO1tUYhTwSEXTen+tX
-LVGrs6YTikSckuqxwax5i8bbwjmmueJXPU6Ftsonp+jh+1FJxHfxpXqZWUb1s0hN
-Stg8hbaHUqBOrSRqp0og/qiejoEUBL6SQ+KCeRdl9U72dWaqVGi4BhMkOoa0Mpf1
-SCAvRM70qP1dUYrCwqMGKdqxIe7QgvOMq+8oAr1G7k/r1QpDkIqxTm7splOPCGjZ
-Q4dYRdonkRcyg5/GnYLPx6p8TL7QHv1rOVq8olrwOivSv0yX44S4kUKGIv5WP2Nw
-xPwnu4Gg/2YD/aumnoKfa+AxRIyHbEZ08uuNagP5r6ODT4A+SpjnqQY0pG28UfGr
-3O2Am1O+pSMpdO3zPvgpjkUcuS0vwJdhuUKj90PKIzpBFJSL+wAVeisIuKTjAE9n
-wCw3grjHRpQoehmkYG/i
-=OSas
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiP00P/16qpl2pPvlEv/Y8ewKHH6H1
+Zeb1d+VxKmmkJt7DPRJhzNsQZdYTTcVeSZ+geU/SnXFJa1rBcykRvujo6Jf6nVjV
+4lcu0+JlwzEtGGBE3TsnhU8Mo6uEey+n2OeoMwDfcQUbAH/Bhli9D+/sReP/RBkE
+cSdmbcPI4b0Urym3C33gV3/VtHOhJ9aIYFalUFTnQPKoFcB9nzzdJTYQnyfMZi72
+VYJc6n9K48MseTWcXLYmMyXw+JbX1I1ObGGCh2INjqisc94mAQcnxjh8lPrW4SPO
+ogekwEnqCGprk/p+moZyMro+D0bjo1Axen5WgEjUQ7A8vKLcXC4XwQKp4bccuxWm
+HtZckuv4sJPCXS2LJnyT/urq+csEfX3VA9SY89cTxB0zybtkSpmpCvTWuZBxAxZP
+WIDuuZHNnl0ir7KPrQEHUjuIZsGJCwgnxXgSSK8Mr79msaF2YKzT+BvhdKqPA6zZ
+wWNYqqjMB50s9O1siKL5s+qDK02EcUQa1+UDz5Cg3XBecMShR1gy02od3xIywSWe
+g+R6KjZaKKKK5PynirxIpfl45BVOP7gkQDIg2P/+W08eKp64w1O2aZpq37EPVJLb
+0rbrPVcvByzUKCf+7NZDzJIbCcC4irlHI+PMnKuhxnWpOAQ/YU6jd3T2TH5wIEzB
+G5QLtCw1ph8MV09mUCG/
+=j2LB
 -----END PGP SIGNATURE-----
diff --git a/dev-python/tzlocal/metadata.xml b/dev-python/tzlocal/metadata.xml
index 337e58dc9345..ba3614fc5729 100644
--- a/dev-python/tzlocal/metadata.xml
+++ b/dev-python/tzlocal/metadata.xml
@@ -4,5 +4,6 @@
   <herd>python</herd>
   <upstream>
     <remote-id type="pypi">tzlocal</remote-id>
+    <remote-id type="github">regebro/tzlocal</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/urllib3/ChangeLog b/dev-python/urllib3/ChangeLog
index 812dc0ffe243..a6ada94b0295 100644
--- a/dev-python/urllib3/ChangeLog
+++ b/dev-python/urllib3/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/urllib3
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/urllib3/ChangeLog,v 1.42 2015/06/07 10:03:44 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/urllib3/ChangeLog,v 1.43 2015/06/07 16:26:51 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   07 Jun 2015; Markus Meier <maekke@gentoo.org> urllib3-1.9.1.ebuild:
   arm stable, bug #540290
diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest
index 3e280c554d49..5f87b81f5048 100644
--- a/dev-python/urllib3/Manifest
+++ b/dev-python/urllib3/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST urllib3-1.10.3.tar.gz 136894 SHA256 ce1bb9a3f103610a062ace3ae6e56ebf2fa0fbeb5c395d601c64d8a7e6df180b SHA512 d36280a29f1580565e79c58991d4ecf2cd69d2b262950bb90c1b0f89f225b6b3cee556914b6a7b3031dd074af8ae6187e6a3641ad8591c6b870203c33d40b113 WHIRLPOOL 5042b1c7e3c156d26c83a770636d9e7a9cf45b638f1b8733603afa255fe1a3ac03abb6447ba5e3f1ad98d7a449fe164c374ab5e131566b15e7c9281ba39677bc
 DIST urllib3-1.10.4.tar.gz 138538 SHA256 52131e6a561466f1206e1a648d9a73dda2a804d0f70e83782bd88494542ded09 SHA512 83118aa5bf23add5bb5dafd98d32459315d971246ac2a49f7f0d0fcad6414099885f6d4fc7847de17e983b949c8a21fa4ed71c0216e578bdfc8eb351672f7c09 WHIRLPOOL 03431b6c575f3399bf8876d7dfad126986864e3a3f09d05e7e682b5b374ed420854c776a3d7bac91538086e43a9b832975aaf0b1b2e3fcde1ba8cfe93417bdc3
@@ -9,12 +9,24 @@ EBUILD urllib3-1.10.3.ebuild 2517 SHA256 cf33d6f5ae9abde0aecc95c7fe869e782e3816e
 EBUILD urllib3-1.10.4.ebuild 2096 SHA256 95412df88e9a6d785baca3bcf3a26c5af5518354b86efddef56475a2d722276d SHA512 2fbc81d8540954bca6829772a598afe9c7a9c6539e15c20965ba71080631cd11daa0ade3ba87daf000bce661d8cdfb0292631abe566cc472d95c1ff89ae596d1 WHIRLPOOL 16078d511436698ad487eeffdaa3e2214e453d06a884047cc6665cb82751e17fde95206e77838a7c5dee622fa28309058203f642179336166c0f6d5adff123ca
 EBUILD urllib3-1.10.ebuild 2210 SHA256 59c5e1fc9ccf863ad2eca9a9d7f63fe7df01510a5a9486b3b0831c28a7382426 SHA512 394576c86d943b89a54dc48b646bb5f4ca62dac655c56ae13dfb9b15f8e92f4771efbd9dcfb4bc8b5a52ceab71297983792a5ad3814a6ee21ceb223262d2969e WHIRLPOOL d94d73b9b10d06e691a2ee0d8e6e7e0437959b63b23f0b8b2d20f6dde322451bb774a65d6631e9654dc383d874f84f36520d5f7cded8fb125731f0f6a78bf3d8
 EBUILD urllib3-1.9.1.ebuild 2237 SHA256 a8295222d4459029097f441912cd31c8d0a5e17d768e49b7336714164cb5e63d SHA512 fdcd3071a7b19ee18858e3abd39d50a8f501b2a1642c46d43eb148dc4fc9d48fcf3bde4d28d015829fe84c04a24e1b5b10ab5780ebbde68a862d4dc85f92a562 WHIRLPOOL cb645eb8fa720cf2cf73cd5c03b3fc6a371d882288a49f602b1275b64918cc0b954ae2f3efd5eb8bc18a55647170585813f3eaa0adce01eeadb1187596e948c4
-MISC ChangeLog 5989 SHA256 880583f3d575f5a790602b528bc974bba297d4c28207c349110e365873f403eb SHA512 c902098ed43da0506846e5c4fca125237865449560c048388d17edc96554a2cbd443a212aff341bd3584c2c11ef27b3a476a7cc383fde15609e1cee752f231a7 WHIRLPOOL 55e504cee0f76613ce74177848fcfb70a460ef962c50973da20eb5fe96e38511dff2aad1b5d5ddc85075618b7cd39da212792e5c0c520d5cabad9a39f1d8f5b0
-MISC metadata.xml 230 SHA256 783d7ab5ebaca687ef2ba45f8c567e93e45eb308a515f0d5ec28afc1e0fe652b SHA512 9f624d4ed6ed478e14955782355c19c0f92198d23bf9c4422e11d38b978f062f781a125883b43ea4c5fc7a1002e08db61cdb59bfc5e7e40c50361869913abf87 WHIRLPOOL 183ead4fc7c1b5dd984879f30ed2fcf7ed855a38edb1747b4000dc1dbe17fc19cf101345c60ed85d996102879ed4a786d8f5227436b978cc910edd3b2727cf89
+MISC ChangeLog 6091 SHA256 3f07ab36011fd507522ab1a94ae75065abf05899d45e8f451bd0f2c2a667396a SHA512 9883daf3f2379442e4fbee75dda6fe5cd8c97f8e0a6964181b55f632ca7c59d7c468173fb8fc30f9465b6b188145edfff4c075c4b93d53f79bf6ae518cc07588 WHIRLPOOL 049c06765e24c022303c11e38aa28c9140ff66d9d730087810677ecabd8bcfb3b5dbafbc701099695cb5d75a7faee0ab664bc44bae11572970cf6a4959339ff6
+MISC metadata.xml 291 SHA256 1bc51ae0f890078326f771c6c68d3035a5d5a61a323baf173778b61f3f6506df SHA512 1eb513af36322e0ab96898a39b0ab2b1e6024d550d7b53f081ec004eb8dd52913f7e281bc387c923aaa4d20cdba618f63637be859ccba7e179bca05fa278a32a WHIRLPOOL d5d505531cfc15f7f0cc02e2713931b42e9b2b6b75ea1fe2be37023c00f06f183c401d5f19c534856522a8546fd60a447e81204752cde1e3cbea029e0ff95b4c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlV0FwIACgkQkKaRLQcq0GKcFQCfWXiFnyuxWDyfxuqD3kwC0fzr
-zV0AoKWZOXeqoUl18H9Udh+9fX7c70Rx
-=jo3/
+iQJ8BAEBCgBmBQJVdHDMXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmigFgQAK48Y3Uq1dHA5oA2ma192qft
+g1QzxYNl/KmpIX/tTjEH4iel9zMuQ2E5/3F5pgcUtg98jwWd3klHhQDh6bExtCIC
+u+IpOuVY2/EVinx4Tr17Y7yd7EZQtjTLzrpI+atUWm6Lmn2UmTjhcxrZ8XNLfHl2
+XMb6Dyd3jbwinwFrbqJKJppuRvFu+I7Pjry5ipVoIB5f+tNLRUu8JMHF5fJH3MlM
+igLrjojd/0b6uzSVDJRCLIVKf/tkcOPLqzisrcQhGLgdJTCsK1foTDkKbS8HUUGy
+8KM5nxto3vLQvdxQrWCTtk8yzGJIpE7ngVdPOFGJxMzxvWvO2kCBv3s7ygRuWHGx
+gugDRFZB25DE2xDma8VFDMUMlQtjtbkwDfzgLNMlO76QEcaLgsTsJEx2kokvTaKM
+rRJrTBrJ6jbyWO3tztrEm0wo9uUrVRYKGWpUAspeB+EyMtMtuej4T6NEL52C1R09
+wtk3dmpUIezhRdhMYFVFj9Ep5+fGaTy3KmLzdZWx40BKuqivePNwL4ZbNoYmZMf6
+ai+uq0N3y6jUdADYqJnJsHFNzZQTsivY1J2iJNQPEs/TrPr7erXi+1w2QqQBhfqS
+gmV82Vf9WzS+GIrWh9xGEQmi2sQwAzvAjnSNFx+bOdzSitDBVoMCLHGqQ5UAGdhA
+GoEqrWHXdc7+hBP5OnGb
+=S2JA
 -----END PGP SIGNATURE-----
diff --git a/dev-python/urllib3/metadata.xml b/dev-python/urllib3/metadata.xml
index 4aaec6560426..f23a901265e4 100644
--- a/dev-python/urllib3/metadata.xml
+++ b/dev-python/urllib3/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>python</herd>
-	<upstream>
-		<remote-id type="pypi">urllib3</remote-id>
-	</upstream>
+  <herd>python</herd>
+  <upstream>
+    <remote-id type="pypi">urllib3</remote-id>
+    <remote-id type="github">shazow/urllib3</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/vcversioner/ChangeLog b/dev-python/vcversioner/ChangeLog
index bfad8f7fc795..1946c67e4d36 100644
--- a/dev-python/vcversioner/ChangeLog
+++ b/dev-python/vcversioner/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/vcversioner
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/vcversioner/ChangeLog,v 1.2 2015/06/04 09:33:42 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/vcversioner/ChangeLog,v 1.3 2015/06/07 16:27:14 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   04 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add pypi to remote-id in metadata.xml
diff --git a/dev-python/vcversioner/Manifest b/dev-python/vcversioner/Manifest
index a58071e2abf1..cbe9ccd3c2e0 100644
--- a/dev-python/vcversioner/Manifest
+++ b/dev-python/vcversioner/Manifest
@@ -1,4 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST vcversioner-2.14.0.0.tar.gz 9015 SHA256 acd43686e92e6c8bbeb4f2eef54408567a7adea9692fa72d591eec5357c03b86 SHA512 0d474910f9d0f0dd0c0d0b824bcdf5da7bbb5d2b55691f18107bb0b8a237213a83d8f51f719d4761e1dae9db70e84ef8c264c388ec1995ed0a55a838575e377e WHIRLPOOL b146f1d008b635fc337c2256a7bb9bd0534ecd3a335c349a0518e36ee21e807de1b43ea52dd6a581fa4de64ad6cdb2dca53646051a93afe752a28d4a25bcbec8
 EBUILD vcversioner-2.14.0.0.ebuild 518 SHA256 7ff99f3a796f873bd4f7e0c4f3d3f5391e48761f832e844dc51deff1cf46d993 SHA512 034f8cc79597d18e3bdc6e2c48ae8e87a0ea1afc347f649bc4cdff18d44b3016192bdbb4f4f1e51c6aa22ecd97c5110549d71b513183d706bdd30401ad294453 WHIRLPOOL 0ddb76cba388fbff64cefa9f67ab051b281500d938caa80b3b3134584701b9bd818cea5c55b1f2ad406e818201ab2e5d44b1f3885ff29de1aab912fa836f8b09
-MISC ChangeLog 528 SHA256 fc01d4e98537353c184db3c8f5ebd694a8e78914f20d432fece8876e0be769b0 SHA512 472ad89068b67875919d3d52de4a556df4720485c1039a6624cd637afd786dea9b7b367f0e7a596eaf2acc6828db0f89e4da79bac54222c7ad37ac3d6c83cf32 WHIRLPOOL a8c8df783638b5536eec2e29126643788d821ac3df869053978591cd9f4fece5410f04369affeb8406544b48f00ebc9313c74f01ca5024d3932897602debeeed
-MISC metadata.xml 315 SHA256 bd0038266210102273b28f39eef0942cb1009f0fd0e22778a08a1f3ab5164781 SHA512 346381ea1f701a55b68754735b401ac51d4b1d9c2b4e32cc4fa85e5ec9419026dc2643c37122658620778a5ec1240b9ad9c23263ec0512d56e6af9c451a85dfe WHIRLPOOL 0c2bfc1607f8961c2702962d2c15cd744f4f52b2aa615890325ee0a80dfc8cb8d5da5289f0011b79cb94a1a8d1bfb2ccaef81abd9f6d9e6879bb34c5095b1291
+MISC ChangeLog 632 SHA256 2742de8aeea4889a05513cd2416fccc245b321af4aac7743c61abc0018dbb444 SHA512 85f9d056a7ebccc58ca7650d001a37d55e04d9e448bd97b0d83f6161ee9eb75685c80412f4020f2ab0cae106f317642638c623e497c11838c3738d5afb4cd88f WHIRLPOOL 1e376c3c11f6a6c6cf5c7230f45d82dd59b83b5fb78d55dfed997819c85df10055df9710cb99b812ce95c8064688abbc03a58d88245934379a8804a79c2f5925
+MISC metadata.xml 377 SHA256 d234d80b32f99173a42d7b0bfc284474e3c70f645462658c7fafe57b59d4fa45 SHA512 58215d70b5e7d14a9c46b88aaede6e0723dc9725a1c4c90b9fe28d2cdc536d2734b6ae9ec24449bd7718d73cd832d451c6c2f0c2f8216a1ce98c3463a5347625 WHIRLPOOL 63bb79fdfe9b8af0c5b4986b1897f140599a46d5eac610cbdcaccaa30e7ebb8d1de1e1100f6760c2582ac0fd42c3b3b836206320299dfdc22eb448d650b4a9d5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVdHDjXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmirCQP/2RPiJuIsJpPYHS5lfD1BJPS
+tQsPhbipUGIYQlKnIEb3qoM/mE9eXmKQky8npIqQ3odY0CP0siEO86wx7vvgsK8K
+NTTdTq7UwRqFGsv4zSYiOtFIc9vcBx4l8rpnR4u4c6Pj2ad+TJrQIs4553HDUG2u
+Vq4pOoMGglw47dJGJY6O/ZHKejY/V4ci4cANhkxoZUCY5TRGkeVo/2UjIEG/jmCy
+U7dCYYe2PFbL8FQnga9UFLBX6V/f120YO06NS+RhjnG2RLcjHdqNlXzYlj21xqSr
+vFTWkM2Xc9uutbBHZ+7UzOXJCd+wjQG78l3e4btIAIwDEf1m18lBH6hALf9i3hZH
+7xF/chewyn4fWX3iHx6E9/MaKVcYFapvCir+SG1ynkZfngb/3/5I3muNcNoxvjyE
+sV517catlppjCareiRk7NAmwaPd9RujK26PSbC9iL+WroXhZJI0WBGXKZdpN6I7E
+zEnl9eJFzYmDf7w6liMMfBR+3kBhH1bXKEdl9YNhpy7CBg6wkTgt68V4JCwfCebG
+VZehjcU+8DXFSShRjUtBkkHYnkZMhLLzX4UplMdaCDu13J7cTY4cwLntUm7o2FmD
+c7wQ3pWsIaXhviRTW0aAtiNcflv5Jxht9oGx4ybze2iREAPdGQTIsLwWSstbFBFR
+h7lkdsSoxU/h81YT9sWS
+=V0UK
+-----END PGP SIGNATURE-----
diff --git a/dev-python/vcversioner/metadata.xml b/dev-python/vcversioner/metadata.xml
index e592b583fb14..6f3bf88d95dd 100644
--- a/dev-python/vcversioner/metadata.xml
+++ b/dev-python/vcversioner/metadata.xml
@@ -7,5 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="pypi">vcversioner</remote-id>
+    <remote-id type="github">habnabit/vcversioner</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/virtualenv-clone/ChangeLog b/dev-python/virtualenv-clone/ChangeLog
index 2d0467e1699d..b208c87ce7a9 100644
--- a/dev-python/virtualenv-clone/ChangeLog
+++ b/dev-python/virtualenv-clone/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/virtualenv-clone
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/virtualenv-clone/ChangeLog,v 1.12 2015/06/04 09:44:37 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/virtualenv-clone/ChangeLog,v 1.13 2015/06/07 16:28:07 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   04 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add pypi to remote-id in metadata.xml
diff --git a/dev-python/virtualenv-clone/Manifest b/dev-python/virtualenv-clone/Manifest
index 1ef888ebfe27..c6871bb1cd37 100644
--- a/dev-python/virtualenv-clone/Manifest
+++ b/dev-python/virtualenv-clone/Manifest
@@ -3,24 +3,24 @@ Hash: SHA512
 
 DIST virtualenv-clone-0.2.4.tar.gz 6192 SHA256 6797e96bc2a1ab41995bcabdfe08ac1b02c55c719c62036ccf53a0ed5430b935 SHA512 0cfcbd32cbffe4c913fabd3f8e609112920f3952cfdc9b8e25080f39d2e3e1062246c04035ad0989d5fce313f1eea228449cd428ea0eda70da1124ef9a4c3c17 WHIRLPOOL 2e71196caeb30d5e6e2c6a15512425b5736a9f7086c340c9d54a5f18864be92bf18c28b22ff2606fce9c4c57676fc43806f26db5104ecbc45d529e63859e5e84
 EBUILD virtualenv-clone-0.2.4-r2.ebuild 568 SHA256 fbffce347b79495d4756e2618ea72e9fecedd3b206c779f8d5671cd366be0fdd SHA512 7d7fe3406e1d509de3ef659e06fe00bf38b63eedc3e8b4eaa7e9c02262b824bc314e2d9dc6e06172ec5ab33c84606480ac380e9107c36cd156f18140432052f6 WHIRLPOOL 8aa98dae4560ac7b3b2812bb079f7e7e620ec680196a87c715cddce948f5bea77fa5020ef636ec6828bc91149b964becf53282c5860ab0b7507b7ac327c88473
-MISC ChangeLog 1876 SHA256 f1d1b151ede9e0f09d1d1056b91eabf4ccbe69ebc0d73637cdad76241862f075 SHA512 e785b21c9be2c51465e39aac68c16a44e28d7e27827fd31d70cb758da1faff86fc7019262bb0b681c1c6625c80c73afe002d63f6fced9ffb2804494655cea35d WHIRLPOOL 7d46036ef478151721744aa3db4da9575d38c4fc8c5bcc060304a0bd6610e688782c809f05a0f071486a73415ab4187d38decf8f4a6bce6165f4d2b59c84e111
-MISC metadata.xml 244 SHA256 90b9830e7d428513b8cc1115a8f582b44ae049f3f33f919ea5f301cd68c8ef3c SHA512 9a5aa46bea570d3ecb9b07c82dc3184d32143cdbf4c14e80c457a35b5d1bdd7e770725ad632f1a7a539a6da945d93f3777e0158c8590b5e27610b39d2d7d2807 WHIRLPOOL 478ee83a521f2d5a0dcdadab2882478a836b3e419a2ba49b8621e9348beb4f1d3ffa3bb573d76183810f713271f138c9ffc18df67b3cbf8358b74f9d586e2e35
+MISC ChangeLog 1980 SHA256 5beb98ce30def62a6908d27dd35b77f0314b326cdce3ac4597f81e48829d5d37 SHA512 7e25bf40bd10bb80c37161953da4ace1d37f6f08cd1741c30b0c8c596efc1c013f0c8bd16d532d1e2c44bc40bf33cb776cf42b1287557b069a4b2084eb171dd1 WHIRLPOOL 6492b64e5e22f90fdb80f587ecfc2a3bf81cb29996128fab5fa8163ce68c87e0955fd77f359d388eefba003b6e9133b8ec5cf57992f4f0a1b08a32de6bc80cf6
+MISC metadata.xml 315 SHA256 c1f3f8711586945f1c424b71544472d8b3eec980d265945648afe60ae4efa4e3 SHA512 b9f3c4bebb451c451f42d005667802fcb0a0e10e3fcd70fc9cdc0104b138f410ed7754b2a1e27e239b86a21c439395f493a83926c6656aef86bc4b4cd34072e8 WHIRLPOOL 20ed697bd5e97a80233563aafb30a1f458e206c4f80f02d9bcbcf21b2f74ed054a18e6637e21a85586256a52e7475db5f5508dbf4e1c1526fb5def088d6ef44a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVcB4GXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVdHEYXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmizJ4P/2HCaPEk5hqX6zI75cYaZaLi
-uOW/6APu46lRj7vyBxskb2KA+DK65U/J+zwKNQgGGtZdudxvS13PM7ZSi2wvUjrA
-R/Lz5DzGPnUwj58DNTI7aVtrGli9TR/BKOK5z9eTCOzbvXazLCNoMnYf/szGu8zE
-bz5pEQGFbv3keEprV3wr33hYckjHOuhYEq9CnYsi6B+phGMXtnZeGfwBx+DM/8nN
-KGoiwygSK6n1ABstTEwXnisEw7kbROLTbimQk0hQ1vtRSDkZqIcbiz6CMuwWJD2k
-MbracE2j/08HoxTjn9jxR+8PESg2+ICRBBb2tpYaQ4AdGwLzXPmJL1zBgsL+/6AV
-St4+1nvlaGzSBrRtxjF7FxdS/A4v+oHTDfmVtCSMSimIFkjw7k16uMD3g27K99j3
-3H45st2K9rLBUHWxJ2BY8K74xvd9medw7TCUvRNv2b9bKt+KQnE+W0xVIxD5rJRU
-wfAQJwy/uW+MyoaBb8bptKWRwsKgOSYdztWB5XR9Ch+5DuRWQBOX5eW5T0zkv6V2
-J+05pbMCmeInk95MBP9y+QysabrG7EeUR0ms6qOBgafaMf2u1GcLVjjCly6RQUP+
-zfNxY+/rdDS/7Sba0NDYE0XARqFhn0uk696DD66REPQfg8muZHp3rBzbkc1pKBMn
-2MIAG3pxp7OrYuavuGyn
-=6IXr
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi0jYQAJiDuhty2s+mheUiZEert2ri
+Wd5rQmBwUsEr/lnuIQzmZO8Gv86O1IpSUHrRYFxJWvU9f4b//xdqILRny/LZVRez
+cgJGu32deVPWqYW0Iqs7THjTJVeW9k/fKGea02ScRh36JQa6FjINgMqmjaAAhrYd
+FcNRxeK4aFI0iEXosbMU7iGeQgURCkkNmJCM9hdwA7HAz5ndhbRMVp40P2vlh/bb
+CApS+/coUy6/NT8yIB5UyxwPS7CxQNqvOJS6QrdpGUWSMPFsejnCUaoG/nh9CNzB
+a+dmW4XygAbshKX2yvHdOzEDjengIr2iJGF5vm4OtLNJGcmFh7/Y9mayH2FHwc+1
+Zc2zV729cOUXlg1LCtjHxr1VBueGiH7NAUJGgPL8jtDgGUueA/JELRxCN9bbzT9L
+DN1/5cMVeTds1hSa+6Q7kuXVV3xZ0atzwkUtwTgbQbzAR5FNscUdjP0CWU35hKfW
+Nneyh7BOFF761fmkRY8ZpETetzh7pSMnFLTMsB7P4ncqSjll/brjROU8ui6v0XN/
+g7SO1zVallEx4FzeSP5raW37jlVViNFlmRpbCZSxhAuWYdQa+q5erQ6O8n3XKEAl
+6sBNEQhwPMm3IOKNuGUSgkMENdHUC5/tl4MUBOBy1ipqYi+zX+c+e2oIbpLaGFSX
+oR5Mi8ywcVfR1mhhjfw5
+=yHup
 -----END PGP SIGNATURE-----
diff --git a/dev-python/virtualenv-clone/metadata.xml b/dev-python/virtualenv-clone/metadata.xml
index 2539e2d03c81..2d5b6be29781 100644
--- a/dev-python/virtualenv-clone/metadata.xml
+++ b/dev-python/virtualenv-clone/metadata.xml
@@ -4,5 +4,6 @@
   <herd>python</herd>
   <upstream>
     <remote-id type="pypi">virtualenv-clone</remote-id>
+    <remote-id type="github">edwardgeorge/virtualenv-clone</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/virtualenv/ChangeLog b/dev-python/virtualenv/ChangeLog
index c4f42e032f3e..78418a9a3254 100644
--- a/dev-python/virtualenv/ChangeLog
+++ b/dev-python/virtualenv/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/virtualenv
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/virtualenv/ChangeLog,v 1.148 2015/06/02 08:49:26 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/virtualenv/ChangeLog,v 1.149 2015/06/07 16:27:51 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
 *virtualenv-13.0.3 (02 Jun 2015)
 
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index b0f4761bbbe8..12bfb97f218a 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -24,24 +24,24 @@ EBUILD virtualenv-12.1.1.ebuild 1394 SHA256 e33363d064aa1e3d8eaa7e30bb524a8f37fb
 EBUILD virtualenv-13.0.0.ebuild 1402 SHA256 3f0f4bc194a3e4b984cd49412db2f72b5dd1cf097b255c7cab3a902a11de16e2 SHA512 fe00d62d34636b2a397a8ae61270158bab277ec9382657a3d6d932196ebd2380871650166c0ad7ddfb6a6baa04d68679d7587db8837fa9c5735851014a7a5f74 WHIRLPOOL 8ce199a5eb71493c78944d25280dfc4328e621757839fac7b5561eedfdec50a60b8e3e38dd3f775b614dabbcb4abc0b041babd546132c79386fc208a1dca8cf2
 EBUILD virtualenv-13.0.1.ebuild 1402 SHA256 a1c4257ef274dad5b6782b93554c2ed847a1564eb7ebee6e7d5a2052a50e415d SHA512 936c525f28fba812578d0da63f7ea07dc2b1f954fb338744319224d27124696d75472ff18baeac104c9c2c649f7de4eac0584a7e0a309920f16b4b889e37439c WHIRLPOOL a0c1e14f1bcfc5bbaf7aa5d4ef46c8166f2850dc5dfefa3c844f5e2eb014d2620ff4c176ee79f6849f9767b29b33a5cf365b291fcaf793c10dad04e18d2d1868
 EBUILD virtualenv-13.0.3.ebuild 1402 SHA256 83bcf46315d06903fb97073d8b726c180c84213cb82249922c32289bcda3d3a7 SHA512 18b1aad38ba16aed7733bf8d2d97dc27f1498038e6d655dd4f412e4211887e2686b8fad30fcc4543011dbf492e62a7eacf947a8dbdd3d87901e8d2b01d9e9a7f WHIRLPOOL a8d17d199f2942eb8c09924c3593f9eed35b26df5febd55ff9eb7d3c57b77668b2d456b592e77570a0b65d377af74fd682fcd72e2506e5cb3ace1aa511d7e206
-MISC ChangeLog 19459 SHA256 412ebd86062fe9a5f0351a96baffb20dbcdf92accc99461120956e43a697eac2 SHA512 5636689cdd770a61b8fe643c2ffa9f4357f35abf96fe64c75d78e394a22bacc45513dfcb48467863cc646bc9afab1493cef4feb773c75235dc842331cd487561 WHIRLPOOL 5823d4be61fb646e29944fdfc41bc230c44917fc23560d51d93b896882608a5d09df581d5d50a1a8ae7c8a49735e21f52bd325cbeab047306d050765cfe9ef80
-MISC metadata.xml 238 SHA256 c3e410fc6283fcc57e036278368ddb6fb2b106c5b46449a6c16b9e2b9b79dab6 SHA512 5ad60448c580db171c9d2733ba0c0ba5873fac5ffeff2d7fa5022f9f109cb6f04074e2625f79902c7949332a40b4824e72d24fa1ae385d864109e387146c6f20 WHIRLPOOL 3e5724afd6114b4b24e8fec6b93d62129a2d43b47661e69ac2a35ee8b61f76af17879f758c964cec2d1f93135a4f63f8c0a8936feffa8bfa34fdd0478e618949
+MISC ChangeLog 19563 SHA256 e32faac9476356abb18f37cc25868f495f6c7fab08b90789116e00b32d1baf05 SHA512 aef67564ee136c951947f4e99211fe6c452837416a216d1fbb0e2b133fd7a1a418983bdb5d1b6532f83c811e3fd062214867c5b2f0285ae5d47c8a2e38e3cb0e WHIRLPOOL 9972b80cf0ad760fe8540bc7064baf191c81efdd23cb82abe8ac8d90a6505719a232ebee8a8a081000f2d503f1d11bd8a1217db16a870e3d66768fb3eefe3de5
+MISC metadata.xml 295 SHA256 12301a477d28b44f0a1088acee0e820e0c13523f271f1f0154cbc06fdacd5131 SHA512 23d19446db68608898ee62f1f7d0da18cae8057f3fde4ee7b7576f1b6d206149b0c0580bd4f03e50daf8d28482f9438f4da19c90d319c146c739520ce8e15575 WHIRLPOOL 9593915f3043c2f0b8a69c4712daf17f46b0866679fdbdfd7d3232ce0e38103ce4dbb88df2e3ce50134d989183f2023d3e223bdece9590abb2ab4505ace13f4c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVbW4XXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVdHEIXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi1aIP/RC0FNB0kKzpD+4mB/bdLLWH
-DH2/PqZ/R/3Nb1oR3y8dxSqbAhEXcTk0ClferI27pUhOmNCiEccRFQjEn44Oz2jD
-9WsWfR8WvWmYK9lIJFARTx9apXgUxduyfWqmXoap+aY0QGfm5XSDFZ9KQ74PCHb/
-wVPV1q60s61s4xgHZjTyAE+45kDV6DxEPEeg+WARcG/0rMI6IGdzcoOQEOxO7aGG
-kgzBGdkMkxcmjYIkc+SuwqSXH209JpAo1Vssm2OWDXIt/ruKulYxEuh6WGn+TqbU
-/r3WNssLGbgeTrmJ3foFMqoME3Dr+6vOu1Z7v9mXBWdNJjIANMr/9RYISfKqVoy2
-CBjSH/uRpRKc8anIbNB49DnIjzYMdgN5Wg9lDS50AmWpCy8vBcVwlCOeWSDBZKJP
-K+5FYEEmecIbXY+qaZwSXkHusUvmVBzodpnJQxgx5qkxncAsFZKxQmjDHhh6HVRw
-KE0+JQN5IgYB+IviYeQb+hapDOdG9MpYHTe3izLc87+YWGobsrNfypD7I3Ho3CIt
-Nzo4MCfr+R7pj1odeAqLAtnEzFUMW7pTuZ+tSmGiz0xikTw6QZIYQVXYo1bWgLVg
-e1lcdk93VxtCEQNAz9HIRYSQtJUIUo+pYuBkSeOu/pcy0Vf3agvzxTkctyB6ovzt
-djAmhbMuFaLkIsF6gBfY
-=1zEU
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiL1MP/3+FNx6dZjGwXWKAn6NtkofF
+6HyKFpPvnYyrpNIJ44i3u7d/S7duquOJ8AT7O7ywPu0sF6ExVfTCabuTxyXM1xyV
+zj0VxdBQJ/DOQYI9AlT7rm+L+kr4J2LxJM+vxh6BDzK0MbdDIgGH4BaWQgF8rGcC
+NLonM8mS/zO11zwudpoe3JNjXYgdE+nK9rOtA0lRJFoyvFBhrSM0Jl5tk4yQASGr
+Nz5VLrMP5jJepfFaR2JGGkRrLJYiD7WNQVLt0sDjoCmNq1xKjnzZS1ZDadMeEpmW
+rVk/o+oWul7MvqRF+eAh87ngtz3lTBROLQR0hFLaD4L5ZSV7bKMfDX8BDIMzTBTl
+T33sQUBTCn2RRYbFqo9SKbHJOwjbNs3iVpnB3I8UGwQfTF6CEy3SHJQh9qnhduh5
++X3DjngvQ4BRl/G3DQJWzpZ7WHQwFCpRF4KXM5mUZm+TSBZfIJLOdSUEDgGT1Wth
+X4OrHOm3dHXcdkmkQ3WX2XtXxYXvPprZX3Qs0KTof4i0U0dBjyCzFaU9FF+eGHyZ
+SdJ4Z4/f0xP8uBQZaIRn+QI7P5BzborbZjwZyPOo5QFn+qxfkYfE0XywCe0f4AgN
+h+PZd9JxON0a0m9V3hyddHHyuR99OcxfHhtXH1/jdsLd8ZJO9Z++NqQVpYfU0I1U
+7x7vuQkun3zkItJviW3e
+=yTlC
 -----END PGP SIGNATURE-----
diff --git a/dev-python/virtualenv/metadata.xml b/dev-python/virtualenv/metadata.xml
index 05c41ddca05b..9252bf6fa92a 100644
--- a/dev-python/virtualenv/metadata.xml
+++ b/dev-python/virtualenv/metadata.xml
@@ -4,5 +4,6 @@
   <herd>python</herd>
   <upstream>
     <remote-id type="pypi">virtualenv</remote-id>
+    <remote-id type="github">pypa/virtualenv</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/w3lib/ChangeLog b/dev-python/w3lib/ChangeLog
index 3a9174419a09..ea7da9f8274f 100644
--- a/dev-python/w3lib/ChangeLog
+++ b/dev-python/w3lib/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/w3lib
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/w3lib/ChangeLog,v 1.12 2015/01/16 02:20:13 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/w3lib/ChangeLog,v 1.13 2015/06/07 16:28:23 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
 *w3lib-1.11.0 (16 Jan 2015)
 
diff --git a/dev-python/w3lib/Manifest b/dev-python/w3lib/Manifest
index c7cb51be45cb..2d1c311268e8 100644
--- a/dev-python/w3lib/Manifest
+++ b/dev-python/w3lib/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST w3lib-1.11.0.tar.gz 12083 SHA256 826f6184232c385b7c8038ef7ae5506f1cb3f8fa470ac12ce0fb6fb0a592fb92 SHA512 421e75639291c6aec56aa28efeaf2a440c878662085a9a667bf1b89e30b2b6ce29066d524f48ad99af1563a1b886483cc81d8897975697084256588319988b37 WHIRLPOOL db05a2f4799065ad4a942f363ce45b00cb87689be049c42a35a0ef703907742fb3bd71a51b6c6a49266bb0e47adf1be6b144708beab0a03749f1c66e597cf7b2
 EBUILD w3lib-1.11.0.ebuild 597 SHA256 3dbc1060bae36993b9cd3063b6fa3aa7ada950a82822e8eed4006301b93794b7 SHA512 6a9a1f01b953e3fec3e4394f9bb93717b4773eb833c4457fd9641106af45d01e17f8472c2f13b575d85bc358e4d65dbadf7dc70a609e8fc5aa89352509e0459b WHIRLPOOL 978d39dbe5dbed1c37c080568bf431d7c594d6c319aeeaecd8ff56eea4397ef5cb5fc3a1614d42e4f96a205db164fa85b7eb06b6e1613224d52878a3c6373ccb
-MISC ChangeLog 1952 SHA256 441df00a357417b86f22c95f61ae6cc235405ef3b3532397a1991f1625bed4a0 SHA512 358d8cd9ff7800fa0c886d0236afcc224d4a612a271a005b7d6888e8836cafc9f31d10d2a5b0a3290b5e9f0aec20dadefdd7684433d4da92ee117f71223bd675 WHIRLPOOL bc30ea9ffd2ba1747e3f3742cee158d7d2eda9b6fe5d0d8b208ac85dbb33a762e38123e207b5386ceb101a1fe218e69d51f6b7e6867c6488f48ae7432c42ed2a
-MISC metadata.xml 295 SHA256 536aca0e2d3f5ebee738b29f3f1b0660e6bcb2055d4aafbf0e530925abb0c474 SHA512 49a8976e442e5bf458c91e7968d540837e8fc49eebb631232259b3f1a1f0891b35394d0634ffe1c7f49eb8917d40f024d438c62677457b6b5051cba1a56346d7 WHIRLPOOL cc8ca06446b1e0777c2fcdab5dc84cb5f7c55f44f6677fed341a9279882676cd57552cde30c4efaba0881b3669e4a563cdc27942642d325e43ffc79f349bb2cf
+MISC ChangeLog 2053 SHA256 809b6011e279ec8df55b4fa25969baa63dea02f05eb41fbe6844162f8c56ecfb SHA512 d216e5be4a11067ca0269543220e93fc710a84bc6ddf521708cd39067475bb235d31f88bd1032ee7dff818286ae6e97abebe657269d94efa0590508e3923d76b WHIRLPOOL 17273fae79fd169bd4a63c3437585ac420fb3be92fe6dcd21464322749dc2349e9364dae72ebfe1062789058d971f97b10b52d753eace9d4d443f97f382f6ec3
+MISC metadata.xml 358 SHA256 9ba568f738615d9fd32d3205e7bcc01d61a9ea804fec8f1b2cd733456493ee62 SHA512 220a7ffaaaac6a95b56c1b526c8d60a38d22a3c0eeb885569eea9ab608d0548a7a1e8488541d0132ac55ef7a2535e2e78fb2128bb895fe14d121e732e7ceed30 WHIRLPOOL 2e35dc231113041bba44b7ff935786187333a1f71d88289cf84c1e4ca80187616bac8189382678eeccccfceaebfc5ce4856b73347b331227637feca9ff81af03
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlS4dWwACgkQso7CE7gHKw2vcACg1AY0B88ffaXXzNHT6/NA1UT/
-whMAoNj9j1AsbKheyCGPpkUqgyAIFmWq
-=pBJ6
+iQJ8BAEBCgBmBQJVdHEoXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmixFIQAIzf4Tj41SQZIESemqRYV3Rl
+JjVO3oZYWgj+VmdAN242Ku5iO+2DKsSzeSuCpKVItMNr+UiBCbxQWvrlTEy03cAu
+zbsw3xgGceLsnxltFrDrV7R/BwxRZDmHp1Qy446RDsd49EAnihuyxGDA/VU9vR8K
+Wz+luv4PU1nkWU3Md59kgnus2A9SyhAGwM6PUfKoabZIO6mLf+3hvrEliIB7PnEx
+NJ9b37OKlAq2iZaftg+Q7HNMfsHjyoGVv0lp7jK18vJuHRSW1E4Y4VhfogZY7Af4
+QSNP1YCWmE0XAAKIFxA7xS59MG75RuxpEhVqJfKrAPg/ccX3QlFvn/sNeOKTKMgn
+mn5Qod4BjTT1IW8Yp5DL+7mfRNzjHngKMvWLt58tiWmwd5aGcG9lb/WuFPOl1R8/
+0yB1EYNrAufNXY+whsmBZZAztO0UwFD17iQ+J3UAdZludriV8vJ3YFW3lkyIHlzM
+A4kDhTYk+bFBNFUQAKG73FoP0XCj8PIWcVKvyMwkGNc32/3SbRNMf5gij8kjBo+g
+PZ8aI8XGlaPyi8DYR6XT7ErmOsX7UkswolSq9KBpRacNHXYfXAbjFmWA5ebpl2ik
+sUysdmppUfhVYwU3ko/0fm90GiAQl6ubAq3yVzyGV8En+VyOHLs9vh9JpThTzkFu
+59kBMGXAvC9iwEbD7Jg4
+=Vt3b
 -----END PGP SIGNATURE-----
diff --git a/dev-python/w3lib/metadata.xml b/dev-python/w3lib/metadata.xml
index 2b10a0a0be40..e3fa45d6a1c2 100644
--- a/dev-python/w3lib/metadata.xml
+++ b/dev-python/w3lib/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>python</herd>
-	<maintainer>
-		<email>maksbotan@gentoo.org</email>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">w3lib</remote-id>
-	</upstream>
+  <herd>python</herd>
+  <maintainer>
+    <email>maksbotan@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">w3lib</remote-id>
+    <remote-id type="github">scrapy/w3lib</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/waitress/ChangeLog b/dev-python/waitress/ChangeLog
index 846d5b39bb27..10307648b417 100644
--- a/dev-python/waitress/ChangeLog
+++ b/dev-python/waitress/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/waitress
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/waitress/ChangeLog,v 1.23 2015/06/02 05:15:42 jmorgan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/waitress/ChangeLog,v 1.24 2015/06/07 16:28:51 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   02 Jun 2015; Jack Morgan <jmorgan@gentoo.org> waitress-0.8.9.ebuild:
   sparc stable wrt bug #540290
diff --git a/dev-python/waitress/Manifest b/dev-python/waitress/Manifest
index 30ce83a21098..7aae409ee9c9 100644
--- a/dev-python/waitress/Manifest
+++ b/dev-python/waitress/Manifest
@@ -1,26 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX waitress-0.8.9-doc.patch 953 SHA256 130513821d35f978347378771aacb6bd3d84254bc13fba52af7c69cf3245d868 SHA512 6c95fa603570066a5d8473528213be9cb63bf7c8fedd9ac36422a016ca778c5a07447f591e7b670ad9f2cfe178a8bf018f11922468e38732715dfa86cba53913 WHIRLPOOL c8b551ca81c6277a37d89a09e385e5a2df56af83579d915f35715bc791782527ed291ba5ee40fbaaffa33926ca92b5c70a6b2a28d1d8d6a93fbf137c1031d381
 DIST pylons_sphinx_theme.tar.gz 607608 SHA256 d892c80fbee8845b79cb41845a89cf2f268893689a68157bc10bd0224948bb9c SHA512 fdafd77e52ff6941de5102bad521ed2a9e28cff6be385cab660a7604be12fa1d86db73fc93f84f72551458cc60b42d3354f27648b1d747b15b25d6f809df8a4d WHIRLPOOL bcf8329b35b90d65eae86a8fc910d074790f912cfe7d4bdd9065970f5c24344e57e585d8dd0b28f101b4ddd4ed0b65caa3bdf7c93fb933ddc6916e63514fa69f
 DIST waitress-0.8.9.tar.gz 121048 SHA256 826527dc9d334ed4ed76cdae672fdcbbccf614186657db71679ab58df869458a SHA512 e9459b8806389fcdbd6f7cfc4fc908c2076f1fcc306315c5375c872c1a0c43c2537347322f7becf1ad36aec0050dca7b2f713f35318fe3a371e544cc880b7d8c WHIRLPOOL f3ce347d3fa04944ebcf7b6b3734bed0ff1fb1fc1dd9479a10cc4cc77111ae250e2c652dd195b15a86c1c7b740d751d0ca539791f3b97c942737ca0be033a59a
 EBUILD waitress-0.8.9.ebuild 1450 SHA256 ee76cb8185fde0ced578ca130884ba07466924b14cb81bb7e4e3ba586d700296 SHA512 7380e664ad935354e4104c9c658cec56db12f5e570123af11d2634513080272808929d802de8b462be3331534d37415fd6e3f3ba28fca6274b08f173fac9e92f WHIRLPOOL 430bb5750878e8fffaaca5290a9c9604f8ea1446b6934c46562a62edd85ed8c9e1ea043daa55774a3f4b1d5ebb6c4d29c895f51871dfa2d8b1c600a6125263b3
-MISC ChangeLog 2829 SHA256 d352b3a1211ee1c61701521ff81597a6f84fc4410aad01d0f6c2ed7807de5ca8 SHA512 c422f23bd40f699326692ba51e177cd8b5d0a02512fac2508ba2521f35f491c1817aa3d1f76fa9cc0678ffdb727db8d35d64e6da35f95a72663a00b44b866b9f WHIRLPOOL dec762ba081a52cc1bbb6c65adb80ced1f5f2a2f828404fedace4674c70b67fc99f6bd472cbfb54a080b2f5653f3988b45781402e820fc1d8e54c9b0450c88f9
-MISC metadata.xml 231 SHA256 1a4e5865b4798388ac0faa382475e823ce09b01cadb39c182902c1b8d6108d8e SHA512 96fbe54d60b9591ce3ae4ca65991b8698d2f31621bd729ccdaadf4486248d6276a852b17d20210743f727bbf7f3e5727ebd4657eadda9ba28ca56c9c0483f480 WHIRLPOOL 51f43361468f72f3a87922a6e691db7df40a3ee00437ddf96376344b7c441132da75d76ed04cae0c9043537ea070c90e01a41e2305c296bdcd5e59158263b2a1
+MISC ChangeLog 2930 SHA256 6654f52e49b60d9419cab7adde8012ea39f3486b1341573d2bf5bf9a5f2cf634 SHA512 1353482a8941272e640c23cc4d7da5ab935ef6db6b08a75b4f5cbb98144a4d4b694aef386d3fbd3a24ec2a93e29f3753d9611b55a3cd7fcd01506c8c541c2e9a WHIRLPOOL c2ca4a4eccb53cc39e58a2df76218162cee8f54b5d7c18d11cd0ec96e00832b9bae2a18a36a67facc46a9372af07558dba29307049ed840f9be29021db36204e
+MISC metadata.xml 293 SHA256 d2542e222017fde02c8b8285a82f05868c3c58715eb42555767f8835bccd98fe SHA512 832df18c14b5a9d074b061c793407c285cf725fb612c924070cd18181677eed134114c89ba8928c4b221be689e8c321dd364aaeb810d12b817caaf3f63476487 WHIRLPOOL c0dc251a8e8100a67707ae7ec583308a726ec5687af16d10b1151348d2977c5049539ce388ae73c1edc0a139b54995bbd7ee3a921aa4ea52be4e733b4752cfcf
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJVbTvsAAoJENNAYYQy1of1AqsP/36yu5g2WLLrZPWA6x5z3KHQ
-y6G4GgGRpwFecAHmpPcGfBIb/yywrEMfohNW5LEvw5LPkFgApTBYSbA189PoYkUA
-gm6DHj7yyAyvaQCdUFE94qcQif0edu92zXCSWVKxu9UBusPDlNeGo7/C3hTundJo
-LxpROpmJWxwb/WHjFfJBw+jyccIgAbuoGgB6GLnFyUXlCky/Zc5lUgQZ91uxERgD
-kQl/PQjOX2LqO1F4+Mb9fmKJWKvOmQjpxdZw5Sh6+RzLEnIbC/5ywigom7VS+Cv3
-yT4cif7QMdGAbWjVaQH580wEYkD0NES5+V2eG+SI3zt95+tIImn5IU/xaNRXh1Hp
-nnKG5ds8IHbZ6TsBCxJTIsrI3wDK3qVS3idLCuwiSsVNit2gGy1kSqcO/UtOGQL0
-bZPDam+wKsM3OgHFKD3RMT2czqFQnwdnhFpBVMlIh2kcd+9uMX3Xmwv5rIEHiG9t
-23XXGYbgOKjjopRGpF6xLdnWKBT7g4ADQgjT5bs2r5enxUS8KovTblVSdIUWFFpu
-hyG1ysZ6TcQJMPQzP1iqyMsJRc5kBxOKNFEEz0wypEPjeNeujnY7IV/W6kR0KfOM
-/SonfHxaboBjamr97utsKjtbH/DFKIcGEK3j7tePyPpFtKDqzUoZHwCqU2q4iIQh
-iRgjBZ7DQ6u+zw/pGWcp
-=vTxo
+iQJ8BAEBCgBmBQJVdHFEXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiV1YP/iQA/21Ff4UfBzAW+VV51ElM
+nKkgeLjrQtMviMkWFsYkfgdX2UdbzcrHeEuB2CnCnG3rDFu60GI0Yt95W7aoVDfC
+k7lGG8nnp6E5CckH7RWhwQInoHmjzCyCqQQ1BPjPdQRwWoWfxMaziv4XxQHpKjqq
+2Do2/5a0mQHXH2mejR+QmDWamAdA/rUPrQTdNGNyyzDEGpU0Yaum2kbAISshPige
+RXLCE3BXC0fbEplE7aY0f7ThbH0ePt4SZo0ZHoRDbif6WbdqTr3V9mq2QqPewS0D
+eCpUT95We4QhBdMINMTTHyRWJ+lM9oNjFVoDgWOpAOPew6vtI9YryY3plzuqfUYU
+Wzh3rUKhWpu2OYw5zRtNdd/VqQCBmb40qZzVUkrFUx4ztxotdK807oiIPNNKRxg+
+aRkv9klK2eJmM0ncR/YRX1ZO5V4pc2tsY8971caQHCMBT78gjjBWzb4EYsouKFWd
+cKEWYgmuCFZIdpaZabBxxVF+2wk7CmXeU8wRGSFPtnOvJA276bM93k4w5SG9RR+s
+QXkPwg3v2gUtfVx7SjNkp8oyoFENRGGlEtZl7S9JoBvKNw1el+TaxXW9rUUjZGJB
+/aRJxc8AXsZnWIs4qqMZXgUjEbBKeuXwoUyZTsGBE+pSj4oFgw+izxHIhed9wDVx
+wQpddy9PV3TgyHwXASqQ
+=6mMe
 -----END PGP SIGNATURE-----
diff --git a/dev-python/waitress/metadata.xml b/dev-python/waitress/metadata.xml
index 8710c73a151f..913fdf59d480 100644
--- a/dev-python/waitress/metadata.xml
+++ b/dev-python/waitress/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>python</herd>
-	<upstream>
-		<remote-id type="pypi">waitress</remote-id>
-	</upstream>
+  <herd>python</herd>
+  <upstream>
+    <remote-id type="pypi">waitress</remote-id>
+    <remote-id type="github">Pylons/waitress</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/warlock/ChangeLog b/dev-python/warlock/ChangeLog
index faa98830f543..62724c5aa1cf 100644
--- a/dev-python/warlock/ChangeLog
+++ b/dev-python/warlock/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/warlock
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/warlock/ChangeLog,v 1.11 2015/06/04 09:47:11 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/warlock/ChangeLog,v 1.12 2015/06/07 16:29:11 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   04 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add pypi to remote-id in metadata.xml
diff --git a/dev-python/warlock/Manifest b/dev-python/warlock/Manifest
index c7d1adae0a45..43279867f93e 100644
--- a/dev-python/warlock/Manifest
+++ b/dev-python/warlock/Manifest
@@ -5,24 +5,24 @@ DIST warlock-1.0.1.tar.gz 4192 SHA256 986ccfd647f89c1c8e7ebe40d159e5633818a58754
 DIST warlock-1.1.0.tar.gz 7879 SHA256 bbfb4279034ccc402723e38d2a2e67cd619988bf4802fda7ba3e8fab15762651 SHA512 57353cb21ee7245cb27f29193d8c0987971535f1bc9f7a8914738ec15cd5712cf7001eae379041c0188e489365f23b0190dc13799b57a117b0bd3ed62cc2e30a WHIRLPOOL e2e258a38770c2c2f823d343ffe8b8a75bb7e89c0bc2b5dbe1e174cd06527eaca84e3e1c90ace11acd766c87408f448c563f2cfed8740239dd0bfeac66740698
 EBUILD warlock-1.0.1.ebuild 1108 SHA256 de7ee99142445dea0fb16069e1ee9fc7fe7efcb9c81b08e9fa313016cb5803e5 SHA512 fd1d828ed1bd01e32fe857e88dd6fa4811b3e7dcbb6f812709149803763ec8dae3e960e4bb22e7e7e7ee367589696b73368c56564885b0544de6fbaa4acf50e3 WHIRLPOOL 80f371e1a8d4054da4ad869b531d9996ff6ead91b6de1eae7e1ab3d91014ceb20d41d1fa572805040ba834785516bb10f57006e760202d284c22e88a69aba2c0
 EBUILD warlock-1.1.0.ebuild 1129 SHA256 7a0617a35addeddeab21c0295626e3a48de59df9cf4e0dea39f1e65be7eb580e SHA512 b7ac06f39f77070ce436f39ef62502b68069bd70d16f700ab3befec8a30a36d2bf52204eb543de49f35c3c7714d4222c6a935ac607834b0bf15e06f43a47246e WHIRLPOOL 1b1099152bbee1bbf7a03483b5cd2489e7dbe94ec19fced2369d882ca31187b64eb3b19cd1dd698f0fca6b9deba3bebccf27eae33a5ad6e0e62acb1c3381ff93
-MISC ChangeLog 1738 SHA256 b9fe0ffd162f5fb0c7e4fc58f8dce24fcc0db9a15beb9dc97059639ed21ef44d SHA512 191be2db746ca2f96c80630d32e9f2b6868ffdac04bb3193bacecdbced901a9f18d818d0043d13cea9c591cc15bb3fdde7b1b2d88596bb30aba83fa0f8599406 WHIRLPOOL c22313fc75655767becebbf1e62e3969d92042df6f08cc76a488b8825678a50798b4cf39d0f0ab2c4e8d7084ba68cb3b49484c190705022534d276c4722aeb50
-MISC metadata.xml 451 SHA256 9dfa7bb2e2e8401ef3c01dc8f08ebd5cb5c068d108b0d8ba7931aa5b43da9be1 SHA512 884b3ecc58112d6e6627bf5f27af846f8f6a878aa66e9e82036cde2a06ac81da1c2711685cf03ddff06b198e2feeb42a6e623c1683cd4514ed6f4a99660b326d WHIRLPOOL 9d1c313d5282446a291434fdc0aeffcb6728598e37de385e04c3dfda4de9fa6ab57a89231ca9ff93375f0c7b85bab4308949e611150163370bfd0d33c33a9ab4
+MISC ChangeLog 1842 SHA256 ed43f7c6955d43324a59ade62b7a54eb264622b183f79eb6afdc27d8419abd8e SHA512 e9e159b93af871c2e34ec3c92e6aa4965f233d9e46273b8f01f9379546558b971c3b0b963a54d916815ac40950931572d01c74b686d7dec4370afb8add66a7f5 WHIRLPOOL 160d43e17885ced5caf3208593191e831acbeccdba3aeaf0e5212834615920ad01343923648b07e0ad548b43eee75d7cf5d507f3cc19e71828448408fe213401
+MISC metadata.xml 495 SHA256 5e81777ab27137d35bea0baf57c2efb3dc303d69c9334e46836b6bd945004418 SHA512 29bfb28a25d09fc567bedd82ba839a98bd1836fa81b48c6db4c568097820019a189bdd3b3760652d00f424c522e1a1d2321b68ed05224249b6872c2c527c60f0 WHIRLPOOL 3880449524d033b6f3c36d3e2696b094661ad534e9db3196321ada00d1ab15bd9735687e702da79439213b8bf43f1928b6fed4b85052de5586dae4d28773dd23
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVcB6gXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVdHFYXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi6YoQAJC0lPvWWpROitq2EAp1EsNs
-gn7SPi5Fq02Q6xPjyGYMqL65LvVl51FbP2dlLiUiXVN6Gvsg9vlG/Ym5iWUTsiZO
-ktu4Mn2kkKfIMqXXYIAPenKFzt4ynrTDz/wez77So8dtqOJrEHXoq/wP8Bbjk5yB
-hRSDVrK89nsvGzQUVavbrV6MaimNVZSr6vvbSyf9eP8TlFBrVsUFXLrNxvZ525T7
-UEFP8jg55PEVCn5G5+0cTOliZfaDsO4xxBVjwlUd8wgFeKU0/ZzmRgKhwGWCKvmJ
-gqgzmDjLLSADTg8ZIpD8KCcQPj0BCwe6vRbo5LKNeVh/FBwMLOKLHOsFUXrt43rn
-8VAGRYmHXJf4WPVyatkh9anWxvmHEaxgcwdDixb83FxxHyBv21kOepb11xk4uk2R
-Ync+j2gJ7rqdHtkwDp+W3jvZqEFb/RqmaatubyXeXM1p6QI/H6BSGAb1WAwl/5uM
-HNSd+LJZ+rEo3xiueih/yaKICiPFup7l/dOWeIoLPFbfs3CJ6hgnOVTUEs7PSM7y
-Ec0wWLd+IurBZK1b4FmijuBCmIOILihDT2CB/Xey/4BSPaUZDXOwc2XTHurxjldh
-6vMZ9wLMx8LHeHb50SUn8WxlwYt6O4TDHZBsd4QTsbrFZSoeLBWs9v6kpPMNJcsQ
-t8lUBdMdAUObVPJkb6yb
-=I+c+
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiK+8P/2XEy2/trFBdH+YoyJGmcso2
+GL75usz5ZX2sitlhrjJseKHXteAi3C/GTZhaMmeDUZ+udK0fos9F7MMb4woIG+Yj
+CM6bSaHx1t0lg+khdCtuD4bwggAVAgTe0IOAUXbGSw74ehNFmFgP7xI0KMXbGnZH
+fG21REFc9mb0YocNR6GVXV3HkkPAyycsCkiczsgruI3B+W41tycNc/ayZgaAI5nr
+6YozOwAgWhbQcmgLgGhI8Rxv/6uqTrgeDu8HSPpqaTmpsH/AxeVGyLkF3U+1i++6
+8tuzn3HkxnoS6Q/Yt6KCufvi4QsPOfmPus1WlYfhuwkWt/pfp01kk8f5m/eONd5u
+Gf+L/1jFOxIumw/6nL/b+rjL5z9rUHN8OsJvppuoxfgfMMvI/68WZ7H0ygs9DVTm
+z15cKtvb4f2LHfxhELVBI8AxaFGeb7Eqc3lkM8KSxmtyZlXZjBCrLFFchLh/lFxs
+aX35yERJ/e7MN63vx19lBLi6pwNALqNDk1m738s9b3gkSbnecD+LuiSRtajaCGdl
+KLg7t0+y7zkq7lSVUic63BGSjncfz7TXwmzNoh3LKQh0AWhvnjwMDZkKWOEtNaBk
+WP19K9JNwTshZwIs/kmruUA7qEQkg3RJjOQpC6Qmg5rfsmFxWMskKIeE5iqLqCUE
+7/KsQXIdgOccyc42KDVW
+=vKkx
 -----END PGP SIGNATURE-----
diff --git a/dev-python/warlock/metadata.xml b/dev-python/warlock/metadata.xml
index 15478e42fff2..e99437e2e041 100644
--- a/dev-python/warlock/metadata.xml
+++ b/dev-python/warlock/metadata.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
-  <maintainer>
-    <email>prometheanfire@gentoo.org</email>
-    <name>Matthew Thode</name>
-  </maintainer>
-  <longdescription lang="en">
+	<herd>python</herd>
+	<maintainer>
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<longdescription lang="en">
 	Python object model built on JSON schema and JSON patch.
   </longdescription>
-  <upstream>
-    <remote-id type="pypi">warlock</remote-id>
-  </upstream>
+	<upstream>
+		<remote-id type="pypi">warlock</remote-id>
+		<remote-id type="github">bcwaldon/warlock</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/watchdog/ChangeLog b/dev-python/watchdog/ChangeLog
index ed4a88abfc9e..40db8944a5f9 100644
--- a/dev-python/watchdog/ChangeLog
+++ b/dev-python/watchdog/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/watchdog
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/watchdog/ChangeLog,v 1.15 2015/04/08 08:04:56 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/watchdog/ChangeLog,v 1.16 2015/06/07 16:29:36 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> watchdog-0.8.2.ebuild:
   Drop old Python implementations
diff --git a/dev-python/watchdog/Manifest b/dev-python/watchdog/Manifest
index 11e34710ce9d..abe8a891398c 100644
--- a/dev-python/watchdog/Manifest
+++ b/dev-python/watchdog/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST watchdog-0.8.1.tar.gz 154747 SHA256 d6ec6be582b244834a888c8ccc2d451816184ab104b5454b5e5cd7649e8f671c SHA512 d5915be2e2817c748c6d2ba91d8a4044938fa5665019ac7c2048e28493c0dba34189bef61cd642204f1bd62d81ef59767af5970f65543a0c981d8f31ab980856 WHIRLPOOL 94890aa9a0a19c49ce2358b694a61b456df270da3a16d5c5e91044a96e228026288c7dcb7d4597e5fddae601692f8b34cae5e2a29ad388bc08aaf86b3d59fcb8
 DIST watchdog-0.8.2.tar.gz 157936 SHA256 33a9ab3ce2e6b1aca4d2a50752231668d69bdba4ab096d9742195ccfbef1e023 SHA512 96f1fcd0d6898ce950c8768000be2f619c9a28c9d96cb1d7323f04371b065e50b38692179949255bb13fa4e3c72e6f656dbc02b4d7f77b7fb3aacdf08600cb71 WHIRLPOOL c2581e9dba65f8ffbe1fe8b21d873e0292aae6ba46012979b221b3d4ede8f74d4c2cc2efa8635e99180c3bce227f943cb5ef4fba3dd24f5dae5bfc150f643c1d
@@ -7,24 +7,24 @@ DIST watchdog-0.8.3.tar.gz 83154 SHA256 7e65882adb7746039b6f3876ee174952f8eaaa34
 EBUILD watchdog-0.8.1.ebuild 737 SHA256 d930d35f8c12e22664b559e72381ae68d999336cc200e5779bf8427ce6b847dc SHA512 80a0db2f56e3e854c3244cebe2a2a8e2a6750f13fe76448e7636ca202d6ed7207816997c6f31051b10b6594ef1e6b549c010a1710adfabec4eb7bdf9c117494e WHIRLPOOL 3de3e7a3d73fb1cc797d24c9745fcbc9f5b6714c578efaa62e03bf64e6a2e9b7a4636a4da975d0183c94ee29133ce4cb657567e5f0549075640667a605579e88
 EBUILD watchdog-0.8.2.ebuild 905 SHA256 c21c69a73119ea8bff8c24d15d7202793ad6b27aafc337a10a86027e40e4f010 SHA512 85fc490052bd966c8bfcdddd916f4385784c59839bd555ba191615697d663af5b3e5dcc93d962944cdd803f81b055fb49992aefb78adb649952f3cbffbac0b60 WHIRLPOOL 41fef8f710d0af92058d9f4e7a822ab042c44d77965d82760f63c6baf8762c7ec0dd1bff9a635cfabc74cb1923bca5976043b5560a8623bf807cf4356de4515e
 EBUILD watchdog-0.8.3.ebuild 968 SHA256 e400ba6942a08f249ccc18f77478e6d52a598850e9a335f04b92c77d33407d65 SHA512 aec6347d18e763de5583a408269c46942e008057aef43bd576a891883ea39ae072e42d6e362cfc5c4cc922292c255fe68ad2602d083558a4a04374041560b505 WHIRLPOOL 5e7d6ac47024d5c1da0ecd1e79ab1f7ae642583b7161adb7e75a9cdb01a44157f9b80145b53b0cf30b74442b9066865e48c7df89096f1fc2589bb24ccd3e9f38
-MISC ChangeLog 1913 SHA256 0ba4ea1e0811d1aae94a50d698208619bf69f613163d478a33d78bc9b41c0bb4 SHA512 d15612b252ce9d23e899c4b14199a664c984330eca828cc8b7a65dfab4f891cedc5848074db90f641ce806329ff68a9465dc86114c227988bf189bf7bded4035 WHIRLPOOL f3a9b3c5d0cfe517ac72d7ed1d50389163e4c8f95a0fb8c5f550145de23759128a3643e2464e7b67011d64abc1ef1fc73aa946ca6485408ea9994ef340c685ce
-MISC metadata.xml 315 SHA256 0d1a2418599e0619b5a6242156feab8c37bf45429c9563276818d963a419cec8 SHA512 cbf2ef3b66bdb8d14618c9142405d710b1f990b8200a63040eb2044b5d8ca8bc5e6c129a06dc672b7ccc486b457ba311d18c92f021275e1c1b66340dc87122cf WHIRLPOOL 4b039e6386e312ceb6cccc3a754220d7eaca7cabc9f7dfb301b22a813b6ccdc91f72d43bc13d9c2d1def5c426c1f2e656d2282672ffbc9e8209536e05530ed94
+MISC ChangeLog 2015 SHA256 cc7e19e4c2a40ed8635a718ed26e73eddceaefc5c06a74e2cc1ce1327a514ebe SHA512 2436c9d1e2014173d02be4886f837cac374cd125e7f2c7549e80558c3aa6f024ae620d1d0b8babcc6fa885a87906c212cdda40806e4fc9171f48bb6815459127 WHIRLPOOL f5cadba51f4fe091510a043d565f8fff2460cc691f77c742b8a58eed0a352ca7ec8466f12b6e0b4cb72f73d3160056c39ee8f4c4cf9679744615f4fc6fbf961d
+MISC metadata.xml 378 SHA256 8e5e3b6b39f20d5be3489c0b6ba800cd0cb9455c9b9cd84cfb5f9c6486a5614d SHA512 85abc82490420f6e998d26e5fc31c2beb752853813f99c9ba059feb0538e741cdc81303893ef445b9acc4f236f908d6a68236b3d4fabdfc43c6b32a91bff73da WHIRLPOOL 04013ff10e3359d6f06fb119a589f5c8e1c399aa6f7185f51141519a72ae039866830f02af519370b07abf4dc3b75ed17a13e16d11a36d2443e1a897690d5848
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVJOKcXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOqlsP/i9kGpl5wY4oZj8V4AzDABRf
-UJuuGdeLdH9GuFhoLcYGR9QAWjPJIzQfuAtwN3g2Cg6SHMgDNuzGv7wlvWTk7iIM
-dOkJenH5yoovhiOURvtjk/69P+wXsrvtyiOETn0mWR4+fYOfUOG3CfCF6tvJ/Q7Z
-SEWlnD34tyjuSpkB8nXOdr322Dt0ooeA7JASQbJssduaOXXpzJIpWbbijpU96bMr
-CsvefVA2smR0BUU7QDt6HgO5OwW50S73fJ/ojjCNbuBoxEyiB93We/uqTaBPik6e
-6UzOempYOyQvXWSPG9zqIMcv003Ew+Td5jt/eGdbxfI3oKnDx8/TvFF5//OM/72g
-DRx407scp/YcAWNU0GlXxUTHet23eT/oKQSIGWaddzmgJ6eFwxALIDJLuvQXYLmP
-MIgJJMpkcUPwZ5vwkVGiG6C1R3d4DS+FKX0I31xxyz0DM9oiTAmVG4Mgp/arFhFh
-fDWhFW/rbwL6XY7VO9WHAS57H3/TCX5RM122pjWjYRqaqWHQYLArH7F166hfDxrz
-pXTF84EXjhDmyj1WNEudRUbz1V2/uMT/F2Zh3/2D8jz7PJ911gSB0n97RQU4o5+g
-OzEBw/V3Ye7ZiL4e/ptLkWWymBZEnxtKbSdAJm8wD+LZDLvxxbuj03QXm/nvojlY
-imXFJn5YwhWDinmju+cp
-=b7B2
+iQJ8BAEBCgBmBQJVdHFxXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi6mwP/3tLqtiAgWtesCOuuJE6IinW
+vtCKtnsQceq5MN+zB1Cf4BsMXT8AmpO0ZP9xCu/t2+sTxeUqSZ1qAa9b3sF4gjpn
+o+5tvwYblN05SrEb1Gj2CLv3J8lcd6IDrbRR+8kTvA+gjn6gVkn4JJL/edv1ZwNz
+wziZWXfmTZ5Krv78CkgWieXgeNrOf/yNrv3LO/tcVxo1D3IQD7M8rDu/9VX3U1Gd
+Z0I8PCbyDytE1cwAh6gg3T4F+fpuHP9s8UocmTntfHOujV5Cfnnifj0gxq161QHs
++IrKXaz05b5XJz4YLK7n026EGeLXn5fR3wv7Sd9pBikkz9wtTwtogYD3vizug2t/
+w/xSx2MT3uBMvSKPO27GzvOnYNYnbvv85pcDis+oPMVxDzWbyV9emP1CDDS78TeL
+IUbN6Me/6/uONGxBl3b5IDh8FL/aZkF6uD6rcYmhko5WIElmvUb7kGVf0RVM2fbq
+pNdoLzntbWCJDFKgvL12akfehD+Fd3662Ijgmrnqg4Xc8K1LouCTJ9F8OdMvnm4w
+qqemSGhzOFXakrES3z6H3FPA6jNB4mZKEI/tOgxHyXtCqfGlNDrpMWNCnH9u2eAO
+EDUz8efr3ldxNwA/D9VMwCmRRLKzVX+kCdTn1G4FNOtSI6px2l6IgYbjgt8zRFTY
++sIAGaXvM8TOaSYaGVlZ
+=Et5J
 -----END PGP SIGNATURE-----
diff --git a/dev-python/watchdog/metadata.xml b/dev-python/watchdog/metadata.xml
index d22b9788e7bf..378220de1467 100644
--- a/dev-python/watchdog/metadata.xml
+++ b/dev-python/watchdog/metadata.xml
@@ -7,5 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="pypi">watchdog</remote-id>
+    <remote-id type="github">gorakhargosh/watchdog</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/wcwidth/ChangeLog b/dev-python/wcwidth/ChangeLog
index e9bbfd9e1835..957d1ded16df 100644
--- a/dev-python/wcwidth/ChangeLog
+++ b/dev-python/wcwidth/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/wcwidth
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wcwidth/ChangeLog,v 1.2 2015/06/04 09:47:41 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wcwidth/ChangeLog,v 1.3 2015/06/07 16:29:55 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   04 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add pypi to remote-id in metadata.xml
diff --git a/dev-python/wcwidth/Manifest b/dev-python/wcwidth/Manifest
index 6834758d7d33..83470a224b8c 100644
--- a/dev-python/wcwidth/Manifest
+++ b/dev-python/wcwidth/Manifest
@@ -3,24 +3,24 @@ Hash: SHA512
 
 DIST wcwidth-0.1.4.tar.gz 19584 SHA256 906d3123045d77027b49fe912458e1a1e1d6ca1a51558a4bd9168d143b129d2b SHA512 3882d7a4309b868593586e7bc52ce5328504db2f37a4152d53a8b7b8632375866cc07900965d1dd9c84d22c4e2b5cb161b3091c6b3ce4a37d51aeca9c76fe36d WHIRLPOOL 432cff1f6e206c9daf35406d485436c9f7b9a3e7c48f14384f9804d69c6a39099bb9ca4ee99547504c4fa2db8f70259796019f008d1c678c6b73c7de9c09cf60
 EBUILD wcwidth-0.1.4.ebuild 586 SHA256 03da05ae17f66c8635916fabf5210f670deadf98a1ee698200aeac46a368c199 SHA512 8c23ee8bab2e6e1615c6d1a5852a1348cdd44c6ed2690587d6bca0b518b99132bb182312688818267df51f9d2784b04a2e02931e74d125772dd3af217989e478 WHIRLPOOL 6f2faa6cd752faed5d8615bf976e654987377b176ce078af88cb164b2461a53d7b67d60cef9b10f706153c562b2ea872f6a6026ce184459f769cd8e2909ba49c
-MISC ChangeLog 441 SHA256 ff30c54c7a1635756b994c1a48d922aa38e8edcd3a3f0514735bd83402381a5c SHA512 6371b480e29fe7e7ac34c6652e8939775ef7808d9bddcfc227e5ee9ed75a2f70e365d0f5f50b378b9d4390b1f1f177c3b83635a3a6029df55e20a96c5b92ef39 WHIRLPOOL 07ecfa3089f64c90410e684b83a6eeab7ed05f6082c0c8dd1a94a886bdbab18b6aad538d4d7c2ee4dfbd7a6d0e30d62f199f438ff26b1ba8cc2cb1ce15eed926
-MISC metadata.xml 310 SHA256 5efed72d7b56c0ddd87093ebfc75146079baac244240132defdae94a1e532acc SHA512 ddcd7b0155abc40adf325ca633d301fbddbe424c7953bc9a1eb80da2adf7fa591ce33c573f69a4b48d4828a592ac42c7077b87480e2028300df31addeac78675 WHIRLPOOL 20d3c43185d5cd41fa2ce5aca67b0233d6a4efe71021359e9835b19ea2186510b76585ab89b2f874d67321068654624bdfe06e80e23ee280932de8fc95db7810
+MISC ChangeLog 545 SHA256 ccc7dca79bb1c42c6c1b04481b4dd5ecdb246c471666171cdf31dcceb63e1cae SHA512 4deed215e67cebba3ae370938e1f243286c58e33e1e4e06255ae5b44c6efa020aab3e4ec58209475bda956150ae71ca3d75b96395b2b2f7615d0fd584e5ecfb5 WHIRLPOOL 68bfb8e400c92073e1d8ad2282b4e60bc574d5eab21ebca99b450e42a5b4e6f92e278bb747654b7308b6c84c0829f39121d824542cc78a53eb4b0620ec26ad74
+MISC metadata.xml 366 SHA256 8bb36bf271181310c5a4fd755d291e5f27f137d3d75bd4e97323547ede8c5a62 SHA512 387ba92cd66e4ec8111b0db0cbb511eb233812396b5432561c0022a67d88e96a87d85ce2233b14a23e83f8b9b9d0f26e0d2fa09513f86b3288c4305475cfc279 WHIRLPOOL ab376cb219f91ba1bc646cddbedeb00d75a05041f65b87373581dd654e6a2b1fc3b7c1b00899de8b9625d656d7f5cc4e7b1066ca4ea6dfaf71ed01132fbe2e19
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVcB6+XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVdHGEXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmimocP/AoaSsFDK3sibgKfSUxlqS2x
-cH6DzwU1A08awJeDSA3FW7gpkkhRTEgzv0M/9ioTowThP4xncRZGTIplyU6M4/Sp
-m96a+zMz6LQ33mEdADTfgISeHul0DmRfpEPU3l9IHqVX36dlHTkGNz8dke4x05/F
-PVhaILu+GHv15GJbx1yHYr1hKo3ZzfdieDfhtZ8ieT03HSCpJc/wXk4YUG+M71Z2
-VBAm4jz7WORqXZ3wM5QMMvnPGxpFvW7GWmVV3AOfV5t5fowrV2slqpQyesztYoO4
-kn1w1chAIOfWOshrXXAmWFOuOnu2WwogN+As2+qUrgLWIYZyah8++xF1AQYe+deo
-HYqcFmHJy3yDbcjupWArghzm7juGHwFFcr00Xo6vbvvQ0zJiV7r+Zussd5KTA10F
-NfD7sIzpuwyd03XpmCA8qNjYWXssNcI/cg0cvMVJtIvHUGMr6sEnItS+zxk5nH/C
-bnJBaQITFI5nbJ43WgGXKEFhECNnBn2Qk1DazuJuSEOUgi4iwQtChwMdTcs19P/h
-fMax/gAlT3CJs3o4g63hMtTlIX6JLAdBbtR1IRzWVrHZG48s4b5l79i6awd40fx1
-/2/2rX5a526fKxyl5gubk4XKQVjKzqWGiJh2dzhWLvtwvTT341Knm40Atykg0S2R
-erANmAAxRHcMAIO3GqcI
-=Y5yg
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiLd4QAIZHjVgmodwtApvp7toRsHRw
+tn8IH6WFv4yeUj3B+0syyBT74W7gcZsRwwarK1fanjhF2f5ZE6uijBRz40/nXCBo
+8NVHOrG7cyIUc9IHmgeoUGRgy9tUHiq3hAosInODcTaNrppHeHkVmaozArGo7R7R
+rt2Ly5W6twG6ahoOutYIxEy0N1boPAj+8BfURP48Jk7k10MMrJGsEQQhHZ8rwSma
+Bjgq2lZUyCa2qoslJTr20/mjBtR/3lYKzF3svRVylTD2QvQTjY9sADCxKd0vfVD7
+l5pthsnmiIVWSEkkPlXri9VWc+M2peNNEDxo1ZBgeYDc/Nca/RzWEXOjUxTCRd0H
+019LYRlwNuh4TAySInn7k/EiKU+9HWKK46riz6G75Nin5HrR+frJHzMwyonPnVof
+NfyvwZIMn04TQ9LncAko33EofrR3NVvHVMism4fBL+pEMZWyQMrBrbGhziLVDGd1
+doQ0F5pzt5OX+cnpMwphHovM3hifqmDOznIQ38EJlvNmQ65iP5utrKIuMFwA8Jim
+k3UwU/2o/giVT93B/FHnaZXjlabv8RmVQriGaIQSdQ+nJIXtnT47dljdC8SUYiEf
+uYrjJMsh5oGW+NFWt+nb7UKjoy9do1k0+2oVaApb5zfaCYdGVrg5Q/lIgjj3T/dl
+4fePe34brp1dbHjXvMED
+=0NpV
 -----END PGP SIGNATURE-----
diff --git a/dev-python/wcwidth/metadata.xml b/dev-python/wcwidth/metadata.xml
index 34d9942d3e29..6272360d4941 100644
--- a/dev-python/wcwidth/metadata.xml
+++ b/dev-python/wcwidth/metadata.xml
@@ -7,5 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="pypi">wcwidth</remote-id>
+    <remote-id type="github">jquast/wcwidth</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/weasyprint/ChangeLog b/dev-python/weasyprint/ChangeLog
index 62d8de9abc6d..12d18618c0f8 100644
--- a/dev-python/weasyprint/ChangeLog
+++ b/dev-python/weasyprint/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/weasyprint
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/weasyprint/ChangeLog,v 1.12 2015/04/08 08:05:02 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/weasyprint/ChangeLog,v 1.13 2015/06/07 16:30:18 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> weasyprint-0.21-r1.ebuild,
   weasyprint-0.22.ebuild, weasyprint-0.23.ebuild:
diff --git a/dev-python/weasyprint/Manifest b/dev-python/weasyprint/Manifest
index ebcd2b5ccadc..09d080713888 100644
--- a/dev-python/weasyprint/Manifest
+++ b/dev-python/weasyprint/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST WeasyPrint-0.21.tar.gz 333898 SHA256 312af72805fd5207ccd58d1c59022bf1e9cf8e6c839825e654bb0d0789d66048 SHA512 6455e17c317e8d25f33e6e497e232b96e907ba569d15d333e7b3d3de2b41af7d593e385c24a8ad3f6877c1a3af4266f95e723277e3ca3194cc884c04c58374e3 WHIRLPOOL 165a3194e9fb92699dd9b00d3f0539d686322f09a3a4d2fa395b1070140bbec4a535648d86d70632ba5b094aa16969491ddd42a5711a4d9e56833dc25aea61d1
 DIST WeasyPrint-0.22.tar.gz 342786 SHA256 78874291649d8013b60462c39456fea8d1097e55bb45907f6c3e30ffe4822bf1 SHA512 f5b7189a9c5408d052cde995a9ff6aa2df04cbf97297c8f2c03d8f12aa84833f7a82b63eac700032570c289a8ce0dbab687d0127518b6743fd95dfb60cbf5993 WHIRLPOOL e2f6efc58a3344c655814b0fcb9b6541e8a3f8e8e4e82240ea34580517095d7622f434bd83da6071184270df6c94cc7771376b87743439a1c3e9a357d72520a6
@@ -7,24 +7,24 @@ DIST WeasyPrint-0.23.tar.gz 343614 SHA256 4c3539b8bf6145f6ae9de657eb4b008ccf2906
 EBUILD weasyprint-0.21-r1.ebuild 1031 SHA256 fbb2d4bb4b69f3679312beb37d4863961e9e5bd38d69890c05ec1f1e6c476a20 SHA512 4011a2b5ffba9b211e6b930c2034a91e2fdc9175437622001f0aa4790b45c91dd621ded7b63088dfb77645f82ff89d777cb965cbe834ed88e40f5af90c67f0f1 WHIRLPOOL d9b28c798aa5ea94d99a1a9db3eb50b7059ebfb3e132aac80799552cf2725411a2283136060747a63692e2de837f5d4e4f5e81a887eacfc18dd101bbadacf381
 EBUILD weasyprint-0.22.ebuild 1318 SHA256 e90c31a36c98087749a87245f2778afea132283efba3d8bfd330b84a257496cf SHA512 e088b155795b3e71efc4b68dfbb83b9afaa386db2bcd1aa3fbc84ff858fda7fa01adfa2be957e0f9b81723ff6a6f929305ae2f5722255d9c5b1b9116c60d3fad WHIRLPOOL 27a7d3dcdae8a967c7635960a4c554e1976d255dcf4e99663497b4b003f14d2cd0eb130a085bb369c0b620c14dd8979f143ee8b1f095f70a477b4870cbb02e2d
 EBUILD weasyprint-0.23.ebuild 1318 SHA256 b970a58f793f402528ca4472bb1b969f81f9dd087fd2a66b386e287665d806db SHA512 d57f15741ce1e402755f8d0b745abd08b306e6002abe7b968f05288df44f34b0c8e367a58b113d5be91dc3eafafa6e20b63e638fb14a2feb7d5dfaddd098b6a6 WHIRLPOOL 3348a572047db3de6eca63dc71bb59e1129f56e79a69deb0d5a8a223785b2ff78034afca7545a187c6dbe7c3890c5f94d9c32dd6571333db8ff3fa652704b345
-MISC ChangeLog 1980 SHA256 a7d5cc1677c4d43da2fab891fa77848508d8c998e472170fbc317ecabc62ee50 SHA512 c16cf8fc05d35777a714c7b4bfe79fab6996c807a121a69f1349275e9367ec71a1e419b8a5e2c4249f613b09079e2233b9016a8521e73ad427a0c0b6923e274c WHIRLPOOL e29b072e088c2bcb8d3c084c4ca8137a4e284dca8d2a0796beea9a6face2d51a8223dccd7e2e82b59b67228bf4c0e5f671eaa7d551cc75e0b178c4ec46c8a58c
-MISC metadata.xml 233 SHA256 e12a8d932622a4d26fc2bed0756100922a610aed8d56c8f3e809961fdd9391dd SHA512 e5a9aea32f57fb9fe2f52fac0566f39a8406ca65c958059cbeeec8edc9f2d00f652893c9bf985279ab0e82027c1ce8efdd10a39875ba980a8cc52c588afbbd16 WHIRLPOOL 35df23ca9ff4885b227fc0556e4ecc29897a34807a99e1824517af97f9cfac6b3d9ce525544a24784a558985c43bbd770dc1f1070ef0d72a56abc5cf7c4fb712
+MISC ChangeLog 2082 SHA256 ef9e282412326bfcac179195c695407e44e86837b2a53fc7de1a51559872dbd6 SHA512 a41aec4004070514cba6e3e72414d5b89a6cd8c1d859e85634c053891ce1b01732fb5a6c7bcf35a6b64e5cb858bbc34824abe8a8e4c3544424623ed36df7a9ba WHIRLPOOL 6854f04d5f436fe87fde9fedad3288e4ca00ff7a8deb853ca7f37a86922de7de39592e02cf293aa3ba29a494ae062105c46d47ed6a0b348fb7041253fa1a8310
+MISC metadata.xml 296 SHA256 51b695aa7b351d67178374b90fae946eb2ecc323f2b6d6316675d8890bca4751 SHA512 50a80825d247b952074abb9774ee4e3a4c2c59f4dec63aae9f7c5f557eaf443c145223e5d049803bef6db6cea72b5c95e606a9b4a87fd264351b9fbe2de1a125 WHIRLPOOL 75615b6c26b002a5ad87ebc3b937030c77d7370a6972e5c770af53c56eeb0720367a847a139638e2b6a5a272239b26cf0e3ac6ee7fbb7bb4aefe855c2b340b11
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVJOKcXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOWzwQAM+bflkB+x00JgZTIfxGgzzj
-Dev7bJCVYUvdd0Lk+K8akwIl19KOZc0rKukj6P7wLAPsEUz8zCPml03j4E8PZ9FJ
-hMFRkWsP1NSkP6IH2CMeFBG04xFBDeN4C+BVIKZbr48m0s7OogJxYeLWgVmEdLFM
-/bQvFwONwJC+SUhaXPPKwmb8QThw3VKRiAsawLbUuC95IRh13HXlPkLID32T2pkD
-O0DWa5uHMuqxrQH9+oROS17WfZgOd+Q5hc+wiVXzkMwqfyGh9PjFaMOW8SEt+lgq
-K0NQjmsLJk5koCgbxm55HFZSmwboE+2ieYikCaLxWsueACJvt5Yx9whlwRZzkidp
-yRqwl5kOlYY0fsTGElzdkUe0ZHPQgugdpxL7rx9B4Vv/eUE00NbMi71mEEn3OSi7
-Et8cPM3nNv8pPgtU7opjJR9QJpX1bO4QxiIcr4eEMnIIsw4YWEBNxNLY7da5E1E+
-+YsFvvriWh76ZBKp1yvoZWUR2wVFmktH/DB2WiwQxIraqXNonz9MQ4rsE3hPU2uv
-G9YERKkjD0L+6u3ERoThNQwRwJxa89boGHiPFAI1D5BoFEG1X0SovZgbMUwFNERc
-8GHTfrtAf21JltGHCaxXKSfDW61sBgbRUFKX1I75cv44TUQBKGO3q0aysOqxI5yA
-9tIDp9nhDOo/hZLdnNtr
-=UbmE
+iQJ8BAEBCgBmBQJVdHGbXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmidFcP/iyr9+j4vlpommhtQKoSxN2i
+2HEmKu4GiZE/3gqfnr7qLBoc3rCgtdTnx06/gbtpXEE/OaBIX3akeuOu2C7H25on
+MkDKzqnihjtBs3ipGXPCgILXLHIXTUvVJShDSuZCy6TSsu0KBO+KTf6rMJ9bsdyW
+TDfDSD/wJO42vDY7r16fyffGLl7/GY/0KR96aI7gGR5Jfa3TUNiBNvPBmaYWxKR+
++wHm3t6X+qbz2BTSO0cpyM1Tsu5cBv89AGjEdDZN+Plds990D08zjj4UhCQIuc+q
+FNt2qvLVhtk8M4YbnOfZNvXE3bjEtnxkLG3fReuREk+pGLGxsFYJwbe0CnVPe54S
+aQYUw58GvXZ+a3mfpqe6LAEHKyFwkZWg+Pb1n83wqVChadvJu9MKVv0qwTHlHl67
+2bd/mxLn7A0lkMz9IbZPOuOT4S08NzQq9+o7I6miNR8eHu0KRlLqfmAkhOpej5lj
+UQrYULQw78shnRinWeMiPBLYKtCYYqx7xBIKuvntbRcxNib7hpgTTQUEWiB6ry2W
+IS4I7Zx9k+rP1MMs7ckb7T186QOD+wLDENMopEz7mQLrwK8LdfF96UXV1ofTrZ73
+KEOVy/sQowBkKFfP4qm3+thpyIb7RA3wWexwRPQPlAQHoOxVPQiCiKOSK8hRwENa
+rm2k6ifZVVJSvpNSD8Ii
+=lVN1
 -----END PGP SIGNATURE-----
diff --git a/dev-python/weasyprint/metadata.xml b/dev-python/weasyprint/metadata.xml
index 278a92a86bbe..1009a336b002 100644
--- a/dev-python/weasyprint/metadata.xml
+++ b/dev-python/weasyprint/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>python</herd>
-	<upstream>
-		<remote-id type="pypi">WeasyPrint</remote-id>
-	</upstream>
+  <herd>python</herd>
+  <upstream>
+    <remote-id type="pypi">WeasyPrint</remote-id>
+    <remote-id type="github">Kozea/WeasyPrint</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/webassets/ChangeLog b/dev-python/webassets/ChangeLog
index 64095ef9454f..0a372b5bd0d1 100644
--- a/dev-python/webassets/ChangeLog
+++ b/dev-python/webassets/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/webassets
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/webassets/ChangeLog,v 1.5 2015/03/09 00:02:08 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/webassets/ChangeLog,v 1.6 2015/06/07 16:30:49 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   09 Mar 2015; Pacho Ramos <pacho@gentoo.org> webassets-0.10.1.ebuild:
   x86 stable, bug 540290
diff --git a/dev-python/webassets/Manifest b/dev-python/webassets/Manifest
index c2925f2a7ba7..100a31711d2d 100644
--- a/dev-python/webassets/Manifest
+++ b/dev-python/webassets/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST webassets-0.10.1.tar.gz 171666 SHA256 8e7dedd8032a963ef7e55e670cc109927e1f153b35cf8e9634617d0c6ee93329 SHA512 2879630608c3bd6904bc9f7ab6eceae899df967856e6d7b6dd125106ca27635993bf34309e320a0deacdb3b31020b69d59b4f85afdeae259b4915557c5ae6134 WHIRLPOOL 315e0a0e836683d4750e176ce89fb929e4027f8a32dcf941d0c5faf3c356923ff7db9b8b19d41bd6741ba41c68fd9c96a8f16d7af98b8efdabcf2afeadbd4953
 EBUILD webassets-0.10.1.ebuild 598 SHA256 9ceaf221be1547aa3ff9fb64d27cc4c1c59727182ed188feab972b4e4cd6444d SHA512 090d6c62a6220d109424da799790e021b9d522bf8e658364a8be79e74f7fdcdea4f0e11b2ba4e1b1dc63cde326b1429af0e39740abd04a8310b6606e9c168b41 WHIRLPOOL f1cc1e2a587b21ecd06a5eddee7b6f027dd5ba37cbbb54c64d45c25d1505e149d060567cc1b1ac2a8dad7eaf15c4415280b5ffba1444b81146dca98d0a80b23e
-MISC ChangeLog 815 SHA256 3db3420e24663b0dc3dc23e29b99e3153a3dffaaa2443184cdd112c747796be4 SHA512 830e741bdb486be312cb09348eb7ed3d376a7334b1799d807b3595f5560ebacd6c79aaafefab71438baab904583064443e80725dfa8a0fe686942e98d9ad1f1a WHIRLPOOL a3bf872a766e8fbda9012d84020e3ff73b97e81183429a3714409bef75661e15fe9c4217f5f9f85700ed0d03d0ea156e12daa2da28a35c6ecbbffbff506b4c39
-MISC metadata.xml 229 SHA256 252d258cb9de1636dd1091a66a914379e0ffa10ba0502db1e8c4958f2ac53afd SHA512 cb65d1220458fbe61774c456ac9b6dc2521062e65f5d1c49089cac9e4b013eb969a8557072b6880651a9899dca9b8a616032459aa173f59b9311e8464186a195 WHIRLPOOL 1f835709ce5876aed6312c1a0ffdbda045f671c14221b7f73bb1ea0a18b5ff0f5339cc9a85a5ea946c85bd6656131e28d430b1a9084041a246d0a874a11a65e0
+MISC ChangeLog 918 SHA256 01d971e8627853275febd8438e9947aad5cf7b4118e0aff42097d4dff53a7ede SHA512 f747dc63adff1163e166d357fe7f8af671671155eee90abf4e8a37483aee8c11fb69be37017a7cc8874c5b5432f977a115627a36eb60554d94be4647432d1a16 WHIRLPOOL 5eecdd4cf71202925e97633602458068d37152d60dd7d7cff05c7aa155e45a7ed15ead7a91282a199357ad91ea982602b3d5c03b31d568b780ffdd948511bd89
+MISC metadata.xml 317 SHA256 3c4e20ee9f4cfb5e3f4d5e70c0c070403df055bcaac2db54b4811e081bfa5da6 SHA512 9a0b690317362424c753fbb1b623ea902fbd37500eaf5d66d8e55307dbe1b0dbc08b694f80ea1ad675c228ac8efea4d4f31ace81cbad8943144cbda56764583f WHIRLPOOL 4a710854dc87b8c60ff313d61df32dc53ba020135af24cda5dd0a7fc6d5e67fae0f49246a98ea23bc93463a92e120ef579652bbafbcf3a4f60976fe68c87a7b3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlT84v0ACgkQCaWpQKGI+9RJWACfXBtTqtnk9zMh7Sj26iC7jLLG
-otAAnRRtMWT0RFZlx4h1dER9/pwMk1Dd
-=5/zP
+iQJ8BAEBCgBmBQJVdHG6XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiQaoP/j904QhsG2lPf/rPIfgAQPSl
+aZ7Q8LYCKyfwdBzW6SpBQg8MM1Rzw9RLtAFo6uD4TlvoyTMKfcZ4keK76d8WtnCB
+iZvgqFRUNNeA387F+Pb4/+UlOpquAaarO1oLPFXycMRO0FGj6rOOZHxqyDWazeXo
+dNNk9OUMFui+5B7gXRQmxn1D7hv0JVnqmtdbKB3XoSuFT3fZ3fKaG3ZzSy+5g/XH
+WT+odjw+NgPjqa3hVsstl6cQqxA1aEOfvActtzQDjAuvJHs2+nUS8gzQwUYitzko
+YiZ/ljs773SWVv6kbjmogXgifbaEMdqNbpJQWOuvG51js5MrA/6I5e327E4swMpj
+K22isVhztCMhb3vxzHOJb8kl43CvIFQubPGtfN7RPROAQOfKV3c/lagEPsJKBpGl
+QjYL8pEPfSg5HUJhW0O46hRUvBOKr5rwn88S2ESzQjklZEvNWz+RGg6pQ51h+EQ9
+rfoz/+6FilxSpwyFuJQntfIMXZPik1mjjM7wD+rLl/jBdDdHisyjAlUctoDPqlhh
+alAUQW8E+MfxtzadmiEZBphBD5BuE2YKyO+Z5QSpQ72PnLDH9x7W9hJM0RhXDubw
+NslBgORn3YbTUrenCX49wLocdPRIxPD3WXrOEMkFNZ//CpHex5sDV8NeyCnh93a2
+lvFZXzYlaVX4t7QzY94q
+=ZOSe
 -----END PGP SIGNATURE-----
diff --git a/dev-python/webassets/metadata.xml b/dev-python/webassets/metadata.xml
index 644bcf7c0481..4fa00587b82a 100644
--- a/dev-python/webassets/metadata.xml
+++ b/dev-python/webassets/metadata.xml
@@ -5,4 +5,7 @@
   <maintainer>
     <email>yngwin@gentoo.org</email>
   </maintainer>
+  <upstream>
+    <remote-id type="github">miracle2k/webassets</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/websocket-client/ChangeLog b/dev-python/websocket-client/ChangeLog
index 4dba55e79d99..28c9f5ab4650 100644
--- a/dev-python/websocket-client/ChangeLog
+++ b/dev-python/websocket-client/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/websocket-client
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/websocket-client/ChangeLog,v 1.15 2015/06/04 09:48:13 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/websocket-client/ChangeLog,v 1.16 2015/06/07 16:31:09 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   04 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add pypi to remote-id in metadata.xml
diff --git a/dev-python/websocket-client/Manifest b/dev-python/websocket-client/Manifest
index efa14110768b..096d63dd3901 100644
--- a/dev-python/websocket-client/Manifest
+++ b/dev-python/websocket-client/Manifest
@@ -9,24 +9,24 @@ EBUILD websocket-client-0.21.0.ebuild 969 SHA256 58c654cac2364e48636d5bde3376060
 EBUILD websocket-client-0.25.0.ebuild 930 SHA256 7061c162478984661e9315eb3fce1d8dea7fac5771c1f880a1d053ca25de5aaa SHA512 714bbefe7561a59f7be5c146b6cdfb46858951958b83e2ba5121a742ca48842a4bd18758345f364e61a85d2d9863e3696a46d26b0787164fbd4fd3be69cce8fa WHIRLPOOL 5b2d1b15bee352bbb6fe909f0fe600e88edff1bc6fc5f2afe078d75d9af336d0f8f93f12e0f82d6c79ee414471c9e3bce2b3e4268a8568a0e87bf9b5724da5a1
 EBUILD websocket-client-0.29.0.ebuild 986 SHA256 99f3f4ae1176f8711f9df55908140189481e88ba56676ec7673d820d2fad4f7e SHA512 ea825f42f9afc77b9dfd63014d3577ab71c01f2e2bcaf44ad8aeadb158b2d5147d6aa4cd1f646d65ba605a468796043d84f319e8d060f1e4e6e0d6c1ec785abb WHIRLPOOL 74efa5b1fd60dfaa05968b838e0fdc359491263b3efb632c18665bab0676af75911c98076132babe661911e6b4e51b9917b751492f6bd0eb4864203e367dc652
 EBUILD websocket-client-0.31.0.ebuild 986 SHA256 383629429c764753a122c460cbf358943449342ca65dcffca67ab028635f4c70 SHA512 681778255eabf35dae59c7ad0434d412bcf58f4278579c6befa92cf567ccb7c52cfce45c02ff0abf35df19bb6c2f2b49c15ddb807f23ff7bd8fbc28dd7b7ac7d WHIRLPOOL 94003c8541fd3a4411108b28d2c70f6441ada60895b2cfa9d33a3eb007b5c73e0ab8fd1b0e4ec829b3fb467c0ff2c085fac43eb0529ac384eca915c964f14767
-MISC ChangeLog 2667 SHA256 8f26db1defdd6da637f3b7162c275974995da1f1cbf835c7bfa3e9f9e64eb649 SHA512 7632b3b8ec36b11173346a76d59fae800e0bc9983ee9bab8140ea4792d5d7d3dcb6d11627e1291242978e187f4e8fadb74a7d107ba3ddde03302d50a0f51e312 WHIRLPOOL c98a3a0c4196575b0fd53271992b34013ff60ad994b0c1d3379249a30ff808adb964e030d5ee4c8067b0e5b4abc8fd91659a8c5868b5e229522f1c428cbd14d4
-MISC metadata.xml 393 SHA256 39e2596ae6695b5c3fbcf7a218915bff4d41e74cc9bafcc7ad5f0728e2977096 SHA512 6bcc8cfcae0bfa95a44ea5bf4cc40ffc1906a6181e86ae8e7fef3a58edf6b7008ab22a82c84fa87b705e34fa09a220421962cc1b7b15b0a3defe822cba54e773 WHIRLPOOL d1b3ef4118f8c4998f17390bb30bd29d2301714533e047aca39f3d12cc0f7b39f46135b6179495f586ce9d3dd871f5e3c133e4bf9c39dc67ef7c9cb12ccf1613
+MISC ChangeLog 2771 SHA256 d1450aac4b8f219f0f9105d07df317638c9f4606e7f33051c98d7e4cc07fafc0 SHA512 2549db03eaaa7880fd95f234806a1843b91e2c9543be80c06ebc0408d7667c54f2104b918ac8b930c392fa72b650aaa5b37316ead9474640a76b9e865b792b19 WHIRLPOOL 74edd664e1a0778af0fec90ca03e56f0838266bed3abada5392f0ffc9f5e34a50082685356901cf38eb5fe082a40139a56f24c03223e2a8c26192159babcd31b
+MISC metadata.xml 443 SHA256 6a3c6632d68444c557cd92ae83858b292f5a4e218768420b4a81ad85aa2c5435 SHA512 35bb2fb96754a6f3162e0123d9a9079facdf2933d95aeb404a42ba81565269e5340daa9ab8163dd5011c984a91847e32482e2bba53fe7c9a3a4d830c784aaa9e WHIRLPOOL 4084ef4a7f2bf63b6634b53bdbf0326c397deac194c836fd0f6e84165706fa78490fee922417992e1e644a97ba664967e867de37d327c37850ae64420a78e191
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVcB7eXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVdHHOXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiLjIQAKUZmtcyJ53gqjX6W3+5ECGi
-1j1VJX6zzWzugo0prz2QC82mNZbU2WzZucQezxdJvJHMxQOAbc/mbslPERVAAfhY
-DeJVumZxDqKpLfZUEPNipVRwSEOjdJHC3oIrx61cyshBhNvEHrrR1qiqPtOU7d3/
-8A81nsM4+1V7y75tRu7l9Ic7ahESwh+HYjrBnoH6rIIdQuIK3otgO+KHilfu+vul
-PHsk8PWjkrwQ/rUGPRER48T4QNG96L9S0XYWiq+mYp1iNPncv8SI0mkP6h51ZyD5
-mnSXGXT86prHx9kEhWnJ5h9fCr9lGBSNakzOTXByfpujDHVD+j5BSzkl1LB89N4G
-tSzKAGSGV5irlzQxFiOMnhwfUHuxYM3EBlsjAjZ2/uaaFXRCfUBNagqW+w8slD5J
-U87oLYRvaQEM6Su0TOBsQwywFaeSoFYcqS4G6gzzgWbaG4p1z66LDNrQJHPC0swG
-Lqv48rKHerHO+W9/DysOFweSjWkUl+Ie1o5xuARZZQ4D1C+5cpA4CtY3S5V7bO1U
-UdanCF8OMYa39JUSU0L0aZv2HOKESNFTbewOujS8DQ9G63lMh5XgAgbEBQ3jYwL8
-v2I2tizqpmDad+h8sSZ3KT+iVQYw1py+DP9yKAxq5DOJnhhzHMWXaNCr/8CqFP9h
-aW4hASkZ3Wv7/Yb9C6/3
-=bByA
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi8EkP+gM/L+hud0hxYgxWx9N6zrZ1
+wQG9wxRAdyLjB2WPOOJrsIenY22tnt3G2uZiZzUiTaG0Bd7yPUh1C6O3J9ODpnt8
+M3TLS/Osm8ViFmChhG6H1m+mBPk0Bq1Am671sG3GfDAZpICfJQ2O7OW6U4IE5P/o
+9gh1y3jo8em0rJUfl/Q22/kdWA/Hsgz5lJybwyC9uEHaV7hAiAQuEjt+XD8VKlZX
+S9oWv/7RUtjrT1PKg8GB5GCV2OMdGYhck+JG2twyozFQyPtsDmrXO6AVm2gaJeeI
+kbxqJDICZrvnE90uTqURHw2LHf2lV2jAcgtWRCmbdAFvnf08rSi08Jhese89x4ou
++QmE36g4fDknd3PDc0J40X8AVZ7Q6GN8TTpxIjb76eQFgI+WZZA8WuE9hUASyyVI
+zsS+e30TaHMOVyzOl8fBBKxuHnsSYEQQRy/T3t9fSyLMjkRMDo7qdgAAeHsKfVPO
+PQNZya/OFGEhhS2dPaZwgdjdfinLQHMOOYo3h2cZGB+lda6lC/0swHTQt43GzO3f
+GkMcQlnvtOlL1ke8MAEuSlfY06225pnVitRcQuWXsGptF6/+E5gn7RyJEbUHJHD5
+kVRolUabH2ds02Kb1i+IH6wkorKICekCMclbf3IlzF7/1YKfEcWlc4IGicMqQ0uw
+jdWVACEsOJnSiGO0NqVy
+=1O6k
 -----END PGP SIGNATURE-----
diff --git a/dev-python/websocket-client/metadata.xml b/dev-python/websocket-client/metadata.xml
index bc6e1e7dea59..726606ed6410 100644
--- a/dev-python/websocket-client/metadata.xml
+++ b/dev-python/websocket-client/metadata.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
-  <maintainer>
-    <email>alunduil@gentoo.org</email>
-    <name>Alex Brandt</name>
-  </maintainer>
-  <longdescription lang="en">
+	<herd>python</herd>
+	<maintainer>
+		<email>alunduil@gentoo.org</email>
+		<name>Alex Brandt</name>
+	</maintainer>
+	<longdescription lang="en">
 	</longdescription>
-  <upstream>
-    <remote-id type="pypi">websocket-client</remote-id>
-  </upstream>
+	<upstream>
+		<remote-id type="pypi">websocket-client</remote-id>
+		<remote-id type="github">liris/websocket-client</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/websockify/ChangeLog b/dev-python/websockify/ChangeLog
index 96c37570c94f..a6d84c0b3193 100644
--- a/dev-python/websockify/ChangeLog
+++ b/dev-python/websockify/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/websockify
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/websockify/ChangeLog,v 1.8 2015/04/18 12:52:24 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/websockify/ChangeLog,v 1.9 2015/06/07 16:31:25 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   18 Apr 2015; Sven Wegener <swegener@gentoo.org> websockify-0.6.0.ebuild:
   Rename distfile to include package name.
diff --git a/dev-python/websockify/Manifest b/dev-python/websockify/Manifest
index 7b2f675404ff..14c8d3ac6be6 100644
--- a/dev-python/websockify/Manifest
+++ b/dev-python/websockify/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST websockify-0.6.0.zip 312980 SHA256 09fd696fc528fcc915e66d43006c4e73e4e009233724d45e365ada1f8b01251c SHA512 f7792b0140fd5170b39dd0cabdf176ea8db43b148068ec336ddf61b70e166f6f935411901675c13657efee7e9cdf4de78bc74b0e371ce91811098b16a11a2915 WHIRLPOOL 46199706a3c8988aa7aec6018ee5defe50a289023132f48bd5d48ed486e17317b7b3a1661e367b818e2cd9445eabd3672f25155f1117ddb641be9ecb9a54ca46
 EBUILD websockify-0.6.0.ebuild 614 SHA256 c051f69e710287769b0d7fb4ab7f9f2880e39461422a283bfca6fee5e3549acc SHA512 c1621d7b6878d5f7f0c0cffabb6f88f173371d49c329777601febfcbc4995be36c6ba568298a76e0a312205a0a3498e01d30204678a4ec4beabb0ad34592d158 WHIRLPOOL 1afa4d88f320a757a80f25dc7f01c23a6391c931698a5ea42de303b6c58baf72aea3ae4a88f3254a446ada785a0c1d599839ca1b8e14d4e8d147ebeca4815cc1
-MISC ChangeLog 1420 SHA256 b1ed8d653fe02f403af4411ed87b8661f1232387bb146257d7fbc31c27c7aa18 SHA512 d520f80ceb259b3cd9c1524a64416db2f5e0b44fa7a0433305409e88e62bc1e329f685ff1639bc039205583858d3eb97a7e39599e2bfa97a828e96e961817198 WHIRLPOOL 7a4e6b2d5aa60324794fd618810bcb31fcb7032e1c61f7535b3a5de7510a90f180d5acf09c201a348146f1b1f6bf4e115df1dafc1794aee62468d1e28bc80b19
-MISC metadata.xml 370 SHA256 26bc137c7a7f807692a396eb6971c4054b867eb23bb9974fb0284ae9cd3df715 SHA512 cb33c34bd4ad921d908d819e6b9f189641888653b1ac87ff5ed2a28cc71b50efb478078330ad2bf276b691d34394abec96688f10a89510b5a51885b5b1c56b72 WHIRLPOOL 1d8eae4e5328c1afd7d52bfa5542c76a6b271b7b40f1fab5538f51a3e3821d54b440a7786954f275545bb7e79c0992520dc1be39edb36af1b62ab3bfb5747d61
+MISC ChangeLog 1520 SHA256 ca72140e6a1f79f78581f82e6a3f58036891008353e420dfb7d511d4f368aebc SHA512 a873aa4a4a45b795c48ff664df772880ab0a9cb9949b1dd54a4226b18c89b4c1798576352145652dbfb097f1bcc0f7aee8b3b9104411355bb333f7dcaa302178 WHIRLPOOL ddf11431216a75a412fb60f5100d0e30675f90e2f5c7e6eea158780bcb107c847b28f96698e4cd6f88385fc8287b87bd2ac4ca4f94046a8561af609b96a8468d
+MISC metadata.xml 455 SHA256 36b767877175576b7e99672a57a051246993faeb10332b3b3c7a941b70108ca2 SHA512 166054a84e7906ab2b47ad9b75d41703631d41ac9d604748002a5fbd1eaeb05f8b9ac3903410b1f4adbab2f6781b710af510c0c63d12a2c0a80c3e3680388b12 WHIRLPOOL 6d7c1506e48a1a8bd49648290e304d0d727c25494a727d1e9e0c189837f5148cadef34f0fed0d417adab8ea96451e3406f23fc17c781921084c5a90b5f10026d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlUyU4kACgkQI1lqEGTUzyQeDwCg1oYltrmyj7IWDYe24w5X8ety
-Qw0AoJz9BraftELgQVratPDnj0aeTJ9P
-=PJBi
+iQJ8BAEBCgBmBQJVdHHeXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi2goQAK+8kgSl0ue+AevFQmS5Ghg8
+E0+/tVFDOGCRJ3DvHpeX0Ygu16eP/KOdcC/412CVSMc2z4skIe09WuZjQPIFdA2h
+Cz0rEafB8oBYM4ts9gV8bUR6fQo69s3L0naUNXacN/abN9FCbXP0uKaD9YovuzzG
+aZcVzNsM2nKqj4MIWHJk4htHjzlHKdinxW5+2U+M2IhcVpTD4W8MTW2Z/JfP59gq
+S1+zD/I4BkWM+K6pO03YtlYVWueMo3RuLhHI3ArQXUXndH2a4HcZQLntu7ZXOWfG
+a6uQ2Bt6uHql5DI7jPTmKLb+H2uMNXue421VOCYvtiyEow4QYGggq0F2UrzeNcdY
+5VLzc04OVHVq5jMsxateG/8YM+TGaow+2fdVFn9HxXOpYABh5lu0g3tzEKox8YdH
+mXM4lyjB+sa2TReLDjCMz1HWFKXUYan3VD7qlar20SqEgkO4w9L0rsqE+DYbbKlu
+3Mh2ZwpY22Ru8qxmjEXex23rrVWXHaRI4EH9syAQykVjw8rVeC/hofehxkrvQrz0
+fgqp3PT/cX19jebVVSMQekJ1+5MD4bns4XzqYJdWunp1wn/SrpMfzepZHVo8H5yd
+qqTYIhRtBg7eGU73x2nfWz8p5/d8UW6IgCdY7Dxt5T0Bsq0nnRlEur3/DmJzrsKB
+L9Du3KZv9xRWcqWG6X+g
+=rQGU
 -----END PGP SIGNATURE-----
diff --git a/dev-python/websockify/metadata.xml b/dev-python/websockify/metadata.xml
index 4f0b75d6af96..07db39f04d75 100644
--- a/dev-python/websockify/metadata.xml
+++ b/dev-python/websockify/metadata.xml
@@ -9,5 +9,7 @@
   <longdescription lang="en">
     WebSockets support for any application/server
   </longdescription>
+  <upstream>
+    <remote-id type="github">kanaka/websockify</remote-id>
+  </upstream>
 </pkgmetadata>
-
diff --git a/dev-python/whirlpool/ChangeLog b/dev-python/whirlpool/ChangeLog
index be0e76289563..d7262bce41ac 100644
--- a/dev-python/whirlpool/ChangeLog
+++ b/dev-python/whirlpool/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/whirlpool
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/whirlpool/ChangeLog,v 1.5 2015/06/04 09:51:13 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/whirlpool/ChangeLog,v 1.6 2015/06/07 16:31:45 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   04 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add pypi to remote-id in metadata.xml
diff --git a/dev-python/whirlpool/Manifest b/dev-python/whirlpool/Manifest
index 9dc8cb9ad25c..33594e9743ee 100644
--- a/dev-python/whirlpool/Manifest
+++ b/dev-python/whirlpool/Manifest
@@ -4,24 +4,24 @@ Hash: SHA512
 AUX tests.py 3759 SHA256 bfcc6a613c42cec5b97d9766d11e524ed5134749471d27ad289623dfb987de7c SHA512 902c785311f1d09331df53e4531274c2211e107cb45f0687bfbf6c5922f572ed0a614cd52ce4575e7d9093e79f715b8a3b20a2a6fb40c438779538bf1d404fe2 WHIRLPOOL a9c974538df2122718f73bdb4dd0a9826e7f016c40bd193ca40909fe8a18a5a6c3cf49ad10a2d810676c70b2c28c375b42cce2ee16a91ec409371227f2495c81
 DIST Whirlpool-0.3.tar.gz 34508 SHA256 27702b350b0cb6ea944cbe048419b48e0a66186fd89e0ef1b293d92dbd05f551 SHA512 d9fed84ff0af885534e70f537c0c17f19ad46d31b2b1d77749328e6cba37a805bb8e178539d09a479b0d7a7e93d11f69858db5b3fdc6c3fad9a89fc727004770 WHIRLPOOL 6c25f8fbeec916e65b594da51a28cabbc6a982e82eea3a0d76e71b8a9b46d98cef0f8d733e5c43d0716f878c9a86177918ebba6612d4007777362e53956604ca
 EBUILD whirlpool-0.3-r1.ebuild 942 SHA256 a49b260a79600cab876731c07b22f8974b69c9b03ade70af01cfa183817c4456 SHA512 60c4220ffe7faa612f7b61dcb8f2dd5f446606aa3e6e73d5e7d5a8f15448ceea3a3893e9a0c76feef0c82a6088da9851b8cae36bc3849a3416a438929e784130 WHIRLPOOL d5eddddb1cf005e01f26f176e25993af3216fc3f980bebcf34a081ee4a096a984ab81a0cdb845531bd76897da61e1830918b55aa9e75256de99824a0eee3f0e3
-MISC ChangeLog 955 SHA256 d3a657a934799f9f11a5ddae57d2e5524d06d86a8631a854ddd9598cdde215f4 SHA512 2855e3330b1c1a7fe5cea8761de21d3be70a52b14ea5c67159185c24200bbf44a89804c721c4154fc74105533170949a68ddf149e3db560a6003180e18cd3914 WHIRLPOOL 0ae7b22863e81e23664ac03af3d3a9807798d014d27730373843d52792f7a81abbd6195a1c2c139a952182244fe7de94de80811169225060e7fa3a0770f80877
-MISC metadata.xml 303 SHA256 17d3500324d7d3a0059c8acfef05046357c58d21a91f15fd93c8c0556c8ed6f3 SHA512 e901130c86f60a12024051502fe35a7eef6e58eccb0cc485f21d0d955ff711b18da7ab0a37fffd399e51203b103a0f5d7360d320fa4a2c9f8e40547e26a4fc66 WHIRLPOOL 32700d9dcc6dc67e0c6128604bcd5dc2ddaf4d8360cced1eb201c324ca505f3880e0596d930a02cf3e893e181c0e635144dc8b9711ca66acfa009fe192674f3d
+MISC ChangeLog 1059 SHA256 5f76c1e33dbe9d8402d4b65f0822de71fa7dc15b0bf292221c793320106c094b SHA512 2eb76e23ea9a8ee63f602125e41d5aa557d5b3dc274380abb68113541fd3b3c8b3099af71c485393ef675b51082c62d22671a1062f3c49a9533b2c778d8b2f86 WHIRLPOOL 71bfbf3438b1cd0593e8c4c5f47fd0e50f69ed0eff842a019cc6179a8fd18f6f269a1db67a8d26691fe83b04e12df7eba74a15077275acd9ec3ccc916e491531
+MISC metadata.xml 374 SHA256 50e47ab9e3646a625a415a78fc06fa2cc06f7d58c68bfedd4ebf5aef472b1c4b SHA512 88a33081cf0dec92ca395c1837f39c8081354fe21e02c27c27cd7bea210e07c1485a5b85d6915754153fd70c2f1f19bfc353508c86d4278b55bbd66b5a9aef10 WHIRLPOOL c0718d2bc79ee205d8bf4a81a273e08da9977070a431cf58188979353235a70fdea91d3567a48a9a0c1021d07d348102dff4b1364089012369808568bf8b0dd3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVcB+SXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVdHHyXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi8LAP/3CmCYOXZ9uKsHLUejBZCuAL
-/fKlmU6ZsZUfpgLI94hKuz7dsllS5yN2HsALrIqkKbnr1hWOETmwdxJjvippOYYo
-hec9+1P9bY6QbMMM2xrijj5ENF7KmXGaJC0/aRHoDirGWSkuhp+tCi1rc6v4kFn9
-JHOjwZqU3Mpk7lwEX8gcg0d70p+9tYNpNbSIN1RT8QbMM17QFpvHVBxrJ7I7kdXF
-zWg/1QjFFTq7E26hLwz6qB8azVDvE8VLzV+lxqp8DDPplX5xGmfl0ISsm8j5yIhj
-9vp6iA3AOrx91W/isiqK/nSXc/9wOU9LHF4arDEASIB8iIVmO1Nj9dI1KmJELuIq
-Ef+4K9QKwra3q/mhxcSgPg6bK80i+y60fmFPgTDPN6Ej1dT9Hq52/pZm+l7Pmvan
-zCRwFEVsTeaUS2qlQ9nSb4Wu+gklA4YZPCM2oDp2ugg7jVU6Bvy+Ub6aK47sZWRW
-T6nkmwPwTpqQsBhe5O6L4usYcO1YMa2vmp03txc5s4CjT4Pa6OXhzm2oi7i+y+0f
-PhZLAfhO/yMgoE//dFftNBr/8elZvTh03z++/XedUBrSh+3QQ82ZyjNhAjqEVsB4
-W+8biJtQDQZOXJbP8Gyc7hLQRgl4W+VndvTsqUmMaGN0IrBpB+xFGNeBK918R6FJ
-VnCxXwnteY3by1parIFx
-=fcyZ
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi9mIQAIaL1RSavXWINtTQGQHh3chL
+RnOJzxXIwKXo82CFXU3ykHuKcP2yAe/3Jdgi14HPOqOvKtq8pCLA8i63MqgDufo/
+9ThM3S5s/oVzPd8b4dUz5oqYD3y7Fln51OVIJhYwF/0zCbJuvDKLn+PpKSmGI0lD
+P8d7oqTHELbRWVHGL7h3PMEva4qj/kJGAel+u0cv0bA5t9Gs/M61l3HMT9zyGbbX
+OKsSsG5RfM3SMT/qXGnAgh2+t02XTVPKpqwmFRIXOL2KaejBWKJUqxX33EzuG5Bz
+EZfvGyZt7aFXwzAPPkRXB84QRaEcW1a3FQPgFdDff4NHo2u/t2nogtcwmTXJbfwF
+tnePAbFomP5vAczsff9YeLLIuBzNuzVrOqYZ00nhacFkKzpWgY1krp9T4/d/PGde
+vMlmgWFGeibJQHyv93Awkbe9dyyBiP/wNLMlXiXcTC10VONXyLG1v8/npPyUp5Qh
+4IhuweEI7tbD2gqlyoNSjv6h72W0raIVf3CcgmCxwe7ODx9xUS8dV2UVVPiONvv/
+ikugkHEzmZDUi0BIAvgqSePR3GUkXBOLKz/IuWM7YlHj8nlHJ3eRCtzsMsWTMQ03
+hplliaml3WH1Zr0S7no2oVlzYkGRxKj7PVaQNBeTJmV5nNKEdoLGXhpu7rhjKThm
+edWWwJEg7hMq8aOcZS1r
+=CopF
 -----END PGP SIGNATURE-----
diff --git a/dev-python/whirlpool/metadata.xml b/dev-python/whirlpool/metadata.xml
index 2b04a15f6acc..67014b12f251 100644
--- a/dev-python/whirlpool/metadata.xml
+++ b/dev-python/whirlpool/metadata.xml
@@ -7,5 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="pypi">Whirlpool</remote-id>
+    <remote-id type="github">radiosilence/python-whirlpool</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/workerpool/ChangeLog b/dev-python/workerpool/ChangeLog
index 8774a29d69dc..4c2765597568 100644
--- a/dev-python/workerpool/ChangeLog
+++ b/dev-python/workerpool/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/workerpool
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/workerpool/ChangeLog,v 1.12 2015/06/04 09:53:30 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/workerpool/ChangeLog,v 1.13 2015/06/07 16:32:06 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   04 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add pypi to remote-id in metadata.xml
diff --git a/dev-python/workerpool/Manifest b/dev-python/workerpool/Manifest
index 5b8ce6783dc3..51cff041936d 100644
--- a/dev-python/workerpool/Manifest
+++ b/dev-python/workerpool/Manifest
@@ -3,24 +3,24 @@ Hash: SHA512
 
 DIST workerpool-0.9.2.tar.gz 7747 SHA256 ab2eaf05e236140c62c7411d13ecc4ddedc365966282719a35afc53043c00f82 SHA512 d5ce36ff48b297adb40baf40a53823cc8b6e39b0c7eb880541dffb5ea1d0849e50c344e63f1ac3089d51fc1fe6e73ff2a26df03f9d68f24980222fe3ef7f01c5 WHIRLPOOL 093221fb442abe017591fa79b85abbd1824b63ec89aaf62eb87cb50975dd5164cd3a1ef36c51336e2dcb97aef3fdd18695691e73bfaaa168077172bcc5a49db3
 EBUILD workerpool-0.9.2-r1.ebuild 795 SHA256 73efe9b25bbd68652830dcbd814d7931abed0e45d8283be7ac9e89de23bba06e SHA512 e94fc4e7cd5916c07fe2ae78cdc3bcb5d3c1f86f162e384f2cb1c5244a78d02accbaac86d1bdff1d317f75470d25905ec79758aec4267f1d115dc634b6b5cad8 WHIRLPOOL 9f52196eec54c6f6ef581b90f2945e294547478adf4d3e1b13a3f903dce2d1883ce00f17e0b8ffef4e775b96e8a63562e445164c77c3ffa851086041d0c1205f
-MISC ChangeLog 1677 SHA256 1fc9e1004c7ff603aff7f294b423e30560eab32044c1c8a45175ac54c782fb1a SHA512 c53b7518319301c88c9b61392ddb210b7f08a3458204c89c6fa8a69893c928691b2872f933a05ad740536507073779db59953871081f9501a20181ed6cc1e552 WHIRLPOOL 56e4889d8d90118de27f37d59f5a2fdada66b2eca2dee18ed1a6e32f107fa9a3e3f20d9a2d4f7b77afcba96fb5589b5192eb3a054b0021dd8fd85b6d3513a3f7
-MISC metadata.xml 336 SHA256 a19c7f098eb9097c59bb21cfc69a71af1656178b2cc33467e26833779e575ad2 SHA512 8b0c71430f9c9bbaab89c65a30f77ae1f5d67a750543b4581d02fa457b1a2ba3d7b4f4b68ed415bc94a1bd9f700f327689c97b3e5d7a1338a0af457c08c062e6 WHIRLPOOL b5cdfc174ff8afebc17d99e7483894bbd86a800f6b96a117fbb925c170adb6ff5dae5e65b72498bfd33c18e8592adcc3e917deeeeb850d14bf94a86d644105ee
+MISC ChangeLog 1781 SHA256 e4aea89be5daa9d5e58f5fb9817dd608e5cc3acb3b097588aa66e67eb097f8d1 SHA512 4f13c6fd54f7881f34f3ded1560bb977d54336ce1e06f7ba26702e78dbd4e5f3cebd649ec7eedf336275ba903578e6180e366174c641cd73665676cad3138bb4 WHIRLPOOL 1a773b846f14a57c1c4c426a409ee690bd7968391941dbd6c3844086bbf624e0fc1c1e33634929aad71401032e8ef186433bbce7343595276dd8d5e313046d88
+MISC metadata.xml 395 SHA256 a9256ef8b0b98f0397630b6a895b15b05e93a9fcd50db1d885bfb2043cb7a3c4 SHA512 8cd2a8a30c6c88822cc1dde0578c1230efcc23a15755c2bebd41f8a8fadfa4234abd56c3c4e63083e68027e000dba041f1c47b567d943e6933c746dda414577b WHIRLPOOL c66cd701899118c2251347a7dc8cb8fd169daf59c62e62cd59a097b53de93a788546471bc1912752b54996c8bd3c38b93a891dda1fc5abffca594963d839f59b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVcCAbXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVdHIHXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmizE0P/A3LXTSJ0vn0QZ6lInTjAJS4
-ozTx9kenzZGdjKok65K4XneqqlE6qc7yRAaID0xx4bbdlh/RZb1CrEz0mpTGV/O1
-VO9UicfxZCNvN5ax+C8IaN/G7fsaFpMcT0xxZYh/V7AtW7DghpbKp8b9KwyiC4Z9
-nHn+lCYY61SNXMBjIs/gzxIJDjuayktgA9AaYWwTtOZQkhsctlsEbFnHJBuSqCFT
-L7D6cQEUP9lm9VyetjtwMEjCuYCGSE9lKv3kOIHFRxP4Vywv91n5HQpOKo7rJTtJ
-o9ARtN2Gbo2E3FqJbwnbVueTCiYOOyM+aJaZpqYHQNgouwxBt+Vype2nkKYzMdaS
-4UoRFt7fWZs9CfakWyUjpDhk42jjjmbNFVQvy+Vd2Rtb/DB+aUZkadUM7zhFJ4u3
-1nVfbP7DvIVL83qqXZiyPbqs6J/1bfDR2qtdqPwFuGMmDbohFc2KFuhddJ0PfonM
-ry36+Tl7T1hwiFbPS9oGyLX9kgH8LW+KnAwupbFN1rL9Tr5B4K07QblvfodWyeUA
-tBpbTvZRBFTSnNQ9wzlF7UCWvPioca8+1N7FH748FSlZAU6UgQxiVcv9Qsap8YyJ
-kFG9PzRzksD9ZpWiK7b06x8Ng4pURL+ORaEnxN0T0xLfTZkPE+AF4Rb+N9bxQtKp
-5QCn6EBNxHqHfUVUCRe8
-=Mx4Y
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiE4cP/jGEIAKp+YsZWu9p16bNw4wZ
+XJ9VVgq24tcW9RYDa4gClZC/OWO0R/9qJ0cH62c65f9FkRxu0yq8fNsXq0KDkBgp
+TgDJzn1lAVBFwr+IV1kPZ2YN3rKPGUyDD8u1yQKYpMj/5AaekXy+bag3ra7qMtZJ
++pn1gHOifexT2V3WoF3AjycOEVTLn+uYgwSs3N03zuYx2V66wxm9aDc5W5+4SJGi
+xaLk0ylR4Pw3s5knszJXnJ75un3SQLLvl7rDX5JLGtiINuhpy9QeGvitrnuKPzqn
+sACvOAs+CudUf4lw/44jpT1I73MIXVTqxNPjwLNEst5NcKbskrS2zaGYNYxNJUKt
+1cMw2NtWOPu0Joat+cy6pTPmnNtkRJcpjLl0GdC5vtuNNVtS8YQHXGxMza7A6SPj
+q71r554SaWsLze+wYYnSvhae0ZGFQg3cntFxMcPC3XZPaGI/ZwLX/wLOy3rMmDhy
+f4Q8iNwTaLBrI0hTrretNaO40k+odfDqK7qBeK2nx9xKwHUTJ2giVzEL6iDwoH7+
+WtEJHxw8uwNti2HGDbeInh5NxxT4d5BQ7FRXlADJ3o9PsRE/BSasrITeI3/mspd/
+X2dIvfyQUun1BVLBkWM4Zd3AK165WziFo1IDnp8FAguF17GeKniFVECZtVoeCGkv
+b+fiKiq36w8LbS1L7ssb
+=i5kM
 -----END PGP SIGNATURE-----
diff --git a/dev-python/workerpool/metadata.xml b/dev-python/workerpool/metadata.xml
index 85efaead76e2..ee323bf45a94 100644
--- a/dev-python/workerpool/metadata.xml
+++ b/dev-python/workerpool/metadata.xml
@@ -8,5 +8,6 @@
   </maintainer>
   <upstream>
     <remote-id type="pypi">workerpool</remote-id>
+    <remote-id type="github">shazow/workerpool</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/ws4py/ChangeLog b/dev-python/ws4py/ChangeLog
index 5a72049ef6a5..add47003f116 100644
--- a/dev-python/ws4py/ChangeLog
+++ b/dev-python/ws4py/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/ws4py
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ws4py/ChangeLog,v 1.17 2015/06/07 10:05:46 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ws4py/ChangeLog,v 1.18 2015/06/07 16:32:38 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   07 Jun 2015; Markus Meier <maekke@gentoo.org> ws4py-0.3.4.ebuild:
   arm stable, bug #540290
diff --git a/dev-python/ws4py/Manifest b/dev-python/ws4py/Manifest
index f5acbd767d1f..5da4bb0e698d 100644
--- a/dev-python/ws4py/Manifest
+++ b/dev-python/ws4py/Manifest
@@ -1,17 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX ws4py-0.2-cherrypy_test.patch 1091 SHA256 659736ebbfa86a9e6f332ef9530872935239b4333c262ca9c563d7269acc768c SHA512 7e334e87dced85cdf21d304bf259c8fce98e7f62d83c09f51335e97a1e0a7a47efcc9bc99a0a43c2bad06316b66a37b321335e357db330d46e7bf3394af65553 WHIRLPOOL 86c0475490a45ba0e5e3a536bb725d049bd709e585c713cf6be9198566f35dafb51853b99e34070d369aab965c88636f80b4f441abd6d813b7b667a2b9459cdc
 AUX ws4py-0.2.1-process-data.patch 761 SHA256 29528dd1d55a2c26d28e50ea39bb4a03f6cf33c6da810ac60669c37bedb9706a SHA512 dbcb6bf8d324986fb7ec7a1aa55654968894587f6128d3862074ff80b5dba659badd6e1ad0f8ea3013422a0c3b863e3469d2c72b82cdd02c0caa3c8a6961561e WHIRLPOOL 6c728f812d3f87706078830ebf1229899677006e674d52225267da3e94a824e27e59eb9ef51f21e4df9d47c05fefc600cebb4ee79bd11f687091ee058b3dff97
 DIST ws4py-0.3.4.tar.gz 65467 SHA256 5aedb5663ee1e5fb4334615cc6582f4f2e97cf967d8dc4c6c3627515d16afa90 SHA512 32cd2eb9df7367e2bf42e354766a0ca407715a863be6b51b7701ec6e0537a2ecf7c2a59423f56ae093855b075c30a4065c7f7efe3b0227915639223b9ba7a55f WHIRLPOOL 77f6c56ab1c2bbcd628f0d1773c1c9659ddc68d976ca8af55804d04e16ec6e9e06e87f5a6a3167670d8c0898dde657f3b3b1fdc4d4a94029f74d71ca2ee50e1b
 EBUILD ws4py-0.3.4.ebuild 1852 SHA256 19b6e5cd41de319806f1c76179e2b34bf57218f473db581e5c8d4960aa4f8220 SHA512 651a65abe6db272f6037ac6b6dc92f6f6f57cb6265105eb03269e3183f77ecdb2d3ea90aec3619c6695f204ebd34e0e2464d54b246df261d05adad7eea5ac29f WHIRLPOOL 249c522c23a81987818bef120d26e0ca7f8f332e91e222e8dfa0a2eb45fed1a8e8468fbf617af9a2550b267ee45fef72d2110778d2e9751dd3bf6dc005ccd5ef
 EBUILD ws4py-9999.ebuild 1855 SHA256 4afefc19fa0dc34ae860aab0f15e0343862ac1cf7a32511364c63dd3ac0c5ba4 SHA512 08059e534795eb69612daf75758c7e8289184c11be7c07f4aa9c9a1b42d7e48f1a4af70595970f28cf1f3b536c99da14a993b54c897d669f4394af2c7311008e WHIRLPOOL 95fe9a4417004674bea89e54ae8de19456134612161b80629b9d4e1646a2e7e4b93e3d4f36590500f4f841ac2b5dccf90c2523fcfda6b735b4b72793f81f0a20
-MISC ChangeLog 3342 SHA256 a296e784342b1a65a76324f859aa0bdee60eb3a1055da6c9c298be33bbe87651 SHA512 7ae5592a7fe9bb10e0bbcdbd495e726c6266a8e5b2d9cad2b4e9aa3982604e7265ed812bb43bd6ef02591a24505aab9f28581932fcf1b32a1f9583d55166dedb WHIRLPOOL 6a01c10374c053212c5e7bece9edb1189d79ed38fb236ad1be4081d237b84cc9a6377d271dbf9973d216d27a869a35621de30e68397cd8000ae2d40785b3ee13
-MISC metadata.xml 394 SHA256 da0ee1261f3a6ec3319e152c257b42ade798e5ed1b47a10444c99919600ddac0 SHA512 d167099bc3f3de3c68ae77aff63f44c3b332dd385ef5cb19c7ab84a2389f2ca916e92ab39d63f8139d36f7b5fa65c0f666c8f5cb02e7abae18af6babbea18fb4 WHIRLPOOL 3d883142b291ede838bd9d2e20db089b8e4e2e2d1e4db9f3f1931b50164f58f788bf79131d5b8969fdadc4d2050f5a5b8b7c09d65b5f7fdb70b33dd69a077fd0
+MISC ChangeLog 3444 SHA256 5c6b94ee257670180f7867f804a59f8a6e0e23e892b5aaf5c6f306b291658c55 SHA512 513219ce36a77f47ea291cc01f2ceec8310725fd5e186b4c2b587ae424c347e6d5cc412aa3508a92a4b3f124caa08023b9c7fd86c5777bda222dc5a53a418a70 WHIRLPOOL b662a4728af836c6f8c1c406d2abc2f511c4273b393b8a6716cda6b51c8cdddc2a5c4f78258c95a842a7b716ad7f1f1755a0bc73bc92e304bd483d33fae6026c
+MISC metadata.xml 514 SHA256 199d970cddbde85005f4d5c3b99856b8280787c87ef1b5e7cd60c3b695657ddf SHA512 04076b9e4b5c7089e19e13c9faf9b035418a297b00ecd7e33fa25bb1e5929db24f87fbef93d3a2c05ffaa4809ec2d7048f8376df997ae018d0199dea69ae9d32 WHIRLPOOL 1c1d3d1b6ac8977643782a470a053b66091855e6e33573c4485cdaa34ff70275f9714888c9562d61d9186901c211d6edb903014681ebe51353c6897ad60837fb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlV0F3sACgkQkKaRLQcq0GL4LQCdE99F7YQQZY/ODnRgsBJ0weNT
-xjAAn1yMqxZjuyBI0T1r+/O8C9Gtdn62
-=740S
+iQJ8BAEBCgBmBQJVdHInXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmib8wP/irZuz0gGILuU669Lk3Dr81l
+CCCmmvxx2ox4zFKgIH0GwwGr+S8kMkngkwrzVwFbIFJtE5OKNuHhFQJHlQHBuHjZ
+f8/1iO1hPFPxnrvFAEGbERpNZWG/9i1XPeP2iUrQxWTNGPYTV86PAVDmUA7qQh0h
+0i9sNaXn+bnKWDPLi6iUmoaqKWRYBGjUHkZuxl89hS2nT0luV/88wsDUC6RfipA0
+20KtQXQCjVB2Iw4zwmWBliTn1rrlah4gBX4Vx8fpHrZRVM6efhsWhHGaiS769K3W
+XdQ0fndD/ABZ7PbPTfF6jkj/4tGkZkyVY7JC/Iy0slwDvdKTIF+1bl/xXKMzW58y
+V/8mQqo0QGY1zxj/ob666bnP3DRLhDWwFCW9n97hxa7r0I3xyN3UKYLxXQZINUgc
+Lpe8ndPeh4TbQ8H660IlfEppi4iMpPJeh0c3HVw7tX9KqKkxznvyHwCoFwMos9/f
+eHNMxyg5/RmpBPHqE1QOPDbL/+c+co/656MaPtIuFlJ2Sh3nic8QcydVoh4dEzRv
+efMSq/vl8/xtYbKZrVzQKKdQUyn1Gvay3TbR0XZWsqYLqtvFNPlSD3ddu/AufFCK
+gRjlRHAVwySJvgfuPvpLd/G7jIf7o/XDVkSb2YSt31MFQUyeMbdgg4WNe055N/nd
+k/iwd7gTwq+9hR9DaIaU
+=XOpn
 -----END PGP SIGNATURE-----
diff --git a/dev-python/ws4py/metadata.xml b/dev-python/ws4py/metadata.xml
index 13bc2c4ff5bb..6a2af9d51e73 100644
--- a/dev-python/ws4py/metadata.xml
+++ b/dev-python/ws4py/metadata.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
-<maintainer>
- <email>vapier@gentoo.org</email>
- <description>make whatever changes you want</description>
-</maintainer>
-<use>
- <flag name='client'>Install client modules</flag>
- <flag name='server'>Install server modules</flag>
-</use>
+  <herd>python</herd>
+  <maintainer>
+    <email>vapier@gentoo.org</email>
+    <description>make whatever changes you want</description>
+  </maintainer>
+  <use>
+    <flag name="client">Install client modules</flag>
+    <flag name="server">Install server modules</flag>
+  </use>
+  <upstream>
+    <remote-id type="github">Lawouach/WebSocket-for-Python</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/wsaccel/ChangeLog b/dev-python/wsaccel/ChangeLog
index b031d5a017b5..7ac327e5657a 100644
--- a/dev-python/wsaccel/ChangeLog
+++ b/dev-python/wsaccel/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/wsaccel
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wsaccel/ChangeLog,v 1.7 2015/06/07 09:16:10 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wsaccel/ChangeLog,v 1.8 2015/06/07 16:33:02 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   07 Jun 2015; Markus Meier <maekke@gentoo.org> wsaccel-0.6.2.ebuild:
   arm stable, bug #540290
diff --git a/dev-python/wsaccel/Manifest b/dev-python/wsaccel/Manifest
index 29c76435d016..f1cdbba156cc 100644
--- a/dev-python/wsaccel/Manifest
+++ b/dev-python/wsaccel/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST wsaccel-0.6.2.tar.gz 35773 SHA256 425706acf0724d2f6bfa391ec37b4ef121d3432c956029de3cea4e101c218e0c SHA512 fbc59803cbb6b113a3e412390eb02f41a68513b9fda6e4408d5e2e3c976a3f62eacc6bf87adf9295a63238390cce00f4abe13daf397a28ce8f3ed3e3bff622ee WHIRLPOOL 2c66ff720fcaecaa8c7fe29d93bb8f32e620898b0ccf31d3dc3f4dbfe4b1623dde6484e3c347649cd4140ec51b52c9a8c0e81b0c24e6135481ebae7a26c09063
 EBUILD wsaccel-0.6.2.ebuild 693 SHA256 ea2a51887173cd6bf0177234767c667fceb4ae09cf2c540fab62506a301fb0d1 SHA512 fde4c2fbe94b3d5afd9b58dbe02c17a4611c71b6c72105935e4bc2626d6aadf31c9c35c1ff09ad0ab351d641109f0f23b4d6d17a182b786157aa1a8a5c905bf6 WHIRLPOOL 00558e825ff4d5106d7d9ffa30565c213d840046f02d75e92835e045d7d48abc6f2c9f7d670a0fc38d30a58cc9b08243752d5bdfc0fc3448efed8ebb9f9f8951
-MISC ChangeLog 934 SHA256 ac25597fd439caa72b6c3d010be261ee662c20b7a27e40e11702c0aa346605e6 SHA512 4ad72e679b57f2f939fcd7f3c0fc9a8ff2e7feaad7519451724e3634836ccda91eda974ca3b423987c3b612b0aadd76b555a61e6c7e95656e91661cbf38a3c48 WHIRLPOOL 3e31680b023038cfc9714a5a7fff4d19e57bb8ea09e8e613c28ab28ab846617f952d8aa96d1d7fc84f2238b49525679182dec2028f557107484b808c5f588282
-MISC metadata.xml 301 SHA256 7d87b65fbe144f60b7b3e45357936279d7929d9582aca1f5575bc3202765e468 SHA512 c24f7fd4f5f517c178cd6d1585eba08a769cde950bd9ddf13e1cfedf8686b7539783431fa0960c5e6a7ea26b829285593649dc20ece033b17214e5055470865c WHIRLPOOL 669c60aaa8b0b1440359fc125294a5b186dfaa70e36c98eec255968613536f27d7dc455a3ddd0eac0cfb78f7ca706cbfddaf48471fc96a646f8054f790f72f25
+MISC ChangeLog 1036 SHA256 ac2bf4273d77866c78f4866ac47883996a952bda9f2b13c6ae5bdd961de05bf8 SHA512 59a1aee34921fdbaa49547718a73a711fdfae4ae548e4ad8859c095157296ac378c05bf42ce7dd3fc497ed07a4766dba9a11f7831fc4fc93f17b23caac067587 WHIRLPOOL f756b42972c67cd4caf25ae68b74d85acfe1dbebe98c2cd41f40897480d60681a4c6093b0c13dd9c813634cdda630fdb1760a843f8d13f741d68793c8312fd39
+MISC metadata.xml 358 SHA256 51c9625d38e121d8e4a8788b8563e53a1365767b03475b483a9ccdd7050a2332 SHA512 4ecfb4911e225c9ac0d5741ea3c29d528a8e392889468c10e844afb1cb23230208bd33156dfe3b8cbc162d021c69835e56fcb947a3c398df6c2e71df5808aa75 WHIRLPOOL 9d8edabc24ba274d4a952714c946db1847b245f99352ab009738084edf1f0936429a6c5952837c2d1653d5db4c39b67e0aa19c6434cc238a506a2356bc49b6a4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlV0C9sACgkQkKaRLQcq0GLRswCeM7cI9PxUh5Aj9zmbqDfoRb9R
-kOoAnAjpJEiYzihi6lDQqZhtER2jefq8
-=K5JB
+iQJ8BAEBCgBmBQJVdHI/XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmirsYP/RtygbTb0TpWH6xeVXA/Ytu6
+ERLb7I25qVE23zop0UxDrr+9TdmJaDhHEv8tHnjyLybvLOZ1jT+HhXj8R5P9cvrr
+3jZhpJatO7aNBT/ZGKGl8iz3GzFi9dYRgRzNh82nMQC6H5VGPEXfOQRBkmc/SjUC
+fLj8KxoL3NX2fmia5tPl/bOauFkuNc8S3G7mFeOrKab+NTLjDpEEZcJMXSKmtfYP
+OgIulZ9/NpVYx2+W+d2vlzepK7nR9v6UY5cmmdH94PB9dRasA+c2FMRFOh0xPBL3
+raMwQHb8TfjTRnLDp2liBfj7y5StYkzyUutNewBKUlyK/BMswnGDG/fYfaG5CePx
+ePF5x8N++ExOG7cD4NyRC2J8Q/Bn0i827F7gR/c6WjoxQ4GXFCJG5rlu2f8tQ19V
+2che/Z2UZnZ34YO0LvAKtLlgwrPMLINmOJsAgldd3oW0Vcw3ZpW5csW3TiiKT7mU
+yei0g80YZlLVDFrmOlQEA5BNTWL1ASKvGsg8AeTDKLD5m9CLHoyKaqV+iVDU8zNm
+p3BF6is1jLTldANAm0KgvU2+TP+sv0nhRe/rSEyFPXXQHtTtR0nX4FUbzgbyTwby
+ITYBnku19Iy/39NAIVp6kffdmdgyEnFJILQhbvRUERwmhiBbU6EhamoVAYP6F88P
+AKzfafRPlAhJ0fYfg041
+=0H1a
 -----END PGP SIGNATURE-----
diff --git a/dev-python/wsaccel/metadata.xml b/dev-python/wsaccel/metadata.xml
index 9af41dab8963..8db9521249a5 100644
--- a/dev-python/wsaccel/metadata.xml
+++ b/dev-python/wsaccel/metadata.xml
@@ -7,5 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="pypi">wsaccel</remote-id>
+    <remote-id type="github">methane/wsaccel</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/wsgiintercept/ChangeLog b/dev-python/wsgiintercept/ChangeLog
index 2460b58fff01..b9ee8ff6e8b7 100644
--- a/dev-python/wsgiintercept/ChangeLog
+++ b/dev-python/wsgiintercept/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/wsgiintercept
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wsgiintercept/ChangeLog,v 1.17 2015/06/02 16:01:58 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wsgiintercept/ChangeLog,v 1.18 2015/06/07 16:33:27 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   02 Jun 2015; Ian Delaney <idella4@gentoo.org> wsgiintercept-0.10.0.ebuild:
   Disable tests connecting to the network, fixes Bug #550710
diff --git a/dev-python/wsgiintercept/Manifest b/dev-python/wsgiintercept/Manifest
index 23c294173dd2..7f7463d79bd7 100644
--- a/dev-python/wsgiintercept/Manifest
+++ b/dev-python/wsgiintercept/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST wsgi_intercept-0.10.0.tar.gz 30017 SHA256 0f2eb4757c6cdefa4499aff4b6b080e223d416fa9c535634b2891e916ea45161 SHA512 749424c1f27366cfaf996767b8b05ee6bfd2422bde0e374e5a0bf0f2fc6366883807a0cf5a97daf53a1fe910d0492eac8cb0438286fa0c98e33e24d80f991f67 WHIRLPOOL 72e401ed7f1113160231bfabf1d89fd74530b2bcd429ff36d9d9af33c174ba5255f6b2666d3fdc4b33fd5f43188c0a136bb26b940017c5a668f41583d294c601
 DIST wsgi_intercept-0.9.0.tar.gz 28865 SHA256 55b01e89a8752625ee94c13f2d125a73a61ee924f4cfd982983ca28c0a7addeb SHA512 3964fec587408b44d5ea0371b279d7686edaa98591438e5d679f8b954396f93408df13a33c809b6d0338a26da2ad3bad666bf66646da585ca73461a0beb1e439 WHIRLPOOL 090a9e607dcd9c56442ec0aa2f0f4c4aeb6c8764777fa29febf89c53e1fd687c2477db5e818480b4d90b9f846205a592125913f4ac0fdac5ce199a16dedb10b1
@@ -7,14 +7,24 @@ DIST wsgi_intercept-0.9.1.tar.gz 29391 SHA256 4eab9fc11fd6abaf74791b6a5a6dd81bdc
 EBUILD wsgiintercept-0.10.0.ebuild 1521 SHA256 3f9d132ff20d8abdbdf1839d510c8f8db649019ccf5e27371e3971e340c6ed8c SHA512 13670d5554c898260ff34f68e52dce15a9619b960b64e759530eb1b07842fe0fa66dac0f426cc6c2b1f09e477ff8b6b914dd1636919448b9d37c0ccd3cf1bdf6 WHIRLPOOL b99c796c66ee4af4d52240fe05973d107cdd398e9cefe84e85a87bef2b0838eaa54738b148d3d33399d3b3eced581a765dcac25e696f5bbc8b865c8ec9f4c4df
 EBUILD wsgiintercept-0.9.0.ebuild 1302 SHA256 b76c84aa0714e067e7da23a14abb5b713fbc8e4605ad6f020b26641ba44c3c46 SHA512 591424532b06c04b7604a6824ec77905609ccd409bedd609dfe29096a9a6f9ea3a4a14d6be2f60442d12eaad9af98755dfaf8c79a08114becd6a8d8a5158ca94 WHIRLPOOL 515e9fee51fb9b83821f70464b11e03a112e5a64975d23d2ad661e8d49550e7eff529fe15e1d4a4a60c6ffeeafd082a8bae946dd6c92c9ea71b040335ae62565
 EBUILD wsgiintercept-0.9.1.ebuild 1303 SHA256 4b5b9724ce78b19bcd33e208d068bc74b75d409a8c0b3c674aa39e333e4b05c6 SHA512 2b654de1ffa086389a56a9f320bb2172142c78a8c43c6d52ee00055ee33bdd0a5482b9595f799121be65d9dca9a5f378d7ca344c03d0ae7e620ec7e06e9252f9 WHIRLPOOL 20bc5e12ad86d6bed1d3b7cd5cd17412aa35c8d9cca07c97cec36cb662e22cdb3a79831af873fa9766a507beb7dcdafda7a1d252bcf71cd4f8a8d21e2c94e1a6
-MISC ChangeLog 2625 SHA256 396e8c261643403b7624165d1752a2312d688cc59690dcb93fde68bb32c13888 SHA512 c6628c95e4184fc4ca0f6ca9ffb2d05040bef7a9de5c5677cc369e91821256a9a5fcbd5f7bb2304448617b1192afda3a04e16976a3b09941b04901eb36af3abb WHIRLPOOL 72c9c1d8870415d74b09bf7d3ab448e825c5a1caeab32fab5ab7e63c5f0069d8634455c1dc1c383d8e1404a6e047cde3277699f40e9d75a6747bdee8ffa5bef3
-MISC metadata.xml 803 SHA256 f3d30905170a4a3e504e186c384312291b84761ca0334230548e7a985b262fc5 SHA512 852d1126441b4b06eb4697237542f37eb7fa5998917dd1be048fd3ab3d0d72068b58c411c15d4b36caea183a8fdb785248e8a2205c67f534a192f5fb1788b883 WHIRLPOOL 31e66427f88fab303cbfeaadc2433a84d73ab4a89b13e9091759a646e57d5bd2f17dd15299ce2b09d3b3f46fd4d32e16ccf966910a5bbbb10bdbb14c77ee3354
+MISC ChangeLog 2726 SHA256 43eedc213140527d975c04444b0ac430e5eb17cc95eacaeab370ff3db1f26086 SHA512 b49e7921a17691f49fca07c44217843e8e874ba36354cdc433e79a9e8a8f54df2b599f5c88cbf345210999b2088609b00d740e7752ac18edbc5bd396992c438b WHIRLPOOL a7c618af27cdf6d1e8173a3af6c21d07b605a12322eae1f617955b88b23e1916eaabd11817b93039c58492cc2776c6fa0dc56d03df038d3e62bf72150b240e0c
+MISC metadata.xml 873 SHA256 6e6c5e11f50d188b5a2b0b3ad663cb5d14cd41a4888d08c86f5d47d81c7f3a7c SHA512 dce15e800210e200e2caeb8f0374516af7f98b4e8449eaf61e294c041181b47fed082a559ad3c6ae23e44d25bd7fc0c01fd2744f002d62428a05ae5ffaf49499 WHIRLPOOL bc565bf57ccf034dffd6fca66ce4fc9f631e2ba8258c970861f2aa608a0b6a40beab346372bb47c572dcf5741193dded035904a376e21d36d39f37c0f8050c61
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.1
+Version: GnuPG v2.0
 
-iKYEAREIAGYFAlVt03hfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
-bnBncC5maWZ0aGhvcnNlbWFuLm5ldDdDQUM1OUY0ODkzMERBREU1NUQ1RjJBRkIy
-OEVDMjEzQjgwNzJCMEQACgkQso7CE7gHKw0S2ACfY/qP7qzzld9WMXKwZk5rcztS
-jK8An1M/OnlkaWh+vuN+KnNAi3iVsKim
-=FH+G
+iQJ8BAEBCgBmBQJVdHJYXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmibxoP/2nsQM9uTfHF0C1fmP+vFtA4
+6LI0yGrlEK8lo6O8sKaiFnLiwUT+nRVG3m1XUuvxUNR5exvdsAX9JxmSDjtlWxYF
+2OTk7VguCdFICJjk5DZy7yeBc1eSX9+V2rynwDmDC1N23CvANx/TGf0zwlTasRrp
+LJ6tt0EH/Ekhp6sQyZodWwz7rRl1H7B6ieThVTTwLBORJ+9twTc9y9HYWJHJfuEl
+Q/O1UlTUz4RvMSj0EYR9c2wxDfx/rR8bvV3s5Y9lFAWaK8H6KiX+i7KP2K5/5Omf
+DB1uPyzoa3QHxeOIgztgpm7usxPCYIe/STJojd3z5CmHPKuUy9UxsrTo8KKDDjJ4
+1cpcxFUe5MqFCpnER6T1Sq9qkripUIACJBgJniqFTLGjO7DjJyFCET77cixJ718p
+aTAVRto0B82Ifaogi4ig6Aj9+uRuOLgIfaeKs+XaDbbPwFht1z2NKvyzn0cJn1dU
+pjr9ZsabYFbyl0Zh5PaIWlSNOsERw1yQYb+ybLjIJes4AHIxjbXbUjhnRVVhblDM
+VP1LutWFgqCot5/f2w9nXJSiqUBCHd2hnV0NNaYAjYiHxUJC+VIMAuh0QAJxCxQw
+irs7vV58jCz4KceiNrYnk/JjyOiAd6hvAM0DqpBVKTerYqd9w2Xm5o3IhGBAfNQh
+E6jPjZzmmMmxLeTE7nZd
+=B0f0
 -----END PGP SIGNATURE-----
diff --git a/dev-python/wsgiintercept/metadata.xml b/dev-python/wsgiintercept/metadata.xml
index 6e23607b1c37..4af2fbaae634 100644
--- a/dev-python/wsgiintercept/metadata.xml
+++ b/dev-python/wsgiintercept/metadata.xml
@@ -15,5 +15,6 @@ avoid spawning multiple processes or threads to test your Web app.
   <upstream>
     <remote-id type="pypi">wsgi_intercept</remote-id>
     <bugs-to>https://code.google.com/p/wsgi-intercept/issues/list</bugs-to>
+    <remote-id type="github">cdent/python3-wsgi-intercept</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/wstools/ChangeLog b/dev-python/wstools/ChangeLog
index cd8af3773297..7dabbb0b577c 100644
--- a/dev-python/wstools/ChangeLog
+++ b/dev-python/wstools/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/wstools
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wstools/ChangeLog,v 1.26 2015/01/16 10:16:19 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wstools/ChangeLog,v 1.27 2015/06/07 16:34:06 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   16 Jan 2015; Ian Delaney <idella4@gentoo.org> -wstools-0.3.ebuild,
   -wstools-0.4-r1.ebuild, -wstools-0.4.ebuild, wstools-0.4.3.ebuild:
diff --git a/dev-python/wstools/Manifest b/dev-python/wstools/Manifest
index b3cb36947cd7..af21a68ce58f 100644
--- a/dev-python/wstools/Manifest
+++ b/dev-python/wstools/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST wstools-0.4.3.tar.gz 148878 SHA256 578b53e98bc8dadf5a55dfd1f559fd9b37a594609f1883f23e8646d2d30336f8 SHA512 e735e2ae63aa410a56c79bef0bec7196393bb8f52d8521001d298b6290a75662f7262b6cd3c3238eeaf33263036cc6dabf8435ebd2fd1c98481cea524d0382ed WHIRLPOOL fa5ca24db23d99337cb08f3317327f6076f230c787477275e54d2322931d4e86831357043df6e8c12f3a62bac95eda13f614120588e9d3265ba40251c68b2881
 EBUILD wstools-0.4.3.ebuild 711 SHA256 1b0537ecbcaa1578773df1b76fa9faa696fe38cdf8120b4b7e92196fc8f9b39b SHA512 af5de4233a00a2668cb29d6311b59d369214102c8569c239458b9b3ccec8a26c5781681014f28cfe5c1527725af7087d92affdaa0f2e7fef3f8ccd9f24c0cf1d WHIRLPOOL dbe18d26356b9d44abd8a009efa67d3ffb20bce004ee80d844418fa8182ed5dc45debc14480f12b142bd17ea5c49be9b968c657b0cb23063248d0585c896711c
-MISC ChangeLog 3270 SHA256 6c292f98ecb82bbac22530628354b0d3de8ff945b9e1be1e24f2fd7f34be48fa SHA512 2824af5b638af2ccda4e4dd84ee8e0e0fad29a0b9d5236e6dd048ef5809f71381bc9dc5a0b5e6c9a9600b51015393ffb7a4ffeb2e9a15c6131281cbe02caac52 WHIRLPOOL 1e1256fceb3150efd5ca1a06481a192c721de85da997e262d3489f6a6d199a430ba1f4770a30345726f472c27f99c11ad47a9a5152218f36e09af3bf20eba5f8
-MISC metadata.xml 230 SHA256 58da341e443e0005cd334450981d303e236d841df61e41fb082737032a5ea8c9 SHA512 4d6c423d3cb490373ddd29cf60069d6e5c79847e297bf85dee81ac5d79d7b23c4154416345674c6c421492da5d5dc12a24c2451e467e4551c9bc677e80110878 WHIRLPOOL ccec136aa3eb62ddddcbc4eccfa290deafde36bc6c4b9a09632067c3fdcf6e7f282d20866fd04b1a16622c3ace7c7b78d424a54d2ea9869b643969dbe8b760d8
+MISC ChangeLog 3371 SHA256 ab5ebc13dec3d01a77e253b930307633b15f32a4b2fb03c52ec3ebd7aa285ea2 SHA512 d8aa762715eef7767c3e4c1ef28718e88f9024f6808f7015fc20e7edf6aef90250281e82ea8b5ac755e63b0973803e51d512ae65c8a1bbcd51588bb9839762ef WHIRLPOOL bc8b1d8be0785dbd9031d32060a480d9d6f3ca5e1023d21a3c75acf855586be398ac23e4e137c66a3c9ec8f01132aadaaa12ab094c7f3c1b6217ab38af0e81cd
+MISC metadata.xml 291 SHA256 8443747700ebf6a9ac41750048e7fb7f4b5cf931a0310a64cdb70ba5eeb2d908 SHA512 746585bd0d15a7cf25e047b10d084f34d2a9e1096d0526b42d85f9c48616cad0f18bff55dd95b11b67469718582e03569b5567c9c92681aba4904cf088cf63f5 WHIRLPOOL 3676f0082972b43bda64f18b2270f22aa386fa108b2a3613bfe38d3f59b27612108d1c485e977a949321c71f5faef601bf16ada2620d270817496a81308587f5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlS45QEACgkQso7CE7gHKw1aHQCcCugrB8vBFBUUAvhV3SxnN8eL
-8eoAn0Jlx4vQKgRI06Q61LKYiyY0ptFB
-=rkRd
+iQJ8BAEBCgBmBQJVdHJ/XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiwwIQALI8/pIqLxTPEL9llPPZ3huY
+kVv+H4Qfr7iXCvF20V37KdqLdtQIpvWJ1AYVwNJWMnBbFC4CKjrqvPz7Bnq19t0y
+oEAFou+Dr1qZ06wZGfDgqxGOXANLdHUFwAc7W6D4IRliIGwwgKiNaYfmQ9lR+/8n
+GvIme4ShZrDvEb+TFtd9Hq5s/VV8IdM89NMd1KTbqledKhhJ9V1j7XoPNkJSr3Tb
+vNIgGFdFLD0JxRojgZXmZJ4NUdUxgfKQLy0MllwXAcCSvZ+GfUM04gilem/c0re3
+rw42iNE82KQNTcTKBzu+H0UcFJd9H8HAAxSUi5NxOLjXWZJpuFeFdklq4tgW2+N+
+38/gn4NZ9ee0w9Wr91xqHtiiXaLdsLhhIELvgxe4ZPbA58ScLd0jfTTmO0DOFIOu
+zEUPKuyDOuEDp7RvbDbrl72qfJky5hDbBugRf1KqXA2u7rbAhoASWs8Wbe2SeRyL
+cilEi79AzGjVO+DpyEpakLl3IpGZxpYWSplmRH7Dckgn1C1zgPTp36HwWZRBz5Fp
+UhP6ovxxAxSvebYV8jUxc7y5aszCKqn3IwtikJ2jmHUkdHrXHf5BBFatezAsszJt
+AQ9ZhVMMpiS9nWi/GRe8kF03wiyyl+FoGAka8daVUG1iw4Pt1wLUUpO9IMMpAWAI
+QYaOgvfMvUc/X1tOGTfc
+=APWv
 -----END PGP SIGNATURE-----
diff --git a/dev-python/wstools/metadata.xml b/dev-python/wstools/metadata.xml
index eb952bd3a3ab..34ca344eaee0 100644
--- a/dev-python/wstools/metadata.xml
+++ b/dev-python/wstools/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>python</herd>
-	<upstream>
-		<remote-id type="pypi">wstools</remote-id>
-	</upstream>
+  <herd>python</herd>
+  <upstream>
+    <remote-id type="pypi">wstools</remote-id>
+    <remote-id type="github">kiorky/wstools</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/wtf-peewee/ChangeLog b/dev-python/wtf-peewee/ChangeLog
index bfcf6d0220b5..4a057547108f 100644
--- a/dev-python/wtf-peewee/ChangeLog
+++ b/dev-python/wtf-peewee/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/wtf-peewee
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wtf-peewee/ChangeLog,v 1.10 2015/04/18 12:51:26 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wtf-peewee/ChangeLog,v 1.11 2015/06/07 16:34:26 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   18 Apr 2015; Sven Wegener <swegener@gentoo.org> wtf-peewee-0.2.3.ebuild:
   Rename distfile to include package name.
diff --git a/dev-python/wtf-peewee/Manifest b/dev-python/wtf-peewee/Manifest
index 953e8d4e0bb3..0642ed574309 100644
--- a/dev-python/wtf-peewee/Manifest
+++ b/dev-python/wtf-peewee/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST wtf-peewee-0.2.3.tar.gz 60654 SHA256 d64bab9c8b9b247f21534e87a94b988afd9655d7abaa14dc7d2af0bea3a3b9da SHA512 0a8e4a6586a4521d99c35b907935286c20b9106214a9826960073e710fc0a91c68402b9812d2b0119263786f8e48bdcacf999044ade9f3a27afa9bc7fd058926 WHIRLPOOL b44d3480d274f26ff84993c8941c473e6104bab8cd65bd8befb903dc9f2d6fad16299d6b4fc5f3b8af822dbc6aa9781dbe9ba43da6fb2f2dcf929578d3eac7ea
 EBUILD wtf-peewee-0.2.3.ebuild 1048 SHA256 3c0c532e2b710d55278564b1762de9083ccbde0ef07575c33fd4781868aa7a57 SHA512 3d579a71ffdc2850da393cbc117ec65f7a400c09ef68c663ec1e8369770171d50f6d50cfcf62102c792307c5bd63c7fdf118ec479ce18c6546ddf896d26440d1 WHIRLPOOL 885339b72d692791c45a60747bbd1a7cf271d3d2c2f7dc593a8ddaaca3f248f2aba19dc562b54b7af01c514cce770a0e18a98aa59234e5adbf1531a5219b1c60
-MISC ChangeLog 1613 SHA256 7051e508b2667a349d5999419107ca4517cbbf54d739333f5d81a9ed72cee62a SHA512 ed0c6f218e7de8e4c02326d05875f4bc4d48fcc834af1ab88edab13a565c89289bb4a2444a186e066394159f4af91685aefc4b82b2251ca8207f45c7e3bd7094 WHIRLPOOL 09421028db4f25fb0b0073f692d1c516352498c69f6a485551dade1c74147bb7569bebd8b0ca97a7a6a90cdf6b134136958082b6d8d34d063f8441ff3ab2acb0
-MISC metadata.xml 160 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a SHA512 7c02a1de1ddcb6b7c6378cceff0458da3a15d5381417f7cdf01874e7c372664b8899863f41b3a2fd8d6ad67ceb732dac6da0cc17575bf8e3e6d89480417c6628 WHIRLPOOL ed2795e4466eda8c804d5067c87386e269a59fe959393057ca5ddc36851e00f5210c4da1adf4bbdfdbb7d1d3d5c60aced25727ca12fdc8305d9e263a3aca9b13
+MISC ChangeLog 1713 SHA256 bdff83fcc73f1aab36d224715d190f222e74a089d3c9edf94151f643e5c478ad SHA512 e14ce17e469ac460c42813f29d869b3532fea5497ac427d514e8da71529d8acaf47adf30199949b25553d8cbc0b1f8cd6bc24a97c3380f0c3bc91ef6604d28ca WHIRLPOOL 12505481fa1a68a176f98a1a99aad0280cd104e0cd09c7c48d60e013308fafbc4634b9f0b7d22a68e64e1991861d9deb6b72e02a2ea062c9976d3b47cf8fb3c4
+MISC metadata.xml 249 SHA256 344fff8729ab44cbf87f1a90215d0a6e7402902febcbab6c89f01d5d79e01413 SHA512 a358ddcd08fe2097e7a42def56eb4cf1cfacd119fd2370b2392ee626540167f7761ecb0f8a547be6101a94df0ba96c5557cfb58887ba3399473e15f78a0d047b WHIRLPOOL eb0ca89c24b2376ed83c75a0cee118d65963714f93fb5e876bb35e2efd99a8a16e63bdada6f2e58cbce0222cf57efb2973d435e0c2d40e071c455ccda865a907
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlUyU08ACgkQI1lqEGTUzyRNiwCfWZl8mXKb0Xo7QPl+ISKwkch2
-UWEAnjf4+4zFG6SeA2whk9EdCVDjHoL6
-=s9lC
+iQJ8BAEBCgBmBQJVdHKTXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiTbwP/RJ8vAuVu5Rsi2xJVphiT3wi
+o2fVa3c0kuU77NTwlamDrvNJuO5587NjZu60SXVPX0/QAdbmwjVvB88BzfK8Hz8Q
+he48vsLhvyKzgnA6x6JWdtU+dv8PWuKF9V0LpZ3wF0c+myH54Iv/WqwabWA2g2fH
+Dpl2SHpLvFXuD8rb/kG+lVuf8QvZqxsukcDeMP/HNHt6jgT3Ey2pSwx3HK3Oaz7i
+uPlI85T5hIUtZrgum/WtakGzChBpf25elklbMJCzX8pb7qNK6654ISH+7oCZIkEK
+DIp0C9tQdfYr1Ls3uDEr/Ulp1ZT6xOr9JLqXqNZZ/ddZ/qgV3fm6/4NpBBkGdxEo
+FvXSepjN/UMHN+q/DSzK3MLeUNdguQPpRPfSwKF5bOWjWojDpIk/yMgVUW9zRCHr
+WLQPo9kZY0povJg00Z+lz1NyMioPE1wJXMQFn5feg9OIGw0g9ut+ygbjzsk9/UuN
+LIc3MSc4uEjUiefgE0XPsE/fQvV6C1ct8y4Z+xmyjB/rbimv6EVS1tpQu3/B7KT9
+61QcwXHAg02ytPFGBpP/mgVsQzoMkEwzoG7U2t33m7FhrMr0GTOBoN83bK8Pvl1J
+GJdEg6RJjvA5da+oDPIMwaGdZHO/kk4jAg0SWm4ZauvsRSyHHwR7xpNsIcCtBnS1
+zLERAtqdRfLgeZYBxZI0
+=mQjz
 -----END PGP SIGNATURE-----
diff --git a/dev-python/wtf-peewee/metadata.xml b/dev-python/wtf-peewee/metadata.xml
index 301d2207cc29..f95712add1aa 100644
--- a/dev-python/wtf-peewee/metadata.xml
+++ b/dev-python/wtf-peewee/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>python</herd>
+  <herd>python</herd>
+  <upstream>
+    <remote-id type="github">coleifer/wtf-peewee</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/xcffib/ChangeLog b/dev-python/xcffib/ChangeLog
index 43e8f9b9f15e..172232b223ad 100644
--- a/dev-python/xcffib/ChangeLog
+++ b/dev-python/xcffib/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/xcffib
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/xcffib/ChangeLog,v 1.10 2015/06/04 09:59:41 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/xcffib/ChangeLog,v 1.11 2015/06/07 16:34:47 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   04 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add pypi to remote-id in metadata.xml
diff --git a/dev-python/xcffib/Manifest b/dev-python/xcffib/Manifest
index c85afbea76c3..86da49cdcddc 100644
--- a/dev-python/xcffib/Manifest
+++ b/dev-python/xcffib/Manifest
@@ -7,24 +7,24 @@ DIST xcffib-0.2.1.tar.gz 69465 SHA256 ce4c1fc87d2c875de834a35450970ae8ea2a9f2354
 EBUILD xcffib-0.1.10.ebuild 721 SHA256 7e07628891116aa36d8db7b60dd31253e0a41833159d8359912b6405933e395b SHA512 ddcf6ce61be3fa1ae495618bc428567722a6219da9670b21e7584196b49fd8dbcfef84dcd4cf674b2c031bfcd53260e1e465143e70f30259bfdba33644d42d5d WHIRLPOOL e427e3b84f2050decd131ce560691ccd1f6daa63baa6b80b02e014ac7a17f4cbeda62dda54dcd461f0793378e7dee92c4b3cc32d69af5ced2bb2dc0f73f1ff8b
 EBUILD xcffib-0.2.0.ebuild 718 SHA256 aca3903e7addd99c29c13a658fc9502826237756d9f92b6d215f9e65ae3389be SHA512 6bc8610189626d672f8994472680e9534fc9db75872aee61631518902de7462dcd15730900c0411f3ebe05d27599a926fc8db90d406a9f26c6702ed6486a4100 WHIRLPOOL 7fd0fbf7f83756e05933f89686a37cf36204401e609b8cf6c911496da94bfcfad5063b0a30a27b99ee48ce7080c38e307cae897958754bb5882dd399646a6043
 EBUILD xcffib-0.2.1.ebuild 718 SHA256 1a1f7daba9b829becb467e80c336cc54ef8c7e40fa9eb1b5a5f9090cb26460a7 SHA512 354e2cd5da5823baea022f372ba75301ea0bb58e768a68383366f2b924d64e606238602521db0e01cb94a3d04d0b327cbd8aa6f99e8e0838cdc312663a28da77 WHIRLPOOL b5348d7f8902cac69055d199fc792be8fd6927643579d531b6800d8086417d02a5f7ad316b4914ffa246516962971a893745d8ed658ff2034d8987f1ab2db6fa
-MISC ChangeLog 1388 SHA256 c4d26ec24f22658b5b3dc280371941dbf73a813506cd75b8bf1980af8a4a86a9 SHA512 a0e1d9a4de78f478544d554c8508f5fb64769d11ffc300f24eb2367b7b18e5f856de3ca100b138699a1f48d513cb8bd63a98dde5577904ebaf2dd06074be0044 WHIRLPOOL 39035ab8057d49f5d032b7d2e48eb5fa0a043c61d6cf5949fd972ca2039024d5cd759bdca7442ea48616b36cde44abc90244aa66f32b87f3e35b751a56934032
-MISC metadata.xml 234 SHA256 471f83d3631cc51af62f65726d5b72909cd76eae55f368b5ca7d29486f8f9042 SHA512 87ee289d0b19b4299207e9a4abb9fa30aaf748aa1adb64152db4b9f9191f446a9047003ea603fd38a76756061c41a74681e7155bba83102b4b14e8d00b592eb8 WHIRLPOOL dc51cdfbb1f21da29806e55dea5dc887d2bc7ffad73b460d9a4d57f7d4d78393ae8b1e1e7a01d112adbfc141295af3ce98f32061c677ff89de5481a86a892db6
+MISC ChangeLog 1492 SHA256 bf8d9eaa03d84fa7551d992f8ebb306ebac4d4a802a65f646b1fb30c45b123fd SHA512 a736168b87f35ae6333b35b69e62c4103b6a97f1ad49b12c8882e5fb7b5c7fa5a8594cd111ab2f5d343831994923933d82373e7456f7d015bdc1f2ff748d1ef9 WHIRLPOOL 474b4a461be310480bd2baf0f3445f6872e9d144be693d8ada9e166f6d0a041cb26932a35c080e3c2839b0d9f9110239f02e4dce6d8a8a7e0cf81e515b5638e8
+MISC metadata.xml 288 SHA256 eca8c0e5ab1c0c69bce6f32595a2c100b461a5d8978d0b07b6b717e09c1258ad SHA512 d4d8f202f8309e0fb4d853e341ac418158d60c0115859e4a7d5a984b4455594f14d85cdf52047dfd483150a50747d91a7d6befb99714ef45ff535ae98b51c1c4 WHIRLPOOL d1cc4f29b109b0524a1e81e7a6b2886ed5a4f7d0e641db4d0b2624a139bf294bfcd3cd3e2db26ec3013c5c3e744440352f98b85b681d3946da687857781a8430
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVcCGOXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVdHKoXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiN3IQAJMZXOa/K4aXd+RiiCyYQPJk
-IItnrspHX325e8Z3VwXJ+qrJQg1Ieuds/yFGFsOKzH2ZZhbVuQ1TK2G7TNeCptrt
-O5mLAipoTjyVnS8oldGJ6EIBWb3MY5EogPj7JZL90MjCF5Ubuh8L2+57l1edRdCa
-bhQMgFSWF9Vl2AOhVIVbCQqPlITKm8sMJ3bIjaypm4rQZ+03G6K2oWoWrnEEoz3X
-TvFsVXmv5EU0FaFGAqSfkQ7aT1qQbI4i19yw/Qu0SNAl/aMm+CE+WGgCrIBgP4lr
-gEQdYpUGwcDzHBLfR0zHYnHrgnSoVmaeAt6A3VjZ+psT46GXQpWDHfIQ0Dcp2lhd
-kwlA5fMKp4GeU+Oe1wej/y9eJ0gbfZpzRL81rypXj5rPEqxvsJy0fVnRpOQkHaYB
-/1VM16vV7H6/C2GIzWh+PCP0OtLUr9Ylz3D9qKppMykT9DjxjdLhkFzQVqZCEcnQ
-/Ozean0UhFHDdfrCY69Z9SB0I3lz0d9r60GPDTDuiPXE9+SqMeb0c3aKohoAVtly
-ey29G6Qay0FacYELBvBGDF+TaIBeLx8aOIDSjVwI6K50zvVHLa5T2B11uVvE8o4o
-TSdhwc3EjTtoDJZi2enJ25hAfIsMQ3DQvDfoMKYojB4roPPRSMvo1uwReYQmsm9x
-YDqV0g6HJsRQQZKqsDlm
-=z24U
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi3TMQAISqcxmlGLrQXtb/t2UtjSNv
+s92nAF+Axg1VJ7RsFuX+GoJQYhjWnMpDwtTbLZJkD2iRW2UnVPYRnacuwaXD/h6A
+gtKmUWP7DiQBbtTbmQJN97zOH4WeHtCwmwGkmGeubrlyqJEq00p34gvTyinWSUcc
+2IVM5e06kAM5PcKUUcZf3n72nSgYE3EUAiEZtpaueQjGGvPPv6OmhbGBe3QlUsIH
+eBkHtAquRuz4xVHAkeOf7rkngqyrkT53OdG8T9v9eWU5Qxo4n1ZEbZoEUPPAiIbu
+U7HK8lhzX6/m9Bg826o7VY5QCH+zbBW0pdbHQis/eowF2VSCEzoN4HNd0bHsaHFR
+hvrlW1tYtO1oaeay7jroVL1YMlGXs8aej6/+y/gGa34usKsW4RVQc6IjLpN1mfG7
+/yI72NWFLHUP4G7Age4sESvc6zH5lNn+X2gjrCAV/67dfNZ6yYTvVrwvOK2jTfwA
+our6bVIC+l0MmcM8Gxz7Bk9Kd6SOfBHonDwqrHs/2cXUBmYPzcxssavYWn//OGKX
+KkC2ztQnTYeAMbUrXS4Suh4zcHA5C1EWhDJZ63YWUrxSoVO+SuCLJ4WnbegxV/tq
+K4dqA7h8FLndcUcsS3iw9U8efZAfc9IREHQXhtVKXbX9C1da6HJjW2XLEjG8PDrV
+R6aabh1/KuCulM7mbYyZ
+=lo57
 -----END PGP SIGNATURE-----
diff --git a/dev-python/xcffib/metadata.xml b/dev-python/xcffib/metadata.xml
index 8df0455f2509..51ccadcfeb45 100644
--- a/dev-python/xcffib/metadata.xml
+++ b/dev-python/xcffib/metadata.xml
@@ -4,5 +4,6 @@
   <herd>python</herd>
   <upstream>
     <remote-id type="pypi">xcffib</remote-id>
+    <remote-id type="github">tych0/xcffib</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/xlrd/ChangeLog b/dev-python/xlrd/ChangeLog
index 0bd950911786..93cc4a5535df 100644
--- a/dev-python/xlrd/ChangeLog
+++ b/dev-python/xlrd/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/xlrd
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/xlrd/ChangeLog,v 1.29 2015/04/08 08:05:04 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/xlrd/ChangeLog,v 1.30 2015/06/07 16:35:08 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> xlrd-0.9.3.ebuild:
   Drop old Python implementations
diff --git a/dev-python/xlrd/Manifest b/dev-python/xlrd/Manifest
index b5527dcdf755..e0e2576cec66 100644
--- a/dev-python/xlrd/Manifest
+++ b/dev-python/xlrd/Manifest
@@ -1,26 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST xlrd-0.9.3.tar.gz 178490 SHA256 933a35e27da7ed7712985486b53b5cfb8dd88e076e2a0bd531373d0001d2939c SHA512 8b1480b1b0eb40435c33e6494e3f1c960d97a4e5a7f5a30d1b418485a88e4c6d2721501646eb129d9fce0bcd775aee50b866807b26da77b5c2d35d977bb247d0 WHIRLPOOL fcfb06859d79e8695d04504cf7e0a7e1eefaca856605f5ca5ae4d36073bdb67759e1edf6c0208ce726090ff63c6ad47f3daa7b783c38397be39ed5400c20c7ab
 EBUILD xlrd-0.9.3.ebuild 924 SHA256 5f6d1daa2332387bd384d4d3aca0836faa01119d4f47b81e515dd5256628d38e SHA512 55e1bb97d624e0823acd87b9fd0000def2b60010bdf968ad2a3e4c985c2c94651adeb6553c00c9965d0bd4bf53bf7dee7fe24fd955a79da3ee541a016dd4f859 WHIRLPOOL 2fa7f41788aa00aa1143b3451955f2cf74a08c376941cf285cfa92534bfe5c8404119a55ac012f82dae2e530df30e1458c0c2e394747080f34ee2f23a62296d4
-MISC ChangeLog 3506 SHA256 24883808152c2fdc0e60a7df98e855fc03cc9757b7fc93283fd1d7398ec6b2d7 SHA512 0b9fc506cdbb7d944e38754d3fbe73b5f639b903eb9bd9b23b701d5fd9aa7fedead43caabf08b6c12c4edd2aeed8fcf156fc06ba91337b120ac93d7d80e27f15 WHIRLPOOL b966764d32dab0a4ccaa7f92d448e046f690c4af33779c268735da2496048ae46d9109846cd1a2cdf93079a339d50e220297ab9c987bb95dfa594c6008557cfc
-MISC metadata.xml 420 SHA256 d49db9aa6fee8fa09487265b230c1ec013e1909257ad7af25785f060746339c4 SHA512 f8ec15884a413e7c917e0705f0d6c152e1498c59e151731474f19dff7111cbe905d942b11b4c80c5905a1bf8749f67a6da0658e8686ddfcfe18f7d3845a56636 WHIRLPOOL 604a7b06d5e03a45124c7dc6ebe6792ac697b4ae99b4c861559829d625982ae35227d159a0135aa0c3deb43490ae3a153225d3146688ea919daf6c8ae69ba275
+MISC ChangeLog 3608 SHA256 623ce271e8926a85bef21a77bd789699bbde15174a3078b4454f1338990653e7 SHA512 afc8c31d7e936e1cf8ed37eaba53e8eb4cacd9d2c58b7ecddc9ea36d724026fc9a730cda75edb50b2b5c2a3ce5ec03dcf697413dd62b9824abb837ab3a20aaca WHIRLPOOL 6eaee0c4152a8d0ec2695b723f3f204c1d883e0df4568fa9032b3f08eb821a1d07ba33a29f42e83a873c64ce440aa0206d9dccbc64bcec71ce6f7ed1d6602786
+MISC metadata.xml 471 SHA256 20e9b9fa916bc291a80a0a8474410d8e6182742af5d4d53abb6e9f134067a356 SHA512 6a2c97b1b0613d1cdd465c977587e9e04ed387187df4d7fac818cedc954989dc5dd7c0a3078b0ddcc692859bfce3c10044f8e5a217eaa64837687e3764deebab WHIRLPOOL 8526521d9a7e612995db8b877fafd32905ca58775507702f7c43691a9ce476ecb532fb4ae488bfe1949fbc3605d67389ef5d6bf5b4442f425a2484dab2ea36a0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVJOKdXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOliQP/32PyMrRJ9tSjnY2nrRSqIUt
-79QZT5SWZISAOVFF5aQrUuPFk2eTZDkNjQfkNAFdoHNYYOF4QZSOrfH7SlxCHaAL
-gbk+Rq9+eJrtDN6eu8oVCjhMq1i2UqZXPQYIw/2HkoGgCY/gE/hRHywuLNkul5h/
-8zMlowklxuqMagtwj6HiHE89aAjUZdoJSregd90EsX4hw6CtOq0DsTAs7j7hcUQR
-jwODRnUFm0zbkoIH6wcBI7U0+nvdod7+zuDB9Q49dWQ+vY6YU/Fc3kYrWU+8YWAK
-6tcSLc490wxdIyhBxA9YOCxOnJblGpfe4PfWXV5XpwDyEJxRLH4CG8Urs2Pjyvr8
-D4MXYiXBhkCN89pi+9LX35XrBjorNH3IUZ+KSTYrcHEqwjcoXTHdGYN5Beqe7lEa
-krF35E0yi3Vq88MfcF/HUEZg/QEc2wQc1sZ2gCt6z0f8JTW4QhWE3Rv2S6upXGA6
-mGi8PkvOjbedbhumtTRC75N5mP48IEz5JBacct+hMsBSpu5ITg40xG2syI7Luhzr
-u3WBd3NQNwfdLAVqoDucsyYg0ex5WdVziFCl5KMDfC/ayVblq2wapA0hK6Ir/AkZ
-tYbdeUhdkT/+ER3lrtWxcCaew5WVVVLeM2bMDPanzzF44PvRjJoCFEP1KW+APQQt
-Mk/NKlzTK65dpdgHl/do
-=7ll6
+iQJ8BAEBCgBmBQJVdHK9XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmig6kQAKV+mqKG8uBq88NuyFakmVDO
+q8foA5HvHvwzfmFaMF2utF8LXr8hJEw1TGAVE1nGLwssIbrpogS+DXf0pP6sV3fn
+4+hKN48+yzAtZckrDA+GxvlG8nLK3m0QyGHIKD+0dbCJpgLlbRp6jAZ/EH5tHvxK
+B6t4dTVZ+Kb+9Rcz7rtSELJxlutY3OBYVcshxoPnn+9NIIg3Gk6t1jWYBYPh/dU4
+KlTN+MfL9RA2eQxX9yE33A1l8dAn9Qwv0fUMM+Z7Y8doXpm+/Hfxz7IRoleHd0dw
+fJVLbIY9+9Ex5cMcBvHvTxcXhcxkLcmukSzRyOLwYzVU7rOsSDVCy7zAemgt+EAl
+1ylOq5NiZm4084WmiO4N9GKbxNIMs4Ftts95CyidbD+zS0U7iikFWfeyHp+MDu0k
+1EQ+kOYe3LYo5tt2ai/f4o9bdgiscnX5J9C/MADnlgKQ/Xn0fW4KE9DkkbrmRMcR
+uRTKxBOwjOIMLwO/ts1iw6rzsjBR13yU4FNEU2EpEalNH46SFRc3EQc1NnitaCpe
+R2Kz4bU0tY2zJTWOK1NdJ4fz9nmJCbPb6Uu/30dmAPJzp8gtj6JWLP+pAmL8WrlK
+iJTWAW16b2cj1+UDJzoQ6GJTZRN/olpKywsHLU6xu7/g9Ckw4hk1IjtI80wZgJ+1
+uWplicEaBIovJ1TW+onD
+=eWq/
 -----END PGP SIGNATURE-----
diff --git a/dev-python/xlrd/metadata.xml b/dev-python/xlrd/metadata.xml
index 9a1f6685bd7c..22c6fed2a1b5 100644
--- a/dev-python/xlrd/metadata.xml
+++ b/dev-python/xlrd/metadata.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
-  <longdescription lang="en">Extract data from new and old Excel spreadsheets on any platform. Pure
+	<herd>python</herd>
+	<longdescription lang="en">Extract data from new and old Excel spreadsheets on any platform. Pure
 		Python (2.1 to 2.6). Strong support for Excel dates. Unicode-aware.</longdescription>
-  <upstream>
-    <remote-id type="pypi">xlrd</remote-id>
-  </upstream>
+	<upstream>
+		<remote-id type="pypi">xlrd</remote-id>
+		<remote-id type="github">python-excel/xlrd</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/xlsxwriter/ChangeLog b/dev-python/xlsxwriter/ChangeLog
index 8077ca904594..200c8cee9728 100644
--- a/dev-python/xlsxwriter/ChangeLog
+++ b/dev-python/xlsxwriter/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/xlsxwriter
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/xlsxwriter/ChangeLog,v 1.5 2015/06/04 10:05:34 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/xlsxwriter/ChangeLog,v 1.6 2015/06/07 16:35:29 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   04 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add pypi to remote-id in metadata.xml
diff --git a/dev-python/xlsxwriter/Manifest b/dev-python/xlsxwriter/Manifest
index 843f0c3bcc12..648ac8b0ed4f 100644
--- a/dev-python/xlsxwriter/Manifest
+++ b/dev-python/xlsxwriter/Manifest
@@ -5,24 +5,24 @@ DIST XlsxWriter-0.6.4.tar.gz 220794 SHA256 5215dbea8071fb9f36fe3d83fb340f206a34f
 DIST XlsxWriter-0.7.3.tar.gz 231999 SHA256 2fa0f2d633bfbbc55a48abd4089820c744ed7a40e11c5c1580196a2c129eb8c6 SHA512 b85ef49fb6d5c6a6454292a7cdbc3fdff9674578f2e535aab7b08f671180f59934616fd78e89e007e8a662539dbbd9b0b9571b02df049a0e5f70f706d9acde35 WHIRLPOOL 7124119bd0151c76689b08fd4da74b5e5876f1047cbd63c960ff7728ed70bcc82ebcf1c44f4c08a4fe5ddcb9aca6441a5c428eab5f793028e3ef65ba3494ec85
 EBUILD xlsxwriter-0.6.4.ebuild 838 SHA256 dbe436061216653b3f49682e889b3cca70623c22fccf5f4ca6f3b4ecc38a4b4b SHA512 f9c55de35b170b037a8e1d8927758e277454e0526760dce705f02654e9bbd1cfbdaf386253df562be29dfd6bb66c8c6c17b22384d9a0bc3582b304d58226cd61 WHIRLPOOL 5f51fc723cce0209c64bf24a375e5197c1c2960f4eacb8fbf2cef7009ac119c2ad21f7a0cd45f3e5703174ef9acdb5686ab79252f6edecf9820935ac9c0a7a03
 EBUILD xlsxwriter-0.7.3.ebuild 839 SHA256 480dd8ad1c63308b337bff2ab83051f6e75564a64d04d6d2bd1cd133875d88da SHA512 f2af2f5fd25e33f1828fc1dcf51429745750712830af9fb1603caea55c64f45ebc09a8a489f3fe3d4f866de3ca5fa7336aad42b4502369018976db7797b75983 WHIRLPOOL 0124d88960c03aee779dfda2e1b4884c9a6e37957f9d9a5d0ea288339553082556d1d5c18a4a4b5785c0493e1ccfce9fe532c5670008952a5dbab098909d2128
-MISC ChangeLog 786 SHA256 f293fa40a536cbc01fb7156fd79478e1433b5c4119df498539683dca8d657a65 SHA512 06dd8afc2cfb1f0cbe7d0b481f5c0e1b227d2c0d2bd7f0bf1f223081708d077607f12419837b2801b2bb84739d2c8290bee28674a18a3cf2cafbe8e2ea5a282c WHIRLPOOL 1a2e6673eebdcfb6207f0a21a7b552c63a9d6eb98b1b6a987b01ad4f579fb83d6003128e97182e8c3d201a5d8efe66177434a863636926e0574e8925c3b08445
-MISC metadata.xml 238 SHA256 8f174c6d5a1cfc3bfafdf7a8283c2ff7863594616ee690ca1a2894bab4c645db SHA512 7a5965a644481b5c1b03316b43ff55044bfe3aae841efb77df321dce530b55ec413aac6b9935eac9e31ee53dc0b616f66e1c0bb72224cb24a0575e2e92b4cd4f WHIRLPOOL 26564249d2777fbeb5c04f7c28ae9c68b22598a657999fa845b3c09525a1db18f4b6aa67f8262106adc232dfa805f99d6efa89c41e5d87993e2d5df6f7d4f388
+MISC ChangeLog 890 SHA256 c0efc3b3b67bca26713379505f355d14e3ef7ddc7fea29e143d8ffe934a691e4 SHA512 ddba6225594e48060931528e482e3bb2ae974cbe278999d899bffa515057ac28c9b389378ac3b57af9cb87e80431ea33a043b3431aaf9ee23e6cc167a70df2c0 WHIRLPOOL c43663d5e30a695ae570920bcf7867ff1996d62fadd51da41e0ce2189834927546ba498ac40e7795a025728341e46bb0a7275c4606d8dcc549ea1ef7bc7e65b8
+MISC metadata.xml 300 SHA256 4341b10be39d11a0ae9dfd9e576ab752a667a30907f4780ee5b33246de0bcb95 SHA512 73c06286ee796e782a0df76724e4327c333ad6efd3176866ce1f06c5e8580d153b61654b41e4516771b0457cadf5ddbc8a41e8763386752ff1ec53e4678dda96 WHIRLPOOL ec1363dd4ebb039487520971f83f3c4862d6e6f788f72c88aa593e469fdfc7d7ebb5a9f8ce2dea43da4ee852044d5a91f8c8ffb9e04b6f2cb1d9d2c2fa04b3b1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVcCLvXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVdHLSXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiSsgQAKKhJ0MIY2EM+U/mpKNT59fC
-O3koGrVEypGziGlBkLdNCzcXVdTK9ZJyCio2THE257J6YHaNHHmQeEN3mpSvHZVO
-zA5MxtElffG8bMTJTZtX1UIxzMipwSxkd2ALE9mM2SdPrQhB29b0WJbknARfL9st
-FA4wqjR6mMBxkgXO3SMDHiATu0SLHnJ9KriyJ8vyzjY7QWY6HxANxidrTTsEHAXk
-2AGoJ3/AqAp3y2akUuufPn7R9mdOC9Nx65SmyOxiHKy7En71zJOOd8A+PAo9jmf9
-ZgD5Msl8sBKB0T2blHP8a1sMO4nxmrVpMsdmGGrq5LkhMq7En4pAfAhEfl/G8sPu
-q++zD5CQ8BubBmQ9wO84bOBmfsVo7xyDzmZXi4Kbd5+mgmBmt4wVoijGrPotufow
-qPiNwZP4jx1BpvVBlBWHaKL7oerwFENCcjBP0BXBt/SdXd5GqDf87A5rj4knur7C
-yZQldpKYy2JVMG1t/HewY8A1YN4aSAyFcHqMHduDO9Z5a4RWrDeIzOJlVEtVghXF
-hh4AWgxCQ9qsO+rGrULY6adp/rjC++d7T0Qbd1Py7kNfW+6sdseLzba03bF9KgFS
-WOwqYMKKZNTmU08Eaeua3gDOLjQTloFqlHLI/qvWdRRN+cXUgyoNpik2SGnFOkgT
-ch/4bo6W/AQBHqngF2Wm
-=8GWy
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmikx4P/0RUvE6DBpkq9hqR3q4sepn2
+UxY74wRzECstE1ncB5YS13ethhwmRUSCohcybw34Rv4rMTlF4tJhzbGEB8+D1HFd
+03Yk44jyYHKlHodGV+tGfOFfb21zUfcJ3oM2Lku2JSMsQzMPGevO8eAmzdIWdNyi
+UGul/Z3/bt8uaXKaIqXeYSi7snHtYcvxV2KrXuLC9ZweL3bs7RniWYx24pptfqGm
+fnLQhe3dfxyrS8t71g3eKBUZJAYMK0L8wLveVLm830vIPX4udZ8wVKhJON9mS5jt
+gr5F33KmPg6Zcoxwwq1F3JyxQEu3xleYINdGmu6QLwSPF2opjtcjlK7xA1RUVrV+
+70QJwaxV5SI1KLtefXY29mljs971jq77WOZnGK210XmAZ3uqvhSUIchzXjsu6mxz
+JDysmHT5DiSJavBlM4H5SAaIdDTFZ00Kxu5xf08+Jss91VadCMKb5Ix9Ei2R3COB
+ZLhtuWMiTeZYsm6fCWazgt1Bl/Y3mXkkCVhUNHEJRujfPWOh3IkjLlwm8fneUHJz
+kgcCwIzWaFW7k2Yi8I89ONlrVulEducczxq1qYeK+fHLt7AItQJ7fxI7hdfItGH4
+6gqar5WYdpgNm+PAjoOAcR+/uBnGTlmk5hpFT/6ObPooak5fqAYdtSyZZFwIJFpF
+50yGZEqXQ+B3zuKL4mzE
+=3lOZ
 -----END PGP SIGNATURE-----
diff --git a/dev-python/xlsxwriter/metadata.xml b/dev-python/xlsxwriter/metadata.xml
index 1ee6f805a6df..6955a1f97fe1 100644
--- a/dev-python/xlsxwriter/metadata.xml
+++ b/dev-python/xlsxwriter/metadata.xml
@@ -4,5 +4,6 @@
   <herd>python</herd>
   <upstream>
     <remote-id type="pypi">XlsxWriter</remote-id>
+    <remote-id type="github">jmcnamara/XlsxWriter</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/xmltodict/ChangeLog b/dev-python/xmltodict/ChangeLog
index 7ba8fb57695a..4c39fd266cd7 100644
--- a/dev-python/xmltodict/ChangeLog
+++ b/dev-python/xmltodict/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/xmltodict
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/xmltodict/ChangeLog,v 1.14 2015/04/08 08:05:04 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/xmltodict/ChangeLog,v 1.15 2015/06/07 16:35:52 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> xmltodict-0.9.1.ebuild:
   Drop old Python implementations
diff --git a/dev-python/xmltodict/Manifest b/dev-python/xmltodict/Manifest
index c7693e2ce149..35491221bc02 100644
--- a/dev-python/xmltodict/Manifest
+++ b/dev-python/xmltodict/Manifest
@@ -1,28 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST xmltodict-0.9.1.tar.gz 37721 SHA256 ba676bec7a2a2e8be0565c26807db8661f1bfd49b5fd7b2d89731270137f49f3 SHA512 4dd3ef1424f74185d37e41c6860c37c63e4d11735bd5e111025429b66ae2bff8b07a30f245dc40c85dc3e657fdfd3e91d7074adc69fc0d4b7bde1bf16d6010ac WHIRLPOOL d4dd1e1af07778757f2de80bc606656ef1488589d50f8da7d68894b9c66e7a6b3f6bc7a5ad0c35aa93e661ec9fadae028261df59dd79b9b922c274eb29d27c02
 DIST xmltodict-0.9.2.tar.gz 37875 SHA256 275d1e68c95cd7e3ee703ddc3ea7278e8281f761680d6bdd637bcd00a5c59901 SHA512 0d2bd2cce9b4484514cf16df92abdf26dfd17e222ea6a9285ca1216858bc8092bd328f39b8af851a1293e9d72f140775e12236a440004783a6bfd2321efec0c5 WHIRLPOOL 909460169cd3948dfc231040cc7f827436aafe0bd89b246e1cbf15699c84356e2947c704a555f62d4e378481b5acd5893a67bf31a9d97cb4b8f7a01fe378f76c
 EBUILD xmltodict-0.9.1.ebuild 888 SHA256 980ecb830dcca3bd5975ad43a017443abbc909cd268fee48d6379a9c7f182c25 SHA512 5018f298876ad1d09a1a8a43bd2560d817d75f133e1b85cfbb864ed6ca84e716e8e57adbbd2a62e47a4f371682d4d203b1c9c8a3593a8ca22ae9bb707b2a6e8a WHIRLPOOL ef3d84f0d1f33c90b31809a30b09a052097fd2b528c3caef13fdab8f68c7bc2ef191dd4902147122d94d3646de5d318e6952afac87f2a99eb77e1bad1254166e
 EBUILD xmltodict-0.9.2.ebuild 745 SHA256 0a8a0667d99472e967fc2a44f0c13d66c583e098ef68c6ad1b16874688699889 SHA512 4775d1dea7851058328d91175016366093b41dfd681dcf336c08da105e5e9515f8acb9a343d3d1533f8edd107c3c34dd0700a8378cb7d2abc61e5feeb78d2152 WHIRLPOOL e10111b8e83f0ac305081628e6a9e08970f4d17ddbf4bfa692fa8bcd17a639b7254c60da0333419981df034f94e7dfc9ba19845864d1d39e767352e22a909be5
-MISC ChangeLog 1883 SHA256 d0e687b977674d02520b44c9ff2e67ebc99734c35bc0acdd05d8d4cd784e1627 SHA512 58d52ace0f07f40c82791cc803271c51be7460cc8307b00d387943aef5ae5775ec26de7f5ce88e29aeef4b30d18084f883b46ae6385f3dfb727d777c14cb2662 WHIRLPOOL 99b88816f9c143f5d1874a7a436a8aadf6d825039a1b30c80944eb7d98b192e09d4bb031223ada6eaed21e3512120355aff5ab181477dee1544e6431150c1da4
-MISC metadata.xml 232 SHA256 3df1c4b1a85cb6f735a3596ae60f762896508061d930381e3fd1d7c75f5cb655 SHA512 341ff655ad9e6f5d47043bc958044427fec060593cb3b45b186543f6b7127327f96c283c437bc1eec7ad44fd89b6a96b9e070de3db9f66140c165bcfda893a26 WHIRLPOOL 71d19c4b97745a2bb2f9895192ad5916b70922fbf5a8e689a948ce8fdd4882db9d63b931befbce59eaabf9ec640e2638ba00e26ee8f36ed52e929fd8cc5baaac
+MISC ChangeLog 1985 SHA256 f5588116c1621bd6350d3c5600158c2c251c85fbf623170554f38a6cccf904ce SHA512 fd2f0b087f34c9516363783b918deef747e4dc7acb3fe46b4a17a1099975647bc48dc08d71ca7013d6b68c0edfa2c93a0c95c8457b5ad45f2c7ee876d63e41d9 WHIRLPOOL afe0a8e1746a55822a2893dc5907026854693bbf08c4b71a0c1e096d86a6f8abbe0d72c18ae5906d61c8e9aa93dbed1b47b26fad59029e0b7cc9b8a12f0cc650
+MISC metadata.xml 300 SHA256 fc31e49adbe93890caddf90497be2d46f0f12382796e05fd561da814efff93b7 SHA512 3f363b6397b1be10c29f090cc850b8c63956273048a7500e50cd3ceddbb03504f890cd2a1dc9d94b81cf6ab6a883cc9c889e15a3f217eac43ca26a9d2014ad88 WHIRLPOOL a8a8cf85583b8ce739ad78c5eb7fe860f5579b3541642bc57b646b47978ff7477306f4cbe67b2cf1873b64e76a8eb928fc37bdad6ea2fa9d1acd332248737318
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVJOKdXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOxBUP/0nPOq8fn0B2JKA8qj5l8xrT
-FQ1Lj/LN49tKOU6YRt3pg0qYP0s/Ia9F5PFaKjCnGCwyCHUD7dfAigxO2zkmnYPm
-EQ6u7/r/U8YKawDqY2hune2TJLM/uraAw5PY7vqMNUW+y3v7thyLraoBK4s/Sade
-buOCeVn/RMO+YUvfZkyjytF4+xTSEtvOknn+h2gjSUhsPWoSKXihjy2eskuk3hfc
-iicrr4nZpQtfqxirtc3LSIuIth0PAPR9XjUZjIOguouOlQN2oWFdBY4J6Hx8DETF
-myRq+tmcL3W0Y2DsJBRzdQB/NU+6Q09AC1xp11Yf1sTPXSiOJoD5nVs3NMFJAobD
-saiM1GsPFVadRJduX711Oov5syYpmDPT4mP28XuLxnIy2mElxh+KsAJiMDvqxifX
-L2y+E35e9dS8BD4QrnLiaRmW8Av8h8h2DjrrTbO2vAQB8qFQkTggrXZ3iTM9PMDd
-Ygp6SsLBSFFMZaXOkdiSqISYL/JQDIJk3tv8evLk+dg19+3Ger3GvZiZ4GE3afPF
-vx+QPtO7aEDukKtZCIViUho8ZQ3LAx89ZEvcS6wX5DARAlD3ha7ygrPbWZ4PBHyw
-LA/myw3FRbLlOunBXcIaw4+yDiYAUx9aeH8L5JbVF9q1lpJVcUnjkG0UMsRdrGf9
-VKzlxaYgE+vtjwf7rLDc
-=O1Ia
+iQJ8BAEBCgBmBQJVdHLpXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiLzwP/3zezAg7mOmJFUXs6ezDBgA4
+0ffls/i2cSP+v4+tgZCYn9qSlwyFhWcLpg0Gbxq6x4hijUfLfDot3FGLLHFlfAwF
+v3SdqmY5T/DnICljIpZqxr/GiPgaFLgWAj8E/hUHnhARYvoXP06+Bi4L+MUJwofu
+sPXJWx1saAFYubXLy9se7Kj0jkJaUFEL3QpH6vo7NsAzvxDmePvnQp0Q6nnW6ZTh
+xFnsGSfRJAIWBqz03nHgPeVriNGnndx6Vnn75mt+SeCm1yQRXOc1FMMqU3RyiruP
+gTp2//PuImTbBddMgoU8spHL8lvekI7NFPJB5wTUAgnYzW9nxn8QPW7c1pn1EjPw
+1/7LJXKwyy5wYAmXzAgGXflzlHfkpTGN4YuR74u/z1SIs9ePi9uyU+bMyGO6tKE3
+bx8vMfSxGDAegUA9Jt9xFCx1jLn+OWqYRhCKRhh/+B89FXEsi+C4w9De7lTmMstM
+Sxp+z+ZyBUcQt/N1Jx44Bjbc020aJ95fSv/BKknDsE3G87m7OKD5ksRdR3Tbt5tJ
+R7l02w6yuZ3bkGGtDa4qOwCph4Uhd+zJvJ3WXdGBLqsUnKrlBkSN7GPtHm+c+6ef
+sHZPuX83/nEPTWu1mBs2tNJsFjPrh0v8kL44W1pmhjl5zKgO+znqlXon5sw7KteF
+VoLpo9XNJzvdkcv0+uis
+=Y/Fh
 -----END PGP SIGNATURE-----
diff --git a/dev-python/xmltodict/metadata.xml b/dev-python/xmltodict/metadata.xml
index 8101a7488bb1..0ceb52bcca50 100644
--- a/dev-python/xmltodict/metadata.xml
+++ b/dev-python/xmltodict/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>python</herd>
-	<upstream>
-		<remote-id type="pypi">xmltodict</remote-id>
-	</upstream>
+  <herd>python</herd>
+  <upstream>
+    <remote-id type="pypi">xmltodict</remote-id>
+    <remote-id type="github">martinblech/xmltodict</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/xvfbwrapper/ChangeLog b/dev-python/xvfbwrapper/ChangeLog
index 50677937526e..f296b171d7cb 100644
--- a/dev-python/xvfbwrapper/ChangeLog
+++ b/dev-python/xvfbwrapper/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/xvfbwrapper
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/xvfbwrapper/ChangeLog,v 1.6 2015/04/08 08:05:20 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/xvfbwrapper/ChangeLog,v 1.7 2015/06/07 16:36:11 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> xvfbwrapper-0.2.2.ebuild,
   xvfbwrapper-0.2.4.ebuild:
diff --git a/dev-python/xvfbwrapper/Manifest b/dev-python/xvfbwrapper/Manifest
index 0f89cb1766a5..02f613ff02c1 100644
--- a/dev-python/xvfbwrapper/Manifest
+++ b/dev-python/xvfbwrapper/Manifest
@@ -1,28 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST xvfbwrapper-0.2.2.tar.gz 3421 SHA256 58934508285c43aafac4179f26c34735b46c0bcb96b66198a4dbc68468e3cbb4 SHA512 ac71ec9a08189456c40e493f57802e872c03c0c5caf84493d77bf2e379853afe79099bcf5e5c7c0eb66ff1bf64e44bf37687a82b49864bc63a237f767752eed4 WHIRLPOOL cf3d39ff9eb68b3665c84c87cd7306134ca6d98734111855a777fe53a0528b5a212f3f082fe4d7734a460325875039511fa832e0ff9983c02c9dfc6b2bb54d90
 DIST xvfbwrapper-0.2.4.tar.gz 3215 SHA256 a7f52aefaf2e18c1aee302eb295ba9ca53ae6d3ba36df76794945a338a4b579c SHA512 26b14fd64c00ea33ad5f32dd69e59001f468ab294970ee281c81f1ae635cdea105b6057ba2e1012975fbb935ccb222585e70798e78c17f476d8b3e40f9e1346c WHIRLPOOL 791578eabe86fa9f3e6d44b9b03008fe8dbe2c9d853453afd29cfa28690d6f4cb44b948c5d991e4cdb7424a87fcce334bf7e403f2a6f781f6868f47af6a74268
 EBUILD xvfbwrapper-0.2.2.ebuild 780 SHA256 c84c5f7de93de0365695636cafc225a32999e7c37803b700a079bc44289e7708 SHA512 e8ba28fd0e341d527f4d7cf78956631904a6af57cb4ae1f81e53e7c3e7d4c9aaf4abbdbd27a51d703fa33cc6d6ae4ebd9803aaefb577c3a69aa14524fd64c665 WHIRLPOOL 1d23e8d3f9be942c30cb75f5189a98534829067ed0d08c8890c130e299f43061c672bb1079a9673b1f5fdb4b3088e7bff463e4ca82c211217f4c17bcded4c531
 EBUILD xvfbwrapper-0.2.4.ebuild 845 SHA256 63258e85fdaf9d8fb03901059b398dc35ec1cf6ef3f837879477c5f834fbd456 SHA512 23d30040723e35b6e5a8165619b45c4441fa81f1a5abf73713b972487b36fe1b045d646d9686aaffe99a0e4827157be8c9f66e047ceb889a3877bf40b38755b9 WHIRLPOOL ef043449a364133f2fde92e9ee979af8a596781fa13ddaa7370bad266da2cfb8a80e88156a7c517b5159a312f5bacd0b6213cea8b44e318c6889c734736dce45
-MISC ChangeLog 955 SHA256 9fa1d74b2c28f47ac895f4bfe25c1c52e1bc4965e08014556ed8a974c21dc76e SHA512 8ba63bd9344fe71050e682c44b419b3c5a349567b4485d42601f90d0744dc1a011a676ae3ad6dae3a84cc3ea57921073f0699c67089cbf0d9d274b5f9690cfe8 WHIRLPOOL dde348c9f723611606ad346b7a89a20fdcc542a6d65265af3859a8bac602cc4ec91ab0c68db545bf80ee7d6c52f220a073ecae5d79d750781bca36c9b69b9192
-MISC metadata.xml 234 SHA256 3961e3c74d86be91bf92c97ebe204b352e6e489bdf7f935b1aaca7949968be87 SHA512 04bd7cbea4165fee9260264a829f8d6a4a0edd404a290e053eb96054c5d77f8e2dbd6c18663b45eeba02ab231bfac929396bb32263755f6968f030cf5110a6e7 WHIRLPOOL d3bcae382d4d9a39dd05ab6c92888ff4c75e871acf524dbedef6ae70eda240e30ef0e25a2ca0e2bdafbc9b0cc1c407ce592c08273d97841f35c1585a10136ee7
+MISC ChangeLog 1057 SHA256 ec4ad6879af7af57d5a916b96be41e8f13c5c6d5011d79014b7e58766f5ce9e5 SHA512 237de79e09679a924b8cf4edf53396311b89bb47b8ff6567177cee3e8f69e30e82acb6b7749a793e9e7ad0a97a34d9e6f25ee34242a2461bcf7a825a173588fb WHIRLPOOL ed5e8f7414c8902a119b9f70a2a0e1a9ab3e76cd6c0430bcd6665e727bc22afed6f1bcb0fc75c04deb921319e4f434215b8e9b3880088efee580298dd619ffcc
+MISC metadata.xml 302 SHA256 ded1437d225760141d1c59f1051f1e1c45050900bbabfa6979ab796a0615840a SHA512 1ebf9adff6fbdd541f99f04d0dbf330ac8e271e1446a83f3417d10a802f79f9563c7410a9692d367ab26584ff3d27e9770faea564732a0ae2d52b165772bab5b WHIRLPOOL 9e3c77e85057c93c97acf9ba2e0c3d43c7828769480e3c8f8f74d69955462480bc7a19ec0a7df26db1aac8d92a87c83a2bce75038291511202aca39cc36d49b3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVJOKdXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZODRoQAIGq/QQ/zSDezMqlYUmybm9c
-Oxp5MLAE65qasKYBOBMUecEHVG2sLI+qhSY1Ql0OtrXv2PN7XbjLpPVXNGEMWyCZ
-fJ9wzho0BtRaX2VMFfsgobVJHVJgkD5IHkzHzHfTXL00FD3MQ24PYkbynJNppl5z
-fISsuXrwSFntyogAUz1QSZf32iD0Iu1FIEQ1TOHb1070PXAp9Cm//g5A3K7fo0MR
-OqK4zhuy0/hNXLXLjrWiA6+8yNmSPtIfYDL0hzU3iOECs0fFajHuqCKntm+fw8iI
-q14vARl3IcvEHRYKd09HwgEN5QJxPoqZEpjZTtayipTSNNh6GSzLbYQP0q14Ni4c
-Nc7JNSdoIn4ZV77RDx4GQ8OnvHRxZZnoQkCQL9DPrbGRx6V4o33tH8ZFGVCvMboS
-CrzAh5VKJxSpg3XJyEkNd8RE3QPV3WY3qMhwxnsUODNYYjX/nlWqIvpaQj2DFSy2
-3XTZ7S5TTkjq4nBs2BItrv0Kf5Uo8vBCTfxdbU23S2ouhd03ZmzRwbc9tJQ4+w4C
-+0x5d5MOVYyG18JCfEyvWxv9wQiHv7Wm0CEDgABC/HGGhEhGuSuudU8eONCpZ/Qv
-q6jk+geqwo9YB7zT2FjKARtso7486XP4ox1FhP6kU7HO5+hPIx4maCRyZoDUDaBO
-S+K9M4qBOUfrjRRZQrI6
-=GH2w
+iQJ8BAEBCgBmBQJVdHL8XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiYhMQAJZE/E7hvekuycP40S/5p/PT
+lLGc2wuA+bCd4oiO/Kl0ZinuqjMiQ99YqrvJILnQ3MyymCqWRqTbHqnXzZjNTXG8
+oxLDnV78l0vfaVaWg67+GkSPMmx+av8c20EARRF3iSXbrjcMemmon1vwmXNeTiYd
+8IF6fn55q1m/5FGRkJA9uMaUI9RmLCJvY31Q2gRQEM0lxctGRg8bCY0THb98XTqg
+CmPPj8VwE43OGWfhpjjaTi6IRhvmavMMec3EGZbyDat/1aRRNT0VOAhUg/ez62zR
+W6dhQ7FCXs1zxKsjXQMlaaGLS7vT2mviASThK+fnvGkdN4EBphs/M2JpqUnHeBfq
+D6uJ6n3V0v9xyUFnpC9nhc5muQT8m/RACQCkAN/pyoBjkTueU+G+I9uwzOtfN/83
+kG6jY/JygVIFM10f+yyz/3oaXw3i1xB4aMinJeZKlOd8KDr6z+XIdGN8jWAUKkw5
+f0GUch0ZcRXzsxEZG98OS7MOUM3wM8oJM/YETRpNbQ5UPzgYTQUddW7GN9kaaQQC
+1W2fDX80/zwVZ2bIpMq5OScYaP0jX5oQwNGJNlCtNs+B87MVjLsgBUDQeP5YoruR
+TauTegQy7T/z7kC7845AIH06S6zUuTPyAmXUUuRTQ87PC5i1FL/ke//F46zoQSs9
+MNGkfPPy+9Ce8ryuMdRv
+=f1A4
 -----END PGP SIGNATURE-----
diff --git a/dev-python/xvfbwrapper/metadata.xml b/dev-python/xvfbwrapper/metadata.xml
index 8de041ce7cb4..ea7b0b684364 100644
--- a/dev-python/xvfbwrapper/metadata.xml
+++ b/dev-python/xvfbwrapper/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>python</herd>
-	<upstream>
-		<remote-id type="pypi">xvfbwrapper</remote-id>
-	</upstream>
+  <herd>python</herd>
+  <upstream>
+    <remote-id type="pypi">xvfbwrapper</remote-id>
+    <remote-id type="github">cgoldberg/xvfbwrapper</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/yapps/ChangeLog b/dev-python/yapps/ChangeLog
index d0ff34e741e9..f1e3f5b40725 100644
--- a/dev-python/yapps/ChangeLog
+++ b/dev-python/yapps/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/yapps
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/yapps/ChangeLog,v 1.5 2015/06/04 10:12:13 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/yapps/ChangeLog,v 1.6 2015/06/07 16:36:31 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   04 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add pypi to remote-id in metadata.xml
diff --git a/dev-python/yapps/Manifest b/dev-python/yapps/Manifest
index 6b3160656ef1..f8254f9367f1 100644
--- a/dev-python/yapps/Manifest
+++ b/dev-python/yapps/Manifest
@@ -3,24 +3,24 @@ Hash: SHA512
 
 DIST Yapps-2.2.0.tar.gz 13630 SHA256 d6e16a8e22ab559ca52eab58cb0015bb088d6889fa06db795222cdccae2354af SHA512 087f99071b2615f5382f453d9b3492675704aa7e7ff54b332d7c4e337e16fbd3ab3c1b3820a7941775c0b3ecf7e255a7773cb47ea20e8adb77dc3dc8d9a49faa WHIRLPOOL 1db693327d88445657fe0a4221928bdf0b81a6c7a238ad1f15579ea853975ce1da15b31c483a6782d43576b8f32024182d131061952d8d00493ca211b2a10eb2
 EBUILD yapps-2.2.0.ebuild 620 SHA256 579b1aeba79562038f4483dcab333a5d152bb5fe4d333846ed37865d70506d16 SHA512 1c65b98b8335b1e7dae2115fcf69c4a40691feef765aebe21a088a671061c984e12bb84255bdf8d9d2e488dc0c86a6308413858c778f37ba91b1137fd7ba4dc7 WHIRLPOOL dfed239fc54b28995c419dfedd34c41ecd5e202e2d4cb363ff4704f7e341703f754211e4f3e61abfae0c79714a695ecb202447130bc8d6ddaddb6fab3c14a864
-MISC ChangeLog 1453 SHA256 6290a40110dec414a2ed6a0a0915e5db1e204da658fae196c5385655af3ef048 SHA512 acf53e5a07ee4da5efd21308f8cc4f24edb5a8b2285a3c7e66e5ffeb7087c77c91f0b9cf49d069c6e9cf50e07fe17fef9a240c2aede7e296ddc5b95663b2748c WHIRLPOOL 4fb884efb24a20020a22544b0130b06f29a88fc2dbef5c28a866bbf5545926809ccf38140a73f1d961293df16689b93c794b4e370cbbe06d78fa2e7fbd628531
-MISC metadata.xml 233 SHA256 a42f84dcd66573f81dc1a5ade8eec488a62979e476b59fda2601a92983f58393 SHA512 cdfd778a0eca567bae9e3b271845eac6d24b76ccad6ebb9fad3bd7a61447aaca04f3924f1754333a6dc63b9befe657fe09d6f0cf1f6006f65cf9f532e86818c3 WHIRLPOOL 95b0b9ededb7990db70da97beee7c7f385a54e408b73cf7d6802fa56fafb9bff568b94f978f586d0e4eb7da00a54b5dbb697a922d12f669156cd892f57383d06
+MISC ChangeLog 1557 SHA256 4458101de514d793342c979296784c9ad879c4d406f32064c8ac7c929ad42ceb SHA512 caedc101fbb95e54dd7dbb775e40b25c76fe5eca500a4d46293cd3b6ba97715a56cc9114749213159569f91dd2a6b1db81a7594e96a703c11dab209ed2d78a4a WHIRLPOOL 0f348f2479828fd3818f451f58c48154655e01241389ef8f8d5c04560d8f08f58b1f02c7a1ce9d427871f6003874b38f5d9ad35097858ec71b4d466ce02d5a45
+MISC metadata.xml 288 SHA256 0384b64388bc7186993feb3021c7758a6c5a21543bed4e083be0718d22342ab8 SHA512 f879e303faf37b2d398fb92dd889b99801598bd0e580cc94b55d8cd87074061cdf9be2e92e76f064c88d7ce4dae63a55f2f2cb90dda249c66eaf92597c303530 WHIRLPOOL 5950dfa630b379bd57fe2a161d8db00caa9dcc5a5278637dc93c6e955f87bee9b02f7d74832fbc8f8dd4922c206fd390be424e084b3ef44b27aa700529a9ba7a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVcCR+XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVdHMQXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiizMP/jhb/YehCxD1yEcVk9bcte7M
-Vc4Nw81ZUNZSU8NH01R/qT5eJooJwn33AY5PXLnw1X6ADEKcQMqd+CpDXjTzw9Pq
-KYkdpRaRykFzt4742EnhNOFnKq2eSZeOEby6bqfiTL3vSrVkyafapcQIZJTBAOPQ
-veZ1bpc4/+xJ16PFsQ4Wf4O9DFVSgKXrgkiWj2qhzAPDhJnC+SgvSzm+wG+NYjDP
-mpEOWbHIftKwTXOinEv1Cpiw3NwCBrMuV6e21Pp9krcWtgAQiOeq5OrV9xCi48Tg
-AoKJepxeex6q8Bc1BoaMXvnGlmTFdBZXZ9I96q1rrEDGMVGO/cSfbGYlvAPlWuyi
-Ne0vXWuUiVEww9/TS6PGjn0YxMMrtf54zwhTcqwss4+EZFprkKuvyt0TWpsMILqH
-HkaJtgvKYi6RrShujagBZQqmhUy5GDRrVBxoiDwUyEYZN01k4pq9EgYd5NaGn1VA
-36906fxVfVm4/8ySMVW2of+6yUfb+/tu9NCLjNrAcb3sE3cnj8fOptg3qB3J0eAT
-C7k38psQoef2YjEkupQKcRjQDmf4gmufOD+64AzpuFgVIuJGtB0uojWgnfZ8VI/z
-4dGG9kVlYr+BFsgBPRogJLE7YV4LufUHa/BUFq25fjWncajXA+C1Rw7T01xi4wY4
-wUMrpwT+sfr3toQMy42q
-=0ZO2
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiPUQP/2FYetEcxzetpKSSIIK4jsvH
+DnehhMUpXsUFyf1bTne1r/4bI/0xVRmsvS5OgJ/ggwVDLGGb2xz/bqx0mZfFz4gy
+eYwV4RqH0xpYcsHQlf512OgO/ElYZJGyAxCbQPiuBJZDgwoozIuWULpIWv/UMwev
+WqYzusTnx4mz2PBRafgU0WWFoL7PCTn8W2IByK9Wt8hvfVcm1jsc65f7gjvBFXyw
+v+0qDuVIJs0Ryc8EjgnOlHKPl3RnnM7uwUcdRfNp/DDGEfT9g3IXS3/IqHG3aKYU
+Ao32Jk5ne9RdZIkLjyo+AB33SZ8lAu+FYOTAXBffXV8InS/PMYIZdGNmiN5xhBJg
+thQWUvWX+49e5focoJv4lq8Hm+XOVEthZLqi2AyBvwPTpomROQwbi0nBlEJznLgH
+/c+UV4+Wbf96zaVSdl370fOrC3h2R8KWgf3O3oUev8qxsNdcAaaE9eAhY6/H9QYY
+TjrrZWbRroLVm+UCblsJrse2nefLrBCgQvzagrdHyVV9FZxZVZMi+P9SeHQzwQed
+c3iNcrv9Hw0kFYGVQ5Yiekh1nM7H8AqwZs+kN8zIdj4c0q2OIiXwG5YYokue8ySV
+AK60EJFCj3OJ1HrORa0+20+zAHSzaTTBVu5sFacAJlgtaMJGsRm3GaJjQ4F5fU7D
+aGsRmVfIwekRD6r/CEyO
+=05ox
 -----END PGP SIGNATURE-----
diff --git a/dev-python/yapps/metadata.xml b/dev-python/yapps/metadata.xml
index cf4a1f288139..6c460c309c0d 100644
--- a/dev-python/yapps/metadata.xml
+++ b/dev-python/yapps/metadata.xml
@@ -4,5 +4,6 @@
   <herd>python</herd>
   <upstream>
     <remote-id type="pypi">Yapps</remote-id>
+    <remote-id type="github">smurfix/yapps</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/zake/ChangeLog b/dev-python/zake/ChangeLog
index 921351fa84a0..70d9ce795cdb 100644
--- a/dev-python/zake/ChangeLog
+++ b/dev-python/zake/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/zake
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/zake/ChangeLog,v 1.2 2015/06/04 10:16:02 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/zake/ChangeLog,v 1.3 2015/06/07 16:36:51 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   04 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add pypi to remote-id in metadata.xml
diff --git a/dev-python/zake/Manifest b/dev-python/zake/Manifest
index 2a18f479421e..15935cb1ed24 100644
--- a/dev-python/zake/Manifest
+++ b/dev-python/zake/Manifest
@@ -3,24 +3,24 @@ Hash: SHA512
 
 DIST zake-0.2.1.tar.gz 12972 SHA256 2e5bcb215e366e682fd05dd1df4f2e6affceefa5d3781c2987a21fd597659a21 SHA512 a9f7ddeb202e16355680d8aeb39af920eeb4280352cf746c630d208567c948efe78036032d4a6ca7b1f719093eaeb1ffa071c66975bd8036a9015706d64a76d2 WHIRLPOOL 411ea1d8463b68633e3ee4717524c0b316476b060b3b3177016a4c8fe0f539361f920c516cf5f25592a46b40fd88978840fe820161314e4aa0744cc9f01fbe00
 EBUILD zake-0.2.1.ebuild 861 SHA256 eeacdfc60242efc3ea140bb1c3149a13f2baadf6f7c7bc4c5db0efd8341468e0 SHA512 2667f59e9b0b0f65d19560b9ee667a956f0ceb4a5fbf05a859e9a75683d77d5491b7e27615a3d4b7c0a2e0b016cecb387f4c6325e751ae009195fcc8f2c0468b WHIRLPOOL d838cacdb150380574dcbb8535af7d0495418e067af4d7568fd9fbb47aa1647f742e107ab55d80345bc904778918e5de80f58c5f8bac5240ff4acbe198d1ece1
-MISC ChangeLog 431 SHA256 281f4b3f09f9c28f5d114456006f86be7406d9a3a949ed5751d79d84962d9da6 SHA512 76293ed0b6953d07f1857bb83fb6ed68ba5191f1b05cfa448e60d6e92da4f173f52f209a4cf9be3a807dd76e3e207e49e7a64bee675fafd3040305014aa03de9 WHIRLPOOL f309a4bd8d16c21777a4d5e925d5251a1f8bf1461e578b9ed0e53b1d8fd913e849e6789ca16c0955ba1dd1b0d41946ff27b035a22b99c3b184744f9495248703
-MISC metadata.xml 489 SHA256 905bd882e6976c5e18888b7f01d55270e538f0af0c4479df08e388d55c48f83f SHA512 696f62e0497597f838b17bac1d03c8f1c20e13358f09a7a18f591664817c149a4aa0fc2eb5a185fd671bff865854e5139258336c1a9a797af284ab9d4da48a2a WHIRLPOOL 0779eb9b31797b5c2224903c3db45103d30f5416e347f9683c45665f90f79a5921ed60964cdc1e3cbc5c053298969fa99380b07ab6e5fcb6ce39a03c063470e7
+MISC ChangeLog 535 SHA256 4094ac0819ad5e055f4cfa978d615f67644b9bd21c6a58c4fd4ea2fc8748e1ba SHA512 cb9bf5116c16589e98600c9f8415c8e110432a411eba927f6a4200842aaba2fec878e791023502e1570ca9c3e026368330b5c0a5201e027e63e18b8150a5e5ea WHIRLPOOL 54647338a58cef4c6b99ac7ddeaf44bcc3359890594d71ffe2b3dbef7b115e35d3d80dc28a16c006b61664ca967106f7cf0124fc27174cd051a04baba85c62b2
+MISC metadata.xml 541 SHA256 d2df6c4d80e0b3050ebf6745ac6d7672d62a05995d7b6ac7a404510f0f1e26aa SHA512 132fe54444bd7e600b291fe96be62914579e676d714a34eb34c6c09ff4c02541ce127118bb8c4d93aa4f4f7dd4d51faa226e689ce14a9744aeea7bd8593ab272 WHIRLPOOL 0c5030e64889694114784320ffae74145730d47b05c01a282375007c22e59c33bc69679db88ab635f30917f6e8dfa205c60776b148fcedf94f008932f90b9235
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVcCVjXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVdHMkXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiqMEQAJXPBkdnaEpghSoddTEvL0Mj
-twB2AGf7OcU5vwEj2gsylZxrfM7MSO4Zuu8VNpIn6Srts9q6wUdd7qxFc4gpEKLa
-y7lbDy3Mtd5Bdjc07HWNrXxcu55deeCKk9hk/xS0Lmarp8Pm4DA1/pCgJtkkAvKJ
-KxNb5nZrdzoJE7bCCq4JlOQ2xB7LyHRTfQZycZlVbjb2bQEY3OsSnqMUI9XTRETh
-uvnkiQWHgrjI5PJaCqS45v32oX97StNAhFqgbmoQ00FX8Uxpln+1qN1mgoT6ZMgo
-gszk40v4/snVx6aYDcvrjAbtEGkj2/EQk5P+A/COBn4hIuoMq46iGPZqB1hVVimC
-aVVh7TvHHNZFJLUvUh2naiC8+iOrcd+7fOkLibDNSuIYO5K/diohRfQR2mTMJiHP
-CeRRsgFAh7hynZBkcslcb1hrbfiVagPAz4LKyaMVaPhnNcN5kaKo/j59LwtMAO7A
-fbrN7OAHNJrKHPROfGAtu5VjDTP3jHQbBep1UtXY8kT1s2kG+Q3/hGXhqdiTqK/D
-L2QPNSXnKEROvVqJ7LEiGT2c7RW3KxI2k5KMeW2dU/xyxpyMNUpGFXHhRlxh4KE6
-AXVVX9y+3fbZXvU4IIVseDquih7iZQUZRhj/mEI7dzQ1M34yrP9Un/oeYaxdywLv
-1wJ0BcMT8fw6pPUwGMV0
-=JpS3
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiwusQAI+HVU2HdVZscQz4IKkTm0al
+CyG2eJZAh3pk/twNRa26p4BcvoLPBDWW46GqPd95X6HDmo9qMNSW6UhfRmWt6u7k
+tvDgaGwY4b2BeadTxC+1lLPcQV2IxlZ4hc+d22PdqJc1R35cR2yN+x1aJ5Xm2+jI
+74z0/TQQ6qnrdDKfeAc+5PPVDBAO1iC7w0t0ZLCZ8JbHJ0dEgNAgGJdX3N+i4KDa
+v5xP4THooDeuQ76brtP8rzl1tRKuNNhAjrTtVQpxX9Vx5o+nym8xtsmA7scUTooB
+zy8IhsMe/srb74KSsG5sO9QAqxO/vDYNE34nNlCieuEzAigaZCDu64MHm8kkrocP
+XnluLdyOADH7jg394DDjPeVaKiO2dZTgZY+xZAd1lZw4OSXoLFQsE5aP/aqLEbFX
+zxvjmA0ZYdRRmpLPu/IC0yBiO1QU0fFglb/JeXIcc8VbQENau0PlB5aawGyFg1h5
+zT4kxZXFK5NulHFH+x69yjHHmePQaF2C1oiAhiNZ7czidzB4DbGkCCytT+/L7bI1
+nZo5U+v8Uxn0ZvV/JGp+vd6lo/7o31gcc3AYC+xMl9+uHE2hbtBg/At1rQYqub2D
+J/2BVyPN7guDIZJxz9yhaMJkHJwEu3GUsrx8uf2B3xVrQfabrWnF9Zd+QDHuPBAj
+lPey2zkDfo8cEy5FVMRd
+=OlQq
 -----END PGP SIGNATURE-----
diff --git a/dev-python/zake/metadata.xml b/dev-python/zake/metadata.xml
index 8cfaf8eb51f1..e02601cd5455 100644
--- a/dev-python/zake/metadata.xml
+++ b/dev-python/zake/metadata.xml
@@ -11,5 +11,6 @@
   </longdescription>
   <upstream>
     <remote-id type="pypi">zake</remote-id>
+    <remote-id type="github">yahoo/Zake</remote-id>
   </upstream>
 </pkgmetadata>
author	Justin Lecher <jlec@gentoo.org>	2015-06-07 16:36:52 +0000
committer	Justin Lecher <jlec@gentoo.org>	2015-06-07 16:36:52 +0000
commit	b081a370f90ec52fa779c40db736fa24d66fa9bb (patch)
tree	ec53b38dc5f7f9ce0818945d7672c58b5a09619a
parent	Add pypi to remote-id in metadata.xml (diff)
download	historical-b081a370f90ec52fa779c40db736fa24d66fa9bb.tar.gz historical-b081a370f90ec52fa779c40db736fa24d66fa9bb.tar.bz2 historical-b081a370f90ec52fa779c40db736fa24d66fa9bb.zip