commit:     52763e8cbab55ed7a93a80ee56d36c335d9746b5
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Fri Mar  6 15:45:35 2026 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri Mar  6 15:45:35 2026 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52763e8c

sys-apps/openrc: apply EPREFIX to meson options

Based on a patch by Michael Morak.

Closes: https://bugs.gentoo.org/970953
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 sys-apps/openrc/openrc-0.62.10.ebuild | 10 +++++-----
 sys-apps/openrc/openrc-0.63.ebuild    | 10 +++++-----
 sys-apps/openrc/openrc-9999.ebuild    | 10 +++++-----
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/sys-apps/openrc/openrc-0.62.10.ebuild 
b/sys-apps/openrc/openrc-0.62.10.ebuild
index b26189001916..24d42d6e04db 100644
--- a/sys-apps/openrc/openrc-0.62.10.ebuild
+++ b/sys-apps/openrc/openrc-0.62.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -52,16 +52,16 @@ PDEPEND="netifrc? ( net-misc/netifrc )"
 
 src_configure() {
        local emesonargs=(
-       --bindir=/bin
-       --sbindir=/sbin
+               --bindir="${EPREFIX}/bin"
+               --sbindir="${EPREFIX}/sbin"
                $(meson_feature audit)
                "-Dbranding=\"Gentoo Linux\""
                $(meson_use newnet)
                -Dos=Linux
                $(meson_use pam)
-               -Dpam_libdir="$(getpam_mod_dir)"
+               -Dpam_libdir="${EPREFIX}$(getpam_mod_dir)"
                $(meson_feature selinux)
-               -Dshell=$(usex bash /bin/bash /bin/sh)
+               -Dshell=$(usex bash "${EPREFIX}/bin/bash" "${EPREFIX}/bin/sh")
                $(meson_use sysv-utils sysvinit)
        )
        # export DEBUG=$(usev debug)

diff --git a/sys-apps/openrc/openrc-0.63.ebuild 
b/sys-apps/openrc/openrc-0.63.ebuild
index 4ea93e65a4f0..8e1aeb869244 100644
--- a/sys-apps/openrc/openrc-0.63.ebuild
+++ b/sys-apps/openrc/openrc-0.63.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -52,15 +52,15 @@ PDEPEND="netifrc? ( net-misc/netifrc )"
 
 src_configure() {
        local emesonargs=(
-       --bindir=/bin
-       --sbindir=/sbin
+               --bindir="${EPREFIX}/bin"
+               --sbindir="${EPREFIX}/sbin"
                $(meson_feature audit)
                "-Dbranding=\"Gentoo Linux\""
                $(meson_use newnet)
                $(meson_use pam)
-               -Dpam_libdir="$(getpam_mod_dir)"
+               -Dpam_libdir="${EPREFIX}$(getpam_mod_dir)"
                $(meson_feature selinux)
-               -Dshell=$(usex bash /bin/bash /bin/sh)
+               -Dshell=$(usex bash "${EPREFIX}/bin/bash" "${EPREFIX}/bin/sh")
                $(meson_use sysv-utils sysvinit)
        )
        # export DEBUG=$(usev debug)

diff --git a/sys-apps/openrc/openrc-9999.ebuild 
b/sys-apps/openrc/openrc-9999.ebuild
index 4ea93e65a4f0..8e1aeb869244 100644
--- a/sys-apps/openrc/openrc-9999.ebuild
+++ b/sys-apps/openrc/openrc-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -52,15 +52,15 @@ PDEPEND="netifrc? ( net-misc/netifrc )"
 
 src_configure() {
        local emesonargs=(
-       --bindir=/bin
-       --sbindir=/sbin
+               --bindir="${EPREFIX}/bin"
+               --sbindir="${EPREFIX}/sbin"
                $(meson_feature audit)
                "-Dbranding=\"Gentoo Linux\""
                $(meson_use newnet)
                $(meson_use pam)
-               -Dpam_libdir="$(getpam_mod_dir)"
+               -Dpam_libdir="${EPREFIX}$(getpam_mod_dir)"
                $(meson_feature selinux)
-               -Dshell=$(usex bash /bin/bash /bin/sh)
+               -Dshell=$(usex bash "${EPREFIX}/bin/bash" "${EPREFIX}/bin/sh")
                $(meson_use sysv-utils sysvinit)
        )
        # export DEBUG=$(usev debug)

Reply via email to