Gentoo Archives: gentoo-commits

From: Christoph Junghans <ottxor@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/sci:master commit in: sci-mathematics/giac/
Date: Sun, 08 Feb 2015 21:08:01
Message-Id: 1423305995.7d34668536aa674a52943ee44e63baf1bb99eb1f.ottxor@gentoo
1 commit: 7d34668536aa674a52943ee44e63baf1bb99eb1f
2 Author: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
3 AuthorDate: Sat Feb 7 10:39: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=7d346685
7
8 sci-mathematics/giac-1.1.0: Add missing, drop useless dies
9
10 ---
11 sci-mathematics/giac/giac-1.1.0.ebuild | 24 ++++++++++++------------
12 1 file changed, 12 insertions(+), 12 deletions(-)
13
14 diff --git a/sci-mathematics/giac/giac-1.1.0.ebuild b/sci-mathematics/giac/giac-1.1.0.ebuild
15 index f04fc2d..34d059c 100644
16 --- a/sci-mathematics/giac/giac-1.1.0.ebuild
17 +++ b/sci-mathematics/giac/giac-1.1.0.ebuild
18 @@ -1,4 +1,4 @@
19 -# Copyright 1999-2014 Gentoo Foundation
20 +# Copyright 1999-2015 Gentoo Foundation
21 # Distributed under the terms of the GNU General Public License v2
22 # $Header: $
23
24 @@ -29,9 +29,9 @@ src_prepare(){
25 -e "s:config.h \$(includedir)/giac:config.h \$(DESTDIR)\$(includedir)/giac:g" \
26 -e "s:\$(DESTDIR)\$(DESTDIR):\$(DESTDIR):g" \
27 -e "s:\$(DESTDIR)/\$(DESTDIR):\$(DESTDIR):g" \
28 - -i `find -name Makefile\*`
29 + -i `find -name Makefile\*` || die
30 if use !fltk; then
31 - sed -e "s: gl2ps\.[chlo]*::g" -i src/Makefile.*
32 + sed -e "s: gl2ps\.[chlo]*::g" -i src/Makefile.* || die
33 fi
34 }
35
36 @@ -40,36 +40,36 @@ src_configure(){
37 then
38 append-cppflags -I$(fltk-config --includedir)
39 append-lfs-flags
40 - append-libs $(fltk-config --ldflags | sed -e 's/\(-L\S*\)\s.*/\1/')
41 + append-libs $(fltk-config --ldflags | sed -e 's/\(-L\S*\)\s.*/\1/') || die
42 fi
43 local myeconfargs=(
44 $(use_enable fltk gui)
45 )
46 - autotools-utils_src_configure || die "configuring failed"
47 + autotools-utils_src_configure
48 }
49
50 src_install() {
51 - emake install DESTDIR="${D}" || die "emake install failed"
52 - mv "${D}"/usr/bin/{aide,giac-help}
53 - rm "${D}"/usr/bin/*cas_help
54 + emake install DESTDIR="${D}"
55 + mv "${D}"/usr/bin/{aide,giac-help} || die
56 + rm "${D}"/usr/bin/*cas_help || die
57 dodoc AUTHORS ChangeLog INSTALL NEWS README TROUBLES
58 if use !fltk; then
59 - rm "${D}"/usr/bin/x*
60 + rm "${D}"/usr/bin/x* || die
61 elif host-is-pax; then
62 pax-mark -m "${D}"/usr/bin/x*
63 fi
64 if use !doc; then
65 - rm -R "${D}"/usr/share/doc/giac "${D}"/usr/share/giac/doc/
66 + rm -R "${D}"/usr/share/doc/giac "${D}"/usr/share/giac/doc/ || die
67 else
68 for LANG in el en es fr pt; do
69 if echo ${LINGUAS} | grep -v "$LANG" &> /dev/null; then
70 rm -R "${D}"/usr/share/giac/doc/"$LANG"
71 else
72 - ln "${D}"/usr/share/giac/doc/aide_cas "${D}"/usr/share/giac/doc/"$LANG"/aide_cas
73 + ln "${D}"/usr/share/giac/doc/aide_cas "${D}"/usr/share/giac/doc/"$LANG"/aide_cas || die
74 fi
75 done
76 fi
77 if use !examples; then
78 - rm -R "${D}"/usr/share/giac/examples
79 + rm -R "${D}"/usr/share/giac/examples || die
80 fi
81 }