gentoo Easter resync : 12.04.2020

3 files changed, 2 insertions, 55 deletions

diff --git a/dev-python/pylibmc/Manifest b/dev-python/pylibmc/Manifest
index 8810161581f3..7ad9d0990547 100644
--- a/dev-python/pylibmc/Manifest
+++ b/dev-python/pylibmc/Manifest
@@ -1,6 +1,4 @@
 AUX pylibmc-1.6.1-fix-test-failures-r1.patch 516 BLAKE2B b471ca80b11beff5ac0119f5eafaf437a74022c977a884b8bdf4ef2afdb3d535ad6602db9b1206fb6649bf57ffe5bbd17509d3dda3b6604fcfa428b592dbeae3 SHA512 802337b66cbd188cc81208420448da24cecde3c01d435d6814437f0ee31850b6ef8a53f61647740da340a69971e5fe570cc2a8c1b31226e425ce7ff88bca101c
-DIST pylibmc-1.5.1.tar.gz 69525 BLAKE2B 5039ad7d99a5ca57bd6cf7f00c77cc8bba122fe5852de164df34a71b4f5d1e4fcb428e749a66d384691b74f30b99e000f5cb9cd6479af2fc324d885b0fa59aa7 SHA512 efc40fae9721a6be589f87b66109132d4656725f718e1d63d7d25b9b27790b7c00fc3c7e4e47235895b7127cebc64229ddb284d23d0d903d3a510da7e1ce4549
 DIST pylibmc-1.6.1.tar.gz 72061 BLAKE2B ebaa6f9dfc341d862a8b46bbbf0db1420ff400cb40390f7bee6bf198ff941ad7967b578040ffe1209721ea84a163a39649108a2a23f3dadc2d579db740b2ccf3 SHA512 a3874435389486b29bab5f1d29e5c179d67655d90995bb27fcb7cd46ce7eb3b60117b94f901602f8a65dc0e587d5f8edfcf15e259effd439411adb58ddb7065e
-EBUILD pylibmc-1.5.1-r1.ebuild 1376 BLAKE2B d26e9ad64e2e0abf63107b806bdc1941bd9a9ccb4aae0e2f6b73a97a7c6b806a69278025b75d297c4e274c14e5b0a2f2ecc2d2254cc622b046f41c2d9f517c40 SHA512 d32d76d77dea1bf978eacee8f017831727862536aa8719d6f6e046269a862397384a96f6649e66abae110bb700c635c71598ee1dae3c301148af12c184313e05
-EBUILD pylibmc-1.6.1-r1.ebuild 1968 BLAKE2B 76b7b13753e78a47831fb6d23ffbc8c21d57072ca1314d87f03ef91e0d48a902269f20a1553a3a714aabe0c1ff885cd820a696ad93d600a62766033692ff2add SHA512 c348a2c24da2314fd20cf05440b32df1d4dd0f9ed1d8788e2b28b96d484f9d363659e402bb348230426407020b1cbac6db34c79f9f79f863585787a759c24661
+EBUILD pylibmc-1.6.1-r1.ebuild 1982 BLAKE2B 566076c2955150762bf92738db5c9f44c2201222f4dc6de4e64373486de0b33525ecdbd4062e54471eab6391284fc67574b7f96caef36a0dcb29e5bd0db9cb3d SHA512 1775292d9451346994b0a54a4e7c93f547fde74e2b5d3e02018571a08dbff64348c9b7c0e75dd0d2606d9f23f92678823b1e888e2eed050c2bb5f30ee821feb8
 MISC metadata.xml 366 BLAKE2B 5dcc369c40a052fcc6ff72c6f8fc46ffc8334c1a91e3f2e8ba8f9bf0bea7414d91833e5627f3d53b10e9d3d9f230b0af333929820a616433ff9d439cae888d2d SHA512 974f19bd4dd8043c07fa0001072e25b553aa82f4b9e9c00e579cb88e8819a4411a04b2e59cace18e0a8e2ce7395057e520b0bc78435865c4536b3de2e402265d
diff --git a/dev-python/pylibmc/pylibmc-1.5.1-r1.ebuild b/dev-python/pylibmc/pylibmc-1.5.1-r1.ebuild
deleted file mode 100644
index a8c201bb4de2..000000000000
--- a/dev-python/pylibmc/pylibmc-1.5.1-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Libmemcached wrapper written as a Python extension"
-HOMEPAGE="http://sendapatch.se/projects/pylibmc/ https://pypi.org/project/pylibmc/"
-# One image is missing from the doc at PyPI
-# https://github.com/lericson/pylibmc/pull/221
-SRC_URI="https://github.com/lericson/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-libs/libmemcached-0.32"
-# Older sphinx versions fail to compile the doc
-# https://github.com/sphinx-doc/sphinx/issues/3266
-DEPEND="${RDEPEND}
-	doc? ( >=dev-python/sphinx-1.5.1-r1[${PYTHON_USEDEP}] )
-	test? (
-		net-misc/memcached
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-
-python_prepare_all() {
-	sed -e "/with-info=1/d" -i setup.cfg || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		# This variable is added to sys.path
-		# but it does not seem to be useful
-		PYLIBMC_DIR="." emake -C docs
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
-
-python_test() {
-	memcached -d -p 11219 -u nobody -l localhost -P "${T}/m.pid" || die
-	MEMCACHED_PORT=11219 nosetests
-	local ret=${?}
-	kill "$(<"${T}/m.pid")" || die
-	[[ ${ret} == 0 ]] || die "Tests fail with ${EPYTHON}!"
-}
diff --git a/dev-python/pylibmc/pylibmc-1.6.1-r1.ebuild b/dev-python/pylibmc/pylibmc-1.6.1-r1.ebuild
index 85eda20375ab..7c190b1ce7db 100644
--- a/dev-python/pylibmc/pylibmc-1.6.1-r1.ebuild
+++ b/dev-python/pylibmc/pylibmc-1.6.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/lericson/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~alpha amd64 ~ppc64 x86"
 IUSE="doc test"
 
 # implementations to use for building docs, separate from PYTHON_COMPAT since