gentoo auto-resync : 10:11:2023 - 22:34:26

3 files changed, 45 insertions, 2 deletions

diff --git a/dev-python/pyopengl/Manifest b/dev-python/pyopengl/Manifest
index 173db159b83a..9dffd4a4b5a8 100644
--- a/dev-python/pyopengl/Manifest
+++ b/dev-python/pyopengl/Manifest
@@ -1,6 +1,7 @@
+AUX pyopengl-3.1.7-py312.patch 829 BLAKE2B a00bbf0bf0a2766ae798222a0b70ed86b1446171251b7c12e2690b8ba9a36f0b2303cabb0000d423753ab3c25215a474bf97d64cac68ba0900f7fbb3e7de6466 SHA512 366ae4070a9be37a8da960619d31a0f7a7d4915081d82d84b85904e52cf011114d804fe228c9794319e400f1ba75f9e1cc4e0be7fa2709de1c88824cc8f29ece
 DIST PyOpenGL-3.1.6.tar.gz 1903892 BLAKE2B 7d1109a09703a7113aa9cc02994662df77bea1da63e81a8adbdc812514b71e04bfa51dad9e48c0e0b98327e4f7deda7a8590c340a38127d38e91659f38739220 SHA512 b6f2f083df0fd7cf8f8a1077f42fa388bce94c0edde00ed6492104af8306c9925b74649cd2c222be4205b0892e7975de2f7591d0f0bcd9540eb53c0de95fec00
 DIST PyOpenGL-3.1.7.tar.gz 1896446 BLAKE2B 3fd4c84bb59157b4a6ee09c2a5ecd0e4f548bf03a84d735acfd92453eafb92102677a2b9c98831a92be33e873630c815dee453745d630a4d6b044771a13c945c SHA512 add1b4d02e7297f00f82a9c9249d6665029073fe620a1650491af9102a76a16e9320b5f227275b0c273ff5a616c284fd9f25f0f425848676c37cab9f3c22ae2e
 DIST pyopengl-3.1.6-glut-font-egl.patch 1430 BLAKE2B 4b8962045b1efce2b4ec8ca759689d880e8df074e98c8c680172fd01d6cfbae33148cef41c46c7d1231674836d0009626ccedd873fcfe35f644fe9a2aaab2d5e SHA512 a0c491bca31cff312a2f431f89109cbf3aff276aee375325cacc5c6ebe37ad2119072ad7658e11b56efd62b18b8ed2642de999c79b0c999414e44c2b1ec7225b
 EBUILD pyopengl-3.1.6-r2.ebuild 1325 BLAKE2B f507bf93ea395338ced8083eb4d7b14998c896f2429552fb4cad59584ecacf64f0464f7972ee6f176ce46b8a56ae99b1def6797d4531bf1ea8822881c217689b SHA512 ce8a86b23aaddecb5f9359d59a9271660af74791a6c85424704e83baefd1deb11e362a5a6842b59b464e59d62e00defcead9e764a0ce1793a30a180a506bbc9b
-EBUILD pyopengl-3.1.7.ebuild 1106 BLAKE2B f3a3327c130b59b7f056ba352d8aedb6f116d0c0f98c7a6c918a0016682af009ae1de457ee2f5d7aabde98b1fd5ecb47bb9142abb9e5d71e62b6c9e5238e95ef SHA512 cf9c214d83f996def1ead4e5f470f54be20a1c0630022927d5626151e087e3061f232bf915c25c0b0739cda8f989b36757bedf606f7c042a01a0aad4db81f2f7
+EBUILD pyopengl-3.1.7.ebuild 1416 BLAKE2B 334e4374267e8265039f558b5150ebdf80a46b4c21b44d5743c9eca13c28136db8896d1be91307a190b47327a7b2dfeade587ef7e438b4549fe96613eaeea09d SHA512 c077021d7922d37fe866377e5782a6e9eb3244ff4bcbc1a9933754fb1ebba7fe52619f940b994b0a4ba36d29ccd84faf44bfc478d946f2679657d89927b51826
 MISC metadata.xml 422 BLAKE2B c9ee324fb408e8d0856193fde1324109e77c97f28fff0dc83d9c903cf3e2385c3401d8f949d50fc2e2a9c41b79c421298e04fc79639b79352138f41aeafb7018 SHA512 bedbbc7fcafc2c625f79241e75faeafd0d3c37b4186b5ef8842e8612d9527a4991f208b1878b1f1e28f4056eab2104e7acb57814e39ee82c0208d6f93fbb7b85
diff --git a/dev-python/pyopengl/files/pyopengl-3.1.7-py312.patch b/dev-python/pyopengl/files/pyopengl-3.1.7-py312.patch
new file mode 100644
index 000000000000..53c4b6ab847f
--- /dev/null
+++ b/dev-python/pyopengl/files/pyopengl-3.1.7-py312.patch
@@ -0,0 +1,28 @@
+From b49af26c615236ebc29cf125a8315091482a4a2a Mon Sep 17 00:00:00 2001
+From: Scott Talbert <swt@techie.net>
+Date: Tue, 18 Jul 2023 10:12:29 -0400
+Subject: [PATCH] Fix ctypes FormatHandler for Python 3.12+
+
+In Python 3.12, CArgObject moved from builtins to _ctypes it seems.
+
+Fixes #99.
+---
+ OpenGL/__init__.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/OpenGL/__init__.py b/OpenGL/__init__.py
+index f9cc6bfc..77dc8c0b 100644
+--- a/OpenGL/__init__.py
++++ b/OpenGL/__init__.py
+@@ -308,7 +308,7 @@ FormatHandler(
+     "ctypesparameter",
+     "OpenGL.arrays.ctypesparameters.CtypesParameterHandler",
+     [
+-        _bi + ".CArgObject",
++        ("_ctypes" if sys.version_info[:2] >= (3,12) else _bi) + ".CArgObject",
+         "ctypes.c_uint",
+         "ctypes.c_int",
+         "ctypes.c_float",
+-- 
+2.42.1
+
diff --git a/dev-python/pyopengl/pyopengl-3.1.7.ebuild b/dev-python/pyopengl/pyopengl-3.1.7.ebuild
index 223b4939eb29..52f90ccbfbbf 100644
--- a/dev-python/pyopengl/pyopengl-3.1.7.ebuild
+++ b/dev-python/pyopengl/pyopengl-3.1.7.ebuild
@@ -7,7 +7,7 @@ DISTUTILS_USE_PEP517=setuptools
 PYPI_NO_NORMALIZE=1
 PYPI_PN=PyOpenGL
 PYTHON_REQ_USE="tk?"
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit distutils-r1 pypi virtualx
 
@@ -49,6 +49,20 @@ BDEPEND="
 
 distutils_enable_tests pytest
 
+PATCHES=(
+	# https://github.com/mcfletch/pyopengl/commit/b49af26c615236ebc29cf125a8315091482a4a2a
+	"${FILESDIR}/${P}-py312.patch"
+)
+
+EPYTEST_DESELECT=(
+	# unreliable memory counting test
+	tests/test_vbo_memusage.py::test_sf_2980896
+)
+
+python_test() {
+	nonfatal epytest || die "Tests failed with ${EPYTHON}"
+}
+
 src_test() {
 	virtx distutils-r1_src_test
 }