gentoo resync : 14.05.2020

3 files changed, 2 insertions, 51 deletions

diff --git a/dev-python/yapsy/Manifest b/dev-python/yapsy/Manifest
index 08459bffbff3..4fd0174e3938 100644
--- a/dev-python/yapsy/Manifest
+++ b/dev-python/yapsy/Manifest
@@ -1,6 +1,4 @@
 AUX yapsy-1.11.223-python36-tests.patch 919 BLAKE2B 51e27515c9e4a129a11aca1e9f37859e0e74386c499fd093e304a27e72d104733a66e643de5303e6ac18df6ad16b2de840025d255f062aa360e3ff18f94dae66 SHA512 aa345024f6afde87f9e3a64da87778f1bd620cd8490d1c564cf74f3a5821eb034d94cf5b464bf567725972122ba78a981cb2d120b3e0f35541a01ecd4f97170a
-DIST Yapsy-1.11.223.tar.gz 80783 BLAKE2B 44f1224f66a35e3ff01d0fb0cf1e0c46fe7932d6fe2ddbaf1c7eed72b7324d8e9fba7be2d32cbec93f33a6d3779b17eb979af751778f672bbffc1119c912e30d SHA512 690d0ab78eafede5a75cf7b7bbcfce00b05c7b6f958980c3b67815bcaf848a8098b6e81afd1d95c5821fa4bb7affefab2cde208ff7c8ac7952615c8ddbafe305
 DIST Yapsy-1.12.2.tar.gz 83986 BLAKE2B e6a2650383a7f0c9bf72d4abf21fffb2abcfdc4115a2a1578a2987b7eef1fc04de9099947c1b9dd510d54a89d9b11f86ac0ca3b13510c6417e94ff92dfec12b6 SHA512 3fdb4de1a6d8f836e22d82354492b99ec9883443c389393d25ea40a08bb0b6ae03db9c947af55237b67764facd4d55a09a36cdba107c8d9202f3700fd55c31fa
-EBUILD yapsy-1.11.223-r2.ebuild 965 BLAKE2B 21317db9bcf631d6759b0b7a07f41c7536b1578bbb125e43c95f68817c82de7583e355f2a0e0aee9ab6ff93390b83396aec387fd3e7394543a05fce032d56f0b SHA512 7cee67403c24a8a8ffef4ad46094442375179262ab3e7f70609061a0b06d2de026016baba3337a7af1dc3c745aa6b8ae84111ee99658b5f54fb42aa0bdef02e2
-EBUILD yapsy-1.12.2.ebuild 483 BLAKE2B 68a1bd4be205a57726b0e47b2f2399fe3b568388d5e7e822cb75e047ec7a5141b2d7d39041d721ce405890180a02244cd012304b7e25936952f73606442a7617 SHA512 a9ab35fc7c58d3ee1d7d56275e585c06940a9e252fda0ab5e19760259faecfee7ab427094505f85712e064993529eacb56705e8d6d10418b20fd5717d10474fa
+EBUILD yapsy-1.12.2.ebuild 481 BLAKE2B 3b85f97ecb5f30d09a0eb139492247aadc6cbab2c3f7eb4669728c1a88132cddee64ee403d8acc9e24f8386a7d85c742d548d45a6b50401391756460d4af7bbf SHA512 11effd4478830ccaa5b569ed2cc4dac5c4d54199f0b781fb467c4b3e6a794cbfcc0bf048e317a7f88c7b03f19b2b87e68498d32c59d145630affbd0c450c0ce7
 MISC metadata.xml 423 BLAKE2B a30bb50714d2efa8d7bf299e53a3992ab24fd55ef2670fc7a15f25ed6fd864fd112940b0a202491307de2f74eb339292e32a475a7cbe89cf1dbd2ea4f6f47b8c SHA512 73e423d31a622b7b15bf672cdbada8378d069954acecdf6d729f05ca4297ef01016519adf362b322dced4694de829f079c80a17c836b5ee458b772a3c5fd36d8
diff --git a/dev-python/yapsy/yapsy-1.11.223-r2.ebuild b/dev-python/yapsy/yapsy-1.11.223-r2.ebuild
deleted file mode 100644
index 92804cbeb7cd..000000000000
--- a/dev-python/yapsy/yapsy-1.11.223-r2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-MY_P="Yapsy-${PV}"
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A fat-free DIY Python plugin management toolkit"
-HOMEPAGE="http://yapsy.sourceforge.net/"
-SRC_URI="mirror://sourceforge/yapsy/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-python36-tests.patch
-)
-
-python_prepare_all() {
-	# Disable erroneous test
-	sed -e 's:test_default_plugins_place_is_parent_dir:_&:' \
-		-i test/test_PluginFileLocator.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/yapsy/yapsy-1.12.2.ebuild b/dev-python/yapsy/yapsy-1.12.2.ebuild
index c0b7e744c76d..20c4b3017728 100644
--- a/dev-python/yapsy/yapsy-1.12.2.ebuild
+++ b/dev-python/yapsy/yapsy-1.12.2.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 distutils_enable_sphinx doc
 distutils_enable_tests setup.py