sys-apps/shadow: add support for /usr merge

Closes: https://github.com/gentoo/gentoo/pull/12477
Signed-off-by: Matija Skala <mskala@gmx.com>
Signed-off-by: Mike Gilbert <floppym@gentoo.org>

diff --git a/sys-apps/shadow/shadow-4.6.ebuild b/sys-apps/shadow/shadow-4.6.ebuild
index 14ef8ce1230025815ef6de76dc58d2f285f3d721..c816078172ce8d053ab3c4bd4cebd46c3f358317 100644 (file)
--- a/sys-apps/shadow/shadow-4.6.ebuild
+++ b/sys-apps/shadow/shadow-4.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/shadow-maint/shadow/releases/download/${PV}/${P}.tar
 LICENSE="BSD GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
-IUSE="acl audit +cracklib nls pam selinux skey xattr"
+IUSE="acl audit +cracklib nls pam selinux skey split-usr xattr"
 # Taken from the man/Makefile.am file.
 LANGS=( cs da de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW )
 
@@ -109,10 +109,12 @@ src_install() {
        insopts -m0600
        doins "${FILESDIR}"/default/useradd
 
-       # move passwd to / to help recover broke systems #64441
-       dodir /bin
-       mv "${ED%/}"/usr/bin/passwd "${ED%/}"/bin/ || die
-       dosym ../../bin/passwd /usr/bin/passwd
+       if use split-usr ; then
+               # move passwd to / to help recover broke systems #64441
+               dodir /bin
+               mv "${ED%/}"/usr/bin/passwd "${ED%/}"/bin/ || die
+               dosym ../../bin/passwd /usr/bin/passwd
+       fi
 
        cd "${S}" || die
        insinto /etc

diff --git a/sys-apps/shadow/shadow-4.7.ebuild b/sys-apps/shadow/shadow-4.7.ebuild
index 809590ead55a0fe05ed4db554876f4fa81633aed..eb5a800dccfba5a61cf4bbfacb7fcdbe992cc6f7 100644 (file)
--- a/sys-apps/shadow/shadow-4.7.ebuild
+++ b/sys-apps/shadow/shadow-4.7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/shadow-maint/shadow/releases/download/${PV}/${P}.tar
 LICENSE="BSD GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
-IUSE="acl audit +cracklib nls pam selinux skey xattr"
+IUSE="acl audit +cracklib nls pam selinux skey split-usr xattr"
 # Taken from the man/Makefile.am file.
 LANGS=( cs da de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW )
 
@@ -109,10 +109,12 @@ src_install() {
        insopts -m0600
        doins "${FILESDIR}"/default/useradd
 
-       # move passwd to / to help recover broke systems #64441
-       dodir /bin
-       mv "${ED}"/usr/bin/passwd "${ED}"/bin/ || die
-       dosym ../../bin/passwd /usr/bin/passwd
+       if use split-usr ; then
+               # move passwd to / to help recover broke systems #64441
+               dodir /bin
+               mv "${ED}"/usr/bin/passwd "${ED}"/bin/ || die
+               dosym ../../bin/passwd /usr/bin/passwd
+       fi
 
        cd "${S}" || die
        insinto /etc