From eacbcf3fbb52865b0547a784e3747cc7e2a2e6de Mon Sep 17 00:00:00 2001
From: Sam James <sam@gentoo.org>
Date: Tue, 8 Mar 2022 12:17:21 +0000
Subject: gui-apps/swaylock: fix 1.6 Wayland dependencies

Bug: https://bugs.gentoo.org/834716
Closes: https://bugs.gentoo.org/834776
Signed-off-by: Sam James <sam@gentoo.org>
---
 gui-apps/swaylock/swaylock-1.6-r1.ebuild | 56 ++++++++++++++++++++++++++++++++
 gui-apps/swaylock/swaylock-1.6.ebuild    | 55 -------------------------------
 gui-apps/swaylock/swaylock-9999.ebuild   |  3 +-
 3 files changed, 58 insertions(+), 56 deletions(-)
 create mode 100644 gui-apps/swaylock/swaylock-1.6-r1.ebuild
 delete mode 100644 gui-apps/swaylock/swaylock-1.6.ebuild

(limited to 'gui-apps')

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..41e00d116218
--- /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-1.6.ebuild b/gui-apps/swaylock/swaylock-1.6.ebuild
deleted file mode 100644
index 91eb6b1360d6..000000000000
--- a/gui-apps/swaylock/swaylock-1.6.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# 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.14
-	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 657a97f351df..41e00d116218 100644
--- a/gui-apps/swaylock/swaylock-9999.ebuild
+++ b/gui-apps/swaylock/swaylock-9999.ebuild
@@ -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 )
 "
-- 
cgit v1.2.3-65-gdbad