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

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

commit:     19889d36b05fae14f96eb01ea09b609a5ff708e2
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 27 08:26:34 2023 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Thu Jul 27 08:27:38 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19889d36

x11-misc/xscreensaver: install xscreensaver's systemd user unit

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

 .../{xscreensaver-6.06.ebuild => xscreensaver-6.06-r1.ebuild} | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/x11-misc/xscreensaver/xscreensaver-6.06.ebuild b/x11-misc/xscreensaver/xscreensaver-6.06-r1.ebuild
similarity index 95%
rename from x11-misc/xscreensaver/xscreensaver-6.06.ebuild
rename to x11-misc/xscreensaver/xscreensaver-6.06-r1.ebuild
index 02ae75c68a51..48ddc842e1b5 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.06.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.06-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit autotools flag-o-matic font optfeature pam strip-linguas xdg-utils
+inherit autotools flag-o-matic font optfeature pam strip-linguas systemd xdg-utils
 
 DESCRIPTION="Modular screen saver and locker for the X Window System"
 HOMEPAGE="https://www.jwz.org/xscreensaver/"
@@ -220,10 +220,13 @@ src_install() {
 	#if ! use gtk; then
 	#	rm "${ED}/usr/bin/xscreensaver-demo" || die
 	#fi
-	# Makefile installs xscreensaver.service regardless of --without-systemd
-	if ! use systemd; then
-		rm "${ED}/usr/share/${PN}/xscreensaver.service" || die
+	if use systemd; then
+		systemd_douserunit "${ED}/usr/share/${PN}/xscreensaver.service"
 	fi
+	# Makefile installs xscreensaver.service regardless of
+	# --without-systemd, and if USE=systemd, we will have installed the
+	# unit file already.
+	rm "${ED}/usr/share/${PN}/xscreensaver.service" || die
 
 	# bug #885989
 	fperms 4755 /usr/$(get_libdir)/misc/xscreensaver/xscreensaver-auth