[gentoo-commits] repo/gentoo:master commit in: gui-apps/waybar/

["Sam James" <sam@gentoo.org>]

commit:     8d5b83c04eafed28c97d9ef5909f7eaedbb69078
Author:     Julien Roy <julien <AT> jroy <DOT> ca>
AuthorDate: Sat Apr 15 15:20:59 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 16 00:10:30 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d5b83c0

gui-apps/waybar: add 0.9.17-r2

Fix pulseaudio USE flag dependency
Remove systemd patch
Improme logind USE flag description
Add REQUIRED_USE for mpris and upower
Make libinput USE flag enabled by default

Bug: https://bugs.gentoo.org/894068
Closes: https://bugs.gentoo.org/904163
Closes: https://bugs.gentoo.org/904165
Signed-off-by: Julien Roy <julien <AT> jroy.ca>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 gui-apps/waybar/metadata.xml                              |  2 +-
 .../{waybar-9999.ebuild => waybar-0.9.17-r2.ebuild}       | 14 ++++++++++----
 gui-apps/waybar/waybar-9999.ebuild                        | 15 ++++++++-------
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/gui-apps/waybar/metadata.xml b/gui-apps/waybar/metadata.xml
index 78b89e6579cc..3d66b6c8fda4 100644
--- a/gui-apps/waybar/metadata.xml
+++ b/gui-apps/waybar/metadata.xml
@@ -17,7 +17,7 @@
 		<flag name="experimental">Enable experimental features, such as Bluetooth battery reporting</flag>
 		<flag name="evdev">Enable libevdev support for evdev related features</flag>
 		<flag name="libinput">Enable libinput support for libinput related features</flag>
-		<flag name="logind">Enable support for logind</flag>
+		<flag name="logind">Enable support for logind (bluetooth and idle inhibit)</flag>
 		<flag name="mpd">Enable support for the Music Player Daemon</flag>
 		<flag name="mpris">Enable support for mpris</flag>
 		<flag name="network">Enable libnl support for network related features</flag>

diff --git a/gui-apps/waybar/waybar-9999.ebuild b/gui-apps/waybar/waybar-0.9.17-r2.ebuild
similarity index 85%
copy from gui-apps/waybar/waybar-9999.ebuild
copy to gui-apps/waybar/waybar-0.9.17-r2.ebuild
index b08f76f5d66f..1fa63f14125b 100644
--- a/gui-apps/waybar/waybar-9999.ebuild
+++ b/gui-apps/waybar/waybar-0.9.17-r2.ebuild
@@ -19,7 +19,11 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="evdev experimental jack libinput logind mpd mpris network +popups pipewire pulseaudio sndio test tray +udev upower wifi"
+IUSE="evdev experimental jack +libinput +logind mpd mpris network +popups pipewire pulseaudio sndio systemd test tray +udev upower wifi"
+REQUIRED_USE="
+	mpris? ( logind )
+	upower? ( logind )
+"
 
 RESTRICT="!test? ( test )"
 
@@ -55,8 +59,9 @@ RDEPEND="
 	network? ( dev-libs/libnl:3 )
 	popups? ( gui-libs/gtk-layer-shell )
 	pipewire? ( media-video/wireplumber:0/0.4 )
-	pulseaudio? ( media-sound/pulseaudio[daemon] )
+	pulseaudio? ( media-libs/libpulse )
 	sndio? ( media-sound/sndio:= )
+	systemd? ( sys-apps/systemd:= )
 	tray? (
 		dev-libs/libdbusmenu[gtk3]
 		dev-libs/libappindicator
@@ -71,13 +76,13 @@ DEPEND="${RDEPEND}
 "
 
 PATCHES=(
-	"${FILESDIR}/systemd-0.9.17.patch"
+	"${FILESDIR}/waybar-0.9.17-wireplumber.patch"
+	"${FILESDIR}/waybar-0.9.17-gcc13.patch"
 )
 
 src_configure() {
 	local emesonargs=(
 		-Dman-pages=enabled
-		-Dsystemd=enabled
 		$(meson_feature evdev libevdev)
 		$(meson_feature jack)
 		$(meson_feature libinput)
@@ -89,6 +94,7 @@ src_configure() {
 		$(meson_feature pulseaudio)
 		$(meson_feature pipewire wireplumber)
 		$(meson_feature sndio)
+		$(meson_feature systemd)
 		$(meson_feature test tests)
 		$(meson_feature tray dbusmenu-gtk)
 		$(meson_feature udev libudev)

diff --git a/gui-apps/waybar/waybar-9999.ebuild b/gui-apps/waybar/waybar-9999.ebuild
index b08f76f5d66f..133e1729c1fe 100644
--- a/gui-apps/waybar/waybar-9999.ebuild
+++ b/gui-apps/waybar/waybar-9999.ebuild
@@ -19,7 +19,11 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="evdev experimental jack libinput logind mpd mpris network +popups pipewire pulseaudio sndio test tray +udev upower wifi"
+IUSE="evdev experimental jack +libinput +logind mpd mpris network +popups pipewire pulseaudio sndio systemd test tray +udev upower wifi"
+REQUIRED_USE="
+	mpris? ( logind )
+	upower? ( logind )
+"
 
 RESTRICT="!test? ( test )"
 
@@ -55,8 +59,9 @@ RDEPEND="
 	network? ( dev-libs/libnl:3 )
 	popups? ( gui-libs/gtk-layer-shell )
 	pipewire? ( media-video/wireplumber:0/0.4 )
-	pulseaudio? ( media-sound/pulseaudio[daemon] )
+	pulseaudio? ( media-libs/libpulse )
 	sndio? ( media-sound/sndio:= )
+	systemd? ( sys-apps/systemd:= )
 	tray? (
 		dev-libs/libdbusmenu[gtk3]
 		dev-libs/libappindicator
@@ -70,14 +75,9 @@ DEPEND="${RDEPEND}
 	test? ( dev-cpp/catch:0 )
 "
 
-PATCHES=(
-	"${FILESDIR}/systemd-0.9.17.patch"
-)
-
 src_configure() {
 	local emesonargs=(
 		-Dman-pages=enabled
-		-Dsystemd=enabled
 		$(meson_feature evdev libevdev)
 		$(meson_feature jack)
 		$(meson_feature libinput)
@@ -89,6 +89,7 @@ src_configure() {
 		$(meson_feature pulseaudio)
 		$(meson_feature pipewire wireplumber)
 		$(meson_feature sndio)
+		$(meson_feature systemd)
 		$(meson_feature test tests)
 		$(meson_feature tray dbusmenu-gtk)
 		$(meson_feature udev libudev)