gentoo resync : 15.12.2019

6 files changed, 5 insertions, 171 deletions

diff --git a/dev-python/jupyter_console/Manifest b/dev-python/jupyter_console/Manifest
index 94d24cb40205..e342dabed82a 100644
--- a/dev-python/jupyter_console/Manifest
+++ b/dev-python/jupyter_console/Manifest
@@ -1,11 +1,5 @@
-DIST jupyter_console-4.0.3.tar.gz 22090 BLAKE2B feec288328132d2f75ad21e242d7b0bd41a6825e736e98ba79be32263e1981f0cb002feb4415bf85da8171b320a27a86182d3c5401d71b9e44f6bb5c348f1e71 SHA512 da9c311d881bbf61fbcea3c79e4dbdbe00f0f713772d0da4d30e0dec36ff5a6c5cbff3b996770f532c1e9c61ade1b1bf7a6f1ed28188ffd6900f6cc2ce7c0665
-DIST jupyter_console-4.1.1.tar.gz 23391 BLAKE2B c22ebebaca3f009f1952d6e2af6c2f552a19626b2f7a51ab760f258d69b10c91cd162cb54d3d6cdf04b04aeff4e538e24ddf5a9ec1907aa2c7927280a5855755 SHA512 40894f41b85c1b823c3d75f33427728717b75e800a08c8a6b17b1c6ca7a6543b2aadc72d7ff131a7633252ac01bb0b0142025d7a53c3f3b7f8d189e6ff14216e
-DIST jupyter_console-5.0.0.tar.gz 26119 BLAKE2B 3961a3da26ad9e873a873556115aa4430b24bdd22d9ebab88c3c7b8d72ecfb90926e0b690b23d9bff0bc68f15dd0623cb1e6f1f56ba47b7afe964542a5f8c3b1 SHA512 e31afa5960200feea125b939124b108a0b9dcc914fe2e21b86cd1dc409789cb25a72918a7eb5fcc7bd35c26bfabb71b6426a2cb7b45a8cab58f1d8e4b9bc89de
 DIST jupyter_console-5.1.0.tar.gz 26661 BLAKE2B 075035d02fee640ccf9a2a7bd22e5872727380bd54b1fed48bd53f6bee12da8ff3dc5f4ff258d0c03f7260e2b495d8cb313a4b4f49e4eb644f0b15988fe41577 SHA512 208a31886eb58c64541048e1f7ed75fccc888d34177f86dfaf10fb7dcd603130a8b3ecbe23cf4d80a75287b847128425f853715c494d2a7e4b4eed8a31058b5c
 DIST jupyter_console-6.0.0.tar.gz 27780 BLAKE2B da2b58461caa987bea0b323cedbc79ff24f31cb928602b8ae6dce1ed615008a8227d7a1bab47364e6d182cfd3bd6f548e355430efc505e7183a391ef26c08375 SHA512 27b333f439733c33062d3baa8b49ff673b10e22cb8c28c688ba604799838e899f93372bd2eaf4a94c97260d6dec043d6aef4421388d77e625b1ec43a3dedfa3f
-EBUILD jupyter_console-4.0.3.ebuild 1255 BLAKE2B a37551ffd0b0ee083bdb8a98eb02c490386b883f46464c5915ff5f22c5b955f2e1c3aa9e9857c5d9fb749c7a933566ecea61b9c03bfe7cd78797e18b723be639 SHA512 051c928cbf65aba7a6839e116e07fc7c50b6c6542c7ca22422971f03add5559d093f135fdc1e97bf6fc809696015ef00fc677722bf6a736f22893812e9f1c144
-EBUILD jupyter_console-4.1.1.ebuild 1181 BLAKE2B 0cdb3992fbc97eb05fb6aa35304725901018416ccf41c12572e29bbc735564665ec79311860a5fac68016de230e7b14e07efba5105b5bb3df27f8c03d04400cc SHA512 3dd41761c80d0792a4c69aeea46f32c1694a19dd9677623a9b6e406a4c4c16bc0ddcab6d7db9578e889db66e5093deed8448d8fa33985dd996d8615e87c93e07
-EBUILD jupyter_console-5.0.0.ebuild 1307 BLAKE2B bc9ba9cc58f0e6bb1a5bc5b460b45cea81c0069ac1002da42206636496dbabbc2e9b347e0c802f2dd8fc09e6e777da8dbac18f29813c1ca92a9bc6450b17ef8b SHA512 d6a120aef4932eaaaf35ff2e28236e3f62d97435f74bbbef9dd2b130acbd76d6302da8aca97e5a776c215f474298f0dc641a9e88ef63113759113873f5bf12c3
-EBUILD jupyter_console-5.1.0.ebuild 1255 BLAKE2B 29f5ab0872910a642de8fd48c6a4b5ff8273060c96f2f4976a8623c364f8df28a53a948027e6e36c79e31861b0927a03780ff9fef6a1f4ee7bf1fc479311a797 SHA512 196a7a6749ec5b3f85a37b9b5056eb0c5706a92dc96d49549615ea8767d35dc541ed5d911056238b25e708f2906ba44f96cc37694d5ab68c498ed013da50acd0
-EBUILD jupyter_console-6.0.0.ebuild 1245 BLAKE2B c98b7bdbb14977ecb9cd67c5f45a3f1b0af06362a9093758551c5aa3a94dd63b57279463d508dabb89e8fddc0bb5253ce5cdd8f9ebd91e40d2d8ed0260db3f77 SHA512 4f6ed450c0effb3f944eb4c290c9dd75988fb4d3563bceb37ffa59c96793636299994f4721bed9fa39b14fcc01e390a561e6b60328b5320a2ef0590ae8f6c86f
+EBUILD jupyter_console-5.1.0.ebuild 1272 BLAKE2B 0028c2b5780eb36c0c74c69cb2afd0ea2e9f01962722d8cd452893392aff6bcb42989f67e14efdba06430ab27d3a29c4ae474f7901d88e99cf171f808afb7c2e SHA512 b8d25a6fe03ff75dc1bfbb5e4d247ac80294097306863d54312ac8d50bafe93d257bf8ae6ce544f682dccda1e82099e79295ce378dace676173cf41417df497c
+EBUILD jupyter_console-6.0.0.ebuild 1272 BLAKE2B 0028c2b5780eb36c0c74c69cb2afd0ea2e9f01962722d8cd452893392aff6bcb42989f67e14efdba06430ab27d3a29c4ae474f7901d88e99cf171f808afb7c2e SHA512 b8d25a6fe03ff75dc1bfbb5e4d247ac80294097306863d54312ac8d50bafe93d257bf8ae6ce544f682dccda1e82099e79295ce378dace676173cf41417df497c
 MISC metadata.xml 569 BLAKE2B 2f205ddc11fc56ac1b708a0d4e786d1e04051faa47af17970d4ed0a2088c4159a1b3199f2581794884463a83fc33926a053c55b4e6b265bdd90539a6d700d977 SHA512 dd29f7ff9dcca2afaa4caf814f4792391560a33b485d9a6de539a36c75df7b63e59d3eabf7bcb020b48ad30a7de0ac28137f54d96023fbc435e3a6378cc79b10
diff --git a/dev-python/jupyter_console/jupyter_console-4.0.3.ebuild b/dev-python/jupyter_console/jupyter_console-4.0.3.ebuild
deleted file mode 100644
index 420dd470c6a8..000000000000
--- a/dev-python/jupyter_console/jupyter_console-4.0.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="A terminal-based console frontend for Jupyter kernels"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-RDEPEND="
-	dev-python/ipython[${PYTHON_USEDEP}]
-	dev-python/ipykernel[${PYTHON_USEDEP}]
-	dev-python/jupyter_client[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		>=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-	)
-	"
-
-python_prepare_all() {
-	# Prevent un-needed download during build
-	if use doc; then
-		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/conf.py || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	nosetests --with-coverage --cover-package=jupyter_console jupyter_console || die
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/jupyter_console/jupyter_console-4.1.1.ebuild b/dev-python/jupyter_console/jupyter_console-4.1.1.ebuild
deleted file mode 100644
index 005c83c43f8b..000000000000
--- a/dev-python/jupyter_console/jupyter_console-4.1.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="A terminal-based console frontend for Jupyter kernels"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-RDEPEND="
-	dev-python/ipython[${PYTHON_USEDEP}]
-	dev-python/ipykernel[${PYTHON_USEDEP}]
-	dev-python/jupyter_client[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		>=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
-	)
-	"
-
-python_prepare_all() {
-	# Prevent un-needed download during build
-	if use doc; then
-		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/conf.py || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	nosetests --verbosity=3 jupyter_console || die
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/jupyter_console/jupyter_console-5.0.0.ebuild b/dev-python/jupyter_console/jupyter_console-5.0.0.ebuild
deleted file mode 100644
index efefcf744d1a..000000000000
--- a/dev-python/jupyter_console/jupyter_console-5.0.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="A terminal-based console frontend for Jupyter kernels"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-RDEPEND="
-	dev-python/ipython[${PYTHON_USEDEP}]
-	dev-python/ipykernel[${PYTHON_USEDEP}]
-	dev-python/jupyter_client[${PYTHON_USEDEP}]
-	>=dev-python/prompt_toolkit-1.0.0[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		>=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
-	)
-	"
-
-python_prepare_all() {
-	# Prevent un-needed download during build
-	if use doc; then
-		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/conf.py || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	nosetests --with-coverage --cover-package=jupyter_console jupyter_console || die
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/jupyter_console/jupyter_console-5.1.0.ebuild b/dev-python/jupyter_console/jupyter_console-5.1.0.ebuild
index 9227c3733bcc..063642fe8216 100644
--- a/dev-python/jupyter_console/jupyter_console-5.1.0.ebuild
+++ b/dev-python/jupyter_console/jupyter_console-5.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 inherit distutils-r1
 
@@ -15,6 +15,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/ipython[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyter_console/jupyter_console-6.0.0.ebuild b/dev-python/jupyter_console/jupyter_console-6.0.0.ebuild
index aa887586323f..063642fe8216 100644
--- a/dev-python/jupyter_console/jupyter_console-6.0.0.ebuild
+++ b/dev-python/jupyter_console/jupyter_console-6.0.0.ebuild
@@ -15,6 +15,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/ipython[${PYTHON_USEDEP}]