summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Seifert <soap@gentoo.org>2019-12-11 13:32:00 +0100
committerDavid Seifert <soap@gentoo.org>2019-12-11 13:32:00 +0100
commit398a42634f34afa1979d88ae1d8b38194e911c2d (patch)
treed6a45bdf7b35b71c192602a46e8d98d12a88cb02 /mail-mta
parentdev-ros/geometric_shapes: Remove old (diff)
downloadgentoo-398a42634f34afa1979d88ae1d8b38194e911c2d.tar.gz
gentoo-398a42634f34afa1979d88ae1d8b38194e911c2d.tar.bz2
gentoo-398a42634f34afa1979d88ae1d8b38194e911c2d.zip
*/*: [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>
Diffstat (limited to 'mail-mta')
-rw-r--r--mail-mta/courier/courier-1.0.5.ebuild2
-rw-r--r--mail-mta/exim/exim-4.92.2.ebuild3
-rw-r--r--mail-mta/exim/exim-4.92.3.ebuild3
-rw-r--r--mail-mta/exim/exim-4.93.ebuild3
-rw-r--r--mail-mta/ssmtp/ssmtp-2.64-r2.ebuild2
-rw-r--r--mail-mta/ssmtp/ssmtp-2.64-r3.ebuild2
6 files changed, 6 insertions, 9 deletions
diff --git a/mail-mta/courier/courier-1.0.5.ebuild b/mail-mta/courier/courier-1.0.5.ebuild
index 845fd449bf7f..b165cabcf331 100644
--- a/mail-mta/courier/courier-1.0.5.ebuild
+++ b/mail-mta/courier/courier-1.0.5.ebuild
@@ -242,7 +242,7 @@ src_install() {
src_test() {
if [ `whoami` != 'root' ]; then
- emake -j1 check || die "Make check failed."
+ emake -j1 check
else
einfo "make check skipped, can't run as root."
einfo "You can enable it with FEATURES=\"userpriv\""
diff --git a/mail-mta/exim/exim-4.92.2.ebuild b/mail-mta/exim/exim-4.92.2.ebuild
index 3628f1466d78..737806a2d8a1 100644
--- a/mail-mta/exim/exim-4.92.2.ebuild
+++ b/mail-mta/exim/exim-4.92.2.ebuild
@@ -487,8 +487,7 @@ src_configure() {
src_compile() {
emake CC="$(tc-getCC)" HOSTCC="$(tc-getBUILD_CC)" \
- AR="$(tc-getAR) cq" RANLIB="$(tc-getRANLIB)" FULLECHO='' \
- || die "make failed"
+ AR="$(tc-getAR) cq" RANLIB="$(tc-getRANLIB)" FULLECHO=''
}
src_install () {
diff --git a/mail-mta/exim/exim-4.92.3.ebuild b/mail-mta/exim/exim-4.92.3.ebuild
index 7b828027f63d..05dbf4afa52d 100644
--- a/mail-mta/exim/exim-4.92.3.ebuild
+++ b/mail-mta/exim/exim-4.92.3.ebuild
@@ -487,8 +487,7 @@ src_configure() {
src_compile() {
emake CC="$(tc-getCC)" HOSTCC="$(tc-getBUILD_CC)" \
- AR="$(tc-getAR) cq" RANLIB="$(tc-getRANLIB)" FULLECHO='' \
- || die "make failed"
+ AR="$(tc-getAR) cq" RANLIB="$(tc-getRANLIB)" FULLECHO=''
}
src_install () {
diff --git a/mail-mta/exim/exim-4.93.ebuild b/mail-mta/exim/exim-4.93.ebuild
index 6feaa1836fa7..1374ea7d36c7 100644
--- a/mail-mta/exim/exim-4.93.ebuild
+++ b/mail-mta/exim/exim-4.93.ebuild
@@ -485,8 +485,7 @@ src_configure() {
src_compile() {
emake CC="$(tc-getCC)" HOSTCC="$(tc-getBUILD_CC)" \
- AR="$(tc-getAR) cq" RANLIB="$(tc-getRANLIB)" FULLECHO='' \
- || die "make failed"
+ AR="$(tc-getAR) cq" RANLIB="$(tc-getRANLIB)" FULLECHO=''
}
src_install () {
diff --git a/mail-mta/ssmtp/ssmtp-2.64-r2.ebuild b/mail-mta/ssmtp/ssmtp-2.64-r2.ebuild
index 30b375ca20d5..885dd6a73045 100644
--- a/mail-mta/ssmtp/ssmtp-2.64-r2.ebuild
+++ b/mail-mta/ssmtp/ssmtp-2.64-r2.ebuild
@@ -70,7 +70,7 @@ src_configure() {
}
src_compile() {
- emake etcdir="${EPREFIX}"/etc || die
+ emake etcdir="${EPREFIX}"/etc
}
src_install() {
diff --git a/mail-mta/ssmtp/ssmtp-2.64-r3.ebuild b/mail-mta/ssmtp/ssmtp-2.64-r3.ebuild
index 3578fd7d685a..4d7d47e86f81 100644
--- a/mail-mta/ssmtp/ssmtp-2.64-r3.ebuild
+++ b/mail-mta/ssmtp/ssmtp-2.64-r3.ebuild
@@ -73,7 +73,7 @@ src_configure() {
}
src_compile() {
- emake etcdir="${EPREFIX}"/etc || die
+ emake etcdir="${EPREFIX}"/etc
}
src_install() {