From 626aaf58c27cbb102f52688f36106f6794e5b071 Mon Sep 17 00:00:00 2001 From: "Liguros - Gitlab CI/CD [develop]" Date: Thu, 22 Aug 2024 17:44:22 +0000 Subject: Adding metadata --- dev-python/clang-python/Manifest | 1 + .../clang-python-20.0.0_pre20240822.ebuild | 53 ++++++ dev-python/langdetect/Manifest | 2 + .../files/langdetect-1.0.9-explicit-config.patch | 13 -- dev-python/langdetect/langdetect-1.0.9.ebuild | 4 +- dev-python/langdetect/metadata.xml | 10 +- dev-python/lit/Manifest | 1 + dev-python/lit/lit-20.0.0_pre20240822.ebuild | 45 +++++ dev-python/pygame_sdl2/Manifest | 1 - .../files/pygame_sdl2-8.2.3-cython-3.patch | 204 --------------------- dev-python/pygame_sdl2/metadata.xml | 10 - dev-python/pygame_sdl2/pygame_sdl2-8.2.3.ebuild | 47 ----- dev-python/uv/Manifest | 4 + dev-python/uv/files/uv-0.3.1-test.patch | 43 +++++ dev-python/uv/uv-0.3.1.ebuild | 116 ++++++++++++ 15 files changed, 272 insertions(+), 282 deletions(-) create mode 100644 dev-python/clang-python/clang-python-20.0.0_pre20240822.ebuild delete mode 100644 dev-python/langdetect/files/langdetect-1.0.9-explicit-config.patch create mode 100644 dev-python/lit/lit-20.0.0_pre20240822.ebuild delete mode 100644 dev-python/pygame_sdl2/Manifest delete mode 100644 dev-python/pygame_sdl2/files/pygame_sdl2-8.2.3-cython-3.patch delete mode 100644 dev-python/pygame_sdl2/metadata.xml delete mode 100644 dev-python/pygame_sdl2/pygame_sdl2-8.2.3.ebuild create mode 100644 dev-python/uv/files/uv-0.3.1-test.patch create mode 100644 dev-python/uv/uv-0.3.1.ebuild (limited to 'dev-python') diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest index b26d3b2910dd..b2c074c06376 100644 --- a/dev-python/clang-python/Manifest +++ b/dev-python/clang-python/Manifest @@ -10,5 +10,6 @@ DIST llvm-project-19.1.0-rc2.src.tar.xz 141264388 BLAKE2B 690b4912d9e4a8019b7990 DIST llvm-project-19.1.0-rc2.src.tar.xz.sig 438 BLAKE2B 1eaf10a1419ecf009c033a8f6ecb6eec86107d81621d5b4665c8d929b05f4845ce0c432017343d7b06f33e6ff6384df9e1d8fc7b9c6efe7f10ef69798891b7e5 SHA512 b46e9a1d40f891c5f3544d8cc6295900bff5dda9a4a526b8db55a42a37ae90deb216b316d2117984e82f4e918d15343e75b3b9e6d6c773866707c3398e032826 DIST llvm-project-19.1.0-rc3.src.tar.xz 141250388 BLAKE2B 6530bede000d2e4b8ce10b445bfc1f81dc25c2d7121fc953581cd9b6989b3ba197707cd79d3c7b94c055bf2e21b0d07ab3cb401d3f73d22eefba6da4b71dca7b SHA512 3ee4eab848e5e38c396e6f5addf5eb42570d451fc8e7cd77150dc5542f8f710f4a9db51836f7a799996dd1b8194defe4d58efe7c19e5d5e1c5f3dbdda94c0cf3 DIST llvm-project-19.1.0-rc3.src.tar.xz.sig 438 BLAKE2B 86bad4d4fb805340096473bc603d7a3483f030f62b6f52b64d12c33561fbbb999c2ab69cc94857a32747492c846a5ab631a84da200b03475fd401335373bbccf SHA512 ef0fd2e3e7069fbfd410cbcf71294d1b7182456330ff151348058b5cb0f292edaecb9dcbf613ee4fc979214a23bd3bb8077d71e674635359da36b938dc143266 +DIST llvm-project-503907dc505db1e439e7061113bf84dd105f2e35.tar.gz 218750576 BLAKE2B 40904dbf62cffe9cb757cc1382a765d5c89791948e86bfa4fbdc5a78ebc11cc82588bc730e6c5c84b6d84922cd32290df0146733a013ffa4e408b8a7c2313a1f SHA512 a121cca2ef49c6b25f137e66d23d332d2f9e3bd0d349b1202b6869f7c85a141aecfe20a6c4d4eff84e32a243216740f20114968589207d39df229daf6443ba0d DIST llvm-project-db8ef6188cbbe2125e6d60bdef77a535105772df.tar.gz 218416682 BLAKE2B 691e3881e4a60c008c6b766b51ecc856122de1f40242ff1d91ebaa12682fea0a22f84783eb930c42d196f50ba0d3b2010f9010ed73ee7e292fe78c93d6e3f324 SHA512 2dc16a603b60607cc3daee2de0126a567a78c4fff72b2fbcb94c82472bc5ec64ac354ba8592b9a643248a5bfd43b34e2a60f2751a0c9e9e28b7f895fc50a5e9d DIST llvm-project-fd7d7882e7fa5a38d4bfde426120d4663718beb4.tar.gz 218217769 BLAKE2B a6c2aa012c342e31527b7e9f85e8fea3549d52530d8f87cd699e094a0aa768d099f9fd2631161ff7f53b4a5011937ed6d1f52b8fa1d23aa34183be1f487d4277 SHA512 c4863fab1a3c03f7f9c42f3501d3a75cebb491343515d77d30b26e5cbd720fc3fd628052099d87ed638e8c424bcbe7a1d066ed857f73da6f243d3d5a76b0e6c5 diff --git a/dev-python/clang-python/clang-python-20.0.0_pre20240822.ebuild b/dev-python/clang-python/clang-python-20.0.0_pre20240822.ebuild new file mode 100644 index 000000000000..82c18f7c0f95 --- /dev/null +++ b/dev-python/clang-python/clang-python-20.0.0_pre20240822.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8,9,10,11,12} ) +inherit llvm.org python-r1 + +DESCRIPTION="Python bindings for sys-devel/clang" +HOMEPAGE="https://llvm.org/" + +LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" +SLOT="0" +IUSE="test" +RESTRICT="!test? ( test )" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +# The module is opening libclang.so directly, and doing some blasphemy +# on top of it. +DEPEND=" + >=sys-devel/clang-${PV}:* + !sys-devel/llvm:0[clang(-),python(-)] + !sys-devel/clang:0[python(-)] +" +RDEPEND=" + ${DEPEND} + ${PYTHON_DEPS} +" +BDEPEND=" + ${PYTHON_DEPS} + test? ( + sys-devel/clang:${LLVM_MAJOR} + ) +" + +LLVM_COMPONENTS=( clang/bindings/python ) +llvm.org_set_globals + +python_test() { + # tests rely on results from a specific clang version, so override + # the search path + local -x CLANG_LIBRARY_PATH=${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir) + local -x CLANG_NO_DEFAULT_CONFIG=1 + "${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}" +} + +src_test() { + python_foreach_impl python_test +} + +src_install() { + python_foreach_impl python_domodule clang +} diff --git a/dev-python/langdetect/Manifest b/dev-python/langdetect/Manifest index a11d7c268c91..37a64204a00a 100644 --- a/dev-python/langdetect/Manifest +++ b/dev-python/langdetect/Manifest @@ -1 +1,3 @@ DIST langdetect-1.0.9.tar.gz 981474 BLAKE2B ea8a9c3f16a2987c080742473bff4f2c1503f53fb3c2b40b0b1d6212bb6133ea22dce7864ffcfb8968c3a46b157d45cb3e2cf6f84bdbed0266cc716a853b032c SHA512 7558d674c47b080c79e43a00a25d2c7f77188cf60bea2cecb3bebb803d75e1aa42b43c74bd26ea1b541f4cb927421908882cbec01a91f0913984217e71ccc8db +EBUILD langdetect-1.0.9.ebuild 494 BLAKE2B 9b3521c5721afa49a58e0c35267f7d82bb56bd7e1d6d3152be0d36cd220180a526cb20b90b1113fbf0fff4a512137570f0b3bcf864498b7b7cc00403cb61ca27 SHA512 16d311400bf84a5f04e15f3da4b68b2810e4b005009f4d03dc8a487176dfc294403c976c412c83dcfa8084a49ef7b7d5389b43fb2ba446ce107ce4595e3558c6 +MISC metadata.xml 457 BLAKE2B 630128a3e982b6d60cc7b9f74c79fcb5ee47a71a02c73a50af9da8cedb6fad8e20a7f74b881e5b25c6483b92c9edbd56552cd38b2d9cbfa8b3eb4530facea969 SHA512 674f4f5cd809c6c77bc14e0f5687fa972bef14bdfa0b3343c5d66b7163eef1906eb87d060c8288732f825de71dce291ad0b841a5f2f0dd230f957b5687e45d45 diff --git a/dev-python/langdetect/files/langdetect-1.0.9-explicit-config.patch b/dev-python/langdetect/files/langdetect-1.0.9-explicit-config.patch deleted file mode 100644 index 637368d2f237..000000000000 --- a/dev-python/langdetect/files/langdetect-1.0.9-explicit-config.patch +++ /dev/null @@ -1,13 +0,0 @@ -Fix "Package 'langdetect.profiles' is absent from the `packages` configuration." - ---- a/setup.py -+++ b/setup.py -@@ -18,7 +18,7 @@ setup( - author_email='michal.danilak@gmail.com', - url='https://github.com/Mimino666/langdetect', - keywords='language detection library', -- packages=['langdetect', 'langdetect.utils', 'langdetect.tests'], -+ packages=['langdetect', 'langdetect.utils', 'langdetect.tests', 'langdetect.profiles'], - include_package_data=True, - install_requires=['six'], - license='MIT', diff --git a/dev-python/langdetect/langdetect-1.0.9.ebuild b/dev-python/langdetect/langdetect-1.0.9.ebuild index 630fe63c6f53..c09b7356f549 100644 --- a/dev-python/langdetect/langdetect-1.0.9.ebuild +++ b/dev-python/langdetect/langdetect-1.0.9.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022-2024 Gentoo Authors +# Copyright 2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -19,6 +19,4 @@ KEYWORDS="~amd64" RDEPEND="dev-python/six[${PYTHON_USEDEP}]" -PATCHES=( "${FILESDIR}/${P}-explicit-config.patch" ) - distutils_enable_tests unittest diff --git a/dev-python/langdetect/metadata.xml b/dev-python/langdetect/metadata.xml index c0f74ac187e2..020e07f2a3dd 100644 --- a/dev-python/langdetect/metadata.xml +++ b/dev-python/langdetect/metadata.xml @@ -2,9 +2,11 @@ - pastalian46@gmail.com - Takuya Wakazono + marcin.deranek@slonko.net + Marcin Deranek - - gentoo-guru-overlay + + https://github.com/Mimino666/langdetect/issues + + slonko-overlay \ No newline at end of file diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest index b26d3b2910dd..b2c074c06376 100644 --- a/dev-python/lit/Manifest +++ b/dev-python/lit/Manifest @@ -10,5 +10,6 @@ DIST llvm-project-19.1.0-rc2.src.tar.xz 141264388 BLAKE2B 690b4912d9e4a8019b7990 DIST llvm-project-19.1.0-rc2.src.tar.xz.sig 438 BLAKE2B 1eaf10a1419ecf009c033a8f6ecb6eec86107d81621d5b4665c8d929b05f4845ce0c432017343d7b06f33e6ff6384df9e1d8fc7b9c6efe7f10ef69798891b7e5 SHA512 b46e9a1d40f891c5f3544d8cc6295900bff5dda9a4a526b8db55a42a37ae90deb216b316d2117984e82f4e918d15343e75b3b9e6d6c773866707c3398e032826 DIST llvm-project-19.1.0-rc3.src.tar.xz 141250388 BLAKE2B 6530bede000d2e4b8ce10b445bfc1f81dc25c2d7121fc953581cd9b6989b3ba197707cd79d3c7b94c055bf2e21b0d07ab3cb401d3f73d22eefba6da4b71dca7b SHA512 3ee4eab848e5e38c396e6f5addf5eb42570d451fc8e7cd77150dc5542f8f710f4a9db51836f7a799996dd1b8194defe4d58efe7c19e5d5e1c5f3dbdda94c0cf3 DIST llvm-project-19.1.0-rc3.src.tar.xz.sig 438 BLAKE2B 86bad4d4fb805340096473bc603d7a3483f030f62b6f52b64d12c33561fbbb999c2ab69cc94857a32747492c846a5ab631a84da200b03475fd401335373bbccf SHA512 ef0fd2e3e7069fbfd410cbcf71294d1b7182456330ff151348058b5cb0f292edaecb9dcbf613ee4fc979214a23bd3bb8077d71e674635359da36b938dc143266 +DIST llvm-project-503907dc505db1e439e7061113bf84dd105f2e35.tar.gz 218750576 BLAKE2B 40904dbf62cffe9cb757cc1382a765d5c89791948e86bfa4fbdc5a78ebc11cc82588bc730e6c5c84b6d84922cd32290df0146733a013ffa4e408b8a7c2313a1f SHA512 a121cca2ef49c6b25f137e66d23d332d2f9e3bd0d349b1202b6869f7c85a141aecfe20a6c4d4eff84e32a243216740f20114968589207d39df229daf6443ba0d DIST llvm-project-db8ef6188cbbe2125e6d60bdef77a535105772df.tar.gz 218416682 BLAKE2B 691e3881e4a60c008c6b766b51ecc856122de1f40242ff1d91ebaa12682fea0a22f84783eb930c42d196f50ba0d3b2010f9010ed73ee7e292fe78c93d6e3f324 SHA512 2dc16a603b60607cc3daee2de0126a567a78c4fff72b2fbcb94c82472bc5ec64ac354ba8592b9a643248a5bfd43b34e2a60f2751a0c9e9e28b7f895fc50a5e9d DIST llvm-project-fd7d7882e7fa5a38d4bfde426120d4663718beb4.tar.gz 218217769 BLAKE2B a6c2aa012c342e31527b7e9f85e8fea3549d52530d8f87cd699e094a0aa768d099f9fd2631161ff7f53b4a5011937ed6d1f52b8fa1d23aa34183be1f487d4277 SHA512 c4863fab1a3c03f7f9c42f3501d3a75cebb491343515d77d30b26e5cbd720fc3fd628052099d87ed638e8c424bcbe7a1d066ed857f73da6f243d3d5a76b0e6c5 diff --git a/dev-python/lit/lit-20.0.0_pre20240822.ebuild b/dev-python/lit/lit-20.0.0_pre20240822.ebuild new file mode 100644 index 000000000000..5ed5b5bd096e --- /dev/null +++ b/dev-python/lit/lit-20.0.0_pre20240822.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{8,9,10,11,12} ) + +inherit distutils-r1 llvm.org + +DESCRIPTION="A stand-alone install of the LLVM suite testing tool" +HOMEPAGE="https://llvm.org/" + +LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" +SLOT="0" +IUSE="test" +RESTRICT="!test? ( test )" + +# Tests require 'FileCheck' and 'not' utilities (from llvm) +BDEPEND=" + test? ( + dev-python/psutil[${PYTHON_USEDEP}] + sys-devel/llvm + ) +" + +LLVM_COMPONENTS=( llvm/utils/lit ) +llvm.org_set_globals + +# TODO: move the manpage generation here (from sys-devel/llvm) + +src_prepare() { + # flaky test + # https://github.com/llvm/llvm-project/issues/72022 + rm tests/progress-bar.py || die + + cd "${WORKDIR}" || die + distutils-r1_src_prepare +} + +python_test() { + local -x LIT_PRESERVES_TMP=1 + local litflags=$(get_lit_flags) + ./lit.py ${litflags//;/ } tests || die +} diff --git a/dev-python/pygame_sdl2/Manifest b/dev-python/pygame_sdl2/Manifest deleted file mode 100644 index 5ed7217741c1..000000000000 --- a/dev-python/pygame_sdl2/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST pygame_sdl2-2.1.0+renpy8.2.3.tar.gz 4270114 BLAKE2B ae70253fc717334e65c438d36bd2991c909ee64c6b47f9c175fd53c1567ea54d2a42ea65cda85560387e744ff792b34658d393f3018d2941e5111efba064236a SHA512 9b3ae71a648511f243d235ba5e81661dde5d0871a4517494f2789c20f95e110305e42bdb635308165cf3985d1096b296a16140c03cbd446db17997c05025b8e3 diff --git a/dev-python/pygame_sdl2/files/pygame_sdl2-8.2.3-cython-3.patch b/dev-python/pygame_sdl2/files/pygame_sdl2-8.2.3-cython-3.patch deleted file mode 100644 index 2011eadfbffb..000000000000 --- a/dev-python/pygame_sdl2/files/pygame_sdl2-8.2.3-cython-3.patch +++ /dev/null @@ -1,204 +0,0 @@ -diff '--color=auto' -Naurd pygame_sdl2-2.1.0+renpy8.2.3.orig/src/pygame_sdl2/mixer_music.pyx pygame_sdl2-2.1.0+renpy8.2.3/src/pygame_sdl2/mixer_music.pyx ---- pygame_sdl2-2.1.0+renpy8.2.3.orig/src/pygame_sdl2/mixer_music.pyx 2015-04-04 18:05:58.000000000 +0300 -+++ pygame_sdl2-2.1.0+renpy8.2.3/src/pygame_sdl2/mixer_music.pyx 2024-08-20 23:31:04.313616957 +0300 -@@ -27,7 +27,7 @@ - cdef object queued_music = None - cdef int endevent = 0 - --cdef void music_finished(): -+cdef void music_finished() noexcept: - global queued_music - if queued_music: - load(queued_music) -diff '--color=auto' -Naurd pygame_sdl2-2.1.0+renpy8.2.3.orig/src/pygame_sdl2/mixer.pyx pygame_sdl2-2.1.0+renpy8.2.3/src/pygame_sdl2/mixer.pyx ---- pygame_sdl2-2.1.0+renpy8.2.3.orig/src/pygame_sdl2/mixer.pyx 2019-04-03 08:15:40.000000000 +0300 -+++ pygame_sdl2-2.1.0+renpy8.2.3/src/pygame_sdl2/mixer.pyx 2024-08-20 23:27:49.115394156 +0300 -@@ -57,7 +57,7 @@ - Mix_PlayChannelTimed(channel, next_sound.chunk, 0, -1) - - --cdef void channel_callback(int channel) with gil: -+cdef void channel_callback(int channel) noexcept with gil: - - cdef int etype = 0 - cdef SDL_Event e -diff '--color=auto' -Naurd pygame_sdl2-2.1.0+renpy8.2.3.orig/src/pygame_sdl2/rwobject.pyx pygame_sdl2-2.1.0+renpy8.2.3/src/pygame_sdl2/rwobject.pyx ---- pygame_sdl2-2.1.0+renpy8.2.3.orig/src/pygame_sdl2/rwobject.pyx 2024-01-29 06:06:06.000000000 +0300 -+++ pygame_sdl2-2.1.0+renpy8.2.3/src/pygame_sdl2/rwobject.pyx 2024-08-20 23:22:53.081539270 +0300 -@@ -63,7 +63,7 @@ - msg = e - SDL_SetError("%s", msg) - --cdef Sint64 python_size(SDL_RWops *context) with gil: -+cdef Sint64 python_size(SDL_RWops *context) noexcept with gil: - f = context.hidden.unknown.data1 - - try: -@@ -76,7 +76,7 @@ - - return rv - --cdef Sint64 python_seek(SDL_RWops *context, Sint64 seek, int whence) with gil: -+cdef Sint64 python_seek(SDL_RWops *context, Sint64 seek, int whence) noexcept with gil: - f = context.hidden.unknown.data1 - - try: -@@ -88,7 +88,7 @@ - - return rv - --cdef size_t python_read(SDL_RWops *context, void *ptr, size_t size, size_t maxnum) with gil: -+cdef size_t python_read(SDL_RWops *context, void *ptr, size_t size, size_t maxnum) noexcept with gil: - f = context.hidden.unknown.data1 - - try: -@@ -100,7 +100,7 @@ - memcpy(ptr, data, len(data)) - return len(data) - --cdef size_t python_write(SDL_RWops *context, const void *ptr, size_t size, size_t maxnum) with gil: -+cdef size_t python_write(SDL_RWops *context, const void *ptr, size_t size, size_t maxnum) noexcept with gil: - f = context.hidden.unknown.data1 - data = ( ptr)[:size * maxnum] - -@@ -112,7 +112,7 @@ - - return len(data) - --cdef int python_close(SDL_RWops *context) with gil: -+cdef int python_close(SDL_RWops *context) noexcept with gil: - if context != NULL: - if context.hidden.unknown.data1 != NULL: - f = context.hidden.unknown.data1 -@@ -135,11 +135,11 @@ - Sint64 length - Sint64 tell - --cdef Sint64 subfile_size(SDL_RWops *context) nogil: -+cdef Sint64 subfile_size(SDL_RWops *context) noexcept nogil: - cdef SubFile *sf = context.hidden.unknown.data1 - return sf.length - --cdef Sint64 subfile_seek(SDL_RWops *context, Sint64 seek, int whence) nogil: -+cdef Sint64 subfile_seek(SDL_RWops *context, Sint64 seek, int whence) noexcept nogil: - cdef SubFile *sf = context.hidden.unknown.data1 - - if whence == RW_SEEK_SET: -@@ -151,7 +151,7 @@ - - return sf.tell - --cdef size_t subfile_read(SDL_RWops *context, void *ptr, size_t size, size_t maxnum) nogil: -+cdef size_t subfile_read(SDL_RWops *context, void *ptr, size_t size, size_t maxnum) noexcept nogil: - cdef SubFile *sf = context.hidden.unknown.data1 - - cdef Sint64 left = sf.length - sf.tell -@@ -170,7 +170,7 @@ - - return rv - --cdef int subfile_close(SDL_RWops *context) nogil: -+cdef int subfile_close(SDL_RWops *context) noexcept nogil: - cdef SubFile *sf - - if context != NULL: -@@ -191,13 +191,13 @@ - Sint64 split - Sint64 tell - --cdef Sint64 splitfile_size(SDL_RWops *context) nogil: -+cdef Sint64 splitfile_size(SDL_RWops *context) noexcept nogil: - cdef SplitFile *sf = context.hidden.unknown.data1 - cdef Sint64 rv - - return SDL_RWsize(sf.a) + SDL_RWsize(sf.b) - --cdef Sint64 splitfile_seek(SDL_RWops *context, Sint64 seek, int whence) nogil: -+cdef Sint64 splitfile_seek(SDL_RWops *context, Sint64 seek, int whence) noexcept nogil: - cdef SplitFile *sf = context.hidden.unknown.data1 - cdef Sint64 rv - -@@ -220,7 +220,7 @@ - else: - return sf.tell - --cdef size_t splitfile_read(SDL_RWops *context, void *ptr, size_t size, size_t maxnum) nogil: -+cdef size_t splitfile_read(SDL_RWops *context, void *ptr, size_t size, size_t maxnum) noexcept nogil: - cdef SplitFile *sf = context.hidden.unknown.data1 - cdef Sint64 left = splitfile_size(context) - sf.tell - cdef size_t rv -@@ -251,7 +251,7 @@ - - return (left_read + right_read) // size - --cdef int splitfile_close(SDL_RWops *context) nogil: -+cdef int splitfile_close(SDL_RWops *context) noexcept nogil: - cdef SplitFile *sf - - if context != NULL: -@@ -274,12 +274,12 @@ - Uint8 *here - Uint8 *stop - --cdef Sint64 buffile_size(SDL_RWops *context) nogil: -+cdef Sint64 buffile_size(SDL_RWops *context) noexcept nogil: - cdef BufFile *bf = context.hidden.unknown.data1 - - return bf.stop - bf.base - --cdef Sint64 buffile_seek(SDL_RWops *context, Sint64 offset, int whence) nogil: -+cdef Sint64 buffile_seek(SDL_RWops *context, Sint64 offset, int whence) noexcept nogil: - cdef BufFile *bf = context.hidden.unknown.data1 - - cdef Uint8 *newpos -@@ -302,7 +302,7 @@ - - return bf.here - bf.base - --cdef size_t buffile_read(SDL_RWops *context, void *ptr, size_t size, size_t maxnum) nogil: -+cdef size_t buffile_read(SDL_RWops *context, void *ptr, size_t size, size_t maxnum) noexcept nogil: - cdef BufFile *bf = context.hidden.unknown.data1 - cdef size_t total_bytes = 0 - cdef size_t mem_available = 0 -@@ -320,7 +320,7 @@ - - return (total_bytes // size) - --cdef size_t buffile_write(SDL_RWops *context, const void *ptr, size_t size, size_t num) nogil: -+cdef size_t buffile_write(SDL_RWops *context, const void *ptr, size_t size, size_t num) noexcept nogil: - cdef BufFile *bf = context.hidden.unknown.data1 - - if bf.view.readonly != 0: -@@ -333,7 +333,7 @@ - - return num - --cdef int buffile_close(SDL_RWops *context) with gil: -+cdef int buffile_close(SDL_RWops *context) noexcept with gil: - cdef BufFile *bf - - if context != NULL: -diff '--color=auto' -Naurd pygame_sdl2-2.1.0+renpy8.2.3.orig/src/pygame_sdl2/surface.pyx pygame_sdl2-2.1.0+renpy8.2.3/src/pygame_sdl2/surface.pyx ---- pygame_sdl2-2.1.0+renpy8.2.3.orig/src/pygame_sdl2/surface.pyx 2023-03-30 06:10:16.000000000 +0300 -+++ pygame_sdl2-2.1.0+renpy8.2.3/src/pygame_sdl2/surface.pyx 2024-08-20 23:23:41.720844257 +0300 -@@ -34,7 +34,7 @@ - int pygame_Blit (SDL_Surface * src, SDL_Rect * srcrect, - SDL_Surface * dst, SDL_Rect * dstrect, int the_args); - --cdef void move_pixels(Uint8 *src, Uint8 *dst, int h, int span, int srcpitch, int dstpitch) nogil: -+cdef void move_pixels(Uint8 *src, Uint8 *dst, int h, int span, int srcpitch, int dstpitch) noexcept nogil: - if src < dst: - src += (h - 1) * srcpitch; - dst += (h - 1) * dstpitch; -diff '--color=auto' -Naurd pygame_sdl2-2.1.0+renpy8.2.3.orig/src/pygame_sdl2/transform.pyx pygame_sdl2-2.1.0+renpy8.2.3/src/pygame_sdl2/transform.pyx ---- pygame_sdl2-2.1.0+renpy8.2.3.orig/src/pygame_sdl2/transform.pyx 2015-08-13 03:31:25.000000000 +0300 -+++ pygame_sdl2-2.1.0+renpy8.2.3/src/pygame_sdl2/transform.pyx 2024-08-20 23:24:30.513150042 +0300 -@@ -119,7 +119,7 @@ - p += x - return p[0] - --cdef void set_at(SDL_Surface *surf, int x, int y, uint32_t color) nogil: -+cdef void set_at(SDL_Surface *surf, int x, int y, uint32_t color) noexcept nogil: - cdef uint32_t *p = surf.pixels - p += y * (surf.pitch // sizeof(uint32_t)) - p += x diff --git a/dev-python/pygame_sdl2/metadata.xml b/dev-python/pygame_sdl2/metadata.xml deleted file mode 100644 index b31b0d62e9a9..000000000000 --- a/dev-python/pygame_sdl2/metadata.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - bircoph@gentoo.org - Andrew Savchenko - - - gentoo-staging - \ No newline at end of file diff --git a/dev-python/pygame_sdl2/pygame_sdl2-8.2.3.ebuild b/dev-python/pygame_sdl2/pygame_sdl2-8.2.3.ebuild deleted file mode 100644 index 307c62ca978b..000000000000 --- a/dev-python/pygame_sdl2/pygame_sdl2-8.2.3.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2024 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_{8,9,10,11,12} ) -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" - -PATCHES=( "${FILESDIR}/${PN}-8.2.3-cython-3.patch" ) - -# +Date: Thu, 22 Aug 2024 07:34:21 +0200 +Subject: [PATCH] Mark emit_marker_expression* tests as requiring python-patch + +Mark the new tests requiring Python 3.12.1 specifically as requiring +python-patch feature. This makes the test suite pass again on systems +not having this specific version (and disabling the feature). +--- + crates/uv/tests/pip_compile.rs | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/crates/uv/tests/pip_compile.rs b/crates/uv/tests/pip_compile.rs +index 7b6af57dbd44..ef87fbc5cafc 100644 +--- a/crates/uv/tests/pip_compile.rs ++++ b/crates/uv/tests/pip_compile.rs +@@ -9974,7 +9974,7 @@ fn dynamic_dependencies() -> Result<()> { + /// Since this test was developed on Linux, the marker expression generated is + /// coupled with the Linux platform. Other tests for other platforms could be + /// added. +-#[cfg(target_os = "linux")] ++#[cfg(all(target_os = "linux", feature = "python-patch"))] + #[test] + fn emit_marker_expression_exciting_linux() -> Result<()> { + let context = TestContext::new("3.12.1"); +@@ -10011,7 +10011,7 @@ fn emit_marker_expression_exciting_linux() -> Result<()> { + /// + /// NOTE: This test runs on `linux` only because it requires that `sys_platform + /// == 'linux'` evaluates to `true`. +-#[cfg(target_os = "linux")] ++#[cfg(all(target_os = "linux", feature = "python-patch"))] + #[test] + fn emit_marker_expression_direct() -> Result<()> { + let context = TestContext::new("3.12.1"); +@@ -10091,7 +10091,7 @@ fn emit_marker_expression_conditional() -> Result<()> { + /// not clear why. The `tzdata` dependency appears to be an unconditional + /// dependency. And if anything, I'd expect it to be included on Windows and + /// excluded everywhere else... Odd.) +-#[cfg(target_os = "linux")] ++#[cfg(all(target_os = "linux", feature = "python-patch"))] + #[test] + fn emit_marker_expression_pypy() -> Result<()> { + let context = TestContext::new("3.12.1"); diff --git a/dev-python/uv/uv-0.3.1.ebuild b/dev-python/uv/uv-0.3.1.ebuild new file mode 100644 index 000000000000..8fbaceba01a6 --- /dev/null +++ b/dev-python/uv/uv-0.3.1.ebuild @@ -0,0 +1,116 @@ +# Copyright 2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CRATES="" + +declare -A GIT_CRATES=( + [async_zip]='https://github.com/charliermarsh/rs-async-zip;011b24604fa7bc223daaad7712c0694bac8f0a87;rs-async-zip-%commit%' + [pubgrub]='https://github.com/astral-sh/pubgrub;aaef464c1b0d8eea4ff9ffaee4f3458c236d10da;pubgrub-%commit%' + [reqwest-middleware]='https://github.com/astral-sh/reqwest-middleware;5e3eaf254b5bd481c75d2710eed055f95b756913;reqwest-middleware-%commit%/reqwest-middleware' + [reqwest-retry]='https://github.com/astral-sh/reqwest-middleware;5e3eaf254b5bd481c75d2710eed055f95b756913;reqwest-middleware-%commit%/reqwest-retry' +) + +inherit cargo check-reqs + +CRATE_PV=${PV} +DESCRIPTION="A Python package installer and resolver, written in Rust" +HOMEPAGE=" + https://github.com/astral-sh/uv/ + https://pypi.org/project/uv/ +" +# pypi sdist misses scripts/, needed for tests +SRC_URI=" + https://github.com/astral-sh/uv/archive/${PV}.tar.gz + -> ${P}.gh.tar.gz + ${CARGO_CRATE_URIS} +" +if [[ ${PKGBUMPING} != ${PVR} ]]; then + SRC_URI+=" + https://dev.gentoo.org/~mgorny/dist/uv-${CRATE_PV}-crates.tar.xz + " +fi + +# most of the code +LICENSE="|| ( Apache-2.0 MIT )" +# crates/pep508-rs is || ( Apache-2.0 BSD-2 ) which is covered below +# Dependent crate licenses +LICENSE+=" + 0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD ISC MIT + MPL-2.0 Unicode-DFS-2016 +" +# ring crate +LICENSE+=" openssl" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" +IUSE="test" +RESTRICT="test" +PROPERTIES="test_network" + +BDEPEND=" + >=virtual/rust-1.80 + test? ( + dev-lang/python:3.8 + dev-lang/python:3.9 + dev-lang/python:3.10 + dev-lang/python:3.11 + dev-lang/python:3.12 + ) +" + +QA_FLAGS_IGNORED="usr/bin/.*" + +check_space() { + local CHECKREQS_DISK_BUILD=3G + use debug && CHECKREQS_DISK_BUILD=9G + check-reqs_pkg_setup +} + +pkg_pretend() { + check_space +} + +pkg_setup() { + check_space +} + +src_prepare() { + local PATCHES=( + # https://github.com/astral-sh/uv/pull/6411 + "${FILESDIR}/${P}-test.patch" + ) + + default + + # remove patch.* that breaks GIT_CRATES + local reqmw=${GIT_CRATES[reqwest-middleware]} + reqmw=${reqmw#*;} + reqmw=${reqmw%;*} + sed -i -e "/^\[patch/,\$s@^\(reqwest-middleware = \).*@\1 { path = \"${WORKDIR}/reqwest-middleware-${reqmw}/reqwest-middleware\" }@" Cargo.toml || die + + # https://github.com/vorot93/tokio-tar/pull/23 + # (fortunately uv already depends on portable-atomic, so we don't + # have to fight Cargo.lock) + cd "${ECARGO_VENDOR}/tokio-tar-0.3.1" || die + eapply "${FILESDIR}/tokio-tar-0.3.1-ppc.patch" +} + +src_compile() { + cd crates/uv || die + cargo_src_compile +} + +src_test() { + # work around https://github.com/astral-sh/uv/issues/4376 + local -x PATH=${BROOT}/usr/lib/python-exec/python3.12:${PATH} + local -x COLUMNS=100 + + cd crates/uv || die + cargo_src_test --no-fail-fast +} + +src_install() { + cd crates/uv || die + cargo_src_install +} -- cgit v1.3