gentoo resync : 13.06.2020

20 files changed, 258 insertions, 73 deletions

diff --git a/gui-apps/Manifest.gz b/gui-apps/Manifest.gz
index fb413cd74b53..49235ef9cbbf 100644
--- a/gui-apps/Manifest.gz
+++ b/gui-apps/Manifest.gz
diff --git a/gui-apps/lavalauncher/Manifest b/gui-apps/lavalauncher/Manifest
new file mode 100644
index 000000000000..e94a19fb18d6
--- /dev/null
+++ b/gui-apps/lavalauncher/Manifest
@@ -0,0 +1,6 @@
+AUX lavalauncher-1.7.1-optional-man.patch 700 BLAKE2B f997ae6bac139094abc7e82d5f4b1a8a52c720051584c7f4ee37f85ecbf96746debc5ebd197f35779aafe7e6f3cbc1c34e192c0a40ad3edd5f9ddf0afc38e2f4 SHA512 6396c32a3e61592715d36bb6f43c21fe0de22cf8c51c90e832f099e22d319ad805aa190fb6287e7a314cf24f82c9692fd05be93fe0f068a89fea4a67efbe9c5f
+AUX lavalauncher-remove-werror.patch 224 BLAKE2B 01974a4bc2f3663b8b4ebb56ad1da9c4017e5a1a9ee37d73cc6333ca3ec06a898ea2f095ec0d48dd470e140c24345f985fb7e48ced42619c6516379f50d4738e SHA512 0e26935aa86756ee6bcaa1cbdce100cfc3aebee7307b6c56e802be3a3f5e39d96d4093b83e39fc2dcbe8a0f96f412064712165f7840d1abf633632a9b5c7eba1
+DIST lavalauncher-1.7.1.tar.gz 82550 BLAKE2B 043fd8a8fb977f89414b4c9eb5a29ae05cea6374ea7bdbf595a3c75eeee4c5273b2d84cd437a451b0a4fec4139e31dec6c520e4a0af745c06b438b1290c114b4 SHA512 e1848d29275a444aef2b85bd6b27ae056cfc76c337695da2f7061ca3d73f510b797f84663a5705d59615a2a4ea0be64388ce1d4d622379f86cfc23d82f2e51d8
+EBUILD lavalauncher-1.7.1.ebuild 923 BLAKE2B 079ff03966db15dfdf9989320a02ba49da476d7d5dd94f462b6682affdd5b0f34fe43902ac685c401618b34e7a59e63df11577946bd6a902acb3d56f8f92edd1 SHA512 f9a2e1b3bee8126ed42133d1c69be84593e8881b18adbbefd2379358eab12a8818395c72a4b852c4facb7b33bb56aa1d6117bd413e5e3ff8f02d7d3304b3938f
+EBUILD lavalauncher-9999.ebuild 932 BLAKE2B f5ba2917f3e1437212f392e8819c0a8cf9616d7ed89254908a16483b48782e382dff40db9b88ed21f7304e448e9c10e9829929690374d9f92d87c6ce27cc9864 SHA512 b2c38845de0d1021eac94f6f9bc6ad75a52aee093627de9b498a48fd990e13a793f732712675719873aa657a85b6b6aa54e254c48324449b05b7e19da1ac9c32
+MISC metadata.xml 675 BLAKE2B 459e6a0696853acb9083e36923fa63110467836467cb2e06cbed8573a02878f7c2636d25d4d7ae9ac237a585d2ef7c44296f39c45e1f15c82f5ee58fb2fe87af SHA512 148df1b9e3298b0183a193ebc43f8447afb722c00ca45bbf0856dc8efd484547e2e7e4562b8cb448cd01e23e53cd7a05d0c0ecbd5c9eebccc1b2aabb51ae9032
diff --git a/gui-apps/lavalauncher/files/lavalauncher-1.7.1-optional-man.patch b/gui-apps/lavalauncher/files/lavalauncher-1.7.1-optional-man.patch
new file mode 100644
index 000000000000..612548e17a78
--- /dev/null
+++ b/gui-apps/lavalauncher/files/lavalauncher-1.7.1-optional-man.patch
@@ -0,0 +1,27 @@
+diff --git a/meson.build b/meson.build
+index 029f711..50beccd 100644
+--- a/meson.build
++++ b/meson.build
+@@ -6,7 +6,6 @@ project(
+   default_options: [
+     'c_std=c11',
+     'warning_level=3',
+-    'werror=true',
+   ]
+ )
+ 
+@@ -61,6 +60,7 @@ scdoc = dependency(
+   'scdoc',
+   version: '>=1.9.2',
+   native: true,
++  required: get_option('man-page'),
+ )
+ if scdoc.found()
+   scdoc_prog = find_program(scdoc.get_pkgconfig_variable('scdoc'), native: true)
+diff --git a/meson_options.txt b/meson_options.txt
+new file mode 100644
+index 0000000..2e41905
+--- /dev/null
++++ b/meson_options.txt
+@@ -0,0 +1 @@
++option('man-page', type: 'feature', value: 'auto', description: 'Generate and install man pages')
diff --git a/gui-apps/lavalauncher/files/lavalauncher-remove-werror.patch b/gui-apps/lavalauncher/files/lavalauncher-remove-werror.patch
new file mode 100644
index 000000000000..3be85ab800c6
--- /dev/null
+++ b/gui-apps/lavalauncher/files/lavalauncher-remove-werror.patch
@@ -0,0 +1,12 @@
+diff --git a/meson.build b/meson.build
+index 317eeec..560421d 100644
+--- a/meson.build
++++ b/meson.build
+@@ -6,7 +6,6 @@ project(
+   default_options: [
+     'c_std=c11',
+     'warning_level=3',
+-    'werror=true',
+   ]
+ )
+ 
diff --git a/gui-apps/lavalauncher/lavalauncher-1.7.1.ebuild b/gui-apps/lavalauncher/lavalauncher-1.7.1.ebuild
new file mode 100644
index 000000000000..09c59864508c
--- /dev/null
+++ b/gui-apps/lavalauncher/lavalauncher-1.7.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="simple launcher for wayland"
+HOMEPAGE="https://git.sr.ht/~leon_plickat/lavalauncher"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.sr.ht/~leon_plickat/lavalauncher"
+else
+	SRC_URI="https://git.sr.ht/~leon_plickat/lavalauncher/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-v${PV}"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="man"
+
+PATCHES=(
+	"${FILESDIR}/${P}-optional-man.patch"
+)
+
+RDEPEND="
+	dev-libs/wayland
+	x11-libs/cairo
+"
+BDEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	dev-libs/wayland-protocols
+"
+
+if [[ ${PV} == 9999 ]]; then
+	BDEPEND+="man? ( ~app-text/scdoc-9999 )"
+else
+	BDEPEND+="man? ( >=app-text/scdoc-1.9.3 )"
+fi
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature man man-page)
+	)
+	meson_src_configure
+}
diff --git a/gui-apps/lavalauncher/lavalauncher-9999.ebuild b/gui-apps/lavalauncher/lavalauncher-9999.ebuild
new file mode 100644
index 000000000000..22da8a44a0ec
--- /dev/null
+++ b/gui-apps/lavalauncher/lavalauncher-9999.ebuild
@@ -0,0 +1,49 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="simple launcher for wayland"
+HOMEPAGE="https://git.sr.ht/~leon_plickat/lavalauncher"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.sr.ht/~leon_plickat/lavalauncher"
+else
+	SRC_URI="https://git.sr.ht/~leon_plickat/lavalauncher/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-v${PV}"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="man"
+
+RDEPEND="
+	dev-libs/wayland
+	x11-libs/cairo
+"
+BDEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	dev-libs/wayland-protocols
+"
+
+if [[ ${PV} == 9999 ]]; then
+	BDEPEND+="man? ( ~app-text/scdoc-9999 )"
+else
+	BDEPEND+="man? ( >=app-text/scdoc-1.9.3 )"
+fi
+
+PATCHES=(
+	"${FILESDIR}/lavalauncher-remove-werror.patch"
+)
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature man man-page)
+	)
+	meson_src_configure
+}
diff --git a/gui-apps/lavalauncher/metadata.xml b/gui-apps/lavalauncher/metadata.xml
new file mode 100644
index 000000000000..3b6117c8b1a8
--- /dev/null
+++ b/gui-apps/lavalauncher/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<longdescription>
+		Minimalistic and simple launcher for Wayland.
+		It serves a single purpose: Letting the user
+		execute shell commands by clicking on icons on
+		a dynamically sized bar, placed at one of the
+		screen edges.
+	</longdescription>
+	<maintainer type="person">
+		<email>gentoo@aisha.cc</email>
+		<name>Aisha Tammy</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="man">Build and install man pages</flag>
+	</use>
+</pkgmetadata>
diff --git a/gui-apps/nm-tray/Manifest b/gui-apps/nm-tray/Manifest
index 629908a604f6..faccceee4c9f 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 760 BLAKE2B c23c2ada51c832f9b491044146bcb9a5701477d3323657b2cb4760f4fbf05ce2b738fedb5dc801daaf57cdfeb89dbd5bd0c98178bc7469714078e0be01588816 SHA512 3de13d1ff071eeecb4ca52dbd15c34a40f98a9f87e7f93f4f2f0da3a3e77f80b5e996d1094849af24c6cca2d658010b49ed3fc936bf04f1f0b75da5a35935917
+EBUILD nm-tray-0.4.3.ebuild 765 BLAKE2B 22c1aa22fae520bc349c07d394420d6242b1d0f9a021ff6821a20c8f6b80b574a283248f84ceab6f80d088dc97b0ff26fa2bb81fc9e3eb5a418eacedbaa6270b SHA512 8576b377aab072ca508d601d6ae009267c82b834a07c13db75d19ea7755ce5e852e1d43a973e641bc7f9a699aec9c6667239ceb9ddc5ab33dbdc2d7e900b4884
 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.ebuild
index d18f9b26f666..e921fc04cae9 100644
--- a/gui-apps/nm-tray/nm-tray-0.4.3.ebuild
+++ b/gui-apps/nm-tray/nm-tray-0.4.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/palinek/nm-tray/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 BDEPEND=">=dev-util/cmake-3.10"
diff --git a/gui-apps/waybar/Manifest b/gui-apps/waybar/Manifest
index 09e358e954b4..c0561164a41a 100644
--- a/gui-apps/waybar/Manifest
+++ b/gui-apps/waybar/Manifest
@@ -1,4 +1,4 @@
 DIST waybar-0.8.0.tar.gz 112019 BLAKE2B b3b61e02a104599e8f9047f9e2f76ec57ef7dd164edca2afd7b0afbb6b2c2341e20d6175905eba525337df9215473afa6cf017f736bb2de24e4daa169a5af3ee SHA512 c670fd21a7d29396d8bbe1b7540ddbbe44a98f7fb49f8518e0cc302aa57e5bb993ff8306973a7b8ca4ec000a7ecc311872762a0782ce19e4bf4cff8ea09caccb
 EBUILD waybar-0.8.0.ebuild 1276 BLAKE2B 8768bd945677fee49b286d8e34de755b687c222525dd8d34bfad3459a2e2f49c9da0a7415bf1c709a9bdc0ee6e39a857060b72d98685a221c38bc3ba6cc0bf1d SHA512 edea2c41126379a6887a6c33e87a59322eb241fd9afc855e6183b44aefee72b32d6f73cbf77cfd968f1c05bc4f7b27a145bd4c907253168301b61151b752a637
 EBUILD waybar-9999.ebuild 1276 BLAKE2B 8768bd945677fee49b286d8e34de755b687c222525dd8d34bfad3459a2e2f49c9da0a7415bf1c709a9bdc0ee6e39a857060b72d98685a221c38bc3ba6cc0bf1d SHA512 edea2c41126379a6887a6c33e87a59322eb241fd9afc855e6183b44aefee72b32d6f73cbf77cfd968f1c05bc4f7b27a145bd4c907253168301b61151b752a637
-MISC metadata.xml 733 BLAKE2B 54a2a98263d1632476f8312b32d039bbebe4295c2b9775ad379e60d776eea4005b02184e5c28c6769b1dea80eb83fa842d9eb091b43daf4f29ad87daadad8b8a SHA512 b615bcd72c49abadf3454a636134340bb3fa869877c3b563fc659ee66740645ec77808e3451705498040239e46fdcf9b822116e84ad2677d42f87fd74c788362
+MISC metadata.xml 591 BLAKE2B 61dad767164be21bc8d67b253802761cd53b8231ecacdad615b680bd9597cd1a49388b04d0c39ae40f9d890a2e274954c132d1d811dc1159c3cbb6e43d0e64fc SHA512 6bef50bf036bc1e5bc9f1c8ac8c33d3840ace788445a831edada1c935a855b18c72ea3f114efd72621fc48533d6d0339bcf19367e27b31d54d6fab8128588fcd
diff --git a/gui-apps/waybar/metadata.xml b/gui-apps/waybar/metadata.xml
index 06e07388c396..a28609715318 100644
--- a/gui-apps/waybar/metadata.xml
+++ b/gui-apps/waybar/metadata.xml
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="person">
-        <email>bman@gentoo.org</email>
-        <name>Aaron Bauman</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="tray">Enable support for tray</flag>
-    </use>
-    <upstream>
-        <remote-id type="github">Alexays/Waybar</remote-id>
-        <bugs-to>https://github.com/Alexays/Waybar/issues</bugs-to>
-        <changelog>https://github.com/Alexays/Waybar/releases</changelog>
-    </upstream>
+	<!-- maintainer-needed -->
+	<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="tray">Enable support for tray</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">Alexays/Waybar</remote-id>
+		<bugs-to>https://github.com/Alexays/Waybar/issues</bugs-to>
+		<changelog>https://github.com/Alexays/Waybar/releases</changelog>
+	</upstream>
 </pkgmetadata>
diff --git a/gui-apps/wcm/Manifest b/gui-apps/wcm/Manifest
index 9697512b3c35..23023d1fefc1 100644
--- a/gui-apps/wcm/Manifest
+++ b/gui-apps/wcm/Manifest
@@ -1,4 +1,4 @@
 DIST wcm-0.4.0.tar.gz 263841 BLAKE2B 28cdf87c479cc7a4a5a40f17a1ec26688bae6a0cd5699b51ad7db2adca89946d7687ae345a7a82d71464df413c956aceeb3db8195c5b40da5f32043821883c49 SHA512 4136ceba90c054165b4b0e7a79d78af827d8b8ddb8b54820bda0c17bbaa28eb74981ce94d8c386b91257ca023a34f76f121a003229365afe72d65323f0a1d2cd
-EBUILD wcm-0.4.0.ebuild 809 BLAKE2B 5d1839a58cd7e5656cc55a4e7bd5aaedfe9a1280bf9ef33aa3fb61db21becb399c82ff5a8a9de12fc5864f48dd15dbabd31a6546c0f7d1782cd58e44758f0586 SHA512 da66001149e2d726fd1a348e505cdad3776ea737f9de355b83ceb64dc4cb190c43055f2ed3263efa84a59882c343949abd8bc4e932b26aba801a0098996bfd50
-EBUILD wcm-9999.ebuild 809 BLAKE2B 5d1839a58cd7e5656cc55a4e7bd5aaedfe9a1280bf9ef33aa3fb61db21becb399c82ff5a8a9de12fc5864f48dd15dbabd31a6546c0f7d1782cd58e44758f0586 SHA512 da66001149e2d726fd1a348e505cdad3776ea737f9de355b83ceb64dc4cb190c43055f2ed3263efa84a59882c343949abd8bc4e932b26aba801a0098996bfd50
+EBUILD wcm-0.4.0-r1.ebuild 645 BLAKE2B 7481b0645eee22ebcbfd76a313d1fbf722336aa564fcf1bfd6ed871076f96253b16fcda1f7af4ddbbfa7cc9868c0da4afad956f3073ddc6d5269f497706aafa3 SHA512 ca9a12a3681d0e172a02dda5462d38b3fc1b564a8808c315acd87be4a1c01683151b3f037cc14af1a2a9a09bc230e534f412c565c9c77fc5c34e2c969288c94c
+EBUILD wcm-9999.ebuild 645 BLAKE2B 7481b0645eee22ebcbfd76a313d1fbf722336aa564fcf1bfd6ed871076f96253b16fcda1f7af4ddbbfa7cc9868c0da4afad956f3073ddc6d5269f497706aafa3 SHA512 ca9a12a3681d0e172a02dda5462d38b3fc1b564a8808c315acd87be4a1c01683151b3f037cc14af1a2a9a09bc230e534f412c565c9c77fc5c34e2c969288c94c
 MISC metadata.xml 581 BLAKE2B 4c7238f4d651f521902f319da41b18b58d40a2db7e9c22f4084939fa0e70d534a7f112985de5f092c7f233f7891b50d17155b22781b32491f40c8d10f92c07a6 SHA512 a0b43b1632468feb2dd7b52fb34ce7f7c0bb8b0d8bf1952fc4e95017b0f7c8139451c78264966edab146cc3b8c255bc6724f4f7bb80479d5f119e6bbbda4fe2d
diff --git a/gui-apps/wcm/wcm-0.4.0.ebuild b/gui-apps/wcm/wcm-0.4.0-r1.ebuild
index 8178a3b0d885..54d7e4cee824 100644
--- a/gui-apps/wcm/wcm-0.4.0.ebuild
+++ b/gui-apps/wcm/wcm-0.4.0-r1.ebuild
@@ -10,21 +10,20 @@ HOMEPAGE="https://github.com/WayfireWM/wcm"
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/WayfireWM/${PN}.git"
+	EGIT_REPO_URI="https://github.com/WayfireWM/wcm.git"
 else
-	SRC_URI="https://github.com/WayfireWM/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/WayfireWM/wcm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="debug"
 
 DEPEND="
 	dev-libs/libevdev
 	dev-libs/libxml2
 	dev-cpp/gtkmm:3.0[wayland]
-	~gui-wm/wayfire-${PV}[debug=]
+	~gui-wm/wayfire-${PV}
 "
 
 RDEPEND="${DEPEND}"
@@ -34,13 +33,3 @@ BDEPEND="
 	dev-libs/wayland-protocols
 	virtual/pkgconfig
 "
-
-src_compile() {
-	local emesonargs=""
-	if use debug; then
-		emesonargs+=(
-			"-Db_sanitize=address,undefined"
-		)
-	fi
-	meson_src_compile
-}
diff --git a/gui-apps/wcm/wcm-9999.ebuild b/gui-apps/wcm/wcm-9999.ebuild
index 8178a3b0d885..54d7e4cee824 100644
--- a/gui-apps/wcm/wcm-9999.ebuild
+++ b/gui-apps/wcm/wcm-9999.ebuild
@@ -10,21 +10,20 @@ HOMEPAGE="https://github.com/WayfireWM/wcm"
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/WayfireWM/${PN}.git"
+	EGIT_REPO_URI="https://github.com/WayfireWM/wcm.git"
 else
-	SRC_URI="https://github.com/WayfireWM/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/WayfireWM/wcm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="debug"
 
 DEPEND="
 	dev-libs/libevdev
 	dev-libs/libxml2
 	dev-cpp/gtkmm:3.0[wayland]
-	~gui-wm/wayfire-${PV}[debug=]
+	~gui-wm/wayfire-${PV}
 "
 
 RDEPEND="${DEPEND}"
@@ -34,13 +33,3 @@ BDEPEND="
 	dev-libs/wayland-protocols
 	virtual/pkgconfig
 "
-
-src_compile() {
-	local emesonargs=""
-	if use debug; then
-		emesonargs+=(
-			"-Db_sanitize=address,undefined"
-		)
-	fi
-	meson_src_compile
-}
diff --git a/gui-apps/wf-recorder/Manifest b/gui-apps/wf-recorder/Manifest
index ca1173034206..9675a7ea62d7 100644
--- a/gui-apps/wf-recorder/Manifest
+++ b/gui-apps/wf-recorder/Manifest
@@ -1,3 +1,4 @@
 DIST wf-recorder-0.2.1.tar.xz 19828 BLAKE2B b86fc418a2779521a44eaefcf0c6d5533be64b608c7c3a8a550156a07eb10053f31bce1693c33842e7313997b090b63f7908eb64d9705c406c5026a6cde09c4d SHA512 e232f4a13d4891863a58667dc87df113f13fabac5042c93143d652472287e84906b261b764869cd02c523f5b3d2331224e2bb71f66814d1a1c9c99a0d28aa40a
-EBUILD wf-recorder-0.2.1.ebuild 684 BLAKE2B 43339e38e1a5821e15f5092b58102e6f98da7f777ec908797fc96a32601ccb0d98f568243c289bc0634477ad46cc65f582c46332afddd9388aa16cd2f8e647e9 SHA512 fb0172f65b6f2fa4a28d7d52ecb90c121a38fdbba9907d540de2d48fdfacb11bcd9741ed5ee7c3d6e2103dd90aeebdc7e0b550e204fe80606f5487fc89c36bbd
+EBUILD wf-recorder-0.2.1-r1.ebuild 864 BLAKE2B a01bcf35e231e188ae4248db6c2d1e25953fb5e3e4dc2fa9ae3e7c1e73d5da2b20e2b7b11ad2269f8413aeba10c0bbe282ed008bd925a58d7bd0e6cfa61a07ec SHA512 994b05efa0871452e5fa18bd78eca3ae07f4894faaa25b936cc168fdef17c6f42a5540d2f0471e2e62db78122ff796cff2e24ba6afaaf104a8d202931b06186d
+EBUILD wf-recorder-9999.ebuild 928 BLAKE2B dbb78423c7ed32557931bbb6b585d739f2a797bc7ebcb659c997cd321cff4ad9435383066621a995df26c8759b46c8042cf729d3aef761aeaebf34b7a0326335 SHA512 00b619b09d1b5d00ccedddcf5a171d4438eff9f454d92f7ae78998d29b5ccaa531bc583effa013240625d4a34cb0dbaf7d01e34de41e144815fb751f00b2c0e5
 MISC metadata.xml 560 BLAKE2B c960b0ae5d6e4c4f84205fc4affe7257271c0348cdcbac940424f0b75f20999ec5b4ca56f1cfa86a28fb8f77808ebccc99f00213e1f0c330918c155433eb255f SHA512 0b6df6fa66cad82544f83cedd53a6f0c4344e28bb9ebe37a615ec44f2170325bb03cf1400769b1c79860f4ee365d4d7075d562278823277814c1b39c7b6a3c91
diff --git a/gui-apps/wf-recorder/wf-recorder-0.2.1.ebuild b/gui-apps/wf-recorder/wf-recorder-0.2.1-r1.ebuild
index cbae5bbd6bda..6bc50719fea0 100644
--- a/gui-apps/wf-recorder/wf-recorder-0.2.1.ebuild
+++ b/gui-apps/wf-recorder/wf-recorder-0.2.1-r1.ebuild
@@ -7,20 +7,31 @@ inherit meson
 
 DESCRIPTION="Screen recorder for wlroots-based compositors"
 HOMEPAGE="https://github.com/ammen99/wf-recorder"
-SRC_URI="https://github.com/ammen99/${PN}/releases/download/v${PV}/${P}.tar.xz"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ammen99/wf-recorder.git"
+else
+	SRC_URI="https://github.com/ammen99/wf-recorder/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
 IUSE="+man opencl"
 
-DEPEND="dev-libs/wayland
-	dev-libs/wayland-protocols
+DEPEND="
+	dev-libs/wayland
 	media-sound/pulseaudio
-	media-video/ffmpeg
-	opencl? ( virtual/opencl )"
+	media-video/ffmpeg[opencl?,pulseaudio,x264]
+	opencl? ( virtual/opencl )
+"
 RDEPEND="${DEPEND}"
-BDEPEND="man? ( app-text/scdoc )"
+BDEPEND="
+	virtual/pkgconfig
+	dev-libs/wayland-protocols
+	man? ( >=app-text/scdoc-1.9.3 )
+"
 
 src_configure() {
 	local emesonargs=(
diff --git a/gui-apps/wf-recorder/wf-recorder-9999.ebuild b/gui-apps/wf-recorder/wf-recorder-9999.ebuild
new file mode 100644
index 000000000000..57cf62b69aff
--- /dev/null
+++ b/gui-apps/wf-recorder/wf-recorder-9999.ebuild
@@ -0,0 +1,43 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="Screen recorder for wlroots-based compositors"
+HOMEPAGE="https://github.com/ammen99/wf-recorder"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ammen99/wf-recorder.git"
+else
+	SRC_URI="https://github.com/ammen99/wf-recorder/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="+man pulseaudio opencl"
+
+DEPEND="
+	dev-libs/wayland
+	pulseaudio? ( media-sound/pulseaudio )
+	media-video/ffmpeg[opencl?,pulseaudio?,x264]
+	opencl? ( virtual/opencl )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	dev-libs/wayland-protocols
+	man? ( >=app-text/scdoc-1.9.3 )
+"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature man man-pages)
+		$(meson_feature pulseaudio pulse)
+		$(meson_feature opencl)
+	)
+	meson_src_configure
+}
diff --git a/gui-apps/wf-shell/Manifest b/gui-apps/wf-shell/Manifest
index 0b2d0c30b8f5..4d05164dd265 100644
--- a/gui-apps/wf-shell/Manifest
+++ b/gui-apps/wf-shell/Manifest
@@ -1,4 +1,4 @@
 DIST wf-shell-0.4.0.tar.xz 8996656 BLAKE2B 609668bcf00fcc7a0b8142d84a7101f07578c2d6a88616da286a615076372e5a356387cf5e3fdee9b4aba6f027d8d081a5cce32f7f00682a756d4ee9bc46916d SHA512 1b293ce3fc2b12acbadb75e0de28217ed24f733e26d7ad12ada9a5f0673df911e75eea5af6841c466f031151f881a8e36dda229ea4dc2f91825e2e6df42d4903
-EBUILD wf-shell-0.4.0.ebuild 939 BLAKE2B 929f80d9d5fa3aa90e5a4e2d2f9f4b3aeea17fd741c209ab56d0c338d722bcadd2ce576bfa58da9ece29055decb064a826d874e7d888f6a2ecd28c48f03fd56d SHA512 17c67b6f3386a5a02619c42007822eba9833681a6be347c7204bad5038cd27b540416fdd7ab8ca322898c929214986ca127df4e56db159f69779dd125307ade5
-EBUILD wf-shell-9999.ebuild 939 BLAKE2B 929f80d9d5fa3aa90e5a4e2d2f9f4b3aeea17fd741c209ab56d0c338d722bcadd2ce576bfa58da9ece29055decb064a826d874e7d888f6a2ecd28c48f03fd56d SHA512 17c67b6f3386a5a02619c42007822eba9833681a6be347c7204bad5038cd27b540416fdd7ab8ca322898c929214986ca127df4e56db159f69779dd125307ade5
+EBUILD wf-shell-0.4.0-r1.ebuild 857 BLAKE2B 3e8de3dae426baabd74e059fdd63ed01f6b8c7c24b7b7a5c36831e04eb0951cba2c021b4611c2ff102b6cc15991f4c562b908f05e997d0ef96f68f3bb2f42a18 SHA512 650121ca9f78ee525e201123235980042c76d0c94bdb2f130729bbc62f6c5a4a3e2527e6760616bf633ea12cdd007c52eba98153e97377b6d51a6cf81929a29f
+EBUILD wf-shell-9999.ebuild 857 BLAKE2B 3e8de3dae426baabd74e059fdd63ed01f6b8c7c24b7b7a5c36831e04eb0951cba2c021b4611c2ff102b6cc15991f4c562b908f05e997d0ef96f68f3bb2f42a18 SHA512 650121ca9f78ee525e201123235980042c76d0c94bdb2f130729bbc62f6c5a4a3e2527e6760616bf633ea12cdd007c52eba98153e97377b6d51a6cf81929a29f
 MISC metadata.xml 653 BLAKE2B 537544446f8e320beafd02fe766de2c3ff66225aba3f69b852484f5251c3c1caeb68cd50d29e036ec96167b336bc9599319fcf324e7f9ecfaa9ddeee4bb52c67 SHA512 a8d332a80f7355424abd6f5b588c8cc9ef0f84bacea3c29b50bb56735d5c1b1753bc94c72737918152bdc6241ce90e8105f4da4bea5cc9a7f94c658d833a08cc
diff --git a/gui-apps/wf-shell/wf-shell-0.4.0.ebuild b/gui-apps/wf-shell/wf-shell-0.4.0-r1.ebuild
index 9167682d0b61..21fc54e4ef78 100644
--- a/gui-apps/wf-shell/wf-shell-0.4.0.ebuild
+++ b/gui-apps/wf-shell/wf-shell-0.4.0-r1.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="+pulseaudio debug"
+IUSE="+pulseaudio"
 
 DEPEND="
 	dev-cpp/gtkmm:3.0=[wayland]
@@ -36,14 +36,9 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-src_compile () {
+src_configure () {
 	local emesonargs=(
 		"$(meson_feature pulseaudio pulse)"
 	)
-	if use debug; then
-		emesonargs+=(
-			"-Db_sanitize=address,undefined"
-		)
-	fi
-	meson_src_compile
+	meson_src_configure
 }
diff --git a/gui-apps/wf-shell/wf-shell-9999.ebuild b/gui-apps/wf-shell/wf-shell-9999.ebuild
index 9167682d0b61..21fc54e4ef78 100644
--- a/gui-apps/wf-shell/wf-shell-9999.ebuild
+++ b/gui-apps/wf-shell/wf-shell-9999.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="+pulseaudio debug"
+IUSE="+pulseaudio"
 
 DEPEND="
 	dev-cpp/gtkmm:3.0=[wayland]
@@ -36,14 +36,9 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-src_compile () {
+src_configure () {
 	local emesonargs=(
 		"$(meson_feature pulseaudio pulse)"
 	)
-	if use debug; then
-		emesonargs+=(
-			"-Db_sanitize=address,undefined"
-		)
-	fi
-	meson_src_compile
+	meson_src_configure
 }