gentoo resync : 15.12.2019

3 files changed, 3 insertions, 64 deletions

diff --git a/dev-python/bokeh/Manifest b/dev-python/bokeh/Manifest
index 09e7c19224ba..6f28f01e0b20 100644
--- a/dev-python/bokeh/Manifest
+++ b/dev-python/bokeh/Manifest
@@ -1,5 +1,3 @@
-DIST bokeh-0.11.1.tar.gz 3383140 BLAKE2B 68a368d7817e4066378018e6283177d5b8cc7e8328a9d2db0b678514016fd54c3d6c7d837e4df0ab0668539fe403a036cb660ea475aded6bbc685a138dffc087 SHA512 18cfee85698f1ba548c34fb223dc57e36584951064e65fac83cb8388b129914a8f67970a133ef2d1a67c06e50cbfb565a27d33dc9c90f5027a1739d400894706
 DIST bokeh-0.12.6.tar.gz 13720124 BLAKE2B e8fc1c42b530622bf6de8e13e81ae45e6d47985cef1ed81a2e32bfaef2a246a09c25210728cf434da6d4a0ef8f47ade1be5ee9e9318cc0a071bff36b317069a1 SHA512 7a293169521b690bb2cdcefe3667f869e75f2b718d6122af63201e2fb2e530eba931b3fa2ee3474a8ead758039cbb7d756acc0349e2f0820d72a4f754b9301b2
-EBUILD bokeh-0.11.1.ebuild 1969 BLAKE2B 32eedfca03f111bc78a6a2b8823b2df44f8a41bff7301980cd760f26ebd31d3f468b7c05891f992a8942a1a95e085424a872e0d15c96a9a180e8093655934ca0 SHA512 1533d73a6ae3667bf7843478e9a6710222cc4bbb397cb1de8e3070a2a0a0e920bb37d7bb02671d9a0d9d36770362a5f5a3b18c882e428948b72c32051571e87c
-EBUILD bokeh-0.12.6.ebuild 2131 BLAKE2B 143671e7f71e1af10f0a384ec77ad8f68820edc244884f1074609522301b50440f0da362f9b00fe36f3266f2346c97b9bc9268a74c965ba0231a5fd2f1ef608e SHA512 49a5d33fc20a9fdd167d2238532e19c682a865d8607c60f4ba6ef0fb521c04370363e39bbd07a4cf9e66e2ad41b98dbaf18faffebb0c9455300c5e406876e0e5
+EBUILD bokeh-0.12.6.ebuild 2148 BLAKE2B ffa63e562003c1ba6a5581808152acfa4d91c2b0c859a89a75ec305cc7f538d4d1ea13a4470a2d50d983de71f5b3f34028ca16e3a4aae09977e2d7d4945c6228 SHA512 4b2d5d557cc57ea144f7bbde8208f2fdd1ca23a1057132b520a41cc79d580dc45b69958ef51882f7afa58ba0b5bdc0785919dc22abbd188140a6d3beaf1fca64
 MISC metadata.xml 879 BLAKE2B edcba4dfedb81192edd9a32b2ad320582129f0efdd9ccab46d99ebc0e561784f04f53fe1dd80243513ea0a69ab3dfeb1d36cda6a5b37585cc26e2c203194a8bc SHA512 46419cc11f266c9e5d51b35c4bd4a75c4c82446dc8a9f06b6ac7ef3c742a371334b56e98a4bc831bc4f5ccee0222ba7f2b36a44d32fc4ea3aaa092b32c7429c9
diff --git a/dev-python/bokeh/bokeh-0.11.1.ebuild b/dev-python/bokeh/bokeh-0.11.1.ebuild
deleted file mode 100644
index 2f3b0875ca1b..000000000000
--- a/dev-python/bokeh/bokeh-0.11.1.ebuild
+++ /dev/null
@@ -1,60 +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="Statistical and novel interactive HTML plots for Python"
-HOMEPAGE="https://bokeh.pydata.org/en/latest/
-	https://github.com/bokeh/bokeh
-	https://pypi.org/project/bokeh/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="examples test"
-
-# A doc build requires napoleon sphinx extension which will be included in sphinx release 1.3
-# Therefore refraining from adding the doc build for now
-RDEPEND="
-	dev-python/abstract_rendering[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.2.7[${PYTHON_USEDEP}]
-	>=dev-python/flask-0.10.1[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.7[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/pandas-0.11[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-14.3.1[${PYTHON_USEDEP}]
-	>=dev-python/redis-py-2.7.6[${PYTHON_USEDEP}]
-	>=dev-python/requests-1.2.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.5.2[${PYTHON_USEDEP}]
-	dev-python/websocket-client[${PYTHON_USEDEP}]
-	>=dev-python/werkzeug-0.9.1[${PYTHON_USEDEP}]
-	>=www-servers/tornado-4.0.1[${PYTHON_USEDEP}]
-	"
-# testing server: needs websocket not in portage yet
-# websocket is in pypi for the adding
-# hdf5 backend: needs array management not in portage yet
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 'python2*')
-		$(python_gen_cond_dep 'dev-python/flexx[${PYTHON_USEDEP}]' 'python3*')
-	)"
-
-python_test() {
-	cd "${BUILD_DIR}"/lib || die
-	py.test -m 'not (js or examples or integration)' -vv || die
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/bokeh/bokeh-0.12.6.ebuild b/dev-python/bokeh/bokeh-0.12.6.ebuild
index e4c6a7d90a63..d29d9e8ff984 100644
--- a/dev-python/bokeh/bokeh-0.12.6.ebuild
+++ b/dev-python/bokeh/bokeh-0.12.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 inherit distutils-r1
 
@@ -17,6 +17,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="examples test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/jinja[${PYTHON_USEDEP}]