*/*: [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>

14 files changed, 35 insertions, 56 deletions

diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20180114-r1.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20180114-r1.ebuild
index f912f538e6ea..df6143b7d93f 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20180114-r1.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20180114-r1.ebuild
@@ -74,7 +74,7 @@ src_prepare() {
 
 src_compile() {
 	for i in ${POLICY_TYPES}; do
-		emake NAME=$i -C "${S}"/${i} || die "${i} compile failed"
+		emake NAME=$i -C "${S}"/${i}
 	done
 }
 
@@ -85,7 +85,7 @@ src_install() {
 		for j in ${MODS}; do
 			einfo "Installing ${i} ${j} policy package"
 			insinto ${BASEDIR}/${i}
-			doins "${S}"/${i}/${j}.pp || die "Failed to add ${j}.pp to ${i}"
+			doins "${S}"/${i}/${j}.pp
 		done
 	done
 }
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20180114-r2.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20180114-r2.ebuild
index 168222b80661..3a81feba60c1 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20180114-r2.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20180114-r2.ebuild
@@ -75,7 +75,7 @@ src_prepare() {
 
 src_compile() {
 	for i in ${POLICY_TYPES}; do
-		emake NAME=$i SHAREDIR="${ROOT%/}"/usr/share/selinux -C "${S}"/${i} || die "${i} compile failed"
+		emake NAME=$i SHAREDIR="${ROOT%/}"/usr/share/selinux -C "${S}"/${i}
 	done
 }
 
@@ -86,7 +86,7 @@ src_install() {
 		for j in ${MODS}; do
 			einfo "Installing ${i} ${j} policy package"
 			insinto ${BASEDIR}/${i}
-			doins "${S}"/${i}/${j}.pp || die "Failed to add ${j}.pp to ${i}"
+			doins "${S}"/${i}/${j}.pp
 		done
 	done
 }
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20180114-r3.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20180114-r3.ebuild
index 2ec944121acd..0a9c31702c14 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20180114-r3.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20180114-r3.ebuild
@@ -75,7 +75,7 @@ src_prepare() {
 
 src_compile() {
 	for i in ${POLICY_TYPES}; do
-		emake NAME=$i SHAREDIR="${ROOT%/}"/usr/share/selinux -C "${S}"/${i} || die "${i} compile failed"
+		emake NAME=$i SHAREDIR="${ROOT%/}"/usr/share/selinux -C "${S}"/${i}
 	done
 }
 
@@ -86,7 +86,7 @@ src_install() {
 		for j in ${MODS}; do
 			einfo "Installing ${i} ${j} policy package"
 			insinto ${BASEDIR}/${i}
-			doins "${S}"/${i}/${j}.pp || die "Failed to add ${j}.pp to ${i}"
+			doins "${S}"/${i}/${j}.pp
 		done
 	done
 }
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20180701-r1.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20180701-r1.ebuild
index edafab22ce16..1e6cc589b6d2 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20180701-r1.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20180701-r1.ebuild
@@ -75,7 +75,7 @@ src_prepare() {
 
 src_compile() {
 	for i in ${POLICY_TYPES}; do
-		emake NAME=$i SHAREDIR="${ROOT%/}"/usr/share/selinux -C "${S}"/${i} || die "${i} compile failed"
+		emake NAME=$i SHAREDIR="${ROOT%/}"/usr/share/selinux -C "${S}"/${i}
 	done
 }
 
@@ -86,7 +86,7 @@ src_install() {
 		for j in ${MODS}; do
 			einfo "Installing ${i} ${j} policy package"
 			insinto ${BASEDIR}/${i}
-			doins "${S}"/${i}/${j}.pp || die "Failed to add ${j}.pp to ${i}"
+			doins "${S}"/${i}/${j}.pp
 		done
 	done
 }
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20180701-r2.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20180701-r2.ebuild
index 6905e0f14863..7b6afaf3e213 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20180701-r2.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20180701-r2.ebuild
@@ -75,7 +75,7 @@ src_prepare() {
 
 src_compile() {
 	for i in ${POLICY_TYPES}; do
-		emake NAME=$i SHAREDIR="${ROOT%/}"/usr/share/selinux -C "${S}"/${i} || die "${i} compile failed"
+		emake NAME=$i SHAREDIR="${ROOT%/}"/usr/share/selinux -C "${S}"/${i}
 	done
 }
 
@@ -86,7 +86,7 @@ src_install() {
 		for j in ${MODS}; do
 			einfo "Installing ${i} ${j} policy package"
 			insinto ${BASEDIR}/${i}
-			doins "${S}"/${i}/${j}.pp || die "Failed to add ${j}.pp to ${i}"
+			doins "${S}"/${i}/${j}.pp
 		done
 	done
 }
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20190201-r1.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20190201-r1.ebuild
index 6905e0f14863..7b6afaf3e213 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20190201-r1.ebuild
@@ -75,7 +75,7 @@ src_prepare() {
 
 src_compile() {
 	for i in ${POLICY_TYPES}; do
-		emake NAME=$i SHAREDIR="${ROOT%/}"/usr/share/selinux -C "${S}"/${i} || die "${i} compile failed"
+		emake NAME=$i SHAREDIR="${ROOT%/}"/usr/share/selinux -C "${S}"/${i}
 	done
 }
 
@@ -86,7 +86,7 @@ src_install() {
 		for j in ${MODS}; do
 			einfo "Installing ${i} ${j} policy package"
 			insinto ${BASEDIR}/${i}
-			doins "${S}"/${i}/${j}.pp || die "Failed to add ${j}.pp to ${i}"
+			doins "${S}"/${i}/${j}.pp
 		done
 	done
 }
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
index 6905e0f14863..7b6afaf3e213 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
@@ -75,7 +75,7 @@ src_prepare() {
 
 src_compile() {
 	for i in ${POLICY_TYPES}; do
-		emake NAME=$i SHAREDIR="${ROOT%/}"/usr/share/selinux -C "${S}"/${i} || die "${i} compile failed"
+		emake NAME=$i SHAREDIR="${ROOT%/}"/usr/share/selinux -C "${S}"/${i}
 	done
 }
 
@@ -86,7 +86,7 @@ src_install() {
 		for j in ${MODS}; do
 			einfo "Installing ${i} ${j} policy package"
 			insinto ${BASEDIR}/${i}
-			doins "${S}"/${i}/${j}.pp || die "Failed to add ${j}.pp to ${i}"
+			doins "${S}"/${i}/${j}.pp
 		done
 	done
 }
diff --git a/sec-policy/selinux-base/selinux-base-2.20180114-r1.ebuild b/sec-policy/selinux-base/selinux-base-2.20180114-r1.ebuild
index 5c86e23535ce..96529c150417 100644
--- a/sec-policy/selinux-base/selinux-base-2.20180114-r1.ebuild
+++ b/sec-policy/selinux-base/selinux-base-2.20180114-r1.ebuild
@@ -72,7 +72,7 @@ src_configure() {
 
 	# Prepare initial configuration
 	cd "${S}/refpolicy" || die
-	emake conf || die "Make conf failed"
+	emake conf
 
 	# Setup the policies based on the types delivered by the end user.
 	# These types can be "targeted", "strict", "mcs" and "mls".
@@ -125,11 +125,8 @@ src_install() {
 	for i in ${POLICY_TYPES}; do
 		cd "${S}/${i}" || die
 
-		emake DESTDIR="${D}" install \
-			|| die "${i} install failed."
-
-		emake DESTDIR="${D}" install-headers \
-			|| die "${i} headers install failed."
+		emake DESTDIR="${D}" install
+		emake DESTDIR="${D}" install-headers
 
 		echo "run_init_t" > "${D}/etc/selinux/${i}/contexts/run_init_type" || die
 
diff --git a/sec-policy/selinux-base/selinux-base-2.20180114-r2.ebuild b/sec-policy/selinux-base/selinux-base-2.20180114-r2.ebuild
index 5c86e23535ce..96529c150417 100644
--- a/sec-policy/selinux-base/selinux-base-2.20180114-r2.ebuild
+++ b/sec-policy/selinux-base/selinux-base-2.20180114-r2.ebuild
@@ -72,7 +72,7 @@ src_configure() {
 
 	# Prepare initial configuration
 	cd "${S}/refpolicy" || die
-	emake conf || die "Make conf failed"
+	emake conf
 
 	# Setup the policies based on the types delivered by the end user.
 	# These types can be "targeted", "strict", "mcs" and "mls".
@@ -125,11 +125,8 @@ src_install() {
 	for i in ${POLICY_TYPES}; do
 		cd "${S}/${i}" || die
 
-		emake DESTDIR="${D}" install \
-			|| die "${i} install failed."
-
-		emake DESTDIR="${D}" install-headers \
-			|| die "${i} headers install failed."
+		emake DESTDIR="${D}" install
+		emake DESTDIR="${D}" install-headers
 
 		echo "run_init_t" > "${D}/etc/selinux/${i}/contexts/run_init_type" || die
 
diff --git a/sec-policy/selinux-base/selinux-base-2.20180114-r3.ebuild b/sec-policy/selinux-base/selinux-base-2.20180114-r3.ebuild
index b4344907d547..91587c4968eb 100644
--- a/sec-policy/selinux-base/selinux-base-2.20180114-r3.ebuild
+++ b/sec-policy/selinux-base/selinux-base-2.20180114-r3.ebuild
@@ -72,7 +72,7 @@ src_configure() {
 
 	# Prepare initial configuration
 	cd "${S}/refpolicy" || die
-	emake conf || die "Make conf failed"
+	emake conf
 
 	# Setup the policies based on the types delivered by the end user.
 	# These types can be "targeted", "strict", "mcs" and "mls".
@@ -125,11 +125,8 @@ src_install() {
 	for i in ${POLICY_TYPES}; do
 		cd "${S}/${i}" || die
 
-		emake DESTDIR="${D}" install \
-			|| die "${i} install failed."
-
-		emake DESTDIR="${D}" install-headers \
-			|| die "${i} headers install failed."
+		emake DESTDIR="${D}" install
+		emake DESTDIR="${D}" install-headers
 
 		echo "run_init_t" > "${D}/etc/selinux/${i}/contexts/run_init_type" || die
 
diff --git a/sec-policy/selinux-base/selinux-base-2.20180701-r1.ebuild b/sec-policy/selinux-base/selinux-base-2.20180701-r1.ebuild
index 020f30cfb94e..c27d17d32999 100644
--- a/sec-policy/selinux-base/selinux-base-2.20180701-r1.ebuild
+++ b/sec-policy/selinux-base/selinux-base-2.20180701-r1.ebuild
@@ -72,7 +72,7 @@ src_configure() {
 
 	# Prepare initial configuration
 	cd "${S}/refpolicy" || die
-	emake conf || die "Make conf failed"
+	emake conf
 
 	# Setup the policies based on the types delivered by the end user.
 	# These types can be "targeted", "strict", "mcs" and "mls".
@@ -125,11 +125,8 @@ src_install() {
 	for i in ${POLICY_TYPES}; do
 		cd "${S}/${i}" || die
 
-		emake DESTDIR="${D}" install \
-			|| die "${i} install failed."
-
-		emake DESTDIR="${D}" install-headers \
-			|| die "${i} headers install failed."
+		emake DESTDIR="${D}" install
+		emake DESTDIR="${D}" install-headers
 
 		echo "run_init_t" > "${D}/etc/selinux/${i}/contexts/run_init_type" || die
 
diff --git a/sec-policy/selinux-base/selinux-base-2.20180701-r2.ebuild b/sec-policy/selinux-base/selinux-base-2.20180701-r2.ebuild
index 942ea13d67f1..16ee9f2b2abb 100644
--- a/sec-policy/selinux-base/selinux-base-2.20180701-r2.ebuild
+++ b/sec-policy/selinux-base/selinux-base-2.20180701-r2.ebuild
@@ -72,7 +72,7 @@ src_configure() {
 
 	# Prepare initial configuration
 	cd "${S}/refpolicy" || die
-	emake conf || die "Make conf failed"
+	emake conf
 
 	# Setup the policies based on the types delivered by the end user.
 	# These types can be "targeted", "strict", "mcs" and "mls".
@@ -125,11 +125,8 @@ src_install() {
 	for i in ${POLICY_TYPES}; do
 		cd "${S}/${i}" || die
 
-		emake DESTDIR="${D}" install \
-			|| die "${i} install failed."
-
-		emake DESTDIR="${D}" install-headers \
-			|| die "${i} headers install failed."
+		emake DESTDIR="${D}" install
+		emake DESTDIR="${D}" install-headers
 
 		echo "run_init_t" > "${D}/etc/selinux/${i}/contexts/run_init_type" || die
 
diff --git a/sec-policy/selinux-base/selinux-base-2.20190201-r1.ebuild b/sec-policy/selinux-base/selinux-base-2.20190201-r1.ebuild
index 942ea13d67f1..16ee9f2b2abb 100644
--- a/sec-policy/selinux-base/selinux-base-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-base/selinux-base-2.20190201-r1.ebuild
@@ -72,7 +72,7 @@ src_configure() {
 
 	# Prepare initial configuration
 	cd "${S}/refpolicy" || die
-	emake conf || die "Make conf failed"
+	emake conf
 
 	# Setup the policies based on the types delivered by the end user.
 	# These types can be "targeted", "strict", "mcs" and "mls".
@@ -125,11 +125,8 @@ src_install() {
 	for i in ${POLICY_TYPES}; do
 		cd "${S}/${i}" || die
 
-		emake DESTDIR="${D}" install \
-			|| die "${i} install failed."
-
-		emake DESTDIR="${D}" install-headers \
-			|| die "${i} headers install failed."
+		emake DESTDIR="${D}" install
+		emake DESTDIR="${D}" install-headers
 
 		echo "run_init_t" > "${D}/etc/selinux/${i}/contexts/run_init_type" || die
 
diff --git a/sec-policy/selinux-base/selinux-base-9999.ebuild b/sec-policy/selinux-base/selinux-base-9999.ebuild
index 942ea13d67f1..16ee9f2b2abb 100644
--- a/sec-policy/selinux-base/selinux-base-9999.ebuild
+++ b/sec-policy/selinux-base/selinux-base-9999.ebuild
@@ -72,7 +72,7 @@ src_configure() {
 
 	# Prepare initial configuration
 	cd "${S}/refpolicy" || die
-	emake conf || die "Make conf failed"
+	emake conf
 
 	# Setup the policies based on the types delivered by the end user.
 	# These types can be "targeted", "strict", "mcs" and "mls".
@@ -125,11 +125,8 @@ src_install() {
 	for i in ${POLICY_TYPES}; do
 		cd "${S}/${i}" || die
 
-		emake DESTDIR="${D}" install \
-			|| die "${i} install failed."
-
-		emake DESTDIR="${D}" install-headers \
-			|| die "${i} headers install failed."
+		emake DESTDIR="${D}" install
+		emake DESTDIR="${D}" install-headers
 
 		echo "run_init_t" > "${D}/etc/selinux/${i}/contexts/run_init_type" || die