commit: 450f96fa85fc867b0705174270dbad5d45d9f83f
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 18 08:06:23 2019 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Nov 18 08:06:23 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=450f96fa
Revert "sys-apps/shadow: Revbump to re-add split-usr"
This reverts commit 3e71cbd8a3a3b45fe6858e5837c2e7535ea3a158.
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
sys-apps/shadow/{shadow-4.7-r2.ebuild => shadow-4.7-r1.ebuild} | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/sys-apps/shadow/shadow-4.7-r2.ebuild
b/sys-apps/shadow/shadow-4.7-r1.ebuild
similarity index 95%
rename from sys-apps/shadow/shadow-4.7-r2.ebuild
rename to sys-apps/shadow/shadow-4.7-r1.ebuild
index 2ca144b20bf..c0735c920ae 100644
--- a/sys-apps/shadow/shadow-4.7-r2.ebuild
+++ b/sys-apps/shadow/shadow-4.7-r1.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 split-usr xattr"
+IUSE="acl audit +cracklib nls pam selinux skey 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,13 +109,6 @@ src_install() {
insopts -m0600
doins "${FILESDIR}"/default/useradd
- 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
insopts -m0644
