diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2010-12-31 16:39:34 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2010-12-31 16:39:34 +0000 |
| commit | e4cce7c5ecd568a180c514cf0b888a1564a77b15 (patch) | |
| tree | 52af96e6966864960b548d0056c24a79ad4ee391 /dev-lang/nqc | |
| parent | Fix build, bug #349794 by flameeyes. Used patch by Mike Gilbert <floppymaster... (diff) | |
| download | gentoo-2-e4cce7c5ecd568a180c514cf0b888a1564a77b15.tar.gz gentoo-2-e4cce7c5ecd568a180c514cf0b888a1564a77b15.tar.bz2 gentoo-2-e4cce7c5ecd568a180c514cf0b888a1564a77b15.zip | |
Replace patches (that should have been applied unconditionally anyway and do not apply to this version).
(Portage version: 2.2.0_alpha10/cvs/Linux i686)
Diffstat (limited to 'dev-lang/nqc')
| -rw-r--r-- | dev-lang/nqc/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-lang/nqc/nqc-3.1_p6.ebuild | 18 |
2 files changed, 11 insertions, 13 deletions
diff --git a/dev-lang/nqc/ChangeLog b/dev-lang/nqc/ChangeLog index 62fce0abc9d8..e7a79f1d90c2 100644 --- a/dev-lang/nqc/ChangeLog +++ b/dev-lang/nqc/ChangeLog @@ -1,6 +1,10 @@ # 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.16 2010/12/30 18:42:58 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/nqc/ChangeLog,v 1.17 2010/12/31 16:39:34 jer Exp $ + + 31 Dec 2010; Jeroen Roovers <jer@gentoo.org> nqc-3.1_p6.ebuild: + Replace patches (that should have been applied unconditionally anyway and do + not apply to this version). *nqc-3.1_p6 (30 Dec 2010) diff --git a/dev-lang/nqc/nqc-3.1_p6.ebuild b/dev-lang/nqc/nqc-3.1_p6.ebuild index 8616f4943ced..a06065a52178 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 # 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.1 2010/12/30 18:42:58 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/nqc/nqc-3.1_p6.ebuild,v 1.2 2010/12/31 16:39:34 jer Exp $ EAPI="2" @@ -21,20 +21,14 @@ DEPEND="usb? ( dev-libs/legousbtower )" RDEPEND="${DEPEND}" src_prepare() { - sed -i \ + sed -i Makefile \ -e 's|$(CXX) -o |$(CXX) $(LDFLAGS) -o |g' \ - -e 's|PREFIX?=/usr/local/|PREFIX?=/usr|' \ - Makefile || die "sed Makefile" + -e 's|/usr/local|/usr|' \ + || die "sed Makefile" } -src_configure() -{ - if use usb; then - epatch "${FILESDIR}"/${P}-usb.patch - fi - if use amd64; then - epatch "${FILESDIR}"/${P}-amd64.patch - fi +src_configure() { + use usb && sed -i Makefile -e 's|#.*USBOBJ =|USBOBJ =|g' || die "sed usb" } src_compile() { |