New addition, written by me

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

5 files changed, 147 insertions, 0 deletions

diff --git a/sci-libs/xkaapi/ChangeLog b/sci-libs/xkaapi/ChangeLog
new file mode 100644
index 000000000000..73e92a5843d4
--- /dev/null
+++ b/sci-libs/xkaapi/ChangeLog
@@ -0,0 +1,9 @@
+# ChangeLog for sci-libs/xkaapi
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/xkaapi/ChangeLog,v 1.1 2014/01/28 12:47:39 jlec Exp $
+
+*xkaapi-2.1 (28 Jan 2014)
+
+  28 Jan 2014; Justin Lecher <jlec@gentoo.org> +files/xkaapi-2.1-ffi.patch,
+  +files/xkaapi-2.1-flags.patch, +metadata.xml, +xkaapi-2.1.ebuild:
+  New addition, written by me
diff --git a/sci-libs/xkaapi/files/xkaapi-2.1-ffi.patch b/sci-libs/xkaapi/files/xkaapi-2.1-ffi.patch
new file mode 100644
index 000000000000..485b6c21a969
--- /dev/null
+++ b/sci-libs/xkaapi/files/xkaapi-2.1-ffi.patch
@@ -0,0 +1,24 @@
+ configure.ac | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 2be95ec..13e876b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1034,12 +1034,12 @@ dnl -----------------------------------------------------------------------
+ 
+ dnl we need to always configure imported-soft/libffi in order to be able
+ dnl to run "make dist"
+-#if test x"$use_ffi" = xinternal; then
++if test x"$use_ffi" = xinternal; then
+   mkdir -p "imported-soft/libffi"
+   AC_CONFIG_SUBDIRS([imported-soft/libffi])
+-#else
+-#  AC_MSG_NOTICE([Not compiling embedded copy of libffi])
+-#fi
++else
++  AC_MSG_NOTICE([Not compiling embedded copy of libffi])
++fi
+ 
+ dnl -----------------------------------------------------------------------
+ dnl Dependencies between libs
diff --git a/sci-libs/xkaapi/files/xkaapi-2.1-flags.patch b/sci-libs/xkaapi/files/xkaapi-2.1-flags.patch
new file mode 100644
index 000000000000..a22cabf9e4dd
--- /dev/null
+++ b/sci-libs/xkaapi/files/xkaapi-2.1-flags.patch
@@ -0,0 +1,39 @@
+ configure.ac | 11 ++++++++++-
+ 1 file changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index c3364aa..2a734fe 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -82,6 +82,9 @@ AC_PROG_F77
+ dnl ----------------------------------------------------------------
+ dnl Disable default flag for compilation
+ dnl ----------------------------------------------------------------
++CPPFLAGS_gentoo="${CPPFLAGS}"
++CFLAGS_gentoo="${CFLAGS}"
++CXXFLAGS_gentoo="${CXXFLAGS}"
+ CPPFLAGS=""
+ CFLAGS=""
+ CXXFLAGS=""
+@@ -407,7 +410,7 @@ AC_ARG_ENABLE([mode],[AS_HELP_STRING([--enable-mode],
+ 		 [choose special compilation mode (debug, release)])],[],
+   [enable_mode=default]
+ )
+-clean_default_flags
++clean_default_flags=no
+ AS_CASE([$enable_mode],
+   [default], [dnl
+     AM_CPPFLAGS="$AM_CPPFLAGS"
+@@ -428,6 +431,12 @@ AS_CASE([$enable_mode],
+     AM_CFLAGS="$AM_CFLAGS -O3 -DNDEBUG"
+     AM_CXXFLAGS="$AM_CXXFLAGS -O3 -DNDEBUG"
+     clean_default_flags=yes
++  ], [gentoo], [dnl
++    AC_MSG_NOTICE([Using gentoo compile mode])
++    AM_CPPFLAGS="$AM_CPPFLAGS ${CPPFLAGS_gentoo}"
++    AM_CFLAGS="$AM_CFLAGS -DNDEBUG ${CFLAGS_gentoo}"
++    AM_CXXFLAGS="$AM_CXXFLAGS -DNDEBUG ${CXXFLAGS_gentoo}"
++    clean_default_flags=yes
+   ], [dnl
+     AC_MSG_ERROR([Unknown compilation mode '$enable_mode'. Aborting.])
+   ])
diff --git a/sci-libs/xkaapi/metadata.xml b/sci-libs/xkaapi/metadata.xml
new file mode 100644
index 000000000000..c635cb9c94ab
--- /dev/null
+++ b/sci-libs/xkaapi/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sci</herd>
+<maintainer>
+	<email>jlec@gentoo.org</email>
+</maintainer>
+<use>
+	<flag name="blas">Kaapi BLAS tasks for PLASMA</flag>
+	<flag name="gpu">Build library for gpu threading</flag>
+</use>
+</pkgmetadata>
diff --git a/sci-libs/xkaapi/xkaapi-2.1.ebuild b/sci-libs/xkaapi/xkaapi-2.1.ebuild
new file mode 100644
index 000000000000..2ac4d0a5acd7
--- /dev/null
+++ b/sci-libs/xkaapi/xkaapi-2.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/xkaapi/xkaapi-2.1.ebuild,v 1.1 2014/01/28 12:47:39 jlec Exp $
+
+EAPI=5
+
+FORTRAN_NEEDED=fortran
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils fortran-2
+
+UPSTREAM_NO=32735
+
+DESCRIPTION="Kernel for Adaptative, Asynchronous Parallel and Interactive programming"
+HOMEPAGE="http://kaapi.gforge.inria.fr"
+SRC_URI="https://gforge.inria.fr/frs/download.php/${UPSTREAM_NO}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="CeCILL-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="blas cxx fortran gpu openmp static-libs"
+
+RDEPEND="
+	sys-apps/hwloc
+	virtual/libffi
+"
+DEPEND="${RDEPEND}
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-flags.patch
+	"${FILESDIR}"/${P}-ffi.patch
+	)
+
+src_prepare() {
+	sed \
+		-e 's:-Werror::g' \
+		-i tests/testsuite* tests/*/*.am || die
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-mode=gentoo
+		--enable-api-kaapic
+		--enable-api-quark
+		--with-ccache=no
+		--enable-hwloc
+		--with-libffi="${EPREFIX}"/usr
+		--enable-target$(usex gpu gpu mt)
+		$(use_enable fortran api-kaapif)
+		$(use_enable cxx api-kaapixx)
+		$(use_enable blas kblas)
+		$(use_enable openmp libkomp)
+#		$(use_with plasma "${EPREFIX}"/usr)
+	)
+	autotools-utils_src_configure
+}
+
+src_test() {
+	cd "${BUILD_DIR}" || die
+	emake check
+}