Version Bump, thanks alexxy telling me this; fix for correct linking

Package-Manager: portage-2.2.0_alpha5/cvs/Linux x86_64

6 files changed, 38 insertions, 17 deletions

diff --git a/sci-chemistry/cns/ChangeLog b/sci-chemistry/cns/ChangeLog
index 4f2c8f0008ec..86133f204859 100644
--- a/sci-chemistry/cns/ChangeLog
+++ b/sci-chemistry/cns/ChangeLog
@@ -1,6 +1,14 @@
 # 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.29 2010/11/19 08:57:24 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/ChangeLog,v 1.30 2010/11/25 13:35:42 jlec Exp $
+
+*cns-1.3_p3 (25 Nov 2010)
+
+  25 Nov 2010; Justin Lecher <jlec@gentoo.org> +files/1.3_p3-delete.patch,
+  +files/1.3_p3-gentoo.patch, -files/1.3-delete.patch, -files/1.3-gentoo.patch,
+  -files/cns_solve_env_sh-1.3, -cns-1.3.ebuild, +files/cns_solve_env_sh-1.3_p3,
+  +cns-1.3_p3.ebuild:
+  Version Bump, thanks alexxy telling me this; fix for correct linking
 
   19 Nov 2010; Justin Lecher <jlec@gentoo.org> -cns-1.2.ebuild,
   -cns-1.2-r1.ebuild, -cns-1.2.1-r1.ebuild, -cns-1.2.1-r3.ebuild,
diff --git a/sci-chemistry/cns/Manifest b/sci-chemistry/cns/Manifest
index 4f9a10630e22..806b0f6a85bd 100644
--- a/sci-chemistry/cns/Manifest
+++ b/sci-chemistry/cns/Manifest
@@ -9,27 +9,27 @@ AUX 1.2.1-aria2.3.patch 658 RMD160 a372156b7a783cb78c81aadae2eca5c64c9630e5 SHA1
 AUX 1.2.1-gentoo.patch 2411 RMD160 a82893524541961a9797fd2bb84982e609fda717 SHA1 7d3168a9cf7622923138022a5683aa65b5d5c34d SHA256 58972606d23d87fdeb08c9e37d9d5c536983e5a1ad4647dedd5b283ef67bc52c
 AUX 1.2.1-ifort.patch 5346 RMD160 106cf7dc7b4e13674fdf34ca0fd9af78effbc84b SHA1 26ccc71740ee2539352009f730b79b2ae20b5047 SHA256 bac35147159fac06fcb3a03a4f09c56224d4ee852b86a771121d98c42f3a9c65
 AUX 1.2.1-parallel.patch 641 RMD160 dffcaf7a4d7c79b9362640b64e677a7fde04ac80 SHA1 5de790cee7acf9ff4a87a61fdc866c330ef6d6f1 SHA256 7cd3312c35d2dbbd2146fdfa977f9866365c4a7be16787b1ba5d9807ff823d31
-AUX 1.3-delete.patch 448 RMD160 17b6ac426c11ae1832e7edf71a954e02434a5a46 SHA1 cd6f63a167dd9392c35d06ffdd31afd086e5c146 SHA256 aa61180b60fd008e3ba445bab5a4a6b0c4634b34fc5655be94ce07dc45abe958
-AUX 1.3-gentoo.patch 2536 RMD160 335c1e6374f3ad9b4340de223ce5e481e96ac875 SHA1 99072abd426614979eb7659a4fb2187bb5ffb3d2 SHA256 0cf8135a5680ebd3df0474d3b04e66c08e8b31547afeed91ceb3108dce8d8864
+AUX 1.3_p3-delete.patch 448 RMD160 17b6ac426c11ae1832e7edf71a954e02434a5a46 SHA1 cd6f63a167dd9392c35d06ffdd31afd086e5c146 SHA256 aa61180b60fd008e3ba445bab5a4a6b0c4634b34fc5655be94ce07dc45abe958
+AUX 1.3_p3-gentoo.patch 2933 RMD160 0ff3cf61ea2f7e061f4f53571a78a4ba986e41bb SHA1 d385b589433dc67f1b6e0dacb4f3921832a480b1 SHA256 ed7e12a2890268b9f29f309b1ec3ea557fe91a5d3334a91bd64eb1a0772ec2a3
 AUX cns_solve_env_sh 7070 RMD160 4104b22476a61a80c7adae8a363da1dd4ab4f136 SHA1 30ba978f4862fd94d9fa939cbb7c3eb55ece46cd SHA256 da571cba2a2244e571870b1783fd6cdce1b595e14234cfb43011e9e9eb50151c
-AUX cns_solve_env_sh-1.3 7332 RMD160 eee19d64dc863e434159994282a78d8d576adf62 SHA1 050de938d0c0b4d1e497b03ff196416e416a0da7 SHA256 88127d99380544e502dfe3b3a7788102a7f6b30e7245b26e5e204b8b611bbc1d
+AUX cns_solve_env_sh-1.3_p3 7332 RMD160 eee19d64dc863e434159994282a78d8d576adf62 SHA1 050de938d0c0b4d1e497b03ff196416e416a0da7 SHA256 88127d99380544e502dfe3b3a7788102a7f6b30e7245b26e5e204b8b611bbc1d
 DIST aria2.3.1.tar.gz 1833973 RMD160 f2ee0bfc7e3164b5c34c81abb74256c5d76f53d7 SHA1 b257094bdaf6ba5b64645b8251d9243654e6d0fc SHA256 cc45ed2d66182cf0ee197a7cf3bc7edd8d5043d95cdcd19e1cec9aeb82c2fdbc
 DIST cns_solve_1.1_basic_inputs.tar.gz 5049767 RMD160 eb5686a006d53cf269456eaecd7507842c8a10eb SHA1 255e7c5170168f9e032ef9e84a870eddf176f4ce SHA256 916d86d96159bd945a3b05e26c71af0cc6097234776385630f618fa2641cf3eb
 DIST cns_solve_1.1_data.tar.gz 18770504 RMD160 a18470f31fa6213e817dadf3c3c56231ebce9e63 SHA1 3eaae5ecd1df14412083af8a31a6e3f7b14c4753 SHA256 da59213013b845ca357decfc11337c7dfdb3134bd012c710291c66e8febdbb37
 DIST cns_solve_1.1_test.tar.gz 2852870 RMD160 2f7e7b5ed4e603b2459944a8991829d1361315b5 SHA1 c50587cf3fdfcb1266d13dbd689a9b8b094fb681 SHA256 c5d049596cca4f6985b0b4997f4fa62345d2c111b8fab534918829ade1899a23
 DIST cns_solve_1.21_all-mp.tar.gz 32748040 RMD160 0da9c1858e858474a8798149b7692b9e097adc9e SHA1 3ba32a6622b55dfff397b6844e8b8a594124a482 SHA256 7ab464e20932eb024ba6378738da77a4a03642d63b0ca9772b612a7cf27baec1
 DIST cns_solve_1.21_all.tar.gz 32739912 RMD160 ab763373923264497d1ccb507cab23b2e1af9826 SHA1 93059805e14f0482cf58755daecc52cf97863215 SHA256 a581c6a0e9e5ffd45f025520959921d7ba91bb5d1e6569f1c81e709bb6f87c81
-DIST cns_solve_1.3_all.tar.gz 61208156 RMD160 430e733e05166330b93977e48b72546c4ddabadd SHA1 b708e3006627642279ae571c31d6ec013adaa4c6 SHA256 de5c0be8ab924f5cbd57b1d651fcfea32a76766b7ff4af69556203191b4e40b6
+DIST cns_solve_1.3_all.tar.gz 61213314 RMD160 56905f3d94f584cace42247c5f68b214fb03a788 SHA1 32fee543da1be60f0be98b8895be237398dc5433 SHA256 4cc06d70b5a4c1904e094409986f763ba14c3c24a516c2fba052d931c6e9ecd9
 EBUILD cns-1.1.ebuild 3598 RMD160 c659528cda734552ca1faa9bc85c371b92d90d46 SHA1 e891a1be5f873e869bce5a6b617bbfd54a7aa71d SHA256 2be38322ddc333590c4d891f675921cabb0e18ef795042c1c4a849beb0793f6b
 EBUILD cns-1.2.1-r5.ebuild 6280 RMD160 47608f4f9fba02ef5aa7fbc258d9c063ed5ae7a4 SHA1 c1b6a3d6106e246e15d8e2f7abb7372b0ec83d72 SHA256 53613522b4be5fdec1d440684754fbee6940d9e32246047063747e4f2b2bed60
 EBUILD cns-1.2.1.ebuild 5400 RMD160 797c8483bda9853ca2f5311cc2ad4c8ad3b3a08d SHA1 7cc8f6366b6eb6759744a95ad56f4d65b32add02 SHA256 70b971e0f65d2cec08bb10e8f5d81a9c13b727c876b6b8fab0572239b8295078
-EBUILD cns-1.3.ebuild 5460 RMD160 1c5b2c82e2ff272a6c204c339ad8080bedf0134c SHA1 7e8c5b1007e2938c6275c1a713ff24a27b15aa4f SHA256 11df60057b73ed153d088729d4e9329767d6d4334568b16e62f5c9889c2ed630
-MISC ChangeLog 5250 RMD160 ef1efb879f800653ef5d54d4f2e9916364583ef6 SHA1 0b7a9b64fe820fd558edee9618e32a6665e8af47 SHA256 99717cfb76347463f0813a62620c3c22f4c5e9cd0ef92ba6aad960736717459b
+EBUILD cns-1.3_p3.ebuild 5469 RMD160 954363211423d4dd032a996f0beb3f78c8035acb SHA1 648c45affa73727be4ba47d669be018c5853cb96 SHA256 1dda77672c6bc8c4c4ee8bdaed4c6dc643dafb3f6068f9bfdc95f8d4083b5e6c
+MISC ChangeLog 5606 RMD160 9b47659e3937a6e69390d882d71bd978ff8a7cbe SHA1 a35e3079209f5a38e72a0b329235cd6ce8a63f32 SHA256 15ffd7cc965b7982d5417796829ecf4442ea38313a561ef144f3da5df162035e
 MISC metadata.xml 302 RMD160 d60d9cd875115eaba68ad4b504bff76b39a136b0 SHA1 ecdd8feeea2de489927403f1941acfc582c17222 SHA256 a374144760a8ac1f72b1c625c41f98cee3f74511c964133bda119da580664c50
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkzmO/kACgkQgAnW8HDreRYakQCfbWa6+cxihZmX+tZfNx8+NqVe
-6goAoKau9Nd2IcfPzkrCUWzYh+UD87cy
-=Y+WC
+iEYEARECAAYFAkzuZjQACgkQgAnW8HDreRZf8ACfYT/6RXR6REweaaNr2UWvl9QL
+EkIAn2Kxw7SYGlvmO+sHqJp6mxjfxa7F
+=OKSC
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/cns/cns-1.3.ebuild b/sci-chemistry/cns/cns-1.3_p3.ebuild
index 7d48fb918c20..4f32d74963d6 100644
--- a/sci-chemistry/cns/cns-1.3.ebuild
+++ b/sci-chemistry/cns/cns-1.3_p3.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/sci-chemistry/cns/cns-1.3.ebuild,v 1.3 2010/11/18 17:05:04 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/cns-1.3_p3.ebuild,v 1.1 2010/11/25 13:35:42 jlec Exp $
 
 EAPI="3"
 
@@ -12,7 +12,7 @@ MY_P="${MY_PN}_${MY_PV}"
 
 DESCRIPTION="Crystallography and NMR System"
 HOMEPAGE="http://cns.csb.yale.edu/"
-SRC_URI="${MY_P}_all.tar.gz
+SRC_URI="${MY_P/p3}_all.tar.gz
 	aria? ( aria2.3.1.tar.gz )"
 
 SLOT="0"
@@ -24,7 +24,7 @@ RDEPEND="app-shells/tcsh"
 DEPEND="${RDEPEND}"
 
 RESTRICT="fetch"
-S="${WORKDIR}/${MY_P}"
+S="${WORKDIR}/${MY_P/p3}"
 
 FORTRAN="gfortran ifc"
 
diff --git a/sci-chemistry/cns/files/1.3-delete.patch b/sci-chemistry/cns/files/1.3_p3-delete.patch
index cbddf4289158..cbddf4289158 100644
--- a/sci-chemistry/cns/files/1.3-delete.patch
+++ b/sci-chemistry/cns/files/1.3_p3-delete.patch
diff --git a/sci-chemistry/cns/files/1.3-gentoo.patch b/sci-chemistry/cns/files/1.3_p3-gentoo.patch
index 95961fe6ff0c..d33d21d21804 100644
--- a/sci-chemistry/cns/files/1.3-gentoo.patch
+++ b/sci-chemistry/cns/files/1.3_p3-gentoo.patch
@@ -62,15 +62,28 @@ index 0d0dd3e..dd4b680 100644
  
  # regenerate makefiles
 diff --git a/instlib/utils/Makefile b/instlib/utils/Makefile
-index 98de84f..2b0a9ce 100644
+index 98de84f..4f32b34 100644
 --- a/instlib/utils/Makefile
 +++ b/instlib/utils/Makefile
-@@ -28,7 +28,7 @@ utils:
- 	$(CC) -o $@ $(CCFLAGS) $(@).c $(CCLINK)
+@@ -22,17 +22,17 @@ utils:
+ 	make clean
+ 
+ .f:
+-	$(F77) -o $@ $(F77FLAGS) $(@).f $(F77LINK)
++	$(F77) $(LDFLAGS) -o $@ $(F77FLAGS) $(@).f $(F77LINK)
+ 
+ .c:
+-	$(CC) -o $@ $(CCFLAGS) $(@).c $(CCLINK)
++	$(CC) $(LDFLAGS) -o $@ $(CCFLAGS) $(@).c $(CCLINK)
  
  .cpp:
 -	$(CPP) -o $@ $(CCFLAGS) $(@).cpp $(CCLINK)
-+	$(CXX) -o $@ $(CXXFLAGS) $(@).cpp $(CCLINK)
++	$(CXX) $(LDFLAGS) -o $@ $(CXXFLAGS) $(@).cpp $(CCLINK)
  
  .l:
  	lex $(@).l
+-	$(CC) $(CCFLAGS) -o $@ lex.yy.c $(CCLINK) -l$(LEXLIB)
++	$(CC) $(LDFLAGS) $(CCFLAGS) -o $@ lex.yy.c $(CCLINK) -l$(LEXLIB)
+ 
+ relink:
+ 	@ cd $(CNS_INST)/utils; touch x; rm -f x `ls * | grep -v Makefile`
diff --git a/sci-chemistry/cns/files/cns_solve_env_sh-1.3 b/sci-chemistry/cns/files/cns_solve_env_sh-1.3_p3
index 12368f87b596..12368f87b596 100644
--- a/sci-chemistry/cns/files/cns_solve_env_sh-1.3
+++ b/sci-chemistry/cns/files/cns_solve_env_sh-1.3_p3