*/*: [QA] Remove redundant `|| die` guards

* Since all ebuilds in the tree are EAPI>=4,
  `|| die` on builtin commands is redundant
  and dead code.

Closes: https://github.com/gentoo/gentoo/pull/13940
Reviewed-by: Ulrich Müller <ulm@gentoo.org>
Reviewed-by: Michał Górny <mgorny@gentoo.org>
Reviewed-by: Andreas K. Hüttel <dilfridge@gentoo.org>
Signed-off-by: David Seifert <soap@gentoo.org>

19 files changed, 47 insertions, 48 deletions

diff --git a/sys-libs/csu/csu-79.ebuild b/sys-libs/csu/csu-79.ebuild
index bd386e8f1cdc..465515a1d795 100644
--- a/sys-libs/csu/csu-79.ebuild
+++ b/sys-libs/csu/csu-79.ebuild
@@ -32,7 +32,7 @@ src_prepare() {
 }
 
 src_compile() {
-	emake USRLIBDIR="${EPREFIX}"/lib || die
+	emake USRLIBDIR="${EPREFIX}"/lib
 }
 
 src_install() {
@@ -40,5 +40,5 @@ src_install() {
 		USRLIBDIR="${EPREFIX}"/lib \
 		LOCLIBDIR="${EPREFIX}"/lib \
 		DSTROOT="${D}" \
-		install || die
+		install
 }
diff --git a/sys-libs/csu/csu-85.ebuild b/sys-libs/csu/csu-85.ebuild
index 4e6c9fd1daf8..6d0fb053db7f 100644
--- a/sys-libs/csu/csu-85.ebuild
+++ b/sys-libs/csu/csu-85.ebuild
@@ -52,7 +52,7 @@ src_compile() {
 	# so this isn't used, should they have gcc-apple installed, then
 	# this wouldn't hurt either.
 	type -P gcc-4.2.1 > /dev/null && export CC=gcc-4.2.1
-	emake USRLIBDIR="${EPREFIX}"/lib || die
+	emake USRLIBDIR="${EPREFIX}"/lib
 }
 
 src_install() {
@@ -60,5 +60,5 @@ src_install() {
 		USRLIBDIR="${EPREFIX}"/lib \
 		LOCLIBDIR="${EPREFIX}"/lib \
 		DSTROOT="${D}" \
-		install || die
+		install
 }
diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.44.5.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.44.5.ebuild
index 2dcb1838de26..31a4fa3fa902 100644
--- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.44.5.ebuild
+++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.44.5.ebuild
@@ -58,23 +58,23 @@ multilib_src_configure() {
 }
 
 multilib_src_compile() {
-	emake -C lib/et V=1 || die "Failed to build libcom"
+	emake -C lib/et V=1
 
-	emake -C lib/ss V=1 || die "Failed to build libss"
+	emake -C lib/ss V=1
 }
 
 multilib_src_test() {
 	if multilib_is_native_abi; then
-		emake -C lib/et V=1 check || die "Failed to test libcom"
+		emake -C lib/et V=1 check
 
-		emake -C lib/ss V=1 check || die "Failed to test libss"
+		emake -C lib/ss V=1 check
 	fi
 }
 
 multilib_src_install() {
-	emake -C lib/et V=1 DESTDIR="${D%/}" install || die "Failed to install libcom"
+	emake -C lib/et V=1 DESTDIR="${D%/}" install
 
-	emake -C lib/ss V=1 DESTDIR="${D%/}" install || die "Failed to install libss"
+	emake -C lib/ss V=1 DESTDIR="${D%/}" install
 
 	# We call "gen_usr_ldscript -a" to ensure libs are present in /lib to support
 	# split /usr (e.g. "e2fsck" from sys-fs/e2fsprogs is installed in /sbin and
diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.2.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.2.ebuild
index 610d4705abb0..24859270ad92 100644
--- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.2.ebuild
+++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.2.ebuild
@@ -58,23 +58,23 @@ multilib_src_configure() {
 }
 
 multilib_src_compile() {
-	emake -C lib/et V=1 || die "Failed to build libcom"
+	emake -C lib/et V=1
 
-	emake -C lib/ss V=1 || die "Failed to build libss"
+	emake -C lib/ss V=1
 }
 
 multilib_src_test() {
 	if multilib_is_native_abi; then
-		emake -C lib/et V=1 check || die "Failed to test libcom"
+		emake -C lib/et V=1 check
 
-		emake -C lib/ss V=1 check || die "Failed to test libss"
+		emake -C lib/ss V=1 check
 	fi
 }
 
 multilib_src_install() {
-	emake -C lib/et V=1 DESTDIR="${D}" install || die "Failed to install libcom"
+	emake -C lib/et V=1 DESTDIR="${D}" install
 
-	emake -C lib/ss V=1 DESTDIR="${D}" install || die "Failed to install libss"
+	emake -C lib/ss V=1 DESTDIR="${D}" install
 
 	# We call "gen_usr_ldscript -a" to ensure libs are present in /lib to support
 	# split /usr (e.g. "e2fsck" from sys-fs/e2fsprogs is installed in /sbin and
diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.3.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.3.ebuild
index a65bd89cf144..f5538bc2e807 100644
--- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.3.ebuild
+++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.3.ebuild
@@ -58,23 +58,23 @@ multilib_src_configure() {
 }
 
 multilib_src_compile() {
-	emake -C lib/et V=1 || die "Failed to build libcom"
+	emake -C lib/et V=1
 
-	emake -C lib/ss V=1 || die "Failed to build libss"
+	emake -C lib/ss V=1
 }
 
 multilib_src_test() {
 	if multilib_is_native_abi; then
-		emake -C lib/et V=1 check || die "Failed to test libcom"
+		emake -C lib/et V=1 check
 
-		emake -C lib/ss V=1 check || die "Failed to test libss"
+		emake -C lib/ss V=1 check
 	fi
 }
 
 multilib_src_install() {
-	emake -C lib/et V=1 DESTDIR="${D}" install || die "Failed to install libcom"
+	emake -C lib/et V=1 DESTDIR="${D}" install
 
-	emake -C lib/ss V=1 DESTDIR="${D}" install || die "Failed to install libss"
+	emake -C lib/ss V=1 DESTDIR="${D}" install
 
 	# We call "gen_usr_ldscript -a" to ensure libs are present in /lib to support
 	# split /usr (e.g. "e2fsck" from sys-fs/e2fsprogs is installed in /sbin and
diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.4.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.4.ebuild
index 610d4705abb0..24859270ad92 100644
--- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.4.ebuild
+++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.4.ebuild
@@ -58,23 +58,23 @@ multilib_src_configure() {
 }
 
 multilib_src_compile() {
-	emake -C lib/et V=1 || die "Failed to build libcom"
+	emake -C lib/et V=1
 
-	emake -C lib/ss V=1 || die "Failed to build libss"
+	emake -C lib/ss V=1
 }
 
 multilib_src_test() {
 	if multilib_is_native_abi; then
-		emake -C lib/et V=1 check || die "Failed to test libcom"
+		emake -C lib/et V=1 check
 
-		emake -C lib/ss V=1 check || die "Failed to test libss"
+		emake -C lib/ss V=1 check
 	fi
 }
 
 multilib_src_install() {
-	emake -C lib/et V=1 DESTDIR="${D}" install || die "Failed to install libcom"
+	emake -C lib/et V=1 DESTDIR="${D}" install
 
-	emake -C lib/ss V=1 DESTDIR="${D}" install || die "Failed to install libss"
+	emake -C lib/ss V=1 DESTDIR="${D}" install
 
 	# We call "gen_usr_ldscript -a" to ensure libs are present in /lib to support
 	# split /usr (e.g. "e2fsck" from sys-fs/e2fsprogs is installed in /sbin and
diff --git a/sys-libs/glibc/glibc-2.19-r2.ebuild b/sys-libs/glibc/glibc-2.19-r2.ebuild
index ee7e71796970..2ba5fba1eef8 100644
--- a/sys-libs/glibc/glibc-2.19-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.19-r2.ebuild
@@ -983,7 +983,7 @@ src_configure() {
 }
 
 do_src_compile() {
-	emake -C "$(builddir nptl)" || die "make nptl for ${ABI} failed"
+	emake -C "$(builddir nptl)"
 }
 
 src_compile() {
@@ -1032,7 +1032,7 @@ glibc_do_src_install() {
 	local builddir=$(builddir nptl)
 	cd "${builddir}"
 
-	emake install_root="${D}$(alt_prefix)" install || die
+	emake install_root="${D}$(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
diff --git a/sys-libs/glibc/glibc-2.26-r7.ebuild b/sys-libs/glibc/glibc-2.26-r7.ebuild
index ae725c40c7cf..7194206b39a5 100644
--- a/sys-libs/glibc/glibc-2.26-r7.ebuild
+++ b/sys-libs/glibc/glibc-2.26-r7.ebuild
@@ -577,7 +577,7 @@ src_configure() {
 }
 
 do_src_compile() {
-	emake -C "$(builddir nptl)" || die "make nptl for ${ABI} failed"
+	emake -C "$(builddir nptl)"
 }
 
 src_compile() {
@@ -616,7 +616,7 @@ glibc_do_src_install() {
 	local builddir=$(builddir nptl)
 	cd "${builddir}"
 
-	emake install_root="${D}$(alt_prefix)" install || die
+	emake install_root="${D}$(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
diff --git a/sys-libs/glibc/glibc-2.27-r6.ebuild b/sys-libs/glibc/glibc-2.27-r6.ebuild
index 1e6d8113f9f7..39bd251ae522 100644
--- a/sys-libs/glibc/glibc-2.27-r6.ebuild
+++ b/sys-libs/glibc/glibc-2.27-r6.ebuild
@@ -1086,7 +1086,7 @@ src_configure() {
 }
 
 do_src_compile() {
-	emake -C "$(builddir nptl)" || die "make nptl for ${ABI} failed"
+	emake -C "$(builddir nptl)"
 }
 
 src_compile() {
@@ -1139,7 +1139,7 @@ glibc_do_src_install() {
 	local builddir=$(builddir nptl)
 	cd "${builddir}"
 
-	emake install_root="${D}$(alt_prefix)" install || die
+	emake install_root="${D}$(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
diff --git a/sys-libs/glibc/glibc-2.28-r6.ebuild b/sys-libs/glibc/glibc-2.28-r6.ebuild
index 797405fefda1..8752c87248c9 100644
--- a/sys-libs/glibc/glibc-2.28-r6.ebuild
+++ b/sys-libs/glibc/glibc-2.28-r6.ebuild
@@ -1084,7 +1084,7 @@ src_configure() {
 }
 
 do_src_compile() {
-	emake -C "$(builddir nptl)" || die "make nptl for ${ABI} failed"
+	emake -C "$(builddir nptl)"
 }
 
 src_compile() {
@@ -1137,7 +1137,7 @@ glibc_do_src_install() {
 	local builddir=$(builddir nptl)
 	cd "${builddir}"
 
-	emake install_root="${D}$(alt_prefix)" install || die
+	emake install_root="${D}$(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
diff --git a/sys-libs/glibc/glibc-2.29-r2.ebuild b/sys-libs/glibc/glibc-2.29-r2.ebuild
index af2826f3bcec..2f287c1a1b22 100644
--- a/sys-libs/glibc/glibc-2.29-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.29-r2.ebuild
@@ -1112,7 +1112,7 @@ src_configure() {
 }
 
 do_src_compile() {
-	emake -C "$(builddir nptl)" || die "make nptl for ${ABI} failed"
+	emake -C "$(builddir nptl)"
 }
 
 src_compile() {
@@ -1165,7 +1165,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
diff --git a/sys-libs/libchipcard/libchipcard-5.0.4.ebuild b/sys-libs/libchipcard/libchipcard-5.0.4.ebuild
index eaa041a3d6c5..cb9f5a1708d1 100644
--- a/sys-libs/libchipcard/libchipcard-5.0.4.ebuild
+++ b/sys-libs/libchipcard/libchipcard-5.0.4.ebuild
@@ -32,7 +32,7 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install
 
 	einstalldocs
 
diff --git a/sys-libs/libhugetlbfs/libhugetlbfs-2.21.ebuild b/sys-libs/libhugetlbfs/libhugetlbfs-2.21.ebuild
index 117d74e685b8..8afaeb6120b1 100644
--- a/sys-libs/libhugetlbfs/libhugetlbfs-2.21.ebuild
+++ b/sys-libs/libhugetlbfs/libhugetlbfs-2.21.ebuild
@@ -73,7 +73,7 @@ src_test_alloc_one() {
 src_test() {
 	[[ $UID -eq 0 ]] || die "Need FEATURES=-userpriv to run this testsuite"
 	einfo "Building testsuite"
-	emake -j1 tests || die "Failed to build tests"
+	emake -j1 tests
 
 	hugeadm='obj/hugeadm'
 	allocated=''
diff --git a/sys-libs/libhugetlbfs/libhugetlbfs-2.22.ebuild b/sys-libs/libhugetlbfs/libhugetlbfs-2.22.ebuild
index e9ace7861409..b62aa943041e 100644
--- a/sys-libs/libhugetlbfs/libhugetlbfs-2.22.ebuild
+++ b/sys-libs/libhugetlbfs/libhugetlbfs-2.22.ebuild
@@ -73,7 +73,7 @@ src_test_alloc_one() {
 src_test() {
 	[[ $UID -eq 0 ]] || die "Need FEATURES=-userpriv to run this testsuite"
 	einfo "Building testsuite"
-	emake -j1 tests || die "Failed to build tests"
+	emake -j1 tests
 
 	local hugeadm='obj/hugeadm'
 	local allocated=''
diff --git a/sys-libs/libvpd/libvpd-2.1.3.ebuild b/sys-libs/libvpd/libvpd-2.1.3.ebuild
index fc751d0e4407..e4566e2fcdee 100644
--- a/sys-libs/libvpd/libvpd-2.1.3.ebuild
+++ b/sys-libs/libvpd/libvpd-2.1.3.ebuild
@@ -23,10 +23,9 @@ src_unpack() {
 
 src_configure() {
 	./bootstrap.sh
-	econf || die "Unable to configure"
+	econf
 }
 
 src_install(){
-	emake DESTDIR="${D}" install || die "Something went wrong"
-
+	emake DESTDIR="${D}" install
 }
diff --git a/sys-libs/musl/musl-1.1.22.ebuild b/sys-libs/musl/musl-1.1.22.ebuild
index 129c83020221..47c54d2eb79c 100644
--- a/sys-libs/musl/musl-1.1.22.ebuild
+++ b/sys-libs/musl/musl-1.1.22.ebuild
@@ -109,7 +109,7 @@ src_install() {
 		dobin "${T}"/getent
 		dobin "${T}"/iconv
 		echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die
-		doenvd "${T}"/00musl || die
+		doenvd "${T}"/00musl
 	fi
 }
 
diff --git a/sys-libs/musl/musl-1.1.23.ebuild b/sys-libs/musl/musl-1.1.23.ebuild
index 129c83020221..47c54d2eb79c 100644
--- a/sys-libs/musl/musl-1.1.23.ebuild
+++ b/sys-libs/musl/musl-1.1.23.ebuild
@@ -109,7 +109,7 @@ src_install() {
 		dobin "${T}"/getent
 		dobin "${T}"/iconv
 		echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die
-		doenvd "${T}"/00musl || die
+		doenvd "${T}"/00musl
 	fi
 }
 
diff --git a/sys-libs/musl/musl-1.1.24.ebuild b/sys-libs/musl/musl-1.1.24.ebuild
index 36f4183156b3..eb6063619101 100644
--- a/sys-libs/musl/musl-1.1.24.ebuild
+++ b/sys-libs/musl/musl-1.1.24.ebuild
@@ -109,7 +109,7 @@ src_install() {
 		dobin "${T}"/getent
 		dobin "${T}"/iconv
 		echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die
-		doenvd "${T}"/00musl || die
+		doenvd "${T}"/00musl
 	fi
 }
 
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild
index 0827b9d412bf..9c1ddb9d501b 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-9999.ebuild
@@ -109,7 +109,7 @@ src_install() {
 		dobin "${T}"/getent
 		dobin "${T}"/iconv
 		echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die
-		doenvd "${T}"/00musl || die
+		doenvd "${T}"/00musl
 	fi
 }