Gentoo Archives: gentoo-commits

From: "Jeroen Roovers (jer)" <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-lang/nqc: ChangeLog nqc-3.1_p6.ebuild
Date: Fri, 31 Dec 2010 16:39:51
Message-Id: 20101231163934.B278820054@flycatcher.gentoo.org
1 jer 10/12/31 16:39:34
2
3 Modified: ChangeLog nqc-3.1_p6.ebuild
4 Log:
5 Replace patches (that should have been applied unconditionally anyway and do not apply to this version).
6
7 (Portage version: 2.2.0_alpha10/cvs/Linux i686)
8
9 Revision Changes Path
10 1.17 dev-lang/nqc/ChangeLog
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/nqc/ChangeLog?rev=1.17&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/nqc/ChangeLog?rev=1.17&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/nqc/ChangeLog?r1=1.16&r2=1.17
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/dev-lang/nqc/ChangeLog,v
19 retrieving revision 1.16
20 retrieving revision 1.17
21 diff -u -r1.16 -r1.17
22 --- ChangeLog 30 Dec 2010 18:42:58 -0000 1.16
23 +++ ChangeLog 31 Dec 2010 16:39:34 -0000 1.17
24 @@ -1,6 +1,10 @@
25 # ChangeLog for dev-lang/nqc
26 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/nqc/ChangeLog,v 1.16 2010/12/30 18:42:58 jer Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/nqc/ChangeLog,v 1.17 2010/12/31 16:39:34 jer Exp $
29 +
30 + 31 Dec 2010; Jeroen Roovers <jer@g.o> nqc-3.1_p6.ebuild:
31 + Replace patches (that should have been applied unconditionally anyway and do
32 + not apply to this version).
33
34 *nqc-3.1_p6 (30 Dec 2010)
35
36
37
38
39 1.2 dev-lang/nqc/nqc-3.1_p6.ebuild
40
41 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/nqc/nqc-3.1_p6.ebuild?rev=1.2&view=markup
42 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/nqc/nqc-3.1_p6.ebuild?rev=1.2&content-type=text/plain
43 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/nqc/nqc-3.1_p6.ebuild?r1=1.1&r2=1.2
44
45 Index: nqc-3.1_p6.ebuild
46 ===================================================================
47 RCS file: /var/cvsroot/gentoo-x86/dev-lang/nqc/nqc-3.1_p6.ebuild,v
48 retrieving revision 1.1
49 retrieving revision 1.2
50 diff -u -r1.1 -r1.2
51 --- nqc-3.1_p6.ebuild 30 Dec 2010 18:42:58 -0000 1.1
52 +++ nqc-3.1_p6.ebuild 31 Dec 2010 16:39:34 -0000 1.2
53 @@ -1,6 +1,6 @@
54 # Copyright 1999-2010 Gentoo Foundation
55 # Distributed under the terms of the GNU General Public License v2
56 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/nqc/nqc-3.1_p6.ebuild,v 1.1 2010/12/30 18:42:58 jer Exp $
57 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/nqc/nqc-3.1_p6.ebuild,v 1.2 2010/12/31 16:39:34 jer Exp $
58
59 EAPI="2"
60
61 @@ -21,20 +21,14 @@
62 RDEPEND="${DEPEND}"
63
64 src_prepare() {
65 - sed -i \
66 + sed -i Makefile \
67 -e 's|$(CXX) -o |$(CXX) $(LDFLAGS) -o |g' \
68 - -e 's|PREFIX?=/usr/local/|PREFIX?=/usr|' \
69 - Makefile || die "sed Makefile"
70 + -e 's|/usr/local|/usr|' \
71 + || die "sed Makefile"
72 }
73
74 -src_configure()
75 -{
76 - if use usb; then
77 - epatch "${FILESDIR}"/${P}-usb.patch
78 - fi
79 - if use amd64; then
80 - epatch "${FILESDIR}"/${P}-amd64.patch
81 - fi
82 +src_configure() {
83 + use usb && sed -i Makefile -e 's|#.*USBOBJ =|USBOBJ =|g' || die "sed usb"
84 }
85
86 src_compile() {