Gentoo Archives: gentoo-commits

From: "Samuli Suominen (ssuominen)" <ssuominen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in eclass: xfconf.eclass
Date: Fri, 04 Feb 2011 17:23:45
Message-Id: 20110204172335.5159320054@flycatcher.gentoo.org
1 ssuominen 11/02/04 17:23:35
2
3 Modified: xfconf.eclass
4 Log:
5 Remove unnecessary die messages as portage prints the command it fails on. Whitespace.
6
7 Revision Changes Path
8 1.22 eclass/xfconf.eclass
9
10 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?rev=1.22&view=markup
11 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?rev=1.22&content-type=text/plain
12 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?r1=1.21&r2=1.22
13
14 Index: xfconf.eclass
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v
17 retrieving revision 1.21
18 retrieving revision 1.22
19 diff -u -r1.21 -r1.22
20 --- xfconf.eclass 27 Jan 2011 17:32:49 -0000 1.21
21 +++ xfconf.eclass 4 Feb 2011 17:23:35 -0000 1.22
22 @@ -1,6 +1,6 @@
23 # Copyright 1999-2009 Gentoo Foundation
24 # Distributed under the terms of the GNU General Public License v2
25 -# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.21 2011/01/27 17:32:49 ssuominen Exp $
26 +# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.22 2011/02/04 17:23:35 ssuominen Exp $
27
28 # @ECLASS: xfconf.eclass
29 # @MAINTAINER:
30 @@ -100,7 +100,7 @@
31 base_src_prepare
32
33 if [[ "${EINTLTOOLIZE}" == "yes" ]]; then
34 - intltoolize --force --copy --automake || die "intltoolize failed"
35 + intltoolize --force --copy --automake || die
36 fi
37
38 if [[ "${EAUTORECONF}" == "yes" ]]; then
39 @@ -121,7 +121,7 @@
40 if [[ "$(declare -p XFCONF 2>/dev/null 2>&1)" != "declare -a"* ]]; then
41 XFCONF=( ${XFCONF} )
42 fi
43 -
44 +
45 econf ${XFCONF[@]}
46 }
47
48 @@ -131,7 +131,7 @@
49 xfconf_src_compile() {
50 debug-print-function ${FUNCNAME} "$@"
51 has src_configure ${XFCONF_EXPF} || xfconf_src_configure
52 - emake || die "emake failed"
53 + emake || die
54 }
55
56 # @FUNCTION: xfconf_src_install
57 @@ -139,10 +139,10 @@
58 # Run emake install and install documentation in DOCS variable
59 xfconf_src_install() {
60 debug-print-function ${FUNCNAME} "$@"
61 - emake DESTDIR="${D}" "$@" install || die "emake install failed"
62 + emake DESTDIR="${D}" "$@" install || die
63
64 if [[ -n ${DOCS} ]]; then
65 - dodoc ${DOCS} || die "dodoc failed"
66 + dodoc ${DOCS} || die
67 fi
68
69 has "${EAPI:-0}" 0 1 2 && ! use prefix && ED="${D}"