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 | f82e480864050002eab8efa543b1fdc45ba798b6 (patch) | |
tree | bd30f3fd63946440d8773b98c771b5096016a022 /dev-lang/nqc | |
parent | Fix build, bug #349794 by flameeyes. Used patch by Mike Gilbert <floppymaster... (diff) | |
download | historical-f82e480864050002eab8efa543b1fdc45ba798b6.tar.gz historical-f82e480864050002eab8efa543b1fdc45ba798b6.tar.bz2 historical-f82e480864050002eab8efa543b1fdc45ba798b6.zip |
Replace patches (that should have been applied unconditionally anyway and do not apply to this version).
Package-Manager: portage-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/Manifest | 4 | ||||
-rw-r--r-- | dev-lang/nqc/nqc-3.1_p6.ebuild | 18 |
3 files changed, 13 insertions, 15 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/Manifest b/dev-lang/nqc/Manifest index af6d88cdbb79..c4fe6cfd496a 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 1576 RMD160 594940e48214a199c8bf3f5b107714f0cc2ad3c6 SHA1 bb48f083fe076a9724d5af4e55bf8d3c85af0be1 SHA256 161443d3ea84c1e8af8589684b76f47255e4c3f79118e671b75e69b96e727234 -MISC ChangeLog 397 RMD160 7fea739a902a43571dd9e71c7c1e3317f6563114 SHA1 bfb42d20471dd0881270af316134dde8fc6851a5 SHA256 608eb6a2476289b3a0550d0759f3b90c6559f4c44ab5c75946951630b455d46c +EBUILD nqc-3.1_p6.ebuild 1510 RMD160 2b5029b89288c649097f112f42c6e8f086cfad5e SHA1 f9395dec38ba10fa8ab12080db06d5027f70250b SHA256 3b82f40fe164708ba817daab2efe5afdeff54d4032047ed650e1a16130861afa +MISC ChangeLog 573 RMD160 1c107e3a94006bf934dc6d9a8586562260c528a9 SHA1 04010d71fbe379ddccb3f6184fe5aa340cfa98fc SHA256 6e139852e87fe31b03d4e468ee8886e5955b0f394503e4c20a2eda334bcb21c0 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 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() { |