gentoo resync : 15.06.2021

12 files changed, 117 insertions, 117 deletions

diff --git a/gui-apps/Manifest.gz b/gui-apps/Manifest.gz
index 51313bc54d58..fb143f0a6e6c 100644
--- a/gui-apps/Manifest.gz
+++ b/gui-apps/Manifest.gz
diff --git a/gui-apps/mako/Manifest b/gui-apps/mako/Manifest
index 0ddad7f0fd4e..547b403e889e 100644
--- a/gui-apps/mako/Manifest
+++ b/gui-apps/mako/Manifest
@@ -1,6 +1,6 @@
 DIST mako-1.4.1.tar.gz 49442 BLAKE2B aa242d905d33dcfd2e30317a65d3826ba43ad344e93d1f41ed8b28f75310f724ed0eb5ae163f97a441ae07a4bb3465aa01f974cd95f97ba981a907fb761ad3d4 SHA512 25b0f59645c1815d8bdba42cedd6f56163ff663cd801a534c4c725c99e9a8cc28aef1d2c899d30cca06f0c6ddfa4a8e6efa01e5e98091347bcfc80d596f16d43
 DIST mako-1.5.tar.gz 57077 BLAKE2B 0ad931ce6408774f029855d0d98bd9444ff246f2ee82dcaa59774caddc9aaa7d632a7584eaaa4439eafd17b72935eada8400fe93e1ec7f9c23b3860049b55269 SHA512 64bb78d391bf07259a62a4045103803c8e108ac2da2fe8a413b09a0e8c2ac9c82eea1ae9576db41f7088476099fc2071543c99d3a52a35f72f5dbb537bba8c47
 EBUILD mako-1.4.1.ebuild 927 BLAKE2B 8aaed18fb7d3c37d7f4cb34fb7902c7e43d4209ca0997df37e6d9f48fb8e72ee13b15365e2057434db3cdfaa7c06355912cf28fc812c4ecc9c8bdd74f1cf6e2f SHA512 d81e45a91be47805af2bb0bd8e328c7ea4fbe6908a1ba2055e11cc15b3eaaafbf42a18793c026a24bcca78cf4c7d92f47302a558c1442ae6b20b1fbe08e87ab3
-EBUILD mako-1.5.ebuild 922 BLAKE2B 4594d6294715e7674d0a2100a045c0616df00164bc5e474c6e4095c351dd71b5eee5841ef6de939decc76e69bce26c22b6cb633365203a846509bcbdfbc33eca SHA512 5b12b15f73a15a5e49187213055111bbc7a380d52775eba804d7b5408f285b6bc6716bec71fb600a4db3e862caad58a714630b5c6c058e0c5ded81097b263bdc
+EBUILD mako-1.5.ebuild 919 BLAKE2B 3ca3b4a24ed058ea975349ad72c600bff71f3deba313afd5bae31a9f13d699d5760a2403edd26c314af9e6d314ddc4b1cee13ad5371ad0d23e6ba771c7d0d210 SHA512 16ed6b509ef76ae67e767ac356a417166579bbbc8b166f0e0199fc7ad37da9dfdd404025aef95ca89102b82ff39c7077a2ce810d5aab73b5217220b9cd78ce3a
 EBUILD mako-9999.ebuild 922 BLAKE2B d6cf730dc689cef6170179b99120b6f5ab5e2a51936688e4052de88f1bfe53299cb4e229287a0db52f173628350631bbc6a4d79d34b0c30ef7e8b587eca32287 SHA512 ba858ca07c748cbd7e89168fb56c4ad97eab3d654f393612242bd8e7203e89028ec65d4e44942ec802a82ea2d15a51ef27a94458c8c0d18ff16277ee0bef092b
 MISC metadata.xml 528 BLAKE2B 2a1f63fe346e4777797fb6a08bc2656ab68e390a9132637b0979222e6236496c4190ff0d916b6c65d9a453791a9a3e5320f521f65e3bbd159644a9d790c67078 SHA512 e042a39ed2e11c10a363d4e1d34813c17cf3dcd4c1bce1299f5692a81bd6a374e82f0d00cc6d0e02b910581f64f11dc768e8d36214954057387a835efdba0ad2
diff --git a/gui-apps/mako/mako-1.5.ebuild b/gui-apps/mako/mako-1.5.ebuild
index ce59067b0376..81df72cd9577 100644
--- a/gui-apps/mako/mako-1.5.ebuild
+++ b/gui-apps/mako/mako-1.5.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 ~x86"
+	KEYWORDS="amd64 arm64 x86"
 fi
 
 LICENSE="MIT"
diff --git a/gui-apps/waypipe/Manifest b/gui-apps/waypipe/Manifest
index 287375a6ceea..2ba1c7dca3bf 100644
--- a/gui-apps/waypipe/Manifest
+++ b/gui-apps/waypipe/Manifest
@@ -1,6 +1,8 @@
 AUX waypipe-0.7.2-no-simd.patch 2593 BLAKE2B e3af5ec9cafe957c68e2694e79a957bd90718c7f3c0926c1da125498f8c2e101ac41881cc800f80e931c2d2ec1f5b0fa34de82b50d085780e8c9d853aa15dc30 SHA512 26078c8d48a9e87f3ce37791e41cbfdf79ab96639264dfc63666e5c45e6728ddb2cfe76b6b90322b4a80a3e755b7b053213dead884fb270c59ab97f717c6e872
 AUX waypipe-0.7.2-werror.patch 235 BLAKE2B e96c58d034ee9358f76ae7b8b182df645046af137a98d8d799694b33b19001806b1d977febf1cf9d9d02575b5a6231a1e69079c2547156202821532ee3b3f49b SHA512 9c7989cfa320fb3f8140b7a7e7259d1cbf7e00baf3db0d4b31c7c4059185dca3418b53ec5678402ab42c58e2a3cf5aecf63a4f453a25a84c76bc5968cda28d68
 DIST waypipe-0.7.2.tar.gz 202601 BLAKE2B bc8a03c8b47ee65a158ca45047f1989761c36b7b6fb5196784637f4e937fa2e5076497079f8368daf20592351e60a12fda5f4500b7220320b4c4a73ca9e5b1e0 SHA512 b126ea9d30864ecba67447793f39dbbe8bc73ab33c79879ac243023c64930e9aae887f13c0fdcc4cdf307b0ca6766b1012915dc88c596b7c250e3b35f6ba9190
-EBUILD waypipe-0.7.2.ebuild 1754 BLAKE2B d84d254f740deff87bbade6bb9cacbf307de6f8e6d80c2ca42fd1f20f5484036d915dc2ce035f1a499455d42a4d51704bd22a788875e435b6face096a03ec276 SHA512 dbf799b5a91af8d1cec2e153884e673b99c53658cc481da209215dc5e50d385a491edb504b174b488f2f33701a249606dce0908c9beaa2830d5542348008d71f
-EBUILD waypipe-9999.ebuild 1732 BLAKE2B f62fdd096b7a58ed5ae2f5446c53cdbb04936d6fceeb237825a48b646b17078540fe0a42192dd9f3213d216c61b248e7fe7aecf86158cc47668a612861a6634c SHA512 93b9a9134037ed60c219da42ba98b57410b4d8852895d57196b18eb099340713a6541826c95e606f97b2595245c4590e7d01fe2c97122284a2781a29e80f18d2
-MISC metadata.xml 902 BLAKE2B ab8d0b0794353478dc93e26672b4f026ed62edb53e2bb2b7bdee7a0af95bb5d7cfa96de58d6495bb8bfbf115e88621d7cf7c81501aa10cda9ce480d8eaf1a2bd SHA512 e28db13c5b7b0815207cc90f136ca093915713ead32450bbaac2af89dd972f5209f8c80ee94baed691ea5b4d28a774605196fa0ae58980377fc911242f005f68
+DIST waypipe-0.8.0.tar.gz 217533 BLAKE2B a2aebb9939acafae3eb693aa8fe344ab775e8d3e9a071e7291ab15a0f9869b681156b5730e42c04401648a32ad2a67d7a3bf95ff5f38e909e9309e00b1c69381 SHA512 853d36a9779e2fcb5ac7bcca6575d456685beadd8d918ec430a57b8359867849bdcb5d9c1edcd19eb8505f06a7758e8f53ba5354daa05f99491d5a45c330eeb2
+EBUILD waypipe-0.7.2.ebuild 1933 BLAKE2B 4ab3e6b3f8a18d52faa9477006ad304e765e018f9aa7e1b4af6783485571edd5cd93d4b3df07b05ee34e68579b1498c1d652a166126c7efda1dceaf12cdac244 SHA512 4760f6d71ee3472ef84e8f19575fd1c9b71c2062d03ce1cd0d716f68e57c3718ffb271b447cae28533f78a960c5f838fa4c7f7e5bac21ba41be166786aafc422
+EBUILD waypipe-0.8.0.ebuild 1877 BLAKE2B 0eec1e9df13454af322b145d4a844a7035a5ad6835ae577a9205e2c443d8402b84bfa350baf4095574da61aa441cc2e9d6d4ce84e824d906a4af1bf37294bcf8 SHA512 d764d91fc0c9e562a9526ab5e63cfb73181d070482049f22688e61a1cc3f89812efa0a553d4be87458b863d66b007f0b18ef995c22826a8b0d1e741aea381ac3
+EBUILD waypipe-9999.ebuild 1877 BLAKE2B 0eec1e9df13454af322b145d4a844a7035a5ad6835ae577a9205e2c443d8402b84bfa350baf4095574da61aa441cc2e9d6d4ce84e824d906a4af1bf37294bcf8 SHA512 d764d91fc0c9e562a9526ab5e63cfb73181d070482049f22688e61a1cc3f89812efa0a553d4be87458b863d66b007f0b18ef995c22826a8b0d1e741aea381ac3
+MISC metadata.xml 918 BLAKE2B 771e9c268b9090cc5129ccd720c02db3be9a2db7ef2bafddb0db185040731495f014da77e27d035c4131b5d408f0ef86c7f9631ae9b0cbe2a9c01840c799a7d3 SHA512 ea9ef61025ffaedcd3f1b2b10e1e65fb927d5b63374fddf42fd65df8d0ef06445808b2ab15e4641281521853f65b00b20947c1c3bd8eed6d8854a91f7e50c585
diff --git a/gui-apps/waypipe/metadata.xml b/gui-apps/waypipe/metadata.xml
index 34f0e3f23fbc..dc98924933d3 100644
--- a/gui-apps/waypipe/metadata.xml
+++ b/gui-apps/waypipe/metadata.xml
@@ -10,14 +10,14 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<longdescription>
-		waypipe is a proxy for wayland clients to allow streaming.
-		sessions over tcp. It forwards Wayland messages and
-		serializes changes to shared memory buffers over a single socket.
-		This makes application forwarding similar to ssh -X feasible.
+		Waypipe is a proxy for all Wayland clients to allow streaming
+		sessions over tcp. It forwards Wayland messages and serializes
+		changes to shared memory buffers over a single socket, to allow
+		application forwarding similar to ssh -X.
 	</longdescription>
 	<use>
-		<flag name="dmabuf">Use dmabuf for data exchange and hardware decoding</flag>
-		<flag name="ffmpeg">Link with ffmpeg for software decoding</flag>
+		<flag name="dmabuf">Use DMABUFs for data exchange and hardware decoding</flag>
+		<flag name="ffmpeg">Link with ffmpeg to allow buffer displays using video streams</flag>
 		<flag name="systemtap">Enable SystemTAP/DTrace tracing</flag>
 	</use>
 </pkgmetadata>
diff --git a/gui-apps/waypipe/waypipe-0.7.2.ebuild b/gui-apps/waypipe/waypipe-0.7.2.ebuild
index 2fa4101e0696..07a5a221492a 100644
--- a/gui-apps/waypipe/waypipe-0.7.2.ebuild
+++ b/gui-apps/waypipe/waypipe-0.7.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{7..9} )
 
 inherit meson python-any-r1
 
-DESCRIPTION="network transparency with Wayland"
+DESCRIPTION="Transparent network proxy for Wayland compositors"
 HOMEPAGE="https://gitlab.freedesktop.org/mstoeckl/waypipe"
 
 if [[ ${PV} == 9999 ]]; then
@@ -16,14 +16,20 @@ if [[ ${PV} == 9999 ]]; then
 else
 	SRC_URI="https://gitlab.freedesktop.org/mstoeckl/waypipe/-/archive/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}"/${PN}-v${PV}
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 LICENSE="MIT"
 SLOT="0"
 
-CPU_FLAGS_X86=( "avx2" "avx512f" "sse3" )
-IUSE="dmabuf ffmpeg lz4 man neon systemtap test vaapi zstd ${CPU_FLAGS_X86[@]/#/cpu_flags_x86_}"
+WAYPIPE_FLAG_MAP_X86=( avx2:with_avx2 avx512f:with_avx512f sse3:with_sse3 )
+WAYPIPE_FLAG_MAP_ARM=( neon:with_neon_opts )
+WAYPIPE_FLAG_MAP=(
+	"${WAYPIPE_FLAG_MAP_X86[@]/#/cpu_flags_x86_}"
+	"${WAYPIPE_FLAG_MAP_ARM[@]/#/cpu_flags_arm_}"
+)
+
+IUSE="dmabuf ffmpeg lz4 man neon systemtap test vaapi zstd ${WAYPIPE_FLAG_MAP[@]%:*}"
 REQUIRED_USE="vaapi? ( ffmpeg )"
 RESTRICT="!test? ( test )"
 
@@ -45,18 +51,17 @@ BDEPEND="
 	${PYTHON_DEPS}
 	virtual/pkgconfig
 	man? ( app-text/scdoc )
-	test? ( dev-libs/weston[wayland-compositor,screen-sharing] )
+	test? ( dev-libs/weston[examples,headless,remoting,screen-sharing,wayland-compositor] )
 "
 
 PATCHES=(
-	"${FILESDIR}"/waypipe-0.7.2-werror.patch
 	"${FILESDIR}"/waypipe-0.7.2-no-simd.patch
 )
 
 src_configure() {
-	local mymesonargs=(
+	local emesonargs=(
+		-Dwerror=false
 		$(meson_use systemtap with_systemtap)
-		$(meson_use neon with_neon_opts)
 		$(meson_feature dmabuf with_dmabuf)
 		$(meson_feature ffmpeg with_video)
 		$(meson_feature lz4 with_lz4)
@@ -65,8 +70,8 @@ src_configure() {
 		$(meson_feature zstd with_zstd)
 	)
 	local fl
-	for fl in "${CPU_FLAGS_X86[@]}"; do
-		mymesonargs+=( $(meson_use cpu_flags_x86_$fl with_$fl ) )
+	for fl in "${WAYPIPE_FLAG_MAP[@]}"; do
+		emesonargs+=( $(meson_use "${fl%:*}" "${fl#*:}") )
 	done
 	meson_src_configure
 }
diff --git a/gui-apps/waypipe/waypipe-0.8.0.ebuild b/gui-apps/waypipe/waypipe-0.8.0.ebuild
new file mode 100644
index 000000000000..a105c5722610
--- /dev/null
+++ b/gui-apps/waypipe/waypipe-0.8.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit meson python-any-r1
+
+DESCRIPTION="Transparent network proxy for Wayland compositors"
+HOMEPAGE="https://gitlab.freedesktop.org/mstoeckl/waypipe"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mstoeckl/waypipe"
+else
+	SRC_URI="https://gitlab.freedesktop.org/mstoeckl/waypipe/-/archive/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}"/${PN}-v${PV}
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+WAYPIPE_FLAG_MAP_X86=( avx2:with_avx2 avx512f:with_avx512f sse3:with_sse3 )
+WAYPIPE_FLAG_MAP_ARM=( neon:with_neon_opts )
+WAYPIPE_FLAG_MAP=(
+	"${WAYPIPE_FLAG_MAP_X86[@]/#/cpu_flags_x86_}"
+	"${WAYPIPE_FLAG_MAP_ARM[@]/#/cpu_flags_arm_}"
+)
+
+IUSE="dmabuf ffmpeg lz4 man neon systemtap test vaapi zstd ${WAYPIPE_FLAG_MAP[@]%:*}"
+REQUIRED_USE="vaapi? ( ffmpeg )"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dmabuf? (
+		media-libs/mesa[gbm,vaapi?,wayland]
+		x11-libs/libdrm
+	)
+	lz4? ( app-arch/lz4 )
+	systemtap? ( dev-util/systemtap )
+	vaapi? ( x11-libs/libva[drm,wayland] )
+	ffmpeg? (
+		media-video/ffmpeg[x264,vaapi?]
+	)
+	zstd? ( app-arch/zstd )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+	man? ( app-text/scdoc )
+	test? ( dev-libs/weston[examples,headless,remoting,screen-sharing,wayland-compositor] )
+"
+
+src_configure() {
+	local emesonargs=(
+		-Dwerror=false
+		$(meson_use systemtap with_systemtap)
+		$(meson_feature dmabuf with_dmabuf)
+		$(meson_feature ffmpeg with_video)
+		$(meson_feature lz4 with_lz4)
+		$(meson_feature man man-pages)
+		$(meson_feature vaapi with_vaapi)
+		$(meson_feature zstd with_zstd)
+	)
+	local fl
+	for fl in "${WAYPIPE_FLAG_MAP[@]}"; do
+		emesonargs+=( $(meson_use "${fl%:*}" "${fl#*:}") )
+	done
+	meson_src_configure
+}
diff --git a/gui-apps/waypipe/waypipe-9999.ebuild b/gui-apps/waypipe/waypipe-9999.ebuild
index 53231be9f678..a105c5722610 100644
--- a/gui-apps/waypipe/waypipe-9999.ebuild
+++ b/gui-apps/waypipe/waypipe-9999.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{7..9} )
 
 inherit meson python-any-r1
 
-DESCRIPTION="transparent network proxy for Wayland compositors"
+DESCRIPTION="Transparent network proxy for Wayland compositors"
 HOMEPAGE="https://gitlab.freedesktop.org/mstoeckl/waypipe"
 
 if [[ ${PV} == 9999 ]]; then
@@ -16,14 +16,20 @@ if [[ ${PV} == 9999 ]]; then
 else
 	SRC_URI="https://gitlab.freedesktop.org/mstoeckl/waypipe/-/archive/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}"/${PN}-v${PV}
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 LICENSE="MIT"
 SLOT="0"
 
-CPU_FLAGS_X86=( "avx2" "avx512f" "sse3" )
-IUSE="dmabuf ffmpeg lz4 man neon systemtap test vaapi zstd ${CPU_FLAGS_X86[@]/#/cpu_flags_x86_}"
+WAYPIPE_FLAG_MAP_X86=( avx2:with_avx2 avx512f:with_avx512f sse3:with_sse3 )
+WAYPIPE_FLAG_MAP_ARM=( neon:with_neon_opts )
+WAYPIPE_FLAG_MAP=(
+	"${WAYPIPE_FLAG_MAP_X86[@]/#/cpu_flags_x86_}"
+	"${WAYPIPE_FLAG_MAP_ARM[@]/#/cpu_flags_arm_}"
+)
+
+IUSE="dmabuf ffmpeg lz4 man neon systemtap test vaapi zstd ${WAYPIPE_FLAG_MAP[@]%:*}"
 REQUIRED_USE="vaapi? ( ffmpeg )"
 RESTRICT="!test? ( test )"
 
@@ -45,17 +51,13 @@ BDEPEND="
 	${PYTHON_DEPS}
 	virtual/pkgconfig
 	man? ( app-text/scdoc )
-	test? ( dev-libs/weston[wayland-compositor,screen-sharing] )
+	test? ( dev-libs/weston[examples,headless,remoting,screen-sharing,wayland-compositor] )
 "
 
-PATCHES=(
-	"${FILESDIR}"/waypipe-0.7.2-werror.patch
-)
-
 src_configure() {
-	local mymesonargs=(
+	local emesonargs=(
+		-Dwerror=false
 		$(meson_use systemtap with_systemtap)
-		$(meson_use neon with_neon_opts)
 		$(meson_feature dmabuf with_dmabuf)
 		$(meson_feature ffmpeg with_video)
 		$(meson_feature lz4 with_lz4)
@@ -64,8 +66,8 @@ src_configure() {
 		$(meson_feature zstd with_zstd)
 	)
 	local fl
-	for fl in "${CPU_FLAGS_X86[@]}"; do
-		mymesonargs+=( $(meson_use cpu_flags_x86_$fl with_$fl ) )
+	for fl in "${WAYPIPE_FLAG_MAP[@]}"; do
+		emesonargs+=( $(meson_use "${fl%:*}" "${fl#*:}") )
 	done
 	meson_src_configure
 }
diff --git a/gui-apps/wcm/Manifest b/gui-apps/wcm/Manifest
index 5ea69161df24..4ea27334e179 100644
--- a/gui-apps/wcm/Manifest
+++ b/gui-apps/wcm/Manifest
@@ -1,8 +1,6 @@
 DIST wcm-0.5.0.tar.gz 253120 BLAKE2B 44f6e36425ed070f086fcea6b3374b8fd2f1e3420176098699ec735cb74a1de0d6919ca71e62ca61116005ad26e50562e0a927dce7990d87eb7559511fb371e3 SHA512 c06e97fa3b22f33bb7f05efda380484377596cce83b7874d42b6f3795f275faee2fdd2f2a6a6f24ebbb7e339a0dd3e526a3d02a2e1d4c45b34f76d627896bc53
-DIST wcm-0.6.0.tar.gz 308100 BLAKE2B 22fd0867b7efee153375844bd9b06fa7978a488494bf48c5da10ecf59ab9ff1ee49fc31e82de294d2a5bf2af5339ccd367916f3e66c9e173379679622c5d9c93 SHA512 a0ce6541ea1416585d3102a07f8ccc73d53345cdab472a9f1a839af652ccaa3b7c4ef26dbe3c24d3ff4bfb5be9a1c61a7922170dafa9a66082c0de90ebcba3d9
 DIST wcm-0.7.0.tar.xz 263952 BLAKE2B 6e8761b75d5e37e49a1ba1e9b2a045c7350fa28642d26f1f66b0513fdb4130495f43bcae137184bf5bd2f0f2a0d5a81891459819d692a84b66b96c7d1440ee7e SHA512 190d8befafac69c27d99d10113160a1806a9dbd83f740216dd38e9cbe3c2638817b3471c9f46b60642e91abe02fbb72458b61f07bda9cd5fc5dbc7cdf880c6bb
 EBUILD wcm-0.5.0.ebuild 634 BLAKE2B 30bbd8f006bed48ac03341bca0c3d88e7697039491bab32ee6a281c429be22f1715a5766ef2dd7b372d6e3a9b25e612f366d9c1b4d0a3ac56518436ec5af13d9 SHA512 53eadfa6341dab246aae60037721424d2e85d6a9a2c10706d867981bd3170a093f81a1cecf2747b56bdb3f228fe12f59a14dfe71a6b19dedbbafe3192db2a330
-EBUILD wcm-0.6.0.ebuild 638 BLAKE2B a8513e768f39022100f503ae897b25b383dfe6a881213897427aec317727d42ea494cbe71d219889b93fda0bc3f2890a0d850abfb38b477d50f981e1ca551e9a SHA512 cb18b707f11b8601832d6c0fd52bcd97d314ea86a27d8e4eb861da00bbfea81bf8e55da36eb90f4f210c965c353a465648539beddf8ca585ba2c35f58c35c268
 EBUILD wcm-0.7.0.ebuild 642 BLAKE2B c413bdce15a85c7ba175519146d6807c1915861f814f3828f9992a1f681c26b4e01330e304a0cad82fbd6aaa91a79118dcd8831b77df01d41df675ca6cbae729 SHA512 f64d45f144fbde97af133a2ab7e0d1e87497f03477be2f2dbac62279dfc76000090d96a902fe792399d95d44b720dd3fc5d5cdc07e004d7529d7f17d502f84d4
 EBUILD wcm-9999.ebuild 642 BLAKE2B c413bdce15a85c7ba175519146d6807c1915861f814f3828f9992a1f681c26b4e01330e304a0cad82fbd6aaa91a79118dcd8831b77df01d41df675ca6cbae729 SHA512 f64d45f144fbde97af133a2ab7e0d1e87497f03477be2f2dbac62279dfc76000090d96a902fe792399d95d44b720dd3fc5d5cdc07e004d7529d7f17d502f84d4
 MISC metadata.xml 611 BLAKE2B 96e3a162d25b5c9bd54bf45b75a26c38aa2b21b7efe73116a98fdebadcd96dd74fbd35275f08297cdfcdc644f6b086f31b159d830130fe66d61dad6fb553f6ee SHA512 8407bac49bfea58a0757c6d0e6e68bec43f69e284cc7755d530db23fdf0b10ce8c9af1b1fea710fa6d48ac38b5758a64d48dbc0aefcaa420c8c10e24d50289c7
diff --git a/gui-apps/wcm/wcm-0.6.0.ebuild b/gui-apps/wcm/wcm-0.6.0.ebuild
deleted file mode 100644
index 66c8ce7b2447..000000000000
--- a/gui-apps/wcm/wcm-0.6.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-DESCRIPTION="Wayfire Config Manager"
-HOMEPAGE="https://github.com/WayfireWM/wcm"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/WayfireWM/wcm.git"
-else
-	SRC_URI="https://github.com/WayfireWM/wcm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-
-DEPEND="
-	dev-libs/libevdev
-	dev-libs/libxml2
-	dev-cpp/gtkmm:3.0[wayland]
-	>=gui-wm/wayfire-${PV%.*}
-"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="
-	dev-libs/wayland-protocols
-	virtual/pkgconfig
-"
diff --git a/gui-apps/wf-shell/Manifest b/gui-apps/wf-shell/Manifest
index eb1a973dffe6..7272f0c65692 100644
--- a/gui-apps/wf-shell/Manifest
+++ b/gui-apps/wf-shell/Manifest
@@ -1,8 +1,6 @@
 DIST wf-shell-0.5.0.tar.xz 8998296 BLAKE2B c32232fc08292b15a0048d11d0f179a82fd21b3179223d898057ac95b42ac35ec063467f67c0f1261857c3b643edc4367112a05bb63f002788b64ed86559addd SHA512 d0029746ea10625bb47381a7ed74aadb8aa3823f83f751b539eefd49da5aa1643a2d16c55fe23d30bd71528ad5c1ea8d389909fe8cc1026746b3b76aa5dabd2b
-DIST wf-shell-0.6.1.tar.xz 9014596 BLAKE2B 5256ceb8dc2b3dd4cf5d4503595c46b72bcde1dd4804a5871e225cee5b028ac69b02618d9c348fca4e21f2fd81b2be51fb0122126dd200dcdaeac894ec902c21 SHA512 d710cf703f5671bba01d056c7733724f90e6510a50e45a1a30cacde33a689c065335d802a3fd556cf9f8f0f420266ed2a8616706ecf5a68dcdf45a79876a4bcf
 DIST wf-shell-0.7.0.tar.xz 9014840 BLAKE2B f2e1ffb76de79db580227ddefc10c9f3431c92f77e6519da1102e7c4456bb30c4f25c82570a5b2796985dac00be65f9428ac6682e80920ed22359f63e3e6a84d SHA512 3d72c5d399280ee9da841a417faf696f8baa40edc1040bc1f354f113a8e431dbab428c93928b1d3faa520e35211345cabb5c70f55e10cfb7a4c321a6db19df90
 EBUILD wf-shell-0.5.0.ebuild 846 BLAKE2B faee64563ed5ab34455b4eb063b26ff0cef9c755e9d12967da6bb8572ece57316af560c4fe41710a7cc4b52122c936e4c9a0ea66e7fc13bea970e22e954153cc SHA512 e40c19893ca81d7447c1eded0a732839c15fdf694531e84158778e4debeba8e1d945bc7ed4d06539e582a94f73b9d3f1066ac5d187bfecee8b6ad350fc5faab5
-EBUILD wf-shell-0.6.1.ebuild 894 BLAKE2B dcba8696d9c2e9cab3f404c7e4af71b5575016d929687d033242bbdd6139231c0e48c746417d711ede3d96f5a321f341b0c2382834877f7aa30c4ed217fd28e9 SHA512 a3cb41c0eb247b65fde86a8b87d150bac6f037ab208e64367bb2f86ff487edef589754abe210c80f955dbe9aa5b84431976a9c367ed9485e48fc89e17ee15b19
 EBUILD wf-shell-0.7.0.ebuild 894 BLAKE2B 95f41d7e1c34d52505a62821152e8bd6db634da38fe836839b9da124ece5478b77ab3bf5e489e5bd38ecc126612db8c137bad4eb364ab5b84c99c05d969999a8 SHA512 751906a8c3abb9032acc962da5b464ff1f00f06412ba6677ce84ea1c6705814f552b98e6a0de6c0a177efb6a976c482f14931cd9335b26ccf9f244bb70317f3b
 EBUILD wf-shell-9999.ebuild 894 BLAKE2B dcba8696d9c2e9cab3f404c7e4af71b5575016d929687d033242bbdd6139231c0e48c746417d711ede3d96f5a321f341b0c2382834877f7aa30c4ed217fd28e9 SHA512 a3cb41c0eb247b65fde86a8b87d150bac6f037ab208e64367bb2f86ff487edef589754abe210c80f955dbe9aa5b84431976a9c367ed9485e48fc89e17ee15b19
 MISC metadata.xml 683 BLAKE2B bb64c04bcfff4291cba3d896fec7effc3aa276a75003f3ab6f488ec69f69fe8f46712b85258617cc4fb3b5fe3d4ab64806ed698629b4a6572bbd6c0b3c31add3 SHA512 08489531c8ae8ad4cfdc9e00d33644bd497d119979cb49370656f0987ca66800f562fdd7b2121bbe1a39a4176c931c09f0140e595131558866e9248fe6191c84
diff --git a/gui-apps/wf-shell/wf-shell-0.6.1.ebuild b/gui-apps/wf-shell/wf-shell-0.6.1.ebuild
deleted file mode 100644
index 08f4995b15b2..000000000000
--- a/gui-apps/wf-shell/wf-shell-0.6.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-DESCRIPTION="A compiz like 3D wayland compositor"
-HOMEPAGE="https://github.com/WayfireWM/wf-shell"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/WayfireWM/${PN}.git"
-else
-	SRC_URI="https://github.com/WayfireWM/${PN}/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="+pulseaudio"
-
-DEPEND="
-	dev-cpp/gtkmm:3.0=[wayland]
-	dev-libs/gobject-introspection
-	gui-libs/gtk-layer-shell
-	>=gui-wm/wayfire-${PV%.*}
-	pulseaudio? ( media-sound/pulseaudio )
-"
-RDEPEND="${DEPEND}
-	gui-apps/wayland-logout
-"
-BDEPEND="
-	dev-libs/wayland-protocols
-	virtual/pkgconfig
-"
-
-src_configure () {
-	local emesonargs=(
-		"$(meson_feature pulseaudio pulse)"
-		-Dwayland-logout=false
-	)
-	meson_src_configure
-}