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 --- media-fonts/culmus/culmus-0.120-r5.ebuild | 2 +- media-fonts/culmus/culmus-0.133.ebuild | 2 +- media-fonts/dejavu/dejavu-2.35.ebuild | 3 +-- media-fonts/dejavu/dejavu-2.37.ebuild | 3 +-- media-fonts/wqy-unibit/wqy-unibit-1.1.0_p1-r1.ebuild | 2 +- 5 files changed, 5 insertions(+), 7 deletions(-) (limited to 'media-fonts') diff --git a/media-fonts/culmus/culmus-0.120-r5.ebuild b/media-fonts/culmus/culmus-0.120-r5.ebuild index eaa1f5351242..13ba5f1211b9 100644 --- a/media-fonts/culmus/culmus-0.120-r5.ebuild +++ b/media-fonts/culmus/culmus-0.120-r5.ebuild @@ -156,7 +156,7 @@ src_install() { done pushd ${PN}$(use fontforge && echo -src)-${PV} - dodoc CHANGES || die + dodoc CHANGES popd >/dev/null if use ancient; then diff --git a/media-fonts/culmus/culmus-0.133.ebuild b/media-fonts/culmus/culmus-0.133.ebuild index cc33ae78e598..d21d6b87d735 100644 --- a/media-fonts/culmus/culmus-0.133.ebuild +++ b/media-fonts/culmus/culmus-0.133.ebuild @@ -156,7 +156,7 @@ src_install() { done pushd ${PN}$(use fontforge && echo -src)-${PV} - dodoc CHANGES || die + dodoc CHANGES popd >/dev/null if use ancient; then diff --git a/media-fonts/dejavu/dejavu-2.35.ebuild b/media-fonts/dejavu/dejavu-2.35.ebuild index 0a0e131e0794..0f47efe4b70b 100644 --- a/media-fonts/dejavu/dejavu-2.35.ebuild +++ b/media-fonts/dejavu/dejavu-2.35.ebuild @@ -63,8 +63,7 @@ src_compile() { BLOCKS=/usr/share/unicode-data/Blocks.txt \ UNICODEDATA=/usr/share/unicode-data/UnicodeData.txt \ FC-LANG=/usr/share/fc-lang \ - full sans \ - || die "emake failed" + full sans fi } diff --git a/media-fonts/dejavu/dejavu-2.37.ebuild b/media-fonts/dejavu/dejavu-2.37.ebuild index f46826227e59..739c84999e4c 100644 --- a/media-fonts/dejavu/dejavu-2.37.ebuild +++ b/media-fonts/dejavu/dejavu-2.37.ebuild @@ -70,8 +70,7 @@ src_compile() { BLOCKS=/usr/share/unicode-data/Blocks.txt \ UNICODEDATA=/usr/share/unicode-data/UnicodeData.txt \ FC-LANG=/usr/share/fc-lang \ - full sans \ - || die "emake failed" + full sans fi } diff --git a/media-fonts/wqy-unibit/wqy-unibit-1.1.0_p1-r1.ebuild b/media-fonts/wqy-unibit/wqy-unibit-1.1.0_p1-r1.ebuild index 1fa0abb9ab19..f99e97246832 100644 --- a/media-fonts/wqy-unibit/wqy-unibit-1.1.0_p1-r1.ebuild +++ b/media-fonts/wqy-unibit/wqy-unibit-1.1.0_p1-r1.ebuild @@ -32,6 +32,6 @@ src_prepare() { } src_compile() { - emake || die + emake gzip -9 wqy-unibit.pcf || die } -- cgit v1.2.3-65-gdbad