Migrate to distutils-r1.

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0x42B9401D

3 files changed, 204 insertions, 8 deletions

diff --git a/dev-python/ipython/ChangeLog b/dev-python/ipython/ChangeLog
index 874595a28d4a..e9358c203e1e 100644
--- a/dev-python/ipython/ChangeLog
+++ b/dev-python/ipython/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/ipython
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ChangeLog,v 1.103 2012/12/31 12:59:55 mgorny Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ChangeLog,v 1.104 2013/02/11 15:59:01 mgorny Exp $
+
+*ipython-0.13.1-r1 (11 Feb 2013)
+
+  11 Feb 2013; Michał Górny <mgorny@gentoo.org> +ipython-0.13.1-r1.ebuild:
+  Migrate to distutils-r1.
 
   31 Dec 2012; Michał Górny <mgorny@gentoo.org> ipython-0.12-r1.ebuild,
   ipython-0.12.1.ebuild, ipython-0.13.1.ebuild, ipython-0.13.ebuild:
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index 88d52a1b3a2e..e55f0f8bdc1c 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -17,16 +17,17 @@ 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 5203 SHA256 66f66ec58d561f9d7e62dbeb61724f3cd324fe10310276ef7ec5e8e6a395b096 SHA512 2bcc84a902682f8d96347e7c1755b594b0485df7a3f95fe3bb6fce99c87fe20d70edd2945a528ee3f3998ddb7f39c1091dd9333333ed94a5afe9e86804a99e12 WHIRLPOOL a9dc8d8874ac443e1c9cfb199b3f34bd3207393b2c62bec9128717b2755b771176f61feffff91ee2c294fc2350a72bc36791b04c7372b964802944320a8d28ed
 EBUILD ipython-0.13.1.ebuild 3682 SHA256 ac51d373dfe436d88329a42f23ddfc14ac829bf5f72bb22df7fc8f0af0477f40 SHA512 446ea2c55f57f4ba2d08f2de272ce2589d57736ac70228a47e283004d1700f673a893414863ae7452610a7326477d8c5cc934cfeeca571c2b47a9f7201338bec WHIRLPOOL 7885f8d7487fcc0685005e376ed5b58bce71db907841dad5b8033ec0b3a3627c4b2f4be16ff5621806e6d215bfd19747c424d0172bff6b380fc64a74bd9b370c
 EBUILD ipython-0.13.ebuild 3726 SHA256 b0d4b2dd175778ac38ea684d4080dc7232c1bd557f5390c7a5d1851ac90b40a9 SHA512 3cd5a69759a1b3690f4686ed8c755a5282030ff01841b6a62b2bef17c63419b45f4992370b6b0aa9ecf0c9ed18c541b10068ed267c289ee658b840289cc40c9b WHIRLPOOL e3f3b82d6866cf3a21039ed78f278fbd787746aea544c7b51ba0182eb5cb7a08528c46e1b7c9b4c262aa3c9c15abd9aab0d846d46ef81eef2bfc5e80f98654b7
-MISC ChangeLog 15528 SHA256 626edfee1c4724c81bdcacbac35ff39af988a3463774eb8528e83f155c4d5237 SHA512 b20a20500e8e9b12028b89ffa31964f4b0f5eb34cc3f325468b983a10a2566bcf6bc9860ef0159f5b9ad45a4ca408e0124d0e75a71aa542fe773550bfe88d25b WHIRLPOOL 7154d8e42c91f5584722e863a3bc01f83170fdc6eb59995121e744856cd8d1ff5dc6587ea15da1cd3404fae1e3f79868a45c6510aa367505a50d012f8f7db9f1
+MISC ChangeLog 15667 SHA256 28d6779028ef80206f16281bb3d890630eb30c202ff03384870075a5d1ebcd3d SHA512 4273868dc2a7070d10acf2397870e00bcd0eaa322770ed9d28ab70aba3393004b4e5a4417e1ea44cbed517991a1e7adc5c374fbebe6395413b7060bdcde713bb WHIRLPOOL 8f98d86f5ac9b49b5ed29c05ce733522c157fcce83e403551e6278e178168cd67242a74b0dd4fa6612514a0af597a3baf2d461d30d30cf332487cc62f35d38f5
 MISC metadata.xml 2641 SHA256 15153c7c170d5a31424157705ad535f6212baa8d13806645dd768c380b527082 SHA512 6720ef9a6dfd75015cb9a02be260be03633446eda9bf9aab899f5326f893303128878b7ea0fac9982933cf0259429ef4e3d422ba716586c823068bbd0a9554c0 WHIRLPOOL 3f24897567d32ea80cf881ee3f9bec2d659318ce0f861471fcbb2c3a059c923a6e035cb8c5c9e91fccc7703b26e2f362364b0196f5d89ab56ff5ff4634edfe1c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iJwEAQEIAAYFAlDhjGAACgkQfXuS5UK5QB0NAgP/aAsiZ6HdBeBezcTG1EjLuFlH
-XhNHnmpwaZKmGEqnhax47Phn51cA85+4uIr1rwdqJGMFpvN7tGVDe5yxyMS+EACd
-R3bCr/5PixJMHR/W43r2SkJ9gyB0rmWjdSMQnAJonElt+DyttB4wOKtW+3lyjqm5
-UNJPggU2/xbs9xkU76Q=
-=VPXr
+iJwEAQEIAAYFAlEZFU8ACgkQfXuS5UK5QB3p+gP/bL6wGrV3i2mwawt1Ai0FIJvE
+L77mdJ0i4biomYXzrYUOmTj3XtGXxjMHo0srK8qUabYqWI9Lhg3IdKiOpL4IfJbz
+CxrITtUW+FJOM5OInc00KXknzWeMDXRP7cY0zeTupdkMeGy7vb2lBrht6zrDKlJE
+d7z4+cOe6AcEvgjkvpk=
+=uFCj
 -----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
new file mode 100644
index 000000000000..0e483a1dabcf
--- /dev/null
+++ b/dev-python/ipython/ipython-0.13.1-r1.ebuild
@@ -0,0 +1,190 @@
+# 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.1 2013/02/11 15:59:01 mgorny Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2} )
+PYTHON_REQ_USE='readline,sqlite'
+
+inherit distutils-r1 elisp-common eutils virtualx
+
+DESCRIPTION="Advanced interactive shell for Python"
+HOMEPAGE="http://ipython.org/"
+SRC_URI="http://archive.ipython.org/release/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc emacs examples matplotlib mongodb notebook octave
+	qt4 +smp test wxwidgets"
+
+PY2_USEDEP=$(python_gen_usedep python2*)
+
+CDEPEND="dev-python/decorator[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PY2_USEDEP}]
+	virtual/pyparsing[${PYTHON_USEDEP}]
+	dev-python/simplegeneric[${PYTHON_USEDEP}]
+	virtual/python-argparse[${PYTHON_USEDEP}]
+	emacs? ( app-emacs/python-mode virtual/emacs )
+	matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
+	mongodb? ( dev-python/pymongo[${PY2_USEDEP}] )
+	octave? ( dev-python/oct2py[${PY2_USEDEP}] )
+	smp? ( dev-python/pyzmq[${PYTHON_USEDEP}] )
+	wxwidgets? ( dev-python/wxpython[${PY2_USEDEP}] )"
+RDEPEND="${CDEPEND}
+	notebook? ( >=www-servers/tornado-2.1[${PY2_USEDEP}]
+			dev-python/pygments[${PYTHON_USEDEP}]
+			dev-python/pyzmq[${PYTHON_USEDEP}] )
+	qt4? ( || ( dev-python/PyQt4[${PYTHON_USEDEP}] dev-python/pyside[${PYTHON_USEDEP}] )
+			dev-python/pygments[${PYTHON_USEDEP}]
+			dev-python/pyzmq[${PYTHON_USEDEP}] )"
+DEPEND="${CDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+PY2_REQUSE="|| ( $(python_gen_useflags python2* ) )"
+REQUIRED_USE="mongodb? ( ${PY2_REQUSE} )
+	notebook? ( ${PY2_REQUSE} )
+	octave? ( ${PY2_REQUSE} )
+	wxwidgets? ( ${PY2_REQUSE} )"
+
+python_prepare_all() {
+	epatch "${FILESDIR}"/${PN}-0.12-globalpath.patch
+
+	# fix for gentoo python scripts
+	sed -i \
+		-e "/ipython_cmd/s/ipython3/ipython/g" \
+		IPython/frontend/terminal/console/tests/test_console.py \
+		IPython/lib/irunner.py \
+		IPython/testing/tools.py || die
+
+	sed -i \
+		-e "s/find_scripts(True, suffix='3')/find_scripts(True)/" \
+		setup.py || die
+
+	# disable failing tests
+	sed -i \
+		-e 's/test_pylab_import_all_disabled/_&/' \
+		-e 's/test_pylab_import_all_enabled/_&/' \
+		IPython/lib/tests/test_irunner_pylab_magic.py || die
+
+	# fix gentoo installation directory for documentation
+	sed -i \
+		-e "/docdirbase  = pjoin/s/ipython/${PF}/" \
+		-e "/pjoin(docdirbase,'manual')/s/manual/html/" \
+		setupbase.py || die "sed failed"
+
+	if ! use doc; then
+		sed -i \
+			-e "/(pjoin(docdirbase, 'extensions'), igridhelpfiles),/d" \
+			-e 's/ + manual_files//' \
+			setupbase.py || die
+	fi
+
+	if ! use examples; then
+		sed -i \
+			-e 's/+ example_files//' \
+			setupbase.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use emacs && elisp-compile docs/emacs/ipython.el
+}
+
+src_test() {
+	# virtualx has trouble with parallel runs.
+	local DISTUTILS_NO_PARALLEL_BUILD=1
+
+	distutils-r1_src_test
+}
+
+python_test() {
+	# https://github.com/ipython/ipython/issues/2083
+	unset PYTHONWARNINGS
+
+	distutils_install_for_testing
+
+	# ipython skips mongodb tests only if it's not running.
+	# since we want the widest test range, and don't want it to fiddle
+	# with user-running mongodb, we always run it if it's available.
+
+	local DB_IP=127.0.0.1
+	local DB_PORT=-1 # disable
+
+	if has_version dev-db/mongodb; then
+		# please keep in sync with dev-python/pymongo
+
+		local dbpath=${TMPDIR}/mongo.db
+		local logpath=${TMPDIR}/mongod.log
+
+		# prefer starting with non-default one
+		DB_PORT=27018
+
+		mkdir -p "${dbpath}" || die
+		while true; do
+			ebegin "Trying to start mongod on port ${DB_PORT}"
+
+			LC_ALL=C \
+			mongod --dbpath "${dbpath}" --smallfiles --nojournal \
+				--bind_ip ${DB_IP} --port ${DB_PORT} \
+				--unixSocketPrefix "${TMPDIR}" \
+				--logpath "${logpath}" --fork \
+			&& sleep 2
+
+			# Now we need to check if the server actually started...
+			if [[ ${?} -eq 0 && -S "${TMPDIR}"/mongodb-${DB_PORT}.sock ]]; then
+				# yay!
+				eend 0
+				break
+			elif grep -q 'Address already in use' "${logpath}"; then
+				# ay, someone took our port!
+				eend 1
+				: $(( DB_PORT += 1 ))
+				continue
+			else
+				eend 1
+				ewarn "Unable to start mongod for tests."
+				break
+			fi
+		done
+	fi
+
+	# No support for DB_IP and DB_PORT.
+	# https://github.com/ipython/ipython/pull/2910
+	sed -i -e "s:Connection(:&host='${DB_IP}', port=${DB_PORT}:" \
+		"${TEST_DIR}"/lib/*/IPython/parallel/tests/test_mongodb.py \
+		|| die "Unable to sed mongod port into tests"
+
+	local fail
+
+	run_tests() {
+		# Initialize ~/.ipython directory.
+		"${TEST_DIR}"/scripts/ipython </dev/null >/dev/null || fail=1
+		# Run tests (-v for more verbosity).
+		"${TEST_DIR}"/scripts/iptest -v || fail=1
+	}
+
+	VIRTUALX_COMMAND=run_tests virtualmake
+
+	[[ ${DB_PORT} != -1 ]] && mongod --dbpath "${dbpath}" --shutdown
+	[[ ${fail} ]] && die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	if use emacs; then
+		cd docs/emacs || die
+		elisp-install ${PN} ${PN}.el*
+		elisp-site-file-install "${FILESDIR}"/62ipython-gentoo.el
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}