gentoo resync : 22.12.2021

5 files changed, 10 insertions, 75 deletions

diff --git a/dev-python/graphviz/Manifest b/dev-python/graphviz/Manifest
index 752ec4d43b69..6f26f0c27664 100644
--- a/dev-python/graphviz/Manifest
+++ b/dev-python/graphviz/Manifest
@@ -1,9 +1,5 @@
-DIST graphviz-0.17.zip 193647 BLAKE2B f2f5ad728157d60c48964d2cfdc76559310af6099a9eae16279b0f9e8a41c08d02d5f255be62222c1f0808750a26e67822b5fbb930f7ada5c6a614c3607494cd SHA512 02f5ef21f9e3bf3b609f43fe0d9cb51632ea43c878055746af62fda4dd55883f6ad58f69faecb6aba552100cc835901309c8c2ec833cd74c617619fce2d49600
-DIST graphviz-0.18.1.zip 204937 BLAKE2B 4fa847aeb9683fc8244a01f8bd240fea29130cbaefbaa60c8fac3a735fda1d400afea01a4b79a4a5dc1cbb0d9759b613c877953d580d73c6329aa4f52fff5f8f SHA512 88b0771988643ac870a53a31afb5c947a42fb54c930cbf759dde10a4405f85798e0bea96189019e1fc958db2679b936e42a478116719ce41f618c6b7e3334aa2
 DIST graphviz-0.18.2.zip 205555 BLAKE2B d245dcd33a7779f00bb9e740968175d4fbe12d3182682b548f447e2c4ce4423683c3fd2727aa693a5e9c264cfdeed603af9a7bc9839f8d91f5fc091045473146 SHA512 f18defc99411b0b12a8326589da603197d345f458d4b0d602e63205f8542fdf4bec636750ac0fc5551126dff4cd76ce04fc089c0985831a1efec3271a7f22230
-DIST graphviz-0.18.zip 199876 BLAKE2B 355478a4341fb5a286b7419a6799c809f7489f80911e21d94be8d63c957ed9952d5f72b1aac6258fb8b3146424c61de64085fd02c0da14b8b4c6fd447568fb92 SHA512 56eb4252076ddb4fd3ad691199e67d58dab766828d9c80403df60cda80cd58cbb04f96edbacef674300f4f63eace0144322c73501737342c797fb7b9a203a722
-EBUILD graphviz-0.17.ebuild 731 BLAKE2B d6409c914a0814e888a17533ed823eee5c8e7caad76d94f5c6355f0840203874119b7846dba80ac4e17475e01838a4628e4f4b7e330a5808adfd0bcc30021415 SHA512 bb6acf1ddc95dd29e0feab8a2839908e059e855178df2773875b7ba7e49480ad8e6cb866ff70b31d39a2fbb30021fd349bfee7c1171f130d091f7a46e8a1bad2
-EBUILD graphviz-0.18.1.ebuild 733 BLAKE2B 5362a98046f54f2079662066ec5290743912843b1dd1477b2664927c3c007960cbba95a579c52088f0888af064b104a92c79759e97afc2b6cd3869dfc35e15a9 SHA512 4da644d793af568e9cafa2248478e780ddb7e36c5010ef36b0d764adbfaab223673104aabb882803e180b83bfd25137137a91e5347bc0a554bcc24b3003e795b
-EBUILD graphviz-0.18.2.ebuild 733 BLAKE2B 5362a98046f54f2079662066ec5290743912843b1dd1477b2664927c3c007960cbba95a579c52088f0888af064b104a92c79759e97afc2b6cd3869dfc35e15a9 SHA512 4da644d793af568e9cafa2248478e780ddb7e36c5010ef36b0d764adbfaab223673104aabb882803e180b83bfd25137137a91e5347bc0a554bcc24b3003e795b
-EBUILD graphviz-0.18.ebuild 733 BLAKE2B 5362a98046f54f2079662066ec5290743912843b1dd1477b2664927c3c007960cbba95a579c52088f0888af064b104a92c79759e97afc2b6cd3869dfc35e15a9 SHA512 4da644d793af568e9cafa2248478e780ddb7e36c5010ef36b0d764adbfaab223673104aabb882803e180b83bfd25137137a91e5347bc0a554bcc24b3003e795b
+DIST graphviz-0.19.1.zip 247779 BLAKE2B c0b226c2ae66f8b583a30cf2842b8cfdecd926f0e7f32fbbfb4dae17ce14792d0af8d8cf6de53cc9a7facdeb8b0a4a078b962eabf64460e1fd42dd995e069428 SHA512 3aa078887458d7bcd173c46ee6e4d8dbdae0c9103755e61e5a027c18e5d8913990aa16a595e80228607c17db1aa9dffdb93e264cafafc8b6318bc3a87547bc5d
+EBUILD graphviz-0.18.2.ebuild 738 BLAKE2B 3b922e8adb465d19bf41c30ee65f3adaea7ae2e2ff8e4ccdf3b5a3f36de4eb19b3ace88dac3d6d661551d916e21ded6055cf96a629d23aa46be663459f577d61 SHA512 2dddd822b6602ba1b5251aa9305245d7a1ed2793c1f64ca2a6bd1f6b180d34a8b420483a145698b5b814e0ff9d90770d2e471a03482f5ce484d96d8f3ec529e9
+EBUILD graphviz-0.19.1.ebuild 862 BLAKE2B ed05ecaf39596ea4c8563a6a7ab25e8b280c75480e18a1326d303530fb74ab6d63e1a31c8af57baf6155d3da873275e32f33f97521dec654a9fa31027d86716e SHA512 01e19fdcf5b6ee8edc8c040f1a6eb9528f35dd048f7dedbb9248ed83bee025f8cc6dc81647603e5d99a78d32afa29c727ff29393f7ff74a0a42c0598d5f20672
 MISC metadata.xml 553 BLAKE2B d974f24c488a83d7c1510825d5e157644a4df70113af1283224a847d1cce2535ff4cb0633833a8671f6508fdd38c9079bc21239fdc1d1e9ac85f2ad08ea3a297 SHA512 72d2ce4887aa23136d689bf51b94f17ea3c8803464f623b0f4380381b9639a15a34858f26f129d5db2025d2ccda82dc80f22f5984ef58cffdf4dfcd7b8c51127
diff --git a/dev-python/graphviz/graphviz-0.18.1.ebuild b/dev-python/graphviz/graphviz-0.18.1.ebuild
deleted file mode 100644
index befd64b4a916..000000000000
--- a/dev-python/graphviz/graphviz-0.18.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Simple Python interface for Graphviz"
-HOMEPAGE="https://graphviz.readthedocs.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-
-RDEPEND="media-gfx/graphviz"
-BDEPEND="
-	app-arch/unzip
-	test? (
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-mock-1.8[${PYTHON_USEDEP}]
-		media-gfx/graphviz[gts,pdf]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -e 's:--cov --cov-report=term --cov-report=html::' \
-		-i setup.cfg || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/graphviz/graphviz-0.18.2.ebuild b/dev-python/graphviz/graphviz-0.18.2.ebuild
index befd64b4a916..de96bc061ec5 100644
--- a/dev-python/graphviz/graphviz-0.18.2.ebuild
+++ b/dev-python/graphviz/graphviz-0.18.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://graphviz.readthedocs.io/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~riscv x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 
 RDEPEND="media-gfx/graphviz"
diff --git a/dev-python/graphviz/graphviz-0.18.ebuild b/dev-python/graphviz/graphviz-0.18.ebuild
deleted file mode 100644
index befd64b4a916..000000000000
--- a/dev-python/graphviz/graphviz-0.18.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Simple Python interface for Graphviz"
-HOMEPAGE="https://graphviz.readthedocs.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-
-RDEPEND="media-gfx/graphviz"
-BDEPEND="
-	app-arch/unzip
-	test? (
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-mock-1.8[${PYTHON_USEDEP}]
-		media-gfx/graphviz[gts,pdf]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -e 's:--cov --cov-report=term --cov-report=html::' \
-		-i setup.cfg || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/graphviz/graphviz-0.17.ebuild b/dev-python/graphviz/graphviz-0.19.1.ebuild
index 61999300c9db..9df7603a752c 100644
--- a/dev-python/graphviz/graphviz-0.17.ebuild
+++ b/dev-python/graphviz/graphviz-0.19.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://graphviz.readthedocs.io/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 LICENSE="MIT"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 
 RDEPEND="media-gfx/graphviz"
@@ -31,3 +31,8 @@ src_prepare() {
 		-i setup.cfg || die
 	distutils-r1_src_prepare
 }
+
+python_test() {
+	"${EPYTHON}" run-tests.py -vv -ra -l -Wdefault -p no:xdoctest ||
+		die "Tests failed with ${EPYTHON}"
+}