gentoo resync : 25.08.2020

3 files changed, 49 insertions, 3 deletions

diff --git a/dev-python/pygraphviz/Manifest b/dev-python/pygraphviz/Manifest
index c318c469b104..877fffc6ddfe 100644
--- a/dev-python/pygraphviz/Manifest
+++ b/dev-python/pygraphviz/Manifest
@@ -1,4 +1,6 @@
 AUX pygraphviz-1.5-docs.patch 929 BLAKE2B 5186201bcbba3485c97c249bf9f4d6b04f641a7ec6db0e8cea9260e8cd4960ab5aeff52ebf81b2bf5dd94be5a0f87b7c10c92cbfc720046f6705e478082b18a5 SHA512 003ed3275771998a40c162abfc61ebf78cb149b20b2b4c770725459364e08a5afb33fe39b00e2e662706a40c3a91033d9e0aead66a7cd627b3b0b2ceba5a62d2
 DIST pygraphviz-1.5.zip 117810 BLAKE2B e9139d6b8e01cacb3135b1ccd2fa8624c041b7a04848f66c7668c5acf55cf66380ab9f05193b1bb240133f0c01a21915e2314807fcde23246c287d22efb9450a SHA512 6d3df6642a7e23ecb6b687761480b80a3ee5886508ef50b81697041425be7d09d623bf46990c5cea3ef36817a28d9e5c2905eb32267296f55524fdedb2199ea2
-EBUILD pygraphviz-1.5.ebuild 1124 BLAKE2B 00760ad0153f1655e8fac9b531826bd6f182f1cc7b24939066d42a3d8e13b3d735ade9bc7ad8164b2b6491be73fab903c5a65fc17ad7c4f5314fbd1b0aa484cf SHA512 fb182c8cb78ff74128e2191db0294889077e88f718417c5e905fbf589cdc37737ad4d95d627ed709c4e81c73b5ad1b437014d2dc5795fc7a29b73d1d1a39d692
+DIST pygraphviz-1.6.zip 117043 BLAKE2B a6c4f28d67ff67bf3fb69869adaad23855c6d702663cfea648b2072b8a5095caaa3d9cfcc864354a362cc6c4c2c6e4a15d5977c58c6af5e22b02f8cea8f7e877 SHA512 6dd389b3fd8c46fd5c8a5a450623f2fe080f720bcf0812618549d092cf917b56ef515f4235fdb89123ece422c6e295705bb08076a3d3e9b193955fcda624acb3
+EBUILD pygraphviz-1.5.ebuild 1137 BLAKE2B 14afc237c4da126b7ac30e6176892fad3c46d0716e167c3d7c6f0a431d70f25b730194688db0e0c25948a4a6eef478260863c9a78a7f30fd1c15851e9108254d SHA512 1143108fdef556d65d181214ab4fa188dc1a6e656a39d79ff07dbda07ef2b5467e7a0edab56670ae884ebfa539ce1da9e4e8ceab7ba41be645c399e52c4fea63
+EBUILD pygraphviz-1.6.ebuild 1055 BLAKE2B 7be6e7da4dc808a7dbb249bb98471f0c52841ffebb555b8b36361b60856054895fd1d7efdf3c036b22e284b2a52453fdf68fe550db9549f15d73e4de3fcfba88 SHA512 a75cc3044e1715e7b102e2a791dba007931602608edfb7e7c231751869310e04f5654e55a52d7c702dcb13646aa7a5e7d6b9ab1f5fc7f1da056c7e95ddd0043d
 MISC metadata.xml 616 BLAKE2B 927c4645cd5247ac976860193a6f8024ff122891699c4831a48944cfec51cc5adc55ea0f3eebb873517492146188f6f3eca702f299dcdecfb88f46c0dbf83d8a SHA512 fd9922ce1c9f9d5381c5ed4f4679b45b5bfbb21c452a1ba4064e26fd33e59f648593d7322d1ee68bb4d3e2268a5a8dd2e7f676679d57147929cdb0493835d34d
diff --git a/dev-python/pygraphviz/pygraphviz-1.5.ebuild b/dev-python/pygraphviz/pygraphviz-1.5.ebuild
index e13abbc3ce6d..d87dcfbc259a 100644
--- a/dev-python/pygraphviz/pygraphviz-1.5.ebuild
+++ b/dev-python/pygraphviz/pygraphviz-1.5.ebuild
@@ -8,12 +8,12 @@ PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1
 
 DESCRIPTION="Python wrapper for the Graphviz Agraph data structure"
-HOMEPAGE="http://pygraphviz.github.io/"
+HOMEPAGE="https://pygraphviz.github.io/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pygraphviz/pygraphviz-1.6.ebuild b/dev-python/pygraphviz/pygraphviz-1.6.ebuild
new file mode 100644
index 000000000000..e53d8c412382
--- /dev/null
+++ b/dev-python/pygraphviz/pygraphviz-1.6.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python wrapper for the Graphviz Agraph data structure"
+HOMEPAGE="https://pygraphviz.github.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+# Note: only C API of graphviz is used, PYTHON_USEDEP unnecessary.
+RDEPEND="media-gfx/graphviz"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-arch/unzip
+	dev-lang/swig:0
+	test? ( dev-python/doctest-ignore-unicode[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests nose
+
+PATCHES=( "${FILESDIR}"/${PN}-1.5-docs.patch )
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	swig -python pygraphviz/graphviz.i || die
+}
+
+python_test() {
+	nosetests -c setup.cfg -x -v "${BUILD_DIR}"/lib/pygraphviz || die
+}
+
+python_install_all() {
+	dodoc -r examples
+	docompress -x /usr/share/doc/${PF}/examples
+
+	distutils-r1_python_install_all
+}