All tc-get* sed replacements must happen before C*FLAGS-related ones, otherwise we...

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

diff --git a/sci-chemistry/namd/ChangeLog b/sci-chemistry/namd/ChangeLog
index 58ba2ec937fcf9a27ffec75f0888a559620efafa..5b1fd4f5122245a68306bc63482e7c19c553ac35 100644 (file)
--- a/sci-chemistry/namd/ChangeLog
+++ b/sci-chemistry/namd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-chemistry/namd
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/namd/ChangeLog,v 1.9 2009/09/23 19:55:56 patrick Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/namd/ChangeLog,v 1.10 2010/04/23 19:38:39 dberkholz Exp $
+
+  23 Apr 2010; Donnie Berkholz <dberkholz@gentoo.org>; namd-2.7.ebuild:
+  All tc-get* sed replacements must happen before C*FLAGS-related ones,
+  otherwise we can replace things like -frecord-gcc-switches with
+  -frecord-x86_64-pc-linux-gnu-gcc-switches.
 
   23 Sep 2009; Patrick Lauer <patrick@gentoo.org> namd-2.6.ebuild,
   namd-2.7.ebuild:

diff --git a/sci-chemistry/namd/Manifest b/sci-chemistry/namd/Manifest
index f5978198f6b56756d7c2e91030c6006b566287a5..3b19ec645fb26ff816ef4b4131a3bc820ca992a9 100644 (file)
--- a/sci-chemistry/namd/Manifest
+++ b/sci-chemistry/namd/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX namd-2.6-gentoo.patch 3650 RMD160 e7cc7fa0e20b01295d6f7c83211f961720e8beaa SHA1 f5525811cc092c5125be93cdce0e8c4e22fbee38 SHA256 55fad22d757d83d786b279a50a724499fb915767ade827895d686df16fa829d9
 AUX namd-2.7-gentoo.patch 4046 RMD160 a7d087c47088d9a8df8f804e023d1a882e281e74 SHA1 333fe98dcfb54736f192f3baa82280dcab1fbd21 SHA256 9416859fa9f065f3f269441cbbb44d4f627b71c8cba29ba9e6765c08dae3611f
 AUX namd-barrier-fix-gentoo.patch 2362 RMD160 c6b045a0f2ec9f29bf7f98db7a71c1533f2a20d3 SHA1 5d42ef58f08914ecdf4afe735345ff1264389544 SHA256 f0186fada88b387c0681095174be336d61b2968197d223c15c840c1ca96e4992
@@ -7,6 +10,13 @@ AUX namd-tcl-lib-gentoo.patch 576 RMD160 0992dd4103b97baed85e66a8d4fc04c3991bedd
 DIST NAMD_2.6_Source.tar.gz 8963319 RMD160 186f79322226a20398031618011104a666237298 SHA1 3b3d83fdc54a520cb6c59b34cde03c9f74d2f443 SHA256 bf353ff13eae18b5a8dc33d79d295e9fe73fb87482858309b7695ce3e24f0d0b
 DIST NAMD_2.7b1_Source.tar.gz 26302404 RMD160 ccb73606d3f0724c55ce022aa130656444825f5e SHA1 955e096a6c70e1e7786d10334bec3cae1eb4fff6 SHA256 cf48b659667fe9e03af27c8d434567525e924ebd08c801321c71361a8f166b2e
 EBUILD namd-2.6.ebuild 2263 RMD160 f846abf600169a6542e7a577724a8827b91fc515 SHA1 504275ea6effca39d3381409f4a9da52d907db31 SHA256 dc4868ffea8c831981080d501efd4dc18f03304cc5971cd4f1ece76a4f4b876e
-EBUILD namd-2.7.ebuild 2650 RMD160 05387801ae0bf2379948d359e51d0f180d96b4b6 SHA1 93d1e1ae9642fe0a751e7229779814fc4529e972 SHA256 944487f9b93a13bba777ea2c669f7725854e69f2fd1df262e363af524591fd45
-MISC ChangeLog 1847 RMD160 75be9b2bd8410d67c529e71e39641bb6de3c38a5 SHA1 db8521aebafd677935171bfc4750f6c0ada24693 SHA256 588112965c57b399bb488e3d2285b0044374c06706262be7fdbcba1591acaa1c
+EBUILD namd-2.7.ebuild 2652 RMD160 4daba1e26065307c20828d3c58abc65d0d469038 SHA1 03fb05e99de39329ae4a2daf97c7dc9ab83ba41d SHA256 01c8390e328ee39fd1647fbb0dd253b41d98b2a0db250640faf124440c98a713
+MISC ChangeLog 2106 RMD160 a982f8a885675f6f9ff4e2087a38ad19628e55ec SHA1 8e0d1b07f086b953c7e6001f7a542dae723b0c39 SHA256 04f6a2058e3960cc5627c6a0ecf0869c45bde0abb82954268589dd56996f6389
 MISC metadata.xml 282 RMD160 539a53475b01291eadb86c8c53a0fbc02b4a34d4 SHA1 7f42dcea44641b8a77ab9644791344ec6ed6c327 SHA256 3c1785eb4ab63774ed3a6b1bddd602ef24cd6795f690bb3289d5a980bca06349
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkvR90YACgkQXVaO67S1rtta2QCg9AjgQbnSK61979RIMQU43Jtb
++9QAoI8jFococeVUgfjFsb93R98lqnw+
+=zCrw
+-----END PGP SIGNATURE-----

diff --git a/sci-chemistry/namd/namd-2.7.ebuild b/sci-chemistry/namd/namd-2.7.ebuild
index 490998207c85015559c93706a2342081a172ae3c..327d7440a8c8788eee48ff697c2e0a9cfdeec973 100644 (file)
--- a/sci-chemistry/namd/namd-2.7.ebuild
+++ b/sci-chemistry/namd/namd-2.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/namd/namd-2.7.ebuild,v 1.2 2009/09/23 19:55:56 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/namd/namd-2.7.ebuild,v 1.3 2010/04/23 19:38:39 dberkholz Exp $
 
 inherit eutils toolchain-funcs flag-o-matic
 
@@ -52,8 +52,8 @@ src_unpack() {
        cd "${S}"
        # proper compiler and cflags
        sed -e "s/g++/$(tc-getCXX)/" \
-               -e "s/CXXOPTS = -O3 -m64 -fexpensive-optimizations -ffast-math/CXXOPTS = ${CXXFLAGS}/" \
                -e "s/gcc/$(tc-getCC)/" \
+               -e "s/CXXOPTS = -O3 -m64 -fexpensive-optimizations -ffast-math/CXXOPTS = ${CXXFLAGS}/" \
                -e "s/COPTS = -O3 -m64 -fexpensive-optimizations -ffast-math/COPTS = ${CFLAGS}/" \
                -i arch/${NAMD_ARCH}.arch || \
                die "Failed to setup ${NAMD_ARCH}.arch"