commit: 215494670034cdd35fefed02a709f18b36b88f64
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 22 19:18:53 2016 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Jan 22 19:18:53 2016 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=21549467
Fix usage of die with ebuild_helper
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
media-gfx/brlcad/brlcad-7.22.0.ebuild | 2 +-
media-gfx/brlcad/brlcad-7.24.0.ebuild | 2 +-
media-gfx/brlcad/brlcad-7.24.2.ebuild | 2 +-
media-gfx/brlcad/brlcad-9999.ebuild | 2 +-
sci-biology/apollo/apollo-9999.ebuild | 2 +-
sci-biology/consed/consed-29.ebuild | 2 +-
sci-biology/pileup/pileup-0.6.ebuild | 4 ++--
sci-biology/repeatmasker/repeatmasker-4.0.6-r2.ebuild | 9 +++++----
sci-biology/tablet-bin/tablet-bin-1.14.10.21.ebuild | 2 +-
sci-biology/trf/trf-4.07b.ebuild | 2 +-
sci-libs/med/med-2.3.6.ebuild | 8 ++++----
11 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/media-gfx/brlcad/brlcad-7.22.0.ebuild
b/media-gfx/brlcad/brlcad-7.22.0.ebuild
index 98fb810..da29102 100644
--- a/media-gfx/brlcad/brlcad-7.22.0.ebuild
+++ b/media-gfx/brlcad/brlcad-7.22.0.ebuild
@@ -105,7 +105,7 @@ src_install() {
dodoc AUTHORS NEWS README HACKING TODO BUGS ChangeLog
echo "PATH=\"${BRLCAD_DIR}/bin\"" > 99brlcad
echo "MANPATH=\"${BRLCAD_DIR}/man\"" >> 99brlcad
- doenvd 99brlcad || die
+ doenvd 99brlcad
newicon misc/macosx/Resources/ReadMe.rtfd/brlcad_logo_tiny.png
brlcad.png
make_desktop_entry mged "BRL-CAD" brlcad "Graphics;Engineering"
}
diff --git a/media-gfx/brlcad/brlcad-7.24.0.ebuild
b/media-gfx/brlcad/brlcad-7.24.0.ebuild
index 1933ed4..d8781b4 100644
--- a/media-gfx/brlcad/brlcad-7.24.0.ebuild
+++ b/media-gfx/brlcad/brlcad-7.24.0.ebuild
@@ -105,7 +105,7 @@ src_install() {
dodoc AUTHORS NEWS README HACKING TODO BUGS ChangeLog
echo "PATH=\"${BRLCAD_DIR}/bin\"" > 99brlcad
echo "MANPATH=\"${BRLCAD_DIR}/man\"" >> 99brlcad
- doenvd 99brlcad || die
+ doenvd 99brlcad
newicon misc/macosx/Resources/ReadMe.rtfd/brlcad_logo_tiny.png
brlcad.png
make_desktop_entry mged "BRL-CAD" brlcad "Graphics;Engineering"
}
diff --git a/media-gfx/brlcad/brlcad-7.24.2.ebuild
b/media-gfx/brlcad/brlcad-7.24.2.ebuild
index 09399be..f828e7c 100644
--- a/media-gfx/brlcad/brlcad-7.24.2.ebuild
+++ b/media-gfx/brlcad/brlcad-7.24.2.ebuild
@@ -104,7 +104,7 @@ src_install() {
dodoc AUTHORS NEWS README HACKING TODO BUGS ChangeLog
echo "PATH=\"${BRLCAD_DIR}/bin\"" > 99brlcad
echo "MANPATH=\"${BRLCAD_DIR}/man\"" >> 99brlcad
- doenvd 99brlcad || die
+ doenvd 99brlcad
newicon misc/macosx/Resources/ReadMe.rtfd/brlcad_logo_tiny.png
brlcad.png
make_desktop_entry mged "BRL-CAD" brlcad "Graphics;Engineering"
}
diff --git a/media-gfx/brlcad/brlcad-9999.ebuild
b/media-gfx/brlcad/brlcad-9999.ebuild
index 06de13d..0ca181c 100644
--- a/media-gfx/brlcad/brlcad-9999.ebuild
+++ b/media-gfx/brlcad/brlcad-9999.ebuild
@@ -100,7 +100,7 @@ src_install() {
dodoc AUTHORS NEWS README HACKING TODO BUGS ChangeLog
echo "PATH=\"${BRLCAD_DIR}/bin\"" > 99brlcad
echo "MANPATH=\"${BRLCAD_DIR}/man\"" >> 99brlcad
- doenvd 99brlcad || die
+ doenvd 99brlcad
newicon misc/macosx/Resources/ReadMe.rtfd/brlcad_logo_tiny.png
brlcad.png
make_desktop_entry mged "BRL-CAD" brlcad "Graphics;Engineering"
}
diff --git a/sci-biology/apollo/apollo-9999.ebuild
b/sci-biology/apollo/apollo-9999.ebuild
index c00cdcc..b92396a 100644
--- a/sci-biology/apollo/apollo-9999.ebuild
+++ b/sci-biology/apollo/apollo-9999.ebuild
@@ -46,5 +46,5 @@ src_install() {
java-pkg_dojar jars/apollo.jar
echo "PATH=/opt/Apollo" > 99Apollo
- doenvd 99Apollo || die
+ doenvd 99Apollo
}
diff --git a/sci-biology/consed/consed-29.ebuild
b/sci-biology/consed/consed-29.ebuild
index b814b46..4614477 100644
--- a/sci-biology/consed/consed-29.ebuild
+++ b/sci-biology/consed/consed-29.ebuild
@@ -74,7 +74,7 @@ src_install() {
echo 'CONSED_PARAMETERS="${EPREFIX}/etc/consedrc"' >> "${S}"/99consed
|| die
mkdir -p "${ED}"/etc/consedrc || die
touch "${ED}"/etc/consedrc || die
- doenvd "${S}/99consed" || die
+ doenvd "${S}/99consed"
sed \
-e "s#/usr/local/genome#${EPREFIX}/usr#" \
-i "${ED}"/usr/bin/{*.perl,phredPhrap,phredPhrapWithPhdBalls}
|| die
diff --git a/sci-biology/pileup/pileup-0.6.ebuild
b/sci-biology/pileup/pileup-0.6.ebuild
index aaa8a56..77322f4 100644
--- a/sci-biology/pileup/pileup-0.6.ebuild
+++ b/sci-biology/pileup/pileup-0.6.ebuild
@@ -48,14 +48,14 @@ src_compile(){
src_install(){
cd ssaha_pileup/ssaha_pileup || die "Cannot cd to
"${S}"ssaha_pileup/ssaha_pileup"
- dobin ssaha_pileup ssaha_solexa ssaha_pairs ssaha_clean ssaha_mates
ssaha_cigar ssaha_indel view_pileup ssaha_reads ssaha_merge ssaha_check-cigar
|| die "dobin failed"
+ dobin ssaha_pileup ssaha_solexa ssaha_pairs ssaha_clean ssaha_mates
ssaha_cigar ssaha_indel view_pileup ssaha_reads ssaha_merge ssaha_check-cigar
"dobin failed"
cd "${S}" || die
for f in ssaha_pileup/other_codes/get_seqreads/get_seqreads \
ssaha_pileup/other_codes/ssaha_split/ssaha_split \
ssaha_pileup/other_codes/ssaha_parseSNP/ssaha_parseSNP \
ssaha_pileup/other_codes/search_read/search_read; do
- dobin $f || die "dobin failed"
+ dobin $f "dobin failed"
done
# TODO:
diff --git a/sci-biology/repeatmasker/repeatmasker-4.0.6-r2.ebuild
b/sci-biology/repeatmasker/repeatmasker-4.0.6-r2.ebuild
index 86be5af..18e3e69 100644
--- a/sci-biology/repeatmasker/repeatmasker-4.0.6-r2.ebuild
+++ b/sci-biology/repeatmasker/repeatmasker-4.0.6-r2.ebuild
@@ -68,19 +68,20 @@ Y
src_install() {
exeinto /usr/share/${PN}
for i in DateRepeats ProcessRepeats RepeatMasker DupMasker
RepeatProteinMask; do
- doexe $i || die
- dosym /usr/share/${PN}/$i /usr/bin/$i || die
+ doexe $i
+ dosym /usr/share/${PN}/$i /usr/bin/$i
done
dodir /usr/share/${PN}/lib
insinto /usr/share/${PN}/lib
doins "${S}"/*.pm "${S}"/Libraries/*.pm
- rm -rf "${S}"/Libraries/*.pm # zap the supposedly misplaced
RepeatAnnotationData.pm file
+ # zap the supposedly misplaced RepeatAnnotationData.pm file
+ rm -rf "${S}"/Libraries/*.pm || die
# if sci-biology/repeatmasker-libraries is installed prevent file
collision
# and do NOT install Libraries/RepeatMaskerLib.embl file which contains
# a limited version of the file: 20110419-min
- rm -rf Libraries/RepeatMaskerLib.embl
+ rm -rf Libraries/RepeatMaskerLib.embl || die
insinto /usr/share/${PN}
doins -r util Matrices Libraries *.help
keepdir /usr/share/${PN}/Libraries
diff --git a/sci-biology/tablet-bin/tablet-bin-1.14.10.21.ebuild
b/sci-biology/tablet-bin/tablet-bin-1.14.10.21.ebuild
index ae4e970..6c0e63a 100644
--- a/sci-biology/tablet-bin/tablet-bin-1.14.10.21.ebuild
+++ b/sci-biology/tablet-bin/tablet-bin-1.14.10.21.ebuild
@@ -93,5 +93,5 @@ src_install() {
# python_foreach_impl python_doscript "${WORKDIR}"/coveragestats.py
echo "PATH=${EPREFIX}/opt/Tablet" > 99Tablet
- doenvd 99Tablet || die
+ doenvd 99Tablet
}
diff --git a/sci-biology/trf/trf-4.07b.ebuild b/sci-biology/trf/trf-4.07b.ebuild
index 4d0416a..eed81de 100644
--- a/sci-biology/trf/trf-4.07b.ebuild
+++ b/sci-biology/trf/trf-4.07b.ebuild
@@ -35,7 +35,7 @@ src_install() {
dosym /opt/${PN}/${MY_P}.linux.exe /opt/bin/trf
# GTK version (http://tandem.bu.edu/trf/downloads/trf400.linuxgtk.exe)
has broken linking
#if use gtk; then
- # doexe trf400.linuxgtk.exe || die
+ # doexe trf400.linuxgtk.exe
# make_desktop_entry /opt/${PN}/trf400.linuxgtk.exe "Tandem
Repeats Finder" || die
#fi
dodoc \
diff --git a/sci-libs/med/med-2.3.6.ebuild b/sci-libs/med/med-2.3.6.ebuild
index edfa5be..d32da0b 100644
--- a/sci-libs/med/med-2.3.6.ebuild
+++ b/sci-libs/med/med-2.3.6.ebuild
@@ -47,18 +47,18 @@ src_install() {
exeinto /usr/share/doc/${PF}/examples/c
for i in `ls tests/c/*.o` ;
do
- doexe tests/c/`basename ${i} .o` || die "doexe failed"
+ doexe tests/c/`basename ${i} .o` "doexe failed"
done
exeinto /usr/share/doc/${PF}/examples/c/.libs
- doexe tests/c/.libs/* || die "doexe failed"
+ doexe tests/c/.libs/* "doexe failed"
dodir /usr/share/doc/${PF}/examples/f/.libs
exeinto /usr/share/doc/${PF}/examples/f
for i in `ls tests/f/*.o` ;
do
- doexe tests/f/`basename ${i} .o` || die "doexe failed"
+ doexe tests/f/`basename ${i} .o` "doexe failed"
done
exeinto /usr/share/doc/${PF}/examples/f/.libs
- doexe tests/f/.libs/* || die "doexe failed"
+ doexe tests/f/.libs/* "doexe failed"
fi
}
