Add pypi 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-03 19:56:44 +0000
committer: Justin Lecher <jlec@gentoo.org> 2015-06-03 19:56:44 +0000
commit: 6339cf31e8f02ec736120e5c69beecf502ae7ff7 (patch)
tree: 8e5608934ef700d78ad9ebb8025fadf14f76a98d /dev-python
parent: Add back dependencies in RDEPEND and DEPEND. Fix bug 549888. (diff)
download: historical-6339cf31e8f02ec736120e5c69beecf502ae7ff7.tar.gz
historical-6339cf31e8f02ec736120e5c69beecf502ae7ff7.tar.bz2
historical-6339cf31e8f02ec736120e5c69beecf502ae7ff7.zip
117 files changed, 1087 insertions, 679 deletions
diff --git a/dev-python/GridDataFormats/ChangeLog b/dev-python/GridDataFormats/ChangeLog
index a044fd75479a..a2ce5170ff85 100644
--- a/dev-python/GridDataFormats/ChangeLog
+++ b/dev-python/GridDataFormats/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/GridDataFormats
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/GridDataFormats/ChangeLog,v 1.2 2014/07/06 12:07:38 jlec Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/GridDataFormats/ChangeLog,v 1.3 2015/06/03 19:36:23 jlec Exp $
+
+  03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add pypi to remote-id in metadata.xml
 
   06 Jul 2014; Justin Lecher <jlec@gentoo.org> GridDataFormats-0.2.2.ebuild:
   Add patch for missing deps, #514752; thanks idella4 for writing the patch
@@ -10,4 +13,3 @@
   04 Jul 2013; Justin Lecher <jlec@gentoo.org> +GridDataFormats-0.2.2.ebuild,
   +metadata.xml:
   New addition written by me
-
diff --git a/dev-python/GridDataFormats/Manifest b/dev-python/GridDataFormats/Manifest
index 7d4c94fe72c7..5a1dba3e4bdb 100644
--- a/dev-python/GridDataFormats/Manifest
+++ b/dev-python/GridDataFormats/Manifest
@@ -3,24 +3,24 @@ Hash: SHA512
 
 DIST GridDataFormats-0.2.2.tar.gz 42363 SHA256 8305897bb291b5cd4e6513e54225f149fab2f5ad13b3437dff77aa6d6c02a383 SHA512 671ed6da8a4447f90f6a95b8fdec53ba793134bbe0adac0b12d97b66ea7e36754a14b64a21926438e8c901d7e9171e56a82fab8d8989fa09fa6bae512bbac229 WHIRLPOOL 2a2bdb3267faed86264297bb5933af7b2d3308587341c905bc091d214dfa9d11bdce3b9efc7c13baae234a291d93374f38326bd8585c75c0de0fe8848414c17b
 EBUILD GridDataFormats-0.2.2.ebuild 691 SHA256 2c99143a888ef62255e68e2bdb4b785ed065535a6a82cac1781b851fd25ed227 SHA512 21521c2ceef2698e2cdb00601df254eda691b1af9adbcfce14d980bdd25703794a77f8d6c024080577a8f47309e991c988d2e6869e419b7404cb7447b3ecb1b9 WHIRLPOOL f716eef963e481323ac73fc6eb41aa860c7906268a38fbf33080a74df74d40bae712718f62c867f48433b261b310c41a77b428d79e6cd255e4c8439323aecb73
-MISC ChangeLog 540 SHA256 3df7448e3b38ea132d8ded5aade496ea8f6b02cf65e06b3254a2d9b93156c79a SHA512 46bd4a374e23f08c0346d4d02db13a9cca2479e23ddb3fb074f5be2f370827c2e9699b18567c18d33d592346154c7329bea1e8c64e50d4e20e6aca697e8a1545 WHIRLPOOL 69dbb584da18a6b1197153cdb5fc732e2423f9b04f6b127991a0f282591cfa43a678e0a468e4b59b2805b657ec4f9e9541eb623cef3c8bbf44e99b142a158986
-MISC metadata.xml 224 SHA256 84b014a026c2945b1b4c6eda4a4576b09039b36c27c2f9f8920ae146a8acfa3e SHA512 3b70a09392d7a939bc59e483e63789152e8dc73351dc682548a47db282224b5d9df7eac8c51bca9847e0b647f88fe2a1e4059ffe262c89a84002a13507fb3586 WHIRLPOOL 078ad63719dd7c12015a2e69f1f00322eda7e4a85f8499b89779a9bdedc92e11bb6c8cb28d6cbdc61c144fe5f22b11264d65a06cc2e67d09a0e4ef37529df71a
+MISC ChangeLog 641 SHA256 c2230ee35f102b47ad9030f8690065f9ead8e2364c9ed083e2b6fd1961775d48 SHA512 55285394aae3b0488acafd628a56b2ee9593e969c27b9db57158217475e1491a8003c5c4600d8e6b27307fd27dda058535a157bba5a337a6205db4b25cdb5ea9 WHIRLPOOL c41b2aa224fa12d01313ae0c88bd7f6a0829fdf8b8d13940d6fbcadded2e2c48d27a6a588edccb26e8e93e65dc7e8d3e55208950e3b844cfa64965ff354ea97f
+MISC metadata.xml 306 SHA256 15829e83d79527e384d240b01607319104af30bbb0595069e0e865681f0e8be3 SHA512 bf11777b36f72a14a52208399fdb0541642727f830b713e53f28e48cb086d7a71e02f7a53d8fc733590fb1252fc7ac6148b9454168f5714866dd2bfacea3a85b WHIRLPOOL 387f982f31c0f97f2a23d64f59057c92f6efd6d99c360a96c417c744baf0168479906648287357dcbfef90350af714cc3be891df39e1f1d35941da25697995dd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJTuTwQXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir+3MP/0zXSmFpxvfg1Mk786WmznDl
-fizskKnAA9tNYu57HCMyr6H92gXtWfFKVfjLuPlrDmyNI5rlWiuoWCcIwq2a8x8X
-N6J6+bgtxINJNn1TAiYkEG3HepderQCJfzKJVbzg6GTTjCTJd8+5l0c1t5VZr+XB
-hpxSgiyVU8oPvWdsdHGzjv/AA5wiaUpYGq8XjcjxA01WLi21KoBYXXWX29OVfSfX
-PAAGyKQdd3G54l7Fak+cMG3eNq+qrVoKw17iJBK2RyXKvCL/W+5rJ4QInTiZkfF6
-jpVb5P34sORbZxNz5ubaNfr7mX/yt3zJmshsm/Rjsa5tp33u8zfWUBrSBJJ/nioj
-30cHJaLSNFX+FvtRMQ39j2OPGeBlF1JQVRqapaTU8swIpZCPEF8FSBg67KFRczeg
-D1q2X+KUFxb99+L+qUSnjAZfzOdju7YRPlYiGYfZhm+x8O3LKVntLWiHCFCKQi9C
-BQijT69eVN7Zk92ZmqiXQL8pt8s+nEf7MF5ntF8MQoQBYsyD5QyH1XfYhfZ9fHjj
-kGurM+F0Gh/W/hzJqBnet5i5XKoG8KRbSUDs1pA39uTWiLOLwAVR+g/AElAX2F5c
-a+3dQDWEiUZjBZt+T73JTe4aD5fbEguxcxI5AyC3YXSOrQuLHGhbVMOr0wxAB8BC
-M1SDaXOStVHpbBtEfXVv
-=DH+w
+iQJ8BAEBCgBmBQJVb1c4XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiNSYP/Rp2wQGe/ol1tO5ScJWawkx9
+Ysyy3Ra5MrGOrVDCYU5jlwo7Gxb9W85/hJgS8vNEzVcwMfgadHFn3htKS3iq8VRO
+rRNOjPZvgDHQIQIs08m5f1tqDaAy4px47QlQf1uJ2FmDuy5DqNn7plh/3E4Thwlk
+LEOAdhsXWjojL+Dm3cQa+MJUSUkx7L4IF9HWVe3vusCtf7Df5R7QBTwNeywHAQXE
+DnLmupwNC2ytQHARNaFpEsOgmkDeGn/FIvfl58itds/SSJogxRpLtHMicwcQu6+h
+Q3LK8U2euvBSZDn+fMMU437EGnb4KfLgEavs0JHEf5K5L33Cy354VEMEuKGsojBf
+Uu/2RL1UqWtnYhTPxX3epU/piBjgCP31muwTkIbKc+RrLsI/qhXSv/j1G7d94/YF
+KGWTI5PbEOWJvaZL0+vlfjbnkrQlBWpE/8vd0/JJCWzeEVnu6aiqRYhlXJ4vBs+a
+rY4tz89z1vLqG3EWPzM+XXv6r+SbyGMiyrsfVkYkJ2IxRn8/qjqiNx/EJ0gACQ/2
+WL5neF3rXTU3GhLHpENZ8GTCbTOWWnzeyg21X71LLojWzseadJv1Kub8gaAuNFct
+HzFly+8pc+6zcu92RMcQBw+2sSYP+Ney6c4QZZamR2FR/+noZwGBcTYtKvcuxbWi
+1ZUsKpDj76Bm0V7IQ0Xj
+=n+Z6
 -----END PGP SIGNATURE-----
diff --git a/dev-python/GridDataFormats/metadata.xml b/dev-python/GridDataFormats/metadata.xml
index 5ef07a39e7e1..1195c9e8d88c 100644
--- a/dev-python/GridDataFormats/metadata.xml
+++ b/dev-python/GridDataFormats/metadata.xml
@@ -5,4 +5,7 @@
   <maintainer>
     <email>jlec@gentoo.org</email>
   </maintainer>
+  <upstream>
+    <remote-id type="pypi">GridDataFormats</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/Kivy/ChangeLog b/dev-python/Kivy/ChangeLog
index 4493a8475cad..56dbe24c3dcb 100644
--- a/dev-python/Kivy/ChangeLog
+++ b/dev-python/Kivy/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/Kivy
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/Kivy/ChangeLog,v 1.8 2015/04/10 08:29:03 slis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/Kivy/ChangeLog,v 1.9 2015/06/03 19:53:14 jlec Exp $
+
+  03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add pypi to remote-id in metadata.xml
 
 *Kivy-1.9.0 (10 Apr 2015)
 
diff --git a/dev-python/Kivy/Manifest b/dev-python/Kivy/Manifest
index d87f466b3b51..8698e00909c6 100644
--- a/dev-python/Kivy/Manifest
+++ b/dev-python/Kivy/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX cython-0.22.patch 4804 SHA256 e7490987c956b1e312090951568dee53e3ed28070a21da2d5a8278e3250c706d SHA512 cd218b0db01cd424f8e5b26cd326dc186ba1328833858b607ffcd26add2e718761eaff012c7f0e051fd8dbad900529e672ed8ca05a6ac92a7113cf34d694d4dd WHIRLPOOL c2154a2bd673ce03a1addd22285ca3e6be7c29d310df3d2bb03263f431cfdaf8d4ec1e8fe36c6535a908af9e39b3796450613f206d93277c4b037921f6bf5431
 AUX cython-fixes.patch 1667 SHA256 f22281bbda72fd21daa80f9669c7105225a2dafb940d51f21138cd91a3582dbc SHA512 630ca8349da7ad2fd8c980e1ceca30a448f4895068aa05d58310893f6139314929d56433f54dc8aca8fa12fa2c6b95f84076c492cd6637dacd1af4be2816775c WHIRLPOOL 31e7a7947d4b81fdd0a2dd77a7bc4631621e2997761766f6387064e58bd30a2a73e8025a7ffbd72110ca364140120fc743de3ce901c93d437ea3561731084258
@@ -7,16 +7,24 @@ DIST Kivy-1.8.0.tar.gz 14655888 SHA256 1bb5add88132c902ed746e7624034ecaab49e61f3
 DIST Kivy-1.9.0.tar.gz 16178808 SHA256 b828617f858963f7873f5c81bb8824ca1dfa265e7811fce03599e2ba7200ffa0 SHA512 e0efc27f8ae070f5748570ee9224220791d32e931bbaf0bad5ddee894cf1d0f9ded5eebcc54d3b666491edaab0316923311f5e0cc7b1e46929d87ea3bec87f21 WHIRLPOOL c57c696752c88d3c8643e126180aa00b864df45bad0de4e6456143fd0f1486085a258a787ec2e4017b982004dd5a1212b11dbcb352f1f72b77591fa5fd9c934e
 EBUILD Kivy-1.8.0.ebuild 1215 SHA256 7c4d56f3fea5b16c572d4e310fa2444a30647f809d44010fca7fd8e656b0c06f SHA512 3edd7f7b6c9b8189557d5c3199ee9edfedb348ef9532e419ae2687535e2885ba6cfd44bfdebd588dab2d7cd3111724e5b3e1d932b6878f5c5fe815abdf1fd9ee WHIRLPOOL 399e8f520d4b81b1e9fc8514fb525b544ef2c916418d7b96c7ffb6c9bfa5b07c3ef16a1d00b089c56a5eed43a8bc80f11e504cd6a00ceaf61e0e6fcddeca6ff9
 EBUILD Kivy-1.9.0.ebuild 1084 SHA256 d6ce030ec343cfbc4297accc3cf1c7a1f0d43c427e9c0683b8004e1c21ac4274 SHA512 5f3c15b95e3c0e2c3aeb3326f79e2d5ee1572b0d3e5df35a1566f44f1e54846001c82abdbb159b6f6889d924d3b8f2618c26aed665ab6f9d5dc79cc87d793431 WHIRLPOOL 08192b8002b7e481cb8b5ef4d8c5c3d47ff9072a3d4398c88321b68ada44545c75dced83f4e222c9d8535b2697d57f19369ace7b7c3ba77090c70bf23635e854
-MISC ChangeLog 1136 SHA256 2fb80a584c3df6873a2114d59c3b566b23ba9241f60199345c9899fb556a6423 SHA512 01b65fc6008413ce94fefa3b7dcd1a5d0032c5006f0a790d3c280a5703e1a64139f45a1d4b11acfc74f78b2fe1304adb2fd8a018ce39b3a2f0605fb6a8147a9d WHIRLPOOL 8bdca2d082b2ea4821a0b2b1911b6474f683a7ff7847dea98e8ff8ac54f3b69b46ffe0c7ab4efdf4abac2913b26d7210eebf8566e6b67c4647825ac01afc9ea7
-MISC metadata.xml 405 SHA256 f7bc0de1629637f683bc13a5716633fd891b94b99110272fa9a8325c7a4e15af SHA512 85b396edb91f819561f3b6a67baf37ff7593ff1f9947b1d93b32e80004c4d3689a279b40f60c60b1641ef64d659ae9929932a0753456185ff835140cdcc13d60 WHIRLPOOL 49f41ebe8dad13c6a74b1433657768f22dd74e6804ed35cd8ada9e0bb285d72606a1162322a02f6ee834b78de73eb3d7e8b57d08328a3de7fa5b4d93d4bb6197
+MISC ChangeLog 1238 SHA256 cbbdf1332986592a0ac937c2ba25377897d9242479a23d4827a0a9465c2a0d11 SHA512 a8078d7cadfad682e3a2be29ae4a66030fbf57c97882755326437e2bd772af422c679cdaf41e4d166c57ed9c9392f8e41e3fe3ad8e0d3522d1eeba81f2f20c16 WHIRLPOOL a98bbd2e5858ed2c01397db155366f6993aacda7f7c8fea731585e222e6751b4808f68a29d16634ab93b84c3b074bc234f1b46063e33bac19d12d875e71b95ab
+MISC metadata.xml 476 SHA256 d4731de8d8db9b7ead207a3f19a910f9abb4221db7d03d440c9bffa3d5b698df SHA512 a57f9091da6c8b76bc2ddf99152ed84e9e06816ae6acb3633d1d0ce9518f07936f2433fbe5a7cb5275bdcbb87f870ee1ac5d1131fe77c725bdb87ea9eb025705 WHIRLPOOL dfd95e36f4ea2c42defd060f06bd5360c1ec6a6204cca57565b9d5d35cc3ab41d58b05f26725eb2db68e392e21086d864afcc6e88014e790b3358f5f19535501
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJVJ4jhAAoJEO1RxJ84ipLk+wsIALyR4VdV+fxp5bbwVZS/54oH
-x+xNcJqPuxjATV59NMfC4jL2m1Got4rLeqt4mbKoY0UDZN9Fsgl95WV4QWMbyhfL
-Df5ZAOuKL9oIRTXEz87RV7pBr6r3BUdPqlkPGs8K2n2FhUap0d32Z7QorQ3rpl9O
-bbKBILnnX3CUwf3p940x9jQ06SJrl8eOZNbjmeFqB9QR5lDhkevW6NIGErv5KU16
-M1tMR58MaFFojFLyZFAV+hNyb7TbKYbd4uLp3FZY8oWMUhiY6D97OdYdLivGftBO
-pgk2e4uABErgB1kFH+MMnMv6BNB9kHO8gyNz9s4gMgjNnrSX9hh/lUBl/XoitxU=
-=rvkM
+iQJ8BAEBCgBmBQJVb1srXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiaVYQAJGohQR0VC/QZBnVBQtl9Cf6
+U6IW/gGN4qjw71HIzncOwz2IWJkKxjX0mAsBjJQ38erh3nNuevcKagCgxaYadk3C
+D2CBNszfklh8fLroZ/tDDQg6SZJdiZUQByGdy8xI4GlhfqmwR78CETfZAtkQF4fQ
+WgR9iBkgJTPusG7dm6k709kcnt92NMIkkgTaXV/B1dwEqVFCyWR23/KHtXnaFh7F
+14tCCHsC0/zIwQUFw4AKIDOGcls1gHsgRbUR5AZitrzNcjwyeilY6vABGd3sik8l
+TUBE/spjtox13DQqH6Bp0YN/LlQlwCgxGQNuE2YqMp/b3GK2fujAvPNJRBCnJLLL
+dCBViten7a+OZ3flwmMZNsN07OhwvH1fqAWK45kH+CTJ7omdIRjNB4OoUDw8yfJt
+SH3ZHRS3x+9Dynw0C/PBN1SYLBOZbUHgv6Z6xtyIfrENrZCn9e32sUJSf02YJwfe
+n9vsmsgxy7RsYGnZSbDooSbuB6MVPjgKfRN9PhfC25shiftOLfBJc4Vv5qNQqNxM
++eAKljzlcnPhT3qXQQHZentHFo4VSpfnRSjrv3XityFxsSp38xBWCeTb5Ud6kfge
+zpz53iteNNmfRzKrO9NLs9nql1jFutaQMne2TvpnqjcH28comaa76DTIYOjZtxh8
+FiY+MoFkAyCfsIooQbOD
+=hFEJ
 -----END PGP SIGNATURE-----
diff --git a/dev-python/Kivy/metadata.xml b/dev-python/Kivy/metadata.xml
index e09b456b13c4..7da70174c4ee 100644
--- a/dev-python/Kivy/metadata.xml
+++ b/dev-python/Kivy/metadata.xml
@@ -12,4 +12,7 @@
       Install garden tool to manage user maintained widgets
     </flag>
   </use>
+  <upstream>
+    <remote-id type="pypi">Kivy</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/gcs-oauth2-boto-plugin/ChangeLog b/dev-python/gcs-oauth2-boto-plugin/ChangeLog
index 403a9bc1ac74..bcd2aaff8ea4 100644
--- a/dev-python/gcs-oauth2-boto-plugin/ChangeLog
+++ b/dev-python/gcs-oauth2-boto-plugin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/gcs-oauth2-boto-plugin
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/gcs-oauth2-boto-plugin/ChangeLog,v 1.7 2015/05/20 10:16:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gcs-oauth2-boto-plugin/ChangeLog,v 1.8 2015/06/03 19:32:39 jlec Exp $
+
+  03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add pypi to remote-id in metadata.xml
 
 *gcs-oauth2-boto-plugin-1.9 (20 May 2015)
 
diff --git a/dev-python/gcs-oauth2-boto-plugin/Manifest b/dev-python/gcs-oauth2-boto-plugin/Manifest
index d84a46edb09a..254ae4d330b6 100644
--- a/dev-python/gcs-oauth2-boto-plugin/Manifest
+++ b/dev-python/gcs-oauth2-boto-plugin/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX gcs-oauth2-boto-plugin-1.7-use-friendy-version-checks.patch 350 SHA256 539d23f28e035733f4fa3b88788a38981f9ce427a507607c188edb40ac8473a4 SHA512 d52e883972d69a209b0267f5c8cfa55f6f78ae4c90880bf681d906fde34d426bc49ce976b5fefc71191f45dd2f28d6f2795784f7345e328bb8314e8b36b22b2a WHIRLPOOL 8307ed65128022c9a5627d7342e66187528c428b969f9fa2be069082c8d1d8c94fe05b91212cd2c344144f7dc8886a26bd26870a43b5a60ce13bbeb1984ee7fd
 AUX gcs-oauth2-boto-plugin-1.8-use-friendy-version-checks.patch 345 SHA256 c27b2be5e28a1fa5eb77bf1279a49da673357d4112e7480a3ef80ba1cff02316 SHA512 cc1dc36815a4ffd42867d398f00a702c0677bcfe54ce772ea93a1e641fd9f2ea0f146b25947587c8d40f66a9b45ff1c4038002c518110bd78808565e120f6230 WHIRLPOOL 80c3bffd819efbf8ffb6d4a43a313d6e3500410a8df8f409031e4d87bab58431797ba7ccf546d8369b047566416769a3fc449cdfe4043d48be76db55f2374730
@@ -10,22 +10,24 @@ EBUILD gcs-oauth2-boto-plugin-1.7.ebuild 1120 SHA256 7bfe7f61b6a4fddd0ae1edc784a
 EBUILD gcs-oauth2-boto-plugin-1.8-r1.ebuild 1073 SHA256 20eb4941e0a7f05455d3811b3f8d0449381438f6cc4d36d1708239757ad7d2d2 SHA512 bc749707745e37e5681895fc9735340516e81e016e595467cc19172a409452c92eeebc6d962c2f756db0e265918851e03da46984bf6a0805bf1286a3ac87aea7 WHIRLPOOL 0b789324ee504238241aabe1d7ca27507ee493513c6f457e401a6d4dce9323cd7458d2b274de9fc9f10b73e5ee6790d15582586cca105e01ea7e3db6ed66b35e
 EBUILD gcs-oauth2-boto-plugin-1.8.ebuild 1070 SHA256 63b6407506abed4cbbb60d2ad8352c3ac88d1e57f90746c0281530f210a42be2 SHA512 bc89a2921916d5ff08fc08ff7c17cce12fa3ba60325878010314673a9a66128b4def818aa32d4a3fb97303371f9f93c27bdc9f5de1eaa3dfa96644fec5899f19 WHIRLPOOL df288c742b430e0b3ab2ab64a3ecb84a8bc49e6e66a5a813c6919928876efd30e4be84e8b926de43706d41186ef3a766381c6e86cc2f3cef4d7fbf5a4a6bb5d5
 EBUILD gcs-oauth2-boto-plugin-1.9.ebuild 1078 SHA256 02264ff88c013082533ceffa237419a05b76755fa8844728636365e42d1c4da1 SHA512 8c6d1ec676124be4e88163107fea7e9fc54df70f6a5f904423769ba946d2637633594909da32d4929c36435234c6271b027c910dfd17579ad756358a086f44fd WHIRLPOOL 12075195e649996b43be4065140cecb0998874532c3114b0fcaf6fed05cc9e720253752111086efc61f740704c10002f186542bcdeda37336ab172c71fa38b76
-MISC ChangeLog 1446 SHA256 f486df2794b9779f1654098488082372eb2e4f141bc29ff58f2aa1fd40525cc7 SHA512 8248bbc0b983ecfdc7aea6bc8858b4d9cad591858219ed64e45d6dbb416c8342361f9c0d0bc4bcdb9a717f7968c596593135445cc685f8b5524b2bdfd89792d2 WHIRLPOOL 00c3c76fafc92b5df282e28199fdf814e5eebfac82e294ad0dc935ac56c7554280237ecd471b29465a44653f716cdc8839f1b8400e9268cadc60bc2ebfe7131a
-MISC metadata.xml 159 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4 SHA512 d5a29b9f6ecddfc368dc0f1f8919cd3c3d6ecf2c7a82bc8d4c0dd51b7aa15561ed0462acb8ae39bc84f97e706e82d9b4b06357494f164f1648219f604b473fbe WHIRLPOOL 36e19b63a1b307cc200e1d73499b7477f73799db3909e71b5a0916084728351c76d400f65e2c8b3f8fffb2c9ba54c0bd235f785b47414178d98f11d64a9420d7
+MISC ChangeLog 1546 SHA256 dee65d09305500edf7e90cef2b12237c78d923aabd2e169d24d1c11134d4144b SHA512 9a1bf3026402f9d0fd5c112eee8c0846bfc58365937f5e6e0bc132ec476ac36f39a35621f65ec7b20234ddcb5b7313661477c3a9f0ae590619150041fb64bd90 WHIRLPOOL 8a70ba8fd403309686d951e6b948cc77945e089446a5465089e23b28a454b398c51b8f9765fe9df588b5332e451cfc378177b07e8cbf36d71ee26ea1159d8746
+MISC metadata.xml 250 SHA256 8b91272dd15e7ed64ce79c05a53754edc5c0ab1bd445a841718db5059d3bd192 SHA512 fa9cdff3bbe7d15887a4edb008d488b1f7796b58e903e181c16b3775541bcc57bdce198f86750826a8c3977560c098895078fe2d4c630ae90861454a46e9d515 WHIRLPOOL bd859caacbf74faf14764643ad9399ce3caef89c865d841c2280905199debc3a8e8a58dfe94854904cc1c215e8c8a52a8c8661d3ba3760547dba61777b1b6395
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJVXF8TAAoJEPGu1DbS6WIAwsMP/1+oj9GmsOl6Cb1iV+mM6zSH
-KSws75eAxEksdSQxjrslDL+t/vio3aKDW2MH0DJvzBW+gpmMzBl4TqrzdwKvDMSf
-p/IIW1BANZeCohXNoMa9dYCEdEL7rArPdBjomkW3SFy4tw/MSi3ZBHSJ2/amR7jr
-2Jssvf2XXGf2tcBNuMVxzV43OQ1csCDsLnhowT89atqmkL4eIby+xvEaBaNHlLye
-iVGgS3F5NtIFsutMhibFpiqSTPqUusiNHcHCt+TTCQBop3PeYp/Od//B4+LNsAkw
-rwrpOdl1D5PeYQbMhtoiQrQsebHqFNpX9yudkSDkN0EbVzmFfmTjD6KL6KBpdIs5
-9EsTa2QoTFsqhQ5bHavD6Es5CH9YGI0jRg5PqCzTLnG+Z8g/1YJZOCaNefqvJhds
-yf5BzzY6idgQvIMBikm9TdaC5S9MFmdyUe21A+2sde61s+V6n20goVVsSK7FVVpW
-Gu7l/zGTcYnd4xF9c8eAhLr/0e01xbUHUynhUGMR7X+krRjvsdHNyyoDHpO9rBa9
-GWHcESyyCl4/4Ym2v0FFvsqGpdmcqCeW1A4EDL6Io/+6/cArS9mCwN3gTJOrKF2H
-AoPRB4dAoHe2mEp8NmiTH/gcZsxR/KBxUxAjnnV62a/nf1nSlg5Mi79aG52+ks6K
-5vjEtVOtDJGr7dB2hT9q
-=Ifzf
+iQJ8BAEBCgBmBQJVb1ZcXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmilH4QALkAvMej69AoVriBNUb2gvNu
+11r6lF1ZSaeLorxxjxLkEkp12nsE+JVWOuseXa/hPAVYPTgHuz7SaDDSMR9Ro23W
+CbQcbaLOe6nKfxj45jTl32M+rZzdT/MQC64ybjQu+mqyzVCdB/k5aiuXRRY/3l0X
+QxBLY0IxhX+xfhCXpFRYpjSDB0FaPQYw6e79Klv+1QJaDjRrddts8TtghUVI/vF5
+unuZx7j2lDbOd6+fLeHlhH7uf+oOjaxrUcLJPtFIshbKNwpPlDJL0xuh6RAgaHTq
+C5gka6J5b5xrbFzP/g3Z+u42jklkHpAKj3ZlcwxdFm38TEmFJngjDNsFBzkE7xU/
+8rVMoxa4UG0Tfo/B/hQ9IA2MfmCIp9U39e5ZyCTD6/yAhyjtbteqACZZrN6RcDFl
+oq/FW7u09Pyaw4FiamzrDSs6F0SyWF1jIn3LGu5zsMQ85jLCg96hLUGzTJHVsOUX
+i9Kga3B7TWOiUbDBazoqf6GYhwzDAN6P4NTVBcBbuUxfg/ixlsVtU6aVy1ZM8G/A
+un8pHE4imdARrdTbpqyIBbkxq2mvzHzR9ucNS8jBsg3NEmR2r7GFQdEiGcvb71vz
+LKUtJGIhFETku63Q2W91VBbF4/+9xD1mtLWZl7FFS4qyjaRhY2MFh+ilxdWEpV/c
+S0D2zGpmOTRYpQ8P5Tsh
+=2F//
 -----END PGP SIGNATURE-----
diff --git a/dev-python/gcs-oauth2-boto-plugin/metadata.xml b/dev-python/gcs-oauth2-boto-plugin/metadata.xml
index de483c53568f..3ccdc0e87b22 100644
--- a/dev-python/gcs-oauth2-boto-plugin/metadata.xml
+++ b/dev-python/gcs-oauth2-boto-plugin/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="pypi">gcs-oauth2-boto-plugin</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/gevent-socketio/ChangeLog b/dev-python/gevent-socketio/ChangeLog
index 7298f288c0b7..94b8fc52e449 100644
--- a/dev-python/gevent-socketio/ChangeLog
+++ b/dev-python/gevent-socketio/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/gevent-socketio
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/gevent-socketio/ChangeLog,v 1.7 2015/04/08 18:50:01 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gevent-socketio/ChangeLog,v 1.8 2015/06/03 19:33:30 jlec Exp $
+
+  03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add pypi to remote-id in metadata.xml
 
 *gevent-socketio-0.3.6 (08 Apr 2015)
 
diff --git a/dev-python/gevent-socketio/Manifest b/dev-python/gevent-socketio/Manifest
index 37b7081c4493..79ee30c85395 100644
--- a/dev-python/gevent-socketio/Manifest
+++ b/dev-python/gevent-socketio/Manifest
@@ -1,26 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST gevent-socketio-0.3.5-rc2.tar.gz 22210 SHA256 ab38b6b97b369626cfa87eb4d2e1cfddf67c45e138e9bc61321e30f32e85facd SHA512 22a7c4c03b527eecb929ea896d8fdcfd2b299a06707cd30772f6762ecfc45e35f0c39053a57fb1ae06748aa58f3c246a1b9c9c3d917851d63f1275a70a7c14b3 WHIRLPOOL f7c2ab35e5036adaeda141c9ec75eb5767db5711c4ba6af8ba1698fa81142c21435c5b694f25cf9af55ff822a7f1a3a9b630c39e659b7f06bd270747318bc778
 DIST gevent-socketio-0.3.6.tar.gz 264203 SHA256 53394ab93fbd84d9dbbb2bef85349f6a503bfc53d86a9be8653250f1a0412aff SHA512 e64ad7c42f9a80e031b443920d7d770bbc58fdbbd4787585dbab0e7d455819e5b09bddf9915867afede45e26deb4087173f6e730ebd0dccaf64ba0bd63b2fd98 WHIRLPOOL eecd771b561a2d89f186e61d8357a946e9c9412cff0d0fc6c36ec0f473bd2aab40efa2516e6b286c1e5986cbb32354b6ebea410ac594a0ae976d123bad2d1e81
 EBUILD gevent-socketio-0.3.5_rc2-r1.ebuild 809 SHA256 5097185d49da5d0c743a63cf762e225f2e1d34736729d9fd4855172a31fabf15 SHA512 5d8a898aa24d0fe9508dc60d6f710ccc3e3b34721d08394fdb33ac1d9bd38006e73bb9b4876e73c06aa603663e3bcff42dfd2f2a4000170fa406e72db6cf3454 WHIRLPOOL 099f95bcec6e1ac6f268634c8aadd790bdee40e0d950c4fb9ddb7452b457877df1e63f134bcd6608781233280b528a4173efbe307b2ae2f3f6e6abaa68169c7b
 EBUILD gevent-socketio-0.3.6.ebuild 850 SHA256 8144d96d1617239f3c642fc62f8d884901b02606b92bca59304fa3b4015bfd52 SHA512 02d7e3783c07326c586fa8ef3c285b3f9398cebb352289e2d5e7e65416e752bc3612d17e2118f533baab5d1d12f1272b52721bdb1be2dfcc38fd39a29770bab7 WHIRLPOOL 8ad066a9fc9bea493409c035505d7ae5dc89cd4b1dcf5b5df6a29d55a4e457f9808204eb17d1722cf99f5774f212e08531911d6e13a9556190c8b89653734921
-MISC ChangeLog 1261 SHA256 f483f9c42732e236127bbe2110b6db6594419195f388e2c7effc10bd4511699b SHA512 0b2600f9b945920db272ada1e17365263b0dae1829e7e3c9cf0ee2dd814a33a67bcc0269a513275888741059ba97b2ae21075dd56d7fa6098137cd12202011db WHIRLPOOL ff02df239c8e02b28f2c3b13d0aeb95948f656172e05f87f5ec1c45aa40bb732ab99ad6bdb18f0b4b28c1016304ccc8bd252a4e00f652a5506abe22bed959e41
-MISC metadata.xml 577 SHA256 3615ec584e2d032bfc0a9044cfd799ba00a326a77773d273de46b1727170e929 SHA512 7ad089dce210b4de8b02ebde2b080078dfa017eb953cfc94df0d0a538f6a2d059c6254d845b430112673ca812fefa44aa79e72c59e8f79c3e4400d60592fa8d7 WHIRLPOOL c3d638e8c50488cfb304ff7b0c26551df7bd0bec21e100945b3b963c52e93dd3b66383ecc64751bb58a5bf4476a095e47d6316440332c92f233d711ba5fa69bf
+MISC ChangeLog 1357 SHA256 a34f53811a212e328e8e6b08531bda5e1287e4bce79fa15e68c3d6f4d74f7a90 SHA512 5be45cd51d11d66f0e0bdf04392d45501e45157f42671d7c0c69fb65f9e0b8f855308f78017d0a01b6ac5260e561d02f6903a3435d7a3bba658493a037358421 WHIRLPOOL 42e454a022d2c4f7af41c875efb43c5a8d0163cbdbc900d77d026070968a1184e088806e24ffeea7ef89222cc18e45d3956950ac6a5b036f2c5ca4ef84eeaf4e
+MISC metadata.xml 659 SHA256 362291e66859637f182f59b9ceafc057440f0069f1c6d71269ebf0ae054dd526 SHA512 338a9ca1275da35704e90e556cf56a77d4296b6110fbf4f60d9155fde295b97d3bfaf191facfe0558280d7d0655275328bb310021746fcd6b5465979b6284d16 WHIRLPOOL 2996964e223af39a7dbc00ef1e1b6eb723c62915cbdfa7d36519dd4eb90db71a31754ba1473cb6ab97ac7a8fc93b26c0137349e0cc08e3d3c225e1cdc4f5459b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJVJXheAAoJEF0huFKJUZL5rLEP+wUyRwsxr6YpYLfk+09ogbBr
-6DdBJryjI7+OhTFHCBp79pvyiWb3PzzEH9JmKxlGIdJwFqmWqKzgz8s9BKVko7LL
-mi3mSDoGfJlHpxugIrtXJFITm/GdqlgOS7cKfV/aLeVm0LIsJj6kwGRoCz7GomAN
-n3dD9xoz3v5KIeKYnw5pSyfF8e68ehC+nBmZU8MrCL99N97IZIuPrtz0rHl1WWA7
-x91D2MEyLR+KFXakhGunPvpLFxqoB2bIkAQSmEtegCNOgpS50DVkthgscqeBm1pL
-h6IsVo9adsMWKas0yNZHdyaCE5r6lHTsrbzOqxGOp1ydiJZgMPUqWtHaQMgsoyjc
-cG710KoDqWs43cTS6WC3B+QJrMui8ILea+DCzrDpHSSaGa4tnUW5Rj1tJ71HCv1J
-VfmbJdF0oErFzyIHG/TiihwPAMsu6YwXFs6XwQoETZM0aVivCUWDLsMC5BQRvcz1
-rGuoJ01RklNn0SbFEatBlU1h/EehWvYvE7JOTyGvmivpp7F+Gk6g9WE+y9vXYq61
-SRDZ2WhWW1ttXcPUp+/ZKWss8AB9/+0erJoe1X5jiacymC8SOolDnO+Etgz9EoVG
-ZzxJADzNZUHjXcgyyXDrxtCxQonb9ykFdXfWLOXHaDDQyqJkZiy1XTucsAOOahTh
-jmAkhkpnKjk828UXHBXQ
-=n5qA
+iQJ8BAEBCgBmBQJVb1aLXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi0zwP/RkYWxOfOxJNp0qlv/jKk62H
+KLfa8hYWn9kYfeWqR7O1lCr1yoNsxbGDA60iyUFNs1qWc9YjHPyCUuxgARFULw6j
+foJCc60HmYeUrxaL9mKfobYJLjolez1nK2ZEGXCt9Mb7OimIsS5oghV+s0/CJ4mw
+/eFj6n3XXI1FRdSsWl7v0PK8P+fQFjB20dNXXFs+ScGpX0wpMAeY1mBobR62ZnpU
+8CJzhz5svDMb5Fr+XG76b0+nzlAqcjYbTvw4NKk5VylaVUt2yNkMXU0wtuHKyjMc
+dfY34SZrytydDNL+0XNrgs/1INaWeiw8XG1c6KEfCgLXq1z98pLC6PdlRMjN6GDG
+dBeb+U1mQRkkA5eM/Fl9YKmd3cmukn5vqJy+dz5V9yYcS6iZZP4NTodsTqJgSZ+e
+zEdx3iB/gQIkF1pkHNAB4LERG9np4cP91bRJKWNr5Vs/20xvHcoYOZ/9gjFb9yLB
+82OExJf7kJlLv5pH0AuZBLXJEssY9V5/6YrPuJbqPA31WVNLsIf6ArsOvbRpafKv
+5fl6/itzf2sXsKvVelTlUEsRxnCZhIewZvx2+1d63eK6/y5vznx3tXFkCZqjTnsf
+cV+aVb2wm/ORN5I114ChwvoHtLB4NVWSapmSAxTrodnHfzQ1ufVhmeSgnf15w5iS
+hGlDasJQi4Xvo1VrI1E3
+=KUOH
 -----END PGP SIGNATURE-----
diff --git a/dev-python/gevent-socketio/metadata.xml b/dev-python/gevent-socketio/metadata.xml
index 0dbef0e2d804..3faf5402a93d 100644
--- a/dev-python/gevent-socketio/metadata.xml
+++ b/dev-python/gevent-socketio/metadata.xml
@@ -14,4 +14,7 @@
     <description>Proxy Maintainer. CC on bugs</description>
   </maintainer>
   <longdescription>SocketIO server based on the Gevent pywsgi server</longdescription>
+  <upstream>
+    <remote-id type="pypi">gevent-socketio</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/gevent-zeromq/ChangeLog b/dev-python/gevent-zeromq/ChangeLog
index 5d80e12df253..eecef20a3191 100644
--- a/dev-python/gevent-zeromq/ChangeLog
+++ b/dev-python/gevent-zeromq/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/gevent-zeromq
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/gevent-zeromq/ChangeLog,v 1.8 2015/04/08 08:05:28 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gevent-zeromq/ChangeLog,v 1.9 2015/06/03 19:34:08 jlec Exp $
+
+  03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add pypi to remote-id in metadata.xml
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> gevent-zeromq-0.2.5-r1.ebuild:
   Drop old Python implementations
diff --git a/dev-python/gevent-zeromq/Manifest b/dev-python/gevent-zeromq/Manifest
index 47111447a93a..f3aa554626c6 100644
--- a/dev-python/gevent-zeromq/Manifest
+++ b/dev-python/gevent-zeromq/Manifest
@@ -1,26 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST gevent_zeromq-0.2.5.tar.gz 5901 SHA256 4c479568e8fbc92260e06d2f9042c9888d1d42e90ef52673a65288f19394f669 SHA512 c7bbeae927e078b9833d6e9b265a11dfd93e27261491c54c1a28ce7d0a87be15a4fc002732f816bce08f47a997a89dd42289501d6bd1d380d4cbfb198c1c763d WHIRLPOOL 2190f24ae9bb026f032805dc5f5867a09b96c816379e8bd428dcb0f107fe7380192a05232ebfac236ab820c53d2d6bd291bb3ccd544fdf78399011ebeb99c9c6
 EBUILD gevent-zeromq-0.2.5-r1.ebuild 741 SHA256 30b459df67d01e2d12545251a77fed84f0f7a481744a60647e422ff691677ad7 SHA512 e667816d5c801be91b164476774c782ac27b014c9dc93c9f36aa829b7a270c7aaee832a50cab6e9e64316630f77f7c9331ed2912a603a03d90b995205fb42599 WHIRLPOOL c37c4c8cc27a99c9855dddf08110a5961cc194a760d02ae82b426054757f75d00ca8e99edb91bf4f7c3cf03f85baea70b9ac850ef93dda03d1e59bab5b1ae15f
-MISC ChangeLog 1241 SHA256 abbb95f275c0e204024a5a24e2bee8c152fefd103d8bf9b8a3820c5d5165415b SHA512 10085c857e500f62db0abfcda257fc4f9d1b7dd6c6a00299ff089c2be81f69716c46858f5376c14b10e6fb3f2b1d26f2cb22c86ccdfeb62b86ddc9220eff57f6 WHIRLPOOL 87879045b01ef01d4234fbb2f9873c40ed76f3cd8f6419b9668823f9a11f59201f28d3541e5a2ea0830c8c63b92edebc7ab1d45af19b5622abccf4ae18f3d153
-MISC metadata.xml 564 SHA256 c41551104164f2e51e8ffe6d67586811be03ee42bcb632479bf1158c50174f4d SHA512 1c49932f348f1a159d5ee48ecc0e4db2821b17d0d0194ec52155a4fb7750a0887f132622a67da4a4150d12ac2290439c9d054e89e65489c830f3c5b88b8dfaaf WHIRLPOOL 0f07febdd5034dc7d580b9890693d9411f184c90cfa9c244745c4f4f3f64bf9eae0ecddb28d6c5a418fc67cac3f7669103087516794f0bcd3e36887debba1c95
+MISC ChangeLog 1341 SHA256 79fd95b513b087aff6df07f64de53cbd0a9cda754c2865bef54f30cf397e9ef4 SHA512 f026f691eaa278df445b2575ac59c0822299a5762153ecd913e9502fde7a44e753b4fcd0ae57efe36c617b023f48aff0a3831dafc8ebf39809ee30bc194f2912 WHIRLPOOL 2f8f034bd60c7ac99376e1b0c509d1ac23a17ed06c8919140282baf4199406ccea55702190c653cb6e088f1eefea31e42396ae3ef4c4c556e4f4bdf42170405e
+MISC metadata.xml 644 SHA256 6d25743f1a974adbb8d088dfb3fa536148affb01240b18d5d0b854b4f04b74c8 SHA512 19cc64a886a02f714fbd67fddf8bcd7a89cd311fc6b0b271904a3791c6c3e4264799c2eea342873eff2372b22868173b4a7b9e19b1be3e0ba7f2248f4a2b06ed WHIRLPOOL 4f40b4c377d694f509253966cc31a55777e27fde26b1f8806e46cf45497e5c5b49cf6b1915245d5d55b7f4d83acb2cc0ae6d28d9f35e1ff1ba97bf3d4d386eb9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVJOJyXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOv0IP/i+OEOIBm/evY6vUjWMao+sG
-yTP32XrRHb4yzDaFKh70QlkJQG6Fe3PTwgJJi8RR6Sw809rXf5zBYSvJNteJSFoP
-nQXJpf3HK8USPOJ1fbtlZ6aRYAPmYPTR+8o+1Y/CWZndvzqZxx8AnXQrN3Ey21OK
-QrGm1v/ZfClFdSkGvL+0XZRYuIaMBoMYBOrf1OtkpdepjXZMD4PfuonQs3gwTMAm
-MM8eF/poBiYjwpPakXqwjyF8i/WiSwnQeQgeu+py3ECEXc4WuIo9uJm8+0d18H13
-chACs0GDNc4cC/Y0EqnJ2MtXOA5KlwAExhCxFgQQW05Be3WDwttQ9a+QGN7FV9I0
-WPn0DCuWFOMHCLa8wPl/cZXtaiJDeHROwqvwOFp5+X1jZd+cy8+oGCN7dGOC6Iky
-xRpdEM8YYhtnOyRcCfoXGLB0QxC9o9oSIe7d+pKvPdixLstMOSMOhfM9NHNQ7RLO
-B+TGi/gGxEjYIF/+rRm7kegFSrvBzfHRt7TNRhjkCPh5nwREz4O2N2y88Qoht/xh
-BIF9wklMSOViznOaPy1pJ0nW5R5N3r3kN7F6VBGpmRvFaOLz/XTXokZKs1H4W74+
-QrwdfdUThPdkirFTfqzEGAbsY075YCkYsbcbqHzP+zED68KRvldtQh5eO2rDQ4D/
-xifisE3luxOUPUKdW0w5
-=J/di
+iQJ8BAEBCgBmBQJVb1axXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiGbkP/iqhoKblXW6uTnGaYQaQZ5+Z
+hO1d50tQrtkoBfI/52IYrnpxIcnqZ4gqP6mLGeTitcXkePX5rD75C65nA93OgC1H
+rgxMDpG7CawUJKtzIEfiOaF0zz/DSOjeDh7InL9razFA/SxTOQ+l02TxRS05TzaB
+pTAV1O+3bIcTzX/vdlQ0V6UBlATfV5k30rZAZYhYT/+w41hhjoko4p4xSfTHJb6Q
+qhDFMVU4NHA0nr3sXeGiIBOrG6XTfBZLUk1c/uD4bNVLSdaSlmObchebAkz8TyqV
+HDgqntXu78FBIEy6gZlEgFTBMV1iMgjbsGAIOeByr6BzOFBMyUCYu6O5pas4WxOT
+SNkcYjcYe29Cmbxdu+pCFT5PkF68vVUiMDwrK3A8Ffy+FJOJUPf5d+DdgIbDrSVs
+/UPZjm1A1qbCcWB0oTRSq4jeuqCDEn7qXEROd8TdaVqXV6jvPlnyjp6nqSmRzI9x
+FaETfDq+UDOhagsQcQgKucER5eL39KDX+nmw5TI/dvYmmswPMD7ixYWKImiETRq6
+i9P8+NdB/3iztr5hqjjsqwJL+Aa0G/flc0LhDMxy/O6ih1YrM3IAkYa8UTz9807P
+JRxLI5BK0mhU7+x9iMr2K0/AXzY+PnKQ8StVl8K0WmEJiQ7mmdyCP/C7nmeraFjc
+5iKRmPYJoeVRZoi3elmk
+=l3s6
 -----END PGP SIGNATURE-----
diff --git a/dev-python/gevent-zeromq/metadata.xml b/dev-python/gevent-zeromq/metadata.xml
index a9e3c2ca7064..48862a945e7e 100644
--- a/dev-python/gevent-zeromq/metadata.xml
+++ b/dev-python/gevent-zeromq/metadata.xml
@@ -14,4 +14,7 @@
     <description>Proxy Maintainer. CC on bugs</description>
   </maintainer>
   <longdescription>Gevent compatibility layer for pyzmq</longdescription>
+  <upstream>
+    <remote-id type="pypi">gevent_zeromq</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/ghp-import/ChangeLog b/dev-python/ghp-import/ChangeLog
index 9448758a9f5d..42b8799a259b 100644
--- a/dev-python/ghp-import/ChangeLog
+++ b/dev-python/ghp-import/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/ghp-import
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ghp-import/ChangeLog,v 1.3 2015/05/22 03:10:24 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ghp-import/ChangeLog,v 1.4 2015/06/03 19:34:38 jlec Exp $
+
+  03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add pypi to remote-id in metadata.xml
 
   22 May 2015; Patrick Lauer <patrick@gentoo.org> ghp-import-0.4.1-r1.ebuild:
   Stable for amd64, dependency of docker-py
diff --git a/dev-python/ghp-import/Manifest b/dev-python/ghp-import/Manifest
index 7cdf14b95c67..4afe822c2074 100644
--- a/dev-python/ghp-import/Manifest
+++ b/dev-python/ghp-import/Manifest
@@ -1,5 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST ghp-import-0.4.1.tar.gz 5002 SHA256 6058810e1c46dd3b5b1eee87e203bdfbd566e10cfc77566edda7aa4dbf6a3053 SHA512 8b0e6578f05dc74449082a840ccd609a43fba3ca1c4dffacaddc4b27d2e9e3eac565a5c9672734e6ec5f2e8872b13ae0bb8a5d6bae4ee6c4cf41ef7d2c0b2eda WHIRLPOOL 15008edc2539affef67267859ce3a4019e1d3621e8e0a2cb3b74de53af2fb5433f77a74b1742552ccc223fdc9cc30db135a0b9f0cd796ce2df38bfc83c7aa24d
 EBUILD ghp-import-0.4.1-r1.ebuild 839 SHA256 c0c20d677579daee8e15408f67b63b4638a1a283faaf20f814dbb5912bb5ee36 SHA512 b442821191dfff77b801f46006fd0f590fd50385d0d11aaa7fd3c991834a6c085a425fa13d6965dbd175b64f3a842a735619882f791f0ee60586a29ea2f3e619 WHIRLPOOL 295d43a63789a52f30c9eb3b76c42a31611e6e5344caae59bf6694a5f46abb825ba52430cb75da886dae4303303c40073e3a9314d2931670b156fec8170062e3
 EBUILD ghp-import-0.4.1.ebuild 584 SHA256 e4ec4c20f60c47c5788e5a89c158d78e47cd625cdf07b5f611eb0b50acdd807b SHA512 c62d57501d463c7d6e9caef3430514e3541daf6ffad11048fa541581dbc21196d7c2805f9167d7b799bd7abf6f4d3bde9db7c13594b4760e52890caaef960f4b WHIRLPOOL ac69686bdaa8e9fceb36ed7ee642f36587855a9ca0a5722a930a5567d918e8949c88deb8e367ebb5ea03b7739a09cc394d9e4171ad89cb5b8453e247baff370b
-MISC ChangeLog 803 SHA256 aedbc9cbc4f89ecb6177cd46a240a6b96ec6dbf4ccc62f4a147aeb07f7703e1f SHA512 9a92cf3f0ef39ef0730a5e430261377ba58c65f0551e45aef8ec1363ada21937d04a572fbb47b02b9405431eb95596c39272d0e8d26a6786fa99d32180111dd6 WHIRLPOOL 7af45b4a3edb3bf5f23009f5f9a432707612c822e91aa556a4f7528054bc8cc58e2082ed4b4509c92440c3fb2a48e4d162766555e2262eb5b9614dec3eef0d04
-MISC metadata.xml 281 SHA256 4f517e212ebf30022599267011b7d752fb61f1063c90f9d442242fba23e5207f SHA512 c4d7e9c37508015a286fc8288d3c201c5779aca1252bc6ed7f25ce87555b513817d4e3fa624255e7644b24e4db0e1b976ea34810ece8f718dac3b027a3e601ba WHIRLPOOL d144bd0785d423f05e5ff568d7c7c5b6f4aa6d651d44ec9f55dce23aafc6552d0d39f8229a612109665cfb3e839ff746e64c0cb0130fe93e9f231238c61a87ba
+MISC ChangeLog 902 SHA256 e7da18013663926f67a4e4da9ea76de7691d509f3153a1724e10d903fcd1bb91 SHA512 1048c4f9c5217b7cd5e586579195fe88c13fd2bc09f8f1a74a8305aa71b0008f9a459aa1bebb2870d1161afb8d4323214d60bb317791c5e9d778d50bdcd9f099 WHIRLPOOL 5dff75e7d93a141ad9f9a009fa12ba56f308843334f2f73595568ebefd702fb0dbf4b9757d60c0fe6fec99176b29764843e1190edab8ddad5b0a1158d5085bcf
+MISC metadata.xml 365 SHA256 46d629a77676775468b9476e4cbe4604c74bb7d7232b93a61094f52207ee35db SHA512 9917ff755ee4e626e68dea58947663cbdeab7219ffa6eda2b656e6061d943066cc1353b932c68fc93e50cfbb40ec22a23a0e76b34eaa94b130b26a504ba812fe WHIRLPOOL c9acde9cffdde9cbb146d0f16d74c75de45b2c1fe0667cec1690e7769b08a7aaad2a3aa54d577e1834ac87481df6dd7dcb7b55c39d9ae23985be90947bb230a6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVb1bPXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSminq0QAL5A8J1Er2vog8M2JJbwPu7+
+acnfercMep4W9OnEzg1BvWfGXjMazdr0ZXsw7/Nt8eaNyAG+MK9cEQatGatxcHDV
+gw8SLMfciOVMuVtwBOVkmo0m7b1qqPxtANOoFl93SSIrJRIxn6KK2EiAOqb70Zhb
+AZNTQBy5lIASoUXZu0JX/w2MmNlbe1EAJ51Sq4yMqLLwTwWUg70fl5SOcxjJ69AL
+LT92fCA9yOL99PRfokLFWhCjBEdkHcLu+NE9V4dcLbBLknmAY8S7dDO4g5a9S0VE
+fVQ+xrc7klqkaT0+2bosCwqno5MhKPzE+7YySmnE//DM7B1O62popSn50HKss6UD
+6yBNhK74TPzuHASYJjqDoyau+De1TTkxDQ68g1fVTyGtq7H2FXxwV5UR4TRkKbnk
+ZTuQlOuSI8N68pSnigMnH0fTU98C4rEdaVPk6xTHM4oXgz2TOWTUu7n2HH0O2ECc
+gCpMr530xNYcvSn4k7gWgbF+CSzUfdW7/2YEZsCDaIQIr9qcHWHdKS/erqSCcYxK
+2e9gR6wWIol1lyKzv6IQH4/Gc1AXcGc7iJnh3nGdRCj5B+U0Q/cEBzdTOJFKmPTD
+xPNwfkYsDVzvJcfhmLrVrgAZieWSKw4eiSFygBRDjUdO1fs3C39vEVRkGXMJxGH/
+MQA2B4SL2Qe4NkHSCPax
+=m0DS
+-----END PGP SIGNATURE-----
diff --git a/dev-python/ghp-import/metadata.xml b/dev-python/ghp-import/metadata.xml
index 02be8c5eb78f..b67c4feeebab 100644
--- a/dev-python/ghp-import/metadata.xml
+++ b/dev-python/ghp-import/metadata.xml
@@ -1,10 +1,13 @@
 <?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">ghp-import</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/git-review/ChangeLog b/dev-python/git-review/ChangeLog
index 6b8857526f1a..9d3ca3923f62 100644
--- a/dev-python/git-review/ChangeLog
+++ b/dev-python/git-review/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/git-review
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/git-review/ChangeLog,v 1.1 2014/12/10 18:49:17 prometheanfire Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/git-review/ChangeLog,v 1.2 2015/06/03 19:34:54 jlec Exp $
+
+  03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add pypi to remote-id in metadata.xml
 
 *git-review-1.24 (10 Dec 2014)
 
diff --git a/dev-python/git-review/Manifest b/dev-python/git-review/Manifest
index f48edf6b4455..c8d0f84da026 100644
--- a/dev-python/git-review/Manifest
+++ b/dev-python/git-review/Manifest
@@ -1,24 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST git-review-1.24.tar.gz 39106 SHA256 20fa8be4b86430b41153c270f770dd270bde06ff70c60c411aa9adc9db2f512a SHA512 7729358c8a99078d1e66d4682b9d886ab97fc82793838f14f7a30572e561a8e1b4c5ae11f7b347180ab34488af309dce7ee804d4a7c7873fa40b182ab6ee1ac5 WHIRLPOOL 07e33a18c42ea5689a4189134a44a3b5a9f95bea4a69f07a6a225a7577f2ccb829b15f41da901cc3e7ea0cd98c3b764bb2056456697bec0db619878b0976c0b3
 EBUILD git-review-1.24.ebuild 692 SHA256 b5c2456b325806fd83191b1bcad7f3507d30a6592f23f65d22f23ee40316816b SHA512 84d7cd16c529b83d9122803bf3ffb2d2e30ee0c4a8e66646e3109380fb5f16ca73a971464a522ff882427571b5bda0becfa3aea67c3e77a230d1d795b60c05cf WHIRLPOOL c7d959a0f53019994b7c7089adfc6316da13b959b965531c322db42700d5225f18bd1f41c03ff24eb7e8afc85d592157c7b87cc75af26e97f62711a1f23fc3a5
-MISC ChangeLog 397 SHA256 6dc6d821586f8b8ac7be9913aa1c11938ae7abaa3d5b08c6741be96e738f13c3 SHA512 410aef6e24a60a94f844f9a6c630d96bde8e403297d59f34205241ad34dc6230f09f936dc115125ade6359320ae4fcedebd8519ca6e89470f798da1e89b497a0 WHIRLPOOL a21ba74f9fa81cd906cd686802d14a9504cfcda53d5331024bc6d587adc342664f68efaa0058cb4ee23a4254b86c980aef1ecff9f1372ebbb189e17b61a7ebd8
-MISC metadata.xml 281 SHA256 e8170b39d9df9b2d0c14a40ed3b563f2b4e8010637ae12c7dc7733f917b4a9c9 SHA512 c015efd3b224a5fb8c2d8e50ca5453b14a5ef707e7a20466590fa1121c1fd497c0966ce5ff1a312e2ba1de59630f5e1f4f38d3650963cbab706c9d919615a077 WHIRLPOOL b17d2086af3c89ec0cc2fbf42a240c201ab9a6bbea560fa3c0e1d1c6f6199183ffda0c8bcdd856e1baa894759f9d0c6100aef25882dc04b8ab672185d5bd7f57
+MISC ChangeLog 489 SHA256 b3dac97eb20652acb8ea9684649a8fdd4469f1a1c6c56d812b056fa172885e9e SHA512 d55731588ab43c1051f408cd6f918f8379e5479a4fae47c937642f51cdb4306cf93e2dc9f95c3ab1cac9183376d7ef0ea9ae9444cce95748c502f6db870892a4 WHIRLPOOL 7ecba5cfc1952f2a8058df4b256592deb73eb87c2b91bee2df3a105748825465370c3136de825235b34dfb7d51c7a565400f4103560027f8d6917f6ee361594b
+MISC metadata.xml 372 SHA256 a03a7c0e24c3248cd4d6bd1fbd2b3a7e119ddd014f7f7d1beb091f33b27cc0cc SHA512 9890d71d501186a5800e3eca06d551048a760feca84e5fce2d5b700d91098f6cf837b424b5bc89035446da4cf5d0fea431e7cb68b673d78a298ea300e7b2a233 WHIRLPOOL a2e8d23310eda05c9f355f1bb57804fef8fd1e46e6daa0d0232d75b870635f0ee1c807ef317452d110ecfd288522ad24eb5518f5205c0c3407e87e82a98c6416
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJUiJXzAAoJECRx6z5ArFrDaDIP/j2YFclLeIuNUgpSKC681+vV
-imvONzI6LVEUtygY7M9cop33vId+hQqO5To+dt0w7aqk7wf8dNPtSQWUwiy58BGo
-I7g4W5zLOiPHQeitNBLHscntfKSt6o15B/mAOsJP0/fx3Z4a3C7YASi9zWPFBrm1
-LmM6M9JX97Qp0fGCaQedP3iQuqwO36tsTLzN+hd4qkM+ALU8Ba/EQjegx5gmO7TN
-XM8tKfFM2CsLopyfrO+955yU/RK6wirvyn/fXWJDQBGfDUi2lMewSu0OIg16DGlY
-ZtKtZv3WuxvEGVcCEcTVUpll96zAgN55trwlqY9hgAcAxEmZodB9wsdOM5FXq9rS
-R8dTkwC0K+C1D2LW1x5uV/NYcgcOY7pHH8knlb5yFt2hp2typ3hIfWjihRsd3Kl2
-910KkBhetb1paids/x/NpL/gdb5C//o5nIUUK++84nsVYS1O39zbZSiGMK5kOzIn
-fvP4XBfef7eArN2yo5ecek4DpSFUxEqAdn8qWgM6mFMJdKLp0lgclkW7aqrQ39QD
-Y3nWNEMuH8XF2rFjyLCHIpovXiTjNypFgLn7qrbeoW9yNMDoLRjhIZ5vyGuPOkC2
-Vq+kUZxFig+fO7jVwTU1hFpDDm9KoeIs4gkJ9Hv+JjQ7Z8i7jfWOXk+pZ6fZFnNq
-zfckBfu72vMmG+i6Sr9u
-=WeVo
+iQJ8BAEBCgBmBQJVb1bfXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi3UIQAKcgaPv9tnCesyGT6eZXH+K6
+UMpo6XXx8Hzpx/P//Rv0vvKHteAeLPo+KlNU9jCfsqD1mtilnZDVo2EgVVnRQtV3
+Y2tQgndESyg9LsO2zdFB7DrJK/ci9HFrd1WxpQuilBlgvhveMyKRiCt2NJtHKC5l
+Bjob/kFsCUcae3iZhIGU1CVc+0/yFB652v+IAi0uBdcFAGHQvY+hN+r/zIA/B4tI
+kt/aKSyOHmslYgyMpNpk/550cW56HnDREOVKJz6dCvES7jTen9mCqz0QSd34o5YL
+4e6BEmvHzHrLBpwHRItpoOVWP1t4ljLJS67vC6pyHbneEKTDzSrNI44ni+20Wg16
+VYwovVZ46y/JfKJYKzWUeqUrzOOjNmdmdPTxMW3nQVJ4khVS3l7f/bUm6CrW9BVj
+hy1TIRZls9LwLSNVoPnkdbZx9eDdEf87yRuNFKdIraPVFTqeuwfxUVVCJmVv+sGU
+ElAzVPbWIezgU5MyAje3tcXqjSzQ+LX9EM3fPJV5QrnAFj3fZrWnI45Prul5d/V+
+zrwOUbSIUbn5rTphxcr2C99mVJ/He8xSz7J6Vcc8T2Jk7qIh5MSsuplJ3nusmu/L
+1GywgsPF7QHDz1UouxFYpccrqGaziG4QykqsBVbZhT4DRhSZQ3SUuBmpiiaON/Pa
+LkTumLC4U5KwnWqFSkVx
+=r5Em
 -----END PGP SIGNATURE-----
diff --git a/dev-python/git-review/metadata.xml b/dev-python/git-review/metadata.xml
index 214c4eafc144..c723b4f7bde8 100644
--- a/dev-python/git-review/metadata.xml
+++ b/dev-python/git-review/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>prometheanfire@gentoo.org</email>
-<name>Matthew Thode</name>
-</maintainer>
-<longdescription lang="en">
+  <maintainer>
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <longdescription lang="en">
 </longdescription>
+  <upstream>
+    <remote-id type="pypi">git-review</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/glance_store/ChangeLog b/dev-python/glance_store/ChangeLog
index ee100f6637fc..c9ab44c07def 100644
--- a/dev-python/glance_store/ChangeLog
+++ b/dev-python/glance_store/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/glance_store
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/glance_store/ChangeLog,v 1.4 2015/05/30 01:38:07 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/glance_store/ChangeLog,v 1.5 2015/06/03 19:35:15 jlec Exp $
+
+  03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add pypi to remote-id in metadata.xml
 
 *glance_store-0.6.0 (30 May 2015)
 
diff --git a/dev-python/glance_store/Manifest b/dev-python/glance_store/Manifest
index 3e1729d1fae1..a24bc354e046 100644
--- a/dev-python/glance_store/Manifest
+++ b/dev-python/glance_store/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST glance_store-0.1.10.tar.gz 95520 SHA256 b390fea864f1398f79ab66ce99c3b868b86ac1bf97dbe89ba4498506e2af7d02 SHA512 cd4b2013c49c1104523c809ae28f8cb3fb927564d46db4cb36d5d7c529e69e684af584ad322786e41afc414770a750a545b1baea9f62f2d9611f165df0fc801f WHIRLPOOL d1c65c33eaec3710463fffbe2139fd72b98b3e3e1e722424d8051c0e28c8277e67c96b80476a4245bbd4f2279998b86a6fbd09361d5f73d46f4b80c2eabc5795
 DIST glance_store-0.4.0.tar.gz 103982 SHA256 cd15e9f9a08dc8d3eeaa452682c8e53423f848eaadf064c0ee8068583aa31154 SHA512 d69337a7f5b06b70ee9ff60e1672d0b16b1fb4e22a38939929df0a6b08f03f0954d60b3ffb747ed30510bca451421f3e5b7133aa574d5786e1b2ba43a80075bd WHIRLPOOL f6685e80e7cce7586a0ecf0af13b1366c1f3fa739571b4f209cf76074742031858f73335c9236806c54a03fb80ccad0c302f1ef6068baa6f6285ac73b708637c
@@ -9,21 +9,24 @@ EBUILD glance_store-0.1.10.ebuild 1089 SHA256 f541f8983e487985b79a5739b832c26f86
 EBUILD glance_store-0.4.0.ebuild 1332 SHA256 b57fea56ff382bd6f9020c34a12523523ccd389d387e2e136649f62c473a73de SHA512 5fcc656fa9f22b6848ed082d9706ddb7149c03ba0176011a124885d650ff65d4ba5f651dd053ba9d09e52a129bf5424074396db26daa3097ad1fb5b2fb9eee10 WHIRLPOOL 2640d219f636ae11b51a41b4a5565d06118fb581ba466cfc3e8a400ce15639b5b91cc13d087774627028deb983269523606a313bd9b5a8f6f248ce1363cc8fff
 EBUILD glance_store-0.5.0.ebuild 1332 SHA256 fe90317f19f750fe515cd9a9cadd137de12282abf9b3bfae975caf0087be80a8 SHA512 054e3d87f3acf1b7082f08d68a34e19a15c0e7920d260a4bf586d0790671f9351a1e721f3c0877894c23fc1fc2cb6e6357ae91efcbafa5265dab5c4cc4f85374 WHIRLPOOL a97beb83f88c2eecd2a833fa623d35b2e177fc7b393ac3eba794edabd4c539c3e6b50b941052bf422d780b871871348b3dd06f72438452df6278911bcdb3215f
 EBUILD glance_store-0.6.0.ebuild 1334 SHA256 50e0b125da390d4d5a651e39a7420913264ba9804e8ba36bce2f87215e81c74c SHA512 f93fe6db5a0c46c76743dda869406499aa7ebbc0f5f3d28fcf179d8c0d5c77e6b2df601955557145b338b1e53931767842af91b22ca52fbf39cbc7388e77358c WHIRLPOOL 0a8862b7a6e870b5af40667fcc2be5b8473606deeecf73d067b7edc6d6d6eb037a541558ab14594cd4d58f0bb7014da1d8b428e1034167f7a8f0e70ac04dd434
-MISC ChangeLog 786 SHA256 6883e4ed6b4f7f0005921a0185570262bc4be954f333ca3daf742f5b25fa10e2 SHA512 42e81624fc65a5049c4f2b43e67f2ad014440c92466770179263b020dc9e21d323ecede3f107ec31be021d75633e1f32ebc74fcf2ac10d2ca653fefc40849e2c WHIRLPOOL a89e9e0dce610ed2b63408889bf5c2f7ce2ded53e9a59b1fa4b63bd329c36ac46cbe9561e0cc9c9d14dd39a74e910690f913ec63c2581bfd3d6af2208c7a8125
-MISC metadata.xml 355 SHA256 5eb15ca599e6b10635dcd80f6da3d82064643e494c33ecc5174f638a532bf95d SHA512 36b8659bdf73c0479887ce5900568268aa3562a471e5f7523658251915de3d31dcdeed15892f9fc4b70d12fd07d0ad3340aae02e1ba8780a948cb70d8f152a99 WHIRLPOOL 9e7394e643edf20e9d2833ab874ee477c2fda21aab4d7d362672f84aef8ef9296a93b4b26c3459673c1e97cb328805793b5a6c4db3783a554a7812780a80777a
+MISC ChangeLog 878 SHA256 de0fa4cc6452cb1e86f42073886edc6042ec4e80c91b6f34c5c2ec5101b63c87 SHA512 ca0a4381d77d9c0107135a5e350fefe4cfa00ba99cd3e46bb10a00a07bb54c4de4f167198dc797ec7df1237cfc220db562760762aa992a8107b65cd8d2d1aed8 WHIRLPOOL 4103ca72123ae7a845521b8ed046221f25b43411da1378c0ae37ba77a7918a7a40669e1d0e88fc1ffe3ed1e2c9a51cc0aae406ae297f51f2ff971457c299d6e9
+MISC metadata.xml 442 SHA256 6cb763532c1736a97924f7fd02d5fa88d20d7d4f5b9bc7aaec5c6a781d40b7f8 SHA512 58fbeec5c177d9e384ebe4d0f699883f536d810d7375f83d834449739e7aa5c3fd60969d40a5699e64ea57757f0c840a5632a85d15075333188b2a55404c3ac7 WHIRLPOOL 03b7c1c87906e2863374f97ac0050a9a75ba2330027c38807b7416ca49a1de0dc138ca665adc2492852b7e299d8fd02908baf412b390e6750934c9704168b243
 -----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJVaRSQAAoJEGSje+quGaToK6MQANa0jeeMjNvs7kcIuFDsQQm8
-1nU+sIZU429zlVMemSlp60B13ZrltfusQUWs+4qB7u/jZLtZTmYcAbDRc9G6FWdi
-jub9loeWpZx4rsE/YtAOqgm4JieD3lRUoobd8tPVgIFTyIkHBNrlDlLwtLF66RZh
-9I3aUgt8v43mXtV/e0UPoDPfsbCMbAI/ZDbZqn37aZhdvAyp89UHkahVH9DEfjia
-1SXdrjyCaHiJ9Ck3UGLvDT2XO30NbMr3XYkpRbms+znndRx6XtAp78Ybe1eREpg5
-5H1mFtjQosAdKfSzPSQ3wiwqypLW6V9L1poNW2rsRROBzSSK7O89Bq5hu8EVZRVO
-RURmeKDKyDz3LrkVaD1lXUyOUdTfe406RXSDRX3iLIOX/H9zoJZ5mgYwatHOq/RX
-BUt00Sr1ZruvGBSIJvCNIGsgZHyV8HolPre0BJYlRi9n24UrvmFuVtGLmEmBjOcr
-O+TC92e++f+DwTpzrHGC3pvniGY/6zdh210VTh6djznGg4UcrvK/zNJ37wTKdFq4
-lLM65Ok7sjZGyp2bntpXXyoJ/+F6q7ha6Pa7f7E4ut6BiGahL/ZZcmNxqPq2A8Ad
-DEl/TDz2DfreR22aVdo22oBpeOcN483OJsl4/HO7ZowCX8E0lx2TFSjNbAkdP978
-upDY4FTRsaOhsJ4VwGNL
-=OKBZ
+iQJ8BAEBCgBmBQJVb1b0XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiXkIP/iRpKKqUCQ+HdPklcKutmvQK
+dV3d3YFKPHWhYxCvLwEDG2hHZeeyVy7sJFKRuOF01GQauTPggKNRjMWSH/JWaJGU
+KYKh8c1xtHCn0tYMbwxPiJTg0nC3AuoXYDyTnYWghTWQRr8y12MHUMYun99GdBUC
+F3eoZQl7Vun4ooDAIW2TpJEikHLEzvFeDewJlPBXiK2Z2gHtZ6jB/c9u0GUgzyQ9
+2mzTiIgekpf9VXiEF8hmailpd6hhOInufUaSLn6TKn39jPzbT1y166B1Irt2V32P
+lqJzgpT19WguTqDo92f2qxOEELqDZDPjm5KIs76cbWVg544PGn2Jhu1c6SQpSWoP
+hmMP1Bx08AMFdd6MFszQ1lark2lO2ZF0sLnfDE7QW9ySYVcrkTsZgp9SADWx53xW
+LSJtIJSVw9/HUrZXycLauHnIY/K1rJKHtojwTL6i8Hp/UZayaKQH4Vs87m7AK/+l
+Y6mZdN0mfPeVcH/1fKKBB3QmQr9KHNOgD/iwX4AUX4z7UUvlk/WCHBKbCYEX2fH4
+V8NlHXvQ1/8ViVFwdujLg8TlbSzwZEPH5Pt31iQszNUf7FK2fdryiVzWIv2ftpMC
+OzQIvjambsx2sCRKGVo7DfVFmXUoBW4WNt0fyQEgDB82kdafl8Sw9R9s23DpFjOf
+jHpZcF5YBkPvUIuCRYAK
+=6yw1
 -----END PGP SIGNATURE-----
diff --git a/dev-python/glance_store/metadata.xml b/dev-python/glance_store/metadata.xml
index 3e102e5e67c4..a83cb1a3463b 100644
--- a/dev-python/glance_store/metadata.xml
+++ b/dev-python/glance_store/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>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">
 	A simple connector pool for python-ldap.
 	</longdescription>
+  <upstream>
+    <remote-id type="pypi">glance_store</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/gntp/ChangeLog b/dev-python/gntp/ChangeLog
index fe6a44cf3380..a803ba74ad44 100644
--- a/dev-python/gntp/ChangeLog
+++ b/dev-python/gntp/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/gntp
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/gntp/ChangeLog,v 1.8 2015/05/17 15:34:35 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gntp/ChangeLog,v 1.9 2015/06/03 19:36:04 jlec Exp $
+
+  03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add pypi to remote-id in metadata.xml
 
   17 May 2015; Manuel Rüger <mrueg@gentoo.org> -gntp-0.5.ebuild,
   -gntp-0.6.ebuild:
diff --git a/dev-python/gntp/Manifest b/dev-python/gntp/Manifest
index f820adb593e1..fb7c11ddf812 100644
--- a/dev-python/gntp/Manifest
+++ b/dev-python/gntp/Manifest
@@ -1,4 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST gntp-1.0.1.tar.gz 10889 SHA256 bad7a9a3d877e46dc13ad60cacca0442901ed9ebd96708cebe9b8f280652e382 SHA512 6e44cbafcaa5b60b39d3bb60a67786300acae5e3aa6fbab1d5cbdcb4a24fffba62f878d801683d724321d5c0e3a3b780da9c99d3faf8a578f956603e1daa49cd WHIRLPOOL d908eca646801672e70bf69ea55a96ef42d75ce2b18ccaa2d96117452411cd07cfb2934a0716dab71e2aa4edf70df91a200b1d7289d0b0ecab39fefb39417e11
 EBUILD gntp-1.0.1.ebuild 570 SHA256 b7d3d115e1dcf57bdee34b3944a288679cf14bab2a13883dd89f3d6302b43adf SHA512 d984d4a16dc147f05a61bd2308550f3892974dc8c9059022dc0b643512c3b71f77151a46d789c496005f0db110b66517d7c1a95c99e23f0adb4ed3713bec39dc WHIRLPOOL 1247fb4a63f9f945768ff9ea221ca52aa4bae050aa8923c7189dd3c9d89c8655c3b44d451360e215203a8285c808505da3545717aa8fd41877c7f07b936cc2c7
-MISC ChangeLog 1110 SHA256 649dadbf72c5368be99a44dbc8379ed909a4bb83fd1fd4fdf6947e41b6b3ba5e SHA512 1e27fa59bc39c11b172930e605b3bb87f5904a8740c2c38dfac64d265e3a6a2c79d60dfd46f4e48bd076c2803adf329bc0a2e0a84175b5223c604407afcc5716 WHIRLPOOL 3b0212436698946ac0f91e2f0957922701b3d0bddbdd627ad8313316143ea05c91dc1c542a47e9291d137d1288fc0f49aaa355994a0849322efbbfbde96dd352
-MISC metadata.xml 225 SHA256 916662a3f1b0e3cf1241d6e4bd9942ff9d5d6ad68adc7b23946c6ff18e317352 SHA512 826d939554184408b06a319934e0b755b5b3970efb9cad15a2d53fd6584e3fb0a0c8c7f91e6cee748cf0955a5c19ba5d3ff913e5a03141da4b391bdb828bfa94 WHIRLPOOL 151404d22a684551fcecd857eb1e78535e6e5b84ee645143aee94494bf762fa22bf3657a70ad6e05ce016f710188a5b42f629d02d3a2ddc2859ec0497c615768
+MISC ChangeLog 1211 SHA256 6de53df2c135cb1681a329723f8e1363cf68f6ae1d42eaa022bd30dcd4961847 SHA512 7e2618c03eb342a609ec13d85091f09dbbeb2dbddd9c12193368ef122dfa4fb8e73b492f8f1db56303336679c6a5dfad589fb8fae29e62b15a24e00571e14ff0 WHIRLPOOL e1200988e1b414b6156f3191d69b98ecaeb9d8262a5ccdb3adadf0aa41953f1adeafc4c5d8cd9403dc29e1eb84ed571022942e289afd30ad7d1593d335f8aa1c
+MISC metadata.xml 307 SHA256 33bdf9fb9abcf63506736a96615dd3d47f6b4354ea6c00be19882d11c62887cd SHA512 fa3cc1048390affaaf02e4ac6d777f20ded684b77b7dd18400c2dbeb10021fc7389eef485c177638893d7f95cbe59d4eaeb41fa859eeafc3790d5f21d9a47210 WHIRLPOOL cc01eaf064f9764104f758f3a78db2da8e5dd8526481ad3bfdab7e746ed14cad938bb7759f571072f1ebd5b796a5d2537e358392876399bf9197e59f1ebda20a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ7BAEBCgBmBQJVb1clXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi0RMP+PLUa+vd1fq3IV3BweOWaJyQ
+V99GZZmO8NYQ9dLhGAwM/yDRSg8dptvCP8GkS35MmGG1t+Kke2Un2w1Ay6fdzLkI
+IO1ysAiu3IPjzeUizoF/jF1h8rdmAYlBplW/2aIyS95TngM2Bm2uE3C+SyOO9LZ+
+PK1ZtF7VoxEfdOT3viOQQKCKJpoxQCzDjlkeDhz/O8mmmGOgKZrn1kKJQs86Z+ow
+OQD6HUpPgqUEIr3vPTgvjln/Gai9XKK/ZEk+xHSLVArbaX95ZvaXje39V5CmIWjz
+HNkBQnwIA8+B8Fjw1wmY43kj9C8tMuJ7S0eqE+bZtiCNbYs1c1RcYWe9ef9Rmfqx
+sPaaioHEqi1F3Lr1FS0krBqg7vl5K76No8zEQSgvReeEVhmH5wnOuOsYswsZzGfZ
+wvgvBhequrrEsZK+fdURQoGN/JHP/JEKjtbA7kLZxYC6X7Qu2aUbF9dPnSXyqfIO
+v031//HPhUHWOtQ/qPsxPYtxjoVOjcvUYj96qgE4AWbTG+CVfJXgMZqoeqs/fhoV
+62bbPdSWD2qGyEuDlqS8OHByCs8tHkZxx0mUz0GMBmfsGZIO+go7irLfMwOnXYZE
+FclfqdtqiMq8uhMsUbuyCylESfmhf3NEL0eXNUSZXVCVpbqSrwR9D1cJ6vA2/jZG
+MskK4HxOagMtZSxPY0g=
+=kBNB
+-----END PGP SIGNATURE-----
diff --git a/dev-python/gntp/metadata.xml b/dev-python/gntp/metadata.xml
index a6e3636c60a1..0033411f945c 100644
--- a/dev-python/gntp/metadata.xml
+++ b/dev-python/gntp/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>naota@gentoo.org</email>
-<name>Naohiro Aota</name>
-</maintainer>
+  <maintainer>
+    <email>naota@gentoo.org</email>
+    <name>Naohiro Aota</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">gntp</remote-id>
+  </upstream>
 </pkgmetadata>
-
diff --git a/dev-python/guessit/ChangeLog b/dev-python/guessit/ChangeLog
index 77a9d887ef14..25c44bd0a3c1 100644
--- a/dev-python/guessit/ChangeLog
+++ b/dev-python/guessit/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/guessit
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/guessit/ChangeLog,v 1.10 2015/04/08 08:05:01 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/guessit/ChangeLog,v 1.11 2015/06/03 19:38:14 jlec Exp $
+
+  03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add pypi to remote-id in metadata.xml
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> guessit-0.5.4.ebuild,
   guessit-0.6.2.ebuild:
diff --git a/dev-python/guessit/Manifest b/dev-python/guessit/Manifest
index 10f4e21e899c..9bc0e416cb5a 100644
--- a/dev-python/guessit/Manifest
+++ b/dev-python/guessit/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX guessit-0.5.4-python3.patch 858 SHA256 33850d01dfd4bb4cb49c6a2d3d8b5978217820bbb93c2e445d6010751dba3283 SHA512 69c6e0434c988b3b3d582a54862477b6004cbbeebb3790add3fb181a6d5ac61640944aa40e5b72aeea5827861a5b1d4627839656fd0430b3c71fcb94ebb16d86 WHIRLPOOL 75a1cad0e3d2ca14a60faeef6b64e4eb72262a6b968a0d24a964667060ad58cb44f4c582c4784f8b4cad310ffc8e57c36f0e2cce0ab8b63150ab1933900749b3
 AUX guessit-0.5.4-tests.patch 6475 SHA256 0b57333d6555b100561c1d4c9912f1ac2ca5f14c6686cf0275d8f1a603a60717 SHA512 d823d5b43a5dad4d276537ca31d367f5fb7fef7f4fd48ddaeaab106c6dd4eb78407c8511e82539039bfd833bdc139ce6f74e36208e333bc8367ea307f2a1a419 WHIRLPOOL b7a4bbe75b7d59d16d4d239554844df837853f465ab19ac7112a911d0edc8514aa5ef21d4182af872b1a00a374b6ab6484b3a3eb4bce02101f9e4419cb8a4095
@@ -12,24 +12,24 @@ EBUILD guessit-0.6.2.ebuild 793 SHA256 6a17a5a11105421d15ae2d6b195be32ed79400e14
 EBUILD guessit-0.7.1.ebuild 865 SHA256 1886211cd4ca0488b6b78026ab711c89549540d07d5b8baf27c5f861b2205198 SHA512 9e490f8bcd596114b9876bce7f6a4d92945330e5ebf53db43a7878188e99d48bcf4cf1f171be9d58b6b9992d0f4688b31df5147df880046792204851b6b0907f WHIRLPOOL 376d33637417106259bbd0de359f7d5165abc3c526e668dd6a38d6c91b9c782e6cb13c844771b5ec85ddbba45e32f3d59fb9df7ea536a366131a81edb63582d3
 EBUILD guessit-0.9.3.ebuild 958 SHA256 ea4b95667d0f992e9282d0ed2073b19c3bba5c0a5a019c00f0acbdef8b7cbf06 SHA512 e378a6da1fa18254a250178b6d229e061eae8b5bbe2390e262576b2a72612edc98f715c7111d032b20d36bc495416a10af6ad1e8e1ef3fabd9eb9cd36f6ea189 WHIRLPOOL b3bba4cb1e17f23e991092e5538a1a10bc6f6c4a0c318aea30e1150b388600749732172cdbd3b6497920e8179c54c4a4de6d0a2e94a3ba9594eedb20b72c2953
 EBUILD guessit-9999.ebuild 927 SHA256 453fd86735fb62b6654b945a1215da2e0df1659f84fa6de59d52e006a08b4fd6 SHA512 3fe5bdaa480df852108fd5fda2708e2b6d55050fbde70d0a01df2b029f3da371b260aeef0a0238abcd358bea72383080653c6fc30368ad360a11230bd0b156c7 WHIRLPOOL 2d811373851835e7b26ab8c9c8b9d21cf69f34d55e3ae697889a7073a9ea49ae1b725501d99218e5c054b5f49084d8a599a27dec5ae71cdf2bdffa99685f6629
-MISC ChangeLog 1709 SHA256 0b9068c222f82fa921b6c4a29492cf81032b94a2f5b09c2de0dd9de405504ca6 SHA512 53ff70fb45e5db466b002553c7c3808618f4a9439ddc11193f1bc62084a6f2d1c6fb9c89540062e841021bab5fd587b2b20d43f06d7ab0bb34067ab5304cca32 WHIRLPOOL 2723e71f99e358de2bee2a49a8ae73893476968f2ea96297bccaf0e8618ead9278a8a768de745d5d0b00de0de62b9825f96e376ad972a3deba8ae971bf061f0d
-MISC metadata.xml 253 SHA256 75f391456f4a730b3f3ae0ed04cd74165228b2189253e018a518c4330ddb2161 SHA512 fbbd056d1532bb6ad58f2aadeacc6d0dd5ee4d8754fb1cf49bade788460de4c415c70bb966491e3d8d84c3a6adbf0d2a3b446f19eabba0bf8b1cf0576d6d6759 WHIRLPOOL e75ba1c4078ea28137b01250dd45436ce6fb2cbf0ee74d4bb7baca671e6fd89e91c60407e0b55085110cec694b0855bdb90c5949e67c35dd1eecca8e7d73eacf
+MISC ChangeLog 1809 SHA256 74fed000a6bc3abceac4a20715e986718252e38f3cd5fa29c7dc75c6bb846597 SHA512 a1a48e49f16f0f8fa376003f97cf2f0c7c93d368bbf9318c20929f91f34ac443653ffdce7c95f7d21413be22dfc451080711bbd5c2e23e6ac9cba199ca363310 WHIRLPOOL 932f121e0b900850f24425383976fa7696ee6fd53d6b82d95f145eba8159fb8f9b264f0f04df375d3c9d5ff1e91ad4ded75f43e83d44343d89d0a0b462296f0c
+MISC metadata.xml 334 SHA256 a90921e2c90c4e88e2775faa6fe808dadbf30231849185e04c7e55b038ea68bb SHA512 5c507b29d84fb8d62b086f6e7647109f4847245b37aecdbc91d45fdeb36f6fa6f54a8ded0b0fd7bb4ab21155adf1c87f17c547095af59c2eb6ad811e3524e000 WHIRLPOOL 1997f807ed61a17e106b90a2f945f5a9789114e76ec2c466af7ef93e8d89d8169cd0eb37dfc71eeb0929d8f81689f88c8993a4fc951a10177c8423bc910ac7ff
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVJOJyXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOHF8P/itgL0VReo2gxiJdhH2CGqjZ
-TYpaDcF7OWnYtvzAsk1Xs/k0sZAgvfbOyPwD4bwVfizwt7BazZ0byVo+m3aXa7dP
-l1dpE6WDeyT7Hv/BG9mbg6MZJ093dUzz+I+GPrfMi7VNEujkpgljPpmi/pYHf4xU
-PD3/DkThnZ8m/vZ0qVBn4wS9XT2QYbVqnyLNex/ftrNiChMblmp3wOhnN/6uYfjp
-oaV40gH2SSqMqMIf/pGIg3Oreb8Zi50EPAw23Bz3qYK2HtOeVngvqeBtjE9nbAX2
-O/b9OQl4FId93EOHEaaDtUgcdeSvAemwRvTDzkICY4aH+3q50mIVnBZTPzzVItTi
-eDh190LBDAwhEUsniIUVdOoet++Ru9jLLiBNb/wXi5HE5L9mCQv85BYzkIuKuqyv
-OZ564LGzNhtprdjaduE3/ikaPXmTw+PR1hYxK1tZKwwdaNFA2zL+OcjjIo32AM+k
-xcChCUqhu6LOWPXLoaKMRAxwk2xNx9sR9+sd2r/5RClykHNuj3OQEWX0WtVaPUxA
-s5mH8ui+4sMyf9HQ8J7WaVi1FCgplL4IwaYoc4has5n+0mwinxgu/HvexqQ0KicY
-Exu21tdNCbPw3mNIHNuQT/qwVetGWPap/9QKRsW1QKtQr3AZm0MljPA/9d4KSiXw
-2MwAAZb2sTEXKU4n1P2C
-=k+H2
+iQJ8BAEBCgBmBQJVb1erXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmilPkP/0pFkFEYvxEhfBCVDAB3/vDp
+k4RTpR4U2QUTPjboYcD0Ns024lg7lmr84SY26DZG3I75Vq4JmGECNv/ppswn2bf3
+vy0K3LmoRvlVClDnBnwQBm6fKtRN9vodZlnMkIlGUN85Be/ZL1DuH8KxsJpkphR0
+lJ8i43XaLA0tDUm8Wc3lTOP8+g48HqXdCUygV7D40kaaDk56J0oLyZYhxFovLem3
+R8eocCL2VE+kjPiyIrNwJmsCSOYn/S6xSyv6VQY0ZIYWrGBezjhJ3ONlM6Colb0J
+Ii3QeLNCcoQzZIZRlz54tPPrA/rjPE+p4+aYzlr2fRPjcYU114Rh7qY8iYk226zn
+Cghhl8pGKDeKLf/fxhRXAtDNhZAQ/m8gWauQKOyJ9dSdMyfHuQToZ47/FkAyQ1/c
+LCXUtYotuIkwDIE25yBWgk7UxSPsia8ppopbQD3XyI6XMtT79e8EvDYuWjI/I0En
+OSbPP8E9ahpGZV7jPA5mVExZ7PXtdMxtPThnNWE1V1sc26gRsofrneDTczwq3DST
+XHpsnMcBAq7Px18OA0PZVAzqCbrtMtdtnIUJ7YJZ6H8imLqCKgevmt/2kMAqbPF9
+4LQ9AfnUIRV7ekJc7F739NiiwHqXOhUk0jiW8VozTH/zkQDzjida7BzpOqEqrl9w
+y0Dz0sooPQ9pYdwQBuQg
+=+Mjk
 -----END PGP SIGNATURE-----
diff --git a/dev-python/guessit/metadata.xml b/dev-python/guessit/metadata.xml
index d932d288d96a..7e025676c2f9 100644
--- a/dev-python/guessit/metadata.xml
+++ b/dev-python/guessit/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
-	<maintainer>
-		<email>nikoli@gmx.us</email>
-		<name>Nikoli</name>
-	</maintainer>
+  <herd>proxy-maintainers</herd>
+  <maintainer>
+    <email>nikoli@gmx.us</email>
+    <name>Nikoli</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">guessit</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/h5py/ChangeLog b/dev-python/h5py/ChangeLog
index 3a576c79a53c..09e9daf52044 100644
--- a/dev-python/h5py/ChangeLog
+++ b/dev-python/h5py/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/h5py
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/h5py/ChangeLog,v 1.39 2015/05/30 07:59:52 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/h5py/ChangeLog,v 1.40 2015/06/03 19:39:09 jlec Exp $
+
+  03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add pypi to remote-id in metadata.xml
 
   30 May 2015; Justin Lecher <jlec@gentoo.org> h5py-2.5.0.ebuild:
   Fix dependency version of sphinx for themeing support, bug #550720
diff --git a/dev-python/h5py/Manifest b/dev-python/h5py/Manifest
index cc6ddb4f0fac..8a19de1e1efe 100644
--- a/dev-python/h5py/Manifest
+++ b/dev-python/h5py/Manifest
@@ -7,24 +7,24 @@ DIST h5py-2.5.0.tar.gz 684354 SHA256 9833df8a679e108b561670b245bcf9f3a827b10ccb3
 EBUILD h5py-2.3.1.ebuild 1231 SHA256 d4c9dcdc480106ac8cf3eb4bd1021a4a2b4ec2bd936a23a674f2ffc683584b3e SHA512 f30e4b226d8ee10348dd546d4cb33b6d17a69820756485c06876354112bec6c4172c4f021ed6046657ce062659def07b53a362c60ea148aeea7f4f89a213cf32 WHIRLPOOL a2ba1d438216aefa2f20d8a632749802352a1a8f9e49464a11f1cff9fae30cd5db5c52279ad62b3dc7dc919495fb0cc0e65f7fe3950dfe94912d09f1d160e0fc
 EBUILD h5py-2.4.0.ebuild 1122 SHA256 70a4cd1b59982e4103cc420e04591cfe9368403ffe05a7e232e9414483d58815 SHA512 1b0c35aebb6fb78ad266df27a901265b3a1c549f4ec0edeb4d8c154f064681695421f1f369b69d4755afed092003c324da11b33cf2825dc0cf9a13007c7af143 WHIRLPOOL 234e4ba42be5a4dd3140c3d984bda71ce5ca21c4c7e40a22eea2b0170a2650f8cdc162b5fa6208d7cf31de611807ad37fb7459a64543337e9b67625a3830a1ae
 EBUILD h5py-2.5.0.ebuild 1513 SHA256 45f009d83ad112e0d90e3750ee10885c2f49d9a11d5faf0b3635e7e525c6f4b4 SHA512 823dc78b2c6f24fd3c3a279220b661d4c6b3d1f2a42733547b112d21f1954e84f9f1eded86beb9166f1d29af616983ff65bc08c0e0859d41786eb35d6916e545 WHIRLPOOL 46d37eac02d5180809d3bd14a4a6c5786f47f43597a10049584c8107028832d7356aba97bf356abee3fe1133e582a2e3bd20de43d5feca618556bb49920cacc7
-MISC ChangeLog 6642 SHA256 8907896c7f052d7f4fc8b567e5005ddb048a94d280ccf0935a28f70474f1c688 SHA512 73a9800a4c7d963e36b7ded320d8e1bf0924a0deb8336b186dd70d791f06fdb3e63ae9b87b64c0003a0cd22643d4fada48b0b7951f1ea71e18414f7ac8abcf2d WHIRLPOOL 012a0da5a4eb66a014e18cb21bb00cbea06db33301b901fc57dbef9271c124a5d5589806615f428a1bceb3f32a51fd2f2ad0007cfea0fa4f26a93e6588e28bc0
-MISC metadata.xml 785 SHA256 4a83a41458931d746396cdfe469becc1597bc5beb35936cc7b4b4cabb21ee430 SHA512 e2ed4fe618cfb7e33be2136096b3f78c3ba9e0851b7442fe275e58e932b02157127983598e7c4d98c3da0f86c407fb1937abe7cb00d8e194fc78f86072af51d9 WHIRLPOOL 132eab65f7bd5c06dc233e1ce14c49a5e1808e0484eaa49c03b5b7f62691ffb1502ce20ab3bad124c3a1d960e5e840d8babcb1ac1348fcdf4f5484b37ec4ae6c
+MISC ChangeLog 6744 SHA256 4748dd52135158fa44c356515f3133ed6ff3f4b2832892fd8114a64f03b82cf1 SHA512 56331f00f8e02297148bdcf454d5b83a51e639de3d550f09bfe0530d0beda2710a83c8c97cc7c34fddb8a90b3c53f24c62c85dc75e9ac2929a30959b80478346 WHIRLPOOL 13c04979b3c6f8efe4997028448a8ef1bf237ad686ea5fc7e909877b3c66267d66d8012a065fbaf97f49f79c1cb26ccf04d28037c69a38dca240b5849b573c6d
+MISC metadata.xml 829 SHA256 7662736e046eccae240ee70f45bde948466d40dbcb0a9088aa4e416aee38e2c5 SHA512 0a598567925cf64de6a5b6cf9cd0be9090949be2d3c8033a5c2244470e3bf383d7a68c6beed49c0073e83f2276f2a117544a208c6c41e0655216ce4995210e4e WHIRLPOOL d3594a280b002566b5495fb9ca9dd8c0c1b60c24deaf8108dbc27b7d5e5003e01112226b636c985a7236e3c55e5e217f8eae6a368e7eaebe87791e2a84310065
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVaW39XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVb1fiXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiFbkQALsMkevIuSf2QIPwvl1waFej
-lmVffIafzdzGOS5rsq+/wD3TPRXfWyLNxj/mmTNpXDQy+ssfW8giYHs7OHCg6ih3
-ZRph8M68riyIVvcd2W/3F3Zj+cvUBZE4NbjYp4r+rLAysZRS7m9m15+PrcbQXblJ
-O43iPEDPoO6ixmc6SoWIB77YYiOk1SD8PAqePysDyjFQdMKBTYzUwieXzUUYAVz7
-TRmc82HlGwM4Tg5x0wN/wxsWKiPxcHz13b53byrkvwPHi4xMTE9d9QC6h9IJtgjQ
-oFqHmKTlLhPjvjm1C99ekVAAMQ4a3IOFn/EnH4XiFtl2J55oy872mCj61ld6zNYD
-WIkqssfkXyBM5m9Dy66GjkrJJizXGqcDOcfTG0sB0uzZg7sco66hAM2O/4ulC5k2
-Dr/4wyKjZ0Xvm7SNzWoLvpMtvfNgJG8V+K05ZFKt8I//y7FCOYhV7opf1COaXafk
-OHO44GLsBZ++/PAhpPykBG8mTM9iUFNAgbu4behDwsz0kVGjqSgXK8QWU1VL6uRV
-CFxI6O0W+Ft39w6nuiwLhrbE8fNoZ8ZcC1TK/5pZI+R7jk646oM4ZysqWZr9eyCQ
-S9R6u+5b5QJ2kPODEyV2/CsYi32p+v9mFee+JLOIjookw6rXdNBsFuzey6p+Z+vX
-djPlBbtMO+N2BIrbkeqw
-=bGGO
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiQpcQAJwYmr7fiGfxKRkMKQ+LtyLJ
+7bWCCdWeS6DVZiWxscrcJOyAusB55be1x0uyb/2OnnmCspy8sn7ic9CZ4eZPY5cy
+lkvdRoOcslHQeKZa5VQaMJ4Ze91Qaf0sRXdPJcLsEBMdBVm99E/Hp3KDkkbXeQni
+1ExlQtlj8IlADUOS30hxyaBG/334m4tfdinFVSzrp1AlyeduLMPWHzKMm8FxThVq
+wkHRtZX9Tq5dPYJtmSiJzNIOuKKLZ0qXLU8b3Gq2c6vVT1H9T+q/hTrqKUOjMnuN
+b+1WsieRxRh2RJDD1Rjz24TefUdm/4diHHBjgyZ+j1Kgt5xemSeRoLFW1mNpKDFk
+MBkvFv4L+6iTJSQsc/B5fq5eoxZMW9K4grB/+XKIshg3Wz7EOVpfCGt698kpPd9A
+t1CWjkZ+TpInWq0OmXpf8fN3f5sv54aOP2ztqozDXODTJM9jhwGw/KuKf47K6jVn
+jn9GinANtyP6LeZ79QVnnXfc9qUH4wfiLiBH1IAbTmmLTdK/4vsw34fhQJvIG9DH
+hu/6fmoQNo6MX4XlcXaXkyG1J/Gv9Yvv6fTGQx2IBCqReXnfNeE9bFFeFr7gUwwy
+kwn3K0QV3LpTcT+BULImCmw5xFF0Kn7YI0ATzU+hGAj23HSJaSf61uT7wt62Ua7s
+9zGkWZ7BL6HuNATDyNO0
+=2jg6
 -----END PGP SIGNATURE-----
diff --git a/dev-python/h5py/metadata.xml b/dev-python/h5py/metadata.xml
index c1e085645a04..7309a3a9f6b0 100644
--- a/dev-python/h5py/metadata.xml
+++ b/dev-python/h5py/metadata.xml
@@ -14,5 +14,6 @@
 </longdescription>
   <upstream>
     <remote-id type="google-code">h5py</remote-id>
+    <remote-id type="pypi">h5py</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/hacking/ChangeLog b/dev-python/hacking/ChangeLog
index b7afbad938c5..43ffb9a12b38 100644
--- a/dev-python/hacking/ChangeLog
+++ b/dev-python/hacking/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/hacking
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/hacking/ChangeLog,v 1.22 2015/05/20 06:51:23 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/hacking/ChangeLog,v 1.23 2015/06/03 19:39:00 jlec Exp $
+
+  03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add pypi to remote-id in metadata.xml
 
 *hacking-0.9.6 (20 May 2015)
 
diff --git a/dev-python/hacking/Manifest b/dev-python/hacking/Manifest
index 24caa1d346d2..3ccaf3ea48e6 100644
--- a/dev-python/hacking/Manifest
+++ b/dev-python/hacking/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST hacking-0.10.1.tar.gz 39768 SHA256 ab5dd17d927f0f980e759a33454e2471587e5650be48222f35f79996f472c016 SHA512 46529b33c4e6ac6e379d6c69d26650d31968c5e9c8313e525abc62966b1317aac9b99ef09b57ab30b8b43e63f3f55e6fe3175bd68f18433c9a29dfdadda1d945 WHIRLPOOL ac5360643b5f9133bbd7677472156b6a69d926288e24f7694641d06afaec33c7faf204bf78e56d5143b37d0fd5667700a55e9d3f00074567a2dd3c69cad3dfac
 DIST hacking-0.10.2.tar.gz 41108 SHA256 5771028dafaf374ee52267f5b6217133f943b18067ccbaff799280ddc60461a8 SHA512 9c7f0836f35e5c233be18d8d134326e05eeef908500d64040e59ce0bec6415171c063aa418e3834654297279aa9c65ecb4499766fdbf50b4a9b0e3513a3c28f4 WHIRLPOOL db41bf40d887441c95b90e4429e5be58409c99511a78d6b6fcab9d6e30e1840fef52bdc282c3644674fd42333c0a5b8d1ed7ac40dedad23a24133295662affd8
@@ -13,21 +13,24 @@ EBUILD hacking-0.8.1.ebuild 2078 SHA256 401882ea1c13ee1a8b57c1e18e1305d8a8eee7a5
 EBUILD hacking-0.9.2.ebuild 2049 SHA256 40211ecd8f3ff137cebec85d16d8eec0562c5b028f72035f82b1becaddce5276 SHA512 d02f97885bbd6fd015d37bad220127eee6d1b4e3842ac872c7a6e01f5889505145c157cb5762b07705eeecdc967b37e83ef57ccfe742dcee8dcfc0bb032dc1f8 WHIRLPOOL af3866f4cdcb21acc284b2ef67935bbce76f6b460362bacb21f0e18a5aa933347d8942d33f6e739c54aab1372c4fbc6f144d11d452f455b97c8b2caadfb9cd90
 EBUILD hacking-0.9.5.ebuild 2021 SHA256 e7cf215250edea1595b9c9fb76f5c2ece0868ee4726bcc3077296d3bb88ebae2 SHA512 fec67d8ff71d572bc525e9a8af9c5bc5a5f96075d428bb53fa50a410f94c48faf0af08677ce4112a9dc725b9d991672ae0433751d353343a8bcce4e6ebc4c18f WHIRLPOOL 97c59292636540150bccc8acb2db94ea23c581de21797b8619b6344c960d518542673c9a2f796abd2d18dfec6d763dbfbbbe40db02f2e587c165ce8169e9d356
 EBUILD hacking-0.9.6.ebuild 2035 SHA256 7b8a66e992bfdb6128e9bdb5caf3702ba199a52a426d3c43160c55ebf0a5abe9 SHA512 71b75d2307ba12157c07586433548b4acb74e559606814e8ec0763c563f8001fa5c8e7ed6a5f716ebf627830ce6865662d31bbfa7eb0219c16720418fc295436 WHIRLPOOL 06039bf1eb195685ce788de9fef1798ad0a87b9e99727d666ee83c2c2a1384aeb1882012c681e90fdb12b256dfb58fcdfca2154ed55f298468e25d7032ff5541
-MISC ChangeLog 3737 SHA256 73accfe1d3d6d0fd5089cf84802444a75db6ab228de626ccd39cc8881485cf7d SHA512 ddf409bcd839b66acba08b7e539db2f47939092a35c95726ad77ba821f5efce113a80c7a44db43d29e10119ff3567ee5d5fa3cd8c9b0e03b9f642a27115ab819 WHIRLPOOL 0eb8cc1c07f47dec83f4aace00ada0f45b15aa32de574716c4a113766a9c06de1d27e78a3c46ae1584f1b5a66d11f4d9346bf41e9259b1e002d135458a5d079e
-MISC metadata.xml 453 SHA256 79d7c622c93da6df217bcdf2e0339b1e3beee44ee084fccd8dee749a7d35e163 SHA512 0437615ec17d8536e8ef50d80f41db35b570e98e5b2e40dd08d1f37556edbf0a62396b7268398ba3b6a0eced6f0ee9fa40974ad54550fc39c5516f8286da2eba WHIRLPOOL 6b200039468f573d5640b2515a05c0f8799a77c5be34486e916df5d73cd3f207268a3e7e6294bee2bffe7bb52427c07c4109cf82c3a01b6daf0dd9097eba8037
+MISC ChangeLog 3829 SHA256 c41bc069edd5ebcc5c4dd97032a662abbbc06508aae031aa37b3bc24c55e5902 SHA512 839de85e8313935f679ad1bfa9a3086ba3ff5668ff981ebb886d3f438763ff7fb2e79b5aaa85613286bab69f7ecdfb9dfdb40b8f7e6d3e1407c02d2a709b0d74 WHIRLPOOL 2c08859bf586b510443f86461fcf14e5d2d8fb803154b315faf23211d9e913f14ce110b9eb12146d73ef9297dc56e7b08e05fee2c62a6c2765320023318322e8
+MISC metadata.xml 526 SHA256 cc7ee3a399f9d9041fa28432250f823eb8075c88b056e77db7d5a24d347be242 SHA512 737f1fcd329a7b575e02a4129b940509587a1597919e60bc3fb0b4337221d731f5dd8933e07b81f064b39ad41c7e63441b99f0efa095aa207d1ae10297318d4f WHIRLPOOL ebc708e2da256e0c7b1b096da3736cd2aa43ebd68c7462f2a9ff48ed85f5cc0aec50d15aad4494f8760b36e249568e1ad8747796f3e5f48cc6ad26be91b6b834
 -----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJVXC71AAoJEGSje+quGaTo1MYP/ifHCwbEKE+MnXld98xU1cok
-UqEJLi/1GK19Spg03gwmuAJOviu/pbczyvMVq+xGWlGn5VGOmTJkKaOcK/j8Hvtk
-PPEA8DC4tproPzpz3oD+UuZJQWdF8GMpe+CdpR6a6Cv5/N+q1KykjMmzYKI9/nuf
-ukyhd37jGZjwblKMYpBtCUlS/moGPtDwufluIGrDz6tGoeLxGa/7+dl/u/SzplaU
-JvSFTTthKTLi0o9xgAf6h+dw4UBtOEpGQkjO1njOPCxsxyB73S0/SrRadoRUyQlq
-TSVXnozUgIWhE5aWxWOh7pVzxXJjZX1nfQIIsBfFCXayXRHglmupTIyqRNl9R+NU
-dsPnj1oEX4bZ50k8Gcuji9XlO0dJ3XQ0VukRpRQYdvL0AoHmVDbiJmij/w6zO0C7
-nF4O2CLyREAzzpcrSZdcis1sOO9DhP7ZGtu6tEZ7JIlGsU/V0uCHtyWUV5ImQFJC
-wH+yWSh6s7R+DePBtpdmeNzJqk1dSgnvzPA1OmzC7VNhAW1HQABGs3VJwBUTDDHQ
-awBv0wk08VXkm40WpFfIUN0ZnK5vrKDvEofWVtGXi5yhRiiqBhG9bSEillGp8olH
-kogknxD+13lXABFJCZwbfjDJz1QGhYhbSODaQ2Nu8n1jp8UNXPKtVhYaBgOD89Pp
-22Ay4TU/98Dl54Tv7QDt
-=D1AK
+iQJ8BAEBCgBmBQJVb1fVXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmikL0P/RksTz9G7oyalIf1yIhZzan0
+TBYtuY4AC6g+DNxPTJurZ8tW+mqN8hoL4nMgYG/LDt9WzAvc8sWNAesz/5KIm4EP
+BZv2b9eu4+lMZVHr/QEdX1drFJYEs7Dfoz2+GMiGM69RanCa01J0FLkJ5ahDi5ba
+/zsy3kZ6eYd68qLy4UxscT4baxJ5H6k+1vprVu5opUYcq1dgTn4SWkPytRZQmBaY
+IBF8B61mGlJLcLkzJfozJ++Ate6ADDUVFLAJDMJ0crf2wm3PDtsYZL6ct0WU6Tr0
+hAry5c7I8m0FvQccQ941Z+hQWmUx9noD9wde7cjOrCxw4WUmqat4otc+qIlCKfv8
+oY2RpGEnXpdNE7UAgTcmocKuYJ3vs/5+Rx1U3nKi5Y5li8VOtUdYnJY/2QTuzw1s
+c1a0MeQvI0mwCtawm70W3zH4j+m08GE621usXx3a86JzmylzVANXrMWdcBlq0WFq
+NVBtKmhJN7fPop+BSmdY2QUN0/AlXDSdchFRn5qVN0PwZeD6xjd6SGBWwyTEQmCL
+/SFnwirqLlvrlhTLEhdNhKAJ5HeaPC2ioH4ibRTjjC0UCcC4gH0pQ7RlXOeIa2AY
+oiVZ8f9FYN7ewlMkAj7tVfYF+cevuMOCTMXGE0kFuey6eu6us592gvpAR59WOdMx
+rBOj1J+xkYbuM8QPuhrb
+=IeAK
 -----END PGP SIGNATURE-----
diff --git a/dev-python/hacking/metadata.xml b/dev-python/hacking/metadata.xml
index 0f7cca002591..fbad25559c35 100644
--- a/dev-python/hacking/metadata.xml
+++ b/dev-python/hacking/metadata.xml
@@ -11,5 +11,7 @@
     hacking is a set of flake8 plugins that test and enforce
 	the OpenStack Style Commandments, HACKING.rst
   </longdescription>
+  <upstream>
+    <remote-id type="pypi">hacking</remote-id>
+  </upstream>
 </pkgmetadata>
-
diff --git a/dev-python/hgtools/ChangeLog b/dev-python/hgtools/ChangeLog
index 71df7b23c572..85e45c590f6c 100644
--- a/dev-python/hgtools/ChangeLog
+++ b/dev-python/hgtools/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/hgtools
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/hgtools/ChangeLog,v 1.14 2015/04/08 08:05:08 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/hgtools/ChangeLog,v 1.15 2015/06/03 19:39:22 jlec Exp $
+
+  03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add pypi to remote-id in metadata.xml
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> hgtools-2.0.2-r1.ebuild,
   hgtools-2.0.2.ebuild, hgtools-3.0.2.ebuild, hgtools-4.0.ebuild,
diff --git a/dev-python/hgtools/Manifest b/dev-python/hgtools/Manifest
index d6073a289f08..5d800c970dc2 100644
--- a/dev-python/hgtools/Manifest
+++ b/dev-python/hgtools/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX hgtools-doctest-2.0.2.patch 369 SHA256 12f94e24f5ec403569b7b371a88e2ccfe99c8679c65bf6f5b195da02ca40ec74 SHA512 eb8225b2cc279034a86d1d15519c9591660d913b79f7f9a09f35cc97a91c859c6b527b9dba659875442a592a34292a2fda0f4b66ed2769070f437fe10485b00a WHIRLPOOL c5fc8aae521a732ef3b8d3917c64d8bc767072d60335ba40e3c6e80439508b4ec648b9f553bf4a0291065068d56e546cdfb4fff88ac7ede7c7388868966ec062
 DIST hgtools-2.0.2.zip 30635 SHA256 bfa82ccfea56b178c9f28cb719cb97853710880b207e0a32801ba1077757da07 SHA512 5173ff7e0e42657058731cdb3cf9c2fe7cbd378d026321be62e937c57da637fb79bbdc6b2c91df06f1c93854c253f77621c0a5b91a7df451d68ea72da6f25266 WHIRLPOOL 5f33ab464b72165948e8e568f3b3e2f5b364b14bc65ff9311906d0aafced74505d974f28af1241b963b6772cf770f544c77df2e6665376da86a41f83db9b349b
@@ -11,24 +11,24 @@ EBUILD hgtools-2.0.2.ebuild 757 SHA256 0c64cdbdfece03db5d40466abdf735fe5c3c91242
 EBUILD hgtools-3.0.2.ebuild 890 SHA256 24da762c2c5a9fba63c42de2079f3866bd2c1b7c1599f89ce87d886c32634139 SHA512 111749822f1a07c69bd55ad629210e5475f41b01c81b459e1f993d223721962a64c3d4cb3a5f184633994aa015e959fe1e880d9f42251ce53029f7ceae45c52d WHIRLPOOL 1d6b6a28e7b9a8b471cbe97d5154ec6359c111bb4f6a8323235cae4f36dd6b8f748534af3cc9502fd58c4d6189437abe81cb7f796e628403f654895a32ef7fdc
 EBUILD hgtools-4.0.ebuild 774 SHA256 de4a2ca91f8403d331d83db47b16f0f26044ab169e03f35700c57e2d95eb75e9 SHA512 a715ad3b9a225388a5d6439816bc970521fd5d56e98c2623f40a82ece548556478703f39a0ce3c00acd3e79acd4c61fa5ef2e61432546e53534ecfb658f3e446 WHIRLPOOL fde44699ba474094287df9f06ecc48b448ec5737c194efbf2cd47bb9e31facb438d020f4820fdabe505b8749adfde12e02ebfa154350884bac624c52af708335
 EBUILD hgtools-6.0.ebuild 776 SHA256 71c4d06b21bb0e9c7e5255e0248031f4d92fe9d99212d367660882306c7997a4 SHA512 39e918b61ac0d9415df23ee7b18ed4d131d56af791db84a6f8a775a0d448017b25b5864ad3fa5719edb5b9e7d9819a27242ca5104a6797ea7f4c299a36c5a158 WHIRLPOOL 539caaa259567e8c176caa87b514ad2f7e9af7d10dc1b14c64411582ab565ec833a5585fed182e6ca29a81df7f6980814d295bdf52b0a365820ca441ffac9ea5
-MISC ChangeLog 2410 SHA256 464007835ffbef3959dfc68b2adadedf51112897e20b54c8777f7aeb1e75fe5b SHA512 078aa9ab0d30e01939d124ec070dcac1472bf4f4b26bcef43f30070906d7a09b69e90c0ed4ad1b315dafb45e25b440c45e289a6e0f969909070f38824822d6fa WHIRLPOOL b045893135a64c399e7f1d8c7f86edfc79993e45c30312fdf251e656eabf7b4924744d37d2627ee9d11a50493ecb97a378bf62ff07bfd1886e9d7c0155ed69e1
-MISC metadata.xml 369 SHA256 45645fc60cfe2bd6c545a37db51ab0d60363b6de21615ba42bd780db41d41760 SHA512 c1c11c0a19a1d6928b1c0526f29c9d3c53b99409273a3dfa037e3e0661edffb26ea6d02868827f6219937fdea4aec5821fd80b20af09b7fbece44e8ca95fa2ef WHIRLPOOL a30b946e65463441bb65fd043498869c4f6578aacc6e5c2833c224dc21af1b64f3d99f5ef637ec90ab9b23f08abc0924adf2f955cccbef3a24af5a8dd4c280dc
+MISC ChangeLog 2510 SHA256 b04192c65b1c8338e3d52937f5263f2202120b461686f4d800db9f57573b7037 SHA512 f02aaa2237a49803899b22c97b4f2e80ad4cfef0e889f8c440c6961d5aaf2c160037bb7f74175aa7be931fa8ec3d95ca02497795dbea47c074728a41fa0b321a WHIRLPOOL 89ade9575e5d21791f14bb0ceba0d6ac5a755a72df6aa646635fb1dadb67b50d6a94237bc7059b814093e71e82151ba9b03b586ab22a51914a03d31a0c8ef163
+MISC metadata.xml 451 SHA256 187772f4e36eb2070c1204706c1f1cf8f10890c612cffe4add66c7679ef00cd1 SHA512 bc219695051809c378a795631d9f222b87bb7c5646fee5df9df6cb840896f455262c0d06453c6274563402e2045a3ce91d0c3911a759a4406e7b3c99c2199501 WHIRLPOOL cfd39eae98a2c3496ad0df299ce1750780d126b18aab4354d7d1450e0e112d7cf9d86507260a8afb278a50c8a80ac5967c3a310bdbced2453fdc6c73d837026b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVJOJzXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO+BgQAI9ahUwzIeJScLVxS2V7ENR9
-Hujb1rne1lDdGMjvIKgJWxZsQPO+hI14AbSGdrTwhMMim+DJzAIlPaH5BrlDyL9a
-AyHzvWQL1NN1jjg5Ltn6Lzzr0M+dCgkxVqoqqSbnoTedw/ZfycYgiOm78mfpArzn
-SNbSssR6Ua4Id5I0K/kCwuNwI8Jgys53dAtJpP/vSKbxeFzH3nv8sBQ/yujRhsJP
-ScCGEXP5MNpxo481MvmZw7I0TPKV33P+3V29O1R2/TuhVPpemXi5Le1Hu0VRmi97
-QgLiXCdwSWUrXZWxcSg/xXVmxGc1DdzYmxgjuKfnKnAlj06121zweLX3ZTWIo8/A
-2vBVkpupPhGD/+TO/ot4NB8SIB9QqpT37PXh8jXA68lw6dbcHrNqiyDmwxubXY+Q
-ygY4vSnTN7rdlAPQ6kxyo57rJjBntSxpe+IaAo4Z2xYrXBlQSeDnMdjkwIlPrQyB
-ZZIhPQilab3ZNa3N0Gi05PAmQ7mHR0ONgcliBabS1YQcoYJt9e7FNQBNO1grTt/6
-oosMO3ZScHpl7lvtPLjuy/kAH7E6oLiKl47luu1mAnr+gf8Mh42JEXp+oNxYLzbc
-SUw9MxMpbM3UGAKDbVC6KouoQMSdDHUUElZl2Eqjpjjsl7s4Z0yYJlS9YYI0Irnf
-4bu5CO53PuqlvoQwEVVv
-=ar01
+iQJ8BAEBCgBmBQJVb1frXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmir5oQAJSKXLD3xd0Nn+XVRXqefN6u
+JwEBXLBt13E5g+ZrUuBbzPqAfUOFwkL5w9EXs9itGGj4aqm2y/sEDwbzfS2izuBy
+wVdEQhhfR8F4p6FrJAkWrxLo5zuKCPvySyRfoEEpDDWYnCfhrDxUXCi2z+BbiqRR
+PGVA/vbtlqW0i44rsURzET5FVaFvAjplzohLUqW3X5IjhZjvrPKeTZGZ/800+z3f
+fcBps7VhkGb5E9Tr5uYaoLs/H0jH1wZMSnopBACbWL0P+CVWu8q1U0Cr+ROh7GmF
+YjAQnXamQTm4kbUpXbyM8RS7ercuwZKnZDYlRWe15zIZqZwpqk5SCwQpAk7GVIrG
+KA7OXD2nSJjYrWDOyf6UQp1kdQcNM0THN6XEGqgPofbhaSqSnAZjexAigpcpiI6I
+sfPEpika0/xQjHfAqWxH/xdocXgZ5YbEG//OVkinz/Yq0MxpFizGFCK5dHXZQ5Bx
+TForFC2ienlu+1h17DMddab9I6y/sAki54j1WB6OlIvdgbHi6l9hoQwTGafMBsS6
+f5kJPRkvvbaXZQpTq5Jvv3qfEE2eb/XCAGBT7oxfln2jyx8Sk2nh/zfl5vlqmlN2
+w3QbQ2AFp2kodgDI6ZJp5GQkCwfnziE35bRBgsQtnFcfJeaBXZ7uPH6VZ1oppjMb
+HABwMrBRqolcLgVGy+lL
+=310e
 -----END PGP SIGNATURE-----
diff --git a/dev-python/hgtools/metadata.xml b/dev-python/hgtools/metadata.xml
index 81ed6741376e..187f6e59c4d5 100644
--- a/dev-python/hgtools/metadata.xml
+++ b/dev-python/hgtools/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>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">
 		Classes and setuptools plugin for Mercurial repositories
 	</longdescription>
+  <upstream>
+    <remote-id type="pypi">hgtools</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/hiredis/ChangeLog b/dev-python/hiredis/ChangeLog
index 91d269de396d..cf3394a57e45 100644
--- a/dev-python/hiredis/ChangeLog
+++ b/dev-python/hiredis/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/hiredis
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/hiredis/ChangeLog,v 1.10 2015/04/08 08:05:09 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/hiredis/ChangeLog,v 1.11 2015/06/03 19:40:02 jlec Exp $
+
+  03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add pypi to remote-id in metadata.xml
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> hiredis-0.1.1-r2.ebuild:
   Drop old Python implementations
diff --git a/dev-python/hiredis/Manifest b/dev-python/hiredis/Manifest
index bd375935632a..a3050f1b4644 100644
--- a/dev-python/hiredis/Manifest
+++ b/dev-python/hiredis/Manifest
@@ -1,27 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX hiredis-0.1.1-system-libs.patch 639 SHA256 7147ec7d5207584d1c89a0215b281041c050f8fb7f2e5e58688e005d96c86ed0 SHA512 3e71a65a6e3eb0833536592ca9bb4f4e96c5601b6b34180a9a89cd0c68b8ae409fc57cd9aaa447b623f3d3df6d9eeb13e0dbd413a8a8fd0d8a21b468149e47e6 WHIRLPOOL 214537b5c34b63a34e579da549115d571d9221e8b083fd89dd8400688ecc56650c62ba18de92e01d8d5fde49ac864aab270a24f3437bd3e2d0a8186e92215f8a
 DIST hiredis-0.1.1.tar.gz 35598 SHA256 ca7b3840d12f836dabfd73708bd64c0ac31204b22a926279b6515e6433e50ffc SHA512 fe588927698e771a3efb5918c2de308e435b1052b7991d331b4c59976a48ba42be0711bab4546d6aac19d851c6eb829c1208ff403f5e447c4201dc9c83aebc20 WHIRLPOOL e9e8b79e6f054e60f7eb0911123ce96e2cb3870378aa710b87c8604a22df4b3aa5a0b123970736d900a507eb5ee4e33858b4af170a776fdf01642e37b171a607
 EBUILD hiredis-0.1.1-r2.ebuild 600 SHA256 e3221a6b9f3b5f7973b22255133d2c8e6e6f56d56633da81eaa8e90b01b48813 SHA512 861564903d2314c03c091e5593d16ff4f50f84d6929e626389aca1c5ad19643c02802a9b8d6b70e09a0c755132e6020f84ff83d1335d5f50e70da8137c74b1d1 WHIRLPOOL c5a4d427a814ea3391a7b7ff497131283c3894f0b754632f6c3a07ccee993b9bcb2e6f57e210ff5c49a0d51647dfaf99c997625b682a98434ab263408f7a8367
-MISC ChangeLog 1480 SHA256 2b60e6b18ef48de2e5e24bd52f0442fe228c3d33e68c9cc31e0764586bc14ace SHA512 d9516716abb58f9efb732b1a3ea1640bf32449608d3a1e0a1e96f7c60f15b942a1f8dcfc62e0439d177b14807520af9ed231a23524a2927111167908870c5b85 WHIRLPOOL de6fc93dc86bfd15c611c37264e3d8a6890485f99c0ed92ac883cd5f630cd320bf3d12c280cf4905fabaa41384e299847921783f014b54c4ecee4d56dbbc1723
-MISC metadata.xml 254 SHA256 95e496788f2a045505928c1f49e7709707da6ca75f1e9cb3ce2f8a6aa8fa8e3a SHA512 46420ab02c157e9ead5fbe31dba465c5da89e2be64405a77dc387af849ccd78c9c39912d8d98e17803862b032c2af179af3f43ea7b1a041db245011b31f534a0 WHIRLPOOL e7c960f520226efcc23fe4dceb6417f4238d8fabd7ba6cfd9621216fda606b48d1b8e94a11f285734418914bacc6d26a03098c8b6657e4bc0b6905c819c73ff5
+MISC ChangeLog 1580 SHA256 cd215953c514667be11af1eac6b3d75c7d973ec1f327b0088368463573fdabc7 SHA512 afba02222b56774d8b7e4ac4f815ea285d2d1197e46cdab6032acc8602bd03a3f89ca6f705f47c9adcb3573a0c0297ff3f5c340ce368263dc6d1470164855f5b WHIRLPOOL 4e0cfe6652432d4e3ee0e633bf14259548d231c517453a89424ba2418efe83b981dea973839f2a9ad6f817ef39bc2c57bcd5a752326005796ac058014c0dfc80
+MISC metadata.xml 335 SHA256 b3948fca1718b652ee20730bd92e9df312e5dfd8f296fd6007ad46477e853970 SHA512 f6113a33eaaeee4480f95c2ad832ed613f6c12dd2a7f6e5c06a32f04f6f13cd278778d040abb94a03953f3d807214c5130af68a7f91284e377f68e4ea193674e WHIRLPOOL 615ae58b80478c31358c564a147331fe47308e85b7822c3d8b59e4e35181cd7507621e620c92990820721d24337d552e7a2665b48d0e89b0711b493ae0bf4c4f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVJOJzXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOOUsQAM97qGp6TUOl18Gw3/T20w/M
-Ir3FZ0WBDTYER/FhPhw6jrlgIT6X43exWpt+uJtzmeKerQsqQdKLybjpD5cMJKcd
-+x5oBsL+cDR9ToZmyNW2lCK4u+P3WYE/MLGW4LoO0fox43w39r3ZTwHxfdGq6Wny
-9NDwfbVQtx3VgLizcnj0YgZg7OocJI0BnsB4oxFzF+3yStJ+Me6u5HhSDyhuWuyP
-jwx0JEvv3buJ/gLG1DzrSIZ55snRHaVnkpT4a9M3r1Ahh8KyUyAJcaGXYqg56Z1u
-XIQ6f+Pl4yWMUgTY4FyCzL1XLi/1hmw55lbL2p1F4oHtlnuT9lPIanS3FuHCFqIw
-EOts5Yb/XkGE8ZFn7wVpMkj5pNbkC0dfuxLqLAiTCUZOkK1iWyNdnf4Rb4n2sLbr
-OjSDScVHv6rl2PVY58pnj4Mzw11KQQUxtHoz+0/71RFf7Pc+/bOdcAPDPsxo/t6i
-RDlzy4U+hWdFyjB1A9XLb33AIAUcH9tcOehnDrJQjY9I6JvWCZXM7oBnL2x+5QQ8
-XUQikL9+XpbfNmDy0SbOqsw4KaymRjPp1bLn9rg1JU7258fP12VYqN5nBtBBXTjK
-bUacTl3oR8csLH0qUKfGD5d5wvWLHn/1Qb2KHJgXGbKSpfQ4piixETv5EoDstglf
-G7ZEiD5Ww11vbmgYWmNk
-=z3KO
+iQJ8BAEBCgBmBQJVb1gTXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmij00QAJ5RHocI8ChHXrfArfcgBmQc
+46iCQ7UMRbBlcKbIDk3omgrr02XouBMEJwrdm/iumCszEkrFj8fLRmtqpC577nqh
+ewvvbDmbZHeA9rMscHN9L+y1eBDMN8qEppyvDlrhTvhOoKLKlX7RNBCdwTJtKqjz
+xjZ2+fOXjtPWao4hPjGWtlQ1LNJxDYHwu2W7p3jeM+1e01/30cC8tzMChM6KIFWA
+ZW2/jN2lgM3Wy5fktTuafxc+BhNB1qxIEbL8gEBTW1UAWv1xFys181bigV2k/uim
+F4Rwt4Fo0Ziea2iORo/Vc/RQfrIX+WnFzojSRW8jAaOYaPzOi3C5rWArwCQTBswf
+TsGKtXkYfQfQ83dxqmr9Jcd496qyhJzF8cW7V+LKoxxPaQ2m+zW4hWHq7Os5MR1t
+xTDSF83bPdjqtV7X8fCQVs1RO9VYh4EUqcnJNZi4YtMRFFLgzDrj6WtyPv+WOPCR
+xb25KXSPLrBEIvN+hc1DnCOPro3sHNdiOLsyq6PUsoUT3jJ/hhpungCsJVXsjBPq
+ST9NPws7fB2RBdr9hn7lVgVBGrfHQJY/pgCQOQE7RudmHbFXiqiwwnePLxD2wEiv
+IBjSyivbnEpA7xcANgrLTXJjhbm1fpNXHNgM2uTidMV062Mr+34OehhJtCqmkUmy
+6vsdOp2Gw208lgOnK5Pm
+=3bVX
 -----END PGP SIGNATURE-----
diff --git a/dev-python/hiredis/metadata.xml b/dev-python/hiredis/metadata.xml
index d81065b0cd40..95d203f6b119 100644
--- a/dev-python/hiredis/metadata.xml
+++ b/dev-python/hiredis/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
-	<maintainer>
-		<email>swegener@gentoo.org</email>
-		<name>Sven Wegener</name>
-	</maintainer>
+  <herd>python</herd>
+  <maintainer>
+    <email>swegener@gentoo.org</email>
+    <name>Sven Wegener</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">hiredis</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/hp3parclient/ChangeLog b/dev-python/hp3parclient/ChangeLog
index 4b91e623ec70..7661670dc41e 100644
--- a/dev-python/hp3parclient/ChangeLog
+++ b/dev-python/hp3parclient/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/hp3parclient
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/hp3parclient/ChangeLog,v 1.4 2015/04/08 08:04:57 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/hp3parclient/ChangeLog,v 1.5 2015/06/03 19:40:20 jlec Exp $
+
+  03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add pypi to remote-id in metadata.xml
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> hp3parclient-2.0.0.ebuild:
   Drop old Python implementations
diff --git a/dev-python/hp3parclient/Manifest b/dev-python/hp3parclient/Manifest
index 0b17aa3a4e76..82381ed3e86b 100644
--- a/dev-python/hp3parclient/Manifest
+++ b/dev-python/hp3parclient/Manifest
@@ -1,28 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST hp3parclient-2.0.0.tar.gz 42167 SHA256 bab78a3fa14236d7884af52271fd91d08d51ec99b7e2d6c6fb477bfdfb9ef259 SHA512 8bc4903e31f3f8a73c7656c1c6d722dd5baff05d7fcab1b22505843f0464e207194a333ba86bf487ac44219a9f792d8384cd0a3aefba292013c66f2d798d9552 WHIRLPOOL b48305e8b7f29d4adaa9ad8d3e83422a1d4a74d59ae0191f00bb947761d5077bfc7f9f70f504f17f23248b8e3c0275f47461eacb38bcd92f66053f06556b6607
 DIST hp3parclient-3.0.0.tar.gz 40895 SHA256 1a3acbe86acf8f698dbda83ced88872fe118eab3a91ae22d6c0cb70d109b9cc5 SHA512 976f28b96ea18ef7995b327403f9ccc2d3322296d4d4ae8c66018b7810adb86f582aec8aed59ddafaa0f8a5cc73b1ef40cf916ad3210a74ce8dae3b1f7f7adff WHIRLPOOL 3a3f34338b64837faf9dc060bed2a5a0154841bedeb0d3770dc91b5f7a89613780f9603ca6f015b0dd7b30bf7f51fc8625fe129bf27a222005f41ef305c9c586
 EBUILD hp3parclient-2.0.0.ebuild 1082 SHA256 e3bc2ffd017b3ece442c58825aeee35e2b0f81b1b6c60fd9f18f4cd4ac122102 SHA512 49ae7f6ae7f297330fb1a2a6bbf01027ddc3fd9ec052836059533f198f0f04600db1bfdeed4aa8804e15bf693a3dfd13597bb3805f1907c871921151ad9743a4 WHIRLPOOL 7671962233ef69bc4ea232ce344f1df40ac9a6eee79c6d131f4a9472861e60be020c281475a6cbbfdc0586293e62f5798624346b4627ea00c7f8ac9a3f0c1791
 EBUILD hp3parclient-3.0.0.ebuild 1176 SHA256 3cb14426ad70c55921a39754ed50c4b08801a6e33e2ed28d4e935a96e9cebd32 SHA512 843379353435753c00f7ed9d56b06b3034360d4a912d2f9378a21fdd645caa71dffaf21a1c1d6a0cfcd520fc04ba908db742eabb42d3452b2fa3376801c7caab WHIRLPOOL 1dfaa2b134a02ad8deb1c026828e865258d58ec7cfccc3a743d6fba79348c0057a03cd3e34b9669dabc621c4ac433f4fa3ff5bfbfbc56ca7b0bf6857438a5093
-MISC ChangeLog 763 SHA256 f89a8a012c4e818b47bad9f40806b10e9630f8495567f77fc3a268c6393f4415 SHA512 5d08b6c9be7cbad2b1f4b06c61a7bf5501c0ce81f97d60ff8b4bf5000dac9aab013e5faae58e45768d824eadd14a80eb052fa2e1316fd6252f940a76f58082da WHIRLPOOL 2f10e065eb38c1057758fb39de42506d166fadcd813d2b61eb3da1b15da97377b97dbaba694420da944960175923b4bb121ca2239650387038fec0f189216405
-MISC metadata.xml 170 SHA256 613f5f63dffc78a75b8e12bd0df1ba7f27afccc7532b809c6ed14de1007bdc25 SHA512 2de67dccf7cc4fe6837c3efb996e16621dc7ddbf58ac725c5f57d0bc8c64036a2adab320f124da571d31bdbedd9aca46aa867a9186b7cee8500855360b6dfb5e WHIRLPOOL 7aa8b64e7a8fa384484d69f4fa024536e537ce70ba49c738f52977912418e2ada990a4626072b0f2c56dedc743a0c81800db6ea271ebd18c87542ec2ba6dd4ed
+MISC ChangeLog 863 SHA256 85ab76f7328d4f9e0d867d472db672468b98465ace9e48aaf75af778dfa44b9a SHA512 6f865945df8b1c0158f01f2571998bcf74e5808f10eca31267d12814a170204fbbb7cf7529d18759d804c37459fb3da06c62179a0262f9cce5000ff8d1ed5ef3 WHIRLPOOL 6bbc6d37f155cf70d06e0151ca3ade5b463946da39e42851adabfef61916e78f55eda86a9847e1aed05820f75ff3fcacc76c5e488ae437e82def2ce825d06f6e
+MISC metadata.xml 243 SHA256 4484b2c7fb21963c22ba30c2a7caa0e16ed6685dc54cb02877e298466fa47538 SHA512 5b82f5556db558bcb41b9f9bf8c78ba350989afce2564103063879ffd226662d345d2c70a8186ab886144e2373c2ae0dd98e88310c8c53225894e9c6ce196898 WHIRLPOOL 263dcec259e0ece622e7884073ebf5c5755aade333901c3db50ce15192e044b8c76910a5aa688d1052a35f5ff9c558fc86b7f242a2ebdb8173185bdbe44e1369
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVJOJzXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOBcsP/2BH/+OnnCODkSW+ZB7aFijV
-ksVGWsVkuGVW8Ur09dfhtcc4t4POrry9hC9RHEj5WzedlYqq2tAZQdouIHC1WsmA
-8zx0a2Q+NnWp/VlrGQhpwIdrjdiedKA5idcRIrFBwqWLUsKnuosn9EhLsezpjUNd
-BJCKVtnXeeSQiwp4fPbBKDdQ91b3jg/khNWaLsR6Wdszo/oJXEkNkp/VwgKJutcM
-jWBKRkAVGWbVjcRqlZIr14bAimfJcaD87ozT9XHRP1dBViqfQOxL9L/IHhVCx86O
-EkWEJMaVHAG8r6w0gcnSgaI52RMKvl0tBGqzlNNmx7GtjkZNIZDA+0Zlv3WxGed3
-8Hz5ewnPT/+p7RZySV0Ta678oz//Cuvr6cRNpVuZo6XkZKKjThbSS0HlrgopLevA
-2b/Fw8zQEu2CT4BZ0+8kwGw3SKkvIKlm7cTcN5Gg6NbVdFCAsejCKWOkLdRBLVYX
-JF9G5o6u8ltZbh5GGP7reDGGGCmtv+zy9PwptSESCc4dS24vGCeQD9dgn/fPZoIb
-W+8Zac3OIp/kOgqkrrSx9Gdu3iZG/Neno7wOBDgFgBW+lQ4O5EHheJOSdFs42tjX
-p5Q3/D8mK1O679EX3KW+ZnYBX7idOCvBLeUVxNbD/PGQOBPJF8tZgTM44LSfDM0z
-48UwyNS8AupG2oqtrUPy
-=Zrbx
+iQJ8BAEBCgBmBQJVb1glXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmit4UQAL92O5LUCrbWJgBWU7XsTmUY
+m72OXMr1IqiEC/H1i76CIp5+IO7CqKDP4MQMcRwdUgUCfYJjRBcvSF0BGRC8VRK7
+VhQwqeHd+WArSJijw1FQX1rGpJ+RFfYYUhhuN/pnbzpRHywFrlMHNwySY3xHQkCn
+KyIt/3tS1w2Mxd03YC8yZKEMj6MswO+gjwh0tmaEn1lApJSUia8pvZw8Y6NbSkvq
+b1YuuEKXj4q6wG4Sc4cbNmYkcuEq2c9ZiXAcXPSkSQbtt/vVP9Q1jHBWM/1bbH9x
+rItV4exkoiUFIFLX5xNbVOasudUS5PugXC2g8fFSo0gAxtiNwmjBsdKXcDa9wC6J
+nugSo1Xe0XEw6RRJx1DTLejBxuBhRUOOcaNmIqY9Ej1Gmin3m1vLCH0sCIgTUFg/
+qTuLP8fuYcPHThEjQ6mrfhCXX7DuszB8W49C+3SQ5sqd4au+BSpILksPqdANuuIl
+Kp8waCDEzq6+qH5hlbz8qN2w5j8J8R0MlIdxnThDwcIdndzWKYyXMIovKWK+oaiw
+RY+0t+E3Og1pGPSDBwM1WqhgkqVrpPoZfGtw57OAJb24RTiwGbkz9lAr496MfZ3z
+pEEDIpNnJC0K7SHpRggllgbE3IHNJvSGJAOK7mp+9V1gHOsnMnoYBZF9ejRwJ8Ch
+9y6+RWmNGAy4qT6Jxc/z
+=POtD
 -----END PGP SIGNATURE-----
diff --git a/dev-python/hp3parclient/metadata.xml b/dev-python/hp3parclient/metadata.xml
index f30f0e0862b2..4680d992b392 100644
--- a/dev-python/hp3parclient/metadata.xml
+++ b/dev-python/hp3parclient/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>openstack</herd>
+  <herd>openstack</herd>
+  <upstream>
+    <remote-id type="pypi">hp3parclient</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/httplib2/ChangeLog b/dev-python/httplib2/ChangeLog
index 909b0eb265e7..1242a8a18850 100644
--- a/dev-python/httplib2/ChangeLog
+++ b/dev-python/httplib2/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/httplib2
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/httplib2/ChangeLog,v 1.55 2015/04/14 07:41:15 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/httplib2/ChangeLog,v 1.56 2015/06/03 19:41:51 jlec Exp $
+
+  03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add pypi to remote-id in metadata.xml
 
 *httplib2-0.9.1 (14 Apr 2015)
 
diff --git a/dev-python/httplib2/Manifest b/dev-python/httplib2/Manifest
index fa89d98a9746..d305b62d57ef 100644
--- a/dev-python/httplib2/Manifest
+++ b/dev-python/httplib2/Manifest
@@ -5,24 +5,24 @@ DIST httplib2-0.8.tar.gz 148284 SHA256 af689bc3cb10a95721eb0d0cf806202a699e7799d
 DIST httplib2-0.9.1.tar.gz 205074 SHA256 bc6339919a5235b9d1aaee011ca5464184098f0c47c9098001f91c97176583f5 SHA512 2005d55c94971163b42366a33578f068b3e1316d59b4d834dc2d2ebcfa050d1492a27d0eefaceea48ed0cc41d8d6d3eb1b401658546a317ff82f0901a441f716 WHIRLPOOL 0d680d8a5745313c64cf0704d1e0aafd14e71a923ef3290caa118b867dc2722f087c6cc2977f104a025a2409d86a4561aac5f39718d80c083d58cd953d32b69d
 EBUILD httplib2-0.8.ebuild 866 SHA256 c3be8ec4486c042a792c6add2e957d15767e001cf5176dba574cb8a75b4f6222 SHA512 eb129efcc6e6c9c1f7aa2408400864721dfe38ca250ec1dd667b4cb3b7083a5d66bf7f87e5a5d6a98d6f70b774e7ccf86d6e36c6ad824451954cd10538635f5e WHIRLPOOL db9a70958542e36611223f883741a0f8080c74344e3d93a666095a0cc6965f1c81b610763fa54fa05bef9863ae0d12f140f42cde40ed362072094d809bf0ea8c
 EBUILD httplib2-0.9.1.ebuild 877 SHA256 d24febe3a55d15b8de4e06626481c1e63922e146f2b3439056acca6bd49f4f83 SHA512 d2ed6d8e038ddb28e84b0eb8e11d10943bc8b3f570155d1e7416c967c84e4fd4bef1e34101b3639e555ec45e723363688e87eecfcc56ab861910856ba45c2e3e WHIRLPOOL b714e306713f57107b61cb29d84becf4a626ddabf7d1f91cd6a580e66510bbf692b13d6b2ce60526858df289ee2bb2196e33082b8dfc64409e90c0adc66f6684
-MISC ChangeLog 6921 SHA256 68ee87d7f0c5521649b2c110346939d7766135c73ddbc56e3e4981869e7d7805 SHA512 d49d4a15f44b99e9e618689b81c257b785b273167532042229945dd9e8e42bbbbf64bdd46cd04659393e43fbb28edb81dd9ba9789a8754d228efb60c3576c372 WHIRLPOOL fad95d0896b19f2a6e7813037ffb17154bb81a1cb4bcbd0819bf6127ae052fb370d8828b0b0e532788bf9c2602017f049f4a89ca3d347f315d57a166fa53b916
-MISC metadata.xml 243 SHA256 2ff60742d7c94ab19b5b8e47af872cc52e6b5f72b61c3586aaa4fcf29b53dea1 SHA512 1aeeb84bd962d0f956772d5b700119eb27b8140b8f973abbd424953e10ca6ed1c2f4ba6a00e46f911d5908d91a873d1660cfeab254a4e29bb2b8a18317a264f8 WHIRLPOOL 5e82dcceaaae6fd68532353df3c2508ab72292b15e4881cf74a7d88fcf0ac373e44f03ea389fbbd6908cbcdc14e78a5ae582d56d3792bae3e2dee1749de1e09b
+MISC ChangeLog 7023 SHA256 0b1556e8364dd25ed6b82c89073daead03d8edfe17cc0911f4d48a535e4a4fe9 SHA512 f97ab60dc87f57ec87183ccce2cc0de8121ce3dda1a96864fb94b0bc217eb623e70b41d29d260e014b0c0b181aa689b49555e89b6ceed970929511fd8006969f WHIRLPOOL a512d84ea1ae99df7da58d95d546e05898c808a5cbbd40d3ceeece13504237163352e4fb4e623ea29a7ce348b9b7a316949655d6aacadfb9ac7a9c678038f3ec
+MISC metadata.xml 291 SHA256 bdceaabf0b48f53e353f9f7795974f7ab1b87a3f77390d2eedffb418c0be91de SHA512 68296f6c79f537f912c69b9b87261d0ede91af47cd90c34b71a205c5455b4cff54f54044337a5265de598af4396827434ec4b0a8fa54d91fa61259307657043c WHIRLPOOL 26e805c5bdbeb9261b73e2bb4ef4eb4186ee1ecf8364499b725322758325e091a2bca6431d50bd1d050413d0bdc2316803e1ab08ea7d49ce9953a23361fee34c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVLMScXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirNw8P/A7Kr2QpcV61qOzd8nnMuyrN
-4dGnID1hh5Q2pOM/jUBpvXW+HxV7rk73OQG95kHiiwc8Qb8WGPO4yk77jEmqdtVY
-bIMFTVqoY4IwtETiVVXsFP7a9Z/iC0lOwfHe7qrgdQ4Ohv+rnw4i+webzpTOxs5b
-ywAtFfNiB6nGCX1B2GJYuXHc8L1R9gfMYLSrRNRc7jHaNv8ZcCl98y8/W4AZcsEz
-+LuOLzGe9lJNnkTDC8b3ISPtHnpQ3YTTVfpekuL/ctAjlO+bSTL/OV3Hc2TJ9cIz
-hOYckMQJxiFKTJTRmyuXr6+e3paH4uYDb682B+ATZD1dUCflFK36RVmrDol3qosH
-+H5sTEBrcC7osujowyGuSY/kZUQNyRXnQK7rTuBdrGGyLR1HkOKKWzg8UijJUFqa
-sNIOUC7lqDK9oULLnaBlzZlmqZasbhQQKZg/cXwnKNCwwKkqOt03cbT+uI7XzmRw
-wp1tbkvdEOVtFptg4/+OQHmTU7R4YMGfqFSeb/U0iV45bl7JPoi1PWDuasgymQj0
-lNYBFDJpWAUThyGsld0ORIGIL7dG2kgYpJkHrqOkYAaUoUVe+IKZTN8J9V8W5GLZ
-X44XJ9jdxpJwI6sKT5e3LUEFZ4/2jluLn9tG3MkZREDbWsbSMezQqGLyKmhVsqh1
-QviJ+xibKCVWLCOJy1l5
-=HP0k
+iQJ8BAEBCgBmBQJVb1iEXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmihgEP/1Nx9ScpLkO3n/otc3JzqiFE
+WFqD6cKKi9fVpWKoOqOH5GLJ6uB4hRTHwpRppk2h14MtKputJmIdmODgq9Uz5u+h
+zMcXr0qPWrcLfLuvuOTJhXmmbjxH28QVhjKpFKOjY19s45mh6CjpajKX02Gos8sA
+7MWyqiJX8UN1uGaVhXmZivs5WC0PMFgPTb3qEs77hw/i0FEQYE/MfzsyI0CgLoZR
+w8n4Cvlt8N7N6MjTlmzg/Dmeqg4rX5Cy5Z4GUpR8lfbwFkf0V9byhxxlVxivq6KG
+BOXmltLzBXGpkKHKxXSbKt5GBIM1g/lpDWBE173DDQQz//CeNKmgVoJcd7FXhzxk
+RYBYrGqXFejqL7oeYMYtz3ntKhv50O6nT+iVxYZl/yHSWqMKylAgX6mpm5Ww/C6S
+qllCP5dFhhXzjVn+0Q2GbHgkS2LhCzN/VzNd0ZMij4vh9abGKrLFov7gJDe2cXkn
+HinHmp5oWokA+XZnGDlLRMQS6JFEtYKjjKE0CaClZ22XQ73y5wuWePNKYcOeqlHk
+5M2FAYsHxhbD70L/j8FbuV6GpaDPu6nrbqKROEje2IYM0f/N2GV5OSIXRnOuHimt
+Kk1ptm+EsWP2SHDqVpYMtQQoBhRNMF9Abk1iRSFPdR/auAWLQoQuMuDTRqHXPwNi
+lCiZgziNuNoESH0mbckL
+=bWZ+
 -----END PGP SIGNATURE-----
diff --git a/dev-python/httplib2/metadata.xml b/dev-python/httplib2/metadata.xml
index d1da3d26b8bb..9dec84d91406 100644
--- a/dev-python/httplib2/metadata.xml
+++ b/dev-python/httplib2/metadata.xml
@@ -4,5 +4,6 @@
   <herd>python</herd>
   <upstream>
     <remote-id type="google-code">httplib2</remote-id>
+    <remote-id type="pypi">httplib2</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/httpretty/ChangeLog b/dev-python/httpretty/ChangeLog
index 24252248c9e5..af1971ecbf7d 100644
--- a/dev-python/httpretty/ChangeLog
+++ b/dev-python/httpretty/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/httpretty
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/httpretty/ChangeLog,v 1.9 2015/03/17 08:26:22 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/httpretty/ChangeLog,v 1.10 2015/06/03 19:41:45 jlec Exp $
+
+  03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add pypi to remote-id in metadata.xml
 
 *httpretty-0.8.0-r1 (17 Mar 2015)
 
diff --git a/dev-python/httpretty/Manifest b/dev-python/httpretty/Manifest
index cfc0989dfa12..56ec7c463c2f 100644
--- a/dev-python/httpretty/Manifest
+++ b/dev-python/httpretty/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX httpretty-0.7.0-deps.patch 2344 SHA256 f221f105ef6da02527a246c898083d7e52edbeaf5004165aec68937558d60b45 SHA512 d8c06d426966673d178969c8d0edb79e903ba89831a9942ba6788006d62e52a0302f306c40e1d171e39aaef03e75b73606b5a936babe50940b04025e7c46229c WHIRLPOOL 6c4f6782a676a6a6aeb090fefb277a56f7a1d19e636d99eb04f630d28d5c6fb4eca5a07a4699fc3b8b0de0961b74674cbe50fcde68d26202d3de84672eaf72f5
 DIST httpretty-0.7.0.tar.gz 28066 SHA256 a422a74fe0f35fbb644c9a3a0a4ccb7a7469a8f5bae2d7c807d35a7d149d3fa6 SHA512 9adfd906336aa0ac2c21be8b789eb2e57994f4aac719958fc657291d922fe28b1fcc60d9b39e0e616b6d8565adaecb8228df3a9d1428cc189372b1cc700f664e WHIRLPOOL 8aaa28f26d038ba198b19a31a7f9490e2c3882a9eaacd6b5ccee34cd5f03f745e0facd96853da1be00c7ae949f18cfd4e8f3f696b51f26ffd9b2c6063502976a
@@ -9,12 +9,24 @@ EBUILD httpretty-0.7.0.ebuild 1545 SHA256 81d7b9d1f25b045298f74a9c92125f16bb8b0d
 EBUILD httpretty-0.7.1.ebuild 1386 SHA256 e61b543dd82d6e662bda6f218cba00913c2edb4a89ddab8012e12163112297ff SHA512 6c9924ebc1d01ceef91377c1aace70cb86ee5cc64389cca988e36cf9130e8b81214d3c1787ad4dfe778afdf6fce62900dfb620fbc8bdc4d50566561106e4f582 WHIRLPOOL 6a579d236ca564ed3ef66e983232bd760cb2b51ff13c164894c9900bea3888f4ebad7b05919aba61bead9f5f30f98192c879752ff29b103d7c0b4c1ef5a997c6
 EBUILD httpretty-0.8.0-r1.ebuild 2434 SHA256 a173d003a1e590130b849c35e71ca22912506098697df08c2417dc415d654228 SHA512 1a12544a4e3975fc44931992bfd6a4e8eb04ff1782fbd380d4b0739a67f2b002dab23d1cd969c2a73877f2fa122ba39b562f45718da4cf0c06bc1e0de3567e7a WHIRLPOOL dc3c6b21f49bf21d0af4c3a2b7e2b2ce773cf46127efb94948b6c8b1d1abe40796a3e826bd3df4f25ef32047f907eba8f12a43f4b005ae2c2ab45033363a752c
 EBUILD httpretty-0.8.0.ebuild 1343 SHA256 1622111b5a0526b6146b6e0d7bdd584a5d8760ecf526605d61efd8ba084311f5 SHA512 2a9b21877eff8a37d9bdb4d5cca8f915a742ecbf8c3a313d7f05fd362b0a41c6c12342aaff3e6e701b151c468024ecc218d90ac940ee6f4f3dc75ea077f7ace9 WHIRLPOOL 435d7e8f4d01247536b2c9fc148d79e26a95b7d5131a7179d661d3e0f2d1d54ec65af13318c1a9b8b6a3c7a6856de9ab8f5975828658fca951603997c7bb8d41
-MISC ChangeLog 1736 SHA256 3146a6708a3d23e6521c306d8d12453ca4f0d7b4ab07be8450f3d7279a91e1ea SHA512 cb8e9b969c9c49de5b393405937acfe3195046518aaddff9e736f37f8bc59f6fccfaa017832b8058318d12839f9dac9798d1e4a66f55298cecc66b592044b812 WHIRLPOOL acbbf11e7a489c367590577e754ec4cc32bd56968d504d5d3117e9f65281ed06a71d9470236d2dcc0e13ca87b46d0ed61d58c3774113aa43430ff03b16a1517a
-MISC metadata.xml 163 SHA256 b0cab84c52d3ee0149ad230fe3bd35b1452c372a7404586c62e251e428af3175 SHA512 89f1aa4dcc73e54f0b7fc8b49939e0cf47faa9d96682f95de2d3838f54e3e20b9a387c340dc4a865d75078cbc764679c414863b5b19a7d43b4e6de31fba6c529 WHIRLPOOL 9482649887fe0318efdcb80e74a3641779420c012d5ce752bfea12c1bab476f385f98c8f4c1090896cc5e0733aa60e1680c255105be14cb690784c8b4144d81f
+MISC ChangeLog 1836 SHA256 b5701a44807f3593e83bb4087d1f3b64044eaa06924dfaabd2cd2af36e1f1b1d SHA512 2416f8b764954535e04bd12bf20b159d67100aa2898eb59df99e49f76addde4e0d566c7509cc9a7800519008299a5212b8038ccc793725ee0f3a44d85020831e WHIRLPOOL b9ce155ee85f5b92e0df66f12ad63da4953b7b748ddf86de5471ec39af1f5b2ed41b63291c5e989c11c45c96e5b14dfa39b86f9d7f5f24c5ca09105c9a6c6315
+MISC metadata.xml 240 SHA256 10f0232cf1bf7241daf99718322b6316d589961f960cbc94587093005b8f31b8 SHA512 54a6ecb9d2f5afaf5bf9167f2e1d9fc1053b305b5817dfd62abf9b22aefec026531a368d9d620e467957d41c132297bf53284a5f9fb27854b3763069007dbeb2 WHIRLPOOL 0ebd176daaa61e7e6a9860411d9c58bebe451a6d72afffeda2b1859f7dbfdd19d989d1332a5e9fd6156183fd14deb3a6495c87ac6214880c0c69d2230b5d9234
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlUH5o0ACgkQso7CE7gHKw3NlgCfcApax7fbUOnGryoUadZ/Kxiu
-qrQAn3ESCPeRCgmMzw3AYUzV12PxG29O
-=XDDg
+iQJ8BAEBCgBmBQJVb1h6XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi0KcP/jP8RysiihUiLZ/Cbk5nnb9s
+bSIfrrpuTLalos+qWxGeJgMOnB007jJnt0HWc+qRWSy4f6SNaiJLJFCw3oc7xRig
+mU2P5uXhtNJzleDUx+GVmZIy2sykuY/tLJs7G8iywMbyIWW++OoNH0x1t7EQipjk
++NKWD3CmrUDqSAmqqytNe5TDQ1gr6kLQqLGC9ugp5BABZsxM3X5aeEzhJ5jGotB5
+hSj3ldAXxYxkKxI+Xk01RwpQD4u5UxMC81hBPjXohMeL4nnof8UuKRRQU1dcMoQ1
+DUVzLe4Y4vv8o5SsjPrARiCc5787UWLrK3uy6YhPRc9XkZT/vi90nWirGhMum3HO
+RiNMfBBbea1X+v27C2bA52czJjdwX4VOYkL64dimCZCdF264ucQiFjvS1kuLIxO8
+a6NfuQ5ssBp1r/2vD4y1rPZfgMlUcZjifrLhVOc/937GraqrBM/DPGoLYrapN+3F
+1isi8RY8/Zb8KjBHTkyJ6rRJflUXbwETbb8OafwQQtlg91m6soLTsdWxc4ANK8oj
+ld1lOer1csUmwFo9Wg8uLJBRLgxLTAEaPHs3bLIYsl5m1X+fSUXQ9qIFFD65Itxy
+ky4bSJjQfqzEY3rcv8qqAdmXpkzwgLparro0m/VnRyFRJeRft2QpkNR3UHBN9+M4
+2FA1sNfEGgWoI5T+EFQS
+=NE+4
 -----END PGP SIGNATURE-----
diff --git a/dev-python/httpretty/metadata.xml b/dev-python/httpretty/metadata.xml
index 4677fb8fa71e..808157377ce0 100644
--- a/dev-python/httpretty/metadata.xml
+++ b/dev-python/httpretty/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>openstack</herd>
+  <herd>openstack</herd>
+  <upstream>
+    <remote-id type="pypi">httpretty</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/idna/ChangeLog b/dev-python/idna/ChangeLog
index 40474b121322..afaf6e3aa2c4 100644
--- a/dev-python/idna/ChangeLog
+++ b/dev-python/idna/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/idna
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/idna/ChangeLog,v 1.5 2015/05/30 19:10:24 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/idna/ChangeLog,v 1.6 2015/06/03 19:42:04 jlec Exp $
+
+  03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add pypi to remote-id in metadata.xml
 
   30 May 2015; Mike Gilbert <floppym@gentoo.org> idna-1.1.ebuild,
   idna-2.0.ebuild:
diff --git a/dev-python/idna/Manifest b/dev-python/idna/Manifest
index de83047f9d06..e7dcafa83f7d 100644
--- a/dev-python/idna/Manifest
+++ b/dev-python/idna/Manifest
@@ -1,16 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST idna-1.1.tar.gz 99242 SHA256 3dab514abd255ada7994a57161750e8f054b938bf7adb8b40b96f13df54efaed SHA512 eb7a3673641827899ab9a4ba56f214e1fd3d17370d05bb04464664c2752ba7636507c3f6a64c9e24d44a1dd566842ffc86ce01351c1bfcebc3248baab786b99c WHIRLPOOL 90c1e03b23f3765749778f41ad7eac5befd5122f0552cf1616c7e4f53ae1d3f68f964753bf050956d773b720d608479830d72eb0a94d62848eab86ab4491326e
 DIST idna-2.0.tar.gz 135150 SHA256 16199aad938b290f5be1057c0e1efc6546229391c23cea61ca940c115f7d3d3b SHA512 005f88e954f13ace584ced510752da58d1cb16ebfbeee10aeef5bec57b3c61a3a5d7ce0bb50deba6dc90b412607727bf94a95a785e91d6528cd8633961c142dc WHIRLPOOL d865420f1c5f648d12480af93a52e0b2d463064c34c57ce56022f6965c2e4f6a49244e7798b9fcc18a7c6517b98e88bf84dc52e0050abe2ce504365b5579d2b6
 EBUILD idna-1.1.ebuild 629 SHA256 b9890d18c347a4d1d8902ad4735d50caefe0ffbcbd7bfa923efaa2f6aafd8f81 SHA512 0211550e0365419a22c281f46e3a03bbaffa915430b4f44c18942f6559cf6294db6486d7d8a66608643d44c7e62d485c1a814b9323f446a79269f046080f6a04 WHIRLPOOL dbff9be7015a76bb565a1708135417889ffee888a6d31ada95397161f1ac6d406adba00c077e08aec7eb54f22938bb65a4151970db4f4f56d20e5e0e4c45ddba
 EBUILD idna-2.0.ebuild 629 SHA256 cb401130cd6b3989bfcc750662e8af550eb68395cac832406bef1adb3610310a SHA512 1580512d07122fe8a9958fbe8469a2a6e7ecb740a393e43184f84ec5c268399d5057e1aec10e5a66961b6bc144a24066260c549ca7122cc1a1add9fba5474618 WHIRLPOOL f428217b679b37db51154ea0b3326785c299f66e503bf586ac768859ff76ffb354c895526e69957bb29ee0b07b50e1b5bb4d302896fae35a32190f2385d8e6b5
-MISC ChangeLog 780 SHA256 512b6754a3397acb7312ce490da6df584731e4f4f33d5c62d2d3b508f140fb24 SHA512 f394aa4a540e87d3718fe2c1f7045f3e700260c80a1a43676209307cccdfa9c99101995589076448fda2d4e88e95b1f4ebb4cbf50f0162d0711e7ffad66bba2a WHIRLPOOL 97c2e07d1b72213a7fda8607f72a87d14c977fd014fbb849f7bbbbc823669e15ed381d8428f95f7f547bd34bc6361fbc1a864a022b011fb1015a407713070eb7
-MISC metadata.xml 258 SHA256 f9120561eb5a0eb0be48e47772750941e1a206da5fda56321b45eb76fd145ba7 SHA512 adbf77e7b9f35851720e2f9ef564420d0d128c19fd2a72cd4c9f25e0261419d46c1f72c45fc7093a00eb15e551a14742f969157fb3356f8a60b3d31dee38c8c2 WHIRLPOOL 7811fe6099018241061d288dcc1333c7bad35703bb201f921041c7faeeacb03faf748f1d34699afe4e21b1a3f95149fafbbb18633548dfd344fbb736a3ddf495
+MISC ChangeLog 879 SHA256 7e677d9abca222bf6eb2900cba4867366bf57f5bc652b477a7f5de292979148b SHA512 7c8c0fba9e988be020bf88d4dea1784be3345c62b5f25d004c650badb5e72c18f4d636d82a73498dca3d2a1bbfbc2d62a8080f6c921ccaf51969a12f849d4d1a WHIRLPOOL c7bf81501fbe730db7a890b86a390de3df95c8a287dfad733773fd8910633ca80c0908db3938711ddfe8c7815341f318bf1220813c6459a1fcb1dd68ff05f283
+MISC metadata.xml 329 SHA256 8e9920027971ece8b9b29bf03baa5f3ac8d4f3ea7c0a9cde7f148d38d658d97c SHA512 852e4e05d93933a48215c6f2af19f5f93f3f9215c3e276104660b208a0e00244029486b8127e4571f82febe29f197de79ae426fce2dee536efaf19a8c7ac8eae WHIRLPOOL 43556d3db5e9e5fcf83d0ab96ad4bf390876b5b0a560cd2bcd04492886403f05365fccce81d89f21b2950da92f565c74fbea0f13ff82f272597f6da489a78676
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iF4EAREIAAYFAlVqCyEACgkQC77qH+pIQ6QN6wEAoaxvYXV7fR7QLUUGSye0OAmV
-Ds69DXH+pAnONnMcY/cBAIvdTUTnI/CXUWvUG+1hh2/pf5MfKbXJavQKlL3nU4Mo
-=oFNT
+iQJ8BAEBCgBmBQJVb1iNXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi5uQQAIlnh/SFCJ2918NH/fHaIzfi
+s5srFsLCSfjB47Kb42jSbGow7XyUVDWWP4xvtuDxyZIKgmNEr+hQlTTpG5A3J7C4
+zPOjHu4LIczrPs9A2aXVAQlX6Kzwv/5CCYmbVY84IdU8iac63gNmfj284Wqj2zKs
+WrOv9DmPz3zCDmZ31xuQAvT26NoQgbEwGPzIpiu3E9JB71UiMWefyYfFwFyMr3eE
+HEUkoBuaCFMehnACrwuQ1G8bNT+sBtTqUyrRl50Y8gZJhLsLmfuWwqqZRfSZSh0E
+p56hxxdPs8PeJpJpe5MD7naY+lm1xSMLuo42JWAjTIaxjsKxHP0PaX3yHViW2HH2
+7T7BoeVhqXrSNWz3p+elEgQ+ZDJ4KhHBXVObSLUcilWcY3pVln2UXNF496/tTmuP
+NKBNd9IqGAAQWOpbctIa5IDUMFW8ohztYawgkPaTE038EadL3u+2VomXLLzyQDT0
+G5W4TnI1MpWkksXa+xfSSU8x452ymcKZXC7Lt6ARNhHmSap2h0okuDXKIYMNW8zD
+qWo8FHN0AxbFdSb3wFn1KsUH7IZwL/EYv3iakXR/TXVKBRDNe9D2FB2Temn3BVbr
+JYOCMbH4uAtnrRuXZ9Lv/d2xzh4HxZaxRu9+SxnPibDNQUJY3MdvuEZ8y7JTLqmu
+lOE2prGiZf9UR2O9a1OS
+=jkdF
 -----END PGP SIGNATURE-----
diff --git a/dev-python/idna/metadata.xml b/dev-python/idna/metadata.xml
index ce97c3a01b30..15ee2a82121e 100644
--- a/dev-python/idna/metadata.xml
+++ b/dev-python/idna/metadata.xml
@@ -6,4 +6,7 @@
     <email>jlec@gentoo.org</email>
     <name>Justin Lecher</name>
   </maintainer>
+  <upstream>
+    <remote-id type="pypi">idna</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/importing/ChangeLog b/dev-python/importing/ChangeLog
index 79bf003d731c..a57add6622a8 100644
--- a/dev-python/importing/ChangeLog
+++ b/dev-python/importing/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/importing
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/importing/ChangeLog,v 1.6 2015/04/08 08:05:11 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/importing/ChangeLog,v 1.7 2015/06/03 19:42:22 jlec Exp $
+
+  03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add pypi to remote-id in metadata.xml
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> importing-1.10.ebuild:
   Drop old Python implementations
diff --git a/dev-python/importing/Manifest b/dev-python/importing/Manifest
index 81d0f1151f67..63b69dfe8621 100644
--- a/dev-python/importing/Manifest
+++ b/dev-python/importing/Manifest
@@ -1,26 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST importing-1.10.zip 17138 SHA256 e61348d8d37b20b69c887ded5378ca99f2588e177133a06607130e6a5515062f SHA512 628f4c119c8d0cf558580887fe30683223dcc439ca7ad5f7fa442d87452f3aa7b2f8ad200634c70a969dfdef7ef5938fd51fd36044d311296a8df73b5f2851cc WHIRLPOOL afcd84da66bc9292c8b8657dc72ba2693928b515607ea1ec3843c9411aaed3c7f50ad484f532ceff64eca38136d71b28b04ab991df63277f4e9edbd12bfc9156
 EBUILD importing-1.10.ebuild 676 SHA256 0b49f6eeccf0126136a496b02245fda6f1b8e11e84e4281142c03cdabe61e804 SHA512 f38e2a157de524fe7151a8295be24cf7df9b8be76740c021ddc6d5b0e20e805b686383fb9ce5b7ce266f92755abfedf95ef743a5db4d57154b9d534f99e705c8 WHIRLPOOL f9b4c4ed0418caf29138dd0af3f291cc42fdbc2952da72606610bbe47cc6412eb0b3bccfdfeecabe2e10d8734823dfb4492da3424cca8ba0d43ba02a960ebaa0
-MISC ChangeLog 928 SHA256 1eda9bf4dbe0afb2ddb154eb780a664e9733cf58f2823e5419ec6ced9c7045bc SHA512 c005a9c37bf45d840c7403e6fe33f849d399202e6c50c6c68835499a67901aa315896d26a8b208df98f63c98ef8ead0a26ad2a7b620447ed256165de18c9ebe0 WHIRLPOOL a9e1aaa5da80061ea6ee111ae40b51512757f381dc730916c285096cd62f2921469f2eeb2b7313be3f3d943421d65cb3024c834fed2147b84257f41521d0521b
-MISC metadata.xml 167 SHA256 a96c7a7081b1a192fc4758c24f63e3f458ce37c90ef5594005e91e01a5daf934 SHA512 05f506754bd3182ba88befefe0609d354f9ee335bea2d866f30719b292ebae30dbe64d6c68ff1a918bfd380bd638146b30754d072229491e8ed6f9d6745510c9 WHIRLPOOL 59ac07478ebcd8bb8b5edba5af0041df85949cf69083c3aae6945e371e6b79c6c92e2bd21189b2d8a87de72c9a4cd299e0773ff73332e247f95b8e850a76d054
+MISC ChangeLog 1028 SHA256 16c5f11c92814b981e5dd3c20557e1a4ac07759dd17e0a838f150a97bb0eb471 SHA512 05b4b424c7082f73fca260395bd6fd4c47d1e53d2fa8a3754c0ae21bd1a0a4642d46ab30d782808b951701c0fdb223c86f974449c0ca80309a5b69256b539e80 WHIRLPOOL b93dabd6e5415918cc04cd1f70a7df5651be8ddfa0480f0d2508e8847a2b19ed55a61d854524862381ef0141662ab3a6d5549c22154600d23c0d0fc3591a4aff
+MISC metadata.xml 237 SHA256 608fae206a9a09835e4ba0927e6bc972c2fb7b59e1db56173956dd96a7ad8c8b SHA512 4e8d980ad5b53a00473bb3ef93d968410db1b205827bfc53b2d4edc09b7c5d870bf4a67bc680d2b99a001ca431d0917337a8f640459a8312a998e648f6abc74e WHIRLPOOL 3336ef1ca6d9548d59f1a08412aa79121d385bff8f5cdf584e5597c21477ee357ed4fbfe1b1d66fa819542cc88642bdc954ae39447a00220edf15ae4117efa15
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVJOJ0XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOjg0P+gMBe0NYLbfS41kEoZtncLi/
-R+rgk9um6FjbWbQ5nshv+yqim5J+NXO6Nok4Sch7MIbekTMjlGbmI5KS382a5ZJE
-PSckeYuqaQTIENIGb7XjkFu2VyVhHe50ZkHAzpuu4/iRZ8kl9P5QSZMCoIvBqrHb
-XHFoL157kvnkKyeJk3GoDpw33VV3K9tOSyoZsx4WtIcFlMNmcweWfh2eExIs/sz+
-Jz/rkiM/WdS8/4BihNGO7gXjc/kXROy4KZXSlvPID/xOLNONkR6KRmZukb9CbhBy
-YIBBI/4rDWzwWI+cO81f6ifUzYbSiGNyoL+n6EdU7wcH0s4Ebqflh5AQtGuF8MH7
-LyMqcMGmfL2V+3q1SccmWtCDCvBjC/jTseKFUeMHu0fLiv/GDx4fvQbyraBYvcSy
-5WpO4ofqI/MoLLIlKT4Gj8If/DerzrZ4RLEgiGSPuZ8Nrb5/6k2Jr9D2/IZt2xJ6
-yyeeHLUgGC6yxXZdz0GHxSnSdnL0z1XWFhzbG+OO68ajv4iYqMlcFInHO4a9Rguf
-dKJX+NkexJn2Qw7AHte20ON0duSFmPc0rO2ojPqZlwghVjqe0pcKyKCluErxt4W5
-/ZmdRU23ugvXuue3aaKdAQJ4R9Z2f1iKa1/PS0stnmo3+DZEnHdEV9o4TsMviDXT
-vKULpj8H7XCOiycioxuy
-=4AUF
+iQJ8BAEBCgBmBQJVb1ifXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiugYP/0q+luIWpLchEJZClOpieBel
++cXr3tsxfdmpNUovQ76QOkQy+1qzDX5U4blbDJcHOw3F9NPxeGwT68BuThGaE9s5
+0bOI5TPN7PM0besOrtfq/QFeJMhHCmhFOZrz2bQShHqPXXmBPq/O83Ee8+S1fYKT
+keU9HuxD26qE4y3ghDIfBuffDu4oOSahfpLi4gNIKckR3JukoaqR42vD65Gbxdre
+LHfjoylI5XTYBNikVXyFD7Cnfrz0SzCbKXikbfpNaKabEH9Bx4JwEk9CgGip6Hha
+hIp2pUJbhSN/wM/uSid30jYcWde5B6o5wMgEOM5PIzz4oe/f12eoGyFvNUFb7Goo
+mhIXxAB1hktvOf+7sWUji9KWwmqgie2j4N5QczVnx18WarxOPcDFfSTjcKba0xAm
+E+8LU1s2/7n4lPvbfmZoxKMeVYmoAu0AYTTrjHjJsJOA+TT/W6wQhMGT1tWtIPDS
+lXqqt3FO+0miut1aGf6/OJB5koq+GxGo8XV5WdOXc40+G9Ogx+4MpvZYtPyUd7Ck
+SFbWI/4tEc1Mj3PkglgSXf6bFi/rw+20PUAbT2Xcgn7r65Qxbo2Hyp3ViSCh9fsm
+U+3kiV91WWl5tnlKPeUjIS6dMo4rv7gV0G4ATEueaaNwhRQL5h8UQ09KLOUZhOZ0
+4pN6l2vSZ5332wYSN6f/
+=C3tT
 -----END PGP SIGNATURE-----
diff --git a/dev-python/importing/metadata.xml b/dev-python/importing/metadata.xml
index 0645cd9ff8f3..16ed310e6320 100644
--- a/dev-python/importing/metadata.xml
+++ b/dev-python/importing/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="pypi">Importing</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/into/ChangeLog b/dev-python/into/ChangeLog
index 6a9847726aae..8e5e9a1e9751 100644
--- a/dev-python/into/ChangeLog
+++ b/dev-python/into/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/into
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/into/ChangeLog,v 1.4 2015/03/08 23:50:49 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/into/ChangeLog,v 1.5 2015/06/03 19:42:44 jlec Exp $
+
+  03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add pypi to remote-id in metadata.xml
 
   08 Mar 2015; Pacho Ramos <pacho@gentoo.org> into-0.1.3.ebuild:
   x86 stable, bug 540290
diff --git a/dev-python/into/Manifest b/dev-python/into/Manifest
index f6fef0c326c4..35bc226fbc46 100644
--- a/dev-python/into/Manifest
+++ b/dev-python/into/Manifest
@@ -1,16 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST into-0.1.3.tar.gz 31161 SHA256 a92642e2a7372b477488c9d92c3e4d03b5412908dd291dd85020a7eb97c49d44 SHA512 a201ab8b2b2e4d2455232edde35bdbbdbf8432152ec6f7084300af7ee8960d476c00326342c0a658b0a8873a3a0ee025cf24b87b4ae45fa4f1d94db7a5a374ef WHIRLPOOL 894b9045917c06c5540c248415f0b4ae1cd2e86d979417f23589a0b41ecc726f5a55d54b9bcc1808370344b6be31c277efaeec5c2c13bc8e3e960ac38345aa17
 DIST into-0.2.1.tar.gz 75510 SHA256 bf4a8d7c4141984ba5db201e076d5ecfdb3a32c0f8ca311d4f49b030fcb04a2f SHA512 3df1a55f2a8881c1d952baeb5484d93245085bff02a38266b9ca478ade8cce23c0b16b6be690ada7e279f0f22ea9adf934a0105cbea2ce4d243e03fc73cc1c9e WHIRLPOOL a5e5dd5845e2dd741165fd484b4314c05539a95b76f840e8b71acb3c42aaaf8e2a01a34ca6881a79cc6db5b2b19b2c8413489469a8af2fee188841f2e0a3a474
 EBUILD into-0.1.3.ebuild 498 SHA256 faf22653f224d8390116653f12486301b5210bac78d152c0ae029a8f4f895f4d SHA512 ee8f4d933201a735a6d2f593050feee530d07e72cb48a3c336e9061b90036a11f075c955f21b5f2fbd1a9e00b07f4ccc013f09916f6f43736e578d402dd5f963 WHIRLPOOL c14dee02b36f5f5d77516ce2e7472fadbe15fb24b2b828a11af8347830aa96331615932fc00748148b4e2382a8e70ea965099a6f2ff133725d9533749a8939dd
 EBUILD into-0.2.1.ebuild 776 SHA256 ed2327aaed636057573ef8f268b688d34e064c49a6357593255dd8edb9391f4a SHA512 7fa71f1d8a63c0c9cbe1062827f0f1e7d662fa45b58ab8b0bbf434a12e2d12febcdb333d17d6fbeadb9b1364c7370bb7f52dfabc5c2cab711268edaf312530a1 WHIRLPOOL 27f267c4f65883b5b6c1f5912ba143a581abcff962f2c267cc5c7e92ff12fe794eeaf1339226c4f6018dadf4618c821011e1f7bba7048f2285ecbd41117aed61
-MISC ChangeLog 665 SHA256 f2ec11a90ccc8a4ffc704a154d6ac9c0dfb3e220059b0146cce55d6815b6441c SHA512 be1d294279707cb0cd722bf46e3b68040315906fb09964843c78fb5494eb6c4a157ee560b06011e461b43033e74360ca68637118b2b2b683ef932c99e4adfc71 WHIRLPOOL ddf497300abecfd9cb406b79cf39f82f275a529b2a90726c42232657208ae111ed99e844652628f380c8faeec538569556a8cddadd53bec02f1200ce15ff1d8c
-MISC metadata.xml 159 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4 SHA512 d5a29b9f6ecddfc368dc0f1f8919cd3c3d6ecf2c7a82bc8d4c0dd51b7aa15561ed0462acb8ae39bc84f97e706e82d9b4b06357494f164f1648219f604b473fbe WHIRLPOOL 36e19b63a1b307cc200e1d73499b7477f73799db3909e71b5a0916084728351c76d400f65e2c8b3f8fffb2c9ba54c0bd235f785b47414178d98f11d64a9420d7
+MISC ChangeLog 766 SHA256 df78cbaf85cc0bc6066957d4a5ce4444bdd3d02791ed0c116c314e8119ad686a SHA512 e41dfc91ba1d16b91cf0016217c14556790450c87562a5fc99771a45f0c36b79d070736832dfa34ba4a116ed8cac6830153e3a2f1afdca2dfc9712cf19076629 WHIRLPOOL dc4b0825af8331bd4b173b8701b1c7a707f6c6402e6bae2fc042f828575a9956f1f54cff3e793bfc0973248c34b91716e27a607508d567b40c565c88788c62bf
+MISC metadata.xml 232 SHA256 ba1fe558f7a2a18dbe895a6b598b6dacef4780d4baab456ffc1cf04388b3684a SHA512 b25ea05f304fff1369f0e4ed9f97f3a1493d2847ac3ae60dcd9fe1562c398d4a29ff12c8890ea14a44c6dd949310d9ebf48995ffb28e74809a203dbe085e24f2 WHIRLPOOL 952b17475f84403eb1656c61cfb30804dc4062920fbb113eb2d97b6df1f0764ea39e8bb8a2bd0a6672b573dba775a0159fecbcf9d5cefa0d37a6a5de87069e04
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlT84FYACgkQCaWpQKGI+9Ri/QCdFkFuPiJWsEcQWRxfqPH93XFM
-e6sAn2W0DAk7fGyx18DMdeogm+nJLxQH
-=OkKs
+iQJ8BAEBCgBmBQJVb1i1XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi2KkP+wTvdaV11XOG7kl+zzO1nsyL
+fgWVny7be28VgPFxABM7FOZ/EXRwsOCyq5MrzWAg/OkcKot4Uk8G3Krx4ZBuznYz
+UYXPWlaeoHpOs5IOdNkYvwZCunw6wAp0KzA8m/M8q0zElzePUYYulTS3CrXAjrhN
+TY+7+pr7g8a0hGKGTiM9MQH/b2rUw1gUZcAel64dyZgNCTG8iFhaSLVYeSpAUSJY
+m0Au0ef3JBmu/FsDSHj8FGPAdFnWpadBywTW1EzmkT3dBBZMT3YnEuv0VymNnMug
+Qzi/u+lztfU88HNI8E8HhMCKJaO+n/r38Tzr+3hvj+2+yBlv3ou6KQ0FsnY2Os9B
+yotOeeHH7Iqz35Y7X5fERAxTfkroOBi9k5DOpHYE2fq6Sfa669riCxfVhqfLn72O
+s2HoiBKSX9M+7LY1ERnJ1/Me6KmKw+SFn+rzEcQvplLU0ddi4dz6jhXXRlrPMyqN
+9z6Hlc9oB+5KBTefBhVCgVP6wt2MYjCOyF+NSiBvcIFPmITGbnzlQCm9V01E3lo7
+MmU100TWtKyRayhEW2/aDNuJ+I5rB0dztLLlKYVFaaQuhPZ/oEa7vdzIorLgUviN
+X+38dqXjv+/Q5eamljB4IgmH9RBTb8l+HX/w7lrdqOzj5oU9EjRVaWAqBvPQx4lD
+Afk949m3D+kRBiolak82
+=JnrS
 -----END PGP SIGNATURE-----
diff --git a/dev-python/into/metadata.xml b/dev-python/into/metadata.xml
index de483c53568f..756e541deb1d 100644
--- a/dev-python/into/metadata.xml
+++ b/dev-python/into/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="pypi">into</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/ipaddr/ChangeLog b/dev-python/ipaddr/ChangeLog
index 740be93154c3..3d75838800d8 100644
--- a/dev-python/ipaddr/ChangeLog
+++ b/dev-python/ipaddr/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/ipaddr
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ipaddr/ChangeLog,v 1.21 2015/04/08 08:05:14 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ipaddr/ChangeLog,v 1.22 2015/06/03 19:44:16 jlec Exp $
+
+  03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add pypi to remote-id in metadata.xml
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> ipaddr-2.1.10-r1.ebuild:
   Drop old Python implementations
diff --git a/dev-python/ipaddr/Manifest b/dev-python/ipaddr/Manifest
index 7bc7cc313354..7ae94b807f5a 100644
--- a/dev-python/ipaddr/Manifest
+++ b/dev-python/ipaddr/Manifest
@@ -1,28 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST ipaddr-2.1.10.tar.gz 29004 SHA256 d2c3bfd45147e5773108d2c8d3c65102ff234f06e2f1049a0febfa31dde4cca3 SHA512 5ad38ffe54e5322bd7d3c643c216647457fd797882549c40a9dad2cadf489aa1ce724e2272af9f8aa4a28eabf60f2ef99d6d730b78c7cb86a1f0cc901dde0eb7 WHIRLPOOL 0bc5a8116d4df2e35e342c9adc2563db963802256461eeb3a8187310d6d1a7a06e567a53953899122242488a366fb759ea091630a3e315de2a7acd749a945c1d
 DIST ipaddr-2.1.11.tar.gz 29046 SHA256 1b555b8a8800134fdafe32b7d0cb52f5bdbfdd093707c3dd484c5ea59f1d98b7 SHA512 a97b0f760f0d7fac549e5edf17b644c966a8858c145b8f9472ddc8bf4805c9d537f6f8755e3716d78b729b87e84149f8b73c7f98c0deee4fbf266ccb7a206bc6 WHIRLPOOL ba34b892828098e00c78df4ecfb8b79b58a6884ca5592336a96c17bbb351f65baa9c0287acc65ed166c60ce5c9317322964dd27bfe6de33a54c3bb3b08b638cb
 EBUILD ipaddr-2.1.10-r1.ebuild 838 SHA256 20dc8d76e7b8c13cdc28153e7f91847b82d1611957a231ba1ec9a56f3fcb6abc SHA512 21464c32227bbe18925dbf69425de139ad23eb7b8edd77301dc08bedef0cbb649fa88b2c4a07928374de1fefece042dc96991a3c6ee22ddfff618a44d96c9442 WHIRLPOOL fd6f76e9f6d9bb2559d88886925601880706cfda33150ca19d0c33ee5cb58411dfe6d68fac46696491272016b61bb430ae64f0157dd0d5610704433e632b03ef
 EBUILD ipaddr-2.1.11.ebuild 795 SHA256 1b54e0b4dab9a05461c1b972936123acd01862cf198602a379d887ada389f75f SHA512 d0ec1f917a4211e39b999a2390bd590132523ee1c77f6ecccce5355383e5f39a0555466338d25dc6e211e117debb62827d1592d44e638af7f29493fd09171889 WHIRLPOOL f0ccc3c5d1823b6919c9d7e7829ed83637ee5c384fac99b8c11f405c84f4a6ac24e046c119de9f3dd9cbd5e88cec41e5c7ab09a22d6d98643e24f263d87cbef4
-MISC ChangeLog 2388 SHA256 fd9e1bc39f26a7595caa60903addecad32ffe4e04d438cff40a087c50682ecb8 SHA512 640c4bab20ea387feb8fdcc271758487d3e0953d4e03c651180f9d09b3587bedabc43887256817cf52f3ee1d0b72eead83253fbb96fe1297e1772a5838d05771 WHIRLPOOL 62e49d334b5ab25d97b081a6ffbdb8e7d6919ad404be0cda3650865fb68a9062562b07117cd472243ebca92202ae2d5f151d87a48ef9aad17f1f6c038e2c326d
-MISC metadata.xml 443 SHA256 17b55629f3ffbf32449cb18caa2f1361b84f4de8f2ed36bc597c163c7f3630d2 SHA512 962089f4f86e6dad4173de9e51bf428f54715d9f0d01fa47aa480e1e884e74c92850ad8ff4a76a58dc5ee414c1a9ae9c2815785b6913af80527b5b5d867127b2 WHIRLPOOL 3a972c36e6a8c50dfcad739d0d39a9cdca17c06e7381821bcc740c97c064a4a725f579c3eae7327c709e081a5d2495f2e71db1b43c32f1070b0be8a558ca3237
+MISC ChangeLog 2488 SHA256 24c6c25b15032d330c15720d8046bb7a6980995558a18c7de6e326761236e8e3 SHA512 46752e7d6e63383153591482b06ce27af26edb84c40de6617c3e600a8695bec700a767b36ef6be615306449a7f74a34f30f13ba1ba8c858692f6eb7818ff77a1 WHIRLPOOL d87e2150920b24ab484a02b3f3c03a2428cf3d980070f7b3511e58f16e8033c12b70027b5e8386d8ca9a53176febf88adfd6203c74627f7ff1ac93eba17530fe
+MISC metadata.xml 505 SHA256 e9b4f60e4437f16aafe8bf16bc804d976d5a8ce7fc8d6cbb9d243857b0103c99 SHA512 60020fcb182c84575181330fa5a33b62f015cb70c6691188e4252d9f0cfc8e7f06e26ff16e950bc72b739a1cde1b2ba3357ebafc263bc7c6585d4aff29246ed4 WHIRLPOOL aa4cd00790e1d776d9a9a53bef2b98bb266941205de676044df227e3f9425b002d82485280e28fea50e605d235f64bc6abe9c789145a385f4c26c6ae0a72db56
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVJOJ0XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO1qAQAIjlaI9wptQx7UtJG/frPuTd
-kUYmMPeITjaaA7+fCImHCXyh18z/x+/F/ra3vnZKA94DF1mLPlS1AodbPfwDDZKb
-sXCUVVGaflmUH7E5ruo8JVRGbs24fecF9m88iNFgRAes5LWI8IS5H6TeI7sXJIEb
-sIxvOlXb1wBx8VRajBgRlFM8/8Kr8cqRTuCbbWsGjJgG9O8nai3dGa64tjkPR6y3
-GNG4w13y075IHvzi0QF5WKFENU5/2TJM+yXymkQbb8FW2uqP3Y2cvMlZZmbfDcr5
-FiQsXRpTH7iHgB6yVq58XtCHmaCJ1YK8lM5Bykj+2LZ7mYakyPrjP/DSaJWCHCWk
-OegMTXwGjUhrPeBDVm9y8k8qzuVY8sdS8STD1M1ug5oRp00RVOv9nHZ/HfSEvQNz
-Dv73hzQyudVIyZdLXU/Q8l5K2+QiqkCh8O1ykT4k1llF/B1t5+rZgYK+4mRTCxHL
-0WShjXP37fZzQyRwQoBkB7IRrIgrc+G5HlDxeLq0JBRXRfnEw/EKaPyuyWGdUxNg
-vLtiE6BMbhe8M13xtMX0yS0tuW56juNcpoNPVQP2qBux/Eqwq0n/gcsRQ/zKQ5F0
-pFGBmrW1CCmVtj9GEwo8OQawd/tNlAyy77wsud7IvJx5+SBDa8UoA7r6mKiPPkJA
-CSv0WmUlpASvMmRz8FKn
-=/z/R
+iQJ8BAEBCgBmBQJVb1kWXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiPIkQALimXJW8rMNS7WOsLUUC9Ck0
+PtiA7StRLKvwWsjBv/V8GySk7sbvT/lqFyQHTUd2pPNPcatv5NsqzyED7lTTUuEa
+0QQlLzFAzqEIsVzj3nZEzq7DkAkdRzs34RQoMcmLjfY05Vzq6x2IjEp3wPVMPQn/
+notwmvTcvuTYytspdkWUvfOJxrIxovMUF8UAa3+rzrSPk+1zryp9c1cETa99yoz2
+51JvhXkTm6LcQZgBV6Q1ChDJT5NOjs2g/gDxXf4sZmc5qAdp8+xSIi4HEcF/eqgW
+DlF+flW5yAQRBNWFOzKbPKmXWeE9cgUDL0hKhaRGVZvyuyPwpQoE+EjHMvGqvVJL
+I6O2Dgaz9DI2J4z9egKXooiiGwHuZxWUPNjzCr1+qb19tYlCU4BcJGsQeKXWTEeR
+PB9Hhn//9GdCOFtlUnlEtcumno5VVCziCIs2o8Wv1rnen1G91WJfPa8tTHpoYYuG
+Pac4zlCOtHfaZazwTPQl+8UAIUl0nwQT/dt8lxI3j4120Ji0GfXWK6o/04SuihjA
+mybktj33ztxtAGTxaw92ewo/qxrTlYWmj7UoQhl4oXprP0fYFfJ/3FaXeN65aE5X
+0wzVs57DvHWiFYiNNbESzDHJlQ1RB1RrqL9YEfxMqJJftvwzk8oWrU992h37qdpz
+vvGgBYXut0duCh+ImTaR
+=NbKV
 -----END PGP SIGNATURE-----
diff --git a/dev-python/ipaddr/metadata.xml b/dev-python/ipaddr/metadata.xml
index 899c56c58abb..b039c82da95c 100644
--- a/dev-python/ipaddr/metadata.xml
+++ b/dev-python/ipaddr/metadata.xml
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
-	<herd>python</herd>
-	<maintainer>
-		<email>andreis.vinogradovs@gmail.com</email>
-	</maintainer>
-	<maintainer>
-		<email>maksbotan@gentoo.org</email>
-		<name>Maxim Koltsov</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="google-code">ipaddr-py</remote-id>
-	</upstream>
+  <herd>proxy-maintainers</herd>
+  <herd>python</herd>
+  <maintainer>
+    <email>andreis.vinogradovs@gmail.com</email>
+  </maintainer>
+  <maintainer>
+    <email>maksbotan@gentoo.org</email>
+    <name>Maxim Koltsov</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="google-code">ipaddr-py</remote-id>
+    <remote-id type="pypi">ipaddr</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/ipaddress/ChangeLog b/dev-python/ipaddress/ChangeLog
index 11434f1daef1..3e132df9af9f 100644
--- a/dev-python/ipaddress/ChangeLog
+++ b/dev-python/ipaddress/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/ipaddress
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ipaddress/ChangeLog,v 1.4 2015/05/17 07:57:15 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ipaddress/ChangeLog,v 1.5 2015/06/03 19:45:10 jlec Exp $
+
+  03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add pypi to remote-id in metadata.xml
 
   17 May 2015; Jeroen Roovers <jer@gentoo.org> ipaddress-1.0.7.ebuild:
   Mark ~hppa (bug #549518).
diff --git a/dev-python/ipaddress/Manifest b/dev-python/ipaddress/Manifest
index b8601bdd959d..56da11dd0cdd 100644
--- a/dev-python/ipaddress/Manifest
+++ b/dev-python/ipaddress/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST ipaddress-1.0.7.tar.gz 15126 SHA256 2c99e9eaea2dacbe4038b3be772ec650f5b4f4c8cc479c3704b81673d96849d7 SHA512 bfbb7ab47c50b1a370dab6905e3212fcd960ecdfa2180605d0775f90f80485040a3760d7042ae503a52d1931e44a0b2dc102de22a107cf2dc4b1e7a441841e8b WHIRLPOOL 00bf3d33e34a3998fdc324a1dc4bbe15149a64c72f7f4b020769097d54e5c46fadd7281639e428b5706855b238738bc74a8655c5009e10626b43979539b59baf
 EBUILD ipaddress-1.0.7.ebuild 586 SHA256 c9ab02f268cc17024ceaf0b1a9375ba241345b04a537f1d881abaccb7fa2c636 SHA512 787ac07c67c6d92ec48676e6d3e101851a6a920362bf5c48de6251d762e7bf9d24c6028574aac70bc4d07b546d015f5680bf552b7a739423445365964d92b0c5 WHIRLPOOL 21b1dcf13a2d6f1fc2feed30f79a18fae732d4beed9b3079ef651daf7e14264fd1edf0d3d90aa72034fe1fa5bda54adbe9df79711c9efca3c5bb317c18789feb
-MISC ChangeLog 692 SHA256 31f220efd016d2609cf59fafab7dbcdeb504a5e999010b96c80e4f602080d269 SHA512 5e0b5adcf082bc95116c08517a1bc30b3f34e258324ec49af4fe0ad33de20355aff1eb0c4d0969d96c3b3df08a8483996ba3c7df9a87f4cc53684c955613f819 WHIRLPOOL ede64982288646db488ab8fbfa9b4dd5dc3b959989b50048c98bab3fe4647a4f89a4febce4bdaed46f088f19f0fafb581e5c45743ebc00bff121ccadbc602086
-MISC metadata.xml 258 SHA256 f9120561eb5a0eb0be48e47772750941e1a206da5fda56321b45eb76fd145ba7 SHA512 adbf77e7b9f35851720e2f9ef564420d0d128c19fd2a72cd4c9f25e0261419d46c1f72c45fc7093a00eb15e551a14742f969157fb3356f8a60b3d31dee38c8c2 WHIRLPOOL 7811fe6099018241061d288dcc1333c7bad35703bb201f921041c7faeeacb03faf748f1d34699afe4e21b1a3f95149fafbbb18633548dfd344fbb736a3ddf495
+MISC ChangeLog 795 SHA256 8dbcb06b601a6c46fa5dd6af7509811251479ce7d9105027aefd1132d0e46aad SHA512 34b7d98ff5df8941050143ebee26be887bdb00267f415ef1e37bb6bc9012055f8fb545f69f2f8a049042ee75038e3883b3c3c61cc11dd2a4433b33d572c1e3c1 WHIRLPOOL 0ce6f51ac1ffd94dca0bc8eec1eb10b1eb52d47bb3a5741004f3081ab741896814a77262503aecbe4286f280ea2645243861f776c7828effdb4d3226ed901573
+MISC metadata.xml 334 SHA256 6a48bf1ae3ac9ba3e70e2b0fa8a5d7b07d758cddfe28cbaf4c9851a346a4e90f SHA512 eae4408179e1591729746cd864c1b7f30b84b0008339b8feb4aee7a08e583144bca7780a81fb0be6422da805ee8deacffcbca6d27a6e281235f58986d2a0fbca WHIRLPOOL d96d5bc187d8844fff32c0a5f299c2eded61cb124b09cee6de67040ead12afe3d35e34a50a54d14bc3c2ac9090d641d217680e9bf8ae667c53c473c40a810c05
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlVYSd0ACgkQVWmRsqeSphM06ACfXTwgpROnt9MBE5K8tlFSrxtJ
-jh0Amwa6AJmmMisQHZtZ01Hy65c7ZHwv
-=Q6Q3
+iQJ8BAEBCgBmBQJVb1lHXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiHBQQAIMWQP05dMlVL4ykWKYDL6aH
+eYl12u8xP1y1/XqXesF8PTYLPJSSznvbEG208ogmdUopxesHNCWxzShNVRmzqhBe
+zzNGfti0uJS6HcHq1oK3MoCWldNRUk50qtih2hSuF14UdA9i2k4uUUmFBu6DIpA6
+vu3yBkk91Z0XsekqeA73azPCtcHfabd00mDAyfGRPmqtSNxl3WscuxpTlEHxoGOs
++NtYGIFCPMg0FccJwBadFRGIkbbf42AGRyvKfQUmPfiO+GHZupkSfzsI0SfUybu0
+j5C+O5HeXClV5wmE5BddfW7OhBYl1CW1vYMIJxfnv3Ng0BrNu/KR8YCwRnsYNOqU
+eTABAVk8CvzqlisFZE0z+5dmcr0HQhbgKvg54H9pKs2Cxu+C+zSr/610T6GtrJEB
+r10T5uATj5rQu+mmjNxgS1NeXXSb7FOvXqILvysTg3zlXvRFCl3z7vd5WQBZ80YN
+xKZlYs9H33SmGYrdcizGcir8sYYJC795ONO2X6zzqyABJ8Zv+RRRR6iDBYU2Fphc
+EIv0h2J16rDUI00lgD2pwMpdj6IAYTalcAVhQroJVJagwicEHYmtrJPS8gXRWDMQ
+UuahcBvo/+COHJSx6T0OAHSAy4ImKgdeBEJLeUBl3KFLcjZLvxNLNokUxRjdFGbv
+cDUW6gy7ABDAPv30Aer9
+=JBq6
 -----END PGP SIGNATURE-----
diff --git a/dev-python/ipaddress/metadata.xml b/dev-python/ipaddress/metadata.xml
index ce97c3a01b30..387b0a7a8d47 100644
--- a/dev-python/ipaddress/metadata.xml
+++ b/dev-python/ipaddress/metadata.xml
@@ -6,4 +6,7 @@
     <email>jlec@gentoo.org</email>
     <name>Justin Lecher</name>
   </maintainer>
+  <upstream>
+    <remote-id type="pypi">ipaddress</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/ipdbplugin/ChangeLog b/dev-python/ipdbplugin/ChangeLog
index 3604d4509e4b..d12fc38bf9a5 100644
--- a/dev-python/ipdbplugin/ChangeLog
+++ b/dev-python/ipdbplugin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/ipdbplugin
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ipdbplugin/ChangeLog,v 1.3 2015/04/08 08:05:04 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ipdbplugin/ChangeLog,v 1.4 2015/06/03 19:45:30 jlec Exp $
+
+  03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add pypi to remote-id in metadata.xml
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> ipdbplugin-1.4.ebuild,
   ipdbplugin-9999.ebuild:
diff --git a/dev-python/ipdbplugin/Manifest b/dev-python/ipdbplugin/Manifest
index 6838b00b6d1e..62609bfeaf25 100644
--- a/dev-python/ipdbplugin/Manifest
+++ b/dev-python/ipdbplugin/Manifest
@@ -1,27 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST ipdbplugin-1.4.tar.gz 2473 SHA256 4778d78b5d0af1a2a6d341aed9e72eb73b1df6b179e145b4845d3a209137029c SHA512 5831d1e9aceb2fe4db272975d4d792622822049813ba76bdc0ee48dee001339084efddf534882775922ec178c1bcd52954bc2df1ce42181cbfdd1c3c4b944365 WHIRLPOOL ebf61a52db5be766a8407a85d8af04667a0818b5e084f762759cc535df8611ff363017961278a8da1bbeaafdb1b5630bbff1ba83475b89cf7f1add683748a79d
 EBUILD ipdbplugin-1.4.ebuild 804 SHA256 7f33f6403b48f06387285d45cc6b63fe0f80802f5635d275fa29153642fa6f46 SHA512 e3a2d96ce9fb0bb225cfd71ac47e6792776c85ab6580cb62fc3ce3c84e8a56de3131b86eac428210e0d9aba6cedcd8d347c7923fe57ad0fb3431b75c452993ff WHIRLPOOL 12455f72112f951b6fcfc2e2733f279f6ef0fe4f5e0372bb5a56f2fcd1d5349d6af4697af434d87db3567994ac1f3a9edfd350a65b4bba923b8673fe9fb2a1bc
 EBUILD ipdbplugin-9999.ebuild 805 SHA256 be5d10b978cb0548b734fa66c73257a9ba5f3ac98cc6368475b04863fca09cdb SHA512 ebecc62a30767383c2150141c0e50d7a90516470b3d2d06168ec832a58772d384f34dd6381e1e8b0489f60fc970b92a5d63597489d4eca6c20ceb37e37c1a304 WHIRLPOOL 2deb3a57c391930f9ba1454ee2180361c960b83d80c691616b5c6e9e8330ca5993af46e16f575b427174dc55904a208e0eaa9a6479bc2c41fc4e16b5414fb289
-MISC ChangeLog 666 SHA256 2a13d2b944df8faaae467e25d50256676bc23e3189e96b9030442ca273addb21 SHA512 55dc0b26010a281d52ddaa75efb5008c2b0ceadb37997eccb9c04b7eadf9566032e432a73efb57ef61a4689c9a880a42b0067e141f917501acf95df495be7a51 WHIRLPOOL e65369d0f208bc9e17b98dc1f8540ddb06fa69499c82dcd83800b87303a5f28c4d0ad9cf6a550f57d0dd1f9e2806501807a1ce9508717adef98c3c21557e7654
-MISC metadata.xml 205 SHA256 132e3db1188fcdf8aa6467bde8677e24fc63015666de6104a656a5b074932454 SHA512 e53c51c47b6f2ba5302d5fe6ee9524fe49c69d2b03d66aa0a3054185c7c0a83dedeec75ea15424afe22f1423d72c5bbc1c1e07c6bdbdd1912d8eb8e046a4ef58 WHIRLPOOL 5f4c6dfd2f9dae15971877f2eb53c1d9f6196a42dc62b2d95ffd2060f119d7e0794541b3d8ca565f9ca48479325d19864f74a85289c83d5a5e2396f9144d161c
+MISC ChangeLog 766 SHA256 29d49b7986daa2c67bc254cf07f6501f52928bce70e3a7a748079559e862b43f SHA512 45d843157ed097d9e53f193a7f788b096e4999abcec350e648c09bc71b663d48ab6f1f0fb1bd2c4dd7045b531b697206162fb2fd37bdfde7059deaef2ee7e551 WHIRLPOOL 55e608e535b41b6ae239fdea973b77cd6a95349bbfb4c335ed1d79e154f90a825fac07d8168bdd8a60a9ce2501f280e3e9d109ecc24a70312166938e0aedd360
+MISC metadata.xml 282 SHA256 e233684877b8a63df05f22326c4317045f8bd7cec45efe3a2f1e80335ccc9540 SHA512 4cb26b3a38cfe727b879dfff92115abb59bb635f4af3d7e60eca2d997ac9c1520d3de25b58dbeb939300f6fc1e2ad8e3b7db0e6f1de54181e3bd574cb50b8982 WHIRLPOOL 14e004a94223566bdc8b7b4f5a05b21c22612514e38e8371b0487a168ed1ed25c7ba4ccec6cef497be303cc39e177d0dd33106940aba57860895ecb231bf6154
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVJOJ1XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOXrwQAKt1n16rzfsEGwejlq7xItlM
-9pvMXk4Xr7aY7K+F2ovcEXQ2YXU+o5fQkEslumJrbOwlm8YvE8FPEjsODrIwkQ2I
-Hv2cmIpBrIUfjHPXGK5pyajC8vXFpKwVHRyJvBlFPdbt7WAMLlncGtlAl4iPvLhd
-bTUa/8XlLBp2YSF1TPOfzOEKJvu8D7YZOUHAugJOgEoalvHOkoCf7eFp3YbsbEl8
-GSZd5Rwy/lVKIbpC98PZjEocj02M018wmXbyyzjSCMCSfI9T452aybcXyvY/Eo76
-tAPfwdFyq1bqmku+ABV3JTkt9T+N/eDtHiDY41UEyuIdqQxlxnlK1zhx7UnyAQja
-pT1pmoqcED/5c9T+c9W8q0kc9gq/YDtrN+WzgOVwfl0uYVaxbuWMsvThkYf4CgaN
-TBIlqumhy+5p4zwsZVNoHAyqPA0B5afW/a7cEYRvYU3hFGJJArmXT6cVJJYfrBud
-xLQqjoGd9/bvXGT3JU2la7jl7qSyIC0fx5QouGr+KnNjYaYKTJXJMgPLCo0WDYMi
-t0Ofs6V3O/GLbaTr2CT6GAqYaFpOQfcdk0ci7o3qigHz24Amc5qmqvbUQ8/EN66n
-qmde8O+DD6rnbBrEdaoyeGl3Y7oaAqvyT4xXd7qq/jte5+TVWJIfaF0OsPpQcRfK
-FqcSQ97d3/jfX6icaTe0
-=FRQ5
+iQJ8BAEBCgBmBQJVb1lbXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiekgP/0E78IMXGr5WiLnV39AbK+E6
+t9p51R4y2FIHuApoAwABWMcvnA/T9uVnh9Cvgd91RehxCX9RtGqV46ATNS8nrKRH
+gyruy3M4Jo6DuOi0LPGBwCH9R8Q2I1i5GOplg1WnAKk3vKbsarDnzcNKSgVeNx/m
+ihQWMRPcJjhz6W9oz4oZVeGfGHXeuqf8NQ6bkt755UDGbonN7sexEhNtTeYlOd52
+vzFPKvGdNy1wwQ5OBQq4efkRPDbWy/D6BAjbW5tSyDB2LH6dsUDsA7dmViglvjpV
+0cN/c5QmmzkjChjBqCkc/mIokouKyFMZ+JsX/5YwLpVIs4Ue0DTvADCPegDCNCDo
+BgI78R8EC4Tt+ApTj184r3sKdxAB8PNU+d4zFbXs3GLv7rYyk4EoUvNwdEw/H8OK
+iGT4cub3qlB5PrZ8+B75LrD6wnykyCLDo4r9C18SuOsn/j5Lsd5OikeETFztcjsb
+iSTP9szHABJIBJchoEbp7RHzIDkoYGPjMYI5tG7ihQrHHoxWIK7RPl3o18kJTnZj
+Jka+S2btwtfGP2DxnxkJr24aR7sENLr+G/w77cCSK2NP/kTkpJE+lyiRzarjj6SA
+4WVPpUcKWnKBeCNQPpwascH/pi4oVqGvdfwbpAdTGG7sfQav47vpPjrmy/HRidB4
+fLOEpWgvyRs6pUP1CeIZ
+=fhuZ
 -----END PGP SIGNATURE-----
diff --git a/dev-python/ipdbplugin/metadata.xml b/dev-python/ipdbplugin/metadata.xml
index 1847f17d2266..91938ff6ff39 100644
--- a/dev-python/ipdbplugin/metadata.xml
+++ b/dev-python/ipdbplugin/metadata.xml
@@ -4,4 +4,7 @@
   <maintainer>
     <email>slis@gentoo.org</email>
   </maintainer>
+  <upstream>
+    <remote-id type="pypi">ipdbplugin</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/itsdangerous/ChangeLog b/dev-python/itsdangerous/ChangeLog
index bf48d0f256c2..b6b950c05b23 100644
--- a/dev-python/itsdangerous/ChangeLog
+++ b/dev-python/itsdangerous/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/itsdangerous
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/itsdangerous/ChangeLog,v 1.16 2015/05/15 12:49:40 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/itsdangerous/ChangeLog,v 1.17 2015/06/03 19:45:59 jlec Exp $
+
+  03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add pypi to remote-id in metadata.xml
 
   15 May 2015; Anthony G. Basile <blueness@gentoo.org> itsdangerous-0.21.ebuild,
   itsdangerous-0.22.ebuild, itsdangerous-0.23.ebuild, itsdangerous-0.24.ebuild:
diff --git a/dev-python/itsdangerous/Manifest b/dev-python/itsdangerous/Manifest
index deb7de32543a..82771407eacc 100644
--- a/dev-python/itsdangerous/Manifest
+++ b/dev-python/itsdangerous/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST itsdangerous-0.21.tar.gz 8595 SHA256 c760381fc09dc120e4b459f5ba39ed55ea21fd77ac9f4d4101c0c237d8fc9d9e SHA512 5164dda9d38d0d1c880f7782db12fe74b7f305057fa5507d788d6af2d49068a870313280ece6e4b019d0e5ba01f945ae7a54b205f289efda2602bad12cd401cd WHIRLPOOL 1359b8625a7865a590fd2d3d8fd667f6ad0b74d5b4bb90b9afd4b38e41479ed0e1f56f92ff55d57c24edc486711dbca36a6ee778b70b766ea6ba32c22793eadc
 DIST itsdangerous-0.22.tar.gz 9460 SHA256 9e63500ef4c2f30be66a69cd0def95966db889c32e7b4fe4dd8fc9c7ebe3f3fc SHA512 48a72c27d9eb9537efac8de5bd59a870d9b6b4622f02ea8247cc24f5c48ce186e32c0a2d438f2cadb000d06059b8f693afa51c85d5c2fcf30a16caf33da95aad WHIRLPOOL 68d9653eec7ba615361097e4bcef27387626c8de91970322b9964ac509417dbf437bcb9fb0e38c2777466d3303027a7f732a4015f912bc506bac798f2acf9326
@@ -9,22 +9,24 @@ EBUILD itsdangerous-0.21.ebuild 664 SHA256 43b5281c4619da1c9a5a9f305065396f5fdff
 EBUILD itsdangerous-0.22.ebuild 645 SHA256 2c0a4077b9c66f8add2f52020bed0d4ed07afd6a7bc5d34ef3236d0fc1a19e5f SHA512 278e0285c148fcc23fdaf1c56eca6c75bb3a8e267f1eea96b47b834eeb2b795ae2374d515a42ce907737df181230cc72e9e2d91e1b479950e5c215650c76e6ea WHIRLPOOL 1527e375c153c35b8c6277a50bf808adc8c431adde7c0a8547a46cf07e83e7d86650b00ef23a9f47453232d2c773a9c3d72c774b2bfca9fbfbb22b7da922af6b
 EBUILD itsdangerous-0.23.ebuild 891 SHA256 af8628826b854bdab06b7bdef04260c75afa92f375c9130be29e90a1eee03726 SHA512 638b28402bdeca04b0b891bfd6bcde4e2c20715d4f6bf377444701856d014be9aaa38ddca90fc5b917d041c3da840081d070245e3af1c00cb728a623391482d7 WHIRLPOOL 462bf69661e2b534b21c8e6bd5db0387fdf0b620ade0ba3089f578ee0a845ce60064847620ad7e96fd06d85f12ca819d049d20a252a63c8c386e052c3e200bc8
 EBUILD itsdangerous-0.24.ebuild 893 SHA256 25aaf2e55f1aac57b2ea14ebc26c112ef034a1ea46261b302a3fe9a5b1d16faf SHA512 406ba65594e880e055c1f569d5d7b3f55f173341bfc57ecbe930284e3559990a9580b07da8be9d79051028042421236c473533bc2ad3acdfb7322ef024a338f5 WHIRLPOOL c0300f08d17e4370612391b24619b0f95422f43f69e0b9ef3dde264f1e787f5a19804ffbbe0543c1a2535e700368060ceb91f93db6d38199152a7526019fb6c7
-MISC ChangeLog 2646 SHA256 cd37703cc606b6bbc27a7dc55e75d12f8e138671da9528b83428bb6181c44b1b SHA512 0c40f3269c43bcb794f19f8431ee54995d00db9783fd880f2e41465ebc49012405509b86fac2c15eae063aa11b0d12b0762b973ef61bb7ccc3aac2782b76fbea WHIRLPOOL d0a677ef6afb53a4258738827ace9e1420d56f6e6a5a1e0aea6bc9621a33e07fd6428032b4484f6f1879c06d9469d38afe1aa9ed906ff11c4e0750b76153942c
-MISC metadata.xml 161 SHA256 6f41e9b782499f6bac80760066dc5ebb307e73d31d2080f2eaa383b8a236c68e SHA512 9d77a0cf6ef95d95fe0e41852a1ddedc8bc4a82d39fa75e8bbf760ba835deebe6ac3beddc83b9b70e381cee31936f54bb2db7cb88357ed2228c9e972cf2cac47 WHIRLPOOL 1f1ee9aa1b4b8747fb5f6c9234263952071a1a90100df893eb7fed974ea7c63639796521cfa1fde8929fc2f1bf0cc65e88ef6d703a2dff633816ff87cbf21411
+MISC ChangeLog 2744 SHA256 a02418921f94c09a3f17d098a64c482f0d697d73147c96d6ce5701d0442bef6a SHA512 0336d813761df20545236cb23c8a0d1e1c46934fb6878d102c31dd8deef31917dd785442d28958f07357ab96eaa337aa1964259ab9b7c137738a320e847be6b2 WHIRLPOOL 7d586eec93f46cfd2e9cf3c58e0b6253a876542015091093874e358ac8a2e448c618a4e12a8c8da883c89033c6f7ee553224ce9f152aec8927cb78e6102e45f4
+MISC metadata.xml 240 SHA256 7a17ba753e8df440a4c5dbe35ff56e5c7d35f5ed3b32436ffff91a4fd89f724a SHA512 d45271558ed445ca551577250b1ce212590cfbcb8b25e59ebeecf8023ecc97c59831a025f6f9de7b6e651676e4db631d403ef0e563478a08fac55da099d8f668 WHIRLPOOL 244618cad082d7c6041a16f4f942f2464a5956e42c5f5c16d0f84cba390174ff8a1cc87fb50feb1b2963b7433244985874b0e8702bcdd4fb4f3b2ddcdb766bb4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJVVeuFAAoJEJOE+m71LUu6r6kQAJDZ4s0E0yNjZk1HzzLHAvpk
-R4vJrPJ6RLoaPe/+YLlbHg+Xz03nZ3In0EIIBDVjUSl/rXUNL1QSzXJg9ebwNFyS
-4sCbPTxb+3a7aC/THxh34/TJ+e5A0rmapLnADUohSYKTdwSSzM2qiVzrb/Gbdlyh
-4n1Ad/AueQsqJW5CLai6BYTU1lb2VIAe7grLhQDzvSQYh4AZi8uDnkTGjNwDJLCY
-4knSL7ArK/mkqAuewC8KLLUwiHoJg1S7tvy34BFzu+l3bHR8mVQLu64iw3s0Dc9L
-2Vh+uiU1qmSk87Lwye15B8Ssze3Bq8XcaBb/fMZ0bYbAwEhLtP9G2vcDpFvJFr2z
-DMuOo4D1LJ/yxzyTa0if6hW50inVl9POjx/XNbMKgGWTZ5lhQIJI0yDyx/7rEQu5
-bD/YB2gaBhl+mTeTCiI0YLdyOV7/gNVXK3RdwHme0N0eZjkLVRxKOQHsMG6gtCRN
-W1loWnwvCYXghD3SeKzf4/V9V6xJKqMTOY5xTssIUTBgQ7F2HdT5DZx41dX9D4Si
-FZcmOdsACfqJzTXAd2RV0ys5iy+l61QR5F19IvbY4bpkEC7cY7v1MZYFRRAlC+iQ
-uvreZKGKrdwvD36f8a9+GDk0sLB2u6Y9QkJhK0S4BRvPJC65oKmtLUPaR+asfTp8
-9f0KINifSvZBULvdSW6+
-=SekW
+iQJ8BAEBCgBmBQJVb1l4XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiKt8QAIcjjoBdE3j/3iNq3bv9rSO1
+5ufukSj9jlP8pfrWizex8YMj1XEuYB4AGcnRKbvmGoT6jhuRda69BVUoyGG/Za6A
+STfKjO5zTaohT9hv/D68EIWO6kouzKmt98DT/481OiEZwEioufZak93Q+VNzA74d
+lD8IYSLDqHfdHF1gPzsBYaThaywhRFeh3wVWhIpNO1+ij31iGFq5bF3DOLLLRC2W
+AtYLhoKENhnPPPJEYvyykCvV4OV1zlhiM3cycXD/nnwVjRbkygOe9rVxaIvuctzR
+L/qLB56ToJe0kwhxbXWn+g9aox5F1THxSs+CA+OrB+FsiH9YHkToHpiqHuGPJtgH
+qrvQhnygyoeXzRFpMmjz4OTC6SnJDVVDWWW3whe6VWr/+tvlv7dNiIJw031YUFJ4
+dLBMHUzA4Ume4sCeSOqFWLQ2lafaLoVz695PtYozo6aInV0HjOlQfLN1lgv0ESP+
+5G/WzbdHi/J4fpFj/BnDmMEAbcVakzND1HM2Mhd4lDouQi2cBSN97rrAzNCYdSwC
+5KuZgJbxtGSJLnpkdmzLHVUE3FggCPmGFIp+13oTvlqzqasJZwoNUW5WCbotDJWW
+amq02WTh6M3l79idbVsyMKRvVBJsnDuRthWBjg+uZTHPBScGTG8U0lLL1FQCC5tm
+m/yPY5N4GkC/e4tQDtpu
+=JYDD
 -----END PGP SIGNATURE-----
diff --git a/dev-python/itsdangerous/metadata.xml b/dev-python/itsdangerous/metadata.xml
index b79a85f89156..d204c07a0838 100644
--- a/dev-python/itsdangerous/metadata.xml
+++ b/dev-python/itsdangerous/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="pypi">itsdangerous</remote-id>
+  </upstream>
 </pkgmetadata>
-
diff --git a/dev-python/jdcal/ChangeLog b/dev-python/jdcal/ChangeLog
index 6f6bea50df94..82ce6a6754fd 100644
--- a/dev-python/jdcal/ChangeLog
+++ b/dev-python/jdcal/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/jdcal
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/jdcal/ChangeLog,v 1.5 2015/02/16 15:48:17 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/jdcal/ChangeLog,v 1.6 2015/06/03 19:46:25 jlec Exp $
+
+  03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add pypi to remote-id in metadata.xml
 
   16 Feb 2015; Pacho Ramos <pacho@gentoo.org> jdcal-1.0.ebuild:
   amd64/x86 stable, bug #530324
diff --git a/dev-python/jdcal/Manifest b/dev-python/jdcal/Manifest
index e6f998a70697..20dd7b7847ba 100644
--- a/dev-python/jdcal/Manifest
+++ b/dev-python/jdcal/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST jdcal-1.0.tar.gz 5677 SHA256 133220a36c533bae02355aca7f507de7b33e57e9467d33cea7d5673ba354a3e6 SHA512 5e9f865a3c9a123a56d084c9ddd325cfe6c246e1a9162bb8f000abaf7cdf376b1e38f7c2a97f14a13d2f4b3f3de4e7e3773a903f905685ce76f541b50134a408 WHIRLPOOL d09da7dbcaea2ae10fd992b20ce5c7203cd020443ed685e5dba6183cd1296e824ba66fb06e317f1598302cb17fe5cf914ff0e7e31dd626029ed6e8c292717c9b
 EBUILD jdcal-1.0.ebuild 539 SHA256 ddfc5a2f72ca4a84b5f9636ac7bf1cc40ea1d46e6051acbca63d91f2ad5ecce3 SHA512 0314fb47cdd8069285873ffedc38fa9e7f97b184e31ce07c423521399d21c3d79282170b5d9632e3a3306116daa16451c040c08afe2170cdcd4e3b69cf75acea WHIRLPOOL 4a3912687edf032da2b64955c88f964b6cf58676ece8bf9d1cfa30d3b9888aed939095a94aa685a3c29fe6369556ba89fcecbd46ba059c302a4794b796cae13f
-MISC ChangeLog 743 SHA256 fedfaa2910e73aac58f9fcec22a44b60b4c8e03d3c7c4c425d290c58995e6203 SHA512 ef81bfa7ae50c94f5cb96f67178191bc26807a9918562c90a44d6aff4e182a9e68a462d9281e7571397d65b01b8e776dad4573f440d538a40b7d0bb746fc2b68 WHIRLPOOL a658f6b4e0808fd9ecdd13c4c70a694921636c12545e3b4228e82d7ccf77f60d39b469c7592e69426a58eeb77ae27b1c5d7efce3f28caafef772879ce510ee37
-MISC metadata.xml 161 SHA256 54c4e6d783f2571466c7b03622195c255b95cf06209e59ab6653a6366cdfde6e SHA512 b306d222517e4eae525f6a79634f26eff2068f85911b7904c52c485a004d1d5401300808da67f9a1e3f102d65aebd1e0d21cd18145ea0bfec156f2aa3785b104 WHIRLPOOL f9c8e8d23bde25f4b14031f83dcc09e8437fdbcbb27199c1e9d8109fb2ccc7589cabf8240256dbbe6e080d04d2c444d115c66f82fc9b479e1e70d1ef0fe60fe2
+MISC ChangeLog 844 SHA256 baf2e0e18c7346d4418eeec2086d52c4cf47f65e7fdfc3f0b15a22bdf40b9aa1 SHA512 1ff217e34ae8d2ac0af8cb81d2ad34fb1015c2acd7809d8326f59722254ddbe918022369c1e82a629af22677a1308ea57631c2befd52812f761f881d67eda52b WHIRLPOOL bf55cfcb0e962ce6544a314d82539009ff335cecc9bb4754d46dcf74667ea506683edb1f2e3a2a395028281263e8ad933921b6c0f8417a72f027b55049550651
+MISC metadata.xml 233 SHA256 0b23df223634716a07d9b6f167925e7339ac8b6b8606c15d0fc28044439e72ec SHA512 944acb5b163382a27d27eb3189a340540b76fb0fc9a3470cee47c831db0a9e9d0c8acf36571c60d11a8faf3b39a3ce18659386dffb003c714d4179879b6409ff WHIRLPOOL 99f7ced90caa10a1d0bcc9ac74aa6ac6e90d9a3f311a44e96dabad8b0823f5940f4de393e48b300998924ed5382cddd14257dd662816c1e3cda1ea91adfad8b7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlTiEUIACgkQCaWpQKGI+9QCWwCeP7dmtCtIxnYp9UIGG+u2R5Sf
-d44An1XSCaU7CgFeAxw2BXKSImv1KLVm
-=Rgld
+iQJ8BAEBCgBmBQJVb1mSXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmihZUP/0eMehbI1t8oxbAEJmLSTuoF
+Blp+JQaa243+ZS9Ef0v1YU0LbT5GqUnLVeAPEOJ2oJ1cfAzbTWMliPmVWO44sAhu
+7NYoVCKI+9oCn3HfoiXEeiRV28vp/eu7e9udNfr43x2dP+qJC2mmVTC08b+XDv+N
++AVK0jDAPK9MldnmPVriVWF8LIu+xEKhcZg7Wk4PB4u2En9atNv3tZonZvksrXBV
+pjwqelAVuy4ZmiyjlE17Um7bpN+8lF902JDCRIaJH0ASF+D9p81KHIhEBgsk1Jhv
+hI++ZHjP6vQoSTjX238gW+OniKayhbVRK0tKi7mQPw92uJK25EBWPRE0GLy3PChs
+FF6v/BB/sA7YNHX2ITosHw1GsPK00z5RhlVY9/m2AlfgEuuHXt4EK1klz+xGY2LB
+fAR23ehFem9WPXOkDN8Eu+OoP+AGlfpYdDKm1+avDFVxLEwCI4bXSMgrI4t35Roj
+jVjJACBtlXA+yjLrBMKLNFZZozljWFOZG/u8yLzAsW4eqrAP7C/peRb9k7C5bcUH
+SILDvHx7METpHkeGjs+Ul4jHmxqjpOpii6PpaMcC4fO6rnGsoMihQVPtwVp7KviS
+etZuoGp+ScVfpWqVlTGvA/GHED6HNUru4LuKVLlbTmDu3TcJq9yOkin+1rtIa+pr
+affuEA7t+0pcI6eeKniz
+=nBGM
 -----END PGP SIGNATURE-----
diff --git a/dev-python/jdcal/metadata.xml b/dev-python/jdcal/metadata.xml
index ee7e8b2450a8..1ac90f0edb30 100644
--- a/dev-python/jdcal/metadata.xml
+++ b/dev-python/jdcal/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>python</herd>
+  <upstream>
+    <remote-id type="pypi">jdcal</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/jedi/ChangeLog b/dev-python/jedi/ChangeLog
index b0c1f0fabf65..91cf28975972 100644
--- a/dev-python/jedi/ChangeLog
+++ b/dev-python/jedi/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/jedi
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/jedi/ChangeLog,v 1.23 2015/05/27 23:31:14 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/jedi/ChangeLog,v 1.24 2015/06/03 19:46:53 jlec Exp $
+
+  03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add pypi to remote-id in metadata.xml
 
 *jedi-0.8.1-r2 (27 May 2015)
 
diff --git a/dev-python/jedi/Manifest b/dev-python/jedi/Manifest
index 473a7beaf29e..3c44c6ec50c2 100644
--- a/dev-python/jedi/Manifest
+++ b/dev-python/jedi/Manifest
@@ -1,6 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST jedi-0.8.1.tar.gz 304088 SHA256 4d23ae457cec14cedb71fb56f0ed51d75798f2fd74e91f6e5134b09a4a78eba8 SHA512 2188bf0eede9d78a298c0cd6071060e74b0531ebd3c21d4e831c77202b7e338452f0ab10b693902e5b0da8095f394e5c67e055f1cde3a476fc2566b627bb6d9f WHIRLPOOL ecc131bd7a9ee046200ebe089cb37b7afe6b9bfd9522329b96418f34383fbf7f60957cba8deb9799bff804783c7b5a909159717f382da9d979d13c57c8f92066
 DIST jedi-0.9.0.tar.gz 334204 SHA256 3b4c19fba31bdead9ab7350fb9fa7c914c59b0a807dcdd5c00a05feb85491d31 SHA512 fa60861bde0afb63c90b0e14b252d33b68d5e83255d662ef727884c91bd530b5a76f0306965ed9620d7d42a92f177feb2524a7b088ade786fb486d62d6912e57 WHIRLPOOL a6233ed19129f129cd97778f1c01bdc1e0747ec1da3611164c50815c77ab57ca1c8d7bec824b00d105cac62d32f53981a54e72b80ddfef00a77cd9316aef94aa
 EBUILD jedi-0.8.1-r2.ebuild 1012 SHA256 f46ae0dbb46ef426fbc13b454ce6660329d0fd2fe2aed8038c4ce2c10c5507a0 SHA512 3506d384b855d946043f2a7189aff8c9ae658065e50c2fc15d015e756006144cd0cb08470ccf4646b95baab3f9dc74b6c3544ccc502d2ace49c28cf67f3384ef WHIRLPOOL 9b9d5e41eb6c8605540d15b12c1019ae0ad61c7e316824c34a24afb5838e38a729a38bef405620974348decf08049f1f2785471e577e4ff5cbe4a3e7a307b8f1
 EBUILD jedi-0.9.0.ebuild 978 SHA256 75b09745c902e16e1145a9eb4088b81b6047ae4c9276011ed5f51254332826d8 SHA512 49715c8595e42d172b89c2ffa0044ddb5ca1067817e7111a6b7ecac2c5695a68096b0d917e3656f48981dbd6b65814dd9cefcb53b781e0076f54efed68f2cb79 WHIRLPOOL 397da0ff5cda28a3f5752863619278647d7074fd74f48efd001782d56b56da2d629d9c612a312f6878c305cb41a0b8365a6d4f69d6b405feb9c8e26103959ef2
-MISC ChangeLog 3319 SHA256 0d3a85cb3edb11430fd856f61b92137c1940151c502ab39274da5409c4aa4366 SHA512 7506a11e4fa07be7cc1ba3a941677e00111450d060a4b13fa6019b3821c3fda81a6a84686b1aaaa09e454ccd53506185477000e00655bee1125a5f10196ad3d2 WHIRLPOOL 123d6136b98ff2bcd7c81ae617c4b61df068d7e80920085960a52071305024857025a1ddfce684f737235ae9874b84f492dc9179d171c3258632577f5b45c217
-MISC metadata.xml 161 SHA256 54c4e6d783f2571466c7b03622195c255b95cf06209e59ab6653a6366cdfde6e SHA512 b306d222517e4eae525f6a79634f26eff2068f85911b7904c52c485a004d1d5401300808da67f9a1e3f102d65aebd1e0d21cd18145ea0bfec156f2aa3785b104 WHIRLPOOL f9c8e8d23bde25f4b14031f83dcc09e8437fdbcbb27199c1e9d8109fb2ccc7589cabf8240256dbbe6e080d04d2c444d115c66f82fc9b479e1e70d1ef0fe60fe2
+MISC ChangeLog 3420 SHA256 c87c3f148b7af6a971b808968b901ee0668fbf98aba340c6efd8a4fc6abdd4e8 SHA512 7d497e32dc29078f20a20a27ec8d225db42c4234604874e43d179a8f7444cfa2ffb211d02bb8607bec79131f3b959099ce1c668df6e6f8ff6fe0b3c58a8eea09 WHIRLPOOL 2257a6e201bb91ee310440c9253625b3383637bee2cc3ad48559b9548525b7cafb3ff4befcf0bf48471eb381ab6c67d69a222be04ed5a71cba4e88c673933146
+MISC metadata.xml 232 SHA256 59bbc89ccbaabe468a862f14e6534dafe930ed51fc04d00c26ada5a5ee621e9d SHA512 43d6aa475d6e33756078555a2ac15655ebc7fd0ef48977c3eb36adf1484a7ff749df2f81c67a5bbe64cc554dbb38a20acc81bd4f0fbaf3df264e1a90e164ff26 WHIRLPOOL d0d0fea70054629256408fc3a6b380e9d71d83662ab3fbdfdb6f494b298e2fb1c95126816c8ecb5056976df1bd0007f595ceb09c822e15f0b209abcf692d7b76
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVb1muXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmia0wQALHT8wOIg1BfMcDXrPe5WtWp
+qZtx2+ujyZEfpKfTmNQeCiCYclgR93G5kwscEGO9Ttd9DePAB5nPboo0WhqEbXTH
+OAQYgznD+2ONR1Ef+iDLcPagKcl/+PfkvdYgWXysCwg7mLo0QJjvhKomGZlHJwJD
+XSo2ht38tuyw6s0AvJdXR4FDnKioxG+SP3+u4Z4KmwQBzdX6LylVMGv7NgkO0Jpk
+E9CzAHEBeYDycjxFahUrR6RpvVokfp5RZBbtyNSYg7RFWvuy6HehWNQqwiytgwlP
+xtpQk4WfC2LNbtKwXcWY7MPcMIrjz5MbC5vgBRXJSu3KeW4V90bjESiU3c/vpVq6
+f0/TwBV7QncNVbqqnayQp3vF10VuTOmBoYAqazLsvjaYsEavvbCpAjKCMG/XRAwH
+7VX9/FMghrrVZC2YxkENVo6cszkQUGIo0tnulKZsItAkUxnGsL0FtMnWxlk5rKjr
+BYcqSw2Fx/tqYasdsbnmSbLPWxZljMVokF8cr87N290L5P8fR7Eu9KGWg3cnJUmO
+3mtLY96gSILawltrmUfsGyKGGcArjY6wCMxiYwrjL/kcIp/NKd8vIk+gfv0mmato
+vDc2VVvFEo5CUALjfZq2HCH+iZEsOGbasOXPRc6izkZ/mZlLtQdVfLUAWYnTRRB6
+ql8gJo0ddPOu583qypdm
+=Uis+
+-----END PGP SIGNATURE-----
diff --git a/dev-python/jedi/metadata.xml b/dev-python/jedi/metadata.xml
index ee7e8b2450a8..c2aba30d5886 100644
--- a/dev-python/jedi/metadata.xml
+++ b/dev-python/jedi/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>python</herd>
+  <upstream>
+    <remote-id type="pypi">jedi</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/jingo/ChangeLog b/dev-python/jingo/ChangeLog
index 0b9901355233..e2919ff4ab45 100644
--- a/dev-python/jingo/ChangeLog
+++ b/dev-python/jingo/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/jingo
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/jingo/ChangeLog,v 1.3 2015/03/08 23:51:23 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/jingo/ChangeLog,v 1.4 2015/06/03 19:47:12 jlec Exp $
+
+  03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add pypi to remote-id in metadata.xml
 
   08 Mar 2015; Pacho Ramos <pacho@gentoo.org> jingo-0.7.ebuild:
   x86 stable, bug 540290
diff --git a/dev-python/jingo/Manifest b/dev-python/jingo/Manifest
index 20f80fca5605..39250667f857 100644
--- a/dev-python/jingo/Manifest
+++ b/dev-python/jingo/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST jingo-0.7.tar.gz 9365 SHA256 a3bd5051dd17e9d50e8a9f2d362508e82d7063010fdc06d5e07ce3608e780fe6 SHA512 7358c20371d761ad147aaa2991056d1789d6a80d645741d816c38369abc469911ca6a1ab4324e7b1243832605fd80cdb3df89610106d2a850f634f1595da254d WHIRLPOOL 5c3c17a287a2cb1469d187387064b8c55accbd240105aa3f09f9fb671512dfb394b3be2529d227181c302070c83c73c1c0556a9885f8cf32ba4dbe31039cfb4d
 EBUILD jingo-0.7.ebuild 596 SHA256 ec723a2ba5ef35e4a89bfe5b7e9d73abbff997d7515c08d30e2085639cb9f550 SHA512 278e597af77f3004d0b5527fd443f1364f7fcacfdea9fffe07d0b2b37e30acdb8a18c355b5a92b5b617aedc748b3a1a18b9e4859fdeccd3b5eea32c50afa79a8 WHIRLPOOL 5259c8a0b3daf2812d692629baffdc61431a4fcd9d5887ef6a395ebf6875e86122183be6ca63dfdc17bbc53c42b3d58f238444d35a0f542411919546ac6f9ed9
-MISC ChangeLog 540 SHA256 0b1441d21f16b1e7cdec38abccbbe25cca24cd1bb7eae1930cde4cfa3011bfcc SHA512 8b0d7674e4b6a0e3b8d390b147a1817dfd2a97a3834e3cb14445d410c70f6a8f5f52d90ee38fa5eda477368c54eaafcdbf0a89a998161b088fc5330cc46cb0a6 WHIRLPOOL 2fb7847e3fc5dd94f0d1cc545d9143cf7fc9d29761154ecd53a5e09735b25c0d5363f16aeed58af495b1ae2811e56f23a048f636333f558d3a252d133c080570
-MISC metadata.xml 167 SHA256 a96c7a7081b1a192fc4758c24f63e3f458ce37c90ef5594005e91e01a5daf934 SHA512 05f506754bd3182ba88befefe0609d354f9ee335bea2d866f30719b292ebae30dbe64d6c68ff1a918bfd380bd638146b30754d072229491e8ed6f9d6745510c9 WHIRLPOOL 59ac07478ebcd8bb8b5edba5af0041df85949cf69083c3aae6945e371e6b79c6c92e2bd21189b2d8a87de72c9a4cd299e0773ff73332e247f95b8e850a76d054
+MISC ChangeLog 641 SHA256 3c035284482729c7f912778f70089108a20bfdeebd58614cc14dc24aedc77680 SHA512 bbdfbe4321e17fe4d09dca05eb7965d87b4944eee814d7a66b3590d54c10caa9864645007fbba87cfd382bf7e9232a14f02f67f17807eb6d3e852395df6a1912 WHIRLPOOL f4bfabf85744dac41d0d8a636d31fe443ef3a6a4d2c14f1157095ef31ca98721764f0612451fdb658d18be0ac0d6d2df372adf2d329b7bc013e1fe7e74551e2b
+MISC metadata.xml 233 SHA256 a091609ffe7b20c0c59d49723cfe493cad44081b24de6f87a725f11e0818c994 SHA512 9d49131daba5400fdd50a5232d35f9e1ee0e09d62558c1132b0ddfe5fc6fb305ec538efe0852998cc1c1632e359ba41aa626c64015fb0cebae76eb0e249ed743 WHIRLPOOL 887508c77b973b3987ab154ef75ae50751b1e0fa738f9f1b20726536ecd1711c695909e057db9cf2e2df559de610678849bc49a0fd74a5b8d2285b83a17815d4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlT84HgACgkQCaWpQKGI+9RSBwCdE9wTR6hdXWyF7atIgsn7IIV4
-WQIAmwUO/dTEnQRogc7uGggCa4JYsBcZ
-=Xemo
+iQJ7BAEBCgBmBQJVb1nBXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmixiQP93MTVDnVd9aqHDQZts1yCM42
+uGc8FvDce5SpR2nDSmGbcflAQyZUnHxYwUSLC8x5/0q/rMUypQoyg/7oc35eRUe1
+zd6iObsbp2GbAxGEpLAwC4EzVKMhpm5d36KHbQNyad/wNuUpktOuROmD9b/QHH9e
+v1m842kJWrKTQaaqaUIV4g9FhrgB8nvl3GjPNZp5eHbRYRcdwiAvw3OC9oiMrR8Q
+zASBLi88iipHMc+tP57N0QCDofUa+lkmDpB9c9ie1//PWLP+tNQPvWy+zJbGZfJ+
+kvLpA6yl45Z8G7WGgstld4Tkd4xhy6OKc8+wQMTdBunY2Kjwfe6xml9J4VJyYjU6
+5zONG0mPOVQKYLLWvPkO8L4m9Y6PJLFqHOwA6qW/CMla/Bhg3kAVzK/7OYH3Dmuy
+g9lntBpxtTjje4SC2+1PdXPH03RYrm7tQrjP8VV3bhJqx8hoNFYfVZq4WqY1A6C1
+xhNo+FzzEPMyK+E58zfbA5FSAxpEe08LEDeT+e5K9+3GqWAH/DefH02LpvPnEpDi
+Rnq270kibhFNjKsksREEbUvjRx30qbCEsRxPLSliQEjSk1k09UqV9D/idAu9e6Eb
+qmJPJ9Gl8z7R1z+JZyZK2fUVbe1wjb9NBe/HHu9EoDS346MVY691Xf8gx8R3if81
+dIB8ZrKh6uSKLYkWebg=
+=0tya
 -----END PGP SIGNATURE-----
diff --git a/dev-python/jingo/metadata.xml b/dev-python/jingo/metadata.xml
index 0645cd9ff8f3..ed77c7c0dc48 100644
--- a/dev-python/jingo/metadata.xml
+++ b/dev-python/jingo/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="pypi">jingo</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/jinja/ChangeLog b/dev-python/jinja/ChangeLog
index ea5f891f6c9d..40e3a4f10537 100644
--- a/dev-python/jinja/ChangeLog
+++ b/dev-python/jinja/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/jinja
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/jinja/ChangeLog,v 1.127 2015/04/08 08:05:23 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/jinja/ChangeLog,v 1.128 2015/06/03 19:48:04 jlec Exp $
+
+  03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add pypi to remote-id in metadata.xml
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> jinja-2.7.3.ebuild:
   Drop old Python implementations
diff --git a/dev-python/jinja/Manifest b/dev-python/jinja/Manifest
index 8f3cbba0560e..4fbfdc7937b7 100644
--- a/dev-python/jinja/Manifest
+++ b/dev-python/jinja/Manifest
@@ -1,28 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX jinja-2.6-python3.3.patch 591 SHA256 38a97d3ffc527d9d12dcb6e103b8a214b95d8d554995f095532915e514ef5251 SHA512 430dcb663bc623c639d1863a7e0c0fd8687f601b570ea4df4fd6ddfe1a7e03c63a90bd30fb53c1ecb11fd57fdc92eb451d243be1d46c5135516d992c102a5011 WHIRLPOOL ab2d5e4fd1d769a0019296e65fff5b3323ed47067aaca9e1a6f59e3fd430bb91aa8517e46fdf7ea4e51b973cb35311d3f673b2e9dc7f948d8e8adbe40a8e8336
 AUX jinja-2.7-docs.patch 1945 SHA256 d3299aff0ed48f0b89a7ad07ba092b02696fb85692d30ec569d308e0925744f7 SHA512 5cfb134597eb3d39426a6e79d871d7381d776e9709b3a9f606c2d5772eacfb508105637e95fcab88fbf2705f3997d9d0f92bc85f92c790603c95ca1f096d013a WHIRLPOOL a27f652d0fea41df7e8b079950a1b7c928386dab954e5dab423906a4f97206573b72280c9073cacfd80f90c6ef112c9f1ffabeb45965f187daf4e288040f5eb7
 DIST Jinja2-2.7.3.tar.gz 378470 SHA256 2e24ac5d004db5714976a04ac0e80c6df6e47e98c354cb2c0d82f8879d4f8fdb SHA512 2810db2b52fe800e2a4a47ea41a07f997b1647a2b7ad05fe564f9d554d6a402283c84c4e2491e5dad8d22acd83d3ca420f0983ed2effc732f6d79600a846071b WHIRLPOOL ece9b68dff414739103eac202b5903d96802939f5742a2bf3ff421d87ef49043ed9a4b2a3a6bf0c2f3d9be0d8295b73c47b253553731b44912cb58add8f233c0
 EBUILD jinja-2.7.3.ebuild 1823 SHA256 fddaa2483e05de1abeb4a4b71213c78038b6940990798c03bfe0a90a9bff0bb4 SHA512 3875cedb6ad7d07cb41ee9e0ffb8f06d085c699c1b446b851eefef60e2443f2faa1074008a832a8185e512d194a96cdc8dcac309d50407aed46c202b36bd0349 WHIRLPOOL 7d7a77114db5f8a19b2a863a0f911011d422cfe2e15ee7f420f28d91ea121b6aa79e2d0614973b180008d7dfd616ec99e5970fc4c2296d12ae64e40dc5af4a0d
-MISC ChangeLog 20080 SHA256 d7a54c9d2bb8a1f956a8007d2cae4da2077391a3aa801ed11abd3558ce64f594 SHA512 ba43d2db6d2f236255826c9685df023d0e9d016f9c6501a35f208573f08146537b0cbcbe37ad0341ab2d44273274870703a998701a990a641e17d82054de9ed1 WHIRLPOOL 67e0744b90c0444ae49195563b3872c5ba6cf8da2c64e4c5cd2e2c0fa6997f453e2695c813c1509f046d19132d4833e2282e5cb7ebe4ff67780c8b22857ceb45
-MISC metadata.xml 160 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a SHA512 7c02a1de1ddcb6b7c6378cceff0458da3a15d5381417f7cdf01874e7c372664b8899863f41b3a2fd8d6ad67ceb732dac6da0cc17575bf8e3e6d89480417c6628 WHIRLPOOL ed2795e4466eda8c804d5067c87386e269a59fe959393057ca5ddc36851e00f5210c4da1adf4bbdfdbb7d1d3d5c60aced25727ca12fdc8305d9e263a3aca9b13
+MISC ChangeLog 20180 SHA256 96db1237ce6b37fc8dcb66ccd0ce04ec9c7b9714f2a1f5ffbb0030e090ae212e SHA512 8c3c3d0a35e8f817ed9aaf5ba060c68d1903902b55ca0bc1bd68c849eafd62eda7cea8616ffc3e53c76fcec78f1a18d6d9830eba671ed64c14d96a61f35b3169 WHIRLPOOL 0dd3bef055e8418d23abde562635f3cf7d04930eea572284f881ed8ef44e14e9b01a44d122ed3d89313d0db1db91ed178b1c26cdcc15248602334705bcc89387
+MISC metadata.xml 234 SHA256 b36a10ee1245dc1d7c7261e29e1882364553a597c3828dec4a46ea2ab615a1da SHA512 27299559035f69e9eb2ddf2142cc3d3aeffca5bd3a26d695f73069ce5ef2d4671e2bbec00012d06ec5bb39b2dd0469f1441af6a6d2680851300c520ac537680e WHIRLPOOL 55d83037c56d2e06197e85cbd7d6c5db32dada1343e25e9151d2ce6e836b82cb88ece93fb77867e38818729656bfa72bdf9479814767ff84b433c7af7112a2b1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVJOJ1XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOl8IP/2zv+wt0c140xAj4MdSGC/4R
-zpEl2zJdv5yO3cIdqOBVQV5BqclAhWvXRCt9Ze/5n8ENYbudOc3uMRNZZQAYM/uz
-B/DtcM+YzFkW6XF5JynKJ/LVjRqIjjiVL0ias5MF+OHbAIhk4qo+bNYPkJlY3R7S
-x4OeJFP1gEPh8nCngOe4FSLXZnIIMuuQwWWrSMAHdeEYtPsJ8EKcJGN4+meG5niW
-ZUYEbVsqjBxia6eohMrgE05GcS0U7PUxrrPsu9q0PD1OsZ4hzQK8cGzhDswon0FW
-7B57x1eEInadQ7m672ifiDLcShnzAYsvkOvUATUPZBJXujfmcyXdTBGpyu4FnvjX
-Bd0RucfGEp/7GXiK84LwxUR+bWP22DsvY/+gOEoYS0rKqqHLpfuONr0kjqKCzag2
-I6U4Nmi6VJ/ADjjN9/jyHg9eIJCKtuISGskUNPzujaoP4sTT4rYuGuJTxwDwF7EF
-fE/GkNFO/zaJpEqnpqwIvAKi0j2MwLVXd4qtWAj4msgu1D4Bqe4ZUx6q+ccy0wJO
-Yqt+clBvDC82vtsGC6HMnNQz2UXUmCO20uNGqWVQTu8fPjU0hbgjb0NMloKlSiYp
-HeHUylAriHjXIBggE9u9OMUEJiCPp/NgMekWTpuKsjWkxVZbju/QLfgo4VNVY1Eg
-Ep1ozKnn3hj6Pd5BRLPY
-=b7o2
+iQJ8BAEBCgBmBQJVb1n1XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi8BQQALGWtFWa0UV9/5p17x89eJ9F
+pODUCqgo91XHd7xjKvHN8mgAk/bruihm5SUBHNz6qZw4cKi0pHzHaxNjke10ZVPf
+3JvTXRnhtrp4ftCcieLpN9n20jcmNX/Z5QVsOd4GwP+J9C9a3ZpE8diYuRGwJW4Y
++s+VToQxyQfFK+YvBE7JTi1Isb+eUaZJo4a9FoJzVPyJ2FoxS2/kV32qsfXEEVNU
+lifUeADnFYLWpKwoT5zieQZGprpITijfDpjoIz6h35GXbXBOK+uVXAqre3CmYjlN
+hEzZGQatUSKmmIOVLTcYPP/7fr2LJkZG7dqVMVdMYVK+5aB8XQOBMr2Q73uj+3KN
+552LKdB953xvnvdrxyXEeApwU3w27WA95MC1+O1HfnzYVBFnJlI3Q/vDO2QVeedG
+HY6wbdqmOaJIAm0+nEROVZD5oYSucBAGombPngj9lKLinclfXLRb+UU2vgjaRLYS
+NHYx9C6JQWJPn8d2LP9SypW0i0UEb8cFG5rs/FUEt84IJtIcAsiZ/EBzDWdWT6/s
+LsH00+MgU0JnuqQEzV0sSJf7+wJYRXvgM3DBnqqATo6OwadIRp8xJLQxSOgmUqd2
+L28XG6ZzqBqO52OFiFb3eZb74uiAP5msA4tYmJ74gNOWAfrPnb/vXS4embYKYtyU
+RX8J/3FHdO3UySWyKXsg
+=9/oe
 -----END PGP SIGNATURE-----
diff --git a/dev-python/jinja/metadata.xml b/dev-python/jinja/metadata.xml
index 301d2207cc29..45bb8cf511c3 100644
--- a/dev-python/jinja/metadata.xml
+++ b/dev-python/jinja/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="pypi">Jinja2</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/jmespath/ChangeLog b/dev-python/jmespath/ChangeLog
index 1769e125dc14..7133cb33798a 100644
--- a/dev-python/jmespath/ChangeLog
+++ b/dev-python/jmespath/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/jmespath
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/jmespath/ChangeLog,v 1.2 2015/03/06 22:25:54 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/jmespath/ChangeLog,v 1.3 2015/06/03 19:48:33 jlec Exp $
+
+  03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add pypi to remote-id in metadata.xml
 
   06 Mar 2015; Pacho Ramos <pacho@gentoo.org> jmespath-0.5.0.ebuild:
   amd64 stable, bug 540290
diff --git a/dev-python/jmespath/Manifest b/dev-python/jmespath/Manifest
index 6cb1f7abd2cc..86f0c6598157 100644
--- a/dev-python/jmespath/Manifest
+++ b/dev-python/jmespath/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST jmespath-0.5.0.tar.gz 18175 SHA256 c3243fb93f914df1852cc3699115c87982009860290b60910c1b2715bec238c2 SHA512 7ea11fa1f011585065a53a8b5286bab0c2422b1c553e89f1c3d543c3018d7d532d44b021e2654a1cd32e4bfbc384897b35f35a30b9b7439e9834135428bc9647 WHIRLPOOL fd1aa83c7a224b7f9d8bea513e83fb2e3ee54656c8661a1b36b1db1c24b0c59ea3de9adaf64cf17d1dfeffd333aa8895dd3ce8f8ec9e6f53e4260ec283d1da51
 EBUILD jmespath-0.5.0.ebuild 625 SHA256 e5436a7a5144c0cd10faf7bbba7bc8403396fb9bd588cf85e793fd7076eaf56d SHA512 54311282e6f8c0f5df6f4ed5865b9903cde4f96fc23f661e54bdafcbc7c81cd132563f579f82d6d607cc3f7f86f2595b5ba49b1afb0da01aaa4edf9ecd7f9f3a WHIRLPOOL 3a2953493d0a533e9c0199b9aee549283e27614f634ea48271f24a5c6bd32322c26c0b9ba79bc181922da618218a461653d0fa87deb89da116fe4878db91c173
-MISC ChangeLog 462 SHA256 044906c321f9ab7131aa1f4946b69216639147e0e69859e284a71bb3d526ce0e SHA512 4631d803937a60b9c95aad8b6715b842efe5aa703a94aee2fd914c2899ed1d8afdae5e076926b3351d1343cfebeec4e8518cfec313d5ab6f32db97aef0596e1b WHIRLPOOL ae6f40f892f0f34be604541fd4afb25cf00f28df4a7f25e496ea481e36799d46ee68d3adc82209d42c23af9ec4529806acd2a49fb19d6ed329cf014d5e0aa485
-MISC metadata.xml 323 SHA256 b99d903ea0c882a2b61bd15ca6ba706fbe995f581303f1219d2ce2d6e66d477e SHA512 1551dce8fd4c9618817abc9e1a3b98ba18bf9ca2c12ccf49a45753cb2662075e1c92ee68822802278c877f5bf1c275a50bf7a335e8884b30a6fa215c370dd4d1 WHIRLPOOL 6381c79b274d224bfeb0a75f6aed003103035bf335114a3dfadc051bf37c08b1d642dea25fcb7da9aae738a98df778545aacbfb0dea4e62fd074d63870a5ca4f
+MISC ChangeLog 563 SHA256 7775b6ecb4c5633ea3c477ebef730b02dc52308252ac58ec1c403e14f0627ed4 SHA512 c91e2a885604163e40a34cb389daba90a39f8a8705eb9103527e9f2d7c80d34257db9128bbba7a0380be2d8e0f2bd6e157bb989cec824eecd36dae090e8f92ff WHIRLPOOL e4255aff37ab305962cc06ce7184110bc9e8d6cff406d10db9e0a8520b78eef506769bf3bb437519781281f6df481cc04d5aa4a414423ce8a1bc073688d3251e
+MISC metadata.xml 416 SHA256 10ac701798815969ae0c7e1581eeef6d6b0a2a8f7f73eb3a9d75394fa7a25ba3 SHA512 ce3ba46c3c56ddb782aec177b07b79512547c04e74f87540ac3d2f3c14c51098838b457ff0bc826b7272452eb456657bf00f310d283578953952e7aee891e343 WHIRLPOOL fa6de63aa6aee0ba413ad08e1b0513ba4949422fe1f267295de6e5ccf572078b7fad109a657764980d0403ec739e7c60aa20b0dba1a2af74014c8985612b21cd
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlT6KXMACgkQCaWpQKGI+9R0nwCeIQIoU1TKO1owsijzaB5N9wCF
-4qwAn0IEVFtr7/YAHXywxSnbG7nbp8uR
-=5nNG
+iQJ8BAEBCgBmBQJVb1oSXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmifRUP+gOfAf6uu5Py9S5Dqg6KNcOX
+5xF6cepAF7KBNmJwVj/7CCep6+gH6DBiiD67sC3MugRW7TDDQrelAjcBVZMzU/bi
+4rtbn2L8jKzI27k5dmRPtjeYEgH7X51MOVlLhmFoxoul94wP7RrOxJNSuObEPzdN
+ArAotMq6Jv0ZT5s9MJ6BxIl64LgDzjPgHCir8Ys09xcimYOgFLUQMtfbuQkB7F2D
+qQaih/cgjPzO4eAgQmB3s27MaiMqKlERmRa6WFFCflPy6hQqC4CaIHg2FYU/Jpfo
+Rl5Py830ekyp2InpiIZ77nTZwiZD1kUe5nDKs3PRQQEzfhkz6V1ywEgF4Qn6ImhO
+0/ikGLZjf1D65z5qclhPYZ/zgjLaRv6t5OKQzedFOJY+V6liIQwjjuanmlbkxRi+
+H4NuZIDnFF1GXG+wXOHm7175nIbVET4XM+Qy1/VFwi1yIDeH0V8Dht6qrHw06Zde
+KkCoCaS2Qtg2RFEucLJUHm03hWKCUl1UpQTyRJV0i2us0LD19MEZPfiMBzI1nRiY
+RDvzkypkv60gVJP2DNeXGGJZhREzBKGDo50YN6kgxa42fKxlGtPMD+Hwwco1Xt9k
+gsrbnz2s0tzWVcXKsayL1RVRsvmHs5hEMTmIzw7+Onlw8juhbLQ5s/8ji+UWj66v
+x87GHrhc0VfFf21d1r0Z
+=ne54
 -----END PGP SIGNATURE-----
diff --git a/dev-python/jmespath/metadata.xml b/dev-python/jmespath/metadata.xml
index 0f23a8b5866f..94d415436cc1 100644
--- a/dev-python/jmespath/metadata.xml
+++ b/dev-python/jmespath/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
-<maintainer>
-<email>aballier@gentoo.org</email>
-<name>Alexis Ballier</name>
-<description>Python team can take the package if they wish.</description>
-</maintainer>
+  <herd>python</herd>
+  <maintainer>
+    <email>aballier@gentoo.org</email>
+    <name>Alexis Ballier</name>
+    <description>Python team can take the package if they wish.</description>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">jmespath</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/jonpy/ChangeLog b/dev-python/jonpy/ChangeLog
index a19163a29f8b..0b1e5fc52b29 100644
--- a/dev-python/jonpy/ChangeLog
+++ b/dev-python/jonpy/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/jonpy
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/jonpy/ChangeLog,v 1.26 2015/04/08 08:05:07 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/jonpy/ChangeLog,v 1.27 2015/06/03 19:50:02 jlec Exp $
+
+  03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add pypi to remote-id in metadata.xml
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> jonpy-0.10-r1.ebuild,
   jonpy-0.11.ebuild:
diff --git a/dev-python/jonpy/Manifest b/dev-python/jonpy/Manifest
index 39598ee17a6e..09cb86d69398 100644
--- a/dev-python/jonpy/Manifest
+++ b/dev-python/jonpy/Manifest
@@ -1,28 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST jonpy-0.10.tar.gz 51672 SHA256 33f43845b6403a2596d89e2210ba043d73facd39937e04eb59d0b7ef683b9456 SHA512 2dcea6798e186a1bfd767f3a0b331ee5ca56e2c0df63b8ac1f3ac53c9906ca98387a0d47166c11057cee62dc669de0771eba6e72d59d5ecd0e88b2fcd5b70281 WHIRLPOOL 8a9e7334d31f822bab462cee321bb520922f070ca569588881ed741ebf0580967d2222f1caf521941a3db3bd8b801f825e485c11dd481a5c66975e293878666f
 DIST jonpy-0.11.tar.gz 51496 SHA256 983f0af78c6a4cdf843da8449a297681be358476764a06ccdd0cb838a6979a7c SHA512 9fa925259a5d56347b71845fc0ed00f16f4b411b350a08f0779f8f867fc34d0c6164cb0dc107410b6b88d1565fc504cabd102a0c7fcbb86e7163319a235d89ee WHIRLPOOL f3166d7cf06c64cde822baee35c15449eedf31b342a5eea5786eb5ee83645fcc6a93537ec0654e5d851ab9ab5880a17039eaa367708ee13df0d36208bc0cba86
 EBUILD jonpy-0.10-r1.ebuild 743 SHA256 e9d07bbf24118cad0e7d0a4db402edbe669297ae9fb4bf75f9de5526ce771c42 SHA512 a4dbaf092bceb5156457711e14edfb10a3bda63d8976e3c5e284dc29373658c4208ac719dd300c189b53016b585a2a6fa632d19bdd96bf117bb3a522ff765e1e WHIRLPOOL f0c9d844a5a9ef3cf41b9eab0bea8629a60f57c96cef906b9608dd4148096a1b240738c171e40514c64e1e9d1558c6568cd04ee11e11f0306fc0150811061ee0
 EBUILD jonpy-0.11.ebuild 719 SHA256 b1ce2f3f1dd2b3af682958ddd53e8a5543a7c4e21fb5a3eb1579981054169d20 SHA512 5e0c9b2e8c8390447b9429cdaeac6324378736becb66443332210397e0284be8ff93214380c8267784348ef331cd1251bc30fe3137190594b23afd15d3b5d6fa WHIRLPOOL 454d8563c61837c50715606bfb9e502f7576a245398bff2f581109f1580c98b1e9690ab1b215a7b1887df1615402cd8d3b76f6ddd2dc4ddf1a8fafb939497c13
-MISC ChangeLog 3129 SHA256 348290e7f80b35abd1fb8e581b0fcde2b3a36cce2c279b6c5d4449c4cd5d2e84 SHA512 dccc5bd22a3b705210ed25c29522c364120067daa9419ab411e894076384a204da5fcf1dd0db148f9e9e48fceaf04e1abcc4380435b9d0ac25c1b1531d46d968 WHIRLPOOL 893d7328bed1ca4871e80bbc3361a5f39997fe63b97e6737ced2fd1f815d7feb84878deedb34db0db58857b283822dae2d98abd2e9a2dc75108dc20c9a7fd1e1
-MISC metadata.xml 159 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4 SHA512 d5a29b9f6ecddfc368dc0f1f8919cd3c3d6ecf2c7a82bc8d4c0dd51b7aa15561ed0462acb8ae39bc84f97e706e82d9b4b06357494f164f1648219f604b473fbe WHIRLPOOL 36e19b63a1b307cc200e1d73499b7477f73799db3909e71b5a0916084728351c76d400f65e2c8b3f8fffb2c9ba54c0bd235f785b47414178d98f11d64a9420d7
+MISC ChangeLog 3229 SHA256 1718ca00f395ef3b65554113b3783d09656a81f935ee281ef35d06f5cb9aeac2 SHA512 ad2d401b68d9a566706a4eaa44f566b4ea3fc0f738bcf556efac90f2a580afd3935d01e80f492cac678d64c6fb37500474d0b376cacad78971614f87b0d4a5f0 WHIRLPOOL 68831569bb3ec45a91d68bfcfcc03c1054163181cecae846bebda83afa9dc271ac76307c49ed95ec489d3786ff2734b104e94346d7530fe98a3992b179046c5b
+MISC metadata.xml 233 SHA256 c5c925bbdb2c269252d10ec4e9d4644684b0bc0af6edc5c50c6caa0ccb1e81fa SHA512 1904e3a5ad259ccae74df84473f0a63055963b13f493f190808cf143ea7dbd2505fe97754a4cf786717351ecdebcac8132d4018921d82031979a2632a1d5b8d5 WHIRLPOOL 7580bd192cbb85adcde5f6209b14a7a854e79706d2b52fb36d15fa1b0cc070bd3bf00c0e047925648c158ea7084e7c4b383448e4d29bfdb10713f1f236a0c524
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVJOJ1XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOZ5YQALWNmUvUn5NzQaj82qa50Jiy
-r9o47gf0DGwH1knxDoyI0Qq+uLR5EBwDXmstnbzRPMjxbARTKtFVTddD5s6ttbdX
-vGEVSnSRp+p10XsHyKNTIwRb0QKq4IISt2C2uB/952h6MbYZ3ikpvWiyMTnHBbeo
-pPXcxKkhyE7aJS/TK8/CLo289xRnK28CZAf/4X95WTPOnaEjT+QaHoCa9PbBELc5
-XeYp4qheQ1n6WuEKqQ79WCQE2a98R7bSozOloOitcE7Lk6hlCLW8QB/k2EB7I+Xk
-ANq9h7Vk9wtWbCSn/1B/Jb32i61NBSEdox+K03s/Nh0ZwoCwiESNtWGmLqNYaKbC
-UNtWP4wB3EoIE6HO8P/PRD3uaJ7+iK/hfGkJb3FOvaenbHt9cQvMi3fv0VCgmLz+
-txwm5nX/46XzNArHm4igVNCgaj1NqFERorDU1+sX224k1DapeI3BiTEDuc+ObWLj
-Z6+DD39tfRYJK1/F9kPyBf8sONw3lfHS3ogNaecjxkl6iI+a/T1ApXNPrA3fOPOY
-tbi/WAbE/tJ7P2ZFPBjAbguM55r1eM2AKLd81RTlmLyC+0+rp4x2jsaJj96kSaX8
-C6BSCT0qB4OlizqeQXpUChnRt9rO11QHg++vigVGytfl9UQC3Bq62MuB9KZiCEq/
-wCiklZrmUTDcE0aLS09p
-=dbmL
+iQJ8BAEBCgBmBQJVb1puXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiChwP/RX/ckuvEAneT6Csh0darFYW
+J+yLzZI4kokYSMlCk8Xp/3XoKwioHHzwMd7mgmsuotkp6MvYJXTvm9FtrgrefdjG
+86gKgR/wI/8vpEh1JbYwOHlMa1bbEXypkB3F3Tq1v4J2WoU8rspSJMPJYwwaBU/n
+J9l+dD22800l76ZRMpGVnr/1s/Rc07WJOjfO1BMZNgmE/R7zCRAUWnC9c/s5zn+Y
+RgU+9LIb3X6QYEzYMbg4mhYMppS7kePOBXPQQxF4xv8AF7Rlf78pvoA3JMEW/Tqn
+ZbooHbOsmqYc//DsFGrd0ntLvAvCj41okkeueMFFmrxMHf982EA4r+8cFfiST1S5
+oG+x01xo0vXsCnUUZtnDtxy/QqqnVAI45v/YbTvtLY/watyKyvhICPEVg5o5HxZk
+pfMJhHp/mUG8pUs0E9z1Gnt4Mm6Qax2zTdpVzNXzbKfSqhr9knZ6VdpDeKiux+3X
+y2nr9pMdSlm2xou7Qlb6wsQUCDMxot0mAiqmX+G83YLA0qfDZwaUYdBJXTduFHX8
+CdZmkhQXaVizde2YlZBJG81MuVuOckMN+mAaEQabM9v4Wqa+quT2x/gkPeruoDQS
+G2BVW2oIFtTxQLMMn3ZT3UBtMoA0WJlIuPUlCRgQo87i09N5OXrflJEUHpJupJzC
+tACBZhRQjs3tSR/0e5b9
+=3gzd
 -----END PGP SIGNATURE-----
diff --git a/dev-python/jonpy/metadata.xml b/dev-python/jonpy/metadata.xml
index de483c53568f..42e1741985c7 100644
--- a/dev-python/jonpy/metadata.xml
+++ b/dev-python/jonpy/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="pypi">jonpy</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/jsmin/ChangeLog b/dev-python/jsmin/ChangeLog
index 2b05ced9f44f..6c6f8103878a 100644
--- a/dev-python/jsmin/ChangeLog
+++ b/dev-python/jsmin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/jsmin
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/jsmin/ChangeLog,v 1.7 2015/04/08 08:05:17 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/jsmin/ChangeLog,v 1.8 2015/06/03 19:49:58 jlec Exp $
+
+  03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add pypi to remote-id in metadata.xml
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> jsmin-2.0.3.ebuild,
   jsmin-2.0.9.ebuild:
diff --git a/dev-python/jsmin/Manifest b/dev-python/jsmin/Manifest
index 6e5fc0b89d3d..1277b8433274 100644
--- a/dev-python/jsmin/Manifest
+++ b/dev-python/jsmin/Manifest
@@ -1,28 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST jsmin-2.0.3.tar.gz 5715 SHA256 3e350a84896faecdbd4aaa3a8ffbb3523eb2c94ee1258c8ccbbdb0d9480a6953 SHA512 a448de8f3b6435487e8daa8bd2a5a34406060afde4b4536f4861a029d4bd1d06c15ab8a4e230a82d2e66c9b9b3de9b2225a562d13f7f84888d501ff54fbb840a WHIRLPOOL 9d62a4ad3d853f58c278b8576100cd1c80bcf680a651f00b923eae82638b53362bd53bd2bc9782dc37805b7ca9c7257015a58a016c0ee2506d808f93e0c9963b
 DIST jsmin-2.0.9.tar.gz 7898 SHA256 04b6b05dd05b3ec27066f4274ed94e65f2f092017ee9c376a01f83de0d376dab SHA512 01478173a44ba1372a6f294f0e8b1744cce21216d8da36285735a87743c48f14415a3ac41b124aa5ca0ebc07594361d458989c1930a1cbf9c3894a594f7f9261 WHIRLPOOL 47cd4ad6b7f54f497f062b0dca16c39760e69cd3f06bde693486988d2b8744221461d588ff9ca472a4c68823aa820c7d21f4ef43aad96b1ec6605473759bac8a
 EBUILD jsmin-2.0.3.ebuild 639 SHA256 3b0e749c3d64306d8b10bba8ad4f3cfcc1c2bd362e39b4329d8e9ecc171a9003 SHA512 2d95bd6429ee4cf9ef8e33a8bdcf4e93ac8d2c4d07416748339e864572f1c7fefe0e8793e0b9485878da87f5d6fc7df6e01aa08b830db85de6bfc2ddea7965ef WHIRLPOOL 674dfa4cc3b56429b710d7e35469c3130b8f36ab79127c184341c36abfc1f52bce81ed38438ef34160f92d3fe65ec8f699a247d9c1776d842e56a41687018406
 EBUILD jsmin-2.0.9.ebuild 659 SHA256 afa2231655296fcc05753c844812127a8180ada501ed59c1b6ebe4be3fb528ef SHA512 92ab4db62a9106cee0e2395b837daca600070d03b4014f6c2988893bed9ae64157eee8e742cecdf232ad578b41fc8153b818201b7b87cfff50a43ccd45486191 WHIRLPOOL 388e774137a54de0a0fe72ee3e2b009ae4491c94fa673fbe0131f8c9f5b4129be2fad24cf72eafed05458bfb4e26a7fa4c836096f722b9dedc3c95033b4d4648
-MISC ChangeLog 1050 SHA256 ffd88c4ced414f6e2b2224ad73fd440fdac9a9b2e00a1f2d20c3ab804ec9c701 SHA512 10c9544293c419a90a3fdcd19aa9ea9454ca0f43c9802e8a98631e86b50b6a92c660bc2b3e6c02a47a996a17fc1c42f01d2997556fe173bef243ec0831752635 WHIRLPOOL d6088c783db7f343d95b926f6de9711635effc7606a2a11d9ee49ad574a7fa04d9150fbbf227beff1bc897db63d3bc91604bf61e1ec017903c5f56b190b707bf
-MISC metadata.xml 167 SHA256 a96c7a7081b1a192fc4758c24f63e3f458ce37c90ef5594005e91e01a5daf934 SHA512 05f506754bd3182ba88befefe0609d354f9ee335bea2d866f30719b292ebae30dbe64d6c68ff1a918bfd380bd638146b30754d072229491e8ed6f9d6745510c9 WHIRLPOOL 59ac07478ebcd8bb8b5edba5af0041df85949cf69083c3aae6945e371e6b79c6c92e2bd21189b2d8a87de72c9a4cd299e0773ff73332e247f95b8e850a76d054
+MISC ChangeLog 1150 SHA256 55d69fb675fa727c6724304177dc9c0c6055bef530484d9ed5bb571663d98ee4 SHA512 d3bd30c3467bf21a829c8cc7ed8266b49fd3da3d52d851f67d7a6fd57b1c53cc2de926b36b3b5c924d813a3a77ecdcf51e9bbd28d1c9bf15c7fcef6f57579062 WHIRLPOOL 9ad1fcf337e2d9002f080136e071a3637e87c3aa73ba53e713b01af1a312cccc03fd25d0e3335fbcf0ad53966ce4e113311e1c1ceff78fec125d9273b472fd22
+MISC metadata.xml 233 SHA256 b0aeea1a724f1fb8cd509f5d4e17a63d8370ea11be2d203797385c397e07bce7 SHA512 dd11aa4381fc6fb56e011b597a92586c02760ed3da5df2e97d6471f77780bba884ff8a96cfd9541af21b176c2b791d85397421c89ecc4f8d6e7081abee104ae1 WHIRLPOOL 2621d9f5d38cb269bdbb893a5e4967a0fbd63c12ffb104507fdb403d764db95dde2e4e5bdfd4abc306cc7139ce88ca3a981235112b0db6cae2fd693a6c188cfa
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVJOJ2XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOXikQAMqX3OrypPCGC+0Urlu9YOMZ
-SyfSLDXNw7A0z3zNfmtezm5QK4w2MJmwCKqiI98/qn1pFF2IIqbn2Czx75NbSPde
-ekJ17ViEH7PZEFzML6XANihvL2sQALIOM95UQCrb6GxMYFpV6dhUYKwoRlA/iHQ9
-Hs8EaR9cSsXuozbomASTzOCVDRuF99Y5vUORybzBR3wMho7ollbnR1h0t+r2uDdR
-a5Jj16l2tyF1YR5ecj1Ssjl1lHbAhvfAHKCnnvH8qidOMkiIK7etbgLAkw4N0xaE
-tsBsiuecJIm4Tqm481t447l/G3P/3fcZN2Sr2rr/lDt/XcqgPyf/4/y0puoL0xU2
-VF3Ulvr71ofM6UhUm92+1IIRgDtCXLBrjVqRV5a4uW3IVPHh+uh9YOu6KBAkIrQm
-u/fKI/nEQX8NihGIxLGhkspjO9yfGTRJijUlL2B9rQmZmrch/Tp4pLvm65Hz1AiU
-pbZXvSZO8cxJxro98BKZ53EOzIcJ5UuRy6r0GiXTtUtQIMwmK+PsPKqCx57pSWnF
-V7k3QwnLfc1aDVL/uZfSe77CQ1z0OnDfQLNk/bqsZ/bzY/LGn6yBUafwFCgjpsbO
-k+E8Nf0hKN7IxpaiY5m/RcVVIYuB6qyz+McpXGL3y6+WCmhWxTI62ecQ2uL1mg8y
-kA73QDxVGa3skwXD4cgD
-=0THy
+iQJ8BAEBCgBmBQJVb1pnXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmidE0P/0BFkAfErla9YZj0BoGzm/Tc
+BWti70JgG+dZcZyoyPVAYphUupNdVy00ViDdgsmHoWWCGWdhTNNF4kp6hKyXCzkK
+vPp43jLxlnzhmFx/zxTVLua6mo7v79pABjqsL9pC/r49TP1iwkUlt4QVrsBYqYIa
+/FtJrNONWxcEtZW/7Ecxzj3v4e02ZUR3sMtXNE2ON6g9oeQ3OblLaCBZkShYrUhZ
+BaB6Z+EveCAnTuJ1cgRauFEA/g55EXSXG7F9ac/RWolVYUlcvpp+8hX3Q36dA3S2
+IKV6jY6pmji+fP03U5xEUUncxAoFLz+bWMpUmL4KhkIucaDM6IrZDNSG/3cTP17Z
+QdjOcdF3tZtOCoLARJh2oOSITGM2wi0KI3yrvq/ohgsRl8RZ/OykyvnRKpbyFJbR
+mtUhulqe8DEpz2KfP3NDC6o859HdlvXazmMXKcstYllUXAImr+wCAixeTSmvYHcx
+KdY9gwfI5hFAzqv1zQaruRnHqXBmSZTogOGNP6aZsTj6+rG9qBd1sphdbSWrwZIx
+i88cdG2QJAetELj1CxCB9UuH6h5JbSpkCyLC/45NIpOCMOhm3YAdshupPaz4lKye
+zfJoKHm8DiCrYYhKfanwWH4LCMctpTezAn4HxDPUVvxn0sFtwzJ4IdWkTa5oAYR5
+lMBMtNbJGPNrmE4CVnjo
+=c/TP
 -----END PGP SIGNATURE-----
diff --git a/dev-python/jsmin/metadata.xml b/dev-python/jsmin/metadata.xml
index 0645cd9ff8f3..405a826aa785 100644
--- a/dev-python/jsmin/metadata.xml
+++ b/dev-python/jsmin/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="pypi">jsmin</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/json-rpc/ChangeLog b/dev-python/json-rpc/ChangeLog
index cc401ec03b26..e67ac0322a91 100644
--- a/dev-python/json-rpc/ChangeLog
+++ b/dev-python/json-rpc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/json-rpc
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/json-rpc/ChangeLog,v 1.4 2015/03/25 08:21:56 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/json-rpc/ChangeLog,v 1.5 2015/06/03 19:50:48 jlec Exp $
+
+  03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add pypi to remote-id in metadata.xml
 
   25 Mar 2015; Michał Górny <mgorny@gentoo.org> json-rpc-1.6.0.ebuild,
   json-rpc-1.7.0.ebuild:
diff --git a/dev-python/json-rpc/Manifest b/dev-python/json-rpc/Manifest
index 757ee0589fcc..50fcc17dd5e1 100644
--- a/dev-python/json-rpc/Manifest
+++ b/dev-python/json-rpc/Manifest
@@ -1,28 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST json-rpc-1.6.0.tar.gz 19919 SHA256 45eaf6c27f6e5265d7639f7c92bbeed10728ec507942f21e38610f63ed74be8f SHA512 8b2b906962aede9b7257b6919f71be6cc7ea43cb1d76cf2f6d4950da5c992bde81a32e784b02f1ce672c800762b4e03c7f0fc72a19b801902a77a387a910f961 WHIRLPOOL 37e40c67042340e0f33b4e6d1f66ae24b89cf05b351cded3fb5c184e0d5d9e9e90121c0e3077a7c8ca21408ea8312cd4be50d9d149f2f5d733a5b4c0b8349ef2
 DIST json-rpc-1.7.0.tar.gz 21699 SHA256 9961113fc66bb4e34abd4fa6e8eb2086d14aee88c789e00a023751b5c84dd34b SHA512 f89ae1c2da9f0fa3e3a6552ea89a13ef1806b1a5d4d03ab7c420a1648dde6980af6743a5c70d500224ad5d0d8a5aa6b74ad7de43ea3aeefb1cba0e5dc6cc5fa4 WHIRLPOOL 02bd37b82b6259b9b8fb513615499b1105a0cbbea8b4e6e37800560b6114beb237efa397bf6f50312a26e500eedd0ddc89bf798162742788200f51a563a713ab
 EBUILD json-rpc-1.6.0.ebuild 679 SHA256 c78d4ed528ff0ac13bda49426de9b5c32fbf20a73f6edf56f1cecc3cceca054a SHA512 1a9b76d99cc6ba76d309ef5238df18e710726bf9be7ad033020f786280b619a16bdc905dd0f47e02920cf466c25e5bce4ac63e1cc179d580b37a33d82a655d9c WHIRLPOOL 275c4e6027c3b0e84d836c3fe365bcdadf9bef31483c9c02d819c2762dac978f5ebc045071b59c9c173c40aed4331b45fd96f8dab76deb1889e9d19aa03f1ce7
 EBUILD json-rpc-1.7.0.ebuild 678 SHA256 1c43a304b3ef27ce5f0ab94640b5322ea5612c8b0aa98844bff1cd9adbe57c45 SHA512 5eb752b528d8ec625b8d0f5c8872220e5ed723ba6b41657c34adc7ac6188b74b0205676959e54188e903b8967f27ddc10aa3e02ae23a0321f7ede218e3b625ea WHIRLPOOL 7cd7a2ac06a0f8f962e814f5edd56b90066051928b2f6b1459ca09b14c4dcee2053c6c96ce2e0a956a4e05405f96c4ef78638c351e22f02e7a9c86e47c0a7c6d
-MISC ChangeLog 745 SHA256 7afb177460f46f7f5078e5a5a6f68c67ef73f0dfaf743c938b29d27fbbf94928 SHA512 5e50c9d157748d87b4a0aad6739e37529ebfc79008eae76aaf7e4b3f34e1b1390c2a4b8fe10c853eece53e99e889594c0b712737aa8a795d0c8284591bc999e5 WHIRLPOOL 80138cd072fb192ab708d433de4954a8262d927839537825ebac7e64c9ef3453a8e03b51d742baac275e10af0ecc4367ce47fb97d697dbe768aaaec32b32dcd2
-MISC metadata.xml 585 SHA256 43481fd1357d2fa9790c396b7a8eb727a42f18292f532f25a5fa11b3f970cf10 SHA512 d9464260fb5ac3e96ddace6858495ac9562f7396e31344284b782f93ddb88e25786385f5b6db0f390144d37d330f4ed2f651f3efc5eff0720c648c4cf2f0e059 WHIRLPOOL f2935e382dcf4894d2d7b8038124d54577bfb50783924068dc79bd8b29639662f39f3a7cf9a52fae1d0731800e6dd69a5f225e351b8a27ffc68d3202c0f34c54
+MISC ChangeLog 845 SHA256 28a493fc17faf65dc21dc08a8d9f7bda7b9e5e11d0c526e2b54e60aa9d38babf SHA512 de149f3a2dc70c6fed071468f1ecc8133dbc855e579286d9fa0eae7c599ba0c7fe578b586d464c89319604125b829e3c58b3da11e7e16e52cc34589b444153f8 WHIRLPOOL 402d58505a759753fc75bbef3d9848c55f175a1214fb270b42376f7ac02fd5bc5ab966738d8c120e67fda8780d5be1d10ac24c3fe7c43bbd8f9bf3a69731e351
+MISC metadata.xml 663 SHA256 6e51d556c753976d3e12bbb2a226aab2a23991a58cac444228ffcb0dd79a4dc3 SHA512 bdf2402f7ce9188d4fd8041735c513f1ad5a81c8f6d72b0efec912eda87e59b677d390c60644352162a449fd66fa2f62b9bf400056537e462bdbc269e44e72d8 WHIRLPOOL e2feee6acaab9be5e0d5a8027f89e219e96cf7a52475fcc61d3c7be560883c7d41fcdf2a0094ba89ec828b93fa3cbb5fdf211aa06626ccd35b60d1f6c71ab011
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVEnAmXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO2ZIQAMeqAcqan785rBJwzamcStVQ
-4xg/HdHnkn1O3MoKjnlh7tTYSvEyCN3vpoH6Z7CwfyjiWvNv6yDYbjj+VNqpzvrQ
-Dpyk+K8E03p51AP9WBxxD7SvPHbbf0+VR7qyPYFTFPMLeJZ/uMxIgky0WE2bsLH6
-bntRmJE+RM43HWOcWkPbNGyGQX1cwIPZSvN482N0qlOsV/Tf3yTn1zBT58o8T5NM
-wWYPHMBoCTBwZIsdwndKpy+TQmBN7hCpOkkHxnxrXbaNxbSChjQwTZYrd9OWFo3j
-5Cv7oi1qjXK4VcVxH0QRRYEIHfdsXIXW6z1h1G0+Ia0wn0sSD3xmp66k/tuUyHHt
-u30F/Zwn5eEaWDAB5Jx3Gqny/Q0MPOK5x9eFlUQOuuNuxgjkyx3HrJXlFtECmn/K
-V+PkrQs3ulrcC540W/m55LwKFWM+PX2Rxu14UwoZma71IBfJpXSDe1Wyf81PTULE
-ySotf9T+UOKLL6tIBaUngcBT5XlQdXtNF1xVnkHo9tsp9WFLyKVQmIdwEofaIUjD
-nMCoy/d80qjlfbaAI13minE3cotRygmR+6lx0e7Gj9Hy2Ys288mvOLMX2l+W0nao
-+MQwmrxwIzadkMxeaGBj5s9PGV2Idc9RIzgG47hG1FxoAla049u1Zc6P8Fn99Yg0
-TXNU1uz7vfBleE5NmB0S
-=BaMw
+iQJ8BAEBCgBmBQJVb1qZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiiOEQAJF4PRaaWJiDP1k5XD91pO2c
+L6ecbna5BTVsagRpAfPRjQAL5sPWG31UHrCUEcoXYhxVj0dBQDKS7Pq+Jz/ZHRRF
+H4UHXmju3QXmOEecWxjiw0OU3WB+Qw3nYm5SWJfMtdAckfxoOAN8BK8uOSipp+nr
+PNub7sJmT4cOdGayQrInirMQWmHg8aRqpxEgdCWDGKwwfpmNd/hamIoYfjLMhgZQ
+Q5grq/J9Wdzjs3ClGowIzuicuA8RRZqCGRNd3Vma5WqBd1hgjWNGtT8hu+kz5viD
+7VTULxv7h1eOrT6OwulsDbVrXeHgYx56Ij32N2xqM+ecDMpjpxuS5H94VqcmZpJ4
+mKHmsDgHKU2JApC8YBheJGzXFm0JKyVf63mU7NkDvINy5hZo96dDCnZbwgAANkBJ
+GBYAfdDdbIjdbREgIExHETlGnxBUWCNaKUvKL+wO8e3erMlSlLsFlghw21ATgZUI
+hMe/OWCCQ+9Ld/rNnyQ7eV1O5cT8bzy1Rl0jZjFGGq48hcHEqpvGkOglN1OlkIWH
+FZPj0e3DSQRzIPbFvGRsoUJC6sfldk4iG/x4+5CS828f4qnI9Rb2M78m8LMLZXLe
+NuzZshhVBBk9qPskOe0GSxsNdUmCiLlYyY+4VQB6L+qHKlqmoeGPY6tsmRre7dNr
+R5AhNjnwXpSHeRmF38g0
+=7f2f
 -----END PGP SIGNATURE-----
diff --git a/dev-python/json-rpc/metadata.xml b/dev-python/json-rpc/metadata.xml
index 7689ba1208a6..0d7f80e8b2a8 100644
--- a/dev-python/json-rpc/metadata.xml
+++ b/dev-python/json-rpc/metadata.xml
@@ -1,13 +1,15 @@
 <?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">
 	JSON-RPC is a stateless, light-weight remote procedure call (RPC) protocol.
 	Primarily this specification defines several data structures and the rules
 	around their processing. It is transport agnostic in that the concepts can
 	be used within the same process, over sockets, over http, or in many various
 	message passing environments. It uses JSON (RFC 4627) as data format.
 </longdescription>
+  <upstream>
+    <remote-id type="pypi">json-rpc</remote-id>
+  </upstream>
 </pkgmetadata>
-
diff --git a/dev-python/jsonfield/ChangeLog b/dev-python/jsonfield/ChangeLog
index ba28c23426ca..a56b6be4f9cc 100644
--- a/dev-python/jsonfield/ChangeLog
+++ b/dev-python/jsonfield/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/jsonfield
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/jsonfield/ChangeLog,v 1.1 2015/02/24 07:24:16 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/jsonfield/ChangeLog,v 1.2 2015/06/03 19:50:17 jlec Exp $
+
+  03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add pypi to remote-id in metadata.xml
 
 *jsonfield-1.0.3 (24 Feb 2015)
 
diff --git a/dev-python/jsonfield/Manifest b/dev-python/jsonfield/Manifest
index 35a25f280d71..4e256661bf03 100644
--- a/dev-python/jsonfield/Manifest
+++ b/dev-python/jsonfield/Manifest
@@ -3,24 +3,24 @@ Hash: SHA512
 
 DIST jsonfield-1.0.3.tar.gz 7950 SHA256 7e7f73a675c518712badd783279e26d164140f3fc2ed7a32102c3d08a6a2a4a7 SHA512 b69b783266f593d40b588f8deb42828b36fe31f62aba0a80286a24fd788bbea543c74b0566a70fb336fb80105f488a16932bab417a01d3730fa89201f542deb0 WHIRLPOOL 456205636a57171ab952172233204e249b786138d2afc2be60e603399d6802122d19acdcad3fa2cb5df981368144b610668b12e14f9e51fff0994ce8e7e2c661
 EBUILD jsonfield-1.0.3.ebuild 721 SHA256 a121714d1208dc222216c61c0446c83d758e817cf57d758c7c0736994caf0a97 SHA512 7372b88ee9d264bc8591f9e32f5cbb9eae5cc41e465ce6c710043090a6b385c71d43e7597953f4e9c26b1a4574b23ccc27219189b33b80b9e21670d5c11220be WHIRLPOOL 451c1b91d4c670b711d8c9098bdade9afa8ee19ea79bbf1b29783bfc9bada1d6129174c9334eeca9109aba107c1a3e5cf84970b19db79d5b7e524518b28f1972
-MISC ChangeLog 361 SHA256 1a95d1234d2874f105f1754d68e8ff98fa291254576a00d4b95151d19f7d9342 SHA512 b666e1740a65304b73a00b1b8dc7128ab72bff65b085866ae106bb4735b7fa47c6be54c3f3376a133d40f542acb0d670372951e576ad674f9d142d8c4d94f63b WHIRLPOOL 05c9cf7ad013c6b9c0d748e8c244aedaacf1e36e2fb0b5d3eee2d27ca4ea07bc6c2ac878856fb38991e4e0a5d04ecf71fcdf56bf588c367eda95efd818c81f62
-MISC metadata.xml 236 SHA256 feedd499ae6ddebc364ebb0f38d08bfbcc6b5d499f805a307a9367fb82dd12e8 SHA512 02882c2ecdf4fe400bf3e4455df1feae173e12b6fbb09181ea50541bb9dbf43780a0ab00fa799ccf5b7f2c27dcf9d854e16146cfb336ff3270a7b4369e451860 WHIRLPOOL b6580a9428931142ea961e985e6b5c736ab716eefb85706692c780c11f97d6019be488493c2e2a51b7ae8b480be80276edddb2858fe19684d48df64433475e06
+MISC ChangeLog 463 SHA256 dac2d8504fe5d5eb2db0bc8507c74f6579533dcf2c36e206d09fe160b70583f7 SHA512 da3caf8075565c5dd407669497fc87cfa96cd7b9fcd726677502b9b514fb8b843cf43572db3800cbafe58adc6e7e2710cd1c6c9dbc6ef83b4c98ad990c8213af WHIRLPOOL f9f4f9b9c365437d84c3ad6fff1fc73b7cc776f0cc792a732480376a455a1f9a999885e3e23acd0f1b2edef884eb366b93d723c3443768092ea1edad8e68581a
+MISC metadata.xml 312 SHA256 805fd8bbe0fb4f2c1c85633592f40070b508cbb9989d4abca71d911b71c4bd71 SHA512 0a87ce59b004ad33d742723e39207c8299f4f722edccf7068e8871c3f01f1655dbbb91aa19e21f4b200515e8358b29a089904cb66fa65fad6280fe9c909fe42c WHIRLPOOL d29b7fc8fab750f7365b48dbcb5a338263fb0f3b37d1bacc77cb651217003570d840848dc7bb9154d5f8f1c648ff0440cdeb563611caa6316f178e9143fe0dcb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJU7CchXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirD3sP/2cxtVS2B+OdYapdHsRUAgS1
-2j+s9cH2twyo+FT91aLXzHUYvPFU8cjNIIDi1Jg3v25xs9WX5mcYczMHip0P32Yw
-wiy1/o0R8vfvtZnnBk+ILJCzxlRzBqC3KmvZ7kR4TV5AUR72ArWGCmdhjXeR3Tji
-gLI480jsGRNaCLFRklq+HZWdGxU3m6mXp/5T5OH6xX7VpGgHFQ0W3QuI/B5vXWlJ
-ZoL/EYgFlBpTnsT0hEu57FTzRvGug47OVGHn6woB+wgxojKCpZgIRp16KTi8KFyG
-5AJyX7ikQSbuwVHtCzoHppjVLArNewts36PobkDTfFwBoZ20ApwPnUNg1iw4SWLb
-OqtIQBB/LKhkST9NIoz4R1oU4APYjKL95cgEDQOejTDST/f1rDHvQUZE7l7vwxMN
-BZyoGXNYJssG9J3JxXr2ROQZj+Mrl3wpao7KxxzhfTC+o+FiPf6nsT4iGPNT4dvR
-5D3ZRbG8HqRl87QcyA2PNGi1lY/zsOjX/4RCnmAXzb5Sen7KdGY1WBeeaxz1QKjk
-Fh2NiCefFIpEJMdtSSzjUm4mUhimhjjeFpIqWns0zBuRDy+EyXk8aXwjhREwSWQW
-gJBHnHiKF6AAi9kV7WEMkIpE9hjFPWx8hcoGFpsVCnoN6MwKvR+NVSiWCXe3RNqK
-AM1w4s04CZDl/1W7M2cW
-=hZjY
+iQJ8BAEBCgBmBQJVb1p6XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiEGIQALA/0qEIfchLQ+xJX2RVl6Eg
+rrpkkyjWAS4+4IWV0Ldh/whVNBi1B0NErAIfZt3TizTnExJu8LKxAVFV2dk1I+yo
+XQ2dt51dOJANXKfGPq4HdWniDhrMhQgbC8RS+kYO7A/6lyY5PDdmLWnsTzvSy9zx
+9HNBDwA6LV6lBh8bQfkIm42ZhU11FvXJTWXxEQH/eONE9+CEc3fxfMd/pUaO8uqx
+ahRHAzkk3nD/1FlVk+cL+AP76gIYgyZkLbFyz1uGj7lTFGGWq7rA3NoEmqpHjxlU
+5mtTXSgDT+nDni6rBpDmzZx1idjuKp1IaJRgL9arN1C3V+jD3BaQP85Y2ccLs2RN
+xA4Zt3lXkf/PZIOxhXZMhVR4rFxcdbNUbNBHzu34ig053pZZY+/n8nd5/VkB8hLc
+QM+PaKb8XPoyEy2cSBfFN2mnAQAOW1Hk8BLpGo8cfZFjyRf0uvEx9pjEizCfL8Sa
+/yupIy4QsSjrgHMnly8gGrWfaGEyz3y/laP8NiOW/L+qubaXpsG9EVwEOTn1iP41
+tjHAXn2QM7pWPdOcy6aszCJIRifl78psfOGC/itf0MnJqMYteh6zJWb/av5nWhal
+pviarWGnLzCDLV0I6UcYIgVrnElDWFHlPw6h0PzQDuZpBG+O0RlTstMw8VnfiW0+
+h7gp1A0mJvKFbIHkNvI6
+=el43
 -----END PGP SIGNATURE-----
diff --git a/dev-python/jsonfield/metadata.xml b/dev-python/jsonfield/metadata.xml
index 7bc6ee8ea837..dc071f1a558d 100644
--- a/dev-python/jsonfield/metadata.xml
+++ b/dev-python/jsonfield/metadata.xml
@@ -5,4 +5,7 @@
     <email>jlec@gentoo.org</email>
     <name>Justin Lecher</name>
   </maintainer>
+  <upstream>
+    <remote-id type="pypi">jsonfield</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/jsonschema/ChangeLog b/dev-python/jsonschema/ChangeLog
index 92f0caddc89f..562108af59ce 100644
--- a/dev-python/jsonschema/ChangeLog
+++ b/dev-python/jsonschema/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/jsonschema
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/jsonschema/ChangeLog,v 1.18 2015/04/08 08:04:54 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/jsonschema/ChangeLog,v 1.19 2015/06/03 19:51:08 jlec Exp $
+
+  03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add pypi to remote-id in metadata.xml
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> jsonschema-2.3.0.ebuild:
   Drop old Python implementations
diff --git a/dev-python/jsonschema/Manifest b/dev-python/jsonschema/Manifest
index 169f67a233f7..1d82bba1d683 100644
--- a/dev-python/jsonschema/Manifest
+++ b/dev-python/jsonschema/Manifest
@@ -1,28 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST jsonschema-2.3.0.tar.gz 43115 SHA256 a79dcee3769d7cf749836da840966a83cd2e33e361264e77b74df9490ffe5c89 SHA512 8c39c47c236904d3deb3893d43fd1a9332896e8a1883901ef6040607575250b0d661b010d94be6b0d52515b42e2c7924c93d352ca9b209cec54514e856d95c75 WHIRLPOOL 7f61838ac7173ac2d0dde16f83a864b8dcd82905d139c4de8d7b698ce022f1a63003ff45be53cf134a30747533cb034d2d5d944559a1b6990a37d8073b38d0ea
 DIST jsonschema-2.4.0.tar.gz 48293 SHA256 1298a2f1b2f4c4a7b921cccd159e4e42f6d7b0fb75c86c0cdecfc71f061833fa SHA512 111d60f6b490c016a69bed6b0b22cc6395c949d4510fdcb530757d6e61720cd2e1e3346293a5dd1b6501b262b36510ec08ab4ed76dc7484065e692e041232a93 WHIRLPOOL 1bcec6c3e09f72ad314db49e73d92f854e5f69c490e9ad46b4d0e31564392fb27bf387eec6d376237735396a7da989dcd601e33e2a43e35ed2559fc83b7ebf63
 EBUILD jsonschema-2.3.0.ebuild 788 SHA256 3c367efb2b3e6975cfb7f7a665bfe5e651a587c3d86899c812fad927552595e5 SHA512 0a6166ae60f4774d82e5034a47065134f8a2f95092ed29320c08c7502feaad9a29abd3b6159720141bba86e5c30dfc77dd67939b298573baa5ef92d04d2d9fdf WHIRLPOOL c880fc486ab55708055649ff8d54ee2e5c0ff6ccb05281f133eff7103bac5c38b266d6203f3aa0a679ed309525f2daa6d2e08444522f662fca304354cfd995e4
 EBUILD jsonschema-2.4.0.ebuild 650 SHA256 4ce092a5fe368d2c0ce9bb58a20aa2dbbd1b296c0901e722c5c8ab1a9d75e79e SHA512 1185de391f6bec78dce8eb593d6885a965a8a61e0f5d3a1db5393bab0f696f568dda92032be33e74c321cabce5c011b7fdbc5eafe7c47aa95e4d1181ada04499 WHIRLPOOL b1c5e774cb6ed64bb0260fd7ba637f2855c3952f6884901d65c05ebf6be6a29e4ddd7d7de63cef0801609f57389aeb6dd8d7b27fd4096c1de447eac92d5261b0
-MISC ChangeLog 2715 SHA256 35ce573bae63962f8ca76277bef8596fb6b953a6257edc4b084913156a3fff91 SHA512 d81bc4a41d980fc74d6b02a36cab5ffe9157d9724ad6b8aae96cc15c7c1fc6d04c0d2e427641c220d092eb9dc3bbb910b5fe335fa807e1c92a7c122a0fbf18da WHIRLPOOL e2207463e276203d5dbf446fdd3bb5a9b7b5ba9a098bb1fdd23b98e60c9b1d703f4a107d2bff55921dc162b3374294dde7465e42b357455a8feb8badc176f87b
-MISC metadata.xml 409 SHA256 d0e6040830c122c72c981c26a26a724b3683709834fef23b129419eb68a209f5 SHA512 f709bc27b8c2ad76f7b41a729761fea867fba470f8b47eb49a6490611da7d4327d60e8f602ba1f1950357370669bea557fe4b339110b5420db80a90c49a19c27 WHIRLPOOL f3e8f2624f66293787667d01f6d1f9833314a83928100e31fb403aba2380b3bfc44b47dce1eb336b07372bd8b7c3ee5e6c4f9a7e02c4e731d9930d03d013f17e
+MISC ChangeLog 2815 SHA256 1dcb4b69cf256ad054d461b67d7400352400dc0eea55d6392ae128004e5d89a5 SHA512 57d2113358c35dac60a4479644968b09a04bd05a9dba810f8f61fc6a92affa0c4806e36aaacec1237b5f223eb6332cd53319282eeb8c21d5b9c4fda40e06043e WHIRLPOOL b816754add96534ffee11c7de9ce15b1f9799ac868d15062f187561a7c1a186157846978c22fbf003f7af27bbe2569646cff093627a39d1ae51d820d7bb27f50
+MISC metadata.xml 486 SHA256 cc777afcae8f719b71272d8326594c90ed697583dde246f0072802a4e79961b5 SHA512 c17ca6620a665b760c635f17e3632f21c5506f6f9ed119c45bbc7b1869c41b1c85b8cbaea38d57de6a5a49a3fa00b5a451530a31218ef727753ea6ad47080154 WHIRLPOOL 0d04b9605e46cabe6d2ff965997664f42a8788012fed85b90b6ea25e1ab0b9c51ac3f639bce68f0981e4d92c7cefa844e3a495c9ecfc1645dcbfef1ad74bb30c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVJOJ2XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOUPMP/iSM8/ka/FvCctR0c9ws1G/a
-sLmIuI/8xUhtOcQgT33swk82wMParfETSMPCLvNL+7FnUBDabhPwmdwhYlV2KB7I
-toLj9SB66tQ3t9pIYDZNLWPiX4zauPA7dm4u3glriuuRFCcNmZOZrwqdpIuXf3m/
-BEriXyHmkqhIpeFp0ujQ2/Kv0cBU/DPKbKtmQvCFTNVULOSxUWS7YxZluZEIRNXO
-calSUoMM8DLW96vy+MATJooG7T35mqKOp1GWdsvPsHP+hkPdRwguqWNFdRozrphU
-czpPDPPnsENFspCXabBTZt2dwjnstSnPP00dFid3I6aGzldnjE2d1wdWXVoXDPzm
-NDFksmsjPdhBX79E/3xjYZ+XLMXw9H+AzTsNg2Wi0Bp7/H9k9ibuS5DI79DCaB4k
-SPamEyEC30AhEmKHYf/K3W9ZjO7WX+uCqYKwOeY8viUZXgjOIWRMskK+lAlGty/7
-QFCEuAu5T5m4N/MWSYOCOBJ7gRBlPZyJI9GWm030frgpfb5A8ZKklZVJGoZfoqTm
-H6SMELiyEMcGZDf++UCrv0ah/rYqvNQ1Kor4yEjQBJMVCc2njAHH97f9bhLACL9L
-8KpHn0txeDP/zdFez9jklOu8trUnDmZph9lLFQ8utxJfACZf7AXfJdNNt8ubLPG7
-AE95yMtxRVf1+2F+Ktrd
-=wnM0
+iQJ8BAEBCgBmBQJVb1qtXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiIHEP/iXI8ke96kE2UdnUvJS5AO9Q
+e3BsfcUZ88h7mRxMiE1PgxT2Y4NyA+4qp1nS8TvZjYcNuLj+hbU+dEK1teISFNxN
+OswgIw7QHoulwJLTHqU4Nh1wyk1CTf8g21TCshEpLIi6/FKG5I7tiYKRx6Xen7Y5
+jbKE1NXHd3NQ06D6Ll/ZofahLN3gdQKo7jxocc3FuWj3dbyXhIEbKF2nqnBF16Pl
+6nhrpAoKD9I6nuNvriQgjEZfidx9M72FHRhJAy/gAOcfmFAP5tf+vieEr+NOVt6f
+j1Ju7cdYRuZ2jZ3pL0VIyGn771g9W65IkLZwQMlrQ+XeBWOeX+9bwMkzXL7MSZ1x
+NSkAvrAisB5LFzX1lsBuCojOPOlfpK09V54w05aVblkd11KV6XWH5piMHKD4wVuu
+GgKiok6zXFkF8BLmeK4KrjwUzX/UEUQdnbhylvX/wc6QD88bOoLXIqBrul8XGrB9
+Ski0TfezaqJaUVVt0PXxunIM6/CQfx5Ike/v+J720QgwGykzZLAgKav5TTyJSY7c
+OogW83fnEXZjfGYSISHxc/oI4njG8+FbyV8+RNzWOpPEiWUryhjBwWoC5zbyUthp
+4SfNqTPRA8d58PvgBNXBsL3yYL2ILBKV7IW8/1UGVkQQm1tMwgTTajUiZZwKItYH
+NF1n69ntYHnV3JnIRBKt
+=vh89
 -----END PGP SIGNATURE-----
diff --git a/dev-python/jsonschema/metadata.xml b/dev-python/jsonschema/metadata.xml
index 4ba2afafe5e0..31179ec4c84f 100644
--- a/dev-python/jsonschema/metadata.xml
+++ b/dev-python/jsonschema/metadata.xml
@@ -9,4 +9,7 @@
 jsonschema is an implementation of JSON Schema (currently in Draft 3) for
 Python (supporting 2.6+ including Python 3).
 </longdescription>
+  <upstream>
+    <remote-id type="pypi">jsonschema</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/keepassx/ChangeLog b/dev-python/keepassx/ChangeLog
index d83798e3b6fc..41cc4365d16e 100644
--- a/dev-python/keepassx/ChangeLog
+++ b/dev-python/keepassx/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/keepassx
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/keepassx/ChangeLog,v 1.2 2015/05/26 12:16:16 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/keepassx/ChangeLog,v 1.3 2015/06/03 19:51:26 jlec Exp $
+
+  03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add pypi to remote-id in metadata.xml
 
   26 May 2015; Justin Lecher <jlec@gentoo.org> keepassx-0.0.3.ebuild:
   Use python_test; thanks mrueg noticing this
diff --git a/dev-python/keepassx/Manifest b/dev-python/keepassx/Manifest
index 2d278a52d916..3b4bd9d5f11a 100644
--- a/dev-python/keepassx/Manifest
+++ b/dev-python/keepassx/Manifest
@@ -3,24 +3,24 @@ Hash: SHA512
 
 DIST keepassx-0.0.3.tar.gz 15041 SHA256 d8cada98caf2aa77472de67efbec9818e5eb9c4e7a2d39a58ac02e5c2553c5ba SHA512 97ca5b00f8f565595ea78f43a152c752e7ae868ba15d8d3c48f3b75e56d266e28e99d1e61badec646f585bdeca42c49c0d2e19efd46bd79e9838d54293f5e784 WHIRLPOOL 89091f89248f0f4bb525e5dc47ccf228d401524968a76cf6605a790b86983ab9cbe0195dd4b067441975ebd9c58067ed4200f689bc3564427fc07d4620567797
 EBUILD keepassx-0.0.3.ebuild 874 SHA256 bfd9731be59d1c84bf1296d2abfbe35a5659b149ba5800e2602f449cf6534b50 SHA512 71f394b1eed62636ba2c8517fa7573ee0e877e6391a9240b58b6ee34e580de72a302a333c4782222cfcfd88db4206cde1824455da9e26cc809fca859735714ba WHIRLPOOL 28a27273af197ad57cc498c8a9a5910e67e7b5d001cdc866d053cb8183f857615d2dc186505a739a2bca12e058258c9e26de9bee41a0807c4dd2b3a1eedab574
-MISC ChangeLog 481 SHA256 3fefaa11e88b7ba1794f44dcae6cef1bba720ec76a153503c233896f3d0db44d SHA512 2de7b2234db386e20f4afdfabf11d82e5249a2c1b14b187999558790a796bc56be53631546546596b47ebf273201cb11ec7fd6f8829ffa8e09a40a11bd771a17 WHIRLPOOL 4fef3510d4e9d258ea9c32ebf78dbde6c741f3f579a184faf0bc30b808d8ea930fe01003735df7c5d1eaf2abacc7fe3bc3603838224d40e1219bad808d8278e5
-MISC metadata.xml 258 SHA256 f9120561eb5a0eb0be48e47772750941e1a206da5fda56321b45eb76fd145ba7 SHA512 adbf77e7b9f35851720e2f9ef564420d0d128c19fd2a72cd4c9f25e0261419d46c1f72c45fc7093a00eb15e551a14742f969157fb3356f8a60b3d31dee38c8c2 WHIRLPOOL 7811fe6099018241061d288dcc1333c7bad35703bb201f921041c7faeeacb03faf748f1d34699afe4e21b1a3f95149fafbbb18633548dfd344fbb736a3ddf495
+MISC ChangeLog 583 SHA256 7b0e0e46eead35b042471ce75f82f0fa3aeb8bad664417749ea86971499be218 SHA512 0f82405db235fafa4b4428f8e5fab051760a5185d6847fa0089420e2d7e8cc5f92894cc0cfc7d9c3ff66ec8b71164e03917eb427cc0a6eac8898912e1b2eaacb WHIRLPOOL cd03a14e317ad225c7a625487a1c2aaa8696053b41649381070c288817dd97367ea086262c3f6e9d4cb708532038179ef1390c7e7803dd6535306f6b2fdb702d
+MISC metadata.xml 333 SHA256 426f020906a3337addcfa7caad4c8a31b4e30dff6e64d211ea52bb530e9594ac SHA512 827cd595e3facf2851af15c998ed602afb8ee352ad0e4027cae6ed7554094b829f3a0b2cf116339f1e51e9ed22ec05ff692372a552326bc7b5c2fbd2025a381b WHIRLPOOL 7d3ae9cbce057f014d08e01c485bb06bd81d1466eb0a036fe1031bb7760a5dcb303d55efe8922165b213b27378f3b06b10b3670111ddcc78dcfc31437644fde4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVZGQRXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVb1q/XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiosgQAKpB2BY22jLTWfbwbOCJA/1y
-4gztrCuVG/2EYmXSTKMXl2de3doW30N4OrRco/lkKb2TSOTtStXgqhXF7dPQMagn
-QXBXPBq1m6h8n1VRp8wBLvvRElCfCAknY4OXNLUkt57q+7AyEXWgZWeZvpzocUJZ
-+D+U9I9U2qlGYjiKWs09nUf4SiIF6mrHEl4bOyvH5YwmoBx/9tVWm2DlhqxhlCZb
-dYvlHQfBGh2jGbc4IG3TZ80oLfNh9qQyj9YK65gZzxkjhqjcpScR4Ck34VnKOI5e
-hm8KRLAmmlWWF4hjUfW65jrCNMddHsdfUb6J2ALTW24Gst6NpxO5gOYi9HX6p3ZR
-w4QLnpKfydfe1kaBljeseUIVvfBEC1/bhkIzkg1honatTrmihSH+Jy/zyXOK7Go4
-akBR4pqYFlFVCXJdt8+OpWlcVy+VMOenZZ3Th6durHyIm+wLZ/FC+Jk6B9YcV+m1
-reborWxZ0D3UAd0RPmHjb5KYussjc864LzxyrVgBmXAxCqnloBqQGvIMHK10j2f+
-vldPsiBu6516Lh/i39XhIA3zxSIfjk1IJwyVbqu81IEqFWgYpIAZ5VlwkYgFVb/p
-8LxzpyQQKaQ3foExx0VhGR3KHL1BfFaBE23co5qNXxjYeqKaMQo8JNgm28zYxo5F
-mX7UAsM9212JQWYwXiwx
-=zStC
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi11UP/0CRI+530yUIqqdLZwlG9vuV
+AxcT5OfT6+N2E0MyM3iRx/rI5a6ZXRVAgRLvrOvHcI4vJvjK9Nm06WH4b9HC5P0A
+8AHGqkssTTszzdYzmzsKQCJ25nfaRjU02trj2HpNgPaGiY7veuMDKTYxkQZrAuBA
+exIs9wl2qk4ILOBJwhi8xKMtUpfXlebz5J4AOuPnfa1CLOm4fHl3jjHJUgMjvwlR
+SRWqDrQbIVQ0ScVvlJeLX1nY3GX0qpXvLOiiIE4kTejG17mtcHP5bixt7Q866tfr
+/FUkXuPnIa71ZOoKN/r+MRXh2KGL1mtflfvNgRF7VYnJJ6AfNb7eLyDd975uPX56
+alXzKsVyo+jnVt3McWEikiOessbMZD9lDJcKDCpatwb5BBkHaG9/zCs2PORgnoIB
+bD7dHRBfdilX+qZMS+0egVvaiHtkhSojneicEqYxZvt3jOqmzYoHMNAM5N+K6FEW
++9nvVao0zCSyW+3vD4cCuauLv1pXb+HaTf6HphIxdowCNechlboT8Jt02o17vJQX
+62pvBhEbC+CfHf1QsJK136D7li1CU/ZgpNztxZAAZ57HaX5tBt3y5BsHl8ZdUWFP
+CNUKnu0sTIbYkuXrPO6Wp9mtNVIVMKIt9It3ss9GZ6V2UD2EgrFnJDaz/AJAfmBb
+jNeU6WPT2SD1ipYgJ/0t
+=LFS6
 -----END PGP SIGNATURE-----
diff --git a/dev-python/keepassx/metadata.xml b/dev-python/keepassx/metadata.xml
index ce97c3a01b30..7ef7d2028164 100644
--- a/dev-python/keepassx/metadata.xml
+++ b/dev-python/keepassx/metadata.xml
@@ -6,4 +6,7 @@
     <email>jlec@gentoo.org</email>
     <name>Justin Lecher</name>
   </maintainer>
+  <upstream>
+    <remote-id type="pypi">keepassx</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/keyring/ChangeLog b/dev-python/keyring/ChangeLog
index f8e202014785..c42776ce7ff6 100644
--- a/dev-python/keyring/ChangeLog
+++ b/dev-python/keyring/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/keyring
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/keyring/ChangeLog,v 1.20 2015/04/08 08:04:55 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/keyring/ChangeLog,v 1.21 2015/06/03 19:52:21 jlec Exp $
+
+  03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add pypi to remote-id in metadata.xml
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> keyring-1.0.ebuild,
   keyring-1.5-r1.ebuild, keyring-1.5.ebuild, keyring-1.6.1.ebuild,
diff --git a/dev-python/keyring/Manifest b/dev-python/keyring/Manifest
index d4452267b5cd..c238a9bcd46a 100644
--- a/dev-python/keyring/Manifest
+++ b/dev-python/keyring/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX setup-1.0.patch 866 SHA256 17b780756f442bd1e4cb8bb0100015921f15ad60ef499d1048b7cb50f2ae12bc SHA512 9c12013472dab8541454353cb68aca2dcf5d5624ec51f81d9d31245d5c156693de4d058ee90a32aaa8366e8eede806b1c43656d567bf8f8db3bccb7189453d8f WHIRLPOOL 1a6b999e9940f6d32b354ad10768bf45f01065c4fdf0023beeb39cf69c9d39cf8d052a768f6c9a0778dda27e573c28e05a25c38b8cbb14890b87d1a3d7916643
 DIST keyring-1.0.zip 61370 SHA256 628070bfb2daa080c98ddb3057a2f802cd1d15720ca40e54bdb2aa39d97485f9 SHA512 6b5002b06c5aa420786e4114c3fdaa75eb79ff72af460dcefba5909224bded2ccd9bd19a7a3847395403283f29d2108ba7679adbc97af5717a539c9f14439dd0 WHIRLPOOL 670e6420001defecbf17f1430fd62b48196d89d5ac4f5bf585c5116fec06bc028ca0c18f64fcf5d0c4dcc10e77674d17e75ce3ba29fb5e14877fa61c4f05ffd0
@@ -17,24 +17,24 @@ EBUILD keyring-3.1.ebuild 1067 SHA256 91697f5d9502febcd1c0de3452ec4e5bcd123f37c1
 EBUILD keyring-3.3.ebuild 853 SHA256 c9f6b5ea89223339b7328c95fd127374f5346e1897c9b81b96a3ace20a7d4b06 SHA512 9faf19c67a021021921cb3b5285ef1951082fd69bd08ae10f0ac950974bc125f2f1c257555a97e40c8d9790b76a34618c8052791ecb929bacb3512f584d23282 WHIRLPOOL ff1232e056ec8d93472fd865d10730067cc45d9a6d8f64e93900c7703cbd84b7876db93268cb3364dca5ae0a0bf8b335e368925657c90e718e5b16c9927e6401
 EBUILD keyring-3.7.ebuild 857 SHA256 6bbc29e699807b5a8aa5515c48ffd00dc4a86310dad0d4afe20d2865c716df8f SHA512 3caa295b32d824a290d5f7a999e683602f657b1969bdfb46a47348a0a8a5eb69c31466c35f15c1b9c2d1e4d659b30eb417a771b152e816ba493906a400f8ec62 WHIRLPOOL 2d605fbce639357cb73f9bc3b634ae80f060895abd2b147134138820993a6be3419032e171377f4891a14b413bdf37aae82653af65d5f33be919db7ec1a9ee64
 EBUILD keyring-4.0.ebuild 853 SHA256 33a6051a47c3e0216d37889dd17b63a2bb96e63c3d2580a0550d21a845b23770 SHA512 2b6ed6ba84b12a5fbace73b94dd517344097f5d19b2290e30b7507ef378ba2c6d1e938c0441b4de62b2505e1c16da3312b4ba4e36afda16794b574213fa3102b WHIRLPOOL c6127b9fab962a5de72c66ddbf4e55d4f68c16804c519211150c9b9c3216c61040d4a5650e4b04a87935d214ad71a2341a9ed7c5f1be72f7f43c0ece15c514fb
-MISC ChangeLog 3269 SHA256 8c4e2b5c62172757cfd388eba375bafc94e01d1bd1e315ccb6acefe6142cfb0c SHA512 ee651bc4b5c7c8eadda4ab33745d5ca4aeefff0ab5a591c7787eada3736895ddee059e7dd851d2f495615252bb9d38480f472725f5edb6b1fb320e3b5581f252 WHIRLPOOL a92149d60a702a1c689d55d34aeb6f48935a38664e0de328721efc636435698e6b7e3352e586d04e6e1ba76b171d67baff46127189e773a283e05435485f4969
-MISC metadata.xml 393 SHA256 326e71a09997354606ebca0143f4ac37d7b1894bdccf1837c83d6126cbf82c7e SHA512 e8ae9a3dc0a986a61e672838d912d607eee80ace2a9e30ddfc2e07341b4be6139e579c0e286536e3056a30906812a9d25f68b6ceb43788eab530629f6307a5ef WHIRLPOOL 758d2d65e7cef5c18b7485dbecbcd09464453ae53ef8b24d607a37ed47b11f4c72c511f523a64189b0485c26003c6144f47db6870e187738f7b0f429c349b954
+MISC ChangeLog 3369 SHA256 9c815b429e0179e06c9d2cb1f74c0731825313cddca455363203408adb284e81 SHA512 f9ab7bea1a72d3a198e79679f0574d5283fe81c649fa927ff13f54ada1b1449d00283c8fb0f952e826d77053bf4bdd222f5b4f8717bcae12029d1ffe38a99e2c WHIRLPOOL fe7f1f716e0a476da567198167487bffecb5931dec40608d89bbbd81eb54632e29f1df3a62b4a49a9845a1d902a7e2f7075b2a5b2ea39039436ece84546a0e59
+MISC metadata.xml 467 SHA256 1e2280f38a64c9137d381d09f53bad4460928efd2ced3aa5637d93d77734e4ad SHA512 090596d12ea0ff43eca2b5c57c13b104cf9bb8958764c092504ff259b89bfb1b0323dd5378abc13714ded140e6902eaa7c390c3369fd66d2c2f46a4497fd304c WHIRLPOOL 182008434db31921a50b10abc2d087f4492ee619057d504f127d6e8166c5a4fac91d0fd9d9d39eee01d36b1181ee47dd877be85a2ddb7a656ab7500de5b1a993
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVJOJ2XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOiZUP/jhuky+/WRQB7Txsn9N8lbi8
-qDBGgN7KdVihouUektOj2/cpAP/tOcK1pq9HnPDOtPS8UT0Nm5pM6bQglOhDz0jU
-LZ1nbwHdmkhoCw/pPJ+cPX5/zoNNs+MhQe6nKV6WlVEMYnQftLRZQ0EGGarWqESV
-O4CdfTY5qCqu1xXg1CsMxH3CslpkeIWymO7EAVul4chgHws+A2rMd3j25SSuXdCU
-e3U3/ta5kzmnxVO/82CwsTYLFlldQPHq32OTiEL+w/ZMFN41blsIc2tVxw3ufuBN
-0yQoneZLEzoMUBzcKV/579Jl3OvwGEcP76xLxjrhd8yYHLB8gaAYpykTuDWZ3AJu
-Z6BWN8Ffiu0v7bxQkJJZCAnzFPQ6/sK4WnhifQodZ6iOh12i/gN+LmXyXI+GsbzT
-ayP7yhX4g0/Epi+xZTRiyXkP5+vAWBiSZuHgCG21ky6f1pFZSQqos+9fEuJUV9tQ
-RWf8EQl9NzUcMH/nzy1mAoWdKib5vUj2PsTEV8pOp/IJWCFBqeIS5KRMUvOzDNrB
-Mrs3y3wDZZyFwrZohk5mpWZtubuSosVZ63mIiuR3/cFaha8HpyTgZxNOQH4No17N
-6Cn5mIE7Pjdp/UXvdmw/WOwSqKUYpg0+DlDqfZlNiWtsDJ/f/PP4ANUqammpm+vJ
-xCjTQhqAkACbYIC5kHLC
-=4C1i
+iQJ8BAEBCgBmBQJVb1r2XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmizsEP/RfytumUOrbazj60+834lT3Q
+rEfZ0hlD7B/46hi912QUU23eaGkVLa80jfjg57i8T+lGZvfHrqVRR60ppJYk9Z3S
+LoTGvzGEGWigILzMl1hhQTfgCK+ODbgoKjVX8g/wLHA+264NDL1EziMNzRkZvPti
+0Fr10l48Pg/Vhw1CGN3Y7ztyLhYo/qJS5MwtA0DCvCnodw+oAVvheOEWatkPTHQR
+/wCOVTRcEcU5WshWzRsAEnu7tvtitfqGUnH5a5fZUQ3rMkIxPVODaR2dCddHStZl
+6ZezW+chnf9dKER9kkHDK5gZQ7GM6lqQwVOwcDGfzz5Tzk5u07XJw/hdS3QJJ8vj
+sRP6hekfr/MUUsyVI7BsDI6WIrNLayzree1q76biOdEZ5iRcvKkb/zdc+v4DEk6G
+UY4KsQtKX5T6ORQYmSN4fkSCUlmd6RZOQama3p4271+a7csLCLtxeOdf8ahrsKrC
+u7T5UCudc4jXZz9pMTPcP6TI6H5ItIbTn/3JCzClGPQzpazLU4qMTn0OHS1ZdoHf
+mv12tVjGiGkAZW+jq/rU8SznwYCMj9511FJAdpk0T2t4FTshKAH0wkqybuTgmeM0
+lsBmeoA88Cv1dElPElivx3a6zPzk7MT+A2lBP9grcv8QYsuGi0kyfyf3FcF9iV1I
+gHD5aNVA2Vz/AmPWA8P2
+=0QbI
 -----END PGP SIGNATURE-----
diff --git a/dev-python/keyring/metadata.xml b/dev-python/keyring/metadata.xml
index e87385528718..e2989ddd2b81 100644
--- a/dev-python/keyring/metadata.xml
+++ b/dev-python/keyring/metadata.xml
@@ -9,4 +9,7 @@
   <longdescription lang="en">
 		Provides a easy way to access the system keyring service from python.
 	</longdescription>
+  <upstream>
+    <remote-id type="pypi">keyring</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/keystonemiddleware/ChangeLog b/dev-python/keystonemiddleware/ChangeLog
index aecae6c115eb..3f8cc95b3515 100644
--- a/dev-python/keystonemiddleware/ChangeLog
+++ b/dev-python/keystonemiddleware/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/keystonemiddleware
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/keystonemiddleware/ChangeLog,v 1.2 2015/04/14 16:11:45 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/keystonemiddleware/ChangeLog,v 1.3 2015/06/03 19:52:53 jlec Exp $
+
+  03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add pypi to remote-id in metadata.xml
 
 *keystonemiddleware-1.5.0 (14 Apr 2015)
 
diff --git a/dev-python/keystonemiddleware/Manifest b/dev-python/keystonemiddleware/Manifest
index c790839c708f..cd2dfdee0921 100644
--- a/dev-python/keystonemiddleware/Manifest
+++ b/dev-python/keystonemiddleware/Manifest
@@ -1,25 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX cve-2015-1852-master-keystonemiddleware.patch 2606 SHA256 3f1fe254a8be40bfbf3441dc1db69d409b300cf3e7aa7fa143a81527cd37d1ca SHA512 90bf9bb62cc874fe7c34f67dc1069858c9a8da7ab32506b296e78a61d88597d21ae9c4e1334c0b91e31a6bc02c85170030b9c604e46ba30e7043998342dc920b WHIRLPOOL 04c941466ef6d209ef34195bd2f05ecb9716bd5801a59cea87a4e5f53ffc9ca15deed0fa4dc58f7e15dce6d6a98f2cb0455b2f51a06753bd338030a93e0beaed
 DIST keystonemiddleware-1.5.0.tar.gz 176315 SHA256 73e98aab8bceb7843b6cc8aba2cbff824a379428519e2f9ffbb8e32578b38fe8 SHA512 365643f7eba633587d8055204df04cfb40bdcc28c57d7ecf8c4ed67803b9b027b6334f868a1bc634d9beefd7410d74da08a7ed599637ec1656e6ef6196043dab WHIRLPOOL da7014869d3fc1ac5339671344542e33c22ac07adfb76ad00144cdcf4e1e26c60eea7ca7867cea6c6e105af1d05be64eff7d55ae1b3cf5114597da966b756b55
 EBUILD keystonemiddleware-1.5.0.ebuild 2696 SHA256 4e06d7e3286d34c37c1b00ea399fb78fee97ca795bb998127149ed80d80a448c SHA512 591b06b2cb54327365b258de7c465b3ec7dd3843a27519656af045ff168917b1a045a770728861b7080a2e69b6faa389d5cc2e9ef8ad840e582700d4884ec121 WHIRLPOOL 3dc6e256dcfe85cae1d6342e58988c298b94a18bffc2dd8022969704576cc0edf9f27a45691fecbcc0e86c56f1bf6f9b75455aa8c2110942d79e68f941c440a4
-MISC ChangeLog 660 SHA256 4a162abc574af48c67a675aa2d6e668d6533b3c3fb1da986e6ab02e1af2d5134 SHA512 7cf816882285301e100dbeafbaa043558bcff4be80278fc0f5da6ded3286206c552ab8dc3101a6116631ca2c2f7b6fc964c8efcad029d31436700d99dca8d9d6 WHIRLPOOL 79d8d26dbc0aead69c4c8cbd87db756ce53b276cf0f247b3970323e3856aaaac7c8efc0701cdc09636227acfd4653412b03b5bfbab26ba237451e2900ab14d61
-MISC metadata.xml 368 SHA256 2977a1caa70d2a7b2687f84c15f2db09e8feb739b3dc46d8a1c9143e5e550a1e SHA512 18c1f98d2e52e14aa4fdbd8842c40c6e3555d51dd5cb6cd4d88a6e13017f87fd8fd8f57729fc9deec819d6a4d04f864714844f23cadb5befa6000d1cd144921f WHIRLPOOL 9c8369f8f3448863124702ba3a3e9968f1bf5d763485730bb8a92006dba8e3023488486244bb6e0c5486c8039c3504598c97393433cc884d374bd9675a6fe50e
+MISC ChangeLog 752 SHA256 dea52be792b1a79db46ec69db2ad2040da2b1ad65880eebdbd39124df3664932 SHA512 e738f87d656b6e74b85c27e4ee6b6bc5bf1d61fb5baa83ea621e837d22d7c53439a73f6a8cc03265d558955686c07418502bba4e27887568737731ca888c83ab WHIRLPOOL d516e92a2c31e284d004a977a2ce9483023328681ba30692c36718c38c1817c6050bd1f7fadbae49b59ebb62e884f5368f660e4e92978e56350e30c744aa68b4
+MISC metadata.xml 452 SHA256 12dc959ed4b9d49de5fb84b5e51de0c429c3dde456fd8cd02a02530307bedfee SHA512 89975d36aca1c5f057cab894b808e363c850a1ccad56cdf99f33464ded0d2a187b25823d5ae9d0d127ab964197b9603859a807b8fdc8c98bd32a1345abe1787e WHIRLPOOL 775393db5fad2559a424f347b5f7793f13d43283d907f527bf07601484903ec9c9e0ddbfb780e1b1e4af248b7cb19a7ef45d472fa8b41bb89c16ae083882a4b0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJVLTxMAAoJEGSje+quGaTo0+kP/RGklNzzRqzK1rUmxAKdo055
-5ICErbAsrkm3zrI/eHNjcAyJs73agnIlo7GkL/tAtlOuQcG8L6A7s4ZC6wO+M5Iv
-TMJSuRF8TYo2gxi+s6MhXe1E4Wy7qVpqWsRNhpn7yGGmQQ/nl1xu4UkH6U5zKQAu
-vbhvFNU2+R+9KmxiMOnjvNaXW+OzameeuqKMjPBveECZDtqKp3iAIb2RqwmL44e3
-MeEMlTwEuXH4QVLAUtmrUWAMpV27xUCyEpKnXb+cYq6MGoMlUit1ZNNxXdnaBHMX
-8LNzRv9OOvTTPkcEs0x8s6Iak6yGgDRy89SR3RH5N5D2ewNWEEnSAD2/9/l6V/HA
-zoKguszjIVZFG++Y4JCKIOdxyrU/eB1K0jynvrq0WXQ9QdGQHk6RTd5D2S3Jz1P9
-OxJtdiCpmK8cUh04o1HDv3SQi/uNtnok7NZ96O1XyRT416/+ziBpKQg1qqC6bzsH
-8y5o2VP1QYazCure4qs6iaaNZwc1agcMd3Nk1XbkEL9fe4rmvSpfjOL+CUnxi//c
-i3f6dVc+JuJGlX1haNgszENjZvhzywsEzPnz9lApjVZ/TpkR1oq2lBrEuO/ntjmy
-L21d1sDBW41NgbLHUPa4RG1reLLo82ZUzWSAVHB2RK8ue3kfW+mb78TP6nZKrplA
-S79L6GYE8lmd/UWa5X9e
-=0pjL
+iQJ8BAEBCgBmBQJVb1sWXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiZp4P/i+wcsVmyt1mi3bwlnxozlwz
+XYHNfGfuYZ87k9Lr71M+O+NtWoZVuZmzIf4yXIicFBQtj5/b4FDoQkz/2Z2ubqoU
+cqs64qMkOvKliw6ocqvgjx+AKJjrLyLxVCY7E4TKMNxpjYRDROAtg69CgG4wj1Ol
+JRuVP46cpWlvr5LEav+gj8wkH81qwyn9VFTGm+p/J2aqrQoRxF05UMlVmhyTjX4W
+7wHHEcL1CYICIwVQhHoBR3rzL72T72MIKO99P7cmpjIB0tFZ4c3xfSltJU39d6bd
+2UFj2bFKv8eZjqTe+6USlrvK+n7RWYUGcjB35CwlIvuRUprtv51ODALSLfbl+/6m
+1afDj00G1GlXVmx1cdHO6Zr7n8xYysam4iEV7MMVQ0K0P3YlGwWXkRgbLIpppD9i
+o0Eg5CAs+v7lMFyTiBnX/KNVesMqoGiZ+6ErKsOpGHft+HdKpE/Rs5IqCIYK+c+L
+kD2gttFllZy6wuw105c+jtytTYVqcPyTgPRNITE5tkW9ftJ3DG1mNWxTwp338e6F
+SVIm20ZJIhbOWXYbBwXVjJfPGpOws0n4lmOmQRX5rR+yTylo0HclxMvHoztTPGUX
+ECIXTr+nPxJPhB8XVv3a0V4YRlPfdsLBRpIgLczcfhhQjWORWoEY+QkgKi88z8m1
+3bDKBv/79inWa7tP+tTN
+=MO3F
 -----END PGP SIGNATURE-----
diff --git a/dev-python/keystonemiddleware/metadata.xml b/dev-python/keystonemiddleware/metadata.xml
index 746cd4752546..8b0a3c77a6a9 100644
--- a/dev-python/keystonemiddleware/metadata.xml
+++ b/dev-python/keystonemiddleware/metadata.xml
@@ -9,5 +9,7 @@
   <longdescription lang="en">
     OpenStack Identity (Keystone) Middleware
   </longdescription>
+  <upstream>
+    <remote-id type="pypi">keystonemiddleware</remote-id>
+  </upstream>
 </pkgmetadata>
-
diff --git a/dev-python/kivy-garden/ChangeLog b/dev-python/kivy-garden/ChangeLog
index 5e4fdd9c7785..dc5ff2a85d6e 100644
--- a/dev-python/kivy-garden/ChangeLog
+++ b/dev-python/kivy-garden/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/kivy-garden
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/kivy-garden/ChangeLog,v 1.2 2015/04/08 08:05:18 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/kivy-garden/ChangeLog,v 1.3 2015/06/03 19:54:57 jlec Exp $
+
+  03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add pypi to remote-id in metadata.xml
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> kivy-garden-0.1.1.ebuild:
   Drop old Python implementations
diff --git a/dev-python/kivy-garden/Manifest b/dev-python/kivy-garden/Manifest
index 5b4d2494d787..33021083dbb7 100644
--- a/dev-python/kivy-garden/Manifest
+++ b/dev-python/kivy-garden/Manifest
@@ -1,27 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX remove_bat.patch 334 SHA256 3c9434f662e3dce7169c99e82fd9a38f0de49ad845e5c63e124d90817f13c1eb SHA512 62fe97a4db39b55abbf4c1027cbed61721c51e5edfab331d785e9f4f03b82cf5792ada58db89567e2c81265bdc1232f93da12dfd7ef6e4a8b8c6938cf98b52e1 WHIRLPOOL 408f04945a56b7b47b28c7460630e4ecb4cd7fd1a0bee7cbd1450c51545f8b43ee27b301524bfedc8a9448e2e7885366ea28e8865cae526675b1df8d51dc57ea
 DIST kivy-garden-0.1.1.tar.gz 5789 SHA256 bea618e978f962bc0a2bfc3890fafe6c1bc2fa7aaf8a1cd3c8c70a682f33d79f SHA512 d551e8fdb08c7c1810972df04b024fb59554a94b9d6dc98a1438620541c13152e8c7de4cc603efed4df00e3d681d8545939ab417266459e26e116ff6660d8013 WHIRLPOOL 79a5db5b0e854ae2d2cf4bbb2c9d4733bf1a4c772a38e7c4e65cfc050bfb4494712b04095e89e026bd282851f562c4df6f5c1ec25e6a5b5e30f53f5a1c503fcc
 EBUILD kivy-garden-0.1.1.ebuild 661 SHA256 3d32d01a6d707cab10e77f70972d3a88523ff9adfc69e081a1f8670e5a86391e SHA512 841faa820327a5f18f5d94ca02bdf0f36fe15afed6b72cf06d216b972b7516222b7add5a58e0f9dcb10d84c9e5d7ebf2bc914de07df0594653c1e7ca9e8726bb WHIRLPOOL d00d5534c9eede94cb857ec8f4ffc6677a112c33164c3089518a33dd7060cffd767c82ce56b36bfd2b49dd67b79b7e4982ad4c6a0f86112069da3c10937d18db
-MISC ChangeLog 504 SHA256 19e47ded542b203d30c9363fa7d895500404af3022f99af4020b26044d3d40f6 SHA512 5ebb85d25fd1f39f4d32c3a5e9951b41e7f0dec5813e064185f600fcb24d12dcc4f1bb07f7724d5fc5a737c8c97f430dcd8732b632ecb7a270859e064df88ea0 WHIRLPOOL 303766499f7fd8afbb3776bae56d23d12fb1fcd280d5eccbe5f51af5e88513ef777a6975e02a48b858b9399e67b00f60aafbc7dddd485d0d4bc8f80d5f00bb3a
-MISC metadata.xml 439 SHA256 2b8cc25e3b9228c53b1876f3ce66fbf0570378d2858208d7e7e67e9fba6371b1 SHA512 6e886880ce7ee2b0d07c5a6bc5f8e6fa4d45881650e821b4a8ecfc189eadd524a9c4897715b446e32f8a1cfb0d0b9824b6576a0ffc050e7bb54319db8e941b97 WHIRLPOOL 3e399f4be84c5814a7cb0fa914448a31c2177ef6d644b8a6017711474e95192fe2a00f3ffb6275b14870e104d10b57c9f373f47bb6bef7f89217b0ae700d6547
+MISC ChangeLog 604 SHA256 de068efe4d30fe31acd4f8864fb75f8424e947cc145165b81cf6e4ba23939914 SHA512 bbd2a8de4e48dd67123246a69edbcde5bb3d0fb85ea2164dcbd2f4b416b663d1f9dd21cc4ebdcabda04d78195bd31ce5cc95365206e8bc9bc6d1ce752c358bd0 WHIRLPOOL db1fcff1f336835446d6d50bccae7baf63f4559043c1ad250918312d63fe2265bc0281aab4fe5fd30dc6bd235b15dc9f771d4c7b00a1f4a674d30a89b1d96451
+MISC metadata.xml 517 SHA256 73aba7f607c14a12a2d9506a2ff57b3b6f1c1ef4b45677653bb8f6dec548bd7e SHA512 85434e3b4dda868b9376b9004973b8e4af243da12e7d890ed27000190a014a454c8e1a773002d74c18fe03b0c1110db8160efea08e45e8a9b92249ccb4d4c1fb WHIRLPOOL e0da09365b95dd54fa64a259f4c0a41f2ff15f614e7d9bc89d0e7214f6fe1daca8805e1a5d8a427c8920d0b5e927a5a622cfd16146f9845d6a4a8c886a023ed2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVJOJ3XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOD1sP/Rspu52xVJyDw2C8HFfBBYkw
-aFfw9MkFbNYZrsoLiipo2bFuQM+DvAkzeb6EFFLMDst0AztQ9kI1wJKCwuedFv3Z
-GtC9ISwYtTNtHdlnwNYBnHdkbP9UAm0agk4dFypcIC6W8Eqa0ogc//BecoN1BAB9
-0ola8oDI7oanjiJ6eDlQjc1IgxRQTNTaq0bZex4wCNL6KZ3PPTvSY32FeFeyeuQp
-ouztJtGtwWr1VXX0cPFx9FJlISH1QAuVsA3X8ckQ4N97kyrQY4h+LnGkO/w4eq/4
-2QCNKc7lWVwnpewB4GMN9SohQ4oawZQpHU0fS7S5w+1WzZxXxKzfsCP80wFg8a0f
-RKzKnTH/en1EYha4bqw0ZKxad9LjgqesqvvkWM2KrKpDpC8phAGJZbLiD71OOZUg
-sRrD3s/2YuvCL23Yw32LqzhH17hpXs4Hc2zeVjMZkOdI0wGzV5DuJ0VN3hTtZdtx
-0j18hGiq80tz6A3OEmwGHvYfDOwWjjpAJhulDi3hoGqcuzsKhfmZMgsKwnqtzpgs
-hePd74wmSLSLWNAz7tyjBZIkBL9owgWQ29U4OLtnS9ZQSkQOJSZExrrZ/7TR14tV
-Qkz07P5EtMPvu3KoyLhr1jPbRq3L8meV7rMUUnWE7ZYMBA5CtHNLeloSy7ex+z1/
-DozqhsNp5MvFuvL34hbz
-=fTdo
+iQJ8BAEBCgBmBQJVb1uSXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiZ2QP/RWEJkIgKLx1tjlh/6T0tS1r
+dKIcECr1FoPCaJgOcigmXTy6WhA/h1cT5h267mBtiOOcCqRwzlVCPipF0iCkghu3
+PFjQkNTMLfp7ebTOLVsbX+oXSyt9hGsE6aBMNtaWrF5T2iNB6297a+CiJs8is3Us
+oFXv1I2QCX3JW3UJBr3B85Imib58Dfj7UOf3Emn0m9RfVYEwVVQNDWBa0eI+qiUe
+OfWf8yCMP66/ivp8cWH/06w96SDxS8UxjrGr7tSu+oTmGaXfAgf7wrPgdrqeVzGZ
+6akYU2NdYxMn16rKY855SYobmTZmDi06/XXkdmypZjasNJlz7rC4G5Y84T6g6ymm
+JAdjm5Fe2aUo99BhU8ayfw5BmpmsXYFHCysdMyppgZCnX5To+AtLDNuc68MUjinh
+frxQvy4NjqXcxSDE7Y70AyNh5C6d2fI/o3Gy+uUqIBXxfNErx8I2xIzqQ7OD9O4j
+giI75mujplGQJempCSE66kji/Kw+c534pPjuBWP0DdZJFAV2dG4pQbXgdjSu0mek
+TvVuHXFC8MU6Zw1PjFI+0ZApbYgzs/2bes94wJUtV4H4BmdqTErWyEWrX/E0p9rI
+Och/otIEjvkQvJgjWwu+b84JjTb9f2WeMjpRcDrSHc88HhL0s6vA/zGGkMN5gDZZ
+Se0VV0wmcAVgQ9Weg4ao
+=EsKI
 -----END PGP SIGNATURE-----
diff --git a/dev-python/kivy-garden/metadata.xml b/dev-python/kivy-garden/metadata.xml
index c1a4d945f545..4a08065cce7c 100644
--- a/dev-python/kivy-garden/metadata.xml
+++ b/dev-python/kivy-garden/metadata.xml
@@ -8,4 +8,7 @@
     Tool to manage the installation, removal of flowers at http://github.com/kivy-garden/ 
     They are a set of user maintained widgets, extensions, tools for kivy(http://kivy.org) framework.
   </longdescription>
+  <upstream>
+    <remote-id type="pypi">kivy-garden</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/kiwisolver/ChangeLog b/dev-python/kiwisolver/ChangeLog
index 7dc624d750bf..260db367c867 100644
--- a/dev-python/kiwisolver/ChangeLog
+++ b/dev-python/kiwisolver/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/kiwisolver
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/kiwisolver/ChangeLog,v 1.2 2015/02/21 11:07:06 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/kiwisolver/ChangeLog,v 1.3 2015/06/03 19:56:43 jlec Exp $
+
+  03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add pypi to remote-id in metadata.xml
 
   21 Feb 2015; Pacho Ramos <pacho@gentoo.org> kiwisolver-0.1.3.ebuild:
   amd64/x86 stable, bug #540516
diff --git a/dev-python/kiwisolver/Manifest b/dev-python/kiwisolver/Manifest
index bd6fe450e220..f2e641ccf6cc 100644
--- a/dev-python/kiwisolver/Manifest
+++ b/dev-python/kiwisolver/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST kiwisolver-0.1.3.zip 48696 SHA256 bbcd6470dd8518ec8d2d0daec96551291e2e17f0e910ec2502a2ecc1c7c98b44 SHA512 ce5ccf03da88743f091aba7e01ec3d7f4d7a83cb1d2e33b52a4a825bc4b9919329e73bb85a05effc83f6cc449082c5534a036a8d639937229fc7bedcc90d5089 WHIRLPOOL 355e8347010cd7cbb018f22e91fc9117cbd71a9cb68fd0c8c2b7f4f2fd146ce6453c5be7d0948b07b13e4b0750e13c8a78643ac2b9c268229f98701dee618838
 EBUILD kiwisolver-0.1.3.ebuild 590 SHA256 fed1a11917333649ec5cd4f298e3d4582088618cc237ad7ff3a9386f54e1e202 SHA512 9b384bbd1a23d77fe7fe6debd6ba69549b990ea11154e6429594edeaf9d370ad9b812e9bc1511c79d1a0688a2e2063d52aab0d0bb0f3dacc134adfb6fff6283e WHIRLPOOL ed6227599e4df58bf9936bae706a0e7010b35a76b55832ac7c508bc6e778ef05c4fea1e58c8e356356698ca7b4eaa3759bbea94321e534938b6474a04a562f60
-MISC ChangeLog 535 SHA256 6761c890cff8b0f2fe472621b7c8459371aa320767dbb46c2e257ca29da95ee3 SHA512 ad1c1e7246734b6acbbd7dbffbd6d65c3a4844041471da38d5364699a3956534b19fffd82f03499d868d684b36e86e237f227e98f6f120d44adaa46b7122ca86 WHIRLPOOL d40fa1154d05eb6a0926cae9ce746094fc79fea0c000adc4d78e299a708e753693fb3a58f7e4c4465cf6b97cbd63acaccdb997dd175308101ba6627c9ce833b9
-MISC metadata.xml 345 SHA256 56cc235fe65d4c5e8a8d379ffffb33c1f6bc547d495b980336cf5a9087e10197 SHA512 1ed1197b6c81b8caa6e52653f2ca3a533b297b078d5742141241accd51ad57445066547e9db811a4ba48cefffcdcf10c913e91fc84625758f1d141f11c1a5b40 WHIRLPOOL 84d2a261db49c8daf20f1b653dedcbbd39e9a45c0e5949d1158530e076b239206ca7c517c48555200c5b61faaf0e5e09a14b8b07dce53662fb7d977d24488e3e
+MISC ChangeLog 636 SHA256 d2b20d0f5aea8fe6375272b3658d072676c4d16a54ed732fe474874ef370a348 SHA512 b5b65b0a0c5698734ad1f70283ce4acc479b769c2df28be7c0fa95078606fca3ee2383fd4ba07f4f18e93cb4d1ee2ae0b7b56031646d203e42b8e09d927b20fe WHIRLPOOL 67d9c11d1cfc1563fc8bcdd3afa1a2341d2033b1060ffb1296b28bc1657d6ee635e0c537baef1f8728ffd0ad6cbd32dde29e48bd0b2dd47a88c5970d89cfc77a
+MISC metadata.xml 434 SHA256 762cba68b82cc2cd22a069f8409750069f76c5b008ea48c996f371b8fd6667a8 SHA512 426c356f3df970845e46b3ad9cea63d22ba406d1af32bb2f65f73720e1d8a2b1d4b116fa3adaaf4917fdb1d7c25536dbee43529dc86f2ec7a7360f808d570047 WHIRLPOOL b5e9b956e17c11a7119d1caa31f531c235c4fccb79a52799f7e1b65a98137a0379555c18b2ccbe9a8493c3bc281c46a253c5d23e0fe733c36dc664b59e21c594
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlToZtsACgkQCaWpQKGI+9QQHACfRGeCWULgoDSUpJIHJau+QS7J
-uwIAn1n2+YKr/PygX5YRMlZwSl/nLLle
-=Wq3S
+iQJ8BAEBCgBmBQJVb1v8XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmimrYP/3E2CEWvYRxQ+puOFJq3Jero
+/gu5vSjwwf9TJkA/TZznkiJkGzv5ykufuityB+LuZ5LBfthgwaGaAPE3VvnYm8Im
+SBDPjgj0pk7dDRSKZDmubXCU0XtQyH3bkFA4sJo6l0dSnR9wCv/r4NI8E1k8g+Vs
+iWVsXmMB0JsspHkGqgkrDCZul2zm0pX3AIJXVsej1A4fdKhRl4aBgCpxocuSrn+/
+2gZcmoJuAkahzszty9vOCQZXGY9WszJ3FH7EDU85GdkJCyb2CKh4nZQGpRlrzNTA
+zpcDS/h63FTjQ6M8sam+ev/UemXLES7Esfc2e4mMKWUMF/vtmn1JeVpOTP/InjUr
+39X7pwS2E5fz9dMjhzzBzwxMWlmwE3B6mNVADi873Cnee+lXysPPpf7yGRVfx6cB
+5IsJ5oT7MYNWu/s40UjSgEBAnGgorfHWNsZEDFd8Q8ompt3+FCO3DLU9FVd6w8jE
+QYKWC6oWvsP8lzOQRBfTLpnchJvFsLD9hqyj1UYm9cflsYOOtXNM5XJ6Br6chEBW
+KHL2nT2MWFLX6PdpWys5u2UjWq3VKYcaDTDI+Zd4O8Etpo6JHy2L0+x2w+OTkww6
+eFt7/NQr4zxcbnyHp5rl6ed4AAspZezU+4ElGSTvWbGnpWG/FcL1Kb91IJMC5lqb
+SVlwKRJELfS9OoHsW5fG
+=Nebj
 -----END PGP SIGNATURE-----
diff --git a/dev-python/kiwisolver/metadata.xml b/dev-python/kiwisolver/metadata.xml
index 0ba10ecfb5b4..9f0a0dab5e2d 100644
--- a/dev-python/kiwisolver/metadata.xml
+++ b/dev-python/kiwisolver/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>idella4@gentoo.org</email>
-	</maintainer>
-	<maintainer>
-		<email>aaron@flappyport.com</email>
-		<name>Arron Bauman</name>
-		<description>proxy maintainer</description>
-	</maintainer>
+  <maintainer>
+    <email>idella4@gentoo.org</email>
+  </maintainer>
+  <maintainer>
+    <email>aaron@flappyport.com</email>
+    <name>Arron Bauman</name>
+    <description>proxy maintainer</description>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">kiwisolver</remote-id>
+  </upstream>
 </pkgmetadata>
author	Justin Lecher <jlec@gentoo.org>	2015-06-03 19:56:44 +0000
committer	Justin Lecher <jlec@gentoo.org>	2015-06-03 19:56:44 +0000
commit	6339cf31e8f02ec736120e5c69beecf502ae7ff7 (patch)
tree	8e5608934ef700d78ad9ebb8025fadf14f76a98d /dev-python
parent	Add back dependencies in RDEPEND and DEPEND. Fix bug 549888. (diff)
download	historical-6339cf31e8f02ec736120e5c69beecf502ae7ff7.tar.gz historical-6339cf31e8f02ec736120e5c69beecf502ae7ff7.tar.bz2 historical-6339cf31e8f02ec736120e5c69beecf502ae7ff7.zip