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 /app-admin
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 'app-admin')
-rw-r--r--app-admin/chrpath/chrpath-0.13-r2.ebuild2
-rw-r--r--app-admin/equo/equo-302.ebuild4
-rw-r--r--app-admin/gam-server/gam-server-0.1.10-r2.ebuild2
-rw-r--r--app-admin/ide-smart/ide-smart-1.4-r2.ebuild2
-rw-r--r--app-admin/matter/matter-302.ebuild6
-rw-r--r--app-admin/paxtest/paxtest-0.9.15-r1.ebuild8
-rw-r--r--app-admin/webalizer/webalizer-2.23.08.ebuild3
-rw-r--r--app-admin/xstow/xstow-1.0.1.ebuild2
8 files changed, 14 insertions, 15 deletions
diff --git a/app-admin/chrpath/chrpath-0.13-r2.ebuild b/app-admin/chrpath/chrpath-0.13-r2.ebuild
index d47a2afa4974..89d26b3b7e07 100644
--- a/app-admin/chrpath/chrpath-0.13-r2.ebuild
+++ b/app-admin/chrpath/chrpath-0.13-r2.ebuild
@@ -31,7 +31,7 @@ src_prepare() {
}
src_configure() {
- econf $(use_enable static-libs static) || die
+ econf $(use_enable static-libs static)
}
src_install() {
diff --git a/app-admin/equo/equo-302.ebuild b/app-admin/equo/equo-302.ebuild
index 1c5924a18e98..cfe1a7c0ea3c 100644
--- a/app-admin/equo/equo-302.ebuild
+++ b/app-admin/equo/equo-302.ebuild
@@ -29,12 +29,12 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
src_compile() {
cd "${S}"/client || die
- emake || die "make failed"
+ emake
}
src_install() {
cd "${S}"/client || die
- emake DESTDIR="${D}" LIBDIR="usr/lib" install || die "make install failed"
+ emake DESTDIR="${D}" LIBDIR="usr/lib" install
newbashcomp "${S}/misc/equo-completion.bash" equo
python_optimize "${D}/usr/lib/entropy/client"
diff --git a/app-admin/gam-server/gam-server-0.1.10-r2.ebuild b/app-admin/gam-server/gam-server-0.1.10-r2.ebuild
index 9d66f04b72eb..ed2b39bb68d9 100644
--- a/app-admin/gam-server/gam-server-0.1.10-r2.ebuild
+++ b/app-admin/gam-server/gam-server-0.1.10-r2.ebuild
@@ -84,5 +84,5 @@ src_configure() {
}
src_install() {
- emake DESTDIR="${D}" install || die
+ emake DESTDIR="${D}" install
}
diff --git a/app-admin/ide-smart/ide-smart-1.4-r2.ebuild b/app-admin/ide-smart/ide-smart-1.4-r2.ebuild
index c4d034211730..b064d1e5e222 100644
--- a/app-admin/ide-smart/ide-smart-1.4-r2.ebuild
+++ b/app-admin/ide-smart/ide-smart-1.4-r2.ebuild
@@ -19,7 +19,7 @@ src_compile() {
}
src_install() {
- dobin ide-smart || die
+ dobin ide-smart
doman ide-smart.8
dodoc README
}
diff --git a/app-admin/matter/matter-302.ebuild b/app-admin/matter/matter-302.ebuild
index 47f0521d6aab..23ff9aad401d 100644
--- a/app-admin/matter/matter-302.ebuild
+++ b/app-admin/matter/matter-302.ebuild
@@ -26,10 +26,10 @@ RDEPEND="entropy? ( ~sys-apps/entropy-${PV}[${PYTHON_USEDEP}] )
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
src_install() {
- emake DESTDIR="${D}" install || die "make install failed"
- emake DESTDIR="${D}" base-install || die "make base-install failed"
+ emake DESTDIR="${D}" install
+ emake DESTDIR="${D}" base-install
if use entropy; then
- emake DESTDIR="${D}" entropysrv-install || die "make base-install failed"
+ emake DESTDIR="${D}" entropysrv-install
fi
python_optimize "${D}/usr/lib/matter"
diff --git a/app-admin/paxtest/paxtest-0.9.15-r1.ebuild b/app-admin/paxtest/paxtest-0.9.15-r1.ebuild
index 4fe8a445c276..2919e526c917 100644
--- a/app-admin/paxtest/paxtest-0.9.15-r1.ebuild
+++ b/app-admin/paxtest/paxtest-0.9.15-r1.ebuild
@@ -33,12 +33,12 @@ src_prepare() {
}
src_compile() {
- emake RUNDIR=/usr/$(get_libdir)/paxtest || die
+ emake RUNDIR=/usr/$(get_libdir)/paxtest
}
src_install() {
- emake DESTDIR="${D}" BINDIR=/usr/bin RUNDIR=/usr/$(get_libdir)/paxtest install || die
+ emake DESTDIR="${D}" BINDIR=/usr/bin RUNDIR=/usr/$(get_libdir)/paxtest install
- newman debian/manpage.1.ex paxtest.1 || die
- dodoc ChangeLog README || die
+ newman debian/manpage.1.ex paxtest.1
+ dodoc ChangeLog README
}
diff --git a/app-admin/webalizer/webalizer-2.23.08.ebuild b/app-admin/webalizer/webalizer-2.23.08.ebuild
index 605bbadefb1f..dbe21c66ca5d 100644
--- a/app-admin/webalizer/webalizer-2.23.08.ebuild
+++ b/app-admin/webalizer/webalizer-2.23.08.ebuild
@@ -76,8 +76,7 @@ src_configure() {
${myconf} \
$(use_enable geoip) \
$(use_enable bzip2 bz2) \
- --with-geodb=${GEODB_DIR} \
- || die "econf failed"
+ --with-geodb=${GEODB_DIR}
}
src_install() {
diff --git a/app-admin/xstow/xstow-1.0.1.ebuild b/app-admin/xstow/xstow-1.0.1.ebuild
index de7357598a6c..8bc68e8c4517 100644
--- a/app-admin/xstow/xstow-1.0.1.ebuild
+++ b/app-admin/xstow/xstow-1.0.1.ebuild
@@ -34,7 +34,7 @@ src_install() {
dodir /var/lib/xstow
# install env.d file to add STOWDIR to PATH and LDPATH
- doenvd "${FILESDIR}/99xstow" || die "doenvd failed"
+ doenvd "${FILESDIR}/99xstow"
}
pkg_postinst() {