Gentoo Archives: gentoo-commits

From: Justin Lecher <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/sci:master commit in: sci-chemistry/gamess/, sci-libs/itk/, sci-libs/mpiblacs/, sci-biology/sra_sdk/, ...
Date: Wed, 23 Sep 2015 10:42:39
Message-Id: 1443004645.f8113b535c57b6c97c37e69d6741c1dee8318ce1.jlec@gentoo
1 commit: f8113b535c57b6c97c37e69d6741c1dee8318ce1
2 Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
3 AuthorDate: Wed Sep 23 10:37:25 2015 +0000
4 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 23 10:37:25 2015 +0000
6 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=f8113b53
7
8 Drop unnecessary die from doins
9
10 Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
11
12 sci-biology/bambino/bambino-1.02.ebuild | 4 ++--
13 sci-biology/bambino/bambino-1.06.ebuild | 4 ++--
14 sci-biology/sra_sdk/sra_sdk-2.2.2a.ebuild | 2 +-
15 sci-chemistry/gamess/gamess-20120501.1.ebuild | 16 ++++++++--------
16 sci-chemistry/gamess/gamess-20130501.1.ebuild | 16 ++++++++--------
17 sci-libs/itk/itk-4.4.2-r1.ebuild | 2 +-
18 sci-libs/mpiblacs/mpiblacs-1.1-r1.ebuild | 2 +-
19 7 files changed, 23 insertions(+), 23 deletions(-)
20
21 diff --git a/sci-biology/bambino/bambino-1.02.ebuild b/sci-biology/bambino/bambino-1.02.ebuild
22 index afeb2f1..bfc859a 100644
23 --- a/sci-biology/bambino/bambino-1.02.ebuild
24 +++ b/sci-biology/bambino/bambino-1.02.ebuild
25 @@ -27,8 +27,8 @@ RDEPEND="${DEPEND}
26
27 src_install(){
28 insinto "${DESTDIR}"/usr/share/"${PN}"/lib
29 - doins "${DISTDIR}"/bambino_core_"${PV}".jar || die
30 - doins "${DISTDIR}"/bambino_bundle_"${PV}".jar || die
31 + doins "${DISTDIR}"/bambino_core_"${PV}".jar
32 + doins "${DISTDIR}"/bambino_bundle_"${PV}".jar
33
34 einfo "bambino can be run using 'java -jar /usr/share/bambino/lib/bambino_bundle_1.02.jar'"
35 einfo " or 'java -jar /usr/share/bambino/lib/bambino_core_1.02.jar'"
36
37 diff --git a/sci-biology/bambino/bambino-1.06.ebuild b/sci-biology/bambino/bambino-1.06.ebuild
38 index cc46f29..fa16a70 100644
39 --- a/sci-biology/bambino/bambino-1.06.ebuild
40 +++ b/sci-biology/bambino/bambino-1.06.ebuild
41 @@ -27,8 +27,8 @@ RDEPEND="${DEPEND}
42
43 src_install(){
44 insinto "${DESTDIR}"/usr/share/"${PN}"/lib
45 - doins "${DISTDIR}"/bambino_core_"${PV}".jar || die
46 - doins "${DISTDIR}"/bambino_bundle_"${PV}".jar || die
47 + doins "${DISTDIR}"/bambino_core_"${PV}".jar
48 + doins "${DISTDIR}"/bambino_bundle_"${PV}".jar
49
50 einfo "bambino can be run using 'java -jar /usr/share/bambino/lib/bambino_bundle_1.06.jar'"
51 einfo " or 'java -jar /usr/share/bambino/lib/bambino_core_1.06.jar'"
52
53 diff --git a/sci-biology/sra_sdk/sra_sdk-2.2.2a.ebuild b/sci-biology/sra_sdk/sra_sdk-2.2.2a.ebuild
54 index d12fbcc..3605a66 100644
55 --- a/sci-biology/sra_sdk/sra_sdk-2.2.2a.ebuild
56 +++ b/sci-biology/sra_sdk/sra_sdk-2.2.2a.ebuild
57 @@ -80,7 +80,7 @@ src_install(){
58
59 # install the main libs and the ncbi/vdb-copy.kfg file
60 insinto /usr/lib/ncbi
61 - doins "${OBJDIR}"/lib/ncbi/* || die
62 + doins "${OBJDIR}"/lib/ncbi/*
63
64 # zap the subdirectory so that copying below does not fail
65 rm -rf "${OBJDIR}"/lib/ncbi || die
66
67 diff --git a/sci-chemistry/gamess/gamess-20120501.1.ebuild b/sci-chemistry/gamess/gamess-20120501.1.ebuild
68 index 768e9c3..d553acd 100644
69 --- a/sci-chemistry/gamess/gamess-20120501.1.ebuild
70 +++ b/sci-chemistry/gamess/gamess-20120501.1.ebuild
71 @@ -269,25 +269,25 @@ src_install() {
72
73 # install ericftm
74 insinto /usr/share/${PN}
75 - doins auxdata/ericfmt.dat || die "Failed installing ericfmt.dat"
76 + doins auxdata/ericfmt.dat
77
78 # install mcpdata
79 insinto /usr/share/${PN}/MCP
80 - doins auxdata/MCP/* || die "Failed installing MCP"
81 + doins auxdata/MCP/*
82
83 # install BASES
84 insinto /usr/share/${PN}/BASES
85 - doins auxdata/BASES/* || die "Failed installing BASES"
86 + doins auxdata/BASES/*
87
88 # install QUANPOL
89 insinto /usr/share/${PN}/QUANPOL
90 - doins auxdata/QUANPOL/* || die "Failed installing QUANPOL"
91 + doins auxdata/QUANPOL/*
92
93 # install tinker params in case of qmmm
94 if use qmmm-tinker ; then
95 dodoc tinker/simomm.doc
96 insinto /usr/share/${PN}
97 - doins -r tinker/params51 || die "Failed to install Tinker params"
98 + doins -r tinker/params51
99 fi
100
101 # install the tests the user should run, and
102 @@ -295,9 +295,9 @@ src_install() {
103 # so the user is ready to run the tests
104 insinto /usr/share/${PN}/tests
105 insopts -m0644
106 - doins -r tests/* || die "Failed installing tests"
107 + doins -r tests/*
108 insopts -m0744
109 - doins runall || die "Failed installing tests"
110 + doins runall
111 #doins tools/checktst/checktst tools/checktst/chkabs || \
112 # die "Failed to install main test checker"
113 #doins tools/checktst/exam* || \
114 @@ -305,7 +305,7 @@ src_install() {
115
116 insinto /usr/share/${PN}/neotests
117 insopts -m0644
118 - doins -r qmnuc/neotests/* || die "Failed to install NEO tests"
119 + doins -r qmnuc/neotests/*
120 }
121
122 pkg_postinst() {
123
124 diff --git a/sci-chemistry/gamess/gamess-20130501.1.ebuild b/sci-chemistry/gamess/gamess-20130501.1.ebuild
125 index 871d6dd..6629eee 100644
126 --- a/sci-chemistry/gamess/gamess-20130501.1.ebuild
127 +++ b/sci-chemistry/gamess/gamess-20130501.1.ebuild
128 @@ -269,25 +269,25 @@ src_install() {
129
130 # install ericftm
131 insinto /usr/share/${PN}
132 - doins auxdata/ericfmt.dat || die "Failed installing ericfmt.dat"
133 + doins auxdata/ericfmt.dat
134
135 # install mcpdata
136 insinto /usr/share/${PN}/MCP
137 - doins auxdata/MCP/* || die "Failed installing MCP"
138 + doins auxdata/MCP/*
139
140 # install BASES
141 insinto /usr/share/${PN}/BASES
142 - doins auxdata/BASES/* || die "Failed installing BASES"
143 + doins auxdata/BASES/*
144
145 # install QUANPOL
146 insinto /usr/share/${PN}/QUANPOL
147 - doins auxdata/QUANPOL/* || die "Failed installing QUANPOL"
148 + doins auxdata/QUANPOL/*
149
150 # install tinker params in case of qmmm
151 if use qmmm-tinker ; then
152 dodoc tinker/simomm.doc
153 insinto /usr/share/${PN}
154 - doins -r tinker/params51 || die "Failed to install Tinker params"
155 + doins -r tinker/params51
156 fi
157
158 # install the tests the user should run, and
159 @@ -295,9 +295,9 @@ src_install() {
160 # so the user is ready to run the tests
161 insinto /usr/share/${PN}/tests
162 insopts -m0644
163 - doins -r tests/* || die "Failed installing tests"
164 + doins -r tests/*
165 insopts -m0744
166 - doins runall || die "Failed installing tests"
167 + doins runall
168 #doins tools/checktst/checktst tools/checktst/chkabs || \
169 # die "Failed to install main test checker"
170 #doins tools/checktst/exam* || \
171 @@ -305,7 +305,7 @@ src_install() {
172
173 insinto /usr/share/${PN}/neotests
174 insopts -m0644
175 - doins -r qmnuc/neotests/* || die "Failed to install NEO tests"
176 + doins -r qmnuc/neotests/*
177 }
178
179 pkg_postinst() {
180
181 diff --git a/sci-libs/itk/itk-4.4.2-r1.ebuild b/sci-libs/itk/itk-4.4.2-r1.ebuild
182 index 54c0e41..518c455 100644
183 --- a/sci-libs/itk/itk-4.4.2-r1.ebuild
184 +++ b/sci-libs/itk/itk-4.4.2-r1.ebuild
185 @@ -129,7 +129,7 @@ src_install() {
186 rm -f *.md5 || die "Failed to remove superfluous hashes"
187 einfo "Installing API docs. This may take some time."
188 insinto "/usr/share/doc/${PF}/api-docs"
189 - doins -r ./* || die "Failed to install docs"
190 + doins -r ./*
191 fi
192
193 doenvd "${T}"/40${PN}
194
195 diff --git a/sci-libs/mpiblacs/mpiblacs-1.1-r1.ebuild b/sci-libs/mpiblacs/mpiblacs-1.1-r1.ebuild
196 index fb6f4ad..a6a4639 100644
197 --- a/sci-libs/mpiblacs/mpiblacs-1.1-r1.ebuild
198 +++ b/sci-libs/mpiblacs/mpiblacs-1.1-r1.ebuild
199 @@ -116,7 +116,7 @@ src_install() {
200 Requires: blas
201 EOF
202 insinto /usr/$(get_libdir)/pkgconfig
203 - doins ${PN}.pc || die
204 + doins ${PN}.pc
205 alternatives_for blacs ${PN} 0 \
206 /usr/$(get_libdir)/pkgconfig/blacs.pc ${PN}.pc
207 popd > /dev/null