gentoo resync : 15.12.2019

3 files changed, 3 insertions, 69 deletions

diff --git a/dev-python/qtconsole/Manifest b/dev-python/qtconsole/Manifest
index 0d8aa8b52b0a..850d3b3a66eb 100644
--- a/dev-python/qtconsole/Manifest
+++ b/dev-python/qtconsole/Manifest
@@ -1,4 +1,3 @@
 DIST qtconsole-4.3.1.tar.gz 416931 BLAKE2B ec47c2ae8527d7aee55d6cb8d2ebea39ab1bfd3a268c46306613b67f72c27904db1de52682a47d075d804dad9cd7c124296163b39532936fb1a497ae606b7ffc SHA512 f0f84d95143b4513c3d12af4712c6a5724143bf8c44e7a3fbc06d7a94e665b8d12072dd13eafb09476a3aa829155f4c75eb517ffb2bd6e8bd3c00af3c764e48f
-EBUILD qtconsole-4.3.1-r1.ebuild 1696 BLAKE2B 3923a5aff993ad83ece55375641e0c6e590eff58573d4e2867114648c1f8a78b4971dea4ff2ebb7a793c7188e8905a542b5d28fb4d2ff867f66f2bb2909410d9 SHA512 acd5cce3b48b2126ec73e65ecffdf1a4e1d9b22bd3fc6dd9f64754ab83e40db506fc78c3f412b45ae96046a4e9855c1ed68f55597a5dd9300465304090b3b27f
-EBUILD qtconsole-4.3.1.ebuild 1704 BLAKE2B 63a4d79cca19aa88f651d49a9675187590a99fd30130866509fc9c281eec4926607bb5369ee314da3a620c25ab075cc86a860ca78fabf1c1af38f2029c0e6a3d SHA512 2b96c6a336bafbd4b7d395cc4eecd12ddb62487d87a6ea64358859d26b419553e5b3947093798cd62c175058c1a97e020f3ef1534eb4ea507e071f4021191032
+EBUILD qtconsole-4.3.1.ebuild 1721 BLAKE2B 6e316508e8863490ccd89c6782af4f7520321b815c0b9b0738ca4d673e8b1c05340500d8a2bb0b4d8d8e9ff0798b0bc0acd9a4b4b7875e33a57d35d533749062 SHA512 1c5f404931816bd9fe66ae09543bbb5ee2c0c0a70d0c5077a90756b13e12fd285663e6339d2b27db9da4cbca7b45fece83154b9083184650a9053bc7f1198169
 MISC metadata.xml 557 BLAKE2B 09988fd98b75ef9c7847cc1035f6d8726375ec61638dc9ff01c0ac9556ce16afe987a66e0ecd674a376fb9af39ec2c721e04abd829f1153652d8eeee82c089ff SHA512 5f176e9d82b9031b0d15c32986074431f03e33843a50f68e94d7aa0ba10c31370e2c4ee0651481d7a5b42f873e0aec4771c9fc7ca996386286255166be20d8cd
diff --git a/dev-python/qtconsole/qtconsole-4.3.1-r1.ebuild b/dev-python/qtconsole/qtconsole-4.3.1-r1.ebuild
deleted file mode 100644
index 9739aa4e8f2f..000000000000
--- a/dev-python/qtconsole/qtconsole-4.3.1-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Qt-based console for Jupyter with support for rich media output"
-HOMEPAGE="http://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc test"
-
-RDEPEND="
-	dev-python/ipykernel[${PYTHON_USEDEP}]
-	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-4.1.1[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	doc? (
-		>=dev-python/ipython-4.0.0-r2[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.3.1-r1[${PYTHON_USEDEP}]
-	)
-	test? (
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' 'python2*')
-		>=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
-		dev-python/PyQt5[${PYTHON_USEDEP},svg,testlib]
-	)
-	dev-python/PyQt5[${PYTHON_USEDEP},svg]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-13[${PYTHON_USEDEP}]
-	"
-PDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	# Prevent un-needed download during build
-	if use doc; then
-		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		emake -C docs html
-		HTML_DOCS=( docs/build/html/. )
-	fi
-}
-
-python_test() {
-	# jupyter qtconsole --generate-config ... jupyter-qtconsole: cannot connect to X server
-	# ERROR
-	sed \
-		-e 's:test_generate_config:_&:g' \
-		-i qtconsole/tests/test_app.py || die
-	virtx nosetests --verbosity=2 qtconsole
-}
diff --git a/dev-python/qtconsole/qtconsole-4.3.1.ebuild b/dev-python/qtconsole/qtconsole-4.3.1.ebuild
index bcf01c05808f..187e9119d4e3 100644
--- a/dev-python/qtconsole/qtconsole-4.3.1.ebuild
+++ b/dev-python/qtconsole/qtconsole-4.3.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{5,6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 virtualx
@@ -16,6 +16,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/ipykernel[${PYTHON_USEDEP}]