Add pypi to remote-id in metadata.xml; drop old

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

17 files changed, 140 insertions, 178 deletions

diff --git a/dev-python/Babel/Babel-0.9.6.ebuild b/dev-python/Babel/Babel-0.9.6.ebuild
deleted file mode 100644
index 1c28481db71f..000000000000
--- a/dev-python/Babel/Babel-0.9.6.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/Babel/Babel-0.9.6.ebuild,v 1.10 2012/09/26 01:13:57 hasufell Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-DISTUTILS_SRC_TEST="setup.py"
-
-inherit eutils distutils
-
-DESCRIPTION="A collection of tools for internationalizing Python applications"
-HOMEPAGE="http://babel.edgewall.org/ http://pypi.python.org/pypi/Babel"
-SRC_URI="http://ftp.edgewall.com/pub/babel/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-
-DEPEND="dev-python/pytz
-	dev-python/setuptools"
-RDEPEND="${DEPEND}"
-
-PYTHON_MODNAME="babel"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-setuptools.patch
-	distutils_src_prepare
-}
-
-src_install() {
-	distutils_src_install
-	dohtml -r doc/* || die "dohtml failed"
-}
diff --git a/dev-python/Babel/Babel-1.3.ebuild b/dev-python/Babel/Babel-1.3.ebuild
deleted file mode 100644
index 27f2c8a2deac..000000000000
--- a/dev-python/Babel/Babel-1.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/Babel/Babel-1.3.ebuild,v 1.13 2015/04/08 08:05:29 mgorny Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3} pypy )
-inherit distutils-r1
-
-DESCRIPTION="A collection of tools for internationalizing Python applications"
-HOMEPAGE="http://babel.edgewall.org/ http://pypi.python.org/pypi/Babel"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc test"
-
-RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${DEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( >=dev-python/pytest-2.3.5 )"
-
-python_prepare_all() {
-	# Make the tests use implementation-specific datadir,
-	# because they try to write in it.
-	sed -e '/datadir =/s:os\.path\.dirname(__file__):os.environ["BUILD_DIR"]:' \
-		-i tests/messages/test_frontend.py || die
-	sed -e '/^intersphinx_mapping/,+3d' -i docs/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# Create implementation-specific datadir for tests.
-	cp -R -l tests/messages/data "${BUILD_DIR}"/ || die
-	export BUILD_DIR
-	py.test
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/Babel/ChangeLog b/dev-python/Babel/ChangeLog
index ddf060f011de..1513909d7c63 100644
--- a/dev-python/Babel/ChangeLog
+++ b/dev-python/Babel/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/Babel
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/Babel/ChangeLog,v 1.77 2015/04/08 08:05:29 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/Babel/ChangeLog,v 1.78 2015/06/03 12:51:47 jlec Exp $
+
+  03 Jun 2015; Justin Lecher <jlec@gentoo.org> -Babel-0.9.6.ebuild,
+  -Babel-1.3.ebuild, metadata.xml:
+  Add pypi to remote-id in metadata.xml; drop old
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> Babel-1.3.ebuild:
   Drop old Python implementations
diff --git a/dev-python/Babel/Manifest b/dev-python/Babel/Manifest
index 7c2b560d3d44..3f6dd43347a9 100644
--- a/dev-python/Babel/Manifest
+++ b/dev-python/Babel/Manifest
@@ -1,30 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX Babel-0.9.6-setuptools.patch 558 SHA256 9b6d2f600253aab873d9f123e0911c24a8988b9fa6e30cff8fec7b8b1c6b866a SHA512 4dd31cfecfb28bad53e1dbfde3c39f382ea1cc6f3011ae87a8e13fd7df07ee53988a090364b149b2f89963ce132e399bcdae6fe68064945a6547fb3d347abbc8 WHIRLPOOL e06cbe858e2d48b7166b569270926685af0966ab7630eedb484cc33d7b46b4d66ba105bc6a32649bd04f5b9d4975bda0740870a44d976ad998a82baec76dc521
-DIST Babel-0.9.6.tar.gz 1820835 SHA256 4a3a085ecf1fcd2736573538ffa114f1f4331b3bbbdd69381e6e172c49c9750f SHA512 65a93a405f8734dba5e36bac62e574633214660667ba5b2a8c1120924a93fed84a2a5087127d20bd33e98fbd8400bb7634f56b27d5f6db574c81ee5fe10ee537 WHIRLPOOL 47c75b88cabd4ed08cd8be4c5e23d6c267e7681a279de8a9bee21c0e0fc8b4379ca519b797cb5245df774b0b816d680c0609cbd67d6e882e7dcb1f4149873c86
 DIST Babel-1.3.tar.gz 3401237 SHA256 9f02d0357184de1f093c10012b52e7454a1008be6a5c185ab7a3307aceb1d12e SHA512 3173d578c36d7a20d14ffcf6406ec9fe301e71a199069b3d2e53bd0c66e7f83d6e94f071dc08f2708202ec1ace4d14f4476234cc8347a37b05317302f0cfe0cf WHIRLPOOL fb48c95d0bdd775fa273f24236a05186f64b0e69a53ad99e2c4fa89b306d2d6c0856f72abe506b655baceaabe1fa481719e002c52188f4e01ead0a6f7057db00
-EBUILD Babel-0.9.6.ebuild 1018 SHA256 ec531b455da3a4752de0ff2f7817895204ed451d7e0ad168d3470e41b42ff97d SHA512 b83dc041d26c2aa77f164e1b5432d40559f37980224b8f7a4820d0351add0fd72d7c7adbfc2e0d7fe24a3789b99e15bf257aee7e9ee1c86ec6e660ba2b35ad54 WHIRLPOOL 9d19a2b35c0248b4795e49a502b17355b902a89030205dc638fa319cc80845585b0d3562562ec13b12a02247d868db6f289f11e3a848857c80c6b53a59c1c6b6
 EBUILD Babel-1.3-r1.ebuild 1574 SHA256 831061648082e61a9b2706821ccd8f9bd13f6e40eabfa20bd617df95654ca3f7 SHA512 1b4d9f2a7cea4ac36d7e287b70691565756df34b14a09fdc1418ecf6ef60a269690bd9429ac2401ce8a96cf9dcc5242be90bdf6eb2faf203a5a6c64dd599af4f WHIRLPOOL ba89514d23b8da9af87606bc7769053d753fe91269d0fecbc289dd80afb0866ffbcdfb75a64386d7c12afc773be262b981d12dde735be1f36df94297b746fca8
-EBUILD Babel-1.3.ebuild 1532 SHA256 42915e60654de2498bf7cee459c3e72a22cf51b18cf34f558f5d8dfb07052238 SHA512 57da3b56b94dd8848182405b6ccbe3d9d95ccd225dfa599c15bdfd345ae84c36550f812285f3aea31c7da84715fad6aabb47f22d31d6567b342a7322277d98ba WHIRLPOOL 57d8cac2c01d83448a5cfa12084e1ceda8ad9866b450a2b1daf61bc7273d0398c3ffd8f75d0acbfd7525a4478d06dc9b7242205b65cf6cde80e27750530c6ebc
-MISC ChangeLog 8327 SHA256 d60c07632b2ada96ab11b4f8188cc20ea065a086244a89faefe5cfbe19be9c01 SHA512 2ecaa844bf94ffc26962e6e418ea2d3d02a09ade3448a0e8a6f175c0191c0255788d2320bd76c6418afb35741245b89883a0177d48619f5847a9bbf3dce79881 WHIRLPOOL 99d32bf2b0c7dc5f8dc650ce491d546762dad2b7ca240367ba4cc309795e7ace5a6e963c0830aafb6ed1067bc31a3b92d72ed5695be948965b278affcf2cd14a
-MISC metadata.xml 544 SHA256 440622fca3c402fbc09286c74c16417c07c5e36121881bac3e76477697d8c5c5 SHA512 cb1a716130a1076a9e132bead62c7d695d960b391c62b4353cb9793b0026aea2ea6e284c914fffd5ccac959a7cbe2e72ed9cc2c89ffccd36767142a69d8dd8ed WHIRLPOOL d9b4df1efeb27c399ea4c90b5ac119a13ec168dd0d1242312c4241846b802c83cd67b8a2700c74036921bc2694aa2aedbc810407e732c8984f5f9f2eb4425c4b
+MISC ChangeLog 8479 SHA256 a8141ce309d155bcf36f36973b123186ebf0be3e101653047eb37abf20933247 SHA512 57d14866e2f9f5c80222472ea1858b9e89a222afb90573bb2bda813a5b203920b7ebefd1950c783085993adaf6464faf7be347c33d1536f1a7733e97287c89cb WHIRLPOOL 3160708faced16251b70576112c44a2d2dedd35565ce511b7e690842f37ab9b813f5703347f8710bbdc7df62ea850d3362e4326e0d101af822921e42e175611c
+MISC metadata.xml 545 SHA256 387f96e8a183f8686f8501c1491ccfa36704a5aedcc013e5a69e5008b3d86b96 SHA512 e70e0996cee82a8d6797f3934fbf04adcfb27995d7e674b4a94c4dc2a97c594e7157b0c1508c863d9ac80ce3b9552d16c73e6f133fe94b4189082a5224c037b9 WHIRLPOOL 1eb4a622966d0d2ea118ad49c45600865104883b6ab850730d6590dc91ed5320df2a3b8b055930c52d8e377575780b8a7d8e14fe16c60245ed5243bc1e3d4de0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVJOJiXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOx/YP/i41e4jztGFJIVXUnr4FNs0F
-oioI5+o2nLWu5MTFg2+Dlnx9FGFKm1UO72VBvId8iOBILd2+JEt7g/CC+YgMMYxp
-ukkjCKvWHqm2MPiwL3AglhIVzv3mnGDelfIMsqw1BWGioZOyQJ1je5pjWev3heVp
-lAQfbesaF/U6nYkgniI0MFYq0Qs6qMS7PXEaJWU8YTTknHve6aPClmWgqUNlIlNP
-MwZUvvKVVDRpfy4Ggt6kV4KA+HBIj/EHEARklDE1Q7u0Lk118pvuWjyQRw5ZzUNL
-n5yqqrcWHlvYBJAh3pRFrTFdxtW3AfHVc4h2ozrtX60pL63hkS+vbOY5zKJTB4L7
-+88rC8JcTgrq2tXDrxYTG/5YBken2q3Q8KGw3t1g0JLDx2VVe0+YWxWOmVqmzW7e
-M2ieTSFaJ3+iR1/Pa4IeP3W1jeBIzrmfWMNh7iWpklaIg6KzjKoYgB6ptRPNPQ7V
-gBarrE6xk1RYo3TZOoXdNeNSUVgcxC14x9QPvV8ZiXO+YozGSufflXSNnPbDCmWA
-dHfrUIBNircFG3qzupp1AviaAG8Mbn7gAl93xYhMaqX/khKTsWRN3cM9/xuISkWS
-w/aQuhS1ZGX+md0r3WOvRDQUt20o5cemd5YNgEdu2IcJTM5mRZNA+f/2rK9TtvmE
-PugRgcXyt3iblMAxzqap
-=O5a+
+iQJ8BAEBCgBmBQJVbvhkXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiih8P/jA6D6ya7oBp3JIoPRU+UHVo
+z6iAsJw4HXENGf7hifB0pva58LcGyJYSogMwiHqlkgNlzo278xMPu948C6j2UHNR
+h7Hn7/1QzMHnSmvr/K/spwWnZ2gX2pA39lb89uxC9bqX3stlnEFnHovYq9b3Chl7
+E2CE3qkke3BkjwPfauD3lJb7+4CF/tJc4s5Dz7wyC4M16bzLkdYwWhwa2VjZPyhU
+hCgkQnFV85DSDdSXw2jXYYHr0a0JFpveNGuaVHhehz99pOayP29MU0k5RJPhLay9
+GAlRt2ZATBHN9ej4e6FmxDj/1yNMObJv47LrduqlxmnRjjfAIYGdQyRPPtpg1yQl
+mQzLX+JiY1lIOIT8NtSkQ3uzTpLzPLv/axMl5ZLyi/2yfooRZbhP422hqoQ3hMn0
+t5GeGUtRI1ICHPPcnEhUjmP4knl6k1IQMNAUDWtGrYEutSDjnlAQBYZuK5ZS1Cgb
+gX6I9eHS1KWxy502qA+iEkzUjnB1c9cl65MG+FhVPK4BmPxut4uTq3zT7BN0BvOF
+FaAZgIMDYkPHzKl4DTd9fl1hkfI9qdqnP1YRKS/5U/a2BHse7HQqr3Hl1rCcp9PR
+nVZcIInHFy7q1EOb9x5Qr+ebW3YAnVHlIeRpyCpkWFnQJnqhfiwQ/NoAne8EIvC0
+efc95wTmK1s2tPIC/BSC
+=xfM4
 -----END PGP SIGNATURE-----
diff --git a/dev-python/Babel/metadata.xml b/dev-python/Babel/metadata.xml
index a0e04b5b57cb..9a4727a2eef6 100644
--- a/dev-python/Babel/metadata.xml
+++ b/dev-python/Babel/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
-	<longdescription lang="en">
+  <herd>python</herd>
+  <longdescription lang="en">
 		A collection of tools for internationalizing Python applications
 		Babel is composed of two major parts:
 			- tools to build and work with gettext message catalogs
@@ -11,4 +11,3 @@
 			and date formatting, etc.
 	</longdescription>
 </pkgmetadata>
-
diff --git a/dev-python/babelfish/ChangeLog b/dev-python/babelfish/ChangeLog
index 3944b3051caa..43b72e22ea1b 100644
--- a/dev-python/babelfish/ChangeLog
+++ b/dev-python/babelfish/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/babelfish
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/babelfish/ChangeLog,v 1.7 2015/04/08 08:05:17 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/babelfish/ChangeLog,v 1.8 2015/06/03 12:52:18 jlec Exp $
+
+  03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add pypi to remote-id in metadata.xml; drop old
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> babelfish-0.5.1.ebuild,
   babelfish-0.5.3.ebuild, babelfish-9999.ebuild:
diff --git a/dev-python/babelfish/Manifest b/dev-python/babelfish/Manifest
index d8d2e06fa87c..a905ce6ba409 100644
--- a/dev-python/babelfish/Manifest
+++ b/dev-python/babelfish/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST babelfish-0.4.0.tar.gz 89386 SHA256 1c22bf70ecc61d0ebe637edc3868dfb146dc5a458be353b20386406e28a18710 SHA512 f9e2cf8ec367cead528d99019fc1e597a94b6654cd2b5c39ba3e2deb9e579bd8af54f463510f709c5c540911e01ed830511f833fe2400bd7ec6a70cd05ee642f WHIRLPOOL 0034705cf62bde3851e9edc4cc63316c4874c404c65fd0ff33937acb1fc4da29e54ad03aa8e11ecf98bcf0f8bc5f2c1b89be7963f63611a481650dfc709e73ab
 DIST babelfish-0.5.1.tar.gz 89683 SHA256 bd78ecacc684aac8939c2937fe25c85179123940997943381ae9c22e37bf964f SHA512 24f192867ba5e34fbe5f5f90cae479b095577b6b6a0a0f6e778f68130b0010c382e204cb1da15f062929ce231f3f9a5bb5c7e4c01a4a2dcbf975e884a25e4210 WHIRLPOOL 3f0dc56b981ac2ec59bb4ba88f27419de0e7276fbd05e845c76f46081afb2561e6852081a1be6f0df36a9fe110419c49679d8e4255ca4e1b37e6689133b05114
@@ -8,24 +8,24 @@ EBUILD babelfish-0.4.0.ebuild 660 SHA256 39c30728a45c44fdc506fd7917ecae044f37c75
 EBUILD babelfish-0.5.1.ebuild 669 SHA256 482a17490d1ec3451321850c909c604e714a6ef15a2d90d36c84117bc0971af8 SHA512 4ba323087962d2fdac33824ff304575e38af929aae800eb8abf13af2411b0de77ceb40800906ab8b74a8886f845cd9972f13f6faa4f18b2488e1c8b67f3e6123 WHIRLPOOL dc708c361807f3c4117a69ad172f78ed896590e4989506b6bab45fd1388dc97c136137515c78e1e70c39e36461d0087906ce4f06c3ef549a4495d3d28b3e55da
 EBUILD babelfish-0.5.3.ebuild 669 SHA256 8da939ef6caebd1d20ed464e3031021400d2c1c4fa134c11e289eb23767d294e SHA512 6a670fa939cd073555481ba25ba836c2fb63bbadec2725237876db151d16f056bf8a23044376a3ad1fff9d3ecac33f8db44fa94d987fb012ba54c28e728b0355 WHIRLPOOL 05df9b3648f4ea7821e845e07b577c5fa7e25037406d99767979a0fb9ef950a240bcc3a698ec8873a7b2143fd17e319a1433fd8a08f133fcf24b8b4307f005e6
 EBUILD babelfish-9999.ebuild 668 SHA256 4f34a4d6daaa6c0e01834ef0e4c29b9e1c253ed348c7087d033dbd76fb0905f0 SHA512 55df660eafc57287d4e54ebe543668a1d0eec513b1ace5c43b237b7ac9853634c6b6cba41cf10563b866dba628cf074458b6ec91a0e50ca4cfd40b0856f063b5 WHIRLPOOL 3defd8ef9734ba3f6d1417835d9132f457c3ac2550e2ad6efa6f6d07d38bdab3171c0326512c1822ff48f9fa0a24959fcb6f3781cfd8a78ba11a1f4795191f0d
-MISC ChangeLog 1358 SHA256 8ecf1fca805c81155b6720b37558875df18a7697d69e6c91045e5ef715107dda SHA512 593787f9f004e42d3e47bb1d429e6e008d9a407fb3d1a98a835414c18c47dd8e4bbd32efdc0dfbed5d71b8c24dd2d6a762c0780c138bda0f18251f7ef2240608 WHIRLPOOL 34015d028d4639802ab0cbb7185a931a70d2af5919866f51ee4fec913c6ba0c086cbb6c849e436f6f26410415d3a986adf4e0948c92fbe10f3b11505c2ac4a10
-MISC metadata.xml 227 SHA256 7ff268c3b48d6310e34944871d18622b9d075f2831dc5954ebbf48f618f1c944 SHA512 edeaaa76df4173b44e386329ac738b2b234f51ca55a5eb29775828ad7ebe737f797bcded80f3353bf5a57d1cb626a82752657abc1dffdcf8f8989ea5420f85e7 WHIRLPOOL e69d29399029be93641496ec2233801972d25963cc85a94647d04ab0852465178c83a0e8bf9e8489ebedaada9c57ad3ee229935be20e8bb8c7c6d533e6bee760
+MISC ChangeLog 1468 SHA256 4cd7f0b99572b11a70d4ccde6827038d409b38bb0c7f94630d79e10a0b0161eb SHA512 25738553e1d91960041a6ca93e362714c982ffe848be5c825d8f29920a1e246dccbf007d3c05548c6bc5dbfc0eedf140990169e48f00f3b14f60bccd5250a38e WHIRLPOOL 39a66aeae58496bf84965e47b79c16bb8a6316d518feb78c0005fd02840c6766dc0637c233c731eb8c6fe4a1ae27fee65b4e27eba36544687327de9e11c42ffc
+MISC metadata.xml 312 SHA256 0f28b73a604a4a1261bf79a34a8ffac140f18d758d3c5f93995fdfb4fe657a41 SHA512 5e3d64b14ed54b638f17ccd441d71906efe7a92164f3b0b892f0b3370021114c5d44c3584c08177543360b33eb9202f14e68d0f8421a9c8e75bcee9323628787 WHIRLPOOL fbc7c70bf8469ccfba74f454ad065dc777662fc7bd6284f557ac2f50f8ef1366d9b37394e870c2dfe75e7e590b210e98d17c0a095faf2405f8e1b3e2ed865710
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVJOJlXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOnxMP/iY9awwTEkzd5wOrXMnWnm8y
-KWzRFaKpZDPpUjUb1KD0tXI0aPfOYVrSFVT6HLStmdFiXOopvJHKttxj++yx7jrd
-8hPoivx0sEDsW7YTJQHAHhenp8sLzYpwI//wLmfb8aEI5q5cOKntsu/bVnf40TDv
-pqvG7djwOIf8nm7x0yNxR/aj1hx+AOKFBFmFKT1OXIUw0gScdNAvE3kRrdkCdi0G
-UT8AZic2IxXfdIzEdnKRK70fAKZy2mKZNQch25XpjhNco26ROBCvnEu/l2PZ7JRu
-bJXT1wncutNuunnQBXlU6Q1ITR4mLVqYU6mKq3f3Fn4omgRwvIwcysdgi4Kym+FO
-eoijexMdm5gMBJAty/j6+UhqfAQLXOeuGQkIrk6SG7VmB40brOL1h56d55gb1Nfu
-TU5q8hNcXQasd/yzWkZJxXgmSdEUYLUYcfkNJ5JZ4LnukPzc4AODp8A5ExTTkxzG
-rL7pvrPjISYKTUGMn3jkEcHqC/4LH+kt60eyMS9KBoB+fpTi6vweLfqnLQuQdtGX
-yVwTZCeEHpwZdTFpOtakUny0ycshJtmpwcfB+Iejk/ICS3kKeyWez9nqZNK+VUKl
-jOuGF23aJozv0skpDB4MWl9TbMwg/M7IUiNHgdoPPz1VD3KDsoMSNS4jw4QV7TBo
-vuUfN3LJnlMFinly0Faz
-=rcR1
+iQJ8BAEBCgBmBQJVbviDXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi+YIP/RkIDkYt/NOEvwEIJQI9hyvf
+FZ1CmVsQLBtD5TFfPkYrkvA95W3N2fn63D7Oj/GArqqJCKBw/B0l20L8f5rKTnnl
+eobnabDv35MSHIIF3rNXHYyDGFnIGKJij3oq6C0e6Dp/v5zXvugxSKqyvAjTTYRO
+zKIECeeNDkuDi7Ph7ShyoiglIasBVy0zEGdmqe185WcxlvSS7qTamx5UHqie/Qec
+erIAN6oEky8e4w2eb+uqAeycA7NDsMKwn3K0I9G3bIq+74U2rJedu2PV4aFsioWg
+fA2lwB6Ed/NllZzdcSZL4Ds4rqfm1JKBg+ksYpBzwcr7xt5EGF06/i9kDCk0uMZx
+K7/yQJTf78ttCAF2wfYJjcx6hmJlYgNy5mBPY6ImOYAlSz3znjEi6CMKcr4+FavY
+H02b3hV/c4nesvfSUL8rH2rG2fSNdRudwpFTB6ypyGGTCD2J8Ry5aXcE+xL4Srol
+hCQaCrxeoTZ4CoBdTgQr4w4hMj+F+PIEknfO7+xL79/5J4yESWxD3f4tKcJYFY0k
+Q5zmPc2pRR95ASUOfubaSvXZsihk8rFFqTRCc/13oykxAXTC0Y390iSsC2jWOhJ0
+FeEOjZcY/miopObiL1Q5xU0BuODUHkZXbZ8VGd0Bm+DvJLl3VXybqCI4CSyto3tn
+ptKeODlWvsMRRaKCL0xb
+=w19W
 -----END PGP SIGNATURE-----
diff --git a/dev-python/babelfish/metadata.xml b/dev-python/babelfish/metadata.xml
index 64dd27329d38..1d1e01fa38eb 100644
--- a/dev-python/babelfish/metadata.xml
+++ b/dev-python/babelfish/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>nikoli@gmx.us</email>
-</maintainer>
-<herd>proxy-maintainers</herd>
+  <maintainer>
+    <email>nikoli@gmx.us</email>
+  </maintainer>
+  <herd>proxy-maintainers</herd>
+  <upstream>
+    <remote-id type="pypi">babelfish</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/backports-lzma/ChangeLog b/dev-python/backports-lzma/ChangeLog
index a0a693b45404..6429d734548b 100644
--- a/dev-python/backports-lzma/ChangeLog
+++ b/dev-python/backports-lzma/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/backports-lzma
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/backports-lzma/ChangeLog,v 1.15 2015/04/08 08:04:53 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/backports-lzma/ChangeLog,v 1.16 2015/06/03 12:53:28 jlec Exp $
+
+  03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add pypi to remote-id in metadata.xml; drop old
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> backports-lzma-0.0.2-r1.ebuild,
   backports-lzma-0.0.3.ebuild:
diff --git a/dev-python/backports-lzma/Manifest b/dev-python/backports-lzma/Manifest
index 745ef9ae8cb1..cc681dd23add 100644
--- a/dev-python/backports-lzma/Manifest
+++ b/dev-python/backports-lzma/Manifest
@@ -1,28 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST backports.lzma-0.0.2.tar.gz 31795 SHA256 a0966deeb2533e96ea84dc0fb7948aa23421c7f061197133b62665a52dfa64e6 SHA512 bf9c79dbb2b661765aa61510c60ddeff57e301ff333a1b5c327b35aa5ae39392a7c753d4be83e576348e5d64c1bc09cfe8a308dba93d8ec186e4a35c6f8843ea WHIRLPOOL 3f5aa12627fd00901b6fc1c4f1461502ee65f975b411e334d9c1f0b87d564e134c4e101e633c8f57e74bdcc132262aab3a88aa0dad620cc36a1c209ec806af19
 DIST backports.lzma-0.0.3.tar.gz 33848 SHA256 bac58aec8d39ac3d22250840fb24830d0e4a0ef05ad8f3f09172dc0cc80cdbca SHA512 a653b61d1e45de73ac13845127fecd97e84872c453be9e090ba2d6d2ff6187817ab980e36c1961f0a66bb9a660bb716fc7679b5317a4ff41db42156024847f45 WHIRLPOOL 33eb3c8b1c9aa8d4beabdc52247cea4b0ad2913989a2b508f71073a7a6b8dd9b6260339233f78d8e8f28476c48242076b3a95b427155f0605336e17b79e0d9ee
 EBUILD backports-lzma-0.0.2-r1.ebuild 943 SHA256 2127a4b6ce3dbedc45c0c28b4b6efc7713efc8152daadf42ebbc1ac04498fd0c SHA512 4fdb99a2888aa3ac674cada304f21e9222f39145773ca70ab0492cb71ffc8149f6a7363d5608c0354e4671ca5ba7ccafcb5b3a704ed11837d18207616d8e1709 WHIRLPOOL db3383e8307ee201ef304fdc1530d128a74f82c7c5707338db73f9a0e7db1a828b8277eda528227dfd8400d8a37342166e1da95cf241a1e5c73a7a47a83d76b2
 EBUILD backports-lzma-0.0.3.ebuild 1055 SHA256 0889353e76a8f58985f5773b163506ade42d698c2e37978ab0aee7bb9667165b SHA512 a49a87ac34b87fa43e17207864691d448a7205468fc71f2cd3f2eec177c46fd06fd85a1ec54268e85ad8c20c589b9fd1a72157723fc50508bf68f7bd8f1f7abe WHIRLPOOL d7208d761e6ceb5cfbf4649dd2708bb6ffadf401698eddd95bc5b99d9104344da6afdcde06d19e75c78b873706f49743faca3a8693d6f03eb9cef07ae2990dde
-MISC ChangeLog 2275 SHA256 58f7da4cdd9453554a63a7a3b315424a880c43fc5de55468db7ace2591f847ab SHA512 40d254070b35d92126b0ba1fd40ab2a24c30db59600a843eeb10d1b11472df026863b0969102a594190a86de03ea69693d428d2a38c0f380e96af45f3ba3974e WHIRLPOOL 4f1c73e19c3d07655ff250ea21e3bf479b5b1b1fe8fc5b8a4e08a173f69fff89b59486b5142b8d5e69dc60bf42f53eb62a8508b1860ab9b1e7ce803038f1e81b
-MISC metadata.xml 252 SHA256 fa3b3272b4761ebfa1b8658630d7f5843ce6dcddc207fb0de0509da5ab90cd50 SHA512 630a5df2c7eef65eec11bcdfa30fd2c8712560bd60ae389d30395bcf351193368de34a7d989a5e034684a8e0ad40c1a2b4d53c07a607a4bef2c717fde78dac2a WHIRLPOOL 1038146779586aaddd03f133df34edc582b5bee4b29ceb280982d01d4f7a220761846134c14dc6c210974ed2772483de4ed1ac607b64f0ee173489d477d2cb44
+MISC ChangeLog 2385 SHA256 833cfec202a87fad11f57bde4a046b24028946db90c86bf6146c5d63a6b96769 SHA512 eae6f665dff04970cf663b36a7b28307911e5c38a9bfa7f578caf6f1e6fd0a10e1e7eb29887477004fab705a44c61caba0f0aa1cc0eb1c89d15230f4b3e11e48 WHIRLPOOL 1296883d1c347911adb513c7a4c99a3e0a93ecaf8917ef865700e9ded9a99a78b32c6622e47f02f5c5823d3e94a395544b1a9231e43549fe2486431278442f6b
+MISC metadata.xml 306 SHA256 a458eeb7c0d0edf1518a566a197168b55060d5636c38a725a9cd04c34e46221b SHA512 6633e0827dd0efc1487521ccb1c34804e62a2444634316c83d823fb3364d268bc2c74591f9d53d6704e55a765850f13f6ce294e4c654fc8006a2f75db2db1817 WHIRLPOOL 78018fc56518ec443cfd8300244affcc39564f0ff857b742474fd6259390f137d35609f70d40e26c919bc66de7ec0bf895281ce1e73cc06853e3fdb1be97ce35
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVJOJlXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOxaUP/1gJ1SeuWhxFl5yvEzFVU5tf
-QuajUPtXZ7lV7Mdm5UPU1pGhVYW4/F318zOCHPiQTRQZXD6TGf2OREsQ/cT9l8Xq
-UvMHBiErQVNvPxxhy7+bLzHnHj/c/NwEdtGbSZ6RNbWswtNHy2RYjCXgKZd17sBS
-iPL7FskaCWEdMlq4CXAWqHTYGuDMgis+OoBMJcFG4EZLs5P/70Q/8Fe9+AxH9hPX
-c6qB/S0zIMxA7yn6ZONiNJKCgX3XT4Cg71MxoXnERw2fzqPL+saO2xQCYztVUmEF
-6K6SjGxbVE5ajbnp0HpiMonVvCt5OqAGvrQklhjSah7qtT4rF9k/ANGuBp5V0Z1f
-0jL4AOqLHnF0Jn7mTuVqN6qKGBtOpbi1ZrH5jnWDcqVrrlq9S4FMnCS9y1r93AlM
-XaDrCXj98curLGuAKGcGcmrmVF+LnwdSzVwY3C41i53rnMCvsUL82tU7rY3pIWmM
-uNZ/pAHGs8mXVpVQ5lfPgiX3jcVEZEWfKUCEHYyAekor2+tkW2AvxmpFj3s8UG60
-F0OGm3fsCNofpCai2Dejl1lCF+m2eHhxJOMFBcG8SVGX+hEwwee48YPyTJ7+2kcW
-NB70te45/vVifqGJZJXS2bhUa50fF5/jgeVfx4F1V+iQda1bF2efzPf4q7yAjuCv
-KTx4T0VfpUVZqPyatsC+
-=TpYa
+iQJ8BAEBCgBmBQJVbvjJXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmilyIP/1ErhQZN9iDfLSMw5fG6uwzY
+/Ss1C5bsFQkVYUkRp4Ef4h4gAp1ea9aBeq3QxhNfcXk+5xwMOUkOjquIKyTMQ5Mm
+DLzE9Wz1pdjKfzpfaZA40doLgmBCDnQX+Vwxfsp9eCIKbsG0rF94EPh2JryX9zqa
+kDxqedY1l1o4RxH0VWXbzpXTNLLZKLajBHYGmEo1akjCcL7aHVfT1ThQp+YP1kJD
+mhuspZdV43QNV+vT+HkHLjrRSsIIZjKTcIhIKORRhVnuY6mwkNu9q2SjL0Zi9xqi
+KB+QUFZfS6nK8dh6pViiweq7eeqDBS+bn6jXMgA9Zfn/WByqSZ4BxGdSWpgnYIY8
+FpWeMRihgSelMxbX/bo6zp/Bn22WkBPo0NLMU++xFttw8sBa6VaRX8RD8fqhOMGa
+pg/QwsmU2HF/TchMa+pqwim+7ym+Q7606/37ar31x/S3SN1ZXakiA0OBMcgOYMtq
+eC/gVLbEjRTI9jUPrNvnhUeF3inDlnE9OFo3vQ5zCGduRRxJ6bwz1yxYPbBTHF2R
+cWdraYnUzRjOGYuoVw6m/rDHsZRACM+spLoXyVglt/CFGF3SHqYr8XaWUWSIrfDG
+jcsUP42AeTy7BhIUPct+OWefCznAtpwEXTs0Ag1upAa4r14hlEeX6LErWonxq+kr
+8h1koG9vSl1ppvaCOfBk
+=7MrR
 -----END PGP SIGNATURE-----
diff --git a/dev-python/backports-lzma/metadata.xml b/dev-python/backports-lzma/metadata.xml
index 4591331b4b37..1780f771218c 100644
--- a/dev-python/backports-lzma/metadata.xml
+++ b/dev-python/backports-lzma/metadata.xml
@@ -4,5 +4,6 @@
   <herd>python</herd>
   <upstream>
     <remote-id type="github">peterjc/backports.lzma</remote-id>
+    <remote-id type="pypi">backports.lzma</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/bashate/ChangeLog b/dev-python/bashate/ChangeLog
index 2233da418b49..eb45a852f18c 100644
--- a/dev-python/bashate/ChangeLog
+++ b/dev-python/bashate/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/bashate
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/bashate/ChangeLog,v 1.2 2014/11/28 10:02:34 pacho Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/bashate/ChangeLog,v 1.3 2015/06/03 12:54:18 jlec Exp $
+
+  03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add pypi to remote-id in metadata.xml; drop old
 
   28 Nov 2014; Pacho Ramos <pacho@gentoo.org> bashate-0.3.1.ebuild:
   Support python 3.4
diff --git a/dev-python/bashate/Manifest b/dev-python/bashate/Manifest
index c77b971f9d57..0ba7cca3ea0c 100644
--- a/dev-python/bashate/Manifest
+++ b/dev-python/bashate/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST bashate-0.3.1.tar.gz 16016 SHA256 2398140c35fcb03249640708aa7de652f9cbe680ad6cb09074a89255f6a30419 SHA512 dfa3e8f98879169cef445cc9a788b4ed051630330e2270c721e472f080899d6742cd3deb571049ba6b943ada0fc77a70f5a7e4742a54d1ca6d5f075a92a00ffb WHIRLPOOL d35e19ee324aa419e855ab4093b3b57f0420a5d9fcc15ff64c32935865e8680b21278f529f87ec0338807d7e903af5918f78a0c780ca7a89f672c0cc87b884bc
 EBUILD bashate-0.3.1.ebuild 818 SHA256 5185805225009af26c05f89cfe10a5c484ce9c322e7e8b4ecb60cf09aa2adc12 SHA512 e04929fdecb95088c0717c6792278d721b1df7b07c482a3f83b52515fa8e6aca7d3546523231123028ab424e435eb7c081c7ef56568cacdaef1d819942fdf476 WHIRLPOOL 9eb323286adc8bfbac13c0311a4346e8035d1e8c59d1cb32b0ee66fa87aea53ff9333050a089c5de35526e9dc06acc231ac0c71d4a9e2f55ac64288d043fd3fe
-MISC ChangeLog 457 SHA256 3691a0039570ce75c619d1ae904110a725379799848fafeec59f960cea1f4203 SHA512 f0c9709e40577a46a08522d37628765ac855b29a409cecca067f61ed656bbca3c60f7fe7732759aced2a7b97621e9c1c8757af3914dc7377442313c1bbda8cf4 WHIRLPOOL dcf0b46fb6ec1350525682b05bcdef75b841605538402720c88a903950e79263ede495bdefd47cc1841142254dbc68066092bab47abb737703b590ea616b1eec
-MISC metadata.xml 349 SHA256 92cba4bf5a8c6dab28626ed8e0578dd46c1e8e7ec02727447ef104acd1dd144a SHA512 1212c30d563f60c5e0018ca92c03d4ca91e93bda94fce22b4edbc206b24a7b2810fca2a07f45d8472f35c80a6360089419e24ce41acda7a3f9934f003c41ef3f WHIRLPOOL 08237f412d4836235dc1f4d850f8581c3b8791b03495af6a74c7d4186aa2c4fd056b3a0367f92a2c616688e2c8341b87ccf99fba0f6c21442c6aa6948031eef3
+MISC ChangeLog 568 SHA256 3eee48cbb99fa5b173e558688fc80f3722f4594c34d1d174b235686174b286d4 SHA512 b78d2f0d04079a35a9bf192be4e9efae4a94f0dd62e39f3ab909f6fe160ac8f0c65e4b1c9ca5472cb8635447f74c83257dd14337c192dc4bc3e570e336516907 WHIRLPOOL bb596226595d25cbf93cc2f286688cb3bd665db9919302bb51feb51af761789000caba8bfc88e1cd1ea2c2196bb2f67d39a7eb55dab79b53b98213fd2d90cd1e
+MISC metadata.xml 431 SHA256 1f6ce8c54405b651ca8676105763238a1f176c92d8e32ade29b8c802b4861347 SHA512 4cc01f98bea75d9527eb84eee303f59271b5db0b49371bca0dc9f2f87391ba8dfc031bcd7ceba9982b643079f073186f9875624d8f019cef57d82d193e631807 WHIRLPOOL c3dd07fcb42f3532bcd38adbed2eb60c7ce30e1b183a4da7884511554181d526157d74d51b9600f2d307454406a4206c331da4b7df320a7677ad1926694a0acf
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlR4SDsACgkQCaWpQKGI+9T6sACfURaLinAsdvxriKm4qYwSWaBO
-O3IAn3iRIa+ZWjtgJmMEVhrFQN1jNEyV
-=UcPM
+iQJ8BAEBCgBmBQJVbvj7XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmijJMP/3r4pEj1pfm5jNbg3dbIhDGn
+SkGBKBck7607yvXp32D2tSKbM2Oje3wOs33oXjd92BSnWLv4KvDEwu+J9TZL71fF
+Z7ZOmVgd4TFBYyQxZYYtI8xaTV3BCxu4bv//6dVYfu+1gbf53VdZNc+Xlc0cB5rH
+oFC6B0RIgm3WPj214jhpAB7UOQu97zwTwyKECaecfBdt03XM+ni7u7u04jxrpBNv
+WYKNov4kYRMWdzrKyzNEycLd83aEXMdLEVZjuXbRoreHBm+G+RCgrtToG9VOZVXV
+UBGAvVEnVpNSw/cWMg42Qj+Gq7Yz2RKDqSaL7Gnp9WR52o/JGJcdmXY5OEdXXvrc
+NaZobMGsE0WL+reRtxPEKWOxSid77IFUBAm3fIO5UJMfKELDt9v09WvyHov4Hunu
+pwn9H0hhVdbdoJHf+82OQDTUwxbZ0jKT/p986XWb/c/djOfLkAeM0wkmXiIJQRvL
+g37d7n7E4dchE77rkPO7EaM05826p9ceaqdA8450LyDVSILrfw8rblKOuqjXynB/
+ZjNoAKFtFNPC7s5XUj8AlFgh8YXIt7tOxW5W0AYp9WrhaTKnH7kN3HI7/ujGPXEI
+4SWW54tEEoAnjzuLF7NBrt/TZ2+QGjexzFepW/avSlrot9a8c+QgbvI6vVwVYdYw
+IrJ6J8Po6POOOUMkSb6h
+=btsq
 -----END PGP SIGNATURE-----
diff --git a/dev-python/bashate/metadata.xml b/dev-python/bashate/metadata.xml
index c601df2df571..8e82ccfb2d1d 100644
--- a/dev-python/bashate/metadata.xml
+++ b/dev-python/bashate/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>openstack</herd>
-	<maintainer>
-		<email>prometheanfire@gentoo.org</email>
-		<name>Matthew Thode</name>
-	</maintainer>
-	<longdescription lang="en">
+  <herd>openstack</herd>
+  <maintainer>
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <longdescription lang="en">
 	A pep8 equivalent for bash scripts
 	</longdescription>
+  <upstream>
+    <remote-id type="pypi">bashate</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/bcolz/ChangeLog b/dev-python/bcolz/ChangeLog
index e2a95c8bd047..7a2b46e145a3 100644
--- a/dev-python/bcolz/ChangeLog
+++ b/dev-python/bcolz/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/bcolz
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/bcolz/ChangeLog,v 1.1 2015/03/01 14:39:41 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/bcolz/ChangeLog,v 1.2 2015/06/03 12:55:34 jlec Exp $
+
+  03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add pypi to remote-id in metadata.xml; drop old
 
 *bcolz-0.8.1 (01 Mar 2015)
 
diff --git a/dev-python/bcolz/Manifest b/dev-python/bcolz/Manifest
index 43acbf70687d..69443bcbc5e9 100644
--- a/dev-python/bcolz/Manifest
+++ b/dev-python/bcolz/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST bcolz-0.8.1.tar.gz 533475 SHA256 c70f986a919842909ae96ff18994e3011d237c9fd0bbc0ee9f3588db736c4296 SHA512 022546f0908130f4af26be79ab9b10fb3d2951a1fe5e953201b249cbd4bcbd3003279c0b71009f29046bdf4b660a6e2d87672c7f47054a03f1df4d9dab83cb0a WHIRLPOOL dff6b600a36bc760a65d3271068d9ea19854eca3b3fe08248bf22d41da0b71315eb254ad175c78f54eb5170397c4d587c48ec3eefc74e5903214adde057f3f76
 EBUILD bcolz-0.8.1.ebuild 1253 SHA256 c0a492b1e6045b6b3c6f19ce23c235ae7666edc4e4006117c98e2e41663a4aeb SHA512 7b93d80b7c62fadc849d33f6b0fb9610f1d51f4b273ec683ace6fe5d733508a62af175fc49c76466d76c7fa209fc493a4edebbbabb17986e09e816b4e6977a28 WHIRLPOOL d709107e5167cdac7b6ab7c66930896a5cc0a25fcf632facd97f2a726ab1b896a7675cbf5a25829b108a5a01f544983d98425d313dffd2c28bc47d7240bc3e48
-MISC ChangeLog 362 SHA256 2d18bd88a1e34180285bd6aa8611359029c4ea9495c2a8c097605e03a1d96b20 SHA512 84b015090a529dcdf6ec5cb5caf06999b64c74fcc8b9eed28ec7df43698afe613c27bbe8ec5477860e6acfd4bd8ce2e30c8d0a393d417d376d638d83b7718ab1 WHIRLPOOL 9a035e8261cfe4bfd607138e6ce4e4d5a474d7018fe463ad647799ada53544c670ebecff3b35747a85c0bcdaf7fb14252e0fec0198001257eff5402be8d65c70
-MISC metadata.xml 160 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a SHA512 7c02a1de1ddcb6b7c6378cceff0458da3a15d5381417f7cdf01874e7c372664b8899863f41b3a2fd8d6ad67ceb732dac6da0cc17575bf8e3e6d89480417c6628 WHIRLPOOL ed2795e4466eda8c804d5067c87386e269a59fe959393057ca5ddc36851e00f5210c4da1adf4bbdfdbb7d1d3d5c60aced25727ca12fdc8305d9e263a3aca9b13
+MISC ChangeLog 471 SHA256 e9abc32fd6f302dec474a61a36978317f55941c5b9dff57396db58924565bd24 SHA512 f7c3e9af75dbb3ba212f77c1cd0a0b5cd5c0bc313f0a876951bf26ff99a79695f16a020086bfdd925352d3dc0f5f4f6d58630913a7ea5de8f5365b5358b658d8 WHIRLPOOL bf1ce1ad73add428f6d1f662e059baeb6cc2a678564a16a1cad9a43d348c8b5c12228a37b3daf6116623f4d4b1a511db26089f9042f1117a88cc5cc3a9d8143b
+MISC metadata.xml 233 SHA256 0c33822078c36a9cfc596272985501e69debee79d62ad86b5b7c094423304ad2 SHA512 9342019e6ec5d45c37459970d0dc19a39489040eb4a9fbc1fe78dc4c9d72cbb81d0903803ed8e21caca2f2810a46bc65d7fd2669f2c7b38a817d9df8d95cea72 WHIRLPOOL 84741d576c54dae3a84a52accaf2de7307d245ea20b80a3582df44d683e50c7c999cd9ac6c439f400f65ddb3e255c5df4bf0bd3b59d8ef24dea5dc42c87583fc
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlTzJL8ACgkQso7CE7gHKw1RWACfZLwln0WtXhkW7OhSW+EweS9H
-XbcAni3+Z5bluW5pmBG/7cLTUdJBqQvM
-=xCC7
+iQJ8BAEBCgBmBQJVbvlHXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmioYEP/jCA2DnTKcVlPh4OWStdNJpU
+s3A+iKcfQCYW7Fy+KYC8hBh0yuzz8xxiH26arPHIQ/BxaecsX7Vram3UJ7Ok9I76
+x997qFwhZz4OAD0CKmXcE7iD4u/sZjLA99slY3gZcjgmBm4ab7z4Cn+qi0iBfkm4
+RYU7wDB7deOU4/MiB2dO7QV9P0BdxfCvwQVrZq4xMA2pKPKKJm9rziZUXl1jkBWX
+7mBkjnDvHmtH/7eZhdhVOukcwqCfcmR34ExmCooPYjkuMqC1z/45MSOBc0W2nWOu
+sSza7FHpSiRDvWDSQTYwkbMbI0uwJc5oakCI9Eoxw2wEJQmp57ziJ4TR8iYOLlJ7
+cApCso25CygsrRJAGDsno8sM4G76/7jHNnmBddyqMuLMGWr6wcA6MqF2M7jXeNGU
+Jc1kVeNKFUnwyB21K4uB08t2jeLUBkFOstFq4jblKjCeHji7CY/Y1p3AWO4rIiOP
+qQmgMiwtmzHvnkop8wWuo6CvWtXToqevoWJMaNV02JW6blP57qLWz9ZC5a+Foji6
+Vte+wuQXFuAMhW4cg496IQeCZ7t07nGpLPiUAW1AevDYT6BJptPoyvy/Fy2OQVl2
+hCWZzOU9GsphPMl6Zi/WwB7nhzF+M253cat5pAC77DNq9ZCp1dn+OQup+gwPtNz7
+AV1EnTvovbzxMl10VSTB
+=WhMf
 -----END PGP SIGNATURE-----
diff --git a/dev-python/bcolz/metadata.xml b/dev-python/bcolz/metadata.xml
index 301d2207cc29..68cfcf33c493 100644
--- a/dev-python/bcolz/metadata.xml
+++ b/dev-python/bcolz/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+  <herd>python</herd>
+  <upstream>
+    <remote-id type="pypi">bcolz</remote-id>
+  </upstream>
 </pkgmetadata>