gentoo resync : 20.03.2022

21 files changed, 268 insertions, 30 deletions

diff --git a/gui-apps/Manifest.gz b/gui-apps/Manifest.gz
index cecb8d371d3b..7bd71bb15716 100644
--- a/gui-apps/Manifest.gz
+++ b/gui-apps/Manifest.gz
diff --git a/gui-apps/foot-terminfo/Manifest b/gui-apps/foot-terminfo/Manifest
new file mode 100644
index 000000000000..6b61d149de58
--- /dev/null
+++ b/gui-apps/foot-terminfo/Manifest
@@ -0,0 +1,3 @@
+DIST foot-1.11.0.tar.gz 468899 BLAKE2B f3e3909c670598dab151f8be4104921fddd6621e833a8fe43c68d06347e3e866101fe1563282622436638674b7f73770762d47a7b9fd61d42b00bc7634e2ea76 SHA512 edf8130dfb52e06b6d8638115eca19695b24536f3f6b284e0319876edb95c3c86800f9527cc9dae3f66d2d317d26add793634a19f302e52c9f0118b9b91fc9c2
+EBUILD foot-terminfo-1.11.0-r1.ebuild 650 BLAKE2B c55b2484914072849ef8b591be60847277299fd4a32a1d57bbd415f0e6dd764dbd189a289fbdd46a325f2004e5449dfc2f362c39541f94bed8806d144a8e9652 SHA512 ed97c8e883e7c152cb9707c7bbb71516802f8b87992cc64ea6d597257d92c122073f8ecccf10e448862ad1407243084a1ba6bc963f98e39df447c670418a96be
+MISC metadata.xml 395 BLAKE2B ab339b3a0e03010977d4ef364da63a1cce6d1986829234a158c6d3c6bd9d639235d081d34bf8a49f8deb9d567b05320479718a5c79cf6b5a8113067fc69e2ad1 SHA512 d04b9e89a98877d7c39b48af3221705f3e2ebd0ed34fb0508bd13228c196350dda1a21a430b42777ccf9349e2e1ab76f39c20961de4429b10d5925a81855a291
diff --git a/gui-apps/foot-terminfo/foot-terminfo-1.11.0-r1.ebuild b/gui-apps/foot-terminfo/foot-terminfo-1.11.0-r1.ebuild
new file mode 100644
index 000000000000..665d31273e16
--- /dev/null
+++ b/gui-apps/foot-terminfo/foot-terminfo-1.11.0-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Terminfo for foot, a fast, lightweight and minimal Wayland terminal emulator"
+HOMEPAGE="https://codeberg.org/dnkl/foot"
+SRC_URI="https://codeberg.org/dnkl/foot/archive/${PV}.tar.gz -> foot-${PV}.tar.gz"
+S="${WORKDIR}/foot"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND="!>=sys-libs/ncurses-6.3[-minimal]"
+BDEPEND="sys-libs/ncurses"
+
+src_prepare() {
+	default
+	sed -i s/@default_terminfo@/foot/ foot.info || die
+}
+
+src_install() {
+	dodir /usr/share/terminfo/
+	tic -xo "${ED}"/usr/share/terminfo foot.info || die
+}
diff --git a/gui-apps/foot-terminfo/metadata.xml b/gui-apps/foot-terminfo/metadata.xml
new file mode 100644
index 000000000000..a3805e31ed69
--- /dev/null
+++ b/gui-apps/foot-terminfo/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>arsen@aarsen.me</email>
+		<name>Arsen Arsenović</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/gui-apps/foot/Manifest b/gui-apps/foot/Manifest
new file mode 100644
index 000000000000..046256206481
--- /dev/null
+++ b/gui-apps/foot/Manifest
@@ -0,0 +1,3 @@
+DIST foot-1.11.0.tar.gz 468899 BLAKE2B f3e3909c670598dab151f8be4104921fddd6621e833a8fe43c68d06347e3e866101fe1563282622436638674b7f73770762d47a7b9fd61d42b00bc7634e2ea76 SHA512 edf8130dfb52e06b6d8638115eca19695b24536f3f6b284e0319876edb95c3c86800f9527cc9dae3f66d2d317d26add793634a19f302e52c9f0118b9b91fc9c2
+EBUILD foot-1.11.0-r1.ebuild 1147 BLAKE2B 2a8281e9583ba5e94bce33f931646d7f204c6dba3bbe4718a2054e6b082dd8c30fda09702d1edb97eb7248a7e68b43aae496e307fa557bd2b735a48a0c6f1a1e SHA512 f532c40b846ab77f0ba09cacd670f661252321c214b44a335e068babc5fd57984975c8274d9aa792cf0fa5442a15a3de2595cceb48203c28e41949e976507b31
+MISC metadata.xml 487 BLAKE2B c9585e04b395d413dc3d087f7e5043a39c8c422299e5aadb560a50a3f600913d2e27f0ac7a3eb8ec5816f167b4c5637063a71cdd4c84a15885200d6417154764 SHA512 78b22205ff6d7f6f75a8d01df4ac4ba497bc31783f2c626d0b9cc3b8347a72e6bc4bd598fc3a1c0da3bd84af2df9391f39bdf00ddc33830ad41aa94b67d57304
diff --git a/gui-apps/foot/foot-1.11.0-r1.ebuild b/gui-apps/foot/foot-1.11.0-r1.ebuild
new file mode 100644
index 000000000000..b168c251e47b
--- /dev/null
+++ b/gui-apps/foot/foot-1.11.0-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson xdg
+
+DESCRIPTION="Fast, lightweight and minimalistic Wayland terminal emulator"
+HOMEPAGE="https://codeberg.org/dnkl/foot"
+SRC_URI="https://codeberg.org/dnkl/foot/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="+grapheme-clustering"
+
+COMMON_DEPEND="
+	dev-libs/wayland
+	media-libs/fcft
+	media-libs/fontconfig
+	x11-libs/libxkbcommon
+	x11-libs/pixman
+	grapheme-clustering? (
+		dev-libs/libutf8proc:=
+		media-libs/fcft[harfbuzz]
+	)
+"
+DEPEND="
+	${COMMON_DEPEND}
+	dev-libs/wayland-protocols
+	dev-libs/tllist
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	|| (
+		>=sys-libs/ncurses-6.3[-minimal]
+		~gui-apps/foot-terminfo-${PV}
+	)
+"
+BDEPEND="
+	dev-util/wayland-scanner
+	app-text/scdoc
+"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature grapheme-clustering)
+		-Dthemes=true
+		-Dime=true
+		-Dterminfo=disabled
+		-Dwerror=false
+	)
+	meson_src_configure
+}
+
+src_install() {
+	local DOCS=( CHANGELOG.md README.md )
+	meson_src_install
+
+	rm -r "${ED}/usr/share/doc/${PN}" || die
+}
diff --git a/gui-apps/foot/metadata.xml b/gui-apps/foot/metadata.xml
new file mode 100644
index 000000000000..ad620b602788
--- /dev/null
+++ b/gui-apps/foot/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>arsen@aarsen.me</email>
+		<name>Arsen Arsenović</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="grapheme-clustering">Enable grapheme clustering support</flag>
+	</use>
+</pkgmetadata>
diff --git a/gui-apps/grim/Manifest b/gui-apps/grim/Manifest
index 2960350b3efe..baa9a23c1f0b 100644
--- a/gui-apps/grim/Manifest
+++ b/gui-apps/grim/Manifest
@@ -1,4 +1,6 @@
 DIST grim-1.3.1.tar.gz 15778 BLAKE2B 7dc1f2fbc9e0f81c41d8ca535346d185a0f6c7a0ee28f0168a29864a36d1077be961278c1be3e647aa09165d9f3800e1bc7979f9fca95f8b39c339d621cd984d SHA512 07d04681ec589bf3e48b14c3bfcdc2a6012dfe5c5c2d7ee0cba95bc128187ca0de19ec04140dbe00907778f3d68844e6a90dc35365dafa489d65048b590fdf1b
+DIST grim-1.4.0.tar.gz 18287 BLAKE2B 72606de01624c98876fe1018877a3cf0b25b44ac4bd6a053f82c40ad1ea2c6c0e510cbb6a0bce988f14607ea162dda1d8350b9f30b0f2b9acd8f8e20ba50bc99 SHA512 d0b33528a00528b3ef7488a0984cde5034de4f5a211eb5c8d3299aea356d9348c5d02d08171802bc0315afb19d2446f5f132ea9dca0579ace803b7d5d90a89cc
 EBUILD grim-1.3.1.ebuild 863 BLAKE2B 25197d8097d9bea56e79e392cc306d309d78b461157b8d1ab823e792b94441f6bbe3e45760cd5c62b160c90b627021f5b4dede3d1c4808f5c287b3d865c03923 SHA512 f9fc55938be271c1ee1c45ee256a7f79fb9c30ef28be3c4bf76ba1a29c8c96878fbcb6fc5cd57fe4a7c289e76bdd6da2dff44a4852cfc235d258d36550dea60f
-EBUILD grim-9999.ebuild 864 BLAKE2B fa9ac89e7e556155b4f088fb17cf3e9b55f682a115e6110adec1a03f022b2ce95965c44704a3f862b29272f7e6a4596dc32421e75bf63f96005c64984df35955 SHA512 382ee6bcb55911031940bc04ad5870196e3c7940add464d3f8ff5f0af0431b20d7f1e1b7e84623feb21b358f5455788a17d2bf43fdc8c9ef6023ca45ae059335
+EBUILD grim-1.4.0-r1.ebuild 1060 BLAKE2B 9d39b2cba5b3696bddbc35b50c637edb4b1d9f63b5ed4f8d67fc5b89aa53026827ebd41d627c7839fc4c95ea0a7766f62ab40dfaeb58853e34331c83b971b04d SHA512 cf6645e44d921f255cbecf5b37496dc01f5a1c947c124da380c414453c5d2da76f9c80bebb7247b128975dea94a973d2648abbab8d03b6920e267002201c0da6
+EBUILD grim-9999.ebuild 1055 BLAKE2B ca5eefb5da5ad020efa6ca8bc0231404056071db59bd9eabd4be715192f9c2ec39e63457fa6c7183cbb9c04244964e770ce8633391c1aff1ea4e8988b5c9b60a SHA512 55c4aee31a73d42ce649385974ce78572cd28e4668bd82d1ad21913728ac5a537e336d16aeac7dfa3e25b99b4493f7ec6afdfa883b1cb91c7a91b67ffc65ac0d
 MISC metadata.xml 567 BLAKE2B d32a0402dd50cbc8bdb831468fd6dc538ad79e42ddbc2bc0078bdb015cafe3b63c970e224dc96a80446ecd977fd28d4331cc7aa5c43468222392d65bc36bba7e SHA512 87bec5b2634c5dbeb7838b0b34532a81050ad5469f483edef935b35ebf4c95d26ef946290b7e2aadb7b664baa132ce8ae9ce92bf3bde04101973438661133f8e
diff --git a/gui-apps/grim/grim-1.4.0-r1.ebuild b/gui-apps/grim/grim-1.4.0-r1.ebuild
new file mode 100644
index 000000000000..0883e35c818a
--- /dev/null
+++ b/gui-apps/grim/grim-1.4.0-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 meson
+
+DESCRIPTION="Grab images from a Wayland compositor"
+HOMEPAGE="https://github.com/emersion/grim"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	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"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="+man jpeg"
+
+DEPEND="
+	>=dev-libs/wayland-protocols-1.14
+	dev-libs/wayland
+	media-libs/libpng
+	x11-libs/pixman
+	jpeg? ( virtual/jpeg )"
+
+RDEPEND="${DEPEND}"
+BDEPEND="man? ( app-text/scdoc )"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature jpeg)
+		$(meson_feature man man-pages)
+		"-Dbash-completions=false"
+		"-Dfish-completions=false"
+		"-Dwerror=false"
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	newbashcomp contrib/completions/bash/grim.bash grim
+	insinto /usr/share/fish/vendor_completions.d/
+	doins contrib/completions/fish/grim.fish
+}
diff --git a/gui-apps/grim/grim-9999.ebuild b/gui-apps/grim/grim-9999.ebuild
index ca7406fc07a3..66522ea185c3 100644
--- a/gui-apps/grim/grim-9999.ebuild
+++ b/gui-apps/grim/grim-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit meson
+inherit bash-completion-r1 meson
 
 DESCRIPTION="Grab images from a Wayland compositor"
 HOMEPAGE="https://github.com/emersion/grim"
@@ -23,22 +23,28 @@ IUSE="+man jpeg"
 DEPEND="
 	>=dev-libs/wayland-protocols-1.14
 	dev-libs/wayland
-	jpeg? ( virtual/jpeg )
-	x11-libs/cairo"
+	media-libs/libpng
+	x11-libs/pixman
+	jpeg? ( virtual/jpeg )"
 
 RDEPEND="${DEPEND}"
-
-if [[ ${PV} == 9999 ]]; then
-	BDEPEND+="man? ( ~app-text/scdoc-9999 )"
-else
-	BDEPEND+="man? ( app-text/scdoc )"
-fi
+BDEPEND="man? ( app-text/scdoc )"
 
 src_configure() {
 	local emesonargs=(
 		$(meson_feature jpeg)
 		$(meson_feature man man-pages)
+		"-Dbash-completions=false"
+		"-Dfish-completions=false"
 		"-Dwerror=false"
 	)
 	meson_src_configure
 }
+
+src_install() {
+	meson_src_install
+
+	newbashcomp contrib/completions/bash/grim.bash grim
+	insinto /usr/share/fish/vendor_completions.d/
+	doins contrib/completions/grim.fish
+}
diff --git a/gui-apps/swayidle/Manifest b/gui-apps/swayidle/Manifest
index 8c0fc97d31c7..889214a23596 100644
--- a/gui-apps/swayidle/Manifest
+++ b/gui-apps/swayidle/Manifest
@@ -1,6 +1,6 @@
 DIST swayidle-1.7.1.tar.gz 13285 BLAKE2B 698f9d75977746631290b92787b33015483ffec4ed1b84386b393bfd20dd65a6dc309de6ef1a01b00b9b96563fcd423d5994d19f03094d1c1ac6382abde898a2 SHA512 6e0a6eb3b99a415414cac04299392ede9a8263fa5f4a75815742f5fcd4a5badb3021a7ff699a476c04ca2256b85f4149f8c8dda0484306636ffbaccff615d9da
 DIST swayidle-1.7.tar.gz 12458 BLAKE2B 06462d286e4786173d26241056c2b0c71a9253eac31e0b33bd70c5729ff172c3b8ab2c6377c3bc4a6f53cf580adbaac792d90f46da7f944bcc5a4055b642fe5a SHA512 26a48c510caaadb1ad694426e82880ab1547b7b0ef8ac62a2c2ee41c7b8cc0554f4925b0abdc6dc37f2501a171c0b6ae53c56b045b5c545093f3b0463aefcf24
-EBUILD swayidle-1.7.1.ebuild 1210 BLAKE2B 484e7880153a2f5c4ad375fea5b00ce72eafd11b26581de52c66f323dc26a3dfb7ae61a52e9c5cd85f399a1d6472eae33a030bb6c1c6f769f341e51134b2f973 SHA512 196db82c04def7f7f53af0b69b84efb17a904e1d5676ec39fe09311e2ce476652425b6e1ecd24b67fac744bfaf66d87f4d98ac76e8536305cc94ee727916dbfb
+EBUILD swayidle-1.7.1.ebuild 1207 BLAKE2B bb75eaae366662962fc9b4f56f149e9ca5d476f75bb8ab57a7af18e9e4bd0251ca8636d9a1dbbaae44a906395dd788f0234aea724d6e0480e5161d1571631960 SHA512 ac38b6f2c97c5770c45e570b3afefaf4e4bcfa471e9d1a4599eba0cfd923e6c07f4ac7d02a3ed0d38b7593a02fed4809d1f2c1cad42f30a6f87eb56e6bac98c5
 EBUILD swayidle-1.7.ebuild 1207 BLAKE2B e8d39b249e4b6333ee3ec3e38f0b71e3a5df39fa905c47cb1f01a58647862280b46773a1dd5ef2f0ab71088af93906a8dfb7d1c584c55e58400880a4c18a7d91 SHA512 686547da179458d1c126765f1d43832a0eb19ceeaa864727d98e26ded0098dd8ed31b90278df3d17a89771d82c0076f4da09ca49e62434c2eab58a687bb2eec3
 EBUILD swayidle-9999.ebuild 1210 BLAKE2B 9540d7e0a422d10c2eab5de2469b505d5d3c9ec3a3bc15e4f2d01692770fcbf964f526289cfdacb0a60a3ac9e252db5ea97e05d9822b404c5686b56e83eb1271 SHA512 5eab61f320978fda892ddac1d41c13a49067ce5de606541920dd5b71b7b4e47cb33316645d0f0cc2e75c7613e31ba4d75792e7b53254164ecbb30d9e6868422e
 MISC metadata.xml 959 BLAKE2B ed555644c99e03baa56ca2c152a6542747e0c473e9b063aeba5fab314161eea758919dff2d9aa635b63d520b7a9843b3d67b547043629619fee37a203e00ae3a SHA512 c5e82c2893b0da74e1994b998d6a8597ed3eb778125069fb416023cef4a1c693c69be6096a0d76d897572905040805863cd34e730ecd818e35e0db8942fd15ce
diff --git a/gui-apps/swayidle/swayidle-1.7.1.ebuild b/gui-apps/swayidle/swayidle-1.7.1.ebuild
index 21f7eca26556..d81957f482f9 100644
--- a/gui-apps/swayidle/swayidle-1.7.1.ebuild
+++ b/gui-apps/swayidle/swayidle-1.7.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/swaywm/${PN}.git"
 else
 	SRC_URI="https://github.com/swaywm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 fi
 
 LICENSE="MIT"
diff --git a/gui-apps/swaylock/Manifest b/gui-apps/swaylock/Manifest
index b16176160455..3fd42e89d3c5 100644
--- a/gui-apps/swaylock/Manifest
+++ b/gui-apps/swaylock/Manifest
@@ -1,6 +1,8 @@
 DIST swaylock-1.3.tar.gz 32848 BLAKE2B 81ed50839bcb0139e7fc2081bd37e738f3e6ef23e96a5108d1acf56cc3425285f7382576a54201f1bf188883b1da06492074c091877af13832c0140e4e6099fd SHA512 723d758d76f076f3f1539ea0d651f6ad2562659c72eef7e895d7827a0be21db663652fe4ce2609065aff45ff20230879599868cff327ab52b896330ca04d78c4
 DIST swaylock-1.5.tar.gz 35350 BLAKE2B c68073d6154842c2cdb99836bda991560605f6ede66c6124986c3395575a4e2c22d59a837a09033d1632b61628e45b18b3ee5ca198bafe4fbd8f429cb0401eda SHA512 16dd9b912ca702849290cf18d91ffbd64a70118cc284982a84b567c4974fd4590b12707c0aae1fcda7ccd1caa7880f342c633b9345bd795c36702916696d1f67
+DIST swaylock-1.6.tar.gz 36439 BLAKE2B 8944bbd5ec0dd719f8dc627dbf878fcf07df3f060b56bce3ab215a2c21fe43debfeac15f6ef7eba43415f3b94a75a335fd692e653ac48407c1cf10b400f8ff67 SHA512 9a472c25e53a41c461af41af31c7fc8b275754628d0b20f4e5085cd7ca514e68361293a6e93fb6fcb7632419a3c73e4578e03294af28fe62d944cc43339f280d
 EBUILD swaylock-1.3-r1.ebuild 1232 BLAKE2B f8184716c1c8c915e691ff2d8e0f506a0ad270b9c29ec518469f9be85e650edd38102118dd256f1846249e7e2adeb9783c1ad37cc33aa07f2f1d5b76fbf7698c SHA512 27b4798856b46dfb1a9ba96e4a481b3eaedee41ffcbe33440215272cc6e1c385b3b2d812886fe0cc90dfffd0c823e25b2b26ac231d314f89be9ee5b6af650e0b
 EBUILD swaylock-1.5-r1.ebuild 1125 BLAKE2B 0a5f87240f5e0a8bf9cc61082c3152d124f235ef95e3331aa1268a873ce5b7fbda1df70faf59711a236eb6d445f74dd0131cf4e4be9a62ff11eebe4f755fbc03 SHA512 cfd505253761181537f4d6c54b7423182fc43399f68cfdaaad012e5b1520a769944c07326fe584e0301f8a45422f40fa376b3beee76b542252f59bfd548dc1e4
-EBUILD swaylock-9999.ebuild 1121 BLAKE2B badfdfff80efb327700eba2c73f275e3c5b2254c7ce2d9663fc179a9fc30d49c8ce025ecc90bfd0f65ebb5d5bc561ad733fe187c25e9204e54db4a4fd2557287 SHA512 a1c6335bf5043d903b8c004ca5ac326fb584ddc16a5d5b8b7b5499e41834328f5dcd31377577fe3524fdd5ac883e7749e993da62e1cb00d8df0f726e79f93feb
+EBUILD swaylock-1.6-r1.ebuild 1158 BLAKE2B 8cfd1f56646bad6a17f34ceb969e8ea03df7dd3c03e787886d8ffea8e6b368091459cd892192d8d4e14907d61d3216c7d5495bef7e4c082fb387517802ec1a22 SHA512 e0862d9d5cee848736ad25e265d6190ef18307626f99513375d54004259d15f596807f8aacce301ff29ce3457e97bed6351dcdfaf8c028cb07c603a5a27a1405
+EBUILD swaylock-9999.ebuild 1161 BLAKE2B 74b18bf4eeca7d639ab3049b3131590490c896dbc244b47081ba8b14f15946b0faf52d4a9535bce0e0b2194111f5ebd0e43cfcac356c523c9f83fb4192f71e26 SHA512 e7ff99ad1f11e27bd30e273721e6c6a8488480e4acba775c1691b9a93a00c4ddc0cada0656bfad5bbfcef61e72a1f8fc94e492a4a27c5fb68bcb6454621d2855
 MISC metadata.xml 1182 BLAKE2B 26d1cd8d48c9d3cd61c9c00838f5ca27f5794e8ad23177c99f14b80e7b5fb0238b361feecb7f24c871e653532bcc7ac6ad797f554151002cad43faba4f3f3963 SHA512 e3a00a1c6f35bb616b8934e0b841930f8efdc282096cacf0a615478444090d49ac4062b3d5b0cdf40ea22cc0a9835d403ef7716aefaed8cae8cfe508a99ff879
diff --git a/gui-apps/swaylock/swaylock-1.6-r1.ebuild b/gui-apps/swaylock/swaylock-1.6-r1.ebuild
new file mode 100644
index 000000000000..fd98b0722227
--- /dev/null
+++ b/gui-apps/swaylock/swaylock-1.6-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit fcaps meson
+
+DESCRIPTION="Screen locker for Wayland"
+HOMEPAGE="https://github.com/swaywm/swaylock"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/swaywm/${PN}.git"
+else
+	SRC_URI="https://github.com/swaywm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="+gdk-pixbuf +man +pam"
+
+DEPEND="
+	dev-libs/wayland
+	x11-libs/cairo
+	x11-libs/libxkbcommon
+	gdk-pixbuf? ( x11-libs/gdk-pixbuf:2 )
+	pam? ( sys-libs/pam )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	>=dev-libs/wayland-protocols-1.25
+	>=dev-util/wayland-scanner-1.15
+	virtual/pkgconfig
+	man? ( app-text/scdoc )
+"
+
+src_configure() {
+	local emesonargs=(
+		-Dman-pages=$(usex man enabled disabled)
+		-Dpam=$(usex pam enabled disabled)
+		-Dgdk-pixbuf=$(usex gdk-pixbuf enabled disabled)
+		"-Dfish-completions=true"
+		"-Dzsh-completions=true"
+		"-Dbash-completions=true"
+		"-Dwerror=false"
+	)
+
+	meson_src_configure
+}
+
+pkg_postinst() {
+	if ! use pam; then
+		fcaps cap_sys_admin usr/bin/swaylock
+	fi
+}
diff --git a/gui-apps/swaylock/swaylock-9999.ebuild b/gui-apps/swaylock/swaylock-9999.ebuild
index c80f325049f7..41e00d116218 100644
--- a/gui-apps/swaylock/swaylock-9999.ebuild
+++ b/gui-apps/swaylock/swaylock-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/swaywm/${PN}.git"
 else
 	SRC_URI="https://github.com/swaywm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="MIT"
@@ -29,7 +29,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 BDEPEND="
-	>=dev-libs/wayland-protocols-1.14
+	>=dev-libs/wayland-protocols-1.25
+	>=dev-util/wayland-scanner-1.15
 	virtual/pkgconfig
 	man? ( app-text/scdoc )
 "
diff --git a/gui-apps/waypipe/Manifest b/gui-apps/waypipe/Manifest
index 9f684f192fd7..d8060e45c694 100644
--- a/gui-apps/waypipe/Manifest
+++ b/gui-apps/waypipe/Manifest
@@ -1,7 +1,7 @@
 AUX waypipe-0.7.2-no-simd.patch 2593 BLAKE2B e3af5ec9cafe957c68e2694e79a957bd90718c7f3c0926c1da125498f8c2e101ac41881cc800f80e931c2d2ec1f5b0fa34de82b50d085780e8c9d853aa15dc30 SHA512 26078c8d48a9e87f3ce37791e41cbfdf79ab96639264dfc63666e5c45e6728ddb2cfe76b6b90322b4a80a3e755b7b053213dead884fb270c59ab97f717c6e872
 DIST waypipe-0.7.2.tar.gz 202601 BLAKE2B bc8a03c8b47ee65a158ca45047f1989761c36b7b6fb5196784637f4e937fa2e5076497079f8368daf20592351e60a12fda5f4500b7220320b4c4a73ca9e5b1e0 SHA512 b126ea9d30864ecba67447793f39dbbe8bc73ab33c79879ac243023c64930e9aae887f13c0fdcc4cdf307b0ca6766b1012915dc88c596b7c250e3b35f6ba9190
 DIST waypipe-0.8.0.tar.gz 217533 BLAKE2B a2aebb9939acafae3eb693aa8fe344ab775e8d3e9a071e7291ab15a0f9869b681156b5730e42c04401648a32ad2a67d7a3bf95ff5f38e909e9309e00b1c69381 SHA512 853d36a9779e2fcb5ac7bcca6575d456685beadd8d918ec430a57b8359867849bdcb5d9c1edcd19eb8505f06a7758e8f53ba5354daa05f99491d5a45c330eeb2
-EBUILD waypipe-0.7.2-r1.ebuild 1936 BLAKE2B 08042cc637d927764d8a44aad30e766491c9f5417b721bb92a7539a8870193b741f9d390e3e0122ee62cd42d7076944ace78239ead0ff789beb836c73e2d45bd SHA512 21721836f3bfeec4f0f44655786ac44cc429334e5fadf5c19707dcb3b3b8e0cd38c942d050f7981156474bb2bf74488805cae1da666bba80db8828759d6b9c87
-EBUILD waypipe-0.8.0-r1.ebuild 1880 BLAKE2B 66ad6da8892c97a1ba53915dedc37f3fd6900adaca202f6624b5336a83e819e5ecd1022d87848678ef4288a1bd183c0625b9fcf5c90946fed31a01b39332ecfe SHA512 98f9d27d51f77f4676e9adc4206f6fb377d1af9150a97b0473237b5a3babd324ddc0d6f2bce82dfb76cb81ac1dcbf92a8cf9ebbd12586279632dea58a9280711
-EBUILD waypipe-9999.ebuild 1880 BLAKE2B 66ad6da8892c97a1ba53915dedc37f3fd6900adaca202f6624b5336a83e819e5ecd1022d87848678ef4288a1bd183c0625b9fcf5c90946fed31a01b39332ecfe SHA512 98f9d27d51f77f4676e9adc4206f6fb377d1af9150a97b0473237b5a3babd324ddc0d6f2bce82dfb76cb81ac1dcbf92a8cf9ebbd12586279632dea58a9280711
+EBUILD waypipe-0.7.2-r1.ebuild 1931 BLAKE2B d82e08d3d5c2cac7543a845fdd1e203b0d6a76c29296bd14604f6f7c9759c59f0f56cdf35707da68626b638a3551fcfc63a5bbf27cb69d40f0bc22e932b8bb69 SHA512 8ab1b5e618fffb6d1c90343d04acaa2028ac65c523873ea924410693610b93a174713ae40583274ad563aacde13df4579a7331acbd2680ca2b8ac88388bf1c9b
+EBUILD waypipe-0.8.0-r1.ebuild 1875 BLAKE2B a03034298ac259cab05a94ee38df0676dfa1f862d10ee54f2e9118f937248864d76affaec8d89d8ebde6d39b2469c9d4fe9a45e680d5db344d51bb9f68139e38 SHA512 39c1fcb70cf28848b1a4441ea2c28ab69f940e6a35f0e42c0c946ecebcb5067f99cf4c2661da3e25a214c0482eda2d67e395dd91fdf3fad48dc240294374b929
+EBUILD waypipe-9999.ebuild 1875 BLAKE2B a03034298ac259cab05a94ee38df0676dfa1f862d10ee54f2e9118f937248864d76affaec8d89d8ebde6d39b2469c9d4fe9a45e680d5db344d51bb9f68139e38 SHA512 39c1fcb70cf28848b1a4441ea2c28ab69f940e6a35f0e42c0c946ecebcb5067f99cf4c2661da3e25a214c0482eda2d67e395dd91fdf3fad48dc240294374b929
 MISC metadata.xml 697 BLAKE2B 0170be716ed47d7f8b3c249bb8c1f07e92b94b44234c5a4287bbabbc1a8f6fd801ec29cea4bd63319b02f8119544575867081b80db182ee4646cac8261d3b93c SHA512 86ef3b400cea10408fa2fd32b0767741241bf19e6abe8fbec4a2e7061bfe6d0d922aaa15e20b3ae3ea3914f6236bcc6bb5d8f11ee90d35a78e7eda84ed154639
diff --git a/gui-apps/waypipe/waypipe-0.7.2-r1.ebuild b/gui-apps/waypipe/waypipe-0.7.2-r1.ebuild
index ea63e6c5435b..e4870877181c 100644
--- a/gui-apps/waypipe/waypipe-0.7.2-r1.ebuild
+++ b/gui-apps/waypipe/waypipe-0.7.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -29,7 +29,7 @@ WAYPIPE_FLAG_MAP=(
 	"${WAYPIPE_FLAG_MAP_ARM[@]/#/cpu_flags_arm_}"
 )
 
-IUSE="dmabuf ffmpeg lz4 man neon systemtap test vaapi zstd ${WAYPIPE_FLAG_MAP[@]%:*}"
+IUSE="dmabuf ffmpeg lz4 man systemtap test vaapi zstd ${WAYPIPE_FLAG_MAP[@]%:*}"
 REQUIRED_USE="vaapi? ( ffmpeg )"
 RESTRICT="!test? ( test )"
 
diff --git a/gui-apps/waypipe/waypipe-0.8.0-r1.ebuild b/gui-apps/waypipe/waypipe-0.8.0-r1.ebuild
index 32359fd9fa55..0a113f6b31c7 100644
--- a/gui-apps/waypipe/waypipe-0.8.0-r1.ebuild
+++ b/gui-apps/waypipe/waypipe-0.8.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -29,7 +29,7 @@ WAYPIPE_FLAG_MAP=(
 	"${WAYPIPE_FLAG_MAP_ARM[@]/#/cpu_flags_arm_}"
 )
 
-IUSE="dmabuf ffmpeg lz4 man neon systemtap test vaapi zstd ${WAYPIPE_FLAG_MAP[@]%:*}"
+IUSE="dmabuf ffmpeg lz4 man systemtap test vaapi zstd ${WAYPIPE_FLAG_MAP[@]%:*}"
 REQUIRED_USE="vaapi? ( ffmpeg )"
 RESTRICT="!test? ( test )"
 
diff --git a/gui-apps/waypipe/waypipe-9999.ebuild b/gui-apps/waypipe/waypipe-9999.ebuild
index 32359fd9fa55..0a113f6b31c7 100644
--- a/gui-apps/waypipe/waypipe-9999.ebuild
+++ b/gui-apps/waypipe/waypipe-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -29,7 +29,7 @@ WAYPIPE_FLAG_MAP=(
 	"${WAYPIPE_FLAG_MAP_ARM[@]/#/cpu_flags_arm_}"
 )
 
-IUSE="dmabuf ffmpeg lz4 man neon systemtap test vaapi zstd ${WAYPIPE_FLAG_MAP[@]%:*}"
+IUSE="dmabuf ffmpeg lz4 man systemtap test vaapi zstd ${WAYPIPE_FLAG_MAP[@]%:*}"
 REQUIRED_USE="vaapi? ( ffmpeg )"
 RESTRICT="!test? ( test )"
 
diff --git a/gui-apps/wl-clipboard/Manifest b/gui-apps/wl-clipboard/Manifest
index ec64d1f5f898..73349d2b309e 100644
--- a/gui-apps/wl-clipboard/Manifest
+++ b/gui-apps/wl-clipboard/Manifest
@@ -1,6 +1,6 @@
 DIST wl-clipboard-1.0.0.tar.gz 25442 BLAKE2B 02e2e99287e1376f26f73a546654e66ddb9d0a85caf457e4a023f0a02cb4d7a9cb3c8ab5840982bf014afb9fc3601722dd4c2fc4239b74a05d309a0a16d20299 SHA512 328c18a9eb2ccfc788e7ab785077ab8d663c75f2ce8f6f434799575fc76ccc89238faf930948bced216d22bee0adfc810af5e84ffc63bc82c4e1d02da4286296
 DIST wl-clipboard-2.0.0.tar.gz 41922 BLAKE2B 6c133f4fc1d70871942cc8ab8ed709a300b9f1370b14869840ed620d866aedc18df8955fcade78affa9317aaee2a1f5c57d04e2e735c94c96049e29e019aadf8 SHA512 a719b7197b0dec247ef50d800d8f10f3c377e41ff6d79ebfb4da50f2581d24a25ff987985e7a8f68842fdf8e706527d0b9ee3545c0044673110963b3ba8b55f1
 EBUILD wl-clipboard-1.0.0.ebuild 527 BLAKE2B d87f1e30fea02987694b1b18f687a2c878de9487503890f0d2af5a49aa2f8f1125c8bf6d111b87bf38f2daabaf300cde98db2e2d23c4c7fc21311a5b9de0c744 SHA512 5f3c2054f621b3509acf97bd54a51941833bb9d56921d9f5699c8cfc0cbb4761c26839b0c773b084b38c65d62818974f31ef8dd3262123796673ccc144623fa0
-EBUILD wl-clipboard-2.0.0.ebuild 551 BLAKE2B f00fba838c8eada991437326ff52296887272a9442ffad824bec70d6971baa0bd9bdee44be973ee6731e964b48a86c2efbef04cb5605d44776dbe9a4e80b1d05 SHA512 c234d482300c345becd7969cbfccb8aea9e0b072a7348d48b40e4a08d5c9ffa5e3e1d8c3014ac9aae7c665377a62cc5a8c6a2b660342ae816d8a23b7aa6a2641
+EBUILD wl-clipboard-2.0.0.ebuild 550 BLAKE2B a5146985748d32292a64b84230c15105b594ecce35c54410e85cd5fdf1b66e5abb90fee3e8ad08500035c996868b1003854b9fbbd423c8ef619bfe6d9da58c7b SHA512 d7900b672f898a17bf42256c6804c275f3fec92e81f7ae7f1e4e78af56f52948cde0c81df9a78b96b453e952fc64f89ba9b48fca68ca9aebc87cfd7480f9fe34
 EBUILD wl-clipboard-9999.ebuild 529 BLAKE2B 6c7e2ea8d53f0808cfe26393b509228d500d4e482df59ace44676cb724ed37512bfb6bad615d83d425d92935e887a07d435550fa5c69aadb6cda2395bfb3d614 SHA512 633d31e5ceb47eb82e94928099b4e65fe9fde0b77ed0849952ff5bb5a5262daf5ddafba4787f97b9fa8288a3ac60f709ab1b9b14775f146b129b1fa20fea783f
 MISC metadata.xml 468 BLAKE2B 4831c7406109ae1ccdd7af9cbd780f91cfbf23153de38b8bf3280fed440e90b38724a64b21570dbfd64795109495902999f5a28788aaf7d627264f9c811b9865 SHA512 753d3918a25a5a416758bf37b9c1d5c15961d62a876e67263d3a3c9391dc49cc4bd6cdf4816ca855f5e49d93ad308a319f9fe007e37f3e88480c2ed2a996ed41
diff --git a/gui-apps/wl-clipboard/wl-clipboard-2.0.0.ebuild b/gui-apps/wl-clipboard/wl-clipboard-2.0.0.ebuild
index abb7b4591d7e..9bf6a274354b 100644
--- a/gui-apps/wl-clipboard/wl-clipboard-2.0.0.ebuild
+++ b/gui-apps/wl-clipboard/wl-clipboard-2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/bugaevc/${PN}.git"
 else
 	SRC_URI="https://github.com/bugaevc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 fi
 
 LICENSE="GPL-3"