From ae832415103492f73a8351ed7a91cb596392d779 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Fri, 21 Mar 2025 00:31:17 +0000
Subject: gentoo auto-resync : 21:03:2025 - 00:31:16

---
 sys-apps/Manifest.gz                               | Bin 51555 -> 51552 bytes
 sys-apps/amdgpu_top/Manifest                       |   4 +
 sys-apps/amdgpu_top/amdgpu_top-0.10.4.ebuild       |  74 ++++++++++
 sys-apps/openrc/Manifest                           |   2 +
 sys-apps/openrc/openrc-0.61.ebuild                 | 163 +++++++++++++++++++++
 sys-apps/pkgcraft-tools/Manifest                   |   2 +-
 sys-apps/pkgcraft-tools/pkgcraft-tools-9999.ebuild |   8 +-
 sys-apps/pv/Manifest                               |   2 +-
 sys-apps/pv/pv-1.9.31.ebuild                       |   2 +-
 sys-apps/util-linux/Manifest                       |   2 +-
 sys-apps/util-linux/util-linux-2.41.ebuild         |   3 +
 sys-apps/xdg-desktop-portal-gtk/Manifest           |   2 +
 .../xdg-desktop-portal-gtk-1.15.2.ebuild           |  56 +++++++
 sys-apps/xdg-desktop-portal/Manifest               |   5 +-
 ...-desktop-portal-1.20.0-optional-gstreamer.patch | 104 +++++++++++++
 ...rtal-1.20.0-sandbox-disable-failing-tests.patch |   7 +-
 .../xdg-desktop-portal-1.20.0-r1.ebuild            | 127 ++++++++++++++++
 .../xdg-desktop-portal-1.20.0.ebuild               | 124 ----------------
 18 files changed, 551 insertions(+), 136 deletions(-)
 create mode 100644 sys-apps/amdgpu_top/amdgpu_top-0.10.4.ebuild
 create mode 100644 sys-apps/openrc/openrc-0.61.ebuild
 create mode 100644 sys-apps/xdg-desktop-portal-gtk/xdg-desktop-portal-gtk-1.15.2.ebuild
 create mode 100644 sys-apps/xdg-desktop-portal/files/xdg-desktop-portal-1.20.0-optional-gstreamer.patch
 create mode 100644 sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.20.0-r1.ebuild
 delete mode 100644 sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.20.0.ebuild

(limited to 'sys-apps')

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index df85786786f2..13d59ebda956 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/amdgpu_top/Manifest b/sys-apps/amdgpu_top/Manifest
index e7428d911907..423e87b71fa6 100644
--- a/sys-apps/amdgpu_top/Manifest
+++ b/sys-apps/amdgpu_top/Manifest
@@ -1,5 +1,7 @@
 DIST amdgpu_top-0.10.1.gh.tar.gz 3139335 BLAKE2B ea7f0fda8e3ae0cc7fa3af5e0afe7217440436a5830acfe0875017616cb0f20d3b2ab4728420129d7b2c04e7cbf31269f5752e24fcbbb9c0cf3b5a33e2932d0a SHA512 3618cc231d2a8b2618456441eebe77184da6b0c289c68e1c2e28303288288c0dc13d886e3e652fc8a77c945be8c7ebb3ec5fc4796469e6c2413c094c581aa28c
 DIST amdgpu_top-0.10.3.gh.tar.gz 3170146 BLAKE2B 8edd77e009012857de06468c02c2989ed0093fd4a68244a2fa4f63977010249c830336c73e5918a9748f0b425c6ae6a4ac00833c5af6d0beb0a657f769fc7756 SHA512 cfb5f345b377eeb1311a5393e1d11f27643237a2c7603c5d4b0bd752a3af8444cc611b905048ba2131a1d30216ada43a43c7b59a406d0643e063962d5d86ecdb
+DIST amdgpu_top-0.10.4-crates.tar.xz 38055628 BLAKE2B 4286b9c560c1071708b2ce95417086f7a1edeb6c1263b364fcb8a3befee8ec351cb0a40351f9c5eba45e2daae66055d159dd28d9992447df568d4dba30c52b69 SHA512 0450ba36552bd26296e011a94e188f31161718f5f304f6b469f0277dee0e5ebaee47fbd501608927dd21c86bf465bec114734de43ae6dee90172fc7cee061869
+DIST amdgpu_top-0.10.4.gh.tar.gz 3172339 BLAKE2B e642e8c9336f61f65f1f02abd3b7df0f14836a408c35a7ba9770fefa0fc68bb0e72bdbb87c6e2f88cb1665d471d6bc4de22085d8d805c918cb84ab0161f891a2 SHA512 3e10e7928d565399effc3f01ec209ebac9596e81399dbc6210660dc08c058786e558c21eaf51c580c68225069cdfa0a5d935107620fe09fbef2d3a39a5802a40
 DIST amdgpu_top-0.7.0.gh.tar.gz 3114789 BLAKE2B 302e2ceb708a21f2e97690fd1ffabefbfd42fd1274e7b0641f75ad349384411fda43caa0e243ed6e987700ebc6408e0d28fb735e3c54408d450f679b29d34457 SHA512 4f0e759b5a5407c4dbf5fd04b1f33dcd3d159205868aca48efc95f0c9d309a80e3a615a65eddab80da92da909f2926bb33b813af1bd811442cb7d000d2ffbf3a
 DIST amdgpu_top-0.9.1.gh.tar.gz 3127230 BLAKE2B b675ee77bddac6cf12611202b06808c1dd0ff15778dd6cdb23c4ba907d7f3d2bf39d64efaca8ee5584842d9f2d2991ebe0bd86a3a2b23a2a3d4e430a0a4d33c2 SHA512 a5aabe87882a6def5e9ea072c8bfe2257b9174f9618f827bf58cff5a009d3e139e286095483fd4b439c04ff740eafdea2ffc3ffb0d7267d32d6cd7d1d2eac6f8
 DIST amdgpu_top-v0.10.1-crates.tar.xz 36611684 BLAKE2B a701a76fa0768743bb5007010c7656f3c42e8ce88fff6b09147c1e4e8b929f5057f36e8917adbf988f9d641ad669a55f5dc7e30d457a40be248cc4c13b77f2f1 SHA512 3121ea4326ec2e78e8cdaa428dc0b8811eb7b1e3a91c47ead860b419b01fceb1b7d514e10faa59097cd27e25728e6cb3bf217cece279e3e048f02c518234a741
@@ -7,11 +9,13 @@ DIST amdgpu_top-v0.10.3-crates.tar.xz 36982492 BLAKE2B d5165fba3b7b4dd25970dbcce
 DIST amdgpu_top-v0.7.0-crates.tar.xz 31903896 BLAKE2B 40302c61c7437ad7d65c6f45063bae5c59b107f1ea313945f078617f0a8582ab306bd407cbf386c6b4c45f0ce480db19e5b6a48e8f34b330e8d67da57c254819 SHA512 7764be037942b4a89841887685af3d5a938a2ab20f2da12fd64eb7b5cf4ba37d3ef6f09a5e114ae9239fad37433f1a0bb4d4f5d561960849cbe60120e5502496
 DIST amdgpu_top-v0.9.1-crates.tar.xz 36413732 BLAKE2B 86fd57af4150b3d405a0dbf477c03cb3121a53fb80c47b346340fb88a3e51acd35adfdb919a70f01a9601fc0953118b2129243d98c6b0eee6c6a77f296a5c8c4 SHA512 0ad3f94f60fe3ed1ef58f4cbc9de652c682fb024e57e2a82f43fc6891b44b9917db71d50582f3e23d3a0e5a657c22dd1b3062baccd113e98c7711eec7fa0f176
 DIST libdrm-amdgpu-sys-rs-6852a973c639385988ce0454b59dddcf40ebcd2f.gh.tar.gz 117442 BLAKE2B 25d176dd1375e45665ba1e9666258930676551d8264d2ca6aee80c0e6d8b7031efe661bf98982a29bd3e10faa3d7ace384488221d71d5230b78b31a33710890e SHA512 59ae9f614dfb7c02d8a0cc48b968c1e8410ab01ec7d0ab6301e8b6b4876b99e5601efd6406f2dedc81ab7ebdb90ab54c1420e35746882f8c9da4d335f6d9788c
+DIST libdrm-amdgpu-sys-rs-69196107b2a8ab8dabfd67265f004f16f146a308.gh.tar.gz 764312 BLAKE2B 709479a02bf6571017be61624eb9fcf1556f69868234ce7c5e9e6cf01254d0e7a3fd7caa2629b2777ffa7201f23399fef6f8f798c89a99c3b254a30419924ff1 SHA512 6ff42d29ddff30793050753e87e519ba3223eac49b67e73a110532e3fe051a80ef5b04efad89cf4ecf7e993cac861cdf65042b14328d00748a273b8243104f11
 DIST libdrm-amdgpu-sys-rs-b5e3441c39ea680871a255c702addbf24c90118a.gh.tar.gz 622620 BLAKE2B adf007ef4b4b16d40c808bfb95672109a2312e7febe9db9d735382e3ad4719350861f0a2c85716c2b992eb2e070902786969b36af1f00d1b439d896ace407e1c SHA512 261f400d17a891d66a189129bdf6f8826ff5ef4458bd48a16ddf69c22cb03906b8507d01a3709f950ddf2d68a6e26836d5da56c83e084421d78fad92f588d9a0
 DIST libdrm-amdgpu-sys-rs-b981299647a56ab8397b36a040f5a82943906a18.gh.tar.gz 644840 BLAKE2B 4d3d5fddc348398e204b49be7703070ca39ad6ae99ca600511c325ce2438dab5937532c22c9608e5397ea820e37dd47d46ad590ae0102a3811d2e6ccf8adc51e SHA512 5929bb963d0218d0c246eda2a556ad70f445c5d4275915f789b05dbb739a3c721f3b81c1821c39372598c18579b575b6e5818e53c29367bc6e582a52f347fe4e
 DIST libdrm-amdgpu-sys-rs-bbe45fbfd1924b96684fc76683e4c61a93449c49.gh.tar.gz 756390 BLAKE2B 0ba170bc24f4a2504ee83207f7b6c33edc8dc7409a2ba46cf5bd65bc0a0ffda1de7ae7c0e4c8f5b31e869ac4716103454cae1df96ef62390e2a999c76dd9a082 SHA512 c0751e18d9b28bb5a65ccb121c50b6e1c45a5ec7a45c6309a6f14a368fee6f06428b8a041919d80fbed687091e2b01e64c99e08ecbd8ddcd088f2714ef244fd7
 EBUILD amdgpu_top-0.10.1-r2.ebuild 1455 BLAKE2B b374dbd5a20aa4156a93055bfbd5e29a1b637e0dccc352216e9bbe68591912f4178822cc0987ad3631f3d7e85c3c53010ac70b37c22488fabf1c8ad511e5ad93 SHA512 11dc0aff3dbb2c4fc3771c91f0fc38e95f992dd3423c917ca5bb19818ecedc54e3ddabced09b9e2f25552d39d0a20ca9aed1491611d2e3998c5189a905a9b035
 EBUILD amdgpu_top-0.10.3.ebuild 1478 BLAKE2B e3be096f914c1970a57430d74edc7b42e972401f372c9f7e0b6dba36cd0f18bc0b630dae733d89625dd84aac7c3fbadc9c331a79494b25e9066d7ca806dd4185 SHA512 f40cf1e1e87cca8ff86be58f6c8e1ab4e623a32fb8bc4e6be0a3b1ce9d52b0205ab85cdc7a501732ceb8be4a67c6cd8a328e6dc556fa0a39b0ef18f3ef3e6db4
+EBUILD amdgpu_top-0.10.4.ebuild 1471 BLAKE2B 50c567f2976cd9f90c5bf4979f22d42e735ec45f463bf3b11c7799c00a132b4426cc013ed7aec98802bef118900e57aa5c4a2899949646bc0daeff503a383135 SHA512 ddeda23f5e2b68eb12d0023bee25a0c8e02949c99e055ee4c837a59473456f6301cf3f17f5e2ca55e14bdc1cf2466692e42395cf25373a37894917614e15a58b
 EBUILD amdgpu_top-0.7.0-r1.ebuild 1473 BLAKE2B 5af61fc95e4e4538c79dcd167ee15cc66bfbb20783f9ff27c89fe2a78b1bca745b0a873c8d2e0df06a78f612607ae239fcc06d5ac4450f5d1080cdbd94bf44f4 SHA512 130b99a9abb79bcb63847dca86776d3f5d6118e06f6110c51c061fdf0622cd71a708994374eeb35a14f18a33cf1a48b2897c60ab7a57e77875fb181411af8ad4
 EBUILD amdgpu_top-0.9.1-r1.ebuild 1415 BLAKE2B 635db8ada67dd8c856f51067a0115ffcffe86c6e04b155d6bfa18deb33ec2c84c73534b8d303acc64115cdeaa681c83a3886453d44d1b140b72bbd6732db8ab5 SHA512 a7fc476903f881c9cdad531a61d58df5027954d64341d35fe1998da761f4cdefc62a5420dfe797f9b90dfe1b7523b5efc410064f43d93e018f2fc90a08d2e2f6
 MISC metadata.xml 337 BLAKE2B 62388e25cb78326d4fbca06d0792ceb5498f21708c326281fdba1cabd5b959e8b79122b3da7b3df74a812dfdb87248b002fc1def14694187ec9e829e83aae0c2 SHA512 3a4ac4d697f32a0a3e042cb6ef4faa7c2c702786c767d19135da793781c3d68b80e3674767ecdf831ac0bba46d0deab4c7efde78491b7a38a36f1152e862bbc8
diff --git a/sys-apps/amdgpu_top/amdgpu_top-0.10.4.ebuild b/sys-apps/amdgpu_top/amdgpu_top-0.10.4.ebuild
new file mode 100644
index 000000000000..806b98832d0a
--- /dev/null
+++ b/sys-apps/amdgpu_top/amdgpu_top-0.10.4.ebuild
@@ -0,0 +1,74 @@
+# Copyright 2024-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Autogenerated by pycargoebuild 0.13.5
+
+EAPI=8
+
+CRATES=""
+
+declare -A GIT_CRATES=(
+	[libdrm_amdgpu_sys]='https://github.com/Umio-Yasuno/libdrm-amdgpu-sys-rs;69196107b2a8ab8dabfd67265f004f16f146a308;libdrm-amdgpu-sys-rs-%commit%'
+)
+
+inherit desktop cargo
+
+DESCRIPTION="Tool to display AMDGPU usage."
+HOMEPAGE="https://github.com/Umio-Yasuno/amdgpu_top"
+SRC_URI="
+	https://github.com/Umio-Yasuno/amdgpu_top/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz
+	${CARGO_CRATE_URIS}
+"
+SRC_URI+=" https://github.com/gentoo-crate-dist/${PN}/releases/download/v${PV}/${P}-crates.tar.xz"
+
+LICENSE="MIT"
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0 BSD Boost-1.0 CC0-1.0 ISC MIT OFL-1.1
+	UbuntuFontLicense-1.0 Unicode-3.0 ZLIB
+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="man"
+
+DEPEND="
+	x11-libs/libdrm:=[video_cards_amdgpu]
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	man? (
+		|| (
+			app-text/lowdown
+			virtual/pandoc
+		)
+	)
+"
+
+QA_PREBUILT="/usr/bin/amdgpu_top"
+
+DOCS=(
+	README.md
+)
+
+src_compile() {
+	cargo_src_compile
+
+	if use man; then
+		local docgen=lowdown
+
+		# prefer pandoc if it's installed
+		has_version virtual/pandoc && docgen=pandoc
+
+		"${docgen}" docs/man.${PN}.md -s -t man -o docs/${PN}.1 \
+			|| die "failed to generate man page with ${docgen}"
+	fi
+}
+
+src_install() {
+	cargo_src_install
+
+	use man && doman docs/${PN}.1
+	domenu assets/*.desktop
+	dodoc "${DOCS[@]}" docs/*
+}
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index cb7cc4b9417e..1f05a483f5cf 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -3,8 +3,10 @@ AUX start-stop-daemon.pam 63 BLAKE2B df39a1a12fe09dbbc0746eac67035d9e6d4a63323f6
 DIST openrc-0.55.1.tar.gz 249926 BLAKE2B 058c4105ee8198e854c6fd23a3074f6ca4470ffe1faf66ee948e088b859ca55d163e16390ad4dbdd97ff4c1e9bc829fe791e4d96c5ac31f30022dcf91d5179cf SHA512 a06018ef98870bf42f209cdbcb1c578864653929df3d5954ce27adb28fa11c8a2fe0374fe6e10b03a957f7f513b3d64a94800b40f5ab104695d1ed2bfc91615d
 DIST openrc-0.56.tar.gz 250196 BLAKE2B 929fa18e2248a432095167ad5b07161103cc5c51cf72b945a4267de22304a66538105e4083bf413f1ffb7136194ef676d4f5e98f52dbef2dfdd92dda65960ec2 SHA512 d3533a12b1f54494492a54f20ddf943c669bc7c8e35e16cd5496d9d1819393ddd47af6ed0ae25f9e70b9980ca0f0a3d58ec057caa26f0f02df282ac00929997b
 DIST openrc-0.60.1.tar.gz 254915 BLAKE2B 435f09da5b20515c2fd7e9230a53008259099aabb9d83bade3d01deb628fc5306b9f2c6752c0fc1fa9393a499fc198fd6368378094f48d12a14730d158231481 SHA512 aa0be312ff5b1dc02c09dded0c52e7819947f6169c79b102090794a242db921eebca505b005bfe746d807b473d61479a357db9c80b854fddaef48a93dab2c2bb
+DIST openrc-0.61.tar.gz 255879 BLAKE2B d009680e4c18981ff46218836abd9a8662b511c06d9856e994d403a89fe7bc2557f0bba8c8a13128f084895c0bc71c7646d13aa978fbfe76ba8b23d58bb0ac7e SHA512 64dd570fbb78a41e4e04f39a7b6fe729ddaaa0d3ea0cfdb0dd2f54ffbc6b11d327eb2d898f937f949b85de56ef70d044638423b195c4eec9557da30713b7da5a
 EBUILD openrc-0.55.1.ebuild 4504 BLAKE2B e2595b1a44e03e1521d36cf996b0f483c139534627a8217e6af4f42970464e4fd9aba76e97955012273340617e071f3e02e8358c6aa2d711138d32ccd9486c0e SHA512 cc1ff04277c473326134097a9ef86bf1287d88e76113d3d97c5aef3c5180c27a0cdaed6c0f24e8c0ab478570fdff2d611bdb4698e5147cd663a531b48d93b6b0
 EBUILD openrc-0.56.ebuild 4412 BLAKE2B de11738b5d56f4db2769053c3b3ef91a76c12d0b83b78f04330275cb69fab7ef90006d2a9fcc7c37cadc6c7470567b06624cd47c44279e00dae0441e0af689b1 SHA512 0e5089ee0e15430e8922982d906102a0d0b3d6bc8f1b00ce41537eb7545634b00f8ca72ed3429c170a3e56223bd7287d17fe5d54e5e322f0ece70c5f8f6424e9
 EBUILD openrc-0.60.1.ebuild 4472 BLAKE2B a672501a2d5544e135203b102166fdcc805d8fbf71e65d0ec085d4772737196942773b723abfd3d8909967172d3e89efc2b68ed35a257d7847f7073ce9c9d794 SHA512 7b6ac24bf9611617211bfd59f03e9a72b8912e3d2f0543e6f772da53f5da455766b71b1d6ee1b73db2325aa1d168008af811133433e660996e519e3b13f72d39
+EBUILD openrc-0.61.ebuild 4507 BLAKE2B 9ef5b417bb052eec9ab482690a0abbdc1decfaede5fff396bc53efb16bb35372af7c9a17c1874b230d03752d27fcf7106cbdd3c5efd4d8a80b553d5e13eab091 SHA512 26bed8da6a2296ef0b70273e43b2a811e8937f43a2abcbf22049cc42bcb8025e3e5e65b4ad40e0dac2276edd9fbb2b3214845b2d04aebcd8afb5514dbb6da40f
 EBUILD openrc-9999.ebuild 4507 BLAKE2B 9ef5b417bb052eec9ab482690a0abbdc1decfaede5fff396bc53efb16bb35372af7c9a17c1874b230d03752d27fcf7106cbdd3c5efd4d8a80b553d5e13eab091 SHA512 26bed8da6a2296ef0b70273e43b2a811e8937f43a2abcbf22049cc42bcb8025e3e5e65b4ad40e0dac2276edd9fbb2b3214845b2d04aebcd8afb5514dbb6da40f
 MISC metadata.xml 842 BLAKE2B 696a5ccdf7eca47ac64ee7f317817a06d93664bcbaa3e94cc4420cc9452c97781d69b6b259350a4c5caf681c2e3394019f9f208eec661c861f3f6e3f5c214542 SHA512 dee510e527b885c19b57f5831081d47a422c88d65b7d50dc5c3e74c0a439ddbd1d1d87e241734d08e35a7551b500ab25d01f7a6be73e36dccde576df59974f36
diff --git a/sys-apps/openrc/openrc-0.61.ebuild b/sys-apps/openrc/openrc-0.61.ebuild
new file mode 100644
index 000000000000..6e1cab8b75a7
--- /dev/null
+++ b/sys-apps/openrc/openrc-0.61.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit eapi9-ver meson pam
+
+DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
+HOMEPAGE="https://github.com/openrc/openrc/"
+
+if [[ ${PV} =~ ^9{4,}$ ]]; then
+	EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/OpenRC/openrc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="audit bash debug pam newnet +netifrc selinux s6 +sysvinit sysv-utils unicode"
+
+COMMON_DEPEND="
+	sys-libs/libcap
+	sys-process/psmisc
+	pam? ( sys-libs/pam )
+	audit? ( sys-process/audit )
+	selinux? (
+		sys-apps/policycoreutils
+		>=sys-libs/libselinux-2.6
+	)"
+DEPEND="${COMMON_DEPEND}
+	virtual/os-headers"
+RDEPEND="${COMMON_DEPEND}
+	bash? ( app-shells/bash )
+	sysv-utils? (
+		!sys-apps/systemd[sysv-utils(-)]
+		!sys-apps/sysvinit
+	)
+	!sysv-utils? (
+		sysvinit? ( >=sys-apps/sysvinit-2.86-r6[selinux?] )
+		s6? ( sys-apps/s6-linux-init[sysv-utils(-)] )
+	)
+	virtual/tmpfiles
+	selinux? (
+		>=sec-policy/selinux-base-policy-2.20170204-r4
+		>=sec-policy/selinux-openrc-2.20170204-r4
+	)
+"
+
+PDEPEND="netifrc? ( net-misc/netifrc )"
+
+src_configure() {
+	local emesonargs=(
+	--bindir=/bin
+	--sbindir=/sbin
+		$(meson_feature audit)
+		"-Dbranding=\"Gentoo Linux\""
+		$(meson_use newnet)
+		-Dos=Linux
+		$(meson_use pam)
+		-Dpam_libdir="$(getpam_mod_dir)"
+		$(meson_feature selinux)
+		-Dshell=$(usex bash /bin/bash /bin/sh)
+		$(meson_use sysv-utils sysvinit)
+	)
+	# export DEBUG=$(usev debug)
+	meson_src_configure
+}
+
+# set_config <file> <option name> <yes value> <no value> test
+# a value of "#" will just comment out the option
+set_config() {
+	local file="${ED}/$1" var=$2 val com
+	eval "${@:5}" && val=$3 || val=$4
+	[[ ${val} == "#" ]] && com="#" && val='\2'
+	sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
+}
+
+set_config_yes_no() {
+	set_config "$1" "$2" YES NO "${@:3}"
+}
+
+src_install() {
+	meson_install
+
+	keepdir /lib/rc/tmp
+
+	# Setup unicode defaults for silly unicode users
+	set_config_yes_no /etc/rc.conf unicode use unicode
+
+	# Cater to the norm
+	set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
+
+	# On HPPA, do not run consolefont by default (bug #222889)
+	if use hppa; then
+		rm -f "${ED}"/etc/runlevels/boot/consolefont
+	fi
+
+	# Support for logfile rotation
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/openrc.logrotate openrc
+
+	if use pam; then
+		# install gentoo pam.d files
+		newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
+		newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon
+		pamd_mimic system-local-login openrc-user session
+	fi
+
+	# install documentation
+	dodoc *.md
+}
+
+pkg_preinst() {
+	# avoid default thrashing in conf.d files when possible #295406
+	if [[ -e "${EROOT}"/etc/conf.d/hostname ]] ; then
+		(
+		unset hostname HOSTNAME
+		source "${EROOT}"/etc/conf.d/hostname
+		: ${hostname:=${HOSTNAME}}
+		[[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
+		)
+	fi
+
+	# set default interactive shell to sulogin if it exists
+	set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
+	return 0
+}
+
+pkg_postinst() {
+	if use hppa; then
+		elog "Setting the console font does not work on all HPPA consoles."
+		elog "You can still enable it by running:"
+		elog "# rc-update add consolefont boot"
+	fi
+
+	if ! use newnet && ! use netifrc; then
+		ewarn "You have emerged OpenRc without network support. This"
+		ewarn "means you need to SET UP a network manager such as"
+		ewarn "	net-misc/netifrc, net-misc/dhcpcd, net-misc/connman,"
+		ewarn " net-misc/NetworkManager, or net-vpn/badvpn."
+		ewarn "Or, you have the option of emerging openrc with the newnet"
+		ewarn "use flag and configuring /etc/conf.d/network and"
+		ewarn "/etc/conf.d/staticroute if you only use static interfaces."
+		ewarn
+	fi
+
+	if use newnet && [ ! -e "${EROOT}"/etc/runlevels/boot/network ]; then
+		ewarn "Please add the network service to your boot runlevel"
+		ewarn "as soon as possible. Not doing so could leave you with a system"
+		ewarn "without networking."
+		ewarn
+	fi
+
+	# added for 0.45 to handle seedrng/urandom switching (2022-06-07)
+	if ver_replacing -lt 0.45 && ! [[ -x $(type rc-update) ]]; then
+		if rc-update show boot | grep -q urandom; then
+			rc-update del urandom boot
+			rc-update add seedrng boot
+		fi
+	fi
+}
diff --git a/sys-apps/pkgcraft-tools/Manifest b/sys-apps/pkgcraft-tools/Manifest
index d7b3d8526304..500b74eba147 100644
--- a/sys-apps/pkgcraft-tools/Manifest
+++ b/sys-apps/pkgcraft-tools/Manifest
@@ -1,4 +1,4 @@
 DIST pkgcraft-tools-0.0.23.tar.xz 31798292 BLAKE2B 04b858acd0b452c60d2149c21026ba991c70a85d8efe5ce444a3cff07ebbfa1c3713da96c70c3f49f660669b219d87897daba6bd9024dff6d3dd6e2f885d9e3e SHA512 0fec5a93a29ef87a651ce8b36421027f9b2668bd93b09437923bf83c37ca21eb579d000aee1bbe176ff00d3e95d0dd95d024d0acd3636b110746de38984e40a7
 EBUILD pkgcraft-tools-0.0.23.ebuild 1488 BLAKE2B df5cd16428c416253b4b559080428166fa1aae0431aab20063943ee64211be8e40a737d8da9540fc47f2812ebdfd8d8c3f0180117a9627db8f76fc6e04ec408b SHA512 4765b5381669e8ea4ad211d78f866ca9575a4a6bba750dd858583e345ce69d6227312feac8533e335642b892dc20baf78fc64805033c4e5efde967b4f8833e3d
-EBUILD pkgcraft-tools-9999.ebuild 1489 BLAKE2B 881de42664c9fd49b97832be42434f2816b3cec7e08eeab432a112ad0313e5e8fd7b603cfaf7f4ba7bb0cb7924f631b91b42e2efeb93096ba91f9bcb09e49b1a SHA512 caf98d4a043eb514ff9de6afcf548ff2246dc43eeeeeb13fd73cd6b3a9939b115b5993aaec61774e30ebfee96f3f78a25636f9f9ed3dcc45c19ab2c069401314
+EBUILD pkgcraft-tools-9999.ebuild 1527 BLAKE2B 963706fd590602343d377499fb8c026138a59ed3ceabb631f34be76c8cc135954e7ccae68a6456c104434e2bdb85d5080cbef6397fca1bc46ef6b44f35922d77 SHA512 2c57dc4b2343be5bf70d1c0fbb88aba3263ad98e30563edf0b489df3b347c1e62a4baf9ff701d9d3b2f13da5ae0ad21b5f625e35ef77f1ae77aeb30e3606d135
 MISC metadata.xml 322 BLAKE2B b0ee0fc53eb8b4b485f74806a78b5560aaf53f1772d7bd3e5af4e03385b3f3aed18fc52462c2d49de6c0d735db0cae3fab175b8adc0e5f7c4baa89e28973776f SHA512 9343cd5028750182fe9325c44f4c4c7df0976b79e0422b66e0fd16f94be76eaa203e8ecad5ec2cbed3535f455f038e51968850ced9afb27af9a98b6b968df88a
diff --git a/sys-apps/pkgcraft-tools/pkgcraft-tools-9999.ebuild b/sys-apps/pkgcraft-tools/pkgcraft-tools-9999.ebuild
index 76d67f13b66c..7fa50ce169a1 100644
--- a/sys-apps/pkgcraft-tools/pkgcraft-tools-9999.ebuild
+++ b/sys-apps/pkgcraft-tools/pkgcraft-tools-9999.ebuild
@@ -70,7 +70,9 @@ src_test() {
 src_install() {
 	cargo_src_install
 
-	newbashcomp shell/pk.bash pk
-	dozshcomp shell/_pk
-	dofishcomp shell/pk.fish
+	if [[ ${PV} != 9999 ]] ; then
+		newbashcomp shell/pk.bash pk
+		dozshcomp shell/_pk
+		dofishcomp shell/pk.fish
+	fi
 }
diff --git a/sys-apps/pv/Manifest b/sys-apps/pv/Manifest
index eba7876b14f4..ff95740583bb 100644
--- a/sys-apps/pv/Manifest
+++ b/sys-apps/pv/Manifest
@@ -6,6 +6,6 @@ DIST pv-1.9.31.tar.gz 417551 BLAKE2B 6018abe674834f45312faa5ce07b49e11258e29fffc
 DIST pv-1.9.31.tar.gz.asc 691 BLAKE2B 7b5b998341db887b14c56fc080d87cb4abb186b4df2c8def638822889a734436fe0c4c132396415bbc0dcb0754f76d0456bb667533ef7ed92ed0c09a62522e8b SHA512 549a3bb3f4f404b3a6e407663ba335e3d4e14303185654771c974335ed5e7ac46dbba71bbf4f26e640217829e58a0da8d6fa139b02f426b60ab074ec97084374
 EBUILD pv-1.9.0.ebuild 1436 BLAKE2B 9140edf0e52ee056673c1e656e238aefbc84a8369725f71eb580474c1ef4dd45d961838267b72e07cdb0dcc1c403165d387d43e7c31104d83dab77cedd15ac20 SHA512 ffc945675effac07424e01cd388160e39b97762015314df0e61de12ae7df5c854e451415e55c91bdd6e12001df24c6f4a13a76b126b901b3965dc87c95d57eba
 EBUILD pv-1.9.15.ebuild 1358 BLAKE2B 432270d1e32b00f3b16f89251e9c90b0a1999fe9e9ae43188e0b2e98205ef559a440d052a1183d8fbccf10b90d0613eb160ede42b460eaf7a9835432aef19ebe SHA512 4084ef2315841228e35776a4fafb93a9fe16718fdf72b6bdbf6d595479a44aacf54b6ab6922293ebfa56f15815a580fbe21075e882992e52aa4f9f2329bac66b
-EBUILD pv-1.9.31.ebuild 1454 BLAKE2B af9e25f4aebffda7fd02870ae97cf5c8163230773f0200a3300b40041ebc746d927b2b7175ae8d69fbe5cc504594742b8e2f42179a14cd47ed76c1666d705d70 SHA512 773998652e73de5e2663b791d45c81a9ce22f811d315082146848ab4f3944b344a05f3ea34aee6771b23b499603e6f3d6d49ef4872df976b9fa56c1acdcb2821
+EBUILD pv-1.9.31.ebuild 1453 BLAKE2B 4261f1909b145351d59b02f28177201853f1ac23d94238911c3fd631d60eeae33c23d2d7d5461c88b969e4a882c546d336a12535b23cdb1a0ce44ec9b459f006 SHA512 7df69bba9107f56a6ef0fac3c1225ad480050c2e54504358526cbc7402256608dc89b681179dbff4678174bd4f6b2aed56baa66716dbec5a562463a69684eb1e
 EBUILD pv-9999.ebuild 1460 BLAKE2B a2fcfc3a2afc892cae848e6a0adc570f0f93b59c4785a0eefeb6987600cf94307b714957cfffaff72d61628c580e92a70133a90d6fda1fed5d74dbff73e6f16b SHA512 653e773ace3eef172fcde1e9b09c2c5dc7e932c5318b592dd48959c45dcba86a045bcf4e849e0e41bafa94463a2e74bde264e5b66c8c8a78665fde62faf2f8d2
 MISC metadata.xml 318 BLAKE2B 784fb52623d9590f78551ca793501497ee0838584119a606a34c6ecd92b872b583e05a9da7ca979e30bba983dd4d5c8b499c1b764f23bf6fb22062b2a0b96200 SHA512 a8e06d0f2f20359e4a45c42a6db544c7efd08adc69843eaf2b1004003c4c03d1bf484214283016db560f1f6952104574287747f14bc42cfe4a184218d3783187
diff --git a/sys-apps/pv/pv-1.9.31.ebuild b/sys-apps/pv/pv-1.9.31.ebuild
index 5e337f37629e..9bc35e6c9a0a 100644
--- a/sys-apps/pv/pv-1.9.31.ebuild
+++ b/sys-apps/pv/pv-1.9.31.ebuild
@@ -18,7 +18,7 @@ else
 		verify-sig? ( https://www.ivarch.com/programs/sources/${P}.tar.gz.txt -> ${P}.tar.gz.asc )
 	"
 
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 LICENSE="GPL-3+"
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 0bc50fd42962..70f37debdb6b 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -10,6 +10,6 @@ DIST util-linux-2.41.tar.sign 833 BLAKE2B 7aa7cdabc76ab893d919372925eaf6c25fc556
 DIST util-linux-2.41.tar.xz 9535724 BLAKE2B b0f6d63c1365d3b065584d4d79a1716e1f036474984fc08dd6b298d7f50e66736af046404d3c9d8051fd0c9c455bcd623257ea1b967b755bee063415d91c5c21 SHA512 800ff92ee7a047732c0accb9dd759d6ed659947373ca72e0dd3ca601d0a6fed9db92c0838cfaff6bcdb8c08bdc1ffa675721893f42945885c57ccd59ab676318
 EBUILD util-linux-2.40.2.ebuild 11840 BLAKE2B 17e67c38a3c97d14a93f2b707f9c0fdc9636ae405cfa07147fe24e13b9fe1a7187d317907b0535637a5708609ca7235d325aa9ae473911d7a55724edc98ead8b SHA512 8c084819d7072f660d703d7707544032f16c7de6e20eb00ddd8fc8f35adaeed9f9812cb9269685cab2feafbb838383a917348e3950f32793619f2142a8425eee
 EBUILD util-linux-2.40.4.ebuild 11923 BLAKE2B d41417b51b9456439cfccdb36456b7dfcde81d3405af4c7e3acc56e4e9b5c7cef869134ad8982f6ae0a601c3216a3ba8415e6cdeebd18ec9817d62c6a21cb143 SHA512 f14662309f449910a4ccd45cdde4fbe4bc6a7d8cf204c1571287c9521926bd3d05250c6232387277ad1a257e6114ffeeefec735ca41366994b69b44555eab114
-EBUILD util-linux-2.41.ebuild 11926 BLAKE2B dac40c90976ffe05b6d6a0d5e1c223be77c7c8aba27bd508af255a3e26f74a97f96ba0d6cb679071fd689cc5ddf281d9dc69df47a0a2359d1415b8fe890e44a7 SHA512 bfcb30e83154866f362f5ddd585a1eabf2c24b7939078c17b5edcaf8a8876bdccc8ac5a22d85042fd803e19762828fc0a713141b9d5644b0a88a458993c86aef
+EBUILD util-linux-2.41.ebuild 11972 BLAKE2B fff941f0b80c0b7ee9e226c786224ac9a78ea72d097806960a2b84abba2f90d8df6ec9ab898126abb5c4a19f76390c917b916cc1de073ad06bea9065f146265d SHA512 7eec6e12a74d2566df7244e082d6089bf08de1f65bbe7f75fc071a756c48f501eb39c53b0eb21cbbd22019dee558ea48d566926f865120fa4dca0e501702dbde
 EBUILD util-linux-9999.ebuild 11449 BLAKE2B b7b714ef0d2b4636758d527094543aee5ceadedf46fb8af163e551e2e6621d329004571e9040158a7220c4d4abcb4d49fa9ec293c29f343e97157274014bb2ec SHA512 88f733724286eb5d5b8b6133fe52e3e0da693f8112112eb0efa3f86f015974b9ad6b1407fbefa70e5f410e1d6eaa1cac924dd0c5149f556c8f602706862fd20a
 MISC metadata.xml 1600 BLAKE2B c36342513e86655c4e4bfee627d9b516d4dc008abce3a7397d6cf3fb65f562bb58bcdc5b9d7daa801da01c77d19415b0dc6bf3407c5cca7d51327bb3689f94f6 SHA512 56b041dcbcc2c048a642bb8b44927cc0bed40de1c531f6445feaf0a87673fa19efffa3a5dabed5178b427d1fe5fdf41c2f7b8c0386f9adf1545c5ff9fa30169b
diff --git a/sys-apps/util-linux/util-linux-2.41.ebuild b/sys-apps/util-linux/util-linux-2.41.ebuild
index 31f9d914538b..41df3bf006f6 100644
--- a/sys-apps/util-linux/util-linux-2.41.ebuild
+++ b/sys-apps/util-linux/util-linux-2.41.ebuild
@@ -155,6 +155,9 @@ src_prepare() {
 			# Permission issues on /dev/random
 			lsfd/mkfds-eventpoll
 			lsfd/column-xmode
+
+			# Hangs on some machines
+			script/replay
 		)
 
 		# debug prints confuse the tests which look for a diff
diff --git a/sys-apps/xdg-desktop-portal-gtk/Manifest b/sys-apps/xdg-desktop-portal-gtk/Manifest
index 9695646ad6c0..d3e133374b73 100644
--- a/sys-apps/xdg-desktop-portal-gtk/Manifest
+++ b/sys-apps/xdg-desktop-portal-gtk/Manifest
@@ -1,3 +1,5 @@
 DIST xdg-desktop-portal-gtk-1.14.1.tar.xz 393964 BLAKE2B fd7fb960a19a13ad722b3db6e00a81e737c25434a6c4f70b97ad6cb2f9e01a06e9dc563f0e61f496260275854404b006cf4b36df56cc967202def6ca4bf0c8a0 SHA512 d8b487e8fc7d8c1f0f41eb3ee28377b2f77af9c65569b5dbaee785ae40c163929da8b13b39b032e25631515cb8e7218129c8bbffe25692e85c7b8e9269024325
+DIST xdg-desktop-portal-gtk-1.15.2.tar.xz 93044 BLAKE2B a44f9fe19280e653f2e5ea0831ab273b51f9d7cf41d7ae39976f9cebbee3502915d15c5455ae28fc701e6816241c0c785eaa389399544fd21106ae953b1cfd47 SHA512 a4ee821cab0a73dade139abee5802fee21fc3dbdb801dea0dc87366f6a0ff2929836f333d5a874fa874c72570a8b792d9ce6b3d261072732935765ed3b2463af
 EBUILD xdg-desktop-portal-gtk-1.14.1.ebuild 1380 BLAKE2B e28d0e76b00a73b6601c4128e7a4524438b34a2e7ee3377740e66c1a94accfe09c7411b3a5a5c75b60eea659de32f9fa205f05fb7705dde7377d93261d3ce436 SHA512 bee57573cd863039cd3aeb0b7149cc3675d0a04b793a472d07ec18366951f562de553727a7c45fbed5968db29eca2cfa3039279f7958be60d133f8a15c0fc3e8
+EBUILD xdg-desktop-portal-gtk-1.15.2.ebuild 1315 BLAKE2B a6c4f303e46842b311407898e26c4a9ac6893bd05bbdd5cb60502cf1dd54115a2a52d554ba4100b7c93a47abdc0cc341cbb1948cbc6fbbb7b43223ef77be6fd3 SHA512 e19c65699f9f7ba83fe486adc892e4e5b2b0b25a2801bc7dbae4ae578d64a5990f588d6d167766660b5ae2fe56c9690fedf294fb9041f7c68cff7e8e93534426
 MISC metadata.xml 359 BLAKE2B b88d2d0b01e730aecbf4ce4f75f3aeb70177190ee0ffbdb4afbc55cf49c9e2fa29b10a67086488a22c77999204ed0a863332595257cb64e85c4fe29b2664a040 SHA512 75b9ab2cbe62b8556c6deff6c52b993fc099a3dbb8242929693f16ab907a2cd70d1b06de702d15150d2b0b47532168c72fa7fcbeb29467d49624b2d8c18172c6
diff --git a/sys-apps/xdg-desktop-portal-gtk/xdg-desktop-portal-gtk-1.15.2.ebuild b/sys-apps/xdg-desktop-portal-gtk/xdg-desktop-portal-gtk-1.15.2.ebuild
new file mode 100644
index 000000000000..097d5d63f0c9
--- /dev/null
+++ b/sys-apps/xdg-desktop-portal-gtk/xdg-desktop-portal-gtk-1.15.2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson systemd
+
+MY_PV="${PV//_pre*}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Backend implementation for xdg-desktop-portal using GTK+"
+HOMEPAGE="https://flatpak.org/ https://github.com/flatpak/xdg-desktop-portal-gtk"
+SRC_URI="https://github.com/flatpak/${PN}/releases/download/${MY_PV}/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="wayland X"
+
+BDEPEND="
+	dev-util/gdbus-codegen
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+DEPEND="
+	dev-libs/glib:2
+	gnome-base/gsettings-desktop-schemas
+	media-libs/fontconfig
+	sys-apps/dbus
+	>=sys-apps/xdg-desktop-portal-1.14.0
+	x11-libs/cairo[X?]
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3[wayland?,X?]
+"
+
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	# As done in Fedora:
+	# All backends that are disabled are instead provided by
+	# xdg-desktop-portal-gnome to keep this package free of GNOME dependencies.
+	# The appchooser and settings backends are enabled for non-GNOME GTK
+	# applications.
+	local emesonargs=(
+		-Dsystemd-user-unit-dir="$(systemd_get_userunitdir)"
+		-Dappchooser=enabled
+		-Dsettings=enabled
+		-Dlockdown=disabled
+		-Dwallpaper=disabled
+	)
+
+	meson_src_configure
+}
diff --git a/sys-apps/xdg-desktop-portal/Manifest b/sys-apps/xdg-desktop-portal/Manifest
index 36f6fd64c44f..8fe1a83178dd 100644
--- a/sys-apps/xdg-desktop-portal/Manifest
+++ b/sys-apps/xdg-desktop-portal/Manifest
@@ -1,10 +1,11 @@
 AUX default-portals.conf 22 BLAKE2B 06a584551d11a4b2d51bf236eb657cda2360e8b324574a936c9d6f03a2d4c041ce72b6cc8a00740e4773ce654ad1867a818215c1bf610007a9dcd4b7b6b65149 SHA512 29af734e44797d4812165fa7d0be36b9047b1b9cfa12aad3628bb95ee3dbb9ff4efbd8023fb43a63d01c7e8879d58c6634710b47416929d3a7a5ca376ae18451
 AUX xdg-desktop-portal-1.18.0-sandbox-disable-failing-tests.patch 2444 BLAKE2B a93b089a7bbd23b258d28711a144982b9c102f7d0001b10a80d1f378da6965f7547ce11c4bfee8e534aa23b573b600d6a40d22877d6d9ddbe81f89d46dc73373 SHA512 99f87d9ed61cdf63af2449c1e2d2f3472db4fd21fa2baec7403bee6460146183a84af01ec18b13c1c072e5a7dd68b2e07a47b0e0886e4dffa09bf788d92ab5ec
-AUX xdg-desktop-portal-1.20.0-sandbox-disable-failing-tests.patch 594 BLAKE2B 7d3ce2962140ff150aaec559d3977831bba13b47de27a044c28820cf92c58833a2a0e80b59617d2c6c884fe264c10e2045d4f9d1b681b4646f53c668a8cd480e SHA512 107ccf6cc27c1409de73cfb9a32d95a70c567f5ff8b5af2b1db048551da3f9ef9a4ff6f6816ca41819392c58f5f36dd16c20787167920b9f0cac4e7abf909ace
+AUX xdg-desktop-portal-1.20.0-optional-gstreamer.patch 3736 BLAKE2B 096dbb487b00de7fa0956022abd2950a959cb6113fdd8f61cbbe460cc046d987bcba820a3c7397f0a13f7c6a4b8139de20958a4f33f20e429cb6990892c168ca SHA512 c5bc6278630df40c61904eb7315f1888ae7502e74de9f8978e27df2acf79fe5ea6887b92d99a38849057ec65f7d8750bf59568ad530ad878f81c63123dc1677c
+AUX xdg-desktop-portal-1.20.0-sandbox-disable-failing-tests.patch 648 BLAKE2B a96000cf55a69c3b3cf7570575202c69182d17b57b5fadfa6acb91709b646d11da81191a55b4eadd3da914a996726ead4517e6c310eeaf9b535c6764e110047f SHA512 f5ba7ee9998f28ce805ffb637c1ee6a6d8234bcf216b07685936ca1c1f865d3065705f49b3c1ef61b8766bb94d1755fc04d7adbade6d48ae26178eec1408efa1
 AUX xdg-desktop-portal.initd 289 BLAKE2B 50a0a56b43004a903f98cf57caed06786d2f6b1db5f743c1420dd6ac5207a5c785851c38a7f6844cc9536ec9d5d8faad7a927123c201bed8c16ad123fd1de773 SHA512 c2b2b687c3f6e1cbcadf609194c764cdd9bfa72818a5efb25376ddd2ed16e86a7a35ec0a0117569074735e57840c9595a635a9b694364aeaef8076b873b9dafd
 DIST xdg-desktop-portal-1.18.4.tar.xz 699380 BLAKE2B 969d9359744f26a931d5d86fbdac222b0d55f7942bb8b1ffba67343c88696dbb4c905b122363c5eae5dcac8b55f58d03433acbbca6f7594a16e72e13bc78353a SHA512 482676777e8180752e13ff485acab91de117f4ecf2aefd313a6f596df800f37d7004ee4ba1040009eb69a6efc780efc7dcd7e46b3f59c47bd9f21aef48d346de
 DIST xdg-desktop-portal-1.20.0.tar.xz 1162932 BLAKE2B 0b6d4615df26a45359be70003f34205a965fb02875e42e613a8526328a304664c530daaaa27d666297726d5fd5cb6f1eb3415e81bae8e0479821078a0549862d SHA512 aac38476b75a841ce12d7b4036830ef4ce3426914bcaf7ee2bb8a3a34e353089ed5c3521b06f7714d5ef8308d1af4e8297e583d363eba94263f3c062ced0063e
 EBUILD xdg-desktop-portal-1.18.4-r1.ebuild 3597 BLAKE2B a17915767365ca331299589390a1173dcbbb3fdc890ed39a96f60aa4f57cfd07346486606e1a3252c278c85dc85d41adcc2201b5656de7a845fb54251c5687a3 SHA512 11567180cbb9b4f68850cbeabd317bc3f47192a13b952acd67f7e425f7ef9459507da181ae65ada23140265551fa8010b008696f4ad940ac42fe8e410d10807c
 EBUILD xdg-desktop-portal-1.18.4.ebuild 3502 BLAKE2B 190f353d6669469a1be307dd74a41e532be73e6146ee57ac2327ccf726268a52e5380bbb98c5ff7eff234012d6cbdc24a0622dcc13745a78f46b1254075a4818 SHA512 8049fae6f08cb85bc4650bcdf0d3c522e32c459fc07362e3ee0042a5cc46c0a615eab6e3ec7de03435db13c7adb565bbcdb40cb6125b9f6ba6a6e97bd36bf05e
-EBUILD xdg-desktop-portal-1.20.0.ebuild 3820 BLAKE2B c6d2d748586529e659d4225c37ad805542c3d6d6c0df2e2a54c53c7b7236ef81f9fab0e5b75d4b5088ebf3205bff84933531b6ea354e6f31d612d335e8ffd93e SHA512 5977aa0859ad5e2a1881442390c4eaddcd82d817072fb45695f32c4904e2debcb9866513ed49b348a349f30814979efbdd655502c3d5fd1f46fd9d8449925a29
+EBUILD xdg-desktop-portal-1.20.0-r1.ebuild 3978 BLAKE2B 428e81b5d92b0273735a5a5c444972acda310f3e1d3d4a581e4b99fc308f304b913133aebca930165b5e44242e58ae8a4b2b4a1ed28fc6b81baa14b77fb43f81 SHA512 69fdfe1a71887cfbbcf28149c72713282a02fc2444a5a5149d1b04c2ecb35418106519bb0335f020c1bbd1853d9daca20c590438280558bdcca673de86148dc2
 MISC metadata.xml 572 BLAKE2B 5d1abb01d74881886beab22900a545b0364cd7b48990577a153bdd1d8125d517b8a26c89382b0ceb9e127e0cbd11d7462d3d74908facb521295314ddf2699723 SHA512 ffaa7cfd28794dd57d1229e5839a28cf5b178c6416cf1817e7e6753c7460c22e96e2997f005b80b574d7f4b49e3a0e5d9f44101258824edb00e328caf449b9d5
diff --git a/sys-apps/xdg-desktop-portal/files/xdg-desktop-portal-1.20.0-optional-gstreamer.patch b/sys-apps/xdg-desktop-portal/files/xdg-desktop-portal-1.20.0-optional-gstreamer.patch
new file mode 100644
index 000000000000..e89844a8345f
--- /dev/null
+++ b/sys-apps/xdg-desktop-portal/files/xdg-desktop-portal-1.20.0-optional-gstreamer.patch
@@ -0,0 +1,104 @@
+https://bugs.gentoo.org/951611
+https://bugs.gentoo.org/951609
+https://github.com/flatpak/xdg-desktop-portal/issues/1650
+https://github.com/flint2/gentoo/blob/7c8a4b4deb84826f20a7c8af1a0f125cd4942b4a/sys-apps/xdg-desktop-portal/files/xdg-desktop-portal-1.20.0-disable-gstreamer.patch
+
+gstreamer is searched for unconditionally, but we don't have gstreamer-pbutils
+packaged yet, so that's a problem. Make it conditional for now (as it ought
+to be upstream either way if they're going to have an option for it).
+--- a/meson.build
++++ b/meson.build
+@@ -112,7 +112,7 @@ gio_unix_dep = dependency('gio-unix-2.0')
+ json_glib_dep = dependency('json-glib-1.0')
+ fuse3_dep = dependency('fuse3', version: '>= 3.10.0')
+ gdk_pixbuf_dep = dependency('gdk-pixbuf-2.0')
+-gst_pbutils_dep = dependency('gstreamer-pbutils-1.0')
++gst_pbutils_dep = dependency('gstreamer-pbutils-1.0', required: get_option('sandboxed-sound-validation'))
+ geoclue_dep = dependency(
+   'libgeoclue-2.0',
+   version: '>= 2.5.2',
+@@ -122,8 +122,8 @@ pipewire_dep = dependency('libpipewire-0.3', version: '>= 0.2.90')
+ libsystemd_dep = dependency('libsystemd', required: get_option('systemd'))
+ gudev_dep = dependency('gudev-1.0', required: get_option('gudev'))
+ umockdev_dep = dependency('umockdev-1.0', required: get_option('tests'))
+-
+-gst_inspect = find_program('gst-inspect-1.0', required: false)
++gst_inspect = find_program('gst-inspect-1.0', required: get_option('sandboxed-sound-validation'))
++have_gst_inspect = gst_inspect.found()
+ if gst_inspect.found()
+   have_wav_parse = run_command(
+     gst_inspect, 'wavparse', '--exists',
+@@ -132,6 +132,7 @@ if gst_inspect.found()
+ else
+   have_wav_parse = false
+ endif
++
+ if have_wav_parse
+   config_h.set('HAVE_WAV_PARSE', 1)
+ endif
+@@ -224,7 +225,7 @@ enable_tests = get_option('tests') \
+   .require(python.found() and python.language_version().version_compare('>=3.9'),
+            error_message: 'Python version >=3.9 is required') \
+   .require(umockdev_dep.found()) \
+-  .require(have_wav_parse,
++  .require(not have_wav_parse and not get_option('sandboxed-sound-validation').allowed(),
+            error_message: 'gst-inspect and the wavparse plugins are required') \
+   .allowed()
+ 
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -206,14 +206,16 @@ if bwrap.found()
+   validate_sound_c_args += '-DHELPER="@0@"'.format(bwrap.full_path())
+ endif
+ 
+-xdp_validate_sound = executable(
+-  'xdg-desktop-portal-validate-sound',
+-  'validate-sound.c',
+-  dependencies: [gst_pbutils_dep],
+-  c_args: validate_sound_c_args,
+-  install: true,
+-  install_dir: libexecdir,
+-)
++if gst_inspect.found()
++  xdp_validate_sound = executable(
++    'xdg-desktop-portal-validate-sound',
++    'validate-sound.c',
++    dependencies: [gst_pbutils_dep],
++    c_args: validate_sound_c_args,
++    install: true,
++    install_dir: libexecdir,
++  )
++endif
+ 
+ configure_file(
+   input: 'xdg-desktop-portal-rewrite-launchers.service.in',
+--- a/tests/meson.build
++++ b/tests/meson.build
+@@ -94,7 +94,6 @@ pytest_files = [
+   'test_inhibit.py',
+   'test_inputcapture.py',
+   'test_location.py',
+-  'test_notification.py',
+   'test_openuri.py',
+   'test_permission_store.py',
+   'test_print.py',
+@@ -122,7 +121,6 @@ template_files = [
+   'templates/__init__.py',
+   'templates/inputcapture.py',
+   'templates/lockdown.py',
+-  'templates/notification.py',
+   'templates/print.py',
+   'templates/remotedesktop.py',
+   'templates/screenshot.py',
+@@ -131,6 +129,11 @@ template_files = [
+   'templates/wallpaper.py',
+ ]
+ 
++if have_gst_inspect
++  template_files += ['templates/notification.py']
++  pytest_files += ['test_notification.py']
++endif
++
+ foreach pytest_file : pytest_files
+   testname = pytest_file.replace('.py', '').replace('test_', '')
+   test(
diff --git a/sys-apps/xdg-desktop-portal/files/xdg-desktop-portal-1.20.0-sandbox-disable-failing-tests.patch b/sys-apps/xdg-desktop-portal/files/xdg-desktop-portal-1.20.0-sandbox-disable-failing-tests.patch
index 2faee17533cb..42162dafc571 100644
--- a/sys-apps/xdg-desktop-portal/files/xdg-desktop-portal-1.20.0-sandbox-disable-failing-tests.patch
+++ b/sys-apps/xdg-desktop-portal/files/xdg-desktop-portal-1.20.0-sandbox-disable-failing-tests.patch
@@ -1,6 +1,8 @@
+diff --git a/tests/meson.build b/tests/meson.build
+index 377d48a..8a6ebe0 100644
 --- a/tests/meson.build
 +++ b/tests/meson.build
-@@ -87,14 +87,11 @@ pytest_files = [
+@@ -87,13 +87,11 @@ pytest_files = [
    'test_clipboard.py',
    'test_documents.py',
    'test_document_fuse.py',
@@ -11,11 +13,10 @@
    'test_inhibit.py',
    'test_inputcapture.py',
 -  'test_location.py',
--  'test_notification.py',
    'test_openuri.py',
    'test_permission_store.py',
    'test_print.py',
-@@ -188,4 +185,4 @@ if enable_installed_tests
+@@ -191,4 +189,4 @@ if enable_installed_tests
        install_dir: installed_tests_data_dir,
      )
    endforeach
diff --git a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.20.0-r1.ebuild b/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.20.0-r1.ebuild
new file mode 100644
index 000000000000..90a013fc9354
--- /dev/null
+++ b/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.20.0-r1.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit meson python-any-r1 systemd
+
+DESCRIPTION="Desktop integration portal"
+HOMEPAGE="https://flatpak.github.io/xdg-desktop-portal/ https://github.com/flatpak/xdg-desktop-portal"
+SRC_URI="https://github.com/flatpak/${PN}/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="geolocation flatpak seccomp systemd test udev"
+RESTRICT="!test? ( test )"
+# Upstream expect flatpak to be used w/ seccomp and flatpak needs bwrap anyway
+REQUIRED_USE="flatpak? ( seccomp )"
+
+DEPEND="
+	>=dev-libs/glib-2.72:2
+	dev-libs/json-glib
+	>=media-video/pipewire-0.3:=
+	>=sys-fs/fuse-3.10.0:3[suid]
+	x11-libs/gdk-pixbuf
+	geolocation? ( >=app-misc/geoclue-2.5.3:2.0 )
+	flatpak? ( sys-apps/flatpak )
+	seccomp? ( sys-apps/bubblewrap )
+	systemd? ( sys-apps/systemd )
+	udev? ( dev-libs/libgudev )
+"
+RDEPEND="
+	${DEPEND}
+	sys-apps/dbus
+"
+BDEPEND="
+	dev-util/gdbus-codegen
+	dev-python/docutils
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? (
+		${PYTHON_DEPS}
+		dev-util/umockdev
+		media-libs/gstreamer
+		media-libs/gst-plugins-good
+		$(python_gen_any_dep '
+			>=dev-python/pytest-3[${PYTHON_USEDEP}]
+			dev-python/pytest-xdist[${PYTHON_USEDEP}]
+			dev-python/python-dbusmock[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+PATCHES=(
+	# Needed until gstreamer-rs (for gstreamer-pbutils) is packaged
+	"${FILESDIR}/${PN}-1.20.0-optional-gstreamer.patch"
+	# These tests require connections to pipewire, internet, /dev/fuse
+	"${FILESDIR}/${PN}-1.20.0-sandbox-disable-failing-tests.patch"
+)
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+python_check_deps() {
+	python_has_version ">=dev-python/pytest-3[${PYTHON_USEDEP}]" &&
+	python_has_version "dev-python/pytest-xdist[${PYTHON_USEDEP}]" &&
+	python_has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]"
+}
+
+src_configure() {
+	local emesonargs=(
+		-Ddbus-service-dir="${EPREFIX}/usr/share/dbus-1/services"
+		-Dsystemd-user-unit-dir="$(systemd_get_userunitdir)"
+		$(meson_feature flatpak flatpak-interfaces)
+		$(meson_feature geolocation geoclue)
+		$(meson_feature udev gudev)
+		$(meson_feature seccomp sandboxed-image-validation)
+		# Needs gstreamer-pbutils (part of gstreamer-rs)?
+		# Not yet packaged
+		#$(meson_feature seccomp sandboxed-sound-validation)
+		-Dsandboxed-sound-validation=disabled
+		$(meson_feature systemd)
+		# Requires flatpak
+		-Ddocumentation=disabled
+		# -Dxmlto-flags=
+		-Ddatarootdir="${EPREFIX}/usr/share"
+		-Dman-pages=enabled
+		-Dinstalled-tests=false
+		$(meson_feature test tests)
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	# Install a default to avoid breakage: >=1.18.0 assumes that DEs/WMs
+	# will install their own, but we want some fallback in case they don't
+	# (so will probably keep this forever). DEs need time to catch up even
+	# if they will eventually provide one anyway. See bug #915356.
+	#
+	# TODO: Add some docs on wiki for users to add their own preference
+	# for minimalist WMs etc.
+	insinto /usr/share/xdg-desktop-portal
+	newins "${FILESDIR}"/default-portals.conf portals.conf
+	exeinto /etc/user/init.d
+	newexe "${FILESDIR}"/xdg-desktop-portal.initd xdg-desktop-portal
+}
+
+pkg_postinst() {
+	if ! has_version gui-libs/xdg-desktop-portal-lxqt && ! has_version gui-libs/xdg-desktop-portal-wlr && \
+		! has_version kde-plasma/xdg-desktop-portal-kde && ! has_version sys-apps/xdg-desktop-portal-gnome && \
+		! has_version sys-apps/xdg-desktop-portal-gtk && ! has_version sys-apps/xdg-desktop-portal-xapp; then
+		elog "${PN} is not usable without any of the following XDP"
+		elog "implementations installed:"
+		elog "  gui-libs/xdg-desktop-portal-lxqt"
+		elog "  gui-libs/xdg-desktop-portal-wlr"
+		elog "  kde-plasma/xdg-desktop-portal-kde"
+		elog "  sys-apps/xdg-desktop-portal-gnome"
+		elog "  sys-apps/xdg-desktop-portal-gtk"
+		elog "  sys-apps/xdg-desktop-portal-xapp"
+	fi
+}
diff --git a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.20.0.ebuild b/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.20.0.ebuild
deleted file mode 100644
index dbffadc6d97c..000000000000
--- a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.20.0.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit meson python-any-r1 systemd
-
-DESCRIPTION="Desktop integration portal"
-HOMEPAGE="https://flatpak.github.io/xdg-desktop-portal/ https://github.com/flatpak/xdg-desktop-portal"
-SRC_URI="https://github.com/flatpak/${PN}/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
-IUSE="geolocation flatpak seccomp systemd test udev"
-RESTRICT="!test? ( test )"
-# Upstream expect flatpak to be used w/ seccomp and flatpak needs bwrap anyway
-REQUIRED_USE="flatpak? ( seccomp )"
-
-DEPEND="
-	>=dev-libs/glib-2.72:2
-	dev-libs/json-glib
-	>=media-video/pipewire-0.3:=
-	>=sys-fs/fuse-3.10.0:3[suid]
-	x11-libs/gdk-pixbuf
-	geolocation? ( >=app-misc/geoclue-2.5.3:2.0 )
-	flatpak? ( sys-apps/flatpak )
-	seccomp? ( sys-apps/bubblewrap )
-	systemd? ( sys-apps/systemd )
-	udev? ( dev-libs/libgudev )
-"
-RDEPEND="
-	${DEPEND}
-	sys-apps/dbus
-"
-BDEPEND="
-	dev-util/gdbus-codegen
-	dev-python/docutils
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? (
-		${PYTHON_DEPS}
-		dev-util/umockdev
-		media-libs/gstreamer
-		media-libs/gst-plugins-good
-		$(python_gen_any_dep '
-			>=dev-python/pytest-3[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-			dev-python/python-dbusmock[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-PATCHES=(
-	# These tests require connections to pipewire, internet, /dev/fuse
-	"${FILESDIR}/${PN}-1.20.0-sandbox-disable-failing-tests.patch"
-)
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-python_check_deps() {
-	python_has_version ">=dev-python/pytest-3[${PYTHON_USEDEP}]" &&
-	python_has_version "dev-python/pytest-xdist[${PYTHON_USEDEP}]" &&
-	python_has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]"
-}
-
-src_configure() {
-	local emesonargs=(
-		-Ddbus-service-dir="${EPREFIX}/usr/share/dbus-1/services"
-		-Dsystemd-user-unit-dir="$(systemd_get_userunitdir)"
-		$(meson_feature flatpak flatpak-interfaces)
-		$(meson_feature geolocation geoclue)
-		$(meson_feature udev gudev)
-		$(meson_feature seccomp sandboxed-image-validation)
-		# Needs gstreamer-pbutils (part of gstreamer-rs)?
-		# Not yet packaged
-		#$(meson_feature seccomp sandboxed-sound-validation)
-		$(meson_feature systemd)
-		# Requires flatpak
-		-Ddocumentation=disabled
-		# -Dxmlto-flags=
-		-Ddatarootdir="${EPREFIX}/usr/share"
-		-Dman-pages=enabled
-		-Dinstalled-tests=false
-		$(meson_feature test tests)
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	# Install a default to avoid breakage: >=1.18.0 assumes that DEs/WMs
-	# will install their own, but we want some fallback in case they don't
-	# (so will probably keep this forever). DEs need time to catch up even
-	# if they will eventually provide one anyway. See bug #915356.
-	#
-	# TODO: Add some docs on wiki for users to add their own preference
-	# for minimalist WMs etc.
-	insinto /usr/share/xdg-desktop-portal
-	newins "${FILESDIR}"/default-portals.conf portals.conf
-	exeinto /etc/user/init.d
-	newexe "${FILESDIR}"/xdg-desktop-portal.initd xdg-desktop-portal
-}
-
-pkg_postinst() {
-	if ! has_version gui-libs/xdg-desktop-portal-lxqt && ! has_version gui-libs/xdg-desktop-portal-wlr && \
-		! has_version kde-plasma/xdg-desktop-portal-kde && ! has_version sys-apps/xdg-desktop-portal-gnome && \
-		! has_version sys-apps/xdg-desktop-portal-gtk && ! has_version sys-apps/xdg-desktop-portal-xapp; then
-		elog "${PN} is not usable without any of the following XDP"
-		elog "implementations installed:"
-		elog "  gui-libs/xdg-desktop-portal-lxqt"
-		elog "  gui-libs/xdg-desktop-portal-wlr"
-		elog "  kde-plasma/xdg-desktop-portal-kde"
-		elog "  sys-apps/xdg-desktop-portal-gnome"
-		elog "  sys-apps/xdg-desktop-portal-gtk"
-		elog "  sys-apps/xdg-desktop-portal-xapp"
-	fi
-}
-- 
cgit v1.2.3