Depend on setuptools, and add some migration code for 0.13.1-r1. Bug 468702 by Coacher.

Package-Manager: portage-2.2.0_alpha174/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

4 files changed, 28 insertions, 19 deletions

diff --git a/dev-python/ipython/ChangeLog b/dev-python/ipython/ChangeLog
index 622d26fdc346..5424f1a093c2 100644
--- a/dev-python/ipython/ChangeLog
+++ b/dev-python/ipython/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/ipython
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ChangeLog,v 1.106 2013/04/27 19:32:41 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ChangeLog,v 1.107 2013/05/07 17:30:28 floppym Exp $
+
+  07 May 2013; Mike Gilbert <floppym@gentoo.org> ipython-0.13.1-r1.ebuild,
+  ipython-0.13.2.ebuild:
+  Depend on setuptools, and add some migration code for 0.13.1-r1. Bug 468702 by
+  Coacher.
 
 *ipython-0.13.2 (27 Apr 2013)
 
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index 1dcdc84d53c0..eb5d39efddf0 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -18,26 +18,16 @@ EBUILD ipython-0.10.2.ebuild 3252 SHA256 297a5c6573ecfaada05fc527101d82925680db9
 EBUILD ipython-0.10.ebuild 2648 SHA256 324cc78e4b695bada7b0dea501dbeece1e0b2b2796f10f8966a347c16659902e SHA512 39c2fba8d3459f95ae0b3debb69377e51ed074e87502c6ae8ce0f9b42621d65c68884ab6f6137dd5a01ad2a252f92fefa91aed025753454aa87a27bf8cbfdc0f WHIRLPOOL 25652e3f1b4fa8747f82481863e579fa5314e817f2491d637bf1591ee6a5d16ef5d2458af8bb73cad325a61005813bfcaec435103721c122603c1f7b8d076746
 EBUILD ipython-0.12-r1.ebuild 3978 SHA256 14df5c4f519c7e5a8257302ef11c891462bd45c307ccf87e34a2c7fca32dd932 SHA512 e604f1234fc6b49242d3e3988677e9dfbb7d93835fe3a657024253e88b92040853789ca624601a6102f243bd041f407e3c94fcd43e4714af42382b196efc7e8c WHIRLPOOL 383c20e0198f35688f0995a7aa416c1e543ed573bc638a2ea328b258e737b902815dcbf29519e74224adbbe468fc6575becefe47fcbe60b9f1cb29af83e42f25
 EBUILD ipython-0.12.1.ebuild 4016 SHA256 d4ad879fae3cf331374a5625b604a2101181db2072670c4512efb338eac80340 SHA512 eb33d0e6f3c8e6948b92227c68d975a5c2da572f23446c30ac74d5f53bd13ef1547e3d9b001526726578f798e79bb545e3ed304d3ccde33ce92bf68e0a887c39 WHIRLPOOL 35e791ff12b0697fb44f8d1625b880675f789aa75f622445385b98607d777798898356853ba1315aebefef7e42cfd426eac51c14a4c29cc3f827a2780ab086b0
-EBUILD ipython-0.13.1-r1.ebuild 5206 SHA256 ac545583db6ed22294a854659d890d8fecd4b9edd35df03d7e0dd8e377c2e553 SHA512 0698eafa985441566248b399cf2a51fedab40069f7536f8d7d5d1b345bcc19cf033da6888143b3d225dc11aa1b591fefcc875f8bec93fb0c48de19dcd331b563 WHIRLPOOL c21760edf3718fa5c8277556b522c40016020ac99a3c35bc8abc533a433773a2142d303e45da015e685cb1f579c6328d7b057543081b3b02587b54c88219a4fd
+EBUILD ipython-0.13.1-r1.ebuild 5595 SHA256 07902213456a62acc3b6ba58f8a39e52d96bd02340468ff02c68c311fe9931ce SHA512 fa2e690f66d0142c37dab105c7a5a5b3082dd60c1d7b0f196696f6c5917da759e9331a12ed3eccd1b448b9719a387931b38301eff786242e33deac547534d4a6 WHIRLPOOL 7eb1998a8c562d21c866c0a63d1457e1af41d8b725a3649a53960a62e8729ccb534310145472823b4b2e2fb5ed68ddea26fc52780de33f10065b8b16a71e4c0e
 EBUILD ipython-0.13.1.ebuild 3682 SHA256 ac51d373dfe436d88329a42f23ddfc14ac829bf5f72bb22df7fc8f0af0477f40 SHA512 446ea2c55f57f4ba2d08f2de272ce2589d57736ac70228a47e283004d1700f673a893414863ae7452610a7326477d8c5cc934cfeeca571c2b47a9f7201338bec WHIRLPOOL 7885f8d7487fcc0685005e376ed5b58bce71db907841dad5b8033ec0b3a3627c4b2f4be16ff5621806e6d215bfd19747c424d0172bff6b380fc64a74bd9b370c
-EBUILD ipython-0.13.2.ebuild 5208 SHA256 ecee999c133f8265a20db4e420f6fa07c48ebee6dfcb159b48ded7c592051819 SHA512 ca5fa94846d706606422060c86deb816525f41936998efda5f9d7565372d1c92ab1a4bda54cc2d1890cf98572826afe3af4e8566dc0df3aced0e1c6800784932 WHIRLPOOL 05cce7cf134843c75bdf53dcfc5a0031c3920b9f46e87169a70eaeb02d2c2b605cd8d8104d2c8b8d730f0b0886dda131be2dcd557a02b71393dc169275df54a4
+EBUILD ipython-0.13.2.ebuild 5248 SHA256 b5371254bc2c10aeef94dc21b37872161f0ea80b7fc8122b9a0fc81cf46aa581 SHA512 da24a3350a1737d2d14cbda21a5809adcfa4e5d975cb425bfc1ee9b9a6861c33093508b9aeb0430009f72fcdc8a1c497cfef8c5bef9a778c0fffdbe10d15f58f WHIRLPOOL 2f2b50c9478c9ae14b89b3b3d796900579f3468c3147f164343ddfed158003ee9d1b3ae6cb87822bec80172310dace8563c9b6522043c4a6b5f76947886c455e
 EBUILD ipython-0.13.ebuild 3726 SHA256 b0d4b2dd175778ac38ea684d4080dc7232c1bd557f5390c7a5d1851ac90b40a9 SHA512 3cd5a69759a1b3690f4686ed8c755a5282030ff01841b6a62b2bef17c63419b45f4992370b6b0aa9ecf0c9ed18c541b10068ed267c289ee658b840289cc40c9b WHIRLPOOL e3f3b82d6866cf3a21039ed78f278fbd787746aea544c7b51ba0182eb5cb7a08528c46e1b7c9b4c262aa3c9c15abd9aab0d846d46ef81eef2bfc5e80f98654b7
-MISC ChangeLog 15909 SHA256 8ddc351169876a17dd44be8bf1e13033573880b807ad55b906f21dd3c7e4995a SHA512 a618270e26fc7904d3c3c3c0b9c254f802fb1888a914855f419f06bb0bcbd33f280ed946902a7f5ca764ccd042886452912125dcea5eb8c5cd1846f909142575 WHIRLPOOL ea81fe4feecd054a86aab0da63067d8f065c464bb6b966feca837ebe2cf854266b448a9ee2cb3691a674eb99937655b71325b931e7169f0a2f237c1774f4be5b
+MISC ChangeLog 16101 SHA256 807a31a4da30c75f121d3bb8ab910f29eb300620c3c9b00aae7b10a9f32f4d2c SHA512 cb3823adca78d73422ac7dfe5f86219751955fa062564388b5b4f2552679a78b2722431742af439090d95c20719b6ef5c7c815fc889ca1564c8926f053d3eb90 WHIRLPOOL 0fbdd47f2559556379e5419558e6c351529ba5149f3ffda431f2c8bad8527be53dabacc2f51982ff5798937e864cba02a6bb0cebd101b1b2c5b73fd201a0975d
 MISC metadata.xml 2641 SHA256 15153c7c170d5a31424157705ad535f6212baa8d13806645dd768c380b527082 SHA512 6720ef9a6dfd75015cb9a02be260be03633446eda9bf9aab899f5326f893303128878b7ea0fac9982933cf0259429ef4e3d422ba716586c823068bbd0a9554c0 WHIRLPOOL 3f24897567d32ea80cf881ee3f9bec2d659318ce0f861471fcbb2c3a059c923a6e035cb8c5c9e91fccc7703b26e2f362364b0196f5d89ab56ff5ff4634edfe1c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRfCfaAAoJEHy/RO9cNQiDNg4P/i0YpyzxipAnNnVyfeR6X4cN
-fO7HnvjlRKn+XUt1kpeg2CLqu8bk38kj1nTALcSss+PYGfWcYkWx54V3Ywa85Uvn
-SKfvLlMMd319q2juFeiLSgrSI4HJ+P9C0YSVcyEE8GxDIT3EkyxXIpPxf+t4INxS
-ljB0ZZ5bcTDqQ3Hl3p1KvXFq8z3olx5ci/vPCgGk5S11zdTgXlMn3rl/a/E8EdyC
-JNt+FoGD0bFmk8l3UCIluyxz88ANeuvOGilwekgOAkJWlZp5F3mzz9KVhVCIeV3r
-KJntDQKDfW8pjvcxcAKV8TiFm5RMvrXSsGIp1L2DQzF+uq4I3GO4USexmxdLl7as
-ECTTB10zeKE1ACaspR9w8bzH5/CSNcvxghS9H1JpsAd4zJvzIj8Rbr7FqPG4OvHE
-+WecPY6HPua0u9/6rP1FiqElEnm0Yk3us4bFNHDI085F6tTcAia45ZV6aWoCc2yd
-fkUhJVh2IZWlhD3mN8qFSmUiYouHlPuSmVulgMGw6wx67gA0pZL7xbkF9N91FTmy
-7+cTltVfOoizjaAvk+I5ME+BdoS9Cp3O+nFWqWU1dhGJdX39UGXExXaydanYLUzU
-l15ibzljftolf8moZ1rChKBeErIlMvt7Pq5itVpWaOeR7S9/+PLW11P4t+bI2CyG
-EQSxcuF7Vo3kP/kRqMrt
-=Uicn
+iF4EAREIAAYFAlGJOjYACgkQC77qH+pIQ6RGLgD/RrL2YhZ+S9XrViHnb4QK6Jkp
+TjnwNXRyMnmi7Sp0n8wA/3+GXe5+k14C97a+fU/p4NCZvspahHMZkjkl50TcLjae
+=aD0Q
 -----END PGP SIGNATURE-----
diff --git a/dev-python/ipython/ipython-0.13.1-r1.ebuild b/dev-python/ipython/ipython-0.13.1-r1.ebuild
index c8296c5049be..9f4d00f7c7fe 100644
--- a/dev-python/ipython/ipython-0.13.1-r1.ebuild
+++ b/dev-python/ipython/ipython-0.13.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ipython-0.13.1-r1.ebuild,v 1.2 2013/03/30 13:02:25 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ipython-0.13.1-r1.ebuild,v 1.3 2013/05/07 17:30:28 floppym Exp $
 
 EAPI=5
 
@@ -40,6 +40,7 @@ RDEPEND="${CDEPEND}
 			dev-python/pygments[${PYTHON_USEDEP}]
 			dev-python/pyzmq[${PYTHON_USEDEP}] )"
 DEPEND="${CDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
 
 PY2_REQUSE="|| ( $(python_gen_useflags python2* ) )"
@@ -181,6 +182,18 @@ python_install_all() {
 	fi
 }
 
+pkg_preinst() {
+	check_egg_info() {
+		python_export PYTHON_SITEDIR
+		local pyver=${EPYTHON#python}
+		local egg_info="${ROOT%/}${PYTHON_SITEDIR}/${P}-py${pyver}.egg-info"
+		if [[ -e ${egg_info} && ! -d ${egg_info} ]]; then
+			rm "${egg_info}" || die "Failed to remove distutils egg-info file"
+		fi
+	}
+	python_parallel_foreach_impl check_egg_info
+}
+
 pkg_postinst() {
 	use emacs && elisp-site-regen
 }
diff --git a/dev-python/ipython/ipython-0.13.2.ebuild b/dev-python/ipython/ipython-0.13.2.ebuild
index 84ce426d0407..c8e888c96c55 100644
--- a/dev-python/ipython/ipython-0.13.2.ebuild
+++ b/dev-python/ipython/ipython-0.13.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ipython-0.13.2.ebuild,v 1.1 2013/04/27 19:32:41 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ipython-0.13.2.ebuild,v 1.2 2013/05/07 17:30:28 floppym Exp $
 
 EAPI=5
 
@@ -40,6 +40,7 @@ RDEPEND="${CDEPEND}
 			dev-python/pygments[${PYTHON_USEDEP}]
 			dev-python/pyzmq[${PYTHON_USEDEP}] )"
 DEPEND="${CDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
 
 PY2_REQUSE="|| ( $(python_gen_useflags python2* ) )"