From 2569f07f063615ff033e7eac0d9b75763416620d Mon Sep 17 00:00:00 2001 From: "Anna (cybertailor) Vyalkova" Date: Sun, 17 Nov 2024 10:07:22 +0500 Subject: [PATCH 01/10] net-im/mautrix-telegram: enable py3.13 Signed-off-by: Anna (cybertailor) Vyalkova --- .../mautrix-telegram-0.15.2.ebuild | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/net-im/mautrix-telegram/mautrix-telegram-0.15.2.ebuild b/net-im/mautrix-telegram/mautrix-telegram-0.15.2.ebuild index 12d765dccc..b8724c0e21 100644 --- a/net-im/mautrix-telegram/mautrix-telegram-0.15.2.ebuild +++ b/net-im/mautrix-telegram/mautrix-telegram-0.15.2.ebuild @@ -5,7 +5,7 @@ EAPI=8 PYPI_NO_NORMALIZE=1 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit distutils-r1 optfeature pypi systemd @@ -46,6 +46,19 @@ RDEPEND=" sqlite? ( dev-python/aiosqlite[${PYTHON_USEDEP}] ) " +distutils_enable_tests import-check + +python_test() { + local sitedir="${BUILD_DIR}/install$(python_get_sitedir)" + local EPYTEST_IGNORE=( + "${sitedir}/mautrix_telegram/__main__.py" + "${sitedir}/mautrix_telegram/abstract_user.py" + "${sitedir}/mautrix_telegram/scripts/unicodemojipack/__main__.py" + ) + + epytest --import-check "${sitedir}" +} + src_install() { distutils-r1_src_install From 6873bfb5541105e6c73cb2a3bbd4dad23bba06d3 Mon Sep 17 00:00:00 2001 From: Takuya Wakazono Date: Sun, 17 Nov 2024 16:53:35 +0900 Subject: [PATCH 02/10] profiles: mask dev-libs/properties-cpp for removal Signed-off-by: Takuya Wakazono --- profiles/package.mask | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/profiles/package.mask b/profiles/package.mask index d73fa0b171..40a3038a3b 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -18,6 +18,11 @@ # New entries go on top. +# Takuya Wakazono (2024-11-17) +# Unmaintained in guru, no reverse dependencies. +# Removal on 2024-12-17. +dev-libs/properties-cpp + # Julien Roy (2024-11-15) # >=x11-themes/adw-gtk3-5.4 requires >=gui-libs/gtk-4.16 # which is not packaged in ::gentoo From d44ea883d89ce767dbe3e43a2f93b3405c29b3de Mon Sep 17 00:00:00 2001 From: Takuya Wakazono Date: Sun, 17 Nov 2024 17:16:34 +0900 Subject: [PATCH 03/10] profiles: mask media-gfx/grafx2 for removal Signed-off-by: Takuya Wakazono --- profiles/package.mask | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/profiles/package.mask b/profiles/package.mask index 40a3038a3b..d86604fee1 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -18,6 +18,11 @@ # New entries go on top. +# Takuya Wakazono (2024-11-17) +# Unmaintained since 2021, no maintainer. +# Removal on 2024-12-17. +media-gfx/grafx2 + # Takuya Wakazono (2024-11-17) # Unmaintained in guru, no reverse dependencies. # Removal on 2024-12-17. From 36c646208ce69e0f1bd8a84f5f3d9fd071629c86 Mon Sep 17 00:00:00 2001 From: Takuya Wakazono Date: Sun, 17 Nov 2024 18:49:29 +0900 Subject: [PATCH 04/10] app-alternatives/phosh-keyboard: drop squeekboard phosh-base/squeekboard is masked and will be removed soon. Signed-off-by: Takuya Wakazono --- app-alternatives/phosh-keyboard/metadata.xml | 3 --- app-alternatives/phosh-keyboard/phosh-keyboard-0.ebuild | 3 --- 2 files changed, 6 deletions(-) diff --git a/app-alternatives/phosh-keyboard/metadata.xml b/app-alternatives/phosh-keyboard/metadata.xml index d0bedfc5ed..02671c97ee 100644 --- a/app-alternatives/phosh-keyboard/metadata.xml +++ b/app-alternatives/phosh-keyboard/metadata.xml @@ -9,8 +9,5 @@ Symlink to phosh-base/phosh-osk-stub - - Symlink to phosh-base/squeekboard - diff --git a/app-alternatives/phosh-keyboard/phosh-keyboard-0.ebuild b/app-alternatives/phosh-keyboard/phosh-keyboard-0.ebuild index 52e2d5374a..ea20baadc7 100644 --- a/app-alternatives/phosh-keyboard/phosh-keyboard-0.ebuild +++ b/app-alternatives/phosh-keyboard/phosh-keyboard-0.ebuild @@ -5,7 +5,6 @@ EAPI=8 ALTERNATIVES=( phosh-osk-stub:phosh-base/phosh-osk-stub - squeekboard:phosh-base/squeekboard ) inherit app-alternatives @@ -19,7 +18,5 @@ src_install() { case $(get_alternative) in phosh-osk-stub) dosym sm.puri.Phosh.OskStub.desktop "${target:?}";; - squeekboard) - dosym sm.puri.Squeekboard.desktop "${target:?}";; esac } From 554bcfaf3f6455c9428aeae9f39453a56799ebc6 Mon Sep 17 00:00:00 2001 From: Takuya Wakazono Date: Sun, 17 Nov 2024 18:49:29 +0900 Subject: [PATCH 05/10] profiles: mask phosh-base/squeekboard for removal Bug: https://bugs.gentoo.org/924133 Bug: https://bugs.gentoo.org/817947 Signed-off-by: Takuya Wakazono --- profiles/package.mask | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/profiles/package.mask b/profiles/package.mask index d86604fee1..ca962b0362 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -18,6 +18,12 @@ # New entries go on top. +# Takuya Wakazono (2024-11-17) +# This ebuild has been broken since 2022 because it tries to pull +# dependencies from the internet. +# Removal on 2024-12-17. Bug #817947, #924133. +phosh-base/squeekboard + # Takuya Wakazono (2024-11-17) # Unmaintained since 2021, no maintainer. # Removal on 2024-12-17. From d2060976b775ad70bd3934b7f23ce1c019894da0 Mon Sep 17 00:00:00 2001 From: Henri Gasc Date: Sat, 16 Nov 2024 15:16:34 +0100 Subject: [PATCH 06/10] media-video/wl-screenrec: Fix *DEPEND and src_* steps Signed-off-by: Henri Gasc --- ...r1.ebuild => wl-screenrec-0.1.6-r2.ebuild} | 31 ++++++++++++------- 1 file changed, 19 insertions(+), 12 deletions(-) rename media-video/wl-screenrec/{wl-screenrec-0.1.6-r1.ebuild => wl-screenrec-0.1.6-r2.ebuild} (77%) diff --git a/media-video/wl-screenrec/wl-screenrec-0.1.6-r1.ebuild b/media-video/wl-screenrec/wl-screenrec-0.1.6-r2.ebuild similarity index 77% rename from media-video/wl-screenrec/wl-screenrec-0.1.6-r1.ebuild rename to media-video/wl-screenrec/wl-screenrec-0.1.6-r2.ebuild index 98228fd56b..74da5b8ad6 100644 --- a/media-video/wl-screenrec/wl-screenrec-0.1.6-r1.ebuild +++ b/media-video/wl-screenrec/wl-screenrec-0.1.6-r2.ebuild @@ -129,14 +129,17 @@ KEYWORDS="~amd64" RESTRICT="test" BDEPEND=" - media-video/ffmpeg:= - x11-libs/libdrm $(llvm_gen_dep ' sys-devel/clang:${LLVM_SLOT} ') " -RDEPEND="${BDEPEND}" -DEPEND="${RDEPEND}" +RDEPEND=" + media-video/ffmpeg:=[vaapi] + x11-libs/libdrm +" +DEPEND=" + ${RDEPEND} +" QA_FLAGS_IGNORED="usr/bin/${PN}" @@ -148,23 +151,27 @@ pkg_setup() { src_compile() { cargo_src_compile - ./"${S}"/target/release/"${PN}" --generate-completions bash > "${S}/wl-screenrec.bash" - ./"${S}"/target/release/"${PN}" --generate-completions fish > "${S}/wl-screenrec.fish" - ./"${S}"/target/release/"${PN}" --generate-completions zsh > "${S}/wl-screenrec.zsh" + ./"$(cargo_target_dir)/${PN}" --generate-completions bash > "${S}/wl-screenrec" || \ + die "Could not generate bash completion" + ./"$(cargo_target_dir)/${PN}" --generate-completions fish > "${S}/wl-screenrec.fish" || \ + die "Could not generate fish completion" + ./"$(cargo_target_dir)/${PN}" --generate-completions zsh > "${S}/_wl-screenrec" || \ + die "Could not generate zsh completion" } src_install() { cargo_src_install - dobashcomp "${S}/wl-screenrec.bash" - dofishcomp "${S}/wl-screenrec.fish" - dozshcomp "${S}/wl-screenrec.zsh" + dobashcomp "${S}/wl-screenrec" || die "Could not install bash completion" + dofishcomp "${S}/wl-screenrec.fish" || die "Could not install fish completion" + dozshcomp "${S}/_wl-screenrec" || die "Could not install zsh completion" } pkg_postinst() { - elog "To use this software, you need vaapi encoding support." - elog "You also need a wayland compositor that supports the" + elog "You need a wayland compositor that supports the" elog "following unstable protocols:" elog " - wlr-output-management-unstable-v1" elog " - wlr-screencopy-unstable-v1" + elog "You should also make sure you have the correct librairies" + elog "installed. See: https://trac.ffmpeg.org/wiki/Hardware/VAAPI" } From 8caf5c91f6cea2637a3096007bbc6f2b352e24d7 Mon Sep 17 00:00:00 2001 From: Henri Gasc Date: Sun, 17 Nov 2024 12:00:39 +0100 Subject: [PATCH 07/10] app-text/dooit: drop 2.2.0, add 3.0.3 Signed-off-by: Henri Gasc --- app-text/dooit/Manifest | 2 +- app-text/dooit/dooit-2.2.0-r1.ebuild | 32 ----------------------- app-text/dooit/dooit-3.0.3.ebuild | 39 ++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 33 deletions(-) delete mode 100644 app-text/dooit/dooit-2.2.0-r1.ebuild create mode 100644 app-text/dooit/dooit-3.0.3.ebuild diff --git a/app-text/dooit/Manifest b/app-text/dooit/Manifest index 8a57bc2051..286fa93c89 100644 --- a/app-text/dooit/Manifest +++ b/app-text/dooit/Manifest @@ -1 +1 @@ -DIST dooit-2.2.0.gh.tar.gz 69238 BLAKE2B 4e14233477c7382929a32efde5853d7bbc618266df508d9824f14db6a1340a1eae44258a8cb690ce5f38627aa0fbda707367c3806763ba32fcf32bea92abdb9a SHA512 9b95da5c667e2dfcb98deee8726800dd07837202140ce5c0f53052151cedf474133d3ad2263f1f66ca86bfe7e916a30ebc3618148454084144775c676eddb080 +DIST dooit-3.0.3.gh.tar.gz 1408829 BLAKE2B 9beeeb281c6418fcaefd2d18d7fe257838b5976fac293dfcaa2a8c4ab30b9104b7494ae041e48c7f9bd78814af146b1ecfff76484144d9176f8f26ee86f349ff SHA512 23159013fc792d50266ded584a0748511ca415e1a18c78143bbb5dee0e4a239e7082dce6c4cc85a511294ba784cbdd1968db24250f5856d26f9aaa7b624f6a1e diff --git a/app-text/dooit/dooit-2.2.0-r1.ebuild b/app-text/dooit/dooit-2.2.0-r1.ebuild deleted file mode 100644 index 37fd116c75..0000000000 --- a/app-text/dooit/dooit-2.2.0-r1.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=poetry -PYTHON_COMPAT=( python3_{10..12} ) - -inherit distutils-r1 - -DESCRIPTION="A TUI todo manager" -HOMEPAGE="https://github.com/kraanzu/dooit https://pipy.org/project/dooit" -SRC_URI="https://github.com/kraanzu/dooit/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" - -RDEPEND=" - >=dev-python/pyperclip-1.8.2[${PYTHON_USEDEP}] - =dev-python/pyyaml-6.0[${PYTHON_USEDEP}] - =dev-python/appdirs-1.4.4[${PYTHON_USEDEP}] - =dev-python/python-dateutil-2.8.2[${PYTHON_USEDEP}] - Date: Sun, 17 Nov 2024 13:18:18 +0100 Subject: [PATCH 08/10] games-strategy/slay-the-spire: new package, add 2.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Hoël Bézier --- games-strategy/slay-the-spire/Manifest | 1 + .../slay-the-spire/files/slay-the-spire | 6 ++ games-strategy/slay-the-spire/metadata.xml | 8 +++ .../slay-the-spire/slay-the-spire-2.2.ebuild | 56 +++++++++++++++++++ 4 files changed, 71 insertions(+) create mode 100644 games-strategy/slay-the-spire/Manifest create mode 100644 games-strategy/slay-the-spire/files/slay-the-spire create mode 100644 games-strategy/slay-the-spire/metadata.xml create mode 100644 games-strategy/slay-the-spire/slay-the-spire-2.2.ebuild diff --git a/games-strategy/slay-the-spire/Manifest b/games-strategy/slay-the-spire/Manifest new file mode 100644 index 0000000000..6f5cac884f --- /dev/null +++ b/games-strategy/slay-the-spire/Manifest @@ -0,0 +1 @@ +DIST slay_the_spire_2020_12_15_8735c9fe3cc2280b76aa3ec47c953352a7df1f65_43444.sh 443844375 BLAKE2B 8d6fc61900fa4c75fbc607531b850ba581200fc5612c68cfff50799588253392cb1060cc6b6e01701092f6ce57648ac736eaf1c572e609e82ac78ac3268c7e59 SHA512 fa8630e00d700e12d708febe4b1509e4ff4cb1c36906eb249ac2ad79e9cc0b1001152f571154e30c3f09bf482cacfc0eb9d0a1abcb72de710701f1d27064d195 diff --git a/games-strategy/slay-the-spire/files/slay-the-spire b/games-strategy/slay-the-spire/files/slay-the-spire new file mode 100644 index 0000000000..359b08f111 --- /dev/null +++ b/games-strategy/slay-the-spire/files/slay-the-spire @@ -0,0 +1,6 @@ +#!/bin/sh + +gamedir="${XDG_DATA_DIR:-${HOME}/.local/share}/slay-the-spire" +mkdir -p "$gamedir" && +cd "$gamedir" && +exec java -jar /opt/slay-the-spire/desktop-1.0.jar diff --git a/games-strategy/slay-the-spire/metadata.xml b/games-strategy/slay-the-spire/metadata.xml new file mode 100644 index 0000000000..d5049a992c --- /dev/null +++ b/games-strategy/slay-the-spire/metadata.xml @@ -0,0 +1,8 @@ + + + + + Hoël Bézier + hoelbezier@riseup.net + + diff --git a/games-strategy/slay-the-spire/slay-the-spire-2.2.ebuild b/games-strategy/slay-the-spire/slay-the-spire-2.2.ebuild new file mode 100644 index 0000000000..c5f56957fc --- /dev/null +++ b/games-strategy/slay-the-spire/slay-the-spire-2.2.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CHECKREQS_DISK_BUILD="550M" +inherit check-reqs desktop unpacker xdg + +DESCRIPTION="Deck-building roguelike game with four playable characters" +HOMEPAGE="https://www.megacrit.com/" +SRC_URI="slay_the_spire_2020_12_15_8735c9fe3cc2280b76aa3ec47c953352a7df1f65_43444.sh" +S="${WORKDIR}/data/noarch/game" + +LICENSE="GOG-EULA" +SLOT="0" +KEYWORDS="~amd64" +RESTRICT="bindist fetch splitdebug" + +BDEPEND=" + app-arch/unzip +" + +# Does not run with dev-java/openjdk: #894768 +RDEPEND=" + dev-java/openjdk-bin + virtual/libc + x11-apps/xrandr + x11-libs/libX11 + x11-libs/libXcursor + x11-libs/libXext + x11-libs/libXrandr + x11-libs/libXxf86vm +" + +DIR="/opt/${PN}" +QA_PREBUILT="${DIR#/}/*" + +pkg_nofetch() { + einfo "Please buy and download ${SRC_URI} from:" + einfo " ${HOMEPAGE}" + einfo "and move it to your distfiles directory." +} + +src_unpack() { + unpack_zip "${A}" +} + +src_install() { + insinto "${DIR}" + doins desktop-1.0.jar mod-uploader.jar mts-launcher.jar + doins "${WORKDIR}/data/noarch/support/icon.png" + + dobin "${FILESDIR}/slay-the-spire" + + make_desktop_entry ${PN} "Slay the Spire" "${EPREFIX}${DIR}"/icon.png +} From bb50e735697669a01f41a6c330ddc0e3d7f9a9e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ho=C3=ABl=20B=C3=A9zier?= Date: Sun, 17 Nov 2024 13:43:15 +0100 Subject: [PATCH 09/10] games-rpg/primordia: new package, add 3.6.70667 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Hoël Bézier --- games-rpg/primordia/Manifest | 1 + games-rpg/primordia/metadata.xml | 8 +++++ .../primordia/primordia-3.6.70667.ebuild | 36 +++++++++++++++++++ 3 files changed, 45 insertions(+) create mode 100644 games-rpg/primordia/Manifest create mode 100644 games-rpg/primordia/metadata.xml create mode 100644 games-rpg/primordia/primordia-3.6.70667.ebuild diff --git a/games-rpg/primordia/Manifest b/games-rpg/primordia/Manifest new file mode 100644 index 0000000000..d7d23a96d9 --- /dev/null +++ b/games-rpg/primordia/Manifest @@ -0,0 +1 @@ +DIST primordia_3_6_70667.sh 1166666570 BLAKE2B 8129b99aec5d09ecf6deb924750ad33ee0aa24601f2ea21d8f184cfe7a46f95a32f4a126c11f2b7e546919aa1e91ddf1d6585f96e0c9c4cf6aea01a5af5ea2c6 SHA512 52ba9adfda47b4376aead568eb879624053cb70d03aaab8e6423d6a585712d474cd7bcf8698dda2aef0ef7e9eb339bd7020a030db7b4aa5563356f835333717a diff --git a/games-rpg/primordia/metadata.xml b/games-rpg/primordia/metadata.xml new file mode 100644 index 0000000000..d5049a992c --- /dev/null +++ b/games-rpg/primordia/metadata.xml @@ -0,0 +1,8 @@ + + + + + Hoël Bézier + hoelbezier@riseup.net + + diff --git a/games-rpg/primordia/primordia-3.6.70667.ebuild b/games-rpg/primordia/primordia-3.6.70667.ebuild new file mode 100644 index 0000000000..2c6f073b72 --- /dev/null +++ b/games-rpg/primordia/primordia-3.6.70667.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop unpacker wrapper xdg + +MY_PV="$(ver_rs 1- _)" +MY_P="${PN}_${MY_PV}" + +DESCRIPTION="A cyberpunk point-and-click adventure game" +HOMEPAGE="https://www.wadjeteyegames.com/games/primordia/" +SRC_URI="${MY_P}.sh" +S="${WORKDIR}/data/noarch/game" + +LICENSE="GOG-EULA" +SLOT="0" +KEYWORDS="~amd64 ~x86" +RESTRICT="bindist fetch" + +RDEPEND=">=games-engines/scummvm-2.8.0[mp3,truetype,opengl,vorbis,theora]" +BDEPEND="app-arch/unzip" + +DIR="/usr/share/games/scummvm/games/primordia" + +src_unpack() { + unpack_zip "${A}" +} + +src_install() { + insinto "${DIR}" + doins acsetup.cfg ENGV.tmp Primordia.ags *.tra *.vox "${WORKDIR}/data/noarch/support/icon.png" + + make_wrapper ${PN} "scummvm primordia" + make_desktop_entry ${PN} "Primordia" "${EPREFIX}/${DIR}/icon.png" +} From 1ea03ad7319fc121cccdb766fe4ea28d1db9ddc8 Mon Sep 17 00:00:00 2001 From: Nowa Ammerlaan Date: Sun, 17 Nov 2024 14:16:33 +0100 Subject: [PATCH 10/10] net-proxy/ngrok-bin: add 3.18.4, drop 3.10.0 Signed-off-by: Nowa Ammerlaan --- net-proxy/ngrok-bin/Manifest | 2 +- .../{ngrok-bin-3.10.0.ebuild => ngrok-bin-3.18.4.ebuild} | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) rename net-proxy/ngrok-bin/{ngrok-bin-3.10.0.ebuild => ngrok-bin-3.18.4.ebuild} (98%) diff --git a/net-proxy/ngrok-bin/Manifest b/net-proxy/ngrok-bin/Manifest index e7c95ef859..7e6955f161 100644 --- a/net-proxy/ngrok-bin/Manifest +++ b/net-proxy/ngrok-bin/Manifest @@ -1 +1 @@ -DIST ngrok-bin-3.10.0.tgz 8965855 BLAKE2B 172905f9f92ede31c7e139728b2bffb83c09a7a3610997062b634811ac81edc95abefcd78fb02410878b6b76a9eba6f87645a127427fe0cdc33de24754b71b28 SHA512 5e2a4ba092914d1ce745f22c401243d0d13dbe0026c15aa4b46d9281b0bc590421883cb7fa30b11cd4c822b448295f45ee2ac8dc8ef56586fd8bf63ccaa6b1a7 +DIST ngrok-bin-3.18.4.tgz 14796857 BLAKE2B c1f6e0faa94aff809d2b7d0ad1bed4481efd6595e21db8bd06ca0933bece7e828d2f61a45554ecff1a142f9e2c0c512757f902d2d55e3de9225d059a5d3daba0 SHA512 72240e74970b9204fd143e0c4fa59565ec118bef468241c45850dd1425ff0e14983b73d2fec043e2653f669b6582fe666924584aa57ce9315a9e734c6f1219ac diff --git a/net-proxy/ngrok-bin/ngrok-bin-3.10.0.ebuild b/net-proxy/ngrok-bin/ngrok-bin-3.18.4.ebuild similarity index 98% rename from net-proxy/ngrok-bin/ngrok-bin-3.10.0.ebuild rename to net-proxy/ngrok-bin/ngrok-bin-3.18.4.ebuild index d11458c5c9..aecb08672a 100644 --- a/net-proxy/ngrok-bin/ngrok-bin-3.10.0.ebuild +++ b/net-proxy/ngrok-bin/ngrok-bin-3.18.4.ebuild @@ -22,6 +22,7 @@ SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc64 ~s390 ~x86" RESTRICT="mirror strip" +QA_PREBUILT="*" src_compile() { :