gentoo Easter resync : 12.04.2020

3 files changed, 2 insertions, 65 deletions

diff --git a/dev-python/imapclient/Manifest b/dev-python/imapclient/Manifest
index 200f98e25a70..0af8e485d1e0 100644
--- a/dev-python/imapclient/Manifest
+++ b/dev-python/imapclient/Manifest
@@ -1,7 +1,5 @@
 AUX 0.12-tests.patch 1596 BLAKE2B 2150cdfd5ae8135f83bd77f6260ab9bc4c2396c9ec6c7fe0e6d4c595ccf09272fd6b991aac89e93f3e267ab129ac15a0ba7c1589af291001987f9be5b279fd87 SHA512 87cd44146f273bf4d77df34eeb4f921eaaa36bfed951769b7c7b8b729b21ca078f8e7a907d98529f917c88754c48b5cc08acb53ac7786dd6b205b567a50d2c0d
 AUX imapclient-2.1.0-py36-tests.patch 1224 BLAKE2B f3a9a7257f8eed538d9c030e1c8682da0a507d5d9c6f1a92f8d42daceaab214c1d033b4ddeb8f6f5081c53f7e464f72830202b048067d8685eaf761f9aa1bdb3 SHA512 cea2d0b0744cc76d52abda07a031b0e61a96e6019172e0e5490f6e32f757c6850344caa41b22d0db9fd814153c1f78d9d48260281d362ebf1eb2d9a05f9b4800
-DIST IMAPClient-0.13.tar.gz 102427 BLAKE2B f087b6e89c45810f359bed889345e6748ebf9ae90f6e3c4e013097a4e57d3f5ab0ec21906cfdccc03a344d92ccc442d58e38e687cd0761d86956047e89fedb03 SHA512 daebaf7f4180b6c9c6f4a486b313abfdd06f3ed8ece18a19bf46a50e56c2094e85de8a8e4efb8850566378eba016c10816611d03852caf637ee1d43f3c8a418f
 DIST imapclient-2.1.0.tar.gz 85925 BLAKE2B 9725be7988c4bec105fda73389241e39e6c006bccd8130125b280041d13becd6a71a1832763171daf25dfb4e7b4a7fc86c0a3afa93216c3dc4370b19348c0a5e SHA512 57e5824504f2667cf41ac4983130e16a5ea73ea37f29cdb16295eb725b56eda55db26a12e380acb579ef6b8540d38ae6badac5dd5b644d4419cbe9151f634e70
-EBUILD imapclient-0.13.ebuild 1602 BLAKE2B c42b001329983cabfdd92998fea541b5ae79616db4bb5f2cb5f6c15c1fde71d05a6f56d37059efd105667812341fe88fb576e1080a3fd869430a867e279226c0 SHA512 81363697a5d4c46921214c4ff76dc2c30fb05978185cfacc531b4d08dca7fa559ee905495290b68687701e89bc8478691193b0601b3d0a7799354d14b0d94a10
-EBUILD imapclient-2.1.0.ebuild 1019 BLAKE2B 9279862a514848b95b111d364fffdb5da6380553e3e6f2910172717ae23f28733e43d32b073dbe439e7fe8191b62b0718165de02d5dab9b1805c88b6678f0d38 SHA512 3feebf090f839431ad24d1a4d26147432d5e500cf30e231dc168d98a1567436e36b80b9923b19cd17322a626378ec02a2767d24e8827267f157c205d3ae4d11e
+EBUILD imapclient-2.1.0.ebuild 1017 BLAKE2B f34c7b19010fbcda2f02bb86b8d1d9c710b609dbbacd1f9b842deb199479b50f93e3ad6d558cb5e80bac2b779b332efd7972acb3bc3cec149b4db44162fe678c SHA512 f83fbe15bdedde4816e6db021cee90052d615a992f5b94d36088296871c62de4b9132ce461aaafdd94bf7802a2c40e919f5dd369347f608064467a5035659dc4
 MISC metadata.xml 313 BLAKE2B 89d6cfc58f1d5e5e5e0737bf8fafc74e26800234041390fdc259aaf4a49b9c8aacbf9c5c2c55e8ddac4b5010dd70a2ca349f41ee15a0812335522354381bd151 SHA512 b8b32e8bfcf59a3f7134ca2f562365c02e590a2d6e8e5eae9c6d3dbe2d4918b973b614aa38650cc67a5c34167b6293f4dede92e53f635f079a050bb26289d48b
diff --git a/dev-python/imapclient/imapclient-0.13.ebuild b/dev-python/imapclient/imapclient-0.13.ebuild
deleted file mode 100644
index 2ca1822e0e13..000000000000
--- a/dev-python/imapclient/imapclient-0.13.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-MY_PN="IMAPClient"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="easy-to-use, pythonic, and complete IMAP client library"
-HOMEPAGE="http://imapclient.freshfoo.com/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc examples"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${MY_P}
-
-python_prepare_all() {
-	# use system setuptools
-	sed -i '/use_setuptools/d' setup.py || die
-
-	# drop explicit mock version test dep
-	sed -i "/tests_require/s:'mock==.\+':'mock':" setup.py || die
-
-	# use system six library. patch proven less preferable to use of sed (< maintenance)
-	# but a copy of the working hunks from prior version works fine for now.
-	rm imapclient/six.py || die
-	epatch "${FILESDIR}"/0.12-tests.patch
-	sed -e 's:from .six:from six:g' \
-		-e 's:from . import six:import six:g' \
-		-i ${PN}/*.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	"${PYTHON}" -m unittest discover || die "tests failed under ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-	# don't install examples and tests in module dir
-	rm -r "${D}"$(python_get_sitedir)/imapclient/{examples,test} || die
-}
-
-python_install_all() {
-#	local DOCS=( AUTHORS HACKING.rst NEWS.rst README.rst THANKS )
-	use doc && local HTML_DOCS=( doc/html/. )
-	distutils-r1_python_install_all
-	use examples && dodoc -r ${PN}/examples
-}
diff --git a/dev-python/imapclient/imapclient-2.1.0.ebuild b/dev-python/imapclient/imapclient-2.1.0.ebuild
index 993fad2fe0d5..49a5838c9844 100644
--- a/dev-python/imapclient/imapclient-2.1.0.ebuild
+++ b/dev-python/imapclient/imapclient-2.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/mjs/imapclient/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc examples"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"