commit: fe97381e24a4913b2c87cd3fb0ed303f1a97d153
Author: Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail <DOT> com>
AuthorDate: Mon Apr 22 15:10:57 2024 +0000
Commit: Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail <DOT> com>
CommitDate: Mon Apr 22 15:38:46 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=fe97381e
gui-apps/gtklock: drop 2.0.1, add 3.0.0
Signed-off-by: Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail.com>
gui-apps/gtklock/Manifest | 3 +--
.../gtklock/files/gtklock-2.0.1-makefile.patch | 13 -----------
.../gtklock/files/gtklock-2.1.0-makefile.patch | 13 -----------
gui-apps/gtklock/gtklock-2.0.1.ebuild | 21 -----------------
.../{gtklock-2.1.0.ebuild => gtklock-3.0.0.ebuild} | 27 ++++++++++++++++------
5 files changed, 21 insertions(+), 56 deletions(-)
diff --git a/gui-apps/gtklock/Manifest b/gui-apps/gtklock/Manifest
index 2f1b1500c6..a9aaa4a02b 100644
--- a/gui-apps/gtklock/Manifest
+++ b/gui-apps/gtklock/Manifest
@@ -1,2 +1 @@
-DIST gtklock-2.0.1.tar.gz 56129 BLAKE2B
70b0aa3be5430665314d50f2d1322a4c57e7202b44b579f06712608b34797928b050aedb5a1c86e98d80a16f8c90fbd1a9b466a499ed04c44ef690805ea6bbf7
SHA512
d9ef0bacf78bcfaf71b4252b8f48678970b044a8fb4de4ab6e6c8a7ac5047b5ad1092401b5f1f57fd009cd9bf508ed7390ef84b71dffa2e994b74b996d7136f3
-DIST gtklock-2.1.0.tar.gz 56550 BLAKE2B
1875321d501970e82d75e32a76629697ef27fa049f795e0f9f3cb30a400ef30aec5f93b4bac9bc6049dc599ed8df8529ab22d6452ee7dd37336e96b40952bda7
SHA512
63fedae301089d922804398aa957eb784778ec033f0f7fd49e85fef0bbf6a029942e55751bcb05e99ded6c42ea88d601531a3b81cd33509ba0cae4cf81d84ce8
+DIST gtklock-3.0.0.tar.gz 54555 BLAKE2B
9c109c37cb3390bfd01b0a54446ec45bb9b4b234bdc547cf4b1c0bd77daf87743f9e4d22c687800f42ae77b81d169874ede203f8f38f6f07bc0612147cdcf60e
SHA512
01c3d4eea155c1d8472f191af5ab6c66509cd7bd3c4b9b7beb1c50005d6015d977474d85e0da5a307e8a6a970456a89ef1b86fb5b218a7943ebc57f710bf534b
diff --git a/gui-apps/gtklock/files/gtklock-2.0.1-makefile.patch
b/gui-apps/gtklock/files/gtklock-2.0.1-makefile.patch
deleted file mode 100644
index bb62649ac7..0000000000
--- a/gui-apps/gtklock/files/gtklock-2.0.1-makefile.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/makefile b/makefile
-index 6541641..4c2b2bd 100644
---- a/makefile
-+++ b/makefile
-@@ -8,7 +8,7 @@ MAJOR_VERSION := 2
- MINOR_VERSION := 0
- MICRO_VERSION := 0
-
--PREFIX = /usr/local
-+PREFIX = /usr
- INSTALL = install
-
- LIBS := pam wayland-client gtk+-wayland-3.0 gtk-layer-shell-0
gmodule-export-2.0
diff --git a/gui-apps/gtklock/files/gtklock-2.1.0-makefile.patch
b/gui-apps/gtklock/files/gtklock-2.1.0-makefile.patch
deleted file mode 100644
index 7d5a8dd008..0000000000
--- a/gui-apps/gtklock/files/gtklock-2.1.0-makefile.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/makefile b/makefile
-index 0d01ffb..e918d0b 100644
---- a/makefile
-+++ b/makefile
-@@ -8,7 +8,7 @@ MAJOR_VERSION := 2
- MINOR_VERSION := 1
- MICRO_VERSION := 0
-
--PREFIX = /usr/local
-+PREFIX = /usr
- SYSCONFDIR = $(PREFIX)/etc
-
- ifeq '$(shell uname)' 'Linux'
diff --git a/gui-apps/gtklock/gtklock-2.0.1.ebuild
b/gui-apps/gtklock/gtklock-2.0.1.ebuild
deleted file mode 100644
index be9e541f9d..0000000000
--- a/gui-apps/gtklock/gtklock-2.0.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="GTK-based lockscreen for Wayland"
-HOMEPAGE="https://github.com/jovanlanik/gtklock";
-SRC_URI="https://github.com/jovanlanik/${PN}/archive/v${PV}.tar.gz ->
${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="sys-libs/pam
- >=gui-libs/gtk-layer-shell-0.6.0"
-
-BDEPEND="app-text/scdoc"
-
-PATCHES=(
- "${FILESDIR}"/"${P}"-makefile.patch
-)
diff --git a/gui-apps/gtklock/gtklock-2.1.0.ebuild
b/gui-apps/gtklock/gtklock-3.0.0.ebuild
similarity index 51%
rename from gui-apps/gtklock/gtklock-2.1.0.ebuild
rename to gui-apps/gtklock/gtklock-3.0.0.ebuild
index be9e541f9d..1f3d329c3c 100644
--- a/gui-apps/gtklock/gtklock-2.1.0.ebuild
+++ b/gui-apps/gtklock/gtklock-3.0.0.ebuild
@@ -3,6 +3,8 @@
EAPI=8
+inherit meson
+
DESCRIPTION="GTK-based lockscreen for Wayland"
HOMEPAGE="https://github.com/jovanlanik/gtklock";
SRC_URI="https://github.com/jovanlanik/${PN}/archive/v${PV}.tar.gz ->
${P}.tar.gz"
@@ -11,11 +13,22 @@ LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64"
-RDEPEND="sys-libs/pam
- >=gui-libs/gtk-layer-shell-0.6.0"
-
-BDEPEND="app-text/scdoc"
+IUSE="man"
+RDEPEND="
+ sys-libs/pam
+ x11-libs/gtk+:3[wayland]
+ gui-libs/gtk-session-lock
+"
+DEPEND="${DEPEND}"
+BDEPEND="
+ virtual/pkgconfig
+ dev-build/meson
+ man? ( app-text/scdoc )
+"
-PATCHES=(
- "${FILESDIR}"/"${P}"-makefile.patch
-)
+src_configure() {
+ local emesonargs=(
+ $(meson_feature man man-pages)
+ )
+ meson_src_configure
+}
