diff options
author | David Seifert <soap@gentoo.org> | 2019-12-11 13:32:00 +0100 |
---|---|---|
committer | David Seifert <soap@gentoo.org> | 2019-12-11 13:32:00 +0100 |
commit | 398a42634f34afa1979d88ae1d8b38194e911c2d (patch) | |
tree | d6a45bdf7b35b71c192602a46e8d98d12a88cb02 /media-plugins | |
parent | dev-ros/geometric_shapes: Remove old (diff) | |
download | gentoo-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 'media-plugins')
-rw-r--r-- | media-plugins/ir_lv2/ir_lv2-1.3.2.ebuild | 6 | ||||
-rw-r--r-- | media-plugins/live/live-2017.10.28.ebuild | 6 | ||||
-rw-r--r-- | media-plugins/live/live-2018.01.29.ebuild | 6 | ||||
-rw-r--r-- | media-plugins/live/live-2018.07.07.ebuild | 6 | ||||
-rw-r--r-- | media-plugins/swh-lv2/swh-lv2-1.0.16.ebuild | 4 | ||||
-rw-r--r-- | media-plugins/vdr-imonlcd/vdr-imonlcd-1.0.2.ebuild | 2 | ||||
-rw-r--r-- | media-plugins/xbmc-addon-xvdr/xbmc-addon-xvdr-9999.ebuild | 2 |
7 files changed, 16 insertions, 16 deletions
diff --git a/media-plugins/ir_lv2/ir_lv2-1.3.2.ebuild b/media-plugins/ir_lv2/ir_lv2-1.3.2.ebuild index cc7e46fac82a..56c7f8b6a29f 100644 --- a/media-plugins/ir_lv2/ir_lv2-1.3.2.ebuild +++ b/media-plugins/ir_lv2/ir_lv2-1.3.2.ebuild @@ -33,10 +33,10 @@ src_prepare() { src_compile() { tc-export CC CXX - emake || die + emake } src_install() { - emake INSTDIR="${D}/usr/$(get_libdir)/lv2/ir.lv2" install || die - dodoc README ChangeLog || die + emake INSTDIR="${D}/usr/$(get_libdir)/lv2/ir.lv2" install + dodoc README ChangeLog } diff --git a/media-plugins/live/live-2017.10.28.ebuild b/media-plugins/live/live-2017.10.28.ebuild index 1f4629ae3c1b..6c6dc0f85b53 100644 --- a/media-plugins/live/live-2017.10.28.ebuild +++ b/media-plugins/live/live-2017.10.28.ebuild @@ -83,14 +83,14 @@ multilib_src_compile() { einfo "Beginning static library build" ./genMakefiles gentoo - emake -j1 LINK_OPTS="-L. $(raw-ldflags)" || die "failed to build static libraries" + emake -j1 LINK_OPTS="-L. $(raw-ldflags)" fi cd "${BUILD_DIR}/live-shared" einfo "Beginning shared library build" ./genMakefiles gentoo-so-r1 local suffix=$(get_libname ${LIVE_ABI_VERSION}) - emake -j1 LINK_OPTS="-L. ${LDFLAGS}" LIB_SUFFIX="${suffix#.}" || die "failed to build shared libraries" + emake -j1 LINK_OPTS="-L. ${LDFLAGS}" LIB_SUFFIX="${suffix#.}" for i in liveMedia groupsock UsageEnvironment BasicUsageEnvironment ; do pushd "${BUILD_DIR}/live-shared/${i}" > /dev/null @@ -102,7 +102,7 @@ multilib_src_compile() { einfo "Beginning programs build" for i in $(use examples && echo "testProgs") proxyServer mediaServer ; do cd "${BUILD_DIR}/live-shared/${i}" - emake LINK_OPTS="-L. ${LDFLAGS}" || die "failed to build test programs" + emake LINK_OPTS="-L. ${LDFLAGS}" done fi } diff --git a/media-plugins/live/live-2018.01.29.ebuild b/media-plugins/live/live-2018.01.29.ebuild index be60aaac5014..d833ddf75eb2 100644 --- a/media-plugins/live/live-2018.01.29.ebuild +++ b/media-plugins/live/live-2018.01.29.ebuild @@ -83,14 +83,14 @@ multilib_src_compile() { einfo "Beginning static library build" ./genMakefiles gentoo - emake -j1 LINK_OPTS="-L. $(raw-ldflags)" || die "failed to build static libraries" + emake -j1 LINK_OPTS="-L. $(raw-ldflags)" fi cd "${BUILD_DIR}/live-shared" einfo "Beginning shared library build" ./genMakefiles gentoo-so-r1 local suffix=$(get_libname ${LIVE_ABI_VERSION}) - emake -j1 LINK_OPTS="-L. ${LDFLAGS}" LIB_SUFFIX="${suffix#.}" || die "failed to build shared libraries" + emake -j1 LINK_OPTS="-L. ${LDFLAGS}" LIB_SUFFIX="${suffix#.}" for i in liveMedia groupsock UsageEnvironment BasicUsageEnvironment ; do pushd "${BUILD_DIR}/live-shared/${i}" > /dev/null @@ -102,7 +102,7 @@ multilib_src_compile() { einfo "Beginning programs build" for i in $(use examples && echo "testProgs") proxyServer mediaServer ; do cd "${BUILD_DIR}/live-shared/${i}" - emake LINK_OPTS="-L. ${LDFLAGS}" || die "failed to build test programs" + emake LINK_OPTS="-L. ${LDFLAGS}" done fi } diff --git a/media-plugins/live/live-2018.07.07.ebuild b/media-plugins/live/live-2018.07.07.ebuild index be60aaac5014..d833ddf75eb2 100644 --- a/media-plugins/live/live-2018.07.07.ebuild +++ b/media-plugins/live/live-2018.07.07.ebuild @@ -83,14 +83,14 @@ multilib_src_compile() { einfo "Beginning static library build" ./genMakefiles gentoo - emake -j1 LINK_OPTS="-L. $(raw-ldflags)" || die "failed to build static libraries" + emake -j1 LINK_OPTS="-L. $(raw-ldflags)" fi cd "${BUILD_DIR}/live-shared" einfo "Beginning shared library build" ./genMakefiles gentoo-so-r1 local suffix=$(get_libname ${LIVE_ABI_VERSION}) - emake -j1 LINK_OPTS="-L. ${LDFLAGS}" LIB_SUFFIX="${suffix#.}" || die "failed to build shared libraries" + emake -j1 LINK_OPTS="-L. ${LDFLAGS}" LIB_SUFFIX="${suffix#.}" for i in liveMedia groupsock UsageEnvironment BasicUsageEnvironment ; do pushd "${BUILD_DIR}/live-shared/${i}" > /dev/null @@ -102,7 +102,7 @@ multilib_src_compile() { einfo "Beginning programs build" for i in $(use examples && echo "testProgs") proxyServer mediaServer ; do cd "${BUILD_DIR}/live-shared/${i}" - emake LINK_OPTS="-L. ${LDFLAGS}" || die "failed to build test programs" + emake LINK_OPTS="-L. ${LDFLAGS}" done fi } diff --git a/media-plugins/swh-lv2/swh-lv2-1.0.16.ebuild b/media-plugins/swh-lv2/swh-lv2-1.0.16.ebuild index 60c107b0b478..c134ba72c5e5 100644 --- a/media-plugins/swh-lv2/swh-lv2-1.0.16.ebuild +++ b/media-plugins/swh-lv2/swh-lv2-1.0.16.ebuild @@ -27,10 +27,10 @@ src_prepare() { } src_compile() { - emake CC=$(tc-getCC) || die + emake CC=$(tc-getCC) } src_install() { - emake INSTALL_DIR="${D}/usr/$(get_libdir)/lv2" install-system || die + emake INSTALL_DIR="${D}/usr/$(get_libdir)/lv2" install-system dodoc README } diff --git a/media-plugins/vdr-imonlcd/vdr-imonlcd-1.0.2.ebuild b/media-plugins/vdr-imonlcd/vdr-imonlcd-1.0.2.ebuild index d67f1e90c8a2..9010c74f2f13 100644 --- a/media-plugins/vdr-imonlcd/vdr-imonlcd-1.0.2.ebuild +++ b/media-plugins/vdr-imonlcd/vdr-imonlcd-1.0.2.ebuild @@ -36,5 +36,5 @@ src_install() { vdr-plugin-2_src_install insinto $(get_udevdir)/rules.d - doins "${FILESDIR}"/99-imonlcd.rules || die + doins "${FILESDIR}"/99-imonlcd.rules } diff --git a/media-plugins/xbmc-addon-xvdr/xbmc-addon-xvdr-9999.ebuild b/media-plugins/xbmc-addon-xvdr/xbmc-addon-xvdr-9999.ebuild index 897eb4d0ccc5..0c3fcf9b0dad 100644 --- a/media-plugins/xbmc-addon-xvdr/xbmc-addon-xvdr-9999.ebuild +++ b/media-plugins/xbmc-addon-xvdr/xbmc-addon-xvdr-9999.ebuild @@ -25,7 +25,7 @@ src_configure() { } src_install() { - emake DESTDIR="${D}" install || die "emake install failed" + emake DESTDIR="${D}" install } pkg_info() { |