gentoo auto-resync : 13:02:2023 - 08:16:09

4 files changed, 18 insertions, 59 deletions

diff --git a/dev-python/pyopengl/Manifest b/dev-python/pyopengl/Manifest
index 2e28ea8b58b3..9ade44221ca2 100644
--- a/dev-python/pyopengl/Manifest
+++ b/dev-python/pyopengl/Manifest
@@ -1,6 +1,5 @@
-DIST PyOpenGL-3.1.5.tar.gz 1835295 BLAKE2B fd3b3e9970b3e704b09128402b401e23c584ba20de23082d019f5ab9e1e222efdfbd2e11ecff6ee748f41bad3a5ff089c57a5c354092e2f717b13e18108de2af SHA512 5d90fc68040b4886e46ff69a59be9e3a8e31e3e1295283756db86d50a1efe681986928e18eb55d20fd2660f863653301ea483425bbe24046f55085b44f4906eb
 DIST PyOpenGL-3.1.6.tar.gz 1903892 BLAKE2B 7d1109a09703a7113aa9cc02994662df77bea1da63e81a8adbdc812514b71e04bfa51dad9e48c0e0b98327e4f7deda7a8590c340a38127d38e91659f38739220 SHA512 b6f2f083df0fd7cf8f8a1077f42fa388bce94c0edde00ed6492104af8306c9925b74649cd2c222be4205b0892e7975de2f7591d0f0bcd9540eb53c0de95fec00
-EBUILD pyopengl-3.1.5.ebuild 1183 BLAKE2B 4a8af0a68701de14c47932bcc2560bb68d7be929f95700b6e6d4b77cc4d9edab8a2ffd84a736e835eee7b8db63ff17cce63dc32c0f80eac9218f7d533343428a SHA512 bd757c5ffc41ea8eeb9f38424a55807221c1098ab00c0ce596cc38a0675a8954d16f88ab4b40e4994eb9971257a755f7dc14e4894c935e1a5dabffc702e2890a
-EBUILD pyopengl-3.1.6-r1.ebuild 1148 BLAKE2B 5d7958826e526e9e468dac319639ad5d8b731638b59bd8a8b28b959ee39f28da0687d7513f4702182ac3efa0c5f874e1e61b3a1a6c9b9462a67da830d34b5b95 SHA512 13c715f0e0b9770c2725f396b6de9eeb6e3760e7a32bb7092604c94cc776eb2e9db54cd84938a6b8f509604e0c621270ffac4f633e0d55b88f578487b664ab0c
+DIST pyopengl-3.1.6-glut-font-egl.patch 1430 BLAKE2B 4b8962045b1efce2b4ec8ca759689d880e8df074e98c8c680172fd01d6cfbae33148cef41c46c7d1231674836d0009626ccedd873fcfe35f644fe9a2aaab2d5e SHA512 a0c491bca31cff312a2f431f89109cbf3aff276aee375325cacc5c6ebe37ad2119072ad7658e11b56efd62b18b8ed2642de999c79b0c999414e44c2b1ec7225b
+EBUILD pyopengl-3.1.6-r2.ebuild 1369 BLAKE2B afa9889a051536c0ddb2aecb6aac598e611860564ea2b5b1d54842ed6f28896dc04b1dd11a8e6bcfa2d190b0a3815a38f57cd6d500edf185ec8814f312d469ed SHA512 b09cfed2a25ed3f77dde5c97a53fee1c7e6ebca68d12b0a36139f92350f034da3a388e4e6f355c14c3f853e41b5ffe6554a047552fbb0d8c6860dca81d9a047c
 EBUILD pyopengl-3.1.6.ebuild 1141 BLAKE2B 450f7d3f7f29f578171e0b6e232ac52bcb5c63fdc7612c367e99605665dd0bddb8e9156c4b3255adf18cb9f5d33bfc907131dd11db34432689e8c9d92726008e SHA512 c3fb429e35962ccf58ee1b3112ed51979706db28c5cf75116e8207a01ecae690db46458a6e9af8507b301defbc91daf7426956778b2d54884ea6a4539d312638
-MISC metadata.xml 365 BLAKE2B 4f4ed59d889195fb5f979daa14ace3f8a77f9ae1330fda3eb454fca4aa5447e285a4f31c5993358d20ecc413b368cf70a7f5e55796b9b81557cff06bc7a4a5fb SHA512 2059e35cf4377763e16007e867897acfdba791681687ec0c45c9c78ea8cf89889e71dc3f4fe6720618f5adf6fe26a3440aaf938a5c1b592654fadcca7ff5ee3b
+MISC metadata.xml 422 BLAKE2B c9ee324fb408e8d0856193fde1324109e77c97f28fff0dc83d9c903cf3e2385c3401d8f949d50fc2e2a9c41b79c421298e04fc79639b79352138f41aeafb7018 SHA512 bedbbc7fcafc2c625f79241e75faeafd0d3c37b4186b5ef8842e8612d9527a4991f208b1878b1f1e28f4056eab2104e7acb57814e39ee82c0208d6f93fbb7b85
diff --git a/dev-python/pyopengl/metadata.xml b/dev-python/pyopengl/metadata.xml
index af8cd164edcb..abe60e1c9f5b 100644
--- a/dev-python/pyopengl/metadata.xml
+++ b/dev-python/pyopengl/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Python</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="github">mcfletch/pyopengl</remote-id>
 		<remote-id type="pypi">PyOpenGL</remote-id>
 		<remote-id type="sourceforge">pyopengl</remote-id>
 	</upstream>
diff --git a/dev-python/pyopengl/pyopengl-3.1.5.ebuild b/dev-python/pyopengl/pyopengl-3.1.5.ebuild
deleted file mode 100644
index e371b19d84b7..000000000000
--- a/dev-python/pyopengl/pyopengl-3.1.5.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_REQ_USE="tk?"
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit distutils-r1 virtualx
-
-MY_PN="PyOpenGL"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python OpenGL bindings"
-HOMEPAGE="http://pyopengl.sourceforge.net/ https://pypi.org/project/PyOpenGL/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-#	mirror://sourceforge/pyopengl/${MY_P}.tar.gz" # broken mirror for this release
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="tk"
-
-RDEPEND="
-	media-libs/freeglut
-	virtual/opengl
-	x11-libs/libXi
-	x11-libs/libXmu
-	tk? ( dev-tcltk/togl )
-"
-DEPEND="
-	${RDEPEND}
-"
-
-# The tests need an X server with the GLX extension. Software rendering
-# under Xvfb works but only with llvmpipe, not softpipe or swr.
-BDEPEND="
-	test? (
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pygame[${PYTHON_USEDEP},opengl,X]
-		!prefix? (
-			media-libs/mesa[llvm]
-			x11-base/xorg-server[-minimal,xorg]
-		)
-	)
-"
-
-distutils_enable_tests pytest
-
-src_test() {
-	virtx distutils-r1_src_test
-}
diff --git a/dev-python/pyopengl/pyopengl-3.1.6-r1.ebuild b/dev-python/pyopengl/pyopengl-3.1.6-r2.ebuild
index 1c19aea56637..44ac3dc91257 100644
--- a/dev-python/pyopengl/pyopengl-3.1.6-r1.ebuild
+++ b/dev-python/pyopengl/pyopengl-3.1.6-r2.ebuild
@@ -13,8 +13,16 @@ MY_PN="PyOpenGL"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Python OpenGL bindings"
-HOMEPAGE="http://pyopengl.sourceforge.net/ https://pypi.org/project/PyOpenGL/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+HOMEPAGE="
+	https://pyopengl.sourceforge.net/
+	https://github.com/mcfletch/pyopengl/
+	https://pypi.org/project/PyOpenGL/
+"
+SRC_URI="
+	mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz
+	https://github.com/mcfletch/pyopengl/commit/2d2457b4d565bce1c58b76b427e1f9027e8b4bcc.patch
+		-> ${P}-glut-font-egl.patch
+"
 S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
@@ -48,6 +56,10 @@ BDEPEND="
 
 distutils_enable_tests pytest
 
+PATCHES=(
+	"${DISTDIR}/${P}-glut-font-egl.patch"
+)
+
 src_test() {
 	virtx distutils-r1_src_test
 }