gentoo auto-resync : 16:04:2023 - 05:49:50

5 files changed, 20 insertions, 15 deletions

diff --git a/gui-apps/Manifest.gz b/gui-apps/Manifest.gz
index 149fffddca21..e9a4089d39a1 100644
--- a/gui-apps/Manifest.gz
+++ b/gui-apps/Manifest.gz
diff --git a/gui-apps/waybar/Manifest b/gui-apps/waybar/Manifest
index a1284770bdb8..c5a7cebfcf75 100644
--- a/gui-apps/waybar/Manifest
+++ b/gui-apps/waybar/Manifest
@@ -4,7 +4,7 @@ AUX waybar-0.9.17-wireplumber.patch 15607 BLAKE2B eb5ad8d86cf5881bcaa4bcde7baee1
 DIST waybar-0.9.16.tar.gz 215154 BLAKE2B c1e655dc57d3950472e22b23bd7bb7f96dd5daa1fc1ffee871a3677486f9f41981dbea8f559f8097e9c7bc367b0bcf224119af556ca62006f0e68e380b91fdec SHA512 d89067639de8ad560cd1515bb448f47f5994281b35239f069a2012165c0f83e0a3ae861cffbb93e7636d7d95cece9424e5900d40a06b80e71768aabda5f7b54a
 DIST waybar-0.9.17.tar.gz 220836 BLAKE2B 78a9065f4b20c1047ce5296c8eb3b6d05ecb1e4b9994b250937e7f681cf6d7f773a5de59189544eab90ad91cfd2abf170ec76c1b125a1d7b09a22f8a7a9d43e0 SHA512 51aba7649c0e2ad3ccf22f6ede3cdf9be9c84268d31d39c5eac62e150e3b115f5560b70ebd54242fd856abec0cca5eba405f1ec153cac4cd6623523f6b19189f
 EBUILD waybar-0.9.16.ebuild 1724 BLAKE2B f5ed70964a390e5ee8970ec8b90c5510d2ce8643bce7d9143e9f725fc878fdde7517d7f570ad05abbcdda5d202099400dfb88e97c2458efc9a1ef706cd299545 SHA512 0c05b7ccef38626b964b493c2aca14aefee022e85d9b963f00db9cbb04b09adf423863301f3a1ae0f2822bcb2a0677afde79d78b3acd6a13d4caa04e369afe7b
-EBUILD waybar-0.9.17-r1.ebuild 2483 BLAKE2B 44abc913530e20b29ebef7a09c9ddaf77027d8461e363e04fea7880ad2cd4d83a01d8564c55ac7e32cc7ea7ac8edb270a4dc0a4a0af08f12898e4e2c78697285 SHA512 3b38ef4e91f1bfabfd2edd3a11ff923d1284c78c2e16b96fe564d5323e280279b6c3b13592bff8b5bd08ada7393c1b34130e5137fa54ff704aac671c4feaf182
+EBUILD waybar-0.9.17-r2.ebuild 2542 BLAKE2B 5ddad03a5295b72726498b6494690303ae6b60cce3038764131fcb7ba6fcd14b98e59e7ecfe56647e0d88561b23af882d724637282f95fb5a2ee14ef66a24b33 SHA512 b87a3afabbf6402bfb5aa88d66cd28a91987de756dd1760408d1418738c027c3827470df923992a44b1a64421e0022d438890ca17dbdfd1f6c09745fcb60c646
 EBUILD waybar-0.9.17.ebuild 1825 BLAKE2B 533e1f016a1e492f867bf8e979195ce673d8a297951eba10842d32dfe08f5cf58cf4c2bc424a6a4c5776256b356db4e102d6808d374890a911459209eb5a3070 SHA512 352efa1913a8bb29cbd21ca3108aac8d5b979b77c0ee49b593671b92a042e6979a15ec5b877eff6342d05fcf80182ca46aa941b5f181c92c4f350124e4afef54
-EBUILD waybar-9999.ebuild 2395 BLAKE2B 5ca67b86d141ebf5127cc5ec1bba06272c0d6ab574a40112aee8edb9e595241b198b82adf5eca3828db2fbbd41a2a95a699a9657d2b75a84cd85f8c97a2090ba SHA512 261458e4d50281ec62175a84b2f608dd9996284992aadc667c608e8ade6def64229e8e520cdc44675ddf991654e774cedcda8f5997f961774e659c8eb252f6b2
-MISC metadata.xml 1648 BLAKE2B 203eb49aaf342fccfdc7f5d7b5dc13e66482cc22acc6352779736d2396fbf822a11a8aa861bc26e7ce5a95157408f517351d0d63612c076dc87ec4d95bcc66a6 SHA512 f5565edc4fad3a1fe4b839dcf8834d8b1408fc8fb5935edcee5d06b845ec6e1e997c71a23176b1ccf2521e89a54c2387998938fea1b85f8838727f5ce0d9bc31
+EBUILD waybar-9999.ebuild 2441 BLAKE2B f62a30ab8a853ff1e70bfd8f480817ea2bcfcded0528f482d4040e1fcdd3e3cc63cfc669b9bd097a06c5945204ec01e4746b8ba59a1a29a5f89e70c298e08aa5 SHA512 f77cc4a651b1ce5db9652714d910f2438a64d05b069d1af3984541f2a793b54bac2b211080425cd54d5e3be62873253880b8e31ee2425795a9e8d08d02593c5a
+MISC metadata.xml 1677 BLAKE2B 2b44ed5a0b97760447698334b10e227c73436a1ba8a76da7c48933a2d7edbeb92f5dfe52ac6d8e8071b66c60703c1be88850d83035218a99ebeceae18e4b1660 SHA512 3e47ec2a12c58cb0f450c77b2ebfa9a521d9ca998bbf99b671b2b1c3d000eedeaeb7578e98d374d1a6db40120d05c5dae3b772c5e150a72b8a70c4435b899720
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-0.9.17-r1.ebuild b/gui-apps/waybar/waybar-0.9.17-r2.ebuild
index 9ee87022a46b..1fa63f14125b 100644
--- a/gui-apps/waybar/waybar-0.9.17-r1.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
@@ -73,13 +78,11 @@ DEPEND="${RDEPEND}
 PATCHES=(
 	"${FILESDIR}/waybar-0.9.17-wireplumber.patch"
 	"${FILESDIR}/waybar-0.9.17-gcc13.patch"
-	"${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)
@@ -91,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)