gentoo resync : 25.08.2020

3 files changed, 2 insertions, 36 deletions

diff --git a/dev-python/pyparsing/Manifest b/dev-python/pyparsing/Manifest
index d86d9d0beb63..01e3acc7258e 100644
--- a/dev-python/pyparsing/Manifest
+++ b/dev-python/pyparsing/Manifest
@@ -1,5 +1,3 @@
-DIST pyparsing_2.4.6.tar.gz 647543 BLAKE2B f6c93fa1e9a7ece4cf6abcc74dae0c96becaf7f50eed5437a6410166e80768c17d429fa2d1e4d1958b2a7c5ad6ffd18218c5160bb0ebe03ae2963014612eecf3 SHA512 475b77f469d2051fb067796849f7c7d3df145f2c6cefc708c904a5b0af22661b4c229c521c2cac3c94621dde9bda6b28e428a8e31d936df6d4596d993263981e
 DIST pyparsing_2.4.7.tar.gz 648158 BLAKE2B 24525b4ee7876e245b9eb270f0e3e22fe2d8b398f9777ad3b3657b8a1227dcbd25983aa64a3f3018debdbffc1a042c732e6b3a09800e081c7acac7b97da15317 SHA512 c7a546729f86a2b5176e2482b566b9fd715b03e495aaef4d720b21307bb03f385dbc849247f8d266cb3d92be0a83c34ce4995b655ce85318355d5a0d42d6991e
-EBUILD pyparsing-2.4.6.ebuild 1005 BLAKE2B bed1f78b5b500b888274bdd0e7667912e6bcb974de3162e986735a4f0a7ab640eb76b83342ead7b205d87617cc615a67a976bc56dcf9ce944ff495994c065c7f SHA512 8e2027117117eb247971eade420f0fccb5712b56f822d28fd05dbf76e8a108fbb6a777e6f491898ead5d96f88c3fe44338a0cb08d491aa11dfa71c0baadf2af4
-EBUILD pyparsing-2.4.7.ebuild 1016 BLAKE2B 1f63ed74a3de89f066687ce8507dc90ce58fa5e4cb788505546b8794e0f7587f1fd9f1c7e4460d055b08b3215b218094b0a1ec13c1b3f824a31ac93b359b3e25 SHA512 c7cb0930c1de7aa02174f436e082086bd856009d8d860e08fe40b2b5b061ab4a60ed3903b036a1389ecf7f65db7c3f18a392fe4f4bb2345b6436319467449e20
+EBUILD pyparsing-2.4.7.ebuild 1007 BLAKE2B e5f921041df7b76129ee3a4f27b16bf6f79120d8dd046ccbbe3238e6b05783e1e73cdcc7e866da5ebd639eab4ec19cdf733f3eb3b10a7db2196d1ee5f0875c17 SHA512 8df4a7f9eebe49308a375f8ef16f455ed7a73a03326bcd0b75c475d67b09fd032a0127cbffd331b7a7acde5f1f70d220f3e1200b84e825bdeb12033986b6b996
 MISC metadata.xml 762 BLAKE2B adad994029179676a767488775141e8d79d51803f1fa9546d85c33dfbaa2a656e82bbd1c684c401bdccad5f2be763878296f149c9032097f1db87c60865dbc7a SHA512 7afb6c24b323080e02f552a35c89e7b0117482ed9edf5ad28e845553d98db9ba0d02919419ec8029bfc431ed39c5b60bc270360e6c5567d34e883c819b2ca9c1
diff --git a/dev-python/pyparsing/pyparsing-2.4.6.ebuild b/dev-python/pyparsing/pyparsing-2.4.6.ebuild
deleted file mode 100644
index 02bfc28f1b87..000000000000
--- a/dev-python/pyparsing/pyparsing-2.4.6.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2004-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-
-inherit distutils-r1
-
-MY_P=${P/-/_}
-DESCRIPTION="Easy-to-use Python module for text parsing"
-HOMEPAGE="https://github.com/pyparsing/pyparsing https://pypi.org/project/pyparsing/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${MY_P}.tar.gz"
-# pypi releases and generated github tarballs lack tests
-#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 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="examples"
-
-distutils_enable_tests setup.py
-
-S=${WORKDIR}/${PN}-${MY_P}
-
-python_install_all() {
-	if use examples; then
-		docompress -x /usr/share/doc/${PF}/examples
-		dodoc -r examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyparsing/pyparsing-2.4.7.ebuild b/dev-python/pyparsing/pyparsing-2.4.7.ebuild
index 66f7c8b3d850..0e591f5e691d 100644
--- a/dev-python/pyparsing/pyparsing-2.4.7.ebuild
+++ b/dev-python/pyparsing/pyparsing-2.4.7.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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"
 
 distutils_enable_tests setup.py