gentoo resync : 20.10.2021

4 files changed, 3 insertions, 53 deletions

diff --git a/dev-python/networkx/Manifest b/dev-python/networkx/Manifest
index d75777d3cea3..74a252e1d9f6 100644
--- a/dev-python/networkx/Manifest
+++ b/dev-python/networkx/Manifest
@@ -1,5 +1,3 @@
-DIST networkx-2.6.2.tar.gz 1842077 BLAKE2B 8493e2d6a64d140b012ea443e9b1dc2409f8208dc1678c1d21cfd19bbdc07df6e9051aefe994d5fa6460db48320d563bb3051150782545ab5f671b7aafda4d0a SHA512 7006dcd209cce79f0f6cac4884797775422bd90fd3e8abb2eee70e6e00c9a25a785dd5856fc1657019a2b5c13a6fa5f705ea2e650c15a1f9d7d93580bc299219
 DIST networkx-2.6.3.tar.gz 1844862 BLAKE2B 408f97e334c3e0cec6d40d15d6ba8dc3c07cbd162fb31b301696c53ff1d924fd12f60d34df3f1b56fd036f2a344933a3b5c41a1aa2f91e5d5ca39f922cdfc41b SHA512 709b5126039c4b34a9b2ed60723e8bab3f591203f3ae8d87474e0f49f52b94b9c15568c78cc9e05e2bf997bc65a6177762bc41b0a44093ee59f6eaa0087d0f34
-EBUILD networkx-2.6.2.ebuild 1230 BLAKE2B f1a8c22e8e56a61b57378b3517d30460abaf0fb5db50947028f2a35c116d9d0010130a15a7d25d4478eddadcb22ff1d7a4f23d0fecb0799202eb50deb0f075ca SHA512 a455b0a1e09ed160352a89b38dca4d063b241d763aa59b0f917c1eeedc184085c9043762fd3574291609bce39b436dde1a01447e376fcbf9d0a5d252b2849229
-EBUILD networkx-2.6.3.ebuild 1341 BLAKE2B a2ffdfc539b5f46272c4de1a23253904c3f087327aceaef84edf7d2ebe7765355579d9cbb1b88048f440d94680961f352c320b9f33e69b05b88ee10986ea6c77 SHA512 0bf9843cedd1bbd3f8125445ac2524aaeb1e0ba028789616fb367e91d5bba3157de874109e7d62b9fb39cc98b120f33d3e1ea066eb288a404144a21c5040c419
-MISC metadata.xml 1304 BLAKE2B 006e40e7b37efdddf137d1a1326300d0bbcb71b48d038ff5c8c4818cfa6252c63412c4d8ef9be05d2b5cffb050b2b9cf180e252aa8273368cc054529e3807535 SHA512 251933e83f7b95ea5323d94bfe3b513c69631aa5646095d7d8e52dcff80dd223bcadc1055dba05de6eb9fd9505c5684a1eb7e1c059ad9d4d28a775eb83b61e7a
+EBUILD networkx-2.6.3.ebuild 1339 BLAKE2B 1b32384561a4be8a82007ce8119d29cf0d339f29d7c67081d5e003565d7f1d965d0a77d159bd1276b3f8f23cfc2669b2bde4fa6a781a6a3b48d369fb759adefa SHA512 04e6381ec450fb4fe02897c55151997326b17897c535867ed850fe63d8d3f9839c27dd3cc849fc5c89d7d0aea0839fcffd766e35b166de02258757faa6bac10d
+MISC metadata.xml 1088 BLAKE2B 407d24ca890c5b2a7c49e5eab7f79477f66cb140ed286a7d0c65be075714c671c0185b067f7ced6e9a1cdc17361cfbeb406c306dafb915590abf6b5b1263a4a4 SHA512 2a790d427d6c4391d409f767359a256ee5b8082246811c82949b898e0a2a9f23e7c40bb045ff5eaf17f3cee04d7d24adcdf1ff0ae416ebd7b2572cfdcf04064f
diff --git a/dev-python/networkx/metadata.xml b/dev-python/networkx/metadata.xml
index b32cbe03944e..b0d0d5f8a56f 100644
--- a/dev-python/networkx/metadata.xml
+++ b/dev-python/networkx/metadata.xml
@@ -21,8 +21,4 @@
     <remote-id type="pypi">networkx</remote-id>
     <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="yaml">Provides YAML format reading and writing</flag>
-  </use>
 </pkgmetadata>
diff --git a/dev-python/networkx/networkx-2.6.2.ebuild b/dev-python/networkx/networkx-2.6.2.ebuild
deleted file mode 100644
index 9e0f4791bb22..000000000000
--- a/dev-python/networkx/networkx-2.6.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Python tools to manipulate graphs and complex networks"
-HOMEPAGE="https://networkx.org/ https://github.com/networkx/networkx"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="examples extras xml yaml"
-
-RDEPEND="
-	>=dev-python/matplotlib-3.3[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.19[${PYTHON_USEDEP}]
-	>=dev-python/pandas-1.1[${PYTHON_USEDEP}]
-	>=dev-python/scipy-1.6.2[${PYTHON_USEDEP}]
-	extras? (
-		>=dev-python/pydot-1.4.1[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			>=dev-python/pygraphviz-1.7[${PYTHON_USEDEP}]
-			>=sci-libs/gdal-1.10.0[python,${PYTHON_USEDEP}]
-		' python3_{8..9})
-	)
-	xml? ( >=dev-python/lxml-4.5[${PYTHON_USEDEP}] )
-	yaml? ( >=dev-python/pyyaml-3.13[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local deselect=()
-	virtx epytest -p no:django ${deselect[@]/#/--deselect }
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/networkx/networkx-2.6.3.ebuild b/dev-python/networkx/networkx-2.6.3.ebuild
index bf19c4bb996d..7cb20910302a 100644
--- a/dev-python/networkx/networkx-2.6.3.ebuild
+++ b/dev-python/networkx/networkx-2.6.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 BDEPEND="
 	test? (