From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BB1C415800A for ; Thu, 27 Jul 2023 08:27:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F02DCE076B; Thu, 27 Jul 2023 08:27:43 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D6848E076B for ; Thu, 27 Jul 2023 08:27:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id ED63E3413CA for ; Thu, 27 Jul 2023 08:27:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 77200DC7 for ; Thu, 27 Jul 2023 08:27:41 +0000 (UTC) From: "Florian Schmaus" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Florian Schmaus" Message-ID: <1690446458.19889d36b05fae14f96eb01ea09b609a5ff708e2.flow@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-misc/xscreensaver/xscreensaver-6.06-r1.ebuild x11-misc/xscreensaver/xscreensaver-6.06.ebuild X-VCS-Directories: x11-misc/xscreensaver/ X-VCS-Committer: flow X-VCS-Committer-Name: Florian Schmaus X-VCS-Revision: 19889d36b05fae14f96eb01ea09b609a5ff708e2 X-VCS-Branch: master Date: Thu, 27 Jul 2023 08:27:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d802596e-a931-48b6-8281-9747c7194c1e X-Archives-Hash: 13f61dff017cb4e8dcf2b81d22f7ca83 commit: 19889d36b05fae14f96eb01ea09b609a5ff708e2 Author: Florian Schmaus gentoo org> AuthorDate: Thu Jul 27 08:26:34 2023 +0000 Commit: Florian Schmaus gentoo 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 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