gentoo resync : 16.09.2020

17 files changed, 136 insertions, 35 deletions

diff --git a/gui-apps/Manifest.gz b/gui-apps/Manifest.gz
index d1626108a0ad..be8d9aa97cdb 100644
--- a/gui-apps/Manifest.gz
+++ b/gui-apps/Manifest.gz
diff --git a/gui-apps/grim/Manifest b/gui-apps/grim/Manifest
index d3c359ffe415..fe9ce96c7d98 100644
--- a/gui-apps/grim/Manifest
+++ b/gui-apps/grim/Manifest
@@ -1,4 +1,4 @@
 DIST grim-1.3.1.tar.gz 15778 BLAKE2B 7dc1f2fbc9e0f81c41d8ca535346d185a0f6c7a0ee28f0168a29864a36d1077be961278c1be3e647aa09165d9f3800e1bc7979f9fca95f8b39c339d621cd984d SHA512 07d04681ec589bf3e48b14c3bfcdc2a6012dfe5c5c2d7ee0cba95bc128187ca0de19ec04140dbe00907778f3d68844e6a90dc35365dafa489d65048b590fdf1b
-EBUILD grim-1.3.1.ebuild 865 BLAKE2B 9925649fca5f87f9fe358314234267f6fb5c42d27233ebf1f2196de3f69da78027f71513334513ddab62b0c9494a0968d6302c97e75cc2b4e31e75962add309f SHA512 156ae9ec3edd284dc3f1d4b8a9ff36e0acf0d0a764f3a4d53d8f3053d1c2183ae45084e35c1d4be92fa80f9b243b48a6884ffc5706f13390b345c7b188d4498d
+EBUILD grim-1.3.1.ebuild 864 BLAKE2B f27b345c1213b420e3247437e55db7f3f4c74897824869320afc00152067b38ec695ee987ac9c68e07c042b8cdfe922926e6d0d5697c8e21d38e6d302a3d2ab7 SHA512 03df4852d2bed3ae24f8dd7617d971f4ceddfca3d76f923f86a9e263d071efe205d2e7caffc6a9a552bac085e95b23971aca895834c0804356944a2e6e412030
 EBUILD grim-9999.ebuild 865 BLAKE2B 1c444c860c77a34c402170ae6e11d3842892771acb8edef033ffb555174a3d23e6d52eebc4213fbed2180d69ef44ca4f2dc1e22b5327bb745be27c179c764f5d SHA512 a4edacbae42d0193a0b33f469ef905d078b2aa60ae1b267ac4614965bae7d6c91d0af174e8e5678b7debc6026fa42a301ff10127a5843f232f86a789804b400b
 MISC metadata.xml 630 BLAKE2B ce32a102600df756ba3996da891e43b505b7d06d3023707c28bf0d5b747a35e56e493e839b099b7fe52e7baec780de857e4df8c9c7280da960de56932e3dbd18 SHA512 1ab3eae93d0c5f1f060d06488d9200e2c7228c72ca71763b12e9dd2f8555f38efb149f7641dccf9ed86168220f9193f7124616f69e6790784594a59ed9f92547
diff --git a/gui-apps/grim/grim-1.3.1.ebuild b/gui-apps/grim/grim-1.3.1.ebuild
index 314e4d76d166..f688ffa4dade 100644
--- a/gui-apps/grim/grim-1.3.1.ebuild
+++ b/gui-apps/grim/grim-1.3.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	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"
+	KEYWORDS="amd64 ~arm64"
 fi
 
 LICENSE="MIT"
diff --git a/gui-apps/gtkgreet/Manifest b/gui-apps/gtkgreet/Manifest
index 07f008b42699..feb9b3405692 100644
--- a/gui-apps/gtkgreet/Manifest
+++ b/gui-apps/gtkgreet/Manifest
@@ -1,4 +1,4 @@
 DIST gtkgreet-0.6.tar.gz 25973 BLAKE2B f05926f9c05b8e164a8f8ca9b4f7091ab42d5d5db08133941ac97c2b6ab0452bf1a75b55dbbcf96579783688501be2148d4728528b63a609a9677587cd59be08 SHA512 00bdd61ea45592c432ba07c62301be7fd89aa3e09dbdaeb0dddd03b4e55e8092b68999ed4d6f2917b66cced57bf55ad68ac61912894683c9dc05b8b5f983ba76
-EBUILD gtkgreet-0.6.ebuild 805 BLAKE2B 5194404bdb8cc8909f23d54c53ee6ac48641b1fc92990b549bbce0f4d8c9a847c0b91cf2103322790a4e079853542623d81d578d0d6f746a3fd0b2991c4ff425 SHA512 57a91247c18875fc68186f056ccbe8dbe40540886f44313c641c6ff78dd4433829a881f457ab04fe8dd221974723b9e0f077a0e0f6d6e69c8cef8aef251a2761
-EBUILD gtkgreet-9999.ebuild 805 BLAKE2B 5194404bdb8cc8909f23d54c53ee6ac48641b1fc92990b549bbce0f4d8c9a847c0b91cf2103322790a4e079853542623d81d578d0d6f746a3fd0b2991c4ff425 SHA512 57a91247c18875fc68186f056ccbe8dbe40540886f44313c641c6ff78dd4433829a881f457ab04fe8dd221974723b9e0f077a0e0f6d6e69c8cef8aef251a2761
+EBUILD gtkgreet-0.6-r1.ebuild 841 BLAKE2B 69cfc2a5e1ae19ce297658db92606482df41e5878c870c2f9757672d4f15e98cf921cad501e89c77811b94a8ce350d22eb6dc149552023e53f1972cfe5660d6e SHA512 c82225f4fd1e5507bb8e021b9b1f1aa2af6e7a82b92867faeaa92b1a4376f23f99abb53cf865aa0f78e869f636432d52d1ba383c57aa65f8f980b1247d75baa8
+EBUILD gtkgreet-9999.ebuild 817 BLAKE2B 10b9f236bac3d36d7221b2768a2f21c00cc2448b0cc9df977f3ec5de797006e244876be45601fd30b1d30d9fc5b03b553d92cd876460771008894e5b3a463690 SHA512 4ebdb0e9b0dc39581f35deeecf5d889748064c09a7e0256d043a97a69c02cda11f74704d3d382b60b6fd2c6e7f6125277bb446b21776a81ec31a3529f7a9be03
 MISC metadata.xml 488 BLAKE2B a465943ce6ce18d292c54f35dca128259c56f43b5a443483c25f36d37fdf0e48edf8df32814682d0d614b12c2436fd55d439272797a10aafb86b5595348bbdc6 SHA512 303c2c0c04fadbd480d27eb5937b1eb01038298ac57d8484136f0783aa3fc2d7c2422d4c4a138ddd342b112003c6ea080da0d12ed6927eb868ac8fc135278663
diff --git a/gui-apps/gtkgreet/gtkgreet-0.6.ebuild b/gui-apps/gtkgreet/gtkgreet-0.6-r1.ebuild
index 9bd30fd0243d..a74b52eb2e4b 100644
--- a/gui-apps/gtkgreet/gtkgreet-0.6.ebuild
+++ b/gui-apps/gtkgreet/gtkgreet-0.6-r1.ebuild
@@ -10,9 +10,10 @@ inherit meson
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://git.sr.ht/~kennylevinsen/gtkgreet.git"
+	EGIT_REPO_URI="https://git.sr.ht/~kennylevinsen/gtkgreet"
 else
-	SRC_URI="https://git.sr.ht/~kennylevinsen/gtkgreet/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	MY_PV=${PV/_rc/-rc}
+	SRC_URI="https://git.sr.ht/~kennylevinsen/gtkgreet/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~ppc64 ~x86"
 fi
 
@@ -22,8 +23,8 @@ IUSE="+layershell +man"
 
 DEPEND="
 	dev-libs/json-c:=
-	gui-libs/gtk-layer-shell
 	x11-libs/gtk+:3
+	layershell? ( gui-libs/gtk-layer-shell )
 "
 RDEPEND="
 	${DEPEND}
diff --git a/gui-apps/gtkgreet/gtkgreet-9999.ebuild b/gui-apps/gtkgreet/gtkgreet-9999.ebuild
index 9bd30fd0243d..bc41aaec11f9 100644
--- a/gui-apps/gtkgreet/gtkgreet-9999.ebuild
+++ b/gui-apps/gtkgreet/gtkgreet-9999.ebuild
@@ -10,7 +10,7 @@ inherit meson
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://git.sr.ht/~kennylevinsen/gtkgreet.git"
+	EGIT_REPO_URI="https://git.sr.ht/~kennylevinsen/gtkgreet"
 else
 	SRC_URI="https://git.sr.ht/~kennylevinsen/gtkgreet/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~ppc64 ~x86"
@@ -22,7 +22,7 @@ IUSE="+layershell +man"
 
 DEPEND="
 	dev-libs/json-c:=
-	gui-libs/gtk-layer-shell
+	layershell? ( gui-libs/gtk-layer-shell )
 	x11-libs/gtk+:3
 "
 RDEPEND="
diff --git a/gui-apps/mako/Manifest b/gui-apps/mako/Manifest
index 89adc819d3ea..803bb7f0dca7 100644
--- a/gui-apps/mako/Manifest
+++ b/gui-apps/mako/Manifest
@@ -1,4 +1,4 @@
 DIST mako-1.4.1.tar.gz 49442 BLAKE2B aa242d905d33dcfd2e30317a65d3826ba43ad344e93d1f41ed8b28f75310f724ed0eb5ae163f97a441ae07a4bb3465aa01f974cd95f97ba981a907fb761ad3d4 SHA512 25b0f59645c1815d8bdba42cedd6f56163ff663cd801a534c4c725c99e9a8cc28aef1d2c899d30cca06f0c6ddfa4a8e6efa01e5e98091347bcfc80d596f16d43
 EBUILD mako-1.4.1.ebuild 927 BLAKE2B 8aaed18fb7d3c37d7f4cb34fb7902c7e43d4209ca0997df37e6d9f48fb8e72ee13b15365e2057434db3cdfaa7c06355912cf28fc812c4ecc9c8bdd74f1cf6e2f SHA512 d81e45a91be47805af2bb0bd8e328c7ea4fbe6908a1ba2055e11cc15b3eaaafbf42a18793c026a24bcca78cf4c7d92f47302a558c1442ae6b20b1fbe08e87ab3
 EBUILD mako-9999.ebuild 922 BLAKE2B d6cf730dc689cef6170179b99120b6f5ab5e2a51936688e4052de88f1bfe53299cb4e229287a0db52f173628350631bbc6a4d79d34b0c30ef7e8b587eca32287 SHA512 ba858ca07c748cbd7e89168fb56c4ad97eab3d654f393612242bd8e7203e89028ec65d4e44942ec802a82ea2d15a51ef27a94458c8c0d18ff16277ee0bef092b
-MISC metadata.xml 642 BLAKE2B 4b96d18b0cf351347a12d6e520d7aace4de2f7df8532953288dcfa2549cde936417b73499e0d0b7debd7716d1b49431db6529a213da0b69491df081400af8ae8 SHA512 51c3f7458f486883613916701f721045c3f7f82c9be1b8feb781632e38489e08c1d84411daaf56e01bc07d06c3b1c1683f55a79a51b4d6fd0f522ce97d303c8a
+MISC metadata.xml 529 BLAKE2B 92f32ae6bbc55317dc73c2fd91123e2035fe905f5c9ec52226c3f145ac456949ff6c11c858443c18689ae3ab7e10d3e3355609956e6005e91b3f9524eed2392c SHA512 1cb3aa5d2a2ef7c20ed831c23d128ce4e7e9b7d25be0f6588d50f47e116ed27a07274c8b4f6e06fa61a6df44cb277267749ff0277c95e1a9e8cbad3c2d4dcc30
diff --git a/gui-apps/mako/metadata.xml b/gui-apps/mako/metadata.xml
index f4af030a3eca..5154a2740284 100644
--- a/gui-apps/mako/metadata.xml
+++ b/gui-apps/mako/metadata.xml
@@ -5,9 +5,6 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
-	<longdescription lang="en">
-		A lightweight notification daemon for Wayland. Works on Sway.
-	</longdescription>
 	<use>
 		<flag name="icons">Enable support for icons</flag>
 	</use>
diff --git a/gui-apps/nm-tray/Manifest b/gui-apps/nm-tray/Manifest
index faccceee4c9f..994aae68a279 100644
--- a/gui-apps/nm-tray/Manifest
+++ b/gui-apps/nm-tray/Manifest
@@ -1,4 +1,4 @@
 AUX nm-tray-0.4.3-missing-include-qmetaenum.patch 565 BLAKE2B 7542d3f95acb8157216d3526df0ee37c24b58316e1a044212ac5355c4030992e6169cf645fe283d00c4d52dd87739889b318b4e3692698628ed500b7453460f5 SHA512 0a11ec9013d1730ce593a17393ed32a76b072480c577bca6219fece1a1a77b1ebe50ef692d6cee93b9ab8fd8f3d83beb5f79cd3e4653218f8cf833f7dd21824b
 DIST nm-tray-0.4.3.tar.gz 44705 BLAKE2B 590e8b3a08e7543a1275d7e5e3264570fe78b6020435783b2b36d6acd1df36b0106f4537035d8b61c0d571451d27277874ec3ddc93cd6163c047666e7013ab2a SHA512 480511a6e5b075ff98b53e91b08f37b9344c81e89c0f580c74f4424b1657c156300c31cc85cc8f82478eec9efdf53589352c3757c16e386d6985828b9dfa819d
-EBUILD nm-tray-0.4.3.ebuild 765 BLAKE2B 22c1aa22fae520bc349c07d394420d6242b1d0f9a021ff6821a20c8f6b80b574a283248f84ceab6f80d088dc97b0ff26fa2bb81fc9e3eb5a418eacedbaa6270b SHA512 8576b377aab072ca508d601d6ae009267c82b834a07c13db75d19ea7755ce5e852e1d43a973e641bc7f9a699aec9c6667239ceb9ddc5ab33dbdc2d7e900b4884
+EBUILD nm-tray-0.4.3-r1.ebuild 775 BLAKE2B 260aa0a956dee9089325637cf0ccdba3a7edd2214f0b44f6eabae514dec9ba916266db42cb1c0c7d21e07af9877bc55f387ae377fcd7d4512e46a6a4cd0deb39 SHA512 a5ebb139dcc6487bd38df7a645e0d9ed096379414c9276afa5c7b43561b4dee038211f63b40c4f95adceeb11376bf2efec0a17f1c7e3fd16e638620f8e0352d6
 MISC metadata.xml 244 BLAKE2B 24ebafa89c32f799b62237b0d9442143de8ccb86c1625f2a49dd91ec9caa63cadc52000005b5b5ef148df89e907e1407330a8d8411ffb5f4facaf629a3184cb8 SHA512 d7a2290eb2970ef7fb9bea275b209c7ace388daadcf3e317b099767d72c7d9f0b894e23492f02e973d27010a7568e48549e4f502c9628efc3133012680304784
diff --git a/gui-apps/nm-tray/nm-tray-0.4.3.ebuild b/gui-apps/nm-tray/nm-tray-0.4.3-r1.ebuild
index e921fc04cae9..a81f79f22fff 100644
--- a/gui-apps/nm-tray/nm-tray-0.4.3.ebuild
+++ b/gui-apps/nm-tray/nm-tray-0.4.3-r1.ebuild
@@ -15,8 +15,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 BDEPEND=">=dev-util/cmake-3.10"
-DEPEND="
-	dev-qt/linguist:5
+RDEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
 	dev-qt/qtgui:5
@@ -24,7 +23,10 @@ DEPEND="
 	dev-qt/qtwidgets:5
 	kde-frameworks/networkmanager-qt
 "
-RDEPEND="${DEPEND}"
+DEPEND="
+	${RDEPEND}
+	dev-qt/linguist-tools:5
+"
 
 PATCHES=( "${FILESDIR}"/nm-tray-0.4.3-missing-include-qmetaenum.patch )
 
diff --git a/gui-apps/slurp/Manifest b/gui-apps/slurp/Manifest
index bea7614e9b9a..60cd94ca8eac 100644
--- a/gui-apps/slurp/Manifest
+++ b/gui-apps/slurp/Manifest
@@ -1,4 +1,4 @@
 DIST slurp-1.2.0.tar.gz 15317 BLAKE2B 92de74abb54b2d53334e0f0c5d08b0b50e9c4583eb192226e38fcefa07cce2265f808ce81c04170e65d3c1209fa263352e3d70cc0a7cf745ed5e18d57c4d3af6 SHA512 443cd497049a5128e80a48c7b2afcc555a8d58a5eacc2dc6207058a9a399bc9e9804c7bca8b010af63f8be99000c05245720bd3e8cca248a74d5aa63a7faf4f9
-EBUILD slurp-1.2.0.ebuild 851 BLAKE2B a800a162e24f187d6034e55c84be3819edfc53d810282c59d864324c7912fc3b68ce05b3a2d25e62cb73ff13b8e2974079fa452b66d8227d6569f2aa0f776781 SHA512 643157353085abab70748739e4fa9f7f1d6abde60fa504fc405904170559d453fc829700fb45be423c3a9a7807feaa3a1ba531439763e8ad2d16817e02f64631
+EBUILD slurp-1.2.0.ebuild 850 BLAKE2B 9bbd040d4c88e4b58b5244b89c423edfc126d2b90e718cf8f2b8cdda6012d01a59800d062d59974452f884c8f30b8f968cdd91dc738e0f7e54ee23d886c1f64e SHA512 95a988c9618f250b519a885ed485b840db2d4d5b29fb02b84dbf3ba62ff55b48789190e4332b9361c1827778b0e83c8e6389fb6be9ed6ba196abcf079a5084aa
 EBUILD slurp-9999.ebuild 793 BLAKE2B 7f071a9a0247b4c77a4ab1eafc3ccf9ad2c02e394a9a9ac746406481d268a2a393595751bc33a5e7e1ed361deee94a11a06386ba8b5cc80a818611e3d1f1e59c SHA512 9032523746be0c4d4d42d93acdc24555a14f4878baf0ff4cf5ef03a643d14524d8cd4d2dc5aa31fedd80a9dbcfb3a9e7f76faf768165ac3ff4d2a36ffdf573a9
 MISC metadata.xml 579 BLAKE2B a9785dbcd765e212d183bca9d1cb4cf6fd37ba4d2d7cdee38aedf75951712fc6fad1f0f94242244b3263de058ad10c42a31a5c1400a3c237b5c21df37d3ae69b SHA512 a59c2a0ba5ab75d1355e14c6b6db241cc0a45fedfa52a4195aa1b77c6568bc3584d40c64777b7f342ab28cec4595ee1c176f25a4e1f04ecca6e5b71c1ea0d004
diff --git a/gui-apps/slurp/slurp-1.2.0.ebuild b/gui-apps/slurp/slurp-1.2.0.ebuild
index c66a344b8153..7adb476ab7b3 100644
--- a/gui-apps/slurp/slurp-1.2.0.ebuild
+++ b/gui-apps/slurp/slurp-1.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	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"
+	KEYWORDS="amd64 ~arm64"
 fi
 
 LICENSE="MIT"
diff --git a/gui-apps/waybar/Manifest b/gui-apps/waybar/Manifest
index c0561164a41a..15dd7048ef44 100644
--- a/gui-apps/waybar/Manifest
+++ b/gui-apps/waybar/Manifest
@@ -1,4 +1,7 @@
+AUX waybar-0.9.3-fix-crash-with-fmt.patch 832 BLAKE2B 3559aeb9c31bee3749e983c017190260057a4467cc336182dd922082bf0984c2687e45057948a456d6f08462dcd3d953aed95f57e5e2ae04ac65887aa1fa1471 SHA512 60778ca7a644cd63100029a5c45e9b2e813a7e14cd99e804422515bf39115cf8d0bc0cff550dc8e21c83276b34a0c121e92e373fb0f7a671071b11f2ec54e840
 DIST waybar-0.8.0.tar.gz 112019 BLAKE2B b3b61e02a104599e8f9047f9e2f76ec57ef7dd164edca2afd7b0afbb6b2c2341e20d6175905eba525337df9215473afa6cf017f736bb2de24e4daa169a5af3ee SHA512 c670fd21a7d29396d8bbe1b7540ddbbe44a98f7fb49f8518e0cc302aa57e5bb993ff8306973a7b8ca4ec000a7ecc311872762a0782ce19e4bf4cff8ea09caccb
+DIST waybar-0.9.3.tar.gz 135024 BLAKE2B d7b0090d0d7e25701ba7b76353737451e4ff8f145998b1a395e4c57e845be319380ac41b1a464bc7b5cc4d9ce037151bc9e7f37763ed1c0f42e945503668f1df SHA512 19dba92c5e430ce71567f149e5d208d594928a1d642584f606d55779d0a336ec4587e8a2e15698a25bdf0d26525f771d0a73b193f948bf9c1dfba5be350d4e78
 EBUILD waybar-0.8.0.ebuild 1276 BLAKE2B 8768bd945677fee49b286d8e34de755b687c222525dd8d34bfad3459a2e2f49c9da0a7415bf1c709a9bdc0ee6e39a857060b72d98685a221c38bc3ba6cc0bf1d SHA512 edea2c41126379a6887a6c33e87a59322eb241fd9afc855e6183b44aefee72b32d6f73cbf77cfd968f1c05bc4f7b27a145bd4c907253168301b61151b752a637
-EBUILD waybar-9999.ebuild 1276 BLAKE2B 8768bd945677fee49b286d8e34de755b687c222525dd8d34bfad3459a2e2f49c9da0a7415bf1c709a9bdc0ee6e39a857060b72d98685a221c38bc3ba6cc0bf1d SHA512 edea2c41126379a6887a6c33e87a59322eb241fd9afc855e6183b44aefee72b32d6f73cbf77cfd968f1c05bc4f7b27a145bd4c907253168301b61151b752a637
-MISC metadata.xml 591 BLAKE2B 61dad767164be21bc8d67b253802761cd53b8231ecacdad615b680bd9597cd1a49388b04d0c39ae40f9d890a2e274954c132d1d811dc1159c3cbb6e43d0e64fc SHA512 6bef50bf036bc1e5bc9f1c8ac8c33d3840ace788445a831edada1c935a855b18c72ea3f114efd72621fc48533d6d0339bcf19367e27b31d54d6fab8128588fcd
+EBUILD waybar-0.9.3-r1.ebuild 1457 BLAKE2B 1aa1565934b694ffc23700553fe8ab25da8cce4af1599f5ac50767e33fd414f3ae6f815aca35d640e1c658ec0668e4343346df671125780bc862f96efa5ec1b6 SHA512 5bc3dec24c976d32e6f8d45263b6bc9a635354d493aeac276b97ea4b76f23fadc78dea01abf9a8a3cdc56a8fad0412c6c64a81f1a74827fc31bef250d73d2191
+EBUILD waybar-9999.ebuild 1373 BLAKE2B 7deb266cb07b669a9fba8bee2a4fe823cd6a2fed0a96a282fb97223d065c8ebfec66b751e8c0cb266cd83fd8f63d2ba0cdbd85b1523cb41d299101b876575a45 SHA512 a831ef6bab9dfb38060501f53aee91396559f5d82769e52fd829458561fcdac97b60f8bcee1ac422ab1adc1da226f8f0fa833932e0acb692739c26dcec8d0d31
+MISC metadata.xml 940 BLAKE2B 6b4f0f25402ce3b094ca7420d0fc5d12815abcdcb51fdd5262f5aff3dee3d80b9ae8dd399f0d30b1a28e48cb6334cca73b54c5a8c53411c3f41b6c0f457aeb8b SHA512 33427710db463f6c4c4686230805d301e659409dcc08b326bf56767c194fc0b447c09ef8f688926cb17abc88375487e87350e7f4d8f8a07a959442221458e680
diff --git a/gui-apps/waybar/files/waybar-0.9.3-fix-crash-with-fmt.patch b/gui-apps/waybar/files/waybar-0.9.3-fix-crash-with-fmt.patch
new file mode 100644
index 000000000000..73a2d871f2d6
--- /dev/null
+++ b/gui-apps/waybar/files/waybar-0.9.3-fix-crash-with-fmt.patch
@@ -0,0 +1,22 @@
+From 9b41b9593418772ce578a87de5984d4e37ef7f11 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Thorben=20G=C3=BCnther?= <admin@xenrox.net>
+Date: Mon, 10 Aug 2020 20:53:29 +0200
+Subject: [PATCH] Fix crash with fmt
+
+---
+ include/util/format.hpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/util/format.hpp b/include/util/format.hpp
+index 0147701b..288d8f0c 100644
+--- a/include/util/format.hpp
++++ b/include/util/format.hpp
+@@ -23,7 +23,7 @@ namespace fmt {
+         constexpr auto parse(ParseContext& ctx) -> decltype (ctx.begin()) {
+           auto it = ctx.begin(), end = ctx.end();
+           if (it != end && *it == ':') ++it;
+-          if (*it == '>' || *it == '<' || *it == '=') {
++          if (it && (*it == '>' || *it == '<' || *it == '=')) {
+             spec = *it;
+             ++it;
+           }
diff --git a/gui-apps/waybar/metadata.xml b/gui-apps/waybar/metadata.xml
index a28609715318..0a74e1a14a8e 100644
--- a/gui-apps/waybar/metadata.xml
+++ b/gui-apps/waybar/metadata.xml
@@ -1,10 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>gentoo@jonas-toth.eu</email>
+		<name>Jonas Toth</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="mpd">Enable support for the Music Player Daemon</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="pulseaudio">Enable support for volume control via PulseAudio</flag>
 		<flag name="tray">Enable support for tray</flag>
 	</use>
 	<upstream>
diff --git a/gui-apps/waybar/waybar-0.9.3-r1.ebuild b/gui-apps/waybar/waybar-0.9.3-r1.ebuild
new file mode 100644
index 000000000000..44f249b15f47
--- /dev/null
+++ b/gui-apps/waybar/waybar-0.9.3-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 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 tray +udev"
+
+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.3.1:=
+	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 )
+	tray? (
+		dev-libs/libdbusmenu[gtk3]
+		dev-libs/libappindicator
+	)
+	udev? ( virtual/libudev:= )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-crash-with-fmt.patch"
+)
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature mpd)
+		$(meson_feature network libnl)
+		$(meson_feature popups gtk-layer-shell)
+		$(meson_feature pulseaudio)
+		$(meson_feature tray dbusmenu-gtk)
+		$(meson_feature udev libudev)
+	)
+	meson_src_configure
+}
diff --git a/gui-apps/waybar/waybar-9999.ebuild b/gui-apps/waybar/waybar-9999.ebuild
index 8cd23063c51d..8d09470b4d47 100644
--- a/gui-apps/waybar/waybar-9999.ebuild
+++ b/gui-apps/waybar/waybar-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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."
+DESCRIPTION="Highly customizable Wayland bar for Sway and Wlroots based compositors"
 HOMEPAGE="https://github.com/Alexays/Waybar"
 
 if [[ ${PV} == 9999 ]]; then
@@ -18,13 +18,12 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="mpd network pulseaudio tray +udev"
+IUSE="mpd network popups pulseaudio tray +udev"
 
 BDEPEND="
 	>=app-text/scdoc-1.9.2
 	virtual/pkgconfig
-"
-
+	"
 DEPEND="
 	dev-cpp/gtkmm:3.0
 	dev-libs/jsoncpp:=
@@ -32,26 +31,28 @@ DEPEND="
 	dev-libs/libsigc++:2
 	>=dev-libs/libfmt-5.3.0:=
 	>=dev-libs/spdlog-1.3.1:=
+	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 )
-	tray? ( dev-libs/libdbusmenu[gtk3] )
+	tray? (
+		dev-libs/libdbusmenu[gtk3]
+		dev-libs/libappindicator
+	)
 	udev? ( virtual/libudev:= )
-"
-
+	"
 RDEPEND="${DEPEND}"
 
-if [[ ${PV} != 9999 ]]; then
-	S="${WORKDIR}/${PN^}-${PV}"
-fi
-
 src_configure() {
 	local emesonargs=(
 		$(meson_feature mpd)
 		$(meson_feature network libnl)
+		$(meson_feature popups gtk-layer-shell)
 		$(meson_feature pulseaudio)
 		$(meson_feature tray dbusmenu-gtk)
 		$(meson_feature udev libudev)