gentoo resync : 29.12.2022

3 files changed, 64 insertions, 22 deletions

diff --git a/dev-python/pylibmc/Manifest b/dev-python/pylibmc/Manifest
index 9a181587619f..2645742108c3 100644
--- a/dev-python/pylibmc/Manifest
+++ b/dev-python/pylibmc/Manifest
@@ -1,4 +1,6 @@
 AUX pylibmc-1.6.1-fix-test-failures-r1.patch 516 BLAKE2B b471ca80b11beff5ac0119f5eafaf437a74022c977a884b8bdf4ef2afdb3d535ad6602db9b1206fb6649bf57ffe5bbd17509d3dda3b6604fcfa428b592dbeae3 SHA512 802337b66cbd188cc81208420448da24cecde3c01d435d6814437f0ee31850b6ef8a53f61647740da340a69971e5fe570cc2a8c1b31226e425ce7ff88bca101c
+AUX pylibmc-1.6.1-py311.patch 918 BLAKE2B dcc8b3a8c8cc6d7a2b8de79af116ed55171a968b6a8da89b96041e70232e239ff6eacb3a4ad8794fc951e34e71e9b142adfc8ddb689336d559f989e219e1a936 SHA512 fedb103ee4d392f21c4b8f4ce7d3fafe8e3c0d9aa8b2ce464cae5e7553fc3a9ec1fb82d085106faeca448df54d3636ec38c296682d9e49b097c9bd06e76a02b1
+DIST pylibmc-1.6.1-no-nose.patch 26090 BLAKE2B 160e5b58107dcea0354462370eeeb12739c7fd1549e1c64ddf1fe2451654e50c1408505985eb6a7150ce60185bc7acebba7a20c6444615bef8c6991debfba4cc SHA512 84fb37505def84caaacb1343032d18bd644f5072e6ce7a2d6e88bc33bd2dedc8b303f4cf2a9b57b32c3c4b8e01bef1bebcc09ecb525568c928aed326bee2cace
 DIST pylibmc-1.6.1.tar.gz 72061 BLAKE2B ebaa6f9dfc341d862a8b46bbbf0db1420ff400cb40390f7bee6bf198ff941ad7967b578040ffe1209721ea84a163a39649108a2a23f3dadc2d579db740b2ccf3 SHA512 a3874435389486b29bab5f1d29e5c179d67655d90995bb27fcb7cd46ce7eb3b60117b94f901602f8a65dc0e587d5f8edfcf15e259effd439411adb58ddb7065e
-EBUILD pylibmc-1.6.1-r2.ebuild 1392 BLAKE2B adc327ca0d47b2b1e37016c8631bb218b9fcba3f23db646a524aaff1c647145fc1b942747283d8e9fd7a3a220208e63edc5f49b774286e314dfdd388aef5cd13 SHA512 b7e322135e6025ae88ea861360b6c5ef1412fd266dacfd294c055ad925cfddd0ffe03948aeeede0b75367fbdc29133e0906a13b578caf94dfd756e8afafe62eb
+EBUILD pylibmc-1.6.1-r2.ebuild 1383 BLAKE2B 722b240fc8e21ef8ad8007d788937c130159080dbc4f6da82a7b7fffc620c9f9945d2c6f330515b17eaf3124738386ee91c8a159743450f711ba281697baab1f SHA512 5b7fbaa7198f7a0eac192607d51a118ab3a1251f017c303ee0f92743b02e83fdc34a795573d821baeda02685a0a19ca02f9784f14c86b0ad67009ef8dd072e21
 MISC metadata.xml 367 BLAKE2B fd37f3e072661e616dcfabb2054827a7b1c3830e555cb6fa461e93dadcd39ab1856c0ad4cbe03be85924889b97ba7cc88da651011a4b1c5622fcd950339f7e2d SHA512 33977c15a726c2039221bcbd282244c240013922bd4f1398e75f01ebd68dd0f8574ac890ddb578cb633a89b52584927800f86dcb4a1eb0ab27b165c38b9a91e6
diff --git a/dev-python/pylibmc/files/pylibmc-1.6.1-py311.patch b/dev-python/pylibmc/files/pylibmc-1.6.1-py311.patch
new file mode 100644
index 000000000000..c687f90fb658
--- /dev/null
+++ b/dev-python/pylibmc/files/pylibmc-1.6.1-py311.patch
@@ -0,0 +1,29 @@
+From 22854a4ba8f7e926099219c107104723089bcad8 Mon Sep 17 00:00:00 2001
+From: Ludvig Ericson <ludvig@lericson.se>
+Date: Mon, 29 Jun 2020 14:59:36 +0200
+Subject: [PATCH] =?UTF-8?q?2020:=20Do=20not=20pass=20=E2=80=98U=E2=80=99?=
+ =?UTF-8?q?=20flag=20to=20open?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+---
+ setup.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 9bea257..89871ea 100644
+--- a/setup.py
++++ b/setup.py
+@@ -95,9 +95,9 @@ def append_env(L, e):
+         s.write(line + "\n")
+     sys.exit(0)
+ 
+-with open("README.rst", "U", encoding="utf-8") as r:
++with open("README.rst", encoding="utf-8") as r:
+     readme_text = r.read()
+-with open("src/pylibmc-version.h", "U", encoding="utf-8") as r:
++with open("src/pylibmc-version.h", encoding="utf-8") as r:
+     version = r.read().strip().split("\"")[1]
+ 
+ setup(
diff --git a/dev-python/pylibmc/pylibmc-1.6.1-r2.ebuild b/dev-python/pylibmc/pylibmc-1.6.1-r2.ebuild
index dd3d4aa2ac54..65a68720139f 100644
--- a/dev-python/pylibmc/pylibmc-1.6.1-r2.ebuild
+++ b/dev-python/pylibmc/pylibmc-1.6.1-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
@@ -12,41 +12,42 @@ DESCRIPTION="Libmemcached wrapper written as a Python extension"
 HOMEPAGE="
 	https://sendapatch.se/projects/pylibmc/
 	https://pypi.org/project/pylibmc/
-	https://github.com/lericson/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"
+	https://github.com/lericson/pylibmc/
+"
+SRC_URI="
+	https://github.com/lericson/pylibmc/archive/${PV}.tar.gz
+		-> ${P}.tar.gz
+	https://github.com/lericson/pylibmc/pull/263.patch
+		-> ${P}-no-nose.patch
+"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ~ppc64 x86"
 
-RDEPEND=">=dev-libs/libmemcached-0.32"
-# Older sphinx versions fail to compile the doc
-# https://github.com/sphinx-doc/sphinx/issues/3266
-DEPEND="${RDEPEND}"
+DEPEND="
+	>=dev-libs/libmemcached-0.32
+"
+RDEPEND="
+	${DEPEND}
+"
 BDEPEND="
 	test? (
 		net-misc/memcached
-	)"
+	)
+"
 
 PATCHES=(
 	"${FILESDIR}/pylibmc-1.6.1-fix-test-failures-r1.patch"
+	"${FILESDIR}/pylibmc-1.6.1-py311.patch"
+	"${DISTDIR}/${P}-no-nose.patch"
 )
 
 distutils_enable_sphinx docs
-distutils_enable_tests nose
+distutils_enable_tests pytest
 
-python_prepare_all() {
-	sed -e "/with-info=1/d" -i setup.cfg || die
-
-	# some amazon thing, expects to be in AWS
-	rm tests/test_autoconf.py || die
-	distutils-r1_python_prepare_all
-
-	# needed for docs
-	export PYLIBMC_DIR=.
-}
+# needed for docs
+export PYLIBMC_DIR=.
 
 src_test() {
 	local -x MEMCACHED_PORT=11219
@@ -55,3 +56,13 @@ src_test() {
 	distutils-r1_src_test
 	kill "$(<"${T}/m.pid")" || die
 }
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# these require "AmazonElastiCache" running
+		tests/test_autoconf.py
+	)
+
+	epytest --doctest-modules --doctest-glob='doctests.txt' \
+		src/pylibmc tests
+}