gentoo auto-resync : 29:08:2023 - 16:05:39

4 files changed, 3 insertions, 85 deletions

diff --git a/dev-python/gssapi/Manifest b/dev-python/gssapi/Manifest
index a1c3945ea67c..e2b78bb35f95 100644
--- a/dev-python/gssapi/Manifest
+++ b/dev-python/gssapi/Manifest
@@ -1,5 +1,3 @@
-AUX gssapi-1.8.2-cython3.patch 1202 BLAKE2B 9195773d2c9a8a9d9028b02bbd9414953e7a4141b54cf26de74c0066875759f599f58d99c0c4643eaa8a0fcee85e62d34a02b808419d185b4c9ddb8fbec7a2b6 SHA512 bcae7a0eb4cafef472d2102e16fa3d63ace48fdcbd0e512ed0bc43ef5ee92c217dd3c53d24da04c2f922d8e8078a0be393a658259815ddf5a2bb484cde95b557
 DIST gssapi-1.8.2.gh.tar.gz 112521 BLAKE2B d7e14c73c346066a58ae3b3cf1faeec2ef7df3d4da3f2c9e3198928225d81d99466185a9dfa06a59ae50beeeed58d4e73f8a668e1ac605e5b9806ed7a0019831 SHA512 6587f1947dc396bf608ba71e77388e6f7d161753005b9b82ea9f3b174c898bb18409a27e9aa035fc782e15fcd2efe7ca5c497d4687d69023034cea59d6a003df
-EBUILD gssapi-1.8.2-r1.ebuild 921 BLAKE2B 1e83d2d68cd57d30c3b295c30a334be76c9b11115425aacbb14526714dadd3a5e11cd44643d9a597aa3f6875efbae91c53930f0702ab9617e72f3d369c6dcde3 SHA512 13124d68368d66fd5a93eed0eda0237849dfa0e2bf591ef3e002b9d6d85163eef90f3d6951ff63ec1206f0a8b2b07493888ee3f23ea4247c46c9e8ac54c8664f
-EBUILD gssapi-1.8.2-r2.ebuild 978 BLAKE2B b5d3bb908620f4f2aed73d7269f5590bfbf450764474e5cc9d781dc62d3a701976c47168c0eb3cbc77b4515bf4ba1005e0d82b74803264898c060380ce9b1b6c SHA512 94a8ec8432e95b0476e808678bff32108ab5b8849f52b356916dc1bde0e7c90c4f75a71fcea4e37298a277bba150df9f36c72a15cc742b47b909b5d112160b26
+EBUILD gssapi-1.8.2-r1.ebuild 1025 BLAKE2B 682b90ce6e66eae4a6f32d3ede2564aab55c4bef17bd89f8a45b5da228c07887dce94a04ed42b7dca517ff4bda83543fb9e80644f3fe5dbc585699d962dfa1a4 SHA512 d2f087ed17bb07b375de0b3ae7fdd90c6ced0bcb5c906a9184cd0765c5c505293816ffcf617d9a0916efe8f3500ca898ae9b29ee5dcb465f3d0ab7e66365726a
 MISC metadata.xml 508 BLAKE2B 546d1ff6df79f22a0cde8d19a5718f834301630cda7700c73f2e6943c1634662bb216f79e290d6efe681e96f24f791785e104a2fbfe4af4d7632899db33edde4 SHA512 3ed7272bbd046d2ca4f8e0b67d005a7a676e4998acba2f7fe70d8f9022d3bb0bdc3c845ed666db3c23e4bd118fb4d762af21d94b47ae664de568fb277b7da033
diff --git a/dev-python/gssapi/files/gssapi-1.8.2-cython3.patch b/dev-python/gssapi/files/gssapi-1.8.2-cython3.patch
deleted file mode 100644
index aabc67d15e72..000000000000
--- a/dev-python/gssapi/files/gssapi-1.8.2-cython3.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-https://github.com/pythongssapi/python-gssapi/commit/d9200d1018ac916b30433da23898c8c5fbde0f28
-
-From d9200d1018ac916b30433da23898c8c5fbde0f28 Mon Sep 17 00:00:00 2001
-From: Jordan Borean <jborean93@gmail.com>
-Date: Tue, 18 Jul 2023 08:57:11 +1000
-Subject: [PATCH] Fix Cython 3 Compatibility
-
-Fixes compatibility with Cython 3 by fixing up the import so it doesn't
-try and do a recursive import. This also increases the upper bound for
-Cython to 4.0.0 now that 3.0.0 is compatible.
-
-Signed-off-by: Jordan Borean <jborean93@gmail.com>
---- a/gssapi/raw/_enum_extensions/ext_dce.pyx
-+++ b/gssapi/raw/_enum_extensions/ext_dce.pyx
-@@ -1,6 +1,6 @@
- from gssapi.raw.cython_types cimport OM_uint32
- 
--import gssapi.raw._enum_extensions as ext_registry
-+from gssapi.raw import _enum_extensions as ext_registry
- 
- 
- cdef extern from "python_gssapi_ext.h":
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -1,6 +1,6 @@
- [build-system]
- requires = [
--    "Cython >= 0.29.29, < 3.0.0",  # 0.29.29 includes fixes for Python 3.11
-+    "Cython >= 0.29.29, < 4.0.0",  # 0.29.29 includes fixes for Python 3.11
-     "setuptools >= 40.6.0",  # Start of PEP 517 support for setuptools
- ]
- build-backend = "setuptools.build_meta"
diff --git a/dev-python/gssapi/gssapi-1.8.2-r1.ebuild b/dev-python/gssapi/gssapi-1.8.2-r1.ebuild
index 365265a2a1dd..b1ac1962c5ed 100644
--- a/dev-python/gssapi/gssapi-1.8.2-r1.ebuild
+++ b/dev-python/gssapi/gssapi-1.8.2-r1.ebuild
@@ -29,6 +29,8 @@ RDEPEND="
 	virtual/krb5
 "
 
+# cython-3 produces a broken extension still
+# https://github.com/pythongssapi/python-gssapi/issues/327
 BDEPEND="
 	<dev-python/cython-3[${PYTHON_USEDEP}]
 	virtual/krb5
diff --git a/dev-python/gssapi/gssapi-1.8.2-r2.ebuild b/dev-python/gssapi/gssapi-1.8.2-r2.ebuild
deleted file mode 100644
index cd41269f8bd8..000000000000
--- a/dev-python/gssapi/gssapi-1.8.2-r2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1
-
-DESCRIPTION="Low and high level wrappers around the GSSAPI C libraries"
-HOMEPAGE="
-	https://github.com/pythongssapi/python-gssapi/
-	https://pypi.org/project/gssapi/
-"
-SRC_URI="
-	https://github.com/pythongssapi/python-gssapi/releases/download/v${PV}/python-${P}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}"/python-${P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-
-RDEPEND="
-	dev-python/decorator[${PYTHON_USEDEP}]
-	virtual/krb5
-"
-
-BDEPEND="
-	>=dev-python/cython-0.29.29[${PYTHON_USEDEP}]
-	virtual/krb5
-	test? (
-		dev-python/k5test[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-cython3.patch
-)
-
-distutils_enable_tests pytest
-
-python_test() {
-	cd "${T}" || die
-	epytest --pyargs gssapi
-}