From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1720377-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
(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 finch.gentoo.org (Postfix) with ESMTPS id 5A3EA1582EF
for <garchives@archives.gentoo.org>; Sat, 22 Feb 2025 09:39:20 +0000 (UTC)
Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189])
(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)
(Authenticated sender: relay-lists.gentoo.org@gentoo.org)
by smtp.gentoo.org (Postfix) with ESMTPSA id 45F83343256
for <garchives@archives.gentoo.org>; Sat, 22 Feb 2025 09:39:20 +0000 (UTC)
Received: from bobolink.gentoo.org (localhost [127.0.0.1])
by bobolink.gentoo.org (Postfix) with ESMTP id EA30611047E;
Sat, 22 Feb 2025 09:38:51 +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 bobolink.gentoo.org (Postfix) with ESMTPS id D70AE110481
for <gentoo-commits@lists.gentoo.org>; Sat, 22 Feb 2025 09:38:51 +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 9180D34321F
for <gentoo-commits@lists.gentoo.org>; Sat, 22 Feb 2025 09:38:51 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 5800027E4
for <gentoo-commits@lists.gentoo.org>; Sat, 22 Feb 2025 09:38:48 +0000 (UTC)
From: "Ulrich Müller" <ulm@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, "Ulrich Müller" <ulm@gentoo.org>
Message-ID: <1740217100.1dd3cbfa7603b48dd2dc52997e8df73fb13370f0.ulm@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/openrc/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sys-apps/openrc/openrc-0.56.ebuild sys-apps/openrc/openrc-9999.ebuild
X-VCS-Directories: sys-apps/openrc/
X-VCS-Committer: ulm
X-VCS-Committer-Name: Ulrich Müller
X-VCS-Revision: 1dd3cbfa7603b48dd2dc52997e8df73fb13370f0
X-VCS-Branch: master
Date: Sat, 22 Feb 2025 09:38:48 +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: 3cb07d1e-2ec9-4bb6-8fb5-f78f27119009
X-Archives-Hash: 917947309d9dff184e10ef4e96a1ad0a
commit: 1dd3cbfa7603b48dd2dc52997e8df73fb13370f0
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 14 14:12:00 2025 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Feb 22 09:38:20 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dd3cbfa
sys-apps/openrc: Port to ver_replacing
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
sys-apps/openrc/openrc-0.56.ebuild | 17 +++++++----------
sys-apps/openrc/openrc-9999.ebuild | 17 +++++++----------
2 files changed, 14 insertions(+), 20 deletions(-)
diff --git a/sys-apps/openrc/openrc-0.56.ebuild b/sys-apps/openrc/openrc-0.56.ebuild
index 45409f32d5a4..030d8ccdd3ac 100644
--- a/sys-apps/openrc/openrc-0.56.ebuild
+++ b/sys-apps/openrc/openrc-0.56.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-inherit meson pam
+inherit eapi9-ver meson pam
DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
HOMEPAGE="https://github.com/openrc/openrc/"
@@ -152,13 +152,10 @@ pkg_postinst() {
fi
# added for 0.45 to handle seedrng/urandom switching (2022-06-07)
- for v in ${REPLACING_VERSIONS}; do
- [[ -x $(type rc-update) ]] || continue
- if ver_test $v -lt 0.45; then
- if rc-update show boot | grep -q urandom; then
- rc-update del urandom boot
- rc-update add seedrng boot
+ if ver_replacing -lt 0.45 && ! [[ -x $(type rc-update) ]]; then
+ if rc-update show boot | grep -q urandom; then
+ rc-update del urandom boot
+ rc-update add seedrng boot
fi
- fi
- done
+ fi
}
diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild
index 45409f32d5a4..030d8ccdd3ac 100644
--- a/sys-apps/openrc/openrc-9999.ebuild
+++ b/sys-apps/openrc/openrc-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-inherit meson pam
+inherit eapi9-ver meson pam
DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
HOMEPAGE="https://github.com/openrc/openrc/"
@@ -152,13 +152,10 @@ pkg_postinst() {
fi
# added for 0.45 to handle seedrng/urandom switching (2022-06-07)
- for v in ${REPLACING_VERSIONS}; do
- [[ -x $(type rc-update) ]] || continue
- if ver_test $v -lt 0.45; then
- if rc-update show boot | grep -q urandom; then
- rc-update del urandom boot
- rc-update add seedrng boot
+ if ver_replacing -lt 0.45 && ! [[ -x $(type rc-update) ]]; then
+ if rc-update show boot | grep -q urandom; then
+ rc-update del urandom boot
+ rc-update add seedrng boot
fi
- fi
- done
+ fi
}