[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/

["Florian Schmaus" <flow@gentoo.org>]

commit:     e9e83b4c602ed4ea444f2ba31e13a06c592de57a
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 15 15:51:06 2023 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Tue Aug 15 15:53:13 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9e83b4c

x11-misc/xscreensaver: add logind-idle-hint USE flag

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 x11-misc/xscreensaver/Manifest                    |  1 +
 x11-misc/xscreensaver/metadata.xml                |  1 +
 x11-misc/xscreensaver/xscreensaver-6.06-r2.ebuild | 15 +++++++++++++--
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index ed7fe38af259..890c5ea07d5b 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -1,2 +1,3 @@
 DIST xscreensaver-6.05.1.tar.gz 26110057 BLAKE2B 97c16c9f0b2a0b4d00ddccd711b921ca683bd233bc3d07ecad38b68ff94b149a20512246dd6bae052323f00b1b433f56469c5638a031cbc65b61c2b84a0180e3 SHA512 c659a769ff71020b9f96b7e707bd1bcc667eb304179305d56b1be45eed095d650a8aa019890a0c5d444672f9dd68516c99c53b0df94cd96196d7f30a24b987e3
+DIST xscreensaver-6.06-logind-idle-hint.patch 4036 BLAKE2B 48c2766ff5879b77f521d17f08452c84a9c926fabba932a02d02615808f6f2503ed2be4bbfd71f21152ba833c7f4cc0d672cdc219b82729963d6d357c6198682 SHA512 fd9848843c43a5eb07007e5cca21ad1517cce1e3ebecd9d678bb6287b9b7f80eee0751b5789f2ed9fb5e0cefa2430ac9d9657aade724d70c6457cce3df1f6ea3
 DIST xscreensaver-6.06.tar.gz 26334374 BLAKE2B f15a439430bbca0852926c15716d3c4b22148d8c36d60b18ab033454d4df0d981400029b32e1f30a061592273deb648453db91813994b9bc4d6c66a61774a5d1 SHA512 988e30d422ef985ac348c275e098ddfe1ee034a2e916c91690ee2836c908801c1e017e22d828aca981b0f8bfc5491cd83ab7c45aabc155ba5013df8b149cbcb5

diff --git a/x11-misc/xscreensaver/metadata.xml b/x11-misc/xscreensaver/metadata.xml
index 11a85b2711e6..9963b899eb86 100644
--- a/x11-misc/xscreensaver/metadata.xml
+++ b/x11-misc/xscreensaver/metadata.xml
@@ -22,6 +22,7 @@
 		<flag name="gles" restrict="&gt;=x11-misc/xscreensaver-6.0.2">Emulate OpenGL 1.3 in terms of OpenGL ES 1.x</flag>
 		<flag name="glx" restrict="&gt;=x11-misc/xscreensaver-6.0.2">Use GLX to interface OpenGL and X11 instead of EGL</flag>
 		<flag name="locking">Compile in support for locking the display</flag>
+		<flag name="logind-idle-hint">Send the session idle hint to logind once the screen saver blanks</flag>
 		<flag name="new-login">Enable user switching support using gdmflexiserver (<pkg>x11-misc/lightdm</pkg>)</flag>
 	</use>
 </pkgmetadata>

diff --git a/x11-misc/xscreensaver/xscreensaver-6.06-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-6.06-r2.ebuild
index a3b38814fc7b..f8f1164d0bae 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.06-r2.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.06-r2.ebuild
@@ -7,7 +7,13 @@ inherit autotools flag-o-matic font optfeature pam strip-linguas systemd xdg-uti
 
 DESCRIPTION="Modular screen saver and locker for the X Window System"
 HOMEPAGE="https://www.jwz.org/xscreensaver/"
-SRC_URI="https://www.jwz.org/xscreensaver/${P}.tar.gz"
+SRC_URI="
+	https://www.jwz.org/xscreensaver/${P}.tar.gz
+	logind-idle-hint? (
+		https://github.com/Flowdalic/xscreensaver/commit/59e7974c42dc08411c9af2a3a644a582c2116f46.patch ->
+			${PN}-6.06-logind-idle-hint.patch
+	)
+"
 
 # Font license mapping for folder ./hacks/fonts/ as following:
 #   clacon.ttf       -- MIT
@@ -18,11 +24,12 @@ SRC_URI="https://www.jwz.org/xscreensaver/${P}.tar.gz"
 LICENSE="BSD fonts? ( MIT Apache-2.0 )"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="elogind fonts gdm gles glx jpeg +locking new-login offensive pam +perl selinux suid systemd xinerama"
+IUSE="elogind fonts gdm gles glx jpeg +locking logind-idle-hint new-login offensive pam +perl selinux suid systemd xinerama"
 REQUIRED_USE="
 	gles? ( !glx )
 	?? ( elogind systemd )
 	pam? ( locking )
+	logind-idle-hint? ( || ( elogind systemd ) )
 "
 
 COMMON_DEPEND="
@@ -129,6 +136,10 @@ src_prepare() {
 		eapply "${FILESDIR}/xscreensaver-6.05-teach-handsy-some-manners.patch"
 	fi
 
+	if use logind-idle-hint; then
+		eapply "${DISTDIR}/${PN}-6.06-logind-idle-hint.patch"
+	fi
+
 	config_rpath_update "${S}"/config.rpath
 
 	# Must be eauto*re*conf, to force the rebuild