gentoo resync : 15.12.2019

6 files changed, 74 insertions, 9 deletions

diff --git a/dev-python/networkx/Manifest b/dev-python/networkx/Manifest
index 65bd5d042b78..0c3025163c97 100644
--- a/dev-python/networkx/Manifest
+++ b/dev-python/networkx/Manifest
@@ -2,8 +2,10 @@ AUX 1.11-sphinx-pngmath.patch 361 BLAKE2B 1cc9c5d7ac8cf426656565df9afba6e4c75459
 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
-EBUILD networkx-1.11-r1.ebuild 1906 BLAKE2B bf1c3c207390a3d28945bb25d164028e1727cd34c53d9f2af0dcb8550ad0703a59e4f768f0239bc754c4a959039929f44f3cacbeaee7230900fcd2a8014d68f9 SHA512 063419d28e04cd51256206a2522013dcb707ab9d97ecc038ae70ac4f19b316f097867508e520c1d2584044833547489c237b97aff010c7e51f0539e608795fd9
-EBUILD networkx-1.11.ebuild 1882 BLAKE2B 29280c963dc0d1fc49700ca7c7bebea6c31651f3ccfce867ed4020d7f9d26cc3d06ab3e7d16803b101f3f8181e33e49f6d34f5b235ec6fbdf6c354f5ff49c82b SHA512 d4e8689c98171dbc13cf307b2343f33ba56b0b73b53d314c6a66063eff1e03b32c78b8f4cc4e4b976660dd131dddf14fa9e7b3ac6b0c4c167dba595f57e3b331
-EBUILD networkx-2.1.ebuild 1493 BLAKE2B 1fc5b26fa405d5a48ae84b67897c1a88e21f0ab5c8e4dd1a667534c84dee876e6a62e5c56c7d5b6427898741850d5ad3582b01b4865f8962278791b99858dfa6 SHA512 56683a5cb53de30b85d8501aa55f5a2aef176baf8aed0ee797fbcea75d0e5b4dd64031b9aef546722aa41309485491d6de46cf79105ea2b35abdf17ed946318c
-EBUILD networkx-2.2.ebuild 1490 BLAKE2B a2b1d9438f2529d6765839d128e6f6e7fccf76c8fcffc9601b5005f3d3f54b901f7b70a56799793a316e2c6f24fafafb3bc066885d77e371c6dcefb9a0372bfc SHA512 72af6766bc5eebb1864d548ea70fe6a93fa72b4d173a9b76e767bbb329a09941c2928bf9a30e3bcffe5580da7427efc161b1c74cc2c733fdbd4d268dfa80fb1f
+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
 MISC metadata.xml 1435 BLAKE2B a39ea5b9fb3de886147486d8d864b6df80480ca8d21326692f214546ce57e124e310dfca274c3d9a00643ed6783efd9ff79f446d8a5c642a97a67f1015590e63 SHA512 e360b0a0f506f12424feb3b5e9b998480e504dd784b27f0a64aecd69c0f14b23468cf17ff03df47a760d24c5536ee8f454aeb6e48e2aa9644d5b29a7cbd1a958
diff --git a/dev-python/networkx/networkx-1.11-r1.ebuild b/dev-python/networkx/networkx-1.11-r1.ebuild
index 2f04d349b386..1280450d7c0b 100644
--- a/dev-python/networkx/networkx-1.11-r1.ebuild
+++ b/dev-python/networkx/networkx-1.11-r1.ebuild
@@ -15,6 +15,7 @@ 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) ) )"
 
@@ -61,7 +62,7 @@ python_compile_all() {
 }
 
 python_test() {
-	virtx nosetests -vv || die
+	virtx nosetests -vv
 }
 
 python_install_all() {
diff --git a/dev-python/networkx/networkx-1.11.ebuild b/dev-python/networkx/networkx-1.11.ebuild
index f4f786cd4b18..8300110fa20e 100644
--- a/dev-python/networkx/networkx-1.11.ebuild
+++ b/dev-python/networkx/networkx-1.11.ebuild
@@ -15,6 +15,7 @@ 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) ) )"
 
@@ -61,7 +62,7 @@ python_compile_all() {
 }
 
 python_test() {
-	virtx nosetests -vv || die
+	virtx nosetests -vv
 }
 
 python_install_all() {
diff --git a/dev-python/networkx/networkx-2.1.ebuild b/dev-python/networkx/networkx-2.1.ebuild
index 0dbd8fe24418..551f5a8714c3 100644
--- a/dev-python/networkx/networkx-2.1.ebuild
+++ b/dev-python/networkx/networkx-2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,6 +15,7 @@ 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 )"
@@ -48,7 +49,7 @@ PATCHES=(
 )
 
 python_test() {
-	virtx nosetests -vv || die
+	virtx nosetests -vv
 }
 
 python_install_all() {
diff --git a/dev-python/networkx/networkx-2.2.ebuild b/dev-python/networkx/networkx-2.2.ebuild
index a33edf2829d5..3c300b4318c1 100644
--- a/dev-python/networkx/networkx-2.2.ebuild
+++ b/dev-python/networkx/networkx-2.2.ebuild
@@ -14,6 +14,7 @@ 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 )"
@@ -47,7 +48,7 @@ PATCHES=(
 )
 
 python_test() {
-	virtx nosetests -vv || die
+	virtx nosetests -vv
 }
 
 python_install_all() {
diff --git a/dev-python/networkx/networkx-2.4.ebuild b/dev-python/networkx/networkx-2.4.ebuild
new file mode 100644
index 000000000000..76776271aebd
--- /dev/null
+++ b/dev-python/networkx/networkx-2.4.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2019 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} )
+
+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="examples extras pandas scipy test xml yaml"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	test? ( extras pandas scipy xml yaml )"
+
+COMMON_DEPEND="
+	>=dev-python/matplotlib-2.2.2[${PYTHON_USEDEP}]
+	extras? (
+		>=dev-python/pydot-1.2.4[${PYTHON_USEDEP}]
+		>=dev-python/pygraphviz-1.5[${PYTHON_USEDEP}]
+		>=sci-libs/gdal-1.10.0[python,${PYTHON_USEDEP}]
+	)
+	pandas? ( >=dev-python/pandas-0.23.3[${PYTHON_USEDEP}] )
+	scipy? ( >=sci-libs/scipy-1.1.0[${PYTHON_USEDEP}] )
+	xml? ( >=dev-python/lxml-4.2.3[${PYTHON_USEDEP}] )
+	yaml? ( >=dev-python/pyyaml-3.13[${PYTHON_USEDEP}] )"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/decorator-4.3.0[${PYTHON_USEDEP}]
+	${COMMON_DEPEND}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+RDEPEND="
+	>=dev-python/decorator-4.3.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
+}