From 34fe596b4f4e3aad7d8611cdf348f03f2edbf1fd Mon Sep 17 00:00:00 2001
From: miqlas <5569059+extrowerk@users.noreply.github.com>
Date: Tue, 26 Dec 2017 20:20:53 +0100
Subject: [PATCH] MLPACK: fix PC file (#1941)

---
 sci-libs/mlpack/mlpack-2.2.5.recipe           |  2 +-
 sci-libs/mlpack/patches/mlpack-2.2.5.patchset | 27 ++++++++++++++++++-
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/sci-libs/mlpack/mlpack-2.2.5.recipe b/sci-libs/mlpack/mlpack-2.2.5.recipe
index 9b4c1bedf..590c47543 100644
--- a/sci-libs/mlpack/mlpack-2.2.5.recipe
+++ b/sci-libs/mlpack/mlpack-2.2.5.recipe
@@ -6,7 +6,7 @@ knife\" for machine learning researchers."
 HOMEPAGE="http://www.mlpack.org/"
 COPYRIGHT="2011-2017 mlpack Team"
 LICENSE="BSD (3-clause)"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://github.com/mlpack/mlpack/archive/mlpack-$portVersion.tar.gz"
 CHECKSUM_SHA256="6bba8b28a50dc3b8afacd357aca57a658cf5b8d90a57d38f357d7e2eafcf09bb"
 SOURCE_DIR="mlpack-mlpack-$portVersion"
diff --git a/sci-libs/mlpack/patches/mlpack-2.2.5.patchset b/sci-libs/mlpack/patches/mlpack-2.2.5.patchset
index 515a4a4f1..c5ecc35ce 100644
--- a/sci-libs/mlpack/patches/mlpack-2.2.5.patchset
+++ b/sci-libs/mlpack/patches/mlpack-2.2.5.patchset
@@ -1,4 +1,4 @@
-From 371ded568630d4a1633585d310511fd2ee8a5236 Mon Sep 17 00:00:00 2001
+From f01e1bbc58fc3cc5296683d99c1f0694e2a98b91 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
 Date: Tue, 12 Dec 2017 10:28:32 +0100
 Subject: Haiku got no -lrt
@@ -20,3 +20,28 @@ index ae70f2d..7ce146e 100644
 -- 
 2.15.0
 
+
+From 63633d4a75303673cf11cb71f182540817d4989a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
+Date: Sat, 23 Dec 2017 22:38:05 +0100
+Subject: PC file fix. (already upstreamed)
+
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7ce146e..2d11b73 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -509,8 +509,8 @@ if (PKG_CONFIG_FOUND)
+   foreach (incldir ${MLPACK_INCLUDE_DIRS})
+     # Filter out some obviously unnecessary directories.
+     if (NOT "${incldir}" STREQUAL "/usr/include")
+-      set(MLPACK_INCLUDE_DIRS_STRING "${MLPACK_INCLUDE_DIRS_STRING}
+-          -I${incldir}")
++      set(MLPACK_INCLUDE_DIRS_STRING 
++          "${MLPACK_INCLUDE_DIRS_STRING} -I${incldir}")
+     endif ()
+   endforeach ()
+   # Add the install directory too.
+-- 
+2.15.0
+