gentoo resync : 13.11.2021

7 files changed, 83 insertions, 13 deletions

diff --git a/gui-apps/Manifest.gz b/gui-apps/Manifest.gz
index f723b87fbf34..17e3e4d23492 100644
--- a/gui-apps/Manifest.gz
+++ b/gui-apps/Manifest.gz
diff --git a/gui-apps/swaylock/Manifest b/gui-apps/swaylock/Manifest
index c468477bec37..b16176160455 100644
--- a/gui-apps/swaylock/Manifest
+++ b/gui-apps/swaylock/Manifest
@@ -1,6 +1,6 @@
 DIST swaylock-1.3.tar.gz 32848 BLAKE2B 81ed50839bcb0139e7fc2081bd37e738f3e6ef23e96a5108d1acf56cc3425285f7382576a54201f1bf188883b1da06492074c091877af13832c0140e4e6099fd SHA512 723d758d76f076f3f1539ea0d651f6ad2562659c72eef7e895d7827a0be21db663652fe4ce2609065aff45ff20230879599868cff327ab52b896330ca04d78c4
 DIST swaylock-1.5.tar.gz 35350 BLAKE2B c68073d6154842c2cdb99836bda991560605f6ede66c6124986c3395575a4e2c22d59a837a09033d1632b61628e45b18b3ee5ca198bafe4fbd8f429cb0401eda SHA512 16dd9b912ca702849290cf18d91ffbd64a70118cc284982a84b567c4974fd4590b12707c0aae1fcda7ccd1caa7880f342c633b9345bd795c36702916696d1f67
 EBUILD swaylock-1.3-r1.ebuild 1232 BLAKE2B f8184716c1c8c915e691ff2d8e0f506a0ad270b9c29ec518469f9be85e650edd38102118dd256f1846249e7e2adeb9783c1ad37cc33aa07f2f1d5b76fbf7698c SHA512 27b4798856b46dfb1a9ba96e4a481b3eaedee41ffcbe33440215272cc6e1c385b3b2d812886fe0cc90dfffd0c823e25b2b26ac231d314f89be9ee5b6af650e0b
-EBUILD swaylock-1.5-r1.ebuild 1205 BLAKE2B 14c382f595109a84dc1d6dbcc850da5832863da38b04fcfff1aa1e90a1e50fca4cbeb21e906f5b54136466514b05140aeca1115a9102a669d05a3669922f2859 SHA512 2e437388e59a85417a0c516c676095a6edb27885af77f5885e15cdadc8c2c3186facd6b5d139339f0201223693917d89e68d382af7b0700157cfc047acb9f2e7
-EBUILD swaylock-9999.ebuild 1201 BLAKE2B 996541932ce21eb88008e7a42b35a1b66b951548910fe39b930c7be127febf8a45162b4be715a935a898e3e311ee70e3896268ace3428c853c9e3d32f6c6d023 SHA512 583947759470721903059db410d4004ab6a7da6f35b0e8de7220b03ffe1601569416831dd66719fdd2fe739a107570e23a6a4a3a87e7b5a8c2a0a6580c7b7957
+EBUILD swaylock-1.5-r1.ebuild 1125 BLAKE2B 0a5f87240f5e0a8bf9cc61082c3152d124f235ef95e3331aa1268a873ce5b7fbda1df70faf59711a236eb6d445f74dd0131cf4e4be9a62ff11eebe4f755fbc03 SHA512 cfd505253761181537f4d6c54b7423182fc43399f68cfdaaad012e5b1520a769944c07326fe584e0301f8a45422f40fa376b3beee76b542252f59bfd548dc1e4
+EBUILD swaylock-9999.ebuild 1121 BLAKE2B badfdfff80efb327700eba2c73f275e3c5b2254c7ce2d9663fc179a9fc30d49c8ce025ecc90bfd0f65ebb5d5bc561ad733fe187c25e9204e54db4a4fd2557287 SHA512 a1c6335bf5043d903b8c004ca5ac326fb584ddc16a5d5b8b7b5499e41834328f5dcd31377577fe3524fdd5ac883e7749e993da62e1cb00d8df0f726e79f93feb
 MISC metadata.xml 1182 BLAKE2B 26d1cd8d48c9d3cd61c9c00838f5ca27f5794e8ad23177c99f14b80e7b5fb0238b361feecb7f24c871e653532bcc7ac6ad797f554151002cad43faba4f3f3963 SHA512 e3a00a1c6f35bb616b8934e0b841930f8efdc282096cacf0a615478444090d49ac4062b3d5b0cdf40ea22cc0a9835d403ef7716aefaed8cae8cfe508a99ff879
diff --git a/gui-apps/swaylock/swaylock-1.5-r1.ebuild b/gui-apps/swaylock/swaylock-1.5-r1.ebuild
index c3e2e1fccdce..920d0fdf1b61 100644
--- a/gui-apps/swaylock/swaylock-1.5-r1.ebuild
+++ b/gui-apps/swaylock/swaylock-1.5-r1.ebuild
@@ -45,10 +45,6 @@ src_configure() {
 		"-Dwerror=false"
 	)
 
-	if [[ ${PV} != 9999 ]]; then
-		emesonargs+=( "-Dswaylock-version=${PV}" )
-	fi
-
 	meson_src_configure
 }
 
diff --git a/gui-apps/swaylock/swaylock-9999.ebuild b/gui-apps/swaylock/swaylock-9999.ebuild
index 68f84c85db2d..c80f325049f7 100644
--- a/gui-apps/swaylock/swaylock-9999.ebuild
+++ b/gui-apps/swaylock/swaylock-9999.ebuild
@@ -45,10 +45,6 @@ src_configure() {
 		"-Dwerror=false"
 	)
 
-	if [[ ${PV} != 9999 ]]; then
-		emesonargs+=( "-Dswaylock-version=${PV}" )
-	fi
-
 	meson_src_configure
 }
 
diff --git a/gui-apps/waybar/Manifest b/gui-apps/waybar/Manifest
index d735401ca178..9c82de676b6d 100644
--- a/gui-apps/waybar/Manifest
+++ b/gui-apps/waybar/Manifest
@@ -1,7 +1,9 @@
 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
-EBUILD waybar-9999.ebuild 1531 BLAKE2B 727efd13df86a26c46e542ede76031ed04f848fa2671b179336d820221cb8aba82f0b77898d510a6fdc8ba94d8640f06807632d40a494dabf1ebf4513e405492 SHA512 4f2ca5cffd4442ab46afa219ebf42fb5004d543e767e6ef9e64ac16e5184b180a82d75bdc7497379b607b630257bbb69cb2ea35d64542d2d3977098835c1bcce
+EBUILD waybar-0.9.8.ebuild 1660 BLAKE2B abeb907aa4f6bb2a3d42b950577955a53e9d01d50e74017615e704ea0bcb9d1dc94e360747b05b6feda58674893c509ebcbb00776b5d0e0e7679aa0ae7d9205d SHA512 2a4a839fe63d6048dbbb5462314ef90b8b027767a686600bd8214792ec70b4ceb80eb76147315c3e183a5f4bdbfd774d21da39a0114fa9a6f9ee52eef3e0808f
+EBUILD waybar-9999.ebuild 1632 BLAKE2B a3b478c3aab3a41e0df3d06d93bc76d3fe20f187b29c9d56e61535a0cf5b0ff2a93bc40d0d90bfc88b800ee28ac7829422482728b0edb2ca0501a36d3a97228d SHA512 708c52f2030a5c72aa4c56bd0e1871633bb3641bfe3b77d518c2ac7907966663c4dcac1fccfc6ab4e16e27a96f41d09658911fae4fdf259ac822c069c62630c4
 MISC metadata.xml 1101 BLAKE2B 4eaa3e0ff4a70904ca17fcf69f47198532bff43a18283ca9ec85c71336d711d8a1ae4f3e7d8bf5f63b7334d0c4a6b3d5d189d8bfa10989e0e7fabbc90cf4c69d SHA512 4bb81f1bdcc5cf8f2ba1a092230e852ca14305a1a40cf778d5b39057984c74fb683deae4b6f3d5520d94b4a0f53c0b2b0a7f76f865e59f5de725d7226cccba09
diff --git a/gui-apps/waybar/waybar-0.9.8.ebuild b/gui-apps/waybar/waybar-0.9.8.ebuild
new file mode 100644
index 000000000000..1aea310cc4a6
--- /dev/null
+++ b/gui-apps/waybar/waybar-0.9.8.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 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="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.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_src_configure
+}
diff --git a/gui-apps/waybar/waybar-9999.ebuild b/gui-apps/waybar/waybar-9999.ebuild
index 666e9bfda0ec..d3aca7df27b2 100644
--- a/gui-apps/waybar/waybar-9999.ebuild
+++ b/gui-apps/waybar/waybar-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit meson
 
@@ -22,20 +22,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/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 )