gentoo auto-resync : 21:12:2023 - 13:58:21

7 files changed, 49 insertions, 99 deletions

diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 7266c8ef968f..609fd3bed4c7 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/cairocffi/Manifest b/dev-python/cairocffi/Manifest
index 30a3b87e8215..6af83051f5aa 100644
--- a/dev-python/cairocffi/Manifest
+++ b/dev-python/cairocffi/Manifest
@@ -1,6 +1,4 @@
 AUX cairocffi-0.8.0-tests.patch 827 BLAKE2B 81e1228f054ccb46b6c3170319fbd47aead8bdbb0b7af8e60cf85391c673d86e3eb1218a393c9b454d3d94b88968421ed9f3d798cc1d28ba7510bc75ad3ec261 SHA512 3fc7c2785586f88b17864931528e8c8e25792855107e5e8b76aa79a198303b68bd8cc822a2a5ff7a646c9f11982a3b5992a9eeb3bd651bbde1792d13a1410021
-DIST cairocffi-1.5.1.tar.gz 86924 BLAKE2B 51bbd85ed486d8a324255d7b328fc44490097f0eeb0568d0e9436350e627ee2da7770323d0cfa547da2f007dc097327962d80d0a9a96a2f119bac0bb4aa4d7f4 SHA512 58b33e921866a3db7dfa464514f935f7c615ae3463b852d888e9d221256e91efaa7639001781999bdf68619a725a90de06300973f9e635c7974e8c48729705dc
 DIST cairocffi-1.6.1.tar.gz 87436 BLAKE2B 54f7f3db31ab52aac6ebce1c830c4c0ff2f5ffde1f6a803bf8453b0ab3307414732c2e43b5b931ff77c9cbf6fe3229150e49254f13891f5e75e88eeef73970b9 SHA512 5489263b7e7e2aca7291860a90a6339d35e819cc03a9add47cd21b4ec0cb0274445c3e852ee3be127c42d8b5d9fcb98b02ff7eb66e3d9d243bd33527ce6ddf5c
-EBUILD cairocffi-1.5.1.ebuild 1092 BLAKE2B f3d3c77da2828884f5b5a4490bff9ac73a1d203c019c6788e546ea3274a2f97e7b2ca27c4fccccf3afd433cb7ee8092168b97fa0da5df92182e99b8215882a8e SHA512 c6524d919c9d2ed6c2f3063bd21223085279ff5760ae1de4430eedc91720456d330143204780ae797352552211bf7c033a2546288ed36bfcfe4bf9dc57b83a0b
 EBUILD cairocffi-1.6.1.ebuild 1046 BLAKE2B 11119c6802b6a9cfee6a2778617f04f0dee5836d103c820fafe9fc935a8eab28644261c08b43cce8f59558940ab27f52c18bee779e2cdc170ba4f05066215cc8 SHA512 7ede3636330afc674b7d965e267d70554103eba22611d8f66830779958881a561ec7918e91b6f85972016174504edaeb985fcf843dc7d52d7438079bd7ccc641
 MISC metadata.xml 380 BLAKE2B e489f8f463877335d35d1ccd7b04247ff92e5bddeffd36d42a4d8d45f3d48962d704c4a2701b8df91bb38182ada14e19ec6f97c58250f7a9881728cfa319ee15 SHA512 d64dde8aa97fa923c5b13f23539774ebcf02d5ea14b50e01e98c6a3e2f63316ab08a235613fe4bedfc496dd7ffacc2f6e41ea5a2fad310b341ad3ac254b2a522
diff --git a/dev-python/cairocffi/cairocffi-1.5.1.ebuild b/dev-python/cairocffi/cairocffi-1.5.1.ebuild
deleted file mode 100644
index 21adaa516af0..000000000000
--- a/dev-python/cairocffi/cairocffi-1.5.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# custom wrapper
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1 pypi virtualx
-
-DESCRIPTION="CFFI-based drop-in replacement for Pycairo"
-HOMEPAGE="
-	https://github.com/Kozea/cairocffi/
-	https://pypi.org/project/cairocffi/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-DEPEND="
-	>=dev-python/xcffib-0.3.2[${PYTHON_USEDEP}]
-	x11-libs/cairo:0=[X,xcb(+)]
-	x11-libs/gdk-pixbuf[jpeg]
-"
-RDEPEND="
-	${DEPEND}
-	$(python_gen_cond_dep '
-		>=dev-python/cffi-1.1.0:=[${PYTHON_USEDEP}]
-	' 'python*')
-"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/cffi-1.1.0:=[${PYTHON_USEDEP}]
-	' 'python*')
-	test? (
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pikepdf[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.8.0-tests.patch
-)
-
-src_test() {
-	rm -r cairocffi || die
-	virtx distutils-r1_src_test
-}
diff --git a/dev-python/pygame_sdl2/Manifest b/dev-python/pygame_sdl2/Manifest
index 5e9d8a526df4..ac2fcfca12fe 100644
--- a/dev-python/pygame_sdl2/Manifest
+++ b/dev-python/pygame_sdl2/Manifest
@@ -1,3 +1,5 @@
+DIST pygame_sdl2-2.1.0+renpy8.1.3.tar.gz 4252499 BLAKE2B b8bff6e3c96e0e8b70e2a6c83278435491a29421572054cca151deca441171ca4bb14277f5a68d32f7c839094347a78ba2dbba1a432b5bcc47fd068b30ecb9de SHA512 3754a29996aa1992748d49b3d178d18e0cefdf17a63c7181027a3210f7360ac01b3a1d90691bb9789085cb8b61331118e6db93be24ea81b2e24e77e3b0de556c
 DIST pygame_sdl2-2.1.0-for-renpy-8.0.3.tar.gz 4053740 BLAKE2B 607e9c587734a5d53f25ff7537b308eade273f97065e81166bbace9ca255adfda0bef23f05d9fcb370c96d7eeb6175a6b649b0b07727b027ed2b43506dc876c6 SHA512 135779d4de6e2bc8ade069c11d521dd0dc2bebae6dc63a374d478785fe7534626e9dc3c7f8f50c3291f4a60b26eb474c14e3971f0b9487215125bbcd5af6782c
 EBUILD pygame_sdl2-8.0.3.ebuild 1107 BLAKE2B e05af36deba48b284525711ceb3890eb1ef33160816cb0abefade84aafa19d3f75479bdaabc7c11729cc08d7c1e0124d8d3719a301cd178a472fe43449ec4265 SHA512 1dd3d201a9b74125f652408bd4ec68e414658410755eba6a07916b01e4e3a2056256026d6584d1c7b9ee292f737b98723c7387ae70c0114d39c4cf2419e69c5f
+EBUILD pygame_sdl2-8.1.3.ebuild 1144 BLAKE2B d080d441cccbbcad6281f5573147ad6fb25c0c8cef3c2185dd2929d3a47291877bd6f460f5f39bea4034250e35294d5795ed5d1e7b522f736fae0723b108fe72 SHA512 4f8547afbc65a78ced3841d853ae9625ddf5a46e69f9a8c0fc7adb9004346f7f4c0fd565d4f93dc8d2ba08fe298d2d49dbc4b3ef63767797200c3f646819df7d
 MISC metadata.xml 382 BLAKE2B 0456a0211bf9f5497ae588dcb47ed34d99f08b7600d135a4591e10c8ce8a7349c816c53ea4e800070afd065821aabf22a70e7482402947f2d1801c3250d62d12 SHA512 dd3d1bfe08a30dedf0da22a02e2a3f3e8d38ebd59b2c122b26486b6891ac7459a06368fc55bbce6b243880367110b1b908bd796a17feededf3b1d8b4c9363278
diff --git a/dev-python/pygame_sdl2/pygame_sdl2-8.1.3.ebuild b/dev-python/pygame_sdl2/pygame_sdl2-8.1.3.ebuild
new file mode 100644
index 000000000000..8c53c2e38c8d
--- /dev/null
+++ b/dev-python/pygame_sdl2/pygame_sdl2-8.1.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_EXT=1
+PYTHON_COMPAT=( python3_{10..11} )
+inherit distutils-r1
+
+MY_P="${PN}-2.1.0+renpy${PV}"
+
+DESCRIPTION="Reimplementation of portions of the pygame API using SDL2"
+HOMEPAGE="https://github.com/renpy/pygame_sdl2"
+SRC_URI="https://www.renpy.org/dl/${PV}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="LGPL-2.1 ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# <wheel-0.41.0 wasn't installing headers correctly
+# https://github.com/pypa/setuptools/issues/3997
+# <cython-3 for bug #911781
+BDEPEND="
+	<dev-python/cython-3[${PYTHON_USEDEP}]
+	>=dev-python/wheel-0.41.0
+"
+DEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:0=
+	media-libs/libsdl2:=[video]
+	media-libs/sdl2-image:=[png,jpeg]
+	>=media-libs/sdl2-mixer-2.0.2:=
+	media-libs/sdl2-ttf:=
+"
+RDEPEND="${DEPEND}"
+
+python_prepare_all() {
+	# PyGame distribution for this version has some pregenerated files;
+	# we need to remove them
+	rm -r gen{,3,-static} || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/xcffib/Manifest b/dev-python/xcffib/Manifest
index 69dbddd3f851..0e0fea64a738 100644
--- a/dev-python/xcffib/Manifest
+++ b/dev-python/xcffib/Manifest
@@ -1,5 +1,3 @@
-DIST xcffib-1.3.0.tar.gz 89874 BLAKE2B 5dd8d64b906d92cb987ee4398da668d6034faf4abc24a56c0fca3e5b6d0cd1252ea1459736a9f7fb83ee97d4d6cec5d103eb19aba626a3d646f67e6332e255a5 SHA512 a493f86891158ffa0c36168da5e7ebdeadafe5e9f067e2ad6052cf302c89db612f907b5e9950748fcfd74886b808870986529902bae77fede7e27d5d422d6ec6
 DIST xcffib-1.5.0.tar.gz 89544 BLAKE2B cb3820a53eb7694078e5dbb175951b6dbdc445c06f397898e52319fd8a7633f2d8115f0d096a14b2b3de0c7b07918343d077705814574ff41de2bf06a12812c0 SHA512 aaa426b57d0d8dc45cb6a2036c862af6308fb5781667b8dba3f5ff399fe5e15912860d0bb696ac09f1efd4ffbbdaf7f555ef76039bd660f36f5c6179535b654f
-EBUILD xcffib-1.3.0-r1.ebuild 772 BLAKE2B 5d5f0da6c63fe87db6ade3da4edb04da956220833bee818e3da482cf69a192529308e788df5d29adc3c72b59f0d4ebe9b113a54f8330607f8f04c30730ab2fe1 SHA512 640d87572534d62e5aa989eeaf1bfd4161da0329ebfa3c1c9cdbbe215b522c9f3f09b42088170722b895a33f761dff941f89d0d610fd2d5be7e20835357c49b5
 EBUILD xcffib-1.5.0.ebuild 772 BLAKE2B 5d5f0da6c63fe87db6ade3da4edb04da956220833bee818e3da482cf69a192529308e788df5d29adc3c72b59f0d4ebe9b113a54f8330607f8f04c30730ab2fe1 SHA512 640d87572534d62e5aa989eeaf1bfd4161da0329ebfa3c1c9cdbbe215b522c9f3f09b42088170722b895a33f761dff941f89d0d610fd2d5be7e20835357c49b5
 MISC metadata.xml 374 BLAKE2B 7f2845d0839dff2568de08f86ce6b8387e76ff450467e14b5c291ad1f55256cb9eff1ff318973e54846ad394b56a3e1e6aa8574fcc0bc39a1c9f7d3b42a1109d SHA512 9403d3d706b5281d6abe2d2fca33b1a70983c7c205f8a5899ad0469fe9a1cd0ceb6c9b27916e1e152467d029d86fc9e6dc28f967bc108499ed901582ad1bbd00
diff --git a/dev-python/xcffib/xcffib-1.3.0-r1.ebuild b/dev-python/xcffib/xcffib-1.3.0-r1.ebuild
deleted file mode 100644
index 0d55d90c6c0c..000000000000
--- a/dev-python/xcffib/xcffib-1.3.0-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A drop in replacement for xpyb, an XCB python binding"
-HOMEPAGE="
-	https://github.com/tych0/xcffib/
-	https://pypi.org/project/xcffib/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-
-DEPEND="
-	x11-libs/libxcb
-"
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]
-	' 'python*')
-	${DEPEND}
-"
-BDEPEND="
-	test? (
-		x11-base/xorg-server[xvfb]
-		x11-apps/xeyes
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	rm -rf xcffib || die
-	epytest
-}