From 398a42634f34afa1979d88ae1d8b38194e911c2d Mon Sep 17 00:00:00 2001 From: David Seifert Date: Wed, 11 Dec 2019 13:32:00 +0100 Subject: */*: [QA] Remove redundant `|| die` guards MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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 Reviewed-by: Michał Górny Reviewed-by: Andreas K. Hüttel Signed-off-by: David Seifert --- net-dns/avahi/avahi-0.7-r2.ebuild | 2 +- net-dns/avahi/avahi-0.7-r4.ebuild | 2 +- net-dns/odsclient/odsclient-1.03-r1.ebuild | 3 +-- net-dns/sheerdns/sheerdns-1.0.3.ebuild | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) (limited to 'net-dns') diff --git a/net-dns/avahi/avahi-0.7-r2.ebuild b/net-dns/avahi/avahi-0.7-r2.ebuild index 7728bc27faac..5768b6f05c1a 100644 --- a/net-dns/avahi/avahi-0.7-r2.ebuild +++ b/net-dns/avahi/avahi-0.7-r2.ebuild @@ -190,7 +190,7 @@ multilib_src_install() { docinto html dodoc -r doxygen/html/. insinto /usr/share/devhelp/books/avahi - doins avahi.devhelp || die + doins avahi.devhelp fi # The build system creates an empty "/run" directory, so we clean it up here diff --git a/net-dns/avahi/avahi-0.7-r4.ebuild b/net-dns/avahi/avahi-0.7-r4.ebuild index 3891e557578a..045191094868 100644 --- a/net-dns/avahi/avahi-0.7-r4.ebuild +++ b/net-dns/avahi/avahi-0.7-r4.ebuild @@ -184,7 +184,7 @@ multilib_src_install() { docinto html dodoc -r doxygen/html/. insinto /usr/share/devhelp/books/avahi - doins avahi.devhelp || die + doins avahi.devhelp fi # The build system creates an empty "/run" directory, so we clean it up here diff --git a/net-dns/odsclient/odsclient-1.03-r1.ebuild b/net-dns/odsclient/odsclient-1.03-r1.ebuild index 4f928f134a1e..7222b961927d 100644 --- a/net-dns/odsclient/odsclient-1.03-r1.ebuild +++ b/net-dns/odsclient/odsclient-1.03-r1.ebuild @@ -25,8 +25,7 @@ src_compile() { emake \ CC=$(tc-getCC) \ CFLAGS="${CFLAGS}" \ - LDFLAGS="${LDFLAGS}" \ - || die + LDFLAGS="${LDFLAGS}" } src_install() { diff --git a/net-dns/sheerdns/sheerdns-1.0.3.ebuild b/net-dns/sheerdns/sheerdns-1.0.3.ebuild index d1e7c5e721a3..4ef9604323b8 100644 --- a/net-dns/sheerdns/sheerdns-1.0.3.ebuild +++ b/net-dns/sheerdns/sheerdns-1.0.3.ebuild @@ -22,7 +22,7 @@ src_prepare() { } src_compile() { - emake CC=$(tc-getCC) || die + emake CC=$(tc-getCC) } src_install() { -- cgit v1.2.3-18-g5258