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

(Portage version: 2.2.0_alpha5/cvs/Linux x86_64)

5 files changed, 29 insertions, 8 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/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