Stop mixing CFLAGS and CXXFLAGS, stop using upstream flags, thanks dberkholz pointing this out

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

4 files changed, 44 insertions, 8 deletions

diff --git a/sci-chemistry/autodock_vina/ChangeLog b/sci-chemistry/autodock_vina/ChangeLog
index d406ca5ace75..f6d94a7937b6 100644
--- a/sci-chemistry/autodock_vina/ChangeLog
+++ b/sci-chemistry/autodock_vina/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-chemistry/autodock_vina
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/autodock_vina/ChangeLog,v 1.1 2010/05/18 11:43:46 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/autodock_vina/ChangeLog,v 1.2 2010/08/11 16:46:14 jlec Exp $
+
+*autodock_vina-1.1.1-r1 (11 Aug 2010)
+
+  11 Aug 2010; Justin Lecher <jlec@gentoo.org> files/1.1.1-gentoo.patch,
+  -autodock_vina-1.1.1.ebuild, +autodock_vina-1.1.1-r1.ebuild:
+  Stop mixing CFLAGS and CXXFLAGS, stop using upstream flags, thanks
+  dberkholz pointing this out
 
 *autodock_vina-1.1.1 (18 May 2010)
 
diff --git a/sci-chemistry/autodock_vina/Manifest b/sci-chemistry/autodock_vina/Manifest
index bfc045d8170c..68632fada810 100644
--- a/sci-chemistry/autodock_vina/Manifest
+++ b/sci-chemistry/autodock_vina/Manifest
@@ -1,5 +1,15 @@
-AUX 1.1.1-gentoo.patch 1786 RMD160 3f42d18738654b75771a7737a53285e2df3d9641 SHA1 66ac15f2cec62e6298da9bfd40dcb6fedea5a193 SHA256 90f5786e8fca88b2c9ed1a7eeef58ef0c670fa154681a9b4af0b70a65f07aa94
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 1.1.1-gentoo.patch 2377 RMD160 ba9aad38e4e64de9e7c2040593daaadee9b7052c SHA1 785f42d6d6d86bad025fc7a820f14dab49132aeb SHA256 3d6b388b831d1a2eab9025c7881a0bac9b71a8e1a5abbad7a05d4ba4c0fbc6ea
 DIST autodock_vina_1_1_1.tgz 66972 RMD160 3e65dd8e38f9f726c9200057fc37e0fcafe7d460 SHA1 620b2f5713b7ad2f13cc90ddb837dfd9fd2b4875 SHA256 f9aaf6b2a322775e1be30f22fb69573418610300c0ab2b9345fd6accc1c1b9fd
-EBUILD autodock_vina-1.1.1.ebuild 970 RMD160 1f5e190edd4b2e7107a6b758c2aead20541108fd SHA1 4e43155469a5081aba0098d222d1f62be68c99f0 SHA256 577ec3f4d6047f4f44148a1c903d42cf80d69870e1ffe5cda2898c5c63005f21
-MISC ChangeLog 401 RMD160 cb3aeb98dce238aa343473b6e57ac986fb1e694c SHA1 8eb972f05a878d492a87e961786a23d5d4db7aea SHA256 291e40d3124d1db92ed0e165221edfe4ddad8228193c3da5688c3ea6c05f5892
+EBUILD autodock_vina-1.1.1-r1.ebuild 973 RMD160 2f8748d6f230dd57c0c7129e8006b50cfd5a98d2 SHA1 0ef2714d9c2d6a85489b77caaedd34ec246a18cc SHA256 612801b589c774eac82eeb745a21977abf25f441c940d24814adf1a4be477ac1
+MISC ChangeLog 676 RMD160 c187a08dbdca0d2c7ea632c39e7c0db91c579748 SHA1 99f91fbcb62fc23925cecb096dcef4210a77865a SHA256 775f00d6de691960d35da0bbaf3d4d7282a2fcb62af6cfc0672982032dee1563
 MISC metadata.xml 1185 RMD160 bcd92b227b83161c855b38524f9416bfeb95e428 SHA1 00b02d67f1971261710d2dffea4048cd1e1bb997 SHA256 cd897855c248d4844803928178f91fada942f9c66060c74fb0766a157f96e08c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkxi09sACgkQgAnW8HDreRZYawCfWi1Jp8IYpkgj8YbVrJsYJgkm
+02AAn1Bp37XgPHmL14b5g7EYy6AQHdTK
+=lCj6
+-----END PGP SIGNATURE-----
diff --git a/sci-chemistry/autodock_vina/autodock_vina-1.1.1.ebuild b/sci-chemistry/autodock_vina/autodock_vina-1.1.1-r1.ebuild
index dfc1fa98263c..eb1a848790f4 100644
--- a/sci-chemistry/autodock_vina/autodock_vina-1.1.1.ebuild
+++ b/sci-chemistry/autodock_vina/autodock_vina-1.1.1-r1.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/autodock_vina/autodock_vina-1.1.1.ebuild,v 1.1 2010/05/18 11:43:46 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/autodock_vina/autodock_vina-1.1.1-r1.ebuild,v 1.1 2010/08/11 16:46:14 jlec Exp $
 
 EAPI="3"
 
diff --git a/sci-chemistry/autodock_vina/files/1.1.1-gentoo.patch b/sci-chemistry/autodock_vina/files/1.1.1-gentoo.patch
index 5b24b4cbc488..356ae2ee547d 100644
--- a/sci-chemistry/autodock_vina/files/1.1.1-gentoo.patch
+++ b/sci-chemistry/autodock_vina/files/1.1.1-gentoo.patch
@@ -23,10 +23,10 @@ index bfbcc1e..c9fd630 100644
  C_OPTIONS= -O3 -DNDEBUG
  BOOST_LIB_VERSION=
 diff --git a/build/makefile_common b/build/makefile_common
-index 885935c..4d5eb0f 100644
+index 885935c..e72142d 100644
 --- a/build/makefile_common
 +++ b/build/makefile_common
-@@ -1,16 +1,16 @@
+@@ -1,30 +1,30 @@
 -BOOST_INCLUDE = $(BASE)/include/boost-${BOOST_VERSION}
 +BOOST_INCLUDE = $(BASE)/include/boost
  
@@ -37,7 +37,8 @@ index 885935c..4d5eb0f 100644
 -INCFLAGS = -I $(BOOST_INCLUDE)
 +INCFLAGS = -I$(BOOST_INCLUDE)
  
- CC = ${GPP} ${C_PLATFORM} -ansi -pedantic -Wno-long-long ${C_OPTIONS} $(INCFLAGS)
+-CC = ${GPP} ${C_PLATFORM} -ansi -pedantic -Wno-long-long ${C_OPTIONS} $(INCFLAGS)
++CC = ${GPP} ${C_PLATFORM} ${C_OPTIONS} $(INCFLAGS)
  
 -LDFLAGS = -L$(BASE)/lib -L.
 +LDFLAGS += -L.
@@ -47,3 +48,21 @@ index 885935c..4d5eb0f 100644
  
  .SUFFIXES: .cpp .o
  
+ %.o : ../../../src/lib/%.cpp 
+-	$(CC) $(CFLAGS) -o $@ -c $< 
++	$(CC) $(CXXFLAGS) -o $@ -c $< 
+ 
+ %.o : ../../../src/design/%.cpp 
+-	$(CC) $(CFLAGS) -I ../../../src/lib -o $@ -c $< 
++	$(CC) $(CXXFLAGS) -I ../../../src/lib -o $@ -c $< 
+ 	
+ %.o : ../../../src/main/%.cpp 
+-	$(CC) $(CFLAGS) -I ../../../src/lib -o $@ -c $< 
++	$(CC) $(CXXFLAGS) -I ../../../src/lib -o $@ -c $< 
+ 
+ %.o : ../../../src/split/%.cpp 
+-	$(CC) $(CFLAGS) -I ../../../src/lib -o $@ -c $< 
++	$(CC) $(CXXFLAGS) -I ../../../src/lib -o $@ -c $< 
+ 
+ all: vina vina_split
+