From cc6fb501ef0f4c443ce79d017dbfbd95072b14f4 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Wed, 24 May 2023 21:03:24 +0100
Subject: gentoo auto-resync : 24:05:2023 - 21:03:24

---
 dev-python/distlib/Manifest                        |  3 +-
 dev-python/distlib/distlib-0.3.6.ebuild            | 12 ++++--
 dev-python/distlib/files/distlib-0.3.6-py312.patch | 50 ++++++++++++++++++++++
 3 files changed, 60 insertions(+), 5 deletions(-)
 create mode 100644 dev-python/distlib/files/distlib-0.3.6-py312.patch

(limited to 'dev-python/distlib')

diff --git a/dev-python/distlib/Manifest b/dev-python/distlib/Manifest
index 2ae0a96aba1d..c77f8d7f049c 100644
--- a/dev-python/distlib/Manifest
+++ b/dev-python/distlib/Manifest
@@ -1,4 +1,5 @@
 AUX distlib-0.3.2-system-pypiserver.py 1294 BLAKE2B 87d419e5d9bd90715e43a125617bf12a2eaf16d114557a56fa0c6afb0fa83468960dcfdba3a3eff2ff136c5ef12ec04e71cea2a77a886854181dcdc64aee954e SHA512 08ee2bdc55b30ba770179c97a8dc7f702d72588b6f8bfd65feb47847ee4b41b97c0f31d37e1c4cfc2cff35ccb189abfc07590a175b7d2fd592beda8eb4a8b040
+AUX distlib-0.3.6-py312.patch 2001 BLAKE2B 761b186ba02ceb3af5a5b88523be120707e1e1be401bdf6b63463e88466250df7f83ac0abd2b22abef15fb8a8420247e265434eeb8d69b18ac1b3e8e2a4aca09 SHA512 92af65078333e9e615f1c045f93bd795d894e85fa390c9d2236febd1ea42e9c960cd8e05c0224a11246907f85a790aae63127e695712dbac0522ee05ebddb486
 DIST distlib-0.3.6.gh.tar.gz 1234082 BLAKE2B 384b736d9fb9e63d1b9a9375caf972ddfccb36c99903928505e684fe09b30190f873cf7b109beb6c32a1e4b1e11a1d9947adea74f9dceef3398fcc1963a2044a SHA512 39948539764ff5d45f14dc602ebd47d523b71b587ee081d7a267669aef4e4b1013d3995cb992038136bc4c01826ea633c6e4ffd050f1511705b296bf76f3bbf9
-EBUILD distlib-0.3.6.ebuild 1326 BLAKE2B 92942ac2cd4c740d41a56d0dee71605924a51100f9ce04e0e6f1ab295606db0665d07bcd10b8caa6a3e54085ae044232e4294892a403a0f3b7feb35ac115e6d2 SHA512 875b2e54fb274ab0a0bdc82db44c42e7cd064f4bd24f8c29b5226c66a475d71d7634e976802abdfbca8119ed985367ecafaedae41dfbaa917aeb8321ddb3013a
+EBUILD distlib-0.3.6.ebuild 1361 BLAKE2B 744c3b04d88b5fc5b5e1071262dc628481d1e0ea2e793d08023d9b233abc77d7e5ccaed0efc019d65ab631b892143e34ceec78f48e348e1a20f586532cdf1528 SHA512 913932c9a414a6b54f6b8d904b84e9a08b6e72c713d09ed8382109573cfce035b69bde7966a44a9779616c9e690a4bb9ee49fa91b75b287a2fe5c899e6458415
 MISC metadata.xml 365 BLAKE2B 74d46041d58af096a40f55e08c48562eb11aa8349f2a5afeffad67182c65561b71e2723254df6176b77852f74fd569bb329e21bc8f4ba70828dc8fdb361bf518 SHA512 3d5da338be7508640eaff3ac9360387a6b98d40df477b81e9d4dd9b642e84c8d3fbdbf8c277dfaadc869bd733616329b02607fe56357139be4721d4cabb7996a
diff --git a/dev-python/distlib/distlib-0.3.6.ebuild b/dev-python/distlib/distlib-0.3.6.ebuild
index 6f1be5b2fb7b..2fb434b9de26 100644
--- a/dev-python/distlib/distlib-0.3.6.ebuild
+++ b/dev-python/distlib/distlib-0.3.6.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} pypy3 )
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
 
 inherit distutils-r1
 
@@ -31,12 +31,16 @@ BDEPEND="
 "
 
 src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}/${P}-py312.patch"
+
+		# use system pypiserver instead of bundled one
+		"${FILESDIR}"/distlib-0.3.2-system-pypiserver.py
+	)
+
 	# make sure they're not used
 	rm tests/pypi-server-standalone.py || die
 
-	# use system pypiserver instead of broken bundled one
-	eapply "${FILESDIR}"/distlib-0.3.2-system-pypiserver.py || die
-
 	distutils-r1_src_prepare
 }
 
diff --git a/dev-python/distlib/files/distlib-0.3.6-py312.patch b/dev-python/distlib/files/distlib-0.3.6-py312.patch
new file mode 100644
index 000000000000..4e1d8927b745
--- /dev/null
+++ b/dev-python/distlib/files/distlib-0.3.6-py312.patch
@@ -0,0 +1,50 @@
+From fe769c72e4f9d613b2ce066325d2fb28317833d5 Mon Sep 17 00:00:00 2001
+From: Lumir Balhar <lbalhar@redhat.com>
+Date: Thu, 18 May 2023 14:09:34 +0200
+Subject: [PATCH 1/2] Check for cert_file attribute before accessing it
+
+In Python 3.12, HTTPSConnection no longer has cert_file attribute
+so unless something adds it to the subclass, the attribute doesn't
+exist by default.
+
+CPython change: https://github.com/python/cpython/commit/ef0e72b31d22f780d3a165d7d0471806061fe380#diff-3cf29d90eb758d0fe5ec013bbfda9b0bb60be4f7d899583bd5f490a7a5a5dc5f
+---
+ distlib/util.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/distlib/util.py b/distlib/util.py
+index dd01849..ddfc992 100644
+--- a/distlib/util.py
++++ b/distlib/util.py
+@@ -1435,7 +1435,7 @@ def connect(self):
+             context = ssl.SSLContext(ssl.PROTOCOL_SSLv23)
+             if hasattr(ssl, 'OP_NO_SSLv2'):
+                 context.options |= ssl.OP_NO_SSLv2
+-            if self.cert_file:
++            if hasattr(self, "cert_file") and self.cert_file:
+                 context.load_cert_chain(self.cert_file, self.key_file)
+             kwargs = {}
+             if self.ca_certs:
+
+From 440a7b57b9521ba2eca749e26945eaf16bc7c472 Mon Sep 17 00:00:00 2001
+From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
+Date: Wed, 24 May 2023 15:50:44 +0100
+Subject: [PATCH 2/2] Use single quotes.
+
+---
+ distlib/util.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/distlib/util.py b/distlib/util.py
+index ddfc992..d1ec58a 100644
+--- a/distlib/util.py
++++ b/distlib/util.py
+@@ -1435,7 +1435,7 @@ def connect(self):
+             context = ssl.SSLContext(ssl.PROTOCOL_SSLv23)
+             if hasattr(ssl, 'OP_NO_SSLv2'):
+                 context.options |= ssl.OP_NO_SSLv2
+-            if hasattr(self, "cert_file") and self.cert_file:
++            if hasattr(self, 'cert_file') and self.cert_file:
+                 context.load_cert_chain(self.cert_file, self.key_file)
+             kwargs = {}
+             if self.ca_certs:
-- 
cgit v1.2.3