sys-libs/glibc: Additional EAPI=7 fixes found by Arfrever

Package-Manager: Portage-2.3.70, Repoman-2.3.16
Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>

diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index 6e19a44aaa10d9fff5d9849275bce82e689b8801..09bf788700f0f116d5d0567c1210304e2f917e23 100644 (file)
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -521,7 +521,7 @@ check_devpts() {
        [[ ${MERGE_TYPE} == "buildonly" ]] && return
 
        # Only sanity check when installing the native glibc.
-       [[ ${ROOT} != "/" ]] && return
+       [[ -n ${ROOT} ]] && return
 
        # If they're opting in to the old suid code, then no need to check.
        use suid && return
@@ -609,7 +609,7 @@ sanity_prechecks() {
 
        # Prevent native builds from downgrading
        if [[ ${MERGE_TYPE} != "buildonly" ]] && \
-          [[ ${ROOT} == "/" ]] && \
+          [[ -z ${ROOT} ]] && \
           [[ ${CBUILD} == ${CHOST} ]] && \
           [[ ${CHOST} == ${CTARGET} ]] ; then
 
@@ -1101,7 +1101,7 @@ src_configure() {
 }
 
 do_src_compile() {
-       emake -C "$(builddir nptl)" || die "make nptl for ${ABI} failed"
+       emake -C "$(builddir nptl)"
 }
 
 src_compile() {
@@ -1166,7 +1166,7 @@ glibc_do_src_install() {
        local builddir=$(builddir nptl)
        cd "${builddir}"
 
-       emake install_root="${D}/$(build_eprefix)$(alt_prefix)" install || die
+       emake install_root="${D}/$(build_eprefix)$(alt_prefix)" install
 
        # This version (2.26) provides some compatibility libraries for the NIS/NIS+ support
        # which come without headers etc. Only needed for binary packages since the
@@ -1348,7 +1348,7 @@ glibc_do_src_install() {
 
        # Generate all locales if this is a native build as locale generation
        if use compile-locales && ! is_crosscompile ; then
-               run_locale_gen --inplace-glibc "${ED%/}/"
+               run_locale_gen --inplace-glibc "${ED}/"
                sed -e 's:COMPILED_LOCALES="":COMPILED_LOCALES="1":' -i "${ED}"/usr/sbin/locale-gen || die
        fi
 }
@@ -1443,7 +1443,7 @@ pkg_postinst() {
 
        if ! tc-is-cross-compiler && [[ -x ${EROOT}/usr/sbin/iconvconfig ]] ; then
                # Generate fastloading iconv module configuration file.
-               "${EROOT}"/usr/sbin/iconvconfig --prefix="${ROOT%/}/"
+               "${EROOT}"/usr/sbin/iconvconfig --prefix="${ROOT}/"
        fi
 
        if ! is_crosscompile && [[ -z ${ROOT} ]] ; then
@@ -1451,7 +1451,7 @@ pkg_postinst() {
                # errors from this step #253697
                /sbin/telinit U 2>/dev/null
 
-               use compile-locales || run_locale_gen "${EROOT}"
+               use compile-locales || run_locale_gen "${EROOT}/"
        fi
 
        # Check for sanity of /etc/nsswitch.conf, take 2