public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "David Roman" <davidroman96@gmail.com>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/guru:master commit in: gui-apps/swaylock-plugin/
Date: Thu, 02 Jan 2025 19:26:51 +0000 (UTC)	[thread overview]
Message-ID: <1735733746.3749e5bd3df9e10ad46c618e0219d53715bdfc80.davidroman@gentoo> (raw)

commit:     3749e5bd3df9e10ad46c618e0219d53715bdfc80
Author:     Pascal Jäger <pascal.jaeger <AT> leimstift <DOT> de>
AuthorDate: Wed Jan  1 12:15:46 2025 +0000
Commit:     David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Wed Jan  1 12:15:46 2025 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=3749e5bd

gui-apps/swaylock-plugin: add 1.8.0, revisit 9999

Signed-off-by: Pascal Jäger <pascal.jaeger <AT> leimstift.de>

 gui-apps/swaylock-plugin/Manifest                  |  1 +
 ...in-9999.ebuild => swaylock-plugin-1.8.0.ebuild} | 20 +++++++++++---------
 .../swaylock-plugin/swaylock-plugin-9999.ebuild    | 22 ++++++++++++----------
 3 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/gui-apps/swaylock-plugin/Manifest b/gui-apps/swaylock-plugin/Manifest
new file mode 100644
index 000000000..5cbe1c270
--- /dev/null
+++ b/gui-apps/swaylock-plugin/Manifest
@@ -0,0 +1 @@
+DIST swaylock-plugin-1.8.0.tar.gz 59493 BLAKE2B 9fd42754d40e05db4b0aef803b6871eb7b33a5298325bb60d9c3d05f81eb3914b93c1348cc2100260a41d7482c089651ac2ba6bc22350402c6b2810b68e683bd SHA512 2d2302da92bbef76d4e599f5e8238bda05e90d473a8364f331a535998ead0e199ff769ac2eabf1508a5b0a3891ef9d412ae09bebe6697c81244ff3cdad1989b7

diff --git a/gui-apps/swaylock-plugin/swaylock-plugin-9999.ebuild b/gui-apps/swaylock-plugin/swaylock-plugin-1.8.0.ebuild
similarity index 71%
copy from gui-apps/swaylock-plugin/swaylock-plugin-9999.ebuild
copy to gui-apps/swaylock-plugin/swaylock-plugin-1.8.0.ebuild
index 17a896edb..3f2b0bf19 100644
--- a/gui-apps/swaylock-plugin/swaylock-plugin-9999.ebuild
+++ b/gui-apps/swaylock-plugin/swaylock-plugin-1.8.0.ebuild
@@ -1,15 +1,21 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit fcaps git-r3 meson
+inherit fcaps meson
+
+if [[ "${PV}" == 9999 ]]
+then
+	  inherit git-r3
+	  EGIT_REPO_URI="https://github.com/mstoeckl/${PN}.git"
+else
+	SRC_URI="https://github.com/mstoeckl/swaylock-plugin/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
 
 DESCRIPTION="Fork of Swaylock that supports animated backgrounds"
 HOMEPAGE="https://github.com/mstoeckl/swaylock-plugin"
-
-EGIT_REPO_URI="https://github.com/mstoeckl/${PN}.git"
-
 LICENSE="MIT"
 SLOT="0"
 IUSE="+gdk-pixbuf +man +pam"
@@ -50,8 +56,4 @@ pkg_postinst() {
 	if ! use pam; then
 		fcaps cap_sys_admin usr/bin/swaylock
 	fi
-	# see https://github.com/mstoeckl/swaylock-plugin/issues/8
-	elog "If gui-apps/swaylock is not installed alongside, "
-	elog "symlink /etc/pam.d/swaylock to /etc/pam.d/swaylock-plugin."
-	elog "!!! Otherwise swaylock plugin will work but can not unlock !!!"
 }

diff --git a/gui-apps/swaylock-plugin/swaylock-plugin-9999.ebuild b/gui-apps/swaylock-plugin/swaylock-plugin-9999.ebuild
index 17a896edb..6ba39a696 100644
--- a/gui-apps/swaylock-plugin/swaylock-plugin-9999.ebuild
+++ b/gui-apps/swaylock-plugin/swaylock-plugin-9999.ebuild
@@ -1,15 +1,21 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit fcaps git-r3 meson
+inherit fcaps meson
+
+if [[ "${PV}" == 9999 ]]
+then
+	  inherit git-r3
+	  EGIT_REPO_URI="https://github.com/mstoeckl/${PN}.git"
+else
+	SRC_URI="https://github.com/mstoeckl/swaylock-plugin/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
 
 DESCRIPTION="Fork of Swaylock that supports animated backgrounds"
 HOMEPAGE="https://github.com/mstoeckl/swaylock-plugin"
-
-EGIT_REPO_URI="https://github.com/mstoeckl/${PN}.git"
-
 LICENSE="MIT"
 SLOT="0"
 IUSE="+gdk-pixbuf +man +pam"
@@ -48,10 +54,6 @@ src_configure() {
 
 pkg_postinst() {
 	if ! use pam; then
-		fcaps cap_sys_admin usr/bin/swaylock
+		  fcaps cap_sys_admin usr/bin/swaylock
 	fi
-	# see https://github.com/mstoeckl/swaylock-plugin/issues/8
-	elog "If gui-apps/swaylock is not installed alongside, "
-	elog "symlink /etc/pam.d/swaylock to /etc/pam.d/swaylock-plugin."
-	elog "!!! Otherwise swaylock plugin will work but can not unlock !!!"
 }


             reply	other threads:[~2025-01-02 19:26 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-01-02 19:26 David Roman [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-12-14  7:25 [gentoo-commits] repo/proj/guru:master commit in: gui-apps/swaylock-plugin/ Viorel Munteanu
2023-12-13 12:15 David Roman
2023-12-13 12:15 David Roman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1735733746.3749e5bd3df9e10ad46c618e0219d53715bdfc80.davidroman@gentoo \
    --to=davidroman96@gmail.com \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox