*/*: [QA] Remove redundant || die guards

* Since all ebuilds in the tree are EAPI>=4, `|| die` on builtin commands is redundant and dead code. Closes: gentoo#13940 Reviewed-by: Ulrich Müller <[email protected]> Reviewed-by: Michał Górny <[email protected]> Reviewed-by: Andreas K. Hüttel <[email protected]> Signed-off-by: David Seifert <[email protected]>
johu · Dec 11, 2019 · 398a426 · 398a426
1 parent 7671b34
commit 398a426
Show file tree

Hide file tree

Showing 710 changed files with 1,463 additions and 1,545 deletions.
diff --git a/app-accessibility/espeakup/espeakup-0.71-r1.ebuild b/app-accessibility/espeakup/espeakup-0.71-r1.ebuild
@@ -36,11 +36,11 @@ pkg_setup() {
 }
 
 src_compile() {
-	emake || die "Compile failed."
+	emake
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "Install failed."
+	emake DESTDIR="${D}" install
 	dodoc ChangeLog README ToDo
 	newconfd "${FILESDIR}"/espeakup.confd espeakup
 	newinitd "${FILESDIR}"/espeakup.rc espeakup

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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() {

diff --git a/app-arch/duff/duff-0.5.2.ebuild b/app-arch/duff/duff-0.5.2.ebuild
@@ -14,6 +14,6 @@ DEPEND=""
 RDEPEND=""
 
 src_install() {
-	emake DESTDIR="${D}" install || die "Failed emake install"
+	emake DESTDIR="${D}" install
 	dodoc AUTHORS ChangeLog HACKING NEWS README* TODO
 }
diff --git a/app-arch/lzma/lzma-9.20-r1.ebuild b/app-arch/lzma/lzma-9.20-r1.ebuild
@@ -25,7 +25,7 @@ src_compile() {
 }
 
 src_install() {
-	newbin CPP/7zip/Bundles/LzmaCon/lzma lzmacon || die
+	newbin CPP/7zip/Bundles/LzmaCon/lzma lzmacon
 	dodoc lzma.txt history.txt
 	use doc && dodoc 7zC.txt 7zFormat.txt Methods.txt
 }

diff --git a/app-arch/mscompress/mscompress-0.3-r1.ebuild b/app-arch/mscompress/mscompress-0.3-r1.ebuild
@@ -27,7 +27,7 @@ src_configure() {
 }
 
 src_install() {
-	dobin mscompress msexpand || die
+	dobin mscompress msexpand
 	doman mscompress.1 msexpand.1
 	dodoc README ChangeLog
 }
diff --git a/app-arch/rar/rar-5.7.1_p20190427.ebuild b/app-arch/rar/rar-5.7.1_p20190427.ebuild
@@ -92,18 +92,18 @@ src_compile() { :; }
 
 src_install() {
 	exeinto /opt/rar
-	doexe rar unrar || die
+	doexe rar unrar
 
 	dodir /opt/bin
-	dosym ../rar/rar /opt/bin/rar || die
-	dosym ../rar/unrar /opt/bin/unrar || die
+	dosym ../rar/rar /opt/bin/rar
+	dosym ../rar/unrar /opt/bin/unrar
 
 	insinto /opt/rar
 	if use all_sfx ; then
-		doins "${WORKDIR}"/sfx/*.{sfx,SFX} || die
+		doins "${WORKDIR}"/sfx/*.{sfx,SFX}
 	else
-		doins default.sfx || die
+		doins default.sfx
 	fi
-	doins rarfiles.lst || die
+	doins rarfiles.lst
 	dodoc *.txt
 }
diff --git a/app-arch/unp/unp-2.0_pre7_p1-r1.ebuild b/app-arch/unp/unp-2.0_pre7_p1-r1.ebuild
@@ -36,9 +36,9 @@ src_compile() {
 }
 
 src_install() {
-	dobin unp || die "dobin failed"
+	dobin unp
 	dosym unp /usr/bin/ucat
-	doman debian/unp.1 || die "doman failed"
+	doman debian/unp.1
 	dodoc debian/changelog debian/README.Debian
 	dobashcomp bash_completion.d/unp
 

diff --git a/app-arch/zpaq-extras/zpaq-extras-3.ebuild b/app-arch/zpaq-extras/zpaq-extras-3.ebuild
@@ -54,13 +54,13 @@ src_configure() {
 
 src_compile() {
 	tc-export CXX
-	emake ${progs} || die
+	emake ${progs}
 }
 
 src_install() {
 	exeinto /usr/lib/zpaq
-	doexe ${progs} || die
+	doexe ${progs}
 
 	insinto /usr/share/zpaq
-	doins *.cfg || die
+	doins *.cfg
 }
diff --git a/app-backup/amanda/amanda-3.3.9.ebuild b/app-backup/amanda/amanda-3.3.9.ebuild
@@ -302,7 +302,7 @@ src_install() {
 	source ${TMPENVFILE}
 
 	einfo "Doing stock install"
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install
 
 	# Build the envdir file
 	# Don't forget this..

diff --git a/app-backup/amanda/amanda-3.4.1.ebuild b/app-backup/amanda/amanda-3.4.1.ebuild
@@ -309,7 +309,7 @@ src_install() {
 	source ${TMPENVFILE}
 
 	einfo "Doing stock install"
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install
 
 	# Build the envdir file
 	# Don't forget this..

diff --git a/app-backup/amanda/amanda-3.4.2.ebuild b/app-backup/amanda/amanda-3.4.2.ebuild
@@ -306,7 +306,7 @@ src_install() {
 	source ${TMPENVFILE}
 
 	einfo "Doing stock install"
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install
 
 	# Build the envdir file
 	# Don't forget this..

diff --git a/app-backup/amanda/amanda-3.4.3.ebuild b/app-backup/amanda/amanda-3.4.3.ebuild
@@ -306,7 +306,7 @@ src_install() {
 	source ${TMPENVFILE}
 
 	einfo "Doing stock install"
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install
 
 	# Build the envdir file
 	# Don't forget this..

diff --git a/app-backup/amanda/amanda-3.4.4.ebuild b/app-backup/amanda/amanda-3.4.4.ebuild
@@ -306,7 +306,7 @@ src_install() {
 	source ${TMPENVFILE}
 
 	einfo "Doing stock install"
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install
 
 	# Build the envdir file
 	# Don't forget this..

diff --git a/app-backup/amanda/amanda-3.4.5.ebuild b/app-backup/amanda/amanda-3.4.5.ebuild
@@ -306,7 +306,7 @@ src_install() {
 	source ${TMPENVFILE}
 
 	einfo "Doing stock install"
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install
 
 	# Build the envdir file
 	# Don't forget this..

diff --git a/app-backup/flexbackup/flexbackup-1.2.1-r13.ebuild b/app-backup/flexbackup/flexbackup-1.2.1-r13.ebuild
@@ -76,8 +76,7 @@ src_install() {
 	dodir /etc /usr/bin /usr/share/man/man{1,5}
 	emake install \
 		PREFIX="${D}"/usr \
-		CONFFILE="${D}"/etc/flexbackup.conf \
-		|| die "emake install failed"
+		CONFFILE="${D}"/etc/flexbackup.conf
 
 	einstalldocs
 }

diff --git a/app-cdr/cdcover/cdcover-0.7.4-r1.ebuild b/app-cdr/cdcover/cdcover-0.7.4-r1.ebuild
@@ -32,11 +32,11 @@ src_prepare() {
 }
 
 src_compile() {
-	emake prefix="${D}"/usr target=/usr || die
+	emake prefix="${D}"/usr target=/usr
 }
 
 src_install() {
-	emake prefix="${D}"/usr docdir="${D}"/usr/share/doc/${PF} install || die
+	emake prefix="${D}"/usr docdir="${D}"/usr/share/doc/${PF} install
 
 	python_fix_shebang "${D}"
 

diff --git a/app-cdr/isomaster/isomaster-1.3.13.ebuild b/app-cdr/isomaster/isomaster-1.3.13.ebuild
@@ -48,7 +48,7 @@ src_compile() {
 
 _apply_linguas() {
 	mv "${D}"/usr/share/locale{,_ALL} || die
-	dodir /usr/share/locale || die
+	dodir /usr/share/locale
 	for lingua in ${LINGUAS}; do
 		[[ -d "${D}"/usr/share/locale_ALL/${lingua} ]] || break
 		mv "${D}"/usr/share/{locale_ALL/${lingua},locale/} || die

diff --git a/app-cdr/isomaster/isomaster-1.3.14.ebuild b/app-cdr/isomaster/isomaster-1.3.14.ebuild
@@ -45,7 +45,7 @@ src_compile() {
 
 _apply_linguas() {
 	mv "${D}"/usr/share/locale{,_ALL} || die
-	dodir /usr/share/locale || die
+	dodir /usr/share/locale
 	for lingua in ${LINGUAS}; do
 		[[ -d "${D}"/usr/share/locale_ALL/${lingua} ]] || break
 		mv "${D}"/usr/share/{locale_ALL/${lingua},locale/} || die

diff --git a/app-crypt/ophcrack/ophcrack-3.6.0.ebuild b/app-crypt/ophcrack/ophcrack-3.6.0.ebuild
@@ -30,9 +30,9 @@ src_configure() {
 
 	myconf="${myconf} $(use_enable debug) --disable-gui"
 
-	econf ${myconf} || die "Failed to compile"
+	econf ${myconf}
 }
 
 src_install() {
-	emake install DESTDIR="${D}" || die "Installation failed."
+	emake install DESTDIR="${D}"
 }
diff --git a/app-crypt/ophcrack/ophcrack-3.7.0.ebuild b/app-crypt/ophcrack/ophcrack-3.7.0.ebuild
@@ -28,9 +28,9 @@ src_configure() {
 
 	myconf="${myconf} $(use_enable debug) --disable-gui"
 
-	econf ${myconf} || die "Failed to compile"
+	econf ${myconf}
 }
 
 src_install() {
-	emake install DESTDIR="${D}" || die "Installation failed."
+	emake install DESTDIR="${D}"
 }
diff --git a/app-crypt/ophcrack/ophcrack-3.8.0.ebuild b/app-crypt/ophcrack/ophcrack-3.8.0.ebuild
@@ -31,11 +31,11 @@ src_configure() {
 	myconf="$(use_enable debug)"
 	myconf="${myconf} $(use_enable qt5 gui)"
 
-	econf ${myconf} || die "Failed to compile"
+	econf ${myconf}
 }
 
 src_install() {
-	emake install DESTDIR="${D}" || die "Installation failed."
+	emake install DESTDIR="${D}"
 
 	cd "${S}"
 	newicon src/gui/pixmaps/os.xpm ophcrack.xpm

diff --git a/app-crypt/rotix/rotix-0.83.ebuild b/app-crypt/rotix/rotix-0.83.ebuild
@@ -28,5 +28,5 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install
 }
diff --git a/app-dicts/gwaei/gwaei-3.6.2.ebuild b/app-dicts/gwaei/gwaei-3.6.2.ebuild
@@ -49,7 +49,7 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install
 	find "${D}" -name '*.la' -delete
 
 	dodoc AUTHORS README

diff --git a/app-dicts/prime-dict/prime-dict-1.0.0-r3.ebuild b/app-dicts/prime-dict/prime-dict-1.0.0-r3.ebuild
@@ -16,7 +16,7 @@ KEYWORDS="alpha amd64 hppa ppc ppc64 ~sparc x86"
 IUSE=""
 
 each_ruby_configure() {
-	econf --with-rubydir="$(ruby_rbconfig_value 'sitelibdir')" || die
+	econf --with-rubydir="$(ruby_rbconfig_value 'sitelibdir')"
 }
 
 each_ruby_compile() {

diff --git a/app-dicts/wordnet/wordnet-3.1.ebuild b/app-dicts/wordnet/wordnet-3.1.ebuild
@@ -76,7 +76,7 @@ src_configure() {
 }
 
 src_compile(){
-	emake -e || die "emake failed"
+	emake -e
 }
 
 src_install(){

diff --git a/app-doc/halibut/halibut-1.1.ebuild b/app-doc/halibut/halibut-1.1.ebuild
@@ -20,15 +20,14 @@ src_compile() {
 	LFLAGS="${LDFLAGS}" \
 	emake -j1 \
 		BUILDDIR="${S}/build" \
-		VERSION="${PV}" \
-		|| die "make failed"
+		VERSION="${PV}"
 
-	emake -C doc || die "make in doc failed"
+	emake -C doc
 }
 
 src_install() {
-	dobin build/halibut || die
-	doman doc/halibut.1 || die
+	dobin build/halibut
+	doman doc/halibut.1
 	dodoc doc/halibut.txt
 	dohtml doc/*.html
 }
diff --git a/app-doc/halibut/halibut-1.2.ebuild b/app-doc/halibut/halibut-1.2.ebuild
@@ -21,8 +21,8 @@ src_compile() {
 	LFLAGS="${LDFLAGS}" \
 	BUILDDIR="${S}/build" \
 	VERSION="${PV}" \
-	emake || die "make failed"
-	emake -C doc || die "make in doc failed"
+	emake
+	emake -C doc
 }
 
 DOCS=( doc/halibut.txt )

diff --git a/app-editors/hexcurse/hexcurse-1.55.ebuild b/app-editors/hexcurse/hexcurse-1.55.ebuild
@@ -26,6 +26,6 @@ src_prepare() {
 }
 
 src_install() {
-	emake install DESTDIR="${D}" || die "Install failed"
+	emake install DESTDIR="${D}"
 	dodoc AUTHORS ChangeLog NEWS README
 }
diff --git a/app-editors/ted/ted-2.23.ebuild b/app-editors/ted/ted-2.23.ebuild
@@ -52,7 +52,7 @@ src_configure() {
 	local dir
 	for dir in appFrame appUtil bitmap docBuf ind Ted tedPackage; do
 		cd "${S}"/${dir}
-		econf --cache-file=../config.cache || die "configure in ${dir} failed"
+		econf --cache-file=../config.cache
 	done
 }