commit: 6068204e04aeacec4f132cb71c2438da90e2fb14 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Sat Sep 3 23:03:42 2022 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Sat Sep 3 23:03:42 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6068204e
sys-apps/systemd: couple split-bin to split-usr Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> sys-apps/systemd/systemd-251.4.ebuild | 3 +-- sys-apps/systemd/systemd-9999.ebuild | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/sys-apps/systemd/systemd-251.4.ebuild b/sys-apps/systemd/systemd-251.4.ebuild index 064778e7f0c7..ba1fca739b5a 100644 --- a/sys-apps/systemd/systemd-251.4.ebuild +++ b/sys-apps/systemd/systemd-251.4.ebuild @@ -285,9 +285,8 @@ multilib_src_configure() { -Dpamlibdir="$(getpam_mod_dir)" # avoid bash-completion dep -Dbashcompletiondir="$(get_bashcompdir)" - # make sure we get /bin:/sbin in PATH $(meson_use split-usr) - -Dsplit-bin=true + $(meson_use split-usr split-bin) -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")" -Drootlibdir="${EPREFIX}/usr/$(get_libdir)" # Avoid infinite exec recursion, bug 642724 diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild index c8aea75e5c3e..d317887a899f 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -282,9 +282,8 @@ multilib_src_configure() { -Dpamlibdir="$(getpam_mod_dir)" # avoid bash-completion dep -Dbashcompletiondir="$(get_bashcompdir)" - # make sure we get /bin:/sbin in PATH $(meson_use split-usr) - -Dsplit-bin=true + $(meson_use split-usr split-bin) -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")" -Drootlibdir="${EPREFIX}/usr/$(get_libdir)" # Avoid infinite exec recursion, bug 642724