gentoo resync : 21.07.2018

3 files changed, 64 insertions, 1 deletions

diff --git a/dev-python/networkx/Manifest b/dev-python/networkx/Manifest
index 944d1e9f3926..b410cfd49a97 100644
--- a/dev-python/networkx/Manifest
+++ b/dev-python/networkx/Manifest
@@ -1,5 +1,7 @@
 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
 EBUILD networkx-1.11-r1.ebuild 1929 BLAKE2B 7852413061c7b9aa3960b9263a9d372e4ea343d0cf90a9e2113150eca7fd5b2ad3c5930e3cd66e90503da639c275ca198c48cfbcabafe99d795e60db687306ae SHA512 bbe4384d6ed6dbe201840f5bbd4d44cdbc1b89e4100f8c0045cdaf45c1ace297573221fcba6b6527ca261c25e4f466acbd81bf9f3a6613ce21e27e03d0547d9c
 EBUILD networkx-1.11.ebuild 1905 BLAKE2B 2ff9b91b619fc0846a90bf0388148398e295de9095e8fe973fbcb53a45650b84b845b67633951d2e45963d6d9e45e05a7bca82ad9c91cddec91ed61a24edc7b6 SHA512 4cb7100d2083b3dcf4c4d829ae30da9d9e4632bb7117f3255f3a3af4f74e8fc1515680cde0cf27d12c2e975e540a8ac32e95549de0c2c4a3bf6e280dd8423a6b
-MISC metadata.xml 1131 BLAKE2B 59e8dfa70e76d2084bc9bf4cdaeaeee7844ed7cd58b096d840ca266b10ca5213899717f60e416f336a288ae5fcdfc764c28e3a0376388c290c42f2ca924c9f34 SHA512 d91220a26181e850a8ddb2a4cc31105bc01cac62e88ab9d76757cf0732cd680aa1568a671902790893f08508072fac160093457f3d09b670ea704d38afe49e1c
+EBUILD networkx-2.1.ebuild 1493 BLAKE2B 1fc5b26fa405d5a48ae84b67897c1a88e21f0ab5c8e4dd1a667534c84dee876e6a62e5c56c7d5b6427898741850d5ad3582b01b4865f8962278791b99858dfa6 SHA512 56683a5cb53de30b85d8501aa55f5a2aef176baf8aed0ee797fbcea75d0e5b4dd64031b9aef546722aa41309485491d6de46cf79105ea2b35abdf17ed946318c
+MISC metadata.xml 1435 BLAKE2B a39ea5b9fb3de886147486d8d864b6df80480ca8d21326692f214546ce57e124e310dfca274c3d9a00643ed6783efd9ff79f446d8a5c642a97a67f1015590e63 SHA512 e360b0a0f506f12424feb3b5e9b998480e504dd784b27f0a64aecd69c0f14b23468cf17ff03df47a760d24c5536ee8f454aeb6e48e2aa9644d5b29a7cbd1a958
diff --git a/dev-python/networkx/metadata.xml b/dev-python/networkx/metadata.xml
index dff6872815b0..9b4b8c4f40d2 100644
--- a/dev-python/networkx/metadata.xml
+++ b/dev-python/networkx/metadata.xml
@@ -21,6 +21,9 @@
     <remote-id type="github">networkx/networkx</remote-id>
   </upstream>
   <use>
+    <flag name="extras">Provide graph drawing and graph layout algorithms along with shapefile format reading and writing</flag>
+    <flag name="pandas">Provides a DataFrame, which is a tabular data structure with labeled axes</flag>
     <flag name="scipy">Enables scipy backend</flag>
+    <flag name="yaml">Provides YAML format reading and writing</flag>
   </use>
 </pkgmetadata>
diff --git a/dev-python/networkx/networkx-2.1.ebuild b/dev-python/networkx/networkx-2.1.ebuild
new file mode 100644
index 000000000000..0dbd8fe24418
--- /dev/null
+++ b/dev-python/networkx/networkx-2.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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"
+
+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 || die
+}
+
+python_install_all() {
+	use examples && dodoc -r examples
+
+	distutils-r1_python_install_all
+}