gentoo resync : 02.02.2022

4 files changed, 11 insertions, 115 deletions

diff --git a/gui-apps/waybar/Manifest b/gui-apps/waybar/Manifest
index 9c82de676b6d..40a92b54feea 100644
--- a/gui-apps/waybar/Manifest
+++ b/gui-apps/waybar/Manifest
@@ -1,9 +1,6 @@
-AUX waybar-0.9.7-libfmt-8.patch 1141 BLAKE2B 0be30ec869c1893078eaed0d57e80da8ddfb7b6e1b7658b52f588ebb44aa3b981e570dabb0f4595e3a4df3daeb069ec7f12f8b1406ae17edf75e560b480f299a SHA512 ffa892473cd20d1f8456f82b4df20d1d3d9084c2d5c537d8384ab9372bd7bf099c4243b25b8e19e04f564a5676fad5f7b7451cd281014b754d31529c3072b3b7
-DIST waybar-0.9.5.tar.gz 146094 BLAKE2B cd46e308d282df5ba6ce34417c0fe5468c188acb3c0f9bf5b2d4dd4c2c80547cab65172b4f4162c2dde0b78f68d15c8b79be74113cacd2610fd2a48299e14013 SHA512 0bbb9e898e205728fc564389927fec661a8dd6a9995a6c5d318f930f4527d6afd0be11a6b71dfa9aafb05c982e0f131e51eb0eec9a3e92c28f5cb04ff780fa8b
-DIST waybar-0.9.7.tar.gz 150768 BLAKE2B 41dbcac30ffc42e04d565a590c1bce086271938936a05599bca6b74bac3fb2a8d1a4a4ddc5bec079dea6963eef8722c2c87a99c066de495caa163b1103a08095 SHA512 731b686235b1f0f94ce263e7ffa854f980fb8fccf30a0bd89e7aa0e1ca2c3fabd6d0df837bace6d6915d7a633500ed1f0497d012e082ca99fb32a78142b99279
 DIST waybar-0.9.8.tar.gz 158869 BLAKE2B d5496986e3985747881cb8693b40d92e5c038a0ee55bf32e156efb67f02c46810cc80767635bd83837609b33855feced4f4f476deecbc47dfd43ef82700a87a2 SHA512 5c65b04cf0ae2e4cdff2b58c6b733a10a8b8d8acbb8f4f4519a0542be759fb6e84e46c323e4b8611ed25bda8bd322ee7a09cb697ed378e120841ce324021b104
-EBUILD waybar-0.9.5-r1.ebuild 1613 BLAKE2B f5629a00c97620954827e6cf4efe864dfdeff8b2c1eb650049e305df9e73a26d68ddbcbdd7a51d2966ea322c619433bf947ae57622b1ca9bb6314b30eefe4c2a SHA512 4905fb8cae8f3e10e50851f449f0650507f5c3baaeddc20f585ffd5f8e7d4f95a4b286169524246db3b6dfbfcd26bfff5116c6d0997895a63e3bac1ed0c62ec2
-EBUILD waybar-0.9.7-r1.ebuild 1607 BLAKE2B e23fac90236d9c2d182ce3af8418050eb934e07aff7163a09528104dbe21d2c382ea8c0045fd10b36d7f60a80582197484140cd46a8215aa4a74438cc4fde655 SHA512 0ddaf02c22bf13c4dd2bbda45eb16edf0046ab14b9002fbe29d7baa433e7ad5959967c2dc49d523a7001ae405b6c8d1e24024876385b1306b25c5ad68ffd93ab
+DIST waybar-0.9.9.tar.gz 181603 BLAKE2B ac0430fef2cc3be3a63ae2e27d6982cdea67ee800db8e9acda2bd8025114c8f065a87a164a787d2c82a00b81012fe2fad91e8adb1b51241bc722355b100fed86 SHA512 c219c55014726d9201031ef4448505de516507a74d840a3f733b1719ae0100d1e882580da8b1490158fff2c3003cf915e04bcdf8a55b757bdb845e29bf705ecd
 EBUILD waybar-0.9.8.ebuild 1660 BLAKE2B abeb907aa4f6bb2a3d42b950577955a53e9d01d50e74017615e704ea0bcb9d1dc94e360747b05b6feda58674893c509ebcbb00776b5d0e0e7679aa0ae7d9205d SHA512 2a4a839fe63d6048dbbb5462314ef90b8b027767a686600bd8214792ec70b4ceb80eb76147315c3e183a5f4bdbfd774d21da39a0114fa9a6f9ee52eef3e0808f
+EBUILD waybar-0.9.9.ebuild 1660 BLAKE2B 58a3226689fa6e9db658297301c96b19349431ff3a11c2edfa23b22743c6fcd898ec8dc6f94f3f07099557a80ce0d8b84d3fca782dc3f51b2837d7ab45eac982 SHA512 628eb11a679efa7760c598ca6607665b3117de3d8775387528add73856974fc610d7a64e1ef395f47b735e6d418d3d5135649f6f0ce871e4f42c77bf76285875
 EBUILD waybar-9999.ebuild 1632 BLAKE2B a3b478c3aab3a41e0df3d06d93bc76d3fe20f187b29c9d56e61535a0cf5b0ff2a93bc40d0d90bfc88b800ee28ac7829422482728b0edb2ca0501a36d3a97228d SHA512 708c52f2030a5c72aa4c56bd0e1871633bb3641bfe3b77d518c2ac7907966663c4dcac1fccfc6ab4e16e27a96f41d09658911fae4fdf259ac822c069c62630c4
 MISC metadata.xml 1101 BLAKE2B 4eaa3e0ff4a70904ca17fcf69f47198532bff43a18283ca9ec85c71336d711d8a1ae4f3e7d8bf5f63b7334d0c4a6b3d5d189d8bfa10989e0e7fabbc90cf4c69d SHA512 4bb81f1bdcc5cf8f2ba1a092230e852ca14305a1a40cf778d5b39057984c74fb683deae4b6f3d5520d94b4a0f53c0b2b0a7f76f865e59f5de725d7226cccba09
diff --git a/gui-apps/waybar/files/waybar-0.9.7-libfmt-8.patch b/gui-apps/waybar/files/waybar-0.9.7-libfmt-8.patch
deleted file mode 100644
index 8ffc8a42a9f1..000000000000
--- a/gui-apps/waybar/files/waybar-0.9.7-libfmt-8.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-https://bugs.gentoo.org/797649
-https://github.com/Alexays/Waybar/pull/1144
-
-From: John Helmert III <jchelmert3@posteo.net>
-Date: Tue, 29 Jun 2021 21:29:12 -0500
-Subject: [PATCH] libfmt >=8.0.0 compatibility
---- a/include/util/format.hpp
-+++ b/include/util/format.hpp
-@@ -35,7 +35,11 @@ namespace fmt {
-             // The rationale for ignoring it is that the only reason to specify
-             // an alignment and a with is to get a fixed width bar, and ">" is
-             // sufficient in this implementation.
-+#if FMT_VERSION < 80000
-             width = parse_nonnegative_int(it, end, ctx);
-+#else
-+            width = detail::parse_nonnegative_int(it, end, -1);
-+#endif
-           }
-           return it;
-         }
---- a/src/modules/clock.cpp
-+++ b/src/modules/clock.cpp
-@@ -196,6 +196,9 @@ template <>
- struct fmt::formatter<waybar_time> : fmt::formatter<std::tm> {
-   template <typename FormatContext>
-   auto format(const waybar_time& t, FormatContext& ctx) {
-+#if FMT_VERSION >= 80000
-+	auto& tm_format = specs;
-+#endif
-     return format_to(ctx.out(), "{}", date::format(t.locale, fmt::to_string(tm_format), t.ztime));
-   }
- };
diff --git a/gui-apps/waybar/waybar-0.9.5-r1.ebuild b/gui-apps/waybar/waybar-0.9.5-r1.ebuild
deleted file mode 100644
index fe2a849be6ce..000000000000
--- a/gui-apps/waybar/waybar-0.9.5-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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="mpd network popups pulseaudio sndio tray +udev wifi"
-
-BDEPEND="
-	>=app-text/scdoc-1.9.2
-	virtual/pkgconfig
-"
-DEPEND="
-	dev-cpp/gtkmm:3.0
-	dev-libs/jsoncpp:=
-	dev-libs/libinput:=
-	dev-libs/libsigc++:2
-	>=dev-libs/libfmt-5.3.0:=
-	>=dev-libs/spdlog-1.8.0:=
-	dev-libs/date:=
-	dev-libs/wayland
-	dev-libs/wayland-protocols
-	gui-libs/wlroots:=
-	x11-libs/gtk+:3[wayland]
-	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}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.9.7-libfmt-8.patch"
-)
-
-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_src_configure
-}
diff --git a/gui-apps/waybar/waybar-0.9.7-r1.ebuild b/gui-apps/waybar/waybar-0.9.9.ebuild
index 920ee272bddd..fa2bf998afdc 100644
--- a/gui-apps/waybar/waybar-0.9.7-r1.ebuild
+++ b/gui-apps/waybar/waybar-0.9.9.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit meson
 
@@ -23,20 +23,25 @@ IUSE="mpd network +popups pulseaudio sndio tray +udev wifi"
 
 BDEPEND="
 	>=app-text/scdoc-1.9.2
+	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-5.3.0:=
-	>=dev-libs/spdlog-1.8.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
 	mpd? ( media-libs/libmpdclient )
 	network? ( dev-libs/libnl:3 )
 	popups? ( gui-libs/gtk-layer-shell )
@@ -51,10 +56,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=(
-	"${FILESDIR}/${P}-libfmt-8.patch"
-)
-
 src_configure() {
 	local emesonargs=(
 		$(meson_feature mpd)