From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1554459-garchives=archives.gentoo.org@lists.gentoo.org>
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 01193158089
for <garchives@archives.gentoo.org>; Thu, 14 Sep 2023 16:35:27 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 2AF262BC01A;
Thu, 14 Sep 2023 16:35:26 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.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 157B22BC01A
for <gentoo-commits@lists.gentoo.org>; Thu, 14 Sep 2023 16:35:26 +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 4C1B6335C87
for <gentoo-commits@lists.gentoo.org>; Thu, 14 Sep 2023 16:35:25 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id D91801113
for <gentoo-commits@lists.gentoo.org>; Thu, 14 Sep 2023 16:35:23 +0000 (UTC)
From: "Florian Schmaus" <flow@gentoo.org>
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" <flow@gentoo.org>
Message-ID: <1694709320.039ff3c0f69b9c4ab2b4a134ec10619d70d5c717.flow@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/
X-VCS-Repository: repo/gentoo
X-VCS-Files: x11-misc/xscreensaver/Manifest x11-misc/xscreensaver/xscreensaver-6.07-r2.ebuild x11-misc/xscreensaver/xscreensaver-6.07.ebuild
X-VCS-Directories: x11-misc/xscreensaver/
X-VCS-Committer: flow
X-VCS-Committer-Name: Florian Schmaus
X-VCS-Revision: 039ff3c0f69b9c4ab2b4a134ec10619d70d5c717
X-VCS-Branch: master
Date: Thu, 14 Sep 2023 16:35:23 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 4f0f542b-b487-4e1a-bd7f-458dcebd4de0
X-Archives-Hash: f450fd323d3bf33d233f1efcbf539199
commit: 039ff3c0f69b9c4ab2b4a134ec10619d70d5c717
Author: Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 14 16:33:28 2023 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Thu Sep 14 16:35:20 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=039ff3c0
x11-misc/xscreensaver: add correct "start with no splash" patch
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
x11-misc/xscreensaver/Manifest | 1 +
...reensaver-6.07.ebuild => xscreensaver-6.07-r2.ebuild} | 16 ++++++++++++----
2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index a615956c98d6..86c43483d88b 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -1,4 +1,5 @@
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
+DIST xscreensaver-6.07-xscreensaver.service-start-with-no-splash.patch 834 BLAKE2B 57c509e370ba79c4197a2a51188e09c2a48cc172f889c8876c0fb1af995b87465ddc390b3e704cb572c29c1537f3d05b065365d6357c51047c910124b7c8f6c4 SHA512 6e7dcfbe0e687719f3f5579790a48544bb8728231cd7ac1c8b82f5814da0be1e67f2308de7f0354a2ba20ac098c2d5ae8c212b9a3a7b84177bc4bb10739378c3
DIST xscreensaver-6.07.tar.gz 26365057 BLAKE2B b0fc24e34713dd5591cff2ff871ec05deae089d7d76fe1239dd59ec1addf97eb764a583d01685953ae6409a7193ca97bc201a20dcf86d5244cf898e4eb9b1221 SHA512 abbf75faa49bb23d35985a7bf269891d168c87fe8939ad5acf6857398dfb056815d79dcf39bba9a33808e2717a47635fa84282c03ed9efeeeb449763253179a5
diff --git a/x11-misc/xscreensaver/xscreensaver-6.07.ebuild b/x11-misc/xscreensaver/xscreensaver-6.07-r2.ebuild
similarity index 93%
rename from x11-misc/xscreensaver/xscreensaver-6.07.ebuild
rename to x11-misc/xscreensaver/xscreensaver-6.07-r2.ebuild
index 3865df2da794..29fc6c4aacc4 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.07.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.07-r2.ebuild
@@ -13,6 +13,10 @@ SRC_URI="
https://github.com/Flowdalic/xscreensaver/commit/59e7974c42dc08411c9af2a3a644a582c2116f46.patch ->
${PN}-6.06-logind-idle-hint.patch
)
+ systemd? (
+ https://github.com/Flowdalic/xscreensaver/commit/376b07ec76cfe1070f498773aaec8fd7030593af.patch ->
+ ${PN}-6.07-xscreensaver.service-start-with-no-splash.patch
+ )
"
# Font license mapping for folder ./hacks/fonts/ as following:
@@ -111,10 +115,14 @@ src_prepare() {
sed -i configure.ac -e '/^ALL_LINGUAS=/d' || die
- # Causes "Failed to enable unit: Cannot alias xscreensaver.service as org.jwz.xscreensaver."
- # after "systemctl --user enable xscreensaver".
- sed -i -e '/^Alias=org.jwz.xscreensaver.service/d' \
- driver/xscreensaver.service.in || die
+ if use systemd; then
+ # Causes "Failed to enable unit: Cannot alias xscreensaver.service as org.jwz.xscreensaver."
+ # after "systemctl --user enable xscreensaver".
+ sed -i -e '/^Alias=org.jwz.xscreensaver.service/d' \
+ driver/xscreensaver.service.in || die
+
+ eapply "${DISTDIR}/${PN}-6.07-xscreensaver.service-start-with-no-splash.patch"
+ fi
strip-linguas -i po/
export ALL_LINGUAS="${LINGUAS}"