gentoo resync : 16.09.2020

5 files changed, 116 insertions, 15 deletions

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)