diff --git a/dev-python/networkx/Manifest b/dev-python/networkx/Manifest
index 99fb7c47f746d..d0df01630f967 100644
--- a/dev-python/networkx/Manifest
+++ b/dev-python/networkx/Manifest
@@ -1 +1,2 @@
 DIST networkx-1.11.tar.gz 1315737 BLAKE2B 9f6556af1a4e23bf7fcf51fcbc753a08f2616dfe63c7b05fbe20ad7532580bf566c44ddc5db0c0d89626a17fd2029485583b513f44688e8033ca83cb36f28315 SHA512 622c93330bb5ba93a2be087f7f19963a1bb9a50dc72b6500ea8321c36aa9da19af379c5cd4bbee8bba3cb6e68a28f11ee24bbe333047f5c7d0ce0b755fd57253
+DIST networkx-2.1.zip 1612593 BLAKE2B 0a603617105bb1efa3711f81a468520eef5f56438bf6e730091a43b628d04fdd22e8b62de671dbe98be180bff68b3ea4af61e475fcc1f274537ccd1e74fcdff5 SHA512 61b819ccfdd38e009e5b363f4bf551f2924bbf751b078aab1b41da9faf4c6b0841f38750b96bd359d3aebefef01e65e88b4c43a378ec25bbd45283d92bdae678
diff --git a/dev-python/networkx/metadata.xml b/dev-python/networkx/metadata.xml
index dff6872815b0e..9b4b8c4f40d2e 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 0000000000000..0dbd8fe244185
--- /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
+}