gui-libs/gtk-session-lock: improve ebuild and fix tests

* tests on gtk-session-lock work very similar to gtk-layer-shell
* the same logic was applied, also most of the depedency are the same
* also add gtk-layer-shell as depedency for test only

Closes: https://bugs.gentoo.org/930470
Signed-off-by: Gonçalo Negrier Duarte <gonegrier.duarte@gmail.com>

3 files changed, 56 insertions, 46 deletions

diff --git a/gui-libs/gtk-session-lock/gtk-session-lock-0.2.0-r3.ebuild b/gui-libs/gtk-session-lock/gtk-session-lock-0.2.0-r3.ebuild
deleted file mode 100644
index 1da545eeb..000000000
--- a/gui-libs/gtk-session-lock/gtk-session-lock-0.2.0-r3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson
-
-DESCRIPTION="GTK-based lockscreen for Wayland"
-HOMEPAGE="https://github.com/Cu3PO42/${PN}"
-SRC_URI="https://github.com/Cu3PO42/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="examples docs"
-#RESTRICT="!test? ( test )"
-RDEPEND="
-	sys-libs/pam
-	x11-libs/gtk+:3[wayland]
-"
-DEPEND="
-	${DEPEND}
-	>=dev-libs/wayland-protocols-1.34
-	gui-libs/gtk-layer-shell
-"
-BDEPEND="
-	dev-util/wayland-scanner
-	virtual/pkgconfig
-	dev-build/meson
-"
-
-src_configure() {
-    local emesonargs=(
-		$(meson_use examples examples)
-		#$(meson_use test tests)
-		$(meson_use docs docs)
-		-Dintrospection=true
-		-Dvapi=false
-	)
-    meson_src_configure
-}
diff --git a/gui-libs/gtk-session-lock/gtk-session-lock-0.2.0-r4.ebuild b/gui-libs/gtk-session-lock/gtk-session-lock-0.2.0-r4.ebuild
new file mode 100644
index 000000000..24f6a72b4
--- /dev/null
+++ b/gui-libs/gtk-session-lock/gtk-session-lock-0.2.0-r4.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+VALA_USE_DEPEND="vapigen"
+inherit vala meson python-any-r1
+
+SRC_URI="https://github.com/Cu3PO42/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+DESCRIPTION="GTK-based lockscreen for Wayland"
+HOMEPAGE="https://github.com/Cu3PO42/${PN}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="examples gtk-doc introspection test vala"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="vala? ( introspection )"
+RDEPEND="
+	sys-libs/pam
+"
+DEPEND="
+	${DEPEND}
+	x11-libs/gtk+:3[introspection?,wayland]
+	>=dev-libs/wayland-1.22.0
+	>=dev-libs/wayland-protocols-1.34
+	test? ( gui-libs/gtk-layer-shell[introspection?] )
+"
+BDEPEND="
+	dev-util/wayland-scanner
+	virtual/pkgconfig
+	dev-build/meson
+	gtk-doc? ( dev-util/gtk-doc )
+	test? ( ${PYTHON_DEPS} )
+	vala? ( $(vala_depend)
+"
+
+src_prepare() {
+	default
+	use vala && vala_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use examples)
+		$(meson_use gtk-doc docs)
+		$(meson_use test tests)
+		$(meson_use introspection)
+		$(meson_use vala vapi)
+	)
+	meson_src_configure
+}
diff --git a/gui-libs/gtk-session-lock/metadata.xml b/gui-libs/gtk-session-lock/metadata.xml
index b0237f3c5..c83b15397 100644
--- a/gui-libs/gtk-session-lock/metadata.xml
+++ b/gui-libs/gtk-session-lock/metadata.xml
@@ -8,8 +8,4 @@
 	<upstream>
 		<remote-id type="github">Cu3PO42/gtk-session-lock</remote-id>
 	</upstream>
-	<use>
-		<flag name="examples">Build example applications</flag>
-		<flag name="docs">Build devhelp API documentation</flag>
-	</use>
 </pkgmetadata>