gentoo resync : 14.05.2020

3 files changed, 2 insertions, 39 deletions

diff --git a/dev-python/send2trash/Manifest b/dev-python/send2trash/Manifest
index 750b22604983..41d5cccd614d 100644
--- a/dev-python/send2trash/Manifest
+++ b/dev-python/send2trash/Manifest
@@ -1,5 +1,4 @@
 AUX send2trash-1.5.0-fix-broken-tests-on-py2.patch 862 BLAKE2B 1d0e43f642c47f5b9f56c5e82361c7376501c0b1f5f34573b6a954bf849f26fe9d2bac456ec474c1cef0a24d62a0481a5a62d04b92c943556b97d45e574e410a SHA512 2b63d6fd6c684c950fb3e60df5412931e95dbab18c360a0d3c21a3a99ed011a2c494cd74b1fae933de1e2edc81e7bb9b6f7d46f84c1b04f9c6b3c1b6b6876fa8
 DIST Send2Trash-1.5.0.tar.gz 10892 BLAKE2B 36b51f1859a3b40aa5d9b619491a13da8453ff6615e71423724131a2a88207665d3fbaeef49ecc0ff02b77738d02023c08543d8a759cc0807d74740a8af9b9de SHA512 3c08ef513e5707cd4ac82290b326bb19161222c7a84b8ffd494789ba9858929241f55ea55482947af464c14e32fea27bd92cd762a32a1d55e2daf2e21fd63172
-EBUILD send2trash-1.5.0-r1.ebuild 676 BLAKE2B 6747b2a69c61c9eb38ff2b1683c3db430f76104d1aa21f3e3f4ddb132806da1b1b4e4f58a0599efede377678b1d08cbfb4bb537add6eec15f2c252f58d29966a SHA512 fbea719c5709d401987e257ce2d36cf7f44d2100aede34396e004d8c50b134ce3714116c0f9b8dcd4637a10e1df8dbaf9b26f26e4aa677c755b8e049d27cf0cc
-EBUILD send2trash-1.5.0.ebuild 672 BLAKE2B e9057784ca96c0a14a4dab5b745c9ce6596350b77d107abed1fc3138a119e3d5b0493b21e309a93e8a54afeecf9bfcb6b43e34f98dad5499dbe23d6db3f30810 SHA512 93d5eec8f34d78aabadc5aeac7220266be4235bcebcb68c9ae13e2b67182a9e4f0dc5d110857be07eb49be2e16bcea2dcc55d5e084920dc54136d8a16cf8d6b5
+EBUILD send2trash-1.5.0-r1.ebuild 674 BLAKE2B 65ceb0f021a0dd5e744e8ecff4df4d3928f33fb971bc1b677309eb23af77e859f5fc75031f21d9ed572b5695aab4980f82620ecaade6c6a9588225203969af9c SHA512 c66b1368507d8e9e53e4b39ae7d33b165e9e4dd9a1acdbe084da6bca03341fbc7f741bcbf44f88272ed130c0291ea8483de04d242dba933619cac98d75cf1501
 MISC metadata.xml 381 BLAKE2B 5afbd1afb5fab636015e710ae55c2e7b6c9eb24d1ffe0418f4ae4c6d02befdf4d50922d25ae6dcd134e2f17de1cc5a7bcee0467cdfc03ac86cbf5b31d33153dd SHA512 309a92e88f854e9384519bb8a959025c97a8c75a7ee317a17d2c51c0a444b0fa008fd46fbbe07be3dd95ab2fc1930cfdf2a0c6df7ce68fc190610176f841067c
diff --git a/dev-python/send2trash/send2trash-1.5.0-r1.ebuild b/dev-python/send2trash/send2trash-1.5.0-r1.ebuild
index 748e6b56a713..bef2e775bec3 100644
--- a/dev-python/send2trash/send2trash-1.5.0-r1.ebuild
+++ b/dev-python/send2trash/send2trash-1.5.0-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/send2trash/send2trash-1.5.0.ebuild b/dev-python/send2trash/send2trash-1.5.0.ebuild
deleted file mode 100644
index 8c20471c469f..000000000000
--- a/dev-python/send2trash/send2trash-1.5.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-MY_PN="Send2Trash"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Sends files to the Trash (or Recycle Bin)"
-HOMEPAGE="
-	https://pypi.org/project/Send2Trash/
-	https://github.com/hsoft/send2trash"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}"/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-broken-tests-on-py2.patch"
-)
-
-python_test() {
-	${EPYTHON} setup.py test
-}