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
commit8c0971070da263cb4eef3766c4cb61940a78392e (patch)
tree45049ec56e844dc36e49488375ee5d4fe947c2b7 /dev-lang/nqc
parentx86 stable wrt bug #350624 (diff)
downloadhistorical-8c0971070da263cb4eef3766c4cb61940a78392e.tar.gz
historical-8c0971070da263cb4eef3766c4cb61940a78392e.tar.bz2
historical-8c0971070da263cb4eef3766c4cb61940a78392e.zip
Fix a && b || die error (bug #351028).
Package-Manager: portage-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/Manifest4
-rw-r--r--dev-lang/nqc/nqc-3.1_p6.ebuild8
3 files changed, 12 insertions, 7 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/Manifest b/dev-lang/nqc/Manifest
index c4fe6cfd496a..426687f3620d 100644
--- a/dev-lang/nqc/Manifest
+++ b/dev-lang/nqc/Manifest
@@ -6,6 +6,6 @@ DIST nqc-3.1.r4.tgz 334211 RMD160 b251210efc52022f1d4d97d9c02c06d4251b3666 SHA1
DIST nqc-3.1.r6.tgz 329410 RMD160 a991494445debbb6a3157e3a9c57793317fe91c4 SHA1 1de6543cc5152f6dacf375aea2974c09e5fe0ffa SHA256 bfd5e654f639af7a588cfdef4d22bd5efcfff547b10a56cebebde58ef2bfe766
EBUILD nqc-2.5.1.ebuild 1234 RMD160 5aa195c39d6a48570e499600753df6a82bb6cdf4 SHA1 7b65864dd4faeac11795890304d2bf034909fc8f SHA256 e8dfc0be1a07e00d67874d5fba98f83c322dd7933ad61f8ba28b735894b2947c
EBUILD nqc-3.1_p4.ebuild 1370 RMD160 4ccdde99575c5a8dfa537a4c6594bcc609bdc7fd SHA1 cd38f4948c3ab531fb16879436302379a60c3723 SHA256 59b20646b1b0463591ffd549984a389e70e79c4de974d836c5ff4b4d8254cbcb
-EBUILD nqc-3.1_p6.ebuild 1510 RMD160 2b5029b89288c649097f112f42c6e8f086cfad5e SHA1 f9395dec38ba10fa8ab12080db06d5027f70250b SHA256 3b82f40fe164708ba817daab2efe5afdeff54d4032047ed650e1a16130861afa
-MISC ChangeLog 573 RMD160 1c107e3a94006bf934dc6d9a8586562260c528a9 SHA1 04010d71fbe379ddccb3f6184fe5aa340cfa98fc SHA256 6e139852e87fe31b03d4e468ee8886e5955b0f394503e4c20a2eda334bcb21c0
+EBUILD nqc-3.1_p6.ebuild 1522 RMD160 5df1e21734d110b387eaf77ff27229461a506671 SHA1 7a47daed210aef4b6a3382af35108d4d587b10a4 SHA256 74fa5cf8712033c15589ef2c1c08df099daad2807dbb39eb44f6e3f9dea8aa7b
+MISC ChangeLog 681 RMD160 6e7c1c2153c7bb032d5c8e4267b5e740000e2aa3 SHA1 696405edaae4a60ce9275ce36f8995340cd1ceb4 SHA256 eb6b82029948f89357fc7781fa18cc25443517e926a389931f7aaa29615d2788
MISC metadata.xml 290 RMD160 b9b86283c09349c8827faef7d3ef5f724a248e77 SHA1 ae1c8e62d75c94ff50b8a5391afb6008460963aa SHA256 380e26e9262298b9cb31e863a9ab641f6fbdc8c50bda2cf2e47fd399f9cb5e85
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() {