3 files changed, 94 insertions, 0 deletions
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/files/xkaapi-3.0.3-flags.patch b/sci-libs/xkaapi/files/xkaapi-3.0.3-flags.patch
new file mode 100644
index 000000000000..0fdad94cb9b9
--- /dev/null
+++ b/sci-libs/xkaapi/files/xkaapi-3.0.3-flags.patch
@@ -0,0 +1,31 @@
+ 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=""
+@@ -428,6 +431,13 @@ AS_CASE([$enable_mode],
+     AM_CXXFLAGS="$AM_CXXFLAGS -O3 -DNDEBUG"
+     clean_default_flags=yes
+     AM_CONDITIONAL([KAAPI_USE_DEBUG], [test "$enable_mode" = truc ])
++  ], [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
++    AM_CONDITIONAL([KAAPI_USE_DEBUG], [test "$enable_mode" = gentoo ])
+   ], [dnl
+     AC_MSG_ERROR([Unknown compilation mode '$enable_mode'. Aborting.])
+   ])