sys-apps/systemd: rename usrmerge to split-usr and invert the meaning

Package-Manager: Portage-2.3.37, Repoman-2.3.9_p219

diff --git a/sys-apps/systemd/metadata.xml b/sys-apps/systemd/metadata.xml
index cdc951205cdc514e4a23cabf9f6b581433af82fd..ad89da6658668697c409473fc440a3ab402e834a 100644 (file)
--- a/sys-apps/systemd/metadata.xml
+++ b/sys-apps/systemd/metadata.xml
@@ -25,7 +25,7 @@
                <flag name="qrcode">Enable qrcode output support in journal</flag>
                <flag name="resolvconf">Install resolvconf symlink for systemd-resolve</flag>
                <flag name="sysv-utils">Install sysvinit compatibility symlinks and manpages for init, telinit, halt, poweroff, reboot, runlevel, and shutdown</flag>
-               <flag name="usrmerge">Enable /usr merge (experimental)</flag>
+               <flag name="split-usr">Enable this if /bin and /usr/bin are separate directories</flag>
                <flag name="vanilla">Disable Gentoo-specific behavior and compatibility quirks</flag>
                <flag name="xkb">Depend on <pkg>x11-libs/libxkbcommon</pkg> to allow logind to control the X11 keymap</flag>
        </use>

diff --git a/sys-apps/systemd/systemd-236-r5.ebuild b/sys-apps/systemd/systemd-236-r5.ebuild
index a39294c568af5465dcb0d6dc55b493a6ab28686a..9c9f8dd71f8747d4abf15336ddf55867c588d535 100644 (file)
--- 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

diff --git a/sys-apps/systemd/systemd-238-r6.ebuild b/sys-apps/systemd/systemd-238-r6.ebuild
index 9766434cbd96677fef13cd4acab46aa65c7ca69d..590c5a8c7e9659c3afcc84c2220b6e161a32626a 100644 (file)
--- a/sys-apps/systemd/systemd-238-r6.ebuild
+++ b/sys-apps/systemd/systemd-238-r6.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 pcre 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 pcre policykit qrcode +seccomp selinux +split-usr ssl +sysv-utils test vanilla xkb"
 
 REQUIRED_USE="importd? ( curl gcrypt lzma )"
 RESTRICT="!test? ( test )"
@@ -204,8 +204,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
@@ -305,7 +305,7 @@ multilib_src_install_all() {
        dodoc "${FILESDIR}"/nsswitch.conf
 
        if ! use sysv-utils; then
-               local rootprefix=$(usex usrmerge /usr '')
+               local rootprefix=$(usex split-usr '' /usr)
                rm "${ED%/}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die
                rmdir "${ED%/}${rootprefix}"/sbin || die
                rm "${ED%/}"/usr/share/man/man1/init.1 || die
@@ -332,11 +332,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

diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 999d766f966c4428e8df8148815709edbee5980d..4d9bb8b9004bb35f37dd64c8b8ec844238d5c895 100644 (file)
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -20,7 +20,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 pcre policykit qrcode +resolvconf +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 pcre policykit qrcode +resolvconf +seccomp selinux +split-usr ssl +sysv-utils test vanilla xkb"
 
 REQUIRED_USE="importd? ( curl gcrypt lzma )"
 RESTRICT="!test? ( test )"
@@ -203,8 +203,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
@@ -297,7 +297,7 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-       local rootprefix=$(usex usrmerge /usr '')
+       local rootprefix=$(usex split-usr '' /usr)
 
        # meson doesn't know about docdir
        mv "${ED%/}"/usr/share/doc/{systemd,${PF}} || die
@@ -336,11 +336,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