From 838196be8847bdf8d5aa5caa31affe49705a8802 Mon Sep 17 00:00:00 2001
From: Levans <levans@levans.fr>
Date: Sat, 2 Mar 2019 12:58:05 +0100
Subject: [PATCH] Waybar-0.4.0 & fix storage filenames

---
 gui-apps/Waybar/Manifest            |  6 ++--
 gui-apps/Waybar/Waybar-0.3.0.ebuild |  2 +-
 gui-apps/Waybar/Waybar-0.4.0.ebuild | 54 +++++++++++++++++++++++++++++
 gui-apps/mako/Manifest              |  4 +--
 gui-apps/mako/mako-1.2.ebuild       |  2 +-
 5 files changed, 62 insertions(+), 6 deletions(-)
 create mode 100644 gui-apps/Waybar/Waybar-0.4.0.ebuild

diff --git a/gui-apps/Waybar/Manifest b/gui-apps/Waybar/Manifest
index b6580f7..747ddfe 100644
--- a/gui-apps/Waybar/Manifest
+++ b/gui-apps/Waybar/Manifest
@@ -1,5 +1,7 @@
 DIST 0.1.3.tar.gz 65396 BLAKE2B 333f5b74f3d04510dde15c14ba989f56f546ef39cb4f36666f13daf56a3a3d5cd65d6fb88c70e357493e5c44235615ab73afeb889a2a4997d6bbdc3e392b7310 SHA512 8e1085f2751b8c7f69178c45016c65437d58083130b111b09a0889ca0a67cc7c7dca1ea27c5c5b4328fa21ebc8d061681644273a2f14b1c23ab73806f7cca20c
-DIST 0.3.0.tar.gz 81988 BLAKE2B 1e610e7e4d4bbd189535b3230f1fe061a1bb99ab2bf8d9f2d950a4a31d8216fdba5f66701be9f31da0064469b116022e7bd4246bffd28f2f61f107289ef2062a SHA512 2c05b40db351a80bbed6eebc7a137aa8d26b3d5931ddf41a588abfd1905d90459a7684e04fb03137910d87e48bd81752fabb009f46c261281116c5ac7d3120f6
+DIST Waybar-0.3.0.tar.gz 81988 BLAKE2B 1e610e7e4d4bbd189535b3230f1fe061a1bb99ab2bf8d9f2d950a4a31d8216fdba5f66701be9f31da0064469b116022e7bd4246bffd28f2f61f107289ef2062a SHA512 2c05b40db351a80bbed6eebc7a137aa8d26b3d5931ddf41a588abfd1905d90459a7684e04fb03137910d87e48bd81752fabb009f46c261281116c5ac7d3120f6
+DIST Waybar-0.4.0.tar.gz 85990 BLAKE2B 89e0a04f26a375a1322309d56c803e7ceca2edea1f10f18f9a18d0820690e5d08a622b4fe4ce98da9e1aecf6c530d01384462ac3ee19111126eea1e7e2564036 SHA512 a545d7b69bcaf0797f29c76a4400a579cebfb2e9590b570693927642bf7c8a2d2503d4223ffaea7305f162da73ecac0d4ea162072b66802972f96858df8a51af
 EBUILD Waybar-0.1.3.ebuild 1188 BLAKE2B 5daaa75284940886fac4bab24a9c3af2368ec349f52c8705a2fc20e5c88266c765626e44d04ca40615949687e1b3146d65897b022a5e8931b6c32942bbfe9126 SHA512 25f06bc0fe8bf2bd57e4aecee08f3495553f7ac2a8324bd3ef121a9419d180802a3065010fe217c5c03181a51654a00a4bc122ccd45dfe0e145797348d86ee67
-EBUILD Waybar-0.3.0.ebuild 1188 BLAKE2B 5daaa75284940886fac4bab24a9c3af2368ec349f52c8705a2fc20e5c88266c765626e44d04ca40615949687e1b3146d65897b022a5e8931b6c32942bbfe9126 SHA512 25f06bc0fe8bf2bd57e4aecee08f3495553f7ac2a8324bd3ef121a9419d180802a3065010fe217c5c03181a51654a00a4bc122ccd45dfe0e145797348d86ee67
+EBUILD Waybar-0.3.0.ebuild 1203 BLAKE2B 77360fcf2f85150eb15de6505df3d3d4833ff72a512e1ff09dfe68341126eb5a12a740111fa0366d1ec63b18d1846737a8773400134ef843f8416239e37aa4ce SHA512 8d236827728b6718569ed25bc7204acf481046f7991dfb800877edcaf3687bd6aeb1f5339abda005455ead4bdc9cd12c6db466bce4f29394853d0b5b561b0fda
+EBUILD Waybar-0.4.0.ebuild 1203 BLAKE2B 77360fcf2f85150eb15de6505df3d3d4833ff72a512e1ff09dfe68341126eb5a12a740111fa0366d1ec63b18d1846737a8773400134ef843f8416239e37aa4ce SHA512 8d236827728b6718569ed25bc7204acf481046f7991dfb800877edcaf3687bd6aeb1f5339abda005455ead4bdc9cd12c6db466bce4f29394853d0b5b561b0fda
 EBUILD Waybar-9999.ebuild 1188 BLAKE2B 5daaa75284940886fac4bab24a9c3af2368ec349f52c8705a2fc20e5c88266c765626e44d04ca40615949687e1b3146d65897b022a5e8931b6c32942bbfe9126 SHA512 25f06bc0fe8bf2bd57e4aecee08f3495553f7ac2a8324bd3ef121a9419d180802a3065010fe217c5c03181a51654a00a4bc122ccd45dfe0e145797348d86ee67
diff --git a/gui-apps/Waybar/Waybar-0.3.0.ebuild b/gui-apps/Waybar/Waybar-0.3.0.ebuild
index d0acfd8..c5e72a9 100644
--- a/gui-apps/Waybar/Waybar-0.3.0.ebuild
+++ b/gui-apps/Waybar/Waybar-0.3.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/Alexays/Waybar"
 if [[ $PV = 9999* ]]; then
 	SRC_URI=""
 else
-	SRC_URI="https://github.com/Alexays/Waybar/archive/${PV}.tar.gz"
+	SRC_URI="https://github.com/Alexays/Waybar/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
diff --git a/gui-apps/Waybar/Waybar-0.4.0.ebuild b/gui-apps/Waybar/Waybar-0.4.0.ebuild
new file mode 100644
index 0000000..c5e72a9
--- /dev/null
+++ b/gui-apps/Waybar/Waybar-0.4.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_REPO_URI="https://github.com/Alexays/Waybar.git"
+EGIT_BRANCH="master"
+
+if [[ ${PV} = 9999* ]]; then
+	GIT_ECLASS="git-r3"
+fi
+
+inherit eutils meson $GIT_ECLASS
+
+DESCRIPTION="Highly customizable Wayland Polybar like bar for Sway and Wlroots based compositors."
+HOMEPAGE="https://github.com/Alexays/Waybar"
+
+if [[ $PV = 9999* ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/Alexays/Waybar/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="dbusmenu-gtk network pulseaudio"
+
+RDEPEND="dev-libs/wayland
+	gui-libs/wlroots
+	dev-cpp/gtkmm:3.0
+	dbusmenu-gtk? (
+		dev-libs/libdbusmenu[gtk3]
+		dev-libs/glib
+	)
+	dev-libs/jsoncpp
+	dev-libs/libsigc++
+	network? ( dev-libs/libnl )
+	pulseaudio? ( media-sound/pulseaudio )"
+
+DEPEND="${RDEPEND}
+	>=dev-util/meson-0.47
+	dev-util/ninja
+	>=dev-util/gdbus-codegen-2.56
+	>=sys-devel/gcc-8.0"
+
+src_configure() {
+	local emesonargs=(
+		-Dlibnl=$(usex network enabled disabled)
+		-Dpulseaudio=$(usex pulseaudio enabled disabled)
+		-Ddbusmenu-gtk=$(usex dbusmenu-gtk enabled disabled)
+	)
+	meson_src_configure
+}
diff --git a/gui-apps/mako/Manifest b/gui-apps/mako/Manifest
index d736fb0..b7ddedf 100644
--- a/gui-apps/mako/Manifest
+++ b/gui-apps/mako/Manifest
@@ -1,2 +1,2 @@
-DIST v1.2.tar.gz 34443 BLAKE2B d505cbc7d25755ef3880adceaf8e33c277a90583c37ebd2691cd3d8d142f19f7eedca2ad167c0174723706c6f0a9b0688ddb34ed824e8231330265f1b5e3d645 SHA512 2552590f690a9749e9ef897052ca6aecf70eb01d77b1afe21335c84e257c6c8347abbd7f33150d561e8f52a9ae3a91c7a199a93cecf64a305934886522fc1454
-EBUILD mako-1.2.ebuild 759 BLAKE2B ad0b8bdc020ddecfe21e526bc54177e5a991a7a2063d6deced42a378154679ef20336084cd975ec8501383f6453dbd7052c0c3a0900b2aee94c50c477e0fca32 SHA512 1f651a6f94d6f2c23b7945ff3ee8d67ae4e912822934dbc906c09b15135c7eb7b25635a8469c4fcc58ec2eede60c1cf841de5da939b35876f68a53f86337eb1d
+DIST mako-1.2.tar.gz 34443 BLAKE2B d505cbc7d25755ef3880adceaf8e33c277a90583c37ebd2691cd3d8d142f19f7eedca2ad167c0174723706c6f0a9b0688ddb34ed824e8231330265f1b5e3d645 SHA512 2552590f690a9749e9ef897052ca6aecf70eb01d77b1afe21335c84e257c6c8347abbd7f33150d561e8f52a9ae3a91c7a199a93cecf64a305934886522fc1454
+EBUILD mako-1.2.ebuild 774 BLAKE2B 27b287747778246b644b2ac478c84a4e7bfba47a6a4a809a5a4e2af4692cb6469a8b527b7f5fdf03bc08926267869fd399493aec2ab95895a59688108c812912 SHA512 1d6aba6c9be31e7ff5935c84efb5f42cf94743bd48977ff5f9ee36613656bd880b9fb2986e41882a3fbe489ce24fe18e94a39132229767604e6e3b8aa4d88a3c
diff --git a/gui-apps/mako/mako-1.2.ebuild b/gui-apps/mako/mako-1.2.ebuild
index 5ddb6bf..58650ed 100644
--- a/gui-apps/mako/mako-1.2.ebuild
+++ b/gui-apps/mako/mako-1.2.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/emersion/mako"
 if [[ $PV = 9999* ]]; then
 	SRC_URI=""
 else
-	SRC_URI="https://github.com/emersion/mako/archive/v${PV}.tar.gz"
+	SRC_URI="https://github.com/emersion/mako/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi