gentoo resync : 05.12.2021

4 files changed, 74 insertions, 11 deletions

diff --git a/gui-libs/xdg-desktop-portal-wlr/Manifest b/gui-libs/xdg-desktop-portal-wlr/Manifest
index 15ff5b6020b8..b080cbc759dd 100644
--- a/gui-libs/xdg-desktop-portal-wlr/Manifest
+++ b/gui-libs/xdg-desktop-portal-wlr/Manifest
@@ -1,4 +1,6 @@
 DIST xdg-desktop-portal-wlr-0.4.0.tar.gz 30776 BLAKE2B c4a6c07f57cc7cf16f16de43571bf9a281e647bcb1216da5a82e9c40d7a8344e78380b08a215a252011c9da8f97294aacc844d999095f4117ea26d17ff9ffec6 SHA512 544dea4601ce8aa8649d15b7c249aa5b0099fa5a6aec1b7a1433439265acede9ac442092da53080c36b372dd0ef5aaa15747b13a56f4a648e1c00ed3c2435e19
-EBUILD xdg-desktop-portal-wlr-0.4.0.ebuild 1009 BLAKE2B 53f3b9542439be482a96d9298999ae1cbbc659b885980ff0cd045c9f81ee521dfcc784ebbb638ba3c99ae460b751612c954228437e52715ee589ebee2fe15add SHA512 b1b4461bee68ba1cfd126d54915a3b0c4c51fda311d56d5c43b099dbec66ba03818e011f647afccc65a27a15541845fb2ce13a2c5f095c42321f617e98ee7372
-EBUILD xdg-desktop-portal-wlr-9999.ebuild 1011 BLAKE2B 9d45d47f0fd84784799da0ceb8fc2df83bb693ab892696989291cd83a5f07d2f5317500d6842722eeb26177aef961655c79bcdebfd533f62f871c86cf8562ca1 SHA512 3a54802faad39b26497b424396347982cafc55b40ad9c927766df591141f6dd9fc4c0f48057d344e7fd54a16a5e16bba130ba80211020e5996a062434325051c
+DIST xdg-desktop-portal-wlr-0.5.0.tar.gz 31622 BLAKE2B 9314a1bfd121f25c6f615e1cfaa62d071224b5da9373bb3a954a06aa7ef9527617e34ae29192e25ca9c13c53eb77eb137fbaa1b121c9365397d64845c0cc3e36 SHA512 9ece46f2381e83cac8002a8175a13b0c29c0a2dab49cf11ed5ffa3448f176802b9d324b7e4fe9c15d3fb65087be42299f21a0ef505088e6281787f4067d256ac
+EBUILD xdg-desktop-portal-wlr-0.4.0.ebuild 984 BLAKE2B 9bb28ebcdcc3b9fc2344befcb84935e6473ed7219017f1d99e9ce24328029fcb1d5aa8e123b6bc854684002ad9f2206860601f3a886dace9b773f93f523fe431 SHA512 27ad3636cc86f0b235df290dfab1ef6809df0dab924d333836e9057ad514f3857400306f645dfb1ebdc34d21b5fbec947133d47745b5348b537454e9f7f31b99
+EBUILD xdg-desktop-portal-wlr-0.5.0.ebuild 1121 BLAKE2B bb037bef08d10769f1832c6a61c48898bdf794dbd2cbcff37c96da5e90dba29dd82d156321fe374a3d71fa0cdb47c2805cb61f62973b914ab8334fd1ee53c971 SHA512 4c8f89dfbd7417e4b1add335762cf9264c9d63c1fc7946a41dade79969b3a452eb014d150a48e693cdaf59cad17b7bbbf66cff53f8e200cbf6d653db93312ff2
+EBUILD xdg-desktop-portal-wlr-9999.ebuild 1121 BLAKE2B bb037bef08d10769f1832c6a61c48898bdf794dbd2cbcff37c96da5e90dba29dd82d156321fe374a3d71fa0cdb47c2805cb61f62973b914ab8334fd1ee53c971 SHA512 4c8f89dfbd7417e4b1add335762cf9264c9d63c1fc7946a41dade79969b3a452eb014d150a48e693cdaf59cad17b7bbbf66cff53f8e200cbf6d653db93312ff2
 MISC metadata.xml 348 BLAKE2B e3ba259446a063f5610926cc7ecbd3ab79c7866eadd96b00d9b7121a66ab9377e527a7dbf0d6c5db1a91b379906c55d9ee21d16c5a0f05cf0e714e3da6113066 SHA512 310f32ff7720a0810408ccb1160ffae4482f15e99e631a6e1e722f258333b72229faf8a88e3dd6589a0a9962198ffe5e7c0d36d87acfb71e0d9152dbb9fe1138
diff --git a/gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-0.4.0.ebuild b/gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-0.4.0.ebuild
index 6bf02b33d246..8c3cb07c2bc8 100644
--- a/gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-0.4.0.ebuild
+++ b/gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-0.4.0.ebuild
@@ -35,7 +35,6 @@ RDEPEND="
 BDEPEND="
 	>=media-video/pipewire-0.3.2:=
 	>=dev-libs/wayland-protocols-1.14
-	>=dev-util/meson-0.50.0
 	dev-libs/inih:0
 	virtual/pkgconfig
 "
diff --git a/gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-0.5.0.ebuild b/gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-0.5.0.ebuild
new file mode 100644
index 000000000000..f0ce88fcabfe
--- /dev/null
+++ b/gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-0.5.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0/9999"
+IUSE="elogind systemd"
+REQUIRED_USE="?? ( elogind systemd )"
+
+DEPEND="
+	>=media-video/pipewire-0.3.34:=
+	dev-libs/inih
+	dev-libs/wayland
+	|| (
+		systemd? ( >=sys-apps/systemd-237 )
+		elogind? ( >=sys-auth/elogind-237 )
+		sys-libs/basu
+	)
+"
+RDEPEND="
+	${DEPEND}
+	sys-apps/xdg-desktop-portal
+"
+BDEPEND="
+	dev-libs/wayland-protocols
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		"-Dwerror=false"
+	)
+	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
+}
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 8642e22e21e1..f0ce88fcabfe 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
@@ -22,21 +22,21 @@ IUSE="elogind systemd"
 REQUIRED_USE="?? ( elogind systemd )"
 
 DEPEND="
-	>=media-video/pipewire-0.3.2:=
+	>=media-video/pipewire-0.3.34:=
+	dev-libs/inih
 	dev-libs/wayland
-	>=dev-libs/wayland-protocols-1.14:=
-	elogind? ( >=sys-auth/elogind-237 )
-	systemd? ( >=sys-apps/systemd-237 )
+	|| (
+		systemd? ( >=sys-apps/systemd-237 )
+		elogind? ( >=sys-auth/elogind-237 )
+		sys-libs/basu
+	)
 "
 RDEPEND="
 	${DEPEND}
 	sys-apps/xdg-desktop-portal
 "
 BDEPEND="
-	>=media-video/pipewire-0.3.2:=
-	>=dev-libs/wayland-protocols-1.14
-	>=dev-util/meson-0.50.0
-	dev-libs/inih:0
+	dev-libs/wayland-protocols
 	virtual/pkgconfig
 "
 
@@ -44,5 +44,12 @@ src_configure() {
 	local emesonargs=(
 		"-Dwerror=false"
 	)
+	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
 }