Moved to EAPI=3 for PREFIX support, keyworded for *-linux, tested by me

Package-Manager: portage-2.2_rc65/cvs/Linux x86_64

3 files changed, 18 insertions, 11 deletions

diff --git a/sci-chemistry/cns/ChangeLog b/sci-chemistry/cns/ChangeLog
index 57f7d426d005..4f872ee93f4a 100644
--- a/sci-chemistry/cns/ChangeLog
+++ b/sci-chemistry/cns/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-chemistry/cns
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/ChangeLog,v 1.19 2010/02/06 21:49:39 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/ChangeLog,v 1.20 2010/03/07 09:54:15 jlec Exp $
+
+  07 Mar 2010; Justin Lecher (jlec) <jlec@gentoo.org> cns-1.2.1-r2.ebuild:
+  Moved to EAPI=3 for PREFIX support, keyworded for *-linux, tested by me
 
 *cns-1.2.1-r2 (06 Feb 2010)
 
diff --git a/sci-chemistry/cns/Manifest b/sci-chemistry/cns/Manifest
index ed99a9f039c1..787adde77806 100644
--- a/sci-chemistry/cns/Manifest
+++ b/sci-chemistry/cns/Manifest
@@ -17,15 +17,15 @@ DIST cns_solve_1.2_all.tar.gz 30456531 RMD160 45cff57b3f026d730032cfc1c9476880f7
 EBUILD cns-1.1.ebuild 3598 RMD160 c659528cda734552ca1faa9bc85c371b92d90d46 SHA1 e891a1be5f873e869bce5a6b617bbfd54a7aa71d SHA256 2be38322ddc333590c4d891f675921cabb0e18ef795042c1c4a849beb0793f6b
 EBUILD cns-1.2-r1.ebuild 4467 RMD160 cc3f1a26a8c28c111f25b74572dc4af3bb1d56c9 SHA1 f4da145be4190c1837e3262291f75c9eeaa3ef2d SHA256 ac40399a59987612e7602811cb79fdb4ae0295d23222afb6947ad1b79f5a8238
 EBUILD cns-1.2.1-r1.ebuild 5531 RMD160 93f382ecb94f6b6a21108182a2aae18547bc704a SHA1 f80f7203f79cd527b2ccdd2755971a21a6b87cba SHA256 0866f9e38ce28d128db71974d1832f7fc6124f0d11b02f90111cd8a5434b075c
-EBUILD cns-1.2.1-r2.ebuild 5925 RMD160 3ec3eaf16b91ab513247c91d91ab2182f756475b SHA1 2f62e0d68a88f3cd91dff36f48665d3f26d47a34 SHA256 f4b51e823fa2fed5d2b187066bfa2848e2f209b05d0875623b8c14668daf6f33
+EBUILD cns-1.2.1-r2.ebuild 6085 RMD160 bbf32a77b2c3d84becb95d390704b77943348ac1 SHA1 4e09e5ce780edb8f78eea2456be1aebd0ebef3a9 SHA256 26812e41de70704d1327b5e9abcdd73eb63b03162aa0ff3e340594d1da0506ec
 EBUILD cns-1.2.1.ebuild 5574 RMD160 23000fd54ce250a3dbf40ab71d12c539fda0d9fd SHA1 42c852c40d23eeec1280359d5adfe8c51a7ebf24 SHA256 7c1f6871416f516773af3cd23d8be9c2b0e978401898d5932622a2dd2b121301
 EBUILD cns-1.2.ebuild 3497 RMD160 9e097171ebd44f1a7e5dd317beeb6b65aefac2f6 SHA1 3afc4b415d2ef559b717843a05bc6afb8ee651a2 SHA256 1a6094c8bca3797e62c375a2370cc7425e9c1dd1106d20f202681bc5a87da1fc
-MISC ChangeLog 3451 RMD160 be074f842da2cffc88e2f09df8742b5cce4703c9 SHA1 070e0afc1edf77c85488802e8071bdca9356ae1a SHA256 6daf9cb8257fcc32ac0c077ba2e55c9540e2e103d9e46901caddf2743cf87eca
+MISC ChangeLog 3601 RMD160 ed48700696862dcf0d6c525afab3c617ac42ac3f SHA1 01e280a56b087ffb2ed0310acdcb41d32b731ea3 SHA256 135e9670a13142ebeb5751aa9cf3e47a1678acb0991a4c80bc857d4d080562a9
 MISC metadata.xml 302 RMD160 d60d9cd875115eaba68ad4b504bff76b39a136b0 SHA1 ecdd8feeea2de489927403f1941acfc582c17222 SHA256 a374144760a8ac1f72b1c625c41f98cee3f74511c964133bda119da580664c50
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAktt4/kACgkQgAnW8HDreRYbRACeL91+WT2Pt7YnCXHCQxQVJcQ5
-o9IAnRBLCnrYhzc97xbiTrG/MtZIJFn2
-=YGlt
+iEYEARECAAYFAkuTd80ACgkQgAnW8HDreRYsGACfcnNH7KgjV/65ePIIHC7P0i3x
+kmUAn1hloW6214zwed7Kr/Js4Y64qO4i
+=f5jI
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/cns/cns-1.2.1-r2.ebuild b/sci-chemistry/cns/cns-1.2.1-r2.ebuild
index 683f615ce923..a911028998ce 100644
--- a/sci-chemistry/cns/cns-1.2.1-r2.ebuild
+++ b/sci-chemistry/cns/cns-1.2.1-r2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/cns-1.2.1-r2.ebuild,v 1.1 2010/02/06 21:49:39 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/cns-1.2.1-r2.ebuild,v 1.2 2010/03/07 09:54:15 jlec Exp $
 
-EAPI="2"
+EAPI="3"
 
 inherit eutils fortran toolchain-funcs versionator flag-o-matic
 
@@ -17,7 +17,7 @@ SRC_URI="${MY_P}_all-mp.tar.gz
 
 SLOT="0"
 LICENSE="cns"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="aria openmp"
 
 RDEPEND="app-shells/tcsh
@@ -85,6 +85,10 @@ src_prepare() {
 		-e "s:_CNSsolve_location_:${S}:g" \
 		-e "17 s:\(.*\):\1\nexport _POSIX2_VERSION; _POSIX2_VERSION=199209:g" \
 		"${T}"/cns_solve_env_sh
+
+	einfo "Fixing shebangs..."
+	find "${S}" -type f \
+		-exec sed "s:/bin/csh:${EPREFIX}/bin/csh:g" -i '{}' \; || die
 }
 
 src_compile() {
@@ -130,7 +134,7 @@ src_install() {
 	# Install to locations resembling FHS
 	sed -i \
 		-e "s:${S}:usr:g" \
-		-e "s:^\(setenv CNS_SOLVE.*\):\1\nsetenv CNS_ROOT /usr:g" \
+		-e "s:^\(setenv CNS_SOLVE.*\):\1\nsetenv CNS_ROOT ${EPREFIX}/usr:g" \
 		-e "s:^\(setenv CNS_SOLVE.*\):\1\nsetenv CNS_DATA \$CNS_ROOT/share/cns:g" \
 		-e "s:^\(setenv CNS_SOLVE.*\):\1\nsetenv CNS_DOC \$CNS_ROOT/share/doc/${PF}:g" \
 		-e "s:CNS_LIB \$CNS_SOLVE/libraries:CNS_LIB \$CNS_DATA/libraries:g" \
@@ -142,7 +146,7 @@ src_install() {
 	# for CNS_SOLVE and CNS_ROOT, but it does
 	sed -i \
 		-e "s:${S}:/usr:g" \
-		-e "s:^\(^[[:space:]]*CNS_SOLVE=.*\):\1\nexport CNS_ROOT=/usr:g" \
+		-e "s:^\(^[[:space:]]*CNS_SOLVE=.*\):\1\nexport CNS_ROOT=${EPREFIX}/usr:g" \
 		-e "s:^\(^[[:space:]]*CNS_SOLVE=.*\):\1\nexport CNS_DATA=\$CNS_ROOT/share/cns:g" \
 		-e "s:^\(^[[:space:]]*CNS_SOLVE=.*\):\1\nexport CNS_DOC=\$CNS_ROOT/share/doc/${PF}:g" \
 		-e "s:CNS_LIB=\$CNS_SOLVE/libraries:CNS_LIB=\$CNS_DATA/libraries:g" \