gentoo resync : 15.01.2020

7 files changed, 7 insertions, 238 deletions

diff --git a/dev-python/networkx/Manifest b/dev-python/networkx/Manifest
index 0c3025163c97..65cb8eb02b12 100644
--- a/dev-python/networkx/Manifest
+++ b/dev-python/networkx/Manifest
@@ -1,11 +1,5 @@
-AUX 1.11-sphinx-pngmath.patch 361 BLAKE2B 1cc9c5d7ac8cf426656565df9afba6e4c75459550daafbaf98f4dbaa0814deb711963a3c7fee33537143e3f45bf7367b6a7c5213f72873f9ec5a47e7ebfa2807 SHA512 2db58b8f6067ccbe66bcdb3f39a80d126bd549c6838a34907b01360b5441f8b122632f1863b51142cba8688f4705697b9cd15d8fb6534ded8a9613e374edea4e
-DIST networkx-1.11.tar.gz 1315737 BLAKE2B 9f6556af1a4e23bf7fcf51fcbc753a08f2616dfe63c7b05fbe20ad7532580bf566c44ddc5db0c0d89626a17fd2029485583b513f44688e8033ca83cb36f28315 SHA512 622c93330bb5ba93a2be087f7f19963a1bb9a50dc72b6500ea8321c36aa9da19af379c5cd4bbee8bba3cb6e68a28f11ee24bbe333047f5c7d0ce0b755fd57253
-DIST networkx-2.1.zip 1612593 BLAKE2B 0a603617105bb1efa3711f81a468520eef5f56438bf6e730091a43b628d04fdd22e8b62de671dbe98be180bff68b3ea4af61e475fcc1f274537ccd1e74fcdff5 SHA512 61b819ccfdd38e009e5b363f4bf551f2924bbf751b078aab1b41da9faf4c6b0841f38750b96bd359d3aebefef01e65e88b4c43a378ec25bbd45283d92bdae678
 DIST networkx-2.2.zip 1700336 BLAKE2B 8cd4bda4100d5da10864f3b08d5a7faa11399176cfe39691aef46234a3de71bb175a3ac0b179cce9971c1954d0fc13469e41d610191c7827f1212d0e9ef1e3aa SHA512 098e58c5f93c72c789e736102815e2f6388eb34147a674941519ef6f6d6452cc09b76d8523893418cb69df133e7623ea2c62fa51144f598f592ebce0e3e3ccbb
 DIST networkx-2.4.tar.gz 1462338 BLAKE2B 90fd7d249f3b022dd9c861dd023881fd241cba0515e2e9991516c278a40b92ee03663eb2b15bd584f179c066529df0587293f9c9a211e7c526addf77fdaf5cd6 SHA512 38eabef56e3667b7fa85206ae01a0a8f5c71bfa2f324bc2490c433cb973508a03955183a0c58ae40390f86d6a4741135cdb426c4c15e53e2f123072f0cac1b89
-EBUILD networkx-1.11-r1.ebuild 1926 BLAKE2B 2fb06a45d31f8460dcc8af6993a4f6d8e4037db5a5f79a1252c81887a3ed982cc571a147e20493aed0e58df1df188e2c3d3e115f1ab0efa0e4f5ec25fbaeba2a SHA512 14fe408f3b704ae0a647c45a4de4c24db28e779807a618bb4e5ff5f361ddb40d29c0d7170cc58037ad57f8bc69eeb8a11603107d2c9b5eba50d2f2edd6a4bc39
-EBUILD networkx-1.11.ebuild 1902 BLAKE2B 659c5a345e0a4258c8934988c28d55b4d1e756b1626f83f86e45d41325946349d61d24d9127efc51ddd28272829c508ea40be31212c371570265e8b48a44fbb7 SHA512 fa3a76b477d93ab37c6940a89368e634d5e49335b53d81c0bb82bf1154dadbd316538dead0daa7b303b600ee4598c5580d799fc717af53ff7b62abb046074b78
-EBUILD networkx-2.1.ebuild 1510 BLAKE2B f48013dac574a11d2c7b4998bedb810009cbfa59c5df6be8a53b2566368ecc0d26c4fa363bbe1cacb6d5ae3b96e3d69da3795954fb560fc83e2765773f15bf72 SHA512 9add51c008c127bf5473e0ebd765ec50f77f03e7957e7f41eae6daf2285f49c4388d6a001791781b1a4a56424ef3e495def8843d33117141de2efeb0eb53ae32
-EBUILD networkx-2.2.ebuild 1510 BLAKE2B 354d3a1ab17328df561ab64c9e543b41a2f3d233925c4c5c4b8bcf00af865163a25e2463806fe09b0ec0aea34d785a62f45705af1e9bfbc39a376688f729c5fa SHA512 126b41e825c509e73724078aeb5fa22c6af17632a3b1144a57b903411bd41903a2bae43a66ea0a31f5c8ad950b1b3413d8848630dc64be6f710ef654b6eee98a
-EBUILD networkx-2.4.ebuild 1551 BLAKE2B d80e91a23202abaeac80fa65caa06fdcc092475b38bec3ff7f965ddf913981801444823cec2146920609bf6c31b174f9562bfb1f08d6a46ffb7cb3dc7905834a SHA512 f595e1e45d05aeae91d90eb8e79fa9a9ae76dd898a43ab1411fa2168c1f1f5332e80422dd70a13a9827adfad035fb827ff4a6ff5e7351b49cf4a002d75f39229
+EBUILD networkx-2.2.ebuild 1500 BLAKE2B dba698161fdaa6e7495c5f52cf2a7920ba79e7a77b57f46a08703b0b799dadf04b939155b8073f2b1ce2f21ef5a257119a8fc653d8aaf2fabb23bf8be610cd71 SHA512 bb700279e5c8d8d355a815b0fcd5d515e2a43e7858e4fbed0c36a28ad579434ff2d84b3d7e4a320bf5ea89e1fbaa94a93d00a481dd77a143754ea0a5fa29f167
+EBUILD networkx-2.4.ebuild 1545 BLAKE2B 86725d70dab8b567f571e7f33f826d3cf5d2c5c9d1bb5e7d7ee3cbca257947c8d0f4c480e521a4d8cc1f86124156cc9ddc5b2c0a0efbeebd3de3271574761cad SHA512 d8d07ef16ac00d6aeb473c3d3b1b1fbafd942e5b1842031f8d77e5926289a41250a36cc14eb38bc3d6c98cd9f1811d624486ce89748f1180b54f48b39308d2df
 MISC metadata.xml 1435 BLAKE2B a39ea5b9fb3de886147486d8d864b6df80480ca8d21326692f214546ce57e124e310dfca274c3d9a00643ed6783efd9ff79f446d8a5c642a97a67f1015590e63 SHA512 e360b0a0f506f12424feb3b5e9b998480e504dd784b27f0a64aecd69c0f14b23468cf17ff03df47a760d24c5536ee8f454aeb6e48e2aa9644d5b29a7cbd1a958
diff --git a/dev-python/networkx/files/1.11-sphinx-pngmath.patch b/dev-python/networkx/files/1.11-sphinx-pngmath.patch
deleted file mode 100644
index d43e4275a40b..000000000000
--- a/dev-python/networkx/files/1.11-sphinx-pngmath.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Drop pngmath extenstion from sphinx config
-
-Bug: https://bugs.gentoo.org/594626
-
---- a/doc/source/conf.py
-+++ b/doc/source/conf.py
-@@ -74,7 +74,6 @@ def cd(newpath):
-     'sphinx.ext.intersphinx',
-     'sphinx.ext.mathjax',
-     'sphinx.ext.napoleon',
--    'sphinx.ext.pngmath',
-     'sphinx.ext.todo',
-     'sphinx.ext.viewcode',
-     #'sphinxcontrib.bibtex',
diff --git a/dev-python/networkx/networkx-1.11-r1.ebuild b/dev-python/networkx/networkx-1.11-r1.ebuild
deleted file mode 100644
index 1280450d7c0b..000000000000
--- a/dev-python/networkx/networkx-1.11-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Python tools to manipulate graphs and complex networks"
-HOMEPAGE="http://networkx.github.io/ https://github.com/networkx/networkx"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples scipy test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="doc? ( || ( $(python_gen_useflags -2) ) )"
-
-COMMON_DEPEND="
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	scipy? ( sci-libs/scipy[${PYTHON_USEDEP}] )"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/numpydoc[${PYTHON_USEDEP}]' python2_7)
-		$(python_gen_cond_dep 'dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]' python2_7)
-	)
-	test? (
-		${COMMON_DEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/pydot[${PYTHON_USEDEP}]' -2)
-	)"
-RDEPEND="
-	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
-	examples? (
-		${COMMON_DEPEND}
-		dev-python/pygraphviz[${PYTHON_USEDEP}]
-		dev-python/pyparsing[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/1.11-sphinx-pngmath.patch
-)
-
-python_prepare_all() {
-	# Avoid d'loading of file objects.inv from 2 sites of python docs
-	sed -e "s/'sphinx.ext.intersphinx', //" -i doc/source/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		python_setup -2
-		emake -C doc html
-	fi
-}
-
-python_test() {
-	virtx nosetests -vv
-}
-
-python_install_all() {
-	# Oh my.
-	rm -r "${ED}"usr/share/doc/${P} || die
-
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	use examples && dodoc -r examples
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/networkx/networkx-1.11.ebuild b/dev-python/networkx/networkx-1.11.ebuild
deleted file mode 100644
index 8300110fa20e..000000000000
--- a/dev-python/networkx/networkx-1.11.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Python tools to manipulate graphs and complex networks"
-HOMEPAGE="http://networkx.github.io/ https://github.com/networkx/networkx"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="doc? ( || ( $(python_gen_useflags -2) ) )"
-
-COMMON_DEPEND="
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/numpydoc[${PYTHON_USEDEP}]' python2_7)
-		$(python_gen_cond_dep 'dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]' python2_7)
-	)
-	test? (
-		${COMMON_DEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/pydot[${PYTHON_USEDEP}]' -2)
-	)"
-RDEPEND="
-	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
-	examples? (
-		${COMMON_DEPEND}
-		dev-python/pygraphviz[${PYTHON_USEDEP}]
-		dev-python/pyparsing[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/1.11-sphinx-pngmath.patch
-)
-
-python_prepare_all() {
-	# Avoid d'loading of file objects.inv from 2 sites of python docs
-	sed -e "s/'sphinx.ext.intersphinx', //" -i doc/source/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		python_setup -2
-		emake -C doc html
-	fi
-}
-
-python_test() {
-	virtx nosetests -vv
-}
-
-python_install_all() {
-	# Oh my.
-	rm -r "${ED}"usr/share/doc/${P} || die
-
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	use examples && dodoc -r examples
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/networkx/networkx-2.1.ebuild b/dev-python/networkx/networkx-2.1.ebuild
deleted file mode 100644
index 551f5a8714c3..000000000000
--- a/dev-python/networkx/networkx-2.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Python tools to manipulate graphs and complex networks"
-HOMEPAGE="http://networkx.github.io/ https://github.com/networkx/networkx"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="examples extras pandas scipy test xml yaml"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	test? ( extras pandas scipy xml yaml )"
-
-COMMON_DEPEND="
-	>=dev-python/matplotlib-2.0.2[${PYTHON_USEDEP}]
-	extras? (
-		>=dev-python/pydot-1.2.3[${PYTHON_USEDEP}]
-		>=dev-python/pygraphviz-1.3.1[${PYTHON_USEDEP}]
-		>=sci-libs/gdal-1.10.0[python,${PYTHON_USEDEP}]
-	)
-	pandas? ( >=dev-python/pandas-0.20.1[${PYTHON_USEDEP}] )
-	scipy? ( >=sci-libs/scipy-0.19[${PYTHON_USEDEP}] )
-	xml? ( >=dev-python/lxml-3.7.3[${PYTHON_USEDEP}] )
-	yaml? ( >=dev-python/pyyaml-3.12[${PYTHON_USEDEP}] )"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/decorator-4.1.0[${PYTHON_USEDEP}]
-	${COMMON_DEPEND}
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
-	${COMMON_DEPEND}
-	examples? (
-		dev-python/pyparsing[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-)
-
-python_test() {
-	virtx nosetests -vv
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/networkx/networkx-2.2.ebuild b/dev-python/networkx/networkx-2.2.ebuild
index 3c300b4318c1..34015c56a179 100644
--- a/dev-python/networkx/networkx-2.2.ebuild
+++ b/dev-python/networkx/networkx-2.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1 virtualx
 
 DESCRIPTION="Python tools to manipulate graphs and complex networks"
diff --git a/dev-python/networkx/networkx-2.4.ebuild b/dev-python/networkx/networkx-2.4.ebuild
index 76776271aebd..352b12090902 100644
--- a/dev-python/networkx/networkx-2.4.ebuild
+++ b/dev-python/networkx/networkx-2.4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-# networkx-2.4 supports up to python3_8
-PYTHON_COMPAT=( python{3_5,3_6,3_7} )
 
+# networkx-2.4 supports up to python3_8
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1 virtualx
 
 DESCRIPTION="Python tools to manipulate graphs and complex networks"