gentoo resync : 25.08.2020

3 files changed, 21 insertions, 29 deletions

diff --git a/dev-python/networkx/Manifest b/dev-python/networkx/Manifest
index aa32f83624bb..8c87139bc40f 100644
--- a/dev-python/networkx/Manifest
+++ b/dev-python/networkx/Manifest
@@ -1,6 +1,7 @@
 AUX networkx-2.4-py38.patch 3170 BLAKE2B 33577a719e9f59f910b5f0284318d77a9dba2392c4a2a25a0539cb3770f8326363de7a24473cd6c7d74a96911f3b0c040056daccaff23bdfd05fc9aff76410e7 SHA512 6142474c21f3ab613256252bf688873f19a68f781690dfdee63325835a692182e10b241495b0948f4658aaf2b36ff1f051931036cb97254459974dd807cd1550
 AUX networkx-2.4-py39.patch 2188 BLAKE2B e94c8ee731642a596d0812d82dbf85379249a64660c2a35d24ec4f405b5abb46fc4d971606ffaee0637d469673f1e55840629453c57d1e3c809d5e2b02c7a103 SHA512 3474cce5a89f3011bc8715c1ee6ca64c2251dae8ef142da24edb88c6b85d4ce1bc1cf72656674387b6a75132d25c4c348f1d32fc71674c789d3c06e9cb9dc5d6
 DIST networkx-2.4.tar.gz 1462338 BLAKE2B 90fd7d249f3b022dd9c861dd023881fd241cba0515e2e9991516c278a40b92ee03663eb2b15bd584f179c066529df0587293f9c9a211e7c526addf77fdaf5cd6 SHA512 38eabef56e3667b7fa85206ae01a0a8f5c71bfa2f324bc2490c433cb973508a03955183a0c58ae40390f86d6a4741135cdb426c4c15e53e2f123072f0cac1b89
-EBUILD networkx-2.4-r1.ebuild 1573 BLAKE2B 295aa550d91e38a9a891c3bc3e1599e2c1585321f9d750b4bd31118e43d553f83056d86e3cb5248189d29194fc9d107d5fbb92839d713739f105e2c5c2327454 SHA512 5abab020ce2045a9f882636d40a599827169038c5ac3a4104c08ab05804b8418b05d443ee71c743972595465efba69220ecb7cdd45b1fa9b807ec6ca0f387d3e
-EBUILD networkx-2.4.ebuild 1543 BLAKE2B b3cc53f08dad66b10636bb9082b43af06eb0828031b9327a1fd04bd329613effe35817af97f546b50ae0e194f73ed4ebea56af314e1311044395ff8c02546b15 SHA512 5c5a68c58eca8beb45568d6f4fe80bd1b58b6513cf3492654db7c4f5ca23d6192a9702793fd1aa62db48f3fc71b48a80dfdc5638c37e3c89d16fd3d1db2f3ef6
+DIST networkx-2.5.tar.gz 1542085 BLAKE2B a4d1d1f65a09f8e7cd830a9e670cf540c19b800dffb90aa1cc6ebda8b6116b6181969382f90339254746a3f277d786020506a3c8f10c90ff48999d3b2c3c433e SHA512 ab51198072d20bdba7c9ceb6856631a20a7e9527a7cadb41271a999f57bf60da5488269c6e4e1f3f4f33420ec6493af665386842c216ea1cfadd1792ccb6444e
+EBUILD networkx-2.4-r1.ebuild 1576 BLAKE2B 6d048939f2edbdaa8d072120dbbd1a56de2f3dc18839a605e3e7643bd7c3dbf1e4786ad35f18dbc8e18608837119070025e9c8809da659345a6d96b7a6bcd330 SHA512 fecab39597d16a78c155ff25149c1469d618cfdbce8909e03506269d18b42c4d899ef1aa4f76242b6d391a8365e8bf68b790d5e4c3181d32e1cbced503290b1f
+EBUILD networkx-2.5.ebuild 1339 BLAKE2B 92132a22cca5dc8edb0ea9619553a23dd789de66946cf2c9e67996e83d751244b342e2c087c2e04bf0be85ed0bf3b6b2db8d244ea9c74b09753d71db36ede169 SHA512 5058a309182f9173bd308c08c7c3dde09a1dcaeb6799d712d2f95fb3afd5dc8807ab741b74b8b189ce0c44214e97c3afb1866090373924103302afcacffed8eb
 MISC metadata.xml 1435 BLAKE2B a39ea5b9fb3de886147486d8d864b6df80480ca8d21326692f214546ce57e124e310dfca274c3d9a00643ed6783efd9ff79f446d8a5c642a97a67f1015590e63 SHA512 e360b0a0f506f12424feb3b5e9b998480e504dd784b27f0a64aecd69c0f14b23468cf17ff03df47a760d24c5536ee8f454aeb6e48e2aa9644d5b29a7cbd1a958
diff --git a/dev-python/networkx/networkx-2.4-r1.ebuild b/dev-python/networkx/networkx-2.4-r1.ebuild
index ef197baa3467..d98c149620d1 100644
--- a/dev-python/networkx/networkx-2.4-r1.ebuild
+++ b/dev-python/networkx/networkx-2.4-r1.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="examples extras pandas scipy test xml yaml"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/networkx/networkx-2.4.ebuild b/dev-python/networkx/networkx-2.5.ebuild
index 07a98d729cc8..7b9a1d6f392f 100644
--- a/dev-python/networkx/networkx-2.4.ebuild
+++ b/dev-python/networkx/networkx-2.5.ebuild
@@ -3,53 +3,44 @@
 
 EAPI=7
 
-# networkx-2.4 supports up to python3_8
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6..9} )
 inherit distutils-r1 virtualx
 
 DESCRIPTION="Python tools to manipulate graphs and complex networks"
-HOMEPAGE="http://networkx.github.io/ https://github.com/networkx/networkx"
+HOMEPAGE="https://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"
+KEYWORDS="~amd64 ~arm ~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="
+RDEPEND="
+	>=dev-python/decorator-4.3.0[${PYTHON_USEDEP}]
 	>=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}]
+		$(python_gen_cond_dep '
+			>=dev-python/pygraphviz-1.5[${PYTHON_USEDEP}]
+			>=sci-libs/gdal-1.10.0[python,${PYTHON_USEDEP}]
+		' python3_{6,7,8})
+	)
+	pandas? (
+		>=dev-python/pandas-0.23.3[${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}
+BDEPEND="
 	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	>=dev-python/decorator-4.3.0[${PYTHON_USEDEP}]
-	${COMMON_DEPEND}
-	examples? (
-		dev-python/pyparsing[${PYTHON_USEDEP}]
+		>=sci-libs/scipy-1.1.0[${PYTHON_USEDEP}]
 	)"
 
-PATCHES=(
-)
+distutils_enable_tests pytest
 
-python_test() {
-	virtx nosetests -vv
+src_test() {
+	virtx distutils-r1_src_test
 }
 
 python_install_all() {