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 --- dev-libs/389-adminutil/389-adminutil-1.1.15.ebuild | 4 ++-- dev-libs/OpenSRF/OpenSRF-2.1.1.ebuild | 8 ++++---- dev-libs/go-usb/go-usb-9999.ebuild | 2 +- dev-libs/klibc/klibc-2.0.4-r3.ebuild | 8 ++++---- dev-libs/libcgroup/libcgroup-0.41-r5.ebuild | 10 +++++----- dev-libs/libelf/libelf-0.8.13-r2.ebuild | 2 +- dev-libs/libmacaroons/libmacaroons-0.2.0-r1.ebuild | 2 +- dev-libs/libmacaroons/libmacaroons-0.3.0.ebuild | 2 +- dev-libs/libmissing/libmissing-1.1.0.ebuild | 2 +- dev-libs/libnl/libnl-1.1.4-r1.ebuild | 2 +- dev-libs/libnl/libnl-1.1.4.ebuild | 2 +- dev-libs/libsigsegv/libsigsegv-2.11.ebuild | 6 +++--- dev-libs/libxml2/libxml2-2.9.9-r2.ebuild | 2 +- dev-libs/mpfr/mpfr-3.1.3_p4.ebuild | 3 ++- dev-libs/mpfr/mpfr-3.1.4.ebuild | 3 ++- dev-libs/mps/mps-1.111.0.ebuild | 2 +- dev-libs/mps/mps-1.114.0.ebuild | 2 +- dev-libs/pcc-libs/pcc-libs-1.1.0.ebuild | 4 ++-- dev-libs/pcc-libs/pcc-libs-9999.ebuild | 4 ++-- dev-libs/snowball-stemmer/snowball-stemmer-0.20140325.ebuild | 4 ++-- dev-libs/svrcore/svrcore-4.0.4-r1.ebuild | 2 +- dev-libs/tntnet/tntnet-2.2.1-r1.ebuild | 6 +++--- dev-libs/tntnet/tntnet-2.2.1.ebuild | 6 +++--- dev-libs/yaz/yaz-3.0.53.ebuild | 4 ++-- dev-libs/zlog/zlog-1.2.12-r1.ebuild | 2 +- dev-libs/zlog/zlog-1.2.12.ebuild | 2 +- 26 files changed, 49 insertions(+), 47 deletions(-) (limited to 'dev-libs') diff --git a/dev-libs/389-adminutil/389-adminutil-1.1.15.ebuild b/dev-libs/389-adminutil/389-adminutil-1.1.15.ebuild index 1339f84e150c..9920bcb5065a 100644 --- a/dev-libs/389-adminutil/389-adminutil-1.1.15.ebuild +++ b/dev-libs/389-adminutil/389-adminutil-1.1.15.ebuild @@ -37,10 +37,10 @@ src_configure() { --with-fhs \ --with-openldap \ --disable-rpath \ - --disable-tests ||die "econf failed" + --disable-tests } src_install () { - emake DESTDIR="${D}" install || die "emake failed" + emake DESTDIR="${D}" install dodoc README NEWS } diff --git a/dev-libs/OpenSRF/OpenSRF-2.1.1.ebuild b/dev-libs/OpenSRF/OpenSRF-2.1.1.ebuild index 7080fd53a102..ed235d5aab1e 100644 --- a/dev-libs/OpenSRF/OpenSRF-2.1.1.ebuild +++ b/dev-libs/OpenSRF/OpenSRF-2.1.1.ebuild @@ -73,15 +73,15 @@ src_prepare() { # -e "/^export APR_HEADERS=/s,/.*,${APR_HEADERS}," \ # -e "/^export LIBXML2_HEADERS=/s,/.*,${LIBXML2_HEADERS}," \ # install.conf -# emake verbose || die "Failed to build" +# emake verbose #} src_configure() { APXS2_INSTALL="-i" \ econf \ --with-apxs=/usr/sbin/apxs2 \ --sysconfdir=/etc/opensrf \ - --localstatedir=/var \ - || die "econf failed" + --localstatedir=/var + cd "${PERL_S}" && S="${PERL_S}" perl-module_src_configure || die "perl-module_src_configure failed" } @@ -92,7 +92,7 @@ src_compile() { src_install() { einfo "Doing src_install" - #emake install-verbose DESTDIR="${D}" || die "Failed to install" + #emake install-verbose DESTDIR="${D}" emake install DESTDIR="${D}" APXS2_INSTALL="-i" apache-module_src_install || die "apache-module_src_install failed" cd "${PERL_S}" && S="${PERL_S}" perl-module_src_install || die "perl-module_src_install failed" diff --git a/dev-libs/go-usb/go-usb-9999.ebuild b/dev-libs/go-usb/go-usb-9999.ebuild index e634c7ea3b82..7c84be80dbe4 100644 --- a/dev-libs/go-usb/go-usb-9999.ebuild +++ b/dev-libs/go-usb/go-usb-9999.ebuild @@ -24,7 +24,7 @@ GO_PN="/usr/lib/go/src/github.com/hanwen/usb" src_install() { insinto "${GO_PN}" - doins *.go LICENSE || die "Install failed" + doins *.go LICENSE } src_test() { diff --git a/dev-libs/klibc/klibc-2.0.4-r3.ebuild b/dev-libs/klibc/klibc-2.0.4-r3.ebuild index 0ce5d3b94957..15cd0619685d 100644 --- a/dev-libs/klibc/klibc-2.0.4-r3.ebuild +++ b/dev-libs/klibc/klibc-2.0.4-r3.ebuild @@ -155,7 +155,7 @@ src_compile() { unset KBUILD_OUTPUT # we are using a private copy cd "${KS}" - emake ${defconfig} CC="${CC}" HOSTCC="${HOSTCC}" ARCH="${KLIBCASMARCH}" || die "No defconfig" + emake ${defconfig} CC="${CC}" HOSTCC="${HOSTCC}" ARCH="${KLIBCASMARCH}" if [[ "${KLIBCARCH/arm}" != "${KLIBCARCH}" ]] && \ [[ "${CHOST/eabi}" != "${CHOST}" ]]; then # The delete and insert are seperate statements @@ -169,7 +169,7 @@ src_compile() { "${KS}"/.config \ "${S}"/defconfig fi - emake prepare CC="${CC}" HOSTCC="${HOSTCC}" ARCH="${KLIBCASMARCH}" || die "Failed to prepare kernel sources for header usage" + emake prepare CC="${CC}" HOSTCC="${HOSTCC}" ARCH="${KLIBCASMARCH}" cd "${S}" @@ -196,7 +196,7 @@ src_compile() { $(use custom-cflags || echo SKIP_)HOSTCFLAGS="${CFLAGS}" \ $(use custom-cflags || echo SKIP_)HOSTLDFLAGS="${LDFLAGS}" \ $(use custom-cflags || echo SKIP_)KLIBCOPTFLAGS="${CFLAGS}" \ - ${myargs} || die "Compile failed!" + ${myargs} #SHLIBDIR="/${libdir}" \ @@ -248,7 +248,7 @@ src_install() { $(use custom-cflags || echo SKIP_)HOSTLDFLAGS="${LDFLAGS}" \ $(use custom-cflags || echo SKIP_)KLIBCOPTFLAGS="${CFLAGS}" \ ${myargs} \ - install || die "Install failed!" + install #SHLIBDIR="/${libdir}" \ diff --git a/dev-libs/libcgroup/libcgroup-0.41-r5.ebuild b/dev-libs/libcgroup/libcgroup-0.41-r5.ebuild index 153dd574401d..b8847f2fdc27 100644 --- a/dev-libs/libcgroup/libcgroup-0.41-r5.ebuild +++ b/dev-libs/libcgroup/libcgroup-0.41-r5.ebuild @@ -88,15 +88,15 @@ src_install() { prune_libtool_files --all insinto /etc/cgroup - doins samples/*.conf || die + doins samples/*.conf if use tools; then - newconfd "${FILESDIR}"/cgconfig.confd-r1 cgconfig || die - newinitd "${FILESDIR}"/cgconfig.initd-r1 cgconfig || die + newconfd "${FILESDIR}"/cgconfig.confd-r1 cgconfig + newinitd "${FILESDIR}"/cgconfig.initd-r1 cgconfig fi if use daemon; then - newconfd "${FILESDIR}"/cgred.confd-r2 cgred || die - newinitd "${FILESDIR}"/cgred.initd-r1 cgred || die + newconfd "${FILESDIR}"/cgred.confd-r2 cgred + newinitd "${FILESDIR}"/cgred.initd-r1 cgred fi } diff --git a/dev-libs/libelf/libelf-0.8.13-r2.ebuild b/dev-libs/libelf/libelf-0.8.13-r2.ebuild index 20f15d7e1782..9cb4e75ff9d0 100644 --- a/dev-libs/libelf/libelf-0.8.13-r2.ebuild +++ b/dev-libs/libelf/libelf-0.8.13-r2.ebuild @@ -44,7 +44,7 @@ multilib_src_install() { libdir="${ED}usr/$(get_libdir)" \ install \ install-compat \ - -j1 || die + -j1 # Stop libelf from stamping on the system nlist.h use elibc_FreeBSD && rm "${ED}"/usr/include/nlist.h diff --git a/dev-libs/libmacaroons/libmacaroons-0.2.0-r1.ebuild b/dev-libs/libmacaroons/libmacaroons-0.2.0-r1.ebuild index 448465a2c6ea..2e904c76228f 100644 --- a/dev-libs/libmacaroons/libmacaroons-0.2.0-r1.ebuild +++ b/dev-libs/libmacaroons/libmacaroons-0.2.0-r1.ebuild @@ -36,5 +36,5 @@ src_configure() { } src_test() { - emake -j1 check || die + emake -j1 check } diff --git a/dev-libs/libmacaroons/libmacaroons-0.3.0.ebuild b/dev-libs/libmacaroons/libmacaroons-0.3.0.ebuild index 448465a2c6ea..2e904c76228f 100644 --- a/dev-libs/libmacaroons/libmacaroons-0.3.0.ebuild +++ b/dev-libs/libmacaroons/libmacaroons-0.3.0.ebuild @@ -36,5 +36,5 @@ src_configure() { } src_test() { - emake -j1 check || die + emake -j1 check } diff --git a/dev-libs/libmissing/libmissing-1.1.0.ebuild b/dev-libs/libmissing/libmissing-1.1.0.ebuild index b7099ebe7775..a60e94ec453f 100644 --- a/dev-libs/libmissing/libmissing-1.1.0.ebuild +++ b/dev-libs/libmissing/libmissing-1.1.0.ebuild @@ -135,7 +135,7 @@ src_configure() { # gnulib cannot be used a shared library, doing so results in stack # protector checks failing for reasons yet unknown to me - econf --disable-shared --enable-static || die + econf --disable-shared --enable-static } src_compile() { diff --git a/dev-libs/libnl/libnl-1.1.4-r1.ebuild b/dev-libs/libnl/libnl-1.1.4-r1.ebuild index 2b9928fc0566..39205ce0c9ca 100644 --- a/dev-libs/libnl/libnl-1.1.4-r1.ebuild +++ b/dev-libs/libnl/libnl-1.1.4-r1.ebuild @@ -42,7 +42,7 @@ src_compile() { if use doc ; then cd "${S}/doc" - emake gendoc || die + emake gendoc fi } diff --git a/dev-libs/libnl/libnl-1.1.4.ebuild b/dev-libs/libnl/libnl-1.1.4.ebuild index 686c171132d1..8fc958567840 100644 --- a/dev-libs/libnl/libnl-1.1.4.ebuild +++ b/dev-libs/libnl/libnl-1.1.4.ebuild @@ -39,7 +39,7 @@ src_compile() { if use doc ; then cd "${S}/doc" - emake gendoc || die + emake gendoc fi } diff --git a/dev-libs/libsigsegv/libsigsegv-2.11.ebuild b/dev-libs/libsigsegv/libsigsegv-2.11.ebuild index 5ab74d80c3a5..3acf972b408d 100644 --- a/dev-libs/libsigsegv/libsigsegv-2.11.ebuild +++ b/dev-libs/libsigsegv/libsigsegv-2.11.ebuild @@ -13,7 +13,7 @@ KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64- IUSE="" src_configure () { - econf --enable-shared || die "Configure phase failed" + econf --enable-shared } src_test () { @@ -22,10 +22,10 @@ src_test () { ewarn "Skipped tests. Please disable sandbox to run tests." return 0 fi - emake check || die "Tests failed" + emake check } src_install() { - emake DESTDIR="${D}" install || die "emake install failed" + emake DESTDIR="${D}" install dodoc AUTHORS ChangeLog* NEWS PORTING README } diff --git a/dev-libs/libxml2/libxml2-2.9.9-r2.ebuild b/dev-libs/libxml2/libxml2-2.9.9-r2.ebuild index 24baa153a846..4181f92e6dae 100644 --- a/dev-libs/libxml2/libxml2-2.9.9-r2.ebuild +++ b/dev-libs/libxml2/libxml2-2.9.9-r2.ebuild @@ -158,7 +158,7 @@ multilib_src_compile() { multilib_src_test() { ln -s "${S}"/xmlconf || die - emake check || die "tests failed" + emake check multilib_is_native_abi && use python && python_foreach_impl libxml2_py_emake test } diff --git a/dev-libs/mpfr/mpfr-3.1.3_p4.ebuild b/dev-libs/mpfr/mpfr-3.1.3_p4.ebuild index 4c65b8c578d1..6784eb0171f7 100644 --- a/dev-libs/mpfr/mpfr-3.1.3_p4.ebuild +++ b/dev-libs/mpfr/mpfr-3.1.3_p4.ebuild @@ -49,7 +49,8 @@ multilib_src_install_all() { # clean up html/license install pushd "${ED}"/usr/share/doc/${PF} >/dev/null - dohtml *.html && rm COPYING* *.html || die + dohtml *.html + rm COPYING* *.html || die popd >/dev/null } diff --git a/dev-libs/mpfr/mpfr-3.1.4.ebuild b/dev-libs/mpfr/mpfr-3.1.4.ebuild index a832b4410b00..6067024dc290 100644 --- a/dev-libs/mpfr/mpfr-3.1.4.ebuild +++ b/dev-libs/mpfr/mpfr-3.1.4.ebuild @@ -50,6 +50,7 @@ multilib_src_install_all() { # clean up html/license install pushd "${ED}"/usr/share/doc/${PF} >/dev/null - dohtml *.html && rm COPYING* *.html || die + dohtml *.html + rm COPYING* *.html || die popd >/dev/null } diff --git a/dev-libs/mps/mps-1.111.0.ebuild b/dev-libs/mps/mps-1.111.0.ebuild index 1bd9a1f18277..685b7aef5c9e 100644 --- a/dev-libs/mps/mps-1.111.0.ebuild +++ b/dev-libs/mps/mps-1.111.0.ebuild @@ -27,5 +27,5 @@ src_prepare() { } src_install() { - emake DESTDIR="${D}" install || die + emake DESTDIR="${D}" install } diff --git a/dev-libs/mps/mps-1.114.0.ebuild b/dev-libs/mps/mps-1.114.0.ebuild index 7adf0b24abc9..767c250c487b 100644 --- a/dev-libs/mps/mps-1.114.0.ebuild +++ b/dev-libs/mps/mps-1.114.0.ebuild @@ -27,5 +27,5 @@ src_prepare() { } src_install() { - emake DESTDIR="${D}" install || die + emake DESTDIR="${D}" install } diff --git a/dev-libs/pcc-libs/pcc-libs-1.1.0.ebuild b/dev-libs/pcc-libs/pcc-libs-1.1.0.ebuild index a045911ed6cf..1c1352594b89 100644 --- a/dev-libs/pcc-libs/pcc-libs-1.1.0.ebuild +++ b/dev-libs/pcc-libs/pcc-libs-1.1.0.ebuild @@ -20,9 +20,9 @@ S=${WORKDIR}/${PN}-${PVR/*_pre/}/ src_compile() { # not parallel-safe yet - emake -j1 || die "emake failed" + emake -j1 } src_install() { - emake DESTDIR="${D}" install || die "emake install failed" + emake DESTDIR="${D}" install } diff --git a/dev-libs/pcc-libs/pcc-libs-9999.ebuild b/dev-libs/pcc-libs/pcc-libs-9999.ebuild index ce43fb4adbd4..d15e96041f3d 100644 --- a/dev-libs/pcc-libs/pcc-libs-9999.ebuild +++ b/dev-libs/pcc-libs/pcc-libs-9999.ebuild @@ -27,9 +27,9 @@ RDEPEND="${DEPEND}" src_compile() { # not parallel-safe yet - emake -j1 || die "emake failed" + emake -j1 } src_install() { - emake DESTDIR="${D}" install || die "emake install failed" + emake DESTDIR="${D}" install } diff --git a/dev-libs/snowball-stemmer/snowball-stemmer-0.20140325.ebuild b/dev-libs/snowball-stemmer/snowball-stemmer-0.20140325.ebuild index 4eb1aa6c4305..644a3a6f436d 100644 --- a/dev-libs/snowball-stemmer/snowball-stemmer-0.20140325.ebuild +++ b/dev-libs/snowball-stemmer/snowball-stemmer-0.20140325.ebuild @@ -30,10 +30,10 @@ src_prepare() { } src_compile() { - CC=$(tc-getCC) emake libstemmer.so stemwords || die "Make failed!" + CC=$(tc-getCC) emake libstemmer.so stemwords if use static-libs; then - CC=$(tc-getCC) AR=$(tc-getAR) emake libstemmer.a || die "Make failed!" + CC=$(tc-getCC) AR=$(tc-getAR) emake libstemmer.a fi } diff --git a/dev-libs/svrcore/svrcore-4.0.4-r1.ebuild b/dev-libs/svrcore/svrcore-4.0.4-r1.ebuild index b88e4a800e90..86751402c273 100644 --- a/dev-libs/svrcore/svrcore-4.0.4-r1.ebuild +++ b/dev-libs/svrcore/svrcore-4.0.4-r1.ebuild @@ -25,7 +25,7 @@ src_prepare() { } src_configure() { - econf --with-pic || die "cannot configure" + econf --with-pic } src_install () { diff --git a/dev-libs/tntnet/tntnet-2.2.1-r1.ebuild b/dev-libs/tntnet/tntnet-2.2.1-r1.ebuild index cc25ab03fdfb..0b0c372cdd83 100644 --- a/dev-libs/tntnet/tntnet-2.2.1-r1.ebuild +++ b/dev-libs/tntnet/tntnet-2.2.1-r1.ebuild @@ -66,11 +66,11 @@ src_configure() { } src_install() { - emake DESTDIR="${D}" install || die + emake DESTDIR="${D}" install dodoc AUTHORS ChangeLog README TODO if use doc; then - dodoc doc/*.pdf || die + dodoc doc/*.pdf fi if use examples; then @@ -80,7 +80,7 @@ src_install() { cd "${S}" insinto /usr/share/doc/${PF}/examples - doins -r sdk/demos/* || die + doins -r sdk/demos/* fi if use server; then diff --git a/dev-libs/tntnet/tntnet-2.2.1.ebuild b/dev-libs/tntnet/tntnet-2.2.1.ebuild index bd46d16526d7..63a7484d2e88 100644 --- a/dev-libs/tntnet/tntnet-2.2.1.ebuild +++ b/dev-libs/tntnet/tntnet-2.2.1.ebuild @@ -63,11 +63,11 @@ src_configure() { } src_install() { - emake DESTDIR="${D}" install || die + emake DESTDIR="${D}" install dodoc AUTHORS ChangeLog README TODO if use doc; then - dodoc doc/*.pdf || die + dodoc doc/*.pdf fi if use examples; then @@ -77,7 +77,7 @@ src_install() { cd "${S}" insinto /usr/share/doc/${PF}/examples - doins -r sdk/demos/* || die + doins -r sdk/demos/* fi if use server; then diff --git a/dev-libs/yaz/yaz-3.0.53.ebuild b/dev-libs/yaz/yaz-3.0.53.ebuild index 66af93b48754..028369d37be8 100644 --- a/dev-libs/yaz/yaz-3.0.53.ebuild +++ b/dev-libs/yaz/yaz-3.0.53.ebuild @@ -40,12 +40,12 @@ src_configure() { } src_compile() { - emake || die "emake failed" + emake } src_install() { local docdir="/usr/share/doc/${PF}" - emake DESTDIR="${D}" docdir="${docdir}" install || die "install failed" + emake DESTDIR="${D}" docdir="${docdir}" install dodir ${docdir}/html mv -f "${D}"/${docdir}/*.{html,png} "${D}"/${docdir}/html/ || die "Failed to move HTML docs" diff --git a/dev-libs/zlog/zlog-1.2.12-r1.ebuild b/dev-libs/zlog/zlog-1.2.12-r1.ebuild index 234c16b0954e..d49daa11b495 100644 --- a/dev-libs/zlog/zlog-1.2.12-r1.ebuild +++ b/dev-libs/zlog/zlog-1.2.12-r1.ebuild @@ -25,7 +25,7 @@ src_compile() { } src_test () { - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" test || die "Tests failed." + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" test } src_install() { diff --git a/dev-libs/zlog/zlog-1.2.12.ebuild b/dev-libs/zlog/zlog-1.2.12.ebuild index 010e98c10de7..ca74561e511e 100644 --- a/dev-libs/zlog/zlog-1.2.12.ebuild +++ b/dev-libs/zlog/zlog-1.2.12.ebuild @@ -24,7 +24,7 @@ src_prepare() { } src_test () { - emake test || die "Tests failed." + emake test } src_install() { -- cgit v1.2.3-65-gdbad