4 files changed, 2 insertions, 77 deletions
diff --git a/gui-apps/Manifest.gz b/gui-apps/Manifest.gz
index bea33a4525d2..73bec3137895 100644
--- a/gui-apps/Manifest.gz
+++ b/gui-apps/Manifest.gz
diff --git a/gui-apps/waybar/Manifest b/gui-apps/waybar/Manifest
index 7692885fd1d1..bc781e4517cd 100644
--- a/gui-apps/waybar/Manifest
+++ b/gui-apps/waybar/Manifest
@@ -1,8 +1,6 @@
 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-r3.ebuild 2550 BLAKE2B cbe76e06b3f8ab339189c1f30e5a9165eb51a8d0afbd8399973108c4b3992384a265c667cf922e5d76ca9591fdf3d0e4562f93872b1d3d57fceac268e6c0fc18 SHA512 7df28544ebf7f8eded5071478da6281cf5d5489c5d06c7b53a675234f76f0db969ddd8cc018ee8db1172752d9e5308fb021aec6abb6e0dae5c26a9cda77db747
-EBUILD waybar-9999.ebuild 2441 BLAKE2B f62a30ab8a853ff1e70bfd8f480817ea2bcfcded0528f482d4040e1fcdd3e3cc63cfc669b9bd097a06c5945204ec01e4746b8ba59a1a29a5f89e70c298e08aa5 SHA512 f77cc4a651b1ce5db9652714d910f2438a64d05b069d1af3984541f2a793b54bac2b211080425cd54d5e3be62873253880b8e31ee2425795a9e8d08d02593c5a
+EBUILD waybar-9999.ebuild 2449 BLAKE2B 37e26c62bf3551a5b32395682216effa8e611af2851cab906396a400cc58c077017dbf08a5f9fc00b1e098ecfe8793776653bd24426103c0a39c3ca14db545bf SHA512 15abb5f846abd0e372c72838b08a3c5fe0ed0afd973f09070a6db7e3720f9349e284aef113a215a22ea115ac24ab4bc3fdef0baa793f243c03d7cac5a955ed23
 MISC metadata.xml 1677 BLAKE2B 2b44ed5a0b97760447698334b10e227c73436a1ba8a76da7c48933a2d7edbeb92f5dfe52ac6d8e8071b66c60703c1be88850d83035218a99ebeceae18e4b1660 SHA512 3e47ec2a12c58cb0f450c77b2ebfa9a521d9ca998bbf99b671b2b1c3d000eedeaeb7578e98d374d1a6db40120d05c5dae3b772c5e150a72b8a70c4435b899720
diff --git a/gui-apps/waybar/waybar-0.9.16.ebuild b/gui-apps/waybar/waybar-0.9.16.ebuild
deleted file mode 100644
index ed6e3ca97877..000000000000
--- a/gui-apps/waybar/waybar-0.9.16.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# 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"
-fi
-S="${WORKDIR}/${PN^}-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="experimental mpd network +popups pulseaudio sndio tray +udev wifi"
-
-BDEPEND="
-	>=app-text/scdoc-1.9.2
-	>=dev-cpp/catch-3.0.0
-	dev-util/gdbus-codegen
-	virtual/pkgconfig
-"
-DEPEND="
-	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
-	dev-libs/wayland-protocols
-	gui-libs/wlroots:=
-	x11-libs/gtk+:3[wayland]
-	x11-libs/libxkbcommon
-	mpd? ( media-libs/libmpdclient )
-	network? ( dev-libs/libnl:3 )
-	popups? ( gui-libs/gtk-layer-shell )
-	pulseaudio? ( media-sound/pulseaudio )
-	sndio? ( media-sound/sndio:= )
-	tray? (
-		dev-libs/libdbusmenu[gtk3]
-		dev-libs/libappindicator
-	)
-	udev? ( virtual/libudev:= )
-	wifi? ( || ( sys-apps/util-linux net-wireless/rfkill ) )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature mpd)
-		$(meson_feature network libnl)
-		$(meson_feature popups gtk-layer-shell)
-		$(meson_feature pulseaudio)
-		$(meson_feature sndio)
-		$(meson_feature tray dbusmenu-gtk)
-		$(meson_feature udev libudev)
-		$(meson_feature wifi rfkill)
-		$(meson_use experimental)
-	)
-	meson_src_configure
-}
diff --git a/gui-apps/waybar/waybar-9999.ebuild b/gui-apps/waybar/waybar-9999.ebuild
index 133e1729c1fe..7eadc9f46529 100644
--- a/gui-apps/waybar/waybar-9999.ebuild
+++ b/gui-apps/waybar/waybar-9999.ebuild
@@ -64,7 +64,7 @@ RDEPEND="
 	systemd? ( sys-apps/systemd:= )
 	tray? (
 		dev-libs/libdbusmenu[gtk3]
-		dev-libs/libappindicator
+		dev-libs/libayatana-appindicator
 	)
 	udev? ( virtual/libudev:= )
 	upower? ( sys-power/upower )