gentoo Easter resync : 12.04.2020

6 files changed, 2 insertions, 188 deletions

diff --git a/dev-python/ply/Manifest b/dev-python/ply/Manifest
index 9b4dd91f0e7c..06b6a379890a 100644
--- a/dev-python/ply/Manifest
+++ b/dev-python/ply/Manifest
@@ -1,11 +1,4 @@
-AUX 3.6-lextab-None.patch 1705 BLAKE2B b41df4e19252f9c7fd63364e6ab73b79b480435cbdf4be1ffae5dca5b031002bd6342cd3371e4a599f3a7dc56056f7d274f9f4d3f85465ca4ba5f8f4b6122a52 SHA512 c5e0d2976d7633bbde91fc957eb2ee9fdf9d8e0f43dac37163ca01d6f6b33da9f7b4e396fba034a53d1270bd1aa0f1683eb507bdb5562a5d3e82823ccf292109
 AUX 3.6-picklefile-IOError.patch 681 BLAKE2B 2aacef3639c9ec920d6cfc5e56ead129234d54019757a4c816c48c563789e119e6148ed409e5432ccdd763b62ad83c1359b63faf8432326ef8ebf4c93fa564c3 SHA512 6dce69df1cc538ff9787cb70617437ac36972b68a998922123bd4f0529dd6f155befe4104741e704e7e8a1ed8822f2e99580867bbc894fc57896aad4130c317b
-DIST ply-3.10.tar.gz 150926 BLAKE2B b7373bfb83f66c35b77f244e67443f5c4805cb5e586e9e9f0bba9746cf72a1ec66ae5e638a29793dc835ef3e7bed061f1b3befd71597b82f86c9a2adbafcef04 SHA512 67fa60ea3fe2cafe165b7c105eb4b08c0c75c98720bbbb19da275215b333d3ce0742c90e558fbe97df396c6faaf85da744063728ab211651beae10e0cad01d44
 DIST ply-3.11.tar.gz 159130 BLAKE2B 58c50b9dad445ad83a64aaa8174ed4602b36f5c8df33a7d62590a92388c4a21c9800599c1d4e4db6f02630e8dee4c8482611e26498e4aa8ccdb2cf3453ae1db4 SHA512 37e39a4f930874933223be58a3da7f259e155b75135f1edd47069b3b40e5e96af883ebf1c8a1bbd32f914a9e92cfc12e29fec05cf61b518f46c1d37421b20008
-DIST ply-3.6.tar.gz 281690 BLAKE2B 1a8e9e925c1a70832e3312208470a3bc4831b7ba18a0c2eb3a8b31fc9a850ae192809b9dec098f8479f2060e63ae781063b362227db2c6080aad85a2fb8648a2 SHA512 1a408d7cd4cdc9d747154623672e6baaf37ad2190cb9d6d6a7c1e1cc3cb40f15547734441b8fc99ecd67d7804d767576bdf0ed219cc669bf3d0df37498c55c55
-DIST ply-3.9.tar.gz 150750 BLAKE2B cb32c3837f2b4bd33ef2074dcb3f1421a54e820faf0e65def16f4c354643dc3e467f7c482dfc5b7f62cfb367945632e346b6e02e16cc79a91bb6f9241e315eb1 SHA512 c3beca6f70e9fdfd11f9fc7beb18efb03f0b32be3cdc949e96c4df3d060e7e9da3ee42d1f58f7a9225d333cb7864a4253fd3a9b75c496364276fe9969ebd7641
-EBUILD ply-3.10.ebuild 1107 BLAKE2B d3e29643cdd3cd9586cc7597976db6edca6144020784787ce6be850c41ecc5e48e6d647cc2e0532cfaa09cc933992a29735ac693e8bbf94d8492509addd3ce82 SHA512 f87cd7c711b598f1582207ea437ec211fe8f416cbef0fae86a9f4e59151231af352cbc7191af54337fe216f4f63f3b846f558fd8b1c881898f140bdaf847a706
-EBUILD ply-3.11.ebuild 1145 BLAKE2B f5bcceb5f39ef5e4ce002b65cd25a466512636f363f5d5d652b741e411ac9fbed6d548cf08623899bd25672ecc6d91da651787f194715ea136631f2f2146fe6b SHA512 bde2259628c85d5c36fd30a9548e3e0b1152b58439a1a7fc68d104ae4a74892f4fbac772bdc2d9b4452ee5117f3a04f923d8d5e445a66220a866c2fece5c512d
-EBUILD ply-3.6-r1.ebuild 1121 BLAKE2B 89d5105f0ad3d68f164892eb7ddf652520ddd56fed7293690d4f67b407d45eae11ddabb252874a73de30928e5738ef57a1f2f5ec72dbcfc5c2a42c6987664eab SHA512 8d7e2d96f707c04419f4a1b2c0aeef424590b7fd81f683aa9ac28c8bfc8ceff63bfddd3b033315505b486c9fe4fbfe66c2f33e0e779bebf63def4d79699227a7
-EBUILD ply-3.9.ebuild 1086 BLAKE2B fc6480a41b4157b27c64f8406893a96e457b544557d2194cd341be37416268ebc3b49d7c3d9779ee524beca39f04378cdcc3a0a2a15bec44a664b5a709e45f84 SHA512 6586556e880df7376b30b4275b615e224906414d2cee2883716165c2faf94e9b6395488f59b46a2619091d9b43d4fd488b65c9c484e157234d6d283e9dd03ef3
+EBUILD ply-3.11.ebuild 1135 BLAKE2B bd8e5356272bbe0f07c92fde2d4697948a05b1b94c858702963a0ded74143c563260b2f7e7f8391326b752c901d1b6e3876869264b8a7935ed4f5c78e09989b5 SHA512 136d835b4dc3e711e17d59d3e793a25b6786454c7172ece8afbb0abfc44b256f073b7f74071ff4f50ea1e2f781fc867f7f50803b0fc745dd96a0804751d5bbf7
 MISC metadata.xml 1418 BLAKE2B df2c9fa5b1d9a0b7779fd72b390d4509f83e1ca4c49f3d64dd2c0b440d2f583c0b936535eb2c15bf323e649cacb4f1bd72bea797bd51afaf611fd8fa6490ae78 SHA512 92a5a470227858726239f537b3d8559e29d589a8aca0f1d43b8a1ee3ec00470117efb45275b5bfc0ab6d0678863db50aadd36aec326978e7a3e858c0b0be41dc
diff --git a/dev-python/ply/files/3.6-lextab-None.patch b/dev-python/ply/files/3.6-lextab-None.patch
deleted file mode 100644
index cab0a466d66f..000000000000
--- a/dev-python/ply/files/3.6-lextab-None.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From dbf122652d38ba03ff9f9fe4aa9bee3693e6775f Mon Sep 17 00:00:00 2001
-From: David Beazley <dave@dabeaz.com>
-Date: Fri, 8 May 2015 10:10:55 -0500
-Subject: [PATCH] Minor fix to account for bad None arguments for
- tabmodule/lextab
-
----
- ply/lex.py  | 4 ++++
- ply/yacc.py | 5 ++++-
- 2 files changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/ply/lex.py b/ply/lex.py
-index ed1e2ed..772325c 100644
---- a/ply/lex.py
-+++ b/ply/lex.py
-@@ -859,6 +859,10 @@ def validate_module(self, module):
- # -----------------------------------------------------------------------------
- def lex(module=None, object=None, debug=False, optimize=False, lextab='lextab',
-         reflags=0, nowarn=False, outputdir=None, debuglog=None, errorlog=None):
-+
-+    if lextab is None:
-+        lextab = 'lextab'
-+
-     global lexer
- 
-     ldict = None
-diff --git a/ply/yacc.py b/ply/yacc.py
-index e0b4faf..eb02cc2 100644
---- a/ply/yacc.py
-+++ b/ply/yacc.py
-@@ -2709,7 +2709,7 @@ def write_table(self, tabmodule, outputdir='', signature=''):
- _lr_method = %r
- 
- _lr_signature = %r
--    ''' % (filename, __tabversion__, self.lr_method, signature))
-+    ''' % (os.path.basename(filename), __tabversion__, self.lr_method, signature))
- 
-             # Change smaller to 0 to go back to original tables
-             smaller = 1
-@@ -3183,6 +3183,9 @@ def yacc(method='LALR', debug=yaccdebug, module=None, tabmodule=tab_module, star
-          check_recursion=True, optimize=False, write_tables=True, debugfile=debug_file,
-          outputdir=None, debuglog=None, errorlog=None, picklefile=None):
- 
-+    if tabmodule is None:
-+        tabmodule = tab_module
-+
-     # Reference to the parsing method of the last built parser
-     global parse
- 
diff --git a/dev-python/ply/ply-3.10.ebuild b/dev-python/ply/ply-3.10.ebuild
deleted file mode 100644
index 3ad00e452918..000000000000
--- a/dev-python/ply/ply-3.10.ebuild
+++ /dev/null
@@ -1,43 +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 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python Lex-Yacc library"
-HOMEPAGE="http://www.dabeaz.com/ply/ https://pypi.org/project/ply/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="examples"
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DOCS=( ANNOUNCE CHANGES TODO )
-
-PATCHES=( "${FILESDIR}/3.6-picklefile-IOError.patch" )
-
-python_test() {
-	cp -r -l test "${BUILD_DIR}"/ || die
-	cd "${BUILD_DIR}"/test || die
-
-	# Checks for pyc/pyo files
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	local t
-	for t in testlex.py testyacc.py; do
-		"${PYTHON}" "${t}" || die "${t} fails with ${EPYTHON}"
-	done
-}
-
-python_install_all() {
-	local HTML_DOCS=( doc/. )
-	use examples && dodoc -r example
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/ply/ply-3.11.ebuild b/dev-python/ply/ply-3.11.ebuild
index 774b1bdaad00..49e25985f91c 100644
--- a/dev-python/ply/ply-3.11.ebuild
+++ b/dev-python/ply/ply-3.11.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples"
 
 RDEPEND=""
diff --git a/dev-python/ply/ply-3.6-r1.ebuild b/dev-python/ply/ply-3.6-r1.ebuild
deleted file mode 100644
index 96b5cc8bd4a0..000000000000
--- a/dev-python/ply/ply-3.6-r1.ebuild
+++ /dev/null
@@ -1,44 +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 Lex-Yacc library"
-HOMEPAGE="http://www.dabeaz.com/ply/ https://pypi.org/project/ply/"
-SRC_URI="http://www.dabeaz.com/ply/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="examples"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-DOCS=( ANNOUNCE CHANGES TODO )
-PATCHES=(
-	"${FILESDIR}/3.6-lextab-None.patch"
-	"${FILESDIR}/3.6-picklefile-IOError.patch"
-)
-
-python_test() {
-	cp -r -l test "${BUILD_DIR}"/ || die
-	cd "${BUILD_DIR}"/test || die
-
-	# Checks for pyc/pyo files
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	local t
-	for t in testlex.py testyacc.py; do
-		"${PYTHON}" "${t}" || die "${t} fails with ${EPYTHON}"
-	done
-}
-
-python_install_all() {
-	local HTML_DOCS=( doc/. )
-	use examples && local EXAMPLES=( example/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/ply/ply-3.9.ebuild b/dev-python/ply/ply-3.9.ebuild
deleted file mode 100644
index 7fe61b77d3b4..000000000000
--- a/dev-python/ply/ply-3.9.ebuild
+++ /dev/null
@@ -1,43 +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 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python Lex-Yacc library"
-HOMEPAGE="http://www.dabeaz.com/ply/ https://pypi.org/project/ply/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="examples"
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DOCS=( ANNOUNCE CHANGES TODO )
-
-PATCHES=( "${FILESDIR}/3.6-picklefile-IOError.patch" )
-
-python_test() {
-	cp -r -l test "${BUILD_DIR}"/ || die
-	cd "${BUILD_DIR}"/test || die
-
-	# Checks for pyc/pyo files
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	local t
-	for t in testlex.py testyacc.py; do
-		"${PYTHON}" "${t}" || die "${t} fails with ${EPYTHON}"
-	done
-}
-
-python_install_all() {
-	local HTML_DOCS=( doc/. )
-	use examples && dodoc -r example
-	distutils-r1_python_install_all
-}