summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2011-01-10 15:59:24 +0000
committerJeroen Roovers <jer@gentoo.org>2011-01-10 15:59:24 +0000
commitc4ff49e016c24bdd5b88256b285c429a338418c6 (patch)
tree44319b7f9637a4df5e27ec627a2ee607cdea3134 /dev-lang/nqc
parentx86 stable wrt bug #350624 (diff)
downloadgentoo-2-c4ff49e016c24bdd5b88256b285c429a338418c6.tar.gz
gentoo-2-c4ff49e016c24bdd5b88256b285c429a338418c6.tar.bz2
gentoo-2-c4ff49e016c24bdd5b88256b285c429a338418c6.zip
Fix a && b || die error (bug #351028).
(Portage version: 2.2.0_alpha14/cvs/Linux i686)
Diffstat (limited to 'dev-lang/nqc')
-rw-r--r--dev-lang/nqc/ChangeLog7
-rw-r--r--dev-lang/nqc/nqc-3.1_p6.ebuild8
2 files changed, 10 insertions, 5 deletions
diff --git a/dev-lang/nqc/ChangeLog b/dev-lang/nqc/ChangeLog
index e7a79f1d90c2..574d2a297f50 100644
--- a/dev-lang/nqc/ChangeLog
+++ b/dev-lang/nqc/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-lang/nqc
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/nqc/ChangeLog,v 1.17 2010/12/31 16:39:34 jer Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/nqc/ChangeLog,v 1.18 2011/01/10 15:59:24 jer Exp $
+
+ 10 Jan 2011; Jeroen Roovers <jer@gentoo.org> nqc-3.1_p6.ebuild:
+ Fix a && b || die error (bug #351028).
31 Dec 2010; Jeroen Roovers <jer@gentoo.org> nqc-3.1_p6.ebuild:
Replace patches (that should have been applied unconditionally anyway and do
diff --git a/dev-lang/nqc/nqc-3.1_p6.ebuild b/dev-lang/nqc/nqc-3.1_p6.ebuild
index a06065a52178..8ec4074d0c5f 100644
--- a/dev-lang/nqc/nqc-3.1_p6.ebuild
+++ b/dev-lang/nqc/nqc-3.1_p6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/nqc/nqc-3.1_p6.ebuild,v 1.2 2010/12/31 16:39:34 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/nqc/nqc-3.1_p6.ebuild,v 1.3 2011/01/10 15:59:24 jer Exp $
EAPI="2"
@@ -28,7 +28,9 @@ src_prepare() {
}
src_configure() {
- use usb && sed -i Makefile -e 's|#.*USBOBJ =|USBOBJ =|g' || die "sed usb"
+ if use usb; then
+ sed -i Makefile -e 's|#.*USBOBJ =|USBOBJ =|g' || die "sed usb"
+ fi
}
src_compile() {