[gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/

[Mike Gilbert]

commit:     64b72f816761aad0ddbf0bb91a356832cbe7e1f1
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 17 19:53:10 2017 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Dec 17 19:53:19 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64b72f81

sys-apps/systemd: prefix fixes

- Restore rootprefix option with hard-coded value(s)
- Add EPREFIX to efi-libdir option.

Package-Manager: Portage-2.3.19_p1, Repoman-2.3.6_p35

 sys-apps/systemd/systemd-236.ebuild  | 3 ++-
 sys-apps/systemd/systemd-9999.ebuild | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/sys-apps/systemd/systemd-236.ebuild 
b/sys-apps/systemd/systemd-236.ebuild
index e0653a7a84a..8142a96390b 100644
--- a/sys-apps/systemd/systemd-236.ebuild
+++ b/sys-apps/systemd/systemd-236.ebuild
@@ -202,6 +202,7 @@ multilib_src_configure() {
                -Dbashcompletiondir="$(get_bashcompdir)"
                # make sure we get /bin:/sbin in PATH
                -Dsplit-usr=$(usex usrmerge false true)
+               -Drootprefix="$(usex usrmerge "${EPREFIX}/usr" "${EPREFIX:-/}")"
                -Dsysvinit-path=
                -Dsysvrcnd-path=
                # no deps
@@ -216,7 +217,7 @@ multilib_src_configure() {
                -Delfutils=$(meson_multilib_native_use elfutils)
                -Dgcrypt=$(meson_use gcrypt)
                -Dgnu-efi=$(meson_multilib_native_use gnuefi)
-               -Defi-libdir="/usr/$(get_libdir)"
+               -Defi-libdir="${EPREFIX}/usr/$(get_libdir)"
                -Dmicrohttpd=$(meson_multilib_native_use http)
                $(usex http -Dgnutls=$(meson_multilib_native_use ssl) 
-Dgnutls=false)
                -Dimportd=$(meson_multilib_native_use importd)

diff --git a/sys-apps/systemd/systemd-9999.ebuild 
b/sys-apps/systemd/systemd-9999.ebuild
index e0653a7a84a..8142a96390b 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -202,6 +202,7 @@ multilib_src_configure() {
                -Dbashcompletiondir="$(get_bashcompdir)"
                # make sure we get /bin:/sbin in PATH
                -Dsplit-usr=$(usex usrmerge false true)
+               -Drootprefix="$(usex usrmerge "${EPREFIX}/usr" "${EPREFIX:-/}")"
                -Dsysvinit-path=
                -Dsysvrcnd-path=
                # no deps
@@ -216,7 +217,7 @@ multilib_src_configure() {
                -Delfutils=$(meson_multilib_native_use elfutils)
                -Dgcrypt=$(meson_use gcrypt)
                -Dgnu-efi=$(meson_multilib_native_use gnuefi)
-               -Defi-libdir="/usr/$(get_libdir)"
+               -Defi-libdir="${EPREFIX}/usr/$(get_libdir)"
                -Dmicrohttpd=$(meson_multilib_native_use http)
                $(usex http -Dgnutls=$(meson_multilib_native_use ssl) 
-Dgnutls=false)
                -Dimportd=$(meson_multilib_native_use importd)