gentoo auto-resync : 13:02:2023 - 08:16:09

3 files changed, 2 insertions, 69 deletions

diff --git a/dev-python/networkx/Manifest b/dev-python/networkx/Manifest
index 22851ef4b7c9..cc028a2604b3 100644
--- a/dev-python/networkx/Manifest
+++ b/dev-python/networkx/Manifest
@@ -1,5 +1,3 @@
-DIST networkx-2.8.8.tar.gz 1960828 BLAKE2B 074e902c2c31e0641fe651d2168c77e62af04b322485bf002f557a42c7a7c63d1391c32f9de95b9d5faf13f7eb9ece93171bb1fdba8548d59df5075ac72263e2 SHA512 c698ed2dcc4221662af585940cf5d6ce1ad97b6b8f6d84348ff1d6b233eb69a36f5fba362bc4bb3a08ec8716434690b52b1d66dc4122edb0f420eaa10023d9d4
 DIST networkx-3.0.tar.gz 1987075 BLAKE2B fd5de216f4934a1d5c730264b3860a91dcaf7a12462b615b1aa22df11bfd7d530a369442eebe185572e94bedf6fae3ef4a452804c84fdf3f1e79527ffab2d5c9 SHA512 73e1a9faca6ecd04f6d8da4cd5a887af31738fbeca3d06adc57a4a61fad1d81ab30e89f9c4d25274b0890519b0a517f09402eea3bf3f26b18c3e3052b837ee37
-EBUILD networkx-2.8.8.ebuild 1889 BLAKE2B 3bc9dfa30c3f4468b851fac086b08a6305e3b1fdae9c910d8035013ed35989deeb3f9ea76a440027dc1de8a519677dbf32c9a6eb46ba58230479122f637d241d SHA512 42b479fb1ac17c926e54c104caa1500db8ab2171ccc6dcef32a89882640b90a0d0730e0d925ef95f5b030e0afe99f83cdc4b1ec629351e96a0953d3b6a6520ae
-EBUILD networkx-3.0.ebuild 1893 BLAKE2B d80b0afb74fb268cb864bb34153720075f45fe80fbc824c416cdd8290f2049c8af0bf1a54453623cadfeaef3df366038f0f907fe97d8282f5d90313b51ff66ef SHA512 64931392ecc08fd40f4a9059c2d693143e50915698a43b0361fb1eeec90b8b58fb0103c850017ee1edb9bd4b720544b76924d4f5628785ed2d7455ddfd90c0aa
+EBUILD networkx-3.0.ebuild 1889 BLAKE2B 5417528efd617a0c636d54b1948eef31f0f75c06e5fdb17f7b694b3ba456b8f6a30e34dfc31aa56cebccea682174d68d461da61fb06743b4406490fcfe23edbe SHA512 d341218c89aa95873a804a9a5e771e26795fc8f4ca362e128ef055a34f95558034cb7091f01354d940f31a6769fc3375ad9ae8f9f9fc9042841ddf6a1e102de1
 MISC metadata.xml 1090 BLAKE2B 9ef8ce06a4f462ac6a535217aa6bb55c9f1994ed3ab57b4cb656434a93a0c1fb401932307c43bd680576b82282b4055b1ee9ef1d49cfd5113927dc4919dc7616 SHA512 e9b291b754118d278b109f5704607f2d9b3807c9e6195b75b77388129952c79dba16e86f0a9c5f65479185c409c5191bb1f8863e282dde052b12d40bc9fb9901
diff --git a/dev-python/networkx/networkx-2.8.8.ebuild b/dev-python/networkx/networkx-2.8.8.ebuild
deleted file mode 100644
index 239cf0dc087c..000000000000
--- a/dev-python/networkx/networkx-2.8.8.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_FULLY_TESTED=( python3_{9..11} )
-PYTHON_COMPAT=( "${PYTHON_FULLY_TESTED[@]}" )
-
-inherit distutils-r1 optfeature multiprocessing virtualx
-
-DESCRIPTION="Python tools to manipulate graphs and complex networks"
-HOMEPAGE="
-	https://networkx.org/
-	https://github.com/networkx/networkx/
-	https://pypi.org/project/networkx/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ~loong ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-BDEPEND="
-	test? (
-		>=dev-python/lxml-4.5[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		>=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			>=dev-python/numpy-1.19[${PYTHON_USEDEP}]
-			>=dev-python/scipy-1.6.2[${PYTHON_USEDEP}]
-		' "${PYTHON_FULLY_TESTED[@]}")
-	)
-"
-
-distutils_enable_tests pytest
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	local EPYTEST_DESELECT=()
-	if ! has_version "dev-python/scipy[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			networkx/drawing/tests/test_pylab.py::test_draw
-		)
-	fi
-	# virtx implies nonfatal
-	nonfatal epytest -p no:django -n "$(makeopts_jobs)" || die
-}
-
-src_install() {
-	distutils-r1_src_install
-	# those examples use various assets and pre-compressed files
-	docompress -x /usr/share/doc/${PF}/examples
-}
-
-pkg_postinst() {
-	optfeature "recommended dependencies" "dev-python/matplotlib dev-python/numpy dev-python/pandas dev-python/scipy"
-	optfeature "graph drawing and graph layout algorithms" "dev-python/pygraphviz dev-python/pydot"
-	optfeature "YAML format reading and writing" "dev-python/pyyaml"
-	optfeature "shapefile format reading and writing" "sci-libs/gdal[python]"
-	optfeature "GraphML XML format" "dev-python/lxml"
-}
diff --git a/dev-python/networkx/networkx-3.0.ebuild b/dev-python/networkx/networkx-3.0.ebuild
index e7b433832070..e0434b31fba8 100644
--- a/dev-python/networkx/networkx-3.0.ebuild
+++ b/dev-python/networkx/networkx-3.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~ia64 ~loong ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 BDEPEND="
 	test? (