From aecae388f667c82eebac21fe1cdcf39d6df93147 Mon Sep 17 00:00:00 2001 From: Adel KARA SLIMANE Date: Sat, 13 Apr 2024 17:53:07 +0200 Subject: [PATCH 1/9] games-util/mangohud: minor ebuild code improvement Signed-off-by: Adel KARA SLIMANE --- games-util/mangohud/mangohud-0.7.1.ebuild | 18 ++++++++++++------ games-util/mangohud/mangohud-9999.ebuild | 18 ++++++++++++------ 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/games-util/mangohud/mangohud-0.7.1.ebuild b/games-util/mangohud/mangohud-0.7.1.ebuild index 5260457e43..56583d7753 100644 --- a/games-util/mangohud/mangohud-0.7.1.ebuild +++ b/games-util/mangohud/mangohud-0.7.1.ebuild @@ -16,17 +16,23 @@ HOMEPAGE="https://github.com/flightlessmango/MangoHud" VK_HEADERS_VER="1.2.158" VK_HEADERS_MESON_WRAP_VER="2" SPDLOG_VER="1.13.0" +SPDLOG_WRAP_VER="1" IMPLOT_VER="0.16" +IMPLOT_WRAP_VER="1" SRC_URI=" https://github.com/KhronosGroup/Vulkan-Headers/archive/v${VK_HEADERS_VER}.tar.gz -> vulkan-headers-${VK_HEADERS_VER}.tar.gz https://wrapdb.mesonbuild.com/v2/vulkan-headers_${VK_HEADERS_VER}-${VK_HEADERS_MESON_WRAP_VER}/get_patch -> vulkan-headers-${VK_HEADERS_VER}-${VK_HEADERS_MESON_WRAP_VER}-meson-wrap.zip - https://github.com/gabime/spdlog/archive/refs/tags/v${SPDLOG_VER}.tar.gz -> spdlog-${SPDLOG_VER}.tar.gz - https://wrapdb.mesonbuild.com/v2/spdlog_${SPDLOG_VER}-1/get_patch -> spdlog-${SPDLOG_VER}-1-wrap.zip - https://github.com/epezent/implot/archive/refs/tags/v${IMPLOT_VER}.tar.gz -> implot-${IMPLOT_VER}.tar.gz - https://wrapdb.mesonbuild.com/v2/implot_${IMPLOT_VER}-1/get_patch -> implot-${IMPLOT_VER}-1-wrap.zip + https://github.com/gabime/spdlog/archive/refs/tags/v${SPDLOG_VER}.tar.gz + -> spdlog-${SPDLOG_VER}.tar.gz + https://wrapdb.mesonbuild.com/v2/spdlog_${SPDLOG_VER}-${SPDLOG_WRAP_VER}/get_patch + -> spdlog-${SPDLOG_VER}-${SPDLOG_WRAP_VER}-wrap.zip + https://github.com/epezent/implot/archive/refs/tags/v${IMPLOT_VER}.tar.gz + -> implot-${IMPLOT_VER}.tar.gz + https://wrapdb.mesonbuild.com/v2/implot_${IMPLOT_VER}-${IMPLOT_WRAP_VER}/get_patch + -> implot-${IMPLOT_VER}-${IMPLOT_WRAP_VER}-wrap.zip " if [[ ${PV} == 9999 ]]; then @@ -101,11 +107,11 @@ src_unpack() { # fix build error by using upstream submodule version of spdlog unpack spdlog-${SPDLOG_VER}.tar.gz - unpack spdlog-${SPDLOG_VER}-1-wrap.zip + unpack spdlog-${SPDLOG_VER}-${SPDLOG_WRAP_VER}-wrap.zip mv "${WORKDIR}/spdlog-${SPDLOG_VER}" "${S}/subprojects/" || die unpack implot-${IMPLOT_VER}.tar.gz - unpack implot-${IMPLOT_VER}-1-wrap.zip + unpack implot-${IMPLOT_VER}-${IMPLOT_WRAP_VER}-wrap.zip mv "${WORKDIR}/implot-${IMPLOT_VER}" "${S}/subprojects/" || die } diff --git a/games-util/mangohud/mangohud-9999.ebuild b/games-util/mangohud/mangohud-9999.ebuild index 5260457e43..56583d7753 100644 --- a/games-util/mangohud/mangohud-9999.ebuild +++ b/games-util/mangohud/mangohud-9999.ebuild @@ -16,17 +16,23 @@ HOMEPAGE="https://github.com/flightlessmango/MangoHud" VK_HEADERS_VER="1.2.158" VK_HEADERS_MESON_WRAP_VER="2" SPDLOG_VER="1.13.0" +SPDLOG_WRAP_VER="1" IMPLOT_VER="0.16" +IMPLOT_WRAP_VER="1" SRC_URI=" https://github.com/KhronosGroup/Vulkan-Headers/archive/v${VK_HEADERS_VER}.tar.gz -> vulkan-headers-${VK_HEADERS_VER}.tar.gz https://wrapdb.mesonbuild.com/v2/vulkan-headers_${VK_HEADERS_VER}-${VK_HEADERS_MESON_WRAP_VER}/get_patch -> vulkan-headers-${VK_HEADERS_VER}-${VK_HEADERS_MESON_WRAP_VER}-meson-wrap.zip - https://github.com/gabime/spdlog/archive/refs/tags/v${SPDLOG_VER}.tar.gz -> spdlog-${SPDLOG_VER}.tar.gz - https://wrapdb.mesonbuild.com/v2/spdlog_${SPDLOG_VER}-1/get_patch -> spdlog-${SPDLOG_VER}-1-wrap.zip - https://github.com/epezent/implot/archive/refs/tags/v${IMPLOT_VER}.tar.gz -> implot-${IMPLOT_VER}.tar.gz - https://wrapdb.mesonbuild.com/v2/implot_${IMPLOT_VER}-1/get_patch -> implot-${IMPLOT_VER}-1-wrap.zip + https://github.com/gabime/spdlog/archive/refs/tags/v${SPDLOG_VER}.tar.gz + -> spdlog-${SPDLOG_VER}.tar.gz + https://wrapdb.mesonbuild.com/v2/spdlog_${SPDLOG_VER}-${SPDLOG_WRAP_VER}/get_patch + -> spdlog-${SPDLOG_VER}-${SPDLOG_WRAP_VER}-wrap.zip + https://github.com/epezent/implot/archive/refs/tags/v${IMPLOT_VER}.tar.gz + -> implot-${IMPLOT_VER}.tar.gz + https://wrapdb.mesonbuild.com/v2/implot_${IMPLOT_VER}-${IMPLOT_WRAP_VER}/get_patch + -> implot-${IMPLOT_VER}-${IMPLOT_WRAP_VER}-wrap.zip " if [[ ${PV} == 9999 ]]; then @@ -101,11 +107,11 @@ src_unpack() { # fix build error by using upstream submodule version of spdlog unpack spdlog-${SPDLOG_VER}.tar.gz - unpack spdlog-${SPDLOG_VER}-1-wrap.zip + unpack spdlog-${SPDLOG_VER}-${SPDLOG_WRAP_VER}-wrap.zip mv "${WORKDIR}/spdlog-${SPDLOG_VER}" "${S}/subprojects/" || die unpack implot-${IMPLOT_VER}.tar.gz - unpack implot-${IMPLOT_VER}-1-wrap.zip + unpack implot-${IMPLOT_VER}-${IMPLOT_WRAP_VER}-wrap.zip mv "${WORKDIR}/implot-${IMPLOT_VER}" "${S}/subprojects/" || die } From e53c699a520f5be0eec8c2320eb29ba986b0129b Mon Sep 17 00:00:00 2001 From: Julien Roy Date: Sat, 13 Apr 2024 11:56:21 -0400 Subject: [PATCH 2/9] app-emulation/quickemu: drop 4.8 Signed-off-by: Julien Roy --- app-emulation/quickemu/Manifest | 1 - app-emulation/quickemu/quickemu-4.8.ebuild | 41 ---------------------- 2 files changed, 42 deletions(-) delete mode 100644 app-emulation/quickemu/quickemu-4.8.ebuild diff --git a/app-emulation/quickemu/Manifest b/app-emulation/quickemu/Manifest index 5915a14753..ce1303b2af 100644 --- a/app-emulation/quickemu/Manifest +++ b/app-emulation/quickemu/Manifest @@ -1,3 +1,2 @@ -DIST quickemu-4.8.tar.gz 166544 BLAKE2B 527ce0cb7310d4d4f3ce19900a60b40b1534a637c58899beb48a947b4bd29c02c8381af65b966f205883c811219cadd2c6dcb40d5bb6925ed92db4283b7d1d4c SHA512 1f09e99ac4e508d5fe9e26482bd6b318f4cc0256bb8079799dc162ea5789ca99a07a11af283456f7832eed0c970ec0dae46e3ab2e80696954f16ff6807e32765 DIST quickemu-4.9.1.tar.gz 176739 BLAKE2B 0cb89afcc54e9e35573721a45a381be708843d33a70d6b8ed9943b46922dc584ff12a34414fc421f85ffc23eb335185d210f126b4bf77c6fa37a02e64ab13c4a SHA512 bf6e4f8a4d05ceb1b69eb32041476d91275c302de162a578380183d981625837256dd7b06804920cf17215657ad4c19eb75ffa12d071cef01d0baabffcc79479 DIST quickemu-4.9.2.tar.gz 179761 BLAKE2B 70eeea65a0a654e00215e595cb3bab0272d2796266656e82bd05621b96c09b5e58d2759bff2ee435c454ceffc94d6bf0f9c07496169852813d69effd8c0f89cc SHA512 c9d3afd81062590af7c73cb4757d9c704dbbbb86aae709962de421e94f235f321a7424cd340bbe15f203e5012e23f8d75fcc1f23c4db01e10e01a81159ad70a2 diff --git a/app-emulation/quickemu/quickemu-4.8.ebuild b/app-emulation/quickemu/quickemu-4.8.ebuild deleted file mode 100644 index 969d43cb0f..0000000000 --- a/app-emulation/quickemu/quickemu-4.8.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_10 ) -inherit python-single-r1 - -DESCRIPTION="Create and run optimised Windows, macOS and Linux desktop virtual machines" -HOMEPAGE="https://github.com/quickemu-project/quickemu" -SRC_URI="https://github.com/quickemu-project/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -DEPEND=" - ${PYTHON_DEPS} - >=app-emulation/qemu-6.0.0[gtk,sdl,spice] - >=app-shells/bash-4.0:= - app-cdr/cdrtools - app-crypt/swtpm - app-misc/jq - net-misc/spice-gtk[gtk3] - net-misc/wget - net-misc/zsync - sys-apps/usbutils - sys-apps/util-linux - || ( sys-firmware/edk2-ovmf sys-firmware/edk2-ovmf-bin ) - sys-process/procps - x11-apps/xrandr - x11-misc/xdg-user-dirs -" -RDEPEND="${DEPEND}" - -src_install() { - python_doscript macrecovery macrecovery - dobin quickemu - dobin quickget -} From 7f3a4149bd64cb0f69ec4f600f0a6dc1dcfdd153 Mon Sep 17 00:00:00 2001 From: Julien Roy Date: Sat, 13 Apr 2024 11:56:29 -0400 Subject: [PATCH 3/9] app-emulation/quickemu: enable py3.11, py3.12 Closes: https://bugs.gentoo.org/897364 Signed-off-by: Julien Roy --- app-emulation/quickemu/quickemu-4.9.1.ebuild | 4 ++-- app-emulation/quickemu/quickemu-4.9.2.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app-emulation/quickemu/quickemu-4.9.1.ebuild b/app-emulation/quickemu/quickemu-4.9.1.ebuild index 969d43cb0f..e23c413c6e 100644 --- a/app-emulation/quickemu/quickemu-4.9.1.ebuild +++ b/app-emulation/quickemu/quickemu-4.9.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 2021 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_10 ) +PYTHON_COMPAT=( python3_{10..12} ) inherit python-single-r1 DESCRIPTION="Create and run optimised Windows, macOS and Linux desktop virtual machines" diff --git a/app-emulation/quickemu/quickemu-4.9.2.ebuild b/app-emulation/quickemu/quickemu-4.9.2.ebuild index 969d43cb0f..e23c413c6e 100644 --- a/app-emulation/quickemu/quickemu-4.9.2.ebuild +++ b/app-emulation/quickemu/quickemu-4.9.2.ebuild @@ -1,9 +1,9 @@ -# Copyright 2021 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_10 ) +PYTHON_COMPAT=( python3_{10..12} ) inherit python-single-r1 DESCRIPTION="Create and run optimised Windows, macOS and Linux desktop virtual machines" From b3b8b9a7d06ffb94119639d9204ea2e2c06caa9c Mon Sep 17 00:00:00 2001 From: Julien Roy Date: Sat, 13 Apr 2024 11:58:59 -0400 Subject: [PATCH 4/9] profiles: mask package with missing DEPEND Signed-off-by: Julien Roy --- profiles/package.mask | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/profiles/package.mask b/profiles/package.mask index 7868c6b76f..8f8d4a3a37 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -14,6 +14,11 @@ # New entries go on top. +# Julien Roy (2024-04-13) +# Depends on last rited dev-python/future +# Masked for removal in 30 days +media-video/ffsubsync + # Anna Vyalkova (2024-04-09) # Depends on masked net-libs/sofia-sip. net-voip/gnome-calls From 6d070fa2bde1dd80b91acc915d3bb34dc9a00526 Mon Sep 17 00:00:00 2001 From: Julien Roy Date: Sat, 13 Apr 2024 12:02:29 -0400 Subject: [PATCH 5/9] dev-python/ascim: enable py3.12 Signed-off-by: Julien Roy --- dev-python/ascim/ascim-0.1.1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-python/ascim/ascim-0.1.1.ebuild b/dev-python/ascim/ascim-0.1.1.ebuild index 7644c33335..491626218e 100644 --- a/dev-python/ascim/ascim-0.1.1.ebuild +++ b/dev-python/ascim/ascim-0.1.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{10..11} pypy3 ) +PYTHON_COMPAT=( python3_{10..12} pypy3 ) DISTUTILS_USE_PEP517=setuptools inherit distutils-r1 From 13bc40dc5339271d9eef8f3d811af974815bd332 Mon Sep 17 00:00:00 2001 From: Julien Roy Date: Sat, 13 Apr 2024 12:03:10 -0400 Subject: [PATCH 6/9] profiles: mask revdep of masked package Signed-off-by: Julien Roy --- profiles/package.mask | 2 ++ 1 file changed, 2 insertions(+) diff --git a/profiles/package.mask b/profiles/package.mask index 8f8d4a3a37..9a6994f540 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -18,6 +18,8 @@ # Depends on last rited dev-python/future # Masked for removal in 30 days media-video/ffsubsync +# Rev Dep +mpv-plugin/autosubsync-mpv # Anna Vyalkova (2024-04-09) # Depends on masked net-libs/sofia-sip. From 3560b7e5499dc18584bd1a933377bdc8d05a759e Mon Sep 17 00:00:00 2001 From: Julien Roy Date: Sat, 13 Apr 2024 12:05:06 -0400 Subject: [PATCH 7/9] dev-python/betamax-serializers: enable py3.12 Signed-off-by: Julien Roy --- .../betamax-serializers/betamax-serializers-0.2.1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-python/betamax-serializers/betamax-serializers-0.2.1.ebuild b/dev-python/betamax-serializers/betamax-serializers-0.2.1.ebuild index b8893b5f26..2cf15548dd 100644 --- a/dev-python/betamax-serializers/betamax-serializers-0.2.1.ebuild +++ b/dev-python/betamax-serializers/betamax-serializers-0.2.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 2022 Gentoo Authors +# Copyright 2022-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( pypy3 python3_{10..11} ) +PYTHON_COMPAT=( pypy3 python3_{10..12} ) DISTUTILS_USE_PEP517=setuptools PYPI_NO_NORMALIZE=1 inherit distutils-r1 optfeature pypi From 86b51ce5ea9c91ee894f8aed3a20f98c4fd426ef Mon Sep 17 00:00:00 2001 From: Julien Roy Date: Sat, 13 Apr 2024 12:07:33 -0400 Subject: [PATCH 8/9] dev-python/PGPy: enable py3.12 Signed-off-by: Julien Roy --- dev-python/PGPy/PGPy-0.6.0.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-python/PGPy/PGPy-0.6.0.ebuild b/dev-python/PGPy/PGPy-0.6.0.ebuild index f84e0fa323..597c92ab04 100644 --- a/dev-python/PGPy/PGPy-0.6.0.ebuild +++ b/dev-python/PGPy/PGPy-0.6.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 2022-2023 Gentoo Authors +# Copyright 2022-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) DISTUTILS_USE_PEP517=setuptools inherit distutils-r1 From e51a84edf0b5ac112c715410369c5a9b567cdf0e Mon Sep 17 00:00:00 2001 From: Julien Roy Date: Sat, 13 Apr 2024 12:09:52 -0400 Subject: [PATCH 9/9] dev-python/baron: enable py3.11, py3.12 Closes: https://bugs.gentoo.org/897402 Signed-off-by: Julien Roy --- dev-python/baron/baron-0.9.ebuild | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dev-python/baron/baron-0.9.ebuild b/dev-python/baron/baron-0.9.ebuild index 79ba62ebfa..594e518bd9 100644 --- a/dev-python/baron/baron-0.9.ebuild +++ b/dev-python/baron/baron-0.9.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_10 ) +PYTHON_COMPAT=( python3_{10..12} ) DISTUTILS_USE_PEP517=setuptools inherit distutils-r1 @@ -22,5 +22,6 @@ RDEPEND=" distutils_enable_tests pytest # Doc building fails: -# RuntimeError: Non Expected warning in `/var/tmp/portage/dev-python/baron-0.9/work/baron-0.9/docs/advanced.rst` line 48 +# RuntimeError: Non Expected warning in +# `/var/tmp/portage/dev-python/baron-0.9/work/baron-0.9/docs/advanced.rst` line 48 #distutils_enable_sphinx docs dev-python/matplotlib dev-python/ipython