gentoo resync : 09.07.2022

7 files changed, 70 insertions, 3 deletions

diff --git a/gui-apps/Manifest.gz b/gui-apps/Manifest.gz
index c183c4f1cb2e..26e5f4510a50 100644
--- a/gui-apps/Manifest.gz
+++ b/gui-apps/Manifest.gz
diff --git a/gui-apps/mako/Manifest b/gui-apps/mako/Manifest
index 9648f979dc6e..4a5ccff08d14 100644
--- a/gui-apps/mako/Manifest
+++ b/gui-apps/mako/Manifest
@@ -1,4 +1,6 @@
 DIST mako-1.6.tar.gz 60468 BLAKE2B 77fcd52e69d6e253d0afb2b0057c94090c0ad6f6bd929eafb88808ad7b7a0deb76f06af99de8bc94064436c47a4110aa2314557b7ff068ba482f285f2ea23e13 SHA512 1b503779b5607ae072d72ba43a2c4557fdf9fdad113e5a2370eb2e603e51422b3a483ac5f4a948ae33d62e7d9e86a6bbc89b2cba98647c4789505a49981c8baf
+DIST mako-1.7.1.tar.gz 62511 BLAKE2B 2556e0be7181999624cfa09898649c61a18691559c9693660db0ff79966bead32c327f217ecc66110526f5dfe02154083334ae8fa82f110869a59f29fa9bc5ae SHA512 a6066327fe6f19eb2717773dca0ea52eb1ad5c402780d12aa07b184f8a11c27a7c77e5c037cd9ff618bce35caa740da1af6ad3b41509e80e75ab5c0efb032588
 EBUILD mako-1.6-r3.ebuild 1147 BLAKE2B 8469de21884b923c67f76cf4bc93e99c37921d791e692ed0c17de47f162b7ae2d63f41291bb175db1306f5582c48a1689877b32b8660d85857c4ecee436ddd08 SHA512 69850a434d60e4983259b3cd495a029853f5a415a2ea288bdb5b3f4246bd1652a8d4b14d226201824b62fe08cfff2ee1836bb6f598f84fab405a84d0f9a67fb4
-EBUILD mako-9999.ebuild 1148 BLAKE2B 03931c9d04e3262ff2a9fc83b88732685fa7f7ab31e637667e58ea58789a929cb8b6a925a68b5ed19d6df416776a6d918e84bbcb33441b4f697671661295cb39 SHA512 b38b76bed330c590d4a5ae15914a631aa8ad63d8edf413881d8c929f2f98dfc56d2a06c7655880e5373d5d16f790d5882aa4418134cea6b4a2deca3eeb5e6794
+EBUILD mako-1.7.1.ebuild 1174 BLAKE2B 87fc5c75df0098b00357a423c8bf00aea9d2f052952144c5fdf85ec0139978b6241899f8d55dcdc3867fe5902e3a8de845326e212b75d2f76857bd8dcb699558 SHA512 cf5647233391232a4caea1f51218a40bda144bd9913ce56ce43c0ae1180130a1fb7fd67419e5920ca1d4b1ac89c87b1d7f6e649979d76c560ddd09b3ba81d3ae
+EBUILD mako-9999.ebuild 1174 BLAKE2B 38855f660571ea69062473caa2c5d3f37e8d0a2997c8cfa9a153edb146d2fb50de9cfad842dc22a62298e09fecdd1960a22537369beb6a91bab3fb60f92dfe4f SHA512 e78402531183c279c83a560dc081624c6f8b34c1b967556d91a76e82a84e1c3a2467cb38fa7c16ad85700b44611c724fea020aead449aac720fb55f0fb1a73cc
 MISC metadata.xml 529 BLAKE2B 4f2efb156f415c6ac8c411f200ef91235304bb2b4cc794ccab638e401164964d8e0268f3ecba0f5dc59bd80c38d0af6fe90b8b8498c317fed041615e4d965ee3 SHA512 f7186a5e6122993c032d502103485093db262193834f568b19a3c19b3b5187e7cfc658c11a53fd47ebb57e091db8734e6f83c4cf99b740fd6f99478bc4275405
diff --git a/gui-apps/mako/mako-1.7.1.ebuild b/gui-apps/mako/mako-1.7.1.ebuild
new file mode 100644
index 000000000000..fdd5238afe72
--- /dev/null
+++ b/gui-apps/mako/mako-1.7.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+DESCRIPTION="A lightweight notification daemon for Wayland. Works on Sway"
+HOMEPAGE="https://github.com/emersion/mako"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/emersion/${PN}.git"
+else
+	SRC_URI="https://github.com/emersion/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="elogind +icons systemd"
+
+DEPEND="
+	dev-libs/wayland
+	dev-util/wayland-scanner
+	x11-libs/pango
+	x11-libs/cairo
+	|| (
+		systemd? ( sys-apps/systemd )
+		elogind? ( sys-auth/elogind )
+		sys-libs/basu
+	)
+	sys-apps/dbus
+	icons? (
+		x11-libs/gtk+:3
+		x11-libs/gdk-pixbuf
+	)
+"
+RDEPEND="
+	${DEPEND}
+	>=dev-libs/wayland-protocols-1.21
+"
+BDEPEND="
+	virtual/pkgconfig
+	app-text/scdoc
+"
+
+src_configure() {
+	local emesonargs=(
+		-Dicons=$(usex icons enabled disabled)
+	)
+
+	if use systemd ; then
+		emesonargs+=( -Dsd-bus-provider=libsystemd )
+	elif use elogind ; then
+		emesonargs+=( -Dsd-bus-provider=libelogind )
+	else
+		emesonargs+=( -Dsd-bus-provider=basu )
+	fi
+
+	meson_src_configure
+}
diff --git a/gui-apps/mako/mako-9999.ebuild b/gui-apps/mako/mako-9999.ebuild
index 597e5e7acd03..a92179a0efdb 100644
--- a/gui-apps/mako/mako-9999.ebuild
+++ b/gui-apps/mako/mako-9999.ebuild
@@ -22,6 +22,7 @@ IUSE="elogind +icons systemd"
 
 DEPEND="
 	dev-libs/wayland
+	dev-util/wayland-scanner
 	x11-libs/pango
 	x11-libs/cairo
 	|| (
diff --git a/gui-apps/waybar/Manifest b/gui-apps/waybar/Manifest
index edd5e4dd696c..afdb6aa07f61 100644
--- a/gui-apps/waybar/Manifest
+++ b/gui-apps/waybar/Manifest
@@ -1,6 +1,6 @@
 DIST waybar-0.9.12.tar.gz 183392 BLAKE2B 697a2fce74af8337dfbfc8d8823cf4f2acfda6a0dd009cea03ec2b79358a80db0935418436a51e375be2f702e2d53f9f3403ab01cb1e91e246c7e4cc01effdf5 SHA512 c035140ca0d47ae2cbc0313e25dc206c116b5b6f7a4e6192c7d40a9bd0ef18b8bfafdc8aeea2a85d670dccceda1e3942b6b3e3a451f51a6e68d25edf0ccb1b05
 DIST waybar-0.9.13.tar.gz 198160 BLAKE2B 222863b1048d2833be393875cad947647eccde3fcae335c48d4606843b3b9445717c18955351c56779196afaf9a5333ae7f718ea590521a79359372450d494a9 SHA512 d0a87044bcccdd16b1bbb20de750804c06335f11e638d37b5b80b72233e513378ba521f5c9d2c121a78a206877487628a6562cb080dd43eadae27e52d4cf6349
-EBUILD waybar-0.9.12.ebuild 1660 BLAKE2B 58a3226689fa6e9db658297301c96b19349431ff3a11c2edfa23b22743c6fcd898ec8dc6f94f3f07099557a80ce0d8b84d3fca782dc3f51b2837d7ab45eac982 SHA512 628eb11a679efa7760c598ca6607665b3117de3d8775387528add73856974fc610d7a64e1ef395f47b735e6d418d3d5135649f6f0ce871e4f42c77bf76285875
-EBUILD waybar-0.9.13.ebuild 1660 BLAKE2B 58a3226689fa6e9db658297301c96b19349431ff3a11c2edfa23b22743c6fcd898ec8dc6f94f3f07099557a80ce0d8b84d3fca782dc3f51b2837d7ab45eac982 SHA512 628eb11a679efa7760c598ca6607665b3117de3d8775387528add73856974fc610d7a64e1ef395f47b735e6d418d3d5135649f6f0ce871e4f42c77bf76285875
+EBUILD waybar-0.9.12.ebuild 1686 BLAKE2B 74268b2f60c60b2e549f7c2d6fb6c4716ba904851cd3209710e0ceb909c164ba138001a37be8dfa469ce6a30a978bec84ca923167296bdc1fa06c32a1ba4950d SHA512 6e8e552d54d7cd4791dc4a42e18db655b578be3ee9d4ac5dad9406ad0b9ed15dea8c4b6101c0de0b0a24443f6d2e24dd140f054dd56704be82709d3d0501b78f
+EBUILD waybar-0.9.13.ebuild 1686 BLAKE2B 74268b2f60c60b2e549f7c2d6fb6c4716ba904851cd3209710e0ceb909c164ba138001a37be8dfa469ce6a30a978bec84ca923167296bdc1fa06c32a1ba4950d SHA512 6e8e552d54d7cd4791dc4a42e18db655b578be3ee9d4ac5dad9406ad0b9ed15dea8c4b6101c0de0b0a24443f6d2e24dd140f054dd56704be82709d3d0501b78f
 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.12.ebuild b/gui-apps/waybar/waybar-0.9.12.ebuild
index fa2bf998afdc..6fbac657f700 100644
--- a/gui-apps/waybar/waybar-0.9.12.ebuild
+++ b/gui-apps/waybar/waybar-0.9.12.ebuild
@@ -35,6 +35,7 @@ DEPEND="
 	dev-libs/libinput:=
 	dev-libs/libsigc++:2
 	>=dev-libs/libfmt-7.0.0:=
+	<dev-libs/libfmt-9.0.0:=
 	>=dev-libs/spdlog-1.8.5:=
 	dev-libs/date:=
 	dev-libs/wayland
diff --git a/gui-apps/waybar/waybar-0.9.13.ebuild b/gui-apps/waybar/waybar-0.9.13.ebuild
index fa2bf998afdc..6fbac657f700 100644
--- a/gui-apps/waybar/waybar-0.9.13.ebuild
+++ b/gui-apps/waybar/waybar-0.9.13.ebuild
@@ -35,6 +35,7 @@ DEPEND="
 	dev-libs/libinput:=
 	dev-libs/libsigc++:2
 	>=dev-libs/libfmt-7.0.0:=
+	<dev-libs/libfmt-9.0.0:=
 	>=dev-libs/spdlog-1.8.5:=
 	dev-libs/date:=
 	dev-libs/wayland