commit: d020a7a157212a8865c99ba428ef48fcbb7f3ff3
Author: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Sat Feb 7 10:38:33 2015 +0000
Commit: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Sat Feb 7 10:46:35 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=d020a7a1
sci-physics/abinit: Add missing, drop useless dies
---
sci-physics/abinit/abinit-7.4.2-r1.ebuild | 14 +++++++-------
sci-physics/abinit/abinit-7.6.4-r1.ebuild | 14 +++++++-------
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/sci-physics/abinit/abinit-7.4.2-r1.ebuild
b/sci-physics/abinit/abinit-7.4.2-r1.ebuild
index b8aa19b..3316d43 100644
--- a/sci-physics/abinit/abinit-7.4.2-r1.ebuild
+++ b/sci-physics/abinit/abinit-7.4.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -185,7 +185,7 @@ src_prepare() {
"${FILESDIR}"/7.6.4-cuda_header.patch \
"${FILESDIR}"/7.6.4-libxc_versions.patch
eautoreconf
- sed -e"s/\(grep '\^-\)\(\[LloW\]\)'/\1\\\(\2\\\|pthread\\\)'/g" -i
configure
+ sed -e"s/\(grep '\^-\)\(\[LloW\]\)'/\1\\\(\2\\\|pthread\\\)'/g" -i
configure || die
use test && python_fix_shebang "${S}"/tests
}
@@ -294,7 +294,7 @@ src_compile() {
# Can Abinit use external libabinit.a?
use libabinit && autotools-utils_src_compile libabinit.a
- sed -i -e's/libatlas/lapack/' "${AUTOTOOLS_BUILD_DIR}"/config.pc
+ sed -i -e's/libatlas/lapack/' "${AUTOTOOLS_BUILD_DIR}"/config.pc || die
}
src_test() {
@@ -307,7 +307,7 @@ src_install() {
#autotools-utils_src_install() expanded
_check_build_dir
pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null
- emake DESTDIR="${D}" install || die "make install failed"
+ emake DESTDIR="${D}" install
use libabinit && dolib libabinit.a
@@ -321,19 +321,19 @@ src_install() {
# XXX: support installing them from builddir as well!!!
if [[ ${DOCS} ]]; then
- dodoc "${DOCS[@]}" || die "dodoc failed"
+ dodoc "${DOCS[@]}"
else
local f
# same list as in PMS
for f in README* ChangeLog AUTHORS NEWS TODO CHANGES \
THANKS BUGS FAQ CREDITS CHANGELOG; do
if [[ -s ${f} ]]; then
- dodoc "${f}" || die "(default) dodoc ${f}
failed"
+ dodoc "${f}"
fi
done
fi
if [[ ${HTML_DOCS} ]]; then
- dohtml -r "${HTML_DOCS[@]}" || die "dohtml failed"
+ dohtml -r "${HTML_DOCS[@]}"
fi
if use scripts; then
diff --git a/sci-physics/abinit/abinit-7.6.4-r1.ebuild
b/sci-physics/abinit/abinit-7.6.4-r1.ebuild
index 708b2de..50a03fa 100644
--- a/sci-physics/abinit/abinit-7.6.4-r1.ebuild
+++ b/sci-physics/abinit/abinit-7.6.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -201,7 +201,7 @@ src_prepare() {
"${FILESDIR}"/7.6.4-cuda_header.patch \
"${FILESDIR}"/7.6.4-libxc_versions.patch
eautoreconf
- sed -e"s/\(grep '\^-\)\(\[LloW\]\)'/\1\\\(\2\\\|pthread\\\)'/g" -i
configure
+ sed -e"s/\(grep '\^-\)\(\[LloW\]\)'/\1\\\(\2\\\|pthread\\\)'/g" -i
configure || die
python_fix_shebang "${S}"
}
@@ -330,7 +330,7 @@ src_compile() {
# Can Abinit use external libabinit.a?
use libabinit && autotools-utils_src_compile libabinit.a
- sed -i -e's/libatlas/lapack/' "${AUTOTOOLS_BUILD_DIR}"/config.pc
+ sed -i -e's/libatlas/lapack/' "${AUTOTOOLS_BUILD_DIR}"/config.pc || die
}
src_test() {
@@ -340,7 +340,7 @@ src_test() {
pushd "${BUILD_DIR}" > /dev/null || die
einfo "Running the internal tests."
- emake tests_in || die 'The internal tests failed.'
+ emake tests_in
einfo "Running the thorough tests. Be patient, please."
"${S}"/tests/runtests.py || ewarn "The package has not passed the
thorough tests."
@@ -352,7 +352,7 @@ src_install() {
#autotools-utils_src_install() expanded
_check_build_dir
pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null
- emake DESTDIR="${D}" install || die "make install failed"
+ emake DESTDIR="${D}" install
use libabinit && dolib libabinit.a
@@ -373,12 +373,12 @@ src_install() {
for f in README* ChangeLog AUTHORS NEWS TODO CHANGES \
THANKS BUGS FAQ CREDITS CHANGELOG; do
if [[ -s ${f} ]]; then
- dodoc "${f}" || die "(default) dodoc ${f}
failed"
+ dodoc "${f}"
fi
done
fi
if [[ ${HTML_DOCS} ]]; then
- dohtml -r "${HTML_DOCS[@]}" || die "dohtml failed"
+ dohtml -r "${HTML_DOCS[@]}"
fi
if use scripts; then
