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 /dev-tex
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 'dev-tex')
-rw-r--r--dev-tex/cjk-latex/cjk-latex-4.8.4.ebuild12
-rw-r--r--dev-tex/hevea/hevea-2.29.ebuild10
-rw-r--r--dev-tex/hevea/hevea-2.30.ebuild10
-rw-r--r--dev-tex/hevea/hevea-2.31.ebuild10
-rw-r--r--dev-tex/latex2rtf/latex2rtf-2.3.11.ebuild2
-rw-r--r--dev-tex/latex2rtf/latex2rtf-2.3.15.ebuild2
-rw-r--r--dev-tex/pscyr/pscyr-0.4d_beta9.ebuild4
7 files changed, 25 insertions, 25 deletions
diff --git a/dev-tex/cjk-latex/cjk-latex-4.8.4.ebuild b/dev-tex/cjk-latex/cjk-latex-4.8.4.ebuild
index df0a850f7e88..4393972bc9c6 100644
--- a/dev-tex/cjk-latex/cjk-latex-4.8.4.ebuild
+++ b/dev-tex/cjk-latex/cjk-latex-4.8.4.ebuild
@@ -60,11 +60,11 @@ src_compile() {
cd utils
for d in *conv; do
cd $d
- emake || die
+ emake
cd -
done
cd hbf2gf
- emake || die
+ emake
cd -
if use emacs ; then
@@ -108,14 +108,14 @@ src_install() {
for d in fonts/pk/modeless/*/* ; do
insinto ${TEXMF}/${d}
for f in "${T}"/${d##*/}*.pk ; do
- newins $f `basename ${f/.pk/.500pk}` || die "newins failed"
+ newins $f `basename ${f/.pk/.500pk}`
done
done
popd &>/dev/null
insinto "${TEXMF}/tex/latex/${PN}"
- doins -r texinput/* || die "installing texinput files failed"
- doins -r contrib/wadalab || die "installing wadalab failed"
+ doins -r texinput/*
+ doins -r contrib/wadalab
if use emacs ; then
cd utils/lisp
@@ -140,7 +140,7 @@ src_install() {
use doc || rm -rf texmf/doc
insinto ${TEXMF}
- doins -r texmf/* || die "installing texmf failed"
+ doins -r texmf/*
# Move fonts because hbf2gf expects them in MISCFONTS
mv "${ED}/${TEXMF}/fonts/hbf" "${ED}/${TEXMF}/fonts/misc" || die "mv font failed"
diff --git a/dev-tex/hevea/hevea-2.29.ebuild b/dev-tex/hevea/hevea-2.29.ebuild
index 4eba8726f009..3f91c929d1aa 100644
--- a/dev-tex/hevea/hevea-2.29.ebuild
+++ b/dev-tex/hevea/hevea-2.29.ebuild
@@ -22,19 +22,19 @@ DEPEND="${DEPEND} dev-ml/ocamlbuild"
src_compile() {
rm -f config.sh
- emake PREFIX=/usr DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)/hevea" LATEXLIBDIR="/usr/share/texmf-site/tex/latex/hevea" config.sh || die "Failed to create config.sh"
+ emake PREFIX=/usr DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)/hevea" LATEXLIBDIR="/usr/share/texmf-site/tex/latex/hevea" config.sh
if use ocamlopt; then
- emake PREFIX=/usr || die "Failed to build native code binaries"
+ emake PREFIX=/usr
else
- emake PREFIX=/usr TARGET=byte || die "Failed to build bytecode binaries"
+ emake PREFIX=/usr TARGET=byte
fi
}
src_install() {
if use ocamlopt; then
- emake DESTDIR="${D}" PREFIX=/usr install || die "Install failed"
+ emake DESTDIR="${D}" PREFIX=/usr install
else
- emake DESTDIR="${D}" PREFIX=/usr TARGET=byte install || die "Install failed"
+ emake DESTDIR="${D}" PREFIX=/usr TARGET=byte install
fi
dodoc README CHANGES
diff --git a/dev-tex/hevea/hevea-2.30.ebuild b/dev-tex/hevea/hevea-2.30.ebuild
index a09af4ace2c4..c49589ed4c53 100644
--- a/dev-tex/hevea/hevea-2.30.ebuild
+++ b/dev-tex/hevea/hevea-2.30.ebuild
@@ -22,19 +22,19 @@ DEPEND="${DEPEND} dev-ml/ocamlbuild"
src_compile() {
rm -f config.sh
- emake PREFIX=/usr DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)/hevea" LATEXLIBDIR="/usr/share/texmf-site/tex/latex/hevea" config.sh || die "Failed to create config.sh"
+ emake PREFIX=/usr DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)/hevea" LATEXLIBDIR="/usr/share/texmf-site/tex/latex/hevea" config.sh
if use ocamlopt; then
- emake PREFIX=/usr || die "Failed to build native code binaries"
+ emake PREFIX=/usr
else
- emake PREFIX=/usr TARGET=byte || die "Failed to build bytecode binaries"
+ emake PREFIX=/usr TARGET=byte
fi
}
src_install() {
if use ocamlopt; then
- emake DESTDIR="${D}" PREFIX=/usr install || die "Install failed"
+ emake DESTDIR="${D}" PREFIX=/usr install
else
- emake DESTDIR="${D}" PREFIX=/usr TARGET=byte install || die "Install failed"
+ emake DESTDIR="${D}" PREFIX=/usr TARGET=byte install
fi
dodoc README CHANGES
diff --git a/dev-tex/hevea/hevea-2.31.ebuild b/dev-tex/hevea/hevea-2.31.ebuild
index a09af4ace2c4..c49589ed4c53 100644
--- a/dev-tex/hevea/hevea-2.31.ebuild
+++ b/dev-tex/hevea/hevea-2.31.ebuild
@@ -22,19 +22,19 @@ DEPEND="${DEPEND} dev-ml/ocamlbuild"
src_compile() {
rm -f config.sh
- emake PREFIX=/usr DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)/hevea" LATEXLIBDIR="/usr/share/texmf-site/tex/latex/hevea" config.sh || die "Failed to create config.sh"
+ emake PREFIX=/usr DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)/hevea" LATEXLIBDIR="/usr/share/texmf-site/tex/latex/hevea" config.sh
if use ocamlopt; then
- emake PREFIX=/usr || die "Failed to build native code binaries"
+ emake PREFIX=/usr
else
- emake PREFIX=/usr TARGET=byte || die "Failed to build bytecode binaries"
+ emake PREFIX=/usr TARGET=byte
fi
}
src_install() {
if use ocamlopt; then
- emake DESTDIR="${D}" PREFIX=/usr install || die "Install failed"
+ emake DESTDIR="${D}" PREFIX=/usr install
else
- emake DESTDIR="${D}" PREFIX=/usr TARGET=byte install || die "Install failed"
+ emake DESTDIR="${D}" PREFIX=/usr TARGET=byte install
fi
dodoc README CHANGES
diff --git a/dev-tex/latex2rtf/latex2rtf-2.3.11.ebuild b/dev-tex/latex2rtf/latex2rtf-2.3.11.ebuild
index 50537d6a876f..17ae8b6a4908 100644
--- a/dev-tex/latex2rtf/latex2rtf-2.3.11.ebuild
+++ b/dev-tex/latex2rtf/latex2rtf-2.3.11.ebuild
@@ -33,7 +33,7 @@ src_compile() {
export VARTEXFONTS="${T}/fonts"
tc-export CC
# Set DESTDIR here too so that compiled-in paths are correct.
- emake DESTDIR="${EPREFIX}/usr" || die "emake failed"
+ emake DESTDIR="${EPREFIX}/usr"
cd "${S}/doc"
emake realclean
diff --git a/dev-tex/latex2rtf/latex2rtf-2.3.15.ebuild b/dev-tex/latex2rtf/latex2rtf-2.3.15.ebuild
index 712cb73c6193..6bfab71d3f27 100644
--- a/dev-tex/latex2rtf/latex2rtf-2.3.15.ebuild
+++ b/dev-tex/latex2rtf/latex2rtf-2.3.15.ebuild
@@ -33,7 +33,7 @@ src_compile() {
export VARTEXFONTS="${T}/fonts"
tc-export CC
# Set DESTDIR here too so that compiled-in paths are correct.
- emake DESTDIR="${EPREFIX}/usr" || die "emake failed"
+ emake DESTDIR="${EPREFIX}/usr"
# Needed for tests
chmod +x test/bracecheck || die
diff --git a/dev-tex/pscyr/pscyr-0.4d_beta9.ebuild b/dev-tex/pscyr/pscyr-0.4d_beta9.ebuild
index f6011b526184..c680a9c179c1 100644
--- a/dev-tex/pscyr/pscyr-0.4d_beta9.ebuild
+++ b/dev-tex/pscyr/pscyr-0.4d_beta9.ebuild
@@ -29,11 +29,11 @@ src_install() {
done
cd "${S}"
insinto "${TEXMF}/fonts/map/dvips/pscyr"
- doins dvips/pscyr/pscyr.map || die "doins $i failed"
+ doins dvips/pscyr/pscyr.map
for each in dvips/pscyr/*.enc; do
insinto "${TEXMF}/fonts/enc/dvips/pscyr"
- doins "$each" || die "doins $i failed"
+ doins "$each"
done
insinto /etc/texmf/updmap.d