gentoo resync : 10.02.2020

6 files changed, 2 insertions, 100 deletions

diff --git a/dev-python/pydot/Manifest b/dev-python/pydot/Manifest
index 0b1751886460..4e0a67ec892c 100644
--- a/dev-python/pydot/Manifest
+++ b/dev-python/pydot/Manifest
@@ -1,9 +1,3 @@
-AUX pydot-1.0.23-setup.patch 623 BLAKE2B e0403d397baed897de27782fc6bf5223f0c0c0148e36f214614bcc4ce0bd9d5bbdbf4979272e4395dd8632321605c83ec7d8e0552960895e7890983adfe5925d SHA512 74202787584f9ed4f9aac5038d200fe7c64d0da906226f11e29897a30f371a200787a585d1d151a8ac2191f160d3cd3029ea6f4f4e388e04e7e80d443227dd61
-AUX pydot-1.0.28-pyparsing2fix.patch 836 BLAKE2B f6b629e47032087241e239d3a7515711739a4a4566fb0291b2e612f9ef498ecf6e64da0f2ae8effea647d24f726c8f265548e5aca6f2f3d7483e7a7e77a4e91e SHA512 c50f6a21609acd177cdc954d5adc967d4cb99177467df4c76cad379050968f86375f61d1a17d0377c9dfe4f23ec1b1647cf85d9c3fd1d6c409387d15de81eeb0
-DIST pydot-1.0.28.tar.gz 19711 BLAKE2B 73fa2a614de998d4b53065a350768dbf1c0a4aef60edd9d0515ebfc9c685aba09dc42f89849c1eb609e469a4036062d3f0b83b364d89557f73414143c2c78d59 SHA512 54b4d7bfb01bbcae9a4832d1c3321d4f453a93f062ee55b35e3d59bee3f8989f4a544afb56c3d16b22bca8e6ef24b6286ac2688c9045b16906ef625999b35055
-DIST pydot-1.2.3.tar.gz 262660 BLAKE2B b5acfc365f7864c2b1fb419e5d4624ebeabef2e969dcf545668062ad46b33de5b5ee65271ac6b0fe0abb48df83f6c24bf3598798eb8879a998c06d91b6a5ac00 SHA512 0527279174bd9d5703131ab6c16365d66e392e27597b5d2d536d43f783a59139913a6dbfa1cc022993f842843f5d79e4e0b2a1435ce3427ebc534ef7b1ef2e9b
 DIST pydot-1.4.1.tar.gz 264987 BLAKE2B 61db2b6dbeab582981bf96054686c927d8d4548ac19a6c197ab1725f92c87e973c2dcd84d4c6c04cb2ca76b8f40814cfee1d5a53e4952065a538fc271e75d2a0 SHA512 b5f16b59908586df61cd415cb1a3e242fb69c39674a82b171862beff1f3727f47cba39bdd806901cb56bc8a6888783a53d112b1b70044e124ea992789d77f938
-EBUILD pydot-1.0.28-r2.ebuild 716 BLAKE2B e654066c1f59f20dc3a4b0a66892be351b34f6edea70263b354fcc63868327aa59458ea0cd58f63bdfae8822794bf68155e58dbac6829ac6eb4c03c8588be632 SHA512 e4093a13f9984a429aa4d6fd8963fac7077af1c124ca144a729b25ad2f7e2f16d1781a3535158f93f7e02b8ee6dd4ffc1d1a8d706408ebde9df3cc777e76e53c
-EBUILD pydot-1.2.3.ebuild 918 BLAKE2B b37148fd8260d27cdf24e59f9de48385cfdf9728a8c179bd2e02b26ba602462c0e2d093d5999e7bb41ac988e2f18653dd2125bd56c6929f597df9a82698d7230 SHA512 ca6ad4dd25e4b1289dfc04fd97b91430494aa7bd5eab12cc85efca1c6aec75402098c333d475414b470d9503ca4d53c239d26ee10f06901a81e61dc126e54639
-EBUILD pydot-1.4.1.ebuild 930 BLAKE2B c9c762a746cfe4d7382e283304731b03dab7f55811911a5e9ee766cbb9b522b8028564787c800168cb7c5dd5b1799449f4cf6ec650c4602f6adb3402ccd83f49 SHA512 afa93d2c6368999a2f8657fd3c73c28543818f519ef6ca69eaeaf8a332840da7d45f77acde7dd95ab9a40b126c4475ab296de1a029802615b7f2f1991e3ea7a9
+EBUILD pydot-1.4.1.ebuild 920 BLAKE2B 562239f017f696452c78c34577789927c8699727d54aa00ae5fbad91f364c6bf3ec512a4e86d23d5e2f0d5247f0d789560b0b6c8ad14adc9a219c05e25269098 SHA512 e4968469e606b094a3d36cff0bd23f82116a5a084c2ae125cd7fd4663d1b3212e570174e6101293009ce688e3736b4f9fbe96e0513e8662c39528ff46267eb52
 MISC metadata.xml 376 BLAKE2B 2118896ad9769d359f3d1573285cc61affc3989d2ea81d0914e01b5e8882ff94fd70a06324ce3cdc38146edc8513aa67457dc65b81af93474568e9a1b3b23c47 SHA512 0f67a0286f6ff6c6b35e67ff08abb0b86f9ac60e57d321ac7ca0508383b5ce8b0c091a3b023e87d20f3705887db40a5edde2055fa96ec7bca21a5b8aacac31ce
diff --git a/dev-python/pydot/files/pydot-1.0.23-setup.patch b/dev-python/pydot/files/pydot-1.0.23-setup.patch
deleted file mode 100644
index c87cc32b30d1..000000000000
--- a/dev-python/pydot/files/pydot-1.0.23-setup.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- setup.py
-+++ setup.py
-@@ -1,9 +1,9 @@
- #!/usr/bin/env python
- 
- try:
--    from distutils.core import setup
--except ImportError, excp:
-     from setuptools import setup
-+except ImportError, excp:
-+    from distutils.core import setup
-     
- import pydot
- import os
-@@ -31,5 +31,4 @@
-         'Topic :: Software Development :: Libraries :: Python Modules'],
-     long_description = "\n".join(pydot.__doc__.split('\n')),
-     py_modules = ['pydot', 'dot_parser'],
--    install_requires = ['pyparsing', 'setuptools'],
--    data_files = [('.', ['LICENSE', 'README'])] )
-+    install_requires = ['pyparsing', 'setuptools'] )
diff --git a/dev-python/pydot/files/pydot-1.0.28-pyparsing2fix.patch b/dev-python/pydot/files/pydot-1.0.28-pyparsing2fix.patch
deleted file mode 100644
index 12a01091223c..000000000000
--- a/dev-python/pydot/files/pydot-1.0.28-pyparsing2fix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -up pydot-1.0.28/dot_parser.py.pyparsing2fix pydot-1.0.28/dot_parser.py
---- pydot-1.0.28/dot_parser.py.pyparsing2fix	2013-12-09 08:59:24.660145534 -0500
-+++ pydot-1.0.28/dot_parser.py	2013-12-09 09:00:10.021222397 -0500
-@@ -25,8 +25,9 @@ from pyparsing import __version__ as pyp
- from pyparsing import ( nestedExpr, Literal, CaselessLiteral, Word, Upcase, OneOrMore, ZeroOrMore,
-     Forward, NotAny, delimitedList, oneOf, Group, Optional, Combine, alphas, nums,
-     restOfLine, cStyleComment, nums, alphanums, printables, empty, quotedString,
--    ParseException, ParseResults, CharsNotIn, _noncomma, dblQuotedString, QuotedString, ParserElement )
-+    ParseException, ParseResults, CharsNotIn, dblQuotedString, QuotedString, ParserElement )
- 
-+_noncomma = "".join( [ c for c in printables if c != "," ] )
- 
- class P_AttrList:
- 
diff --git a/dev-python/pydot/pydot-1.0.28-r2.ebuild b/dev-python/pydot/pydot-1.0.28-r2.ebuild
deleted file mode 100644
index 5c92facbb112..000000000000
--- a/dev-python/pydot/pydot-1.0.28-r2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python interface to Graphviz's Dot language"
-HOMEPAGE="https://pypi.org/project/pydot/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
-IUSE=""
-
-RDEPEND="
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	media-gfx/graphviz"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.23-setup.patch
-	"${FILESDIR}"/${P}-pyparsing2fix.patch )
diff --git a/dev-python/pydot/pydot-1.2.3.ebuild b/dev-python/pydot/pydot-1.2.3.ebuild
deleted file mode 100644
index 1fd6811bffa6..000000000000
--- a/dev-python/pydot/pydot-1.2.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python interface to Graphviz's Dot language"
-HOMEPAGE="https://github.com/erocarrera/pydot https://pypi.org/project/pydot/"
-# pypi releases don't include tests
-SRC_URI="https://github.com/erocarrera/pydot/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	media-gfx/graphviz"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/chardet[${PYTHON_USEDEP}] )"
-
-python_test() {
-	cd test || die
-	"${PYTHON}" pydot_unittest.py || die "Test failed with ${EPYTHON}"
-}
diff --git a/dev-python/pydot/pydot-1.4.1.ebuild b/dev-python/pydot/pydot-1.4.1.ebuild
index d87d9d0fdf74..fb2062cdb6de 100644
--- a/dev-python/pydot/pydot-1.4.1.ebuild
+++ b/dev-python/pydot/pydot-1.4.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1