diff options
Diffstat (limited to 'sys-apps/systemd/systemd-236-r5.ebuild')
-rw-r--r-- | sys-apps/systemd/systemd-236-r5.ebuild | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys-apps/systemd/systemd-236-r5.ebuild b/sys-apps/systemd/systemd-236-r5.ebuild index a39294c568af..9c9f8dd71f87 100644 --- a/sys-apps/systemd/systemd-236-r5.ebuild +++ b/sys-apps/systemd/systemd-236-r5.ebuild @@ -21,7 +21,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd" LICENSE="GPL-2 LGPL-2.1 MIT public-domain" SLOT="0/2" -IUSE="acl apparmor audit build cryptsetup curl elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam policykit qrcode +seccomp selinux ssl +sysv-utils test usrmerge vanilla xkb" +IUSE="acl apparmor audit build cryptsetup curl elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam policykit qrcode +seccomp selinux +split-usr ssl +sysv-utils test vanilla xkb" REQUIRED_USE="importd? ( curl gcrypt lzma )" RESTRICT="!test? ( test )" @@ -199,8 +199,8 @@ multilib_src_configure() { # avoid bash-completion dep -Dbashcompletiondir="$(get_bashcompdir)" # make sure we get /bin:/sbin in PATH - -Dsplit-usr=$(usex usrmerge false true) - -Drootprefix="$(usex usrmerge "${EPREFIX}/usr" "${EPREFIX:-/}")" + -Dsplit-usr=$(usex split-usr true false) + -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")" -Dsysvinit-path= -Dsysvrcnd-path= # Avoid infinite exec recursion, bug 642724 @@ -331,11 +331,11 @@ multilib_src_install_all() { rm -fr "${ED%/}"/etc/systemd/system/sysinit.target.wants || die local udevdir=/lib/udev - use usrmerge && udevdir=/usr/lib/udev + use split-usr || udevdir=/usr/lib/udev rm -r "${ED%/}${udevdir}/hwdb.d" || die - if ! use usrmerge; then + if use split-usr; then # Avoid breaking boot/reboot dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown |