gentoo auto-resync : 10:04:2023 - 11:36:36

8 files changed, 219 insertions, 12 deletions

diff --git a/gui-apps/Manifest.gz b/gui-apps/Manifest.gz
index 211596778579..149fffddca21 100644
--- a/gui-apps/Manifest.gz
+++ b/gui-apps/Manifest.gz
diff --git a/gui-apps/waybar/Manifest b/gui-apps/waybar/Manifest
index 9b7db95dd7c0..a1284770bdb8 100644
--- a/gui-apps/waybar/Manifest
+++ b/gui-apps/waybar/Manifest
@@ -1,7 +1,10 @@
+AUX systemd-0.9.17.patch 1090 BLAKE2B 7f4ef47739555d20b85ead7cdf8d72d7475f480aab8193ce447a55bf4a5b36f14d04cd05481bf9c9aaec82d2d7fb3e6216c94f028723e9b07721c090ab5b8be8 SHA512 8e415c3d68accce1da3e52df8e5b1ddf45638db86298f3be5a51cbe1107f7f2266327c5edeefade910cca5ab418381b2cee10c42086ca1e9b2ff744d06d6d1e7
+AUX waybar-0.9.17-gcc13.patch 808 BLAKE2B 21f746710d1db1d064f58f0c78da281ef9fd68ba16184cc255a7f557f2faec75d625462d833aec3ba2f3dc64c249bb6785a7791f7429d85f65e0050d102d43b1 SHA512 91edbb60aef10fad5259e73daec98baf026f85f38dc4a646cccf5cdccc438857de2f66ad9b1fb1f53e1e1aa4cc1db572609661e2b27e9f5e4773c326d2c2b9f9
 AUX waybar-0.9.17-wireplumber.patch 15607 BLAKE2B eb5ad8d86cf5881bcaa4bcde7baee10c0c0c6add3005c0e13dcc86fa0e6212d1e49900642edb8ddaff14ee1cfdf338c16e6b06e8c9a94309f0220c1a39dc5703 SHA512 1ab4da1c0f1c5c62a8054a7e7ce8c81141a15abc053fbff8c3d98e78d6934b6dcacd04d52841d0ea98fe7507298d33bf896f0a4ba3a55f4610aec0f9c8e3045b
 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.ebuild 1784 BLAKE2B d1a5381088407105efe98e931343995dace4e2edae39b46cb384b4c11ebc6b13443488dd7c779a9275d6d7e8d4cbd003acdf6eacdeb95b7f91ecaf67a5d0858d SHA512 dfe159672a5a191f8299b50723ea09c9311bb5fbd826b284cdd40b48379675ef4ccc7c8ce20012d86caa40b5ceb712f8b3ef07cacc5af9c86d6073dec0e18b45
-EBUILD waybar-9999.ebuild 1632 BLAKE2B a3b478c3aab3a41e0df3d06d93bc76d3fe20f187b29c9d56e61535a0cf5b0ff2a93bc40d0d90bfc88b800ee28ac7829422482728b0edb2ca0501a36d3a97228d SHA512 708c52f2030a5c72aa4c56bd0e1871633bb3641bfe3b77d518c2ac7907966663c4dcac1fccfc6ab4e16e27a96f41d09658911fae4fdf259ac822c069c62630c4
-MISC metadata.xml 1280 BLAKE2B 83dcff4c9798e9a6013b1b74894095cd07802373cc9b7d0230d3ab1ef9f574f0701053314a8906fbe0074946b90763afc322e3ec921e78b5703304bc22e8f5c1 SHA512 fcd07931cee04e7050e9f7cf2e711a5ff1194f10aa602ad222e19e2708d701cd8c0fb9535c42282715abaac2c85d5456e5bc8058f0f96bd716245114316f1d17
+EBUILD waybar-0.9.17-r1.ebuild 2483 BLAKE2B 44abc913530e20b29ebef7a09c9ddaf77027d8461e363e04fea7880ad2cd4d83a01d8564c55ac7e32cc7ea7ac8edb270a4dc0a4a0af08f12898e4e2c78697285 SHA512 3b38ef4e91f1bfabfd2edd3a11ff923d1284c78c2e16b96fe564d5323e280279b6c3b13592bff8b5bd08ada7393c1b34130e5137fa54ff704aac671c4feaf182
+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
diff --git a/gui-apps/waybar/files/systemd-0.9.17.patch b/gui-apps/waybar/files/systemd-0.9.17.patch
new file mode 100644
index 000000000000..7d6c8dd10b38
--- /dev/null
+++ b/gui-apps/waybar/files/systemd-0.9.17.patch
@@ -0,0 +1,35 @@
+diff --git a/meson.build b/meson.build
+index ebf68d4..3c2a7fd 100644
+--- a/meson.build
++++ b/meson.build
+@@ -122,7 +122,6 @@ endif
+ gtk_layer_shell = dependency('gtk-layer-shell-0',
+         required: get_option('gtk-layer-shell'),
+         fallback : ['gtk-layer-shell', 'gtk_layer_shell_dep'])
+-systemd = dependency('systemd', required: get_option('systemd'))
+ tz_dep = dependency('date',
+     required: false,
+     default_options : [ 'use_system_tzdb=true' ],
+@@ -136,16 +135,12 @@ conf_data.set('prefix', prefix)
+ 
+ add_project_arguments('-DSYSCONFDIR="/@0@"'.format(join_paths(prefix, sysconfdir)), language : 'cpp')
+ 
+-if systemd.found()
+-  user_units_dir = systemd.get_pkgconfig_variable('systemduserunitdir')
+-
+-  configure_file(
+-    configuration: conf_data,
+-    input: './resources/waybar.service.in',
+-    output: '@BASENAME@',
+-    install_dir: user_units_dir
+-  )
+-endif
++configure_file(
++  configuration: conf_data,
++  input: './resources/waybar.service.in',
++  output: '@BASENAME@',
++  install_dir: '/usr/lib/systemd/user'
++)
+ 
+ src_files = files(
+     'src/factory.cpp',
diff --git a/gui-apps/waybar/files/waybar-0.9.17-gcc13.patch b/gui-apps/waybar/files/waybar-0.9.17-gcc13.patch
new file mode 100644
index 000000000000..831435f50cac
--- /dev/null
+++ b/gui-apps/waybar/files/waybar-0.9.17-gcc13.patch
@@ -0,0 +1,31 @@
+https://bugs.gentoo.org/900729
+https://github.com/Alexays/Waybar/commit/ca9d237b00b4d01f341b0d7bc938afb10a4f8cad
+
+From ca9d237b00b4d01f341b0d7bc938afb10a4f8cad Mon Sep 17 00:00:00 2001
+From: Aleksei Bavshin <alebastr89@gmail.com>
+Date: Mon, 16 Jan 2023 10:27:21 -0800
+Subject: [PATCH] fix(sway): add missing includes for GCC 13
+
+See also: https://gcc.gnu.org/gcc-13/porting_to.html
+--- a/include/modules/sway/ipc/client.hpp
++++ b/include/modules/sway/ipc/client.hpp
+@@ -8,6 +8,7 @@
+ #include <cstring>
+ #include <memory>
+ #include <mutex>
++#include <string>
+ 
+ #include "ipc.hpp"
+ #include "util/sleeper_thread.hpp"
+--- a/src/modules/sway/ipc/client.cpp
++++ b/src/modules/sway/ipc/client.cpp
+@@ -2,6 +2,8 @@
+ 
+ #include <fcntl.h>
+ 
++#include <stdexcept>
++
+ namespace waybar::modules::sway {
+ 
+ Ipc::Ipc() {
+
diff --git a/gui-apps/waybar/metadata.xml b/gui-apps/waybar/metadata.xml
index b481b93d48a5..78b89e6579cc 100644
--- a/gui-apps/waybar/metadata.xml
+++ b/gui-apps/waybar/metadata.xml
@@ -14,11 +14,16 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<use>
-		<flag name="experimental">Enable experimental features</flag>
+		<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="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>
 		<flag name="popups">Enable popup support with gtk-layer-shell</flag>
 		<flag name="sndio">Enable support for volume control via sndio</flag>
+		<flag name="pipewire">Enable support for pipewire</flag>
 		<flag name="pulseaudio">Enable support for volume control via PulseAudio</flag>
 		<flag name="tray">Enable support for tray</flag>
 		<flag name="wifi">Enable support for wifi/rfkill</flag>
diff --git a/gui-apps/waybar/waybar-0.9.17-r1.ebuild b/gui-apps/waybar/waybar-0.9.17-r1.ebuild
new file mode 100644
index 000000000000..9ee87022a46b
--- /dev/null
+++ b/gui-apps/waybar/waybar-0.9.17-r1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+DESCRIPTION="Highly customizable Wayland bar for Sway and Wlroots based compositors"
+HOMEPAGE="https://github.com/Alexays/Waybar"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Alexays/${PN^}.git"
+else
+	SRC_URI="https://github.com/Alexays/${PN^}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/${PN^}-${PV}"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="evdev experimental jack libinput logind mpd mpris network +popups pipewire pulseaudio sndio test tray +udev upower wifi"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	>=app-text/scdoc-1.9.2
+	dev-util/gdbus-codegen
+	virtual/pkgconfig
+"
+RDEPEND="
+	dev-cpp/cairomm:0
+	dev-cpp/glibmm:2
+	dev-cpp/gtkmm:3.0
+	dev-libs/glib:2
+	dev-libs/jsoncpp:=
+	dev-libs/libinput:=
+	dev-libs/libsigc++:2
+	>=dev-libs/libfmt-7.0.0:=
+	>=dev-libs/spdlog-1.8.5:=
+	dev-libs/date:=
+	dev-libs/wayland
+	gui-libs/wlroots:=
+	x11-libs/gtk+:3[wayland]
+	x11-libs/libxkbcommon
+	evdev? ( dev-libs/libevdev:= )
+	jack? ( virtual/jack )
+	libinput? ( dev-libs/libinput:= )
+	logind? (
+		|| ( sys-apps/systemd
+			 sys-auth/elogind )
+	)
+	mpd? ( media-libs/libmpdclient )
+	mpris? ( >=media-sound/playerctl-2 )
+	network? ( dev-libs/libnl:3 )
+	popups? ( gui-libs/gtk-layer-shell )
+	pipewire? ( media-video/wireplumber:0/0.4 )
+	pulseaudio? ( media-sound/pulseaudio[daemon] )
+	sndio? ( media-sound/sndio:= )
+	tray? (
+		dev-libs/libdbusmenu[gtk3]
+		dev-libs/libappindicator
+	)
+	udev? ( virtual/libudev:= )
+	upower? ( sys-power/upower )
+	wifi? ( sys-apps/util-linux )
+"
+DEPEND="${RDEPEND}
+	dev-libs/wayland-protocols
+	test? ( dev-cpp/catch:0 )
+"
+
+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)
+		$(meson_feature logind)
+		$(meson_feature mpd)
+		$(meson_feature mpris)
+		$(meson_feature network libnl)
+		$(meson_feature popups gtk-layer-shell)
+		$(meson_feature pulseaudio)
+		$(meson_feature pipewire wireplumber)
+		$(meson_feature sndio)
+		$(meson_feature test tests)
+		$(meson_feature tray dbusmenu-gtk)
+		$(meson_feature udev libudev)
+		$(meson_feature upower upower_glib)
+		$(meson_feature wifi rfkill)
+		$(meson_use experimental)
+	)
+	meson_src_configure
+}
diff --git a/gui-apps/waybar/waybar-0.9.17.ebuild b/gui-apps/waybar/waybar-0.9.17.ebuild
index 9d2f830e6558..cd71fa673ed4 100644
--- a/gui-apps/waybar/waybar-0.9.17.ebuild
+++ b/gui-apps/waybar/waybar-0.9.17.ebuild
@@ -59,6 +59,7 @@ RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/waybar-0.9.17-wireplumber.patch"
+	"${FILESDIR}/waybar-0.9.17-gcc13.patch"
 )
 
 src_configure() {
diff --git a/gui-apps/waybar/waybar-9999.ebuild b/gui-apps/waybar/waybar-9999.ebuild
index d3aca7df27b2..b08f76f5d66f 100644
--- a/gui-apps/waybar/waybar-9999.ebuild
+++ b/gui-apps/waybar/waybar-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,18 +14,21 @@ if [[ ${PV} == 9999 ]]; then
 else
 	SRC_URI="https://github.com/Alexays/${PN^}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
+	S="${WORKDIR}/${PN^}-${PV}"
 fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="mpd network +popups pulseaudio sndio tray +udev wifi"
+IUSE="evdev experimental jack libinput logind mpd mpris network +popups pipewire pulseaudio sndio test tray +udev upower wifi"
+
+RESTRICT="!test? ( test )"
 
 BDEPEND="
 	>=app-text/scdoc-1.9.2
 	dev-util/gdbus-codegen
 	virtual/pkgconfig
 "
-DEPEND="
+RDEPEND="
 	dev-cpp/cairomm:0
 	dev-cpp/glibmm:2
 	dev-cpp/gtkmm:3.0
@@ -33,38 +36,65 @@ DEPEND="
 	dev-libs/jsoncpp:=
 	dev-libs/libinput:=
 	dev-libs/libsigc++:2
-	>=dev-libs/libfmt-5.3.0:=
+	>=dev-libs/libfmt-7.0.0:=
 	>=dev-libs/spdlog-1.8.5:=
 	dev-libs/date:=
 	dev-libs/wayland
-	dev-libs/wayland-protocols
 	gui-libs/wlroots:=
 	x11-libs/gtk+:3[wayland]
 	x11-libs/libxkbcommon
+	evdev? ( dev-libs/libevdev:= )
+	jack? ( virtual/jack )
+	libinput? ( dev-libs/libinput:= )
+	logind? (
+		|| ( sys-apps/systemd
+			 sys-auth/elogind )
+	)
 	mpd? ( media-libs/libmpdclient )
+	mpris? ( >=media-sound/playerctl-2 )
 	network? ( dev-libs/libnl:3 )
 	popups? ( gui-libs/gtk-layer-shell )
-	pulseaudio? ( media-sound/pulseaudio )
+	pipewire? ( media-video/wireplumber:0/0.4 )
+	pulseaudio? ( media-sound/pulseaudio[daemon] )
 	sndio? ( media-sound/sndio:= )
 	tray? (
 		dev-libs/libdbusmenu[gtk3]
 		dev-libs/libappindicator
 	)
 	udev? ( virtual/libudev:= )
-	wifi? ( || ( sys-apps/util-linux net-wireless/rfkill ) )
+	upower? ( sys-power/upower )
+	wifi? ( sys-apps/util-linux )
 "
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	dev-libs/wayland-protocols
+	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)
+		$(meson_feature logind)
 		$(meson_feature mpd)
+		$(meson_feature mpris)
 		$(meson_feature network libnl)
 		$(meson_feature popups gtk-layer-shell)
 		$(meson_feature pulseaudio)
+		$(meson_feature pipewire wireplumber)
 		$(meson_feature sndio)
+		$(meson_feature test tests)
 		$(meson_feature tray dbusmenu-gtk)
 		$(meson_feature udev libudev)
+		$(meson_feature upower upower_glib)
 		$(meson_feature wifi rfkill)
+		$(meson_use experimental)
 	)
 	meson_src_configure
 }