Add bitbucket to remote-id in metadata.xml

Package-Manager: portage-2.2.20/cvs/Linux x86_64 Manifest-Sign-Key: 0xE9402A79B03529A2!
author: Justin Lecher <jlec@gentoo.org> 2015-06-07 19:40:23 +0000
committer: Justin Lecher <jlec@gentoo.org> 2015-06-07 19:40:23 +0000
commit: 11d0ee2a026bc28e43889e9fdf757abec5243bfd (patch)
tree: ffa5056f2fb726cc9fbe1b78dae6aca574633f5f /dev-python
parent: add patch for mypy script to fix #551272 (diff)
download: historical-11d0ee2a026bc28e43889e9fdf757abec5243bfd.tar.gz
historical-11d0ee2a026bc28e43889e9fdf757abec5243bfd.tar.bz2
historical-11d0ee2a026bc28e43889e9fdf757abec5243bfd.zip
165 files changed, 1460 insertions, 1021 deletions
diff --git a/dev-python/APScheduler/ChangeLog b/dev-python/APScheduler/ChangeLog
index 0145cc2d8331..c2a6ed493762 100644
--- a/dev-python/APScheduler/ChangeLog
+++ b/dev-python/APScheduler/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/APScheduler
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/APScheduler/ChangeLog,v 1.3 2015/06/03 12:14:03 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/APScheduler/ChangeLog,v 1.4 2015/06/07 19:15:39 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add bitbucket to remote-id in metadata.xml
 
   03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add pypi to remote-id in metadata.xml
diff --git a/dev-python/APScheduler/Manifest b/dev-python/APScheduler/Manifest
index 46ae474ac83f..99d4546ff181 100644
--- a/dev-python/APScheduler/Manifest
+++ b/dev-python/APScheduler/Manifest
@@ -3,24 +3,24 @@ Hash: SHA512
 
 DIST APScheduler-3.0.1.tar.gz 74325 SHA256 4e71d83578166fdc73d8adb646b40a6a7c70d9f7cb017ca93b0dc2ad51999eb5 SHA512 1a63518f02a4a17b4f11210736b7fafc11e77c78620934c50d21f4c34c85473b4f6f00647b7f39122e865d94bec027c564245a66516fee35552c012001965f18 WHIRLPOOL 168054d8405502c9366dd3366a7e5e1b49c084846b969ce3524c420cc40c3a5178021acb0187485351297ba8da5a5a6e3275dba473434196e62f03700f84bc3e
 EBUILD APScheduler-3.0.1.ebuild 958 SHA256 4dc3bb1ef296051c9ac6a38635130ab2145efe06454bbad0189709799c02b1a0 SHA512 9299a0e92020994f3a4c48c251b7a87871b2f5c0e8691a73fbfc5492fdf9ac2113dc9f68e966fd4ada3dd0b3199415a6cd203d0eea1787c4b61bc41380a9fd15 WHIRLPOOL ff3224ac73dc00be1781a3bf5a0d3d0e3c39d72137cc7df53e79168918646ce21074fa655ef7b8a679a87c2bdcfa5cf943187d3ba49ec8d83f2a3524fa0a7c3c
-MISC ChangeLog 592 SHA256 a9d1e94441e6a7c242fbab4a83b7c35f5572e1a6cba6754a343d250d0c64df45 SHA512 f5dec5e30e7dd71c61daf08c3369812f1a300e802a499f763ad92ebf3e576a99339ac03f5ed4faadc76a1cc7086a2c1283b9f94d50480b79b6507551107a473f WHIRLPOOL acdaa17e237936800f02a172898a2776f3235922a87de576304e7927f368b29499663f2b2dd24aa5ab18bf86fc5a28bbb9562e2e81fff8cf1af78635bc1a13df
-MISC metadata.xml 316 SHA256 95c6cce85e1bd4c061d0a92d55d90b25b7a1abd4cb56b30f6496043d62666594 SHA512 b921d98cb65304303036ecc0a2f1fce4c8fba570c3031a074c3278a6ed8ab95bd2e2105b2e2fb5911050a6830fefbf190b8ea2c73333d713e0611e06757297f7 WHIRLPOOL 456683e39778b7e0f172a48e340faf09ff61b9e8cccff2498d6e1c224c6e5928b9cb2b5c6c33491d44f0aaf306da4af1ee3b017e8f2e6d26cd54a1966223de53
+MISC ChangeLog 699 SHA256 4945a0e15bc3f81d269ff150406f6164bde747d03d7beeef3030709acdeb9092 SHA512 5337f9072a40b253af4e5cf46e4d9cbe9eea71e33cb52d8a199a198b8062b1b6b701d20c782fb927dde60cf6a53f66978cf18b816343c4d7754dc85cc175abb4 WHIRLPOOL 6bf65fe560629449895d054a4ea7cd448adb3619d8efe8d3e8ae27b04139640becd89d5112f985d6a147a92781eddead04852b4ed16e077331105f7edb458519
+MISC metadata.xml 382 SHA256 2e44f90a230562f0a3a7af83103426c631d375c8dec661ec721d5f4a45b3b9c0 SHA512 4353405893111c3ed59b06a65d7628328ecd77ab0d8a7d6b98258729064848c73ef1f8fc40d9f8601ea122e478270986f94cda5b73aa9f43b45f6d34bbe646ed WHIRLPOOL cb28fe52356e9373038a213f919385a7b4afb4fd1089f085bda1c1337dcf4d277d2a26365694846e1f1495b8bdcb4b9a789d5dea662326d021e055ec5568f18a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVbu+MXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVdJhcXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmim60P+gN27kWd99qNVpqXHc1Nvkeg
-7d4w3ZW1Zvn4NVFVHDXE4RKvasXDYgpmt0PSfuZ80NOteeSzkYoH30sATGl/qq/K
-ou8cnR5tydKUDQu0rKCMorFnzaXg2bBH89xINp5YW9BkIEHH0edvehJ2mwARGsdt
-iz2gxNBxpPqPPk6g/8MXtnvfISOZWuRc80l3rhHPEQpCbtfscOrMfia7K+pP272T
-0kVCBTgfZAs1Nj8Lbd5qe+YDOX/s24n1uoyd0wMptoq94X9/FbGP5PUyiUs0lOWV
-nvksYe2pBDx7oVXi+ECOGNMJy5x/IP+BKbPWarN/Z9HV74XOGaua5qYiI3Gs9ST+
-hYaFRfCmh4GtkNW2tN7vj7iRH1FxMpnCLTXsWlyaI0wmCMXtZiaRgslqO0uCv1sG
-B+EKTMiqfHp3mTknVLdrEe6sM3PHtkE7oQgw1Z0Pn/5ckjbQZpWJSC3wViQfd3Ke
-7w7maUANLyvf5/il048dLWKgjme9quRKPNffEM+hcUyfWTHR30PeYIw6Xfe+YBui
-0HD8OQiaR+RaNhY9q1LsG0ggF+MC9Q/k4t8aPC/qKSsEU89yUSrToFFv5EwWc21L
-FRSFqvSlKrogG6yKeMlqIt+6nJa/rWIgiE+cokfpX6J3fvNCcfBkcmj1ncLEIY3d
-AMt365eAkFa6iF80NSI8
-=fflG
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiEwkQAJXUzLXZvfBZTtEwYHjuYMaL
+f4340AFNXDOzbu71pO60mYk05rOx3oiEwuBaAJDjIuDu8aEfYlFbTojLFVlRGZHy
+J6MiFI3Js1gcfZ+luMyTK1mws2Purr4GeuJxL1icatQnK1xxkPlNiINbFI+NXugO
+GdyAsDnNQOB3IR0T6w7DwypZ8MEzmwQdcyTfagfJWe1dleFWymqESXDl/NqsYXUB
+glbGQ3ju1Y95St3yTfc4iRrhQIc0T4iq5RTbE49/lL806Jh+TtLi6GXrWoX0pDMW
+4ZWL+7KVAsPZySmy59SFXb763WOJlXY6nqgBUHUabJCyu5WdhwAp2hYvxmZbepEa
+pvdRfqCwFejCa0f3vMz+a6Q1kwPvAxZjoRGFcLsRnueL+XicntK2mgudBSPtsYQO
+FiiCEp5xF+jZSu5CAevczkqnmHoMNohNE3bDfHnKB1j49zelpdjAb3CqZ+W2CTWI
+CF+rScA3DLdYoYINKmAY2xvOpNoQ6yQ1QWS3Tgk+M4ro4moPfDpHYuP8QbKs4D2m
+ZSesZuNNi2kq2Gfw1zhmdLQ3XicrgZRKhPgMEIXM0MzeHn65tP+TnmNSLRTK1/Sr
+D0UBQi5MVoisfhVELMsFgCeQLNFZaYAKOi/3mEH+7yvRqe6oNM0ZGmCH8/2Q97mI
+pVX45+wVNtH96Xi2N4TE
+=7e0B
 -----END PGP SIGNATURE-----
diff --git a/dev-python/APScheduler/metadata.xml b/dev-python/APScheduler/metadata.xml
index 57538d179ef1..d1646e4cea34 100644
--- a/dev-python/APScheduler/metadata.xml
+++ b/dev-python/APScheduler/metadata.xml
@@ -7,5 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="pypi">APScheduler</remote-id>
+    <remote-id type="bitbucket">agronholm/apscheduler</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/aioeventlet/ChangeLog b/dev-python/aioeventlet/ChangeLog
index 2a3fa3ee7a93..c8eb5b43f774 100644
--- a/dev-python/aioeventlet/ChangeLog
+++ b/dev-python/aioeventlet/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/aioeventlet
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/aioeventlet/ChangeLog,v 1.3 2015/06/03 11:50:07 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/aioeventlet/ChangeLog,v 1.4 2015/06/07 19:15:57 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add bitbucket to remote-id in metadata.xml
 
   03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add pypi to remote-id in metadata.xml
diff --git a/dev-python/aioeventlet/Manifest b/dev-python/aioeventlet/Manifest
index 82c017429671..877e542df13a 100644
--- a/dev-python/aioeventlet/Manifest
+++ b/dev-python/aioeventlet/Manifest
@@ -3,24 +3,24 @@ Hash: SHA512
 
 DIST aioeventlet-0.4.tar.gz 64314 SHA256 fe78c2b227ce077b1581e2ae2c071f351111d0878ec1b0216435f6a898df79a6 SHA512 6d76bacd1ccaf477f121bf57f2963d37c86208547beb5fe7d2c8dc22d787d7ed98761869d3957b9c1f62dc40ca462363f4a7cb2a80b6dabf13f89950d314c2ce WHIRLPOOL 4be9753fb9d2784ffd7e1590d0cebb5a9163d9fa178d5cf3537bf1c297d0e64eb921172af5d50c9cf9ada62ec77be6adbd74679f0aa429cfdba5eb193aeb87c1
 EBUILD aioeventlet-0.4.ebuild 843 SHA256 b2fa4c4216936162bf5f02001cb19213d7cba8be7e35566cb254ea63598d0ff6 SHA512 1088f053c1fcb0088b3ae5695a2c89413c29c87dd6afc813852238680b83d744f6a448a982f0bdd03774b699026674777217809871ab713650a5bf463fe7dd74 WHIRLPOOL bc105a827c702c254fb1c0fa76f0d28ee8b1317c53f456645fcf8482a3ea314a4e6f43f4dcbf1384d1cb08d24c8207bf8df80a180c779e580d8b78e4c8080a07
-MISC ChangeLog 592 SHA256 41e05603583ed99cd88400007d7fd3b0de70b133dc0aafddf171482681924150 SHA512 9b9737b89cc54dc0ac050e1864416c05fde9f155fb23085bc6c972f7cc329cbbfe61decc904737cffda9b3a297cfd31a200c3b1931119f365a2f12d1f496c304 WHIRLPOOL 08d4e5867a4720c699d68bc88ac303b9a65a28a544c5846e7c7048125a4ce396f7367c31a65f9da09a2c28ad8cc04cf72e4aa2a5372fba4f84ab2498c51984c4
-MISC metadata.xml 550 SHA256 9aed3a5df6b89dda92cdc1e91eaae356e874be4796782b37914361014562fa71 SHA512 3c9b9bb829a52ebd45048dba00b6f7f1e571bd6f476bcc39647ac39e1c9502d25f5c06018051b7dbd0038a3771553fc29e043290e242e196e64e75f7d2934217 WHIRLPOOL 6da3f1ea0dab2e2147b38c1e5a33f75b7e13e089dd6fa446b7499d2cc392b1457076901529f16d0c766576a5acae53c1aa5b74b484022a430a4fd0e94a9f5b35
+MISC ChangeLog 699 SHA256 27ee3c2a5a41b5a684a16a27588d18d29d8467f543ea274fef8414b085a27b9a SHA512 cce345d2417bb5faa8d6395475280dab4bfc96b0f3535293914f44f2f15b318d921d3b84bc402ad8a407248a0be40681e896730bb609b9bb044c007e4661eac0 WHIRLPOOL 2cf4a4bf5d004591d83fc37481a7d5233e31b509a85d4006faa4becd6a2a3002d0b5be00e157d402e3796f89a3693f057b2d72808d14adec6fb18e185cf29bfd
+MISC metadata.xml 612 SHA256 bf2b1ded2253eb5df8d732648dde78ffafaa60e89959f9313e1cdc98f975acab SHA512 bc6988b1cbc58c7e2c0fbdb71d8f0565cbe421d430e835c2514ae1d71859728d225c332a5d373ebb013f0de5eaa004a7fc28a33c51f753f85bedf814894186a4 WHIRLPOOL 2d9bebf8da9f162e145fa7057b5d7941281af304959652426cdbef31a53c6131aec2ef9aa3ef965e651e070004707326bac8fce7448bdc847d408b2cf8c6101e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVbunxXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVdJhuXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmixb4P/0DxGZy6XDqywdgcVOL2gOid
-Fm4W9LFK1Cj7qGWiizRnUdqD4GWMF1FtDAdLFc5Tep5+LH/MWodA5LMyI3o+43D1
-POCfjzIv9MI3bPExLcTzUhFVeYIyVN7Y3t3nXScUkZBS2fQN8i344fK75H6krRkN
-msYChGqszA8f17oDNZGcJggp7zHKQcSkwPIM9PAtihp1B4zV7KwNXLOAOM0mlu80
-9LgsTxXtpIHdHp9caSFHTA4YryT6n30XZGkesjO7Qovpl277X+ofD3Axm06ovqP1
-BYnWqwiUSowD6l+p4g6cc5QQMTosxuOBF/Qk6E3SsZmwK6WRXgYkwdZ0+MMEcVZF
-8lfXA/1nXvYv6pvm6MNXl5iGjxFWGhfQfp724/v6+2OwuG6U9i5XD+4P8tRhpj0F
-teSPS44wT0qCN9g1JLqnfi4iDwftcHygs2PYKBMVPxGiSrO9dYHF9UZdC/GCYFqf
-2lMt3pm28qvYq50hW1hgn1e4e7SvVX2JI99Lbh55qT0I9THORONMI9D0BCUBWyiD
-rb1MKsY7LL5rSFvQ4thhgU6AP7z3dLKFB9Lub5tWlBG7i5yo7UQj5kpSA14A+//+
-a8MFDdVW7eqHuwu0c5JX+HeWMcE9dzhEwOa26XN6K2UaZYtHj1a6bGan77asKJkt
-J+qUlUkBFPY9ceRtHr7a
-=6bCC
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiGHMP/3ZUzjEKheGhoqem0i/SPVAU
+Zch+O7dsyr5jA7KGPfUpet2rfJl0SLSxpY8aIdpt1O5P6qQTldNOgBjD/z5wE3uz
+jGV5ps7J4sKp0BVRoAfzbL8U3MKSUjmWFFUWhY3C/OQWXFGMWvEW/ACVoLxxZM5+
+m+r7+ipbD8hq3fMaDGVvmGletBm1b1EhndQqw2tfmh1OiaMJtmrmKrNcvIUcDGKV
+WNXgRmu+sBzrMfJwBB7hNGccJq7EE1XvXc+GgMtAapKuri0gDRuFdMqoa9ade/Rs
+rv+qhGrDnYaqV2/nOsvTWapk5hD2KCRRO0eXOQX0UH757LH1xO3QKT2VkkGfUl1u
+xMOoVmboy6b0UbNXd1x382q2IHJUYkOIsAPfP/BhjgHaqQAgo7971abKMr5UQZ8Q
+SdGHCW3i4mIfA8WPF8iBCYtuUBNV9LX2LFBBWx1VuZm1oeEkxbzwSvqhrQ8ze5JQ
+F2+xDmsnWdhygaWLEalaQXojNxTwqEGhk8YCh4us7Sa8xMUjcLp3YOpCEUceeJZN
+6ULvDbY1jpihtqulFRcMQe29ZMqjkZOkce4Aza2po00i9jVqFWI/74gU2NKWN/2R
+zdQLjOcY4F2/2oxjs6LuZVDDJlMO43EpEooer34Gb2n0z9Iv3LFGXCNlVt8o6CS4
+XBcP6YzCIA7q8O48PhuY
+=ReCr
 -----END PGP SIGNATURE-----
diff --git a/dev-python/aioeventlet/metadata.xml b/dev-python/aioeventlet/metadata.xml
index 0179804b8eb6..595605a0ea16 100644
--- a/dev-python/aioeventlet/metadata.xml
+++ b/dev-python/aioeventlet/metadata.xml
@@ -11,5 +11,6 @@ aioeventlet implements the asyncio API (PEP 3156) on top of eventlet. It makes p
 </longdescription>
   <upstream>
     <remote-id type="pypi">aioeventlet</remote-id>
+    <remote-id type="bitbucket">haypo/aioeventlet</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/alembic/ChangeLog b/dev-python/alembic/ChangeLog
index 7fb19c919334..a5ef30ab7c76 100644
--- a/dev-python/alembic/ChangeLog
+++ b/dev-python/alembic/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/alembic
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/alembic/ChangeLog,v 1.19 2015/06/03 11:55:27 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/alembic/ChangeLog,v 1.20 2015/06/07 19:16:22 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add bitbucket to remote-id in metadata.xml
 
   03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add pypi to remote-id in metadata.xml
diff --git a/dev-python/alembic/Manifest b/dev-python/alembic/Manifest
index f0c8da2020a4..bf6442857356 100644
--- a/dev-python/alembic/Manifest
+++ b/dev-python/alembic/Manifest
@@ -5,24 +5,24 @@ DIST alembic-0.6.7.tar.gz 467942 SHA256 55c35e897d2970bae45345ff4c8a190e773a08f4
 DIST alembic-0.7.4.tar.gz 604836 SHA256 550f10b2266f689778eced2fed899bfd05755737478454b97fb99385f2e780e5 SHA512 258d2f7fe046e7fd662fae0b68ba19988cc59fd1d0d8bb6e1b3b0ea133d076d649d6bc99933ac50be538d1c4d64062b2b2d259cb042d9bbddf7346d0283af383 WHIRLPOOL eaa17f8b0bd91ca8eb11292bc0be45443b43564b06ec1461c5d6b60dcbd3777c443c6a355164057334080a7dbf37f32cf591f176deb52afdb12d7ca79de4a766
 EBUILD alembic-0.6.7.ebuild 1520 SHA256 ba00361f698a92c53c30dd50064d5782f109c8d8763de179388931eba3945ee2 SHA512 4108b8108b076f55210346daf3c2d0c7709440fa67ed3a75c05ba245b3a86243ec0d01a69f3cdbfcd29594f0c0c2434ab600a025b6e37660686954619eafa389 WHIRLPOOL 22d909a6f776ec80a7f6376ebb4f9bc5add6ea2587c0e206a3905dbbb41761be3fbacc71581cd0cad13f03ab383042ca019f2d25b964cb2d8f79ce2f8248f516
 EBUILD alembic-0.7.4.ebuild 1395 SHA256 3c2c577d11dc8edb05ea1a09b5cc67a8509ac47b09093981ca85f734c8e733b2 SHA512 84655c4bc493b352fe5fab32f3dd25cf6c299c3ea9a020e8779d83ad905a17b4016618672e2090db077533de33e2c071e12d915f34054a56e52df18475ece219 WHIRLPOOL a002ba24250e64579488d9e27e3cef16b29598f6772a12f4b54edac4c7f384f143e54d7923dd2bf7fc62b5e50179d016c64fa1bd2d9042db46a49d98659161d2
-MISC ChangeLog 2698 SHA256 7b5c90fd4a8dd5b1c2ab4aa6798272c600586df4f3f1a2679a7f51617bf8e336 SHA512 3ce6c89e0ec067c09a6363deef7e824d3a439d3cf001b134592046eeb5a25496836b5b0fd94c82b452876eb084d44067d6b0df34c20d19bf9511402f8d8e30e9 WHIRLPOOL de707bc833dc572cb980c0eb06d1237157194a904b376a30b591c58f3a8f188fc5f8b447dc5ae12a8cbc518d21df5124d35eaa4881069431fddbadb015a00333
-MISC metadata.xml 330 SHA256 1a33e85e8ef88d5ed8d4aca887426b9e9a3fa8bf9954b8a4d3ae47f2f71e06dc SHA512 5c247dce9ef7511460c9763d04b1dfac55033f2b08b38f0a7d7a7600b6b4339db6e66e8c9ea58eb5de8012eb7e265e174079c154fc0a02c7af6f2952e289449f WHIRLPOOL befee829c8a270e7b8a439b6416944bb683263da1649bb5715dc0a991776562f15fc6509864c42768a42e86d21294d493d46d4a540b332498db22cb17524365b
+MISC ChangeLog 2805 SHA256 65893a26fbdc748a6a3a45a13853cf441c86bafc8251b1f9667b8a2dc9cc3356 SHA512 a3e5ea5ff3d42482250e6ff712bbfe129661c6adc2f078c304cd24e149e484e0798a960f364a13075c5bdea1590d3cef5151d2a540e3283d743fb4b063aa79a7 WHIRLPOOL 02a2198f41247c571c4c098dc3434a431e35b6df413829e0292591f2f55db0861ced389b8da0b46b364e2c7811ed7358979ba07ee6442b92fccfdc5b47d857de
+MISC metadata.xml 389 SHA256 84a0e5231abef9609b9ea7904bce37ab28987fad2304c5e622c600dd56b52109 SHA512 6cc0ba5ce5ba9168b6829d880399553012a1fa460dd5c1426323805828da0c01badcba01bcbeffba772b1398ea728ea9632d94ee61b7d8afcaa6679b4cd34d95 WHIRLPOOL abbc6128c5b4475d24046a8cf6ff3784e229f8f5eb61e884cb07ef7136bf464f672ea3eea59c93a2c93a24a4574384fcbd3eebe422562cbf847708c99bc67ed4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVbuswXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVdJiHXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiQy0QAJzyeHwu6D7xPooLeKgaLqTw
-mCIDROUG/95BwBLXkPBMKM9Hs6zUWRuLJUUBKhr6txCt+JbS7gTzd977avRid8Fv
-paEVDqIlNALaZMF2igmc/5XsowaQM8yAtP4EkYZAhuujwhsH3NeOB8zakEHP+VZb
-zlAV8prbQ5X5lBxCeTZsu8Zy8QAIAkWYVzumxYakk5BKqUEcaGVVIvzSLO986p53
-+NQbcnMQWmjqXpfoy2UJzZCHAh7KP61WYBTc/Om7tgp1x9inrkunJoowMS2mI5SU
-DTfvl1qt7MZJOMwtYU6gAzNySaeojXAY3Af4y7QWJt+c67l+T4lXCzOoZWYOe0IN
-6+1j7n2IwEZFLcE4djpJ7JgQY3b88zfcYmHbOcOc1xYclLkxcxCXYJJ0860qGHuV
-xdhAGuHdPKZyKPtzeHKPAuD5+ohDorJPMeFYzQCCNHAmC5LU/DKkCJdKs2o0g7pG
-evG+tulS++EBQ2IZiCOHSb8VRcJw0j/NFMt8s0xgS7fya4bn9bWyfyBL1ZgeN4bg
-ZAzmwcEtnrCceSfZqALddXlM3ZdOBlZUkRjA6AGPMt/nzLaajBGx76mHR0/GmT/G
-Qn9xjNxRPM7p1uKrJXe4TlHjQbCcumBQEgKLUSpkZ2DiFwG02EVm0XUOtFQ1prp/
-L8kgdCXd/tuAFJlNjtmN
-=vb5x
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmioGQP/1eq+nuoywpg1gShNIB5bg0B
+snp0UDqaFeCTzjXDrYbsmRUHFs6jVOGgYRCC6mjPmwesyR62KRhrg2QQBzWo27Em
+SwdUYHu38m4V+/llYJQQJNv6qYUxrrQrGFBd0JXZWPuIAIomEV2DSaYqAHRyRZD5
+/tNX57Kk8CN8L+AwayxjPjBb+uZgq+XUJ6E5dTEOEbxGdC5ztN/PxEtn2tYENm7Y
+T/JPNFRl2XQEcnhjtFat2iiL6uyKahhPWRLxnnqfawnAVTmaY48b+njoOn/Kj6wF
+BWTG6eVlW3BgOqnE/EpZlwVrGBnFv7BABKn3veSi2gKHmYlzaPzwSba7Nn68o4Rs
+PJhn1jp8aycUO/jdoIK9Cxyb00mpgwdx4xhGP2TKXyNuGIcu1OBgJHJPU0b4RlwI
+xSlQWADg0CT9vtnoYycYBom+Zma+EfjelzN1HWymD/rg4P+utxCwNzGrYiISsU0E
+YtoUt+BBewC1NUREwCaEZvjEaVVvkCiXtv9X6bUlS9YrUg4gaDGdDtiY3bB5Ftl0
+UZgOA9WoRQYnWx73ZBPrkpiAt625T4gqgYvwejaaxIf8EQ8UErkffSWgbJC/Hmpt
+STspQq5Ahbyn6KazTY/eZT7+DKu1iuYM1Fvi3VCiOSdpv7Uh4yCzfKpyGl+7kMSe
+Xpbp2r+HmwfMS4DdW1RM
+=osLq
 -----END PGP SIGNATURE-----
diff --git a/dev-python/alembic/metadata.xml b/dev-python/alembic/metadata.xml
index b5a56e626746..b0ab8676db40 100644
--- a/dev-python/alembic/metadata.xml
+++ b/dev-python/alembic/metadata.xml
@@ -8,5 +8,6 @@
   </maintainer>
   <upstream>
     <remote-id type="pypi">alembic</remote-id>
+    <remote-id type="bitbucket">zzzeek/alembic</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/aniso8601/ChangeLog b/dev-python/aniso8601/ChangeLog
index 85183ace632d..0a92b60b6c68 100644
--- a/dev-python/aniso8601/ChangeLog
+++ b/dev-python/aniso8601/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/aniso8601
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/aniso8601/ChangeLog,v 1.8 2015/06/01 07:08:48 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/aniso8601/ChangeLog,v 1.9 2015/06/07 19:16:45 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add bitbucket to remote-id in metadata.xml
 
 *aniso8601-1.0.0 (01 Jun 2015)
 
diff --git a/dev-python/aniso8601/Manifest b/dev-python/aniso8601/Manifest
index d5615389f33e..07af91606513 100644
--- a/dev-python/aniso8601/Manifest
+++ b/dev-python/aniso8601/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST aniso8601-0.82.tar.gz 64186 SHA256 e33ffc4ff6882e6a318c07844e346cd6160abe2f48cc2e797d2fe5f36364789e SHA512 7b43f0d6284b55f4a56d376f1898c8375336f7c66ddda3fc35766409feae80b5d9e0d86667204fbc896195ab625233d0207eefe52c110a52d79acf07378e55fc WHIRLPOOL 895ef0c4e5d00f142376db3a40200775ed9e1fbe509b82bec279a79c82374afdeb8da7d2f5e5e7720ec2c892d498f61538f977ae8cc806e62472d01f66fd5583
 DIST aniso8601-0.83.tar.gz 58487 SHA256 1153cfe2599da556c6ce664b12c0e39659340cc6633a316b34eaac480f276429 SHA512 393bbc59dfad69be4224c1149fdfd305486188aae14336b065791e994c50719ba163ba7a701fc785a25ff983861242a8d171a39139f4d475c002f4f4b8405761 WHIRLPOOL f32edfa8d52c820d466322b7b1a4e1cd1d5514276fe7c4cbf529453d4015b1608abd507a199b5079fb36fcb7f0c070675384677877649bb0da51c1249f85d818
 DIST aniso8601-0.90.tar.gz 64577 SHA256 2c0ec72a4185c2dd05eac0b2faa8d47a0477a17ca0784e1a547e544777116226 SHA512 b238461b5fa10236a9f6e9af5befff88b263fea872655dfb479b00045f4da07b7ec6ead9822f49b19ea0bc105d33db76a99efb4dec04fe85761bb0dcdc2a7d44 WHIRLPOOL 6c6df3d4cb1a2484050ff29113ad7f5a45c5dc2efd49aed50cb2286541c3cf562cee777fca3845108f7dd19f3281f720b32a7bafe337f01b13dc59978f0b768c
@@ -8,5 +11,24 @@ EBUILD aniso8601-0.83.ebuild 767 SHA256 cb0cb93dedcca52975c2e87dd669fc050826a32d
 EBUILD aniso8601-0.90.ebuild 777 SHA256 9c8ca441987f7d20746ce1d870caf58f9cf8ae8884753ff79bd30426f1307260 SHA512 1e2748850d3681eb7e7bba9eaf7c052370342fe811f611437eaa38f23c589440bca5985e13a7fcc1aa1a607c84724405828fafa68b34c80bb6afd5b06a603a56 WHIRLPOOL 941f1f97e66b51d9d17b951fe2cd52d3aec7d1055ef127b52eca40f3b44db2c1b6dea6fca91a22dda8e9f1c9bca0df692178ade5e3a5e59e7641462242d363bc
 EBUILD aniso8601-0.92.ebuild 706 SHA256 b360cb62922fc05ecf9000e1f14c7b9c719872b53d6a60db51d885de496532c1 SHA512 807d99aca4a4bc49b342550825099b4660c50965df6540d75392cf1eb30a6b8e3784c90c06ceccb966707a0ba2da566a7acf10f99f907454c2ff43d2903dfb7d WHIRLPOOL 417528cc740f806f7d44297b061cdecdacbd0e2c162ab7db91ebe55e6b59e019795e1afc5e1b6facf205d50d59646ef8e98c2981b0403042f7161f4040f8a6f0
 EBUILD aniso8601-1.0.0.ebuild 705 SHA256 fab0415fa8226a6125ad259cfdbaefb902d979bc172cc9bcf549d9cd795d4a4e SHA512 6b99293ff8153ee71a92d2a7c54527494efdce6c64617eae4a21b879ef1154f4e52ec8ae36842f1a3307db174bc3352a55426b7e653a1b0281c517c6e7ed2be7 WHIRLPOOL 0ce1a5f7790ae3f0aa7e38a72e3897b2341ba36c76e5d40952460cc73c0f19c53a88ac8e5da011f15ca4391b30b726ee9d9c13cea36f43b1f19d9ce7c80a41a4
-MISC ChangeLog 1121 SHA256 131562d9cf06d353ba78da4f250b0160fecd08c05f9a11a154d4d862b0a56669 SHA512 fe901db09a42f9fbe3bcc7747df6a4048b44809c72d65ac3462d7bef53c02ca9d644873826b13ac92dbba8f420dd260683e67948a2fd1b4e1640ab29fc34afb5 WHIRLPOOL 92d9ffc80547aeca8396bf33c7942f1725fe13b56b9d932b6901970a3c4248dba69d991a98e5c98ae3cd3e9b17e3cc6ad1c9dd3662512aca76d1ac3d259248b5
-MISC metadata.xml 232 SHA256 1b265602842e5e1049404d1655e9f9bd892e779af9650f5b99cd2ba6a58e23d2 SHA512 21e2171bdf0ec8c3205f5850681969cd9125a2455f92c34f041a073cdc7fe215e036273e8bf99881bb9b6073e2a20bd833f4c5d68bdbff64fc58247a388e0425 WHIRLPOOL 95e7e3980992416728e4b11da1926c107075e1d3c7a7b8bf78be357626d0325f5c84c544dc2c6c6463333a7133f424a90769124b7db63f25fc46a444ab0956c6
+MISC ChangeLog 1225 SHA256 ddc0b03f16c3915d78e5d8aaaa91dc89e3b3e1f65cdd0f51af541dbbc4252cd9 SHA512 22fd65ac1571ccdb29a45455b3309bc76aed6b0d42b88717468b4b73917b7adb3fa1147ce720e33e6a0ce00984c5bb0f83777d969d49b7bbf2bdc655f4971660 WHIRLPOOL 4aa22531cf9e5feb07b14fdb223c3133eb97f404a3d948b0a2dfdfe00acc36d73c65eedcd74ea03f865b196428fa265f21d24277df17d81b3d92262ca2862df9
+MISC metadata.xml 300 SHA256 d189f60d357851137fcc141e1ecd894f4dd314ef39b91235ed4db3f8b83bb2c9 SHA512 b0a04ab5f1bf7982ebd13bd9d52c001b8bb46c02501e7ec55a9dc96e6ec958310cef840b55e6aa1c1833e189a2eefb896f97378520434c98c7bbe92eef89d545 WHIRLPOOL 977143724063950e67a95865758fa9ce380f5a8aafa7ef3c72a7fa1940fe9714b0e1678d1887ca3144c2e13af7723ceef7e24c56808c640869fc65a2e4775097
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVdJieXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi7OMP/RbKYf1UBrrBA4hHZCTqq/6C
+rtjaS6L2hdyYOJvmJp5BFSMAn7iH0N+vBSpwE/I88rtbbTnrTGLvONIMfsi2e4rd
+L941TZnzoXeCeDkaeAF1KESjYWrrZZZuIjRXMoVqAHAmYOr+npuRPreoCd60KOh+
+Ef4/Bxrn2ZcSWXZeRq67D2t64vyk3xFZ5Xpjg5e9wGrZleQihfW/fstX30EVWmCf
+gxwdsaySVgwANClfSCTwvJTQIgMJ9snx+RBLPgz350LJg14FZbcHRoQLawK3GBC5
+vrcVADSZ35TkomxxpiqQeTXoc8XDmKY9zy6CxmcvGRYuAWyaIS4niON73n+ArtWK
+IzJFTIQd/eFmqV2dISmaJu5auQS7q334k1DhLJfPSqFKOZVlLR5NOC6Lb/sw9/cf
+tCBP/GWnQSiP0Mqs281jzuwXjIUZ6/b5iYJW1X81VqtystKYgzS4QSQ939HYcdo5
+unx0mZZJqLesKFRaQTBANwTQkGcEhCHo8kspPZ1yDkkgK0UwjnkTdCdCi4CGm+Fl
+dyHsrwT8uuzRJ9rXuWcZm+4sY1qHLdu8XMlmqyCgjdr+LbLW2tQzEovlc4pw6z+u
++Yg+shpyILjn1whcfd0OXhYuCwDUnGk5P41IrFBPsX8pJz6QI3jUMnOG3V25m1IG
+YHALMYAr9+gSCaqthiOH
+=aen9
+-----END PGP SIGNATURE-----
diff --git a/dev-python/aniso8601/metadata.xml b/dev-python/aniso8601/metadata.xml
index 72ef91df996d..551ccb5eb0f6 100644
--- a/dev-python/aniso8601/metadata.xml
+++ b/dev-python/aniso8601/metadata.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
-	<upstream>
-		<remote-id type="pypi">aniso8601</remote-id>
-	</upstream>
+  <herd>python</herd>
+  <upstream>
+    <remote-id type="pypi">aniso8601</remote-id>
+    <remote-id type="bitbucket">nielsenb/aniso8601</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/anyjson/ChangeLog b/dev-python/anyjson/ChangeLog
index 2e03a3c883bc..1a14b50e2f90 100644
--- a/dev-python/anyjson/ChangeLog
+++ b/dev-python/anyjson/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/anyjson
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/anyjson/ChangeLog,v 1.16 2015/04/08 08:05:15 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/anyjson/ChangeLog,v 1.17 2015/06/07 19:17:07 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add bitbucket to remote-id in metadata.xml
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> anyjson-0.2.4.ebuild,
   anyjson-0.3.3-r1.ebuild:
diff --git a/dev-python/anyjson/Manifest b/dev-python/anyjson/Manifest
index 2f88e485e3b8..67eaf03955fb 100644
--- a/dev-python/anyjson/Manifest
+++ b/dev-python/anyjson/Manifest
@@ -1,29 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST anyjson-0.2.4.tar.gz 4781 SHA256 27ddec5bc9220c13f405cb30adee9b5db17a608f56935618785219348c8a90ac SHA512 b916c8c950a927a6da341e67b0e123527fc54496040c8c71231e98aad1a7f39df3b0a090648127aa3fbca298268774aa6441c83267b04dd720a8c890223e5fbe WHIRLPOOL 229342c7ba6c2a73b1d582d9ca321d0c63c87f4d002a639df7d273327dec28c9fbc3f8f484c8d31c34bf4724e05b2d0f2558cc76ca8ce2166547621f357726ff
 DIST anyjson-0.3.3.tar.gz 8332 SHA256 37812d863c9ad3e35c0734c42e0bf0320ce8c3bed82cd20ad54cb34d158157ba SHA512 9e70df3cb8bfe2348fdb0eb03cf3c33ca5a1171aca6467787fc28c161354b5ebe89b2f73badfa00708774d6825799860493ddcac7f5da8cc9c251b92b5a343bc WHIRLPOOL 9a17b6296ddf6359c217a7deea989a6dd3c07c2f11125f934c5c4325a909b9a923c08b03fd49a96c30df8ed06c81cdba54ae5391240c7d288edaafb9c44b50a7
 EBUILD anyjson-0.2.4.ebuild 1048 SHA256 1bfd8a3bf42010b7eae78f47d473f3113f8dec3726e6345c41887942c565de81 SHA512 0e8e2a0d59be323a38e5209e651908505a7bedba49463f6afdd6a9bf8e739635edc2c164667f140b3397b4aea3f88511cbd827560cf405f3a1d55108a544edfa WHIRLPOOL b3da6a0e2292fb2d53f886ad875390fb9d11069df7dc4b37e8cf4da81bd37c4f7ca590fcea51cfdb3e9cee4d4cfcb47ce40e6f58fed283ffa704f17f6252058c
 EBUILD anyjson-0.3.3-r1.ebuild 1059 SHA256 30ea5037cf6e52d37e23cc311602ba6bdc7429433aad07ef970823aa5bd50ca8 SHA512 fd31c88159f8489c3346bb612289658bc490fe5c595a062822106e6fbba67a6be46ec0fa8765be1ef976d613acb063055b89bc1f9e0521e449ce0c05a4520086 WHIRLPOOL de69da4658f4d8e567657baf5aa6153c10567041a56acbf500ad3b782acfcd8d147c40319db79269e2880c8b0c11f4827c6aa708ac4b29e24e3ab4fb1d7f126c
 EBUILD anyjson-0.3.3.ebuild 593 SHA256 1d1e8cdc9486b96b1a53a0bd48145a02f56261dc0595523f5ea86aa70bda9a7f SHA512 4db3ed4ec8d1f39e47a0773a4a80ed07b7f7135cd3e18f131f14391e885f2ee814e3826b46f2059b258aa3ae5c3cf63acb5fc8f417e62a30334306ab54dc6fc4 WHIRLPOOL 0874a87d5ec80d686de1ef92ea1d3c260a76c9d82c6d8fcc465a4a20d33d690a1d24a61d3b1ade7170f26944be3c8abb3cf062c94bddb7cfc00a524c7822152b
-MISC ChangeLog 2220 SHA256 0fe41cb49be12304e358e87ce607f8f90c01ce3d3040bbff9a23b198057166c5 SHA512 510167e0b52d9d5f185d999a8e82c02b51b0d1e9938f5b3cba08182f9aa49c23f1124d0d8c79550c228a068421e1c2578437c9b029835a0fde1b2479012e2646 WHIRLPOOL 45130a8ec8d444f4e509b4ee3ddb71285685aefe5a215674b357947eb6a23efcd6ca266e568ef6dd602a969b831a6937420f6d5f4a2cd6f556e8567ca62a80ed
-MISC metadata.xml 230 SHA256 eefab88f37f79eca6090bc4f3ea0955775eeb5e444f1823c091ee093df39154a SHA512 d264604906083caa1b228587b4a1867fbf6926e7bf5bf019549c6ea9e1fb47522613df5bdb3313bc9b6a32ebccc68369f8727128e590a4cd0b608a2d055b2e21 WHIRLPOOL 972e758c577fe0c5be8529b56f7f921bba11ad3dfade2383fc9432be02acb4b983b92d0509cf92f65ac094590b80acfcb3a257f60a4d41a7a6f4d3427640cb2b
+MISC ChangeLog 2325 SHA256 03595ef6f5a8f66334f399fcb97eee68396f582f67e64e13d33786b0f9c6d737 SHA512 449d55776aebcc94db3efbd2436373bd6c4b89148e32c3629fc1a83e816f787423aeeceba0c27107063ee28b2712e937fa0c2e27b25c33adb46e2e978d56c7f5 WHIRLPOOL f9b2f2e4fcb11654521dba32e4e866913782dafc273a8cddda9866d10a22f89f2f44f857a5d3138e96ea9407ecb3b5e79cfefdbe2e72ccaf9e9470d8e894b3b8
+MISC metadata.xml 293 SHA256 8ef82c6b020b2162b97f59fd48762d0dc8bd67b6f737836d9da910b2668f9f29 SHA512 d411f45cda19f32a0877eb4a54a80998ee616550cfb04f06ee89e00f0b3a49803e45929057f571b67f6558903eb825a629880ecf681e50accac02875be6e5e38 WHIRLPOOL c67859cebc2ed6af6d67296e9fbba27b01a16764f5f9b91e53757018d1343e48b85b44f827e0f5109e50ec6d6fa4756b2be1d06db8545e47bee5d63c1ec077e3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVJOJjXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOZLgP/1xNZIVTHm14nOVjkArPeBNF
-ZVbPUUQ81VAFvn8jWiDkb+VSPNyMVb0RS2gwqT3WEpsRk3X932/YAJ9HrR0rcb+J
-XbXW7k6LUGDneET1TpQA623X+FxgPCoK1BX+/oKW0w5/mWWKBa+f7DfjH4+3ZVZD
-LcoDRhNiRpj/PAKheQQTl0mbMhprr8R0DXQuLP4ZXYMQ2LTqXlU2puyUj1z+q5NN
-MsiNoDkd0bsbvXPwpv3WtdWocL/lnopMtUrd+HuX2lW0D3bqHg0ZRC72+VstrcFO
-WL6lB9snfT1neDgE9L/IAjFDvRkaR1qba/gs0RbgjEYzwCF9k6kkRMs4oi67mxu7
-SXL9m7Rjz5N2lFFxLHpCVKIsaXw7lanvXFjviKFa8Cz+mtHo4geDUFtuh4adEmV9
-XGI0dbkYSeqTj4Fkw1e6wC3p5gXFgy10TAvApdlmzadA0shBb7tW+RAWTgpk9zaT
-ZlvW5en/hqCtFw9rWEdNG3pM7ABcB91C3xchAGHFXFSUJhAn9SiWF69rP5AExd+4
-Rh6mCRv8GUtAr9E/tdWtA9DD6BlMjRvGytGloN4d9yOlQ28YEJsBm0vEQ5qccxh8
-4zeT0tXIBXRXvWvxdzPM48tyr6EOzPa3NMjLEVB2ZSzEoVG14Z41H4KVdxbbvzrA
-TBpQY+xdtNBU2CfMuXuP
-=xLLU
+iQJ8BAEBCgBmBQJVdJi0XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiUnoQALeuQbigmuAlLeMiPV6uhpm7
+N8D14bznAx/zQYFVn4IxAD00PB+vcnhbgvDiqasMB4HzfV4Sr1JRReRxQmX+fN1x
+UHHGJiUZVcUs+3/Q8HbM4eTDRANoTsliWM/J9yFNn2cXw+KBlvh1WoAYawJu9kKz
+gfMA99Gb/kogHmYF8Z/ZgB7Zlv6S2tHxJy9uuIcwMePN05sSze0KVdT3ysV/6q3i
+H0HGQMneMGtnV+SS2T9mD+OORXsKltnT9iW3j9HeIKg8ay/SBfU0jjTh3S45j9hQ
+GlE6HWoKGvafH4GxTYBko2G7DtOUV+C1ohpe0sdb8rsNiGmGLvH3plED+mO74cyj
+YdMjJYWZ/BVpYGpN/FqjFJWR49hqf+qXp7dxQwkWb5JvIvWOQbAYcSHbLESQbuA4
+x01bXCJHZggBpYVPkd36jg+0HOE4/on7UDby12LsLM6tpGvrKccrrvZod7B+BOds
+CNrnx7PIUsbwTXwlZGh/UJIIEv7m3FLJUOEk3vWqptchwG2ocZnMOC91BqfDF4yC
+niBGPKVmMVcMLAbccTmgnzokFRPaUgMM13/0iuJLyTBUQqc2WKiSpdE6Y7+/eDE+
+K7xRLNqlR/Z5r3qOmXf0Ofg4mwsbfo2Ubqni3k/0L8d6AlWcHqMAheKLvQR+hN5t
+pvvaUrd4dhC31zSmsX0n
+=HaIv
 -----END PGP SIGNATURE-----
diff --git a/dev-python/anyjson/metadata.xml b/dev-python/anyjson/metadata.xml
index bce73902bdca..f73b5edab803 100644
--- a/dev-python/anyjson/metadata.xml
+++ b/dev-python/anyjson/metadata.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
-	<upstream>
-		<remote-id type="pypi">anyjson</remote-id>
-	</upstream>
+  <herd>python</herd>
+  <upstream>
+    <remote-id type="pypi">anyjson</remote-id>
+    <remote-id type="bitbucket">runeh/anyjson</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/astroid/ChangeLog b/dev-python/astroid/ChangeLog
index 0c4f60a384ed..f75fd309eefb 100644
--- a/dev-python/astroid/ChangeLog
+++ b/dev-python/astroid/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/astroid
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/astroid/ChangeLog,v 1.22 2015/06/07 09:12:50 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/astroid/ChangeLog,v 1.23 2015/06/07 19:17:49 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add bitbucket to remote-id in metadata.xml
 
   07 Jun 2015; Markus Meier <maekke@gentoo.org> astroid-1.3.4.ebuild:
   arm stable, bug #540290
diff --git a/dev-python/astroid/Manifest b/dev-python/astroid/Manifest
index d71ac35190dc..5806a41134c8 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST astroid-1.0.1.tar.gz 112597 SHA256 46c2b57ab1eedd1b0931c075c21644445dd589a92481e938cf66495e0f205fda SHA512 277353f30b8f3ce509f65f3f4b5f6da70bd96483ef22cb03beebe141c9eece1baa2989b40b545ed71952619814ba049796b13727d97531d2630ebfcbf1cb6cff WHIRLPOOL 85c83ab850bc0d9d692995127e8d51803aca824425e2afe204479437b618b2821ed3ede3d54af043c9a164d0e419b54647910b1e5785c0fcdeadb1c56fa7c818
 DIST astroid-1.1.1.tar.gz 119539 SHA256 780735cb451f5ae982bfa8a6b80866305e3eb9cbdd68e58d79afd94feb00e1f4 SHA512 98d3c2aaa6686a5080886f74da33fb72842ad90ee6ed5ea4a74fce974b3745e351609a6be1565543ba4dd29b6b793cbb8629426fed39587d99d5e3f2bca92ff6 WHIRLPOOL ef139d3c2ded68a0acbfcbd417b080fd9b499b7fe189b883b6252353d1af1841d1524652d6305e499dc7f998893d824facc4736e9034d0b902670cc11b0d4986
@@ -12,12 +12,24 @@ EBUILD astroid-1.1.1.ebuild 1560 SHA256 31edc7a7ac69ad1aa899e0ed35de21af2f9845d0
 EBUILD astroid-1.3.2.ebuild 1320 SHA256 bc40a33bf41d9595980dcaa3b9073d4fa445da5fd8bbf610fc5f968fd465c8ec SHA512 dd5a85d048774e716c7ba13b657aa218bf9d5bc90497b5c1cd274f410705910f86755106afcad0b6a0f9d92850cc79b8e85cc55d8332551606c54ce624a3f840 WHIRLPOOL ea451c28e5ae2f1bcdc5f4f9e393ee923c5ee3aeb1e06486ebf3f14db26c85fa4a9101a51a588f8285bb37060ee0fbc080b04a4c2814b7497be09b741d0cb2c4
 EBUILD astroid-1.3.4.ebuild 1345 SHA256 2dc39152faeccaed2f1cadd6fc5fd9b730ac7114d99bf85304a99e0d39e02703 SHA512 6323fb7585dc43ec03311a9342c6a832cbd9b7f3e574a1b3aa5265923dc856fad6b0934dbfe310b819e0d5c4a160d516bc50553cdc1d95f0a593e85a47f170bd WHIRLPOOL 4c7c349258be3215064da54270a7b4a097a5436dd5c0567c0b98120a0cef3ed43af062478932d8bffd7c1cf50e8f4451fa91bae53c67e97b9aa49a5433820178
 EBUILD astroid-1.3.6.ebuild 1354 SHA256 05dfc66dab9441c6b234fde6fb1488d9ff34e360d67df78b85139608d15ceff5 SHA512 7e1f0c0d21d1ef47f173920218bf5a9bad999bbcd4a441ab4fd2a3b064bbe56401b2d24c498e946578e51b3cbfd94a964a8075942cb933025a20bb2d8211b471 WHIRLPOOL 0dd70024277f5d7b6184ecd9a9240fec47d1ce127aacaf03f9377efc76e998f8947183ca3828b26a94eb2f4fdbc954aa00ddbcbf2086128f8a4b340d4638c7c6
-MISC ChangeLog 2996 SHA256 c28f411df61393de29aa0bbab7d52e33ee2102eb29a0614a71b08b238f46affa SHA512 c26660e1b3c6e711436cdabcca700324d8780333e7ea1c769822d48c02d9adb5cb17c9a4da9591325c69ab81f99527c9186e0634c432ade9db7dce045c8a63ca WHIRLPOOL 289b2da6cbe56873d849e44d2fa6420b838e40f59997f71461f9fe5c5f232bfc7a6b72818c847867020f84fe96b69d610ea27e3ef20c5259744610a410d44efd
-MISC metadata.xml 977 SHA256 361b3b8ad67249e1ac5e9887530f8eedb13d4f26dccbc654b77243f5d53a3af7 SHA512 921e65970e65f1d8fc3af99f4180de92484c1d9e17812d88a2e8f57257e4ad3b7db8cdda08e1b69f4a31c55e252073dafbcee4b97ac38f51736654bdb3eaf73d WHIRLPOOL 89e0d6e651f201544626c110f4710935c861f50f9abf66fe6b440dd335ed562e072f9a1da0272c6977455f597ea6b0534da4619e32c1b879792a43e84324a825
+MISC ChangeLog 3101 SHA256 df59fbf0d74bfce3218cc1573b7f094acd4c4de727ed1afb2ab98caf66a0f55c SHA512 d346a623b96a04ccd4d578d6232cea0d166512f88141c25dd520dad5da1ac645aabcaed0175e309d3ccbbf43ede3ff487bad0e6914ad61d32e89758a2ae64800 WHIRLPOOL b7d3e22f696228c428b442e7d29f24961fad379274e6a61edc66643af34eaaafb4386fdc52037a2bb19af6d1020dc3d365cc64859b4b393f63a36d69da8354ac
+MISC metadata.xml 1037 SHA256 6c610d18ef6ab5f595bde74d59ef334418a613adc77a098f772d54d8b3ef396f SHA512 a446adc6e916fc24bee74bf606d71b817f9215d7547a29340ab53949d335bd577ad1a30c8efb27285fb2ce59c4038ed13edd23e563a9bad21ad0142c08cb5b3e WHIRLPOOL abda856f9f158e800e0d001b504d48033d1d75c207a3fcbd9e6bc844b319e784d9180576585886e0c0f29ebd600051f5a466e81a1d36ee38a470bdf3c76fe749
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlV0CxMACgkQkKaRLQcq0GLoNgCfb2a6P0AH9Un97GrTB5rEAqcA
-UZAAnjzbFuNDuXKUsqIc4LVeTwU+BkOO
-=xdrM
+iQJ8BAEBCgBmBQJVdJjeXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiGysP/1/Yc44n+fYyE7Mrkk1kJLpj
+S0Ew3jb9WWi+fAB9oN/SO35bToV8tMzWPodZp0kSIvDuEirHSKgFvz+MrhLwLzxx
+5OsxI77Stas9FLqwe9TaIC6r4nRQH2uBGw/brdMhfEqCSF7DfMTfh/A0BSMbhOBB
+fJc7nS59IlrcoDpzddpFHnxEnfso5vZzNZ06EL17N/Ifu/RIX/OZbhIGcRddw8Iw
+oTpR0bm/q1NaoJOFHuS5WVfphC6D/fdGUOfaU5JN1YwpZVn3Zw0n5VEpFrRhpElm
+WlT3+id96tvHaJO2Wu96HM9rlWJdcaV5w4nmBXGbshnLjft2vJIbjlpWJcsG+3Fg
+q+aa1eTXrtoGkgog65Ebq9buqGnpmmXf+Y1fRipEroSnVZuU8S6CdFwv/ccWvgfZ
+iqFTLjAFbP7ZRoGEE4w8+xf9h+xXnztkFR6WZ//7A5cOua71JLLwATJ8Df9I2T5g
+ZvnpHXexKua5vJcPOffyeHy1o7BkUXjMTZaIKw639J2ENH/BpaclR50BAL00UBMI
+uhVgZ1chn+8wc/b1EDKhkPPHe19v13VCBS7gz9Y6Uw5H3AKHHsHaU38faokmvwAu
+ltgmasa+kjStR4ChtWL9rT0+xi0DGmkJJ5t4kuHtnylaV2k01arEg5aJfv24ys6i
+VcMX9IypNBrAzYw1HfTb
+=fhW9
 -----END PGP SIGNATURE-----
diff --git a/dev-python/astroid/metadata.xml b/dev-python/astroid/metadata.xml
index 7ab724cd51ef..7794b7137e79 100644
--- a/dev-python/astroid/metadata.xml
+++ b/dev-python/astroid/metadata.xml
@@ -15,5 +15,6 @@
   trees by inspecting living objects.</longdescription>
   <upstream>
     <remote-id type="pypi">astroid</remote-id>
+    <remote-id type="bitbucket">logilab/astroid</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/backports/ChangeLog b/dev-python/backports/ChangeLog
index 6dd756e0c549..f6ddd51b7d96 100644
--- a/dev-python/backports/ChangeLog
+++ b/dev-python/backports/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/backports
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/backports/ChangeLog,v 1.12 2015/04/08 08:05:17 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/backports/ChangeLog,v 1.13 2015/06/07 19:18:16 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add bitbucket to remote-id in metadata.xml
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> backports-1.0.ebuild:
   Drop old Python implementations
diff --git a/dev-python/backports/Manifest b/dev-python/backports/Manifest
index f9f5cab93c7a..7e32fc6ddad1 100644
--- a/dev-python/backports/Manifest
+++ b/dev-python/backports/Manifest
@@ -1,26 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST backports-1.0.tar.gz 2070 SHA256 ee43d5b7bf4e79e04fbab30a09421cb5cbf4f56e7c14769393a7d1c34ea5e740 SHA512 069e155209d6036dec09000e4543abea9383f13b229a7259b1d3d02fff4b51be1a32c766dee434215c8a5209afc5e7d24163d188a77cec7d354d34170665bd37 WHIRLPOOL 105962b9fd92a4ae9cf6b9c54a2306b92460971efa0bec7885167c9197fa286be01f077e0ed35f56f6c341223a42f4e2ab217f745283ae1a0ffb70544e1a5d50
 EBUILD backports-1.0.ebuild 643 SHA256 476a98235f7c60563be1b3e1e83809f41bdf7540cf527bc291ac5cd5ca13044c SHA512 2caf863fae45a88c232db9960d3f561746c7d49b3cb3b581b02fb34f55a54685ea1d780b32c6809d78b2bfe470deae9d254acd2c31d60e91f1cde0834bc10c24 WHIRLPOOL 7def9519ee5ba4d86b2a0839c7be8707975649fa6d063471b2d661890ae340da94896cafd2efbc500c68a88fa8de2de97607a61774d5536d91999cc4ce4e2135
-MISC ChangeLog 1394 SHA256 bf2e39e53cc8037cc73cef6559acbe4c92665ab99832285f570299877b80d392 SHA512 3ccabeb9cdeb40f803c6e2e6af732b7d656ce7f28f7119986cd25d310241132988645058a9e64db11d88217ef1f9565c1c48faf2b8ad189b4a22c707f2f53c76 WHIRLPOOL 0d1f582a2f2cbef7acfcaa91c1e4b123beb0a547e29bc349c5f583470e331a6a97a18f1edfb1b8389bce8709fe95bfcbe72cb1ae390def42c6e8aab8dbaae71f
-MISC metadata.xml 253 SHA256 9f2f51fd5d49ee6b0ef785dd7256455213e0e18e37f23b498cfee07dc1efac7f SHA512 5cb93e348b913d23ba4283ee3baf4a052658e27cbfad60ae3b80e68317909342ad3ec537724886b746f3cc1ada9db3010e41d80b615919d596df11bbe7bc7fed WHIRLPOOL e98beb144d79c5c872f1709991bd5b3ad17b63c494bcd4e9b2282957b309a888788e2b1c3ed8231a108914f76e0bfd21b5bd395236c09c25caa71df3a6063a90
+MISC ChangeLog 1499 SHA256 2ab31ac8d3487b72afc3ae58753a1019bae580f54c34359052918db687863a50 SHA512 bca9f8fcfbeae9fa33c0c749b0c3a721ef1b19d4755829070af2a6f6e6d9ffa8fa57ce370f977353c831eeb8fb30a02690bee769aa3d62f8e70b161be17907c9 WHIRLPOOL 91c6b82278098c61c1d62188ab5fc6613880fa92e99c4b526cbe07fff7c60b28b261b3fdfc57e1818e8ac4aa035b4206e06bfd4a380a56c23b25adb0c47e5267
+MISC metadata.xml 349 SHA256 3c857f6e0ef499d41581bb648d27bc996ba6f4d1a363313c0a6f449e18e0fe06 SHA512 d833604d386aaa9e24838a9c4b9c4b584f9d647dcdbaafb2e7c537fbe37eb2ff2e68f58bab96c98c1d2cf836f5b1dcb1aabe4045ca930986e80cda66cc059291 WHIRLPOOL 654c8de9fb6b298edef05598e99079b9ba7dc54499dc0085e48b415039dc35369362825c7a0722468ec931f09b1ace990774b56ac3ae8db70cde57ac2b755f20
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVJOJlXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOYf4QAOKK6qAd35RGD8jln/A1b7ql
-WVBQJAkp+VIbncf0JxgmxuL7qnnQqSRnpgd2YGw8UKCMln/6jj4C4mD26b8We1Qy
-4IYkRXRarzD1U5W1l6T4IHzIqEOjk2sKraDFzYiVfcCiKP7IQftOYp9IIqCVl1o3
-0z5koNH352WZOa+cZA0Tqeuip8H/CqJHZ6Nor32rw8GHTnAYEKv22OSHjUM5eAE6
-2J2KJEf1mqGFAdHfzxuWUfs+W9SeS9uVhIgSUSQprbDr52jmxhGi4/qYEGYrNMC8
-NIZHQafcIH5xmOMDItzl1UxO3XW7C/32hJS+Na157HZ5NG9UG0f1EUWF3DPm+c5M
-+uX/NPWFUDzQjRcOONfZzYflvizN+szHrK2lJe09xBQQ7ifSCNSh0E3zoIJoGyaX
-kfkARv0z8Ah8AAq5VGFq7YHg6yEj/c1PF6NG2c1IyXpNjJrCBnVvjBhyZv0iZJsV
-m6V0jFWs7en/B7+MoxmX7B3x79UPRPNI9qTswWLF28f1mkfYaOv3dxsGfiaqNTBF
-rNGIUxJo2N8UZN6tbXyYHWlGYJKVwyeEpApjD1q9yKFN50yPFcrlGbZBF+QRzEQU
-JTAnzRWwDpiN9bwpi3JIKiFLsHWb8+HtaPMydCMrYdkLT/2uJYCSMImUqyrg5Nmn
-O9gdGay6a7S2U0kRrWat
-=2JUy
+iQJ8BAEBCgBmBQJVdJj5XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiLP8P/00Q3+p5eL3V1hsHHnAO74Gp
+ruvQDhrzdgz1bexOBW0fohEBONIVOAF1I1ZuW/dKtMvS0ViuoEOujJ2UxsQJJTS+
+15UkWjOI6/739QvdbxW4JuaxWytV2ICpCaaLnUTeFBmXhYiIgc5U3eAHXj151SNr
+rw7rDmplcd+TW0xTmIiFtU5dFI2aR2SvM4+04BvsnwlAuTDWsGdF392HWrfxThCE
+58nxqmnDoh/wTBTuaBIcrhtZiqZ8MV0l5Q/nTv0wZp1VoHzmKF6dz4MAex98R5jt
+qXWwbWEYH+uSfYdx3hMmoBknCwC0YevGAw7xQsHo3xYTYamJFI/Mloq1MKBPSCg3
+ONq0VdhwKSD85t4JmOGeqmeV5fztvo5qGqBwld3IWo7s3vj8Vsh56ngkSuAPpCkU
+2zxg+oQh8PvzO27IXm3Uo4832WuET+pcfey4/WZ/WyhiHgs2EaWAJZWvQo/TIXuB
+fRT8sKDoPaXL0NByvzzDt4YA3WY8HSKXz0QIxhxDDUQgNNB1zJO+P5/N8j3f6Sue
+VsR5ZcRvoliCOacX3sc7wGpHI3oCRKgqcwcDseFxKzf6qw+R4PQ79YmeBv9qFPpt
+f++K6xe6Abad/X++YImi9FsNk0ie1PozEjfqgZAwBUE6seQwGcMx4gyOhoVDM9Bb
+7v0iO9faAfY10qi9R/aZ
+=ZahA
 -----END PGP SIGNATURE-----
diff --git a/dev-python/backports/metadata.xml b/dev-python/backports/metadata.xml
index 9300f12fbb80..e01cf2895863 100644
--- a/dev-python/backports/metadata.xml
+++ b/dev-python/backports/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>radhermit@gentoo.org</email>
-		<name>Tim Harder</name>
-	</maintainer>
+  <herd>python</herd>
+  <maintainer>
+    <email>radhermit@gentoo.org</email>
+    <name>Tim Harder</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="bitbucket">brandon/backports</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/bpython/ChangeLog b/dev-python/bpython/ChangeLog
index ab5c07929820..71fc9a1e9041 100644
--- a/dev-python/bpython/ChangeLog
+++ b/dev-python/bpython/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/bpython
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/bpython/ChangeLog,v 1.56 2015/06/04 07:03:27 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/bpython/ChangeLog,v 1.57 2015/06/07 19:18:40 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add bitbucket to remote-id in metadata.xml
 
   04 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add pypi to remote-id in metadata.xml
diff --git a/dev-python/bpython/Manifest b/dev-python/bpython/Manifest
index c3ceb8f13990..da7565a8ebb4 100644
--- a/dev-python/bpython/Manifest
+++ b/dev-python/bpython/Manifest
@@ -14,24 +14,24 @@ EBUILD bpython-0.13.2.ebuild 1961 SHA256 8184dcc22a5032f83910cb508d00668d6d326b3
 EBUILD bpython-0.14.1.ebuild 1731 SHA256 33fcb4dcfbeca3384714ae760c461035483695b832ae87e52262ef66b555086d SHA512 2db8fcf57dbb911539fc9a17cc6d15a33b515343f5180d05d74985f2ddc7fbe09d3f76d088d89f50ce9fd62385dcea2880f11f12bd269d0cdce7effb1f1cb7f4 WHIRLPOOL b59ef5934b5a5fb5fc173899968b0c5b7bca145dc5e779bd8f4e77f41a50bb9a4c537ef11ebf522d80d908488c3de197831927f153b332f80b6439c226f329ce
 EBUILD bpython-0.14.2.ebuild 1731 SHA256 0b3e1d04408681673fc49d1515a86cefc38ad7e47af204c12f30d167d2b707d1 SHA512 5dbe98e832ada962dfaab57bb63c99db36e52a160d613a91455164e2ccc6066807fb4a1924a37d8ca9574609ae78ce30dd9f4cc693eee1685755e8cb2d095c21 WHIRLPOOL e6a7e0942da49ca7344aedfbd3f7421ed3f0c8ed7e069d0bb3d8bd0c9b0cfd6c430b1e3763dba06bcfa78c07bb32e6faefcd2f47170c4077ca56b8c4d146817a
 EBUILD bpython-0.14.ebuild 1816 SHA256 aeef8ee2d2de205c2688a670c0ab5b4ce43df735e04bdbfa43e6b8de94c31281 SHA512 8a996d5f96299ab4e8ead413724fef5c58193ec088059bc8d3916f1be94600529e21d654f759fb108a88a1a7562607d1246bedf1aff4d5f13e7fc4fbbb4a6daf WHIRLPOOL cba25ef41438806bd4888e4797cbd4e071c36f38946f77e39739a9e8d536b59f00466d1e13576fc3b2e9587bf071a1115b53122a410981ecb3c3ba24c93afc5d
-MISC ChangeLog 7492 SHA256 0a5a1e7b5fea2b6acd73dc369b0fab93585fd5c4da7605322a8ffb7a1c680e4a SHA512 4e1ee09cddb083e7f6dc1c6524a95998af681228bf911309ef9141538c4b582fe8e4940a40d0de050e2179bdd4eb0f6278b87bc14e73326bcae339ab15182379 WHIRLPOOL 006a1f58d0fcc30645df1a4ff19d5d4e8f8a5506f42e984dfa2186c8e2d1ee324f8109a9d0cd95073dba53df0ba64b0c5e0104dde9f301605a2b57bd47bd8aad
-MISC metadata.xml 442 SHA256 8ee7c265bc75404c3347199029c013763f2d54826866a78f3d9a6f6a7bd0bbaf SHA512 6742d28d5cfc23a8623a8a32c792fd7bebf3b812b1fd34e99a61fb8e173a38961fe288a3b2c0e3fd133604ca6e44737f30a26ba0b25311026d5f80d5c58fea32 WHIRLPOOL 4310e91e25578fa7600ffacb00afcef046d2b18b3f207ccd4dbe98f29d0d81f785b8cb8ef418c4402de2f62da647b402707ccb142b9e993dc178e7bf78e3e560
+MISC ChangeLog 7599 SHA256 3ca81c103dd35b21dc80c41de171a09c2e20117c4f9cb4b1d5eb8903e15d1445 SHA512 b4e7f17fde19109c81cf6fa4cfc45b6ab6b8889b72ae22bf56e2fca2e8acdd052dc4537edd324649df646adc1ae7111c9d4aa3f38e63be5f348475ebe6c6a88a WHIRLPOOL 89a3383f596f952191db4656619d58eaf95b6fd2504cd2868715d0333a53cd33e79b76da0c1a7244185ec3ed513cb98eb1589c2d13a35214b7c0369dc1834dfc
+MISC metadata.xml 485 SHA256 f5f1f54378b052d26b0678894455ebad600249ac44aba95c678c3dbed2a2ac4e SHA512 f6f3d51bcd07a80db5ebddb15954bade9d470b41e95ab172cb2df6e7ffce17272cad6cc9b5c5acbfead6b631ba19edf561d436a057041e4edd871ebed67421f4 WHIRLPOOL 510d2facad7b0de0a66a3816b85483f8eb6c0199021b39577fd542eedbdb56f0daacc8300eff794c64cad3835428ad4a9e849753b396fadcfd1ef569307076ce
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVb/hEXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVdJkRXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmicioP/iV1jRldWL/NRdGVrEbgSZ9d
-LOJRfAgeKpkH2im7fFjmS8Czli1d83at5NiNFT3MwY3K1ld/4DOUBUVkzESvRxin
-RNjGOLyu5FHX4kmIFcjhYNJFlSL6R1rpMmE6hpFfR2tb4w1LrYEN46+bhVOlKKEL
-C2QnMYNuXQUkbHVBkJvdSoahb3cc6tpnfN+gLVIR/waRKK/FTPoL7qRz9JF/T/3P
-N6OhIypgwcifX+uYt9VFtw+PWqvvFKiFQcdqJcU3Gy7YGFAuLj2Juco1pjtCsHuJ
-Ml4qnv1Z1Qzs+bp6cs56Hkanx/Jn/m0R/g334Fo9lYGk68Pi5ravY6noBegOKl+S
-x4mv97MQpLmXgXyiXkz3CuOyBTXSPPWNW3kP78imGmKqHg7YqeCd3a6+fDux2kCE
-JWbJjeLlb3VShBc+Zf+02+vs/18DB9IeiflsT8+Owp5hW33MkF4BFdU5836x6e0y
-y/+rOB0KrFQ1SdqgvTmRxtEjj/yzrVuPJGlz5XO7/F1Gqs7MNoRkAt0i4Z5iJijB
-dRnq9OmokA7IlR1PefP8PFIr6UsTp+2U4B2r5pWXqxGNyv8HcLglf5OmHJO3gkAh
-QLJU8cX2UCxBYZYAbTkUk2YB+bemCQyc555A/Pp3HTxchs8o+k8SZd2xb4RQ3A6N
-i9aeZP6YvOV7MEaaxYJX
-=4B7d
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiRpEP/30p6mfk09MqhdJyS0pR3F1N
+sEBBxR33fzoUqtVQG0/Ud2k4XA3xFHeGDgNZxMhQ+k4TkJfE++12MKj3JuBSlQ2k
+YFN4C9L6mfTFzu/IYowQTpOhB4347oaVZtfcm5Gyqf4ftfvsMGzvjVz4MPg/KGUu
+UZTQ6jdxuv+J7+BG26QBTl28vZZzurppeERElRNgWsbnnXmUdfsFoK9HhbFm/lsi
+QmDfz/virUj1js6HMzcAvUVnP6Pfxk3rMvC9d8IcAMp8y/NDglP14pUvKOv84ZpG
+D5YjTH9bXyc9LGEIweThjxqv/A8JAey2+70Sym+6dm+rpDkWXLvQH+0eoVao/pOM
+P3jFXkqSgRaToblQ8Y8GtNmOD4Ig0cZvKgiRR1J1ZDWC4RZYttcFcdnBlEc9M9uv
+oAp15SOyW1TVAnzX2YlxkgkmAOWisgPY8sVEFxKJE+n6N2WaudWc4piq9AjdnXUO
+OlIBChtS4shUDVY+vJlyE61OiOSf3v1Rq7N7GSk8k/8HQhxWVTBgiYdAl3XBIHib
+Ywd5+VRluQbRZEB+5JGYO/imfAbuOc/t5eC3pXsehoUXytKF0k+o/w65AcMuKs/u
+hauxqoxG1oZKODDWIqlAQOV/7GliGGS5DS0mYjo+yjhXFqQzb6qoVZDeNfufBhnN
+HyFpqSnHD2HqABEW1KfI
+=DrcF
 -----END PGP SIGNATURE-----
diff --git a/dev-python/bpython/metadata.xml b/dev-python/bpython/metadata.xml
index 1588601178e3..346bda3eed20 100644
--- a/dev-python/bpython/metadata.xml
+++ b/dev-python/bpython/metadata.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
-  <maintainer>
-    <email>grozin@gentoo.org</email>
-    <name>Andrey Grozin</name>
-  </maintainer>
-  <longdescription>Syntax highlighting and autocompletion
+	<herd>python</herd>
+	<maintainer>
+		<email>grozin@gentoo.org</email>
+		<name>Andrey Grozin</name>
+	</maintainer>
+	<longdescription>Syntax highlighting and autocompletion
 	  for the python interpreter
 	</longdescription>
-  <upstream>
-    <remote-id type="pypi">bpython</remote-id>
-  </upstream>
+	<upstream>
+		<remote-id type="pypi">bpython</remote-id>
+		<remote-id type="bitbucket">bobf/bpython</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/cmd2/ChangeLog b/dev-python/cmd2/ChangeLog
index b2224fe832f8..7bcea8c43b81 100644
--- a/dev-python/cmd2/ChangeLog
+++ b/dev-python/cmd2/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/cmd2
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cmd2/ChangeLog,v 1.10 2015/06/03 14:11:52 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cmd2/ChangeLog,v 1.11 2015/06/07 19:19:10 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add bitbucket to remote-id in metadata.xml
 
   03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add pypi to remote-id in metadata.xml
diff --git a/dev-python/cmd2/Manifest b/dev-python/cmd2/Manifest
index 85e456a38102..281785f0ec86 100644
--- a/dev-python/cmd2/Manifest
+++ b/dev-python/cmd2/Manifest
@@ -7,24 +7,24 @@ DIST cmd2-0.6.7.tar.gz 20558 SHA256 8e98c7a1cfd106183559240b269e7cd9fe97e8342b5c
 EBUILD cmd2-0.6.4-r1.ebuild 696 SHA256 73ece361357bbd5e54584ca6b498084caaf26ba739925eddc30f85617452a50f SHA512 9dcbde9b20c281e5f6643841e3c60d2bf79bef3553230c41e05eaf3f2dda57fc3a187399aad21fc3bd9dd7de455a14561e9f24400ed0ceb9cb88a138abd006ef WHIRLPOOL 3eb0d351bef23d43394004992768a9ba624e3ab177d3af38838bbee78078ec520065f6ee856bbb5c9a3b9e69dd4e9a2857bf51227d41dca895c0b211cf820e8a
 EBUILD cmd2-0.6.6.1.ebuild 935 SHA256 9fbb914fe2493e6d9d9b1d381ba3e4857c8b9a0d4f1e4ab03bc3228026edf906 SHA512 36ccc9bf298d52586f59804932ceb20530b693361bf4bc9c1a54d9aae9eaf3a7bb8d9f512450b4a3afbda4ef6b02c105c4567d3e9df4c61f3df1be19239801d2 WHIRLPOOL 4d6fbde55a672bfde526546f5f37a576b5f0eb0592be1dc328389b1614859e2edfc7aef71c6ff9f6e3454358a2594a5391d408a553202b26291d9232bd3fdc49
 EBUILD cmd2-0.6.7.ebuild 974 SHA256 df7c138334d94a6e137771724dbe72c1f66fc52bb6b4e23cad05be78d7f43de6 SHA512 6def3fa81c4975fa6e4a182b5a4b1b4cd346930427ae5e18f96b6916f9118a9c75f48fbcdfe756c97a87d096961ae34070c670c6945bf408a667a4291b63b225 WHIRLPOOL b14399fe816447e1a82cb68ab264ba653835cc89b31ae0647870c141a4109ae33a30e9405bc8d41d044f722b87cf2a3bc3e64e8b56569299e2b8db495a32ed34
-MISC ChangeLog 1639 SHA256 e1312924692368a0b83019299168b7da7625ff534b782321784d80177e8e4b2a SHA512 6b000e83f3f1ab854aaf637ad27dc4ff9a01ac64aa9729dde353f612fcc5434fb8a26799cdc3963bf63c27d80becdaae7882c049b8134a6df75e10773af44420 WHIRLPOOL 0b25d47d2df0424a0cbadacbf795e43777e6e17059069528771ccbb45b0ddffdb8669cb399ddb581343ccae9176c30c65a7b3dc051383cadbc6d449ed8ff0b81
-MISC metadata.xml 443 SHA256 ef0e8411b027658f8aa7ae846e464800ffda60bab6c3da3bdc350a73cf9bbe7f SHA512 c9c569b6ee835f6952dc428e957660d7f2b9a20f3445456398cd59a2175c8a8b555fb76c8edad0ba7fecb36e3232bd7315d87ea1930eb9d018639a6f953d8940 WHIRLPOOL ca714f3b80142ad3dbcaa559487750e964f4f53166f85f41518e1ee89c8837e5c8688159afa72ac587d00c735f0424d587a3be7670756dcd5cde900b07c1532a
+MISC ChangeLog 1746 SHA256 f98fe1f4250bbbac1cefc054321189ddcb7c964c7ebf64ea6f4b216fbf5a7aa1 SHA512 e3ea213f6bc77a97c60de5f37e49433e6415193066a77d27a0ba81acc8cb9d272915e00aa2ed49954c0cfeaf15b2278bb2260360155fce2e1d0c7827c7b389db WHIRLPOOL dd70551e4ad0290fb7c6b7a9d42632d687efc708926f735280606e0701d7c33a927150c39064171659877d0fe0e437cbe66bdaed0505acb6047f6d3973e611bf
+MISC metadata.xml 508 SHA256 3f82d2eab0fb8cba27ded3b6e1ff54d891c82d29260b6d2e840de78f653de692 SHA512 fd85e31a747ff68e0ad547fae83dda1158f1a7f35db92be42d9a63f896b63d8ad0595702e71be162d26adcb25d0306696a25dfccb115f6a2ada5e3e7578ab7ed WHIRLPOOL 9cca0294003f7d9552a097bfc9a8f17fecb83f0b2d84aeb389829d2fe00429a71f037cb0927a7d79d08912cbdfbf1e13f33dff5437bdc42194cbf0b3072926d3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVbwspXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVdJkvXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiy74P/iF4eAT0yfqdZ3bbPvpw8Baj
-1XU+/NsDOEqz1pd/4hkVBEHb5s2e0blAHqFueMMEVV3CawQNrxGoMh6l03QOQbTv
-TO/OfhXZTmLxwLw07FfMKF0DIMf6s+pkCaM/i4KRkMMkJlF6stDNRVGJx96lwlrm
-QfHj6gfBYikldlr6HM1HLWMFY6Geqxleo46BmUt5GUwAGBGW28U492ABQin37gKM
-pQIAjzU30Y/gYjt+QzQcN6tMb4Uf1nbMeZAiB+A15cefke6uafmuHtsWh7v/86hf
-4icwhD3iyNBk9r7cJKNmTCDTB6gyUIT+VDji/6u5PL1zBLRsc7yKmBCFGhBYzAza
-OLJcviRk7LawvPP2VhXeYO3WApYXzNmWnbLNbzYm221OUP6p1TqqVYVU+76hN0oD
-PWb+ipLZ8fl0CXj6XiESv76ChMOpYj4WJXnSFzLotR3Oskt3kwkuDszNAgK7e7zo
-Do+E7+K0Q4zSRSWqlxUe0c2l5jOHhPOoREiQgUuIMJ/E7ZOSePIuWq0KwdyoEbD5
-I/xFBnd/PYRCL0rOuEGmCfeSrcmrJbqoFXkbznfM2mPbwptsCOjYVuPax3Zh3o02
-ikrWSTBPjq5Xv5Zx9qnYi/BFV/x24q0/M94v5dhDHvsSupAkgQ7etdmJGxD1jy+k
-Y7Ak0FoDMsfvf4xayKQN
-=eWRx
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmin3YQAJgZ0+RzUli0DTgXBO9RCh5W
+FZDnbDEjZDbNyF5l6BJzFErphvAuelw+MHp38m8jsipbTXF5UQFO0t9WdFndGKBy
+as7OcvTkwmTsMQ6sElLn5B8N48kYBkvN/Ap9t/aOkaA+6urEUlaR59Q0HnoxMb8Q
+LkbT2CLUUt/9gemJ+mm7nqmDc2H7HqGq/8O6LrgZD2JEqU9JCpQd72UpmQLHK0gZ
+QBNFtEKJp2rI5df9zh6N+OrDugtkMb8RSN99a2zd1T6N+Py07xO4pKwk87mnl8Tx
+MnT5fLiGEDf+MXeRAlxHNSHjLfFIh+I+ZDtBJQ6ZwjmMWk+z2BvZgTbfV0FZ0lZn
+xIvYGyBHpsLJgQI0Eneg8fO9E4D4dhbmzbepTTiqxj6q1L61/VAUHcfQHq9w3JvT
+ECeL1DTpoAm+NcmCw6P34Ifu8hBne1l1JtPU3gbrzEe5lUMyKjnI9CpZaArPm/Ad
+S3kF4dEHqBoYAAOBNEdHWQtBzs6V9JQUeyR5uQ0QX4ZSmGsveoIjeon3v2SmwUtk
+pR4dZJdE9bg5hC7SQSa0IPh2nasGLhCDvgUP7MTKmGU2gnI1Stlrq70aoAS1nqAw
+YlLvYlggVv+JwUOQPq9QGzxmxc1Avy+E3eF5b37nDlbjRH+K+BOudBaQVY37iFB2
+6K54oa9hXgMGS5lX91YN
+=a3nf
 -----END PGP SIGNATURE-----
diff --git a/dev-python/cmd2/metadata.xml b/dev-python/cmd2/metadata.xml
index eb821f9e80ef..ead6025e17bb 100644
--- a/dev-python/cmd2/metadata.xml
+++ b/dev-python/cmd2/metadata.xml
@@ -11,5 +11,6 @@
   </longdescription>
   <upstream>
     <remote-id type="pypi">cmd2</remote-id>
+    <remote-id type="bitbucket">catherinedevlin/cmd2</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/cov-core/ChangeLog b/dev-python/cov-core/ChangeLog
index 9ab2a99eafc5..84c652ce5519 100644
--- a/dev-python/cov-core/ChangeLog
+++ b/dev-python/cov-core/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/cov-core
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cov-core/ChangeLog,v 1.18 2015/06/03 14:20:54 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cov-core/ChangeLog,v 1.19 2015/06/07 19:19:52 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add bitbucket to remote-id in metadata.xml
 
   03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add pypi to remote-id in metadata.xml
diff --git a/dev-python/cov-core/Manifest b/dev-python/cov-core/Manifest
index 70024ced81d8..b8c013b2e3a6 100644
--- a/dev-python/cov-core/Manifest
+++ b/dev-python/cov-core/Manifest
@@ -5,24 +5,24 @@ DIST cov-core-1.15.0.tar.gz 5890 SHA256 4a14c67d520fda9d42b0da6134638578caae1d37
 DIST cov-core-1.7.tar.gz 5972 SHA256 8050c226fa73234b88e62630d64e0416c879202891309cbcdbb8b556222c3020 SHA512 8e1744f686262c5affc6e2d7b08ce6277b60e79156a4c2491f805325048702f765b64c40acd53d59b5fd7358d85bf3ab367270eef4a12ad209db5f661612b140 WHIRLPOOL cb85a234560bae9628853958a88e15abb85a570710fdfaf627b1a3c0242bf3d6b46bdecd14972744df5331d884c1b592266143f4ececa0b795fb4a682d1156a6
 EBUILD cov-core-1.15.0.ebuild 715 SHA256 5da6561b01e9617dfe368c302df0e86160814d3c9c7b46cfd89c9aba74e400d9 SHA512 79b028ba5f80d9a8f68bfd20e6889099434a293839037ad9a561a4e283db19b589c8da0564899f89b2e57dd03dd92489ae67aca3d43a9bcdfcd6f9736721deae WHIRLPOOL 9cdbb353f5bae6eddd3f6aed1be858709a86b435d7843901b8a78a76d4f13de9472d6e785a25a7739f0b434c0746330057f15a818d6e172fb2c5e66234edf9ba
 EBUILD cov-core-1.7.ebuild 649 SHA256 90a2abdbc02560bcba0058eae192841b92589b18dd8dc1a0578edf989d909492 SHA512 783b9f92b3c57cb29b234caaaa54d20448a0008d69b98c7f9cba18d45594a1db4d9fcc96e4fe88d93e9b88ae1ce5d44b79ea50a051c8aea3dbea5b7768299a73 WHIRLPOOL 777f02d604d5c6d1e591007ac1ac03c8f782c3ead46a24a6f6f4ab4b6a19b803cff96ddf5326fb43827e4490dd1bf27bb0db97240c329f1beff214934895cc2e
-MISC ChangeLog 2241 SHA256 8496859be7e9ff0be52549c701fef5598bd43ce591b98380fb30859b96395564 SHA512 2ecfd89669e587e1c41387d51595720a35ad4d9acbe9b82e970d3a4da2b4c45567661a3da041b8d7172b4ef8b2f2014eea94194fb20dd2676936bbbd83af743d WHIRLPOOL 0f3f3f42a4746d2f890ea7c299e1c784d0182b624d0f583e2c3432c6f72d83f1f2c70c7daa80194ade0ccd1810076c771356be835579c543c7e3ddee1e1bf030
-MISC metadata.xml 316 SHA256 bb25cb94cb21cee578b28a8d4458fced3ee07ed058e86ad7b69fda5f7c673832 SHA512 b014a1398bd0d3c51491274328f2f2ea868fcdd03cf9d67f6af0e42aa2397df97e423b11e921f3b9d1a07dab4665e8f1002fd5d4b41c41cde5ee45c3da2487d0 WHIRLPOOL fc1bb7017d765a3c07349f2f00b7075d341a923970e1738f00810cde254628fafc291036887d102d40083dbf047d885c036d1bf974a23f4461b13fb478309df6
+MISC ChangeLog 2348 SHA256 75e6c7531e143d944a68510ce169d11a066d47bc72512041084ec1f45c251a0a SHA512 aa5369dc5140806b4c434dcd18de050b42043d07da8b7fa1a86f56e35c2246b0e32737c670b92ef6b6a16fae20c895202ca0a5fe8802ec4c43dce43a11ef6d52 WHIRLPOOL 136a0c0b09eb689e7dd265939324fea0110418c3ed7292631cbde92e57939d6de8632cfdcc082d60ebff19dadc179b0db96b6ab55c4ac2acfa045cd24a963fed
+MISC metadata.xml 379 SHA256 ce350ffe38afe575058ad2ad729a2b24d239324a2427b7118bd2df1e59b309da SHA512 98c701503874dbfb75eb9b19a55fe6ddc04c5753f43a289335a1626c3bc9d657e0bbbb2aeb0c77e2755a1311bafb849667a8785b079a8e37c71c79443574a38c WHIRLPOOL dbce2b573bbca89625ccb121a656c84aae0e1e292899397185ed32b7b4ccad81a843bfff38af7559156f84e22b4dc5130c093e7b993fb7e6c1b0bb9aa4a4bfa2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVbw1HXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVdJlZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiLrMQAJXcEkXYHZWUzUmMDkR64Q/R
-L1EQxATwW0xS2JUgpi5M8M5Did5B6Z6mUTfLRO+MGVq9vGb3C4ftBmQtFHN1WnyK
-wWkyyQ/FpDQX/TKd7AAuiIYEY0uTKPnIWnIQi46nzXq/TnDY96o2XrHC//8LrIdS
-jAxBb4NYA418b+3C/ZAUErZcOcAzjYIcfCK1JflbMLiaSkmTDpw8tHdayhtcwk7m
-av19SEEt02dDIgSaUgzpTkOtlT5OvEGrCj9k42L1SW37jsOHAsYJpbeU4e95M4Fb
-dlZ5MpdlKo431G+MMg8aILv/bFp5g/L31czPDRcjtAAH0CWAsahYyL1McLJI6zt0
-6mGjicDrATNIDSTaHJ3y32pay41DSTW9dXjqzxEH7S9mgQVGZDr81DVsvB8hj2Cj
-aGzXZFOZuTnuvAGk+pQQ0zIY23Rm/tLwbIy91JDGTqG6Gc+2B2lx6wZ4Hkuu9BmX
-Fg0MfEtt2g803iA9Jv6MpXc3A8vV46CvcWkQ2xnK4LPVdyAydyRnOuJQbLrjuled
-Xtrr19cZURkK71cmitS+XVB/FjAdo727uFh+4g+4xENbSmWNqaKhRO+Fb6duSl/E
-b5jj0YCFBXUtBLhco2BQzzEfDaAojnI3IemuTFqN8ezSTGqhqkSzUlN+t0gQmkxj
-NfAR+kpw9VKLh1zLtcaO
-=66eg
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmigl8P/j0jLgd9hFzOyvSqdyHApSr/
+zb68HrRPeIIxvb+h9YT66cMiZHA2ZWN+TJd55Bb/lKds4wjFzbUiyCCwWvZiUyDG
+f0vqBYp1UhpIGSc6xetIKtZBi8sskWELMFTjx7/yGh/iD6WwM7HHYAzkMbgWU51U
++yNYatR/w6gp8yAjiA3fHlGX4YgLO/1Pfch85EUPDCIOnqFbEIdbIibprcKny4zA
+Ru6ffvIHq82LjDR1bSEvySV7DQbZ9G0NvmzBx1a1JRD5KOhwGpxhl5pW+XBm1Qzm
+2ELux6nvclywO9Ua14lxVP1OFs1afDwYz82GWpbrYlSEO8axnDbMBm7qYN80OCA6
+avYz5KbyH3ygVQsDFvJLN7QrWO8zqk/pfyBm+0ZU3CAm9fK2OqrhPUqfCYxmQnIL
+D98mMdCjEoyTbLEO3stZ8LMe5NbacOwUSOHD0tWMIDamstWkIzuP8I6FBxpta04g
+e94W2DsbVjQUV/aBmrl2oZbmNUru2bMBXgmotyjHIi3p9Y+difoW615ckUF5bMX5
+OpBJyW2q+1qJY8ydcM3XeA8TWgbuYCCTxs7aIOIfdAXChhSae50CGiLMRmw1M3f0
+lhGkcoFoumLvtChwQVyP6NYbDVU+MM4VnfMPEaXXDsHq/SUnL9SR4bIXRXUqmE/m
+xyOrjh4Ki8cQrnmWjBh8
+=1jks
 -----END PGP SIGNATURE-----
diff --git a/dev-python/cov-core/metadata.xml b/dev-python/cov-core/metadata.xml
index 515c17bf4eea..9e8e0d2961c4 100644
--- a/dev-python/cov-core/metadata.xml
+++ b/dev-python/cov-core/metadata.xml
@@ -7,5 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="pypi">cov-core</remote-id>
+    <remote-id type="bitbucket">memedough/cov-core</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/cssutils/ChangeLog b/dev-python/cssutils/ChangeLog
index 37a2fc8ef6e1..bf99a21ed041 100644
--- a/dev-python/cssutils/ChangeLog
+++ b/dev-python/cssutils/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/cssutils
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cssutils/ChangeLog,v 1.40 2015/06/03 15:04:10 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cssutils/ChangeLog,v 1.41 2015/06/07 19:20:19 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add bitbucket to remote-id in metadata.xml
 
   03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add pypi to remote-id in metadata.xml
diff --git a/dev-python/cssutils/Manifest b/dev-python/cssutils/Manifest
index 8272ac874a3a..c37a48c5705f 100644
--- a/dev-python/cssutils/Manifest
+++ b/dev-python/cssutils/Manifest
@@ -3,24 +3,24 @@ Hash: SHA512
 
 DIST cssutils-0.9.10.tar.gz 622919 SHA256 08e2481f53d57e27fffb781bf8c313132c1079b8b1c18ff4f633f2df47011ca6 SHA512 c8fabc808a6d31f0d4a1b48b566277a15bb91974eb797d11d857b05e9e548e03d510d90265e43b9fa9b173eccb5f571c9306bda57c2515878e646b2be32b736e WHIRLPOOL 8d8455b5c6a0fb49d87c7097169c2670e7a2e09ade9fcaa70344a6aab70d7420e3e982488eb88ef118457936d9f917080ea576b879905ebff7dc8bf47815c9b2
 EBUILD cssutils-0.9.10-r1.ebuild 1426 SHA256 8f40c2f280ee52e0a0e728475f8a040b9d0836951a24c7ca48c952ee6c89f357 SHA512 7418ceac6f6a8fceef4a42aaea68eb613af4cda9ba6a667b1f2cc6fcfa55b866d00c07b5b996be3944ebd7b79fd8f8978a3cb3d8b85d8094906739728581e12a WHIRLPOOL 243d1d3ef776da1f5ff934b04ce7c7b50f756d4577b6bcd72456df186db7e58e4360a839e48ef55093341de13d63b46c69145ddf9fbaa147e4d3054e99aac7a4
-MISC ChangeLog 6557 SHA256 d1061bda597051c77a2ec94be48c4b1725fca6ce0ab98fd470bed6478372ecea SHA512 a1aab7ceecaba3669228bae6b3ab4988c8f5780d031df5f32fce60c5b4269b79512c5d6d22027eb2823ce6c8996fa226916261bc72b653ae6c17a9eec36b26c2 WHIRLPOOL 4f3a468a791356b82567ac1699025619f8256b31b57b542366dd928063ff4220650c92050273201c4b68f5ec156713d1db2e2c1d7e7499a24b30c204ff9e7c57
-MISC metadata.xml 509 SHA256 d1e6d364e7a527d309a878949b20231766db07826984460a34507b607ffa451d SHA512 94a74a699729ea178a821212071f236b83f05bf24568a670f262c76e83eeb6fa4ef7f87b5d50c9c17321bc2dbd8635269bb7207b1b7d7fa699366cc23b6cc4a3 WHIRLPOOL 9b3146323765d1579172b3352bb2c6db60131e9aac2c5a69321dd74d9f76d1630cb07f7bd1968c7414198d08d40a496588d7be07c0dae336cfa000f1df76b727
+MISC ChangeLog 6664 SHA256 d2ef2d7119bb64c8347f7ab73dbbbc0690b2b39883ec0b821eb7dd43874d8884 SHA512 6678aaa77255f6e336a14426bf0017ab68a79b2ea5bd95c3c09a3e346d61dc3a68392b57c395418c1ab18e7fa55d108b643aeb27ee9107a3fe226920bdd69de8 WHIRLPOOL b55436822319cd557faf154a37daa3f84d08d01f7d670916451699da0601e5955c75a91bf8c54febc60725e9b22c399c38eaa736b290ed8b23d061cd3f9d36bf
+MISC metadata.xml 570 SHA256 d68fc8cf4ea39f649d902e222184dea36d8f8739648f6fbb13103c5ac61bd718 SHA512 349ae0eeb50913f71211555b8168d8852614dfd2d3c451cbf77dc67bc8c4d6e7673e40470610d527de2acc07beaf052c73362cc454c51bde65e48a4adb170456 WHIRLPOOL b53f7a48ee3cbaa6f6d9e22f7564593a8cf459fa56eb45a3a0a91bbbfe7ecceef584f1a4cbab8ee88e21fedc953fe2b5a37d8272e746e159e628970dc94d38e9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVbxdwXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVdJl0XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiXwwP/11yg75/oDIkeqx9bmA6mdAS
-O6cL2wLc+dvDFl/ikCLtSf8cFyRuvipkRLO1eNtuNwuVo5ckA3AgsBQ1dsZCUOhq
-6mggnLp0E4kpcNJmtzgb5Ui1CzPEyYkTV7EWQBd7IQaYP2q52oiZmBBnChjnD3JW
-F5pFXTr/m4xNyi1inYdzFCCDGPaqUzQEb0Mn26XfXxqKSH2AOuGA6QlatnnhL06b
-41kPteJvxBB46sngypagJTpp1M2kKBUOAszkJTeTdhFtfan4NgzBVR6YCVpR4OX+
-JAr3n/0ETkBlZtzhvJk4rIvVwtNsNoJ1sdgmDpTr1JUu7i63CgKT8G72Yu05Ezll
-YtD5Som8ud364wvqf1GzsXW7pVOJWYPkJDhsI8JjU4CXeCBox/1NnUwV+fwFMIzI
-xIIeRB3vlg9VlNqpffD+L9nDsI1DnDu55VIea6kMqCjYrsbRSy3ES/ehZsYtKh5b
-Sz/43DBpjiBFyOg3nOjQM8KAcbm9ULKfT5bqORBBGFNLI0ioL1pmfI7DyZRWiXoV
-EU7zNwAstLsZwTRylgOkQE0Ev6lkzOuxfyjoZBNElK85xuP1atS8LtEtTrOsffob
-NDGrosjZchh0b1fCz7kn66WThpgMkNsHuZbL9PZ3Yf/GAoiNPXmj23iSQ+UA2+Z/
-oqgL2qyS/WhZgz2+vEZc
-=0JGh
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmil3oP/2wxOYHGMUS/surudvHLYqDe
+albwk7ZYaj70Rx6/JQZVLcvz5uV3ewO77Qkew2NY4PSgvpw4rJzZdXubRk6T/Ixw
+c3rOcRX+O7/3uwn+UOiiyrueCYH9L5AebIgnCleRKwWW9mKFishCe/TwmPCBfKdq
+vfoKh0qVzeiSYGoyFRdtpbrZ+ztRy3mc006pknkd80+2n5IRKVhH1jTPlZaaMROI
+DVTOMQoi+g1bMPlAB/7HqoTPk8fZyta90AYpX7xq6YLFhHR7OPAM+bTBMWn399Gz
+pQ7fwfXzOlm0GmLWbe9m6euuQRZOk5dHB12Oqrvd6q62caejvNyWkjEfihCXDIPW
+PN3HP32PdaOId/JqIiQs5hPoxqBgLIffgKBUfcudI9nMdA5PEMQdDoki565iY/PS
+yCPN+lGfAd81BBNurwEp5ICYmqz8qMOiKJAhiOuNkohQHL6NxdburtSretiCpnrk
+PgIn96FK9+ekKlCJfJFzB97ODrHpeaa4ikiKGf4DA6PNyigGrwHIcKD0G7Pup+ig
+58d5dpLLym8UVTHIEnYTJW5MzBfCvMpANb/xVL22ccM15R404u/TVvNoANeK/elC
+U/4Ed6SJT1ECZh2B1U4lL+f7zuwqK2v4wbwOHhXrX0OjYLMGcGeDE0Vfb5CAP/gH
+TE50i/of8UdhR2LPjA41
+=75XY
 -----END PGP SIGNATURE-----
diff --git a/dev-python/cssutils/metadata.xml b/dev-python/cssutils/metadata.xml
index 22405dfa8c97..596676e6bf4e 100644
--- a/dev-python/cssutils/metadata.xml
+++ b/dev-python/cssutils/metadata.xml
@@ -12,5 +12,6 @@ A Python package to parse and build CSS Cascading Style Sheets.
   <upstream>
     <remote-id type="google-code">cssutils</remote-id>
     <remote-id type="pypi">cssutils</remote-id>
+    <remote-id type="bitbucket">cthedot/cssutils</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/defusedxml/ChangeLog b/dev-python/defusedxml/ChangeLog
index 8d147d98ddd3..2a0d459ac3e0 100644
--- a/dev-python/defusedxml/ChangeLog
+++ b/dev-python/defusedxml/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/defusedxml
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/defusedxml/ChangeLog,v 1.15 2015/06/07 09:17:55 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/defusedxml/ChangeLog,v 1.16 2015/06/07 19:23:20 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add bitbucket to remote-id in metadata.xml
 
   07 Jun 2015; Markus Meier <maekke@gentoo.org> defusedxml-0.4.1-r1.ebuild:
   arm stable, bug #540290
diff --git a/dev-python/defusedxml/Manifest b/dev-python/defusedxml/Manifest
index 8e613551646f..334be25068a7 100644
--- a/dev-python/defusedxml/Manifest
+++ b/dev-python/defusedxml/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST defusedxml-0.4.1.tar.gz 48889 SHA256 cd551d5a518b745407635bb85116eb813818ecaf182e773c35b36239fc3f2478 SHA512 78a7a1f3d1eed9d7cda00afaaccf8153c7f616303c53d3918341d75970d532932b04effcfc8b1b8ed88ba6d730cb56400e9e4ecee8aa7d2181c7577f1d535783 WHIRLPOOL 9f3f51af296e3fd16b2cd94029481fbabb687c986f39810dcba331c9d3e5e30e0b294f9f1f5ce031ea28053f33be1a13e89d65ef7d0c6a3333e81dc764868d7e
 EBUILD defusedxml-0.4.1-r1.ebuild 771 SHA256 33f522249aae51d8237e6e4fab1576dd4dbc3d0402d0bcf57788a1cc5584e124 SHA512 081957badeed1c9d29920620f2b5487cd59d4317c37b042451d50eb9fa606be845f8d0e230852cae9ca2d876b2a678002e8284010ccd29a6bd7964a9fbae4eac WHIRLPOOL 8e914a924e94c7e42b661f2c2c069d6f35e8b1271c662067b155cb62ea815bcdc697f349148a05704e18d6806d8739b0b82915ed9d9ffa387a9aaed4738b044f
-MISC ChangeLog 2101 SHA256 b6e9d441fb4089830eb23bd0ee6ceaaee299c5f49ade4282fe6c75e2662b32c0 SHA512 436b6e12bbf0483bc07a3a7186498a75329d620208c0abe34f2fb51f88adac59290befb95865d85e33a0751d2ee816c558c7878105f20c875543143055c21f3d WHIRLPOOL 91970aed1c00566d7d4121593c914578f281e4aec8d2fa64c769620f13256136769603d13624760525077b34e76e3d43951ff685b441e53fae3bdf321b7f3487
-MISC metadata.xml 238 SHA256 b1f1970a98e0e12953ac4d2a4b213723b6e77335ecf570ec27a4d21cdb54cdb9 SHA512 43678cbcbac4631af8b61d7844ce30378e4d448ca5886e5c64a7f1db85e7bc04ec634269d823c9cbc086941656f821b8d62587415b57a777dfbd161620e8df7e WHIRLPOOL ce3f9a8b291ca9f355c598792fa09918e9e33e8c579d18d5cca22b59bc284420bbb272c578ec5604b43f26e0f0ad32af77ab2c866be2603be8dada31eb29ffdb
+MISC ChangeLog 2206 SHA256 2e77249b77fca0fa9f5d8d9f3d0dd72068d8b05ee2317783b7d69d1b454fc21f SHA512 c51295bb5406c96f4be2cd7fa022cde0f69042f4563b00b1fb9e73105f194319619337614819902f8d4aaa0b9f2ca115f3f0f2f6c1d68bc6b8671840521029b0 WHIRLPOOL 7d7849d4beafa461982b784ce6a32cdb0de7d5507ebfa8306aa90adf59c4399c971ff5e80064093d3e581676f86d6a9e38885243d60c7430f91d6b6b86c178af
+MISC metadata.xml 299 SHA256 60d764c4e0c58219a54c27d0e0ab19afe0b394c45b5e6662696baca422586478 SHA512 73df90294ba092b091ef07d7981d0e90cf0428d5a333ddb9478436824de2a2b6373e860521b20831c83e706230747b9568a6e54b4b25a55a56099ce67ad306eb WHIRLPOOL 857db73c8f681b5c8fd4380d6ebe2b9f22c651fcfab6ed8e6e43638c5f475148f158031e85d8c1011f4321244c9d3b7e26e10afd1bccc854e6bc43217d6c5298
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlV0DEUACgkQkKaRLQcq0GIn3gCfcG2QBP7fym2n+faUPRQuW/ni
-zc4AoJkkHxpMIifEtNDWCfHZ/9eqlU6R
-=dByc
+iQJ8BAEBCgBmBQJVdJopXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmikqkP/Rwx2Y7r0RiBgov1Pt8/YDe1
+Wqt9NwBZULtvMTIygw8wHadVEwsP3elnWl2qtc3TOmJCpHq2pxohqDxFqUSAfBqn
+7sQ37TGJ4M8m2LkErywzh9nnI79U0UKzwcDlQW3gJXHJU7WjKluoQ7OG4TFd+sIW
+F8hkhDvIcIDUGLAl4F5/53JXE1MIGYbywEHSrLeyyYVHMZc4yQmchwEKt2WE16Lh
+XV5dX2pxe+KvZWNKougZQDh7mIVmgrHfgsbI6igKdV8QKSQ1qUrpyxRxLCOmiFB1
+q5Q4H54lksx8q4BGd6O5o7L7azNk6NTl238fyM8Vywhz2r2W7rlx7zAPtyS9ahWh
+wAnGtpTGP0dQGSOYk/tiBxDUtRn4o2bZshmb1xSsIzS6MmQxpo2r2UFjg8wad11K
+y85+k08SElYlSV/NY7CFi1Vvk+yzKfK8bruXAiq/EH5ps0f9adfooUmzgxugSqOa
+SZJfKL2D1QQQRWGnJEgBsTQeWNgnOSUaZiK05fqcFU7u0z8EaHbJGIEOIy6y7ZIA
+f6zLds2Smc0wc8OjUUMueKTUN+lT9qR3xz2IbDSry6PiEY6Owg7KCgQpOLq91Ywt
+69gIXkc7uAULKrBOJUx97tqlIfbm9/mxUqSImLZYN7juGiwGvwPDWCqmzwvGXWbr
+MwtzfQ2QddX/UyDLqj2+
+=MKJr
 -----END PGP SIGNATURE-----
diff --git a/dev-python/defusedxml/metadata.xml b/dev-python/defusedxml/metadata.xml
index 7b46dbcd75b8..1928bfb0b228 100644
--- a/dev-python/defusedxml/metadata.xml
+++ b/dev-python/defusedxml/metadata.xml
@@ -4,5 +4,6 @@
   <herd>python</herd>
   <upstream>
     <remote-id type="pypi">defusedxml</remote-id>
+    <remote-id type="bitbucket">tiran/defusedxml</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/django-annoying/ChangeLog b/dev-python/django-annoying/ChangeLog
index 549f5eaa74ca..07bafe7c3bcd 100644
--- a/dev-python/django-annoying/ChangeLog
+++ b/dev-python/django-annoying/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/django-annoying
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django-annoying/ChangeLog,v 1.10 2015/06/03 15:08:27 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-annoying/ChangeLog,v 1.11 2015/06/07 19:23:47 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add bitbucket to remote-id in metadata.xml
 
   03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add pypi to remote-id in metadata.xml
diff --git a/dev-python/django-annoying/Manifest b/dev-python/django-annoying/Manifest
index 538805635b61..4bf0f1b84b9c 100644
--- a/dev-python/django-annoying/Manifest
+++ b/dev-python/django-annoying/Manifest
@@ -5,24 +5,24 @@ DIST django-annoying-0.7.6.tar.gz 7355 SHA256 7cc80ef00d63c3863e03ed97a197f8b71c
 DIST django-annoying-0.7.7.tar.gz 7277 SHA256 498ba1ab00da56b939772913f7d5b3a29997990b63518acfa5305e8bf03fed7b SHA512 37435fb08110bc0e06a2a8b35d4f45d96d7fed3c03b87a541fcd96a76ed2e36281f1f7632654f3f5f64597203097ac7b5def1e8dc32e500e973fd81686a208ab WHIRLPOOL 14df887e05b9d1d47f80982a89ab719a2244dc38fa02ec9f0666484d79923ad7a1df047e261b5f70be8b408df30def2f70b9ca93ab7637278b5302e1eeb5e2f9
 EBUILD django-annoying-0.7.6-r1.ebuild 667 SHA256 fd88b7d61c6754915249b8f722cb9f70bacfbabdd1748e410bb78ee4e93faa47 SHA512 095473be0017dba6995dd9afb3f760b3981958cb7768a6cb96262ebce7f045a70cb5ec53b808f7a755deb428c38afc581e10933acea775bf06b84d1086ed7c0b WHIRLPOOL 26ee1d69e93d3664838b9ea50358dec0ba42b832e9f9e12d54d74c39cf895c723a2a4ba336e638302bea5f8874e06782e31761da8dd72e4f65740670995b3586
 EBUILD django-annoying-0.7.7.ebuild 662 SHA256 f4906085c9b39be9b6945730a115a41bff3fe6111e5a157581afacbf55fab2ad SHA512 c47ca1f153cb096b0c608d3adf2ba455535758ae8b0590b110a01c18943257d353d467409ac8026de3bcf3cd1e2b0500ae45974c271dc1e6b00aa68aae4f7c66 WHIRLPOOL 9583be6b7cf0c80739eaa716d17a9b3ffabdc494689effdcaf01273ad229fe0c334946a178d0c983e3eeb614f9f2ed77540a8f020a95bcd6101d672ab97adbf4
-MISC ChangeLog 1601 SHA256 314e04243f871d55488e6348f498be136dc420e56cfe587c6e0a64b6e23c6703 SHA512 3a092ada466b050620b953bfd6af645f05e9e1d28775151f7ca4508eec7f3d2ba99d3981c32efbffbad8c02c40fd9c0ba397d41e0be9457c98a5636555462bf7 WHIRLPOOL d86e91f70086b8cedc6951fe4314ee720089258a880e8a9cfcc0133896aa072a50bb8009313eca1758869d67ec42384dc0b553b4ab16c4b7ccb19cfd2ab8b156
-MISC metadata.xml 243 SHA256 85067910858a360e630bf98c74a649335ce628f667919821c734397394700555 SHA512 0f6b4623951d38f687cbd3a32ed87f7393e500f3c971a80970688c494463666cb2a4a37677bd577b36925489f3210a5a3a8051dcbf903be756af0d0e08e926f0 WHIRLPOOL acf980856a9f3b3cdffb891da3547cddb24728f2221c1aca235585f0a39e5574badc70f901497ca1cc18f709f9c0cb891a943f2c4fabe3c42b703e7b797bbb74
+MISC ChangeLog 1708 SHA256 6040710e0a839a5bd2a9f810dfff610b022b0835297d2d1c5b555231447879b7 SHA512 0b3af22c2a6b60517fad53067332f8a8824fd4f7c25f2d1791ca352cc0547fbefeef8ad4ae27b7167d8403ebd1d8e05610f5ed62a00f628e30d6541b62492c10 WHIRLPOOL 939b3ae0e435ab1c39ea837a71459b602240be3486c6fe49e457919191de43fc297d5f3a6e9d447c4b18e10c45f095a2f4029766ab7ced5a6dabd7af4ec7ada7
+MISC metadata.xml 311 SHA256 d2b481602b702a59ac1e9a0312b9660a536d2751ea71df59c403b6416ab3dfa2 SHA512 4b22b8534b9e39b47b4c77384d0180800f2aebc0c2e43e7f73a5fe5d27ae589fe62e7b85691c5004152f956bf7795489b140785c976237460f9665884d1fd22f WHIRLPOOL b3911284fdddd9fc03c072249c51e6d78430dc4b0cc5c841f6dc84ec26a625704b5e78d69e2dd79b363d6ec96b5ed991f1d3583276f4594a84ecbcd03ab6d8db
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVbxhsXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVdJpEXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmixbsP/R1yccQZD7Scsn6hlXSFrask
-Lwvco1wbQCsL/bCSnbTgm6gGCuW+AbV00/KuZQTZAQchY1dkwa+LxjedNCxbXjx3
-QeTxGN4otDa9OHONioVJC9rkCSeEVmQuS5zhP5dWqqW4SSerD2x5q3ZF43DWs2Tv
-PwSlDuexc8ndEidDQeJ+lmv2Mb2mYOlGOQfEp54fH7Zy8zkZOM5GoY//XDvYfaSR
-iabjz+hyCHLEvUVpr9xmaRkC9Qy34GWqL2HpfJpTdz251LaxIZwufYeTuy6SIb9k
-oaG59mLLAhGuPfJ5QtY/ATRi6wUptK1ZQ+0MVEOTYHQdOMF01jxg301W3b1UCzev
-sRunPePa3HhfWTkbW/YgGypx/pX0xbcnAicFh5WuFdQ1dz1BOBW6SCjv0Tjb61UA
-XTBC11gRY2e9gfwqExuN8Qusfi3TyBOKpcSdr5G243pBYf4XiYTdUZlTxAWZm+Ux
-FhJncdVKI8PAfsX4lDyfVANEXweexyQNFlvAb+KSY7Hc8n4QIC0oUHeeL11Ewz7q
-HDTs7aiYbvAn4fw5fz0YzRAtSu3ETBvnNwMfHAxe4dXytKsoU309+1oOZACQA11h
-EFrOUz0TX+/naTo67E98Aoh/VuGxKPM/vBo76lzDh2Rhs8cHNN1im2uUpaQq3B8h
-tN0mgfKfmJGxiutOKgeY
-=Ckii
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiXk8QAJ2i3SNPFCrjpTIfcKkAtrkW
+s62AbULrTufvd+BsgkjbOP8BfEgGZbTkiNtAhSZAbPJCH7mrF/kjP/edK3yPmS1h
+03j4WSDQjJy6Z3lXX/ju2QVpeI0iAMf/jbLdoKyeM4P6lRJAEXnbm6v08pkNX7Ir
+uU84gc+PD4mFsr0bZUFUIJ5HIZHuxq7gQdKxBsQYZHhCh6d09QQNVJsq9e/5X2kE
+CC3rRVilrLgLFcmGpF0EdZAv1yK+EKdml0aeiiNjRBHBSW+i2BJpSqEl183gdOCY
+Egvn/YC4wpLbJGHSK6MTscfJhzSMx17qvgEpNqPm04obYC63cGMC7aPNBR+0hFIe
+dZQTLV1bPCdVcMf/QQ2UE3TC9y/RP2adkllsW9PoBfdA8hd2dpg9ZaFcQuv0ygUa
+dYKtldiQyWsN11HMFM8rpg2IyQ3ZrGMj4Q+xs8Jz9mmNm8IySXxBTcTv7Haaj6RC
+VSnA9gpOXwE/kvJbPeQhwvUgvzzzl8MN/VdAG5VZulqNW7G2hLbQQ4pV7Tg+mqNh
+Iar1AoZkZ2PSTO8VtKgjvp371rWKPMubjqmaIVH/iOzvv66z00jIS9dawSpD8/7C
+5YY6xLD3kQsB3Moyq3OqYAkTf36fHUFKIckftw9dxLKoo9Y1vgJv3yLP6iITq0sG
+ZY83bRwjXkO7nhG//9Vo
+=KRlu
 -----END PGP SIGNATURE-----
diff --git a/dev-python/django-annoying/metadata.xml b/dev-python/django-annoying/metadata.xml
index 78d79c8860b5..51ac3214141b 100644
--- a/dev-python/django-annoying/metadata.xml
+++ b/dev-python/django-annoying/metadata.xml
@@ -4,5 +4,6 @@
   <herd>python</herd>
   <upstream>
     <remote-id type="pypi">django-annoying</remote-id>
+    <remote-id type="bitbucket">offline/django-annoying</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/django-auth-ldap/ChangeLog b/dev-python/django-auth-ldap/ChangeLog
index 8a1cf240ee6f..7902726f43e8 100644
--- a/dev-python/django-auth-ldap/ChangeLog
+++ b/dev-python/django-auth-ldap/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/django-auth-ldap
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django-auth-ldap/ChangeLog,v 1.21 2015/06/03 15:08:51 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-auth-ldap/ChangeLog,v 1.22 2015/06/07 19:24:04 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add bitbucket to remote-id in metadata.xml
 
   03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add pypi to remote-id in metadata.xml
diff --git a/dev-python/django-auth-ldap/Manifest b/dev-python/django-auth-ldap/Manifest
index 04d3490f97f5..46e950e9ce92 100644
--- a/dev-python/django-auth-ldap/Manifest
+++ b/dev-python/django-auth-ldap/Manifest
@@ -4,24 +4,24 @@ Hash: SHA512
 AUX docs.patch 697 SHA256 fbf3dffdd07c6844b496599647d21ee08978548fd45d309cfa00367cfa6a4587 SHA512 e9f0607d6f770d451c53e851d6141cd0cdd63ee59e654eab0c3454b9f724f36086115760614470dd42e8f8afc63b018bd695cd596d2ac71530e4a5eaab379779 WHIRLPOOL 797a4983fadae766f33332fcb7236f78135fd5090b153900477897be67f86d218a1e56b5c7c9778095bd2e3679ab0b063d97a385ffb92c726ee13285d574d4bc
 DIST django-auth-ldap-1.2.2.tar.gz 131086 SHA256 faa067b073f6ea73c1ceeb5e244187ae1b3cf4ec79846ff366fa996428434264 SHA512 676d1114faeb9a2956ed51c586afea7618c1bf62867d3525596599391f8327b8f22a075c4203311df88279c317ca37b9097b59e55a64330afee6eb1c5a9c9ac3 WHIRLPOOL ae84405b4855ad9701244ab6cbd5e5154d2e173e04896c27e0869680bb4e030b6847293bcc59ef4f7f56969778c7d403721bae0d7099e2f3724186908c7abbbd
 EBUILD django-auth-ldap-1.2.2.ebuild 1227 SHA256 4888206425cb5a068ab253bca6cfcd1eec9d57ff63d2fcce9e197aca57fb483a SHA512 6d9329e1536bbe023f19e4218e44aaabf6905741a5ab34eec67c204a3703e04eeb9084623887181f36d157ce4f924be7a14eefc2854fa6910542f39e0bcfeafd WHIRLPOOL d1178f1d903e4296fc2b9e067277924f60272ba960fc383ae5ff223805f76ad9dc5148ddf7ac29c97f058be794d9e4f6048bf8626f1ace970c8379dca77f0202
-MISC ChangeLog 3188 SHA256 5475d9223b602cdf52c3a04e4cf7fe690e1deb10831db6edadf9365219654547 SHA512 cd67ea79ee3c030f99d7d127144320d00dfb8b2a33cc6bcb736e65e1e28d39bfa309f412ee8e93d13655130a63e3a86cd9a5e425f4b89540f23030a84e037d65 WHIRLPOOL 74bf4e64186f1a3ddfe9cbb1b8eb5f0ee5c42d6ed5d0e3cb4fc33579153887d854d988e37e359efc2ebc2dbf92301572db7070d065f405c13e0e71fc25a37570
-MISC metadata.xml 244 SHA256 2ca6810cce3e9a4664e78e3d549d6875092ed734898dd9ee1db090dd1214bf92 SHA512 652f510a90516b50b022cb34e10fd1ca61b4db9a4e4c60e0ac7e612e82ddaf4bf6370aa68b4d599376f9a5d623b71e0f0ac2e0568d52b0dbdb97d0d8cea864d8 WHIRLPOOL 7a5cf9d71985abd25619fd568f3572ae6c8ad85e854f856322201daa3bbac2ca5f0b03f1e8e22de53fc3c53dedf54bdd2fe096dc3a6ab6f4f7d1eea770b4baa8
+MISC ChangeLog 3295 SHA256 a6e5b3e21961d2dd91b64bd124e823a0ff61192c882f13c82dd27da50f85b670 SHA512 0d73c6e6cacf5d34286db897e17ad98a345bfd1f262ebb3830787081e37214a3b5cf5c48806ac9b071cc81437c35ad7523c778be219d42e4f00a0c53bace73a1 WHIRLPOOL 1cbe4c626029e31c3106e1f7187c35c9bcabe3ef6575ab3949e79e12c6649957add4f9f61961f004c7d853293f5e157ade7cb3b9ce5f2e0b27304ec71c3137dc
+MISC metadata.xml 313 SHA256 8afa2f6e032e5d41f77790f32c025eaf3ba4b37ed8d1e9b0bbefe22617b43967 SHA512 3f6a21f528da4bf8cec04867d2d8e172498ebedfde6636a64bf29b9a7de676284d58ae03583526cd8bf2c3eb374b2275c0bad8acc39c83a93c262f66e7822960 WHIRLPOOL e7f6e4d08d99cfdc3d9aa9146241a1d1c49697b31bf7da9492e7f37d51227057d659b6aefd8bec4de2ee9bdc5d6cec9ff591d65bb20ccc589b410e20aae72137
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVbxiEXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVdJpVXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmicQsP/iaK2bw4WCREgOfi2YH/9ZoE
-qBhOw9Q4dVg6kGcn6b8bH2HDm5kUZoSZhOkIkuWKX+/nfIyf/eWwPv3O/rEdRNg3
-zuqdR60eXbkjoP87JwzVgxOJ0yHQnnGVzQ90aUG/JIEKHoiH8/9ObogwVRX64L+Z
-WMi9enHD3lIauBmyNWNsECPlsqE6teeD7suLVMA0azyFzOCydxBXRfOxIaOwrwQe
-fJMLAaaIS9FQ94T+i/yGVDvAVybWtjuORenBDHmK6u32muDRQX8dXkn+Ml4h8yTl
-QCbFodxFHVv6L6mm5EcS8efg1lAZzn138h/bWPrWwnQiEC8jlEk9yB/BxhfuNExa
-pbkJL+I+h7sPtUm3R7+FE8uGpWIYjNNjmq2VE+SRUJE1PPy7vV18QR5F4ofEdrlm
-joAD2YzFWxXAD9g9bs3YsW6V/QjwG04OrkpAwyuq8iqOYMa+fQEbDregi+Dx429A
-+Uzzwvw6XE3einl2vQJGObSBZrzmXv4s1gO3y9bE28X5vQk7wmhxuWEgnByVQx2Q
-nWo7TnQ2ECYmYiHlwlurY46E4guV4Eek438jiIm1Sykw4qRcgexi7eOhHHKRWMv0
-fqHMuLOB6h52DNbcgGr85s6KKdsytZP+DUXbhhfTaGv9EjcCUdmcH6Sm6QlvI3Gb
-uChwRqPEhbkem46SjbUP
-=yT/q
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSminCgP/3/WvevSGgklwyxR2irz56wc
+medjl1a7tLzMFY7z2AB1dJEwA8OHUW7QuxGsfRjGCbSL/9UVDC8Gcc9T946RYT1p
+X4A5G4LwWfPGRNiWdPdEWqzw3031OwOF1cybQoH8CJA+ulTj/NN/Ji5xtxQVfSq2
+tgQFJo/z4GKlgzDEyLzH4fU9GbKKl1vo+2GZQwEGlwVn00z0uFXuBSRhN3ahpJil
+CSng1J+wzY5GEYcsuU03e6V85PKpCkLVUVdI/VLSCWOa9Vj7Mtbqrqk8595qQB2Q
+jCJQX97yukfQeaxoL5AC+7IAIhOl0X8lWsDevlJE5I1emuSr0AftGGrzBM1bBjDw
+cPhLwa5U/ci4B+Za31ufAiM4PZ8wmZlw6s7PGClOQQAJCtKjyVRzyMbJqxOgk3HG
+DKZK9mjEFpEF1e+hx9JQ7mfC3Ls0QE+3CpIxdPcJ4YYAk+xt2VQrpzQ2T4dwQ07e
+DT1fHJFGHtLK9Ak7c8V/R0JVySxspl0ZlGkHRxluVmLNO7iXw9LHH2jS/NC3W1Ri
+PWHdHtcuwZXwN3v4ydeduHAxboBT42lPCyCG7z+Xl8GzrE3j+iopKA91Amyu/UPb
+Wscae23WSw24N29IvvpjMlR9N0VFHnHbt/thbHEXJtihVJGGPsgxo37PG2O1HRZL
+FuJj9QGOCj69vtyvoHEF
+=bB7y
 -----END PGP SIGNATURE-----
diff --git a/dev-python/django-auth-ldap/metadata.xml b/dev-python/django-auth-ldap/metadata.xml
index 1c8440244267..29b8b314b8c2 100644
--- a/dev-python/django-auth-ldap/metadata.xml
+++ b/dev-python/django-auth-ldap/metadata.xml
@@ -4,5 +4,6 @@
   <herd>python</herd>
   <upstream>
     <remote-id type="pypi">django-auth-ldap</remote-id>
+    <remote-id type="bitbucket">psagers/django-auth-ldap</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/django-international/ChangeLog b/dev-python/django-international/ChangeLog
index 746925eb2a54..eb65150ba498 100644
--- a/dev-python/django-international/ChangeLog
+++ b/dev-python/django-international/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/django-international
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django-international/ChangeLog,v 1.9 2015/06/03 17:11:23 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-international/ChangeLog,v 1.10 2015/06/07 19:24:20 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add bitbucket to remote-id in metadata.xml
 
   03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add pypi to remote-id in metadata.xml
diff --git a/dev-python/django-international/Manifest b/dev-python/django-international/Manifest
index bd004b68f97c..735dfb932e81 100644
--- a/dev-python/django-international/Manifest
+++ b/dev-python/django-international/Manifest
@@ -5,24 +5,24 @@ DIST django-international-0.0.3.tar.gz 16481 SHA256 3be26df5e77d43f04992d26d7a6f
 DIST django-international-0.0.6.tar.gz 17104 SHA256 21e94cf90ac6befc267132916b8ca1b33100f95dab544184f42125968fb3b946 SHA512 a7ef5881467b88bd1d611476a8bc43ba54731f7bea8abd8790ca7b6912480c4b87ebc4d37a41859f60738d961b4a6c0221fabce5bc2d90c4fc83c8991567990c WHIRLPOOL 721196703beed43a88ee80a60a83ea037a75be07828eee787427018867b0ea0ab64ec1ad75b1a9a16e86bfd6460b8a393532c553b82bff78adf3e8e5f9a341b3
 EBUILD django-international-0.0.3.ebuild 893 SHA256 0ad73a7e01262f3da3a2a97c3cbcfdccb6885a500d2fb774b2da14c6c4bc36fc SHA512 e32b9d994e7b7f009711014dafc7bc74e764b0390c8874cf05443168e6b6b92c7348696f0d20b1a6777d1bad28d79a0cee26a277311e0e25700c5cee2b6d080a WHIRLPOOL 5f71771e612083a012998077f0c8ae795bb68c98cb9b3ad3065c9728d8a1627ea7216ce17bb0e65d8c494aeeba93e471dd1a8e071175549aef4480b9f25d76be
 EBUILD django-international-0.0.6.ebuild 689 SHA256 59cba7803178e904a7635b1b1c7f1999b13f88d6307f0bcafeb0300e9b802075 SHA512 e6bba603c6ff999487b4b91541eb141f3015cebcf62343fae4e037e3a3de58a66581451d78ab66a9bedd586e7470bf119471e92aea1e2e63b74e15fa4227635b WHIRLPOOL b509873309afa426336dd73988b1cd1cbaa73947a4adf84e51727af1eb692a918bde343838f0020dffc2e6f3e58e1f6d7941ffe398b7c16c849b250fe6040b5c
-MISC ChangeLog 1555 SHA256 cf289ad3c739c49794dbd642c08faeb3a925cde3a26544a0aaec39f9b1323188 SHA512 4f7e60dbe3fc59635a7bd9008530de8aafce53d5d354ca11620ec58e2e505c821f0bbb379fe21a0b68b642371936be697319d0a4610f47744a40f33b2de86b7e WHIRLPOOL 5c344128b3dc28eab7aee8239181ea38f3ec24325bd96a9e706e844c4419ccd02bbbdb2e87923e38be78bf14000fd96232479916c5147bab80d8a1ec2476706a
-MISC metadata.xml 248 SHA256 83117a782c09534bdef669610039d79fc5c2db0d22184acc124e6beb358aa985 SHA512 219f1cda632a7a7605fef61aa371dc55f3c312ab605353ed704eb4a8bb5d6ff1d36cac6dc10efb882b82b3a00738497d6cc9d7a04e1e5b0699e48519e0397217 WHIRLPOOL f2ceb4e8171362493f0e82c04fd98eddb47282af52a7210647629ab763a6b4edcaf39fe1c88fe6d34e50816b93c489e499743197763f1c1c8b7e8a635da58d99
+MISC ChangeLog 1663 SHA256 4593c30f617db6d14cf2fe97efa9c2e005051504786a40e546e2b18518821ab2 SHA512 3644a85850ed12429246a1772cbb4d08c930a19c7783a14e83ee468172f41f4e11d9d30bbd8c8eba6c36a61d5f222423dbe96a3b25a24b1ae5316c42a1f2b6cd WHIRLPOOL 7cff57b4eee8677512c1be0c58110105916ace3a4422207c07b64d4fea24d653f6607ac1bc940d58028935f3f7c5c3a7f552d7dd6de3a173599b9bd8393025c3
+MISC metadata.xml 321 SHA256 c5df289093121d9a3c1f370fb390a2bc6acc17db1b7fcfc8112b672601f52fe5 SHA512 3018ecdf10309f9cece468e88a2232a47e1cb3c55a8104205324d884e6bb5e72edd4747acc984a4e0c8c2c41c11f36115161a6b6a4a37f5b3140374427445436 WHIRLPOOL 2b04131b8d7a379ee565d98d70ceec14595e3335a3f8d73c5c71d19327892a24f91d01eb038881380f97fa300ff18838e31928067fd30e3ff7e1539c85f5c783
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVbzU8XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVdJplXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiJgUP/A8hZzb25gPSFRoSkTPSWp9M
-nXULH+LKRXqV1xgibHuQX1d4XNMiAuOZE+Zz/rHqpYJAL5bTMq4X/poEll/J8aur
-4uVbyEHAfvqkl8Y1EOgqadNY2By4JEo16A39r9vmsZ9Aft82x2eQpPtCiVlsENh+
-QG2rDtyXaIERbCqpEyuQR5X0pvWd06p/2/acffpnSqg3XT4HnmDUW93ttkU/5+FK
-SC9/M0L5y85l0KxcQ4S19Alv5ApI5wi+YqTMjSGw1FxDUEiKHuIZHCKQsOPRT9CE
-Tsh0IR+cVHEXLghiW4ugkeyzrW5gDAHqxnVZ/6hDTXN++FU3UxVjM0wUnqXqDrTa
-LhQXxCjfn9n80sfiA9Srjeo42mCPkQRDEB2Jnf1WYdNbsi7+z2TTEkpxh1T0jdGG
-YfTQOKSDACaQQzGoVXv0BdtY8dWTL2BIutsmj0pq6GGK0/9PVzQM8Fa3qj2zc1qf
-3lS1AmYG4FK/BeYIGyp54WGbI4tCtrYXLWol4Sw06SY1sQpLUn/NC3zCLk/crrf+
-4SJQvHt5qBplU9IK5eb/UXfs0D7cZCBv5eqHn2wnUdi/x5bqyCr/iVFDTEQRt3aO
-Vo+Jv5ucb4hACqjopf+iAVuq3NEOh2/2i8XlaICYSEbfRVjJzOcmK7824tkZRhLx
-F4NzwjC12JxUBL1SZWhC
-=dpyl
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiabgP/0xjsGeqx/zBMEAbxQRfYHQ+
+kZEYNBM18satDHQ8WKwzuKWHR49GN2xoEpjZp+U8azHA8qPyHJPpk2ibjfZvC12v
+lLk3fFFoIsERJ3xb8E0SfFDK6hA6b4UMH/EfOrwQCqU9Ts+VElMW622jLEHYLL7M
+xmT0JNNLvVgrHk9tNflIoukvHXXvrSr0U8jDjaYl1ZHWUPDbgihU8tGWJHxOscah
+LmQ8b0TYCm0K9eOxpK6h6YEjcZOBAEvG70ZhppNS5ax1hJ5NpKf3d40JL+xewLUU
+9gBzsE6S9u8EGOfP1kC7Lamxrf2lyFqbruewWrIrbI2cqccdtA+dyr76FBlbDJFE
+b91h10HwNlZ9A0WWFhHXyT8UJmlXrDTPWRD/dDnd8JqAADNLeEOnghMVSPdlJsTa
+FjFC20W8LKDQYXIIwvcToeqkkwJ4o3ptIrII7Bxor5oxiwx076uVPUNTagSBko3N
+1FoG84SDGqMBKsaRHqDDXGMiKdgWYbHMoHQocLxL1P47i/H0yoXTLfo2MAu2UNua
+sWe9uirF3RY+AJeRC0JNm1VFzoTDr9iRtLKzYlTkc4w6xUCjgBC88Gs2ba9o1gSU
+DBKTlp7TQWJTe5d86YbYE5oQuXdcBZQgY6RmaXQzYFFhKqzMEybqNbZroATw3Nf+
+GP4tT8lrw63901O/f/NX
+=PmJ+
 -----END PGP SIGNATURE-----
diff --git a/dev-python/django-international/metadata.xml b/dev-python/django-international/metadata.xml
index 3df753671ce2..d83293204507 100644
--- a/dev-python/django-international/metadata.xml
+++ b/dev-python/django-international/metadata.xml
@@ -4,5 +4,6 @@
   <herd>python</herd>
   <upstream>
     <remote-id type="pypi">django-international</remote-id>
+    <remote-id type="bitbucket">monwara/django-international</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/django-otp-yubikey/ChangeLog b/dev-python/django-otp-yubikey/ChangeLog
index 73b762db9e46..29f1931c6ba7 100644
--- a/dev-python/django-otp-yubikey/ChangeLog
+++ b/dev-python/django-otp-yubikey/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/django-otp-yubikey
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django-otp-yubikey/ChangeLog,v 1.4 2015/06/03 17:14:32 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-otp-yubikey/ChangeLog,v 1.5 2015/06/07 19:24:59 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add bitbucket to remote-id in metadata.xml
 
   03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add pypi to remote-id in metadata.xml
diff --git a/dev-python/django-otp-yubikey/Manifest b/dev-python/django-otp-yubikey/Manifest
index ecd2d2257a39..efacade6e03b 100644
--- a/dev-python/django-otp-yubikey/Manifest
+++ b/dev-python/django-otp-yubikey/Manifest
@@ -5,24 +5,24 @@ DIST django-otp-yubikey-0.2.0.tar.gz 11264 SHA256 72a62d0a0cec9ccf1a1a029b04b6b6
 DIST django-otp-yubikey-0.3.1.tar.gz 14027 SHA256 584ca85fe05525c04575d760348c1c9adaec24fbab882b3c718a56dbd2f3386b SHA512 d7f13a22f2beb52a8566b5f5b43997344a6ea754bcd06fade0fa39872aad2ba2eecc11b9bccff340e2099c264dcae08faf6beb8d99f0508ae5d67646fcd79204 WHIRLPOOL 90e7cd6b63d322335aa725f30435c222542b4a59e6d7c1c5659ab150a1b00e757b13fdc40cef527e95731499e8f922fd900474bcd70b0b03feb6e06753c5df43
 EBUILD django-otp-yubikey-0.2.0.ebuild 688 SHA256 f0c3830065b27d945992e553a87a8b56e3c6630a55fe07d7b6d6b4308e75e014 SHA512 3a987182f870218c642c5e6d78e5334b3bfd0ab32ae078822a8ffca5f3750d800fc7b486dcfa06494ae9c09ca85e18118555ff0b98d8b88e9fd74b6fdbe01ba6 WHIRLPOOL bae8e3a0af0b47b12c7d71bc53c8a81e6f616a31d9fc99f08d31a770df3b70abb53feeaa080d83e112dbfcb134b2eee640a6bf0057d093b8be1b036ebdbb7fa5
 EBUILD django-otp-yubikey-0.3.1.ebuild 704 SHA256 552e0050f93466b3874f1612f820866a6d19f06f3879bf5040e8e4a5258bf082 SHA512 b191a3148fe84e36fbd5410a6fa5af5dad65264d32c1effa6c9fdff91e0cd44c018a4ab7d4f54981ef42f6da837d2b42a6b84c0bae5d6c11b5bffb8d7cb147a4 WHIRLPOOL 3224a824025d495f00146b682d10a9276621335cfa329c451d961cc6f7cbd363df27c85d9c03f87859264fd4288f65947547bbdfabcbc9f47a513ff66f337800
-MISC ChangeLog 830 SHA256 8b7c7fc1567ded033a00beb7f39ec464773f445cdb72f23f2f182da386a07bff SHA512 6972ae96e93cd139db66de91fd3950d293e59f43455431dfc774156387ddb1bc81e63b5bd83142731ea84bd68306cc7de1732c7037dc0abef8acaf7fdb8875c6 WHIRLPOOL 0c74876f420fc14f6ce0f1681b2fdd9e273a0618cafb42ed326abe25e58a5d8ec3bdee99a08caea21f183c616591ad41d18fa2ddab818ba304da47eb2a1139c9
-MISC metadata.xml 331 SHA256 59cd4c15bf1db18c36ac23f97f60752a5fbd4769b4d5811ef78de48ec65cb817 SHA512 1850c4db403713c3481564b61e6268f3402a032ea895f40035e22f5f69a4cb63fa0c335ce905e047dcb2eb7bbf0167fb479bf1b02b5f12eb0f81477a0bd85042 WHIRLPOOL 2375404e6fd3c0448f89643b2abb9887eda9f069526d0195c25bcfa01c124038573e886bd7bb7b77379e0b32d71b44f12fcfeaa98292332952b8435dcba2bad4
+MISC ChangeLog 937 SHA256 8a39d567af21bf556a297d9b147a2b04a353772c8af634bac9d653d204e63600 SHA512 bac3134ddc0ba253fec0d53a095e3f0472487de0cdfe73e7ac6525bb845c383587e4a7095c49b9724e1a6892110a772de5afbc462259e62a89c603547f08ee9a WHIRLPOOL 21783479d9aa791e999f84f1cfe44d3f6c6ed3b00c88cb4c7609e879d072180f1f99ab150f20323ab54592fb7580d5bafc85ef8862c69523a453643744694aac
+MISC metadata.xml 394 SHA256 f412293f75efd402ee7374b7b7365a94ab77fc757826cd0e61c46716b08de111 SHA512 123ed52b831c34b64fe808597cb91e2ac17138f7f68b7cbc633b8a839d035417eb483feb01fcc6eb123706dd8b1c04c566c4a561cdbde8cd05c8f3ed0bfd82ea WHIRLPOOL 483746c63a4c758f03ebe38d37fcbf44d9e84aaa73c939af50161d26309cc70a0560cf9b2d6490d8a3302239f8cf1a6092fc82527406b1b88ebe9d60161a4d33
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVbzX5XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVdJqMXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiDVwP/1pQ6XEqKwK3BzaobqkZDLRb
-k4x1qPSM+JjI49tdu4L/NXi+l5liD7suA1Sqymbq97+eIm0ZKQiGzD7mHESDMWUD
-cW75W7mZ8P2NavKMNF0voRNqNdgWxBEEUPFe41uzJjFoLpEmNugesFkp/4WPNUGA
-eW7JnEWHMuJnqIFQSxWTKp52byNPXzQvwOnROL/lFbGtnz407mFdE6y0C3U8adp+
-EeFXQhhQQEtNpYendWih6LB/NnDrNsqeUl6frxmGLD50dn1CuirzFLqK3dTz2cLX
-seQT44AeipQtABpGjX+XkqKZFysaLUhh0era8h6c8J7qeS8f9SGyqM3ZlUrH+MOS
-HEXZykYt0TOPhz2veYkZoH6cbmt0kZdrfISZ7Av7WIYbkAxkuxLJKDjga33KcJmb
-FomUZ7PtowWy2jozJDtVvt+yW/Vvb9ttvaaG1T5F66VgCgJCgAm7yEk4CFUZ1icG
-mljMY+Wy2QggNjc0HYZaMg2qDlZZuJ81iYs2ut6Sq+dYJekjr70A2VJ33rTK+jPT
-NRKDef6Gq2X9hLHUWfTtwk3vAtGJZZp2DTodx5vNpChMzbKjf+7eP5tczS3USbKV
-jNShB9ORXPwgX0YntjTV3GZdtFup0rSI/9/EmYc3Huq/iUTDSwqEiCIlDXkZBaaA
-AOCBDKWgcYaF3NdD5qGo
-=fPO3
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiIygQAJCxhOzOirEJtSuryz9/AUre
+ZnKYmO+j05dIDyGcbBKZ51Uo6qu1Qlpo8By/PIewk8qqt1p4FDqrFx+NttmqSJ1W
+Wbx93QmAxyvWaYXfCKjj9FyNa4cYOgs1Cxxl3JXfE4+u4f8yWO+ZswaO/YrwNl4q
+nNiQb1UKlcOSo/frAAY+Yln1W++FeiuK/XUNfF+qUbBbvZJTbO/9u8IeNaUAmgcq
+iGwSncJxMECpGds3AI9L2XWAZFT2XtunDUbO+pTiyUo6U0FzaHK04rO++oe8NJ4f
+j7Y4kKB1Mzln8u9shS74LC1FQfQlB1mckXi8e6g+MjrVPz2GiwJW42QulLfnN8Pm
+4Qm+LxJTX4oiguaky1HLjCtzg0BdwVLVm4R6dwoc9e7vXekeC1/mamNb2AdwKVb7
+HxjuV/qZvN0TFDsAroza2bKxgq9qqtuEo2p6S1ZjycD2zPgWXXCFY45k50dDNR9H
+IXgzFuulmO/g/lbHCKse7s4BZflbY5jYA5k7uCGICHeo+9D5q5smbPyMvDQNgtD2
+8qXvz/h2uPWCGv+mKPr6O2yFu1VC0iLRw8pWiMuBgOhAiBEdGWpT0g8vJCVYdrtB
+uZJdBgJTMPPGERp3F5GyQaw0jmNwwKjKUyEI5DM17WE9ILvzdWKf53I0CmYNvquw
+8/qeJBL853F1LHExiQ7u
+=wOns
 -----END PGP SIGNATURE-----
diff --git a/dev-python/django-otp-yubikey/metadata.xml b/dev-python/django-otp-yubikey/metadata.xml
index 922f02143d95..c2fc810c4b5e 100644
--- a/dev-python/django-otp-yubikey/metadata.xml
+++ b/dev-python/django-otp-yubikey/metadata.xml
@@ -7,5 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="pypi">django-otp-yubikey</remote-id>
+    <remote-id type="bitbucket">psagers/django-otp</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/django-otp/ChangeLog b/dev-python/django-otp/ChangeLog
index cbeba409ba2d..b9f76ab0ce39 100644
--- a/dev-python/django-otp/ChangeLog
+++ b/dev-python/django-otp/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/django-otp
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django-otp/ChangeLog,v 1.4 2015/06/03 17:14:15 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-otp/ChangeLog,v 1.5 2015/06/07 19:24:38 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add bitbucket to remote-id in metadata.xml
 
   03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add pypi to remote-id in metadata.xml
diff --git a/dev-python/django-otp/Manifest b/dev-python/django-otp/Manifest
index a6aee12789e5..2d28fa0ddc26 100644
--- a/dev-python/django-otp/Manifest
+++ b/dev-python/django-otp/Manifest
@@ -5,24 +5,24 @@ DIST django-otp-0.2.7.tar.gz 76879 SHA256 dfc305aa894da2b7111c8846d90254b0d9099f
 DIST django-otp-0.3.1.tar.gz 38800 SHA256 2aa9f24d655ca0c2583b7fc08c603c2861f337155e35fcc5aae9946e6985db45 SHA512 6eb78da109609ab843d97c170615a2273f32fa02cd9ca874f8e059c80736d98015477c1c15e8db2fba59a449b44c471f067e3ddb87776378e908c04e3a8a82db WHIRLPOOL fe27c2fbdd89ff279694d4b2baa0cd11354c104baccbad8282036ddd476da5b3cadb331d372c7114bcc77f885c606f875039e27b72f1d271fa1df7387e794d2a
 EBUILD django-otp-0.2.7.ebuild 676 SHA256 72ca3d560cc2e5aa9cac05e0b0d6015ed82bcd4c8182c7fb6dba422638b44635 SHA512 e875268b5b7d5dd6a1b40d1cd058bad8169148abc6e2e14fe3e48b9e286740611109e4c055b8b9d51bc92c46cee46d67c9e6322eafa305e83bc20d6a379ddcd1 WHIRLPOOL 50d1f58ac71e9a6038ef8e7381d07d1a3f5f5cf98630ce43d71096c5f09ac2403595b7c8d347803e10e55ccc32d4e1f8b33ad8bd0c2b2857320740b772a6fa4d
 EBUILD django-otp-0.3.1.ebuild 676 SHA256 9fca6bf518bc6f1b5cd2171e450185dc5798774c8edda1144c6532f1d7a75720 SHA512 4eb988b4d6a12618541c1175196da67763212726769da1f3a5329eb48fd18053a8c5f0bba785879b29dd0c345b380e6906def3072d232b9aa4c93221ce4f5289 WHIRLPOOL 11127f0e85794c31604982f787226ebfb75364b166fab23abc17d4277e4e842328e28cbe886cc0211055fbdd638dd5df6b1c5b56c53d02e74b2f0dc3b6a0ea5c
-MISC ChangeLog 741 SHA256 44179f07216fc89f868e3dbe040824fe1220027e6f5ed9dbcd34c70f2c666d48 SHA512 cabd4d591e27e92cd6a1c1d5df81d5dd9b325602fc35ca12bc32f6bd0bb1a8c78609ec4faf5ed636b1377ea24cd5c70e4b9e99bc469c02e9028b409ab6626c82 WHIRLPOOL 5b2c51c11ae3c01d07b8db59fc9ae8b41a8b1a94e1842a8a8169b36742c1c1d7ff3d1a4ed2545a824b4d92a0d12b26250b09806fcff3027ddfae2fdc4e1498fb
-MISC metadata.xml 323 SHA256 9f4d296304e34aaab58ae1f87fc26117b387f1fff51f50848411b153a830b747 SHA512 a23e0e6ec94fd99585e6bc1608908adcd11889c118f25d5aab37fe6fa5e5cd53e4c8be21c3614d3409762fa0a70391533a2ec266f3ad23784ee6434089538ca7 WHIRLPOOL 33395b4d079c4c841625b143b1568471e2667542360319d7ce11b217a1ecc1c85f9f1be4282114c05440caaab3aeaac18d874b6a7dd66a0aaf74e88aa134867e
+MISC ChangeLog 848 SHA256 895dc5ea415b6b0914476bbb6ae156cbd8f25a9c36fb7af2ba3ca841a16070c8 SHA512 62df0b22f19d48fa859bf71e322141e0888b4afebcca6ddaf90cc5b52fc3d3f597089d7d3256891191c2644058bcb50c0ef85924f7d6d878db62e001dbe286c8 WHIRLPOOL daa8508ab91e62cf275359bb364a4b0ab2428e3a1c87f64f2fa915a34bd9b927614d7478bad28725e78c8edcc6678ba85fa1dd81afa1a48f2e2125aec46bffe6
+MISC metadata.xml 386 SHA256 c076c20c5d1f6941407939e40fa69b27177e521ff1f65f8d800e43591596c8e8 SHA512 e3625050952dee38a310af96314a1fc2e77081de0a3d621a56e0bc32b7459c074f869b179c75bd13f8bf2cae5bd0b672e7962841f65578491c16ba47963de472 WHIRLPOOL c9aed231c5cd1245aff9eebed647be2659835fd35a77dbff06a1463275e84b02419a0e814c6ccb990aee3f7e039499603d507a099aa5974f676cb5be3b506654
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVbzXoXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVdJp3XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiU5QP/RmCHwDUGnKARxCl1+fPhzBG
-uRYkVYCMzTwzcM+M3t6GdJEyvrbCM/dc4Pl3IffTzDQ+qlH9k2AQDJ7j/EH+GjX/
-z+AZ2aGoAz7SL4R7zOq8Qr7llHLCSyrFVR47lkbVwUW5hov4/UM7TmKjs0yi4psf
-Lk/JOoShjibRcoF8f/urb0QASxL0/Ljs8I6bHrCeS1fnGa4H4kBFClZn9BeB6YDc
-tV2kjf8jpkYQ12fkm8qSSl5EUItaBm4nR9jJA40XNtiQ7k3PrXBsEsmpn3ibLj5K
-Wk5Ju08g/WrujFN05ZU8JajCsIWF3pjTSB3SkpsC+rcUU3h8purF/4/vRovT1hja
-xih6FAgYlOjNTqLWc5Oq2z7zI7dGOsOXGXAU6Qep7G2yiKR8DqiubMsNKxI7GBCt
-o0LJMnnG/zAZ/6iIuauKtsX2xB5xthKbbfyKZlADF2zZk3K2vSVpAZHVXx9sq76Z
-VCgCZA+6Lh5SDRAsAArlV9zO/0tlxGylAJzHmJrlIj9QoK6WzZyfSwXeyqUGZ0Au
-wjR5OySYQGOAXfoMZx2/M2Pju8aYSmXhPqPs+CnQRzrocHmoSxWUNR11QTbo3vH+
-cYnPxqaAxhAnhkfIqzd3uYUhytcpfccqHPlabdXGKahvZl3AFS+f2HSV58ZDYc2p
-NazdmEQ7G2GLfAaH5U5Q
-=0xp4
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiv8MP/RSyr2xgxPuATDfb4SiMZajU
+uPoaXbT+y7OH/kjd5w+ONgOQNq177/GCurwGfqZRtSrsbzT+LasWvu/Km35sk90/
+yy2VA9aWJvrAHpSYRxiMwMEs/OIhQsIOUaq2FfLYN3B8FdF0gLIlQtCWvKFzyK5p
+41N0BRhPIItg4A5MSABehIjDzschP8it6JTqe0oxMOdEVnftePEo23Cmp53XQiV+
+W4UpblBoPR1X/C210cn3mvlnLhwfiMEMpJI6I3yXekT+MC6m4uHXSwJCMymwR6Dz
+7njT4/QUKr1+kLGVK0OUxkQQfmRP82eKIfyZ7Zw0/FOo7fILV0zQZL3+Pc03c0lS
+2+Elo8BxJ8NTc5I+R+QqtsxF9tG6XotJqB1CYXWCesAHwkmtbjx5KQCQIsOSSOnK
+aIjjVT2mSgySigJ793MlzuDJh4skeN2fqDIW8Mx+ctKWNCm0/9yT2zRXY+WyfYr0
+n+YekNKLsTZZFmmq5j6Ccuz1P1eG6Fk+Y26QircGvc9arqziY+0NM8xu66kG7fG3
+0g8NUVA4fuLv9k5TmrLbtNDgZLsmZ3Q6qQZAtjE6qGpQ1dVLt45y1OW6a2FKRpAx
+2gD1IaAL0kiw+iep3cpfsj7/0DpeUblb1WdKTT9GRTXUrjgqKaqsBrrPqPvvVmN/
+jYcFYgrF8lT60fpQEElD
+=AGyf
 -----END PGP SIGNATURE-----
diff --git a/dev-python/django-otp/metadata.xml b/dev-python/django-otp/metadata.xml
index 57df5b17e7cf..c3c00c114afe 100644
--- a/dev-python/django-otp/metadata.xml
+++ b/dev-python/django-otp/metadata.xml
@@ -7,5 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="pypi">django-otp</remote-id>
+    <remote-id type="bitbucket">psagers/django-otp</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/django-piston/ChangeLog b/dev-python/django-piston/ChangeLog
index f1e569ab0d6e..bb7f9a3904c7 100644
--- a/dev-python/django-piston/ChangeLog
+++ b/dev-python/django-piston/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/django-piston
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django-piston/ChangeLog,v 1.12 2015/03/08 23:45:11 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-piston/ChangeLog,v 1.13 2015/06/07 19:25:18 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add bitbucket to remote-id in metadata.xml
 
   08 Mar 2015; Pacho Ramos <pacho@gentoo.org> django-piston-0.2.3-r1.ebuild:
   x86 stable, bug 540290
diff --git a/dev-python/django-piston/Manifest b/dev-python/django-piston/Manifest
index c14189e9f6f3..4cf8f2de9b6a 100644
--- a/dev-python/django-piston/Manifest
+++ b/dev-python/django-piston/Manifest
@@ -1,15 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST django-piston-0.2.3.tar.gz 34319 SHA256 fb015137ceb7934f4645f7eb91a05d7bd63ef6bb1bd84f557ce55fac38e38ae9 SHA512 205cb15b4e59e7cb4d744525e149480ce9f54afa6b514c038ecf20df9221b4193d5041963b7217f40454c34d77125a1e52f0e7bfed5a471b27b1694a3af2ef6a WHIRLPOOL 364c8273a7542c43e18059b9c0ea6a110577ae190d2faa8cb268045556cf9d1882771ae05d907c907467562994be1367435c498329515d554eb675618f3bc50f
 EBUILD django-piston-0.2.3-r1.ebuild 629 SHA256 ec81e6b2a9e490b4c04402edc4ffb287b68211ebdf8adfd4ebdbe975aedc97fd SHA512 cfccb51b57083b1b1d9e2016fb7bb07c59bf6af7a2af8f91843ec20ef2f860d4f3c73c15eb29ba01f136f8723dea420583e5e62c3b27276196c4f02f6e65b5d8 WHIRLPOOL fde21c3a41f8508d84363c489eddb9abc7f71284729ed5ec91880dde9cb5d83192815158c9664e73bb37df487f229375046ed69b9059c20c44c8ef329bc2e659
 EBUILD django-piston-9999.ebuild 657 SHA256 e44f2d79b46bb9393ce8a03afae891bfaba1d84d173625c29182045be9667c57 SHA512 92b4881f1d92e6a194d556d5e5191bc948f2d92b760e64a2018f4a1ea2b435ea41d8e15b22eab19f34baaf1f5c8754d8c55288ee3f24084f0200c6dea598b631 WHIRLPOOL 32b8ce766c9ae9c5177ab5256317cbd1f583c392068b66b07dd7d8f16b77ba017097a34d85f25ba1954747394d9c6d67eb7acdf5287659192c02fcbbe328907e
-MISC ChangeLog 1884 SHA256 448426d298c42f45e46197e6d65b974adf007e869bf9a2d7080f9eec38826507 SHA512 0830a67e9db5203bfa55b2ed62d5a8f6327b78dd714265c226bd655c9dbffbb739f9cffc9385da97dbf1f9fe5ec0d992e40851da4092f24cb6b95e30aaf46a34 WHIRLPOOL a00fe8777d66511c7a1b7742d1fda3a991b96418818b9df3024606018d0296ba542a7a06241b5e46e2a359164cb65fba133536f7d951bc06fde193c6d25a307e
-MISC metadata.xml 333 SHA256 e5e0ddf768ddb92b0b67ff20d6e493be89a683bf25409554213c5a4c00bcdf4b SHA512 e6fc7b834c4abfe46e7e80c728379c9a1f5a93700f2af4e5fd909ebddc86aacf06dbb5afe07b099ca0a1521bf32aa3070c9b701e808ea8f984ec1bdbbeb75d45 WHIRLPOOL 042b251271dfaa02fb555186e6ff98fd5acc6705c48b87f1ccaee724ab394ecbe3b876d40b86a7c2e94cbe3abbe49379214a660b9b251d4fac7b510263311543
+MISC ChangeLog 1990 SHA256 7b6309dcb73c89e37909c95af315026c3e6dcebd10188005d87c0eb64bb253ff SHA512 6f863cb04fdacebe743401a54686bc5089684d907447e6783c01e05e75026cc006c06ecef35fc785a484d008332059ae90af99708f5b359a29f7e901a0e14d3d WHIRLPOOL 6f1555ba54dd384d55318f9106ec4ad371b83713584f3fbe52e44b96778a9b4c78f568c232cc0bc3cea7a8053cd589b9c7c1659967083819fc7779c4d0cc4129
+MISC metadata.xml 410 SHA256 58e366c19b72e2c9daa4e4da248e5231b75bbb6dafd3e4535ec12a8f8d813668 SHA512 dc4675b2185da962190a40a34a6aa9f36b3ab1b573cfcea58815d1c0b2134cd8e216be6a0a52fbacf10a600fbd3a5bb40433fcd75eb1be9703b2b4fcf6f6509b WHIRLPOOL 035ac8eae6eb3158e81187bb14b6fa315c2e844f4af3115e56c6297ebc5efc5f7fd76b344bc9011e99597f9db8b1bf34eb67ef028371314e3895e3b6dd61a273
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlT83wQACgkQCaWpQKGI+9SMIQCeKkEv8PSZhARKhw1ULxvv8sUD
-VFMAoIIM+mFYTM/3lyk3onMMNr4D2sgh
-=CA06
+iQJ8BAEBCgBmBQJVdJqfXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiHSwP/AxPKIpvK0r/tHKPl9iEAWBV
+NYonnYJ6djDeMsjf84JoZ9vAmzQ3/W8LYOnTx/v1LJi/9ROMdZBPx+BPOa5a5mVT
+BscylfdRcBpY8ykkYQaNznkcqGHrocKilBxUMzg+JFSXphFRIZmGfyGhNcN/a4M4
+QlDOtCUOzwGY4Uy1PxnCj5brbt+MuW26KsZVAF0q34JpPfL1s3Gb8eUTUufMiGb2
+RWemWDhOGvLrcAAvR2mAYYGXY/qh4pr4uPG6qAO97aV/eqL9LwW+lHsN+dQ5OV13
+YegOO8/m7crC9k1PtwKs/6/94kh9Q/hMF22Id7YfkUG7DPOLpmo5y+6wuF7gQS9P
+RPeDMNa4ThSstyGEf4C6Lp5umwdVFH+7mRMIedWILTjIf+OXIBt0Kqy4/ndqO5dF
+R0tdDBOXJsA12c6IQUpGi1hiObNE1h7dIA2UmD2AnrGCWgAtK+0dtCFhfT7Go5Bo
+NV5xvFASGvVAY2q489oL/hA7JlXroNNmDOKNYrZDCe4Mgt8DBdnl7OSYENWOrRWB
+j67o+6aunHzwCto872tWPI7lv+ctoZDeU2D+epHCN0MDfWAur62GNDmOMf/s1CwO
+liGfMLij0jHhf5lSilTja5ekXPQYYKcVE+F337hrMLxxkv1aXFFHScPjlxpFGJIU
+LHFgwIac/9/aYLA4nQkO
+=5BEr
 -----END PGP SIGNATURE-----
diff --git a/dev-python/django-piston/metadata.xml b/dev-python/django-piston/metadata.xml
index e97f7000b3d9..dedfa7e1286a 100644
--- a/dev-python/django-piston/metadata.xml
+++ b/dev-python/django-piston/metadata.xml
@@ -1,12 +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>dev-zero@gentoo.org</email>
-		<name>Tiziano Müller</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">django-piston</remote-id>
-	</upstream>
+  <herd>python</herd>
+  <maintainer>
+    <email>dev-zero@gentoo.org</email>
+    <name>Tiziano Müller</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">django-piston</remote-id>
+    <remote-id type="bitbucket">jespern/django-piston</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/dogpile-cache/ChangeLog b/dev-python/dogpile-cache/ChangeLog
index ad27011c85c3..09a6bece2d99 100644
--- a/dev-python/dogpile-cache/ChangeLog
+++ b/dev-python/dogpile-cache/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/dogpile-cache
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/dogpile-cache/ChangeLog,v 1.9 2015/06/03 17:28:44 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/dogpile-cache/ChangeLog,v 1.10 2015/06/07 19:25:38 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add bitbucket to remote-id in metadata.xml
 
   03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add pypi to remote-id in metadata.xml
diff --git a/dev-python/dogpile-cache/Manifest b/dev-python/dogpile-cache/Manifest
index ca1c2adbb3ca..f4b740732f3c 100644
--- a/dev-python/dogpile-cache/Manifest
+++ b/dev-python/dogpile-cache/Manifest
@@ -7,24 +7,24 @@ DIST dogpile.cache-0.5.4.tar.gz 185676 SHA256 9eab7a5dc05ad1b6573144c4a2717226b5
 EBUILD dogpile-cache-0.5.1.ebuild 970 SHA256 f04eb9766857581dbf782cc03857e67ceb5e7c5b43e55901cffb3772499f3057 SHA512 eab6d0397f19885f429c3c42f5db547a4e9ce66d3d900f95f3205c262ca3d2b393c7f96786c56ee6138b39ae135df22e529828359e5d686bc0a36be913a74255 WHIRLPOOL 581af0c40a4a7142b452ed89dddee19732827c0601fed495b094da88981844b09d93be1be3004be920778adb87257cb8b602b1f2a68cbba7e8d5488368186767
 EBUILD dogpile-cache-0.5.2.ebuild 1243 SHA256 f63c4e54c738d89796ab2bf09e80eb7c4a6775a1229c927417fea62acb3acf9a SHA512 68e47d8c4e79d5c8180a10037de258cbea78dfbeeb3943b6fe48e7d085cf416b661faab4a13c1613b21af0203e9f2e32b687aad385482d4f833977c2bbfacfe1 WHIRLPOOL 52627a9539083a1c3075f2481b472ca4649e5c57cc5388575155696e6d4cf2d6d6853de83ac88ba2a00e4bfd02ae103c2c65dd0a8599218630f5d0f83ecff6e0
 EBUILD dogpile-cache-0.5.4.ebuild 1284 SHA256 6550fac6c7b2df3b69aa58f157b5ec913fcf1d94417503e6a02b3184969e64a7 SHA512 7795e4bbc59ee337b94a0e62a7a331854e3c8092c8d5259e6f867002d7409298f9a345115d603c698c6bac4e7c9e3f3d9423d1bf609c77a667776098dc7fb46f WHIRLPOOL 44985fb529c5f2116813092f4bf9c1caccd397bf77e4af2fbde91f1e715b3e1ea7fe2cda6454f5cb9dd850ab53f6c81a250f2348bfcad280c15f50019c3700ee
-MISC ChangeLog 1384 SHA256 075909254985d45734532ece38bb0fb8c24f49e42e6243a81de98dc239c00051 SHA512 a4f409647257e89bdbdc24b396374bbf8a2105febbb485e93b0f0ee612bba58f8ed31b652f512aed7c9fa625a03230b76cc47e7fb09d994046485996491d0fed WHIRLPOOL 8e7da50dc8529d7564fa752e2167cfa2a2c849b0f065700c47e2d58aea19ba56648c67ed0431085b6419ead792745db9ff710a0db7e74de3165119ba9ec2c62a
-MISC metadata.xml 569 SHA256 247d147871127923642365d18d42d3478f7b6129fd49c3dfaebb26a5ea0b70d0 SHA512 7cceee3db3d3c322b1df1b44b18165041b764fd01b8b6981908071a17ccda5420987cb3e849029465ffa4de479d0c64f72c248551614bb92a9042aefdef96603 WHIRLPOOL 83fc9dcbe3aaa36b4be4993f04dc8fec6b9e17a49ffbdf4e9557797b822541bf8b70c738dffcd899736b45507fe25832f114245abd4b12b8ba5a80cec317a87f
+MISC ChangeLog 1492 SHA256 7d20222856df4567bd3f5dd8b16a51d891bc043e41ddd96233eb5c40ea988023 SHA512 2619785e13e46a8204a91ba5c46650ed31da44cebc75463ff075cec9ee96e4d44a699046d5aeff81373cf5e7404dad6e92cb0537cc205e4edaf79662786850be WHIRLPOOL 7704517503ec9372981d3c20f67f6feb5aed576d6de6ef9e0afb89c1284d2fadc7761db136be99a97951a9e4a0d54a2f416fb9d015802bdfd40de676a1bc227d
+MISC metadata.xml 620 SHA256 065375843c262399c0faad4029e139153b2e57434d0b25425e21172e49b25c3b SHA512 ce4483754946b7692f2a850f439df9f6ce269018a0c9b5cb5d6fe877f86b758e44ea8e55d7cb925ecaf8bc47005b7ceb0adc2d23b03a900c289d33b44a19eb67 WHIRLPOOL 2de314cf1ef38689524b802f81e97ae38081183c487598abf79cfa92f87de2df7a631f84f7bb576732cf0977462b5fdf838eec38e8e63e04f6a0d1413b8b3b82
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVbzlNXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVdJqzXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiHGoP/3Jy8J26RpKlnQenLKdDO+aL
-tK/7DTPe6dmrzLHMUdIedMxOVBIIrkTy8O2G4aOkULmh9gNWbyCUolO5cKvwVQ5C
-TTDxztwfq6AWAt/PB12z/4wPWXQyW63SOD/AOeUJ+xCAX+y+QCNb0A/7uPJmnlKM
-fSW5Eko++LqAXaSjxtiLaNO59nobuHGm+oVaXsyysZSwq9mXsDFUrg3kewkbVIgb
-y3W16VBxJnEXjsg+BvDwHQ5qgH8bpJ/trR7b708/fpfYp9VBR6bZbkfX9N3y3pqP
-i0Vt098btMvXETUJymj+LAiZznGrJb+MRiAC0vrJIFT3UPOMStGFGyRVe+Ink3WJ
-WugYYX39pjmTCZQkns3RvTDLzHLKBhvCwjQArZIC2aUwpGwrBXicNcXfBfmsMAsw
-aW6V37FHvuSKXgq2G81DjYDMC/inNydC7pUBLIaJQKgXiPeVAZhP0vILff+qPf1Q
-SpssHmYrY0NU8hRSi0vojE5f43u6ph+LeQn7Uxtdw0Rdt9tIDlph4E3VxHyDMTvF
-yQOkNwaIdLFdlxn3osMawTbqpwWjKkz3pDHWknlZAq2tPxTyjcN/dDbZphNd4Ryp
-6cUxVIoWZ6rbUDhwQ3wgRPJPOkSSlf1Ycnej6er2DUciq3fKydH4sGTl837RVRQA
-1yQS1/jkUsPVKBRx+tKv
-=+M3u
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiNH4QALo7Xg02u2nCqXoVVeKmzktl
+jcp7Vk+tZ90hB5A6LMslR94MctQf7pLeAzxo0uZXzmWJfMhZWQNCt0XmO6nWLG9k
+fICkzB8vRMptIAfv8dLWD2nHK+oal1lJhtAef27C/bWvOoBmwGkErKCoINZVfDEY
+vl6lpavJ1G5ilzOqQdPExcgSXn1ZbAkAF/EHEP4a9qghSSipAGCc8LUbMIqfsX1y
+WQGtJRK6SVLnTvD+rK0CjeTCo1phtA4KF4ZABzMSKU8OeZrhzoYvvkob44SUfdiS
+uLimJPaqxQy4ACD3HM+VBkE3Lae67alEEFsswTBYprkc8UMdBOG8F5Fl8Qkuw0nI
+IMFU8Zv+nW2OLB4bCNRw5cMvbaTdNaGLGukdX4mRKOu01FivdiRipuQOO6m3XsDT
+zR7Q0Wgq4+IYMhlMphGbRuRnpfckOZj9xoFS7TcHwzDFl5EMqTeQRN+eJ7YCWY1Z
+WlG8XA86VL1gd+cp+fdiKE1eodYiU3+8VzRMR/aiw7RGxrTBonZr9eyx7X+tR+P5
+gDVlHyDlpDF2ST9pasVNxzt/wVAZNiZxTKCQjZ2Q59nhlmn8UzBcGGtdCgmCcSUd
+p3U2BdWXBtpbKNVCAEr188hBH+3zIyNvV8SVpj5TJQmvb+XuKRhL48h+oVNKxQYu
+mErP3gF/KymnLz2BuMch
+=azM3
 -----END PGP SIGNATURE-----
diff --git a/dev-python/dogpile-cache/metadata.xml b/dev-python/dogpile-cache/metadata.xml
index dc7acced2bc3..108d29fd0ac5 100644
--- a/dev-python/dogpile-cache/metadata.xml
+++ b/dev-python/dogpile-cache/metadata.xml
@@ -1,17 +1,18 @@
 <?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 caching API built around the concept of a "dogpile lock", which allows
 	continued access to an expiring data value while
 	a single thread generates a new value.
   </longdescription>
-  <upstream>
-    <remote-id type="pypi">dogpile.cache</remote-id>
-  </upstream>
+	<upstream>
+		<remote-id type="pypi">dogpile.cache</remote-id>
+		<remote-id type="bitbucket">zzzeek/dogpile.cache</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/dogpile-core/ChangeLog b/dev-python/dogpile-core/ChangeLog
index 065c81bf9c63..a9796860b732 100644
--- a/dev-python/dogpile-core/ChangeLog
+++ b/dev-python/dogpile-core/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/dogpile-core
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/dogpile-core/ChangeLog,v 1.6 2015/06/03 17:52:56 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/dogpile-core/ChangeLog,v 1.7 2015/06/07 19:25:54 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add bitbucket to remote-id in metadata.xml
 
   03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add pypi to remote-id in metadata.xml
diff --git a/dev-python/dogpile-core/Manifest b/dev-python/dogpile-core/Manifest
index 3c5b6001b4f2..62c53ce52ba1 100644
--- a/dev-python/dogpile-core/Manifest
+++ b/dev-python/dogpile-core/Manifest
@@ -3,24 +3,24 @@ Hash: SHA512
 
 DIST dogpile.core-0.4.1.tar.gz 99534 SHA256 af2555702811d56846778d39451cf822b04b3f13347080c121a4977fefdfcbff SHA512 f4c37297788677afe6ab17ba5aa928f9770b0edbd1a675cd4ad512ef0c15cf1e2d765d9b7a9fe3638f0a646e0ad51d54c9b4ded33611022744226bfde1aa9896 WHIRLPOOL 09677b564eee99202e66bba97b9e8db36a75aa1c3e86616a043db8b6bff318031c2afe72f9c243e19cc106e546aa9cc422820aeee505a7f5627f64c808af1eec
 EBUILD dogpile-core-0.4.1.ebuild 830 SHA256 efb287e3a50657bdae49b23ad2f2a5af93b028113ceeeb3270dd6177f409551d SHA512 c4c80a8f439ccd99eb97086c654ee8ec96f11638e2b52446e466d5a8a02c25ad73a33358cc3467fa45a41ce445b4ff7e81607ce0afb4d581866279a60b3898a7 WHIRLPOOL f440febfe2f37fcef476cd100d91b6c1f858589839ab2a256d75bdbfee359853a8c3517e0b44b3e7792ef986cd70ffe213c60b833e12aa0e258c8493e4e0f399
-MISC ChangeLog 937 SHA256 a3268dc8e552a74a1674a761fbb6d34426168b87a69e5e3f4d42600405d8e8b0 SHA512 6eed4403bf249ebbc14b0922cf1a508e35994eca345a6c1d69e115771e100752a68a3a4c7086602db46aa17a3ff1045f70e6e33e0e4e1db6ea50f5032ade1226 WHIRLPOOL 7a9b6b9df285472535954054322004c5070c8ef99990e2d5f939b949901f701072ea08b68bc51b136c36573d9a6c8e5f780da371dd7fbe861140fa1209747986
-MISC metadata.xml 562 SHA256 c6189d7314f5417497936619b82695638e329b0422b12f08887b76fe33bc75b6 SHA512 0faf434974effd2821d5b318a66384244feed10ff181555cb9ee3a597c9f9ee44eada6ee4bd131e76f8706ee6a45d852326c503640421639984ef54c248b50c1 WHIRLPOOL 27c90eea03771bf986481cfdc52cc748db30492b56257730d7a68a1c06b21472806c10200a24724dc3d50e60e2694a32219cad3f30093d1de5be761e3cff7ff3
+MISC ChangeLog 1044 SHA256 f064d254e8c748f75b754cf07547f308da5af76ca218c7c4ae98e58d7162ff4d SHA512 7426fac53ad70c0b815b5149b9410ffd3a98e83cedaeb3fdb06716d4d650c4d45936fdc444d3a3d4738e0084af1000652b725032af753b1e843398fe50903cae WHIRLPOOL 7c3497d5a15c7bdb835ec191f05693d6e8b251f0e67879e4fed1b9c40b890f8f8e1ca849f6a8c40a70afa3ca4e3451671d6b830afbb3d977572bdbcc85c83d6e
+MISC metadata.xml 612 SHA256 cbc820afdb17272b972309fcb8462cd02bb79c39f6539d461f70c0b9292b28c4 SHA512 5754ce6fcc3463084bd89324380d4189ffb928b106819dd4d60a5c65e6732cc61fc6aacd1455c9c98383218dcd87258bbabe9994160007b84660be9532d8c9bd WHIRLPOOL c525be52a758d366738ff4acc5b263c287fc41dda8d03351a7853e031fe2054538fb5d3cbc8712f9d36570cc53afbb46c06ab65adce69303f0ea187f8e295bc3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVbz79XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVdJrDXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiBtwP/R3PLj91reu62k8ljekXRZt9
-g56UVWlwkAY1OEavNfYApUebKRAtCrvGc4C1qQcaV2aDMSnsBb7b9p+SIIZctqqM
-hVuqWfnN/mzFxruN7TDVLi5RqmxGk9+WMx0euuTxLfGHfnsKaEqlWhwCigy9fGyZ
-Wi9WQfWTAzrLDZhbqSAPEiDp/L6nAp1ood/aljkt6sUKBB+9cM+YfsqDnYPgUvA0
-gXc9cyrJ3AcBNoiiLpufqa0r+bHkhV4dDym5AfpacLv51czwyNKsHH78s8SEWE62
-ng/BlJBZVFgUtFJRCFE/INv0uSi6NnzOI6zV3jvQ9kNb0RJar7pQp7mN1GfjCSqm
-QdbKvkCIq/CVVp0rpd1dfzMKJPb5E15vMzzTJIfyPXZmMdjcvgync1f06o8CWN6r
-Ao4F/SgRSJbPcSyY8OepAfsKpbMsHcBhJvmsOa6fmjT1Hi7AKpVEc+lSEP0J6QAF
-xj8rquirx4TEUOJGqOHVrrQj+UGS4/+qGFFKosPyHE2tMgh1M6NumHg4BVK8aPjs
-3Eqd74C+uox/wbv8fh6dx2qm2tQfS0B62Fnt+3L2WBuKPL/dJ+p4j1BNnvIu8pPX
-B7xPlsHnvHnDDCZvu9NyG++pNarDTw2DciiUHXY7ye0pYa80C/bS5t39vxryRGgA
-JV1gr5WOEV9/vCnrFYr3
-=aR+3
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiUjAP/jH2Yox0CmkJ3TfwY1p0WAA6
+VamicUajrv1JBE9Hb0LaUzSgOnmK0nGG8SkMkeD0JCE0tnq3ugX+MzS9NVwVQno+
+qnUtPllraSCwV5fu40Hd2NEgNanp+hIHIqe6tRuyJ4gT9QyLfuZLD0DZNGSqw7gw
+i08izrL16/+W/t2gX/9OAteP53OI07rA8VeLKSMArQuYQBmDC4t99+t/a5SxeOan
+KSrBo7kIBmVd9oNl+DETgWxj+T1SV5mZXOFLp8zaPd6O4p3qmL/EJ7qnaBwDIkqQ
+lpCrMDtWVr+UHpLDNVJrd2yIsN4Io1eFntCkXKxceycfd2IAHUlF05LPp7zpIvZb
+PF0kxkU0oWapZ6ro5mDKtqfqx6AXYTGhF+MULDj76+9N8bm5KC6Mkc2iLvhwWOSE
+9lBW2zq7zShTCUCIEu5ZJEalzj33kMPWRssuaZreEQ9EOWRLKQGTy34znmP4fXEd
+BW2GuuYLA965e2Tf4l8LAVd939/O0jc5kHN7Z6rUCJvJJbKCJYZn2WD4ljt7oL2o
+W4zTgHQuE8t5TNBbx6byAZNbMJVgN5bQZhv+UaIJ25M3+IJLTnKSkPnujt5T4KSQ
+nAQAXl2EqSTVco+NWWT5u0jmR95nSNIC2+0B8ck4n8x4+umghHsDAuHDtejxjb4l
+0FwpDt2k0vhOXE3DzQOc
+=MBGK
 -----END PGP SIGNATURE-----
diff --git a/dev-python/dogpile-core/metadata.xml b/dev-python/dogpile-core/metadata.xml
index c87183252436..79fa0556ac62 100644
--- a/dev-python/dogpile-core/metadata.xml
+++ b/dev-python/dogpile-core/metadata.xml
@@ -1,17 +1,18 @@
 <?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">
     A "dogpile" lock, one which allows a single thread to generate an
 	expensive resource while other threads use the "old" value,
 	until the "new" value is ready.
   </longdescription>
-  <upstream>
-    <remote-id type="pypi">dogpile.core</remote-id>
-  </upstream>
+	<upstream>
+		<remote-id type="pypi">dogpile.core</remote-id>
+		<remote-id type="bitbucket">zzzeek/dogpile.core</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/doublex/ChangeLog b/dev-python/doublex/ChangeLog
index 9b77c2d1b041..168f56fd6a79 100644
--- a/dev-python/doublex/ChangeLog
+++ b/dev-python/doublex/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/doublex
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/doublex/ChangeLog,v 1.3 2015/06/03 17:53:37 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/doublex/ChangeLog,v 1.4 2015/06/07 19:26:12 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add bitbucket to remote-id in metadata.xml
 
   03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add pypi to remote-id in metadata.xml
diff --git a/dev-python/doublex/Manifest b/dev-python/doublex/Manifest
index b791e2f7db53..c3141c1e4944 100644
--- a/dev-python/doublex/Manifest
+++ b/dev-python/doublex/Manifest
@@ -5,24 +5,24 @@ DIST doublex-1.7.tar.gz 28964 SHA256 b8488c08cae47039671a343d54346e28ba7532f5596
 DIST doublex-1.8.1.tar.gz 69685 SHA256 80e01004c744615b308c745068bf8df3425551037cbea6d97a3d91477765d65a SHA512 30d2b572862370da8402cc2cfa5481d3278f0fefd2d5b2f5be126a793c8e165df0e2ae6089ba321e71d994f14024b882933c1523f7a0b9e341bf75644b49e073 WHIRLPOOL 81283c427df9347c65e58ac82c9b2b87555cd47b3047672b2af59b354944e7ace7e48030d71335fcea570e5e34834d4aed7c38984eb91141565e94c70d4de631
 EBUILD doublex-1.7.ebuild 838 SHA256 9f024ef7e6273900c1d183e052e456751de8f7b83d1debb60a5619f978b603f9 SHA512 ac04915d273f900128b2c496f078dc5e16ef5405e30e30c5b1982808cb82701f88d5cc46eb298f5fea95bea6b2a5d9753e2ba5f605c7ca19cb42cbe95bc85d53 WHIRLPOOL c85aaaf80b50a84557ca4a577b60e9b670355fadec17039a4dbaa2d8cf2eeb9271c26223d1cbf6e2dd852a857c8168346fe82dc601a3549c266e1982646caae4
 EBUILD doublex-1.8.1.ebuild 1129 SHA256 5b90cf8dff4e95f70efaafb50280c0658936bb1e5861c73f168c5b0c4775c892 SHA512 b30d57750c12dc8e764c225a09476215d604d789f77d1d50aabf1eb5d49176a2cc4782f24c926a672d796115b6c89e0df4414a4025ba42897201e6a41dc5f9a9 WHIRLPOOL 4b567eb6cf9b4edf5d860066722574f120b080bdd69dd73409d6e85f7cc1210b90bb8264c44d4f5b43902b5e6e837598ebf981220ee878e4f7bdf4ff9bdaddc0
-MISC ChangeLog 593 SHA256 45e6968cfca1fea551d39b904067323cd2dea133cd84ecbc86af250bffaaa96c SHA512 288d4407a774b14d8cbff30521fcd94ed40c51271c61e394f03ea627a226a52f9a8ad82b9eed6b8860846aebde090aa6dcd54b099851f403b2010e4f99261083 WHIRLPOOL 0e76b3b07d324f990ca7f22a208a3e178fef5d5f59a52f0bfdb4922ccb80dd0af17a94f386663ec7b95d4be9cd89dbc7096630e02bbf1b77272682d092f942dd
-MISC metadata.xml 362 SHA256 a3349165fc761d5d0d293b048d5af099eee018c552115e922d52e11e1582c578 SHA512 f9828b3bd1871279cce37a641a6503f2e1f1c245978249f900eb29b3b8b96d1767e7f1daa1c8eb368971b80153fd7b0e10780f92917538c0c3812c955b14adf8 WHIRLPOOL a21f976d0f1c06b04a35c93e425c70547344b80e4752cc0e413c2ab982149d77b85a55be38b83a48d48e74a66f52081c9496b02cf6df4b20c8131ba1bc3ab607
+MISC ChangeLog 700 SHA256 1651da63062291afb2bb61388475e840d33ca92c3dd2e1eb48ba2f3191331bde SHA512 2adc579df3109f0f3f6891507257c77410bd21e213b7c544489acf4e2f0414bcca1358f269c3724b610798a533436670a434c6d4258eabdb8fc43d603996ee76 WHIRLPOOL 0b0f2f367b52bfc27de54decd98128fc43049f49e88b1990b05ab271f8b80d8d9141613c2d6b1ed5cfed4b56b5c316dae842323fe56e862c45ffd102bf3ada10
+MISC metadata.xml 419 SHA256 d083626c6aa91b628c1a3bddeda3dfd9d589cd09d6b897d93e1557491cd92fcd SHA512 040e532f689c6ea85decff59df93647cf8b48676d6810e2a538d07dc79020f3a895ac4ff8c0f16e864254f648aa8b97aa5b0a56f20a707e72b56f42a0c19376f WHIRLPOOL 5b5e82eba5631faea0cd13954848055c9dbb44ca140d23567188b2476bbc2c655db530d9a6ff51b72eba992a9c6803be2adb83ab29d92bc74fba5731ff2fab8c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVbz8iXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVdJrVXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiA6oP/3e0ijH2UFg13L6ZvOgyfcS1
-86Nck96n7WEsz/CAU/fBfhyv3HwjuTZs8ABEY+G3tUG03/xAmSpwPHusok+miP5i
-IWPTiestCbfR77WsYU4uc+1YNn3/ujUSls5byc6cGrgBy5FEsxX91J56qQdMOIiA
-qVcck2heUQYREBsWCwTK5xEZb9Ty61GqpzEJS8pVjvo//pQqoxlKOW1OtQPDX/tM
-BepqAI3QUc79pY5MbsV0QE0VjVOGNXzkIQCSdYEUDWeKFFINrrGPn2fB4r0VcJCf
-7lY1HUCCzDkZOywN5p/mu0qQIosPJCJs49jNp3OQZXiTSs6esvyPw+7S6/66pF94
-tHhCJJoIuEkBeYMukHf4Nkw3xThj49VU+Rx9/3M5vb2vTvn4sRo+9kQs1L+C7dt5
-U5eGHn3Ol62ZhkytMz/RurOycVj4vRFStMOYtnx5g6IdZV+0UxiwIErgsMf7B+/K
-tluhYBg3bkht9E6x/m3dXnx+uLCsu8/vZIkt3kQHloqMRzt8R+sfQRBdPZXiRE82
-ME1qERgIps51z2qf0q1NOJEAknXHEuSBAavd6U2kd+AWif6f8j3QWKp4XpJShB7f
-WCTQtEqxPWBWsYyf6s3+IO9KkzPUUt/RFkr+OLqVJrlWIO7aM/P5ZnBrBns3MFux
-70ugaqGxXWf4o2lPqh09
-=3a3z
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi1skP/1/skzOqb3ypAHVRPLy+sS7R
+7BuFbUMiHTttaudjMO4XopEGFXJEm/0w6koA4wHvFAlEOKG6dvhHV6uH8ESu12hk
+vXoZrhhGqk7e9AYHS6v6BvYhzzQCs0QfjEUvRoS2jFMxXhVbaC4BVUTzRl96533S
+MjOsWCEyti9Z2WpnUiomSIiIX6DGEmg9HpcWMWaLMeMQZCsLQvdFxH3suXqlC1Vt
+fvTjACQ3gcIDZh9d4Krj+9wSCgGDPB0MDtAfPuSeInCEh+YONcn2UEWc9Wf6yjTX
+PQ7JwIKcbyqcXquHCHv8MHHED3hx1lIz7xlmduebJvfs7Y96uUbc/Rj3yD/RbtQD
+HCpcTCtu+OSuL1HmqN33X0JTLUF3H0ASGlcf088KsfNjm0SssVCvt9NA0+QJIDOS
+doHwcl1HgibBXe/dBnc7Js2JSX0B7HEsDgL5ENwZRoMvqYl0YKPo/taznBGR4RF5
+9InbSutqEAn2pZLVNmdIt/WkD1Mg34V8u9SA07yagHyBAIGqoSdQqUDPJwdHoSd2
+dmeXhtfUUtCb2fL9rYlpjkJEOLqMZZq8L+Mu/NgucoX1B/5xfRG3eylwK6qm8tKp
+b/mAwqAcRK5EDkSQxvXMjyQDfnXrSHpl6gCG5sTGWwVJVc09mhYAG1s2NOegikto
+iRBKh7l4SWawDKxvl4XG
+=bDu2
 -----END PGP SIGNATURE-----
diff --git a/dev-python/doublex/metadata.xml b/dev-python/doublex/metadata.xml
index 37fda5f9b376..8ad3a1836d14 100644
--- a/dev-python/doublex/metadata.xml
+++ b/dev-python/doublex/metadata.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>alunduil@gentoo.org</email>
-    <name>Alex Brandt</name>
-  </maintainer>
-  <longdescription lang="en">
+	<maintainer>
+		<email>alunduil@gentoo.org</email>
+		<name>Alex Brandt</name>
+	</maintainer>
+	<longdescription lang="en">
 	</longdescription>
-  <upstream>
-    <remote-id type="pypi">doublex</remote-id>
-  </upstream>
+	<upstream>
+		<remote-id type="pypi">doublex</remote-id>
+		<remote-id type="bitbucket">DavidVilla/python-doublex</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/dugong/ChangeLog b/dev-python/dugong/ChangeLog
index 36cc85cfeeb5..9a854f888d29 100644
--- a/dev-python/dugong/ChangeLog
+++ b/dev-python/dugong/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/dugong
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/dugong/ChangeLog,v 1.14 2015/03/08 23:46:00 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/dugong/ChangeLog,v 1.15 2015/06/07 19:26:45 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add bitbucket to remote-id in metadata.xml
 
   08 Mar 2015; Pacho Ramos <pacho@gentoo.org> dugong-3.4.ebuild:
   x86 stable, bug 540290
diff --git a/dev-python/dugong/Manifest b/dev-python/dugong/Manifest
index 022aecbd43c1..6f1c8a80850f 100644
--- a/dev-python/dugong/Manifest
+++ b/dev-python/dugong/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 3.2-aborted_write.patch 1226 SHA256 b5418d592128151ad23370fd832cf23ca3ae2757cd488e20775846e52b8dcbf6 SHA512 a9d381bfd9a08377d13563c4b5e85406cafcccfefee0b12725f4fba661d8b8a2cc8617067868fcf74e639d9afa2ae52db0ef07776f6d8afb8d92a37665328703 WHIRLPOOL f62c0adcf88bb7d67869bf7af6f55860b077c8b21c55a91c4e84a66283562e29946dc43e95a8d456c0a15c3dd40c0d66927de473f4de01ff24278cd68d5aa720
 AUX 3.2-extract_links.patch 790 SHA256 9548472a93965d0076b9bb68a4c08650769f785694bd5b34863432db252f0846 SHA512 6595f605616e04c34a98cd49a5a23471fc43a936745d7f33f19691dc157874d5b2c998264e2aa585f7f7e4aabaa1eec23289f07ee15edf9ccf7b8ba438c058de WHIRLPOOL 7f597c1f70ffdb34c9b5c812fa6616054efa33bed7663ac8d27ef88f1d2ced407e938f4395d2b5190c8144d20df5dd1f3bc32a842691abcc686041f06c0f71a7
@@ -9,12 +9,24 @@ DIST dugong-3.4.tar.bz2 190012 SHA256 148a65931b52e030f8eb5e1dd2740eb62754ad0c83
 DIST dugong-3.5.tar.bz2 192228 SHA256 44bc81cd25b2e8762458b59f2f2382a3e59869c457edbbcdfe03541e576f1978 SHA512 204d8fceb63e9036f026e5a23da028a41600a740ceaa42f54474a1986c19cb224ca335d81c24c257dd761ac0f58443091df1d95fb0e1776eb3227c18d5331e39 WHIRLPOOL 678525106190b82c0be3d2c0ab72d006a8bd1b4343071bfa8d9702a7d8619859406f39a59a6bd87160d9ca31bf026cb547a55bc75907f645eba2da24ab77c1e3
 EBUILD dugong-3.4.ebuild 847 SHA256 565816204441adadf694e9158eaefd88aaa17ecd6365bec00c390e0bbb2ac4ce SHA512 6a550165f21ad27922613179b592d9ecfda6edaf8e36a74863736ef093b900096cd8a331abf77867d5cc54829ec53da9134164b9284c7dab1db3dbf6951d1a71 WHIRLPOOL 59b6c0fd30458fb5a99d7cb8d8b5da22c475fc81def855739fa3a7231e880f47b3a73fbe00dc7a6cac738f53843263f44bd02aa083494d0e35399809e37d2e87
 EBUILD dugong-3.5.ebuild 851 SHA256 763e5636715706024b9a89f69cad350a0aebbf56537a026b99e41280f9f51b56 SHA512 83e48c621c90227f506ebc90ce7bc6a8b94c0a74ca4764a5ca244405986ae31d2946d68f2295cf814d115c37c2876e78a3b734d85d9ff076870eec331c6e767e WHIRLPOOL 00f2787faed0e2dc10284d9fe6e23d0cea33e7130f3e79ad21b544fff9b5b783fab39a90993c1a805232c2f44288ff552dab57ff296746720b4ece1419b0ef36
-MISC ChangeLog 1895 SHA256 6310f3cc88a78fd170422f46926d5f23bcc507b1746d9bbfa51135a7f2a5ff8f SHA512 820746fa61d707eff5184c3ff910273ec7c6d7e60909116701885ce5c2dbebd58490fac0d88b261ac3b3811155a58db75a31a4781a437be57a3c33a71dfab555 WHIRLPOOL d10cd75992401831b77fca664e246ca4528066a09e96d6106bfa1abab4ab01a390a369bf0da67450c81261da757d4af24b1ae3399e32e0a4eff7a98f802397ce
-MISC metadata.xml 229 SHA256 c8bab846efadebd18f52bff862c55d45f8331e7b0085aa08dbefe8911174af08 SHA512 287f4064e75cbba1feee980105cb1e87dd702790e966f341f0777a30a8c264810c046001c19bc1c5039e936de368b3e9edc6f36b500a2ca446b97a9ea52e671c WHIRLPOOL fe5e5d23e977b159a0d9a7802e4e87a40ecc821e4b20749eacafdbd2db53f7c0971ae22c06520fe0271dde1706aaa09edf0528c5094858d19035c7f9722c4109
+MISC ChangeLog 2001 SHA256 03fe06b256da708ce56dac8ce84a39aa221b79067d27dff103344732d0fb7edb SHA512 98edb7674ed32f5e6fa62a856d956c2dc1cbe1455acc759569fa2190a1a1d15df6aca48718cc797b6e8234b0911243f89b1db0022c45a02d160f94ca085ce335 WHIRLPOOL bad3116519cb90b9204894846aabbdadd5ebdfe4f685eb7a14dfcfdbbb49524338aa1c1ddee7d11c35f0547666c5439047007a8d08a819f69bfcedf9130c87e0
+MISC metadata.xml 301 SHA256 a92f782cdf3810c08bfe6883a28fed5ea05ba8d1838e701cff22b39f04d33b0a SHA512 38c84aa9fac33bbe15762a6bade536114b05cdf1a0c896020ed6efb41131984122048d83901cf4b850bc5b901653156f2ba51a4c4b8bced29f70e37424f4135c WHIRLPOOL 84d4d69d8ea4d1f1f5914ed2626bddb3b0808c6ecf4a21b752ed58b0df981e1525a8e55d543d65f4fc61def27b6527695e6bcd70e5b42f6aebb0055576524826
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlT83zUACgkQCaWpQKGI+9TpKQCdGI33ABy6wtcesRQZLpOerBwb
-u18AnROKwtJmIb8zdfCZy9lTZBv4a5R7
-=0P0s
+iQJ8BAEBCgBmBQJVdJr3XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiaxIP/jk0MuR77yk7MXwevfI0QmuC
+Wj3KvvotVC0P3TvfAoFSQbUb5kgKZtv5LmtZh43KxtKyaZKwld7kmc0AMdZfCo7j
+D4LB5To/ON+8MVw1E1s4hh+3154t2WwTc4pzP7H57DZAFuKlBddeCORMK9FOXm8v
+EIRYINIz1tY2S5RIEdH5HG9LrsGEnYQ1AEVHm8RKcX//O7nFWvlNA1Vyf+ODjn31
+4ui8QHxZIO/CAVajwGUg8xRHdlNl38ClC8u8dIOXXRB11WZUZFe6BSSu/oY3ZyzU
+IA1jx0FD76/4Ro6XkdR8hajlVBIOY8lQPF6NRPYjklGq49xgEqDTgfytwM0IhEQe
+It7ir8CNmtl5wLzaONsF9/bmVZq/ZJYwEif9zvWu2Kji6513tbHtZ5vxTetcr84e
+cx5qEYx6cmny73jY2RyD1ZHIDXEIUXDOmdVN6YKM49Hhba3cypBrX7fmzgPcPWzg
+RGWdjbIp/x77vAl+fYw0O7w+ZuaMfWfk9XXwhFsl78DZKdoBdlSGMRf8xkSo8EdD
+3ofBdRh02LnRd5pCiJ6pU0YKyVcitSgqIKsm9FNHR6uiTzFKyKYCQvND5W1G24K2
+gHZDTMdcbB/oF2C1DWqw1YqPsr14Lai7CvgieONqLgp04Sxkd+33qlp5RREraCyL
+9xE6oo0AVsA0VNTPdN1d
+=Vfw1
 -----END PGP SIGNATURE-----
diff --git a/dev-python/dugong/metadata.xml b/dev-python/dugong/metadata.xml
index d6835d0fd080..31e4106d1133 100644
--- a/dev-python/dugong/metadata.xml
+++ b/dev-python/dugong/metadata.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
-	<upstream>
-		<remote-id type="pypi">dugong</remote-id>
-	</upstream>
+  <herd>python</herd>
+  <upstream>
+    <remote-id type="pypi">dugong</remote-id>
+    <remote-id type="bitbucket">nikratio/python-dugong</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/flake8/ChangeLog b/dev-python/flake8/ChangeLog
index 5b89768592d0..bc493bc9e55a 100644
--- a/dev-python/flake8/ChangeLog
+++ b/dev-python/flake8/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/flake8
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/flake8/ChangeLog,v 1.38 2015/06/03 18:32:55 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/flake8/ChangeLog,v 1.39 2015/06/07 19:27:26 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add bitbucket to remote-id in metadata.xml
 
   03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add pypi to remote-id in metadata.xml
diff --git a/dev-python/flake8/Manifest b/dev-python/flake8/Manifest
index 9d023ef10c92..f449293fc5f9 100644
--- a/dev-python/flake8/Manifest
+++ b/dev-python/flake8/Manifest
@@ -10,24 +10,24 @@ EBUILD flake8-2.1.0.ebuild 1172 SHA256 72cb897580cf1a7acbb3fad0182345b3a9c679a55
 EBUILD flake8-2.2.5.ebuild 1200 SHA256 6c4e7fd5fe5c63746c700c813ba71e2675070d6ef16f75489ca9dd492d899503 SHA512 c7403b1165d9f1a009054856f6fe55867d8613bd814a9d9a941d17a69335e694aba55acacca3369ed6370f69d261dcf0082e25a7338184ed0ce3084fd875197b WHIRLPOOL 836b34a5e4ae98be770cb3da387aa78d77eff8f1ee798145e3893e68b6492e94d5ba497e70ca2170f7f5561ac6293b45a88d6c32eb4cd9bcf11c4cd79a0ade1e
 EBUILD flake8-2.4.0-r1.ebuild 1380 SHA256 bf7f5cee9902602014aee2aacf2fdfae8a17f57c2a74c33ccfd29b87a5210f30 SHA512 54fb78f20ca819fa32b5779843548e644e27ef11af10a9d0acdbc443a2ed313c890d24e74f4b19e74f53d56df8564dd0a6aab9fa95045461d83e29cf34ed290a WHIRLPOOL fea7017c150c93a49549049b2d7c27454189d168e6ea457e5f23e085dfcf941907675ed47c24d2a7281533cea762e211e5895b4e86e70e6a4bfd356afbecf2f6
 EBUILD flake8-2.4.0.ebuild 1212 SHA256 a0106e2e312be7711f824d8f5c10b768fed81d2d9116c8bd9cff8b8985985df7 SHA512 4bbff33192525ceeb9693c415f1454afbdbbb8ba0f486f2c7eb7dff1678bac4353511d7bb8d61fb2da241468461e670077ae213ad3579bc43fa1f1c73e57ed62 WHIRLPOOL 99e23ae4d1814e120b009a9befb50ba5cb7c9ac913013ebaeb8de233861436f86493c7ab9bf29314b11080f78dda026f841abaeff721abb0fb3ac88265e3fd6e
-MISC ChangeLog 4676 SHA256 c562c2faa95284b298b10039c3faa979f4adeb04b111a0513456d9f84b764dcb SHA512 767c0ba3fec5a192903ad012c91de1b9b622357a57eb67f3c754bf953594b9f3650c03b19f237752fa9bf13646eeef0a43669b4c0c75b2acc6552e1acb015a8d WHIRLPOOL fb6563db0f33168f23f412827a70520a0bed49c9b0c23a8525ee5887cf01c15877d096cf35a0058ec3bb8f7b7e35943aef3570a201467abb55bd2731036aff03
-MISC metadata.xml 234 SHA256 d18922582f2af09e18d8d80a42159d99d190411e7555d79bd9881932e086950a SHA512 8884f6fa54d0dd023292e8feeb9d68dbc9159db9b74bfc0544043ab8c989fef180ec7afa5c22a511c827d443d2ef0ef67185c06b5f904cf4ba3f6c0a8f94779e WHIRLPOOL 5924631c6034bc296df9b33cda6ba0419ae065a884973ef33a13d775a99a70f9ec79bccd34974c0b547f2eae00cbffeba01fbe2b879429434a445be8262fdb05
+MISC ChangeLog 4783 SHA256 c439de07518f7ccf8dca5c854728fdd96147b86b497c15d8eb6593ea2471282a SHA512 7d05ad8e1a1a4e011176da0492f4a75549f17243e29eb58fe1fdf1269f69234c7f466846f344770a43b677f8698c6adc97f64b3ca352e94e6a2a7905456434c7 WHIRLPOOL 0defb36af2f8222b51e03c706417f0027a5004247b3197e4609667cac2253b2c288c5fbeac31f37f1fd632b425cf91f2e772fd171ffe3c435c22c8322b0a4c68
+MISC metadata.xml 291 SHA256 e6ff4a89b7b3df9765103bdb930a65dbf65d0bf75b61ace8f92b303f4ebf78f1 SHA512 b78e5900d17217cc6a5d78b8ba955ae0231b5d5758bcf527e9bdd0ecd389df4b3935c156dc300c6dd08261f1ac36f52fb9a5b2582f5d6091035c4ab75c4f2a3c WHIRLPOOL 90eea522ac951384f687c9bc957bfe7d6b4cbd85df0f7d43472a3b49eae8410af938dbd1e80b85dedae7ba1e7d5df0a973e255a9ad864943f15c4866c193b1a7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVb0hYXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVdJsfXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmib7gQAIVFF8fFUnrtPndi+6j8teHi
-kJv4rwvDz0GcTjz1GK77bSNlUHqW2H20YyGWstGLXMxe05bX+++F3DQEe//MTWCs
-nItS7pHvJYV5skuE6kxt2++feLjfaOkefBnP9MR9Y0BK6W+4xz6s3mEAjkcTzj/m
-lOAKpABqqQJDSytTBEFRQgZFUhNKGfukPCO1tE27wFS85ArxO0IBqWpo3SgJvPMO
-RdAu85aghukGB4JQs7G930jTFBJwbgmde61pXFsC8oW4Pt+JCoDnSgaEVociwkau
-4SDCZwvE8AzeF2ifLGwXa01VBrKG4L+RCSoYgGCWN25vzKya4esceBFEiGygC6dR
-C7/nLdv8TT0T1mwi/IRLhvj1CzFy7N9VcBAGAga59ZDRt7MscL7f3U2cGlux9X1R
-e+JoGYeEpl/q9QkaZqpDy6IyMb71PX6GSkglv4Ygk3Y/06RzEW5visC20PyMKbnr
-xn6ElHlzJfPPuDpz/tWCIumIFvx1Y3rv8DyP+530uhdcdJ+vFcui+5h1/3JcqS2x
-3nQRsFW2LxPAtSQ0SpuFNw3kvgTCinm5/AarhYMWAD19eMNj+II/I5ISV7gcaxVg
-d7Sd1LBnDz65kbeRnQ3+k0hewqA3Xayta8Gyi4lcJRAi3uA5BEFq066heSbGwvV1
-dAaY9GTtXkoFbR9oIstH
-=pwRN
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiOQQP/iitXo5yhPHUdNaUvc+C0uDs
+A7abmzRZRcLDHbKR4WcWX/lyG58q/Jtc32j1AFNESVaFQsk9QIfsj1Hz8Y5BoLnp
+1BlMWALryW+c7m7IZxvOJ7AAE7j/GA3XTgYkm4t64LvL/QyPkbgwlN3IcuThGZRW
+3+0fdl5wQARTBSlUvUEUI5+Qfu92t9XDv2OTq52cLEmvzIBzWgHclu5LTEU2mJ3X
+JvmP20+hGopnZ83yvAjr+K6gb0taNuKvx20A/uAChHsCClK3M4LFw17R+0+cT8Uu
+p8TwRYkaogtReZY9UbZV+lXVYvXbIG08p5/X2wblUKOjVKZJMQ8v0RQegaHOriHr
+VYYRVyRNfH4Bps0xGhwlwQKG4WIB2nBJV9Mg3PHhYo7s1pghVOYYdyvgZfuRjJnG
+MuOm+KHAyJJWzjCgtUIb/rAqId5ijgTjGiuaX70I3w8Au2wJojWBtFL4EGt2OT3j
+R8dI8muwJNNGICdDIx97qp4A0YVB820DfJR7/7zGX/3GAqckSxBiWm44omm9r4bf
+z5y+rjM8yHI6GkUBTMGH7YUyWislz32jpUXAeN9ZryrDAubuELx6I+CwT4lE36r3
+JYSRibL6qEamO+LT9LvaP41Z1Wy6wuGqgzlR20e6FHHnB02LXC0r0q+Gm/OLY6W5
+wMvBwjkgt38ZUT3HmQUP
+=pnaY
 -----END PGP SIGNATURE-----
diff --git a/dev-python/flake8/metadata.xml b/dev-python/flake8/metadata.xml
index 3540ee8bce84..6a0b5bd93656 100644
--- a/dev-python/flake8/metadata.xml
+++ b/dev-python/flake8/metadata.xml
@@ -4,5 +4,6 @@
   <herd>python</herd>
   <upstream>
     <remote-id type="pypi">flake8</remote-id>
+    <remote-id type="bitbucket">tarek/flake8</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/fusil/ChangeLog b/dev-python/fusil/ChangeLog
index c192315e9c0b..52f7a55eef2d 100644
--- a/dev-python/fusil/ChangeLog
+++ b/dev-python/fusil/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/fusil
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/fusil/ChangeLog,v 1.14 2015/03/08 23:48:43 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/fusil/ChangeLog,v 1.15 2015/06/07 19:27:44 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add bitbucket to remote-id in metadata.xml
 
   08 Mar 2015; Pacho Ramos <pacho@gentoo.org> fusil-1.5.ebuild:
   x86 stable, bug 540290
diff --git a/dev-python/fusil/Manifest b/dev-python/fusil/Manifest
index b6052a125dfb..b05ca9133e31 100644
--- a/dev-python/fusil/Manifest
+++ b/dev-python/fusil/Manifest
@@ -1,15 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 1.4-python25.patch 313 SHA256 dd587a243c9d3c228423357322385280020700ae43743f7401faefca6062e602 SHA512 3a7f6f8a707af78cd7f0dd582ef206b3e7d656be2ad0bf507ea410b05bd158ee661a0713ab20506f9aa85af62a1bd93ffb33c9696c0fc7bc9b8e003f5f4cc417 WHIRLPOOL 5ca15f464eb6feba726f41924ccab24d16de19695c82268b1ed383e529209a33fa2a7d2e36d7aa536ea3d5f288429d41482d5cebde24ff9f911bf7836310fe11
 DIST fusil-1.5.tar.gz 138910 SHA256 1b6e269f47636b5fd1ddd25940aa1beaae68c05c076b3ad6bcef72db5865729b SHA512 0d84bfd2d9b8e509989723de26b30c3ec2824612dbdcc097ff3e998fd4efa6b1293cb78743e098ad5012d4981b8e8036f3ad3f9c6acf2dc30e3ff1f707c7d1c0 WHIRLPOOL d0747c9f53af8ccaa9155fa05726928b0a52b5cef6fc76f7ab38b3219ca3d1c82c396737de3427fe3129d257f91853659ea7f2ab158c31a4349b53d906c5121d
 EBUILD fusil-1.5.ebuild 1042 SHA256 daa66ee61f8d8bf02fe16c1723b2bf5447be60f8f111518795e682c803ec62af SHA512 7671c9efa5fb020c86c5f51ffdc60f5db03b8f1a8b68aea7a51c2d04b9c87e166ccfd6edda6b6400e9ed75baf27e0d56de0faceb4e091843ae3956a9b8c5d2e4 WHIRLPOOL 59f8ccb5ecbaa24c6a3618c2bead51a7fc6e1586ef2222f0940b388abd889fff079650b0e096faac19782d8c406cf3990fe254af9aa96fd7e352e414f2d2e7a9
-MISC ChangeLog 2232 SHA256 149ea70e18484cce64c112e15aacd5851cf6afb197ec7f759883e3054bbf1187 SHA512 7af05b1c6f23509103cbdd49aa62ecefa3c601cd13b9dfdb407e3dcab1942033811ddb05dbe39ad352d9a46659fd9bb1d399adb691b03e405a3d2f18f474904e WHIRLPOOL db16a2511361f1266f5a829dcd596aa2bbd0b86b3dd8c6c1f691c2071e75a45e4ae2caa8dd302baa2571e8d42fe7aca23465a08273837f4201dbcaf6bbe4698d
-MISC metadata.xml 228 SHA256 4a1f4235aba4aa3315bc7fe1b79e76bb1931a1103d9e94521654a3aaca195b01 SHA512 0b29b0ada9fb4256008d740d4531d7a76aa85538d2c579a697192bcdb2c067824276ab07acf772271b403f151563e272fc7a2903ab91f75bd15929838898904b WHIRLPOOL 13a4f9ceafe4873ac6857c669bf4d1b48c537a91523e6616f29536281b3c6cdae6475d319e1531dfe05d3369b9ea05001a1436f757a1b82cb2a501464147fc03
+MISC ChangeLog 2338 SHA256 e230b45b115e8f85100cc789830aba52daa728de82caee3f50af758ca8818dec SHA512 5fa7999c2b0529749f53f6dab29e0ca54d028bae5bcd2957fb22743e03e669323e4d8432b2369e3a347748350e121b0449d62d28e88afd10504877b141eb8bff WHIRLPOOL c913eaed971169055be4e9eb998534d7fe16c1a087e46f495a920e8a3cfdf4bb8dee2537c636004e2cf7db78ca6defff5e545ecaeb3c79d16b067d48a2817d54
+MISC metadata.xml 289 SHA256 d463b987f24e4094f67b4ead1aedb46dbaa37ad850c7b12de54f2db7f2bc6bcf SHA512 2a63bf7505d568d745d69d0cbb966caa65c21c4ba040a923edb53963428589d5f14e1501445879db80c97d659ea8795f8588afee6e98934511c47e7535eef04a WHIRLPOOL 14a2a01396fef325f164aed7818e8953d48056faac23625c211dfb66c7fc8db6544461ab178fc6d50318fb3f1bf1dcf9d4fccc230762a060bd8bc32112f863a7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlT839gACgkQCaWpQKGI+9T66wCeKPJO/RPBRosozp5xPhYMuADX
-QQoAniEtfDkJQDRo5IDPB0xaDgpn9qc0
-=jYHf
+iQJ8BAEBCgBmBQJVdJsxXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmirf4QAIgBNnS5iyh8cBfDUTTUGGuf
+oJLv5UFZLzTdYiV4NMZ5bPCgjEeGl54CYJmqWldZKXv3C//E1AUxv1JyCpACKgKI
+bmvNRlFoc6ydFT+HSm0nwULXCO1immdG/3mToXjGlolZpiFYrqtbBStXVvL45nc3
+4LZyTFtPexEUFmoqpjNOnqeA1f5hVugkqwXoY6NoizVd2dSijWT9+l8KjZ96929u
+TRPc8ywEDNn8hdZflks0LW3FvXC9yuk0GG2IaSSzk/QBsibowll2Wml/Dk81yY7N
+D/1n4j/JIU+YyLiTo/GIZfC1XtsdgXEjsiiDO2jWK2f1XY/UiwH55sr9/AEDSOal
+194vy+r3Kx1vPFLyoCnbm64sURV00QHeqHAzxR5iX16HVDh/38V3OxIZdeSo0Fv9
+QwCCblHjcrXWgTthsn6+ANavJALlIfzwYEYSvmlLiuNM8GXuIBpDXWJQukkyjAos
+yoUIlt3EwN/0k0ZVzLjbAbs5gYaAlY9fiN3/Km7u4L602Z2+EcQ/Zk8BN1wdMdDf
+gUh3eJL6MWxNfK/kHZxVp6FKIGQ6HNCbWjH83rcButrZuthtqVEPvmOsUrFavH8g
+hWp/ffHdB+rf7n5SlYg9xCNjuL/aqWyi/gFAzAV0lz4RwhUfVmyxE4SKhffiG/UE
+nvO76MqDNKkRYyhAj/D4
+=dONu
 -----END PGP SIGNATURE-----
diff --git a/dev-python/fusil/metadata.xml b/dev-python/fusil/metadata.xml
index 5f8c783ed59f..c9788744da70 100644
--- a/dev-python/fusil/metadata.xml
+++ b/dev-python/fusil/metadata.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
-	<upstream>
-		<remote-id type="pypi">fusil</remote-id>
-	</upstream>
+  <herd>python</herd>
+  <upstream>
+    <remote-id type="pypi">fusil</remote-id>
+    <remote-id type="bitbucket">haypo/fusil</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/hachoir-core/ChangeLog b/dev-python/hachoir-core/ChangeLog
index 318f5af4e1be..31a7e7263508 100644
--- a/dev-python/hachoir-core/ChangeLog
+++ b/dev-python/hachoir-core/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/hachoir-core
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/hachoir-core/ChangeLog,v 1.15 2015/04/08 08:05:17 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/hachoir-core/ChangeLog,v 1.16 2015/06/07 19:28:09 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add bitbucket to remote-id in metadata.xml
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> hachoir-core-1.3.3-r1.ebuild:
   Drop old Python implementations
diff --git a/dev-python/hachoir-core/Manifest b/dev-python/hachoir-core/Manifest
index 14999d4006ae..35f9c4ae0522 100644
--- a/dev-python/hachoir-core/Manifest
+++ b/dev-python/hachoir-core/Manifest
@@ -1,26 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST hachoir-core-1.3.3.tar.gz 91504 SHA256 ecf5d16eccc76b22071d6062e54edb67595f70d827644d3a6dff04289b4058df SHA512 71c24c4c4612ab544663ddde4aa07bb7514fcb3b86596ad67d6b48e0d8590b1a9d8c88ed4007c2341cb195ef825e06634bce14c62cc2c5200b6d745d341cac51 WHIRLPOOL 1b6ab4088cc5a8270cd590d00fafb0c68571248a5f15703d5e644613cc338c6d594df87b82e2bc39f420333ca34bf37f45e003aedf43e1d085958a9294a716c7
 EBUILD hachoir-core-1.3.3-r1.ebuild 787 SHA256 6347c23e03daf2a8caf21c1d3e09a16c04f7d6a1c72364dd2a32da478498e679 SHA512 5284c5fe71888cb07f3c5cb254c1f8e2ea11088d389b32c6da20ad3e0fe06901ffe6b23f04798064ffe78374e7bc67983627f29e2516fa7251095968a4b62e0e WHIRLPOOL 54f5bbb99e6dbcc37603d08f8825f6d2adfde4fe05a2c2996261fded0b45620b78f40ac9daec64e0544c672b470be0e64fe084e669838413ceaa0c67885aaf8a
-MISC ChangeLog 2179 SHA256 2f25cc0c896a5a834c2769fe52728f55c13d960a02b7db4e6bfe909e14800c85 SHA512 59a8707fc78980f21bf52691cfbfcd5db9b6ea35e0772532e4784dc1dc4af8ef2836e7a200e9085944f14968afdc5a36a50b62a478a52a5ac8a04ea011cb69d4 WHIRLPOOL 6e0eee9fe0fe7df164f7ede07c593562ae32ada64442fd1b51adefbe88b8a555de0c14c61b1287d7e0b0a1cd78e043ba98ce25482f80756afb2ca7609b7b0092
-MISC metadata.xml 509 SHA256 50c448220e5f47949c1ef40fe2236d50eebfb7a98961fdfed22235755d298a2a SHA512 0087bd354161698729e76c351ebd76c2230755c529a490c83cd8ed28416d968205b74220266ecc7611a3bff57fd825692447a0f4bff7a320629fc586703310c2 WHIRLPOOL 2a6888af05d4fe270a56043639b4c62900c379784b8a6ee2478cbcef31d25435433a9e65d6027757b551b99c560935c82ad09059310c7a1cb64ff7693b3dffa3
+MISC ChangeLog 2284 SHA256 aa066fcd984ab53b949c8f4602617bb10c9905ffb2d712538f1b26a653c4fe5c SHA512 a4140fb33d21d8c9b263317d5e3d04eb04412d38479536977776daed24123d50311d490de67715c69aca074fc8d88f1daf803b6876e4b72e2a7ec23293cacdbb WHIRLPOOL 1f6a28d0642c606f41eb5eb64d4797acd4030d0962451d27da737e3a5e17765c70dbce9df55ecbc9924798a61045ec659d1481fe60313c4239c6d157cd51ce3d
+MISC metadata.xml 565 SHA256 6c26bb11424a1765e1c2751fa0855b0bbe97ce142d6abafd1cd730afdda5bd97 SHA512 856f91dcdd47e8aed2ce56d5aec1c1af34c85c78496dc53f46dab6479c64cfa0daa0966ae47a72a0f797c66d91784a64f7934f66ab5fdd9e529beb819fe5675d WHIRLPOOL ca8fbcc8b9a9735c88f6da6fb188f7fd090f9eb27ad36a615bc3f1ad013083115ce101ea6633ea3ac4d5883a025339fbf474444bf3849d8abe18ba5692ba0718
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVJOJzXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOdyUP/RwwlP8cbfJHcjn12AT8K1M2
-vVjQkq5QzdzM25I6TRqE9dLxxVZgaS/j9rNZooQtkk9d8qRjLu3qOev7MX0wpUwF
-DqsnnlRh5J53QYMIdyR5MrXBIyztldk9b5sp5QQZWUbh+Pt02DG3jEVru7mmP9o5
-v3Zaulb+3YnwLpXwrmoshpIRxki4DKYDwVQyimDAcDPYB8auDU+wpcrwWgOpd/G8
-RVs9EHfciIEJcldfoHFpxWCvnywrqox08WeTibnsrwDma+TmSiBCcEq4R+A8DPh6
-gf8YNcxEO58GENs9YWXT4v0wKt/lnU3hyTvC3K8SQvdaPYOWqNLSr7rU1VKvc33T
-PP3jEXvMYfhIIXuF+PiYQBjXL+6oaD1xaAn7oM5vDYWWLM1vEs1pwBBAYPaEPRQc
-u1Hw029/2OTD871xB5BdOrTU88CqHEx7p3x6J04nWHfw8M7v5MAPzwGwjXUZ4idw
-txkUw0qunUUv9YThQoYT0UdTcJAiveaYLD0cCasuMvPnfH5t7Gcq/2F1FnRfcNLC
-c8qZD0hhKIhg7TNd3iH1Oj+1w6Xe1QXG+lhcwa7faLOQSWqrSi27tqh2zTUEneB4
-BDjspHnlg8zgPcbfUqax+CvZFv0/meZkx2ec2cyveHhKm8xFOVbHj6eZT2x1OsIt
-QHLLH/NuIYA1H3xoyWwV
-=V+n+
+iQJ8BAEBCgBmBQJVdJtKXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmizO0P+wdSSN4iPzZQGQ3I6Blf4V41
+ASd8sn1urSRKIbWovmfGj91KBWBkJEfpv2y5wwBTn9LREHCa1C7wwL65cPOUIeC8
+G6E8l7pOlhdj80cNE+21wAA4Mqhc3TpVE0FrBZt6dXvHLSVQHcywWp6GMxDE2RPB
+xAeSMCZCvVoyBLhTmoHRwJ79VRsXJOL/T0Q3uF4F6pWEYvi9rzVZerx7NpZN7ABS
+l6nExiVGQM1h3vwvM1TOScet7tNRUFvl6tyuNMF57wEeGEah6ozrVrZTqhxGJrjp
+D00+7LQVTLKp+s7yDPuoekTVMGibWcyt/YH+ipBKa7sY6shsLCRUdf2RSfjXYtcn
+mNX/gbgNC+3WnpJU4mlhPVsy3BK7n/A1fNkVcI4TSEcW9pLhNv+Kke6ylHvEeGcf
+R0b2CwW8ykhj/tdrbTr9VKoAG3uDddiXzSruw/w5jfoOd+EXK534/N5rm+MYLC4l
+gNvmVteNa7Vs/414nru2vjjIjdg+SCFINrFfbQt4V0dxtLNHSjizjmAbTF6xirQT
+E3Hc68Ag4tfOVCuM22YW0xbVKcK1NZfhiHAbE/9Eo2+Ax0G7pz0vahst66pQmxpm
+sxkXaT+qmWYg0d/yJJj51rXwlyeFlgvGtODq+OGh2jOKZQ4R974dbqoqKaPyKZTX
+zxGeXPhE/t1j2vl+mc1+
+=n68T
 -----END PGP SIGNATURE-----
diff --git a/dev-python/hachoir-core/metadata.xml b/dev-python/hachoir-core/metadata.xml
index 751feb81ad93..12b9db27479c 100644
--- a/dev-python/hachoir-core/metadata.xml
+++ b/dev-python/hachoir-core/metadata.xml
@@ -8,5 +8,6 @@
 		etc.</longdescription>
 	<upstream>
 		<remote-id type="pypi">hachoir-core</remote-id>
+		<remote-id type="bitbucket">haypo/hachoir</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/hachoir-parser/ChangeLog b/dev-python/hachoir-parser/ChangeLog
index 175faf8a1a2f..7c4b972f3ae2 100644
--- a/dev-python/hachoir-parser/ChangeLog
+++ b/dev-python/hachoir-parser/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/hachoir-parser
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/hachoir-parser/ChangeLog,v 1.15 2015/03/08 23:49:54 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/hachoir-parser/ChangeLog,v 1.16 2015/06/07 19:28:30 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add bitbucket to remote-id in metadata.xml
 
   08 Mar 2015; Pacho Ramos <pacho@gentoo.org> hachoir-parser-1.3.4-r1.ebuild:
   x86 stable, bug 540290
diff --git a/dev-python/hachoir-parser/Manifest b/dev-python/hachoir-parser/Manifest
index 66c6a83b875b..29ea2f63e8bc 100644
--- a/dev-python/hachoir-parser/Manifest
+++ b/dev-python/hachoir-parser/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST hachoir-parser-1.3.4.tar.gz 359230 SHA256 775be5e10d72c6122b1ba3202dfce153c09ebcb60080d8edbd51aa89aa4e6b3f SHA512 d1c01af0fc7dc59fc4fed57401cbbb3ba498d1a6de78322f47ff139ac10f1ad1d5713011c04fde610267b40188c84ff79397f9c8d309c1ab5cc3384c03577948 WHIRLPOOL 84ded718259a823f9a0458a846b4d330cb087bec8b8559e8dc2c1175e8b4f82ec17e728a38e7d881087ff371f24f7cfcd8dd30d3454b714366e3129de418a9a7
 EBUILD hachoir-parser-1.3.4-r1.ebuild 771 SHA256 5a43b3c4c31715eb4a214a8d92df28eb4bece021168e3ecce372d4efecdde0d3 SHA512 7a47e8e319727a41742346db688c33d0442baf74bd013917d0da6b129f1baed8a73df6ee692da2581df91aac7de68ee5e28c84ddb5da9106f470e108e1643ce1 WHIRLPOOL 51d39d82c3833d2784e6f90090c8c88234e8f0d99c086ad497d13c8c18f4428728ecd39d7e1a32b48411b4eb6c1960534551f4c9ee12ba873db7908752be78d9
-MISC ChangeLog 2317 SHA256 d864d5db57cfe538aa7d601fe8422dcf8ded2aa82d3c8313bc1ef9968b02c7e0 SHA512 a16b4758ba0571fd91bcdc837bf268ee7139a210f75ee21c9de8d7e849125b23db6ace6228ad0aa3dd0c488d22bfc3e3ed1352e0405dfd1613bb755e8e78bc3a WHIRLPOOL 03c7090eef851c849714bc345b4ec884944a01808b689eeca8731c2c10bb32f99d04683d1c8610782e38eb1727c8fe2e8111da1d6201b31eaf893da2377f8a4e
-MISC metadata.xml 487 SHA256 1ca977fbc98c5278bdc4830a0926bb5cb79d445f9fecb604cabaf5ebc2a2d61c SHA512 cc2b18fd7d5355d979adbc40bb2fe2d5b032381d3f9670b5d83dd120e6fe56e8dea75e990cba2ce2475aec142b2f512bd12ce0ac8a5dfbcde42133c568439881 WHIRLPOOL 98d31457deadd1231e91cc8e159b1afd30a30bc1681be7aad16599dcd6f58c6466292e176d87cbc5c7893dc8dcc11e40f3c76a37c257ba457ee63c584a03aca3
+MISC ChangeLog 2423 SHA256 52aeca9655522a9b0a6728eb6d03a14f3e6d253bfe22fa423041884d782f78f9 SHA512 7791db98abb7079148e3d49dc1ee476c2818318de3da857c75b83e6a0ba8c47b192223b3a8f142d87ae99114f5080f6d78591940240593d2410b48fbf0448d68 WHIRLPOOL 0d2fffcde89cd1ed109251e8fcd9d4bc23314d849073457ce71f055b6b181260adcc16614ec56130a5d82744135ffaee4a337435f53cf57c7ed3684f3dcb38aa
+MISC metadata.xml 543 SHA256 761736c3c1efe323796d1a04e7c77fe91da35897d8febb623ba098f0f21d5031 SHA512 b575cbf419753bf27f95db0c754ad1076fab8953d8e2f9cc4509b9b1e48ea9b6e37cb86a96c806149647dd718547d0eca59b42e742f64acd3b0a7d67f39f7e18 WHIRLPOOL ecda611b7adcf2ca0412fd9a41fce6f64864039ea29a3209c6a113784e1765c7514356ba59e24b7f2475333d6aa2d5bc1147a56bcb98d1a05d0292baf3fb9126
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlT84B8ACgkQCaWpQKGI+9RILQCfQvbVEkSjwTSCg1v6H1e8BMuZ
-jdIAmgOptgMHXUAplB39oex2bNZ0lPWl
-=mIbD
+iQJ8BAEBCgBmBQJVdJtfXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmijWgP/jkNq+51NFie2kI8iacobTCG
+DwnwMLtKGOBSitU1aDg9N24crmkE0FtrfgmlPVu4tmfMJmh5G5tvm+BAcaN9hITC
+TBAiqBbhXpuA4Jau1EDk+TxjPX5eubcYbTA6gbfgcUeKvZTij6slpo/CoYkMzsS1
+t0uRmdkGeWfTvkXegmHezxh3jLdptiZHIiQSH/n6ykRs3C5V42LXalSx+GABlJTe
+iuwzOFvumkjfeTrgA+N4PBS/zgd8AkLgZ1rdb7I79iq85//h+1e2Oo6hFza0tjjd
+k3DfJPjRIMdrc6iQ05BPBW3fZdt3UQHKxyUMu5MmIWvZFsWpsHEA+pipOIpZuA01
+SMh+9JzLHVwWySVUAHCkdBf+VV5BQUY+pNMROPiqFxRXdmObf0GQ0RMxjv61+EIB
+rBpIusaC8pWfPxmk1QD5KpBlEV/Uh3jHVpiLFcgDYfV7M+RUzSfpRRmiQJx+vIGy
+eNh+CLzfd+jSUZOUZcFZvn+rISWMXaSDb684mn2beIqnXCm1UDhVOmAjT7soI5ii
+CqjgNO9c3DDkD05PeeY1Q3bIVgXjBWA7S41xd3Hq+1ogsBlxvF3rOzxjbyFzWue3
+l1DlzEOYlxazQDZ4pq6N2Ru9c+vNoV+HeOjOPpI2pePFbwTtRtdAXgN3J136os5z
+8L5Tho4biNmeKcPHyeof
+=YNSH
 -----END PGP SIGNATURE-----
diff --git a/dev-python/hachoir-parser/metadata.xml b/dev-python/hachoir-parser/metadata.xml
index 8382f1c39897..7233bee923b8 100644
--- a/dev-python/hachoir-parser/metadata.xml
+++ b/dev-python/hachoir-parser/metadata.xml
@@ -7,5 +7,6 @@
 		(they only parse the first level of the tree for example).</longdescription>
 	<upstream>
 		<remote-id type="pypi">hachoir-parser</remote-id>
+		<remote-id type="bitbucket">haypo/hachoir</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/hachoir-regex/ChangeLog b/dev-python/hachoir-regex/ChangeLog
index 87d3eab9d918..834ca347b335 100644
--- a/dev-python/hachoir-regex/ChangeLog
+++ b/dev-python/hachoir-regex/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/hachoir-regex
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/hachoir-regex/ChangeLog,v 1.13 2015/03/08 23:49:58 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/hachoir-regex/ChangeLog,v 1.14 2015/06/07 19:28:52 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add bitbucket to remote-id in metadata.xml
 
   08 Mar 2015; Pacho Ramos <pacho@gentoo.org> hachoir-regex-1.0.5-r1.ebuild:
   x86 stable, bug 540290
diff --git a/dev-python/hachoir-regex/Manifest b/dev-python/hachoir-regex/Manifest
index 726acef20c58..a4a4733b973b 100644
--- a/dev-python/hachoir-regex/Manifest
+++ b/dev-python/hachoir-regex/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST hachoir-regex-1.0.5.tar.gz 22156 SHA256 a35b2bb0ff11418230fffbb97605adba012bf65d2aba3e5e7d8295774d5ba986 SHA512 eee781ea9665c41e8a2d02116aa0af0d734e6e1ecdb06aaaa69fe9a54abd3ef16590281570ec0f87a54903c9849c12387626c9fc78f3523eaf13a5a77cae1610 WHIRLPOOL bd11417c1ef933be5706c1539284910fff343831d96239a979a855c651bd8a033ce2ea1b8d4d54b4dea88423ca87faa0a6aa0a0c57ac83d58f73fded87691097
 EBUILD hachoir-regex-1.0.5-r1.ebuild 777 SHA256 829c46422d295c2e17d3ee51e8fe6136c55bc51cdf97c2e09a9ca224f9926201 SHA512 23b115e7d6f5b20b79167f635f28b497be73ac1c7b2304cde4d3457d0dcb99ae25d980c7c964928b5606dd767d75592296fe1fed7aea679cf9a42a1b3fe6cb2f WHIRLPOOL 56525779d6275b589653218c42084b0076acf18ebf9a97bc9574f331b7028026c1aaf6f248cad70d16b110a8be51883ffe6082e5372d315bdf0d2f54b91ef431
-MISC ChangeLog 1968 SHA256 632ef19d186755c40c2bc2baeea85223ae6cf77f793e59c0a02d472462a9e09a SHA512 d63f15612dcfc3a7471e31d1032700a1535f4ccad8a4ed08495b11f89396898341a1c4ff44e3f021bf7fbcecd7a67e61407992d69ba15a96d1d7db6c39c5cbcc WHIRLPOOL 911daa4446f2a7969610b40c52efc9b25ba7ddb0fdbe92364629b78fa36a69c9dca3e386b6a7d064821a2035a300152d31f9b9cc2c521ba630178e257d094327
-MISC metadata.xml 394 SHA256 610acb690a4cd8b4f1b31bab469efefcbc330802d489880ae366cd475b02987a SHA512 936d27db79a857edb2a0236f726493aa7df340c9834a1c1f3da03c6f72704f4bb6888bc0c8682faf79d8d03026eb67651dd3071ec59389112211082cbc77c59d WHIRLPOOL 02fdd2ba74c00bb2d5db2a2d36ff68eee3919e33555f83d17e5e911c2aaba41021926aab7bdca44b8294a63592b6125fa5b0958f46dc9692b627806098add5e6
+MISC ChangeLog 2074 SHA256 e00991aaf6e598717072c16cdf5b68b30e2632c37e095a6971910dc0b9f8e164 SHA512 785d7ea0ef8510548197bc16b2942e08e6fa4b71a045a817bf87a6579cbcfd3a6802d8f63c70701bc5210fc0e5a01ba0186e4c189e0f42a29321f5d48fd95764 WHIRLPOOL 057159db313c29246b5ef8207522bbeebc7ae0c964c6b028136a84f8d0034ef5cd90b865fe0b81b848a4e44899f76184b41d4217b23b9f4f250306bdfe7d7229
+MISC metadata.xml 450 SHA256 c2a856d2c26c1f6f4c97cef903c6fd45938582a9de920c6b29dd7745910c9e02 SHA512 52b9bd7c835f70b038d5df800a50ff9739f16502c1e829fc027fa8c51c2cac90f6497858433b6b4365ad15415fd3db1ecf7f44c3f81f9ab6fc934b3a41103d5a WHIRLPOOL c4214a8c5cbce9c64854fb26ea290536caaab12fb9b79c6d3bd5904a9757f6806a2cae156caf115381d311ba2c8c0aca84e4dd390da955700fec1db8084e54e4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlT84CMACgkQCaWpQKGI+9QyEACeLb0921nu9H+bkCiREVj6gqFj
-VqUAn1n07j9PTLF/Ytqv7SdPjyPG6n0Q
-=uO0m
+iQJ8BAEBCgBmBQJVdJt1XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi22MP/0b11rZn/ii7KfYf+Aeua4KJ
+B1ujy+B0uAJFiIC5syFzQBYGk0/vCZjwjncK0r/MIwrcTBC6zpRI8ADK5UCCA/q2
+IRFkThzfs8KtMIPGbVewHt9nukAbJpOdx+icJui9X2FpmM/3hqt75iPynyemXx0v
++zfoo7opbB1B/pD1WdntGr06VeZZ1ajweCBMTXLkEARUEBOwjegA0IWevSbyBfHc
+m0And2dC/xj3S9cB/bZTCa7Z56fU6oUYMjhzx87mb+QjM9yDREnD2kWMotnY22H6
+2JF0B1BDuuzM4PlUfqEnrRBbqG3RZQt9g1NfDvVPncxyd7u4o6h8G83ypWLBBM6F
+4jKLo/QVia/F4+u6AbmUPql8YW0nTRypfLiPCAS10o/NJbckYEiTKeyyJocsLQXu
+K/hfpWrmTbIivWFwNsKVu8LmLQxGCEGgGwGl3yHP+quDYAF+2h5xNr5TDLcjB2ny
+4d354vTa6zYDxuZmkbskS5RQNbE3RJymRRjUF1xjM2Q+pZITIt+FJFnUaLPAQs8j
+ExNB+CprRyHkvc1/kCfR8uagpprlvhdjrTVMpZWoI3scN/dCimEbUK+LF0Ay2pCn
+mAANmaNeMzD5QgdC6Wbv3I5CZ2XPp55N9EhURmoUx/VX88YcuXC1R/zeOWDZOnrF
+XALtAaTZHlt3a3mwPRQc
+=VMXb
 -----END PGP SIGNATURE-----
diff --git a/dev-python/hachoir-regex/metadata.xml b/dev-python/hachoir-regex/metadata.xml
index 323a4f52e6e5..a00819c5f2f0 100644
--- a/dev-python/hachoir-regex/metadata.xml
+++ b/dev-python/hachoir-regex/metadata.xml
@@ -6,5 +6,6 @@
 		pattern matching (find file header).</longdescription>
 	<upstream>
 		<remote-id type="pypi">hachoir-regex</remote-id>
+		<remote-id type="bitbucket">haypo/hachoir</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/hgdistver/ChangeLog b/dev-python/hgdistver/ChangeLog
index 581112d59bff..3fccaaa5ba6c 100644
--- a/dev-python/hgdistver/ChangeLog
+++ b/dev-python/hgdistver/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/hgdistver
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/hgdistver/ChangeLog,v 1.20 2015/02/19 18:30:53 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/hgdistver/ChangeLog,v 1.21 2015/06/07 19:29:18 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add bitbucket to remote-id in metadata.xml
 
   19 Feb 2015; Manuel Rüger <mrueg@gentoo.org> -hgdistver-0.16-r1.ebuild,
   -hgdistver-0.16.ebuild, -hgdistver-0.18.ebuild:
diff --git a/dev-python/hgdistver/Manifest b/dev-python/hgdistver/Manifest
index b8a649b6feda..2048dd5f6c37 100644
--- a/dev-python/hgdistver/Manifest
+++ b/dev-python/hgdistver/Manifest
@@ -1,4 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST hgdistver-0.22.tar.gz 5442 SHA256 97bfe6b57f0edf67dc4d59abf3abe949584499cd3f67350052d9e2601e749bdf SHA512 690c4fd1fdafd853539c37703982ece5aca6df8a7c03b35e98447ec6349454f806500ea8fcf9efcca8958286e3e5f36fc86d2ae81f64ab61397cc86106cec7ad WHIRLPOOL 53050ff028c8c67840967d20209bb9c50b1e33b74786b0f7ef984172d6f87c05b111d51e8d3cc06ebdd6aa52aa34dc59d90931e5ebb0a16f50c1b071bb0d15a8
 EBUILD hgdistver-0.22.ebuild 884 SHA256 33a799c0d949dd2b41751bfdbd2701f282d654f54e9e57f0357e2e563af8470b SHA512 166d0ae40411724f9e1e81ae8186988c9702711638cfbf40f7571dc46eec348224a8f6ea46a164abcab770abc27f78f6d2c4c88245677d64d968e8f3e72b678a WHIRLPOOL 11668c930cc80c4281eec8a22324f96b7dab696833621567101e6edb73fe3e68d2bb0a6f38aa3e7436a63241258b37953217ac115e310a332e306a30ee6b9d16
-MISC ChangeLog 2675 SHA256 3ad2b52d0d5d5c943bb2d5c71dbb25737d1cb2fe53fb4d35df5b7306f3d57c08 SHA512 f40d78e405eac946d63638ca5c1ddfde00e21b0525562dd051c82632ee871e2431f4616f38d807bfa06a12a46a9ff40cfa9188909c1d69930ccb4ac124bbec4d WHIRLPOOL 232487831f14e91851500f54940cc2c8e19f2fc3da0550e68aa797653e7fe6d3f3740607914d8fc8b20d0e566c95ae2ed6080032f16aec79a6cae79501613061
-MISC metadata.xml 227 SHA256 1e76d484d45147b1b13e20c4b24f361111b0c32973f536f1812f7109a511a254 SHA512 1ce4b99355b37566c5674c6e3c626373da74b495c04e3f17b1844cd448c999da4193ef8475e3d2413f54aeab9a5a73fb5ec31ec8da19714f94d93496a775c9f9 WHIRLPOOL 728a0330dd4542c2c0d79273d57bc3690d929218dceb4ff0a0743aeb4833162333f528707c13971a6b221cc374745d700e5b9a4385bd558eb56ab247c75b1a12
+MISC ChangeLog 2781 SHA256 70cb61aae70032ff9d175bc0b6f87c57df2d26f3bf18e5afe43eda9824bfde3b SHA512 35ebbda1152fad492687419607bcb517ce2cd47af1040bc34445b0a6946a7fce3653c071dbc41b3d60b274792c701a76eee80cc8ba5b0696870d20404942b40a WHIRLPOOL cfcdc6433c6b65a7a15c2ad3263d7b38739e92a0cd9a4c52f20930febd552d6b7ebfcb1670e3426a430f35472fedaf1324b6a3e27363acb4d7e22e77f52358c6
+MISC metadata.xml 304 SHA256 7ad26d8031f1e2273f97a84dd346eaad29c23ec9044bc35303796282da8361c0 SHA512 78c490bbece897da2f6f77588d43e10d670d1963360ef48c16f67d3543bb47c61d3717f035d982c26d5b2e3306edb53f31df9a5bfa702dd20d26244cb4512606 WHIRLPOOL f88d9139db8957e132fb3fae8c65f5d547984d88da92176fda7bf8ce68042fc12dd6fff15fe031b11915d9e7ae7ca2ffa01745278e3b6cf18f081ef10b3ceaca
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVdJuPXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmirGkQAI6coT1zCwUO0Bp6MhEE0R6b
+8bCsNeriaoKMmP6a95xVWffTQzVSD3j3eNx9QPlkzVrSMiO/8JhD4upN7ggjILs/
+8tSdAYHYjWH2+JmoZ/6o3yRrDaei82VhX412ogeNWH91kDiX2EVasK2RQ6nKVUY0
+EejLkIT64ZF5KOqjTJSa+9xnN55AuBFr7DpEZO6JyQirdSUbVMQgrQ3/+jsT0kyY
+4med8IEQaps0nA0VX55//n+PWimZ6zpfeHLVCpuGn/uABj+j2ohLCjG7cS6oVPWd
+ztSuJ6Q1biIU/pPZ5ahOkBqjPhOHZA0S/ST3uk/YasqQhy1900NTVPtaW+fHUCC6
+Jde1c4GkvXCTENFmiRn4IPCMzkMmw71av40BoUHrI51K70UFeLv1W7J8qK5UB5xX
+jQDzDAPk4V35RTFFnbVV3pIbtvrdZE0XIjNE300EZCP/b8bcvBk1kVY4E856CUsX
+YKQYdWpRvl115HiTFkZFAKfYnxUAOdPPzKJhM7FXsKX+hEgilANYRAMT/Am5cclZ
+wCcUh0/V5uRZGr7WT9b4kiQAXRfFw/7ctkjWpBZPjNAWcfzLx0vBx9vWLsKVV6U7
+bE7Wxw4oROv3oUNsPrFphGBK1wB/C/vEZ4NrBxpB1gONO0NhL+cPEW13YtsdntQX
+JoOV0f5dJlgZGDoo566w
+=Mzss
+-----END PGP SIGNATURE-----
diff --git a/dev-python/hgdistver/metadata.xml b/dev-python/hgdistver/metadata.xml
index bb68f3916224..1c8d93ddaf6a 100644
--- a/dev-python/hgdistver/metadata.xml
+++ b/dev-python/hgdistver/metadata.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
-	<upstream>
-		<remote-id type="pypi">cffi</remote-id>
-	</upstream>
+  <herd>python</herd>
+  <upstream>
+    <remote-id type="pypi">cffi</remote-id>
+    <remote-id type="bitbucket">RonnyPfannschmidt/hgdistver</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/hgtools/ChangeLog b/dev-python/hgtools/ChangeLog
index 85e45c590f6c..5ad372c93c28 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.15 2015/06/03 19:39:22 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/hgtools/ChangeLog,v 1.16 2015/06/07 19:29:40 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add bitbucket to remote-id in metadata.xml
 
   03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add pypi to remote-id in metadata.xml
diff --git a/dev-python/hgtools/Manifest b/dev-python/hgtools/Manifest
index 5d800c970dc2..ed363e276951 100644
--- a/dev-python/hgtools/Manifest
+++ b/dev-python/hgtools/Manifest
@@ -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 2510 SHA256 b04192c65b1c8338e3d52937f5263f2202120b461686f4d800db9f57573b7037 SHA512 f02aaa2237a49803899b22c97b4f2e80ad4cfef0e889f8c440c6961d5aaf2c160037bb7f74175aa7be931fa8ec3d95ca02497795dbea47c074728a41fa0b321a WHIRLPOOL 89ade9575e5d21791f14bb0ceba0d6ac5a755a72df6aa646635fb1dadb67b50d6a94237bc7059b814093e71e82151ba9b03b586ab22a51914a03d31a0c8ef163
-MISC metadata.xml 451 SHA256 187772f4e36eb2070c1204706c1f1cf8f10890c612cffe4add66c7679ef00cd1 SHA512 bc219695051809c378a795631d9f222b87bb7c5646fee5df9df6cb840896f455262c0d06453c6274563402e2045a3ce91d0c3911a759a4406e7b3c99c2199501 WHIRLPOOL cfd39eae98a2c3496ad0df299ce1750780d126b18aab4354d7d1450e0e112d7cf9d86507260a8afb278a50c8a80ac5967c3a310bdbced2453fdc6c73d837026b
+MISC ChangeLog 2617 SHA256 754fb4e7f5f341d75c3b0965d34ff265177ba1cc4b4f969bccb439175d32b3f5 SHA512 c1407a21ebf4ca21c2a04c0615acc38f2dbadfab864e03f56dd960accf64c67667624e84143f880f22edf9fed0f607c9f223705ea8a9795aca7edf3857d848f9 WHIRLPOOL 231f50a3f909519edc611ba5053533d0e82e3c890f17b8fa69f97fb23d3eab1cb61dc9c42fb74d2f7b218ffb630f914e5fdbc9017976715c53906be874079c6b
+MISC metadata.xml 496 SHA256 fd9bb7b7d7930db4f1566511de55fd153f879d1a286321c9297af8cd06a79262 SHA512 7105fc8fbc7fa469a60ab5cadd7ddbc0aa352bd551bb9c0c36812c6f364bdb3ad13b8d6a89ce2da292b554aca7c9fb6e4ff21dd32a66f5f6ecf18e097cdd8261 WHIRLPOOL 323db3938585aa5de334be1ae2b7b9e2de39f6f2b6b68ab4f5a46d243c23a1790f765e184f87ae6b19e15adac11b6cbdc791c1aaa2ed1041fa464948020a2e27
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVb1frXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVdJulXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 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
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi858P/i/J4JOPL4/y+8QXtBnyFpH6
+2O771ZWs8wK2pHR9UbItlk3Lnn5RbUk9kb7S7hGzw/16XdZ2K+UmYcqhVeLm1zMV
+bJOLH3wVerfkTiSZHogchQC3im1FYgIpQ3+D9tcM6/vyQboeKjMVHqv45QEzO7tG
+mvt3fainh3ha2XhAJDgXRdTD5mvH0+ZbxY2f+wEBP17irS4C68lHEA0+e6EQ2Pac
+pOUBtfSQTuHg2OHmoMRdg9AcRSHBpFGAldsbtnRtSJdEe0HelTaYfrxYjizmD5Cm
+ZPyP1DZWz8He7683EKkW1yP9PS8S6HsV/bpvGcLeSAPM00RRc1QAaHok5H2C8hyF
+k7JY2lZ8sdty1PKthn0dEuFkPlHF8bjeOX6kdLoVZBmZCLJyHI6oeWHVnuJhV73y
+20nlBPO6VN6kUZY4t6PHCNg35kAPgXLfREOEE95YAJYlb3zCcoCy6O9reNOthyrG
+M7RHdzg9/ojFwJ+eXJ2vLx0fqn/xhY0BUlU5wr6A43foTuGCgGeeh7+w/4eYrUeL
+CZQl9bKU71Yr0sgpXalUZjSjXY8hhAqejavXSVWQMpCjdgnV8N4xZZrH99Es60mm
+Yit2dfmeucau8jV132+i0glIYhQ+sPlFAjpI0K7Lp9iw2MoNn8ddpZnM0tVhu0h5
+Yi6j9fwI7FKGGu9XTJ8C
+=YCrv
 -----END PGP SIGNATURE-----
diff --git a/dev-python/hgtools/metadata.xml b/dev-python/hgtools/metadata.xml
index 187f6e59c4d5..af2c31f7fb35 100644
--- a/dev-python/hgtools/metadata.xml
+++ b/dev-python/hgtools/metadata.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
-  <maintainer>
-    <email>prometheanfire@gentoo.org</email>
-    <name>Matthew Thode</name>
-  </maintainer>
-  <longdescription lang="en">
+	<herd>python</herd>
+	<maintainer>
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<longdescription lang="en">
 		Classes and setuptools plugin for Mercurial repositories
 	</longdescription>
-  <upstream>
-    <remote-id type="pypi">hgtools</remote-id>
-  </upstream>
+	<upstream>
+		<remote-id type="pypi">hgtools</remote-id>
+		<remote-id type="bitbucket">jaraco/hgtools</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/irc/ChangeLog b/dev-python/irc/ChangeLog
index 7f6a50c82103..439afdb9339e 100644
--- a/dev-python/irc/ChangeLog
+++ b/dev-python/irc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/irc
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/irc/ChangeLog,v 1.31 2015/03/08 23:51:11 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/irc/ChangeLog,v 1.32 2015/06/07 19:30:00 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add bitbucket to remote-id in metadata.xml
 
   08 Mar 2015; Pacho Ramos <pacho@gentoo.org> irc-11.0.1.ebuild:
   x86 stable, bug 540290
diff --git a/dev-python/irc/Manifest b/dev-python/irc/Manifest
index 5da9e693bca1..df77fb5c635d 100644
--- a/dev-python/irc/Manifest
+++ b/dev-python/irc/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST irc-11.0.1.zip 120409 SHA256 25d818003780fd6d62e93d3ff32580e74c0e527c6290ae14b47af50b58339233 SHA512 fca2fe653d921c9ec65dfb2b072c16658d88d4a22ae91568b1eaf722a90179920808db157f587afe6de0055af3a04a528eb9022122e539150e5635f05b58f466 WHIRLPOOL dd9b9e8624e6bd86d27fead1f3006a2b80832d236ad21f50c147c07a27b2cc4933d68efd951dece44398dbc0299b73ba7a98e4eff2061d0e3a8a01833518113b
 EBUILD irc-11.0.1.ebuild 1208 SHA256 a2b67d80a1e5bd5eddf9efcdb5443ffbd553fc811a42a9a6cf9f51378d217e82 SHA512 171241419f49c776b8903349e85992be96201ab7bc2b3a2cb363b2d7a878d5c4b899fbf4546fd0123aecf802f9d15ca25ceee04784415dcce1d420829731d374 WHIRLPOOL c6a9815ec9cb26d5a8fc7b1337493da606a738c8d66dfdea51d5ee5f5d32bfab56578314cda33228bf6e9c700d1c3aa6da6c2bd262a501087c7fb5bdd76a4c45
-MISC ChangeLog 4747 SHA256 3d38c1313e60d9073c1dfaad7f874a6dbaf093da91435aa420c01304618982e3 SHA512 299387be3aad9518a2b1d05a5acb8e8692df8e10d7d11d00af9ef48c0f56a35769690f993d79f0ea7068c912e50fff9931439126f664af2036d1745db8cde5ef WHIRLPOOL f18b167e0bd469bdf499068ece32e9a17798dabb398fde12f7d0a9af72d95202ae982399a9c7ea444eb3634042243265a00a8bd3b30e6d4a6ba6cc8b4e5bc343
-MISC metadata.xml 418 SHA256 9b2dad5f714ed9d78c5c0bb82c9288af9b1ec7e6b05adb748291864b406cd045 SHA512 a80816c4db89dc89d42a558c378899e0ca3d3dffed507375c2d6ba37399254507692b142b04b3544897a62082a6cdf7c0237187f79e37e0decc31702bd5abed8 WHIRLPOOL d1d97ccdb003f4d4f3ab36b4abc018d7ddd92e16151d6f139d211519cb3982d28d378e9c076e8ee22e443e93968036f74d9de2e4eab30b14419f4c40db6c9a6e
+MISC ChangeLog 4853 SHA256 e0a6e9e62d7cbcb58c82332e7a1784f79a8225674273fd8f522269e387a005a7 SHA512 f1f1c7bbb13686353cb8361caff6419a22b3b97482b6607f8063b33376a58333fdb8e1c15b271189719e6c1f063eb7076a445881e2d4b852249a70803dc72461 WHIRLPOOL 837f08859e2c680c39eed1142b24dd4f4e308b70e804b9bc2c36c340f45c1487ec5f035aebaa9a00feb1bd8c15255b6f20cbf3085d5835be6b9bc4c7336eb7cc
+MISC metadata.xml 471 SHA256 dbfa171f1da618861e0176cbd8b843b87f5bd2e4d5eb9e5107cb00a6fdbba489 SHA512 2e17b43f4aaba0ce2a58ca827d19223df99913f2730c31a4ad19bcb9f57c1aedec75e2e069aaa452b9a415d1f0fc177b9b4feb0145670279c2fe888b5e2d41d8 WHIRLPOOL e39293cfadda98e1466f61877b4d56c664658450afdc8458843af77595420c9b6faaecd131187ab1b1e3845c019835a8916f170766b39584a2a8039b375d83a0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlT84GwACgkQCaWpQKGI+9QtCACeP/ifdJM+1dG09rmWZLRmGj5u
-LskAn2zbYQClwtsOcd1dc/NpParRiNJl
-=QChZ
+iQJ8BAEBCgBmBQJVdJu5XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiFZgP/RnO9kv54vx7T8uoEazsDRET
+WwO5eTbuNedCfzs1hg8whrvyctaFbLoRU2bnrJocXQyPlD3PMmq8jISUxxi6GZW8
+XBSiSxSO1ecRD9gjiZMnG6/xp/IghupqSXz4oH357/V5NuH/rRuIokRhLMaRrwsA
+36pzNagQzllBQjWGE4GJrjwpPucCU14s8kaijMKejMb/RoStyHPZlE1f0l7OXzjA
+XaRgMIH/DWITevCZXIi4lMWAAztWaVasZGgg3eGUmFC4L5EUqBKD8B43rrPP+2dj
+AflXsEXbH0dfQyGqAZQNQVjvDIQZe3PyNXMyrTXhI9+lSnE2HNPnDGjxMow3uGPN
+TBwB15E8ZMpXGJ4jqNpfap87SQtbRzvlZZF2No6vEePuM1TFuGDxomDlIM71BDUr
+ZZthoX1b/iQecHJmnAic+sV5jUSppfJzWEzlpbNXhejesD+axRajMnAYg3bXLQjE
+zorXXvPUlsibbsJ5LYwrZvuoasQ0N0Aq+u/2hNY887oeY0LaF1avlAxj6T9JEoZG
+UnwFzcpxes/gTAH7URdg0q3X9Xe3NgISyjWRjLl6uTEEO7eZOd2nTTsyDsJwsm7I
+ny3N/58rZ/lCBWXOCVsUOAKaCJs1cCaoRND4nznsWNbJbnwfRstkOe66Mz9yBCst
+PzplSX69dqVIn2HizD4S
+=UE2U
 -----END PGP SIGNATURE-----
diff --git a/dev-python/irc/metadata.xml b/dev-python/irc/metadata.xml
index 594bb4f5e361..9a5995a5ee5f 100644
--- a/dev-python/irc/metadata.xml
+++ b/dev-python/irc/metadata.xml
@@ -8,5 +8,6 @@
 	</longdescription>
 	<upstream>
 		<remote-id type="pypi">irc</remote-id>
+		<remote-id type="bitbucket">jaraco/irc</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/jsmin/ChangeLog b/dev-python/jsmin/ChangeLog
index 6c6f8103878a..4027d74003ae 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.8 2015/06/03 19:49:58 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/jsmin/ChangeLog,v 1.9 2015/06/07 19:30:18 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add bitbucket to remote-id in metadata.xml
 
   03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add pypi to remote-id in metadata.xml
diff --git a/dev-python/jsmin/Manifest b/dev-python/jsmin/Manifest
index 1277b8433274..5965c3592813 100644
--- a/dev-python/jsmin/Manifest
+++ b/dev-python/jsmin/Manifest
@@ -5,24 +5,24 @@ DIST jsmin-2.0.3.tar.gz 5715 SHA256 3e350a84896faecdbd4aaa3a8ffbb3523eb2c94ee125
 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 1150 SHA256 55d69fb675fa727c6724304177dc9c0c6055bef530484d9ed5bb571663d98ee4 SHA512 d3bd30c3467bf21a829c8cc7ed8266b49fd3da3d52d851f67d7a6fd57b1c53cc2de926b36b3b5c924d813a3a77ecdcf51e9bbd28d1c9bf15c7fcef6f57579062 WHIRLPOOL 9ad1fcf337e2d9002f080136e071a3637e87c3aa73ba53e713b01af1a312cccc03fd25d0e3335fbcf0ad53966ce4e113311e1c1ceff78fec125d9273b472fd22
-MISC metadata.xml 233 SHA256 b0aeea1a724f1fb8cd509f5d4e17a63d8370ea11be2d203797385c397e07bce7 SHA512 dd11aa4381fc6fb56e011b597a92586c02760ed3da5df2e97d6471f77780bba884ff8a96cfd9541af21b176c2b791d85397421c89ecc4f8d6e7081abee104ae1 WHIRLPOOL 2621d9f5d38cb269bdbb893a5e4967a0fbd63c12ffb104507fdb403d764db95dde2e4e5bdfd4abc306cc7139ce88ca3a981235112b0db6cae2fd693a6c188cfa
+MISC ChangeLog 1257 SHA256 08beb928087025f64aa319379ccd0aaf559f8e47a2b43b06efa7ef93d3e3e808 SHA512 03799742caaba78a581488f51bb9a93b95edfb42e937acc6aae608debde4f771aaae90844dbf3a325e5464141370a6a2d0bb18716f06292a96bf525c01e700e0 WHIRLPOOL 9c6d89c3ab8d75c7a91b8b0f39d2d777963d8413b19585b0f2f5a48c2189d479b5a8753c5b351d5d77b5e0bf2aedd012eac9e8fc57bd437eba421d29191b96db
+MISC metadata.xml 287 SHA256 6812b5e75b96e97aabed05a047354b8248bf098ee059ca03be3607071808355f SHA512 e96862ace00d94bed5779875c532c34b1c096a89a68fa93e8a72666477c931298a4791d5ed984cf2e0ae23f21721b4c1399690ff60175d1aee83ece23827fba7 WHIRLPOOL 3cf37d7b0196b1c60955642a2cfa9c24266102958ccffca08a85d278d66144cf42163e948fbc586328ae7a08f122bdcdff90a3791ebf8bd027072540b212de26
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVb1pnXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVdJvLXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 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
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi5EMQAIN+OZrtt0NJW2W4qQOQ3wqB
+Hihi1B7nANVPByU+V+8PQoP6mlH4wS6d9fwq1zTQM8MtU0IWCtq7rRlWvplPD/lm
+WyUHL+saRmrRuS1pFaAZgO2bAz80l5Qavtlq8Cd97o6HBe7J1yCBgLC9kaLU1e63
+TjKbuYOVx34q4t91wT8h3ryjch7NCmJIb7fC9CkvdoW139gLaIMovjOegn4Syg74
++0hZOIrq+ZfNbHW48HOOujq4vywkbGieFqUvTWLoxcO/+lwZUU69m8TH9JF5CbCV
+5222i1sH8L/9R1UgsKaK6fcwfgIvW4FiqO+OU+eIKnZDrlzof79BJohE8DGeQcEY
+Q4ROooaM1H2dTWOfLVa1vmOQv9wAxaStojxEu5TG1KLhvt58y3ufJJYydWELgk44
+h6CQw9zlAWBPxD39GGbh2gaDM8Na3P/o+jMr3aH9X1lWT6lmJMf8XaijuFoNUl4C
+llNQilSzm1LrH3N2KGArjVJdEz1zpAtCA/waHe2txDu2KHwrBbEc7egAQnnN+ADY
+7xAAKkJITMT/6lKCMb8kfsy0ueoZF5klcoYt3dPzf/AIES1479go5Mr/oerugPZT
+jm7QYjnsXsBpYtR2OmflP2ZjFWKIWh+u1Ts4QlRIwLmyhyZocZ1OAuPW03R0uVuf
+dCZ0aCwBokJZK8gFsA3h
+=Z0Ju
 -----END PGP SIGNATURE-----
diff --git a/dev-python/jsmin/metadata.xml b/dev-python/jsmin/metadata.xml
index 405a826aa785..a4bede9eb394 100644
--- a/dev-python/jsmin/metadata.xml
+++ b/dev-python/jsmin/metadata.xml
@@ -4,5 +4,6 @@
   <herd>python</herd>
   <upstream>
     <remote-id type="pypi">jsmin</remote-id>
+    <remote-id type="bitbucket">dcs/jsmin</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/json-tools/ChangeLog b/dev-python/json-tools/ChangeLog
index dd7eea907182..859ac6200c0e 100644
--- a/dev-python/json-tools/ChangeLog
+++ b/dev-python/json-tools/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/json-tools
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/json-tools/ChangeLog,v 1.5 2015/04/08 08:04:56 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/json-tools/ChangeLog,v 1.6 2015/06/07 19:30:36 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add bitbucket to remote-id in metadata.xml
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> json-tools-0.3.2.ebuild,
   json-tools-0.3.3.ebuild:
diff --git a/dev-python/json-tools/Manifest b/dev-python/json-tools/Manifest
index deff45b5051d..1bc6bdbd19ad 100644
--- a/dev-python/json-tools/Manifest
+++ b/dev-python/json-tools/Manifest
@@ -1,28 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST json_tools-0.3.2.tar.gz 8922 SHA256 246f287787582c206bf31a5a01bb823c0daaa979753d711c71bbf6f4d597bd1d SHA512 b6fe64f1acff8805bb30a01759a2f12536b6864ec4382ebc4c366a89a58e0a309136b49404007cb6df83800b0cfc33dd21c94fa7a5390a75760e1dd89da2198b WHIRLPOOL 72e20b29efb558322c657f6c98a4fd1c86c5e37fad1347e20d7cf685dca3136b18d375b93cf0932556f44a3e7ba993715dc3153320134d87847fab5a7bd42098
 DIST json_tools-0.3.3.tar.gz 8093 SHA256 d651d10326447b7a039305661b0fa6c44bb54ca2313494e20dda1e4c8c63b7d6 SHA512 34bb34d52f7f230a13071a9a5c3de79f2c76de6b4a8ce60d0acb4447f68893faeb79ee9a98133ba72f1c1acebd9e8beb34dba0953242aee97799e8b97fcf6537 WHIRLPOOL 203666696b13d95b4c918c604c8b968ac1b64603f3559fec4251c2d80792c1d0674fd7a7a086e4536110f241c93fe28457921023183daa3697bf7deee352a11f
 EBUILD json-tools-0.3.2.ebuild 867 SHA256 6aae7df0b313189bcf69dbba9bfdff960ea6f89bfe10e872e888b45c53e203f4 SHA512 6fa3d21cf8ecc640bf2d15d6702bbf493ec51710b91969b3582800e7265aae2a91e9979fd9110191a25c59a9114e8b0a7856f10e61531124ce75c59f10f4f241 WHIRLPOOL db6c204d88c60c26a52f982fe2d25ac4e31060c466c1c70b2136e5125ddb9754941dc7885bd9e003e2d5d7c7f6216e6b583476d4a7574423852046d45ad514f6
 EBUILD json-tools-0.3.3.ebuild 865 SHA256 438c32b6d639d8994ff0e6615a7753e4f9e211d78c315113f85d446eb49da438 SHA512 ec5b484d6305e1a044d5af8daeeea4b781008123f6db58cdb20d0058387b4f379257a94452dea18bb48acf764601aa0e22cc8ae32b5b24b415fd40d39bad95b1 WHIRLPOOL bbb3342310c6628e01df5566d739e4b16fe1994ff05718bacd2681b4ef282ec54c54feedaee7aa366c7996a959251af27480c05eb69a317c31ce0f49be0b3b1d
-MISC ChangeLog 853 SHA256 95cc21fbf01f9aaa904ec7c62d18b1193575a91f6b5959f9c80517f422129706 SHA512 a3bb48514e3e3ad9ea9bba374bd40d7ef384624b0f0219f4530191b98ed61d282e8f0d284e3447022c097c3a18ba3ec707669a356985fd389cdc2e056a96c1ce WHIRLPOOL c8bb025032d2f6f90a987ac2bf556981671c31fd49d3ebf1efe2e3ee6da4792e0c97715265e011c0ca7995754153030fcffeae99f044c72cca5138550dcd1b67
-MISC metadata.xml 233 SHA256 99f350c1ce516e7bc5ff65ac2457ea1cc3b3ebf40ffd4a049c2eca2e1693616d SHA512 58ff644cfaf2c7eaa1c1581bbd3b398b3eaa9cd32b1625fde3e43f16002a6f3e311d06712dd1a08c1514bdf6bbef5cbcb226baaef1289d45d65bdd15221ff040 WHIRLPOOL dbcd908c327bb21f811c5a70e569e74ae9813619e4e96e369ca445fb90bd71af9dc284abe37d3a37fe86fbe404cbc1c15050b69f3e91ac76d36d6ab185f86139
+MISC ChangeLog 958 SHA256 4a07afa671bcb7f13e4b3da52ceedf2c669e63c5b25542ae4234364d568a97ba SHA512 cc70353f984c22e28f930ec37bd79edcffa61ac21a8f98df239621d3d96509781f3609e7230d1b8f09f7827ce13669a7500e38f8c2299f0426a6f03ee01d3a66 WHIRLPOOL bcd00f23b444248ef317b5bff02e964fae27ccba2ddb342047c1a9c76abf21a1843e455eeb01ffd0d77ddd552a514dd825f0fedcd7c2d5911a83ee657b090ac9
+MISC metadata.xml 307 SHA256 7ade366334e26c4d5bf069dba2bca33c785f520b475068fa5c877f10513b21fe SHA512 f0923369dd94e3c33669fe162f6c19819152bcabb65dd1996060905905b7519d990cdd5ca8a71292b7ecbd4564cf98da8a81175cc8fcb4a3072b1e9f03309a63 WHIRLPOOL fed01fd75bf6fd492668e2a2c467c27f2586d38e8d09a55a7708feb888dfa9254747b12005ffff333a4799979979a6d2d95cb2ba33130966833b31797832a993
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVJOJ2XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOtRkQAJp8J+R0e3MriWoRHyvPwZk4
-CtE52RJr6RGOFmQSMwuQw/AH6puUlbnVgccQlgATB+iPR130AvqnYj+QD9daHZJH
-4nD6GLGGGqsNth0W1Z5VqxR3L7H24HUgZitGN8xqeglfW2YPN7lIGzOxAjhu5Hjm
-sANKZIOwev5vyS47rqMn6Okd9bSpw9E3KLvjVr+i8aJPx6dRe3ODmHmqLgw7d6Oz
-8MMo7d18U9JIDX5mrAkQrQUMN7Vee983X9UWqL58r+kuD78FQ9ZRTXeArx4HR5c0
-yQ1lyG9Fk7rwX3Jm0z8ZRrk4ERiMEEB2fTgjTApXBKv2Xs3VFssBx99JwG56YKWT
-AWhGb8k4iA+tsTA+cpNr25BpA88ETPN8zkDD7Od9fGyPSISgJwWGUgMNp2L1tJB6
-QhFqZ8VtUUJoGjSUuyRF82p+f1fmUhWfwi3r4Oap1teo/Ubji/QdBZww6ggAg/uk
-vt9MA47GDBTS5/5N8YSB+H5Nf6pCGUYGVaBWwtGhjAVdQC6iA6EdW7LzCmmcxjof
-pjsSNQSTIft3S+3mDOv1HNBaH6GYyDLDQRqTtI2PFNsLwA/Nq9wuCGITpfc1PB5N
-pVRDfk2CGH/26FyCuservf/v7Xeo9JjiOqyowaPl/4XKsHzP0uXK2ZX1Lijv/IOF
-kECu6Qe7KjiJu7FqWg9c
-=RoZi
+iQJ8BAEBCgBmBQJVdJvdXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiFHIP/3Vq8pr3on/M9sUqzlTNabY6
+9P4mFdOEP+f4awH3KG+EqKApCgo90AJ4ugt7cwVWrtEZ5G2jywJ+iBXn8+wF7O9o
+BdFe2+s7+KljS7zQaRp7o6acblcRRMVYpTkdODB1i9IroFOcbWd045/c5KBidNp6
+lF3Ia2JHU6LqIeGRU7vX4B0MMA4SRi9FohboDS1hQ1C1NWz17qEGnJpayQiWqsMo
+If95MKblz68K1dosGywE39ARpSwCRS3+hhvHYtyY+rB25mDeGvifnpK9idEZz3E9
+jw451+geUAaYfzRqVUUV2oLc7XKd8jrmuPKa4cZpsZ2m43hWyRbLhPRPJfqhawyE
+fterxu0O5E5y+Chxq5dkIZ/nnOQAa0q7k83w//5PUsxhkslxbkXrd5Xj2Wc5dkhu
+TVtRPHzLvKKaOuripWHgeCpzhfLJg8Cgtm7qmBfbhZ9+MyW6pk4bgsdxzhXluXLe
+5UP6VQ4cKawieBxTOCgfJED/F9jhgdhzXY/kxNAydlb9mYnoo9VDT7gpJQvdsFwx
+ewIhlHeE2pxDi4hjn4lbcmjgfpStIxG7LkpHumHFBdMA8dlW9zYNNa9e3hkrihc3
+7rZTbo350RhRbiTO+7Gei2jcvzFXRCZrTkzcKhIeiyOmbP5OZ17fh0zJDeeazEpc
+U+YdzJdmUd79WikWn1YZ
+=xXk5
 -----END PGP SIGNATURE-----
diff --git a/dev-python/json-tools/metadata.xml b/dev-python/json-tools/metadata.xml
index 1de1e01639a4..3212f3c37437 100644
--- a/dev-python/json-tools/metadata.xml
+++ b/dev-python/json-tools/metadata.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
-	<upstream>
-		<remote-id type="pypi">json_tools</remote-id>
-	</upstream>
+  <herd>python</herd>
+  <upstream>
+    <remote-id type="pypi">json_tools</remote-id>
+    <remote-id type="bitbucket">vadim_semenov/json_tools</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/keyring/ChangeLog b/dev-python/keyring/ChangeLog
index c42776ce7ff6..32e06bf25df9 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.21 2015/06/03 19:52:21 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/keyring/ChangeLog,v 1.22 2015/06/07 19:30:59 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add bitbucket to remote-id in metadata.xml
 
   03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add pypi to remote-id in metadata.xml
diff --git a/dev-python/keyring/Manifest b/dev-python/keyring/Manifest
index c238a9bcd46a..3c2b1311e38e 100644
--- a/dev-python/keyring/Manifest
+++ b/dev-python/keyring/Manifest
@@ -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 3369 SHA256 9c815b429e0179e06c9d2cb1f74c0731825313cddca455363203408adb284e81 SHA512 f9ab7bea1a72d3a198e79679f0574d5283fe81c649fa927ff13f54ada1b1449d00283c8fb0f952e826d77053bf4bdd222f5b4f8717bcae12029d1ffe38a99e2c WHIRLPOOL fe7f1f716e0a476da567198167487bffecb5931dec40608d89bbbd81eb54632e29f1df3a62b4a49a9845a1d902a7e2f7075b2a5b2ea39039436ece84546a0e59
-MISC metadata.xml 467 SHA256 1e2280f38a64c9137d381d09f53bad4460928efd2ced3aa5637d93d77734e4ad SHA512 090596d12ea0ff43eca2b5c57c13b104cf9bb8958764c092504ff259b89bfb1b0323dd5378abc13714ded140e6902eaa7c390c3369fd66d2c2f46a4497fd304c WHIRLPOOL 182008434db31921a50b10abc2d087f4492ee619057d504f127d6e8166c5a4fac91d0fd9d9d39eee01d36b1181ee47dd877be85a2ddb7a656ab7500de5b1a993
+MISC ChangeLog 3476 SHA256 9e3e504467d5b4b3d18bb5cc12358b59087f7484d612d56ed0d82c069c58ebf8 SHA512 81e4fbb0ef294c4b9a4a812ef92f85fc7a7557219dabe2cc60bb025c54eb8a6c7cc3b4b0e68592590064a6282965180c2bdd45f98832e606bfc908bd95e610a7 WHIRLPOOL 63f15f3b64efc5facb2c7e27d2c0e270ba15ee67a14722758961624e0505616f873d4bb5e367b461861d4a7a34c841a90265c33fc09b86e995230a79c9832c4c
+MISC metadata.xml 521 SHA256 8b79c8e26ec97fc26fb90fc6036e9815f9ffd5f4e3d7b217d36627a6c4a88ffc SHA512 93ab4d12c79a5ed231af131829b6fcbcd923352fbade5645af641600ada12f41f8b9ffa138766687daf67243edec20ed92f8c6274577ab62ce2f92084bb2388c WHIRLPOOL d374955e99bfe235a324b3f8110c791cbcb006a2488b66e5ab7c624f98bf2b2ac3f3162637d104cb28cc3383b16f175edc23b664d4ed026d5e3a44352e4747e9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVb1r2XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVdJv0XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 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
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiJjUP/30PB6L9HjzhUWm2Kub4+76g
+MkW2SsQdNc4UOuZcJODOrB3qPpG5LtoPeoRXuD729ms3WZ1ag2yboGj9CJkprGgM
+lTKnmlroQwcao/I5ENqo5NvMiXYK+aZOpu+ze5g0E3LHS4su+JnmOI+pocJSVefp
+XDXD4LXtaF+pgoJIqQo/tdLJcMK7iVij3KUJjgXd/I6xXiMrrVfdw42aY+m+miu+
+G6MpPXu2Y1uAjf0T6GMJ1W/1Kq+ZX9O5ijp2jMWqEuUc1K64Tbr1PGyaF4ZGS+We
+TaE5t/6cC8LJ/BLA3LEzQrXt/DFzV+L9wNJFnuONl3RFndQbbQ2Fpr6NnoHJLQEV
+X5eCDySe4uzaS1sTwWmG5HNfyHUdAmXGPxr9JO/0y9hQ7eHtqbMwDN4M+YqoLFsR
+BnoFWN0tvPrNDqt3ag/zkwZN/XqhWTfpV45nOLK8d6jAiI9Ad3x7Zm0J1OFo0KAX
+EXA85eHoLV62mlVJ5HXG8BuT0NEJE6mxjy/VYbaPRjSP3HPBK7EnEj9UM/rwEcXL
+VwoFUB6CdXc7bDTiVX8KTGwFwE0enxgM0Q1AatLPPLNNJJa0IRMrZkqQIFz2EPHV
+vBOrVI6TunkWvL/XaIdXacVnDHKgleV+Q6X/hlrB3YBAe3ERRc50h3LG/aYa/hEv
+HlGgjfvywCOQA9XLHqeQ
+=d4kq
 -----END PGP SIGNATURE-----
diff --git a/dev-python/keyring/metadata.xml b/dev-python/keyring/metadata.xml
index e2989ddd2b81..ef2f5eba9e84 100644
--- a/dev-python/keyring/metadata.xml
+++ b/dev-python/keyring/metadata.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>openstack</herd>
-  <maintainer>
-    <email>prometheanfire@gentoo.org</email>
-    <name>Matthew Thode</name>
-  </maintainer>
-  <longdescription lang="en">
+	<herd>openstack</herd>
+	<maintainer>
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<longdescription lang="en">
 		Provides a easy way to access the system keyring service from python.
 	</longdescription>
-  <upstream>
-    <remote-id type="pypi">keyring</remote-id>
-  </upstream>
+	<upstream>
+		<remote-id type="pypi">keyring</remote-id>
+		<remote-id type="bitbucket">kang/python-keyring-lib</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/mockldap/ChangeLog b/dev-python/mockldap/ChangeLog
index f28708a6e230..a58ebac00e24 100644
--- a/dev-python/mockldap/ChangeLog
+++ b/dev-python/mockldap/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/mockldap
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mockldap/ChangeLog,v 1.16 2015/03/16 04:12:44 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mockldap/ChangeLog,v 1.17 2015/06/07 19:31:19 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add bitbucket to remote-id in metadata.xml
 
 *mockldap-0.2.4 (16 Mar 2015)
 
diff --git a/dev-python/mockldap/Manifest b/dev-python/mockldap/Manifest
index c9f7c56dd0cd..1d53687f50ad 100644
--- a/dev-python/mockldap/Manifest
+++ b/dev-python/mockldap/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX mapping.patch 440 SHA256 88e2b5bee2c29f12aa8ebeb06073ac295d8d6fa609e8af35fad9a25c57b7662e SHA512 d69af2a319dc5f3511063b36b456a11c44b8d85d93b541cb223542b71eaef71fecd5405bdaa688d9516ca162060f64a4abe284841b7cbeaf69203f37ee5df120 WHIRLPOOL 4f9c4bcd9a8105951865e451288f92014c17c07eb3fe68d8868b75af243119e5a00aabaed7cd65ca7bb18c2f7308ad5ea5b939bd167515d19472a515835baf2b
 AUX mockldap-0.1.5-modify_s-backport.patch 756 SHA256 f493c5fef68a2d2d9381bef4dd7a51fea17316aad09d1af3bfce0bcd7d480036 SHA512 9fbecb2363236c64bb41e19cf9a036cb65a46a026e9aae8b0ad1180606ad1a713c7c8dd180a4753be8989d3a4b51bf90d8836857954f6a916e40a4f3362a6318 WHIRLPOOL 676af18fb48096151b555f62932fb6eaea96957e68d8a0a28eac70d8e3fc816557ef688f55f1572b02e029004e25d2b3d4e18341f626e7df4eed381259037612
 DIST mockldap-0.2.2.tar.gz 22237 SHA256 a2327eeb735a283da7dfa91a878a80d8804fc0bee66e835ac9b62054cf8d00b5 SHA512 79beb00d663e7ba48972cfe85eae59916f2d10f9924ee232f71bdd2b8b821d9d6276b4c54a2480d2726afb0f162193058e390aa7ee614dad0a9ffa652f8cd244 WHIRLPOOL 4457c4d8b6ec75ac0b4379dcd0c2927455d0ba2acd74d15db86c328a49bdd476a5a32cf81fad5c89e67461f4b09272740eb0d52fd5dd1c5827ab182d72e149b7
@@ -6,5 +9,24 @@ DIST mockldap-0.2.4.tar.gz 22460 SHA256 6d96035920cec440ca415fc809a37f60ccf394ef
 EBUILD mockldap-0.2.2.ebuild 1219 SHA256 ad8436d3e917dea301193d752ffa9afb426e6bd1eeaa7df4e03b61dbce4c0d36 SHA512 fc50cfac09716aae6a9f81278d716ab46cb8c3373aabd042ac6eb29bb79cb8b8742993cf47a8255669836b45c1f4ec53d1566f75d7ee844c14dab6697773138c WHIRLPOOL 11e86d39cd3a46f31b2a5c9f6c73e81f4b642bf76705ad0d5d95304f481a253da86c272b798b1f874c613f1f2906e531b5aa1e9b83f8031f9bc4b1e87ef0dbfa
 EBUILD mockldap-0.2.3.ebuild 1215 SHA256 8f4dd8aa26f504f42b27441e866f34d75b624e2596ee31bfe66398ec7b112a4c SHA512 44da56f4445fea195363e47774ddc24f7fa341f924289a1189e36c8b380271aceaa82adcd36e9487efc6bbaf2156390aaedc452fbd7865e45fe82878ffa9b621 WHIRLPOOL 37dc0207333972a27dc95bfd7fed810ca4101a5cf9d25a2bedb9f6d3df9c058a65fcbc87d5a7f20dd81bc78def9e1e06cd8cdfed75594076a2764dedff6e17f0
 EBUILD mockldap-0.2.4.ebuild 1219 SHA256 5058828ec6684661f3aa80c9abd99d730bb47fafe1733b9d4afdbbbb9fc63932 SHA512 516a583d3eba52d5a94a6bbee526e27cf8b7652e33dc1b86b7d7920eae1e8fd7961df2834fccacab6d18f1a9adfce3b0a3f49b67c20cc21dfef40fef068db0a2 WHIRLPOOL c7a975dcf19a3117731579fae2dba39b646342675a2cd24ab8d515f9460d1b59b985ec5e9263385a5dab8db9310be71dbd9e43e988716cd1700fc2d66e7ce6da
-MISC ChangeLog 2587 SHA256 59a844f26185fd4d1a56ca6938efc1f93f66e110176a82ad47b38e04e19e7964 SHA512 cee9757de60f695076e00a40205b2fd08605ff71f24868acd36c6593f2afd8ca5236d79d1a1d88f181c4ad663730204bc12262270a2504356a56e14fa7bae04c WHIRLPOOL 13b8d95f9f8b08121b5db79b1e62789890fdf626dcb847a7a908362286d0e61a01eb8b6cdfd8fdfbd1750c194fbd16d8e80dbb1eb89d191d38c4c9de0562a271
-MISC metadata.xml 236 SHA256 127de8843d08abc19b16b4c0409c47d6551a507d5ea1f299ecd00f5e5c285224 SHA512 257de56fc7936629747255ca737e32674260f4248669588ebf1596ef07c57c79d7f421ef67b3d7dcf48b3e60f4b5e912aa7dd7b71c338ca9b333622670617b1c WHIRLPOOL 8d27b55423e139cf8130dc2fc03678d7b9cfc1e0bd5a3f0889fdd122b7e8adba88ddd5fde18b0a8ed6fcc0349980b404c0d92124241fa241b60ccb5197193627
+MISC ChangeLog 2691 SHA256 8005f3aff26593f155db6875e458aa0e140bbaefd398750fefb4b663046d27f0 SHA512 5113f9d90ca2921d7a2aae90a81b246a4f028ad94deb3207c2c4ccc3e4f5923150bbcf9789b071bed2a7a7b9c9fce6ccfd99385923bcd2ae5e565861982c3810 WHIRLPOOL 03e5a35075f02397d565283f56e9958ca2fea2b54478b0c24ecc6bb7840eb4fdc9767b2645b2ae4ee9364714a634891468523a4857ede70aafa086838f1d6ffb
+MISC metadata.xml 297 SHA256 51132e074a8e0003a1786af88e57f1ba8942308149aeb616410274c791964eb0 SHA512 829fdadc2763cee8185e4c1997a60fec1985ada126d58e3e92c31280bc310b95418becbe895b4921771b2e6f85212d1c83ee80ff2f3fec315df3b332c176998f WHIRLPOOL 4d8cf223a2a858b8352e1c030265479c080709bce788f0116b0ab9865557f7e71c5e6f85140b1e2ae9f00b2a251220c13ae574f7e6f7ecdd860ffe8366ea7cde
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVdJwIXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiVJkQALPeRa/47ZszOFkwohJfUY0W
+MsmqWVeCSBkGHNAlAJ1ybX5wp7FcjXza/NQ9CFY6x0OEkb1eEf464HeS20M78y7T
+qny9IlIvrkVsxu2lFnQaOlKutisACa1qMT3A0RI1jjQJuAzowhdXogGUTNWEOeWr
+gxcNlMKzmXsIMLcloZvsirZIrSStdejZv7bKHn1Uj1sThfA8IZE8Yt0Y7gGRlP1D
+vROzB0x/sEy2ZvISdtY43KG65/tJN6bnJTNH/KF/woWuicJRfm4dVgQNzcWI0jo+
+Vh614l25dT1cHF5ijTfoATW7xx2eMr9PzF/As28oiIHrdqSA/k2lQz1vfXtcPZIh
+l0ui2Zt5XRgJ5bXlFsPZBsYKAMVCPYy9il7rgp66snJbnBohyoosLeK0rwxHyCFc
+zeWhtSBqbPeffG06bIX7k+s8A44RInOSl11z9KU8Iy9hz3a7TfdIZL0bx6WwgPPB
+/LT1ONNT+OKsR4AcUiWuzXXXtQ36nLNVuqB7GChyXalIHztAA3cvgVpIZ9f2T3LO
+saqAoVwstsPm9frEtbkxJcIurQL3GjgheJC+ZiXeb3vSvbfaQrT+hk6bhwqpJoU6
+JWj0IN0pQXs1MSGwFURRc/vGV2YDSekl7FRzT1RErhPc1cAMyiG5Kn9wZy7vtC8Q
+MKpMCqvJprFER80OsN8u
+=IAYo
+-----END PGP SIGNATURE-----
diff --git a/dev-python/mockldap/metadata.xml b/dev-python/mockldap/metadata.xml
index d7540b5f96a8..4f80f5ed7d98 100644
--- a/dev-python/mockldap/metadata.xml
+++ b/dev-python/mockldap/metadata.xml
@@ -4,5 +4,6 @@
   <herd>python</herd>
   <upstream>
     <remote-id type="pypi">mockldap</remote-id>
+    <remote-id type="bitbucket">psagers/mockldap</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/nose-exclude/ChangeLog b/dev-python/nose-exclude/ChangeLog
index 19bd9c5b8438..2886f3b52033 100644
--- a/dev-python/nose-exclude/ChangeLog
+++ b/dev-python/nose-exclude/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/nose-exclude
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/nose-exclude/ChangeLog,v 1.13 2015/06/03 20:28:06 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/nose-exclude/ChangeLog,v 1.14 2015/06/07 19:31:44 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add bitbucket to remote-id in metadata.xml
 
   03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add pypi to remote-id in metadata.xml
diff --git a/dev-python/nose-exclude/Manifest b/dev-python/nose-exclude/Manifest
index 4228b72d65e5..4f09c9630660 100644
--- a/dev-python/nose-exclude/Manifest
+++ b/dev-python/nose-exclude/Manifest
@@ -5,24 +5,24 @@ DIST nose-exclude-0.1.9.tar.gz 3444 SHA256 c2862e55f9c6245141fc0437bad5f71a3aa83
 DIST nose-exclude-0.2.0.tar.gz 5741 SHA256 27babdc53e0741ed09d21b7fdb5d244aabb1679f67ef81289f0f34e50aca51c9 SHA512 0c23fe809e7e4f75e34bd6e7922cbc021ca880511f9f4d6094ec7cb330261ce2eb10135595f64d555c6503eef5280f8fc41665d8a491e1a01a566c5e277c83f4 WHIRLPOOL 34d9731097e5a6f8e0de111438b3d5db65ec470a79317336c3eb2fceb583a4b7929d4c9b0da8d6b1fc8e8132d2724f2263c2b70e5fc9530dd38be554994b05e8
 EBUILD nose-exclude-0.1.9.ebuild 618 SHA256 1feaff75bd2d455a78277fdf9d3818e4b0b8d5a8af23703eeae6f7527ba989c0 SHA512 d416ae838349e215c4755f4e9ee37958ee30be4a68d6336d39c9fe01d8fe196fdaec557751f166ba5b64a3f5fe94601d20a206d2133588da652ce0dcac515690 WHIRLPOOL 14e0cbb3404ca511730370aa2265f5ef3627e9df04dc7263760c739b37fda68db36883ef5e7a3b0e6393a1328b369ab7f14b0a132f459cb868932b44bd5f7dc1
 EBUILD nose-exclude-0.2.0.ebuild 753 SHA256 db5b83ea3e9b3f9d977424af6419984f34cee54d376dd863c050355abdec9407 SHA512 8e9978cb71ea1eb4fe28424ba774c29dc0f0603a2d4e70572af2e4129b2adab2705eb8b810136a3e4e7b84b29621cdf81c479bdb801adb3bc47adc39d6042871 WHIRLPOOL 723439350d2c6f43ffdd83d56b8cde3ab2120eaecaae78ed8d40379e0a99b8fbe6cac4bdefaae73278108f26f363f7693ae4b1a330d43d0742c18193ac11fe67
-MISC ChangeLog 1856 SHA256 91de653d59d86fda2fd7a77f9aec03750bdedc000f629b958ae37c26fa88f18f SHA512 b21da1cf6d67cbd383fdb8edcb2076745f72a596b97a882115900aed2f9f9dd4869f3de12d8f7eabf8ff331085b89500334d40be9d594dc535d153041868efa9 WHIRLPOOL c8a0861d55f0e1c1a850c9db79b34510886dea0e761203ed06b1fc95dc84815dc5d255fd1f74453af18f4ce5e60cef87e75f45555fe45f1aae7c97f8e7b44d93
-MISC metadata.xml 452 SHA256 3ddc0b60edb42f43d43124f5f15c24325bcb97e3e2bb8c01bb782d44dcee89e2 SHA512 0da24e132479e3937d0f11fe6f2bc6d30bf7aa08f8a6d6ac3dc8fee93f0405402ee97771c2be3b9e36654c1e24d4089ebbe30202f609eadd1fbb8f90c65004ca WHIRLPOOL 102c31373ad1206f6ca58f343a1ed3229096e4353ab38988ef57ad29f5b3ae5c5183378999819eecb5626d8377920bca628c18171b6310b7a9d504c1d0877225
+MISC ChangeLog 1963 SHA256 8721681b570127ed393617e6ab1adae9b49c9ee787c3532ba6626b627d6cbb7a SHA512 f60707ebba1fa8cf2781b98e14fb8efd7083d38e7cc16d22f683db1fc8c93a24ed07f6ca4e8cc514541749798bd6a404d7d8e38ddf1f4331b98c49e7e41228be WHIRLPOOL f5f357a38b115890619c94df7cbcdde0ef130a6f29979710c965c7f54b4b9fa94323428d1f65111f35e2d988d988fe1109ef668605d97efa10b4bfa3e6c892ca
+MISC metadata.xml 518 SHA256 2ff71b4e2ba969d2181d5ed6bb975f807b7be111e04ed4659618e3bd6d5b64a7 SHA512 ef65bf81da6a32770ee296412ec7c5bb250192995308007376bf384c2869ad82d823bf0a5008704fa5ce8bd9266d64036af7484cc564ee14a52856310dafb6bc WHIRLPOOL c9da6452b1948c58073d8c151cf9a8862873a2ff618f6d0857ba7a3a35799736261bf49edaec6c98df5a7797e67ecca559465ab6240d7972c7652c5a7408750d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVb2NXXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVdJwhXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiCmsP/3ndmV3IC2tiBN4FmMrh2C+n
-IRp7Au+55TrO0rSdYWOQYwbevvbfsjERH1S0I5fXb4dPwa/ppVNgVIM1SY61lK7z
-tBiglM3bMGJZl8Wsu6DcPln5fSgCHBXtRwMGTjtinGJQaym/FREVrZqrPRuC8ttU
-KHvcEC68LRxcpKW9bs6RfV8cnhABNgS4vijpiKo17hYNHBgwRStjfp3yOXqpha9X
-m5BSjU822IY97iDB8dJBqaxItURReFnZBMIFq0h17U323YZsd5rOMwvjKSz8dV+0
-520ukLrBQwrexEoNelduX9ZGYUKDWFtUieUqFmmUGh7t/ZIFvijJ2LrNfyU4aVun
-YFS3kvB447Da/AotAAkxS+bu1x8jrM59A5yCm9pz0NqjQc1+nfmmswyLiuc/c0ph
-HvzJrhh9OQAsjfau9PO46HRwHWFCH41TBtrg19vFdZj56pxPGgi9/2Yrjp8EQmdk
-gV2yh66IyIZT9WIRKE/tpZ9twZvW86fUjEzC/oi1sSu/g4d01csMOnYslH8pLSK2
-sKxnUWTmwaKng+BZdh4kSM3sJy9dyiPH00poWMEesK8JCtu/pUL7LQvRjUYLZoQP
-5Lb7oerpDtH9MaIRxNwNccEhX+XmSx3baTRclk2TTEUpsj/8EHBlqcyPCWyZayXv
-gM7OuLTRKx6SGLASt0WC
-=i2YH
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiEVMP/RlXRT7PVDqcGyz9rrW/Gyef
+DuFhIt3fiUXYOTPN9JWj5IitUVhWyQvXM8lm1Aqf3GTdSrxxGJQkwLiy8viu9AO+
+/mZD0kTnt0BLlDFaw8zz2jPZXKLs1JvThpaAdIPZP/i211RRPbKB294B9x1z41Nz
+sngsCcy+qRFBJCXYASwntc7qZnhuyhy9czKbfjHH34z/mG6r+x7zAzgtLpqkumro
++qH7qwFnkRlC4PzxydKBqiC+47Y16uetv1swuquEf0qVJKVucTfcVyQeytSGT4J7
+DKamRow1h/yD1S4Lr5rEso2De2GDytxURFjpy3wYkg8xwtEtKUbGDT6QyCSnGQX5
+jhx0UntzWbrPB/CX7IRHiQWQa1L0yICPG+hDcE5y3MUNWkOEnSjxTC3ahcn4nFAY
+qlVBFPTbE8dPh9SmE5c4pRfnSM8ogtXbgphB1EGGrU515htjiE9T4D9YqcXwEXl3
+9XjwWYVObZOzdbd/SDxn23rUBoRGbkDTlVk3cQrdR7HdsYo1hHygljvEYXMoucSu
+qAP+7GVJrVyZzQLQ8hwCiFfvXn+FsXl5yYPwHxmSkJsZ6j3d4vvIDVSQC83l7xH3
+5uceYQ7LMI2A//+98knkEyG5DVU0zcvA3WjTwCLdr1yoLGp9TcYMrTFvppD8EVPt
+2qTPFIRHwAZfn2PBWSon
+=M4ET
 -----END PGP SIGNATURE-----
diff --git a/dev-python/nose-exclude/metadata.xml b/dev-python/nose-exclude/metadata.xml
index d6ac2816c341..180e82bbad75 100644
--- a/dev-python/nose-exclude/metadata.xml
+++ b/dev-python/nose-exclude/metadata.xml
@@ -11,5 +11,6 @@
   </longdescription>
   <upstream>
     <remote-id type="pypi">nose-exclude</remote-id>
+    <remote-id type="bitbucket">kgrandis/nose-exclude</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/nose-testconfig/ChangeLog b/dev-python/nose-testconfig/ChangeLog
index 105382e87f1f..df11405124d2 100644
--- a/dev-python/nose-testconfig/ChangeLog
+++ b/dev-python/nose-testconfig/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/nose-testconfig
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/nose-testconfig/ChangeLog,v 1.5 2015/06/03 20:29:32 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/nose-testconfig/ChangeLog,v 1.6 2015/06/07 19:32:04 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add bitbucket to remote-id in metadata.xml
 
   03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add pypi to remote-id in metadata.xml
diff --git a/dev-python/nose-testconfig/Manifest b/dev-python/nose-testconfig/Manifest
index b70a9bcf30ce..7fdf0cbc3a3e 100644
--- a/dev-python/nose-testconfig/Manifest
+++ b/dev-python/nose-testconfig/Manifest
@@ -3,24 +3,24 @@ Hash: SHA512
 
 DIST nose-testconfig-0.9.tar.gz 7614 SHA256 bb6f1dd2dbd3e54a6c456110fb6dced449b5ad5262af712d595c123e4f8c34d3 SHA512 411630f9af56955e5bd87efaf2db0817442f78dc61ea64a29ac186f0a71d23d81220f68bab18ceb7d3bf201bc441b522bf9acff21b541905a5a4397280444a07 WHIRLPOOL e69abb0eb794ed72f54010268a4eeb7356b374efa52caf60cc637a904836ca703b04d36bbbdbb6bc5eefaee6e7d1990cc7d52228864611c91ef631e09624a25b
 EBUILD nose-testconfig-0.9.ebuild 748 SHA256 2ba45fa94d42f9e18adb158598277499301b7407131e2bed391dd8df9f4c8d21 SHA512 20d1340e9265eb5f7dacb611060f3be2aaf8b061b5b682c315efd0006ca47933cca8ae412693a39a95591bd2b345a132c7ea46270c0dc706b4960a919c74b395 WHIRLPOOL 95d8ea7b61517de04d83a167664296c7432b765c0d71e35f24adc5c2f4d8bc80210ca347fa3a9a336b84c1391f6027ba8c24159f73f0ef3ca3eb70290b71504c
-MISC ChangeLog 842 SHA256 fe493326a253bf18e9b81b393925ad92741309916d1a5203ecc7ebc036e59e04 SHA512 fb6edb8bfcb8b937677c0446143289d95967663b60c7c416900314ee943638f2c88561cf65acd1cee6b4410e9fae6e1aaf47d72d4cb4bffd3450ceef35cbd039 WHIRLPOOL f5f1b0c4ea8b83427c3f16e7977d987a33df643766c0083ec31ca8bee16e709c041a6dd1c07bd8b58cc1159cc501bdfe7dea1ebfddbf358d751fba99d1c31c33
-MISC metadata.xml 246 SHA256 c78df3552c07620f0ef64deff4782f93ad6d901b0f79b4b0b0624109d788451f SHA512 98cd67a4316162a2ccb2f5b1d9a5858cc59f3418ede7bf95a1004c17942d94b0d7d3ccec8e8976ea54b0fe9336e3db579e3b7a6f037deae79081710ba38a2f41 WHIRLPOOL b86cb644e0726b2b0bdb24f9cfb9b9e725037dc1f48bc8cd19a94682b03fc7af49e45ddd6a12618f7890a475511333bb9845f174ed7d5e8624a01b52809cf3ce
+MISC ChangeLog 949 SHA256 35904cfe15d445445e8b879839bb9da97193540dffab23842e9b83f021df1f6d SHA512 d442d3d827e8de3e548938d4f38cc0185a5ccf4a53e8a5fa07fa16a83c40ef1d9698c781100bf906a2d6c466092f3c2ff5f4716728d0f2629be3812223412c9a WHIRLPOOL 5a7eda3d249f7ce865ea6a3878a97de558958fe9a540c304de20241beed7ae28abf1313a7e961d9e03fb841190de7c0a8ba84710f7ed0d7f42ae1fd60ec0219f
+MISC metadata.xml 314 SHA256 e0ea0eecd01f1aae3bea5cdd40edf781243590a3dfa0fc9225cfe8139cc63f55 SHA512 4d44bd965b5845b26c5c6d81c710595e961504d5c03c3d06814f2d48b0586445b6f6828515b36bea9c644f7404fcf6133c9360015c6fcadf45d2ba1e5ca94cd1 WHIRLPOOL ce7f42d0dedc3dfda060acc629d0e5c2506eaf13b6e32f582c2d9645026823fa0f3aed99b314d9ce812cfdb7b988a7be8c617a22cb7415da96e9373af83f0545
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVb2OtXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVdJw1XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi9rEP/3deTpfJJ6Ij4vvGLirs9epl
-Kd9fvkbb1jDmvnwigh5VFc0pi8PXIGKMC3sNKuTH4YIEzbZd+7aka03GkFPvqyPe
-RRuPA0XDmjuIXOtYK6tCkKMgqeNtSk9G9HilYrhO+4Sig9FzMvA2sAtW//DzBy1W
-BE3d5/o1fz9WXx8vWOmslJcxHFGJtf8/VUJUItvU3uOil/fBgDOYjPXm1ShbIjLO
-8xbONsq2VBidyCegKr12RUJc2/YdfnVoI/igd/05gE0fcbxDMqROkVgp1ahMHZsW
-5osPpFJ9wdlAjZ/DhCZI9Y1vHt3S3zaGylY11jKclRjqvPqjSFaxbjXBVV8uDCIR
-Eo+AqEIpRWv+lJxMIz0HKWlES8r3v5T9NSHrUElMGcO2uw5K0SQ3SWsjqXR7FvMf
-NVCxxi7m/g7u4ytUnndrCLlCoePGqHou91xZqNbeTjMzk3sSeWntq5DlcpoGgxbx
-jo4VcQ8+xjHf+befWxcIQTZSKEEarW8mwDGmO9a48h7c9Go60MhIZrVHyfZql0wY
-VlCY79fk6Hz8VeAeV9UtOUVeDmd7CxQMduD2gOW8xQI6Hloy99U/qwpDeXqCNoT6
-GuP0Lt4bi1gTCiYOKn43nUVoyi3c4xtgEBagoPsTKzjW3l3muE65u+Hcw2qEQvt6
-n6WmtrmSxgURoUIqgACT
-=qBrw
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmizeYQAJcLMPzXL4s3ir+N1ZN4Gnq6
+kNGJjdRlY604uFaZaJqzeS8bLstmM2NbiSqZFx2l3/7rTPbFgYv+ZTmfchDHkRC8
+4VhYZSuL2pQ5lLKwZPPx95h282wr8LBOWAzBBsVAIyRj9QCmO/bKFW5vLEvSOWS7
+pbJxEu44kJXA1S3nsSztW01sl7dR241QMlbRm03J92SCnLnyil8cztOMCfctH3f1
+KUtMGdfXGhkXRUXSI/wo3g4nj17PLlcs4jOIKhxnV7+OgdU1ytLUj5rxoYka7eQY
+pN2wioWAd1MIWrmoT+rEgH0scLVdAZzqUGfNnqm3IDzzpFsCfJlCDBPOGsf1GTye
+y58oOu5Lpre2UMVpLa+RsuaBsrcKK0gqiLtdFKk4ZUH8HXd1yo1XlLgANv4wUhrW
+szRRIUj2bOh/qu/nouiNiCa5LG54fFTJRaSCVppuGzqCzAQQEBW9L3I/ZWbJTyFX
+XFmF/lT/SR+5wvOAwiysYNePkcgHPl9EojhqfDtSkJO987ua9Oi77Zf1yZKwlb+B
+P56vsZf4c/oUA+p1GuFYmVbLYTvugiLSIOG5rrLG52VsUF7pdbqqdCZIugL9somH
+nOcP0fYSqHaDgcndwn1SoI6LNdc/27n8DnouOeiqMvTtwQHnaouGwLLTnPiuhF2k
+Lqkl28Dl+5xivUfIM+V5
+=crIM
 -----END PGP SIGNATURE-----
diff --git a/dev-python/nose-testconfig/metadata.xml b/dev-python/nose-testconfig/metadata.xml
index 34a16a6b702a..651b8ab51417 100644
--- a/dev-python/nose-testconfig/metadata.xml
+++ b/dev-python/nose-testconfig/metadata.xml
@@ -4,5 +4,6 @@
   <herd>openstack</herd>
   <upstream>
     <remote-id type="pypi">nose-testconfig</remote-id>
+    <remote-id type="bitbucket">jnoller/nose-testconfig</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/polib/ChangeLog b/dev-python/polib/ChangeLog
index a94bbdcd4804..ae50a84b56c6 100644
--- a/dev-python/polib/ChangeLog
+++ b/dev-python/polib/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/polib
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/polib/ChangeLog,v 1.6 2015/04/08 08:05:12 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/polib/ChangeLog,v 1.7 2015/06/07 19:32:23 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add bitbucket to remote-id in metadata.xml
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> polib-1.0.4.ebuild:
   Drop old Python implementations
diff --git a/dev-python/polib/Manifest b/dev-python/polib/Manifest
index 1ff513ba5988..b982d1cefe5d 100644
--- a/dev-python/polib/Manifest
+++ b/dev-python/polib/Manifest
@@ -1,26 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST polib-1.0.4.tar.gz 151634 SHA256 8b3276f75ce2fce9442e27db3ae63d842416e17f0e2095f39ff52dc735e5749a SHA512 a38d57acdaded0371be83825a28f14f178aebdbc0435724f33eebda109adb2b8210e33659ebec88d2d9e98aa60c482d7f8a958ec18f6769fda7a2fb14edd2744 WHIRLPOOL 1fe4e5bbf27444c1a6d7d79c70325078d3b2d15f6a5eb84852ccb080dfee4d03a7f8311127b6f93e1cb23ad633155bf93221317ec3518b1c5d7ec52b79fab87d
 EBUILD polib-1.0.4.ebuild 868 SHA256 926242fbebf19f5824941c3498254c98e1ec0eb58c172f448e474d687eba65d4 SHA512 885c3e3cbe93e54cf05c133d1ab5dd15cfd3f01497ef2f67b28891eab1f5066db0784690d2f56e4024b073a0a9672c065127f9797a0df5876ed1c30883465730 WHIRLPOOL d827b5d25e0ceeaba39d8479216e864b18be8be4596b585790155b3727fb2302037099a4fa4ca28813ae43a45e56209e70738db2d373750ab7d08d493b7c3390
-MISC ChangeLog 960 SHA256 87747e839373cb0bbcdc337acd2045ae0d8d4968526137e26b14cd4256709632 SHA512 88ae7f28d16aadb7172b84fd369e6b7fd807d8a99c3c5c347b85539ab7bb2f77253ff51de17b22e68562f533d0cb3fe1cf635361bdb6a59e702758ed0a754ec2 WHIRLPOOL e3294e741212cc78703960c725d6014eda79eae3283772902903473ca0b9b66a32b3b289fb46e38b22fb0f049a8622490cff6414e33fbae05df8289ea0d1ba6e
-MISC metadata.xml 236 SHA256 bb5f221af72a7c7368e6ac0e3c098cf31ee374499f0ece7bc1995c55fdd5d0d6 SHA512 cc95cc724a3283c23fc28169fea51d8506ad00b74a087025c7e29a3e4ffd862ac38baa3ad834dc1fcb342434724084b9d1fff99ba234de0c8d237d894cb063c8 WHIRLPOOL 05af5886628e1c828336cf012b332b531a9c94f96d7e7f4285a79155f92a8fa25118438126ddce11e6f1fc6efaff2e8170fbc8d454c709536a8ea58240f713ee
+MISC ChangeLog 1065 SHA256 439c72ac0ea0f3a7c5b4995858b1b1efb4498394e4df2bafb0c795d9ef018b17 SHA512 55c90c00c44e7d33d47fa185673db13a6b414dbb4efc19a83d7adc608ad9c9437a1e56a0ce7d937c90e6ccea232b3423bd9aa1cc4b72fe72bdb35da78ac153aa WHIRLPOOL 03549be3cf1b16c9cceee872d8627384a112dac90830850e98776e76a3c478850cbf3f4c770bed7f0c2c5c9c73ffad05bf6b1cbb36715138da0ccbaeafd30f9b
+MISC metadata.xml 329 SHA256 40ec063d0d7f54d61703e96feb19228d2f1ed1a49e9f0b19566bd2d3203aad20 SHA512 bb1c7bdb18a3c3d0f4740590b30ba8b116820ac114a363ce2b8e7acbe8bcb919fd52a9b1ca2590bb651ac3305a62b5f9b4591978286037085fda17273b893be5 WHIRLPOOL ba2381e5ba87d3aff179b4dc25c5558bd3411b85a4a72003a96c6f3287a91dbb02a4ddaa6115ad25233824d2bf18b43f07bf7209f95c6a81976bdcf137b4abc9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVJOKAXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOrYkP/2RfPRvfaSImoRNsIGUw3UgE
-hConbOZFpa74Rf4HYbz2zO64VuyGhhng4B3ccickMDStdMHVdEgYXuwtUNIYagwY
-ItTeIudxa33cjGBXa6T8XR7GKZsdU9xfQWQdsSWOylHys3n1P1fCHe/QcrMBw0BH
-Pk/fXIttwxFy6EYgQQjlpOQQGU1/a2ZYSix7G98W+1GpSYKcSLnLSOAtFZ+TFpp7
-tWhdJZv7WEI5ysTnsITizYi/FHQykjT3R1eBpc69ydyIy5cUXbFNhPlUfpWA3ULf
-Gcd/Zm9cZx5S2ZNrbJjkqjXcUk+b2Os0kxNkyseRFmXmcMhudXL6s6GlnsCtnUPh
-lHC0WDR+i6uZjwIUnPtrldbYAwl0IpCvWQv4mQ7RQfBdwmYwkXdVWrjRPVLhSOX9
-SGaCaFQFT+4VI2DkSCLeiEvYbwNwU4W2ta0KaI9uDs8N8HH8pZ7zF8hJ+i0Qa1Ae
-Mhryy6FTiCtmeO37J0tBnyQ66p9C+PFuvPs+45AEm2UNYcnilnF0w0ZJOn4UFnJs
-OFwm0XHUooFCLCFrNTE7SsJLV+NplQds6VXrqADk4afOuyO4leZN8u0NUUVSdlCC
-hMQmbVNoA9Ww3qdbn1e8iNPmb0j405pgOYXFOdCdvYQO16h8VK3QF0LICTA0JzDs
-/f9xpKH8sHDMSoqJgZrF
-=O4g6
+iQJ8BAEBCgBmBQJVdJxIXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmimt0P/3p1guziijy0RP4kcRv+BX8J
+OeewCJhwaTeeij1012iUpr6s8/kkzArhzJn6eYfGqJKXWKsXKLuR39y1XHz0FdlC
+356TQz6X/vx5fNfc3Dm4zURPTeai+rpxg/P0g0I0wN1Tr3Xn8McPqQLXHUTfTrcC
+ifafbiaky3PT5tyA07YI6wd26I/dIeN+B460IwaxGnfdUazyES/4Om+nYcAlaBnl
+JQFCFPmVTNaf6O8WfcLFFhQvkxvLA51PvzZRKrgXmmAnBTXgXYxr3EO+V9FW1IUv
+GYD3wi/6HgmjzhPa9/PMIcTBc8conLoWFkGj4pNy5JN3rCyxBJfYOioCIldVskj1
+UBoyyTNuWynFMttYL9btstAMyw+6yDIm3rpnbtzh/mG7QilEhdzZ/gZhKLdcOF0C
+HXFGtrh9xu2TnRvyrtm6iPkmtnUcOh7E+6NOFQaOGElqQANIiJBpXyQBfzgAySsr
+3sHJMQOExuQijiBZdWdlz2kgt2GIaVjp+2PtiTdkPqZmqBCZXBF7ILcRxvZjMuuX
+zYdBAJCFsjlgwvVt+MhYt3h88OhYAVRNAlcTWiRP5tRISbSTyWi7oZAp6Gz8mV12
+wASMGEQ6t4NE+bLgvoI9kZTj8J5Mo8cxit1siXbEZLI/pRJsQMAa6eRkHP9MgipP
+NJJE1Kzz84wVR16lwSZx
+=jFd5
 -----END PGP SIGNATURE-----
diff --git a/dev-python/polib/metadata.xml b/dev-python/polib/metadata.xml
index 6cfea5201833..3b4d48a8b559 100644
--- a/dev-python/polib/metadata.xml
+++ b/dev-python/polib/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>tetromino@gentoo.org</email>
-<name>Alexandre Rostovtsev</name>
-</maintainer>
+  <maintainer>
+    <email>tetromino@gentoo.org</email>
+    <name>Alexandre Rostovtsev</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="bitbucket">izi/polib</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/pyh2o/ChangeLog b/dev-python/pyh2o/ChangeLog
index 1f51c3a4b4a8..220328be0960 100644
--- a/dev-python/pyh2o/ChangeLog
+++ b/dev-python/pyh2o/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/pyh2o
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyh2o/ChangeLog,v 1.10 2015/04/08 08:05:24 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyh2o/ChangeLog,v 1.11 2015/06/07 19:32:40 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add bitbucket to remote-id in metadata.xml
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> pyh2o-9999.ebuild:
   Drop old Python implementations
diff --git a/dev-python/pyh2o/Manifest b/dev-python/pyh2o/Manifest
index d4d699d0c04f..d83ffe043e95 100644
--- a/dev-python/pyh2o/Manifest
+++ b/dev-python/pyh2o/Manifest
@@ -1,25 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 EBUILD pyh2o-9999.ebuild 737 SHA256 f8aaa22de276356498f1325f01cc9c02b461d24c0c3b2fbdb44bb9e8be05fbe9 SHA512 1d9f98e0126cd1c84f03b72e9f5263e90dc3e2ea14490829d0bac141a5f5e0631c8ed6e4514dc2d4e2de15ad50e3acebc33ffd1775086a6a7a669453731971d5 WHIRLPOOL 9cb0d477706d517322390f3825399876a9f22737645cb2fefdcd99b02c20f38e141a52aecf05c8411af8573cff295145d115a2761d7d4152c6dd406c002c884f
-MISC ChangeLog 1388 SHA256 ba3aee47abaa0e5afe865d550c2794d9214ca854f23f0a17037c573a7e7a5623 SHA512 483aa90860f342b77e2ed9ed8c3f4975902fbea61b52a4e11fc23e5fc00cce7636eae8450062db87238a8b0044b9e69e342fca972e60d10763def46c67f6daf4 WHIRLPOOL 83954f6395c18b9e8f952ae019a690a1abb748b5e16b56ac52a8949c128403000db409aea5913863d876b71f6f56dedfd9c1e444656d55db96c4c3e18ad6610b
-MISC metadata.xml 436 SHA256 a09655b3f25fb0354b1d20b27c6f620f8330847defbf75702045787d80287575 SHA512 d3be54e204c6a9b46f737a8a93c8c59ffffe0f5b3f13520b28fe46aa9ac61018b94d71ef526436e3ff98e4e5a23e05b75b3b32e27014f1971e358be49de22d52 WHIRLPOOL 4f7569418fefa51b885ab20ed900cd25439c72c464fb43226793284ace07b30e4c50218cf419f7244348dfb2aa8667ebda783e2452e3f7e51536c45463483767
+MISC ChangeLog 1493 SHA256 8c5242d332e1dab4ac7cbd4adfe0d3fb24f372f2309dd9331cadd89c99e3c1ad SHA512 b74517ee13eb6accf33374266e494ec59c00c274875a416ae1d2a64941324f950dcb0995e5cdb0b60cc8c64323ab4be7ec75839d8c0f5e5f628d51d675f277fd WHIRLPOOL c524402b53cd690becab12879d719722400d090ebdba828f0c7f4a60093bd4433314f736035649736767a6502b39de8dc08645572a37a35f60cbf3b68149b416
+MISC metadata.xml 514 SHA256 57332f345d237352f3d658f32c5512b05303bcdb41a9af6f5d891ddecb0e3cb5 SHA512 6a7df83a9a4077e581b15a2888069bd4e814c760811ae053618ccea8ea49aafa7cc02f70c56b41d4c2707f864b18d6f0c79576c171d9aa6a386eb9828e0c2f84 WHIRLPOOL b7581eec63e48c53ef4ec702dc99486ec815eb459064c64771c189a59d46f1e7d556ca5b47a8b19417fe2f5ddb96c72e2ca3cf799ccb825e8848bcbffec142b3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVJOKGXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOMt0QAI+lJBl9XaIM/KqX5t/POjen
-uPGN6EAMudKwO72GP5AylfA6aoICZ5RMdiBcUlk+I5EefF3fTtW0375LMqN608qx
-BPVUWomfP6d9EUvGt3jJ+lN5Q2dWZ9jFNI2p+GXgIAm0WvwzzS4HB7SmzLXQO8dm
-91LRpkOiK+l5GQImKnl96AeirxdL9Dfe5xCMZFnN+7frZ7pVC+oDP3bywKhqByrN
-8e0/21fr9/bZskBUuaDmYOlxo8cKprdzSV3mUAxiAcyuRbwsjNXwHBum4+DeNWSS
-CrBXoMT28WeUFDd4lrGuSbxAx7sfDiYN1pA9kLst/t644GVDY+unNi/XotMHj/xM
-rF5VuwoymtHB+mYEaGvNTncby+1T2371W6xtEoYmZjktEA67JT+4R/SfOC2F5V/2
-0PW21aXC9pE6imNW7mj5mHE35vQHjmHzh/uH44EiHuASNrs4q5VkkiA4WEg+Dhlb
-6L/DbLxzjm3M6z4bR2qIafFWptwbFtxA2qtbXAlRQ5uSWmMyKGJI82od62mEJ5CI
-VnHSBJASQs8VnHAiFkV9YuaVByZJJ2i9AawdiZfAGFs+///PVpfsUf5D5Hk38Ljn
-P94fs3timG+wdiEbZw3ORpwZXMlhHEoMoBtDyQwf7uYHQFLVogyxXyzJOnBmt/+Y
-gCwC0x2D75TrCpj998fY
-=pYht
+iQJ8BAEBCgBmBQJVdJxZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmihpQP/iWMFz8nPwwtOT3y2bX2t8PL
+y29a6ALsNyoC91hH9Q97SUk0zQSjgg1U9yBfKfjpjjAcbuF6Cto1X0nxd/Gxe4gk
+1iD4QUY/ZNvU9HzzfUsZI6CiYOMYp03kAbsykn5c8nTCnXxg2dror5/9rKAcNjHl
+GYG2xqnzMHlwzmPSrInGSeX2GaJZ58XDRBkNSnyQemeUMtiAGyee3fL0KmAVVT7u
+3FAwyj2cCvezVVAm1T0Wuv+d+cmqc1oZJHIupdr1cEJDw+IHX7Oe+QIQgMiXCOCj
+NkKfNV75ctlYUJOStJcN4KU77MpuawNYLSMQ/QDLNM7GQVNAjToP1TR6Q09mO6Y7
+zAH1NpbSaU3Ap+x/hgopagm5AfZZWbECLzwIyvz6hIkjNoyPZ/4l6E0PRtyrBNj6
+wHPXl7NQKrzKyVLj0wWyu1rhpsUQnO8ROpYVwdHWcQYPUcD4gs1OEcZ6GMJEj8Rs
+SD3plgMX2s91kafj5/xGJaGq9vVZ92NEY+TEF6/N5mTeSB4hTWsR2K6y1e4IXM3N
+7/1yCo0X27uY2Y/k12j9ogKEzepPt0wYdbhxwgnAldpZRdZRmRya2skcGS71d449
+kKuNMze766xSsy36A5fVJtqTDbNZlHntCKpidZPLC22gfL5AQjxKGbOuqdqChCAT
+MixXY3Fav2xxlt6llT9H
+=V3FR
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pyh2o/metadata.xml b/dev-python/pyh2o/metadata.xml
index 07308e92faf9..dd3556565a11 100644
--- a/dev-python/pyh2o/metadata.xml
+++ b/dev-python/pyh2o/metadata.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>mgorny@gentoo.org</email>
-		<name>Michał Górny</name>
-	</maintainer>
-	<upstream>
-		<maintainer status="active">
-			<email>mgorny@gentoo.org</email>
-			<name>Michał Górny</name>
-		</maintainer>
-		<bugs-to>https://bitbucket.org/mgorny/pyh2o/issues/</bugs-to>
-	</upstream>
+  <maintainer>
+    <email>mgorny@gentoo.org</email>
+    <name>Michał Górny</name>
+  </maintainer>
+  <upstream>
+    <maintainer status="active">
+      <email>mgorny@gentoo.org</email>
+      <name>Michał Górny</name>
+    </maintainer>
+    <bugs-to>https://bitbucket.org/mgorny/pyh2o/issues/</bugs-to>
+    <remote-id type="bitbucket">mgorny/libh2o</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/pymountboot/ChangeLog b/dev-python/pymountboot/ChangeLog
index d9b1e67def42..693a882ea26c 100644
--- a/dev-python/pymountboot/ChangeLog
+++ b/dev-python/pymountboot/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/pymountboot
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pymountboot/ChangeLog,v 1.18 2015/04/08 08:05:23 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pymountboot/ChangeLog,v 1.19 2015/06/07 19:32:58 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add bitbucket to remote-id in metadata.xml
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> pymountboot-0.2.1.ebuild,
   pymountboot-0.2.2.ebuild:
diff --git a/dev-python/pymountboot/Manifest b/dev-python/pymountboot/Manifest
index 865bdb9ed869..13d3e3966f93 100644
--- a/dev-python/pymountboot/Manifest
+++ b/dev-python/pymountboot/Manifest
@@ -1,29 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST pymountboot-0.2.1.tar.bz2 4075 SHA256 0d3b109540380f92ae031b92e195f600165c6d45bf251ac83f82e9610df44406 SHA512 e21f73d832b69bc458a3f220f099bf6a8eabb21c0159b230969f4342e83874bac3983ef6bba19975b17e5185bdeb5cc42c6778f982f4fd4551a077039a2b6a0c WHIRLPOOL 1e644751e04cac4d3a6a1597cb8aaf3fc7e1031b45f269619fcd24f3feb3725364b94f9ee6fa6be26e5fbd5bf91bf94d15b025e6a933a65b014c7cf09b11b380
 DIST pymountboot-0.2.2.tar.bz2 4098 SHA256 d10a94069ee85c4038be7d600cc0ea0f97476a1798e962fb95510a17a018252f SHA512 bb6ec0772300b2edf9864a09ff64f67ad99f0cd29b009793e1b2a590be48146640c927b5772023d27e68fc2fba51652a55ab66d1cf875dd9b4134f043ac353c9 WHIRLPOOL 899180ddb16f65c12df18306fc093ebac694f060c9f183b610c4cb616e6a8c97e41813b07da0ba710aa6ae8923e0f22958af2f8830f3ce44b452172484f66a64
 EBUILD pymountboot-0.2.1.ebuild 589 SHA256 fac5c191af1e8c823e853e63e16efe968067819dc6f0eadd6b753dc245b8b426 SHA512 37afe8f47703b19d7d0275ca37a6402bb887b2270ba6d07bd95e307d60a3364ceb0d000ca41d962a8f2bef89cf8c889b73bd6002b09643555f8bb9ecf1d0ad93 WHIRLPOOL 66aeeb30c265655b726d03d0c27d2b97a2804df0c4abfe689bd6fb0a642c9499d42143a3d6e6544852cdc7259896510e96417c806131e47d26a513136846dc7c
 EBUILD pymountboot-0.2.2.ebuild 721 SHA256 e1d1cd4584802f867d3c8974dd300c83b83d75e7a653830cd55cf22d885167ef SHA512 dfe23699c9488b0a830cdfeb9111aac1b18cb0346aa4b839d163df1ae6bf3044b64ee05d416a7839443ea4f0224cfb16353a16e458e26cfb0d29840100df6a27 WHIRLPOOL 688ae58211cf3b6a44531a2b8a802b19632f7c97eefe81375ab6d43f0e1860f5b1ee52b8bbec8fec74548e4db43ed511257d592805df92b5511fef8ed04b8e71
 EBUILD pymountboot-9999.ebuild 842 SHA256 fd26ab8c2ba5a12c5756c7026c5c70d77b4e446d890517a1c5e43f6ca6758d31 SHA512 b45827486bb128719dfd4888ec368876831e9708add4338f02c202582f94abb5a1440380ce4c71a4fc1b279e31f04674903378707b683c0dd14d52b1c70be936 WHIRLPOOL 8a7d542c3f7994d32eec7134fc01c328f15107f5fb0af82eae1f7dc62769c19347242deae9aa61f98bf6e5cdb875f861712c1352e93113eaae9cc2bc4596f397
-MISC ChangeLog 2878 SHA256 24f98b13bc8b55fd3a8b5857d5ca168cfaf6ef8c4d3fb8126b9c29f60e3b7f89 SHA512 4b06ece077d1d6dfbf0bd916c764597706c5569a223eab6e215527560594445d26ca71b3af1a434a96497bca7571ce98eae6b5102b022c67db31a2e1d406db07 WHIRLPOOL 69cfe47ffd1c84d9dd14cd03750d8be88c9aefbe7906a206cedae54f98c0defe5ed910e8ea7e820a9da58b3eda7bcc03486e5364e71c430dec9bc00d617e37fa
-MISC metadata.xml 442 SHA256 a5dc62c7cad3a24a102f892e6cf4587e2ac1899a668993c2bb2fa8857c986c07 SHA512 428c88bbcfe6b400628c1a3da0733fd221ae005d1be70a029dbd86c38d2284f4642a0bc51779b451627898d2ce7266eb4995f6f48dcd4dfb278277b63c6aa337 WHIRLPOOL 082eb8d061bb4fcbadc96fd1d4cf30952ba0e54b83679bd2004f03f36e997949baad795391df2ca3636aa29d07e56b2ebf793c6dce5032d48ea653d3a040476b
+MISC ChangeLog 2983 SHA256 391b09459853250bc977d99d1707e1f60d722894f8ef777da6256a61efb366b6 SHA512 9023243fb96b41dfc0228c1b8e891bceca9ad3cd86242f8d11513d4c153e4ad140f1f1ccf3a099b746b0dac869a7a6a7648689ef797ad25e8b8d4d2694927a66 WHIRLPOOL e84b6827808b5110f3ffe9178d2ca87d6120ce0db4da6b5b619d717d56194b74bf8678f296f0109534a135a634845bff4c184f01a4df92163b28b2696466520f
+MISC metadata.xml 525 SHA256 831c5098d1fb9b431530bf76613fec8c123faed06736aedf38c42e1b4f85cfe3 SHA512 d25c018f11db5d324b2d320a890025f121bd3ee356100acc1d4ec805555af7c37b7a876f97651718c895df94fcd3d0d71bfabc8fe85d0a88ba015ac99fe2b7d3 WHIRLPOOL 2fb36be9adca01e01f77db2575c95c1d75d2ff9a43963e438203edaf8014edca190bc577f75410491dd6116e1c6cc0c31d4d414d1eca8d13c52a697bc52de2eb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVJOKHXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZODOsP/22kE7aDE/7hPp/OA+mDbRO+
-iNUWKzid61SDhLOXbEGYr7XZUq32zpe1+9y6Se9svFuLlRsPMn9XZokycImii69o
-c8FmNK6TWHra4D0BKhruIiQxsxdndRGz8Xpmp0efre5Jw4ZFCpgDkmzGhj7AYlaK
-vt0CialPKfKxi4DJhnv69s7P4aTkDquO8pJu5Ig6YekDrbOUa3KwACzL/Z4fNYoH
-kuU2U+JOEPUH3Hq1ntHfUluREWLttIjtn+djn4PlbKDgOgeNKHDqyk12Qk3z/F7H
-Wg2+slFnpS+3Uqoh9w7jEnh5HRhRNcxFBBBOdCyqWXROCQFh2FlP/iBD11frjs0O
-YVOhtztju3sGPWIKsp4WRTEqfAO+XoKlTSnjPUu1XmMALpgoFxxjEMdCX8mwh4Id
-VBpzJ2QjoMwMTUcN6eVQbSG3gSJSTZQv/U86bgiic2bZfWJC2V3lA0K0IgZv90ZZ
-RP7pwfT/XkzQ9LRuRPcQKGhW5KetSzD9V7aSHG6y0ULDscv7EUpDL2w6gYkQUCIJ
-yexU8l0I9wrka/4/ebAf276Mbl36IILhOGo0NOgDIvQCjKDivzZdGYd9+Ky25sL+
-RN09DWH7LuyRYpqfCxwKVVqDa8o5pPRYwY7Ey5t442FgutDtNKV56wJvQzREVIeL
-+ZcB/Xiq9OUc4ifIYBDZ
-=Qy6k
+iQJ8BAEBCgBmBQJVdJxrXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiiwoP/RPgM2acvv6gV7Dhc7e9OV28
+BHF0jt+z+bAw768LvAKJox99vwefUGzi0K2PnWCPgItcwJVDTtbo8tRdIgKonRPQ
+a5jzJf5wSd10AkDXfdJJb7Ag2wkBgdmlXQ0cnNSRqIGLPw1+WbvjIPvpCKWk6zJe
++hrhcyYHhoidWtBROTW0AmI89kVjAv+qFEsCPC018Ja8I8XW+1AcMAdE9MQ0hQmL
+wJLDdpNkvAKKTMHys69JcDyafGIaBiJ+LjxxYij7CMx6LnGpUTFyqsi/IRwuhlly
+GwPlezwhsGO1arLg3rcPesWhYUKtejQzZpHUhYNApQTxtU058x3W522BZi6CJLWJ
+qquAMSKPRV88Da2s3O7x1l+1uGYboSp/k8xFI2O8tsQvW+nkfSlgx6GjVwSzkz2P
+inwG6nXlUi1Z/kJ1oOiR5H/pRYNwehfZn6EnPgvCJq7+TSLzjkXrZt4VyzO7WXUf
+w8wT5ua5abfCMk24x8kQ0Hwk5C2HITuIH5Be/uo0hYAx7dGidlbi0oVN9jAe+KgA
+9+rZl8u8kxyt7YG9LvOUvLdeljKIVl2vqUBEOGeDGHwvvPUCUemCqgDuqXc6mPsJ
+gPB/Qxshd3HrHiZzexPMubImWJsbUg45rpfqTB5Ludbg9YuNeQqNX07XEUdgkxLR
+rqXMP0wuBX7HWaxs4tUM
+=12yO
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pymountboot/metadata.xml b/dev-python/pymountboot/metadata.xml
index 96c10ae0e45d..6d5d6440f942 100644
--- a/dev-python/pymountboot/metadata.xml
+++ b/dev-python/pymountboot/metadata.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>mgorny@gentoo.org</email>
-		<name>Michał Górny</name>
-	</maintainer>
-	<upstream>
-		<maintainer status="active">
-			<email>mgorny@gentoo.org</email>
-			<name>Michał Górny</name>
-		</maintainer>
-		<bugs-to>https://bitbucket.org/mgorny/pymountboot/issues/</bugs-to>
-	</upstream>
+  <maintainer>
+    <email>mgorny@gentoo.org</email>
+    <name>Michał Górny</name>
+  </maintainer>
+  <upstream>
+    <maintainer status="active">
+      <email>mgorny@gentoo.org</email>
+      <name>Michał Górny</name>
+    </maintainer>
+    <bugs-to>https://bitbucket.org/mgorny/pymountboot/issues/</bugs-to>
+    <remote-id type="bitbucket">mgorny/pymountboot</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/pyroma/ChangeLog b/dev-python/pyroma/ChangeLog
index 23b19497569b..1c1f46c288b6 100644
--- a/dev-python/pyroma/ChangeLog
+++ b/dev-python/pyroma/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/pyroma
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyroma/ChangeLog,v 1.5 2015/04/08 08:05:01 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyroma/ChangeLog,v 1.6 2015/06/07 19:33:21 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add bitbucket to remote-id in metadata.xml
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> pyroma-1.7.ebuild:
   Drop old Python implementations
diff --git a/dev-python/pyroma/Manifest b/dev-python/pyroma/Manifest
index f4ea6761e0a5..0df88dd6f12d 100644
--- a/dev-python/pyroma/Manifest
+++ b/dev-python/pyroma/Manifest
@@ -1,26 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST pyroma-1.7.zip 359654 SHA256 5498d46cb690404d70351aacaf04e61a709ca48c24c803ab5aac7fd7a1629518 SHA512 d7c95283273befbed6a747a1f3c0aa0af0db5c8d486128bcf5a3439dfe7204e1025afcf22cbdf5b96b6f4302b8d569c60c1eb9c646c035fd8a324e3d69f7195f WHIRLPOOL e5fc4a47c258db50ab2d5bb033e66cc6d589864c8d63bd448ddf491de849dbc87a1c93ccdde8729ff824e437dc8d2fefb05e536eb772507c0239c91983a22dc9
 EBUILD pyroma-1.7.ebuild 707 SHA256 f99ad1bdfe1e34bbdfd6ae32864a095ca8b7cfd9825733e611f95980b8005601 SHA512 d3107cbf34aecc2d4ba5b42ff407b02024fe7a83c035d0ad91d01e4c4dc61b9dc1ce9d9e9cdf773b37bf0ac9e87840e755b31027804aaef8c7636d270a58f612 WHIRLPOOL 45c2bce4556fa7e2445cc4adbf13e7a85a7a707cdd6921ecdf8890407ea99ae2736cd130ebbf20232d2e9a68d0c05ca24c7c20ef588a8fc9810ef0c38e2038e0
-MISC ChangeLog 784 SHA256 cc5b3e2cfe2a32952c56230437da6f47d71733e662a1163926bca3afe4681b5c SHA512 11817cc6222f9c0480625f0d7ce78437d7c27e630fbf2f97b7729ce40d5f8cf30b36fd75344205a429d1ee99a198590614c762f312f1e62c4aeb7177ca6fc9e1 WHIRLPOOL d0ad8ae0d15ad3736b98e76a9e0a39f8f5fece1d9bf203fb291482a27cc7864d5848c3911d575f55e429e9d03bc953fe3236b28974e1bae5b353e9877bec5754
-MISC metadata.xml 303 SHA256 c2f8d3fe6aa8b73fe064e76c24949d60d7a3773e60a89a38e5002a6e11335fdf SHA512 29f2a0c7984c11b43cc01e64501ab8e78e16dd762f120a5ee4a8a3ede09cd90cb646a6eb0ff3f8b82fcc1020879df1fe7598d25baf0ee2e705843f463e3d81c3 WHIRLPOOL dd9ee862b533569017b6cc24bb4de93c4561f228986b04b51900b42e4da10a2c107ee97089cbb7383099ad143a4427ef1e20a8ed4c9341877e87635a9628bea3
+MISC ChangeLog 889 SHA256 7d57e5e8a9b673b1d2939fbf028a5a7bc5ed62bd79350ab9c1d6d06f01a3cf3b SHA512 668e28b27cae475d6b8c0534bdc469108bd8a3bdc51db2af8197b350284e27494a91d340df976cd12b875fc992f44a93970dd749ab5af9da2d0e44a67c579f28 WHIRLPOOL cedb7e931e6ba67a46a935f1ac580ab9d19a75e2ca5ab0cbd647b0855a3f7f54e21ff95c35ed54cc90ec8f455deff8f9fbd0fe977d6291c29d07c2c0cbb2cf4c
+MISC metadata.xml 372 SHA256 05a9f0e796ec5a058a15925d7023e7ac0dd6e3f2b7742cf5b7125da82172efc7 SHA512 b6810ad35a31d9c343c002a120ea43a3e5c5eb213e6fe6fb967e8f7113c9c1f1452345bd2651fb52c6d31180238292e841e673c737b01b4f95a9eea886bc486c WHIRLPOOL b20568ca7013818f50201b235190c4d9fcc455d6283a00bcff96d5d3865729ca966fa1d6cd1fb2a7995c3d5d7ae889d9858d0251c8daac90774233aca0e4e9b6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVJOKJXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOXCkP+waUeA5BymGg3CSdN6zYMLem
-s/hwGoyYF2gVkLcnGF5jLsL15DMjaKNEd1I2YtmregXB4TLhlOS3cdmT/pdfZtgG
-WwwjgdK41/K4lqQD+c3WRpKGRSck9smnIjbvC6tKoN9VkahFa/ClYwknz5N9vRLv
-Dy5hfMBocR2TYMEkrDD/ulGBH3iAq4kbfwinNzWJ7YDosG/Pi32YEXwOk8P+dd7B
-uFN1pxPXdm7ohhNiHuwWycDocGqj7yErf+q4Ey2x3pGeaGp9OdVniR85TsOmHO3x
-YZNwl0LpVIykc+Vzd0HE6SH3owEP46wBD0MoT0lh9EeCx7ZUvkVOJ0ITU9t0lQIc
-C+Im8Q5XgD5bRR1chLTrh2LdosY+ptUkm1l+bQl6FXwSdOEXdmFs+7UnsjLqk8e0
-DtzVgqaggt7qT1JnkxiFeQmoG/xQJpzIpDpI/0BSaWSNX3slxYDKSAAg/CX2YJHe
-Qw1l4ExyJ/JZuXZ2YozV0lKtbjElUOm1YmLpRgqr/CSD/JP+eYqSv+Oj9YWZBMmp
-olmveZbrLBimBFmzb6y0sTHouC7GdNaSf1gbdRk5gzLoob33wXvpm1HwQ4nYLrJu
-OC2D0fh4ffemG4QQBz+IZ1blxn4oNe3x4nfM/KF9M+iqQMuwr8FN+d4SlAe/7dqy
-s3jye9bN/6bXUl3lmnUz
-=C748
+iQJ8BAEBCgBmBQJVdJyCXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi9Z4P/2AUrSXJVgmyl9rST+akigcR
+eyfrQnJN0zk790XAygfjAAC/lrgqBZxh9KtYLKVYeCUbbdI3jonjegkmFlEE8eLV
+H0JnO81HxdiNi0nH94RnTipOIE5ajK44I9xydv2l0OejcOExPEwyl3ndD8b3z3XC
+p82H6ss7u3KxUEpixJysDoz3vMZt8UWLjILaG35ynlX7VBTBB6qcDaX09dCooc4L
+lnfn7Ie9E6JbtdaOzh6b+tCBxfbygiVt7aaj5NOn+V+/PUTqXmoZJ6FrMo0abPst
+jMU2+YNeTsDg6o7h4Uohause+huWI47U/w8NpnEcjFyhj7+BrClModZ//0ekbzVc
+ltq9U/oQH3+42xYb62Kxgryv7wfNqikNNfAv0OGKqo7t6ce3Etnib/oM7YNvemp7
+SUXEmTDG3BpEpaL+L6PMJJhVq+Yrk1OkNvr5kMApWmxb++/lyB5DrfPB8+VPAZIy
+ZVqTveYiiglJrGUBxAZqdMGirKdIM412hLwqMLDnkRgiCM6LA46fYu9Mqt8FUFYl
+BTwZ3eU6Eo/FIlK4LwJaowpMbJVf3xf4hvOlgqn1SBZw6HXKtQmq5HelWRZ8GM10
+PsR47d2fvXFTJ56IXJt0Z3kMQDT51nhnqGaojnNO04cnIYMrUz9iq4er0gjhk5hB
+t4gw/m1UsWTt6lKxBB+a
+=eHxe
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pyroma/metadata.xml b/dev-python/pyroma/metadata.xml
index 4c8192ef2c4c..b919f51ed2d9 100644
--- a/dev-python/pyroma/metadata.xml
+++ b/dev-python/pyroma/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>dastergon@gentoo.org</email>
-		<name>Pavlos Ratis</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">pyroma</remote-id>
-	</upstream>
+  <maintainer>
+    <email>dastergon@gentoo.org</email>
+    <name>Pavlos Ratis</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">pyroma</remote-id>
+    <remote-id type="bitbucket">regebro/pyroma</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/pytest-cov/ChangeLog b/dev-python/pytest-cov/ChangeLog
index d9b4076565e8..019b3c1dda1a 100644
--- a/dev-python/pytest-cov/ChangeLog
+++ b/dev-python/pytest-cov/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/pytest-cov
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pytest-cov/ChangeLog,v 1.17 2015/06/03 21:15:40 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pytest-cov/ChangeLog,v 1.18 2015/06/07 19:33:58 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add bitbucket to remote-id in metadata.xml
 
   03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add pypi to remote-id in metadata.xml
diff --git a/dev-python/pytest-cov/Manifest b/dev-python/pytest-cov/Manifest
index c0782c87d6e9..5c25e0709b14 100644
--- a/dev-python/pytest-cov/Manifest
+++ b/dev-python/pytest-cov/Manifest
@@ -5,24 +5,24 @@ DIST pytest-cov-1.6.tar.gz 8257 SHA256 2e803c89f11e0344111670349f6ef401f831e85cb
 DIST pytest-cov-1.8.1.tar.gz 8649 SHA256 31e5198c06f290e1e813d30ddd063a0401d9e3a698129ca44267781673a71285 SHA512 dff6c6345bdc2d219800782d7acb3d301c8d67314f0f4af983daa0942a8c97768a2ce6c64f11529a3d8d876c218c62dbf08b7a63cc7345072e70bbc85ad4d112 WHIRLPOOL 90f024e0388323a5d1bd8ffd439c3c6cfb242ac2f539d391f4139a6ab2e251c6ff01831e9a261506d2c1552f1beeacc99db43d3b98a3663828083fec1ae722f8
 EBUILD pytest-cov-1.6.ebuild 674 SHA256 90d677406783b979ab0adbc8efcead73298fee47bf2e14e89a387889691dc6d3 SHA512 a1af390522897d502e83b51f984eb963674e1837ab60564e44195b8cff8bdbdb0438495c35bcc6568f2a6446890faf4bc2a26f94103c05279daa6609f5f8b2f0 WHIRLPOOL 66475d16ff093538d9b3592c932f32368ec71cca6577acc15513b13fdcde604c6a64f1af90dab51fee032b9602449668dce84de9dee60b8a7d0e8b0dcaec2ee5
 EBUILD pytest-cov-1.8.1.ebuild 1068 SHA256 89b93cac39df9916859a2d81675493cd3cdaa3556213475af9bf62fba620ea4f SHA512 d55ff38465e5fffdf8a4f880816db2d09b6fa66ae576a439ce5473bd617c07e7f5980c3af18074a95f61a3eb02527cc859ef1f03ef9658f12b5d4dc691cc9fc8 WHIRLPOOL c3288065cc68f2484535899ac696c8ee10deec1276b38015c06ca7b5b95a78e2af88968d0fa52f9ac5539da3f87ef5b5e859ec13a66323696255741c59dad336
-MISC ChangeLog 2135 SHA256 319e4b87b9ea0a1f0d2fbeff5286bb391824146dfd47b91dccf855bebfb3695c SHA512 bdb7e6f595b5619899f153a07cb32cf02b422a442aff0dd6babfa3fa826caf86702d1750f505b45edb66b60773e67742301b60f9c2953a0c07e51b686d78f16e WHIRLPOOL fc35464e90cae6c0082b9164492d12828e732b2a741d4cd24369375481875060a18c0aa999af9dad0913fa3b0896ef682992909f6fdb494cbf200bb0ba55d1c5
-MISC metadata.xml 318 SHA256 6cf43ac847d80057a519c2be649d008ffabc5bd58e6a76f3c9554303d31982cb SHA512 538af13f34f11a26ceb7386e5fe52bf0c43950a08724b966338ea8ba4a3e6f0f57936081ab913f3fc5ba09531d2f42474c180baec635b70a342ed0c51bc4d321 WHIRLPOOL 0a06a57308683897fcf82859f12e337bf05523db5d53c437dcc6a504264e35b17ac66a403ee5cc6b36e1e68639273ab168d11726c95560b82fa3b49c80877d66
+MISC ChangeLog 2242 SHA256 cb4dc9473b65553931eefc28dcc31332c522430dc463ad0a766513ec8af04c4f SHA512 c3accfc5d86a0775e13ecf921b04aa087762a43c22a1976170b017012f1c56816ba994ad101acb76988243d0499c28fbbfc0e567f9926754f858e17a9afb2fc8 WHIRLPOOL 8128460f3fb688a9713f23ce5b0a3dca1e6260d2aa8f0b9e2bb95130ff2ffb8d793e7bdb3fd138d6f01ed52dc97735d497ae192885721a441999acb22c94073c
+MISC metadata.xml 383 SHA256 d970b6ae26b32c0cb8fc55f24e2bd98e2736fe39fb5f92f0995535eaba4f3638 SHA512 f386b6d83e363f4a294d1fdb0318b27ad2291f16827225a5b2ca3e721ebc2eebec7d25b9a9448d529b03bab849f6a204f9c242fd021dbfb6ec57e1016ca0ac0a WHIRLPOOL d82feeaa5cb38fae6c53eae042e63df283bd8ab8a307fc65d8853a4ddd80aa22b57632e7cfc7217e5b66424ee71a2df93687961f3b228b5732a2a8d20cde4f32
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVb259XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVdJynXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiqCMP/2EMaeaq4ZlsjjJk1Pb8QElS
-V5r422i+eMLK+G74WhqT1+ZILy3xMElty02onJ4znwRoz25ySsD9pJT/XIhKjOs+
-RyDqIxtBMBeIbu5XrLVyJGf1YrxD/u1gXpxSeX9vDvZK1HqKEmwfOLD22IjBKyD4
-dUDQVI7DhxbxQ3nTkoyDhTa7ZEXe+PDtNrrc+NgCVqcwroxCk8/IYI9Q7iJv0J68
-/7fvwIVKM4D835Wp3PAyduKV5FC7ZG5A+Lv/Ao7dCIu3kquqTZQW9QazyLGZ64SD
-6GJLMR0Dk6uaiRiUYlTDrWf9IuoCTk6JPEFLGVqFIOtcBF4ULEheUTYZQIXlWPcu
-c5/U4d6VJRGp/lMuLwvRNuFLBqJYd4WH4FXbRRNrYJmdZ3qEVH679l4Igd7p6EJP
-og4oTESLZeK1Pfdv7FaCoo7H1gzqqYW02xbxCbpeenlRqq61KKuOnsJZ9tCV8cPk
-thLI3JVmECalPl5tW/0TUm6+uvPJPlOm6Snbc0YLkBfmDwjC/RbSCxzj66E1HUBf
-OjPqgl6sDOg2ltmHI1Q3qTpmZNRfZtcQA4oJeYIDOHbBECsrFadpaUOsxqCNNNCh
-lFyVV0/asWLJu14EEr4DtDM71E8qrPjcWl95QaSfFngKvxUSpNsHwT5cFtPQU6W9
-dmAgWi8lm6xHuF2oitvx
-=Fzlm
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiyxAP/3/PGQFFumpOJ5idOKhn7IeE
+K2wgE2M3lmJFaKA5zq7r82lOJDEWyd9l+KF0T0E5yZUd04NXs+rHj1sF6Zb04M8r
+0YIYV9PjJ3hbLQstMYM2tpX6FCqtE3UgN8rWlnHIlt1qRRV9zT6VZh9hV9QmLQUo
+W2iuPhUCUg/gUH3mviIygRU+TV8qClQQT61jC+3/83IP3IrigVP6G/QpPVSCsYJv
+l7i2kpqs/h/LSHVo5fwTdZxG11n215/BFVqkmsJ/WJw03bfhQZ3am4zoYgV0fS8e
+dG7bTkrHQFPcWlnI55NB0Hvj0zhHGUMebetb4IjnMcl14p4spHpBuf+zcgVAmEn2
+PZTw2eSrcZjE1Hr8+DxhCFm4Qo9e7pmMU3kfnkv7c4ElzlPQzEZcj4Z9NW/jLs2z
+uWfNSuNIR9+8YGmrJo2QPImmtXW4vPk68lPcwH0CVYzlDGwbhDTTVnl3euKdc0G/
+Hy2WSW8U7FW8c72Tg9bm49IpUjX4U/c6erqNdEQv7tZlpJgjqEscZx2L9RuMfkb3
+emkGII8YdT97bRki0cx/xxpW0e12OuPwoRnr9ALwxZd61LSEuZxCa1dHdEj+Ld8O
+DCwzItsxfudv3yv0LCzo+u4dpFR1FzaAR/QuTRgb/IOCQL1n10F/woi0Cf3J2K8a
+C1kmCE3667Qqh7B/LwJm
+=Xmhn
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pytest-cov/metadata.xml b/dev-python/pytest-cov/metadata.xml
index 55fc11020e2f..6f652477d098 100644
--- a/dev-python/pytest-cov/metadata.xml
+++ b/dev-python/pytest-cov/metadata.xml
@@ -7,5 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="pypi">pytest-cov</remote-id>
+    <remote-id type="bitbucket">memedough/pytest-cov</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/python-digest/ChangeLog b/dev-python/python-digest/ChangeLog
index 0803bf41e9ca..d839eb983ba4 100644
--- a/dev-python/python-digest/ChangeLog
+++ b/dev-python/python-digest/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/python-digest
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-digest/ChangeLog,v 1.11 2015/06/03 21:19:43 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-digest/ChangeLog,v 1.12 2015/06/07 19:34:16 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add bitbucket to remote-id in metadata.xml
 
   03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add pypi to remote-id in metadata.xml
diff --git a/dev-python/python-digest/Manifest b/dev-python/python-digest/Manifest
index 808392948758..08c08ccb6134 100644
--- a/dev-python/python-digest/Manifest
+++ b/dev-python/python-digest/Manifest
@@ -4,24 +4,24 @@ Hash: SHA512
 AUX python-digest-1.7-unittest.patch 331 SHA256 54dac56e7e1a1fe426168b5d30eebbbb36f88a00b511c75129cde3c1094efd58 SHA512 65b8c0cdceaa81fe816232b689579ec9a38bf98d7eeef17013588078b9a7a2c63ce54559938034704f8a4fb6605b07dfa70d500c03e7f2657602151321f68809 WHIRLPOOL 50a2b22879c8d6803b7ae1ed54f5904d68cec574552be0ca67fd2b1ab97be17827492b5cfb7cafdccc428e5980ba3989a44524b987bca1cadcd69ead3613fb7a
 DIST python-digest-1.7.tar.gz 10073 SHA256 cda2673e208e95c222b26b8b7717a356d2688e57391c7bd5a77154015e83be45 SHA512 15bfdb8e42275bc8f7fbc10f6f8bcd109852c57b77e98c8c2251784278fb135db494b0224341d34626ad49ea4db2a8803b2eb89d70d88b704819f4e6ca10f7e1 WHIRLPOOL 9b6002b2df7529db3f186a4c81803f8bacd8d14bb8a84b88ece71e36f21e38bd7af3c1394ac427ccd790bd68478c1acecc72b956d7993857eb604356c2b57f0c
 EBUILD python-digest-1.7-r1.ebuild 805 SHA256 8939760848207190634021547690e2506fb50519dd06573b175d02aa6fae5257 SHA512 d97e405b68bc532343c7a81616459b5a72c80d58dd53ec433623805fd7e297da1e1419865cb6aa31cfd65bd5ba0e966487c8a79a44a1b4ad87f7ed4908684fd0 WHIRLPOOL 7378b9f2db585f3ccab0104266894cf46bf5e87faa5d98b2a6d6e5d94290f64a7328f203e9b639ecf5c1a455d3064270a28f403caf6289796cdf3abeaab80d0d
-MISC ChangeLog 1592 SHA256 085743fce2359537989e5e039b8ea60aab5b31517a83559b8eb998cf0b420a7e SHA512 a338057cf6b13da45b4f3df6faff58d526797136855b6cabad3a6e966df5bc5f1f8e8a4a16749117173ab28d6fd15fee229ae57ff3f52504c1fd2bf1cfefa37e WHIRLPOOL fbb215bd64bec2c3a5df28d7783908b5460036153dc09d838c8dfde84bf04b2d495054cae100445693596b19253136c6aa91842d67b7178a10b8964313c65251
-MISC metadata.xml 339 SHA256 be733abb7c875c3bdb0ef8762785c371bf40a90fa497b0e0577bbbb3afa18b1c SHA512 43417031aab9c55f87f1ebb69b6f8aa27efe6a70131ce0b3ddf96f7f830e0e9e4273f65ad4514a3675b6794684f225602854208074a20c4e4bdfd25f7ca2a9b6 WHIRLPOOL e2af8af7b1d006220699b81511b862de851cf06a8cbff2290ba3861b8c010d0eb7d99ae9ffed9a1d8f88e7bd0c5e0abda3cf47d85f9e443ed837fda6ecb6670e
+MISC ChangeLog 1699 SHA256 507e0e85136141c2509dbf691d6cf341f1e7ac8a71c5e6e30cd19f8cd1f327ef SHA512 a2c95e415738cf13cd1be255fe61ccfb56ce5f1fc4c15e8f9885119bfda98f7f0dab14395b8e3ecc621e68557c51aa8962a2a4d3d485a16a409bcf5757a66bdc WHIRLPOOL 7606843602696ad53c58a52f95d8a51a497dc07068563ebddeacf6d6c2d07ec844544e007e3370f4e704117ca70ec69ec32c3d8ac2c0154feded2c8f7e3910ee
+MISC metadata.xml 403 SHA256 bdf2b72eddc6b987237af470e8750c694f344e2f1411bfba4fe29ec595f9b12f SHA512 f8f9d5a62fc54f83c70d544f075d18ccac72fb41d45f06aa10282d3f25efa0eacccc73a41fcd7d4cc6c8a135c17410ff2a747067784e7de3ab78efd3c92f7782 WHIRLPOOL f9839836f76b8f591e28b61c552df8ce66ed0b9de0ad06b919bec830243ae15f60557323837de18afba9037a9aa7f6cdfca4e108439cb0a057473220f717ad84
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVb29wXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVdJy5XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiKWkP/Rr5rbhnQ6jdHENKtx/UjJmK
-D3xZaZqsGTGLZ2tcdfW71pFEoQUFzE30uVR+K59pnTa1Nxk6BRnPMqNuYrFmHfCU
-yZO9E85li7Fe3dJVMbAX43XDjUQcIWWly1uVPPPi9WTXyhJVu9gdsTa7e3YRmtyJ
-DO8ssbxo1vLP0QpxJ9BBIt7cNi6iQUgkOmZfI/9nBCrhExVcmc8/f9UOVg8CXWq5
-Bi5JoLjcb4fSgAtnCbcd/kfrfpF5NIQn/n1ajd4pIx7wYXuxXGdKYcVgNowjregs
-BY7jysBcBknwHzeAWDZMDlO8Nnny6gZ10p7/sTgveEMksRa1KzYp34nArCrmxpvZ
-bYiCMD/baHbECvrXJpPKfPGgkQ2od4RXMqZFU2s5QsCJSkGTwFOAGGSmkHjMy7dk
-ztdXb0NTq6PyQnjM+uWfFB28Bl7YevG55Anx0GWxORY1i96Z7Un6RBu97J/Eyi/L
-WMpCVt+eaJNSRN970YGRZ2fUw9nu0s4f/ktH7vhM7i+12RSaH3rLyqN48djnISU2
-777i5w0QxDIsSwd1wAom3Qxa4MYwagEqXEfywKxeh3M3cgQPQCOcUZqDKc3xJJXN
-lgPB3RPfXwcnxXnqW8FadGmta+youYOKf1u0WUd3DFIlQnBXhNaFTngUoF5xh97l
-a958dvoXPWTjNDoe4ScN
-=G+mu
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi+gEP/ixlCKipxxsEPZ/G/3TEGdC0
+K5uvFpjkqLDadUtO1B/TpJLwtON1YTTFALfKOpM6AGHgm9GiTiJWxUzdve2eJD22
+RMXSMyrDKfkMcnSy5/XTCSkVYcS/OW30boqCAl/Ue3oMxdvv34IPrYdnyR+SVkYn
+/NPXm3aQaeuJjquTf5Ccs0vP9qgKvf6wfJqQO66TjEx6NM0GBzRUsTb3FYelC1F8
+X4wF/sx9it3sRJHwPW8Ut+4qImmMxqDIUnhq4evXadobAYvRWLRECqKCzct8V2sM
+VSclQxgjmcx4w31g7i5NyK4+KXXkT1/TMY0ldZ9g2ZnRdnICdHM5JWsrGmrW/ED9
+eXcceO89St0EckiVJMo1dLUirE282pNYBEIoJkV/eVBKsHeI9bsDL+ocS8lEiXJd
+6v2Ci4lTORHbbz4Y3dTW0tIvMtKTsgxqZH6Ls+pkhut4IaFNNWJvo2WwRs8Jg9wD
+L0X/QEV1xRpHlAe3phTQd8WjlHI710oekultfvfOGdvLlial9SsyMYkcKnCA40b3
+MGCD4OoFUG0onE0s0V4mWfG74bL6ncZLKnGgdMKnHp/0iowaiyyf/+LDiqrJXcYg
+5tR/8cAbjypzPEE5c8bEdfnlkJo7ynpCoiMLOP3MObqaB/Ykb8oM7sAXwGa3qAh9
+ewuZfbyLXdRKsmbAzyMw
+=2Ped
 -----END PGP SIGNATURE-----
diff --git a/dev-python/python-digest/metadata.xml b/dev-python/python-digest/metadata.xml
index 00b596496c10..e30ccd6a26bb 100644
--- a/dev-python/python-digest/metadata.xml
+++ b/dev-python/python-digest/metadata.xml
@@ -8,5 +8,6 @@
   </maintainer>
   <upstream>
     <remote-id type="pypi">python-digest</remote-id>
+    <remote-id type="bitbucket">akoha/python-digest</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/python-ptrace/ChangeLog b/dev-python/python-ptrace/ChangeLog
index 869f425e2f63..0bdb0c622b0f 100644
--- a/dev-python/python-ptrace/ChangeLog
+++ b/dev-python/python-ptrace/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/python-ptrace
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ptrace/ChangeLog,v 1.22 2015/03/08 23:57:31 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ptrace/ChangeLog,v 1.23 2015/06/07 19:34:38 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add bitbucket to remote-id in metadata.xml
 
   08 Mar 2015; Pacho Ramos <pacho@gentoo.org> python-ptrace-0.8.1-r1.ebuild:
   x86 stable, bug 540290
diff --git a/dev-python/python-ptrace/Manifest b/dev-python/python-ptrace/Manifest
index 01b12cad74d6..9915b05b50b2 100644
--- a/dev-python/python-ptrace/Manifest
+++ b/dev-python/python-ptrace/Manifest
@@ -1,15 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 0.8.1-python3.4.patch 4629 SHA256 3bb83e7303a412854912091394cc29a6a8acf3486b3008bac14669b744e81245 SHA512 3b5c072b55c138c97e9b6456354bdf17c820d448880e0d6bb5ce398b7dfd1bd432f9886da4f8b960578f60e24fb636142bdaa66566ac22e12cda0928753aa46e WHIRLPOOL a8aeaf886a02264170e84b97fbcc6291f8ca09e59dff9d8894debd69a916cf267044ddf527bd7c94cc7c89b7c00fe0fa557d8ff62e2e4ddaf636fb75978f9b86
 DIST python-ptrace-0.8.1.tar.gz 93674 SHA256 779e04c7bdc00150b739e7d49c9c61b7f36f17afd26355f91b10cd0e7d55d19f SHA512 1c3dadf381ad0fe30374fe030fc3a81b5ec0885c31ac9be4ae561cf14ff891fc2e465555133b2efce6be0154b06768121aa068161bb3de10aca6df0eb181e25c WHIRLPOOL 1541571ed580b5852b1fc51f515776463dc622a4a2c334691f0433083a29bc1059549e0b4e938ea7c694517e341cd39bbc3f487f5ea7f83b327aaad1dbd8b7df
 EBUILD python-ptrace-0.8.1-r1.ebuild 973 SHA256 b3ac81af4764f69e970d265c3e72a0003b52f736812fd5d991feabb7e1380372 SHA512 729e2cc232bdbc5bbe1e9d81a5e8a03ddd396aaf8ff151232b30257bcce2fb801ce85b29b5fe7b6f80982d4b52c213778326e37c05b417f42eca6bf0e02bc9ec WHIRLPOOL 1ce97301718ca84d9449b8023f1e1656a2e09817c479a110930a04ca9a0140edf44a5e9cd6e788c7ee6d0bf30ee7d9fdc5d0c777266418758768bbbf3567e82d
-MISC ChangeLog 3747 SHA256 7aa9eaccacd2151599ec16d396dfe2722fba7af801e2e758f773c47481f9cf7d SHA512 a67d97f0b95ad94bbcbdd204e923da47c31f4e9c384e965bcb17d5d10969801a293e4be552b6af84edbcd95cf4eb179c9399baf36f088e4087f282d187b6418e WHIRLPOOL 7ae3419ed9117c8de65643718bbf2f6762907dbd2d812ae509b4537a1ac636e7667fa04bbb3cdb34e49d3c686f524202b840da50f310cd9ff09b07e286bedf91
-MISC metadata.xml 236 SHA256 ef9f12fc623783043709c89a6c5febf6f6d6bcec5882e7ce867228e3e13f0b40 SHA512 6ab6dc105ead9eb542ce5800527ccf9fe99f813cfe59ca8b075b877468d2f027ce6e96ddbe1cfc4e9ac42fc24a96a80b5490e5e2e85eb3d8145e4b97c2a2dcec WHIRLPOOL f0b5d1dee36e29c2ef1122261d24054db7388f32b2e743e47177156f396cf24e77d88af071e93f3505946e5026ae4696e71949e0163da0f498e4d55c0243e2e8
+MISC ChangeLog 3853 SHA256 39f74986e224d8ca77d3a4048f171f806ca7ee739c5f03cbcfa6da47d108fd8e SHA512 5893fb83bfa6fd03f3fb7a4e29ce893a36c589a5928a61caa329b90f404af9b3545dea814ed0a048edab478807c5b36c63d5803f5706fab9f679f8474301f179 WHIRLPOOL 8e23f5c9e551bf60023f70bb9df17c38e6d9a2ed553427ffaecac1ece896c07126a7ea510bef8eeb52de45fa459d364048a2e36242e5e7c9a2a4d18c621fa9ec
+MISC metadata.xml 305 SHA256 22b8c7e876b6be222379f8c200bf08592cda6db24623219855d76d5c91ed475a SHA512 9bc2239b22112bf159a76585861408db44cbe6258fa4c3f646ecdd7cfad391b0b3766f8813c2c5c7964adf07005692921ce3e5371c6f70ccd2d61d46000c30b6 WHIRLPOOL b19ebad5829dd3cde75fc59e61f64890f00cca92a1b633dec355a6aaafba3898067f7ce4b04ffc9dfa8f0e7ad311d1acd5212ce063c0f07510df2191624cfe8b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlT84egACgkQCaWpQKGI+9RNYACeLyEyJaWaklnihoTVCgR24coI
-Vs0AniW/es7OAtciTU8dLvwxX59zs9vS
-=hEtZ
+iQJ8BAEBCgBmBQJVdJzPXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmidAcQAL0DP8qQZ4wpJ7TrYHjA98ZH
+By4o/NBauHPYzxH5RHQzmDWbLQ/5jykiF4FO1u/iUWsTq1MGmz6/QAQynTqkGeer
+8iETs8YriRQcbxswZAvNOHA5P1OmDuzRDHZ0opivhcbHWPFuPQOZm66L0GXorvg/
+31zkv4octmwjGHWO/DG7cSJ4BfK8xqusmB7cFLZL022DgslnV1EiZPVrMI83n3O3
+jWr9/WdmlMLJgYHfuty4uHa2KkLlanD6AM8WUZUdsB5b2n8IqhOHbXdcbxEqsWFM
+HqPtoecmC+il4QIts6FgXq7aQgA35Y+vmFuNmjyK+gkeyY4vq4fMbBpGkgHtcKTO
+XR8fwctVmOAu0mA08x5v/SryoCLmPi7I/wo/U852V9/JhjJkbYM1Uw8XL6uL2DS4
+jID448MoozsaiIMJNTWjaJKWuUQ+k9jxXxcXGi3Hn5ul7tgZJhfBj+yrCWNDzQEB
+GAp5NH0UFg4oPcICkV4+J8j+4N/mhwLTiHH6cC18AP5pI0QfBejoJdSfK1B+HWrT
+WrJC3+jvyipLyPexhcUBKSuJqXuxcJHgfETcNgyBGtUdHl2COvddNe7MFlOySwgu
+KBATFDduVVstaxd+gvaTYt0zYsHlqXMYA4nVvzFhTQ+GSL6NmVKazG/g21KKbrVw
+31TF7d03AKoIhvUp4hje
+=Inrk
 -----END PGP SIGNATURE-----
diff --git a/dev-python/python-ptrace/metadata.xml b/dev-python/python-ptrace/metadata.xml
index 7eaf395302c5..a484905aea3b 100644
--- a/dev-python/python-ptrace/metadata.xml
+++ b/dev-python/python-ptrace/metadata.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
-	<upstream>
-		<remote-id type="pypi">python-ptrace</remote-id>
-	</upstream>
+  <herd>python</herd>
+  <upstream>
+    <remote-id type="pypi">python-ptrace</remote-id>
+    <remote-id type="bitbucket">haypo/python-ptrace</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/setuptools_hg/ChangeLog b/dev-python/setuptools_hg/ChangeLog
index adf7172be10c..e652731ac58c 100644
--- a/dev-python/setuptools_hg/ChangeLog
+++ b/dev-python/setuptools_hg/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/setuptools_hg
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools_hg/ChangeLog,v 1.11 2015/04/08 08:04:54 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools_hg/ChangeLog,v 1.12 2015/06/07 19:35:04 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add bitbucket to remote-id in metadata.xml
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> setuptools_hg-0.4-r1.ebuild:
   Drop old Python implementations
diff --git a/dev-python/setuptools_hg/Manifest b/dev-python/setuptools_hg/Manifest
index 5c5837b03ed0..271cf3241f20 100644
--- a/dev-python/setuptools_hg/Manifest
+++ b/dev-python/setuptools_hg/Manifest
@@ -1,26 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST setuptools_hg-0.4.tar.gz 11059 SHA256 a41c3f9e7e503d760068aefd707ad82297a8d734078f478013b50be0dbe28f4e SHA512 95fd8930a8893b8db3f94ca42e51fb0b417818fc96842b0824318a383f4eff2ca54d8e0d51cacfe856abbcfa386aadb0a9cd05017f4b3b26fe8d634d8b5d3908 WHIRLPOOL 92887e231b906b22358806f1e04ae345a58341182745a70acdca8ce9b1831f55ccab129faf4ade6ad56bebfbea45a6b870ebf3e51315f8c08013de6fc479a997
 EBUILD setuptools_hg-0.4-r1.ebuild 694 SHA256 53571974cf51df2eb718951fb3f75385f6f3990cdf4705343af806a852b53569 SHA512 ecb6078cc83e4929330d9e8c1983517afd523301523d66aa5c498c786a311e7cb7cae0e12229159346ff67c85950f5dc64d56dba6d509c0dbddf61973e5bf61d WHIRLPOOL 5c47f77f0dd6554cc92e0ce5c872fe63d99882ea18c55a9ac9ddbd6be861b59e49890d81e57a56da2c05d8713a60dc21fb20f7ecba4e73d7f28f3ecf7deee939
-MISC ChangeLog 1535 SHA256 7fb8a0427355194480af2383c27a763d694bb288e1f1a8ced327570af1f821fe SHA512 e50a93a051f7afcfd5f6abed5ecbe4d0d97e410a4bd90625e19be16a94edae495d687a64489cd64a08be12b43aea9af8597049e23c53d76c5c0d5afddbce92e5 WHIRLPOOL 8156e1b4c5cadf8db6929ed8bbe91e9fe28801e61c37077d470c2e5d7a0ec940eaf61552bb2ecaa308aae4109d6c4d8bf35b3c835c63f41d39ebec7be1c74ba0
-MISC metadata.xml 395 SHA256 79efc0fdd9655a2c51eb82de96d854f69ad61541696965172dbb69a9ba75cdcb SHA512 96263c48117a972057c03d80bf674ff8950a4434cfbd61d70a75e332685138c61318502c92c20dff60871d474dc5cd0a7324348eb763acddb12fafc174db8793 WHIRLPOOL cfea7eaa30f19063efd144f2410391ac1f3484807162ff582803087e0a184f42fba5a35bc1f0da43ba8573a4a1d2bc12669ad4b74a06b4892ec084e316a1fddd
+MISC ChangeLog 1640 SHA256 7d5ad8a54e87ed478e522eb452f71eed8a74e592e0aed175b0ee303aa9863200 SHA512 3c67f56c7fe0d0fe381a0e37b93cc9e081d1d135f4c2450bbef8aa9034b785ea57d6086ab84b4ff6a93aac94f044755866775aaf1cd76ebc8434e8dd819ec072 WHIRLPOOL e945823a560c244c8b91531b219d90141fd500a2d5fdb3a642a32763c55f322a7583b60671e5a2faf12c3f271b0118ba0b13126886f9285d8221f2aa735156a0
+MISC metadata.xml 466 SHA256 e3c7edb391bf801acd0c34578b1f21cb04dd7e334bbf06c7a12188f2a9524f1f SHA512 57388f6fe30106bd271a85944aa6272ebc9e8278dcd8f0103a2596b4ba37ebb0668d0748350ccc2b89a3df667af98d8e6ecc92c31c3bc9516c07626043f0ae92 WHIRLPOOL d875f35eab611a18146ecd2a4f203c0345109e89ec285840ffe92139a406366ac8cdb0cce9b2cbfb9fdc0e923a5477575cde1233ef7dd2eb052cb0be037b2f36
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVJOKTXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOfkwQALhT/Q5h2W+D27OZo05Av3Rb
-PhRNi7yPMGv6DKx9LIbUWYf2A4r42r6rBIHIqQIawSr+V/VJn8uDDiPNJ7aoeuPE
-a5x4uEmyJdrVJPSfOs7RN502musiqWLmtX5qnGS3DqihfBOdkvYkntWTZ3jwAdsK
-0lTh7KJpJaFtJ3YpUHUK/oe99p5TfzpGIU1WbR+av469HxA0zSKPWxBoMfOcWElR
-xLGq2iORzqmI5m2nYIMAHEOJ2gKspNEt5nRWstQ2EuiSKcCQsZEUwlPqL6kNckGF
-xBZhQk3qTS5cBeK82keImkk48sj31aTuO9ToyXCDXZzerfMOBIWWpqEc9nBK/MBN
-U/Id/uK/vDJqdShuMI8fluAOmU765LvBa9Jfe7dCCDxxUAQPx9IvVt+KVuEgr1Zl
-VY6KOhzImFZZ4u8BphJAdbfn8loTixW4BwP2E7pNQwWqZn/kIBJrPYSZG9GXrtKV
-UWo4hogloGokoIRS29yaNaJE+pcuHoHmEUGH8WVDQhdAqUvF/zUsFpykeJKHEKk4
-hurGvAbGZWrTYM+H+7KeqkVuexs+YGYR7uxGC278/vy63p0pSlBlVh20fSIZ1+fy
-rUCSFN/46ZlNh8iL2utLp/oKO7rvSK+Cse7zrC7+OPzEep+JeJ2DY9D4PyMe2CRf
-hfbo2VeSFy1YYf/pcMLL
-=dDdX
+iQJ8BAEBCgBmBQJVdJzpXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiYuYP/1qlLJGlDleKU7XHwpIpaKYK
+EynrOgb3QDzQ8S3cMTts00TCq0gGfnuEvIVd4dyEWlpemt6na/gOhtfYT67Pcc8M
+rw7zTH+h92LW8Q494ta82M6lC+HaPbkZgsedUuBxtA5prr4/E4SyPKK1wtOaWgRH
+In0QuYWOb9gYn4GCL/ZKe1axGyVdu5PsKc+QuMmPMtFaQmJBdds9BiUI3qwFauHg
+YTiDc/JcMUa9NjWIVCwR8sZTGJkNPMSkTHA56ZTWuvBLWHzdepFhK/vqavgts6Qq
+j+a8QeG+AR4csf6bvjFR37ARiu85joDcomdsxD0RDbQz13av8VII46gGxoKk3pbZ
+t3ONUBjaQVgeIKEgViMQm8Asw3MUFsMXdck3f9eaCqBvpkY9NBGUwlpDcchCBNc0
+ZwNZ0ozuB139v7nsdRPcEYc4YkASjGHOwLG5sidYSqD47CqVbgSQFWU3aOvepTcE
+wBjvhsWUNCXWZAe7v38XQPOyNRpvVPOOlHkJlP9i9iPaPWhWMXFYzJ2P6XHvw4rk
+DG47jCokOov+l6go858wWBAM0pPIBy9/3fRKxSpgbnfGABebBJyxDijamL0M/od5
+Afad2xkmO+mjC/Tik1oPvolp0yJ6bPaLTQTztkdMZS3MpYJYqBLsES2LOYdEIqWY
+D0nyd6jAyMJSburTbic9
+=hzrF
 -----END PGP SIGNATURE-----
diff --git a/dev-python/setuptools_hg/metadata.xml b/dev-python/setuptools_hg/metadata.xml
index 09c8706c814b..7d3dea218e16 100644
--- a/dev-python/setuptools_hg/metadata.xml
+++ b/dev-python/setuptools_hg/metadata.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
-	<longdescription>setuptools_hg is a plugin for setuptools/distribute to enable it to find files under the Mercurial version control system.</longdescription>
-	<upstream>
-		<remote-id type="pypi">setuptools_hg</remote-id>
-	</upstream>
+  <herd>python</herd>
+  <longdescription>setuptools_hg is a plugin for setuptools/distribute to enable it to find files under the Mercurial version control system.</longdescription>
+  <upstream>
+    <remote-id type="pypi">setuptools_hg</remote-id>
+    <remote-id type="bitbucket">jezdez/setuptools_hg</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/six/ChangeLog b/dev-python/six/ChangeLog
index fae7d4f0f955..4d9f320e47c5 100644
--- a/dev-python/six/ChangeLog
+++ b/dev-python/six/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/six
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/six/ChangeLog,v 1.68 2015/05/06 11:57:45 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/six/ChangeLog,v 1.69 2015/06/07 19:35:48 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add bitbucket to remote-id in metadata.xml
 
 *six-1.9.0-r1 (06 May 2015)
 
diff --git a/dev-python/six/Manifest b/dev-python/six/Manifest
index 6dc62a7f0b2a..d976cac7f1d5 100644
--- a/dev-python/six/Manifest
+++ b/dev-python/six/Manifest
@@ -14,24 +14,24 @@ EBUILD six-1.8.0.ebuild 1122 SHA256 dbe3c775e86d859827666a24d6cf79b1f448d1becd6a
 EBUILD six-1.9.0-r1.ebuild 1212 SHA256 5bbb9b1b7a17a1a98e9d38dbe9506dec2ef78979511022bd4257096949ba0315 SHA512 5c895b4b9731ee381d4699782a21559c4541aeeaf8ad858dbf374670f2b332f8a5a14638a159859c337699e2ec7e6e2ef6075a4c059e0be87fddd853ed01ec0d WHIRLPOOL 84dab193ec3b29f0cbdb544b9adbb52b0916a60e24a0f331a90401c63730c69db28cb812cb896e3e86340eea4e13a10e9c8665ff9495e68f7b3db98de9b158cb
 EBUILD six-1.9.0.ebuild 1128 SHA256 0607125ef91417cfd6fbeef799082c8ef30292a63da7c2dc5c54f9a71e10ce43 SHA512 05cd8f67b8fdb3d84a60e1f7dde084ed3168c50ef2cffd081b31ace03cc1f12692c3cb192506be00a9fa119b862161a18f306ca44667466a8eb1d4242c9dbc84 WHIRLPOOL 5ed9bf53151c7e5e4ea23b0652aab9463e8ab53c5465cf5fa98ffb23dafc76ebc70971c8e5f0f55ac1df3f1f5f31a87b81436176af714b65c6181ea533562bf0
 EBUILD six-9999.ebuild 930 SHA256 c318f0196a47e738113530cf5f19b077bdf39bbd20bc5bf8aedf3086aeff2f47 SHA512 27d31f55e28586650f8bb9616bbbf39965ea8e383de005d2abc6828d264e2756de84e5006f48ba1e58e20466bd7bd6a1039c1363eaa04d64badef1bf5fad8277 WHIRLPOOL 507c47c37ce30fc861849489d391ac64e56fc86cfd1ffaa3e197da0a4059537bf12bd239fe2f05ef98fe2c68991849162ecc042b1024e2a1b3196c2a9f0e1bd2
-MISC ChangeLog 8019 SHA256 36e8b670f86600fd21b32be80ce2c7dba16bfe2ac0ee3e857a2f7c8adc9ad911 SHA512 321d50ff4cd7175687d2318444a982157b4cef3e928cf949aeb2b7805b8813717e71634c51ea23111fa17b6cfaa46dc0e88e2c1d503a962131ff3e6b75ec30f7 WHIRLPOOL d5cc1214f2b15971b8074b77eb8fa5f1a4433010840d1b158b132cd2867a9005b21dba95bd393782444898a90cfa96d8548f6ce9bc17885c11c0c608b739127c
-MISC metadata.xml 231 SHA256 0482e658b6244ec7ee59eded17721992d37b1e576f544c5c2e9203965c8e960a SHA512 e045464564b71216836e362a472c6a4766f22b02413b4ac2c60e8c03838a0a229833ebff2b82b0ae9d78cb4069b8ce9950ff47a0c0360904f47e8d017f33658a WHIRLPOOL 774f9602bcc751a4d7f84659e51078528deac93f97aa52bbd4ef3eb510d1cccd9e761843f4054d0dde0b2d28954b7791b2da63fb4498d9fcd7ccc4d5ba2b7949
+MISC ChangeLog 8126 SHA256 ce28c8cf053d0a89909ee888c4b1b26639810eabc31b1b8880708452b2151a0b SHA512 b2f826e8785dfa8c479eb7255ed28973d3479fcc9c09c2793debd9cfbe6e76718a464c4d785a64822f1b15b3a6b03d9fe7820f506bf7df52588516cd941c138c WHIRLPOOL 8150c1a58b39a387ec2f910eaa3b3eeeace84b45820dddff24c4785ccb991ed3ff93274599dce6e3b299b8b756b555ecbc88abd300a9c39c328ab27f0b06b749
+MISC metadata.xml 288 SHA256 45513edadd5ce2993c87458edcd8354cc1ecc0fa4a56ac3ac7aff650cfa49bc8 SHA512 f18d9e2d651c5fa0b4776a691fc31e64390892e188980f4f40dd0bf0bcbbd7165b240530b5344bba10c15786466fdc5fbe1fae3d15c48d041caad4ee88f213d2 WHIRLPOOL 24fa15ceb575479fd61f601079bbd3dd5102c463bbfc0b5dc31a9e4d4f2f8cbc73055be57ace4209672a16a72012da10a3c885d891875bdad6e2cb56f9f9cc17
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.1
+Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVSgG6XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirpOUQAIIdU+zVdZdSZkCxvuJLik79
-dIOVHQN4hHdJusdRfOgENjYhqquPDdpVdJXP707vaUVLR3v+E8TZ3kr7n+pKMDT1
-qSzMlH428vzkdAoq7+/eAuMWeYaFE9gKsPgZxBiGPQK2p+2hry53EyVdQjZAC3W6
-Jge7J27yluFqYqrJHXNVXIP6729/cvMpqJm2+tj934bWsUFseAU/YiL4E7qpCD/7
-jcWOcic6CXhtOyuD37t3F4gP+rgMrS+i5zWwkQjV/FSQ55+qrJGgaIfLYvfvVDv+
-EhNDvLTPWaEg+J59yM7rpqJ627r3YVEsM86uuNaxx7E+UMD79qKPTOvVXgEL+QSn
-tEzIoVbG1DJPZ+sB2G1TZysC4Xl8yoHbfFh6ngN3O1aqi5hMgiTVx96XQ7mHjw/2
-AfjwPWxAVj7CSwQhaLpNFy/EKbg+5oJYQMAiYV8BJn8FuhvCbTQiF8OY6hRubiQp
-1wDucKDAkB96/kqdPbv6lcfO0ci/hhpoDYx9rVS5ZLpP2VW/F55LMr3SN6esj4jx
-3wvVcaaHDDgDEvo703ZDrcW5GIJOyp2hfuPykTBydETOSMBNqLVxahTJOBwrcwFJ
-bOkAPFeA9noL5D/6KcB0CmO2v/6vqyyjnzDnKcQlW0g+LeQKIBSZHDQ03WFcCokl
-tvS4bmaoZbFT0cxsahNy
-=GLzz
+iQJ8BAEBCgBmBQJVdJ0VXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiPpYQAIfJ6tBcpLwKW9rNXWLDOFqJ
+Ik73bPvym25Qm3hJKelPk/MSOI1nkUZWj7k00OODQLcjoLfBa926/7Srpc/ppiaJ
+pkV/vG3YisKqKrNDydQahy1sPpDpz9fnHHpqnN45m8BpbACD3/g/O29ZrQRk0t48
+PLHQ7AJ9xLegFlPxe8O6mNjjDV9ABzrsbmTLolqJE2o8OApaynWLDiLWnZ6ZrUx9
++Yk/WqZDsbeKaPgqKbNP0bq0fk351tu+s8AtriiW93GJhqCbvjqbEFwEDiXKceCi
+pW2+NeLJNImWjj0MCFV50/xDH0DcXTcrs3xMP2iOKaFDzk081OYacy4laewSHQCB
+NVBl07Q9RCON18tdsnQ6XhBjG+75R0Y//v43eMug1HyxbLlPgULG+xspqItoXoOK
+arVzGBc29HX4hE4e2h83VinOmJqlgOb4hqNJojDyA+Q59Vq7T5cJvvsdw6abN4rs
+vzf6dA0jmzKMtOt165jLVOgcuzir5/DvCu9172Rk6bjEwI1+W9oDE51HdkZHN1P1
+7MiF6lrW09JC1DgN8PVazaK7m91nMyNXXovs0b/IFzWELotul0cNYTwwM4Vny1ch
+DcZ5t6fUXc7mgFwgICT1Zmq3UYWpzpo20K9cASmNknbLSlYXKvD2u/gmlxqkZg4z
+aMKEoA+7CKbjHFVUmYWe
+=4c5a
 -----END PGP SIGNATURE-----
diff --git a/dev-python/six/metadata.xml b/dev-python/six/metadata.xml
index f3c6951bce50..ce1e3409b591 100644
--- a/dev-python/six/metadata.xml
+++ b/dev-python/six/metadata.xml
@@ -4,5 +4,6 @@
   <herd>python</herd>
   <upstream>
     <remote-id type="pypi">six</remote-id>
+    <remote-id type="bitbucket">gutworth/six</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/sphinxcontrib-cheeseshop/ChangeLog b/dev-python/sphinxcontrib-cheeseshop/ChangeLog
index ff34ae5aa9ba..daa6a688260d 100644
--- a/dev-python/sphinxcontrib-cheeseshop/ChangeLog
+++ b/dev-python/sphinxcontrib-cheeseshop/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/sphinxcontrib-cheeseshop
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinxcontrib-cheeseshop/ChangeLog,v 1.2 2015/06/03 21:54:18 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinxcontrib-cheeseshop/ChangeLog,v 1.3 2015/06/07 19:36:16 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add bitbucket to remote-id in metadata.xml
 
   03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add pypi to remote-id in metadata.xml
diff --git a/dev-python/sphinxcontrib-cheeseshop/Manifest b/dev-python/sphinxcontrib-cheeseshop/Manifest
index 5aab7d694b64..15ded6ea8683 100644
--- a/dev-python/sphinxcontrib-cheeseshop/Manifest
+++ b/dev-python/sphinxcontrib-cheeseshop/Manifest
@@ -3,24 +3,24 @@ Hash: SHA512
 
 DIST sphinxcontrib-cheeseshop-0.2.tar.gz 3568 SHA256 d1a3bc4c1842868f959f7e14fa7390e64fa717823144286e7d15a25c3624b1ec SHA512 5d6c88c0c43f37b94ebe6a2a62f795a6f7d5d6c407b808d6b21d54c1775fc4b5f22466c13e61adc16ac7973ba11e99a66da8650c869856f766e6bb3a6e99923b WHIRLPOOL 171762e8e197b54412a48db928395a62a8003eec614584df36d427afb44ee55cbfb8d75534dc38046cfef1a72c1f9eb2e37617afc755ea5b40187f48a493fbf2
 EBUILD sphinxcontrib-cheeseshop-0.2.ebuild 792 SHA256 f0ac81353d2bed3f3210ca2ebb8d0342e6c3886e80b3453e09d74182fb18f220 SHA512 5686f947a81cca2173e06b32cbd6aa57e2be6524d584f87a3fa1865c96b1017ce0594154d2d5f05d869d4dd142427c481faed3d3393e7c9f6a8c1a90b6e60e05 WHIRLPOOL c187eeb2c4d204679779e59116cc171e1812fc3b64c40169dc53ff20b7dd5e7bd73614d46dd86beb2de9e058030d352af9ebfcae9ccaa0094eec47ecac16cf98
-MISC ChangeLog 519 SHA256 71e211e226f669fca48c75120efb4661a2465c92faf00f73e03e93beaafffd59 SHA512 e25795f3190568119d6c13adcf2db1d9f012ef45161fd5816414e1f69f220ced00e1ecd8efcd698852db509435ca804d19cdabbdb15d28b41258a2b0f4d4c9d0 WHIRLPOOL ea6fdfc3be21abd7178dea3e728e5499ab44a99b2d4f0bcfcf1719d5e5a3021b66dd5662dcbbeb657a99c24aa87088611ed72407c448ab51c7e932dabccff145
-MISC metadata.xml 379 SHA256 56d6776fe3fbf18fef96dee78882222fe0e446261be4658c4a5f5998104e11db SHA512 65df368dc8134baedd98d3310c0b85e5020ead43e90415ac5812514a81dbf34d4b5a6f18c55d8bc8f3f6dbacd4fb2074a4e2889e24b3e2a736f8e74e6eadded3 WHIRLPOOL b67d337981847ab4f2c4a59dc295fdd029056d0ec98ba2e08e93358cc5e8124badcb866dd19ab214d1b6a644707ae5e5d4fdf63ebb24999b387271dfd387df2e
+MISC ChangeLog 626 SHA256 09a20677cd669307147c62c624a24543d3e5093d5525f87131a886bf0039930c SHA512 7cdb659dc84d34743164d596e98cf4f07b68a8cfdead2ec57e30274d87bb086e6e111ecf5a5a9bf1347d43ab79c379ad7857e1d1ae264ab26c9ce81fe14ca046 WHIRLPOOL f314eb812e812f43f745e7fc63813bbf39978de447fa2f1c995e3c7d16cf67590144931d4e051d8aff54bb98fc5df1943bdd317ce4ed1fc6658391a4e18f5747
+MISC metadata.xml 436 SHA256 839c15c06b9deed51fc4d6059de22d5f249b115f34f47f03d83a0738b11e6bf3 SHA512 7ce6aa24d6073beffaf12a3c136165424e853b3d4c7556a1a8314ed962d794e4c53e3700ab69f368b37720fc178c71486bbc09736094a4f27ea3c74bd30dcb4d WHIRLPOOL 32f9ab514a90c27fed98144cb50f90475bfd519d828f9769b20e361fdfff3773e28c6517b649741bcedc49365e417b78234725470f9e8f2c1fd4fe2dc4b7b63d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVb3eLXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVdJ0xXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiEuEQALayxMjgbF5gvOe5hxp7cs0Z
-xak8oBx/K1VpONzamvGMWlJmKA6dPPGIIxBjoC75XX4RwHcEd1wCk6CX5w+EOjRw
-hc/x9TkQlLVHoPbwjuLa4B3+bw0D/vTpebViQpt58zu6WhnKADCf0OxEeshw1I0v
-J3ihy2VI4aMC57szYQ34bgnkJ4fzymDeX4cHuqQjMoOKyJNI77kKkk/lHyj2ZI18
-pO3J8xCeX5Ep3b4nlOmKTOJB5OjVgx3R4rnFM3ufTN5c6GPKwL6iINyzRO1nYnQF
-7ksWpm9AcsMhkCFVQSFRFVA4JXzzU697f0UiymDLajMWJ7iyY3GgBmBiTMve4v7a
-u0IB5PngUTqUKENOCGydoq3cXYqju74fGN2Q3f/pQfXiq3LDVXFu9C6OKToD6HlR
-x+JcqMXsJDjSftAEYSXHUZs1CJPgN182es9MvbrB79JCHlCPoY6aJ91P8j+haqGT
-1dBXu/X772V4ml3H8VVbZUAqnGhEnCeDlJrsKmg5GOla45X4a9BIlWryZUD2uXWS
-YGvQOnI5D8p9d0cKWbCdwShulmiBN0eiwJUwXGQP78vJW4JIgc20rQhNS4ctErxJ
-qDQOC+OfgUOU+JB8uBaz6gSrPoA/z8/32+W5tfUL/pMk+ZdkivWzd62fRlwgArvB
-Omt6l2A5t4eiFqcBGPMP
-=2lYs
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiirYP/joqnMc0WqqcEVFL5PAMDcHC
+SlqgWvavE5LuRxlL+Qiw9dyw7J/Z51znu35o7u2F47MpBqpq6H6gr2/XPZCkOH3O
+9WmnYP+U9XmnPC8tn6jsdl7CZGZIIo88BFzPiYuEe8G3zqh1xqd0NvbS7P+vM36I
+gXVN3g0V2ayfD+tFrtpYjqUfZo5qIDCZ28TzL/8uRyd81W5O63D0/wX5NtLR6jR3
+Uy8CEeMgAVFXYTmlvgnI5fEp/aqSL6KFSqrihh3smjAvaxmAQPwrg8U+czZMms55
+/qP6fatAtgXRDtc+fISUkL/xpdPs6Eiv9KjoktcARHAac5pBj7Bn/wLz+iTuJon3
++5yIjxuhH7i4CFkI2rcWDKvLMWCgxg5A2Vgf73+PZzJkkbgGvq3TCtfAyLO07k6t
+Xz1QH43NwHLvthqAyHgHe8x+y8yaq/zWaJztUaOqtX+EU3Z7G2CaYQ8VPQrNhhZX
+CBQ/Lv7aTgPZGgqQsY5a4Vt48+vk+k2pUzOJER51VCRJeAlgeWLcAXDRu7mQoGRb
+FQl++cNDWL13tytsv6xcD5zEvGifmqUgsYwzDrVu31GiW9RDR2yDarsX7Isf3W3C
+gKlAUxxuVNl3PhP/Dec4oPtQ5BbFQEMT203nvIHhGnuTx6wfHjgNtdPjHH0fmP77
+1kwPangFAXVnzZvwD+Q3
+=+K03
 -----END PGP SIGNATURE-----
diff --git a/dev-python/sphinxcontrib-cheeseshop/metadata.xml b/dev-python/sphinxcontrib-cheeseshop/metadata.xml
index 30615777d121..0f5079b0d605 100644
--- a/dev-python/sphinxcontrib-cheeseshop/metadata.xml
+++ b/dev-python/sphinxcontrib-cheeseshop/metadata.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>alunduil@gentoo.org</email>
-    <name>Alex Brandt</name>
-  </maintainer>
-  <longdescription lang="en">
+	<maintainer>
+		<email>alunduil@gentoo.org</email>
+		<name>Alex Brandt</name>
+	</maintainer>
+	<longdescription lang="en">
 	</longdescription>
-  <upstream>
-    <remote-id type="pypi">sphinxcontrib-cheeseshop</remote-id>
-  </upstream>
+	<upstream>
+		<remote-id type="pypi">sphinxcontrib-cheeseshop</remote-id>
+		<remote-id type="bitbucket">birkenfeld/sphinx-contrib</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/sphinxcontrib-doxylink/ChangeLog b/dev-python/sphinxcontrib-doxylink/ChangeLog
index 17bd40dbef24..669fb25680d6 100644
--- a/dev-python/sphinxcontrib-doxylink/ChangeLog
+++ b/dev-python/sphinxcontrib-doxylink/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/sphinxcontrib-doxylink
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinxcontrib-doxylink/ChangeLog,v 1.3 2015/06/03 21:54:40 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinxcontrib-doxylink/ChangeLog,v 1.4 2015/06/07 19:36:37 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add bitbucket to remote-id in metadata.xml
 
   03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add pypi to remote-id in metadata.xml
diff --git a/dev-python/sphinxcontrib-doxylink/Manifest b/dev-python/sphinxcontrib-doxylink/Manifest
index a393b6c3991c..4d1798ff0562 100644
--- a/dev-python/sphinxcontrib-doxylink/Manifest
+++ b/dev-python/sphinxcontrib-doxylink/Manifest
@@ -3,24 +3,24 @@ Hash: SHA512
 
 DIST sphinxcontrib-doxylink-1.3.tar.gz 12401 SHA256 95dd12637b2d28aae50f2abbf57dcb339be01f7b829dc435432d314a8f37a9c4 SHA512 5a53061cddda22b682b4b640725d4cd763b54d9dfa3599b666dd55d72660f07fc89318abeab07d114d01313b215e69e421a3b5251125d28c3dd326426830f9ee WHIRLPOOL 6db488051e0b2758182a1be6f21601500f473974a1d780e986a7347dceac8f441744c29ded49312021947bd623421237d36f395aac285ff0acba01b78e715f68
 EBUILD sphinxcontrib-doxylink-1.3.ebuild 888 SHA256 fb08a18ada29e8d114cdae140a9ac170631e7806ce37b32a3feebcc27275a877 SHA512 f11a1afa2d07799fa10d7d2a460beb25b5672eda3c3b01f08876d0f3d2937f6e9b1acfa716b066267ff915104556091230a0a5e12c7f37eba01d4b2ebd1e9cc2 WHIRLPOOL d63dbcc4a632a08952a5bbef390a11a9b2ccf0c13976e1b0da8ee2b0e0024c482851bfb28fabd5bdbaa942b1fdd9b49be648e6bbc6655489e4fb19927b606e0a
-MISC ChangeLog 623 SHA256 7f66c8bed40b38b6b056ecc8910657eec43e0dc9d1733f52d1a8db6ad2a047b3 SHA512 24da31e5fd138a6756a61746f72105cf6d3039c15fe0a3984b199530acebaace65340cfe927d9537fb0cce81696eae6fb720bfa0dcfa6756698f1422b2238806 WHIRLPOOL df8a6581742e2ffba96814f95f0a814c0c86aac84f2a199eafbde389adadace96155b354f25b72bcfba87b67dc291902df76e0ac134588f0d65deed77f268c8c
-MISC metadata.xml 430 SHA256 aafb87c6c43af0c412cb3886cbf2443fc906e07c84bffcdf1d0ac30d90c940ad SHA512 edc5cf175d46bdd95de7503b8fa573cf71822215cfb41da9514cc3b91a89e354d24863e4e4f1b761df06f483711d4fed34e248afe160636f3d51a020ff384e3a WHIRLPOOL 895e4e11412d7de964517823f6ad9a9d543fe787a1ac29df17d0d2ba0b752327e3b7c63540dbf2c1458fc3d550c2925a09710dd14e8e3f2b63bd223410abd850
+MISC ChangeLog 730 SHA256 72944eb6e2988c9f103ee2addbaf6944c56b9dfa04211be471d8177841977dce SHA512 926149ee17449b160d3e44aca60035b90227433547d14f6243c40dba61906fabca92df3f49a0f1b959f8eece95f63ecc6d36ff18dc7b98f2e6c9d688dced5586 WHIRLPOOL fec4fac227315a07d81f2e02aa3ce536810a0e59f384b35f8be57dcc35db093c2d167c861a11ac51a23ac1659ec050de78e29302b05aea483a828fb419426962
+MISC metadata.xml 500 SHA256 f308ef8acbcf9e2de943bc56d62edb30f0758cef60379661d6853891ef145bda SHA512 d9d8fc69450f39ba2f52c59ddc9875347a12409ecf6f62ed8881a18be9ceacc75eec55cbe4d14f40369e349484ddb612113bfffbb6bcee4305666b94af799a5a WHIRLPOOL 00fb3b371cde241a3b2b10148ac51ea7447901f874a1c21a9d8742c91575d53dd872ce9b160c55ae7e53f53e2c05a7caca094993d13959f024a8d4a1a5f47721
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVb3ehXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVdJ1GXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiXdwP/3sGDREu0exxjzIq9hqqb1SZ
-SsBhCGSmRgMyinEuTsVmcbxjGhoDFPX6xEFiW75R1qKyuCAeddYTzBLz2fvZ5x49
-u/pCJqyJlCVvWjUhGdoEhBU6fE/gCWl1UyDijz+ZDXRHCzWgLoiqTG2hbr6I6l65
-7Uw+AQ7mbicTQKev5tBVut8Xiy2+VpWdPYnJsHvkAQyNmxEJP8FxHN0epilVZz5a
-qH+v7wGZ0aicxY4/8B2Uj4qGRpyzK+0s/azj5o+lk1Lszkykjc/HkmZ7vsOTuO0X
-fvviTngHmpJLj1nyXCY627Rm35jvlHdFvSqH7Lj5ptjfChdQomqRf97Pb1a9F6+2
-warlbNfEm17i6Nf3wSlxnCOPZDSiGav50DsKNcrUMGhfNdLJGfzqCluL/eyyKZWk
-Pq6k88rwJoNbtcqNqkYVaJoERqvciTyj0x1ECJM0ogzwEOyKDnnRplrUfMuADqKt
-0bLaA8gobFMaqBXEvKUmyuAGpAVEGGnVWEAe0dDbZn3aJtlfMiu1mrSzLARjkbjw
-GDWLT8c4SQ9xUnkQQDTaf7334fYO7N/81RHchhKjdKY9MkxYtm7avXzQ0pZP/OG5
-BPGmkTu/1v70f+ABLlE6TA0Pzqo1ILYNqUgMSjcaoDKObWY68Hcxbo9bhl/KoJLs
-Udb+gQnF7ZZVPm3vCUAw
-=YVIS
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmivToQAJJpW1EHZk/uI5lijeoXJjQn
+n+zMq87j/cnzlScw2J6jMBNNmgI4BWZrF7clqZCTUVjY3kjjNbP4g9Wg08dgxefR
+lzv9yGIIoZO9CNY188Bjc7xP+MTpcGD6CicNFwxWFWefAK/DO4vtn1WivsXPNfIZ
+nCVqUIHQcswr+KDiPJvWmexVqQ0/CB/BezkKB3gNbj7jJdLXbi43oLjFbuJW2dk8
+irYcafp5JCGUunpq8+SN7ZSdLNRK2mQWhCVPrY7zBhIbrO6DxR7R+2yX+cv2oojC
+/X79upVmGb7NBTylOnEexdEvVS/whS8TjqmJGax5Rsahvmm009AIUCPfAY2d0lu5
+zF20JosBkIh1I8KAxlzmAr+kyFI3sSZeBQX0gEyosZCdYIdFYasQTpyx+k/AEywb
+G2xbNPoN9zrTnNhE2S0ckMZkwIO87kBZ2gWMn12yPuw9qetKNwWW+xnfhcQ0MSDl
+HubPlwTlDzUF/MRxN39cwQqSLwOWi9IvGt5E5mrr4L4jsMKvlDwUHlrV2lW5xvwG
+vymizUtizxZRbxRg6pXtC/wtoaMEEVrq27sCmyk8qfXqhe+7AF06YJ6oY4cGcCW2
+bcTdApX0XuRFRvcnScnp+m/R4lYgvk4bv3OGauCua3b3gNPs5+PPJ+s1JbiQFYUO
+qDcP194G15dnP3w8LJuK
+=OZ68
 -----END PGP SIGNATURE-----
diff --git a/dev-python/sphinxcontrib-doxylink/metadata.xml b/dev-python/sphinxcontrib-doxylink/metadata.xml
index d4c23ea548ba..229aef6d540e 100644
--- a/dev-python/sphinxcontrib-doxylink/metadata.xml
+++ b/dev-python/sphinxcontrib-doxylink/metadata.xml
@@ -9,5 +9,6 @@
   </maintainer>
   <upstream>
     <remote-id type="pypi">sphinxcontrib-doxylink</remote-id>
+    <remote-id type="bitbucket">birkenfeld/sphinx-contrib</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/sphinxcontrib-googleanalytics/ChangeLog b/dev-python/sphinxcontrib-googleanalytics/ChangeLog
index 9574dd92edc3..155a5174133f 100644
--- a/dev-python/sphinxcontrib-googleanalytics/ChangeLog
+++ b/dev-python/sphinxcontrib-googleanalytics/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/sphinxcontrib-googleanalytics
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinxcontrib-googleanalytics/ChangeLog,v 1.7 2015/03/08 23:59:30 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinxcontrib-googleanalytics/ChangeLog,v 1.8 2015/06/07 19:37:00 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add bitbucket to remote-id in metadata.xml
 
   08 Mar 2015; Pacho Ramos <pacho@gentoo.org>
   sphinxcontrib-googleanalytics-0.1-r1.ebuild:
diff --git a/dev-python/sphinxcontrib-googleanalytics/Manifest b/dev-python/sphinxcontrib-googleanalytics/Manifest
index 8f006e00f363..ca6969d604e7 100644
--- a/dev-python/sphinxcontrib-googleanalytics/Manifest
+++ b/dev-python/sphinxcontrib-googleanalytics/Manifest
@@ -1,15 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX setup.py.utf-8.patch 409 SHA256 8d6b86bb22521cdeea772fea086f868dd9d3051580a9f1b987628af9890a9447 SHA512 eaaef102cd6f25096e895a37bee9711c951f1e633b1850ba16d76a803c227cdeca7a2c640d2ab9b639e21e93ee2701423e000ee283d4caf686ebccf642ae21d6 WHIRLPOOL 0448a36ba1445c64e0d158751e0b07ace5cf8a0a616fae42ef4ef32a37bc69ac8a31a0cb937bca76205baf949e66b348f45058d18b664ea25056017dcb9b0c8e
 DIST sphinxcontrib-googleanalytics-0.1.tar.gz 2892 SHA256 92b7d74a45defb01e7d29e86fd8206eba42c896b2272cbd1b4b4f6a7d178d5a8 SHA512 fdec9108f9c1d86c6c59cd2bcfa55d82cd5cd48aca5b7aecec7734f3cd29b0f6c080aad7b7009148e3d95b7cf80af38ffb6ba230879495f3c1488ddb661fbf48 WHIRLPOOL 32115511eb21cdb7a202b9b63a4568f31f64a9d98d4dfd25cd6d15628cbd7873d8666f9969d25a3db569f25389d43028214d7d805ec07961c9d96f9991f9c10f
 EBUILD sphinxcontrib-googleanalytics-0.1-r1.ebuild 686 SHA256 e6317dc9d446368170506a220c2d0ae875a12773f66d76ad014d13e044f05fb7 SHA512 49f621166c0d349c53ec2198ac1d2d688d8da919c14ba011667162f5e1000319a2b1b2dbd3091b31bce2c7ec48277568a4602cc21ddb63617f9bee70af01a0f0 WHIRLPOOL 2a6162fad993de014733cc762aab5a46ce3be5cddc943ee68511067b0566a8bfeee6a1e7f909fcf8f977878cfa058b639646501e08924d8a3dea3808ab47a1cb
-MISC ChangeLog 1335 SHA256 345e8aedb7685e8b9e07cb5d9f7d90a9257b3e8d35959c440aa5d233febf2741 SHA512 c829e87a066c7b9132fc5d767531ff395b78996de8470cea9415ae77296957fac60ffcc6f8e72a4fc68097fce50c837f49447faea1c2e0119760a1c86ff802fb WHIRLPOOL d6cc7b8085eb77ee82a7c394161a2aee157f27ae5b49a6f57f0e35b79731ee9d02d0dbe96a937579991eef9ef73369bb344095a7dceee61dbd17cae17c8a6a1b
-MISC metadata.xml 252 SHA256 59ceb59eebae2135ea502c6c714f92b3dc1db83fed773065097bf8a24f926afe SHA512 940f6dc72efdbbf244dc564539fd0e09f4df2550bc44c1c0868e3588da9c028e54ff1c97fa53109882ed4177dd6a4f4fdcf424ef072b0f92d279fb01ab305fa8 WHIRLPOOL a6e7a7d211b5fac86a1069fc1e7eb5f138217b022d4d3deddba2280df81f0ebcfe31b5f22b905e22684f22df8306ff3afd30353bc4f10b0d073691e0ed75e789
+MISC ChangeLog 1441 SHA256 0d365b6f3259e42d3ce5034ecf197027382f06c87b9cff6630fcca51f423da44 SHA512 b6f1c58e7dd77981d74fae3e7554bebd255e6d4d9aa379523e53bdc910de9ebc994d62cea7680e04a3292893baad5877020d241aebb00bade9d79b73c01e8e33 WHIRLPOOL 3c02dfd9e02ce99951a7b39429f0ec0f708bf2766dcb2a286c8126eafb4ee640d4067ab143e9850191697bd0fcc6a2ff33f1088fc364108974843b1abc81787e
+MISC metadata.xml 327 SHA256 350addb3a77ed21181f5f9c748c9339f851aff3d57173132ef007dd5e94382ac SHA512 ec81ecc960db6eea754c224e80450bfde11dee4ae7d1fc59a20f5efa80e01aeb00f7dd5f980a84b27d04a6f87ac9f05cad4635e20de91b55780c9d1280eb01cf WHIRLPOOL 1d4d00958100ad59847b1fa58bc10c20a08e2e25bb903057757a4290debfdbfefe860c7986fd2f21952449052142ea7588149333064ce19398027d59b0d6b985
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlT84l8ACgkQCaWpQKGI+9RJFQCfQzGPkmwK8rBvFGDs0z+iSYP+
-kkwAmgOPFV/FxDnbOd+3TWMeBARSAN+4
-=aisb
+iQJ8BAEBCgBmBQJVdJ1dXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi8ywP/iFWJ31/xqWv/uwqx360Oi/9
+lhKWD7lkKMQYRcoejfyVuCJ0PGFOn0OaMa9Tx/ZnXmP40nH6GlsfPMJ7DEIQ9AEb
+2WrwcrpSq49Kf+cTCWlIhR8NgugYFVawzq2Q7YVdpUVTAPU2qqCYcFSN7oWwmCno
+pHtNnyatCtWy39KvD4LMt4MPTU6wazYRN/S1uaHupCbVrwWZuKXXfm9lMjM9Z6H2
+Jn51D1d8tUOPtpe2cvEmgCcF3M6IO+7LbGdgWg9WbhTfzHdsVeGVLDcVF/KKKZFW
+B5snAH2LaM98txtaAUoYM045KCJ/drLG3z5Aa6jPqYavVG4tdU063jpBxNIHzwCY
+h0PMAlT7ZsQTi5BZAQNJ+B6VF31GAxh6EBFS9gMimi+9kcbTCjNMRzsCZD47c/7k
+n2AjP8rVVrpaR3ruf4QPht42EcShLTRh7eF+Z8ZPNB/hc5jvl/+G7OCoFgJ6z8lw
+JNhMjtuv40kl5y6v0c9GBix4FV5T9u7DbzV82Kx02Za5uu2CMPRHgJk6RlZ4hEkp
+2jKKuUlTMiE0uMnMvWhH4dT8YI82v2M3b4a7MNyoCSSGGLnCAatzzJe4CeZrE4kG
+LfRlRdO5ysUP/QRl0OArdV+CscM0RNc7hlnwt4ZEBHBh97OzHvMZ19qDlyMOWOHl
+MPEJdIn+zb3BrNUTEvAE
+=AH42
 -----END PGP SIGNATURE-----
diff --git a/dev-python/sphinxcontrib-googleanalytics/metadata.xml b/dev-python/sphinxcontrib-googleanalytics/metadata.xml
index 9e14e17f3ff7..f312ebabd5e6 100644
--- a/dev-python/sphinxcontrib-googleanalytics/metadata.xml
+++ b/dev-python/sphinxcontrib-googleanalytics/metadata.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
-	<upstream>
-		<remote-id type="pypi">sphinxcontrib-googleanalytics</remote-id>
-	</upstream>
+  <herd>python</herd>
+  <upstream>
+    <remote-id type="pypi">sphinxcontrib-googleanalytics</remote-id>
+    <remote-id type="bitbucket">birkenfeld/sphinx-contrib</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/sphinxcontrib-httpdomain/ChangeLog b/dev-python/sphinxcontrib-httpdomain/ChangeLog
index 29fd4c97af58..d8879aff9091 100644
--- a/dev-python/sphinxcontrib-httpdomain/ChangeLog
+++ b/dev-python/sphinxcontrib-httpdomain/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/sphinxcontrib-httpdomain
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinxcontrib-httpdomain/ChangeLog,v 1.11 2015/04/08 08:04:55 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinxcontrib-httpdomain/ChangeLog,v 1.12 2015/06/07 19:37:24 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add bitbucket to remote-id in metadata.xml
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org>
   sphinxcontrib-httpdomain-1.1.8.ebuild, sphinxcontrib-httpdomain-1.1.9.ebuild,
diff --git a/dev-python/sphinxcontrib-httpdomain/Manifest b/dev-python/sphinxcontrib-httpdomain/Manifest
index 6db035711cbb..a5f53b5873a6 100644
--- a/dev-python/sphinxcontrib-httpdomain/Manifest
+++ b/dev-python/sphinxcontrib-httpdomain/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST sphinxcontrib-httpdomain-1.1.8.tar.gz 8844 SHA256 29ff90b9e51a8e0cee4372c8f39d85edd0a88747dd0ae5e7734a66f63e256279 SHA512 fa6abe4c6b42844dd0b066c591e8780e01ed006304b31af0ffe6bc89a08c31cca71510d3013b45014409784fce6b0f869d117a34759856b54356d5a4ca7398d1 WHIRLPOOL 95a17f70df2bc51c07432e1966135464b530ca1f9e532bdbf4a07e05fe67eb9a1150d1a13ed4c6e2e2faaefa91fd4915adf701811ad83766cc0b80a6a5b0002f
 DIST sphinxcontrib-httpdomain-1.1.9.tar.gz 9589 SHA256 560eec7b60872cb570dd6a4f29f8d717a2217dfec775919651e8adf0e55a585a SHA512 015ff76b7f6f6639e6b9e228209b8dc06ce435049d08cf513d40914015c17ca21df905f7d505951508e7255ce273c95700e3ae415f54afdebc8ef03fd3707283 WHIRLPOOL 49049c807163ff1496dd777ba4dd439d49dd6ffbdeb1a4fd45d70d8a6167928b342429d03e7b023f192e2580e79b05b9b3de1ad3f58c82fe6f870315415238d6
@@ -11,24 +11,24 @@ EBUILD sphinxcontrib-httpdomain-1.1.9.ebuild 741 SHA256 5fb6b23476569870c14467e0
 EBUILD sphinxcontrib-httpdomain-1.2.0.ebuild 741 SHA256 a0657daeadb293eab3f4b419e887b7f05d41f37a764c00998d765339975c4344 SHA512 e1527f8ddc3e5bfe079089cd95010fbb1cca5a93cdc8788931c4364acfe10c5dd827828fddcc4d9316066ce81b09e9d4fd6b6707170b11aa2d334bb549f6b2b6 WHIRLPOOL f3bfdb392bca92d9c92ea1de4383e2b0beee0dce0bcfaed54ca05843aeca8605510c4dd547e7171070499a2b7e60d54d66a50e41f9053c7bf5ee99f624be32b3
 EBUILD sphinxcontrib-httpdomain-1.2.1.ebuild 779 SHA256 5e33b4d021d1ddeedf3ff897c50798ff644540d88614f0f252c322c175e2c616 SHA512 045f9b56bae52334e070e0deca63bc9a64c9b6ac70f3d8b4387650f88efd7514363e24e7c81ed93c0b16659fd8a9ea0c2973c325d9b9ab29466f1e5e0d5892d9 WHIRLPOOL b7ef600246f2a2e1781d96f93021d55616e9a0a7d798182ab76b236a92ef6672cb5b0c5f28c043f7638e12c9818612092ed3ea08d2bd5e6b20c398f3f548c26d
 EBUILD sphinxcontrib-httpdomain-1.3.0.ebuild 773 SHA256 2f92ce437b29cdb5fbbed538e62d0088d9d68899cca9c21905a2b1cd38bd4a83 SHA512 762144bfbde9264eba2bd9437709174a84bda54822a1485fb1c5d1c69d39155d0f837e32c68ff96cb684cc09b6f20c2561574491dcf200babb77c89b1ce3ba45 WHIRLPOOL caa9df40addb104596271c53c47a9f226788e096f53a1fd6e7cc9279a116f6eb02c15b02ea01130f7c5c3b531a04b6268d52a091e7ff99dce3fc81462d35a462
-MISC ChangeLog 1960 SHA256 aea46e9b65ed060ebdf39f7a5b10945ab49c04e3d6da7f3c9b3047eb730e6adb SHA512 aa55c10f1604ead51dbfef686132fef656073198d9b100bc9979bee9c99b224d8fd6d969a0aef852b81fa7de47b84913c3ef796822e310673a195ea2ab9f42cf WHIRLPOOL 9185ecd62eb7783b579ab271b05c75601fbbdafaf93fda0064e2eb73f96bab3066fbeb50991677bc3f1440a3b460d7225aafc5298f165695586fab2a923e9b74
-MISC metadata.xml 247 SHA256 958fde8687206d247a52ed3cd1b04620d33af0325474c4e3bc45697b803abe65 SHA512 be8aad9403871cb506f5e3eb8aab9f336651d98781fa754b934bd2e40a375b21e10027ea25b3739f9187e241e7f37aa6ae4e80f1b477bd2cccce7bf9f11c8c68 WHIRLPOOL aa747b9ba304bfac48e2dfa9de1a46a9dd4e676835548045e5beda00a506afea4df737221437aae39bb410f433308d7dd07d98adbf5fc661f48dba542c51d7dd
+MISC ChangeLog 2065 SHA256 c620d41004b3d5da62911c24cb458255ef8f62a1885fc71d4d4654b4cf32f5db SHA512 78f020c965d33736e875a2578dc1d4d7927489605e5ec74f22f669eb2a3fdf3df37ec0a508246cd7cea0a2c9946f4271414b419ad32a17e9e158438f05bc4ffe WHIRLPOOL 5f762afb7f04536d8099662bb48d9e35acff09a7417778dfd17f2c58199dbc5d10e0bd718386ee2cf954a3d7fb0669b31d388d35413651d3dc7ae44ed9620517
+MISC metadata.xml 322 SHA256 07d4e4b1b622ca137fd1906c527a45a8c27894f68684f7d3787efd8e8ae9861d SHA512 a33d51e0459149a21b19190fb1b58b9b391c2b12e9e5f475d0d36e68bf13c97f38bb66cc05803815be7873ca3532513251608af29d6d053795d0347abefd9f09 WHIRLPOOL aaf42fc11a168934c3006a35f33b4bd14bc7a6fddd4768c3a49ca8f08315883964b264eb904212f651004baba92e2e4b8ec627ced643d067d202c2c384a97a39
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVJOKVXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOIdEQALGAwbRZ4Os7d+FgTVEjwVNp
-w2K/SDTm4h/eDSW2WIVuwQIVa5C5+xX01M3w+P8ubaLaURm5kguN780+PwjyGZHj
-8m8ipDdYNe777zNdS3EkQD3wfSukAMygyTQfaXxY2QPI7eAVDtRIYXw4FTqHTu7k
-ZXUq8mc+4zIQmi3GZPr/n6gRIw3GS6PpUecHZgf1HdtCPJXIqA7rf5p11pzxXPVq
-D29yw9xtuER5ptPe60EN5shW5dmQLRRnN5yCb/p+QdcB1PFKhiVq8UJ3tvPrFQXf
-mpy09LmCC9Ku05Kn1g7HvsNdvMDHxeKC85+m7o0wPV6FAK0X/tORlcEKykWJl59Y
-GK1fd6PxX234fI2eWWZugDjzr0zfY/OyHnhfDQY7bz6FHkaXholy87cNSjXqpish
-GIs4v1aIYBC8T7P1vYTR0RwyFvWgL3AIOfrTuTbFIRE1iQ/t8m5G6gppIl+IaD/j
-40HGrD0IgMbB5itMHnIHTnI7meULi6omt4LA3mraCHsOxuIYwKTTCgvlE+MIXhqC
-NrXAsaOVTXy8qiTXNLwzqf4MxDgtRVoZ/YKtdgIxWVNAt7TgvSmVgrLSegdIy7B/
-2eTZf7OvAX2/qlgu+rc4Fxzj4OkN/izR2Wo0C64remQqgOvKVqRt4hniBSHEWDzS
-e5ogAs3r9lEDS1j9hUHA
-=M9fj
+iQJ8BAEBCgBmBQJVdJ11XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi9MMQAKGbVh+ucp+It29bEGxSRtyA
+UJlPSfBOScugvMp525jIXDxTA1lIDPNtmAFNxMFpgpf5yTVdDncZlRGEQnjLiPpb
+0dCf9CsXCuUJtA9USrnuzye7nNKTTFa9iPRJ8QWiqDIh8Yws+yesXwb9FY4eZ1yK
+g+jGLa/8kAN5RF0HbqWgbN8A6oBJKhU94N3QKDrO36Gdgv9d/6jp3dPNlsJG72e0
+tsIzoomot3U6eGvIAnWrY3HX2xEYqYqQUQe2BFEH1J7jx4W6BiVbrLTCHgM6rV6j
+rgjd3VFzsYX5zUwvNQBkQYR03Lh3zSBFl6c69jICsr9VwL6R4q4fQiUhOspModt2
+E8Je9lrphVbSqSImw3adn8rPrUF/zrhZ6GWpDhaUcD9uTvr+arfb08BCGcm/VUhI
+imU+iucpeFktCY8ojcjCmHKgAggvcXwV5+Dv5VV31Q0opE1tUMBmqpvV3dL2qetx
+xTXRmohjiS+dxZsCsbKBJzT87dk0SgWl+WfglbeMkyjYXLCjwXHWX+bbbVi8ugpu
++895PqFwlsf4Lp+CsIYIquv4ezXpv7a0hzrtZyM/iS0sYMBaVm+XjdWOW3Xi4Mer
+5f3OtG31HzbAI0jNY2wPvrLBPn48mmMZLtm/BDUHvpmVEYvthvpHG8RUh2HPDgdv
+MRzLXUxYiHOi1RKRo6oM
+=a/1E
 -----END PGP SIGNATURE-----
diff --git a/dev-python/sphinxcontrib-httpdomain/metadata.xml b/dev-python/sphinxcontrib-httpdomain/metadata.xml
index 2078865f3a4a..3759492bd555 100644
--- a/dev-python/sphinxcontrib-httpdomain/metadata.xml
+++ b/dev-python/sphinxcontrib-httpdomain/metadata.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
-	<upstream>
-		<remote-id type="pypi">sphinxcontrib-httpdomain</remote-id>
-	</upstream>
+  <herd>python</herd>
+  <upstream>
+    <remote-id type="pypi">sphinxcontrib-httpdomain</remote-id>
+    <remote-id type="bitbucket">birkenfeld/sphinx-contrib</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/sphinxcontrib-plantuml/ChangeLog b/dev-python/sphinxcontrib-plantuml/ChangeLog
index 6fc72187b9cd..c5791b04bbee 100644
--- a/dev-python/sphinxcontrib-plantuml/ChangeLog
+++ b/dev-python/sphinxcontrib-plantuml/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/sphinxcontrib-plantuml
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinxcontrib-plantuml/ChangeLog,v 1.3 2015/06/03 21:55:04 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinxcontrib-plantuml/ChangeLog,v 1.4 2015/06/07 19:37:44 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add bitbucket to remote-id in metadata.xml
 
   03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add pypi to remote-id in metadata.xml
diff --git a/dev-python/sphinxcontrib-plantuml/Manifest b/dev-python/sphinxcontrib-plantuml/Manifest
index e9a701d7f63a..2c695ab72cba 100644
--- a/dev-python/sphinxcontrib-plantuml/Manifest
+++ b/dev-python/sphinxcontrib-plantuml/Manifest
@@ -3,24 +3,24 @@ Hash: SHA512
 
 DIST sphinxcontrib-plantuml-0.4.tar.gz 4944 SHA256 2305cb631f6bea2bdae7c69d841b92c451115433c6b3b8fb1bee5fec323dd857 SHA512 a00760146ab56a96035d511fdf01d5dfbca5ef077b40ac00087267a702d7367d706f9956774af6acd7154d3b425452169d02f98170a765280e4d0b77e14b7438 WHIRLPOOL 7a4e4332b7f488c6e050c84670d1d06afc7b6375aa0b00231134c1fb24b63d8be73216b400c1c1417a1a3302421e045b9495f6906942fb6ebf0321f6c2b8aa1e
 EBUILD sphinxcontrib-plantuml-0.4.ebuild 706 SHA256 da6322bb2692c60972b28eb90d5e31b9c90db65d91781bf449a1be436ec13358 SHA512 df22e287e369660df3f7d43b1b147449cd37c5fb088e225d7371900ba74bcd402f02d04d0e47869d6d7f23ed5d3698ffac14ca369dcd37fd8cf582b7f8365c1b WHIRLPOOL 3cd451cb5102974c0dc308e5c8b311d2838183bbfd68029e54eb10fbb1f531a58c4afa36d649fd28a1ef422b8dded763f2c58069de31d9b4775e9b61946eb75a
-MISC ChangeLog 640 SHA256 ca77f2368762c186bac5876ab189b5bec2c9a52f57be7044673c583cda0c4f07 SHA512 4a8060bff47130e3db3b8511683763b7204619cc70a80f63de9178f4beb131b6590a999cac56ce0cf12d5d091a51a6018eba2e078a4f1bd208c3528074b551a5 WHIRLPOOL 42da8642a04086ab12647a23a5d79f1189ab9a03ebdd555f2698c991707950a0c6bfd9b73c873572ff8d834f482559335e03a2c96785a0d292b6128bafaa729b
-MISC metadata.xml 445 SHA256 6e7b66a11502b6d688d21ae32d7178b360ed22b730e0826a56ca621d8637eb21 SHA512 dffbd279ec66961a07b2e8e05a046fb6b367a23e1d44c710abc7c5e2f99978ba80855cd7c699ffda9db4fbf597e0d84964bd2ac20d534afcd04d62673e540dd0 WHIRLPOOL c171f6063136430a3e687bfd7356aa087be8b0971f549bb69e4d6bfa6e2d721d2e324b4c1477573bbaefa654735f3ce21c27362b0314b69868dfcc7eb539262b
+MISC ChangeLog 747 SHA256 1e4b03f74799519b8ccbe5a7a4c64e30d9ed34670f9ee0346734dfd29bf4c30a SHA512 ea9a3cdf4d479708077fb9ef894fff43a1afadaf4e0af3e32cca3659ed6a57d3198fcd0eac2ec2a504f1c16831ef1771758b1b180d6d484c2815b162db67da9a WHIRLPOOL 04e7d508056655fb425dc6965e767b7719c314fe12d524913862a783b6f67f6e167c433bc01cbf550956a92bccb9046c4f2bd00eea405ea776df0667d2c5e5b6
+MISC metadata.xml 502 SHA256 d18292c3934382cdd6c39dd81811e0e6007c8979a327369fa4bfb1d56a1b32ac SHA512 183e697bc03ba039022299693ca2c824be66b7980bbf025dbd8735c3ebb35ab9a97c8459ee03c97f3b9b65e3ca5d00751cb3ddb991b102d8726cfa605ca37222 WHIRLPOOL dab162566ad02de8cf8388b14617ddb690698e0147c42a63fcf9d1b548ed37d63f4ac06dbf48ef142bac37d61bb023a12a874ea3d48e56f0f690f516e154adba
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVb3e5XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVdJ2JXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiiyYP/i7RIpCdzLWpaRDee1BZx+OQ
-hlkXQsdb1snAmi0dcCKW2LeoPlEh9YDvrpJsdrGTRhWl1i6ieh652ZZWyeLuZAMe
-Dr4gcaJzpkJWXGvJ33mufnomnxHASJw4j7LDe66o8el4twSK8LgZrKGVJg9HCegv
-7RXC7jOoEk73zVr0006FmnKJTwRt+j8Wcmgx2klLvZHCSz0t0KE7LVdgVC1k7Loz
-ylIhpdZ6bKDnVBTgVIFOxi7cpAS+8p72u1J+i8asTjk8cniW2YBDfeW9/2uI/thX
-j744oYzo5Sgkpw2kgKPX0jEy5JvzVgrRJ2TQznKpAk6YF+Nbwdg/cOADADWIF0Lo
-DChvpZFO9G2Qexur1+3YunhjR07465fyDuo4K+gg3IrOxNweJmn+qLx/9wVBtiSp
-hxXLqnhAQzUVSCMi1PFgmdiFU5cAdCdI+3smkvLPf8wQwtp7NExbcCfZRufWgKEW
-mCN2QWe6d//Ndu+VIxhunA97TyA7BOZPUCZyqy9fbVOa0TIqPndUN/Y4VwiP7Dmh
-trxlTIyRCc3v6FPacX28VPJiP+SaeeQXr/pKw0to0yxOb27KwanyUhEb9ZQrHSGd
-N85tbuD66sPKmAYGLLluplylxJySiu/WxLMC3yi2lPtNXgtjBPnnWd7K/mg08ISq
-STPz3urceYF7iiyTLNaS
-=+Mux
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiUPQP/RAycsZrRxhrF8GCZd25AHWA
+MYzcX1QbfCf/ofWUGU6jQe/cokkBd/xySVNffHFCgk0mqSJvGnqq0s1a5yd2XF/X
+egn3UmTGZquNuiUsYbtNGnccNywZ8hDBqToZwpFNPFn0kRFZxenAsrO5I3feCno/
+BJwKDO7HQI34gl/tatZntr7zoe1i7gxcpgn0M45KQ5KzpuPxV6DkqbDyL6PyecAK
+FqBu/HZdUR9dIA/zvKH/Xhomdsa8XrfVFVLwceUihCeY/2uyOHHWI6gkQiLi5qjR
+g4OwXYnJmqHrOx+yRz48J/T8buTv+SarN4B6bygsZD8Gc4h3C8lLz2UjFmMbmik+
+6GOB9BTSr1uF0Ful/d5xkL1V6hQUJFKdnvzb/PStM+JwgUvtrF0bvcn4nW50Ry9j
+LoHCse+GwujO/9zf71Eaz8/EZ37oa6SerTT8P/tcKyn4pr3iTMnQtbfPGy36H4FI
+KHefJFh6d+LSJVuiUWAlMVs5LjQL7CuW9igg8yQF4Qz3Lv1/uSD3LKroFzf1a/0Y
+99cnG4yI1MOacl7YoDnmEfeVmdAPI04emYrgm/w6/otbSdLqvcPFr/QZ2aZPVnKd
+AIN5u6sMH6sdwaZTpuIcGsZUVbN4p7608NKyTziS5nkQ0IowOyEv/9LuC0YLPxrb
+XI1Z/Klf9reddE4CxjUZ
+=t41C
 -----END PGP SIGNATURE-----
diff --git a/dev-python/sphinxcontrib-plantuml/metadata.xml b/dev-python/sphinxcontrib-plantuml/metadata.xml
index 1c578370f64d..c58b58dc580b 100644
--- a/dev-python/sphinxcontrib-plantuml/metadata.xml
+++ b/dev-python/sphinxcontrib-plantuml/metadata.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>pva@gentoo.org</email>
-    <name>Peter Volkov</name>
-  </maintainer>
-  <longdescription lang="en">
+	<maintainer>
+		<email>pva@gentoo.org</email>
+		<name>Peter Volkov</name>
+	</maintainer>
+	<longdescription lang="en">
 	This package allows inline plantuml diagrams inside sphinx text files.
 	</longdescription>
-  <upstream>
-    <remote-id type="pypi">sphinxcontrib-plantuml</remote-id>
-  </upstream>
+	<upstream>
+		<remote-id type="pypi">sphinxcontrib-plantuml</remote-id>
+		<remote-id type="bitbucket">birkenfeld/sphinx-contrib</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/spyder/ChangeLog b/dev-python/spyder/ChangeLog
index 7b93abdc79a6..5b917311192c 100644
--- a/dev-python/spyder/ChangeLog
+++ b/dev-python/spyder/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/spyder
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/spyder/ChangeLog,v 1.37 2015/03/26 07:22:32 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/spyder/ChangeLog,v 1.38 2015/06/07 19:38:11 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add bitbucket to remote-id in metadata.xml
 
 *spyder-2.3.4 (26 Mar 2015)
 
diff --git a/dev-python/spyder/Manifest b/dev-python/spyder/Manifest
index c183bc0e119f..b43da0112ea4 100644
--- a/dev-python/spyder/Manifest
+++ b/dev-python/spyder/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX spyder-2.3.1-build.patch 6207 SHA256 4fac1e1ab11833f8bc3a28e8b53d876e66666cb68b2fdf185c7d334801ed9a75 SHA512 c2ff643f96099d4fb521bfc27d811d65c84513d824e97b304cfcdb4a6c708c6189fd53390a4bf88c90916c4dc8a119e64d65ad60230f1d2610557761db0e4e2f WHIRLPOOL 56830cf3d2ee28fc6d1f68adbe266a2f3931a74b72faf421f3fbf16eed0ef2986b82bb37ede124f829f79acd55ebc442f5876784e87a124744704d83927d99fa
 DIST spyder-2.3.1.zip 3721231 SHA256 986aa9307cfa551d93021452cbe0fc98e9785236b3af12692c179d0d931d4ebc SHA512 c422ac2945d63bec53c7e6e568b13b36fee25a77f2c41936b23cbcb4d4ec94a44128f5c0a21e12f39cd573cf51fc6335f9169c8bdaab14994025ab4959345954 WHIRLPOOL f79e3b5f24d1b14f8dcbfa268535eb82062d173c4e017894234607815895a4ebf08fc23eb9ee1f7db0c824c92a2f0f07c0b9a799d2655ddcc49c1e65b4600c11
 DIST spyder-2.3.2.zip 3724423 SHA256 f4f71ffe8590ffa8813622efb6705e52897552624726df317e0589ae121240bb SHA512 822f658344bca63d4582fc8e0a537af726ca5a8170a7f7240ff76b2911f17be5f579db6303ea1828f12ec63d0b83cfa45d54038c74eb962a3dedd96b3833bcd8 WHIRLPOOL 8bbf72aa5c60da42efa573dd937991a2c5ec8ddfd2aaa45800f9ac0fb2bdf69d5ef375d5a8feda305213777dc887873cff7a7a08d1612e735b83f4603e3320d8
@@ -7,5 +10,24 @@ EBUILD spyder-2.3.1.ebuild 1840 SHA256 12709856b65d4be59587d9e7123c8313a5d255add
 EBUILD spyder-2.3.2.ebuild 1847 SHA256 f487e893e9dc4e117c9bcf5edaadcae7b3fe957bd31e3d31f678a07925bbf2d5 SHA512 f71eddb943e8121ee6e86cc6499727a9e1dfdbf79e79619ebcfff4a44c1bfae347933bd952a7cb3bc3bec430a9c0a2e2eef2d3be481aaec4b124abbe0e2fc41c WHIRLPOOL 7e396b4bdb2063201a91613e000edbc81812c5e0f9bd1d75805cbb6d05f00b415957697219901dd3d241aa1fd9b0b46812c21f5e8cb138fc5e46d8684d7cb2a4
 EBUILD spyder-2.3.3.ebuild 1847 SHA256 07ec06f8caeebc1dcabdbd1a8966fa57ef457f8740f0060cf92e84cf7394711c SHA512 bc81c50587e6dd46afeba0771517e75951fffd83b3fb1a58ff468774922ed29cc03c83a9ecab8f27ee2c902630301765163629eb9e6ef5c3f8da9b7f1fc43773 WHIRLPOOL b9c3e6baebe3805c9e14dab8c71b5e2e566174caf0366952d2e114430b05bb3d3141ed2cc3b397042aeda4e17a3707c5dfcc4eff2a783733d60017c1bbfc1a15
 EBUILD spyder-2.3.4.ebuild 1847 SHA256 f94fb183837e5e03e33c9a39cd94bbb6ea2826d57da3a6a990658e7669bab6bd SHA512 71997e21c334df2382809341687cffd858e6a9a9046d4ff89691a23ea4a398d61d3acc00487bfe77253e3fc6d207cb3d28aab70b7ab3a6c6e2f3195c0e51e798 WHIRLPOOL 9156baeff50fc36cee6da3c069133646d63bbaf146dc9be502793e12fadf7b84f125e65fa4a729e92f6fc8cb192b7f3696128ad899c5ab27529e64a8169c03ee
-MISC ChangeLog 7031 SHA256 891ee8676171aa84cb9e8eb8266672417e7949d361faa9d4f756cd24f3b4ae04 SHA512 0a3b684e49db43bca1f009974b9af5d09f8f97e9e104315ceaea9cd7ace3e1c160c714f8db341078bc7e082cde22b55a674a1b4f65862b9efc39f63ff6ba552f WHIRLPOOL 7c32b7b0c46d9e6b09fbeaa299f0d0476de7794a4257fafd34bdab4961315e7a4bb67a6a4dcfa03955a52fc634db6e5ad194221bcbbc363f7a420f0c906b7d1f
-MISC metadata.xml 1261 SHA256 7d9daa17ce356586e02935a945f3830f553931c72c8fcd79c170a1a1510dd0aa SHA512 11b433e0b1b0b517fbf411a43e9326f07a4197989c971cf06db7990a75619faddf9392b634394c54c1583f54f41b968c8264256581d0d765941b4e8598f75271 WHIRLPOOL 603346ec9f5fa3d3ad0f38825c93aae19ae8c6851b49759571950d1734b92c05bd449d6062609ca69865a04213f52ff3f37a535cde988cc5fe259a2261cfa66a
+MISC ChangeLog 7135 SHA256 40723b0b8cf59de796014da9bfbe07a212d698eeab3a52c6db5a40d6005db162 SHA512 b27f2acf7db1b9161035a5a2070f60bda9988827ff10d49cf3f7070f914954a1763259636aab0b12df35b8eb0015f541b04bfcf028077fbfa2335b8a1f875d42 WHIRLPOOL e05872abc7d3ddbf9aefe246394678a831e3323e2a5307bc7908e8756dfa56ef80f17c877f39badc138b6680b54b0b7b6021c16578f7d0a2d77fd1a6ca64029d
+MISC metadata.xml 1366 SHA256 46b3e1c5eea0ad21b21237b1243cc94a61832ae166944e5ccaa4f8fd10641d4e SHA512 8cc5b8958c225c51100e6bb889e80277d37e8d659dd5584af35bf867be8176caa89ed5c8aa3e5bf1627a7a53c939159eda413e0d19ce99cca0bdfc2b4d1f22c9 WHIRLPOOL fd92ddb318c438b1e851ab7847c84f1fd19132ce0d76cb77866767bb334127f4b2632ddfae98fb59448d7569fefc9b8719f7a6c877f21bcda813c632eba3d4fd
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVdJ2kXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiqvMQAJvZXHzGMybdOKZdK7yJoUaT
+UTFnMlRmPOSHTgb6GSjRWE+P0ThCK6kyFhAvk3F18BzXAlLQQZgUumW5Tk9nhnV2
+1518wtkTL2d6fnM/cJcIOzvX1bj4+CI0t+FXI6zN5gWvFXM/wLKqI6FxzBHquFmv
++cn5d4v/7M70B6M4+pRav1peeF9QUQxEm92/hH+1HjkbzpP18/eFQoXNnWOhJg8s
+81+bqskQU8EjWPyWjZF+lusiJW7K2gM77L1x/Xb2dr0munYepbB5SA2f4tCHkVxS
+d8qtPEBR0BAFVUxPWz1oY4nlN3gObVSy2Xu6d+mVxWNUSpU5oAtRE8JtiNN36PD8
+w1ymWAz+XSVK+fGzlkh6cVSetO6duUrg3DD3xgbLaXGZiN3FXX/VcwObo6Yz5QOv
+bcd238MWkzr7daY21JC8iQyMMDOyJUC2KTRA9ms96zZ1uyD505W8ff9wxVI9Iw5a
+25RyajxQ6M7u82b47R/+Vp/pOkb76jSCqRy/tKdc22vZKxu6SxAEaBodq5IA69Eo
+dg1O4dL/L2ZOOOAt6X41eXxrDmrp8pAMU3SzyZHPeAbFGM2MNCsQAQr3fC/lO9cy
+VgYURV4xt9KT1JGSsrABSfIKBI66iUXk3DMfLlx3tMxTLMqSkQLQNeDqtz3wm+AP
+FD4luYTffRoN4gexc6pt
+=ofoI
+-----END PGP SIGNATURE-----
diff --git a/dev-python/spyder/metadata.xml b/dev-python/spyder/metadata.xml
index 07ae2c216e5d..c4364ce877cf 100644
--- a/dev-python/spyder/metadata.xml
+++ b/dev-python/spyder/metadata.xml
@@ -1,29 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
-<maintainer>
-  <email>grozin@gentoo.org</email>
-  <name>Andrey Grozin</name>
-</maintainer>
-<longdescription lang='en'>
+  <herd>python</herd>
+  <maintainer>
+    <email>grozin@gentoo.org</email>
+    <name>Andrey Grozin</name>
+  </maintainer>
+  <longdescription lang="en">
   Spyder development environment and its PyQt4-based IDE tools:
   interactive Python shell, Python code editor, workspace
   (dict/list/string/array editor), doc viewer, history log,
   environment variables editor, ...
 </longdescription>
-<use>
-  <flag name='ipython'>Add support for <pkg>dev-python/ipython</pkg></flag>
-  <flag name='matplotlib'>Add support for <pkg>dev-python/matplotlib</pkg></flag>
-  <flag name='numpy'>Add support for <pkg>dev-python/numpy</pkg></flag>
-  <flag name='pep8'>Add support for <pkg>dev-python/pep8</pkg></flag>
-  <flag name='pyflakes'>Add support for <pkg>dev-python/pyflakes</pkg></flag>
-  <flag name='pylint'>Add support for <pkg>dev-python/pylint</pkg></flag>
-  <flag name='rope'>Add support for <pkg>dev-python/rope</pkg></flag>
-  <flag name='scipy'>Add support for <pkg>sci-libs/scipy</pkg></flag>
-  <flag name='sphinx'>Add support for <pkg>dev-python/sphinx</pkg></flag>
-</use>
-<upstream>
-  <remote-id type="pypi">spyder</remote-id>
-</upstream>
+  <use>
+    <flag name="ipython">Add support for <pkg>dev-python/ipython</pkg></flag>
+    <flag name="matplotlib">Add support for <pkg>dev-python/matplotlib</pkg></flag>
+    <flag name="numpy">Add support for <pkg>dev-python/numpy</pkg></flag>
+    <flag name="pep8">Add support for <pkg>dev-python/pep8</pkg></flag>
+    <flag name="pyflakes">Add support for <pkg>dev-python/pyflakes</pkg></flag>
+    <flag name="pylint">Add support for <pkg>dev-python/pylint</pkg></flag>
+    <flag name="rope">Add support for <pkg>dev-python/rope</pkg></flag>
+    <flag name="scipy">Add support for <pkg>sci-libs/scipy</pkg></flag>
+    <flag name="sphinx">Add support for <pkg>dev-python/sphinx</pkg></flag>
+  </use>
+  <upstream>
+    <remote-id type="pypi">spyder</remote-id>
+    <remote-id type="bitbucket">spyder-ide/spyderlib</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/transmissionrpc/ChangeLog b/dev-python/transmissionrpc/ChangeLog
index a1c322d20e14..dd3fdc125993 100644
--- a/dev-python/transmissionrpc/ChangeLog
+++ b/dev-python/transmissionrpc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/transmissionrpc
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/transmissionrpc/ChangeLog,v 1.14 2015/04/08 08:05:03 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/transmissionrpc/ChangeLog,v 1.15 2015/06/07 19:38:54 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add bitbucket to remote-id in metadata.xml
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> transmissionrpc-0.11.ebuild,
   transmissionrpc-9999.ebuild:
diff --git a/dev-python/transmissionrpc/Manifest b/dev-python/transmissionrpc/Manifest
index c1796703cba8..4a1465963596 100644
--- a/dev-python/transmissionrpc/Manifest
+++ b/dev-python/transmissionrpc/Manifest
@@ -1,28 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST transmissionrpc-0.11.tar.gz 96091 SHA256 ec43b460f9fde2faedbfa6d663ef495b3fd69df855a135eebe8f8a741c0dde60 SHA512 778c4099264d38deefbcf05c8f9e5d165ce113b4180e3797eb3cf11f0a9ba5393c0b2e6f1f0ae7c2dcfc679bfc1d0d69cb3715b3db6ac90a1a840fbd0775f82f WHIRLPOOL fabee8985ce38d6430aa80fdda1ea90d244a33cd50f1cb8200b10e81b607000e119cb70a9dd7ed5276ed8384e5dc32f1fb47ab50143b4cbec535ed759989ec64
 DIST ubuntu-12.04.2-alternate-amd64.iso.torrent 28541 SHA256 2fe13c38b0b9ab9b1d3d92c53af8f8c0be5e9d36dd270591deee922bdcceaf64 SHA512 a597d9c5258111cb9c42dfcbb0804e093b6c69d4cdf178c961de1d52ec64e75f76d078700b59535e631575e42d3a995844ac0d30c9f7e852ab1ece149ec1f6de WHIRLPOOL 36323cf11643be4fd51b2dc658c0bd96b2dafc5ceffeed71cfdc6603520e78cc52ba19ace46b642e03fb950aae7b6b9ca7e3c0ee2f2790341820cf06ff52f71d
 EBUILD transmissionrpc-0.11.ebuild 1081 SHA256 436b09adcdb3f415b16796512b245fd5117a4dc8328982abe9e986eab1e71ceb SHA512 6943e8c02e11f1b836bbe652d12f0eaa8f3b7a57998e644a4ad7d717ab285455bf463380a947931605fbbb4319f463dc00c15ddbe328e36b3ad265416979c55f WHIRLPOOL b6dde3424b666cb35dcb73af1cbc642ca1611aed3773aae0196b90cde617bd9b36cd10a9278e36a1d75106f2754e805ddb31cd095d07e62f45ae3f280446f2c9
 EBUILD transmissionrpc-9999.ebuild 841 SHA256 d94927ce4d99ab58529366a66d873de05251850222ee387809ef0023c042e090 SHA512 b8821a6cf67b1ed752a38525fb69e65d45aeccf82bece73341a08db8be9b25db4526f41609b7013ee333ff00fe82e2d14e1f72a20cebd995e9cb8a781f9375cd WHIRLPOOL 194f63495cf91331b5a37383bc53e877beb1fa5b2a206e0a98d03a0c449605b70601c0d17b0f7b2350945ecf82d107ce333c61a4fd8ebe9e67d36f6d1a51cdb5
-MISC ChangeLog 2709 SHA256 dbb9edede1d1127f4e0ed3f760df29642c381a1a01b08a499450f84f40367d1c SHA512 39f24f0c3513358b7386f590df93f068a1bee52f3d2a5b50e4ba1155e423de3c852a607fdc9f65e720d6b09b4a904cdba70e5a006dddc2b8ee539716f9658a11 WHIRLPOOL b5a1472688d206fff570d190d08d98b80d3f6af001a3e4e08c8cf6f89264cd3bb587b69cbf7902dc11f7cb604e51807a6a1ff744d67f07ebb0771008880ae661
-MISC metadata.xml 310 SHA256 78bcdda6bbdfd37d01f4887f392f6f02681d4f803e04febae1573ed8a794d820 SHA512 45a03e99349a1679afbb5170322746ddd6b33c30ae80b993e62d2d2dac1a58063d09fa8d90e7fff042f549d96565956c066c16e01c58d1b3528512bc7d7ee99b WHIRLPOOL db687dcc8147fbcc46abec2ceda8ba5d0413fa6da7745e995c1f744a107812c4c1b3150a63de1484d3623b66f976ea79f8d46896e9107973b12a3cb319af7619
+MISC ChangeLog 2814 SHA256 4f6ccb1590dca29c0ad2f253a3235c0b9487f4cabc231ce02c2f54f2e256c8f3 SHA512 79cd7aa51d997b7510e2645d1cffcc24dd0cb560c251272d17152f00afd75be8b267628036adbd736fe7c11670c2d794ab9af6ea1d2c68c22a859b96c7d8ddb8 WHIRLPOOL 459120bea4fbf1bdf28112af695bec9e15e7d527908512f4d17251ec79c10e271afdf0bd4869f28126931403266c3f17b7244036c663e8e9a9cf8a6c9f7f94d8
+MISC metadata.xml 389 SHA256 367dbc993dd923e24c0b9b06dceb660665e21bce81cef6f244a48ff139d33ea1 SHA512 f45aabd62b5ea7a8f51a5ac2f223f4089b70d90ffdd1a8728934205c50fad8690df5d2c15e57b16c11025821461526be322dc41e9ac85a6ec5134f91cc4f7329 WHIRLPOOL e8c8c715341708ae8d4718fdb1d050f4588d7e0ae4b6d9e4702ba62174c2135568e50d30b5f2095e62e9d30ac8dd5aac49d75299ba3014701700f0a95c31106d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVJOKZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOByAP/0B+fTQpfaWz81X4mOdTD7PQ
-H9Wju7JvFRyGCgCDn8lO9xndr/Zi2J7guRlAXmkM/DVAU2TO1Mi30WL6nsuRIqFv
-78Rxe1Olj8sITJXFImkM+8hZ70pi8k2QlpGyJDguL+k8WF5tS7ifaUTDKyg9M0PI
-ijjZARcb1D+kKJMDrVqrMl5WKcaefKMXAo1ZVECV+xJv64XeRYSFiT1H0x8/n71U
-YY6uZWsFCme6jVgsBeWhWmUCo6qn3aIW2LdtUIXQt24S9LD80y6Or39al+QQsJ/3
-pug+rdFgv7eTgDm2hOOQ3V+AQuM+yKPnoop5RAICQ7u6lUGnry4U/BIkI1oI7dXH
-AirBfs7J5TLCM5WKePN6WcV80737XgVJ0dILDQPQIsRw2z4uPVCv3e8dcAGh3ivD
-Fa987bGQyuKOAX478CnAZyPeusu26gTmNQ8JbxPdRaQv68Sl3z9QMzQVyal9DyKp
-er4BzSOjkC7n0ucv2E+GlKi2VjqKtSg30sMomGMSSsyBKq0n378fxHXCWEGRzF6U
-WNjwKqKxK4AoxrXMKTqLQ/riltWu6hTA9Jcs5UlIo3d3IcoEzF9xzY7zxvvqzLJF
-wE3EDUE2E+sxQ/7c/NZMQOZGVyTkPEg6p7RmAQB8S485ZA9uIhRTWz/CVWBzs09o
-7cKS5XDVACatl2wxDSDz
-=Uzpa
+iQJ8BAEBCgBmBQJVdJ3PXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmixjMP/1h6Nr2Dextvqio3fXpGv9jw
+viiYIQbvqgLnZDm61YVqloeYRh63tNPMwqjjqvSEFzpWxlZSLK4rgxbkaisZdE99
+v12HMfnj13PGcubNvlDu5mI9AzfdYMdrOLB0/i7qwy4Z45h5BiuQ3ISHz/F5nmpM
+YvrzRXxZQGPqTPFJr0moSwoQM8itM0R94+ctKYS4WblXNv5tKFH6syMuCwUk2bCa
+11cOqwdR+xfYbc0cO4cQ/5SXxw7nuvQdOjgOQWp2lRRg8Ucm5KMOSimmeuuSUucO
+B7HG9W1m4sv151Ab2f/zE3pWbGomOn/q1uN3sItCSRtEbeZxyaveBWis7puNmrkt
+wCNyDQnYxjFY41Lg5VbenjzuFQkxrA0t8KDRqWdW97IG3zrh8Qe6d6r5mQedHuqy
+RDrTrfPjtxHxsG1ZkNbPe1wZA7WIjY8zfE9lpWBVl6XUbwICLp/RSbQztoo+I9hW
+Z5k3QYIBOYjG1qqPJBPWGVQGSF1XVvbqgNyRtfinLGGy4i02d+C6qcpGfL+rZyB3
+nGuPtl33eqznRoG5V18XlhESLS6diXXOa8Z5zvl+3gUjSIRnN1QjXuAgZxg5kWHw
+uJD0SolQa7SysgH4stOadkVhFA40qDV6iF0k2MDYdvlIpzDclZUIMsqO+SNW8676
+dNevm8dZWf8DYThLEvW7
+=w8zl
 -----END PGP SIGNATURE-----
diff --git a/dev-python/transmissionrpc/metadata.xml b/dev-python/transmissionrpc/metadata.xml
index 1d655e264fe8..ad30f06856c9 100644
--- a/dev-python/transmissionrpc/metadata.xml
+++ b/dev-python/transmissionrpc/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>floppym@gentoo.org</email>
-		<name>Mike Gilbert</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">transmissionrpc</remote-id>
-	</upstream>
+  <maintainer>
+    <email>floppym@gentoo.org</email>
+    <name>Mike Gilbert</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">transmissionrpc</remote-id>
+    <remote-id type="bitbucket">blueluna/transmissionrpc</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/trollius/ChangeLog b/dev-python/trollius/ChangeLog
index f2dc16f8e3cb..d7da84c23b63 100644
--- a/dev-python/trollius/ChangeLog
+++ b/dev-python/trollius/ChangeLog
@@ -1,10 +1,12 @@
 # ChangeLog for dev-python/trollius
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/trollius/ChangeLog,v 1.1 2015/02/25 17:49:15 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/trollius/ChangeLog,v 1.2 2015/06/07 19:39:24 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add bitbucket to remote-id in metadata.xml
 
 *trollius-1.0.4 (25 Feb 2015)
 
   25 Feb 2015; Tim Harder <radhermit@gentoo.org> +trollius-1.0.4.ebuild,
   +metadata.xml:
   Initial import.
-
diff --git a/dev-python/trollius/Manifest b/dev-python/trollius/Manifest
index 7c3343b91dca..68c169556df4 100644
--- a/dev-python/trollius/Manifest
+++ b/dev-python/trollius/Manifest
@@ -1,18 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST trollius-1.0.4.tar.gz 259188 SHA256 8884cae4ec6a2d593abcffd5e700626ad4618f42b11beb2b75998f2e8247de76 SHA512 f8df8c9f0034e6075e2a356a0bcfcd7908d98d8d14b07332a71de0115753e17335f5b8030c06c6b2a5b79437392ccf13f92d46155622f789b13c36d04c6d1f9e WHIRLPOOL 0cc57bee6be7a2bd8785decc406792c0d354dfc24f4a51b40d0de9557e212cbda738f9aab0a41fcb1ebe1a4b72986c09db1e243fd6ca3398f1df400e8c4ae6ad
 EBUILD trollius-1.0.4.ebuild 762 SHA256 382b65f464f4c1aa925634642bcf9361ae3839a26f38996c981c46847d72bf1a SHA512 d6eade10c3039edc706caa01acda4b47ffc3f1baeeb1b5a8b13edad55fe471a32fbc37771bd02d3a1432803aeb0c4c189bc8e6c25f583d97b1a080195d91a7d6 WHIRLPOOL 1361a88f2466d3f5baf997080f78274329bb687ae74acc5e21c7a693c201eb78dba5c42f9631d1a7686dc488c4a50e92447cf70ad99ace2376faff510aefa148
-MISC ChangeLog 354 SHA256 fb5b0484ed5874f238bb23532555ba3b538825e43102bbf12907c6e8cd46a727 SHA512 b4b0926d01fbdaabf2da145bb132d69abe927b46dbb5695a88e0570134e215f71814da9d029dc6db9181817c3717ba3f7e4baff466a4ada52fe30ecdf7f220df WHIRLPOOL 5ff54fbb2d9659fa24be369314721246d9f9b5148e0a0d468e9e8e7ee124afee70c1f89e754537f89ef1f29dc797c51aab31517cfeea6c0b2f6fcf2e64fdeaa0
-MISC metadata.xml 228 SHA256 194c35c47e37f9c067fd5540fa08eefd6cee642441d6a4d6fc7dc4a6c0ae2a74 SHA512 dee2bd9e882ecd6841644c79de341e5bb8fe7766f706b6ca2d696d98bd2fa32972ea3f3db25244fbf6a2139660acec63098b37f452eac6e48fe3347ec8ef0ce7 WHIRLPOOL 9f204988eb8438657e5cfb6718cb63670f1bb04f24e895a33cbd57a0357147643e82fc9b8523c3b6604169ae16583c171cbfa9a9620831754f56167f707e7ebf
+MISC ChangeLog 455 SHA256 aaec94a9b3dc6af746f9907286cc203913a22e2da482ad719f58b7e262e28fd8 SHA512 980ab39bc7af49bddc05a56e1061dd3cb2fc28015531926bffa4913002112646eb9f2a6968f22cf1a7f7965bf2f57164409e6bf1552a7acf235abb0274f6ab58 WHIRLPOOL 81d23920f9a5ac9ce7027230995d8c944cb1a6c528bbbf8f89d1428184a0d591898bd7c0f3b1c20f3cf47574533cb1b628e941bf848f3da283e2aa8f92ac500a
+MISC metadata.xml 298 SHA256 c0b44c4d24912975a11be9449547cb2e44065c8e2d054f4cd38dbcda37f3591c SHA512 ff42a31443e05fc4821c0d6a26309ae215798afbb53c4e15167c6fa9850883f37aa2a0276f215a6a915ea6865c0d76102ef28a25a32f83ff7c3191d9ad4053b2 WHIRLPOOL 2d5cf5f37d95236f8a229ce974c406ec71991a0de7c4d08c7f2a5eb0443f592d8e8148594cfa4fdd8ae715ab75b13c5b09b08cb83ed051c823e6fd8ea0e203c6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJU7gskAAoJEEqz6FtPBkyjUCgIAJneoG4MdTQcyJ/kz3peh7tc
-lYbrjo+NSHkVLwxB3IG2l8vxgWDcrI5zpa/SYZD4KAQfNsNnNqbHdTbgQHyS5qdM
-G2BGFrFd+YOCps2fE4v8DI6xOVk47VMi8qNi7Gl+ROJibkXy4p0yGoL3o7J6CuIS
-cC0cXy57MJ1qaozYD+XJFmoqzhEvZcnAIjV2AYhdZIpCn3nOOcD7VH0sHGa67vD1
-NFOiE+PxHCsBHr9nxnqauumuIXdXMh3c9XpCsrnSHVBOalGVrjvZEy7rQYr43iEW
-fw5T5PDVHC1yR1Fniar+RcHjzinLqsIqVXGV4zHIcNCHSZIoz63xIpU39wTv6r4=
-=yqfZ
+iQJ8BAEBCgBmBQJVdJ3tXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmibbsP/AzboYCi+TqEZcwGrOz7UPCj
+py3uS6wrKe8M3MfmQw33I25Q2TZDrYmj0qgpvDv2+jpFhCRRiBtsnCCj7Ldt2aYO
+5rU/QYdXLDxK9UlrO4t6OpO/cAKkgig77LxPhQl8ZmbobNGF16ycR+CHoB+YgTyB
+N8MWbVdHbBF8ym9tq2yyctZNHpayAOhwHGOABjzDe8znvOAdupFhs89aTLOdqKsG
+IZJBBAjZ8Yb2HFou3DdgO4MMa9d3BIRC1GMZJxyTnmuZUVcRCIcGjWF1upy77Yp4
+mcbUiOsvFRtpN/ABB4QRdp3fg6INZORN1zIqYiv3XmKDvsDmYpGWX+xaBOCDIu1x
+gKTSDByPyzs5uAl+84c3O/3JgNlbuqOoMVfjVolQlxwMVDFRA082owH6FL/W6Ymd
+5u391EyY/4FX+iZfU0NzLw3fwAUWYajSgcWKBA0uP7P+suRqKaQCSb23ZUw98MrK
+AfbgnlChx3nx5zcLn2l+FJsT2N9W6KwOe3lL7m6GkQpwk0jDUct0juER67dEqjoy
+xE+OVIzf+l/N/QJ0PRqrhB93+1nzasohq7mQvA+fPOLpV7W7hS2/Q00pRyaI28Hf
+emO3/F4oGGqd/PH2ABePPx5iuFEwUHT84vOD9fN4kNOV3W2oxCnu0d3Q8XLGzM0E
+J08+FUEGvjmQzvfVjK6I
+=X3lL
 -----END PGP SIGNATURE-----
diff --git a/dev-python/trollius/metadata.xml b/dev-python/trollius/metadata.xml
index 87a34ff91f26..68aa3af684bc 100644
--- a/dev-python/trollius/metadata.xml
+++ b/dev-python/trollius/metadata.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
-<upstream>
-  <remote-id type="pypi">trollius</remote-id>
-</upstream>
+  <herd>python</herd>
+  <upstream>
+    <remote-id type="pypi">trollius</remote-id>
+    <remote-id type="bitbucket">enovance/trollius</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/whoosh/ChangeLog b/dev-python/whoosh/ChangeLog
index af8c59310824..2160455c81b7 100644
--- a/dev-python/whoosh/ChangeLog
+++ b/dev-python/whoosh/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/whoosh
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/whoosh/ChangeLog,v 1.28 2015/06/04 09:53:05 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/whoosh/ChangeLog,v 1.29 2015/06/07 19:39:53 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add bitbucket to remote-id in metadata.xml
 
   04 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add pypi to remote-id in metadata.xml
diff --git a/dev-python/whoosh/Manifest b/dev-python/whoosh/Manifest
index 4fdb8fbbd510..da8525fd28b3 100644
--- a/dev-python/whoosh/Manifest
+++ b/dev-python/whoosh/Manifest
@@ -5,24 +5,24 @@ DIST Whoosh-2.6.0.zip 1193541 SHA256 7de7bc4d00a6d051dbb360b48eb7f3cd002373d8725
 DIST Whoosh-2.7.0.zip 1080985 SHA256 733df1ad4142fcd1e8f3259070de0521d272d7685e2febc0f4fdd1668cfe0d48 SHA512 5126a9ed5ef50af391905347c7aa1c1cc7d100213c29f5a5f67fcfabab9cdcfcd14a6b75735df8e343f61254d1fec8610f0e1260167a321ab303a0a55b02673f WHIRLPOOL 6a35448280e3c6382b8a4b50432d5def3a910d9af95d35afc11544030b69f0103aae910bbf91cb5942ec80f10a848bbd32dbd828c71482f5e2fc15a9cd29c249
 EBUILD whoosh-2.6.0.ebuild 1499 SHA256 6c2761835a09acc7e78fee03db4c228b4950594f07b64c7a06591cff6b7daa72 SHA512 3df00fa9f2b6ecf7ad3ec3f066dae8ab0aa3382e3bbce4e4ffcab1250a3fd2306bbab3b531a4f7c084f941b38eb920ff48eef49cb1595618e4bbbb9cc84180ec WHIRLPOOL 15c7a0834a1869c4fd44ad75356e169634fc3e9ef3041fb171739988ecf531752465dc406a0a9e6b51182a20b90116fadc3e6a24b841557872cb0ed957b83bdf
 EBUILD whoosh-2.7.0.ebuild 1545 SHA256 b7b870dc06129547e428e1fffe7ff1dcb5714f217debab55efa4d27253866f73 SHA512 c7950703f85fb3c9fdcbe2828b1816e6702326e81357f251bef9ff58454b02c1e09d2d7d5adad3298ff5252729534b8f778b2fe0aba5978adf6276b2580503f5 WHIRLPOOL c4709c1f009539f1d78b4ce231c54cb4284a94f23d3c137fe746249323e05fe2282f4d5b21cce1d93afffce42daf312d4ba40843c8de55cebd97eebd979df60d
-MISC ChangeLog 6599 SHA256 7c08cab69933200a0b09b1b6788bb214b0dfbe365338a50c48cbf631f0ff11c9 SHA512 93b4f624300214a2d95ad22e21ba405d79a784e6967db621334e1966cce74e462cdff3e8252469721d8c6d63611cdab9691f7f2100256b9624f62a998354076c WHIRLPOOL 47813647d96d6fad73cb28bc1e5d871e0a1a0ae16126bdf4fff7e15cc7bd4b0e3c23350a1a795b0e13322f9079809ad5d1451b9f470730ff5a1cd7071c698a5e
-MISC metadata.xml 814 SHA256 32621a595afb2ea258390c063f2d80afeccf8d88d29936e420bf6cc8bd44e429 SHA512 148a1b099e1271ba1911cf13ae42afb405c57c515af02a8e8832589ae1ddcc3a45c2e70422a543a0b734954d304e54624ab6066adeb2215dd40e33ec4305faa9 WHIRLPOOL d05d00ff0093f0a661132201ff43539f15274ddf43314a0a02c533839f98147c905dede511851720951b70e2d31fa95c515cd1626d5acab7eb0a23e537a98250
+MISC ChangeLog 6706 SHA256 acf5d0db3e6890fefe81256f6d29f03ab55d9fc36fe5197fa328918e7939c5df SHA512 c6b9a857d51f3a04689b1d9483c9d615ea138f20e0cded92c949e31ff2aa1c99fc02945377d76334d6d255c9b1cbd36cb00673efc373ae667ddb79f643b0dbae WHIRLPOOL 643b884e1f1adad6caf119bafae28588b78888d7f7849b72d996ea7c7d186db00bbcea31410f9e79b05af3851fd6fef2979524839ed4decbba0a99ec6db57a7a
+MISC metadata.xml 852 SHA256 8778e9cfdaf28093fe4fceb8e48134e115581fc37ddd7b98d6218504ecd04ec5 SHA512 2b11cf0673b1c65d7e90dc7efcbe4b68ee7b9a026a96f1558a63498f8f6a1c1afeb202654d3118d4d528d897cc84c79d7196cba188cb5b725fcd7133b20f36f4 WHIRLPOOL 8f22e4e35c7fcd760f0b64cb7a778ed84487081f5421ed82ba6d8d9fed7843bc30971659f08f3aa923fa3458150f7ecbb0036e9dc32260690b82873bc61dd656
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVcCACXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVdJ4KXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiXQgP/2AIZasz8HJtDgbU9N2MBoRt
-oa9hheN/VdqtYtV7lH/AqNacg39EgBlt/1K9/mLMX+s50VZheYmePuwfrGDlxvdy
-Gexxcr7eGWMc537ZNXiZA74aREwnzFsK0hvguOAMd3MZOkGU9G+uN6fCOE8ZjafF
-4CrdJTGRKYHPsW+YwOqLTHAhzxW2vSbxl5CQZc3LYZzoaV9AJrBryZPaHu5EJkRq
-qoN2sB9iizwF6bwIxcshtDnN55cp3thhHlLrWfPcwCoSvU9r3qB4XmBAH+HYTsAn
-OdA3ztWpAOinEnn8J8Ti4MKanI6T6rMdw/YeFVLZLdBiVPE9S/IBT/im778L/BvG
-20p0IUBLqPLKDYUlib2M1Owh07G1lu6fDhZ4JEI8Gep5b9+X3pIm55kwLwbgseWz
-TWL+sJhMYPTIAK0/Wbp7O8w4RtNqxRN1Gj2y4ZeQpKcSqcuAa6gU74UvAcbadl/s
-BmI2egHU9JrBJFencFGIl9oB4gpcD6/Nlwb1VKiDKR8a4Wq4FIrKIMUJYyD9/gbg
-ZzVS7PWEd14y6mF+syooHMhqDLqKNpSZKicAOOR1bgE9S8mq4sCTZiWCRY0sebDC
-+fq/t57iBgDaWWpYpBb95L9sxkM01C/jU7wEvBkyK051B7PyjWrBKVQUBZMn/5Wp
-4AweWcyq6sn7Tr2qOMyg
-=yrBf
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiRxQQAJjZLy6+EyWhV3d7WNA+C4I7
+HEE1b5MW84Wbt15spa7MQeqXxaM8aIGAy1VqLvCIF0pYt90zGvSKqiFZP2cWOPDI
+MUk4lt/rcJyc96GpnKnaBjWa6G30hqF22c8q2lr4c41ZH7sThGevWveLCaYAbGAA
+64Q1uTRxJVy52lO1AHRL7VxKBa/jUOakf9EkFthvfFIPpQhdhFidUsQIoPSkGnFF
+SPEFrTaS7bchfBQm53ipR7E0xRzAFbANolxrmNUyRbtl9ou4ZeqbF6Y1GHH4c7NG
+YiQVKsQl4awFSnMC1T8pj9G9ckfcvolf+Ygg52avWILRNWp/v7EdED2AbkCACqKk
+gxGGvo5lZ3iiMccfZPCP83cTsuc+LVYDNqySXRXlmEkxxIIaO8IZJsDSjOnSNRgL
+pNvCoXoFEXeqlamZuotS8v9Z8dhb4AV9VLvKWpzrNrXgRt/+vX/P1HbchsxHL9xH
+xb9siE45emAdCt3faewTRWh7URB+jY9niuGphHxygVpLUFuqyklgn9NePIOnfQUP
+aiXWav3cbXcRJroL/yduUuIn5Vo6d8pWut5fzLJ1Ke8h9RAKg818d39KAgaIIm1y
+cJbtC5s4HSze7ixGP3gPF3T5DKELhzCAJ1kyvPIgJmRHjLgN3MQ2tfEPimDJavt/
+p+xSCWRqnpxTLtcjJvKI
+=go/H
 -----END PGP SIGNATURE-----
diff --git a/dev-python/whoosh/metadata.xml b/dev-python/whoosh/metadata.xml
index 8b0d85c73b6d..861b39a466ef 100644
--- a/dev-python/whoosh/metadata.xml
+++ b/dev-python/whoosh/metadata.xml
@@ -1,24 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
-  <herd>proxy-maintainers</herd>
-  <maintainer>
-    <email>blueness@gentoo.org</email>
-    <name>Anthony G. Basile</name>
-  </maintainer>
-  <maintainer>
-    <email>bugs@bergstroem.nu</email>
-    <name>Johan Bergström</name>
-  </maintainer>
-  <longdescription lang="en">
+	<herd>python</herd>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>blueness@gentoo.org</email>
+		<name>Anthony G. Basile</name>
+	</maintainer>
+	<maintainer>
+		<email>bugs@bergstroem.nu</email>
+		<name>Johan Bergström</name>
+	</maintainer>
+	<longdescription lang="en">
 		Whoosh is a fast, featureful full-text indexing and searching
 		library implemented in pure Python. Programmers can use it to
 		easily add search functionality to their applications and websites.
 		Every part of how Whoosh works can be extended or replaced to meet
 		your needs exactly.
 	</longdescription>
-  <upstream>
-    <remote-id type="pypi">Whoosh</remote-id>
-  </upstream>
+	<upstream>
+		<remote-id type="pypi">Whoosh</remote-id>
+		<remote-id type="bitbucket">mchaput/whoosh</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/yubiotp/ChangeLog b/dev-python/yubiotp/ChangeLog
index 4d95998edc73..64cecaaa978a 100644
--- a/dev-python/yubiotp/ChangeLog
+++ b/dev-python/yubiotp/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/yubiotp
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/yubiotp/ChangeLog,v 1.3 2015/06/04 10:14:19 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/yubiotp/ChangeLog,v 1.4 2015/06/07 19:40:22 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add bitbucket to remote-id in metadata.xml
 
   04 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add pypi to remote-id in metadata.xml
diff --git a/dev-python/yubiotp/Manifest b/dev-python/yubiotp/Manifest
index fe81c439f76e..d6953cf46377 100644
--- a/dev-python/yubiotp/Manifest
+++ b/dev-python/yubiotp/Manifest
@@ -3,24 +3,24 @@ Hash: SHA512
 
 DIST YubiOTP-0.2.1.tar.gz 17493 SHA256 458b6db6e9988740766dc47ca5583ac4c4db8b7483ffa7e3bc82101e6b07075c SHA512 3b505fed17ed27d1ef325598a5899d4ed4ae5ed7938d1ae71155f889a6533a969e07e1172661e411cdbf23a2060e8f521cd90779c314524c4a564fbf852a670c WHIRLPOOL 99697e6886a6757c09bac9d9d64ef04b3721f4d2f20b227f246015f7d214a32b1a646a5da40d9bf9e4bd5f3e3688424885ceb7b76f6f04e82ece919c6d84650d
 EBUILD yubiotp-0.2.1.ebuild 800 SHA256 37d4b93815a9f238fb650f53bea058ce91b8a7b6ff937bc2f2fe1a76f038f572 SHA512 57909b370924bc3f8ea7c6b52014df3922293a86fa34228e085b5bdfe23e2da7e0545195b6d18181a32456aaa984c8ddea72c53d76426532375d0324956a166d WHIRLPOOL aa35c58027caa4b154d9f6d94d5f732aeab0fdf26e6e58d1f1c8dd83b081244506029a087b08480dfac23d5f255d17251449d911a522245c7c58f281b0ba6f48
-MISC ChangeLog 560 SHA256 841cdcd2cf5467fe49fb34f94f057d00f2820c482b7441f22b00ae7d5610c76b SHA512 86c6e00e679ead4e3583f8d43ab5c41fb3261ac5ce2d4b85322516b49074c7a5b6866702fee118168787103099e79df152fcd6c6aa15bd34dbb5bcc9bdec84a2 WHIRLPOOL a1e4ada1ab5854e969ac01a4fcaf529d8ed3258d3a562e962feea6beebbfd3e17425ad32e57581911ee967b34c334b8f2ddd98823e1ef8b096364d14717f42df
-MISC metadata.xml 320 SHA256 e9843c916d1b01ac0f7affedab09cd406a08611181910424ffb0a362002bc7e1 SHA512 73ea81b54fed897bab7ad2215c9e8b013b8a94203429553b66b72900e5a1bc129dd2db2cd737050ea202bbc5acff03bacaa80662eeae6b6c63d61bdf9a680fda WHIRLPOOL f6ee699b6f5a26b3d5158b822324159d9f35414e9b55cd6676c8d7f83576d6e11bf09c69eb82109b137d439f9b6a4a4e567f065b72d53cf22be6f6c8210d099d
+MISC ChangeLog 667 SHA256 34af732f996e7c78241fb91f3aec54ae31c605ed66af0e0e6b0f168b1eee3abb SHA512 50306ae6f6fc34e28770db233a9457b4ee601b9bb7d25afe88cb44a4992e714123059fddc9ed9cbdcf2eec0a8440be0e19d92b1642ee7f6e48d74d2a11f55429 WHIRLPOOL b513c597f3696f2561742d49c794b8aca130f7b76db0a2d6744c8dd0c87a749ffd719de53afa99f744180482dd03a5c7a7c5c0e272bd406c7013006d9ada01a8
+MISC metadata.xml 380 SHA256 da2c39cc77845b3bcf540d200125e6f358b8fae442f98dffecb13ed5fd539a77 SHA512 737d815d7f8f50c88fdcb92d47097a4ff1ddb73bd3b397337523b96e78f9461f806f03650eb6c16b04e96708403858dc8a09fb0fe1fe1064c50eff23dab40905 WHIRLPOOL c784f31781d73d8cfe319931847aa8596b2c64ece374e665c8dab01654586719bb31a100d2f3fd3e5dc608ba9aeb67fffe93507566fd28f97547eff018b754c6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVcCT8XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVdJ4nXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiMdMQAInm1/p5YZUikGl8bDcpSj6L
-ma7huehTN9BQ//wEfLqDc25EJL0oUvoq0ebvwao/C1y8RhzPbf3xt82P1eHen669
-X4A9P7rlbNSt9IU8Z9Opsjp6Mwm7//wUKdEc3EW3isEhko4wrPpYGaL6AToHJ92k
-Tq/obQwU6b8qvY5kcj+0J6B7E9dKecvgTWBx2gkB64Nu2yEKlxgrj3BqnRdE2pQ6
-l6wCm8Z7sf/N4QWNO6kQRnKo6qM1Zhxd2bhUc1UkI+S/4w+LndeEVU3S4ZibymAY
-0O703bLfxA+r3tRLMgNNcJaPVk9JE3C365COu4gY+ZdiuplZUDhL3GmmcnRSPfQe
-pgJ4PwuREsyxHrQrBH+xrsWfGdwtvHtRUurlOXlUj7maejOgF5426+3Ti8Fs5x8h
-NUx6fyg6ZVo3xn/HYMkMQTYYRfZ4tzz7d3SZzQTban3Fo5YZ7HkxK+LzyTx47M/c
-+LLQ3s2WKWYkvE3oHtph5b3O+fnlQTSKXi3BVdhKQTWlgSsFvdHOBzKKC9ty4wy3
-h+mX+TWlsBYI8k1ICcSw4ev/X8uw4jNy9wE0eGgC9AM3uRH01TGW+6nv86V3qmRs
-nimShIunsCKpTCjcge3YRZYBB+y1WdgtWDLtNsxTKJczeVoRu18DeUCnHR5Az1r+
-rlZX90mviD3Lp+8Im1z8
-=f3bo
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi+WwP/jETRqIWB1iCmhLnkBu3ccwK
+avXdmh88HjL++JCySACo0A3LTMZq/qQFcwn/MKjKSek+1EdF0VdmoU7UaWDd9x9J
+QnzqKpF3+th2Rebh0YXkbV8Ugqsjn0AvUGa5pdcwKASpQZWNU/q+8srKBNw70ZTd
+1juNGdUCmvzEztoIcmuBRc6wzlBd6PiPp0RZDt0LIleb5tyzPI8fR6qPOks9+vON
+zLHkuIW0zekKxZdaLfGi9aj5qThvwYaaKtU9K4K0DRVFkCmncuq/GAhZ1ZayWXMC
+J0/GyJsg/XoHwifpFbyrauIDCxpw3anZ/1esXOZVQPxCaduiocJozw9GdBJHm3Mq
+Ob/8Bwolol5XMJasQonsQ5pCumQPfF+rOmLO/HEZPcjXyKBDvXaTTKI+Bblm8yCo
+ysptHTt62AYB4G++DWuTcvCNHxfSvSvJlB6j/+EbIocZAzvyZidJPAMjYLXx66HL
+wFoI3NV6vPkS4Ysh8MkmwUNT+aeI3e7LRgSgqtesoT0SuhmTPJWXfV/SEtQvUkKT
+FBekYE9NOdD4ldSyMrFUqP2AJSUT1w8l59oJFxMK6eGOfwtEgDEPXAeVmqVsn/Pf
+8ebcHYqfkK3kzO6lp3wQ5nDKvsUyI8G4fC5QOSFzT4mp717YrHWmmb+Nq/a5E5kj
+LqHwNWXrFSZCfkEZBohC
+=jihC
 -----END PGP SIGNATURE-----
diff --git a/dev-python/yubiotp/metadata.xml b/dev-python/yubiotp/metadata.xml
index 635e856429c9..100ebaca37d9 100644
--- a/dev-python/yubiotp/metadata.xml
+++ b/dev-python/yubiotp/metadata.xml
@@ -7,5 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="pypi">YubiOTP</remote-id>
+    <remote-id type="bitbucket">psagers/yubiotp</remote-id>
   </upstream>
 </pkgmetadata>
author	Justin Lecher <jlec@gentoo.org>	2015-06-07 19:40:23 +0000
committer	Justin Lecher <jlec@gentoo.org>	2015-06-07 19:40:23 +0000
commit	11d0ee2a026bc28e43889e9fdf757abec5243bfd (patch)
tree	ffa5056f2fb726cc9fbe1b78dae6aca574633f5f /dev-python
parent	add patch for mypy script to fix #551272 (diff)
download	historical-11d0ee2a026bc28e43889e9fdf757abec5243bfd.tar.gz historical-11d0ee2a026bc28e43889e9fdf757abec5243bfd.tar.bz2 historical-11d0ee2a026bc28e43889e9fdf757abec5243bfd.zip