| 1 |
commit: d020a7a157212a8865c99ba428ef48fcbb7f3ff3 |
| 2 |
Author: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de> |
| 3 |
AuthorDate: Sat Feb 7 10:38:33 2015 +0000 |
| 4 |
Commit: Christoph Junghans <ottxor <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Feb 7 10:46:35 2015 +0000 |
| 6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=d020a7a1 |
| 7 |
|
| 8 |
sci-physics/abinit: Add missing, drop useless dies |
| 9 |
|
| 10 |
--- |
| 11 |
sci-physics/abinit/abinit-7.4.2-r1.ebuild | 14 +++++++------- |
| 12 |
sci-physics/abinit/abinit-7.6.4-r1.ebuild | 14 +++++++------- |
| 13 |
2 files changed, 14 insertions(+), 14 deletions(-) |
| 14 |
|
| 15 |
diff --git a/sci-physics/abinit/abinit-7.4.2-r1.ebuild b/sci-physics/abinit/abinit-7.4.2-r1.ebuild |
| 16 |
index b8aa19b..3316d43 100644 |
| 17 |
--- a/sci-physics/abinit/abinit-7.4.2-r1.ebuild |
| 18 |
+++ b/sci-physics/abinit/abinit-7.4.2-r1.ebuild |
| 19 |
@@ -1,4 +1,4 @@ |
| 20 |
-# Copyright 1999-2014 Gentoo Foundation |
| 21 |
+# Copyright 1999-2015 Gentoo Foundation |
| 22 |
# Distributed under the terms of the GNU General Public License v2 |
| 23 |
# $Header: $ |
| 24 |
|
| 25 |
@@ -185,7 +185,7 @@ src_prepare() { |
| 26 |
"${FILESDIR}"/7.6.4-cuda_header.patch \ |
| 27 |
"${FILESDIR}"/7.6.4-libxc_versions.patch |
| 28 |
eautoreconf |
| 29 |
- sed -e"s/\(grep '\^-\)\(\[LloW\]\)'/\1\\\(\2\\\|pthread\\\)'/g" -i configure |
| 30 |
+ sed -e"s/\(grep '\^-\)\(\[LloW\]\)'/\1\\\(\2\\\|pthread\\\)'/g" -i configure || die |
| 31 |
use test && python_fix_shebang "${S}"/tests |
| 32 |
} |
| 33 |
|
| 34 |
@@ -294,7 +294,7 @@ src_compile() { |
| 35 |
# Can Abinit use external libabinit.a? |
| 36 |
use libabinit && autotools-utils_src_compile libabinit.a |
| 37 |
|
| 38 |
- sed -i -e's/libatlas/lapack/' "${AUTOTOOLS_BUILD_DIR}"/config.pc |
| 39 |
+ sed -i -e's/libatlas/lapack/' "${AUTOTOOLS_BUILD_DIR}"/config.pc || die |
| 40 |
} |
| 41 |
|
| 42 |
src_test() { |
| 43 |
@@ -307,7 +307,7 @@ src_install() { |
| 44 |
#autotools-utils_src_install() expanded |
| 45 |
_check_build_dir |
| 46 |
pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null |
| 47 |
- emake DESTDIR="${D}" install || die "make install failed" |
| 48 |
+ emake DESTDIR="${D}" install |
| 49 |
|
| 50 |
use libabinit && dolib libabinit.a |
| 51 |
|
| 52 |
@@ -321,19 +321,19 @@ src_install() { |
| 53 |
|
| 54 |
# XXX: support installing them from builddir as well!!! |
| 55 |
if [[ ${DOCS} ]]; then |
| 56 |
- dodoc "${DOCS[@]}" || die "dodoc failed" |
| 57 |
+ dodoc "${DOCS[@]}" |
| 58 |
else |
| 59 |
local f |
| 60 |
# same list as in PMS |
| 61 |
for f in README* ChangeLog AUTHORS NEWS TODO CHANGES \ |
| 62 |
THANKS BUGS FAQ CREDITS CHANGELOG; do |
| 63 |
if [[ -s ${f} ]]; then |
| 64 |
- dodoc "${f}" || die "(default) dodoc ${f} failed" |
| 65 |
+ dodoc "${f}" |
| 66 |
fi |
| 67 |
done |
| 68 |
fi |
| 69 |
if [[ ${HTML_DOCS} ]]; then |
| 70 |
- dohtml -r "${HTML_DOCS[@]}" || die "dohtml failed" |
| 71 |
+ dohtml -r "${HTML_DOCS[@]}" |
| 72 |
fi |
| 73 |
|
| 74 |
if use scripts; then |
| 75 |
|
| 76 |
diff --git a/sci-physics/abinit/abinit-7.6.4-r1.ebuild b/sci-physics/abinit/abinit-7.6.4-r1.ebuild |
| 77 |
index 708b2de..50a03fa 100644 |
| 78 |
--- a/sci-physics/abinit/abinit-7.6.4-r1.ebuild |
| 79 |
+++ b/sci-physics/abinit/abinit-7.6.4-r1.ebuild |
| 80 |
@@ -1,4 +1,4 @@ |
| 81 |
-# Copyright 1999-2014 Gentoo Foundation |
| 82 |
+# Copyright 1999-2015 Gentoo Foundation |
| 83 |
# Distributed under the terms of the GNU General Public License v2 |
| 84 |
# $Header: $ |
| 85 |
|
| 86 |
@@ -201,7 +201,7 @@ src_prepare() { |
| 87 |
"${FILESDIR}"/7.6.4-cuda_header.patch \ |
| 88 |
"${FILESDIR}"/7.6.4-libxc_versions.patch |
| 89 |
eautoreconf |
| 90 |
- sed -e"s/\(grep '\^-\)\(\[LloW\]\)'/\1\\\(\2\\\|pthread\\\)'/g" -i configure |
| 91 |
+ sed -e"s/\(grep '\^-\)\(\[LloW\]\)'/\1\\\(\2\\\|pthread\\\)'/g" -i configure || die |
| 92 |
python_fix_shebang "${S}" |
| 93 |
} |
| 94 |
|
| 95 |
@@ -330,7 +330,7 @@ src_compile() { |
| 96 |
# Can Abinit use external libabinit.a? |
| 97 |
use libabinit && autotools-utils_src_compile libabinit.a |
| 98 |
|
| 99 |
- sed -i -e's/libatlas/lapack/' "${AUTOTOOLS_BUILD_DIR}"/config.pc |
| 100 |
+ sed -i -e's/libatlas/lapack/' "${AUTOTOOLS_BUILD_DIR}"/config.pc || die |
| 101 |
} |
| 102 |
|
| 103 |
src_test() { |
| 104 |
@@ -340,7 +340,7 @@ src_test() { |
| 105 |
pushd "${BUILD_DIR}" > /dev/null || die |
| 106 |
|
| 107 |
einfo "Running the internal tests." |
| 108 |
- emake tests_in || die 'The internal tests failed.' |
| 109 |
+ emake tests_in |
| 110 |
|
| 111 |
einfo "Running the thorough tests. Be patient, please." |
| 112 |
"${S}"/tests/runtests.py || ewarn "The package has not passed the thorough tests." |
| 113 |
@@ -352,7 +352,7 @@ src_install() { |
| 114 |
#autotools-utils_src_install() expanded |
| 115 |
_check_build_dir |
| 116 |
pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null |
| 117 |
- emake DESTDIR="${D}" install || die "make install failed" |
| 118 |
+ emake DESTDIR="${D}" install |
| 119 |
|
| 120 |
use libabinit && dolib libabinit.a |
| 121 |
|
| 122 |
@@ -373,12 +373,12 @@ src_install() { |
| 123 |
for f in README* ChangeLog AUTHORS NEWS TODO CHANGES \ |
| 124 |
THANKS BUGS FAQ CREDITS CHANGELOG; do |
| 125 |
if [[ -s ${f} ]]; then |
| 126 |
- dodoc "${f}" || die "(default) dodoc ${f} failed" |
| 127 |
+ dodoc "${f}" |
| 128 |
fi |
| 129 |
done |
| 130 |
fi |
| 131 |
if [[ ${HTML_DOCS} ]]; then |
| 132 |
- dohtml -r "${HTML_DOCS[@]}" || die "dohtml failed" |
| 133 |
+ dohtml -r "${HTML_DOCS[@]}" |
| 134 |
fi |
| 135 |
|
| 136 |
if use scripts; then |
Archives