gentoo resync : 20.03.2022

3 files changed, 63 insertions, 4 deletions

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 )
 "