[gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/

[Anthony G. Basile]

commit:     c357084ea3f964cfd5822ad6d5d2bf95eac0b837
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 21 19:38:13 2015 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Wed Oct 21 19:40:09 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c357084e

sys-libs/musl: cleanup wrt `|| die`

Thanks hasufell.

Package-Manager: portage-2.2.20.1

 sys-libs/musl/musl-1.1.12.ebuild | 12 ++++++------
 sys-libs/musl/musl-9999.ebuild   | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/sys-libs/musl/musl-1.1.12.ebuild b/sys-libs/musl/musl-1.1.12.ebuild
index f7c9ef0..8de636c 100644
--- a/sys-libs/musl/musl-1.1.12.ebuild
+++ b/sys-libs/musl/musl-1.1.12.ebuild
@@ -78,16 +78,16 @@ src_configure() {
 }
 
 src_compile() {
-       emake include/bits/alltypes.h || die
+       emake include/bits/alltypes.h
        just_headers && return 0
 
-       emake || die
+       emake
 }
 
 src_install() {
        local target="install"
        just_headers && target="install-headers"
-       emake DESTDIR="${D}" ${target} || die
+       emake DESTDIR="${D}" ${target}
        just_headers && return 0
 
        # musl provides ldd via a sym link to its ld.so
@@ -106,13 +106,13 @@ src_install() {
                        ppc)   arch="powerpc";;
                        x86)   arch="i386";;
                esac
-               cp "${FILESDIR}"/ldconfig.in "${T}"
-               sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > 
"${T}"/ldconfig
+               cp "${FILESDIR}"/ldconfig.in "${T}" || die
+               sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > 
"${T}"/ldconfig || die
                into /
                dosbin "${T}"/ldconfig
                into /usr
                dobin "${FILESDIR}"/getent
-               echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl
+               echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || 
die
                doenvd "${T}"/00musl || die
        fi
 }

diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild
index f7c9ef0..8de636c 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-9999.ebuild
@@ -78,16 +78,16 @@ src_configure() {
 }
 
 src_compile() {
-       emake include/bits/alltypes.h || die
+       emake include/bits/alltypes.h
        just_headers && return 0
 
-       emake || die
+       emake
 }
 
 src_install() {
        local target="install"
        just_headers && target="install-headers"
-       emake DESTDIR="${D}" ${target} || die
+       emake DESTDIR="${D}" ${target}
        just_headers && return 0
 
        # musl provides ldd via a sym link to its ld.so
@@ -106,13 +106,13 @@ src_install() {
                        ppc)   arch="powerpc";;
                        x86)   arch="i386";;
                esac
-               cp "${FILESDIR}"/ldconfig.in "${T}"
-               sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > 
"${T}"/ldconfig
+               cp "${FILESDIR}"/ldconfig.in "${T}" || die
+               sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > 
"${T}"/ldconfig || die
                into /
                dosbin "${T}"/ldconfig
                into /usr
                dobin "${FILESDIR}"/getent
-               echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl
+               echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || 
die
                doenvd "${T}"/00musl || die
        fi
 }