gentoo auto-resync : 20:12:2023 - 13:50:54

5 files changed, 107 insertions, 2 deletions

diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index a6df8f007e84..a55414e59356 100644
--- a/gui-libs/Manifest.gz
+++ b/gui-libs/Manifest.gz
diff --git a/gui-libs/xdg-desktop-portal-wlr/Manifest b/gui-libs/xdg-desktop-portal-wlr/Manifest
index db6755c4804c..7683f3b391cd 100644
--- a/gui-libs/xdg-desktop-portal-wlr/Manifest
+++ b/gui-libs/xdg-desktop-portal-wlr/Manifest
@@ -1,8 +1,10 @@
+AUX xdg-desktop-portal-wlr-0.7.0-portal-config.patch 1235 BLAKE2B 9fcba6a71e2627d5dc53dd900e997965ed349905507b22f1d6bfbf6a5111153f43e3111cf032e0c0ef7c798adab4f2478a2ee1ef506faeb153823aa57c6c8bb2 SHA512 806ab8d86cc4b453f46703d61fc3a78904f36972205d04edf841a4e45eabf8a236a3f30e6201f52d28c0a4b857d57f26f623ce0a6487add22bcc3e21dd148ad7
 DIST xdg-desktop-portal-wlr-0.5.0.tar.gz 31622 BLAKE2B 9314a1bfd121f25c6f615e1cfaa62d071224b5da9373bb3a954a06aa7ef9527617e34ae29192e25ca9c13c53eb77eb137fbaa1b121c9365397d64845c0cc3e36 SHA512 9ece46f2381e83cac8002a8175a13b0c29c0a2dab49cf11ed5ffa3448f176802b9d324b7e4fe9c15d3fb65087be42299f21a0ef505088e6281787f4067d256ac
 DIST xdg-desktop-portal-wlr-0.6.0.tar.gz 35654 BLAKE2B 1c213e9789db14366639d924d673fd05d94463f7fda8f3afb03f74269162f00e986c157d9741cb6b243d79e04230399b0bbc400f1d1e2bb72c9f53a9d6bc1e15 SHA512 e325c2de2a98ffc4612da3492138843b6c9927e536f52f7a87e794380c099f84ab8d344ee989bf88e71faaad2e5300fc31ac74058cea5040654ac74ce270ee53
 DIST xdg-desktop-portal-wlr-0.7.0.tar.gz 37812 BLAKE2B 6f8a8f5e8bc5d60df8f7bddce3a5da2ef9a4b74b490595b73b925f177ee28467bba3738d8c5b0852754bc702ca950f657c58b735b5775d0b07e906547419f79f SHA512 7efb3b66130f2f8ef8538ced3a9785bbae8382bbb9171fb4b6496567e39a69cd8b6e687f1b18b5eb90be175bf7c0737c3a51daa3eef784f88c4ee0bf70ad6d87
 EBUILD xdg-desktop-portal-wlr-0.5.0.ebuild 1106 BLAKE2B 0cc1cead17aecdba3ea3d2e2b0ef296c413ab30e29290f4d9fd137ad401f871ce6d0fa8261e442dd4ec7e1263579499abee45d1f0391c89ac628358fb27d90b9 SHA512 5e550aa1e96fdc5ce13a5907e648e11dd9e1dc205426ab9c43e5c19261cab3b5598d29d3d01c50137c1a1c5d8508443d182116c25e7a8a6fd2118e5b31a37489
 EBUILD xdg-desktop-portal-wlr-0.6.0.ebuild 1208 BLAKE2B b0e524da8ff6947ebd8ff3f2ee757b0578acc137d27c6fd51354a5c1c8cfbfe05953aa964c26119635b6ee4d3046a0f6d3ad2b8029a657e188444c41060c336d SHA512 23d8cf37bb2510f925412b9c254c715ef2eda39f46fd38e9beb280052d720125ac1a92dfd69568e7577a601874bdde9febe36e8c918e82b7d43889951687af26
+EBUILD xdg-desktop-portal-wlr-0.7.0-r1.ebuild 1411 BLAKE2B 2a8c2a94615773ddc7f8b253097dfa7a4aafe0d3a1994f685b4cf67645bfd5431f7c8874f2311f70927a893ff7bed0bf93656cff76a9c7859699b106b553fb71 SHA512 1474c9f9db8a83d599d64a229a51bcc5a45fdf0ff771a68ef965854f6f914364192030a991364c8245f5c6ce1608c3e7eec1b2fb6d115a6e0d12c763f4305ad5
 EBUILD xdg-desktop-portal-wlr-0.7.0.ebuild 1203 BLAKE2B f283f8ff7e0e26224d8c2a2d261705410d30283cf359aa483fe94981dc37fab5221a50c9b835a2d54ad7deda336d9b98c01911b5a598680a0cf0f55e2405b25e SHA512 1ef37b5d5aa13825f0e1a624ce9a40e1f0d2abe84236098e6a2ee400bb16f9e644070e8ef57ca2c3af9bc30ec812644b4af83e81c0109e6c7a2e67cd924a4385
-EBUILD xdg-desktop-portal-wlr-9999.ebuild 1332 BLAKE2B 602440d51d9d872c99014acf9aee59e0a7ab17dd1345351cff2729c0f73e48bca747e061caa4ca2b314787b1e78b022f994fcb3ef0beea740d6ce692274fe43e SHA512 15cf809941f27d2fd62de1722e764702370f94faa9f99c0a16aab55f3e1bc41648414ad6f75de2789dc82c864bdb086ef6c7bd18028e278c46d825c5527bfa52
+EBUILD xdg-desktop-portal-wlr-9999.ebuild 1358 BLAKE2B a3771d6558f0aaa7124dcd8e5a1fd2c1c5fb68a9b9468e68f0fb59097ad33583acab3d1e660e9eea3c4506a0c2d3f837f52211b07d50b07382c5871126ad4309 SHA512 39f0811d3d76a1b08e181660dc0a22003e09262c13d5c1f97436c1e9f261fbb2a70b56e4625d8009fed3a7668f24f6c54a87f57331bbded05e4a9088c9e6f564
 MISC metadata.xml 444 BLAKE2B 44732ae1920d37f03d5b233037876c050b8b65a0175c35d516f3d3a7dc76389a4876de84e69b875730b81a7f7cfbc7842f7e8820a40401ad1199f850a8d48049 SHA512 0f025bbc99adcbe21ea8ae5d26d639cfbd6465c7a2976605087898087cd51aee09b9bdf5371681d9b820ae2dd1d03006a4a7971a87918f63530d64ddbe538703
diff --git a/gui-libs/xdg-desktop-portal-wlr/files/xdg-desktop-portal-wlr-0.7.0-portal-config.patch b/gui-libs/xdg-desktop-portal-wlr/files/xdg-desktop-portal-wlr-0.7.0-portal-config.patch
new file mode 100644
index 000000000000..7302ca33d064
--- /dev/null
+++ b/gui-libs/xdg-desktop-portal-wlr/files/xdg-desktop-portal-wlr-0.7.0-portal-config.patch
@@ -0,0 +1,32 @@
+https://bugs.gentoo.org/915702
+https://github.com/emersion/xdg-desktop-portal-wlr/commit/e88e00ca9bc1b2e0e91bc297ff95c882dd1829ff
+
+From e88e00ca9bc1b2e0e91bc297ff95c882dd1829ff Mon Sep 17 00:00:00 2001
+From: columbarius <co1umbarius@protonmail.com>
+Date: Wed, 10 May 2023 01:36:21 +0200
+Subject: [PATCH] contrib: Add portals config example
+
+This is an example configuration for choosing the portal implementations
+which should be used [1]. Compositors and distributions are expected to ship
+their modified version according to their choice of components.
+
+[1] https://github.com/flatpak/xdg-desktop-portal/pull/955
+---
+ contrib/wlroots-portals.conf | 7 +++++++
+ 1 file changed, 7 insertions(+)
+ create mode 100644 contrib/wlroots-portals.conf
+
+diff --git a/contrib/wlroots-portals.conf b/contrib/wlroots-portals.conf
+new file mode 100644
+index 00000000..0baa2ca4
+--- /dev/null
++++ b/contrib/wlroots-portals.conf
+@@ -0,0 +1,7 @@
++[preferred]
++# Use xdg-desktop-portal-gtk for every portal interface...
++default=gtk
++# ... except for the Screencast, Screenshot and Settings (dark/light mode) interface
++org.freedesktop.impl.portal.Screencast=wlr
++org.freedesktop.impl.portal.Screenshot=wlr
++org.freedesktop.impl.portal.Settings=darkman
+
diff --git a/gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-0.7.0-r1.ebuild b/gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-0.7.0-r1.ebuild
new file mode 100644
index 000000000000..ee4c1b0f3797
--- /dev/null
+++ b/gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-0.7.0-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+DESCRIPTION="xdg-desktop-portal backend for wlroots"
+HOMEPAGE="https://github.com/emersion/xdg-desktop-portal-wlr"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/emersion/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/emersion/${PN}/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="elogind systemd"
+REQUIRED_USE="?? ( elogind systemd )"
+
+DEPEND="
+	>=media-video/pipewire-0.3.62:=
+	dev-libs/inih
+	dev-libs/wayland
+	media-libs/mesa
+	x11-libs/libdrm
+	|| (
+		systemd? ( >=sys-apps/systemd-237 )
+		elogind? ( >=sys-auth/elogind-237 )
+		sys-libs/basu
+	)
+"
+# mesa is needed for gbm dep (which it hards sets to 'on')
+RDEPEND="
+	${DEPEND}
+	sys-apps/xdg-desktop-portal
+"
+BDEPEND="
+	>=dev-libs/wayland-protocols-1.24
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-portal-config.patch
+)
+
+src_configure() {
+	local emesonargs=()
+
+	if use systemd; then
+		emesonargs+=(-Dsd-bus-provider=libsystemd)
+	elif use elogind; then
+		emesonargs+=(-Dsd-bus-provider=libelogind)
+	else
+		emesonargs+=(-Dsd-bus-provider=basu)
+	fi
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	# bug #915702
+	insinto /usr/share/xdg-desktop-portal/portals
+	doins "${WORKDIR}/${P}/contrib/wlroots-portals.conf"
+}
diff --git a/gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-9999.ebuild b/gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-9999.ebuild
index d36917abedf1..f874a75b8fbd 100644
--- a/gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-9999.ebuild
+++ b/gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-9999.ebuild
@@ -57,7 +57,9 @@ src_configure() {
 }
 
 src_install() {
-	default
+	meson_src_install
+
+	# bug #915702
 	insinto /usr/share/xdg-desktop-portal/portals
 	doins "${WORKDIR}/${P}/contrib/wlroots-portals.conf"
 }