Correct handling of OpenMp support

(Portage version: 2.2.0_alpha9/git/Linux x86_64, signed Manifest commit with key 70EB7916)

4 files changed, 16 insertions, 61 deletions

diff --git a/sci-chemistry/coot/ChangeLog b/sci-chemistry/coot/ChangeLog
index ddad523ec..86c863207 100644
--- a/sci-chemistry/coot/ChangeLog
+++ b/sci-chemistry/coot/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  17 Dec 2010; Justin Lecher <jlec@gentoo.org> files/9999-openmp.patch,
+  coot-9999.ebuild:
+  Correct handling of OpenMp support
+
   19 Nov 2010; Justin Lecher <jlec@gentoo.org> +files/9999-goocanvas.patch,
   coot-9999.ebuild:
   Better goocanvas detection
diff --git a/sci-chemistry/coot/Manifest b/sci-chemistry/coot/Manifest
index cd92e1e35..aaee3157f 100644
--- a/sci-chemistry/coot/Manifest
+++ b/sci-chemistry/coot/Manifest
@@ -3,19 +3,19 @@ Hash: SHA1
 
 AUX 9999-goocanvas.patch 1050 RMD160 3d87866b3ef15b42c8f92b839e338f357d8bb9e3 SHA1 3525db644d8c6fb6a99de5a61d33646284c9e5bd SHA256 02cad7059c877b9fc99f50dfa91eaacb83132dbc8c2530e0f46bb989d71be24b
 AUX 9999-include.patch 345 RMD160 6e42ce2afa7141f9cdcda0ca3ea5a11ef4f0f15f SHA1 3df3955307115ed8527f55fb49452905991c36cc SHA256 07b61fb298da857c5c37abb492cf192c65f9b538a3fc2d316aca7f4269e25a75
-AUX 9999-openmp.patch 1717 RMD160 ec23c16f75ed0ad5ca9e9477b1d5518bc51b0f91 SHA1 d61328176281acc4b29410282b72d32b2fda749b SHA256 8c8fba3038f9cc175bc4b48866c8c5efee15f721e98b855f645bc237ab644219
+AUX 9999-openmp.patch 397 RMD160 4cbfc6af2589718aa514efc59bb19f7f98a71640 SHA1 ed7157da29251054ffe89aea16eb2378676e0a9e SHA256 6dd87625db48e630450da8352f5ba7a52002129ed0576dc4ac1373dd1a387b28
 AUX 9999-rappermc.patch 477 RMD160 5d67f80be6e4bc303d7999cfa645ea36dbfc834a SHA1 4c2ff98125b6a4664f77e8b5f39f6a9a1ac72622 SHA256 83dd4ddda627baec52a0754117741d97e7b2c61e42813a314b258db93903d7c0
 AUX fix-namespace-error.patch 1081 RMD160 ebecd51b87c39dc2c37e565f18fc88b7aa837d05 SHA1 f732df5f4795e728bdf217aac9c9f53952e2890c SHA256 fd271dd22eec5725fcbd20c68b57008eed0f435d1e0ac212fbfd389a0a970beb
 AUX glib.m4 8444 RMD160 f3f4b2987796f16d17758f2af3459279351d6f2c SHA1 201eb58c2b3f3c5395dacd3913a4fb9d950d3276 SHA256 ada4a0a46bd00eda39afe77f675b721f60cd20c0080170848f4d7e92b4ba4dc8
 AUX gtk.m4 8516 RMD160 3860fe211902d5b9290f0a70e7d75ebec6b0ec67 SHA1 98b93b820423a52ebd80e3f1822a8f2bd4b3f15d SHA256 4eb6e0bb2c6863139d1fb4ca2d1d0f0ef07e3a85fdbb5ba98d03373f610f0c37
 DIST greg-data.tar.gz 8041681 RMD160 dc03bc233bed69fd6288a92a48b9a7e0bbf56129 SHA1 6e27bd0053758cf829a3ff8bd07b94c9e1ffb777 SHA256 46b9bb2dc9f5dfff463a5fe95e8e583e2a44760ae96fc0b8b5b4bd455e35862d
-EBUILD coot-9999.ebuild 3884 RMD160 e3d2791198b7ed5fd2743fc136ea1909c527d818 SHA1 e1249e7acf5821c92366ec3480c1446678b73948 SHA256 3d64396d5dff2dd1e294111ac46e64522ed5651a1ab009877960fdcfeb60c96a
-MISC ChangeLog 8532 RMD160 844cb35934aacc899b8893bbb5c64d53ceb9666f SHA1 c9941bebb822cb9e0a0789cb85e6cc2293118c5b SHA256 e1e0faea661b58f00ad74bd1e364abbcb7ac2b65b9696180c4a402873313e0a8
+EBUILD coot-9999.ebuild 3847 RMD160 303fa6064a7331d4ff39b98d38c8d2956ca644e3 SHA1 1a1049721f14bacb79623c20429c7978864fdb61 SHA256 eaf27586890b8742b382fde62c7885f0962e0340868b62b46999f6510bd1e220
+MISC ChangeLog 8662 RMD160 87b879c02dfdf9762c4f2643e8cbed4c9a66ae7d SHA1 28706061aa7523a275ee04937e948bacbe7a830b SHA256 e9803318f35df5070f4b8c4aa462c3f7f86034776553485c8849b0d18afd5fea
 MISC metadata.xml 306 RMD160 303613d4bb58ea149f418efc0d41f550ecbb94ca SHA1 1caeb2549f7f6a1dd44f2200784be8f2a7f294ab SHA256 f0ead885a2ede3186db2797473c72249fb525de661c279ca2ce7b8b152399bf6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkzmTqoACgkQgAnW8HDreRaGxwCffDu+s/laLw7nOfbbTNDSqWbA
-k04AnjsTFwA8xNsEgz88+r6F2jX3u5Ff
-=+bsR
+iEYEARECAAYFAk0LrGAACgkQgAnW8HDreRbhBgCeOeggv1+cchBDIiDg4KWzELXw
+k7gAoIcmQu/upoW+ATFMssKGUKo7cRTZ
+=/JwB
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/coot/coot-9999.ebuild b/sci-chemistry/coot/coot-9999.ebuild
index 9c9e22e2e..ab7bc0ee7 100644
--- a/sci-chemistry/coot/coot-9999.ebuild
+++ b/sci-chemistry/coot/coot-9999.ebuild
@@ -72,7 +72,6 @@ pkg_setup() {
 PATCHES=(
 	"${FILESDIR}"/${PV}-openmp.patch
 	"${FILESDIR}"/${PV}-include.patch
-	"${FILESDIR}"/${PV}-goocanvas.patch
 	)
 
 src_unpack() {
diff --git a/sci-chemistry/coot/files/9999-openmp.patch b/sci-chemistry/coot/files/9999-openmp.patch
index 03fc9a46b..3cc9501a8 100644
--- a/sci-chemistry/coot/files/9999-openmp.patch
+++ b/sci-chemistry/coot/files/9999-openmp.patch
@@ -1,61 +1,13 @@
-Index: configure.in
-===================================================================
---- configure.in	(revision 3219)
-+++ configure.in	(working copy)
-@@ -51,6 +51,21 @@
- 
- AC_OPENMP
- 
-+dnl Find OpenMP library
-+GOMP_LIBS=''
-+if test "$enable_openmp" != 'no'; then
-+  if test "${GCC}" = "yes"; then
-+    AC_CHECK_LIB(gomp,GOMP_parallel_start,GOMP_LIBS="-lgomp",,)  # gcc
-+  else
-+    AC_CHECK_LIB(mtsk,sunw_mp_register_warn,GOMP_LIBS="-lmtsk",,)  # solaris cc
-+    AC_CHECK_LIB(xlsmp,_xlsmpFlush,GOMP_LIBS="-lxlsmp",,)  # AIX xlc
-+    AC_CHECK_LIB(mp,mp_destroy,GOMP_LIBS="-lmp",,)  # SGI IRIX 6.5 MIPSpro C/C++
-+  fi
-+  LIBS="$GOMP_LIBS $LIBS"
-+fi
-+AC_SUBST(GOMP_LIBS)
-+
-+
- AC_LIB_PREPARE_MULTILIB
- 
- AC_SUBST(COOT_STDTYPES)
 Index: surface/Makefile.am
 ===================================================================
---- surface/Makefile.am	(revision 3219)
+--- surface/Makefile.am	(revision 3299)
 +++ surface/Makefile.am	(working copy)
-@@ -48,7 +48,7 @@
- 	CXXUtils.h \
- 	CXXSphereFlatTriangle.h
- 
--libccp4mg_surface_la_LIBADD = $(CLIPPER_LIBS) $(MMDB_LIBS)
-+libccp4mg_surface_la_LIBADD = $(CLIPPER_LIBS) $(MMDB_LIBS) $(GOMP_LIBS)
- 
- 
- # CXXAtom.h CXXAtom.cpp
-Index: src/Makefile.am
-===================================================================
---- src/Makefile.am	(revision 3219)
-+++ src/Makefile.am	(working copy)
-@@ -166,7 +166,7 @@
- 	$(GUILE_CFLAGS)		\
- 	$(PYTHON_CFLAGS)	\
- 	$(COOT_WINDOWS_CFLAGS) 	\
--	$(COOT_GSL_FLAGS) $(OPENMP_CFLAGS)
-+	$(COOT_GSL_FLAGS) $(OPENMP_CXXFLAGS)
+@@ -1,7 +1,7 @@
  
+ INCLUDES = -I$(top_srcdir)/coot-utils $(MMDB_CXXFLAGS) $(CLIPPER_CXXFLAGS) $(FFTW_CXXFLAGS)
  
+-AM_CPPFLAGS = $(OPENMP_CFLAGS)
++AM_CPPFLAGS = $(OPENMP_CXXFLAGS)
  
-@@ -414,7 +414,7 @@
- # coot_real_LDFLAGS = -static -lstdc++
- coot_real_LDFLAGS =
+ lib_LTLIBRARIES = libccp4mg-surface.la
  
--coot_real_LDADD =  $(OPENMP_CFLAGS)     \
-+coot_real_LDADD =  $(GOMP_LIBS)     \
-                 $(COOT_EXTRA_LIBS)      \
- 		$(GUILE_GTK_LIBS)       \
- 		$(GUILE_LDFLAGS)	\