Use complete PYTHON_USEDEP on pexpect since it supports Python 3 now.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 235 insertions, 5 deletions

diff --git a/dev-python/ipython/ChangeLog b/dev-python/ipython/ChangeLog
index fd1256d6e21c..819b2d8ee86a 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.128 2013/11/15 00:21:28 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ChangeLog,v 1.129 2013/11/17 10:24:54 mgorny Exp $
+
+*ipython-1.1.0-r1 (17 Nov 2013)
+
+  17 Nov 2013; Michał Górny <mgorny@gentoo.org> +ipython-1.1.0-r1.ebuild:
+  Use complete PYTHON_USEDEP on pexpect since it supports Python 3 now.
 
   15 Nov 2013; Mike Gilbert <floppym@gentoo.org> ipython-1.0.0.ebuild,
   ipython-1.1.0.ebuild:
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index ba101dc73cee..baf29ad0acce 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -15,13 +15,26 @@ EBUILD ipython-0.10.2.ebuild 3252 SHA256 297a5c6573ecfaada05fc527101d82925680db9
 EBUILD ipython-0.12-r1.ebuild 3981 SHA256 2cda10555e8f6e5521c1de8922a4354cbb94704fecb984effae4bf2d9a5268d9 SHA512 0d37ed4d67f8b04fa3bfab923e40eb3afeb825f05ff2b082e55e2f58c6c1be48adc75a5d0035939cfbe9d03c3ed4c83f5ce8c32defa9148e568490b49b494021 WHIRLPOOL 65d6b77201e209ba1a02906f977fe42b9ae9bcab2dd7208237a56c112e8b6503a219a43bc95930a161a0c369dac7e9a1c6c93025c3c226e84d064780236dc61c
 EBUILD ipython-0.13.2.ebuild 5432 SHA256 f822dcab3ca1d5bb5862ad6109396f6280ccc7a43e22649b9c6e969c4e08b082 SHA512 427961107e31b3a9f1a24867acbd2f46f84588fedb315556ddcf0500a0f02443f321ed5c03f4c582f7bc533e07c95768e0189b3e5c7de496ce6cb9c4e876b6ff WHIRLPOOL 642e1bf2b361d4c4d0e80e7d35e8228950989687bd641a37b121e7340ce08fc1adc25a14e54011c5c72b3ee14a632397f788e309db7d6dfc4cba9e169e86ed6d
 EBUILD ipython-1.0.0.ebuild 5718 SHA256 63c49a9a6e9790c249212dc0aec55536756852bb6731ad09094fd4eca15dacdf SHA512 c11c61e882f275e69bb9fd5f26705092c09cd487106d673795137a8e66fdd7c28f1e9e5981a8e4ef33c25e7a28e55681d721829bdd8c9864886b2be127cece6e WHIRLPOOL 6e364cd5aee697901cfff95f381f93a8b062a350ec0200397f59c894dbabf4fa7ef042359ca58bf2d5fd1e265f6750db989e9bee787ee8bea7e719371d31620d
+EBUILD ipython-1.1.0-r1.ebuild 5722 SHA256 5537d1837290b6eb326e5bcbd80d56197a28b5ec484157aa6dc791b5f1780edd SHA512 0c2d5938c6958b88f224106c7bce6261d7c45f478c434d85cca6aa82569dad8d0f270b7e48be5db23a8781e4782866ada9364a4995c3280b9313c31636914785 WHIRLPOOL 3cccd6052b794870a25cde1bb39f088388c19772e5be4105dd70d5828250f681ef01aa97365a3d3d1f0ce05edf69280800435db6c5c4506e064c3c2be5611548
 EBUILD ipython-1.1.0.ebuild 5717 SHA256 f755ee639243fe96eb728fbb4f530bd3fd05cc0e011153463e18e5b49ff99b63 SHA512 6be04744fa3b1bd4ddfcde97e370c28e3b3945377c9c96d3f9261e8836cf5996aeefdfba76e90dbf0272ea7e825dc2b92b0af18635f964e846d2f45e9a2667f6 WHIRLPOOL 87edc3f7f98229b69ee1f2ea562ef0028c6e4a76f6f7faabae4028d077d354147485b6109e59d607305fb60836df2a3287feb8ff420b91d57585a7ebbcacace1
-MISC ChangeLog 19427 SHA256 569360339c3c695cdebfc1c5d3102273ea305fd1f28362f2e65fd58083126430 SHA512 3ace55fc1db77821400b5dfe76bd8c6b0a1875d7651681cc992302062e136004c2015ff1bd838688e0a008de30f8fc226efb542288f10c23f025d1a7f6abca0e WHIRLPOOL 1f3ed9fe676c1a1aa2fe97727be9215798ca876c829f66a35a9fc21bc12d925507dc08b6ffbfdc16a358cb8b83db7a9ee1c38c5ae62ab93ef832abfdb67553ea
+MISC ChangeLog 19608 SHA256 8b5522509bd2a2f0e79321eb175b85dc0836d13f660acff366a806c2bb1ebe49 SHA512 94332eb20817f3cdd051d592b16599e1089c65c59cf20dec5d4982dc9dca0aa292610d4592f7e479d9f804b0f0a79c255ca6633284b26b56f5dcebf06671c7ce WHIRLPOOL 4a501d7dbe80053bd84523fe3715a7e80592b6f6f6251d9bd0b9ee321a58154247004073332dcaa35622a1963bf66d8965e0c59009b214e91e5f3de015bef41b
 MISC metadata.xml 2803 SHA256 6cec3ab4d81eaf8b6019d93d68e53efcbfdc88ccf52588e8dcc447f2d00d999f SHA512 3f4a6296f4d08d149af0dd85b6198134b8b68bd2972c01a148cd091414c1818a01a498d30ade1a3a56d98f4f8fd64f7898f3992500713fe33e59f2527353ac87 WHIRLPOOL 84b96e09a6d40bf77079b12c1c3e8a7e1f56cd52b8e9795cb748c60e295444ed9d9e0e909e9da961c02e76975d0f0f8125bddf90ebe0e0e2f8d8233239749364
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlKFaQoACgkQC77qH+pIQ6Rn4gEAwjJ0lP/NrawEfhqF3xZiLfsY
-wqbSGT5E9XVyvAU40PkBAJEs4t4M65rQL3YSMLSB0gmdjtBNn/2+Ewm7D8Uzak4v
-=caW9
+iQJ8BAEBCABmBQJSiJl7XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO3TkQAMwF6/rUhtDUiA5dqPWDxhgU
+FXXJxQwl6U9Uj6/Xq21BKx9AlAz44h8dFbapsWchlZu69HF+U1+WyfpX+8pvjifl
+TzMwkHAWyik8cbe/cSFK8v1TUNvNZliVorbIGz/tj/uQookF0f6ddlq93A+rQc58
+HQVaH0z1XJouMyE+HG5bDz7JisPyikhP1e2Ppi8I1Zs3x1xYpbMzrcY+0NB6Xcxe
+ePLzOgNlCHRAqUKrTcnNC0/aoTFSph96kXyOj++wn81yo7/rtX9Hx1TjtrGfwsU6
+wlbMzyx7woQbkckU9lC3vhQ13n7NvuiSbyWk1JSN5xZMEFziLT/CYY6tglnqOTKM
+R9wxywwX1J/2cCqHcHoXA9OvLT6Br9nPHB8yelmu2d7lDbOZCdwm/Hwx+QJ5ylbv
+0fQKnvK5CT+Dlfwn1+zceVeQ65nTNg/zqgW5Ybdb62XifG+vkirSQ7e7lSa93BMl
+uyHTeY49pUfMLHAt8ONVIpOHFDkCZ1DYe09hUR9HIlmPEdNmrZ5VP23MZAKlBHdv
+r/sd26DblFMpZkMPDxBjiy5/s+HVU/5YVFKqAzoBONh4p73oBanq9tSdnKE2K9FF
+DE+POIRGU9pXO5aqMNrsWtY2qGaFLMA+SlethZP9Y0dSVh3PZeORUUOG0utRv8pA
+zhDj7Ye1TGYhCC3UdGkH
+=WDMr
 -----END PGP SIGNATURE-----
diff --git a/dev-python/ipython/ipython-1.1.0-r1.ebuild b/dev-python/ipython/ipython-1.1.0-r1.ebuild
new file mode 100644
index 000000000000..0c94f2a2fa05
--- /dev/null
+++ b/dev-python/ipython/ipython-1.1.0-r1.ebuild
@@ -0,0 +1,212 @@
+# 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-1.1.0-r1.ebuild,v 1.1 2013/11/17 10:24:54 mgorny Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+PYTHON_REQ_USE='readline,sqlite'
+
+inherit distutils-r1 elisp-common eutils virtualx
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+DESCRIPTION="Advanced interactive shell for Python"
+HOMEPAGE="http://ipython.org/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/rel-${PV}/${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc emacs examples matplotlib mongodb notebook nbconvert octave
+	qt4 +smp test wxwidgets"
+
+PY2_USEDEP=$(python_gen_usedep 'python2*')
+
+gen_python_deps() {
+	local flag
+	for flag in $(python_gen_useflags '*'); do
+		echo "${flag}? ( ${1}[${flag}(-)] )"
+	done
+}
+
+CDEPEND="
+	dev-python/decorator[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/simplegeneric[${PYTHON_USEDEP}]
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+	virtual/python-argparse[${PYTHON_USEDEP}]
+	emacs? ( app-emacs/python-mode virtual/emacs )
+	matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
+	mongodb? ( dev-python/pymongo[${PYTHON_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}]
+		dev-libs/mathjax
+		$(gen_python_deps dev-python/jinja)
+	)
+	nbconvert? (
+		app-text/pandoc
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		$(gen_python_deps dev-python/jinja)
+	)
+	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} )"
+
+PATCHES=(
+	"${FILESDIR}/ipython-1.0.0-setuptools.patch"
+)
+
+python_prepare_all() {
+	# fix for gentoo python scripts
+	sed -i \
+		-e "/ipython_cmd/s/ipython3/ipython/g" \
+		IPython/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
+
+	# 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
+
+	# 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
+
+	pushd "${BUILD_DIR}"/../IPython/scripts/ > /dev/null
+
+	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}:" \
+		"${BUILD_DIR}"/lib/IPython/parallel/tests/test_mongodb.py \
+		|| die "Unable to sed mongod port into tests"
+
+	local fail
+	run_tests() {
+		# Initialize ~/.ipython directory.
+		"${EPYTHON}" ipython </dev/null >/dev/null || fail=1
+		# Run tests (-v for more verbosity).
+		PYTHONPATH=${PYTHONPATH}:. "${EPYTHON}" iptest -v || fail=1
+	}
+
+	VIRTUALX_COMMAND=run_tests virtualmake
+
+	[[ ${DB_PORT} != -1 ]] && mongod --dbpath "${dbpath}" --shutdown
+	[[ ${fail} ]] && die "Tests fail with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install
+	ln -snf "${EPREFIX}"/usr/share/mathjax \
+		"${D}$(python_get_sitedir)"/IPython/html/static/mathjax || die
+}
+
+python_install_all() {
+	distutils-r1_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
+}