Merge updates from master

2026-07-18 11:33:15 -04:00 · 2024-04-15 09:48:26 +00:00
parent 83ec5aca4c a808136140
commit 825d3fee38
14 changed files with 127 additions and 20 deletions
--- a/dev-python/celery/celery-5.3.6.ebuild
+++ b/dev-python/celery/celery-5.3.6.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# 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_{10,11} )
+PYTHON_COMPAT=( python3_11 )

 inherit bash-completion-r1 check-reqs distutils-r1 optfeature

--- a/dev-python/hunter/hunter-3.6.1.ebuild
+++ b/dev-python/hunter/hunter-3.6.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8

 DISTUTILS_EXT=1
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{11..12} )
 DISTUTILS_USE_PEP517=setuptools

 DOCS_BUILDER="sphinx"
--- a/dev-python/mkdocs-rss-plugin/mkdocs-rss-plugin-1.12.1.ebuild
+++ b/dev-python/mkdocs-rss-plugin/mkdocs-rss-plugin-1.12.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8

 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_11 )

 DOCS_BUILDER="mkdocs"
 DOCS_DEPEND="
--- a/dev-python/pycpio/Manifest
+++ b/dev-python/pycpio/Manifest
@@ -1,3 +1,4 @@
 DIST pycpio-0.8.0.tar.gz 17988 BLAKE2B 101aa0d533e1a1b00eda7f6286a5f4c9b97248625adeeeece3377a6ef6510a6bc3f2a4e24c70a6b967e135270c3bae91419d20a2952464f22f8596cc2fefacf7 SHA512 d1c8519e1dc6e2663e55a2e9f6e8d90670cca5f47a58a8838f1ed9ec1bb7fb002db98b04b8d083475fc61b52f05e6a5a9d21435f06a6f627550b292d2eeea846
 DIST pycpio-0.8.2.tar.gz 17985 BLAKE2B 3e7e5e2ccc289c85d1a818e66a848c462225a7ec529c874d4e450e33141e8785bfd23ba5b3d24fb1c593c78188230def9fa0759d857c773dfc6941b421e66469 SHA512 1eb0e2213792c9d5c28e4377c7cb6acef4f2679830584c6efd9687912ae89268bfe265c79f42a3f786b74993ebc90290c8786353848f481a5e25fb26a43a2b81
 DIST pycpio-0.9.1.tar.gz 17815 BLAKE2B 6eed15c3ed6cc8a5d84767672b2762608efc352ac012ef6679a8b86df67e49af606f1e7ea6ecf67d51f7d9737f6a14d15bc7d14df0063e6f512bc1b72ba8f7a6 SHA512 0189f7d3b9c3eb2fdc2c2d10f0253243535d54fbc5d93efe82e9864ab70cb069f46a131edc5db5b1e1940b66d03a1a9b8d60f29a8ab5315e628d3402bcdfdb1e
+DIST pycpio-0.9.2.tar.gz 17820 BLAKE2B 738f32ab54f77f8de2cbf38b22f0eaa5321d5a26ac4c46ce05372708d93f8b8e9cd2c20b49ba74d7acf6ad0f1f1d81b35624c46be2c7b30c00b1f6df945be99d SHA512 9e4e1e798307cd7ed30bf189dc7cd647472628d39e26d26893cded62b8178659749926459ef60d99493a191dad8298a46b3ea4a5b47d7fc600fa259f05bb1f7f
--- a/dev-python/pycpio/pycpio-0.9.2.ebuild
+++ b/dev-python/pycpio/pycpio-0.9.2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{11..12} )
+inherit distutils-r1
+
+DESCRIPTION="Python CPIO library"
+HOMEPAGE="https://github.com/desultory/pycpio"
+SRC_URI="https://github.com/desultory/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=">=dev-python/zenlib-1.7.2[${PYTHON_USEDEP}]"
--- a/dev-python/pytest-benchmark/pytest-benchmark-4.0.0.ebuild
+++ b/dev-python/pytest-benchmark/pytest-benchmark-4.0.0.ebuild
@@ -3,7 +3,7 @@

 EAPI=8

-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{11..12} )
 DISTUTILS_USE_PEP517=setuptools

 DOCS_BUILDER="sphinx"
--- a/dev-python/pytest-celery/pytest-celery-0.1.0.ebuild
+++ b/dev-python/pytest-celery/pytest-celery-0.1.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8

 DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{10,11} )
+PYTHON_COMPAT=( python3_11 )
 inherit distutils-r1

 DESCRIPTION="a shim pytest plugin to enable celery.contrib.pytest"
--- a/dev-python/pytest-syrupy/pytest-syrupy-4.0.1.ebuild
+++ b/dev-python/pytest-syrupy/pytest-syrupy-4.0.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8

 DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{11..12} )

 inherit distutils-r1

--- a/dev-python/validator-collection/validator-collection-1.5.0.ebuild
+++ b/dev-python/validator-collection/validator-collection-1.5.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 2023-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8

 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_11 )

 inherit distutils-r1

--- a/games-emulation/rpcs3/files/rpcs3-0001-gui_pad_thread-add-missing-unistd-h.patch
+++ b/games-emulation/rpcs3/files/rpcs3-0001-gui_pad_thread-add-missing-unistd-h.patch
@@ -0,0 +1,29 @@
+From 5d3427acaad0084caee0051c846efe9a333e5428 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Gon=C3=A7alo=20Negrier=20Duarte?=
+ <gonegrier.duarte@gmail.com>
+Date: Sun, 14 Apr 2024 17:58:50 +0100
+Subject: [PATCH] rpcs3-gui_pad_thread-add-missing-unistd-h
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Gonçalo Negrier Duarte <gonegrier.duarte@gmail.com>
+---
+ rpcs3/Input/gui_pad_thread.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/rpcs3/Input/gui_pad_thread.cpp b/rpcs3/Input/gui_pad_thread.cpp
+index 92fb23367..e3dbae518 100644
+--- a/rpcs3/Input/gui_pad_thread.cpp
+++ b/rpcs3/Input/gui_pad_thread.cpp
+@@ -22,6 +22,7 @@
+ #ifdef __linux__
+ #include <linux/uinput.h>
+ #include <fcntl.h>
+#include <unistd.h>
+ #define CHECK_IOCTRL_RET(res) if (res == -1) { gui_log.error("gui_pad_thread: ioctl failed (errno=%d=%s)", res, strerror(errno)); }
+ #elif defined(__APPLE__)
+ #pragma GCC diagnostic push
+-- 
+2.44.0
+
--- a/games-emulation/rpcs3/rpcs3-9999.ebuild
+++ b/games-emulation/rpcs3/rpcs3-9999.ebuild
@@ -3,15 +3,37 @@

 EAPI=8

-inherit cmake flag-o-matic git-r3 xdg
+inherit cmake flag-o-matic xdg
+
+ASMJIT_COMMIT="416f7356967c1f66784dc1580fe157f9406d8bff"
+GLSLANG_COMMIT="36d08c0d940cf307a23928299ef52c7970d8cee6"
+MINIUPNP_COMMIT="f22a96b4697699d32fdc2d17c5d0ad7880a99c24"
+RTMIDI_COMMIT="1e5b49925aa60065db52de44c366d446a902547b"
+WOLFSSL_COMMIT="8970ff4c34034dbb3594943d11f8c9d4c5512bd5"
+SOUNDTOUCH_COMMIT="ced3ce8d5ecc5aef8a5156fea206a37b33774bf3"
+YAMLCPP_COMMIT="456c68f452da09d8ca84b375faa2b1397713eaba"

 DESCRIPTION="PS3 emulator/debugger"
 HOMEPAGE="https://rpcs3.net/"
-EGIT_REPO_URI="https://github.com/RPCS3/rpcs3"
-EGIT_SUBMODULES=( 'asmjit' '3rdparty/glslang' '3rdparty/miniupnp/miniupnp' '3rdparty/rtmidi/rtmidi' '3rdparty/wolfssl'
-	'3rdparty/SoundTouch/soundtouch' )
-# Delete sources when ensuring yaml-cpp compiled with fexceptions
-EGIT_SUBMODULES+=( '3rdparty/yaml-cpp' )
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/RPCS3/rpcs3"
+	EGIT_SUBMODULES=( 'asmjit' '3rdparty/glslang' '3rdparty/miniupnp/miniupnp' '3rdparty/rtmidi/rtmidi' '3rdparty/wolfssl' '3rdparty/SoundTouch/soundtouch' )
+	# Delete sources when ensuring yaml-cpp compiled with fexceptions
+	EGIT_SUBMODULES+=( '3rdparty/yaml-cpp' )
+	inherit git-r3
+else
+	SRC_URI="
+		https://github.com/RPCS3/rpcs3/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		https://github.com/asmjit/asmjit/archive/${ASMJIT_COMMIT}.tar.gz -> ${PN}-asmjit-${ASMJIT_COMMIT}.tar.gz
+		https://github.com/KhronosGroup/glslang/archive/${GLSLANG_COMMIT}.tar.gz -> ${PN}-glslang-${GLSLANG_COMMIT}.tar.gz
+		https://github.com/miniupnp/miniupnp/archive/${MINIUPNP_COMMIT}.tar.gz -> ${PN}-miniupnp-${MINIUPNP_COMMIT}.tar.gz
+		https://github.com/thestk/rtmidi/archive/${RTMIDI_COMMIT}.tar.gz -> ${PN}-rtmidi-${RTMIDI_COMMIT}.tar.gz
+		https://github.com/wolfSSL/wolfssl/archive/${WOLFSSL_COMMIT}.tar.gz -> ${PN}-wolfssl-${WOLFSSL_COMMIT}.tar.gz
+		https://github.com/RPCS3/soundtouch/archive/${SOUNDTOUCH_COMMIT}.tar.gz -> ${PN}-soundtouch-${SOUNDTOUCH_COMMIT}.tar.gz
+		https://github.com/RPCS3/yaml-cpp/archive/${YAMLCPP_COMMIT}.tar.gz -> ${PN}-yaml-cpp-${SOUNDTOUCH_COMMIT}-.tar.gz
+	"
+	KEYWORDS="~amd64"
+fi

 LICENSE="GPL-2"
 SLOT="0"
@@ -46,7 +68,42 @@ RDEPEND="${DEPEND}"
 QA_PREBUILT="usr/share/rpcs3/test/.*"
 QA_WX_LOAD="usr/share/rpcs3/test/*"

+PATCHES=(
+	"${FILESDIR}/${PN}-0001-gui_pad_thread-add-missing-unistd-h.patch"
+)
+
+
 src_prepare() {
+	if [[ ${PV} != "9999" ]]; then
+		rmdir "${S}/3rdparty/asmjit/asmjit" || die
+		mv "${WORKDIR}/asmjit-${ASMJIT_COMMIT}" "${S}/3rdparty/asmjit/asmjit" || die
+
+		rmdir "${S}/3rdparty/glslang/glslang" || die
+		mv "${WORKDIR}/glslang-${GLSLANG_COMMIT}" "${S}/3rdparty/glslang/glslang" || die
+
+		rmdir "${S}/3rdparty/miniupnp/miniupnp" || die
+		mv "${WORKDIR}/miniupnp-${MINIUPNP_COMMIT}" "${S}/3rdparty/miniupnp/miniupnp" || die
+
+		rmdir "${S}/3rdparty/rtmidi/rtmidi" || die
+		mv "${WORKDIR}/rtmidi-${RTMIDI_COMMIT}" "${S}/3rdparty/rtmidi/rtmidi" || die
+
+		rmdir "${S}/3rdparty/wolfssl/wolfssl" || die
+		mv "${WORKDIR}/wolfssl-${WOLFSSL_COMMIT}" "${S}/3rdparty/wolfssl/wolfssl" || die
+
+		rmdir "${S}/3rdparty/SoundTouch/soundtouch" || die
+		mv "${WORKDIR}/soundtouch-${SOUNDTOUCH_COMMIT}" "${S}/3rdparty/SoundTouch/soundtouch" || die
+
+		rmdir "${S}/3rdparty/yaml-cpp/yaml-cpp" || die
+		mv "${WORKDIR}/yaml-cpp-${YAMLCPP_COMMIT}" "${S}/3rdparty/SoundTouch/soundtouch" || die
+
+
+		#Define RPCS3 Version
+		{ echo "#define RPCS3_GIT_VERSION \"${PV}\""
+		echo '#define RPCS3_GIT_BRANCH "master"'
+		echo '#define RPCS3_GIT_FULL_BRANCH "RPCS3/rpcs3/master"'
+		echo '#define RPCS3_GIT_VERSION_NO_UPDATE 1'; } > rpcs3/git-version.h
+	fi
+
 	# Disable automagic ccache
 	sed -i -e '/find_program(CCACHE_FOUND ccache)/d' CMakeLists.txt || die

--- a/games-puzzle/katawa-shoujo/katawa-shoujo-1.4.6.ebuild
+++ b/games-puzzle/katawa-shoujo/katawa-shoujo-1.4.6.ebuild
@@ -5,7 +5,7 @@ EAPI=8

 inherit wrapper

-DESCRIPTION="Bishoujo-style, in the fictional Yamaku High School for disabled children"
+DESCRIPTION="Re-Engineered visual novel with accessibility features"
 HOMEPAGE="https://www.fhs.sh/projects"
 SRC_URI="https://github.com/fleetingheart/ksre/releases/download/v$PV/KSRE-linux.tar.bz2"

--- a/media-video/walksnail-osd-tool/walksnail-osd-tool-0.3.0.ebuild
+++ b/media-video/walksnail-osd-tool/walksnail-osd-tool-0.3.0.ebuild
@@ -494,6 +494,8 @@ PATCHES=(
 	"${FILESDIR}/${P}-build-remove-git-dep.patch"
 )

+QA_FLAGS_IGNORED="usr/bin/${PN}"
+
 src_unpack() {
 	cargo_src_unpack
 	# rename the repo to match what the build expects
@@ -517,4 +519,3 @@ pkg_postinst() {
 pkg_postrm() {
 	xdg_icon_cache_update
 }
-
--- a/media-video/walksnail-osd-tool/walksnail-osd-tool-9999.ebuild
+++ b/media-video/walksnail-osd-tool/walksnail-osd-tool-9999.ebuild
@@ -12,11 +12,13 @@ EGIT_REPO_URI="https://github.com/avsaase/walksnail-osd-tool.git"
 LICENSE="0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 Boost-1.0 GPL-3 ISC UbuntuFontLicense-1.0 MIT MPL-2.0 OFL-1.1 Unicode-DFS-2016 Unlicense XC ZLIB"
 SLOT="0"

-DEPEND=""
+#DEPEND=""
 RDEPEND="${DEPEND}
 	media-video/ffmpeg"
 BDEPEND=">=virtual/rust-1.71.1-r1"

+QA_FLAGS_IGNORED="usr/bin/${PN}"
+
 src_unpack() {
 	git-r3_src_unpack
 	cargo_live_src_unpack
@@ -41,4 +43,3 @@ pkg_postinst() {
 pkg_postrm() {
 	xdg_icon_cache_update
 }
-