Merge updates from master

2026-07-14 01:23:23 -04:00 · 2024-07-01 14:03:48 +00:00
parent a94f152115 89ce17a46d
commit 06c59cd1b9
96 changed files with 1306 additions and 802 deletions
--- a/app-admin/i2pd-tools/Manifest
+++ b/app-admin/i2pd-tools/Manifest
@@ -1,3 +1,4 @@
 DIST i2pd-a6bd827.tar.gz 650322 BLAKE2B 74a9c686f0468c10b09d54d02445ced9df79bf152b7953cf999b2914fcf61ea38b189524692af7318a1c064a31ab3a888d4cf8a0c01734f6225c4705717cd280 SHA512 008d59c5b7edae2664dcd0bef712572f51f7520de5f5f25da69cba2b81278d3b9ee8a323cabd1c96bc73d28234085e12247f5d2e796e00bb7a4a322b42278367
-DIST i2pd-tools-0.2023.05.26.tar.gz 19457 BLAKE2B a1c9f4edd812affafd16cc9dda70b6165d095207c00c3dc19d692cbea38d64795be5f8d6ebaba89360788ce931860a56f250e03edbe3df6fb0f0e5b83c86db89 SHA512 491e704936e67c7baa1395c77fbc0b5746855ba99ed3fa16731ea8f6a570157c5a7b53eb7bb46efec691d0583dafca75bd42903495c2c0776625a7dbd6f38651
+DIST i2pd-c98926a.tar.gz 673645 BLAKE2B 3197b78573e2b1f8b6592e804f6342ffc84c625fa3f9aafbe610e81c13a5e8c84c33f225c45ecb653be45c3c727057ce2fccad1c04347b41de36717fb67de934 SHA512 ba12fda3124bcf1e1bdc3e1594c065241b80cb61a532352c2f9632cc3f309e3d957013adf4fc0a16f97624503a7a02b958d128833747b083777629fdc89cb5f4
 DIST i2pd-tools-2023.09.06.tar.gz 22556 BLAKE2B a3c93c8f7e7f359099c3f730587d38870e44bf4dd0314df7be146e2423cf099691871702064c7b77d8f0e8d588ac991390cdad03be6ee72afb2304639e53cee4 SHA512 366ad92232889550ef3a4463b967d2959823cd8b423185b38b294b3d8d1790adcb821c609dde86bc0cda4b6ec86c20340a1496c57577599e699621545d247427
+DIST i2pd-tools-2024.05.08.tar.gz 22594 BLAKE2B af3abcb44e437c8a84da3be3cfbc830e12b3f141fea34b4fa644bf01c9a0cc6dda9ac4049a6d68ec26e63e611871ca070310e70a8732fdab00aada9b9e604cb1 SHA512 a5073c9dac1addc0e91d6fa7601b7f140c9ff084bdad2e5bf29448afc918a50441c5326bd5e616e8cf0323251a3bb7ba1ffd13e4fbdac2ecb3a02b021359cb07
--- a/app-admin/i2pd-tools/i2pd-tools-0.2023.05.26.ebuild
+++ b/app-admin/i2pd-tools/i2pd-tools-0.2023.05.26.ebuild
@@ -5,8 +5,8 @@ EAPI=8

 inherit toolchain-funcs

-COMMIT="40d335a4279aec7f227209831d79a4d8304111a2"
-I2PD_COMMIT="a6bd8275ca496c75c84d7eb890c0071569d28f55" # keep in sync with bundled version
+COMMIT="d7a079ad644be3e55d2f7c5074a732166ffec19f"
+I2PD_COMMIT="c98926abf2dcd3cbe2cbbfc00a9e9159240c3df9" # keep in sync with bundled version
 DESCRIPTION="Some useful tools for I2P"
 HOMEPAGE="https://github.com/PurpleI2P/i2pd-tools"
 SRC_URI="
@@ -18,6 +18,7 @@ S="${WORKDIR}/${PN}-${COMMIT}"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
+IUSE="cpu_flags_x86_aes"

 DEPEND="
 	dev-libs/boost:=
@@ -28,7 +29,6 @@ RDEPEND="${DEPEND}"

 PATCHES=(
 	"${FILESDIR}"/${PN}-0.2023.03.12-nodebug.patch
-	"${FILESDIR}"/${PN}-0.2023.03.12-flags.patch
 )

 src_unpack() {
@@ -39,7 +39,17 @@ src_unpack() {
 }

 src_configure() {
-	tc-export CXX
+	tc-export AR CXX
+}
+
+src_compile() {
+	mymakeflags=(
+		CXXFLAGS="${CXXFLAGS}"
+		LDFLAGS="${LDFLAGS}"
+		USE_AESNI="$(usex cpu_flags_x86_aes)"
+	)
+
+	emake "${mymakeflags[@]}"
 }

 src_install() {
@@ -47,7 +57,7 @@ src_install() {

 	# extracted from Makefile
 	binaries=(
-		keygen keyinfo famtool routerinfo regaddr regaddr_3ld vain
+		vain keygen keyinfo famtool routerinfo regaddr regaddr_3ld
 		i2pbase64 offlinekeys b33address regaddralias x25519 verifyhost
 	)
 	dobin "${binaries[@]}"
--- a/app-crypt/autofirma/autofirma-1.8.3.ebuild
+++ b/app-crypt/autofirma/autofirma-1.8.3.ebuild
@@ -11,8 +11,9 @@ HOMEPAGE="
 	https://github.com/ctt-gob-es/clienteafirma
 "

-# Upstream blocks wget with no User Agent.
-SRC_URI="https://estaticos.redsara.es/comunes/autofirma/$(ver_rs 1- /)/AutoFirma_Linux_Fedora.zip -> ${P}.zip"
+# Upstream blocks wget with no User Agent. It can be addressed globally (see https://wiki.gentoo.org/wiki/FETCHCOMMAND).
+# If Gentoo's default configuration is in place, pkg_pretend() and pkg_nofetch() provide fallback options.
+SRC_URI="https://estaticos.redsara.es/comunes/autofirma/$(ver_rs 1- /)/AutoFirma_Linux_Fedora.zip -> ${PF}.zip"

 S=${WORKDIR}

@@ -21,12 +22,23 @@ SLOT="0"
 KEYWORDS="~amd64"

 RDEPEND="virtual/jre:1.8"
-BDEPEND="app-arch/unzip"
+BDEPEND="
+	app-arch/unzip
+	net-misc/wget
+"
+
+pkg_pretend() {
+	# Upstream blocks vanilla wget, so we set up a browser User-Agent as a fallback.
+	local URI="https://estaticos.redsara.es/comunes/autofirma/$(ver_rs 1- /)/AutoFirma_Linux_Fedora.zip"
+	local USER_AGENT="Mozilla/5.0 (X11; Fedora; Linux x86_64; rv:52.0) Gecko/20100101 Firefox/52.0"
+	local DISTFILE="${PORTAGE_ACTUAL_DISTDIR}/${PF}.zip"
+	[ -f "${DISTFILE}" ] || /usr/sbin/wget --user-agent="${USER_AGENT}" "${URI}" -O "${DISTFILE}"
+}

 pkg_nofetch() {
 	einfo "Please download:"
 	einfo " https://estaticos.redsara.es/comunes/autofirma/$(ver_rs 1- /)/AutoFirma_Linux_Fedora.zip"
-	einfo "and move it to your distfiles directory as autofirma-${PV}.zip."
+	einfo "and move it to ${PORTAGE_ACTUAL_DISTDIR}/${PF}.zip."
 }

 src_unpack() {
--- a/app-dicts/rhvoice-ru/Manifest
+++ b/app-dicts/rhvoice-ru/Manifest
@@ -1 +1,2 @@
 DIST rhvoice-ru-2.14.zip 1585105 BLAKE2B bbd7ba8caf646ff7d6b0125c97c3bb739c864f4ce9ebf627693454830cb4de31360932e2f12a2cfbc5f507b238aa1e84ebb22bc41e210956d11422f058626579 SHA512 1b9555ff0613d01928a91e09319111be3001e96a0fad3456d107e1c39b777d6899c05d78f38066a5c79f5e68e82847c2776030edf7c4738233f0193ed841854d
+DIST rhvoice-ru-2.15.zip 1585171 BLAKE2B 317f5d472f2c48b6d08c7c39beae10809370514b36fbff0fe1c955ef13d5885f853037356d558008c87d31450bae3e311cbc38af67daccd515e12b518306fdee SHA512 5b1d205f6a5c75d084ea3d364e33dd3f11abc4346bc9f7fbe62c416407d5f7dbe132dc58788f007345ac44c229dc93d794b09cda34bed7aec8d2ddfc9fe7aceb
--- a/app-dicts/rhvoice-ru/rhvoice-ru-2.15.ebuild
+++ b/app-dicts/rhvoice-ru/rhvoice-ru-2.15.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+RHVOICE_LANG="Russian"
+inherit rhvoice-lang
+
+LICENSE="LGPL-2.1+"
--- a/app-doc/openbsd-manpages/Manifest
+++ b/app-doc/openbsd-manpages/Manifest
@@ -1,4 +1,2 @@
-DIST comp69.tgz 88021988 BLAKE2B e1e49f09baa01d747b5c165b57ef129e91d9d534b61163659478db1118f042c0aaf7c4df88ba0eacf74a5fff4692e3f92a663c5b2ef84d3cfb46a1e5ca87baf8 SHA512 5f22e7271e9677af9975a9645ed693fb490b5a85c5e1ddfdaf95c6d2fdac504ad34e2aa064801b052c426153431625f111191124907fd271802dbbf14277c8bd
-DIST comp70.tgz 74754856 BLAKE2B b462967a6349c167d385cb534dca86b4d96de74be307c69d78c3e82f7326767ab80640dcd28e86055a2989cb049d067657c9bdd68d75b8283d08f8a5109929d9 SHA512 10d3a5feb6d275613df9abb4a2eb0526363d97a4f7b9d33a7ffc7bea2bfe18d3aed8f44885bbd9402da0064b94e2363356879e5f2628bbfe60557a87807cfa82
-DIST man69.tgz 7742404 BLAKE2B 8375477e1fecc20945ebc766c2da980ca988a0955dad746631ce5cebe2080b7eb030b1a8e062a6174c7a998aff99cbe5104268f142d372f91cf7d0aec581ed22 SHA512 b257a84862ba274bea82a908cc06c84d4164fcd607d29e92180154d89bb4250893b04e2faeac2dbc3ef9e919c5cfdee19e1b418ec8958d0b4dcdc3e492d837be
-DIST man70.tgz 7762328 BLAKE2B 3dbdde2b4242f10d9d35981b471baf01fb1e8919dd7982af77fabc9875cd8976de491cea1b640af56de4ea093c9d90b7821d21691bf78fb2a389ac2e1f7f42f0 SHA512 5aea38a8046610ed10e9de5ea3c0c3ddced457c17d162e1ae1250cb2fcee5d1252b4be165f199e55b6e7f413c9803339fdb49b25da48378fa2e3aa755c4191bd
+DIST comp75.tgz 82618249 BLAKE2B d54381675aba347d70058fc0cfb5fa55a80a477096af65287009221b540e09342bb6a05b1172defc6e046602057b35083fa164493037f851e979fe66cc067ae6 SHA512 e5c018ed834ba11994da18dc97b10f0c8d3d0384c2d2d55e750acf09bf074c2445264b76579c822a4457f6daee7fec47dbf4c16cf3ea1d70053e9fc9acd09918
+DIST man75.tgz 8059203 BLAKE2B 2fe5823fa6f8b2580e95057a0cebc93d299d4da66cd552b123e95d22080109e5f95a1506adfd50f89c613d75df43c2858a36e353d0c20ac46addbb10edc86290 SHA512 2c60f6f42c6eff7caa563bf4db7c51e2b83aee59ef647835b0b3031deabf0b0e4e582894900665155b44eda946eedd0d9c418ef3e29432ca2d401b7516c74399
--- a/app-doc/openbsd-manpages/openbsd-manpages-7.0.ebuild
+++ b/app-doc/openbsd-manpages/openbsd-manpages-7.0.ebuild
@@ -1,41 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PV=${PV/./}
-DESCRIPTION="OpenBSD manual pages"
-HOMEPAGE="https://man.openbsd.org"
-BASE_URI="https://ftp.openbsd.org/pub/OpenBSD/${PV}/amd64"
-SRC_URI="
-	${BASE_URI}/comp${MY_PV}.tgz
-	${BASE_URI}/man${MY_PV}.tgz
-"
-S="${WORKDIR}/usr/share/man"
-
-LICENSE="BSD BSD-2 BSD-4 ISC MIT icu openssl"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-src_prepare() {
-	default
-
-	ebegin "Renaming sections to prevent collision"
-	find . -maxdepth 1 -name 'man*' -execdir mv '{}' '{}'bsd \; || die
-	find . -type f -execdir mv '{}' '{}'bsd \; || die
-	find . -type f -execdir sed -i '{}' \
-		-e 's:^\.Dt \S\+ \S\+:\0bsd:' \
-		-e 's:^\(\.TH \S\+ "\?\)\([0-9a-z]\+\):\1\2bsd:' \; || die
-	eend 0
-}
-
-src_install() {
-	insinto /usr/share/man
-	doins -r *
-}
-
-pkg_postinst() {
-	elog "To read an OpenBSD manpage, add 'bsd' suffix to its section name."
-	elog "For example:"
-	elog "$ man -s 9bsd style"
-}
--- a/app-doc/openbsd-manpages/openbsd-manpages-7.5.ebuild
+++ b/app-doc/openbsd-manpages/openbsd-manpages-7.5.ebuild
--- a/app-misc/badvideo/badvideo-9999.ebuild
+++ b/app-misc/badvideo/badvideo-9999.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Ruin your videos in SECONDS!"
+HOMEPAGE="https://github.com/kernaltrap8/badvideo"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/kernaltrap8/badvideo"
+	S="${WORKDIR}/${PN}-9999"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+
+RDEPEND="
+	media-video/ffmpeg[opus,x264]
+"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	newbin ${S}/src/badvideo.sh badvideo
+}
--- a/app-misc/badvideo/metadata.xml
+++ b/app-misc/badvideo/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="person">
+    <email>aidenwingard2@gmail.com</email>
+    <description>Primary maintainer</description>
+  </maintainer>
+  <longdescription>
+   badvideo is a Bash script that uses FFmpeg
+   to manipulate video files. It uses the
+   x264 and OPUS encoders to heavily compress
+   and ruin the bitrates of MP4 video files.
+  </longdescription>
+  <upstream>
+    <remote-id type="github">kernaltrap8/badvideo</remote-id>
+  </upstream>
+</pkgmetadata>
--- a/app-misc/nerdfetch/Manifest
+++ b/app-misc/nerdfetch/Manifest
@@ -1 +1 @@
-DIST nerdfetch-8.1.1.tar.gz 5403 BLAKE2B 78f827858072d1feea2903341b6c6658702edf49fe98fb7d592570181fc35b6a56d03b11e5857853df606b17c1a1cd2a02d3107fd4c14c1ffbb0c182c76e31e6 SHA512 ab9e36be77aaa8b67379a321985b78cc38360ed9dd028369562b0d34aa89c9f2d1fe38fc7810dee1fb28bfc2f935762ae22e537f18987cf024a4b59e981929a2
+DIST nerdfetch-8.1.2.tar.gz 5432 BLAKE2B 70d4f19b0b4b40ae46616d637043af0881e47367d0959b8ca9c690b15388eaab63e2c54cc4a7b865d0f60b43063cc4b2553e02c4ae842565c806e09e03c2e831 SHA512 7c5c4817e96102d152df1e5e74d5db3da534f02612568b3e2a783fc8fcb1deeb488c02cb90e23d0e3d7f97236e1f800629fbcc5b01331567c0fe113065ce5013
--- a/app-misc/nerdfetch/nerdfetch-8.1.2.ebuild
+++ b/app-misc/nerdfetch/nerdfetch-8.1.2.ebuild
--- a/app-mobilephone/usb-tethering/files/usb-tethering
+++ b/app-mobilephone/usb-tethering/files/usb-tethering
@@ -59,7 +59,7 @@ setup_usb_network_configfs() {
 	mkdir $CONFIGFS/g1/configs/c.1/strings/0x409 \
 		|| echo "  Couldn't create $CONFIGFS/g1/configs/c.1/strings/0x409"
 	echo "rndis" > $CONFIGFS/g1/configs/c.1/strings/0x409/configuration \
-		|| echo "  Couldn't write configration name"
+		|| echo "  Couldn't write configuration name"

 	# Link the rndis instance to the configuration
 	ln -s $CONFIGFS/g1/functions/"$usb_rndis_function" $CONFIGFS/g1/configs/c.1 \
--- a/app-shells/carapace/Manifest
+++ b/app-shells/carapace/Manifest
@@ -1,6 +1,6 @@
-DIST carapace-1.0.1-deps.tar.xz 3059464 BLAKE2B 2d6590659d707e8820c71f25b1d69e88b0f40a0a9738e3568095568bd2db013acbd754f913060c778a3932b4f16688e94f768680a5843b19a2b7a62da81c4f72 SHA512 4ac7f058a6fa27c9c205eddc31557cdd025d6946313b53f5da08c5608c1b8a62d79b6758f1729832b7cff05ead696367fcd3441aaa6f9f5a92cf6531f3a1b523
-DIST carapace-1.0.1.tar.gz 14611346 BLAKE2B 6e7d0ce9897f4b4251531d951cbdece9420931141d311b84b873ecd51f9e1ebe9bd0ee4ab647e1e578ed372469e11769621448c8e0b6c61774513088bb6da763 SHA512 4e4d745879209343ff06e2d716bcbb7ec59920bb885deea9cb6a765d4c7a2040e4ace578e3fa820bda4c89a6ecab55e48e914f22c00565551331645e62e3fe73
 DIST carapace-1.0.2-deps.tar.xz 3057732 BLAKE2B e657e06d1cf7d2f72210c2d61c5b5180db8a14f2aa93bcea463311c7523b4d0e8ce27f344e7fae54ac3fb4a941679d41882213cdc3a3db101821ac8227cd5919 SHA512 268989ab7ee3d86b174b261517bc2bc55ba33467d3f7eb88ebba220164bb938a4a7560afcc5aef7c9fc112d896116f9d6db26176c8aa4b32742ea4229abbf7ea
 DIST carapace-1.0.2.tar.gz 14617140 BLAKE2B 0837165d4930d6e9fdd47ece9c51a8c7470bf6abd4f873c023658ed8c39e307a7b2a66f0d79d47f9767b29207e09ee9fb12e82d136e5e4b04709fd0202d76150 SHA512 f32bea9b15d0517dab0a0e5176fdab4e23dc3c11209a9647578adf3f2a12628d69424505e1833bbab497d8f8348c393e0dcf5250434cf860ae2e6bb0e04e2bc5
 DIST carapace-1.0.3-deps.tar.xz 3060444 BLAKE2B 560a0ee95810cca800ab4ebcf22c90e7971c7748ff50da79ae5c58b9775c4ed159ea67b2ecdb232bd7e919b0831641510cae30fdff6e91592b983a3581bc7e18 SHA512 996364d0746c678bb75e950656e0d969ff78235e148afb415472b3153169f2d5d4c74e361490e69f84b50564246cf18b7ef2238c09de7445694d427accdaa4c9
 DIST carapace-1.0.3.tar.gz 14613295 BLAKE2B 71cd6675a30673dba859f3647ee18299def074c4e8d1dd29ffa0c0264d128c55a04f3177f67928742b5a86984aee3782432e041376e6a702c6715e4fd67bb9aa SHA512 8b1781bff0d2f1e9a7b9b433153eced755231479c7eabf383af07687b4c588f8488dc43d4f6707ba345548737318b442ac0e4614068017106540ef50ef4b1527
+DIST carapace-1.0.4-deps.tar.xz 3065556 BLAKE2B e5eaff8be53fd55e1a862806204efdd8ba6ef08ffb2b6f1d3dcfdccb1e3360b9a44d2c2a644246c11792206b079af1ea77ff3868e41567653f093545962a0286 SHA512 89dcccee7b98a9585e7a13b4da11d41fbda9f67bc82737a28a3809b9b79812cf6d22db77d76ccb3b2c73c6255b062ef02dc54a4f76188bac3da6503d054d34fd
+DIST carapace-1.0.4.tar.gz 14721282 BLAKE2B 078a1acd6071729421e3107c5045ee5af14b45c0a27f5e7c9db8a81ee4116c07c086e7f15a5ca029743b5d2ca4091ea0cdfbf8a99e8727268637ab5025df5955 SHA512 cafc801adbb598cae105aeb3befb64870d93ced4b2c0d4e2b891e593615e050c5bf4fcfa57940322ed4024d62469c23de515cfca56e260827c689319b43ca706
--- a/app-shells/carapace/carapace-1.0.4.ebuild
+++ b/app-shells/carapace/carapace-1.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8
@@ -7,8 +7,11 @@ inherit go-module

 DESCRIPTION="Multi-shell multi-command argument completer"
 HOMEPAGE="https://carapace.sh/"
-SRC_URI="https://github.com/${PN}-sh/${PN}-bin/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-	https://gitlab.com/freijon_gentoo/${CATEGORY}/${PN}/-/raw/main/${P}-deps.tar.xz"
+SRC_URI="https://github.com/${PN}-sh/${PN}-bin/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+# Using a dependency tarball as per https://devmanual.gentoo.org/eclass-reference/go-module.eclass/index.html
+DEPS_URI="https://gitlab.com/freijon_gentoo/${CATEGORY}/${PN}/-/raw/main/${P}-deps.tar.xz"
+SRC_URI+=" ${DEPS_URI}"

 S="${WORKDIR}/${PN}-bin-${PV}"

--- a/app-text/jrnl/jrnl-4.1.ebuild
+++ b/app-text/jrnl/jrnl-4.1.ebuild
@@ -1,3 +1,6 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
 EAPI=8

 PYTHON_COMPAT=( python3_{10..12} )
--- a/app-text/jrnl/jrnl-9999.ebuild
+++ b/app-text/jrnl/jrnl-9999.ebuild
@@ -1,3 +1,6 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
 EAPI=8

 PYTHON_COMPAT=( python3_{10..12} )
--- a/app-vim/yats/Manifest
+++ b/app-vim/yats/Manifest
@@ -1,2 +1,2 @@
-DIST yats-2022.08.26.tar.gz 218153 BLAKE2B 0733327d3e329ee8492ac084613eaaa002e48aded81496f0eaddbabfc0f40f2d097e761e850c32594467cc1d71ca498ed265a3102c906b6f903254e2868beb8f SHA512 4bf429edf27bbd199030d79e1273ad6aeb52b53a5d4ead79951b6fb488e0f5f98a4c5b65808a5f02362b649ae71c28841cfbb5d76e6bec0dfd195a908d55591f
 DIST yats-2023.08.24.tar.gz 220267 BLAKE2B aa42e65d3ddce06b0166a5d694d2303f1f046f6e5e0257234022684f2b80e537ceb4254c9c819aaffde0b0a272e56efb3ef2faf26652097329cb210b6e5e6fc8 SHA512 73dc6b04609682097918577ab89aad2f355ab9b6d8eba92685348ba0918503577604bc7e9b4041962f17e56eb2cc6b4e9f07d252d55a88ae543cec3b7570453d
+DIST yats-2024.05.31.tar.gz 222463 BLAKE2B 6e666308222a4238a8774dc5f3e9cbb625534030774d9e78895c3fa8590afec9d14f2c736ffff1bfa68b7757ed27314578d565b9196b5e207c7bfbea038f9164 SHA512 ee5c2fcd5c56f4e618b71d49636e4af3ae49a90cc810e91b8560cf55f4ed527c32f6cd08d156fc8a721076ec0359ab4c6ce787b07c60a1b782aa52782f348cca
--- a/app-vim/yats/yats-2024.05.31.ebuild
+++ b/app-vim/yats/yats-2024.05.31.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8
@@ -6,7 +6,7 @@ EAPI=8
 inherit vim-plugin

 MY_PN="${PN}.vim"
-COMMIT="4bf3879055847e675335f1c3050bd2dd11700c7e"
+COMMIT="9b16b86f7be4603b416ab18a9e57a34e86e7bec2"
 DESCRIPTION="vim plugin: Yet Another TypeScript Syntax"
 HOMEPAGE="https://github.com/HerringtonDarkholme/yats.vim"
 SRC_URI="https://github.com/HerringtonDarkholme/${MY_PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
@@ -26,21 +26,16 @@ BDEPEND="

 DOCS=( CHANGES.markdown README.md )

-src_prepare() {
-	default
-	rm Makefile || die
-
-	# failing tests
-	rm test/tsx.indent.vader || die
+src_compile() {
+	:
 }

 src_test() {
-	cd test || die
-
 	unset DISPLAY
-	export TERM=xterm
+	local -x TERM="xterm"

-	vim -eu "${FILESDIR}"/vimrc -c 'Vader! ./*.vader' || die
+	cd test || die
+	vim -eu "${FILESDIR}"/vimrc -c "Vader! syntax.vader tsx.vader" || die
 }

 src_install() {
--- a/dev-cpp/cpptrace/Manifest
+++ b/dev-cpp/cpptrace/Manifest
@@ -1,2 +1,3 @@
 DIST cpptrace-0.5.2.tar.gz 311215 BLAKE2B 77f5bce58ac088c5430cfa6b427bc8f019590520be8648a848108f4dbb23d3ce1260f6a3dd1d6bc9acf3a069218f3a25853083f88700d9dbdbeeadd20f9bc873 SHA512 e05a8a070ec7be0a1b36f25901c3ed7b566e4ca69e8e87cde558a0e65743d2dabd4cbad614af32d62a4da4b6a77144853adf7cb1be33335a86f7b1ef2d08c72f
 DIST cpptrace-0.6.0.tar.gz 318375 BLAKE2B 5c1694b6e579fb097379e9e9788ae84f89e1cd65848cf6fce79c8f9415e1b047fb018142a4d6fd868c021ae1d140d21e955d30f7eeb55f341f74ce7a4de68e32 SHA512 c5ebd1a733e22006abe2ef2b5e65a9f967ef2a433194d1c2dbed2dea7a81034a56717ad54698eaad20b3c53b941a2766587dc32936b3703ef87fda29eafc5dbf
+DIST cpptrace-0.6.2.tar.gz 319911 BLAKE2B 63531a4097f45dd5f24bc0b4227b7872c0b5303443bec7394da5dea3e25df56865673d3d0243fcb59213c00d2b6d3bb28fb525cf5d40ec639f686c4e552f6ca2 SHA512 aaf14207dbcb3e3fd551cfc4a4dbee265f9454f205362eb061fd5672ee54d19e3966a5f497bc90689a4c426ab4f9225f083d3a84bf4a0060b851cdf252f22615
--- a/dev-cpp/cpptrace/cpptrace-0.6.2.ebuild
+++ b/dev-cpp/cpptrace/cpptrace-0.6.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Simple, portable, and self-contained stacktrace library for C++"
+HOMEPAGE="https://github.com/jeremy-rifkin/cpptrace"
+SRC_URI="https://github.com/jeremy-rifkin/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+KEYWORDS="~amd64"
+
+DEPEND="dev-libs/libdwarf
+	test? ( dev-cpp/gtest )"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-fix-tests.patch" )
+
+
+src_configure() {
+	local mycmakeargs=(
+		-DCPPTRACE_USE_EXTERNAL_LIBDWARF=On
+		-DCPPTRACE_USE_EXTERNAL_GTEST=On
+		-DCPPTRACE_BUILD_TESTING=$(usex test)
+	)
+
+	cmake_src_configure
+}
--- a/dev-cpp/cpptrace/files/cpptrace-fix-tests.patch
+++ b/dev-cpp/cpptrace/files/cpptrace-fix-tests.patch
@@ -0,0 +1,12 @@
+diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
+index 1fc6c66..ec60849 100644
+--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
+@@ -60,6 +60,6 @@ if(NOT CPPTRACE_SKIP_UNIT)
+   )
+   target_compile_features(unittest PRIVATE cxx_std_20)
+   target_link_libraries(unittest PRIVATE ${target_name} GTest::gtest_main GTest::gmock_main)
+-  target_compile_options(unittest PRIVATE ${warning_options} $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wno-pedantic -Wno-attributes>)
+  target_compile_options(unittest PRIVATE ${warning_options} $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wno-pedantic -Wno-attributes -ggdb>)
+   add_test(NAME unittest COMMAND unittest)
+ endif()
--- a/dev-db/tdscpp/Manifest
+++ b/dev-db/tdscpp/Manifest
@@ -1 +1 @@
-DIST tdscpp-20240212.tar.gz 724415 BLAKE2B 669b2741deb4881b698db68ec5db09da79345caa59d6d2a41938219bede27b00cb33d5cc404173ad9a1fe09d976e3fe46d25c5020c971704163577622e2695ce SHA512 bc88ccfced8dafd57ff14e480a3a911f8d00243c2d022fdee07afb5e49a285b82871cd43e50d3960370b7225aa86ace191725411128969c9fc47e85f3ab8aa8b
+DIST tdscpp-20240629.tar.gz 726330 BLAKE2B 61d3de2cf991d109cd58e3fc5cbdb2e5d5503fedba40431fff7eb01483e06e6d5ace737f650d44e1033f778cfcb893fd6f1f0506bc848ebebbb9e152332cc4ee SHA512 96ccfe86ecbe34fa7c55115d33ceb277c065f3ffef8600e1cf5df5daf458fedf35e994d3d335b5724436bf283622d32252616d4e9336fcf0123af5edb3f32bf1
--- a/dev-db/tdscpp/tdscpp-20240629.ebuild
+++ b/dev-db/tdscpp/tdscpp-20240629.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://codeload.github.com/maharmstone/tdscpp/tar.gz/refs/tags/${PV} -

 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 IUSE="kerberos +ssl"

 DEPEND="dev-cpp/nlohmann_json
--- a/dev-embedded/bcm2-utils/bcm2-utils-0.9.8.ebuild
+++ b/dev-embedded/bcm2-utils/bcm2-utils-0.9.8.ebuild
@@ -30,3 +30,8 @@ src_install(){
 	mkdir -p "${D}/usr/bin" || die
 	emake PREFIX="${D}/usr" install
 }
+
+src_test(){
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
+		LDFLAGS="${LDFLAGS}" check
+}
--- a/dev-lang/swift/Manifest
+++ b/dev-lang/swift/Manifest
@@ -0,0 +1 @@
+DIST swift-5.10.1-RELEASE-fedora39.tar.gz 701249576 BLAKE2B 37e3e989476c9676c642c604948eec1285f06998f02e8d75ed723bebb360069dc77d1eabcc8c97039461e018034d71ff7867cb9308c839fd708cca87f3ee90e1 SHA512 582e2f23e6b9dca76c908452ad1a0f20e0ab1f789b3e140568427f13736071ec9ce9c16abaa90535510cc5a08001cd5e95961ae8bb591b249c16f3881d289859
--- a/dev-lang/swift/metadata.xml
+++ b/dev-lang/swift/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 needed -->
+  <upstream>
+    <remote-id type="github">swiftlang/swift</remote-id>
+  </upstream>
+</pkgmetadata>
--- a/dev-lang/swift/swift-5.10.1.ebuild
+++ b/dev-lang/swift/swift-5.10.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit python-single-r1
+
+DESCRIPTION="A high-level general-purpose, multi-paradigm, compiled programming language"
+HOMEPAGE="https://www.swift.org/"
+SRC_URI="amd64? ( https://download.swift.org/${P}-release/fedora39/${P}-RELEASE/${P}-RELEASE-fedora39.tar.gz )"
+S="${WORKDIR}/${P}-RELEASE-fedora39/usr"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="bindist mirror test strip"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-db/sqlite
+	dev-lang/python
+	dev-libs/libedit
+	dev-libs/libxml2
+	dev-vcs/git
+	net-misc/curl
+	sys-devel/binutils[gold]
+	sys-devel/gcc
+	sys-libs/ncurses
+	sys-libs/zlib
+"
+
+BDEPEND="dev-util/patchelf"
+
+QA_PREBUILT="*"
+
+src_install() {
+	# lib/swift/linux/libicudataswift.so.69.1 has an empty DT_RUNPATH, which
+	# fails `rpath_security_checks`. It contains only data, so we can remove its
+	# rpath altogether.
+	patchelf --remove-rpath lib/swift/linux/libicudataswift.so.69.1
+
+	# The RELEASE tarball is a self-contained portable installation that's
+	# _significantly_ easier to leave as-is rather than attempt to splat onto
+	# the filesystem; we'll install the contents as-is into
+	# `/usr/lib64/swift-{version}` (e.g., `/usr/lib64/swift-5.10.1`) and expose
+	# the relevant binaries via linking.
+	dest_dir="/usr/lib64/swift-${PV}"
+	mkdir -p "${ED}${dest_dir}"
+	cp -pPR "${S}" "${ED}${dest_dir}"
+
+	# Swift ships with its own `clang`, `lldb`, etc.; these don't need to be
+	# exposed externally, so we'll just symlink Swift-specific binaries into
+	# `/usr/bin`.
+	find bin -maxdepth 1 \( -type f -o -type l \) \
+		\( -name "swift*" -o -name "sourcekit*" \) -executable -print0 |
+		while IFS= read -r -d '' exe_path; do
+			exe_name="$(basename "$exe_path")"
+			dosym -r "${dest_dir}/usr/bin/${exe_name}" "/usr/bin/${exe_name}"
+		done
+}
--- a/dev-libs/feedbackd/Manifest
+++ b/dev-libs/feedbackd/Manifest
@@ -1,4 +1,4 @@
 DIST feedbackd-0.3.0.tar.xz 106640 BLAKE2B 03c5d11422891d2c36c07e07e3ea705de0e5fca0e759bd2cfd481959c7782a63b76b79e11cdf3f37d50b22a9deeab79a30faefefdc399fb0d2ea544d76532e96 SHA512 243ee56cb96541181fc2ae614ae80be694dc1d7cf3a240927f843efb7c8736e0c4ca227af8872ed3caad68ff896c5339ea3f4148099f5327a16ca0c95346d996
 DIST feedbackd-0.3.0.tar.xz.asc 833 BLAKE2B 85979a8d0dc2be4fa4f0ba9ee3bf02b05415aafed62b259a1dbd2bbd5c8b09b447bfa33d4909f2ed08060f3cbdaf5610a9a0c3e60784577155e12553650fbe00 SHA512 d17c3374a522c76a86bbae0fdb920e5372d48336890d1616e693f157ff5b5949152ff83b6ce5710c4d147d0265cb3b430cbc4bb4dc091e1910badbd831655019
-DIST feedbackd-v0.2.0.tar.bz2 76695 BLAKE2B 81928442f05c0623eba46aa37ba1957c216d8d7fe8bd89b55a3ab4928d3b95c4792ee30325f878eb9bce82ee262219233b9cdc3e086c1954e7811d5574b9ecaf SHA512 d758cd135b10b76fd35b64a66ec46261fc66be75095898a6592f4efdea7a9f94a850c654e63cde028e9f80cc7f180396d7e1fe46222611c5140b2116ac04ca6d
-DIST gmobile-d483537aee4778b114ce5d50c4c8a9f8d58337ed.tar.bz2 20337 BLAKE2B f94295672ed699f308ccfab3835ed6c7f1184c0e267ea1c2ab7b6d59c98b3d027b300bf6d29db6442de20cec852f5c1031d1b09f220e94afc79c48566c160676 SHA512 86acabbffb1b5f98f2b132ce5bd12940769c11ed53d38401a0048216943a4b095bd230774d83444e7b5f5d26825f32ced0075dce7354f6fa486d47ef5f86b4f3
+DIST feedbackd-0.4.0.tar.xz 94668 BLAKE2B bae08fd6d694748ae07b650ca11d2257741b8f7d60050e0d4dc5af26143e470866084881c1a78651b8ad7660212e0d9a749973cae6f0e97db61f0df995c37193 SHA512 43d6f6cd84ae6ebfd0ed0442080f80e75a89bb1a56bcbc9bf9cb357d6ac680fbd6e0d487ef89f8759f3093b09bedc427cba0958a761c4307bcd3633bd8d8f26e
+DIST feedbackd-0.4.0.tar.xz.asc 833 BLAKE2B 625370c8e9630fcce793bffde821a3d04e8afdef2b7d2a36ab1594bd9a6e0a7361aec178469f6bffbd40d7098ccbc066fd20ec2d888a6f5c5289736040159c5f SHA512 505eff3731dcbdb79a921ccc8da6cd869624ddb675b38c21f1c26f5eab27fc8dd2e8a150c59f9e19d0d22cc5afac15b66c7cf0cb9b08313753fc0a3fcfedadce
--- a/dev-libs/feedbackd/feedbackd-0.4.0.ebuild
+++ b/dev-libs/feedbackd/feedbackd-0.4.0.ebuild
@@ -4,32 +4,31 @@
 EAPI=8
 VALA_USE_DEPEND="vapigen"

-inherit vala meson udev
+inherit meson udev vala verify-sig

-GMOBILE_COMMIT="d483537aee4778b114ce5d50c4c8a9f8d58337ed"
 DESCRIPTION="A daemon to provide haptic feedback on events"
 HOMEPAGE="https://source.puri.sm/Librem5/feedbackd"
-SRC_URI="
-	https://source.puri.sm/Librem5/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2
-	https://gitlab.gnome.org/guidog/gmobile/-/archive/${GMOBILE_COMMIT}.tar.bz2 -> gmobile-${GMOBILE_COMMIT}.tar.bz2
-"
-S="${WORKDIR}/${PN}-v${PV}"
+SRC_URI="https://sources.phosh.mobi/releases/${PN}/${P}.tar.xz
+	verify-sig? ( https://sources.phosh.mobi/releases/${PN}/${P}.tar.xz.asc )"

 LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="+daemon gtk-doc +introspection man test +vala"
+
 REQUIRED_USE="vala? ( introspection )"
 RESTRICT="!test? ( test )"

 DEPEND="
 	dev-libs/glib:2
+	dev-libs/gmobile
 	daemon? (
 		dev-libs/json-glib
 		dev-libs/libgudev
 		media-libs/gsound
 	)
 	introspection? ( dev-libs/gobject-introspection )
+	test? ( dev-util/umockdev )
 "
 RDEPEND="${DEPEND}
 	dev-libs/feedbackd-device-themes
@@ -39,16 +38,14 @@ BDEPEND="
 	gtk-doc? ( dev-util/gi-docgen )
 	man? ( dev-python/docutils )
 	vala? ( $(vala_depend) )
+	verify-sig? ( sec-keys/openpgp-keys-phosh )
 "

+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/phosh.asc"
+
 src_prepare() {
 	default

-	if use daemon; then
-		rmdir "${S}/subprojects/gmobile" || die
-		mv "${WORKDIR}/gmobile-${GMOBILE_COMMIT}" "${S}/subprojects/gmobile" || die
-	fi
-
 	use vala && vala_setup
 	sed -i 's/-G feedbackd/-G video/g' debian/feedbackd.udev || die
 }
--- a/dev-libs/gmobile/Manifest
+++ b/dev-libs/gmobile/Manifest
@@ -1,2 +1,4 @@
 DIST gmobile-0.1.0.tar.xz 45044 BLAKE2B 90d9efaf4383392fc55c15540ae7b600cea486750885d22df467fb20ade748d28784856301fbdd614a9148dbc40f015a8f8a8369dff310f54e95e1468b8c966d SHA512 eb17d0b39d5dbe197a2502fe974af37076317094c4759bbc4924d951fdb1bdb1fe8f13a85419dad756954c165bbd6dfca4ce555f6e3f5a3def4bac8bc913ab1a
 DIST gmobile-0.1.0.tar.xz.asc 833 BLAKE2B 30c6a97e78cb03beda468e1759d73d55892f61785adcde390195b0089df039a2c50882e0f22d2db925a324af0869d659d6c9dc71f405bfd608a07521481e261b SHA512 a90ff042dcd6e26508e9927a92c3ab537ca9556a758e2064d0a480c11b83c1355f6422f9e2ee0a51dc4e28355ef9b626b0c0388ed59363c42581037d5b781080
+DIST gmobile-0.2.1.tar.xz 54500 BLAKE2B 4daf129db96db9251320bf31d2a9d4951cd55b4622a69d45fbaa0b716d967aada4cc72a1594a96ed48dd5f822f4de032b8957f38f57d31db7602ef2d5af4d93e SHA512 f572900d177f12554357fe467aca98a61ea9b95f0ceffa64f877d78d627d32c7dbc4ca2665c2602ca16097d6aab53fddfc413055f4810e10d55c331c5ebf147c
+DIST gmobile-0.2.1.tar.xz.asc 833 BLAKE2B 96736ec7924ac279da7b42cb37a53005bb1af4aa18786445e04bacac49c1a79f56b8e7184c69eb14bbc982de6bead322f4748cc11fa0bc91b53f642b9530dd6b SHA512 89fd0d2033a3eff1b599df6eff495fb91315d7ea11c4d311bcdc4aab43003d7ad1ab83e4ae41f4cdaf600f9110f31f86cfedcaf294a9622bdb2dd728d7d8d1cf
--- a/dev-libs/gmobile/gmobile-0.2.1.ebuild
+++ b/dev-libs/gmobile/gmobile-0.2.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+VALA_USE_DEPEND="vapigen"
+
+inherit meson udev verify-sig
+
+DESCRIPTION="Mobile related helpers for glib based projects"
+HOMEPAGE="https://gitlab.gnome.org/World/Phosh/gmobile/"
+SRC_URI="https://sources.phosh.mobi/releases/${PN}/${P}.tar.xz
+	verify-sig? ( https://sources.phosh.mobi/releases/${PN}/${P}.tar.xz.asc )"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="gtk-doc +introspection man test udev"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	>=dev-libs/glib-2.66:2
+	>=dev-libs/json-glib-1.6.2
+	introspection? ( dev-libs/gobject-introspection )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	gtk-doc? ( >=dev-util/gi-docgen-2021.1 )
+	man? ( dev-python/docutils )
+	verify-sig? ( sec-keys/openpgp-keys-phosh )
+"
+IDEPEND="udev? ( virtual/udev )"
+
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/phosh.asc"
+
+src_configure() {
+	local emesonargs=(
+		-Dexamples=false
+		$(meson_use gtk-doc gtk_doc)
+		$(meson_use introspection)
+		$(meson_use man)
+		$(meson_use test tests)
+		$(meson_use udev hwdb)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	# https://bugs.gentoo.org/930407
+	find "${ED}"/usr/$(get_libdir) -name "*.a" -delete || die
+
+	if use gtk-doc; then
+		local gtkdocdir="${ED}/usr/share/gtk-doc/html/"
+		mkdir -p "${gtkdocdir}" || die
+		mv "${ED}"/usr/share/doc/${PN}-${SLOT} "${gtkdocdir}" || die
+	fi
+}
+
+pkg_postinst() {
+	use udev || return 0
+
+	udev_reload
+}
+
+pkg_postrm() {
+	use udev || return 0
+
+	udev_reload
+}
--- a/dev-libs/libopensmtpd/Manifest
+++ b/dev-libs/libopensmtpd/Manifest
@@ -1 +0,0 @@
-DIST libopensmtpd-0.7.tar.gz 34942 BLAKE2B 09b820bed528678adce8e52db9a0001732636668ece49eca4bd91c35374d53d3c076367dc543d06ef73b671b2776942bb210b82da4a4804db7a91e5065545df5 SHA512 53153eea5ed85309434316fa9bbba032aba9cac30744a6c228892b5fdf67f9df7e05c25832f16845c603892a255dfcf67d432e2a43ec6228f3103cf92ba2394f
--- a/dev-libs/libopensmtpd/libopensmtpd-0.7.ebuild
+++ b/dev-libs/libopensmtpd/libopensmtpd-0.7.ebuild
@@ -1,38 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Library for creating OpenSMTPD filters"
-HOMEPAGE="http://imperialat.at/dev/libopensmtpd/"
-SRC_URI="http://imperialat.at/releases/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/0.1"
-KEYWORDS="~amd64"
-
-DEPEND="dev-libs/libevent:="
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	tc-export CC
-}
-
-src_compile() {
-	local myargs=(
-		MANFORMAT=mdoc
-	)
-	emake -f Makefile.gnu "${myargs[@]}"
-}
-
-src_install() {
-	local myargs=(
-		MANFORMAT=mdoc
-		DESTDIR="${D}"
-		LOCALBASE="${EPREFIX}"/usr
-		LIBDIR="${EPREFIX}"/usr/$(get_libdir)
-	)
-	emake -f Makefile.gnu "${myargs[@]}" install
-}
--- a/dev-libs/libopensmtpd/metadata.xml
+++ b/dev-libs/libopensmtpd/metadata.xml
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<maintainer>
-			<email>martijn@openbsd.org</email>
-			<name>Martijn van Duren</name>
-		</maintainer>
-	</upstream>
-</pkgmetadata>
--- a/dev-nim/cligen/Manifest
+++ b/dev-nim/cligen/Manifest
@@ -1,2 +1,2 @@
-DIST cligen-1.6.7.tar.gz 441610 BLAKE2B 46fda5067e6df440b9954a4b99e09454d7610c3ae4c878be533f097d7159d6eea9b3dd34bb63cab746e951818f15b901c53591ef51f78c39d9b784d25feb27ef SHA512 66026590c5ee319eac18ab1edbe39ad4858b206243ada3e64fbbfcad625eafa18adcb607a49ab225ca629b71ae28bf67c1e47360e08ea75e0d9df4f067fc67a2
 DIST cligen-1.6.8.tar.gz 442112 BLAKE2B 91166348ee373821f2dc3f58ada6b9b1b7ba5331b57cf593d5091a448ca877c0b1db8b8dfc155ba18d6f9aeeaa5f879ae2e956bd9935e6d7abc29907c2afa266 SHA512 d9ee7ec2ee90e4accc40bedab29fd5f5746318edd1290c55a9a9dd1e1a8c13bfae94efcb07ecc62b4c96c6d608e33856d9971e46531c4944d15278600dc6a6a4
+DIST cligen-1.7.2.tar.gz 450244 BLAKE2B cdf6dfd7f63005d88a0cbb073e3a286ad85e2949c61ea211928e64b0c6eb7bc1a43b8fad8a54c7b610986996be9319e5a17d6427c9f152189bfa1eb84e22cc2c SHA512 f8bc42006e8b838d075a3d9e284c76e2d83a8ef5c935a0d8f5bb013eaa27d808d217cf5dbc8f200d8b35695d9b73229eaf5497e8cc061ec591938163b1417695
--- a/dev-nim/cligen/cligen-1.7.2.ebuild
+++ b/dev-nim/cligen/cligen-1.7.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8
@@ -8,7 +8,6 @@ inherit nimble
 DESCRIPTION="Infer & generate command-line interface/option/argument parser"
 HOMEPAGE="
 	https://c-blake.github.io/cligen/
-	https://nimble.directory/pkg/cligen
 	https://github.com/c-blake/cligen
 "
 SRC_URI="https://github.com/c-blake/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
@@ -23,7 +22,7 @@ DOCS=( configs {MOTIVATION,README,RELEASE-NOTES,TODO}.md )
 set_package_url "https://github.com/c-blake/cligen"

 src_test() {
-	emake V=1
+	emake V=1 NIM_EXTRA="--processing:off"
 }

 src_install() {
--- a/dev-nim/inim/Manifest
+++ b/dev-nim/inim/Manifest
@@ -1 +1,2 @@
 DIST inim-0.6.1.tar.gz 577278 BLAKE2B b3581ad658b5d7134e557487453fa29a7f23c534d1c5def5e787f4e1ff7f7f7e17e44a6f40782ceae494b413354c0c9491ba328cc7347f95bb7c2b66c2f58df6 SHA512 3c153261aa6c16579f954e1e9dc713e8c33c177bbb6275b5bb613c811ed8f9be075f28ae7a1574a7742a8eb9918da5df49529501947edca927723a7a3c84d2d9
+DIST inim-1.0.0.tar.gz 577871 BLAKE2B 6116f516425a4751c0e2387894ab3b145ee221065f5510a8552ea313d8c85ac88f5a1be3b0ab1c4ca19f88f2be95529e296b3e278f937f70d59abe9379d8ec3c SHA512 4a13f1fd2a0bf3ec627ed2f7f7c104404eb5f7a5531a3634c0d8f708e9c9e217412805834fb37ac1a8c6a0ce701e71dfd79a4fc4c4d78a12b5c6e9809a4c9c9f
--- a/dev-nim/inim/inim-1.0.0.ebuild
+++ b/dev-nim/inim/inim-1.0.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit nimble
+
+DESCRIPTION="Interactive Nim Shell / REPL / Playground"
+HOMEPAGE="https://github.com/inim-repl/INim"
+SRC_URI="https://github.com/${PN}-repl/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/INim-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	>=dev-nim/cligen-1.5.22
+	>=dev-nim/noise-0.1.4
+"
+
+DOCS=( {README,SECURITY}.md readme.gif )
--- a/dev-util/hut/Manifest
+++ b/dev-util/hut/Manifest
@@ -1,2 +1,2 @@
-DIST hut-0.5.0-vendor.tar.xz 619096 BLAKE2B de94aaa087c857365e52ff8928d61aad1e9ae05cb8601531012df58cdfd878ccf1f89ec8c7c84bed0667b6d153a5b6a30d1ee5a0b758c0fc7e557f0e7159a3c7 SHA512 06015a5fe47524790df63ec123c64c33e7f9282956db04253dccebede7050db58bd3b6cf80275a25ccaccacd57f42939ba03b063801c83019ff42348dcc99401
-DIST hut-0.5.0.tar.gz 129041 BLAKE2B 7e551f337525a7e043acba6b15e260488fdc498f87cfce0ec7d473d7e6070eda5f307a4cc1a8a16b40ec040bdacb8c28a23c3be2009a4c1e052e85a6a943cf72 SHA512 f24a0bfcb96f1643d1f6c741c101f54b9a522f3fde6fcd7fc65f27bbec0303e304dc2430cafec0a17aa471ec78e37b2c65cdf401cc5034480cd82f27ed3166d3
+DIST hut-0.6.0.tar.gz 137077 BLAKE2B 7d9ba6aebb4439457026efe3e7d798c7ca483e9d02c586677053a7dfe781bb0bbc79ef923f148449348b301c8abd543407cc6e3d802fb3696a7aec104fd832c5 SHA512 288acd443023297104cef963026b0b0d54713515e22870df767e562d4c4f031cad662ad4d341a6b4888661e4550e072300cc166fa1f1504926625121d56ae7a5
+DIST hut-v0.6.0-vendor.tar.xz 638564 BLAKE2B 675e264d03a56663bcd8e6d8e7810ad802a5bd3da4f77abed218fa23b360b78baaa606b7e896d8be16961edba6065ca42859191f90c87fd7caf707c928734522 SHA512 a1ebbfc4fa06b78165d30320dc044c257eb28211ef23c7ceba6cb117fb6c4894e4b39336d226f7996603027cf9d597369a92f1afe13942cd8c135562c5dc7379
--- a/dev-util/hut/hut-0.6.0.ebuild
+++ b/dev-util/hut/hut-0.6.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://sr.ht/~xenrox/hut/"

 SRC_URI="
 	https://git.sr.ht/~xenrox/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/cjbayliss/hut-vendor/releases/download/v${PV}/hut-${PV}-vendor.tar.xz
+	https://github.com/cjbayliss/hut-vendor/releases/download/v${PV}/${PN}-v${PV}-vendor.tar.xz
 "

 S="${WORKDIR}/${PN}-v${PV}"
--- a/eclass/nimble.eclass
+++ b/eclass/nimble.eclass
@@ -178,7 +178,7 @@ nimble_src_compile() {
 nimble_src_test() {
 	debug-print-function ${FUNCNAME} "${@}"

-	if nonfatal nimble_build test -n &> /dev/null; then
+	if nonfatal nimble_build -n test &> /dev/null; then
 		nimble_build test "${@}"
 	fi
 }
--- a/games-engines/fs2_open/Manifest
+++ b/games-engines/fs2_open/Manifest
@@ -1,6 +1,6 @@
-DIST fs2_open-23.0.0-ext_libRocket.tar.gz 2417905 BLAKE2B 0e5ac40b0e811b9213fb84f6f2f0ef38ad7d562ae671e865d96e40615c2d67213905ce153a69192c0b53a3e4f0d1aef077c0769e46d308adf9210c0c9d1fe7c2 SHA512 700e242ecb5207faf729ca7d23ac4f28be819c0ef7a0ba51ca18de1592f1016040cd5e4c1c75a573f91cea69dd43549966ac089804a52c0f1b0cfbaabefc4346
-DIST fs2_open-23.0.0-ext_rpavlik-cmake-modules.tar.gz 267464 BLAKE2B d63fa3867aad5fad7bd5d20845dd8d6a6698d59dc30dc511704f3c74bbe958bb6d36160bae3ef5c01027719c50d18e4d24209ea5811c6a52c5af4d3de2a587e9 SHA512 0bb03e2a1c0cafa80849163455cdb5fc5c7200e51f18f0354c36f251b51156f86a04a9f87cd17e2942d14ae8767d8df756062fbcff9b37f04e8399b2e37d306f
-DIST fs2_open-23.0.0.tar.gz 12210430 BLAKE2B 95e5a4f328711a3915b2624941eb90810a19c4d8fe16edc0af47eec3cb1393be8379cd53f27cf378693ba711bd37f0fec360fda931ba17b883195f356a0f8dfc SHA512 efd3648986bb36f0b217ea033ab56ba7c1a705a0d9f16f0351a019d06276f68810729eb9749d1facbf8bc312114eb4e380b68049f5d30b410de2b28c5c67975e
 DIST fs2_open-23.2.1-ext_libRocket.tar.gz 2417905 BLAKE2B 0e5ac40b0e811b9213fb84f6f2f0ef38ad7d562ae671e865d96e40615c2d67213905ce153a69192c0b53a3e4f0d1aef077c0769e46d308adf9210c0c9d1fe7c2 SHA512 700e242ecb5207faf729ca7d23ac4f28be819c0ef7a0ba51ca18de1592f1016040cd5e4c1c75a573f91cea69dd43549966ac089804a52c0f1b0cfbaabefc4346
 DIST fs2_open-23.2.1-ext_rpavlik-cmake-modules.tar.gz 267464 BLAKE2B d63fa3867aad5fad7bd5d20845dd8d6a6698d59dc30dc511704f3c74bbe958bb6d36160bae3ef5c01027719c50d18e4d24209ea5811c6a52c5af4d3de2a587e9 SHA512 0bb03e2a1c0cafa80849163455cdb5fc5c7200e51f18f0354c36f251b51156f86a04a9f87cd17e2942d14ae8767d8df756062fbcff9b37f04e8399b2e37d306f
 DIST fs2_open-23.2.1.tar.gz 12091345 BLAKE2B a03179842d53dd429969b2863ab53f613b52bf70ff50d0991e0dd36a73ee0a2374a0d09e95a13410add9f8c4b955a49e9894b35b5ccb92982c63e06daec5694a SHA512 dfb4fe7c0f8048730e91e754754e26677706bb391c4d88ff7f4f6090d931db9dc2ca616dcd552d213d7c7de5b597a5cc43ab6bad0f422bc3e78dcbc15f64600b
+DIST fs2_open-24.0.2-ext_libRocket.tar.gz 2417905 BLAKE2B 0e5ac40b0e811b9213fb84f6f2f0ef38ad7d562ae671e865d96e40615c2d67213905ce153a69192c0b53a3e4f0d1aef077c0769e46d308adf9210c0c9d1fe7c2 SHA512 700e242ecb5207faf729ca7d23ac4f28be819c0ef7a0ba51ca18de1592f1016040cd5e4c1c75a573f91cea69dd43549966ac089804a52c0f1b0cfbaabefc4346
+DIST fs2_open-24.0.2-ext_rpavlik-cmake-modules.tar.gz 267464 BLAKE2B d63fa3867aad5fad7bd5d20845dd8d6a6698d59dc30dc511704f3c74bbe958bb6d36160bae3ef5c01027719c50d18e4d24209ea5811c6a52c5af4d3de2a587e9 SHA512 0bb03e2a1c0cafa80849163455cdb5fc5c7200e51f18f0354c36f251b51156f86a04a9f87cd17e2942d14ae8767d8df756062fbcff9b37f04e8399b2e37d306f
+DIST fs2_open-24.0.2.tar.gz 12652011 BLAKE2B f1ab67f8ceb9389a7087a1264897bc46748d8a7c18799941cca7acdbe64a718452fe755e6dc36067529e533ac881df2d6025147aa8e20aff8751e3a9eebbf1d0 SHA512 f0ffb5da42d0dba98f9f46432c09f8edc7e80f3e65a5d4c0ed9e2e37a26b63d67526982e7209edb6d6727b23d8ce1d75ccac6dcd8da74cd55f7e6fea52ad56d4
--- a/games-engines/fs2_open/files/fs2_open-23.0.0-disable-discord.patch
+++ b/games-engines/fs2_open/files/fs2_open-23.0.0-disable-discord.patch
@@ -1,107 +0,0 @@
--- fs2_open/freespace2/freespace.cpp	2023-02-11 13:13:50.000000000 +0100
-+++ fs2_open/freespace2/freespace.cpp	2023-02-11 13:32:41.501644997 +0100
-@@ -84,7 +84,6 @@
- #include "io/timer.h"
- #include "jumpnode/jumpnode.h"
- #include "lab/labv2.h"
-#include "libs/discord/discord.h"
- #include "libs/ffmpeg/FFmpeg.h"
- #include "lighting/lighting.h"
- #include "lighting/lighting_profiles.h"
-@@ -1987,9 +1986,6 @@
- #ifdef WITH_FFMPEG
- 		libs::ffmpeg::initialize();
- #endif
-		if (Discord_presence) {
-			libs::discord::init();
-		}
- 	}
- 
- 	mod_table_post_process();
--- fs2_open/code/source_groups.cmake	2023-02-11 13:13:50.000000000 +0100
-+++ fs2_open/code/source_groups.cmake	2023-02-11 13:53:03.901702823 +0100
-@@ -706,11 +706,6 @@
- 	libs/antlr/ErrorListener.h
- 	)
- 
-add_file_folder("Libs\\\\Discord"
-	libs/discord/discord.cpp
-	libs/discord/discord.h
-)
-
- if (FSO_BUILD_WITH_FFMPEG)
- 	add_file_folder("Libs\\\\FFmpeg"
- 		libs/ffmpeg/FFmpeg.cpp
--- fs2_open/code/mod_table/mod_table.h	2023-02-11 13:13:50.000000000 +0100
-+++ fs2_open/code/mod_table/mod_table.h	2023-02-11 13:57:44.162716081 +0100
-@@ -124,7 +124,6 @@
- } Shadow_disable_overrides;
- extern float Thruster_easing;
- extern bool Always_use_distant_firepoints;
-extern bool Discord_presence;
- extern bool Hotkey_always_hide_hidden_ships;
- extern bool Use_weapon_class_sounds_for_hits_to_player;
- extern bool SCPUI_loads_hi_res_animations;
--- fs2_open/code/mod_table/mod_table.cpp	2023-02-11 13:13:50.000000000 +0100
-+++ fs2_open/code/mod_table/mod_table.cpp	2023-02-11 13:57:15.745714737 +0100
-@@ -12,7 +12,6 @@
- #include "globalincs/version.h"
- #include "graphics/shadows.h"
- #include "localization/localize.h"
-#include "libs/discord/discord.h"
- #include "mission/missioncampaign.h"
- #include "mission/missionload.h"
- #include "mission/missionmessage.h"
-@@ -128,34 +127,10 @@
- shadow_disable_overrides Shadow_disable_overrides {false, false, false, false};
- float Thruster_easing;
- bool Always_use_distant_firepoints;
-bool Discord_presence;
- bool Hotkey_always_hide_hidden_ships;
- bool Use_weapon_class_sounds_for_hits_to_player;
- bool SCPUI_loads_hi_res_animations;
- 
-static auto DiscordOption = options::OptionBuilder<bool>("Other.Discord", "Discord Presence", "Toggle Discord Rich Presence")
-							 .category("Other")
-							 .default_val(Discord_presence)
-							 .level(options::ExpertLevel::Advanced)
-							 .importance(55)
-		                     .change_listener([](bool val, bool) {
-									if(Discord_presence){
-										if (!val) {
-											Discord_presence = false;
-											libs::discord::shutdown();
-											return true;
-										}
-									} else {
-										if (val) {
-											Discord_presence = true;
-											libs::discord::init();
-											return true;
-										}
-									}
-									return false;
-								})
-							 .finish();
-
- void mod_table_set_version_flags();
- 
- SCP_vector<std::pair<SCP_string, gr_capability>> req_render_ext_pairs = {
-@@ -1128,9 +1103,6 @@
- 		if (optional_string("$Use distant firepoint for all turrets:")){
- 			stuff_boolean(&Always_use_distant_firepoints);
- 		}
-		if (optional_string("$Enable Discord rich presence:")) {
-			stuff_boolean(&Discord_presence);
-		}
- 
- 		if (optional_string("$Always hide hidden ships in hotkey list:")) {
- 			stuff_boolean(&Hotkey_always_hide_hidden_ships);
-@@ -1285,7 +1257,6 @@
- 	Lead_indicator_behavior = leadIndicatorBehavior::DEFAULT;
- 	Thruster_easing = 0;
- 	Always_use_distant_firepoints = false;
-	Discord_presence = true;
- 	Hotkey_always_hide_hidden_ships = false;
- 	Use_weapon_class_sounds_for_hits_to_player = false;
- 	SCPUI_loads_hi_res_animations = true;
--- a/games-engines/fs2_open/files/fs2_open-23.0.0-dont-build-lz4.patch
+++ b/games-engines/fs2_open/files/fs2_open-23.0.0-dont-build-lz4.patch
@@ -1,9 +0,0 @@
--- fs2_open/lib/CMakeLists.txt	2023-02-11 13:13:50.000000000 +0100
-+++ fs2_open/lib/CMakeLists.txt	2023-02-11 13:45:46.251682120 +0100
-@@ -55,6 +55,4 @@
- 
- add_subdirectory(optional)
- 
-ADD_SUBDIRECTORY(lz4)
-
- ADD_SUBDIRECTORY(imgui)
--- a/games-engines/fs2_open/files/fs2_open-24.0.2-deps-fix.patch
+++ b/games-engines/fs2_open/files/fs2_open-24.0.2-deps-fix.patch
@@ -0,0 +1,183 @@
+--- a/code/cmdline/cmdline.h
+++ b/code/cmdline/cmdline.h
+@@ -13,6 +13,8 @@
+ #define FS_CMDLINE_HEADER_FILE
+ 
+ #include <tl/optional.hpp>
+#include <cstdint>
+#include "globalincs/vmallocator.h"
+ 
+ int parse_cmdline(int argc, char *argv[]);
+ 
+--- a/code/cfile/cfile.h
+++ b/code/cfile/cfile.h
+@@ -15,6 +15,7 @@
+ 
+ #include "globalincs/pstypes.h"
+ 
+#include <array>
+ #include <ctime>
+ #include <stdexcept>
+ #include <memory>
+--- a/code/graphics/opengl/gropenglopenxr.h
+++ b/code/graphics/opengl/gropenglopenxr.h
+@@ -1,8 +1,11 @@
+ #pragma once
+ 
+#include <cstdint>
+#include <globalincs/vmallocator.h>
+
+ SCP_vector<const char*> gr_opengl_openxr_get_extensions();
+ bool gr_opengl_openxr_test_capabilities();
+ bool gr_opengl_openxr_create_session();
+ int64_t gr_opengl_openxr_get_swapchain_format(const SCP_vector<int64_t>& allowed);
+ bool gr_opengl_openxr_acquire_swapchain_buffers();
+-bool gr_opengl_openxr_flip();
+\ No newline at end of file
+bool gr_opengl_openxr_flip();
+--- a/code/libs/discord/discord.h
+++ b/code/libs/discord/discord.h
+@@ -1,5 +1,7 @@
+ #pragma once
+ 
+#include <globalincs/vmallocator.h>
+
+ namespace libs {
+ namespace discord {
+ 
+--- a/code/math/floating.h
+++ b/code/math/floating.h
+@@ -12,6 +12,7 @@
+ #ifndef _FLOATING_H
+ #define _FLOATING_H
+ 
+#include <algorithm>
+ #include <cmath>
+ #include <cfloat>
+ #include <limits>
+--- a/code/io/spacemouse.h
+++ b/code/io/spacemouse.h
+@@ -4,6 +4,8 @@
+ #include "math/vecmat.h"
+ #include "io/timer.h"
+ 
+#include <array>
+
+ struct hid_device_;
+ typedef hid_device_ hid_device;
+ 
+@@ -59,4 +61,4 @@
+ 			static std::unique_ptr<SpaceMouse> searchSpaceMice(int pollingFrequency = 10);
+ 		};
+ 	}
+-}
+\ No newline at end of file
+}
+--- a/code/network/multi_mdns.h
+++ b/code/network/multi_mdns.h
+@@ -1,6 +1,8 @@
+ #ifndef MULTI_MDNS_H
+ #define MULTI_MDNS_H
+ 
+#include <array>
+
+ bool multi_mdns_query();
+ void multi_mdns_query_do();
+ void multi_mdns_query_close();
+--- a/code/network/multi_pxo.h
+++ b/code/network/multi_pxo.h
+@@ -7,7 +7,7 @@
+  *
+ */
+ 
+-
+#include <globalincs/vmallocator.h>
+ 
+ #ifndef _PARALLAX_ONLINE_HEADER_FILE
+ #define _PARALLAX_ONLINE_HEADER_FILE
+--- a/code/network/psnet.h
+++ b/code/network/psnet2.h
+@@ -20,6 +20,7 @@
+ #include <netinet/in.h>
+ #include <cerrno>
+ #endif
+#include <iomanip>
+ 
+ #include "globalincs/pstypes.h"
+ 
+--- a/code/osapi/osapi.h
+++ b/code/osapi/osapi.h
+@@ -25,6 +25,7 @@
+ #include "globalincs/flagset.h"
+ 
+ #include <functional>
+#include <fstream>
+ #include <memory>
+ 
+ #include <SDL_events.h>
+--- a/code/scripting/lua/LuaTypes.h
+++ b/code/scripting/lua/LuaTypes.h
+@@ -1,5 +1,8 @@
+ #pragma once
+ 
+#include <iostream>
+#include <vector>
+
+ namespace luacpp {
+ class LuaValue;
+ 
+--- a/code/scripting/api/LuaPromise.h
+++ b/code/scripting/api/LuaPromise.h
+@@ -2,6 +2,9 @@
+ 
+ #include "scripting/lua/LuaTypes.h"
+ 
+#include <functional>
+#include <memory>
+
+ namespace scripting {
+ namespace api {
+ 
+--- a/code/mission/missionhotkey.h
+++ b/code/mission/missionhotkey.h
+@@ -14,6 +14,8 @@
+ 
+ #include "globalincs/globals.h"
+ 
+#include <globalincs/vmallocator.h>
+
+ #define MAX_LINES MAX_SHIPS // retail was 200, bump it to match MAX_SHIPS
+ 
+ // Types of items that can be in the hotkey list
+--- a/code/gamehelp/gameplayhelp.h
+++ b/code/gamehelp/gameplayhelp.h
+@@ -7,7 +7,7 @@
+  *
+ */ 
+ 
+-
+#include <globalincs/vmallocator.h>
+ 
+ #ifndef __GAMEPLAY_HELP_H__
+ #define __GAMEPLAY_HELP_H__
+--- a/code/cutscene/ffmpeg/FFMPEGDecoder.h
+++ b/code/cutscene/ffmpeg/FFMPEGDecoder.h
+@@ -2,6 +2,8 @@
+ 
+ #include "cutscene/Decoder.h"
+ 
+#include <thread>
+
+ namespace cutscene {
+ namespace ffmpeg {
+ struct InputStream;
+--- a/code/scripting/hook_conditions.h
+++ b/code/scripting/hook_conditions.h
+@@ -1,5 +1,6 @@
+ #pragma once
+ 
+#include <globalincs/vmallocator.h>
+ #include <linb/any.hpp>
+ 
+ class object;
+
--- a/games-engines/fs2_open/files/fs2_open-24.0.2-disable-discord.patch
+++ b/games-engines/fs2_open/files/fs2_open-24.0.2-disable-discord.patch
@@ -0,0 +1,175 @@
+--- a/freespace2/freespace.cpp
+++ b/freespace2/freespace.cpp
+@@ -84,7 +84,6 @@
+ #include "io/timer.h"
+ #include "jumpnode/jumpnode.h"
+ #include "lab/labv2.h"
+-#include "libs/discord/discord.h"
+ #include "libs/ffmpeg/FFmpeg.h"
+ #include "lighting/lighting.h"
+ #include "lighting/lighting_profiles.h"
+@@ -1987,9 +1986,6 @@
+ #ifdef WITH_FFMPEG
+ 		libs::ffmpeg::initialize();
+ #endif
+-		if (Discord_presence) {
+-			libs::discord::init();
+-		}
+ 	}
+ 
+ 	mod_table_post_process();
+--- a/code/source_groups.cmake
+++ b/code/source_groups.cmake
+@@ -706,11 +706,6 @@
+ 	libs/antlr/ErrorListener.h
+ 	)
+ 
+-add_file_folder("Libs\\\\Discord"
+-	libs/discord/discord.cpp
+-	libs/discord/discord.h
+-)
+-
+ if (FSO_BUILD_WITH_FFMPEG)
+ 	add_file_folder("Libs\\\\FFmpeg"
+ 		libs/ffmpeg/FFmpeg.cpp
+--- a/code/mod_table/mod_table.h
+++ b/code/mod_table/mod_table.h
+@@ -124,7 +124,6 @@
+ } Shadow_disable_overrides;
+ extern float Thruster_easing;
+ extern bool Always_use_distant_firepoints;
+-extern bool Discord_presence;
+ extern bool Hotkey_always_hide_hidden_ships;
+ extern bool Use_weapon_class_sounds_for_hits_to_player;
+ extern bool SCPUI_loads_hi_res_animations;
+--- a/code/mod_table/mod_table.cpp
+++ b/code/mod_table/mod_table.cpp
+@@ -12,7 +12,6 @@
+ #include "globalincs/version.h"
+ #include "graphics/shadows.h"
+ #include "localization/localize.h"
+-#include "libs/discord/discord.h"
+ #include "mission/missioncampaign.h"
+ #include "mission/missionload.h"
+ #include "mission/missionmessage.h"
+@@ -135,7 +134,6 @@
+ shadow_disable_overrides Shadow_disable_overrides {false, false, false, false};
+ float Thruster_easing;
+ bool Always_use_distant_firepoints;
+-bool Discord_presence;
+ bool Hotkey_always_hide_hidden_ships;
+ bool Use_weapon_class_sounds_for_hits_to_player;
+ bool SCPUI_loads_hi_res_animations;
+@@ -145,29 +143,6 @@
+ std::array<std::tuple<float, float>, 6> Fred_spacemouse_nonlinearity;
+ bool Randomize_particle_rotation;
+ 
+-static auto DiscordOption __UNUSED = options::OptionBuilder<bool>("Game.Discord",
+-                     std::pair<const char*, int>{"Discord Presence", 1754},
+-                     std::pair<const char*, int>{"Toggle Discord Rich Presence", 1755})
+-                     .category("Game")
+-                     .default_val(Discord_presence)
+-                     .level(options::ExpertLevel::Advanced)
+-                     .importance(55)
+-                     .change_listener([](bool val, bool) {
+-                          if(Discord_presence){
+-                               if (!val) {
+-                                    Discord_presence = false;
+-                                    libs::discord::shutdown();
+-                               }
+-                          } else {
+-                               if (val) {
+-                                    Discord_presence = true;
+-                                    libs::discord::init();
+-                               }
+-                          }
+-                          return true;
+-                     })
+-                     .finish();
+-
+ void mod_table_set_version_flags();
+ 
+ SCP_vector<std::pair<SCP_string, gr_capability>> req_render_ext_pairs = {
+@@ -1264,10 +1239,6 @@
+ 			stuff_boolean(&Always_use_distant_firepoints);
+ 		}
+ 
+-		if (optional_string("$Enable Discord rich presence:")) {
+-			stuff_boolean(&Discord_presence);
+-		}
+-
+ 		if (optional_string("$Always hide hidden ships in hotkey list:")) {
+ 			stuff_boolean(&Hotkey_always_hide_hidden_ships);
+ 		}
+@@ -1440,7 +1411,6 @@
+ 	Lead_indicator_behavior = leadIndicatorBehavior::DEFAULT;
+ 	Thruster_easing = 0;
+ 	Always_use_distant_firepoints = false;
+-	Discord_presence = true;
+ 	Hotkey_always_hide_hidden_ships = false;
+ 	Use_weapon_class_sounds_for_hits_to_player = false;
+ 	SCPUI_loads_hi_res_animations = true;
+--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
+@@ -33,8 +33,6 @@
+ 	include(FFmpeg.cmake)
+ endif()
+ 
+-add_subdirectory(discord)
+-
+ include(libRocket.cmake)
+ 
+ add_subdirectory(libpcp)
+--- a/code/CMakeLists.txt
+++ b/code/CMakeLists.txt
+@@ -44,8 +44,6 @@
+ 
+ target_link_libraries(code PUBLIC md5)
+ 
+-target_link_libraries(code PUBLIC discord-rpc)
+-
+ target_link_libraries(code PUBLIC libRocket)
+ 
+ target_link_libraries(code PUBLIC pcp)
+--- a/code/scripting/api/libs/base.cpp
+++ b/code/scripting/api/libs/base.cpp
+@@ -8,7 +8,6 @@
+ #include "freespace.h"
+ 
+ #include "gamesequence/gamesequence.h"
+-#include "libs/discord/discord.h"
+ #include "mission/missiontraining.h"
+ #include "network/multi.h"
+ #include "parse/parselo.h"
+@@ -754,31 +753,6 @@
+ }
+ 
+ 
+-ADE_FUNC(setDiscordPresence,
+-	l_Base,
+-	"string DisplayText, [boolean Gameplay]",
+-	"Sets the Discord presence to a specific string. If Gameplay is true then the string is ignored and presence will "
+-	"be set as if the player is in-mission. The latter will fail if the player is not in a mission.",
+-	nullptr,
+-	"nothing")
+-{
+-	const char* text;
+-	bool gp = false;
+-	if (!ade_get_args(L, "s|b", &text, &gp)) {
+-		return ADE_RETURN_NIL;
+-	}
+-
+-	if (gp) {
+-		if ((Game_mode & GM_IN_MISSION) != 0){
+-			libs::discord::set_presence_gameplay();
+-		}
+-	} else {
+-		libs::discord::set_presence_string(text);
+-	}
+-
+-	return ADE_RETURN_NIL;
+-}
+-
+ ADE_FUNC(hasFocus, l_Base, nullptr, "Returns if the game engine has focus or not", "boolean", "True if the game has focus, false if it has been lost")
+ {
+ 	return ade_set_args(L, "b", os_foreground());
--- a/games-engines/fs2_open/files/fs2_open-24.0.2-dont-build-lz4.patch
+++ b/games-engines/fs2_open/files/fs2_open-24.0.2-dont-build-lz4.patch
@@ -0,0 +1,11 @@
+--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
+@@ -53,8 +53,6 @@
+ 
+ add_subdirectory(optional)
+ 
+-ADD_SUBDIRECTORY(lz4)
+-
+ set(HIDAPI_WITH_LIBUSB OFF)
+ set(HIDAPI_WITH_HIDRAW ON)
+ add_subdirectory(hidapi)
--- a/games-engines/fs2_open/files/fs2_open-24.0.2-make-arch-independent.patch
+++ b/games-engines/fs2_open/files/fs2_open-24.0.2-make-arch-independent.patch
@@ -1,10 +1,12 @@
--- fs2_open/cmake/version.cmake	2021-05-22 20:20:18.448441242 +0200
-+++ fs2_open/cmake/version.cmake	2021-05-22 20:21:05.493447003 +0200
-@@ -35,11 +35,6 @@
+--- a/cmake/version.cmake
+++ b/cmake/version.cmake
+@@ -35,13 +35,6 @@
     SET(FSO_BINARY_SUFFIX "${FSO_VERSION_MAJOR}_${FSO_VERSION_MINOR}_${FSO_VERSION_BUILD}_${FSO_VERSION_REVISION_STR}")
 ENDIF()
 
-IF(IS_64BIT)
+-IF(IS_ARM64)
+-    SET(FSO_BINARY_SUFFIX "${FSO_BINARY_SUFFIX}_arm64")
+-ELSEIF(IS_64BIT)
 -	# This is a 64-bit builds
 -    SET(FSO_BINARY_SUFFIX "${FSO_BINARY_SUFFIX}_x64")
 -ENDIF()
--- a/games-engines/fs2_open/fs2_open-24.0.2.ebuild
+++ b/games-engines/fs2_open/fs2_open-24.0.2.ebuild
@@ -1,10 +1,13 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8

 inherit cmake

+DESCRIPTION="FreeSpace2 Source Code Project game engine"
+HOMEPAGE="https://github.com/scp-fs2open/fs2open.github.com/"
+
 # Replace "." with "_" in version
 _PV=${PV//./_}

@@ -12,11 +15,9 @@ _PV=${PV//./_}
 HASH_LIBROCKET="ecd648a43aff8a9f3daf064d75ca5725237d5b38"
 HASH_CMAKE_MODULES="7cef9577d6fc35057ea57f46b4986a8a28aeff50"

-DESCRIPTION="FreeSpace2 Source Code Project game engine"
-HOMEPAGE="https://github.com/scp-fs2open/fs2open.github.com/"
 SRC_URI="
 	https://github.com/scp-fs2open/fs2open.github.com/archive/refs/tags/release_${_PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/asarium/libRocket/archive/${HASH_LIBROCKET}.tar.gz -> ${P}-ext_libRocket.tar.gz
+	https://github.com/scp-fs2open/libRocket/archive/${HASH_LIBROCKET}.tar.gz -> ${P}-ext_libRocket.tar.gz
 	https://github.com/asarium/cmake-modules/archive/${HASH_CMAKE_MODULES}.tar.gz -> ${P}-ext_rpavlik-cmake-modules.tar.gz
 "

@@ -25,6 +26,7 @@ S="${WORKDIR}/fs2open.github.com-release_${_PV}"
 LICENSE="Unlicense MIT Boost-1.0"
 SLOT="0"
 KEYWORDS="~amd64"
+
 IUSE="clang debug discord"

 DEPEND="
@@ -42,9 +44,11 @@ DEPEND="
 	media-libs/openal
 	media-video/ffmpeg
 "
-RDEPEND="${DEPEND}"
-BDEPEND="clang? ( sys-devel/clang )"
+BDEPEND="
+	clang? ( sys-devel/clang:= )
+"
 PATCHES=(
+	"${FILESDIR}/${P}-deps-fix.patch"
 	"${FILESDIR}/${P}-dont-build-lz4.patch"
 	"${FILESDIR}/${P}-make-arch-independent.patch"
 )
--- a/gui-wm/niri/Manifest
+++ b/gui-wm/niri/Manifest
@@ -1,2 +1,2 @@
-DIST niri-0.1.6-vendored-dependencies.tar.xz 55357156 BLAKE2B 6be7227ebb856d501e1bc7eb94746ab21ac8171b060a0375f956fc774d73372e3e33f218ba8ba1728687c01d0a3ba770250ba0b0d762ef4ad3dd729a581b555f SHA512 2368a8d7feb06e02b41174e8baff28324da5ebc9f7fec58e5662245730f357cc1ec68d5c19d2923c5c86cba27ee60fc8190f10ae67856b42ead02543445bfe08
-DIST niri-0.1.6.tar.gz 335427 BLAKE2B 17ab734d3412b4da4e0eca7a3dcbbb7210140ef9ae7a6d4bcd9ca7177128073c9385a59776ab2903e4ac70e158a5860c310519f0b5768721bbee483bad9ad0f4 SHA512 ed83a62552e3a7b049ec03aff2e8e191eb383584f1789f15fe94cce8df847a0de7b3917bd5b64fa1c8e6392de52bb81caa92472a3e40df97ac1b5562b881dca2
+DIST niri-0.1.7-vendored-dependencies.tar.xz 55986496 BLAKE2B 86d7a3ddce3884831874cfac0540d6e5e8dccb9fe503f3d9b061af22f4a29e4f4742e150081fffff139b69961b19f3d8bcb4b2dd4bba5fb0ef955dca0a165df7 SHA512 bc58c234760c42034628c273c428d2200affdd4076cdd2e2a6961fa07aa256832e0a20c3cbc6116f4af29c452a1a82f29a871ccf718a8bbb121a3b544c09d320
+DIST niri-0.1.7.tar.gz 354660 BLAKE2B 5d547424248d547587f0ec1e647f1265f334e49b8a1dc3d133b43707c7789ce12c5e18e9e42de87fa897e71332353a313af791574ac2e002d39b6c5c6b2441f8 SHA512 cd1067dc0a2a11920b33af8e13823147d7a0e7a206cf9ff94a0c410c8414c6c70db0c21d1a08d0e0935edf04e12e3fba5e748ac8f430c7bc63e6d6b84c2141dd
--- a/gui-wm/niri/niri-0.1.7.ebuild
+++ b/gui-wm/niri/niri-0.1.7.ebuild
--- a/gui-wm/phoc/Manifest
+++ b/gui-wm/phoc/Manifest
@@ -2,3 +2,5 @@ DIST phoc-0.36.0.tar.xz 681384 BLAKE2B 6c27c785dd01f9e44cb0940c5a4f73d5ce75cad85
 DIST phoc-0.36.0.tar.xz.asc 833 BLAKE2B 0562c02dcb5d1618b3a316c4c36e4757f4729adf99b8ac748ed52c1bdcad6b65bc9fdb98462375e80f6898d699c6e237e4aa5057631434235166ca616de7d2e6 SHA512 2108eed0a0723c743d86eee9f517a9c8505faf8f55a32eb60ee9da04ae53221b00520ca9e422397617d1bde6f1047ba2ebdf6d45211df052b9b2cfa2d3ea12fe
 DIST phoc-0.38.0.tar.xz 694784 BLAKE2B 51aef1cb1a4e753278727c8311b7aadfb9c18cbdf820725487c837bd0f943e6c7a0420a502e0316ba4ba96cb861a13d1f6a8cdcd9d1a5b51e75e5ecb9bdcf6f7 SHA512 739fb382336885b78ca3f50f8c5f6ddf3bc308a2158663c49c84ce506d2edf0c8d0dcd412e634eccf848d420bb5923d42ebc02044f7acf322b3ab621ffa4cd23
 DIST phoc-0.38.0.tar.xz.asc 833 BLAKE2B 63dd885cda46b90f5edd56289b9114d31726a543608f5a3f02f52848713a01d06e7e8a8660797c98c3504c3c59fe485ab92e58eaf7689c185d26e41027b96b30 SHA512 f69533ed5d1bce220ea66ae4f6307620178609b6c4d9ed743d0cd62f9944faf3dd76e7fce242e722b6912246e268b466ee0bf52326b39907c78d7f6c8eceabda
+DIST phoc-0.40.0.tar.xz 682564 BLAKE2B 97c04902d51118e4d08ce7d9ac7aa04d0e513cf6c3d20dc0e9812c4a9cf97292600a1d5e8205373b67739b829940ea17a2ee9f1e4cb0c72ce9f3651d9fbe9dff SHA512 3d3223ca7f2d3e865c3aa7924447d638b9dd7fef054f71ce667d545d1eeb5d13082e87093adc654426e7dec44e28df41858ef03bb3bb7d0c6c815e1bc958c855
+DIST phoc-0.40.0.tar.xz.asc 833 BLAKE2B 102b5c8405b0393330afb6c5e33df2a41e8ce7fea11eae8c959ef4fd7a9183bf4ec94743241bb8d8c8e07071484d8d831022b1858a43b5db11e2d8785cbc88be SHA512 df8abb534374bdc4af1849e3bf7ecbb4ff5d6bc57226a52cfdb0a95d349e167674cd0e7ee0eb223229c7a37c29eb17a7913d613f0bf1bd93451168cba94ca602
--- a/gui-wm/phoc/phoc-0.40.0.ebuild
+++ b/gui-wm/phoc/phoc-0.40.0.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome2-utils meson verify-sig virtualx xdg
+
+DESCRIPTION="Wayland compositor for mobile phones"
+HOMEPAGE="https://gitlab.gnome.org/World/Phosh/phoc"
+SRC_URI="https://sources.phosh.mobi/releases/${PN}/${P}.tar.xz
+	verify-sig? ( https://sources.phosh.mobi/releases/${PN}/${P}.tar.xz.asc )
+"
+
+LICENSE="|| ( GPL-3+ MIT ) GPL-3+ LGPL-2.1+ MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="gtk-doc man test"
+RESTRICT="!test? ( test )"
+
+WLROOTS_DEPEND="
+	>=dev-libs/libinput-1.14.0:=
+	>=dev-libs/wayland-1.22.0
+	media-libs/libdisplay-info
+	media-libs/libglvnd
+	|| (
+		>=media-libs/mesa-24.1.0_rc1[opengl]
+		<media-libs/mesa-24.1.0_rc1[egl(+),gles2]
+	)
+	sys-apps/hwdata
+	sys-auth/seatd:=
+	x11-base/xwayland
+	x11-libs/cairo
+	>=x11-libs/libdrm-2.4.114
+	x11-libs/libxcb:=
+	x11-libs/libxkbcommon
+	>=x11-libs/pixman-0.42.0
+	x11-libs/xcb-util-errors
+	x11-libs/xcb-util-renderutil
+	x11-libs/xcb-util-wm
+	virtual/libudev
+	amd64? ( >=dev-libs/libliftoff-0.4 )
+"
+COMMON_DEPEND="${WLROOTS_DEPEND}
+	>=dev-libs/glib-2.74:2
+	dev-libs/gmobile
+	dev-libs/libinput:=
+	dev-libs/wayland
+	>=gnome-base/gnome-desktop-3.26:3
+	gnome-base/gsettings-desktop-schemas
+	x11-libs/pixman
+	x11-libs/libxcb:=
+	x11-libs/libxkbcommon
+"
+DEPEND="${COMMON_DEPEND}
+	test? ( x11-wm/mutter )
+"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND="
+	dev-libs/glib:2
+	dev-libs/wayland-protocols
+	dev-util/wayland-scanner
+	sys-devel/gettext
+	gtk-doc? ( dev-util/gi-docgen )
+	man? ( dev-python/docutils )
+	verify-sig? ( sec-keys/openpgp-keys-phosh )
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/phosh.asc"
+
+src_prepare() {
+	default
+
+	cd subprojects/wlroots || die
+	eapply "${S}"/subprojects/packagefiles/wlroots
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gtk-doc gtk_doc)
+		$(meson_use man)
+		$(meson_use test tests)
+		-Ddefault_library=static
+		-Dembed-wlroots=enabled
+		-Dxwayland=enabled
+	)
+	meson_src_configure
+}
+
+src_test() {
+	local -x LC_ALL="C.UTF-8"
+	virtx meson_src_test
+}
+
+src_install() {
+	meson_src_install --skip-subprojects wlroots
+
+	if use gtk-doc; then
+		mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die
+		mv "${ED}"/usr/share/doc/${PN}-${SLOT} "${ED}"/usr/share/gtk-doc/html/ || die
+	fi
+
+	newbin helpers/auto-maximize phoc-auto-maximize
+	newbin helpers/scale-to-fit phoc-scale-to-fit
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
--- a/mail-filter/opensmtpd-filter-dkimsign/Manifest
+++ b/mail-filter/opensmtpd-filter-dkimsign/Manifest
@@ -1 +0,0 @@
-DIST filter-dkimsign-0.6.tar.gz 24163 BLAKE2B f82175c6140a1691f5647562619420c57923cc2deadeabc4ac4b78eeaaa9ddaf6b73635034239e148a8532f77b0422ac52d1961a4f3549b6b686698592b71ae0 SHA512 1efab386a020c6a3cbf6059ce0feea539fa62be0990fd8538c4b152fa0c302d7bfffa7c7bb74643c25e47c20250f600f1371d2725dc3178ad103ce585530c0ce
--- a/mail-filter/opensmtpd-filter-dkimsign/metadata.xml
+++ b/mail-filter/opensmtpd-filter-dkimsign/metadata.xml
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<maintainer>
-			<email>martijn@openbsd.org</email>
-			<name>Martijn van Duren</name>
-		</maintainer>
-	</upstream>
-	<use>
-		<flag name="ed25519">Enable ED25519 support</flag>
-	</use>
-</pkgmetadata>
--- a/mail-filter/opensmtpd-filter-dkimsign/opensmtpd-filter-dkimsign-0.6.ebuild
+++ b/mail-filter/opensmtpd-filter-dkimsign/opensmtpd-filter-dkimsign-0.6.ebuild
@@ -1,46 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-MY_P="${P#opensmtpd-}"
-DESCRIPTION="OpenSMTPD filter for DKIM signing"
-HOMEPAGE="http://imperialat.at/dev/filter-dkimsign/"
-SRC_URI="http://imperialat.at/releases/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+ed25519"
-
-DEPEND="
-	dev-libs/libopensmtpd:=
-	dev-libs/openssl:=
-"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_configure() {
-	tc-export CC
-}
-
-src_compile() {
-	local myargs=(
-		MANFORMAT=mdoc
-		LIBCRYPTOPC=libcrypto
-		$(usex ed25519 HAVE_ED25519=1 '')
-	)
-	emake -f Makefile.gnu "${myargs[@]}"
-}
-
-src_install() {
-	local myargs=(
-		MANFORMAT=mdoc
-		DESTDIR="${D}"
-		LOCALBASE="${EPREFIX}"/usr
-	)
-	emake -f Makefile.gnu "${myargs[@]}" install
-}
--- a/media-gfx/mayo/mayo-0.8.0.ebuild
+++ b/media-gfx/mayo/mayo-0.8.0.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="~amd64"

 RDEPEND="
 	>=sci-libs/opencascade-7.7.0-r2
-	<sci-libs/opencascade-7.8.0
+	<sci-libs/opencascade-7.7.1
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtwidgets:5
@@ -29,9 +29,7 @@ PATCHES=(
 )

 src_configure() {
-
 	eqmake5 "CASCADE_INC_DIR=/usr/include/opencascade" "CASCADE_LIB_DIR=/usr/$(get_libdir)/opencascade" "ASSIMP_INC_DIR=/usr/include/assimp" "ASSIMP_LIB_DIR=/usr/$(get_libdir)" mayo.pro
-
 }

 src_install() {
--- a/net-client/telescope/Manifest
+++ b/net-client/telescope/Manifest
@@ -1,4 +1,4 @@
-DIST telescope-0.8.1.sha.sig 437 BLAKE2B 54c176b06012f32d3b31370baebcf3c2887eb57db64559f59b942f9527ee069c5b08a1516659743cb8b8d5f0ba4202ff49360c835af28c8fb3a693d3e0a856a6 SHA512 3952bb740f2146c157b613b90563b7b7badefb8fa99849dc1d3f124e30cccb6fdf2488e01afb96fc52ae20681fa7fe048e56d3c31c9acc74e300d9c2cce9169d
-DIST telescope-0.8.1.tar.gz 305052 BLAKE2B 0e4955684a3694a21a46eadd5eba69b7b41424c191e596443b5edc66155e4e3f2384f2a833fec08b1c4d61e74189c0b1069e8089583a284d9df9d0bbde2a444d SHA512 1134fa763f36c306bb676fe361442e557144f5d32e29e5ba8a3fb406ef274b28b462389729f1eacc32d2bb341fbb1627fc4b07cca1089f5276317151239dc822
+DIST telescope-0.10.1.tar.gz 1174821 BLAKE2B c8d70fd9ea4d609b334c3c1818c452cf899d6e96d72b7ac7d3a7e5d0b4c24ab9d1b6c190dc617eede43debe65651c937ace266c1666d1d8cd1b928789a13dce6 SHA512 6915b663c16da8d7266d2da0e205a7953800cf9ad517ffc522b95339e819e54c93a3d73d7056d8578f6649cbaffdc8715338050cfb56e325644b2259eb5e82cc
+DIST telescope-0.10.1.tar.gz.sha256.sig 251 BLAKE2B 00f8e13d38686f160129732d8529cc2e3e61941199a8083e75afe3ad39914281fe03f7af21cad1651175b6ef358ccf2402404ba79c72effa8c4f1d882f401824 SHA512 c5c54337b176035832e9f1a9c218a117d6dc5b07fcb92430c6985cf760e3bd032523c81edd09c9f4f6cb624f1d702b228358f9070f1c5b5d83e0f88efe7a5231
 DIST telescope-0.9.tar.gz 349054 BLAKE2B 4fa83a47d0661e6c0bbed1f24e51152270311873bb48e80ef119175d152c40261a13ce415e5faba814bf7fc4c4f4dda84674ea30cb518d2ab11ed1163a4fad26 SHA512 cea25b8b988011ced6851917b0452d96972e0c9a48a3097f74f2f6fbef1e9d6df7ddf9408ba9885554b269a31d4a5a8ab25817f28d42e430a8ce172453cbd56d
 DIST telescope-0.9.tar.gz.sha256.sig 247 BLAKE2B 9a71d0f7f51974720b913bdcc9eddd5fd6f51ab910abdf989dcf721c25ec0fa63493aedd89e34adfdcb53e1a85bcb6e7fb1e8b99b1db5b445a320d5fa73fa57f SHA512 86e29e51d4b12265ce383b6d3bb33e34d29f0fcbf062b1d13bcc53484665176a72d4a28f06439176cfdf64b1b76c754f1266816bdbbbc67bef54ed7695fde9a7
--- a/net-client/telescope/metadata.xml
+++ b/net-client/telescope/metadata.xml
@@ -2,15 +2,12 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <!-- maintainer-needed -->
-<use>
-	<flag name="libbsd">Use <pkg>dev-libs/libbsd</pkg> instead of internal funcs</flag>
-</use>
 <upstream>
 	<maintainer>
 		<name>Omar Polo</name>
 		<email>telescope@omarpolo.com</email>
 	</maintainer>
-	<doc>https://telescope.omarpolo.com/telescope.1.html</doc>
-	<remote-id type="github">omar-polo/telescope</remote-id>
+	<doc>https://www.telescope-browser.org/telescope.1.html</doc>
+	<remote-id type="github">telescope-browser/telescope</remote-id>
 </upstream>
 </pkgmetadata>
--- a/net-client/telescope/telescope-0.10.1.ebuild
+++ b/net-client/telescope/telescope-0.10.1.ebuild
@@ -1,31 +1,33 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2021-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8

 VERIFY_SIG_METHOD="signify"
-inherit toolchain-funcs verify-sig
+inherit optfeature toolchain-funcs verify-sig

 DESCRIPTION="w3m-like browser for Gemini"
-HOMEPAGE="https://telescope.omarpolo.com"
-SRC_URI="https://github.com/omar-polo/${PN}/releases/download/${PV}/${P}.tar.gz
-	verify-sig? ( https://github.com/omar-polo/${PN}/releases/download/${PV}/SHA256.sig -> ${P}.sha.sig )"
+HOMEPAGE="https://www.telescope-browser.org/"
+SRC_URI="https://ftp.omarpolo.com/${P}.tar.gz
+	verify-sig? ( https://ftp.omarpolo.com/${P}.tar.gz.sha256.sig )"

-LICENSE="!libbsd? ( BSD MIT ) ISC unicode"
+LICENSE="ISC"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+libbsd"
+IUSE="unicode"

 DEPEND="
-	dev-libs/imsg-compat
 	dev-libs/libbsd
-	dev-libs/libevent:=
+	dev-libs/libgrapheme:=
 	dev-libs/libretls:=
 	sys-libs/ncurses:=
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	app-misc/editor-wrapper
+	net-mail/mailbase
+"
 BDEPEND="
-	virtual/pkgconfig
+	app-alternatives/yacc
 	verify-sig? ( sec-keys/signify-keys-telescope:$(ver_cut 1-2) )
 "

@@ -34,10 +36,10 @@ VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/signify-keys/${PN}-$(ver_cut 1-2).pub"
 src_unpack() {
 	if use verify-sig; then
 		# Too many levels of symbolic links
-		cp "${DISTDIR}"/${P}.{sha.sig,tar.gz} "${WORKDIR}" || die
+		cp "${DISTDIR}"/${P}.tar.gz{,.sha256.sig} "${WORKDIR}" || die
 		cd "${WORKDIR}" || die
 		verify-sig_verify_signed_checksums \
-			${P}.sha.sig sha256 ${P}.tar.gz
+			${P}.tar.gz.sha256.sig sha256 ${P}.tar.gz
 	fi
 	default
 }
@@ -47,9 +49,14 @@ src_configure() {
 	local econf_args=(
 		HOSTCC="${BUILD_CC}"
 		HOSTCFLAGS="${BUILD_CFLAGS}"
+		--with-default-editor="${EPREFIX}"/usr/libexec/editor
 		--with-libbsd
-		--with-libimsg
+		--without-libimsg
 	)

 	econf "${econf_args[@]}"
 }
+
+pkg_postinst() {
+	optfeature "file opener support" x11-misc/xdg-utils
+}
--- a/net-client/telescope/telescope-0.9.ebuild
+++ b/net-client/telescope/telescope-0.9.ebuild
@@ -7,7 +7,7 @@ VERIFY_SIG_METHOD="signify"
 inherit toolchain-funcs verify-sig

 DESCRIPTION="w3m-like browser for Gemini"
-HOMEPAGE="https://telescope.omarpolo.com"
+HOMEPAGE="https://www.telescope-browser.org/"
 SRC_URI="https://ftp.omarpolo.com/${P}.tar.gz
 	verify-sig? ( https://ftp.omarpolo.com/${P}.tar.gz.sha256.sig )"

--- a/net-im/manyverse-bin/Manifest
+++ b/net-im/manyverse-bin/Manifest
@@ -0,0 +1 @@
+DIST manyverse_0.2310.9-beta_amd64.deb 72048716 BLAKE2B 613c174359c72d948c51598674a7fdde15ffac80f451cc0765524329e625ed1c4fd642b8dd62613e6a28fbf17cf5796053412e4a08b4f256c75e7b7f0cfcf533 SHA512 6a970126f7ae622ba0bfed85ddb31b5193823365d04f50ca7ac914968336fdb9cbf310ce535946875bb9500d754bf98a01eb9f2236bdac054e93dfa8f31b3461
--- a/net-im/manyverse-bin/manyverse-bin-0.2310.9.ebuild
+++ b/net-im/manyverse-bin/manyverse-bin-0.2310.9.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit unpacker xdg-utils
+
+DESCRIPTION="A social network off the grid with append-only protocol (no edits) on blockchain"
+HOMEPAGE="https://www.manyver.se/"
+
+SRC_URI="https://github.com/staltz/manyverse/releases/download/v${PV}-beta/manyverse_${PV}-beta_amd64.deb"
+S="${WORKDIR}"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="strip"
+
+src_prepare() {
+	rm -rf usr/share/doc/
+	# Because only changelog.gz here with a few lines, and need to be unpacked
+
+	default
+}
+
+src_install() {
+	insinto /
+	doins -r .
+
+	fperms +x /opt/Manyverse/manyverse
+	dosym /opt/Manyverse/manyverse /usr/bin/${PN}
+}
+
+pkg_postinst() {
+
+	xdg_desktop_database_update
+
+	xdg_icon_cache_update
+}
--- a/net-im/manyverse-bin/metadata.xml
+++ b/net-im/manyverse-bin/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>zdanevich.vitaly@ya.ru</email>
+		<name>Vitaly Zdanevich</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">staltz/manyverse</remote-id>
+	</upstream>
+</pkgmetadata>
--- a/net-irc/catgirl/Manifest
+++ b/net-irc/catgirl/Manifest
@@ -1,3 +1,2 @@
-DIST catgirl-2.0a.tar.gz 63237 BLAKE2B fe2c90121f8b1eacba5d246378808ac45fe1b3a7f53f56361595f2937bbd0e3d0ba373162aa3e98f49a9f418a6b206321e609f877cf56cca575d75c59a5db732 SHA512 4e948f3feae9754e2e751b997d35710655a49e08efba7f75ed6c126c1a7326552c5eb17f22a94a694d84653dbbae2d866bf10b9a3e33c5289d6a823628cbca5d
-DIST catgirl-2.1.tar.gz 68822 BLAKE2B 56e7ee3e06c6581029c8c98093cad8c6af749e3a7f104023ca402ff5097af49c590f340b6b7a80a4e3e28bd68680c927b67455f131d8577962d778f6c971dc3e SHA512 3b77ae3cc382c8db2918baf73e08d8397a55f752959aad23014235d335d48bbff3d329f75b6663c8fe8dfa74a525b22d51209408ccad9f14e28488116e6c5fee
 DIST catgirl-2.2.tar.gz 69835 BLAKE2B 87a8bf143fc23576efb722c68e10d7dee645686dc117dfb345c979cfc95d2a013a4965e3489012096be8e6ab40d793937f7afe17079f264f93862eac7e4511f9 SHA512 a963a469635f5cc1c28112e35028ea2b550886ff9ca4fea82286ff3c5222f18c5271c4055fcd351b2fcdfbb41bd9e52d19854f81262591acdc90d992e49a3ede
+DIST catgirl-2.2a.tar.gz 69660 BLAKE2B 1b3d505db34f320a3fcab25f1b9071382bd9387bbfe23c27b936d666e3964359abf28ee7ec636caa8fb83582fa36e744f3fd0b2c0811ec392cf3759fd7119664 SHA512 988750c960630ec8314ebde7b9802f8b6a3087f733359f61f49c4f83cb6e327c03cde9ad88f2cb535d56ead1376cd121a7124c367c90394a6d4d7f80b25e329f
--- a/net-irc/catgirl/catgirl-2.0a.ebuild
+++ b/net-irc/catgirl/catgirl-2.0a.ebuild
@@ -1,43 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit readme.gentoo-r1 toolchain-funcs
-
-DESCRIPTION="TLS-only terminal IRC client"
-HOMEPAGE="https://git.causal.agency/catgirl/about/"
-SRC_URI="https://git.causal.agency/${PN}/snapshot/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	dev-libs/libretls:=
-	sys-libs/ncurses:=
-"
-BDEPEND="virtual/pkgconfig"
-RDEPEND="${DEPEND}"
-
-DOCS=( README.7 scripts/chat.tmux.conf )
-
-src_configure() {
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		--mandir="${EPREFIX}"/usr/share/man || die
-	tc-export CC
-}
-
-src_compile() {
-	emake all
-}
-
-src_install() {
-	default
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
--- a/net-irc/catgirl/catgirl-2.2a.ebuild
+++ b/net-irc/catgirl/catgirl-2.2a.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2021-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8
--- a/net-misc/gmid/Manifest
+++ b/net-misc/gmid/Manifest
@@ -1,4 +1,4 @@
-DIST gmid-2.0.1.sha256.sig 239 BLAKE2B b118bd39fc529a05112f405589ce2d1c44d4436b19edecb388709ff2cfe4f49ec15506082da6e8a9aecba7cd9ed2d308aafef5432f1692145d6eabe3b5e53683 SHA512 83eff56ffec7ed55338dfe1e48d670779008c523634c86050a63f333ed328541dcaeb1a0d3fccb01bdf2f6d3bbea20c2898bfbd115ee7590203c04bd24baa064
-DIST gmid-2.0.1.tar.gz 182989 BLAKE2B 4973711ee94babd0b0f470cf84f460343c39867753858817b7262d8ca3947e79b2e20fe004627e8acf00728a3b43db4bfddf446115acca8eadf190dcc6ef533f SHA512 38d29775968c40fe174b8ead3393c3cd77dd535dae18d3051eb9b98b248a56929d84909c07c3405ddc6035e7d1fc66ea856a2a1dd96e53ac8d30fd231c764478
 DIST gmid-2.0.2.sha256.sig 239 BLAKE2B e7f6e6c0f21e10b5bc08b5b72747036ab2b7f1ce820bbf45b3bb4e589d83a6fa1d49e20b95acf3148dcf20608272d48ff2de99ea7fae5b2071a0b7c14539b0cc SHA512 482d8673b140c1a3d0b1a4bc9fd11d74d1bdf968e5d69682c911ff1ea587cfb4e66bafb5817f5286d570f48774d1e13c98939f35afdb69be2f81868dc7560df2
 DIST gmid-2.0.2.tar.gz 182867 BLAKE2B edceadfdccbd2e1c90ec4059062f3fc9feaa0c8d5efede5e51a917604eb7ec7537eff25e1a53223fc0fb13645c7fd3be7e3d4545ea14c7cafc1b0f409c949616 SHA512 dd5ab9b1eb7d1ea82fb935099d05f4e606c9e4e112baf132dad72abe5469b2ade2a4a650c5bad7675ca46601721dd5f0a8ebb91b356af90aed9e11c487fd2f7d
+DIST gmid-2.0.5.sha256.sig 239 BLAKE2B 0f2c2a59fe887dcb04c59e234850b3fd798b377e2e244382d54105af88a9cb08f694168fb227105b2f5e9ea187fb8b39b9d5a7d0dfc46c3343b8c7d5d6354722 SHA512 d18daaa6067b701dacf7c1ed0ebd9e0741b45834db4df2b50bf4d40b41f7c86f741dab0e6951231105f8f6930f6f31c6fd4be2f9ace3f5a08d4ee1f2a6a4f1e5
+DIST gmid-2.0.5.tar.gz 192727 BLAKE2B bfec3f7521fc305973b3ee4d5125ee70b537002236ffbb4e2f18a6aa1ab355d995df970f52108b1266a903aecfc6d97dc96a81872ae4b96851a518cda81f9b44 SHA512 011cdd3fc940b1fd5c88c7496a531e56aba5c4ebf9825b87c3daf7c64dd88e21a7d94556bf5c1a5a34e926e52f13e91e0c8cb60278dfac8ad71fe9197320c022
--- a/net-misc/gmid/files/gmid.service-r1
+++ b/net-misc/gmid/files/gmid.service-r1
@@ -0,0 +1,19 @@
+[Unit]
+Description=The gmid Gemini server
+Documentation=https://gmid.omarpolo.com/
+After=network-online.target syslog.target 
+Wants=network-online.target
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/gmid -f -c /etc/gmid.conf
+ExecStop=/bin/kill -TERM $MAINPID
+ExecReload=/bin/kill -HUP $MAINPID
+Restart=on-failure
+RestartSec=30
+StandardOutput=journal
+StandardError=inherit
+SyslogIdentifier=gmid
+
+[Install]
+WantedBy=multi-user.target
--- a/net-misc/gmid/gmid-2.0.1-r1.ebuild
+++ b/net-misc/gmid/gmid-2.0.1-r1.ebuild
@@ -15,8 +15,8 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://git.omarpolo.com/${PN} https://github.com/omar-polo/${PN}.git"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/omar-polo/${PN}/releases/download/${PV}/${P}.tar.gz
-		verify-sig? ( https://github.com/omar-polo/${PN}/releases/download/${PV}/${P}.sha256.sig )"
+	SRC_URI="https://ftp.omarpolo.com/${P}.tar.gz
+		verify-sig? ( https://ftp.omarpolo.com/${P}.sha256.sig )"
 	KEYWORDS="~amd64 ~x86"
 fi

@@ -91,7 +91,7 @@ src_install() {
 	insinto /usr/share/vim/vimfiles
 	doins -r contrib/vim/*

-	systemd_dounit "${FILESDIR}"/gmid.service
+	systemd_newunit "${FILESDIR}"/gmid.service-r1 gmid.service
 	newinitd "${FILESDIR}"/gmid.initd gmid
 	newconfd "${FILESDIR}"/gmid.confd gmid

--- a/net-misc/gmid/gmid-9999.ebuild
+++ b/net-misc/gmid/gmid-9999.ebuild
@@ -91,7 +91,7 @@ src_install() {
 	insinto /usr/share/vim/vimfiles
 	doins -r contrib/vim/*

-	systemd_dounit "${FILESDIR}"/gmid.service
+	systemd_newunit "${FILESDIR}"/gmid.service-r1 gmid.service
 	newinitd "${FILESDIR}"/gmid.initd gmid
 	newconfd "${FILESDIR}"/gmid.confd gmid

--- a/net-voip/gnome-calls/Manifest
+++ b/net-voip/gnome-calls/Manifest
@@ -1,4 +1,3 @@
-DIST calls-v44.2.tar.bz2 461737 BLAKE2B a13bebd16c907d914c49d2d9c02130803a95ae96f2c948758badd8780794933c3018c0bf0c955870e5b3d8bbdc0f7fd1364693164cf92dd43ccda9ad7f6054b0 SHA512 4bed94cb5acd47ca68dae80bebe1fbad5e919e22b93c21f5ce300c9d51cca65a25fb0fb3f6661e07982507d2e9bd72c6ac9548bbaa32deeb79acbb237fade71f
 DIST calls-v45.0.tar.bz2 468539 BLAKE2B e696d91570e65eb3ba6884c760e76be4b6a15bbbb84f0c577fcd55be7168d2e0cce2ecd5825b0e106d56cd060118335019a7549e85fd6a5c3ea563677abdcb25 SHA512 6d7987b024e0b674122ea9693a921ff6505710812e06121ff102bf110648a402e5ab33915618ee96593ae429a13653e5ac8bcf30e528f5fc873c20167a61f818
-DIST libcall-ui-6798b38d4d66d069751151b3e9a202c6de8d7f3c.tar.bz2 161183 BLAKE2B 928be11a2d7359592540d86e72cc749c46c3d6fe78f12faf1546cf5889438b392a9d31a884d7c3e8e1e5c879669e058134e22e0965a478b91e6a6759ae2c27d1 SHA512 503107d83f142b66842a57f86613b0ca12801d26c73ef590f92546963997c5faa04d29b783bbf355a40ab1ce41b1073b56be067ff010a322393ee6d206331726
+DIST calls-v46.3.tar.bz2 481214 BLAKE2B 3e4b7edf3f50fd4355cbb828967280de53735b1577f726c097870b4d84f05b2af13ba27e821dc0ab2408629882dc1c062673b17c2682ea9af904c0bd445067ff SHA512 4816e0fee3fb1dc097a440858f36dd777efc41d7eea0178db08fbcc662d266be20a1b3b70937dbca81bb1f16997728a048f4725c31b753dca5c7a072f608e06d
 DIST libcall-ui-v0.1.0.tar.bz2 161130 BLAKE2B 9c684802f1a17630bad25eacfb960522eee7b1a668239a9e2b4711dee24c26ae6926674742828f95072e26c7d0cc19fe704107c22cd5824734548189761aa9f8 SHA512 b2f29e48003d22ffb9d5392af35f6a3e6c5aa5aebb155dcd8cc890111b98f163ce3b7d843a6b5e8adf96272544c999b9e0fd7bfd358847dc87b38d0c942038c4
--- a/net-voip/gnome-calls/gnome-calls-46.3.ebuild
+++ b/net-voip/gnome-calls/gnome-calls-46.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8
@@ -8,13 +8,13 @@ inherit vala meson gnome2-utils optfeature virtualx xdg

 MY_PN="${PN#gnome-}"
 MY_P="${MY_PN}-v${PV}"
-LCU_COMMIT="6798b38d4d66d069751151b3e9a202c6de8d7f3c"
+LCU_V="0.1.0"
 DESCRIPTION="Phone dialer and call handler"
 HOMEPAGE="https://gitlab.gnome.org/GNOME/calls"
 GITLAB="https://gitlab.gnome.org"
 SRC_URI="
 	${GITLAB}/GNOME/${MY_PN}/-/archive/v${PV}/${MY_P}.tar.bz2
-	${GITLAB}/World/Phosh/libcall-ui/-/archive/${LCU_COMMIT}/libcall-ui-${LCU_COMMIT}.tar.bz2
+	${GITLAB}/World/Phosh/libcall-ui/-/archive/v${LCU_V}/libcall-ui-v${LCU_V}.tar.bz2
 "
 S="${WORKDIR}/${MY_P}"

@@ -56,7 +56,7 @@ src_unpack() {

 	cd "${S}" || die
 	rmdir subprojects/libcall-ui || die
-	mv "${WORKDIR}"/libcall-ui-${LCU_COMMIT} subprojects/libcall-ui || die
+	mv "${WORKDIR}"/libcall-ui-v${LCU_V} subprojects/libcall-ui || die
 }

 src_prepare() {
@@ -75,7 +75,6 @@ src_configure() {

 src_test() {
 	local tests=(
-		calls:application
 		calls:call
 		calls:contacts
 		calls:dbus
@@ -84,13 +83,20 @@ src_test() {
 		calls:origin
 		calls:plugins
 		calls:provider
-		calls:ringer
 		calls:sdp-crypto
 		calls:settings
-		#calls:sip
 		calls:srtp
 		calls:ui-call
 		calls:util
+
+		# TODO: needs working sound card
+		#calls:application
+
+		# TODO: failure related to feedbackd
+		#calls:ringer
+
+		# TODO: hangs
+		#calls:sip
 	)
 	virtx meson_src_test "${tests[@]}"
 }
--- a/net-vpn/candy/Manifest
+++ b/net-vpn/candy/Manifest
@@ -1 +1 @@
-DIST candy-5.9.0.tar.gz 74223 BLAKE2B 7a3b60b369f999cdc6e90371e6ff1cac36a7a0fada876596537ea25381a28c70c2900e515bef1ce4b9d7b7c98791578a50164eec84820f2aca1581ec163e918d SHA512 28aacc4ce60c59204173ed7ac9b11d1c598d1a674176fbafb2ac887e15e720a6f4b180e7096bfaa40a5cd0188f65bf08d16a90cde53b759d12bc114ab42aeee0
+DIST candy-5.9.2.tar.gz 75303 BLAKE2B bdffac54ab9575398b3aa52e10a58138208f6716771d7165c51f9e9b03b4ec944d62ea11f9d815195eb2bd371d9d950af1b53e60182a046682277c74098b3ff9 SHA512 1b2a658153afcef74cdfabf3a1ec5bb9752833448e27f9b175267a214e9d89ce9e275e0085dfaa5900375ac89549dff903c7ae1edbc3e77642040562b75b27f5
--- a/net-vpn/candy/candy-5.9.2.ebuild
+++ b/net-vpn/candy/candy-5.9.2.ebuild
--- a/phosh-base/phosh-mobile-settings/Manifest
+++ b/phosh-base/phosh-mobile-settings/Manifest
@@ -2,3 +2,5 @@ DIST phosh-mobile-settings-0.36.0.tar.xz 185628 BLAKE2B bed3c8dcd278e44e9beaec29
 DIST phosh-mobile-settings-0.36.0.tar.xz.asc 833 BLAKE2B 749625bae2a1bafc77ad5867b65a0a526dd5c9da25eebe9967fea816e30855f98e5bfec61c7cfcad3019fcb32290a262dbc108902bc969787e02d9be11e405f6 SHA512 bbe173ae4f34757963637c9e26bc0dd8d0ee60ea789a894b4732e572eaa25762605d79351f6e0e1b330e51dcc3dc9538b2e70ee98b679f46ea9d95df0e0906c0
 DIST phosh-mobile-settings-0.38.0.tar.xz 197692 BLAKE2B df92c780943fcd441b6709e5a9722e02e0b08f27b3355b0621ff3ee626276af53988b9a2bf8047bc3cf14c73691a01b8502c1952795e2388fe29652c16cef3be SHA512 7406ca631d0bb2d51bf405ffb1820496bbd3349927b677b208d623d7a792dbfbd5f6bfd6edc31bb3009490e4ea6c860660df5d983861d929b7b9300d69c8f9e8
 DIST phosh-mobile-settings-0.38.0.tar.xz.asc 833 BLAKE2B baab43631489a35bcea287b096dfcbaa0379bb7499c0f50006372c4e1138b545f7253cd9172eae3598840c5f9eb8be5590cc7d7b506e6c148705a04c9ff3fe54 SHA512 9af93755cd5aa0e265b97e999d692dd00ad923c4a676da33d72248cb352c2d818fe299926c8bea0799255156cc29bb2bb6c7bc7efc31202aacf29124f7f9ad1b
+DIST phosh-mobile-settings-0.40.0.tar.xz 206976 BLAKE2B ff21e9672c9b849f1fb423c8305c1ed57164022684c188ef98f27100c5b08d9a3e2d3bb28b7f22046616ce7e277f4061db17d2af127af12bfe08c3ba63c1f51e SHA512 f379df314ef885161842cb03c6f116c1243a9bffc6e56ad1ad8b2e52bf81aad89f687112732a80ae50d20ec9ec123621d5a6ae0945ddab6ba1b8e0de932532ff
+DIST phosh-mobile-settings-0.40.0.tar.xz.asc 833 BLAKE2B 43e8e329a8b0850a9b2859b39b4c440a8b945bee0c5cd7e8e1409b1f2b766bb1ceb02de2344b59c7b2da57139c2ec98a5f39557609c4367eacb2cbd057a7c538 SHA512 3683bb77400f3bd5c2b21cad645bbf5aa7ee578cf0a2ee81b27cd60162ee942ddcf22f2f8dc6f844a8724d9b1ae78935e90de4608738f156b76684c71cd2220a
--- a/phosh-base/phosh-mobile-settings/phosh-mobile-settings-0.40.0.ebuild
+++ b/phosh-base/phosh-mobile-settings/phosh-mobile-settings-0.40.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome2-utils meson verify-sig xdg
+
+DESCRIPTION="Mobile Settings App for phosh and related components"
+HOMEPAGE="https://gitlab.gnome.org/guidog/phosh-mobile-settings"
+SRC_URI="https://sources.phosh.mobi/releases/${PN}/${P}.tar.xz
+	verify-sig? ( https://sources.phosh.mobi/releases/${PN}/${P}.tar.xz.asc )"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-libs/glib-2.74:2
+	dev-libs/gmobile
+	>=dev-libs/wayland-1.14
+	>=gui-libs/gtk-4.12.5:4[wayland]
+	>=gui-libs/libadwaita-1.4:1
+	media-libs/gsound
+	>=phosh-base/phosh-shell-0.37.0
+	sys-apps/lm-sensors:=
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/wayland-protocols-1.12
+"
+BDEPEND="
+	dev-libs/glib:2
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/wayland-scanner
+	sys-devel/gettext
+	verify-sig? ( sec-keys/openpgp-keys-phosh )
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/phosh.asc"
+
+QA_DESKTOP_FILE="usr/share/applications/mobi.phosh.MobileSettings.desktop"
+
+src_test() {
+	# No useful tests
+	:
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
--- a/phosh-base/phosh-shell/Manifest
+++ b/phosh-base/phosh-shell/Manifest
@@ -2,3 +2,5 @@ DIST phosh-0.36.0.tar.xz 839440 BLAKE2B a6aa1c6fc2356055b0a451cb66fcfcbf3329059a
 DIST phosh-0.36.0.tar.xz.asc 833 BLAKE2B 1dcdfd6cd0708f60408a34bd2df891db4050de02c9349d5517fe23b2e17e0fb0fdfe97e3f86f5b30fb47c871932bd67310b889ce4d03b32408c7704d7ea31ce4 SHA512 c1ceac2eaad073b79f342915205f0539454f789eb6cb8aaae5fa4847bfac60641822796ee0adc83970af7ee6d6e57248bba48a718a05da1d2123984c4a3c9b91
 DIST phosh-0.38.0.tar.xz 866816 BLAKE2B 22be8e8a673494da7795270d7fb7fff2bfb87762b8cce9540d2f8644ded760ee2ac8a75d8052eb46172d6f5764e020ef949330ed14f5cc645cef586e26b5a398 SHA512 dfde54b64ea6edba2b66dfe2f5ff0f4b3edbb192b1a37fbc8c98d9365bdedc5d19ddb1464673e516cb8e436a6c0ea00c84087cc6431b6c1862019f90e02b73ce
 DIST phosh-0.38.0.tar.xz.asc 833 BLAKE2B d9c49a42bc5083678e3195eb6fded80455312887b0c0f99dd03c6662d3c01bec228b0c68f7044dfe86fe1473b8ddbaf797729a5a92fbbbb5c8d18302149376dd SHA512 8007c2f58c311659310d06962ad825c51fb90f4da864f110db5b1f0f5d7c70b0ef69ddbfa169489657b3088ed6b89dbdf7e910101267ccd307578d75f9301b46
+DIST phosh-0.40.0.tar.xz 910888 BLAKE2B 9bf1da29af73387b4f080f580dc29422d6f113c19b52c72596bcf2dd1f3e4e61da4270f3798f07148f8a197f8b076b67e51108c08af503c0a4a5566c8ef13669 SHA512 e82e1955b708f01827f5ce8e31cd5b6449e66b527dd9a1bc6300a70c6c90ccffa14ae9d569bfa8627f995d96437ef4d063e7ebd7e20556a273dc75902a1e9538
+DIST phosh-0.40.0.tar.xz.asc 833 BLAKE2B e45a7726d4f94cabd98f36d9de2c870d51a480f8b4b10f1ea046fa4cffbef165caf3c701892a7cd80e63753fc791556da854dfd24c8f80bd70b2a19ce63c9508 SHA512 9bb24e6f0ccf3534a9a28711e82b5aa8b2a10bcbe3b99b7d7329476ed2916b53ce9dc31c0c06aaec7d67370bc05dc35199da60f191d6706bb636f7a6b7ecffb8
--- a/phosh-base/phosh-shell/phosh-shell-0.40.0.ebuild
+++ b/phosh-base/phosh-shell/phosh-shell-0.40.0.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome2-utils meson pam systemd verify-sig virtualx xdg
+
+MY_PN="${PN%-shell}"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="Pure Wayland shell for mobile devices"
+HOMEPAGE="https://gitlab.gnome.org/World/Phosh/phosh/"
+SRC_URI="https://sources.phosh.mobi/releases/${MY_PN}/${MY_P}.tar.xz
+	verify-sig? ( https://sources.phosh.mobi/releases/${MY_PN}/${MY_P}.tar.xz.asc )"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="CC0-1.0 CC-BY-SA-4.0 GPL-2+ GPL-3+ LGPL-2+ LGPL-2.1+ MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="elogind gtk-doc introspection +lockscreen-plugins man test test-full"
+REQUIRED_USE="
+	gtk-doc? ( introspection )
+	test? ( lockscreen-plugins )
+"
+
+COMMON_DEPEND="
+	>=app-crypt/gcr-3.7.5:0[introspection?]
+	app-crypt/libsecret
+	>=dev-libs/feedbackd-0.2.0
+	dev-libs/fribidi
+	>=dev-libs/glib-2.76:2
+	dev-libs/gmobile
+	dev-libs/libgudev:=
+	dev-libs/libical:=
+	>=dev-libs/wayland-1.14
+	>=gnome-base/gnome-desktop-3.26:3
+	>=gnome-base/gsettings-desktop-schemas-42
+	>=gnome-extra/evolution-data-server-3.33.1:=
+	>=gui-libs/libhandy-1.1.90:1[introspection?]
+	media-libs/libpulse[glib]
+	media-sound/callaudiod
+	net-libs/libsoup:3.0
+	>=net-misc/networkmanager-1.14[introspection?]
+	sys-apps/dbus
+	>=sys-auth/polkit-0.105
+	sys-libs/pam
+	>=sys-power/upower-0.99.1:=
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/pango
+	>=x11-libs/gtk+-3.22:3[introspection?,wayland]
+	elogind? ( >=sys-auth/elogind-241 )
+	!elogind? ( >=sys-apps/systemd-241:= )
+	lockscreen-plugins? (
+		app-text/evince:=
+		gui-libs/gtk:4
+		gui-libs/libadwaita:1
+	)
+"
+RUNTIME_DEPEND="
+	gnome-base/gnome-shell
+	virtual/freedesktop-icon-theme
+	x11-themes/gnome-themes-standard
+"
+
+DEPEND="
+	${COMMON_DEPEND:?}
+	>=dev-libs/wayland-protocols-1.12
+	test-full? ( ${RUNTIME_DEPEND:?} )
+"
+RDEPEND="
+	${COMMON_DEPEND:?}
+	${RUNTIME_DEPEND:?}
+	!elogind? ( sys-libs/libcap )
+"
+BDEPEND="
+	dev-libs/glib:2
+	dev-libs/libxml2
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/wayland-scanner
+	sys-devel/gettext
+	gtk-doc? ( dev-util/gi-docgen )
+	man? ( dev-python/docutils )
+	test-full? ( >=gui-wm/phoc-0.36.0-r1 )
+	verify-sig? ( sec-keys/openpgp-keys-phosh )
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/phosh.asc"
+
+src_configure() {
+	local emesonargs=(
+		-Dcompositor="${EPREFIX}"/usr/bin/phoc
+		-Dtools=true
+		-Dquick-setting-plugins=true
+		$(meson_use gtk-doc gtk_doc)
+		$(meson_use introspection)
+		$(meson_use lockscreen-plugins)
+		$(meson_use man)
+		$(meson_use test tests)
+		$(meson_feature test-full phoc_tests)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	local -x LC_ALL="C.UTF-8"
+	local -x WLR_RENDERER="pixman"
+
+	virtx meson_src_test --suite unit
+	if use test-full; then
+		virtx meson_src_test --suite integration
+	fi
+}
+
+src_install() {
+	meson_src_install
+	pamd_mimic system-local-login phosh auth account session
+	systemd_douserunit data/phosh.service
+
+	if use gtk-doc; then
+		mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die
+		mv "${ED}"/usr/share/doc/${MY_PN}-${SLOT} "${ED}"/usr/share/gtk-doc/html/ || die
+	fi
+}
+
+phosh_giomodule_cache_update() {
+	local plugins_dir
+	plugins_dir=$(pkg-config --variable=lockscreen_plugins_dir phosh-plugins) || return 1
+
+	ebegin "Updating GIO modules cache"
+	gio-querymodules "${plugins_dir}"
+	eend $?
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+	phosh_giomodule_cache_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+	phosh_giomodule_cache_update
+}
--- a/phosh-base/phosh-tour/Manifest
+++ b/phosh-base/phosh-tour/Manifest
@@ -2,3 +2,5 @@ DIST phosh-tour-0.36.0.tar.xz 113636 BLAKE2B 21803419b5e70d7fbb38da23d266905eb25
 DIST phosh-tour-0.36.0.tar.xz.asc 833 BLAKE2B 5501484621f4aa76f4a4f71c65d6c1469d521e1e0b01427180b6753b9c20d7aa07e72cd75c43eee08fa7e6493a07c6b8f671c539afca389d44f5fe836731469b SHA512 a243fe4ea2933bc3b4de46ce23e29571a620db6e8c415e16f928f5c6a9c821c6c87146dec85832d36cd1d68349054a12888f1f67ee4fdcbfc6fee7fb01add7aa
 DIST phosh-tour-0.38.0.tar.xz 151456 BLAKE2B 24335f40cf358ce706f19cab08afb6c9e2176fed533f8bc8a43ac6b8d1d64d4a5c8874e5a857070e846dbd857ed0aecbe516366bdbc7708dcb6c2c5abeef6a43 SHA512 27462565c96071bf3877cc823b09b61ee739904d6df75e5da0cf57f3a89fa51a35c7a81201228194d44a125480a484e8fd7cfaa640ede0b464a93d13bfcb488d
 DIST phosh-tour-0.38.0.tar.xz.asc 833 BLAKE2B 1afa17d9be38d2717caaef67cd66021616ba07ff26180580b8c353b698cc92293dc6e04d183ffd7f9db7b18def277ceadbbe82bfd99aec1feea53780f281b449 SHA512 17039d7debbbcde2fc2e178186e30ca14e3eaad4e3577be7eba7b098f43031b27e08cf629274a46b794dccb4f82e0f19dfb6d66d6e33e5c2495f62c64d0f02e7
+DIST phosh-tour-0.39.0.tar.xz 121632 BLAKE2B c3264e67a4abe702d18c0ce534d1cf4e52a85cc164c887cbfc158dd71fb0ee06734f394fc0f03271dc62d7ea082765dcb0b3fb82ffbfbaf20922890233258563 SHA512 6e5bcc9495ee7eb38a36847d87432dc5678bd23dfb04efc901691c22d5f4a757b2677bf306128c6c045b74bd370c53766cdcc29f30a88cbb041ca8aa4a030194
+DIST phosh-tour-0.39.0.tar.xz.asc 833 BLAKE2B ff8f32f87b397cd5503584daf836ac098b9ca38fe97ba8661845db8aeddb787a62375a05b8f8c6c4c7f66e954bad7c1200ac9ba97de416788a8729b186fad014 SHA512 3b3a267a9ad1d544a08b7966a0e536bde4e5de9adcbf16043fef567c393d0f68308b15140d20f2f9093495bf526ddf8c5fa4749f273f51e7ace1627e84f4bb6c
--- a/phosh-base/phosh-tour/metadata.xml
+++ b/phosh-base/phosh-tour/metadata.xml
@@ -6,6 +6,6 @@
 				<name>Anna</name>
 		</maintainer>
 		<upstream>
-				<remote-id type="gnome-gitlab">guidog/phosh-tour</remote-id>
+				<remote-id type="gnome-gitlab">World/Phosh/phosh-tour</remote-id>
 		</upstream>
 </pkgmetadata>
--- a/phosh-base/phosh-tour/phosh-tour-0.39.0.ebuild
+++ b/phosh-base/phosh-tour/phosh-tour-0.39.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome2-utils meson verify-sig xdg
+
+DESCRIPTION="Introduction to phosh on smartphones"
+HOMEPAGE="https://gitlab.gnome.org/World/Phosh/phosh-tour"
+SRC_URI="https://sources.phosh.mobi/releases/${PN}/${P}.tar.xz
+	verify-sig? ( https://sources.phosh.mobi/releases/${PN}/${P}.tar.xz.asc )"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	>=dev-libs/glib-2.74:2
+	dev-libs/gmobile
+	>=gui-libs/gtk-4.12:4
+	>=gui-libs/libadwaita-1.4:1
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-libs/libxml2
+	sys-devel/gettext
+	verify-sig? (
+		sec-keys/openpgp-keys-phosh
+	)
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/phosh.asc"
+
+QA_DESKTOP_FILE="usr/share/applications/mobi.phosh.PhoshTour.desktop"
+
+src_configure() {
+	local emesonargs=(
+		-Dbrand="smartphone"
+		-Dvendor="Gentoo"
+	)
+	meson_src_configure
+}
+
+src_test() {
+	# No useful tests
+	:
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
--- a/phosh-base/phosh/phosh-0.36.0-r1.ebuild
+++ b/phosh-base/phosh/phosh-0.36.0-r1.ebuild
@@ -9,14 +9,23 @@ HOMEPAGE="https://phosh.mobi/"
 LICENSE="metapackage"
 SLOT="0"
 KEYWORDS="~amd64"
+IUSE="cups +desktop-portal geolocation iio"

 RDEPEND="
 	app-alternatives/phosh-keyboard
-	app-misc/geoclue:2.0
 	dev-libs/feedbackd[daemon]
-	>=gui-wm/phoc-${PV}-r1
+	gnome-base/gnome-core-libs[cups?]
+	>=gui-wm/phoc-${PV}
+	media-fonts/cantarell
 	>=phosh-base/phosh-mobile-settings-${PV}
 	>=phosh-base/phosh-shell-${PV}
-	>=phosh-base/phosh-tour-${PV}
-	x11-themes/gnome-backgrounds
+	>=phosh-base/phosh-tour-0.39.0
+	>=x11-themes/phosh-wallpapers-${PV}
+	x11-themes/sound-theme-freedesktop
+	desktop-portal? (
+		gui-libs/xdg-desktop-portal-wlr
+		sys-apps/xdg-desktop-portal-gtk
+	)
+	geolocation? ( app-misc/geoclue:2.0 )
+	iio? ( gnome-extra/iio-sensor-proxy )
 "
--- a/profiles/updates/2Q-2024
+++ b/profiles/updates/2Q-2024
@@ -7,3 +7,4 @@ move sys-apps/sdate app-misc/sdate
 move gui-libs/webp-pixbuf-loader gui-libs/gdk-pixbuf-loader-webp
 move dev-python/typing_inspect dev-python/typing-inspect
 move dev-python/latexify dev-python/latexify-py
+move dev-libs/libopensmtpd mail-filter/libopensmtpd
--- a/sec-keys/signify-keys-telescope/Manifest
+++ b/sec-keys/signify-keys-telescope/Manifest
@@ -1,3 +1,2 @@
 DIST telescope-0.10.pub 95 BLAKE2B 8e79de6da956e7de25994fbca4949b431c792a1c77317c76a04218e065b27d25758d42dbadc5c57e3c35477a60ea9224cf6ca48e77bab9445601df2ee22479c7 SHA512 92e5839684de4cf2c91972d14ee914bb67b4b1f8b083bf60328c90c4beb8968646708269a7bbffb052fefde4c8454a602b021cea5844b88cde9d377c18902639
-DIST telescope-0.8.pub 95 BLAKE2B 51db0037fb1739fc087163650c8a76f02ef5f8122b0462ca114b63441f09f032ee28dc281c7260c6f286cfd51bac7e1fc7fc6918b38bd3c0b5d296656881000b SHA512 c8eeda00e65a30c75e4c4c7bec999ee37a8122ec93c4e1c444f980fb82e0c91984455c5300b49a2da35418aef4e184c421141662a9bb8be40841307029e96577
 DIST telescope-0.9.pub 95 BLAKE2B 5b65eb226db41efc31502e6b4e190aab4ec59b00206da3944028d2af0b0ebe8e0ae48a532238da79c370e2b148ff6b50ca212889799fea1fc0a0b0aee4f807d6 SHA512 c3b316d31fac4f586e0db922628529f8d64f3addc7f80b6be3a01a5b62065607351a998868fc34f581d794e563d72feaf84dd8faa6dba1b417a67d6ee8ecf211
--- a/sec-keys/signify-keys-telescope/metadata.xml
+++ b/sec-keys/signify-keys-telescope/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<upstream>
-		<remote-id type="github">omar-polo/telescope</remote-id>
+		<remote-id type="github">telescope-browser/telescope</remote-id>
 	</upstream>
 </pkgmetadata>
--- a/sec-keys/signify-keys-telescope/signify-keys-telescope-0.10.ebuild
+++ b/sec-keys/signify-keys-telescope/signify-keys-telescope-0.10.ebuild
@@ -5,7 +5,7 @@ EAPI=8

 MY_P="${PN#signify-keys-}-${PV}"
 DESCRIPTION="Signify keys used to sign telescope releases"
-HOMEPAGE="https://telescope.omarpolo.com/"
+HOMEPAGE="https://www.telescope-browser.org/"
 SRC_URI="https://ftp.omarpolo.com/${MY_P}.pub"
 S="${WORKDIR}"

--- a/sec-keys/signify-keys-telescope/signify-keys-telescope-0.8.ebuild
+++ b/sec-keys/signify-keys-telescope/signify-keys-telescope-0.8.ebuild
@@ -1,23 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN="${PN#signify-keys-}"
-MY_PV="$(ver_cut 1-2)"
-MY_P="${MY_PN}-${MY_PV}"
-DESCRIPTION="Signify keys used to sign telescope releases"
-HOMEPAGE="https://github.com/omar-polo/telescope"
-SRC_URI="https://github.com/omar-polo/${MY_PN}/releases/download/${PV}/${MY_P}.pub"
-S="${WORKDIR}"
-
-LICENSE="public-domain"
-SLOT="${MY_PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-src_install() {
-	local files=( ${A} )
-
-	insinto /usr/share/signify-keys
-	newins - ${MY_P}.pub < <(cat "${files[@]/#/${DISTDIR}/}" || die)
-}
--- a/sec-keys/signify-keys-telescope/signify-keys-telescope-0.9.ebuild
+++ b/sec-keys/signify-keys-telescope/signify-keys-telescope-0.9.ebuild
@@ -5,7 +5,7 @@ EAPI=8

 MY_P="${PN#signify-keys-}-${PV}"
 DESCRIPTION="Signify keys used to sign telescope releases"
-HOMEPAGE="https://telescope.omarpolo.com/"
+HOMEPAGE="https://www.telescope-browser.org/"
 SRC_URI="https://ftp.omarpolo.com/${MY_P}.pub"
 S="${WORKDIR}"

--- a/x11-drivers/OpenTabletDriver/Manifest
+++ b/x11-drivers/OpenTabletDriver/Manifest
@@ -1,4 +1,3 @@
-DIST OpenTabletDriver-0.6.3.0.tar.gz 272028 BLAKE2B daf60eb65c845b5b12688b3afd92851034939ab197ce9660cfb50bae22707ac4fbd3a89c507864fa06aa8262f708ac41a1b59f4d3f1eb08dcc4f086fe1545fa0 SHA512 c094d4e9c688d86c71859b63aa5ee98d2c17574206c6909bc2ce9f0d193792da438c9f89144f0dd4df621b981b52f1edda40ef0d4099ad42039abb0a1516aefd
 DIST OpenTabletDriver-0.6.4.0.tar.gz 276822 BLAKE2B 657616e7fa11bcd25d04522126aad83672f10a07d676f36ae75c7445fd79b707c65f0521a2efd0251097a2989ccf176e5664fcb1a7228f11547e1d808756fc81 SHA512 38130c09488b47688f7c07573ebd1cc441b4de0fda26a48d82197c83ee70dc070fac5a3056197ce78979df5101f77faeada5be51c38873c4004ea3e61d7fb057
 DIST atksharp.3.24.24.34.nupkg 101718 BLAKE2B 14f6e22ea9c95413e47b08b2911f27505a9d3f126547dc420d3f8f32e9df18b81617c1fb48469a5071d7f34b24645704e8021735437bb2362af642a06608ff2f SHA512 9985de9ed5dfcc376c3880f156f9807d427161509332c1af0fb92897adef17e2e9d21b52b4fd09da5bba9055807356a11e76a5a3659130eb3878c781db493a74
 DIST cairosharp.3.24.24.34.nupkg 49431 BLAKE2B f5bfd2d184b4a3c5a6d54e4b5d746b6d56346ed3dba83c6df17f2e91fed19c5774168ba687ab7ba2504ff8765a55ec62fcf0dc62b0827c2e27f36adf2bb1e38c SHA512 8589828a0f64cb377844bb2e7b329c4372c6f4de336c55d27cb74f0373f967df707756f3742a7f02ec145f71262c9114f35f5ebb853c3c57aff972931b2a013b
@@ -17,7 +16,6 @@ DIST messagepack.annotations.2.1.194.nupkg 17243 BLAKE2B 606ab1733705c66af302295
 DIST microsoft.bcl.asyncinterfaces.1.1.1.nupkg 93574 BLAKE2B 7d2ac06afc4cf6484ecf6978e8f2dc649d3cef441b709b5194abf7466e3c9e0239c1fce954fc45502e5f9be488aaf6b5eb448e37501555862402ab9466a81e98 SHA512 4cce7ecad99baae70b1f815cd047431f284a466342e4456f929bef24891f45d600d90037f0d45ca97b1b8a453b51145dc215b9807ac1ce8b2b8cf45630334204
 DIST microsoft.codecoverage.16.9.4.nupkg 5160070 BLAKE2B 763611edf9c40b7dcf90477c05e7178d5c5dea4a3ee910edd0738b70ee846490467c1bdbfe4821670ee35e1ffeeec3bdf2ed75920b210402d2fb2646d3c19514 SHA512 f404d780d660db99c92ae3d9bf22ec28e6afb5417ce4f16518525fb1b65cb37268be69c5e2ae153d103de2d6b43f02bd98d8413a9d3b01489ee73dc4a2b31d57
 DIST microsoft.csharp.4.0.1.nupkg 462346 BLAKE2B 209ccebc9103b803d26ea1f0232245c3cd231078b03a83a0011a2a79a1a8a324a72c5b3fda94b2686fff170932f366e165f81a36a70df590a39c45d70778e4be SHA512 c0e75a9162f28ba4c4572c8fac4fd4c8c97d6d3505a37683646ba5f7e5f6ac0da69d5200d2646054de90e8e08f893a10e514591b69b8273640842b2cf90bddec
-DIST microsoft.csharp.4.4.1.nupkg 654902 BLAKE2B 908ef033afbcb20eedfd8dd760c6e3039f62ea4b138ca86026ca5b6c5dcb1cb87b8620324a8b51af87d9749a660bd6ed444220b363baf5f7aac91f15b87707ef SHA512 93b2bc774e52092defb72e755877014b4f3408c5be8c48c3c1438524f73eb1d8cd77c2d014a92fd9316335229995b87704b966004fcaa92c1be8ff180a2acebc
 DIST microsoft.extensions.dependencyinjection.6.0.0-rc.1.21451.13.nupkg 198627 BLAKE2B 385ea8935b27604db8602fa2aeca84772f60be864872e2e6138f9c867309793ba43ecfca19c6fb53bbcdabb583ba182d83c84ad77333d45400e9586db08d00b4 SHA512 cd6cf1b59b8c9030a0d892006d8a72cc95f5d6c0427dc7cf9d98dc00e11b83167abe54247e9a10ecaeb16121e66a94cdaaf4ac5e3d35e25c2c71fbfc03966245
 DIST microsoft.extensions.dependencyinjection.abstractions.6.0.0-rc.1.21451.13.nupkg 138519 BLAKE2B 5a7cb5f01aeaab67492cbe2ed0ea7ba605040867ce6c60623a4a6804ff3d3d6a0e3c5a36a800d242ae12c66163629c40d824ff30a8aadf13b30ecc5458bba86e SHA512 7e764cec76616ede23c006221e6da4f7591cd037c4c76aa61f8db8828c0dd08474a2f95d3a297ef41cf259553810fd0784ba1148f30a12551a450838449ce614
 DIST microsoft.net.test.sdk.16.9.4.nupkg 40302 BLAKE2B 59313813889fc515dcc9119353234b6f189ec6e128680b304d1d42b7096f9d553671c8a8e21dca6d66825fcb869306ffa9e8b77deb49a80c935f0d014cb446f6 SHA512 e26d86adbe78e86d8b837094556b13cd83b4f02dfd9d1668edd88f723849ee8486d17cec0c35b766a557b9722578cc622d6830e1ec08a29afceae269af98bf85
@@ -38,7 +36,6 @@ DIST moq.4.16.1.nupkg 565511 BLAKE2B 12b6b77c41cad64bc2f8c00ca61a3b82bfb1c48dcf0
 DIST nerdbank.streams.2.6.77.nupkg 438007 BLAKE2B 2545c22475de9127303b8c78f0be501ddf2d68c24e85c949994dfa53531cfcfda18973f98c4c37ef5fa72a819c8df9850ee853e7d8ac7139774a7b6d479d1ecc SHA512 d53880ecfe0eb3922c34d2ba01976671fbf4431897732b1119624716d379152b57db921c7849397d7b370ecfb41d228ff0d2dcc1337847f88a7b32caddf33537
 DIST netstandard.library.1.6.1.nupkg 17360 BLAKE2B 02badd3473451f83997f0b66d05f1541c741e65b9127b8b27ab391260df7939f235eb6648b11c7c11cc5400489ddf1cd26820b7bdf6fd9f1d8f0dfdfeef96acc SHA512 0972dc2dbb4925e896f62bce2e59d4e48639320ee38ad3016dcd485fbd6936a0ed08073ad5eef2a612dff05dfc390f3930fff9e79d87a06070eeb8128277cbd0
 DIST newtonsoft.json.12.0.2.nupkg 2521025 BLAKE2B 2d6a40a97fedde8a83cef9d4ea9f5635efc83f4f7f6a8d38633e1d2011c9e9a1120979db181396c894f38c4fe0515b86781407fa607bd402dbad80f41d6cfd51 SHA512 9adc1e0573d6869d42310013b414fb65f319adb6414ca7e31b0cfa63be4dc068f1fc6ced0da5277f0f062bd299d93e1f0c8a8a2720e373d471970e7e1b615c54
-DIST newtonsoft.json.12.0.3.nupkg 2596051 BLAKE2B f7c4510414d5f0eb207bac44a1c3507d2791e1f49fea2f16a714cb194182d867435d9ea63d64f6606fea3e5e7d4ac431740e0e6b9fa6aea8e3d4319ed6189826 SHA512 6934665f0479c58bbe996c44f2bf16d435a72f4d92795f0bc1d40cb0bc1358ff0e660ac20b24eabce01ee6145bd553506178e59fbaabd0f2a94b23bfa5c735f5
 DIST newtonsoft.json.13.0.1.nupkg 2065787 BLAKE2B 000c38ce26a2a00bb25a9c1d6fb069ada521ff089bb624a5c1255b25767c10616cc51821524e7bc3d8b45eb8f8ee54c97454db1db9ae5e5c78eb6300a99f979d SHA512 83731b662eaf05379a23f8446ef47bbc111349dd4358b7bd8b51383fe9cf637e2fe62f78cea52a0d7bdd582dc6fbbb5837d4a7b1d53dcf37a0ae7473e21ee7b1
 DIST newtonsoft.json.13.0.3.nupkg 2441966 BLAKE2B 0c83cd81b9eb647fd9106c5b8b7af4ff6b35eae4fa24712f16cef1db070857b072b9e40a52ed006a82125c860dc48b89ac54224baa24bfdedfa573183e19d169 SHA512 99b252bc77d1c5f5f7b51fd4ea7d5653e9961d7b3061cf9207f8643a9c7cc9965eebc84d6467f2989bb4723b1a244915cc232a78f894e8b748ca882a7c89fb92
 DIST newtonsoft.json.9.0.1.nupkg 1613054 BLAKE2B 56918db57c3786cff0548b642195521ef203246a6b2ed010186ccae230af3b0c913ace4b2a3319bf94c6e47647b9c5ad7b017e3b50d35e6654b4d5b987643739 SHA512 da8917a5347051c8106f4ea9bade4bc300a3b60a05a3be3390f92c8dcbcea67223c7b4da8065b9228042000e25b99c75fad7e2221a0daa8888ed8ef3c161b228
@@ -108,7 +105,6 @@ DIST system.collections.concurrent.4.3.0.nupkg 502676 BLAKE2B 0d98ffad3452545961
 DIST system.collections.immutable.1.7.1.nupkg 595037 BLAKE2B 83f95d1b23960b35915e5418b125810d3087e7dd46fd2702907cac9856290bdb02d3c7e1d0a8fc73fb8cab4bdb4e928b717f6b61e7ff8fb3b508f6de49940597 SHA512 d263cc2c90a537edc49bce334490fd09d888a50f5b793e42e89133ad8db9544f356bd5745a735c4b81b7687bc1b8e4df9c8d64e388c8433361a775591ddedd76
 DIST system.collections.nongeneric.4.3.0.nupkg 239265 BLAKE2B cc987578ab9b0c1dfc8925f2c946876f8c8d6f335d8d6a6a0a30848c6c812a24774d059fe28aa83887b45d924705abe88fd96451dba7b2253dc9b99afc7a75e8 SHA512 dc6abfe778b3ea08e99f50b79112a51728e689f353b082234351b9f5b1be4b601a0b6d38a04c2138d05b5bdd83d6f3d91b53ee86ed119225c15e4683c38bf98c
 DIST system.collections.specialized.4.3.0.nupkg 183462 BLAKE2B 9297ea15b3d8880a719e4608622793e8883f68887ed2422b287897ad389b41f5301c69707434868c3db88ba3b8819c4cc22b7f5cbb09d2729b0f5e121ddb6921 SHA512 c7a257cbda812d6c0c44b29d8bb5cc4f5cf2d3cb81574eb1dc94a7efde980ac26c5ffadb7cc3521fe7b19437766a046c83cbf2e7ea59a36435c288add8142b57
-DIST system.commandline.2.0.0-beta1.21216.1.nupkg 284515 BLAKE2B 3a5492b9b38adc9b2f0c81cc288c369845d734c2a9e29bf537db978ab65df1f59257c7a3fb9a4edc2d5f7c232dbb76c695a32e27cbc3d928bdcb75c976d87c9e SHA512 4234e4c13212ecfcd465efd613e3818dc03ab22914b83a7adebc885bfe9b837cd1dc9c21fd7ad63d6e91cf1c400fd92a5bc1ee9313d2795e404c6335d35e0d2d
 DIST system.commandline.2.0.0-beta4.22272.1.nupkg 616636 BLAKE2B 5252560598c4cd67348520cea086c37b4151b984a61238de1984838975340247b16050113422b1765931bdfc1dee38e226789b6427e56ab7c3a36bf07d0bcc20 SHA512 979a7e66ba29e17bc5bec42e926ed15362e23ae403e498c955e09dffc4d3baa14777a06f95e25d591fc9757a0eaa18deb9e4662a1ca1663fa300f509a4a0383c
 DIST system.componentmodel.4.3.0.nupkg 95320 BLAKE2B 8c03f003539d1c0920c4d1a2d0b57a19f93c9c1d7f2e0004035b758b56915da1ba0207d1506cc0cf8af71bb2e58408fb824674941230a0465249752b1dc0df93 SHA512 7c638ac92a132e1553a089c6a711ffb7431b22fecca322ce748d6684ae2baaf161bab2f71704750bd15ec6fda11e795f2ab8491ac769b89341bde77aa9212d59
 DIST system.componentmodel.annotations.4.7.0.nupkg 758451 BLAKE2B 40ed473676a7c397c2d69f34b377f74022bfe70ffcaa4108f1e910f606e86d215ffabbc5ffb990433f091522595ca9d1028c257c354bcc5a1961cef9892b3d5d SHA512 a06e7cbfb16420c7b0654d6d372a8a6e78a51286d6e88e16d31cb443f873b6355b4d5afcde85cd3c7c2bbd2db82492ab0f294b8a7808948ff39821c2679bead4
@@ -218,7 +214,6 @@ DIST system.xml.readerwriter.4.3.0.nupkg 1388897 BLAKE2B ae51b8fe4492dec1e4e3584
 DIST system.xml.xdocument.4.0.11.nupkg 591353 BLAKE2B 8373fa19c6aafbe6e347db7bb1ec304dd8ce77df415acf0c3ee04ea2dcfce050f59d6e72cdeb14c4e54d29c1c07fc9eb0ef8045fb09830b48fb1a8e90dcb09a8 SHA512 f8ae902901963f2636f39c0652d82daa9df3fb3e3d5a60493c39f6cf01ed07c7d57f175a2d2895f4a872d4e92527e5131522218d1a67da2fd491e162273a8527
 DIST system.xml.xdocument.4.3.0.nupkg 591350 BLAKE2B 86f910cef36c056f4a9ea9dc26eea6e01070467d27ac80fb8a0af5e1a572ad5d2169e4f1297cd362fddc9e0309458dbd413fca85ef8e56f97781c218e594604a SHA512 c2d9236a696daf23a29b530b9aa510fb813041685a1bb9a95845a51e61d870a0615e988b150f5be0d0896ef94b123e97f96c8a43ee815cf5b9897593986b1113
 DIST system.xml.xmldocument.4.3.0.nupkg 285212 BLAKE2B 0d96ca356543e8e915597e0624dca42f0c7032a2ae9e380a6fba3fbee0dacb9e5f06017893b2b7a8b937dbb4de7d5665fa6648e3bf8df12e0d34e4075c125109 SHA512 22251b3f16de9aa06e091b24baea1b8c95752f0d22266faf34e1fb76b347b23f7910cdaf567058e23d06b7079961090ca70805070a2491add5da4d0271afd133
-DIST udev.net.1.0.0.nupkg 14270 BLAKE2B 85a71ee6634c8fcdde185adf21d51bc55afdb7e5185bf5a93326f0bba9b30ec554b1d78a6e47b005c77c6420e04e0402a3147843b13761ab6fc180dc794b2b8c SHA512 b9f5247119574b1118811cbe95c784a38cfc75bd4c3e7b82674cb0e4bbab5a2a69aee896bd1226755b2fe61cf00d1340b532fb0539c09bd51870ac0a29a7fc31
 DIST waylandnet.0.2.0.nupkg 35239 BLAKE2B bda630839d46d25e0e671487b78c0991f42affa450a1014f532f8da7c65ec7e0afadae4eddd2da1344d1aa6afecf220fc58e9bb1d85d54bbf269455cc289ecec SHA512 d930f63c407102a466322f0c736cba279a6f0f076ba0ca199ba93c89546158a1bf25dbf2ea9cf09d51635dbb63c2c16c197afae4619a3ed6341ef25f4b8f3c72
 DIST xunit.2.4.1.nupkg 20733 BLAKE2B ee83156610dc4ade1f15c05d97725e1913a9dde04e474c11fe396c37df5d438ab934776e4660d3d139fe34949eb890dae67c0145d3815a8a25cc976b9d2cca7b SHA512 3b0061a5ecfd49166f123aa27375956c00aedb0b22f6ee6a8be629cd583a0532f7476e51ffacad3385245139f1f9d4990c9dc850fc7ef7d097fd85e7c6b40058
 DIST xunit.abstractions.2.0.3.nupkg 75155 BLAKE2B 8cfecf557dbe20e0e14b1d8b413acd7516b6538cb543a12708910311fa76b7dcd9d060c7be70a05b0af5ef3b8bd5f819104025afe9796e240c28fcae1c7460c1 SHA512 3ca26b8b97f4a8440f16f818e82651f571bc2513a5592742fd960b9240d0b880fef84827fb25a307e61fe7b019f14e864653fbcf7dee0d0e3faf90593deaf624
--- a/x11-drivers/OpenTabletDriver/OpenTabletDriver-0.6.3.0.ebuild
+++ b/x11-drivers/OpenTabletDriver/OpenTabletDriver-0.6.3.0.ebuild
@@ -1,326 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DOTNET_PKG_COMPAT=6.0
-NUGETS="
-atksharp@3.24.24.34
-cairosharp@3.24.24.34
-castle.core@4.4.0
-coverlet.collector@3.0.2
-eto.forms@2.5.10
-eto.forms@2.5.11
-eto.platform.gtk@2.5.11
-gdksharp@3.24.24.34
-giosharp@3.24.24.34
-glibsharp@3.24.24.34
-gtksharp@3.24.24.34
-hidsharpcore@1.2.1.1
-messagepack@2.1.194
-messagepack.annotations@2.1.194
-microsoft.bcl.asyncinterfaces@1.1.1
-microsoft.codecoverage@16.9.4
-microsoft.csharp@4.0.1
-microsoft.csharp@4.4.1
-microsoft.extensions.dependencyinjection@6.0.0-rc.1.21451.13
-microsoft.extensions.dependencyinjection.abstractions@6.0.0-rc.1.21451.13
-microsoft.netcore.platforms@1.0.1
-microsoft.netcore.platforms@1.1.0
-microsoft.netcore.platforms@1.1.1
-microsoft.netcore.platforms@3.0.0
-microsoft.netcore.targets@1.0.1
-microsoft.netcore.targets@1.1.0
-microsoft.net.test.sdk@16.9.4
-microsoft.testplatform.objectmodel@16.9.4
-microsoft.testplatform.testhost@16.9.4
-microsoft.visualstudio.threading@16.7.56
-microsoft.visualstudio.threading.analyzers@16.7.56
-microsoft.visualstudio.validation@15.5.31
-microsoft.win32.primitives@4.3.0
-microsoft.win32.registry@4.6.0
-moq@4.16.1
-nerdbank.streams@2.6.77
-netstandard.library@1.6.1
-newtonsoft.json@12.0.3
-newtonsoft.json@12.0.2
-newtonsoft.json@13.0.1
-newtonsoft.json@9.0.1
-nuget.frameworks@5.0.0
-octokit@0.50.0
-pangosharp@3.24.24.34
-runtime.any.system.collections@4.3.0
-runtime.any.system.diagnostics.tools@4.3.0
-runtime.any.system.diagnostics.tracing@4.3.0
-runtime.any.system.globalization@4.3.0
-runtime.any.system.globalization.calendars@4.3.0
-runtime.any.system.io@4.3.0
-runtime.any.system.reflection@4.3.0
-runtime.any.system.reflection.extensions@4.3.0
-runtime.any.system.reflection.primitives@4.3.0
-runtime.any.system.resources.resourcemanager@4.3.0
-runtime.any.system.runtime@4.3.0
-runtime.any.system.runtime.handles@4.3.0
-runtime.any.system.runtime.interopservices@4.3.0
-runtime.any.system.text.encoding@4.3.0
-runtime.any.system.text.encoding.extensions@4.3.0
-runtime.any.system.threading.tasks@4.3.0
-runtime.any.system.threading.timer@4.3.0
-runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl@4.3.0
-runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl@4.3.2
-runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl@4.3.0
-runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl@4.3.2
-runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl@4.3.0
-runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl@4.3.2
-runtime.native.system@4.3.0
-runtime.native.system.io.compression@4.3.0
-runtime.native.system.net.http@4.3.0
-runtime.native.system.security.cryptography.apple@4.3.0
-runtime.native.system.security.cryptography.openssl@4.3.0
-runtime.native.system.security.cryptography.openssl@4.3.2
-runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl@4.3.0
-runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl@4.3.2
-runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl@4.3.0
-runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl@4.3.2
-runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple@4.3.0
-runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl@4.3.0
-runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl@4.3.2
-runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl@4.3.0
-runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl@4.3.2
-runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl@4.3.0
-runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl@4.3.2
-runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl@4.3.0
-runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl@4.3.2
-runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl@4.3.0
-runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl@4.3.2
-runtime.unix.microsoft.win32.primitives@4.3.0
-runtime.unix.system.console@4.3.0
-runtime.unix.system.diagnostics.debug@4.3.0
-runtime.unix.system.io.filesystem@4.3.0
-runtime.unix.system.net.primitives@4.3.0
-runtime.unix.system.net.sockets@4.3.0
-runtime.unix.system.private.uri@4.3.0
-runtime.unix.system.runtime.extensions@4.3.0
-sharpziplib@1.3.3
-streamjsonrpc@2.6.121
-system.appcontext@4.3.0
-system.buffers@4.3.0
-system.collections@4.0.11
-system.collections@4.3.0
-system.collections.concurrent@4.3.0
-system.collections.immutable@1.7.1
-system.collections.nongeneric@4.3.0
-system.collections.specialized@4.3.0
-system.commandline@2.0.0-beta1.21216.1
-system.commandline@2.0.0-beta4.22272.1
-system.componentmodel@4.3.0
-system.componentmodel.annotations@4.7.0
-system.componentmodel.primitives@4.3.0
-system.componentmodel.typeconverter@4.3.0
-system.console@4.3.0
-system.diagnostics.debug@4.0.11
-system.diagnostics.debug@4.3.0
-system.diagnostics.diagnosticsource@4.3.0
-system.diagnostics.tools@4.0.1
-system.diagnostics.tools@4.3.0
-system.diagnostics.tracesource@4.3.0
-system.diagnostics.tracing@4.3.0
-system.dynamic.runtime@4.0.11
-system.dynamic.runtime@4.3.0
-system.globalization@4.0.11
-system.globalization@4.3.0
-system.globalization.calendars@4.3.0
-system.globalization.extensions@4.3.0
-system.io@4.1.0
-system.io@4.3.0
-system.io.compression@4.3.0
-system.io.compression.zipfile@4.3.0
-system.io.filesystem@4.0.1
-system.io.filesystem@4.3.0
-system.io.filesystem.primitives@4.0.1
-system.io.filesystem.primitives@4.3.0
-system.io.pipelines@4.7.2
-system.linq@4.1.0
-system.linq@4.3.0
-system.linq.expressions@4.1.0
-system.linq.expressions@4.3.0
-system.memory@4.5.4
-system.net.http@4.3.0
-system.net.http@4.3.4
-system.net.nameresolution@4.3.0
-system.net.primitives@4.3.0
-system.net.sockets@4.3.0
-system.net.websockets@4.3.0
-system.objectmodel@4.0.12
-system.objectmodel@4.3.0
-system.private.uri@4.3.0
-system.reflection@4.1.0
-system.reflection@4.3.0
-system.reflection.emit@4.0.1
-system.reflection.emit@4.3.0
-system.reflection.emit@4.7.0
-system.reflection.emit.ilgeneration@4.0.1
-system.reflection.emit.ilgeneration@4.3.0
-system.reflection.emit.lightweight@4.0.1
-system.reflection.emit.lightweight@4.3.0
-system.reflection.emit.lightweight@4.6.0
-system.reflection.extensions@4.0.1
-system.reflection.extensions@4.3.0
-system.reflection.metadata@1.6.0
-system.reflection.primitives@4.0.1
-system.reflection.primitives@4.3.0
-system.reflection.typeextensions@4.1.0
-system.reflection.typeextensions@4.3.0
-system.resources.resourcemanager@4.0.1
-system.resources.resourcemanager@4.3.0
-system.runtime@4.1.0
-system.runtime@4.3.0
-system.runtime.compilerservices.unsafe@4.5.2
-system.runtime.compilerservices.unsafe@4.7.1
-system.runtime.compilerservices.unsafe@6.0.0-rc.1.21451.13
-system.runtime.extensions@4.1.0
-system.runtime.extensions@4.3.0
-system.runtime.handles@4.0.1
-system.runtime.handles@4.3.0
-system.runtime.interopservices@4.1.0
-system.runtime.interopservices@4.3.0
-system.runtime.interopservices.runtimeinformation@4.3.0
-system.runtime.numerics@4.3.0
-system.runtime.serialization.primitives@4.1.1
-system.security.accesscontrol@4.6.0
-system.security.claims@4.3.0
-system.security.cryptography.algorithms@4.3.0
-system.security.cryptography.cng@4.3.0
-system.security.cryptography.csp@4.3.0
-system.security.cryptography.encoding@4.3.0
-system.security.cryptography.openssl@4.3.0
-system.security.cryptography.primitives@4.3.0
-system.security.cryptography.x509certificates@4.3.0
-system.security.principal@4.3.0
-system.security.principal.windows@4.3.0
-system.security.principal.windows@4.6.0
-system.text.encoding@4.0.11
-system.text.encoding@4.3.0
-system.text.encoding.extensions@4.0.11
-system.text.encoding.extensions@4.3.0
-system.text.regularexpressions@4.1.0
-system.text.regularexpressions@4.3.0
-system.threading@4.0.11
-system.threading@4.3.0
-system.threading.tasks@4.0.11
-system.threading.tasks@4.3.0
-system.threading.tasks.dataflow@4.11.1
-system.threading.tasks.extensions@4.0.0
-system.threading.tasks.extensions@4.3.0
-system.threading.tasks.extensions@4.5.4
-system.threading.threadpool@4.3.0
-system.threading.timer@4.3.0
-system.xml.readerwriter@4.0.11
-system.xml.readerwriter@4.3.0
-system.xml.xdocument@4.0.11
-system.xml.xdocument@4.3.0
-system.xml.xmldocument@4.3.0
-udev.net@1.0.0
-waylandnet@0.2.0
-xunit@2.4.1
-xunit.abstractions@2.0.3
-xunit.analyzers@0.10.0
-xunit.assert@2.4.1
-xunit.core@2.4.1
-xunit.extensibility.core@2.4.1
-xunit.extensibility.execution@2.4.1
-xunit.runner.visualstudio@2.4.3
-"
-
-inherit desktop dotnet-pkg linux-info udev xdg
-
-DESCRIPTION="A cross-platform open-source tablet driver"
-HOMEPAGE="https://opentabletdriver.net/"
-SRC_URI="
-	https://github.com/OpenTabletDriver/OpenTabletDriver/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-	${NUGET_URIS}
-"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-libs/libevdev
-	virtual/udev
-	x11-libs/libX11
-	x11-libs/libXrandr
-	x11-libs/gtk+:3
-	!x11-drivers/OpenTabletDriver-bin
-"
-
-CONFIG_CHECK="~INPUT_UINPUT"
-DOTNET_PKG_PROJECTS=(
-	"${S}/OpenTabletDriver.Console/OpenTabletDriver.Console.csproj"
-	"${S}/OpenTabletDriver.Daemon/OpenTabletDriver.Daemon.csproj"
-	"${S}/OpenTabletDriver.UX.Gtk/OpenTabletDriver.UX.Gtk.csproj"
-)
-
-pkg_setup() {
-	linux-info_pkg_setup
-	dotnet-pkg_pkg_setup
-}
-
-src_prepare() {
-	# Build doesn't need the solution file but eclass tries to use it.
-	rm -f OpenTabletDriver.sln || die
-	dotnet-pkg_src_prepare
-}
-
-src_configure() {
-	dotnet-pkg_src_configure
-
-	# These projects are only used at build time, should not be installed.
-	dotnet-pkg-base_restore OpenTabletDriver.Tests
-	dotnet-pkg-base_restore OpenTabletDriver.Tools.udev
-}
-
-src_compile() {
-	dotnet-pkg_src_compile
-	edotnet run --project OpenTabletDriver.Tools.udev -- \
-		OpenTabletDriver.Configurations/Configurations > 70-opentabletdriver.rules
-}
-
-src_install() {
-	dotnet-pkg_src_install
-
-	dotnet-pkg-base_dolauncher "/usr/share/${P}/${PN}.Console" otd
-	dotnet-pkg-base_dolauncher "/usr/share/${P}/${PN}.Daemon" otd-daemon
-	dotnet-pkg-base_dolauncher "/usr/share/${P}/${PN}.UX.Gtk" otd-gui
-
-	doicon OpenTabletDriver.UX/Assets/otd.png
-	doman docs/manpages/opentabletdriver.8
-	make_desktop_entry otd-gui OpenTabletDriver otd Settings
-	udev_dorules 70-opentabletdriver.rules
-
-	cd "${S}/eng/linux/Generic/usr/lib" || die
-	insinto /lib/modprobe.d
-	doins modprobe.d/99-opentabletdriver.conf
-	insinto /usr/lib/modules-load.d
-	doins modules-load.d/opentabletdriver.conf
-	insinto /usr/lib/systemd/user
-	doins systemd/user/opentabletdriver.service
-}
-
-src_test() {
-	dotnet-pkg-base_test OpenTabletDriver.Tests
-}
-
-pkg_postinst() {
-	udev_reload
-	xdg_pkg_postinst
-
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "Please replug your tablet before attempting to use the driver"
-	fi
-}
-
-pkg_postrm() {
-	udev_reload
-	xdg_pkg_postrm
-}
--- a/x11-misc/rofi-emoji/rofi-emoji-3.3.0.ebuild
+++ b/x11-misc/rofi-emoji/rofi-emoji-3.3.0.ebuild
@@ -13,26 +13,22 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"

-IUSE="X wayland"
+IUSE="wayland"

 DEPEND="
-	wayland? (
-		gui-apps/rofi-wayland
-	)
-	X? (
-		x11-misc/rofi
-	)
+	!wayland? ( x11-misc/rofi )
+	wayland? ( gui-apps/rofi-wayland )
 "
 RDEPEND="
 	${DEPEND}
+	!wayland? (
+		|| ( x11-misc/xsel x11-misc/xclip x11-misc/copyq )
+		x11-misc/xdotool
+	)
 	wayland? (
 		gui-apps/wl-clipboard
 		gui-apps/wtype
 	)
-	X? (
-		|| ( x11-misc/xsel x11-misc/xclip x11-misc/copyq )
-		x11-misc/xdotool
-	)
 "

 src_prepare() {
--- a/x11-themes/phosh-wallpapers/Manifest
+++ b/x11-themes/phosh-wallpapers/Manifest
@@ -0,0 +1,2 @@
+DIST phosh-wallpapers-0.40.0.tar.xz 2379648 BLAKE2B 56bce8c499fe5bbc4228d986dc54473b436afc5e6a8c8840b1f7d1367e74a613f67746a39dbd59c69bec5488ba7e592ebaf778c39e4b5a0737d54d01edfc4cff SHA512 aa77b5ad3c3ecf09118ca195075701669a9d632c4a88b91d9479b1b1c8469271f61b6c11b57a5dba477ac9fa38ee2faece1f26ce699327fb58d3ad9f0804a469
+DIST phosh-wallpapers-0.40.0.tar.xz.asc 833 BLAKE2B f4a3bb38cf4ccc9e3fdce920e05c7bd798c06beb1e544ec5536cdc1f28b9fd6d05cc4ffe9cc0d1e5a1c0c6d848c434909a38e2e7b4eb339249ad79fbcd327c87 SHA512 5bad716a1652f02e71cd0491b3d77353288e5d780f6e8d4bca6095a8340a1d201c505d033a266e040c0f7427b4fd049a4e8dc8205088bfac557d893c82559cda
--- a/x11-themes/phosh-wallpapers/metadata.xml
+++ b/x11-themes/phosh-wallpapers/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+		<maintainer type="person">
+				<email>cyber+gentoo@sysrq.in</email>
+				<name>Anna</name>
+		</maintainer>
+		<upstream>
+				<remote-id type="gnome-gitlab">guidog/phosh-wallpapers</remote-id>
+		</upstream>
+</pkgmetadata>
--- a/x11-themes/phosh-wallpapers/phosh-wallpapers-0.40.0.ebuild
+++ b/x11-themes/phosh-wallpapers/phosh-wallpapers-0.40.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome2-utils meson verify-sig xdg
+
+DESCRIPTION="Phosh wallpapers and other artwork"
+HOMEPAGE="https://gitlab.gnome.org/guidog/phosh-wallpapers"
+SRC_URI="https://sources.phosh.mobi/releases/${PN}/${P}.tar.xz
+	verify-sig? ( https://sources.phosh.mobi/releases/${PN}/${P}.tar.xz.asc )"
+
+LICENSE="CC0-1.0 CC-BY-SA-4.0 GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/phosh.asc"
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
				`@@ -0,0 +1 @@`
				`DIST swift-5.10.1-RELEASE-fedora39.tar.gz 701249576 BLAKE2B 37e3e989476c9676c642c604948eec1285f06998f02e8d75ed723bebb360069dc77d1eabcc8c97039461e018034d71ff7867cb9308c839fd708cca87f3ee90e1 SHA512 582e2f23e6b9dca76c908452ad1a0f20e0ab1f789b3e140568427f13736071ec9ce9c16abaa90535510cc5a08001cd5e95961ae8bb591b249c16f3881d289859`
				`@@ -1 +0,0 @@`
				`DIST libopensmtpd-0.7.tar.gz 34942 BLAKE2B 09b820bed528678adce8e52db9a0001732636668ece49eca4bd91c35374d53d3c076367dc543d06ef73b671b2776942bb210b82da4a4804db7a91e5065545df5 SHA512 53153eea5ed85309434316fa9bbba032aba9cac30744a6c228892b5fdf67f9df7e05c25832f16845c603892a255dfcf67d432e2a43ec6228f3103cf92ba2394f`
				`@@ -1 +0,0 @@`
				`DIST filter-dkimsign-0.6.tar.gz 24163 BLAKE2B f82175c6140a1691f5647562619420c57923cc2deadeabc4ac4b78eeaaa9ddaf6b73635034239e148a8532f77b0422ac52d1961a4f3549b6b686698592b71ae0 SHA512 1efab386a020c6a3cbf6059ce0feea539fa62be0990fd8538c4b152fa0c302d7bfffa7c7bb74643c25e47c20250f600f1371d2725dc3178ad103ce585530c0ce`
				`@@ -0,0 +1 @@`
				`DIST manyverse_0.2310.9-beta_amd64.deb 72048716 BLAKE2B 613c174359c72d948c51598674a7fdde15ffac80f451cc0765524329e625ed1c4fd642b8dd62613e6a28fbf17cf5796053412e4a08b4f256c75e7b7f0cfcf533 SHA512 6a970126f7ae622ba0bfed85ddb31b5193823365d04f50ca7ac914968336fdb9cbf310ce535946875bb9500d754bf98a01eb9f2236bdac054e93dfa8f31b3461`