*/*: [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, 39 insertions, 40 deletions

diff --git a/net-misc/cfengine/cfengine-3.3.9.ebuild b/net-misc/cfengine/cfengine-3.3.9.ebuild
index 7588c8da106d..a671fd89e08f 100644
--- a/net-misc/cfengine/cfengine-3.3.9.ebuild
+++ b/net-misc/cfengine/cfengine-3.3.9.ebuild
@@ -57,11 +57,11 @@ src_configure() {
 }
 
 src_install() {
-	newinitd "${FILESDIR}"/cf-serverd.rc6 cf-serverd || die
-	newinitd "${FILESDIR}"/cf-monitord.rc6 cf-monitord || die
-	newinitd "${FILESDIR}"/cf-execd.rc6 cf-execd || die
+	newinitd "${FILESDIR}"/cf-serverd.rc6 cf-serverd
+	newinitd "${FILESDIR}"/cf-monitord.rc6 cf-monitord
+	newinitd "${FILESDIR}"/cf-execd.rc6 cf-execd
 
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install
 
 	# Evil workaround for now..
 	mv "${D}"/usr/share/doc/${PN}/ "${D}"/usr/share/doc/${PF}
@@ -81,12 +81,12 @@ src_install() {
 	# binaries here. This is the default search location for the
 	# binaries.
 	for bin in know promises agent monitord serverd execd runagent key report; do
-		dosym /usr/sbin/cf-$bin /var/cfengine/bin/cf-$bin || die
+		dosym /usr/sbin/cf-$bin /var/cfengine/bin/cf-$bin
 	done
 
 	if use html; then
 		docinto html
-		dohtml -r docs/ || die
+		dohtml -r docs/
 	fi
 }
 
diff --git a/net-misc/cfengine/cfengine-3.4.5.ebuild b/net-misc/cfengine/cfengine-3.4.5.ebuild
index 074d4d8593a4..f3399734b57b 100644
--- a/net-misc/cfengine/cfengine-3.4.5.ebuild
+++ b/net-misc/cfengine/cfengine-3.4.5.ebuild
@@ -72,11 +72,11 @@ src_configure() {
 }
 
 src_install() {
-	newinitd "${FILESDIR}"/cf-serverd.rc6 cf-serverd || die
-	newinitd "${FILESDIR}"/cf-monitord.rc6 cf-monitord || die
-	newinitd "${FILESDIR}"/cf-execd.rc6 cf-execd || die
+	newinitd "${FILESDIR}"/cf-serverd.rc6 cf-serverd
+	newinitd "${FILESDIR}"/cf-monitord.rc6 cf-monitord
+	newinitd "${FILESDIR}"/cf-execd.rc6 cf-execd
 
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install
 
 	# Evil workaround for now..
 	mv "${D}"/usr/share/doc/${PN}/ "${D}"/usr/share/doc/${PF}
@@ -96,12 +96,12 @@ src_install() {
 	# binaries here. This is the default search location for the
 	# binaries.
 	for bin in promises agent monitord serverd execd runagent key report; do
-		dosym /usr/sbin/cf-$bin /var/cfengine/bin/cf-$bin || die
+		dosym /usr/sbin/cf-$bin /var/cfengine/bin/cf-$bin
 	done
 
 	if use html; then
 		docinto html
-		dohtml -r docs/ || die
+		dohtml -r docs/
 	fi
 }
 
diff --git a/net-misc/cfengine/cfengine-3.5.3.ebuild b/net-misc/cfengine/cfengine-3.5.3.ebuild
index 1afbf48c234c..911431636bda 100644
--- a/net-misc/cfengine/cfengine-3.5.3.ebuild
+++ b/net-misc/cfengine/cfengine-3.5.3.ebuild
@@ -71,11 +71,11 @@ src_configure() {
 }
 
 src_install() {
-	newinitd "${FILESDIR}"/cf-serverd.rc6 cf-serverd || die
-	newinitd "${FILESDIR}"/cf-monitord.rc6 cf-monitord || die
-	newinitd "${FILESDIR}"/cf-execd.rc6 cf-execd || die
+	newinitd "${FILESDIR}"/cf-serverd.rc6 cf-serverd
+	newinitd "${FILESDIR}"/cf-monitord.rc6 cf-monitord
+	newinitd "${FILESDIR}"/cf-execd.rc6 cf-execd
 
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install
 
 	# fix ifconfig path in provided promises
 	find "${D}"/usr/share -name "*.cf" | xargs sed -i "s,/sbin/ifconfig,$(which ifconfig),g"
@@ -98,7 +98,7 @@ src_install() {
 	# binaries here. This is the default search location for the
 	# binaries.
 	for bin in promises agent monitord serverd execd runagent key; do
-		dosym /usr/sbin/cf-$bin /var/cfengine/bin/cf-$bin || die
+		dosym /usr/sbin/cf-$bin /var/cfengine/bin/cf-$bin
 	done
 }
 
diff --git a/net-misc/cfengine/cfengine-3.6.2.ebuild b/net-misc/cfengine/cfengine-3.6.2.ebuild
index fd0b75a9d5c7..d0d55340c25f 100644
--- a/net-misc/cfengine/cfengine-3.6.2.ebuild
+++ b/net-misc/cfengine/cfengine-3.6.2.ebuild
@@ -77,11 +77,11 @@ src_configure() {
 }
 
 src_install() {
-	newinitd "${FILESDIR}"/cf-serverd.rc6 cf-serverd || die
-	newinitd "${FILESDIR}"/cf-monitord.rc6 cf-monitord || die
-	newinitd "${FILESDIR}"/cf-execd.rc6 cf-execd || die
+	newinitd "${FILESDIR}"/cf-serverd.rc6 cf-serverd
+	newinitd "${FILESDIR}"/cf-monitord.rc6 cf-monitord
+	newinitd "${FILESDIR}"/cf-execd.rc6 cf-execd
 
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install
 
 	# fix ifconfig path in provided promises
 	find "${D}"/usr/share -name "*.cf" | xargs sed -i "s,/sbin/ifconfig,$(which ifconfig),g"
@@ -104,7 +104,7 @@ src_install() {
 	# binaries here. This is the default search location for the
 	# binaries.
 	for bin in promises agent monitord serverd execd runagent key; do
-		dosym /usr/sbin/cf-$bin /var/cfengine/bin/cf-$bin || die
+		dosym /usr/sbin/cf-$bin /var/cfengine/bin/cf-$bin
 	done
 
 	if use masterfiles; then
diff --git a/net-misc/hashcash/hashcash-1.22-r2.ebuild b/net-misc/hashcash/hashcash-1.22-r2.ebuild
index 1533c90bd7b5..e29148642453 100644
--- a/net-misc/hashcash/hashcash-1.22-r2.ebuild
+++ b/net-misc/hashcash/hashcash-1.22-r2.ebuild
@@ -19,7 +19,7 @@ src_prepare() {
 }
 
 src_compile() {
-	emake CC="$(tc-getCC)" generic || die
+	emake CC="$(tc-getCC)" generic
 }
 
 src_install() {
diff --git a/net-misc/ndisc6/ndisc6-1.0.3.ebuild b/net-misc/ndisc6/ndisc6-1.0.3.ebuild
index 5302cb4d211d..8c33ffaefa15 100644
--- a/net-misc/ndisc6/ndisc6-1.0.3.ebuild
+++ b/net-misc/ndisc6/ndisc6-1.0.3.ebuild
@@ -21,10 +21,10 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
-	newinitd "${FILESDIR}"/rdnssd.rc-1 rdnssd || die
-	newconfd "${FILESDIR}"/rdnssd.conf rdnssd || die
+	emake DESTDIR="${D}" install
+	newinitd "${FILESDIR}"/rdnssd.rc-1 rdnssd
+	newconfd "${FILESDIR}"/rdnssd.conf rdnssd
 	exeinto /etc/rdnssd
 	newexe "${FILESDIR}"/resolvconf-1 resolvconf || die
-	dodoc AUTHORS ChangeLog NEWS README || die
+	dodoc AUTHORS ChangeLog NEWS README
 }
diff --git a/net-misc/proxytunnel/proxytunnel-1.9.1-r1.ebuild b/net-misc/proxytunnel/proxytunnel-1.9.1-r1.ebuild
index 40ac24ea6cf2..4807d1daeff2 100644
--- a/net-misc/proxytunnel/proxytunnel-1.9.1-r1.ebuild
+++ b/net-misc/proxytunnel/proxytunnel-1.9.1-r1.ebuild
@@ -28,10 +28,10 @@ src_prepare() {
 
 src_compile() {
 	use static && append-ldflags -static
-	emake CC="$(tc-getCC)" || die
+	emake CC="$(tc-getCC)"
 }
 
 src_install() {
-	emake install prefix="${EPREFIX}"/usr DESTDIR="${D}" || die
+	emake install prefix="${EPREFIX}"/usr DESTDIR="${D}"
 	dodoc CHANGES CREDITS INSTALL KNOWN_ISSUES LICENSE.txt README RELNOTES TODO
 }
diff --git a/net-misc/proxytunnel/proxytunnel-1.9.1-r2.ebuild b/net-misc/proxytunnel/proxytunnel-1.9.1-r2.ebuild
index c3a2f9493841..eaf7123e2b0c 100644
--- a/net-misc/proxytunnel/proxytunnel-1.9.1-r2.ebuild
+++ b/net-misc/proxytunnel/proxytunnel-1.9.1-r2.ebuild
@@ -39,10 +39,10 @@ src_prepare() {
 
 src_compile() {
 	use static && append-ldflags -static
-	emake CC="$(tc-getCC)" || die
+	emake CC="$(tc-getCC)"
 }
 
 src_install() {
-	emake install prefix="${EPREFIX}"/usr DESTDIR="${D}" || die
+	emake install prefix="${EPREFIX}"/usr DESTDIR="${D}"
 	einstalldocs
 }
diff --git a/net-misc/proxytunnel/proxytunnel-9999.ebuild b/net-misc/proxytunnel/proxytunnel-9999.ebuild
index 16a4a63d0bb9..2622cf670239 100644
--- a/net-misc/proxytunnel/proxytunnel-9999.ebuild
+++ b/net-misc/proxytunnel/proxytunnel-9999.ebuild
@@ -36,10 +36,10 @@ src_prepare() {
 
 src_compile() {
 	use static && append-ldflags -static
-	emake CC="$(tc-getCC)" || die
+	emake CC="$(tc-getCC)"
 }
 
 src_install() {
-	emake install prefix="${EPREFIX}"/usr DESTDIR="${D}" || die
+	emake install prefix="${EPREFIX}"/usr DESTDIR="${D}"
 	einstalldocs
 }
diff --git a/net-misc/sipsak/sipsak-0.9.6_p1-r1.ebuild b/net-misc/sipsak/sipsak-0.9.6_p1-r1.ebuild
index 8532201199aa..c82636600396 100644
--- a/net-misc/sipsak/sipsak-0.9.6_p1-r1.ebuild
+++ b/net-misc/sipsak/sipsak-0.9.6_p1-r1.ebuild
@@ -30,6 +30,6 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install
 	dodoc AUTHORS ChangeLog NEWS README TODO
 }
diff --git a/net-misc/sipsak/sipsak-0.9.6_p1-r2.ebuild b/net-misc/sipsak/sipsak-0.9.6_p1-r2.ebuild
index 6893d2605d39..8b19b230546d 100644
--- a/net-misc/sipsak/sipsak-0.9.6_p1-r2.ebuild
+++ b/net-misc/sipsak/sipsak-0.9.6_p1-r2.ebuild
@@ -32,6 +32,6 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install
 	dodoc AUTHORS ChangeLog NEWS README TODO
 }
diff --git a/net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-1.0-r1.ebuild b/net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-1.0-r1.ebuild
index dbd21787dcc2..ae3f4983f181 100644
--- a/net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-1.0-r1.ebuild
+++ b/net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-1.0-r1.ebuild
@@ -34,5 +34,5 @@ src_install() {
 	# Automatically display the passphrase dialog - see bug #437764
 	echo "SSH_ASKPASS='${EPREFIX}/usr/bin/ssh-askpass-fullscreen'" >> "${T}/99ssh_askpass" \
 		|| die "envd file creation failed"
-	doenvd "${T}"/99ssh_askpass || die "doenvd failed"
+	doenvd "${T}"/99ssh_askpass
 }
diff --git a/net-misc/termpkg/termpkg-3.3.9.1-r2.ebuild b/net-misc/termpkg/termpkg-3.3.9.1-r2.ebuild
index 9b4e786d429a..112f96195585 100644
--- a/net-misc/termpkg/termpkg-3.3.9.1-r2.ebuild
+++ b/net-misc/termpkg/termpkg-3.3.9.1-r2.ebuild
@@ -45,7 +45,7 @@ src_configure() {
 }
 
 src_compile() {
-	emake -C linux CC=$(tc-getCC) LIBS="${LDFLAGS}" || die "emake failed"
+	emake -C linux CC=$(tc-getCC) LIBS="${LDFLAGS}"
 }
 
 src_install() {
diff --git a/net-misc/vmpsd/vmpsd-1.4.ebuild b/net-misc/vmpsd/vmpsd-1.4.ebuild
index 3921400cd694..e2dd42654288 100644
--- a/net-misc/vmpsd/vmpsd-1.4.ebuild
+++ b/net-misc/vmpsd/vmpsd-1.4.ebuild
@@ -28,12 +28,11 @@ src_configure() {
 	econf \
 		--sysconfdir=/etc/vmpsd \
 		--enable-snmp \
-		LIBS="-lssl" \
-		|| die "econf failed"
+		LIBS="-lssl"
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install
 	dodoc README INSTALL AUTHORS doc/*txt
 	newdoc external/README README.external
 	newdoc tools/README README.tools