gentoo resync : 05.02.2020

8 files changed, 2 insertions, 230 deletions

diff --git a/dev-python/pygraphviz/Manifest b/dev-python/pygraphviz/Manifest
index 469807fd82c2..3165107cc7df 100644
--- a/dev-python/pygraphviz/Manifest
+++ b/dev-python/pygraphviz/Manifest
@@ -1,12 +1,4 @@
-AUX pygraphviz-1.0-setup.py.patch 1215 BLAKE2B 6b680df9adc31aba21d98cc745258279d96822fb635e56c0ea6043b34dc5ee6c97042f070a77331c8bf0a8185b75441464eef4cf67b8e5aa2a5d530bbf0a43dc SHA512 176497d1e61ee74b6ca576b322ec47eccfb67d2fa1341c7f0f857ecc32ccd16660262abe46a90871ee4cba60587670d8b479bfd60944ac0de32b13f4aab4846c
-AUX pygraphviz-1.2-avoid_tests.patch 1620 BLAKE2B 8d7b5c81eec0f06d5dbe103429da92249ad751d354981a79f83d0c714230e3e4f687f9822de2cbca6eee29ec5d597b456cfc019baf5b819fda09c69966de6dd5 SHA512 74c161dbeb69ad2b9f381428b6cc0e0d8411d95b121fb16eb0f1e45344a52c2dafc2bf06cac8a6be8152fb1592bd55bf001da85e4e53ed82bec39f61c7d329f2
-AUX pygraphviz-1.3.1-docs.patch 929 BLAKE2B 5186201bcbba3485c97c249bf9f4d6b04f641a7ec6db0e8cea9260e8cd4960ab5aeff52ebf81b2bf5dd94be5a0f87b7c10c92cbfc720046f6705e478082b18a5 SHA512 003ed3275771998a40c162abfc61ebf78cb149b20b2b4c770725459364e08a5afb33fe39b00e2e662706a40c3a91033d9e0aead66a7cd627b3b0b2ceba5a62d2
-AUX pygraphviz-1.3.1-swig-3.patch 790 BLAKE2B 5cedc7992e890a5901bb83486fe5f2a2d470f71c35fd2bedb02e7396ee708d5e4e0aa608b4756a9fb4e185efd1ef9ccb5c69340e7a43b90dd866568dcf2bd2be SHA512 37a5689360aa786a94bd3bbad98bca4bf5f3a61eb2dc54de1c4bec3b6ec677e4f99a817b896687e2506386becc67f5e31308a30ceaedd388e57693ae9e8de2d4
 AUX pygraphviz-1.5-docs.patch 929 BLAKE2B 5186201bcbba3485c97c249bf9f4d6b04f641a7ec6db0e8cea9260e8cd4960ab5aeff52ebf81b2bf5dd94be5a0f87b7c10c92cbfc720046f6705e478082b18a5 SHA512 003ed3275771998a40c162abfc61ebf78cb149b20b2b4c770725459364e08a5afb33fe39b00e2e662706a40c3a91033d9e0aead66a7cd627b3b0b2ceba5a62d2
-DIST pygraphviz-1.2.tar.gz 90913 BLAKE2B 2031b3d1366ce038fc10a1ed632bae9ae67789eae1c45e9e9eb418cf8e5729d47baed96508f52e962aa0138a1fa6231a50bbba2049435f4af959ef467eaa7454 SHA512 e477af635594c3ba1aa6fa499bc5e60df14e76616a1a777f648e2e96d3953dd3d0b3bae4a92275dac2f7466276cf526ecb8b6a63fd3fbad26ee24b67d76ecfa3
-DIST pygraphviz-1.3.1.tar.gz 103336 BLAKE2B 267c85ca4639a2f0ad8c06d36eaa1f2026c6afafe357be23ea4c108b7953aedac2f397bf262a68f336385a5810d77bec9d200bf86da3d101b4d402dcc2d77e1f SHA512 e1957d7daf7ae9e60873cb6f23ac19a3320b4b10579ab24a2307beb558dad11a8e82e1da528799165b761d944efb4860b7296e3218846f7885f715c396a8e3dc
 DIST pygraphviz-1.5.zip 117810 BLAKE2B e9139d6b8e01cacb3135b1ccd2fa8624c041b7a04848f66c7668c5acf55cf66380ab9f05193b1bb240133f0c01a21915e2314807fcde23246c287d22efb9450a SHA512 6d3df6642a7e23ecb6b687761480b80a3ee5886508ef50b81697041425be7d09d623bf46990c5cea3ef36817a28d9e5c2905eb32267296f55524fdedb2199ea2
-EBUILD pygraphviz-1.2.ebuild 981 BLAKE2B ec7393d162ecf32e423ed08b8464e1caf99d91dca43d7ffab048b25f9fe870441d32dd72849e89fd414320e32a9e8286ba44d7136eb8cb3e8e74ce5b4aabac03 SHA512 1e30090835e51b5bf59c8e26d2bf657b248a242b302a7f46ce5df8663fd38253588c2cd0e4850fc2b0e87ccad1090e321921fafa3c98dd6f1ed5ca67a6117c1a
-EBUILD pygraphviz-1.3.1.ebuild 1119 BLAKE2B 6109e31df0d0b5d8bf73fb91b0afa846c9f498d5e9c5fbc982a5588da31a963c8517509cf7070c9985417f143c9c276a5bc5763f2f84741e6231e0f6b9c9ee49 SHA512 215caa815030f4ed8dd54c988bcfd7811f76501b186285d5b0d44bfcd55cbe3010ea66124e928758cd15a4d897b4412e8292b6a0aaaaa5fd92663f559502a0a9
-EBUILD pygraphviz-1.5.ebuild 1088 BLAKE2B 3f777db42953967a94235b43ef9c2d307856b8ece61a6294070980dc8f7e7c2387993e2b95eaf11416dbc07722378639d6fc07366fb69f5bdd1ec16e25144e57 SHA512 6dfecdcc034426d1a32c72788dd19fb49f050677510d65029005814198ce0c557970ab81a9d6ec24982418f5579daa99a43df3344a48415996f4bed0e53f43e8
+EBUILD pygraphviz-1.5.ebuild 1078 BLAKE2B 133a5338a68859472e4bd0dac9dc2e51477a8740ba0f714b49132d6bf61f9fc98ceea743ee21bddb256bd8e2aa22aacad948d82e78c3697d7e7ea2e9fdddf5ff SHA512 f41fe9490f3c080b4d651e47b8bbc84a349b80b3ef72cf6e9ddb7b2251a5c778cb37f24f10d083f9a209d888d891e2256982d422f30a49447ead9cd6debdb5c1
 MISC metadata.xml 616 BLAKE2B 927c4645cd5247ac976860193a6f8024ff122891699c4831a48944cfec51cc5adc55ea0f3eebb873517492146188f6f3eca702f299dcdecfb88f46c0dbf83d8a SHA512 fd9922ce1c9f9d5381c5ed4f4679b45b5bfbb21c452a1ba4064e26fd33e59f648593d7322d1ee68bb4d3e2268a5a8dd2e7f676679d57147929cdb0493835d34d
diff --git a/dev-python/pygraphviz/files/pygraphviz-1.0-setup.py.patch b/dev-python/pygraphviz/files/pygraphviz-1.0-setup.py.patch
deleted file mode 100644
index 13eb0f213ce1..000000000000
--- a/dev-python/pygraphviz/files/pygraphviz-1.0-setup.py.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- setup_egg.py
-+++ setup_egg.py
-@@ -46,7 +46,6 @@
-         download_url     = release.download_url,
-         classifiers      = release.classifiers,
-         packages         = packages,
--        data_files       = data,
-         ext_modules      = extension,
-         package_data     = package_data,
-         install_requires=['setuptools'],
---- setup.py
-+++ setup.py
-@@ -98,12 +98,6 @@
- sys.path.pop(0)
- 
- packages = ["pygraphviz","pygraphviz.tests"]
--docdirbase  = 'share/doc/pygraphviz-%s' % release.version
--data = [(docdirbase, glob("*.txt")),
--        (os.path.join(docdirbase, 'examples'),glob("examples/*.py")),
--        (os.path.join(docdirbase, 'examples'),glob("examples/*.dat")),
--        (os.path.join(docdirbase, 'examples'),glob("examples/*.dat.gz")),
--        ]
- extension = [Extension("pygraphviz._graphviz",
-                       ["pygraphviz/graphviz_wrap.c"],
-                       include_dirs=include_dirs,
-@@ -130,7 +124,6 @@
-         download_url     = release.download_url,
-         classifiers      = release.classifiers,
-         packages         = packages,
--        data_files       = data,
-         ext_modules      = extension,
-         package_data     = package_data
-       )
diff --git a/dev-python/pygraphviz/files/pygraphviz-1.2-avoid_tests.patch b/dev-python/pygraphviz/files/pygraphviz-1.2-avoid_tests.patch
deleted file mode 100644
index d444ee3d2df7..000000000000
--- a/dev-python/pygraphviz/files/pygraphviz-1.2-avoid_tests.patch
+++ /dev/null
@@ -1,47 +0,0 @@
- pygraphviz/__init__.py |  2 --
- pygraphviz/agraph.py   | 25 -------------------------
- 2 files changed, 27 deletions(-)
-
-diff --git a/pygraphviz/__init__.py b/pygraphviz/__init__.py
-index a807801..33f727e 100644
---- a/pygraphviz/__init__.py
-+++ b/pygraphviz/__init__.py
-@@ -68,5 +68,3 @@ def version():
-     neato=_get_prog('neato')
-     os.system(neato+' -V')
- 
--# import tests: run as pygraphviz.test()
--from tests import run as test
-diff --git a/pygraphviz/agraph.py b/pygraphviz/agraph.py
-index c9f735b..90a661e 100644
---- a/pygraphviz/agraph.py
-+++ b/pygraphviz/agraph.py
-@@ -1771,28 +1771,3 @@ class ItemAttribute(Attribute):
-                        value.decode(self.encoding))
-             except KeyError: # gv.agxget returned KeyError, skip
-                 continue
--
--
--
--def _test_suite():
--    import doctest
--    suite = doctest.DocFileSuite('tests/graph.txt',
--                                 'tests/attributes.txt',
--                                 'tests/layout_draw.txt',
--                                 'tests/subgraph.txt',
--                                 package='pygraphviz')
--    doctest.testmod() # test docstrings in module
--    return suite
--
--
--if __name__ == "__main__":
--    import os
--    import sys
--    import unittest
--    if sys.version_info[:2] < (2, 4):
--        print "Python version 2.4 or later required for tests (%d.%d detected)." %  sys.version_info[:2]
--        sys.exit(-1)
--    # directory of package (relative to this)
--    nxbase=sys.path[0]+os.sep+os.pardir
--    sys.path.insert(0,nxbase) # prepend to search path
--    unittest.TextTestRunner().run(_test_suite())
diff --git a/dev-python/pygraphviz/files/pygraphviz-1.3.1-docs.patch b/dev-python/pygraphviz/files/pygraphviz-1.3.1-docs.patch
deleted file mode 100644
index aed5c9075b88..000000000000
--- a/dev-python/pygraphviz/files/pygraphviz-1.3.1-docs.patch
+++ /dev/null
@@ -1,29 +0,0 @@
- setup.py | 8 --------
- 1 file changed, 8 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index fc0a96f..98b7f58 100644
---- a/setup.py
-+++ b/setup.py
-@@ -36,13 +36,6 @@ release.write_versionfile()
- sys.path.pop(0)
- 
- packages = ["pygraphviz", "pygraphviz.tests"]
--docdirbase = 'share/doc/pygraphviz-%s' % release.version
--data = [
--    (docdirbase, glob("*.txt")),
--    (os.path.join(docdirbase, 'examples'), glob("examples/*.py")),
--    (os.path.join(docdirbase, 'examples'), glob("examples/*.dat")),
--    (os.path.join(docdirbase, 'examples'), glob("examples/*.dat.gz")),
--]
- package_data = {'': ['*.txt'], }
- 
- if __name__ == "__main__":
-@@ -75,7 +68,6 @@ if __name__ == "__main__":
-         download_url=release.download_url,
-         classifiers=release.classifiers,
-         packages=packages,
--        data_files=data,
-         ext_modules=extension,
-         cmdclass={
-             'install': AddExtensionInstallCommand,
diff --git a/dev-python/pygraphviz/files/pygraphviz-1.3.1-swig-3.patch b/dev-python/pygraphviz/files/pygraphviz-1.3.1-swig-3.patch
deleted file mode 100644
index 912667e7f5a7..000000000000
--- a/dev-python/pygraphviz/files/pygraphviz-1.3.1-swig-3.patch
+++ /dev/null
@@ -1,23 +0,0 @@
- pygraphviz/graphviz.i | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/pygraphviz/graphviz.i b/pygraphviz/graphviz.i
-index 0d9b43b..5f1f6b0 100644
---- a/pygraphviz/graphviz.i
-+++ b/pygraphviz/graphviz.i
-@@ -1,9 +1,9 @@
--#    Copyright (C) 2004-2006 by 
--#    Aric Hagberg <hagberg@lanl.gov>
--#    Dan Schult <dschult@colgate.edu>
--#    Manos Renieris, http://www.cs.brown.edu/~er/
--#    Distributed with BSD license.     
--#    All rights reserved, see LICENSE for details.
-+//    Copyright (C) 2004-2006 by 
-+//    Aric Hagberg <hagberg@lanl.gov>
-+//    Dan Schult <dschult@colgate.edu>
-+//    Manos Renieris, http://www.cs.brown.edu/~er/
-+//    Distributed with BSD license.     
-+//    All rights reserved, see LICENSE for details.
- 
- %module graphviz
- 
diff --git a/dev-python/pygraphviz/pygraphviz-1.2.ebuild b/dev-python/pygraphviz/pygraphviz-1.2.ebuild
deleted file mode 100644
index c4a7bc3f7843..000000000000
--- a/dev-python/pygraphviz/pygraphviz-1.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python wrapper for the Graphviz Agraph data structure"
-HOMEPAGE="http://networkx.lanl.gov/pygraphviz/ https://pypi.org/project/pygraphviz/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="examples"
-
-# Note: only C API of graphviz is used, PYTHON_USEDEP unnecessary.
-RDEPEND="media-gfx/graphviz"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0-setup.py.patch
-	"${FILESDIR}"/${P}-avoid_tests.patch
-)
-
-python_test() {
-	PYTHONPATH=${PYTHONPATH}:${BUILD_DIR}/lib/pygraphviz \
-	"${PYTHON}" \
-		-c "import pygraphviz.tests; pygraphviz.tests.run()" \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use examples && local EXAMPLES=( examples/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pygraphviz/pygraphviz-1.3.1.ebuild b/dev-python/pygraphviz/pygraphviz-1.3.1.ebuild
deleted file mode 100644
index 174617915ba2..000000000000
--- a/dev-python/pygraphviz/pygraphviz-1.3.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python wrapper for the Graphviz Agraph data structure"
-HOMEPAGE="http://pygraphviz.github.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-# Note: only C API of graphviz is used, PYTHON_USEDEP unnecessary.
-RDEPEND="media-gfx/graphviz"
-DEPEND="${RDEPEND}
-	dev-lang/swig:0
-	test? (
-		dev-python/doctest-ignore-unicode[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-docs.patch
-	"${FILESDIR}"/${P}-swig-3.patch
-)
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	swig -python pygraphviz/graphviz.i || die
-}
-
-python_test() {
-	PYTHONPATH=${PYTHONPATH}:${BUILD_DIR}/lib/pygraphviz \
-		nosetests -c setup.cfg -x -v || die
-}
-
-python_install_all() {
-	use examples && local EXAMPLES=( examples/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pygraphviz/pygraphviz-1.5.ebuild b/dev-python/pygraphviz/pygraphviz-1.5.ebuild
index 7f0c40611e5a..ebb016167c1f 100644
--- a/dev-python/pygraphviz/pygraphviz-1.5.ebuild
+++ b/dev-python/pygraphviz/pygraphviz-1.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1