gentoo resync : 04.05.2019

2 files changed, 50 insertions, 28 deletions

diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index c03f8b1a233a..5787383edd84 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -1,8 +1,8 @@
 AUX 2.1.0-substitute-files.patch 1017 BLAKE2B 70577eb950a18345804a2a4b750bd233dc6a0b6bbdb524dfc66e0f4a7c69b0eeb2d35efb9d1845d567a11d1afa7881068b4757e42b9baf24dc01ba3026608a38 SHA512 fc4c9e12267ac5f04a2e16ad27334a093638538b8149ff380099fcbeb674a276ab9eb624a508010e37f82c05d5f7ab527a80e386b3e7b61c123ecb8effd9d542
 DIST ipython-5.4.1.tar.gz 4973571 BLAKE2B bbda7b5a172ea1e80a9867f036ef68d1d0ec0a7340d77d8b4bbce63c5db7d3aade106ee5a6d59fb7e2b773c37d8263e51e1eaaa81d582849a70de60e93b7205a SHA512 b37dae27a558585ec4f42fa22e86380ac81990207ec680fc7b0e6f97ac81c99d915cfe77488bc0b91a61c34e0c00b323df08aa06b142ce0fc88ce30203102907
 DIST ipython-5.8.0.tar.gz 4977824 BLAKE2B cfa0592e8b71f82d996e6e961c3ac478617132f569799916a8794f1af733f3e40649fea763595b58dd8a10f31869d280338b81d15c3d059707a66ff7dab889f5 SHA512 946afb8f1623c8a7564ba2d782e05f5c961577dfb1e4a0f27e4a10e2932d5d041035c12aea7eb3e1d61af87867fab85a29919499822f93f638634bc343084b3e
-DIST ipython-6.1.0.tar.gz 5066094 BLAKE2B 4f68776ba15f50b2f0fcc1503dd5c62ac464d9d0ace0801f572c9cdc1a0ddd7d840369a3df5940551c848376985cc74848002cef53869014adb2fd9714989acd SHA512 6b1d9713b5e8c3870ac8cd8bea9d3a6f0c0302e3983017516128ede9f0baba21372890873df29fbba3f9d2f47ba16bfadb1c611f9de23b71595c0ab8f917695b
+DIST ipython-7.5.0.tar.gz 5118610 BLAKE2B 3f89babc292ea55724c2333076a673ef7fcd0a7a468e972a50c962194a71a0bc3cc9bdea4f96db4c21fe475b4d79dc87c124bcde53e1bc3ae7066a3c0c136e0d SHA512 564027879e53b3716ebe8cb1ed4b516835c15f326c865fd664aa7a4e5f26e1a78a329ff8e19d4acf6249e2acf7382501114cd2258c38bba89f0f382f7dcda09b
 EBUILD ipython-5.4.1-r2.ebuild 3708 BLAKE2B ca51fda923be3b4165303f6828b786f1b30403a9333ef47a56184eaa5d2ba175050247e2c8cbc8a68793642e3f60afe9927141722e6d0e84c7b46399c3f52d1c SHA512 fd3b5f5bb71a40960725e467fa69de0671d14d4f946d2acd272fe140da9bede8499454a6b932760f334c89a86ac06bab28e8feeb5eae892fbaab6981ca4c8aba
 EBUILD ipython-5.8.0-r1.ebuild 3792 BLAKE2B bf4657c93f27d988da7af429cb7eede7d7e0e6717d358bfebcf3f8ae01b0b16ac9d55e8c0718478cc49153c604a32d652461f942262554eb183bb329aaca86d2 SHA512 0c0ce13cc6e73182d631ff29fa93803e8a5152b1ef44fbf6f50b38ded551944ce7c9c14f45a73ccd7b8dfe2136947cbd0f37f68aa6eba9880341bdca78836461
-EBUILD ipython-6.1.0-r2.ebuild 3441 BLAKE2B efb27e3cf1a926684fb366cf0310554d8a4333e59c88c101db58955241b811e412836602d7dda0b43806183411b9d9ea3fc5714829f22d20c1662f5de8cc7a02 SHA512 c5b585bfeeaa521c33abdfba89d143c17532653bb0eb143eacb7ff31da89c93cfb9b3432cfbbfbcd4190180a2acc31c39ef77152bbdbc66a900d1f8957686bb6
+EBUILD ipython-7.5.0.ebuild 4674 BLAKE2B 699809fee7070140e17c0bc04aaa01a0b73ea66589d1607e6aa7bcc3fea2f07da2031a34e34540f5a2295bc487ecfc8cd2410675cefa9a1df80bb9920e04c504 SHA512 5f5df0e61b71f0bca5632181cdea5d9fee26f7c98f455153a0bbd7ea8fb11dbcc36a657bfc7da29f55f57faf48f6fd37c48d63f7beefd7de14ed27b2b3853ef1
 MISC metadata.xml 2857 BLAKE2B 89f6ea04a550e2e590f9e041c435fe578691118e24265d0f3c2465480cb32cbf4f5ca4d6c8fb2a08a665061347e19e361160f73aea080b1f67a4c9c743f6c23c SHA512 6b28c7f0be77e23656df143940074658a71ea872ba12238d3dc206f25662ddd589e3ebee11d5ca06498cfbbc651ae0effc95235feed91e853616706c87ca5bc4
diff --git a/dev-python/ipython/ipython-6.1.0-r2.ebuild b/dev-python/ipython/ipython-7.5.0.ebuild
index 4122a9aa3323..2a20f1205ac3 100644
--- a/dev-python/ipython/ipython-6.1.0-r2.ebuild
+++ b/dev-python/ipython/ipython-7.5.0.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python3_{5,6,7} )
 PYTHON_REQ_USE='readline,sqlite,threads(+)'
 
-inherit distutils-r1 eutils
+inherit distutils-r1 eutils virtualx
 
 DESCRIPTION="Advanced interactive shell for Python"
 HOMEPAGE="http://ipython.org/"
@@ -14,56 +14,72 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples matplotlib notebook nbconvert qt5 smp test"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test"
+RESTRICT="!test? ( test )"
+
+# About "-python_targets_python2_7":
+# The ipython stack is in a tricky transition to py3-only. It has many circular
+# dependencies which causes a chicken-and-egg problem because for Portage to
+# properly handle dependency resolution on a system with
+# python_targets_python2_7 all members of the circular dependency must go
+# py3-only at the same time. If they don't, the dependency that requires py2
+# will seek older ipython releases for resolution. This is why, for members
+# of the circular dependency, we force -python_targets_python2_7. This way, the
+# circle stays firmly in py3-only land. This only affects members of the
+# circular dependency. Other dependencies can be on py2 without problem.
+#
+# This situation also require us to explicitly depend on transitive dependencies
+# that are part of the circular dependecy so that we preserve "circle
+# integrity". It's a bit ugly, but temporary.
 
 CDEPEND="
+	dev-python/backcall[${PYTHON_USEDEP}]
 	dev-python/decorator[${PYTHON_USEDEP}]
-	>=dev-python/jedi-0.10.0[${PYTHON_USEDEP}]
+	dev-python/jedi[${PYTHON_USEDEP}]
 	dev-python/pexpect[${PYTHON_USEDEP}]
 	dev-python/pickleshare[${PYTHON_USEDEP}]
-	>=dev-python/prompt_toolkit-1.0.4[${PYTHON_USEDEP}]
-	<dev-python/prompt_toolkit-2[${PYTHON_USEDEP}]
+	>=dev-python/prompt_toolkit-2[${PYTHON_USEDEP}]
+	<dev-python/prompt_toolkit-2.1[${PYTHON_USEDEP}]
 	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	dev-python/simplegeneric[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
-	matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
+	dev-python/traitlets[${PYTHON_USEDEP}]
+	matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP},-python_targets_python2_7] )
 "
 
 RDEPEND="${CDEPEND}
-	nbconvert? ( dev-python/nbconvert[${PYTHON_USEDEP}] )
-"
+	nbconvert? ( dev-python/nbconvert[${PYTHON_USEDEP},-python_targets_python2_7] )"
 
 DEPEND="${CDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	virtual/python-typing[${PYTHON_USEDEP}]
 	test? (
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/nbformat[${PYTHON_USEDEP}]
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		dev-python/nbformat[${PYTHON_USEDEP},-python_targets_python2_7]
 		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
 		dev-python/testpath[${PYTHON_USEDEP}]
 	)
 	doc? (
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
-	)
-"
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-2[${PYTHON_USEDEP}]
+	)"
 
 PDEPEND="
 	notebook? (
-		dev-python/notebook[${PYTHON_USEDEP}]
-		dev-python/ipywidgets[${PYTHON_USEDEP}]
+		dev-python/notebook[${PYTHON_USEDEP},-python_targets_python2_7]
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		dev-python/ipywidgets[${PYTHON_USEDEP},-python_targets_python2_7]
+		dev-python/widgetsnbextension[${PYTHON_USEDEP},-python_targets_python2_7]
 	)
 	qt5? ( dev-python/qtconsole[${PYTHON_USEDEP}] )
-	smp? ( dev-python/ipyparallel[${PYTHON_USEDEP}] )
-"
+	smp? (
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		>=dev-python/ipyparallel-6.2.3[${PYTHON_USEDEP},-python_targets_python2_7]
+	)"
 
 PATCHES=( "${FILESDIR}"/2.1.0-substitute-files.patch )
 
-#DISTUTILS_IN_SOURCE_BUILD=1
+DISTUTILS_IN_SOURCE_BUILD=1
 
 python_prepare_all() {
 	# Remove out of date insource files
@@ -74,6 +90,7 @@ python_prepare_all() {
 	if use doc; then
 		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
 	fi
+
 	distutils-r1_python_prepare_all
 }
 
@@ -84,6 +101,10 @@ python_compile_all() {
 	fi
 }
 
+src_test() {
+	virtx distutils-r1_src_test
+}
+
 python_test() {
 	distutils_install_for_testing
 	pushd "${TEST_DIR}" >/dev/null || die
@@ -105,6 +126,7 @@ python_install() {
 
 python_install_all() {
 	distutils-r1_python_install_all
+
 	if use examples; then
 		dodoc -r examples
 		docompress -x /usr/share/doc/${PF}/examples