Treated a small problem with CUDA in sci-physics/abinit, corrected its dependency on sci-libs/libxs versions.

Package-Manager: portage-2.2.14

5 files changed, 70 insertions, 4 deletions

diff --git a/sci-physics/abinit/ChangeLog b/sci-physics/abinit/ChangeLog
index 656fde67e..a2b5e94b6 100644
--- a/sci-physics/abinit/ChangeLog
+++ b/sci-physics/abinit/ChangeLog
@@ -2,6 +2,15 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*abinit-7.6.4-r1 (10 Dec 2014)
+*abinit-7.4.2-r1 (10 Dec 2014)
+
+  10 Dec 2014; Honza Macháček <Hloupy.Honza@centrum.cz> -abinit-7.4.2.ebuild,
+  +abinit-7.4.2-r1.ebuild, -abinit-7.6.4.ebuild, +abinit-7.6.4-r1.ebuild,
+  +files/7.6.4-cuda_header.patch, +files/7.6.4-libxc_versions.patch:
+  Treated a small problem with CUDA in sci-physics/abinit, corrected its
+  dependency on sci-libs/libxs versions.
+
   17 Sep 2014; Christoph Junghans <ottxor@gentoo.org> metadata.xml:
   updated metadata.xml
 
diff --git a/sci-physics/abinit/abinit-7.4.2.ebuild b/sci-physics/abinit/abinit-7.4.2-r1.ebuild
index 67f324986..b8aa19b34 100644
--- a/sci-physics/abinit/abinit-7.4.2.ebuild
+++ b/sci-physics/abinit/abinit-7.4.2-r1.ebuild
@@ -34,7 +34,8 @@ RDEPEND="virtual/blas
 	gsl? ( sci-libs/gsl )
 	hdf5? ( sci-libs/hdf5[fortran] )
 	levmar? ( sci-libs/levmar )
-	libxc? ( >=sci-libs/libxc-2.0.1[fortran] )
+	libxc? ( >=sci-libs/libxc-2.0[fortran]
+			<sci-libs/libxc-2.2 )
 	netcdf? (
 		sci-libs/netcdf[hdf5?]
 		|| (
@@ -180,7 +181,9 @@ src_prepare() {
 		"${FILESDIR}"/6.12.1-xmalloc.patch \
 		"${FILESDIR}"/7.4.2-levmar_diag_scaling.patch \
 		"${FILESDIR}"/7.4.2-syntax.patch \
-		"${FILESDIR}"/7.4.2-cuda_link_stdc++.patch
+		"${FILESDIR}"/7.4.2-cuda_link_stdc++.patch \
+		"${FILESDIR}"/7.6.4-cuda_header.patch \
+		"${FILESDIR}"/7.6.4-libxc_versions.patch
 	eautoreconf
 	sed -e"s/\(grep '\^-\)\(\[LloW\]\)'/\1\\\(\2\\\|pthread\\\)'/g" -i configure
 	use test && python_fix_shebang "${S}"/tests
diff --git a/sci-physics/abinit/abinit-7.6.4.ebuild b/sci-physics/abinit/abinit-7.6.4-r1.ebuild
index 6947f110c..708b2de58 100644
--- a/sci-physics/abinit/abinit-7.6.4.ebuild
+++ b/sci-physics/abinit/abinit-7.6.4-r1.ebuild
@@ -44,7 +44,8 @@ RDEPEND="virtual/blas
 	gsl? ( sci-libs/gsl )
 	hdf5? ( sci-libs/hdf5[fortran] )
 	levmar? ( sci-libs/levmar )
-	libxc? ( =sci-libs/libxc-2.0*[fortran] )
+	libxc? ( >=sci-libs/libxc-2.0[fortran]
+			<sci-libs/libxc-2.2 )
 	netcdf? (
 		sci-libs/netcdf[hdf5?]
 		|| (
@@ -196,7 +197,9 @@ src_prepare() {
 		"${FILESDIR}"/7.6.3-libabinit_options.patch \
 		"${FILESDIR}"/7.4.2-levmar_diag_scaling.patch \
 		"${FILESDIR}"/7.4.2-syntax.patch \
-		"${FILESDIR}"/7.4.2-cuda_link_stdc++.patch
+		"${FILESDIR}"/7.4.2-cuda_link_stdc++.patch \
+		"${FILESDIR}"/7.6.4-cuda_header.patch \
+		"${FILESDIR}"/7.6.4-libxc_versions.patch
 	eautoreconf
 	sed -e"s/\(grep '\^-\)\(\[LloW\]\)'/\1\\\(\2\\\|pthread\\\)'/g" -i configure
 	python_fix_shebang "${S}"
diff --git a/sci-physics/abinit/files/7.6.4-cuda_header.patch b/sci-physics/abinit/files/7.6.4-cuda_header.patch
new file mode 100644
index 000000000..cc7481686
--- /dev/null
+++ b/sci-physics/abinit/files/7.6.4-cuda_header.patch
@@ -0,0 +1,11 @@
+diff -Naurp abinit-7.6.4.orig/src/incs/cuda_header.h abinit-7.6.4/src/incs/cuda_header.h
+--- abinit-7.6.4.orig/src/incs/cuda_header.h	2014-05-03 14:18:46.000000000 +0000
++++ abinit-7.6.4/src/incs/cuda_header.h	2014-12-04 13:21:36.000000000 +0000
+@@ -17,6 +17,7 @@
+ //#include <cutil.h>
+ #include <stdlib.h>
+ #include <unistd.h>
++#include <stdio.h>
+ #include <cufft.h>
+ #include <cuda_runtime.h>
+ #include <cuda.h>
diff --git a/sci-physics/abinit/files/7.6.4-libxc_versions.patch b/sci-physics/abinit/files/7.6.4-libxc_versions.patch
new file mode 100644
index 000000000..4f45db7b4
--- /dev/null
+++ b/sci-physics/abinit/files/7.6.4-libxc_versions.patch
@@ -0,0 +1,40 @@
+diff -Naurp abinit-7.6.4.orig/config/m4/conn-dft.m4 abinit-7.6.4/config/m4/conn-dft.m4
+--- abinit-7.6.4.orig/config/m4/conn-dft.m4	2014-05-03 14:18:46.000000000 +0000
++++ abinit-7.6.4/config/m4/conn-dft.m4	2014-12-10 14:08:19.786380878 +0000
+@@ -135,7 +135,7 @@ AC_DEFUN([_ABI_DFT_CHECK_BIGDFT],[
+ 
+ 
+ 
+-# _ABI_DFT_CHECK_LIBXC(API_MAJOR, API_MINOR)
++# _ABI_DFT_CHECK_LIBXC(API_MIN_MAJOR, API_MIN_MINOR, API_MAX_MAJOR, API_MAX_MINOR)
+ # ------------------------------------------
+ #
+ # Check whether the LibXC library is working.
+@@ -203,7 +203,7 @@ AC_DEFUN([_ABI_DFT_CHECK_LIBXC],[
+   dnl Check that we have the correct LibXC version
+   if test "${abi_dft_libxc_has_incs}" = "yes" -a \
+           "${abi_dft_libxc_has_libs}" = "yes"; then
+-    AC_MSG_CHECKING([whether this is LibXC version $1.$2])
++    AC_MSG_CHECKING([whether this is LibXC version from $1.$2 to $3.$4])
+     AC_LANG_PUSH([C])
+     AC_RUN_IFELSE([AC_LANG_PROGRAM(
+       [[
+@@ -212,7 +212,8 @@ AC_DEFUN([_ABI_DFT_CHECK_LIBXC],[
+       [[
+         int major = -1, minor = -1;
+         xc_version(&major, &minor);
+-        if ( (major != $1) || (minor != $2) ) {
++        if ( (major < $1) || (major == $1) && (minor < $2) ||
++		(major == $3) && (minor > $4) || (major > $3) ) {
+           return 1; }
+       ]])], [abi_dft_libxc_version="yes"], [abi_dft_libxc_version="no"])
+     AC_LANG_POP([C])
+@@ -518,7 +519,7 @@ AC_DEFUN([ABI_CONNECT_DFT],[
+           ;;
+ 
+         libxc)
+-          _ABI_DFT_CHECK_LIBXC(2,0)
++          _ABI_DFT_CHECK_LIBXC(2,0,2,1)
+           if test "${abi_dft_libxc_serial}" = "yes" -o \
+                   "${enable_fallbacks}" = "yes"; then
+             AC_DEFINE([HAVE_DFT_LIBXC],1,