gentoo resync : 29.01.2021

16 files changed, 358 insertions, 27 deletions

diff --git a/gui-apps/Manifest.gz b/gui-apps/Manifest.gz
index 996a4c4c4ab6..626a91bad2fe 100644
--- a/gui-apps/Manifest.gz
+++ b/gui-apps/Manifest.gz
diff --git a/gui-apps/waybar/Manifest b/gui-apps/waybar/Manifest
index 60c48715dfe6..59ba4d9ca293 100644
--- a/gui-apps/waybar/Manifest
+++ b/gui-apps/waybar/Manifest
@@ -5,5 +5,5 @@ DIST waybar-0.9.5.tar.gz 146094 BLAKE2B cd46e308d282df5ba6ce34417c0fe5468c188acb
 EBUILD waybar-0.9.3-r1.ebuild 1457 BLAKE2B 1aa1565934b694ffc23700553fe8ab25da8cce4af1599f5ac50767e33fd414f3ae6f815aca35d640e1c658ec0668e4343346df671125780bc862f96efa5ec1b6 SHA512 5bc3dec24c976d32e6f8d45263b6bc9a635354d493aeac276b97ea4b76f23fadc78dea01abf9a8a3cdc56a8fad0412c6c64a81f1a74827fc31bef250d73d2191
 EBUILD waybar-0.9.4.ebuild 1399 BLAKE2B 142db5313a8612058afd68ad164ef670682b03d98874a482a97f18489dd3d11ac707fdd3397976e7cf78efaeeb26a551dbd36706128109d304cf06c64cd47bda SHA512 de9eb9943aa3565efde0186a7fb37c001915c2614dc5ca9f15621d3801556ec4c663ffa5b1dc13c06ef76be2dc08b22814d880d39b03373f3c5319bbba390435
 EBUILD waybar-0.9.5.ebuild 1512 BLAKE2B 2afae936761a35cdd7fafe6fce3415f84d2ee2e4846b46c1b12b7dba340b7c9e05f26c97adfe6e4ca5c41828f0cd8adf07503627296d55e75ba95306223cd568 SHA512 59e2cd4fd0deef37832a1b6b9b88f6d1642a01a30a6339173c79be415a284cbd9087f39317f81de4bd374674e5f7de3340098e0ce80936be773ec62b41a37a57
-EBUILD waybar-9999.ebuild 1373 BLAKE2B 7deb266cb07b669a9fba8bee2a4fe823cd6a2fed0a96a282fb97223d065c8ebfec66b751e8c0cb266cd83fd8f63d2ba0cdbd85b1523cb41d299101b876575a45 SHA512 a831ef6bab9dfb38060501f53aee91396559f5d82769e52fd829458561fcdac97b60f8bcee1ac422ab1adc1da226f8f0fa833932e0acb692739c26dcec8d0d31
+EBUILD waybar-9999.ebuild 1484 BLAKE2B e9f0652d319431721ff42fbf595f6f353c75c32a2053b1ab348bf021e647afa88ec0589adb4a65ebc403684f7088fd79a61296a39cdd1c8d1a50a2746765d4f4 SHA512 c4235c768d6e50ce3c4c407b16ad6be3d78f05607c8a90f04454a5c62ff0cbb4cfd53c602c1e67aa284a6e38044a8eff3770bbcb897f546b1f94d42787146b37
 MISC metadata.xml 998 BLAKE2B 62b8116ea495ec9375a2134e60a8fab06913a77ecd0f58b3aca8ccdc6acbf0216dc79ec8c877b241e89ec508d86186b949273ee2c58c6a2659af94465ac44bfa SHA512 5a507ea16511a066bdd22117d627f277f3e46527fac20ff80d0330be8e2a6cadbfc2009a4f9f81dd704c5d2eb32d5db9acb230e1680dfd12ac05f1c6b137ea8f
diff --git a/gui-apps/waybar/waybar-9999.ebuild b/gui-apps/waybar/waybar-9999.ebuild
index 8d09470b4d47..664cb2388f3c 100644
--- a/gui-apps/waybar/waybar-9999.ebuild
+++ b/gui-apps/waybar/waybar-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,19 +18,19 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="mpd network popups pulseaudio tray +udev"
+IUSE="mpd network popups pulseaudio tray +udev wifi"
 
 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/spdlog-1.8.0:=
 	dev-libs/date:=
 	dev-libs/wayland
 	dev-libs/wayland-protocols
@@ -45,7 +45,8 @@ DEPEND="
 		dev-libs/libappindicator
 	)
 	udev? ( virtual/libudev:= )
-	"
+	wifi? ( || ( sys-apps/util-linux net-wireless/rfkill ) )
+"
 RDEPEND="${DEPEND}"
 
 src_configure() {
@@ -56,6 +57,8 @@ src_configure() {
 		$(meson_feature pulseaudio)
 		$(meson_feature tray dbusmenu-gtk)
 		$(meson_feature udev libudev)
+		$(meson_feature wifi rfkill)
+		-Dsndio=disabled
 	)
 	meson_src_configure
 }
diff --git a/gui-apps/wayland-logout/Manifest b/gui-apps/wayland-logout/Manifest
index 935645872dbe..4ddf561b3060 100644
--- a/gui-apps/wayland-logout/Manifest
+++ b/gui-apps/wayland-logout/Manifest
@@ -1,4 +1,4 @@
-DIST wayland-logout-1.1.tar.gz 17731 BLAKE2B 179fba23ff885746e6664022a1e427e0a29f59e92b29fdf84807729253d5e3f7d2cea31bd2108f2daeb1bf87fdfceb2ce93fdab4dd3e7a914baeff0102880c84 SHA512 3664c865044e81d7fc41b5888ea1a8669804642b05a518e418c222c90867d38ada4c7f6c5193a251f43498dc9e1a70d4bdf79034569b5add12007523aa011e03
-EBUILD wayland-logout-1.1.ebuild 590 BLAKE2B 9981f9efe7aead784692b58f0d2d7cee6f2f755f1cda72f2f376ae55765101f3b3c843a3aef2db10cd1e306a70acad9b2ae2ac7788c23768e0f46414563797ae SHA512 c5d0fd906db6b5464bb5d989377c57ff0977d8a2c85f86823f8e7e91a6f01d57c2a9e6951fb506ffd5973c08bfa2f7569382dd273fc85d1356e300f5f77cb83a
-EBUILD wayland-logout-9999.ebuild 590 BLAKE2B 9981f9efe7aead784692b58f0d2d7cee6f2f755f1cda72f2f376ae55765101f3b3c843a3aef2db10cd1e306a70acad9b2ae2ac7788c23768e0f46414563797ae SHA512 c5d0fd906db6b5464bb5d989377c57ff0977d8a2c85f86823f8e7e91a6f01d57c2a9e6951fb506ffd5973c08bfa2f7569382dd273fc85d1356e300f5f77cb83a
+DIST wayland-logout-1.4.tar.gz 16878 BLAKE2B abc7cd6a6c6916aac97459e733e20cda71068654b30939feac50af94c76db393e94ec2b2df1b3488e0897857ede669e637e5db734c1323db2964fa7bcd821cf6 SHA512 376f39283851478723e3d846055ad76b6ae8b887b487cd98ebcdf87b1d95c3b5de5cad07f2d8921740c4e4102ce988833a9b7ebe662e51654316de9f85daabcf
+EBUILD wayland-logout-1.4.ebuild 497 BLAKE2B ca4a9d64008cd443db42fef84f3607bd1b66a4d313e0af5f8b847c0899165ab8612610a1194b44fba0e6ad01d0abaec6715eab63b14a2ab53d64375df4a28591 SHA512 3b66f21ff32aada6b4ac78e0959f81118ce8c127382118028eb3ee53e53ccf9565c53e2dfab01297ef59136a2ca6e178c93dc47b090c99eb92d9106727d70aab
+EBUILD wayland-logout-9999.ebuild 497 BLAKE2B ca4a9d64008cd443db42fef84f3607bd1b66a4d313e0af5f8b847c0899165ab8612610a1194b44fba0e6ad01d0abaec6715eab63b14a2ab53d64375df4a28591 SHA512 3b66f21ff32aada6b4ac78e0959f81118ce8c127382118028eb3ee53e53ccf9565c53e2dfab01297ef59136a2ca6e178c93dc47b090c99eb92d9106727d70aab
 MISC metadata.xml 359 BLAKE2B 6a34261ec10702f5bec40975ab7723eee34e015afa5a4544146834c43a9a3b040d9ead5d5a617da0b8253e9e9a7e05fe9efae38588b02b8fa16f653d9bfc5340 SHA512 43bdd93da8962e2ca6d852356e206511754f1e5f0bda721ac6458c54abab89367fc137f686583dd9df6d83be82bad66f9858efc52ed1e5a002d6b3bacd8fdbb4
diff --git a/gui-apps/wayland-logout/wayland-logout-1.1.ebuild b/gui-apps/wayland-logout/wayland-logout-1.4.ebuild
index 19849dc6704e..d29f95b176ff 100644
--- a/gui-apps/wayland-logout/wayland-logout-1.1.ebuild
+++ b/gui-apps/wayland-logout/wayland-logout-1.4.ebuild
@@ -1,10 +1,11 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-DESCRIPTION="general logout scripts for wayland compositors"
+inherit meson
 
+DESCRIPTION="general logout scripts for wayland compositors"
 HOMEPAGE="https://github.com/soreau/wayland-logout"
 
 if [[ ${PV} == 9999 ]]; then
@@ -17,10 +18,3 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-
-RDEPEND="sys-process/lsof"
-
-src_install() {
-	newbin wayland-logout.sh wayland-logout
-	doman wayland-logout.1
-}
diff --git a/gui-apps/wayland-logout/wayland-logout-9999.ebuild b/gui-apps/wayland-logout/wayland-logout-9999.ebuild
index 19849dc6704e..d29f95b176ff 100644
--- a/gui-apps/wayland-logout/wayland-logout-9999.ebuild
+++ b/gui-apps/wayland-logout/wayland-logout-9999.ebuild
@@ -1,10 +1,11 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-DESCRIPTION="general logout scripts for wayland compositors"
+inherit meson
 
+DESCRIPTION="general logout scripts for wayland compositors"
 HOMEPAGE="https://github.com/soreau/wayland-logout"
 
 if [[ ${PV} == 9999 ]]; then
@@ -17,10 +18,3 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-
-RDEPEND="sys-process/lsof"
-
-src_install() {
-	newbin wayland-logout.sh wayland-logout
-	doman wayland-logout.1
-}
diff --git a/gui-apps/waypipe/Manifest b/gui-apps/waypipe/Manifest
new file mode 100644
index 000000000000..534844580333
--- /dev/null
+++ b/gui-apps/waypipe/Manifest
@@ -0,0 +1,6 @@
+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 e7637ff87a9216842c3f7c34063f5a8bc707043f07c939d5ae0172b7ca779b451a9fad74a77950ed7b55f1e26cefacb0587b22cddee2cfc6dd52293f04e92b99 SHA512 53192e6f20cbfdcb93fa8c9db8eba3af84da5b971a6610df9e47d0cc2b05386851cb405f9cfc3f88af2f5457edbb9295363bedd09f9c3eba30dba41cb92b9a6b
+EBUILD waypipe-9999.ebuild 1770 BLAKE2B b9a4889283a17a7fb7bafd3ccf12a233662892384866206462816db06a52e0eec301a8228b65e7b6909e240a9d1c3da2bd8dfd785d310a290db5343948f0f88c SHA512 2458e59f795766562af6058bd90975029e613e2e38704ec2037d82d2aca9d2cc7f653e3db336bd80503c95a46f1e03cc59948b0467e0a0016574afa09f166c41
+MISC metadata.xml 926 BLAKE2B 708740a25670ffd20bc5f58c26d32e508b1bcfb3e853692417fb1eebda13201bc9cdcd19944081461c153290fd51ab5aed652425bbe5d3c02ec46518045a6d7e SHA512 99d90b8dd59cb9f9b0d2ba90c7ae2512c0c99fa9c6a436483836b00d3e0466b2bbcc88601ccf141e6e496f0dc139545d43787f8d30e10ce194f5dfd9444ac4b4
diff --git a/gui-apps/waypipe/files/waypipe-0.7.2-no-simd.patch b/gui-apps/waypipe/files/waypipe-0.7.2-no-simd.patch
new file mode 100644
index 000000000000..df464810e1b3
--- /dev/null
+++ b/gui-apps/waypipe/files/waypipe-0.7.2-no-simd.patch
@@ -0,0 +1,38 @@
+make simd instructions optional
+
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -5,3 +5,7 @@ option('with_lz4', type : 'feature', value : 'auto', description : 'Support LZ4
+ option('with_zstd', type : 'feature', value : 'auto', description : 'Support ZStandard as a compression mechanism')
+ option('with_vaapi', type : 'feature', value : 'auto', description : 'Link with libva and use VAAPI to perform hardware video output color space conversions on GPU')
+ option('with_systemtap', type: 'boolean', value: true, description: 'Enable tracing using sdt and provide static tracepoints for profiling')
++option('with_avx512f', type: 'boolean', value: true, description: 'Enable avx512f SIMD instructions')
++option('with_avx2', type: 'boolean', value: true, description: 'Enable avx2 SIMD instructions')
++option('with_sse3', type: 'boolean', value: true, description: 'Enable sse3 SIMD instructions')
++option('with_neon_opts', type: 'boolean', value: true, description: 'Enable optimizations for ARM64 neon cpus')
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -25,19 +25,19 @@ endif
+ # Conditionally compile SIMD-optimized code.
+ # (The meson simd module is a bit too limited for this)
+ kernel_libs = []
+-if cc.has_argument('-mavx512f') and cc.has_argument('-mlzcnt') and cc.has_argument('-mbmi')
++if cc.has_argument('-mavx512f') and cc.has_argument('-mlzcnt') and cc.has_argument('-mbmi') and get_option('with_avx512f')
+ 	kernel_libs += static_library('kernel_avx512f', 'kernel_avx512f.c', c_args:['-mavx512f', '-mlzcnt', '-mbmi'])
+ 	config_data.set('HAVE_AVX512F', 1, description: 'Compiler supports AVX-512F')
+ endif
+-if cc.has_argument('-mavx2') and cc.has_argument('-mlzcnt') and cc.has_argument('-mbmi')
++if cc.has_argument('-mavx2') and cc.has_argument('-mlzcnt') and cc.has_argument('-mbmi') and get_option('with_avx2')
+ 	kernel_libs += static_library('kernel_avx2', 'kernel_avx2.c', c_args:['-mavx2', '-mlzcnt', '-mbmi'])
+ 	config_data.set('HAVE_AVX2', 1, description: 'Compiler supports AVX2')
+ endif
+-if cc.has_argument('-msse3')
++if cc.has_argument('-msse3') and get_option('with_sse3')
+ 	kernel_libs += static_library('kernel_sse3', 'kernel_sse3.c', c_args:['-msse3'])
+ 	config_data.set('HAVE_SSE3', 1, description: 'Compiler supports SSE 3')
+ endif
+-if host_machine.cpu_family() == 'aarch64' or cc.has_argument('-mfpu=neon')
++if ( host_machine.cpu_family() == 'aarch64' or cc.has_argument('-mfpu=neon') ) and get_option('with_neon_opts')
+ 	neon_args = host_machine.cpu_family() == 'aarch64' ? [] : ['-mfpu=neon']
+ 
+ 	# Clang additionally enforces that NEON code only be compiled
diff --git a/gui-apps/waypipe/files/waypipe-0.7.2-werror.patch b/gui-apps/waypipe/files/waypipe-0.7.2-werror.patch
new file mode 100644
index 000000000000..289a0c29acb5
--- /dev/null
+++ b/gui-apps/waypipe/files/waypipe-0.7.2-werror.patch
@@ -0,0 +1,12 @@
+diff --git a/meson.build b/meson.build
+index d023f1f..372f0e3 100644
+--- a/meson.build
++++ b/meson.build
+@@ -6,7 +6,6 @@ project(
+ 	default_options: [
+ 		'c_std=c11',
+ 		'warning_level=3',
+-		'werror=true',
+ 	],
+ 	version: '0.7.2',
+ )
diff --git a/gui-apps/waypipe/metadata.xml b/gui-apps/waypipe/metadata.xml
new file mode 100644
index 000000000000..c0b193b3bddb
--- /dev/null
+++ b/gui-apps/waypipe/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<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>
+	<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.
+	</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="man">Build and install man pages</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
new file mode 100644
index 000000000000..ad21057c1731
--- /dev/null
+++ b/gui-apps/waypipe/waypipe-0.7.2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit meson python-any-r1
+
+DESCRIPTION="network transparency with Wayland"
+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 ~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_}"
+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[wayland-compositor,screen-sharing] )
+"
+
+PATCHES=(
+	"${FILESDIR}"/waypipe-0.7.2-werror.patch
+	"${FILESDIR}"/waypipe-0.7.2-no-simd.patch
+)
+
+src_configure() {
+	local mymesonargs=(
+		$(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)
+		$(meson_feature man man-pages)
+		$(meson_feature vaapi with_vaapi)
+		$(meson_feature zstd with_zstd)
+	)
+	local fl
+	for fl in "${CPU_FLAGS_X86[@]}"; do
+		mymesonargs+=( $(meson_use cpu_flags_x86_$fl with_$fl ) )
+	done
+	meson_src_configure
+}
diff --git a/gui-apps/waypipe/waypipe-9999.ebuild b/gui-apps/waypipe/waypipe-9999.ebuild
new file mode 100644
index 000000000000..60bffcfedb71
--- /dev/null
+++ b/gui-apps/waypipe/waypipe-9999.ebuild
@@ -0,0 +1,72 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..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 ~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_}"
+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[wayland-compositor,screen-sharing] )
+"
+
+PATCHES=(
+	"${FILESDIR}"/waypipe-0.7.2-werror.patch
+	"${FILESDIR}"/waypipe-0.7.2-no-simd.patch
+)
+
+src_configure() {
+	local mymesonargs=(
+		$(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)
+		$(meson_feature man man-pages)
+		$(meson_feature vaapi with_vaapi)
+		$(meson_feature zstd with_zstd)
+	)
+	local fl
+	for fl in "${CPU_FLAGS_X86[@]}"; do
+		mymesonargs+=( $(meson_use cpu_flags_x86_$fl with_$fl ) )
+	done
+	meson_src_configure
+}
diff --git a/gui-apps/wayvnc/Manifest b/gui-apps/wayvnc/Manifest
new file mode 100644
index 000000000000..f003c6065408
--- /dev/null
+++ b/gui-apps/wayvnc/Manifest
@@ -0,0 +1,4 @@
+DIST wayvnc-0.4.0.tar.gz 52157 BLAKE2B 7c8456d5136ef361ca7dd72ffa7501514eeb7a61ae1777a02391fb7fceea6b020d68951300ab76254f2afd5e2610fe66ce0f461d18dc38522706691438f4620e SHA512 b8f1af24213077dc6126ae1f613b9cdeed8f365f9d1989a5b053563f0eb4bc49921e746e0f1026fe0e02bfeea23b912798678a5a337a052d977aa04496a75570
+EBUILD wayvnc-0.4.0.ebuild 884 BLAKE2B 12217ad95e53efd84149ce8d3140bb1552b41a425740e448f1d59f98d8ebf8a32b6401dac5b92895ac6dcd453af531d0940f3c74324d8714e6b0b49a3ae93293 SHA512 d13a811372db890cd7d3e894e2190852e3b6806cbeef91d11cf1fa9d7a035b219b8cc9065f498864ff943b1f57a69c52443e39db223e46e8060dd3f1c81f4bd3
+EBUILD wayvnc-9999.ebuild 884 BLAKE2B 12217ad95e53efd84149ce8d3140bb1552b41a425740e448f1d59f98d8ebf8a32b6401dac5b92895ac6dcd453af531d0940f3c74324d8714e6b0b49a3ae93293 SHA512 d13a811372db890cd7d3e894e2190852e3b6806cbeef91d11cf1fa9d7a035b219b8cc9065f498864ff943b1f57a69c52443e39db223e46e8060dd3f1c81f4bd3
+MISC metadata.xml 936 BLAKE2B cf96fe5683e483676b78f7c155ea20aa76f302bc27a9a17e69b862256da3d7c6d90c9ca113ef96de8b00f179981ee9eb8ceec8258948a588f7e4f4ea29d48f7e SHA512 21d6f94c0ec2c47a47e4d408b834af9be63d855ac7cd9a5b0d1e6ca642eab3eb80c4e4b8bc9e692be2dbf29d31167770467a75041deb196c0fdfedb8e05dfd02
diff --git a/gui-apps/wayvnc/metadata.xml b/gui-apps/wayvnc/metadata.xml
new file mode 100644
index 000000000000..32c02efdbf9e
--- /dev/null
+++ b/gui-apps/wayvnc/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <longdescription>
+        VNC server for wlroots based Wayland compositors.
+        It attaches to a running Wayland session, creates
+        virtual input devices and exposes a single display
+        via the RFB protocol. The Wayland session may be a
+        headless one, so it is also possible to run wayvnc
+        without a physical display attached.
+    </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="gbm">enable GPU-side screencopy (experimental)</flag>
+      <flag name="tracing">Trace kernel and memory calls</flag>
+     </use>
+</pkgmetadata>
diff --git a/gui-apps/wayvnc/wayvnc-0.4.0.ebuild b/gui-apps/wayvnc/wayvnc-0.4.0.ebuild
new file mode 100644
index 000000000000..369ff2e67cac
--- /dev/null
+++ b/gui-apps/wayvnc/wayvnc-0.4.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="VNC server for wlroots based Wayland compositors"
+HOMEPAGE="https://github.com/any1/wayvnc"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/any1/wayvnc.git"
+else
+	SRC_URI="https://github.com/any1/wayvnc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="ISC"
+SLOT="0"
+IUSE="gbm tracing"
+
+RDEPEND="
+	dev-libs/aml
+	dev-libs/wayland
+	gui-libs/neatvnc[tracing?]
+	media-libs/mesa:=[egl,gles2,gbm?]
+	x11-libs/libxkbcommon
+	x11-libs/pixman
+	tracing? ( dev-util/systemtap )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	dev-libs/wayland-protocols
+"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature gbm screencopy-dmabuf)
+		$(meson_use tracing systemtap)
+	)
+	meson_src_configure
+}
diff --git a/gui-apps/wayvnc/wayvnc-9999.ebuild b/gui-apps/wayvnc/wayvnc-9999.ebuild
new file mode 100644
index 000000000000..369ff2e67cac
--- /dev/null
+++ b/gui-apps/wayvnc/wayvnc-9999.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="VNC server for wlroots based Wayland compositors"
+HOMEPAGE="https://github.com/any1/wayvnc"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/any1/wayvnc.git"
+else
+	SRC_URI="https://github.com/any1/wayvnc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="ISC"
+SLOT="0"
+IUSE="gbm tracing"
+
+RDEPEND="
+	dev-libs/aml
+	dev-libs/wayland
+	gui-libs/neatvnc[tracing?]
+	media-libs/mesa:=[egl,gles2,gbm?]
+	x11-libs/libxkbcommon
+	x11-libs/pixman
+	tracing? ( dev-util/systemtap )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	dev-libs/wayland-protocols
+"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature gbm screencopy-dmabuf)
+		$(meson_use tracing systemtap)
+	)
+	meson_src_configure
+}