Merge updates from master

app-alternatives/phosh-keyboard/metadata.xml

@@ -9,8 +9,5 @@
 		<flag name="phosh-osk-stub">
 			Symlink to <pkg>phosh-base/phosh-osk-stub</pkg>
 		</flag>
-		<flag name="squeekboard">
-			Symlink to <pkg>phosh-base/squeekboard</pkg>
-		</flag>
 	</use>
 </pkgmetadata>

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
 }

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

app-text/dooit/dooit-2.2.0-r1.ebuild

@@ -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/pyperclip-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-6.0[${PYTHON_USEDEP}]
-	<dev-python/pyyaml-7.0[${PYTHON_USEDEP}]
-	dev-python/tzlocal[${PYTHON_USEDEP}]
-	>=dev-python/appdirs-1.4.4[${PYTHON_USEDEP}]
-	<dev-python/appdirs-2.0.0[${PYTHON_USEDEP}]
-	dev-python/textual[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.8.2[${PYTHON_USEDEP}]
-	<dev-python/python-dateutil-3.0.0[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}"

app-text/dooit/dooit-3.0.3.ebuild

@@ -0,0 +1,39 @@
+# 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..13} )
+
+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"
+
+BDEPEND="
+	test? (
+		=dev-python/pytest-asyncio-0.24*[${PYTHON_USEDEP}]
+		~dev-python/Faker-30.8.2[${PYTHON_USEDEP}]
+	)
+"
+
+RDEPEND="
+	=dev-python/pyperclip-1.9*[${PYTHON_USEDEP}]
+	=dev-python/pyyaml-6*[${PYTHON_USEDEP}]
+	=dev-python/tzlocal-5.2*[${PYTHON_USEDEP}]
+	=dev-python/textual-0.85*[${PYTHON_USEDEP}]
+	=dev-python/python-dateutil-2.9*[${PYTHON_USEDEP}]
+	~dev-python/sqlalchemy-2.0.36[${PYTHON_USEDEP}]
+	~dev-python/platformdirs-4.3.6[${PYTHON_USEDEP}]
+	~dev-python/click-8.1.7[${PYTHON_USEDEP}]
+"
+
+DEPEND="${RDEPEND}"
+
+distutils_enable_tests pytest

games-rpg/primordia/Manifest

@@ -0,0 +1 @@
+DIST primordia_3_6_70667.sh 1166666570 BLAKE2B 8129b99aec5d09ecf6deb924750ad33ee0aa24601f2ea21d8f184cfe7a46f95a32f4a126c11f2b7e546919aa1e91ddf1d6585f96e0c9c4cf6aea01a5af5ea2c6 SHA512 52ba9adfda47b4376aead568eb879624053cb70d03aaab8e6423d6a585712d474cd7bcf8698dda2aef0ef7e9eb339bd7020a030db7b4aa5563356f835333717a

games-rpg/primordia/metadata.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<name>Hoël Bézier</name>
+		<email>hoelbezier@riseup.net</email>
+	</maintainer>
+</pkgmetadata>

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"
+}

games-strategy/slay-the-spire/Manifest

@@ -0,0 +1 @@
+DIST slay_the_spire_2020_12_15_8735c9fe3cc2280b76aa3ec47c953352a7df1f65_43444.sh 443844375 BLAKE2B 8d6fc61900fa4c75fbc607531b850ba581200fc5612c68cfff50799588253392cb1060cc6b6e01701092f6ce57648ac736eaf1c572e609e82ac78ac3268c7e59 SHA512 fa8630e00d700e12d708febe4b1509e4ff4cb1c36906eb249ac2ad79e9cc0b1001152f571154e30c3f09bf482cacfc0eb9d0a1abcb72de710701f1d27064d195

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

games-strategy/slay-the-spire/metadata.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<name>Hoël Bézier</name>
+		<email>hoelbezier@riseup.net</email>
+	</maintainer>
+</pkgmetadata>

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
+}

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"
 }

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
 

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

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() {
 :

profiles/package.mask

@@ -18,6 +18,22 @@
 
 # New entries go on top.
 
+# Takuya Wakazono <pastalian46@gmail.com> (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 <pastalian46@gmail.com> (2024-11-17)
+# Unmaintained since 2021, no maintainer.
+# Removal on 2024-12-17.
+media-gfx/grafx2
+
+# Takuya Wakazono <pastalian46@gmail.com> (2024-11-17)
+# Unmaintained in guru, no reverse dependencies.
+# Removal on 2024-12-17.
+dev-libs/properties-cpp
+
 # Julien Roy <julien@jroy.ca> (2024-11-15)
 # >=x11-themes/adw-gtk3-5.4 requires >=gui-libs/gtk-4.16
 # which is not packaged in ::gentoo