summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2023-08-29 08:13:49 +0200
committerMichał Górny <mgorny@gentoo.org>2023-08-29 13:20:07 +0200
commitb0f4d6d83709e7903ca9dd9fb3c1bcdb75eb38d5 (patch)
tree525af9dec069269febe86b762fa16c1583a02c0a
parentllvm.org.eclass: Remove old snapshot support (diff)
downloadgentoo-b0f4d6d83709e7903ca9dd9fb3c1bcdb75eb38d5.tar.gz
gentoo-b0f4d6d83709e7903ca9dd9fb3c1bcdb75eb38d5.tar.bz2
gentoo-b0f4d6d83709e7903ca9dd9fb3c1bcdb75eb38d5.zip
dev-python/gssapi: Remove -r2 since cython-3 is still broken
Signed-off-by: Michał Górny <mgorny@gentoo.org>
-rw-r--r--dev-python/gssapi/files/gssapi-1.8.2-cython3.patch32
-rw-r--r--dev-python/gssapi/gssapi-1.8.2-r1.ebuild2
-rw-r--r--dev-python/gssapi/gssapi-1.8.2-r2.ebuild50
3 files changed, 2 insertions, 82 deletions
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
-}