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

[William Hubbs]

commit:     410804ae543ad927dc2b75f125cde04baa907a77
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 20 14:50:47 2020 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Aug 20 14:50:47 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=410804ae

sys-apps/baselayout: sync live

Signed-off-by: William Hubbs <williamh <AT> gentoo.org>

 sys-apps/baselayout/baselayout-9999.ebuild | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/sys-apps/baselayout/baselayout-9999.ebuild b/sys-apps/baselayout/baselayout-9999.ebuild
index a94078654b8..ee4f298e840 100644
--- a/sys-apps/baselayout/baselayout-9999.ebuild
+++ b/sys-apps/baselayout/baselayout-9999.ebuild
@@ -33,7 +33,7 @@ multilib_layout() {
 
 	if [[ -z "${SYMLINK_LIB}" || ${SYMLINK_LIB} = no ]] ; then
 		prefix_lst=( "${EROOT}"{,usr/,usr/local/} )
-		for prefix in ${prefix_lst[@]}; do
+		for prefix in "${prefix_lst[@]}"; do
 			for libdir in ${libdirs}; do
 				dir="${prefix}${libdir}"
 				if [[ -e "${dir}" ]]; then
@@ -153,7 +153,8 @@ multilib_layout() {
 	if ! use split-usr ; then
 		for libdir in ${libdirs}; do
 			if [[ ! -e "${EROOT}${libdir}" ]]; then
-				ln -s usr/"${libdir}" "${EROOT}${libdir}"
+				ln -s usr/"${libdir}" "${EROOT}${libdir}" ||
+					die " Unable to make ${EROOT}${libdir} symlink"
 			fi
 		done
 	fi
@@ -222,6 +223,7 @@ src_install() {
 		DESTDIR="${ED}" \
 		install
 	dodoc ChangeLog
+	rm "${ED}"/etc/sysctl.d/README
 
 	# need the makefile in pkg_preinst
 	insinto /usr/share/${PN}