sci-libs/shogun: Fix buildproblems with atlas detection, #507304; be multilib friendly, #531034; do not fetch gmock for tests, #528566

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

4 files changed, 64 insertions, 24 deletions

diff --git a/sci-libs/shogun/ChangeLog b/sci-libs/shogun/ChangeLog
index a8873c3dac67..2d7f3bb7e15a 100644
--- a/sci-libs/shogun/ChangeLog
+++ b/sci-libs/shogun/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/shogun
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/shogun/ChangeLog,v 1.8 2014/04/06 01:47:16 bicatali Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/shogun/ChangeLog,v 1.9 2015/01/25 17:41:02 jlec Exp $
+
+  25 Jan 2015; Justin Lecher <jlec@gentoo.org> shogun-3.2.0.ebuild,
+  +files/shogun-3.2.0-atlas.patch, metadata.xml:
+  Fix buildproblems with atlas detection, #507304; be multilib friendly,
+  #531034; do not fetch gmock for tests, #528566
 
 *shogun-3.2.0 (06 Apr 2014)
 
diff --git a/sci-libs/shogun/files/shogun-3.2.0-atlas.patch b/sci-libs/shogun/files/shogun-3.2.0-atlas.patch
new file mode 100644
index 000000000000..a4f5e1c77d77
--- /dev/null
+++ b/sci-libs/shogun/files/shogun-3.2.0-atlas.patch
@@ -0,0 +1,22 @@
+ cmake/FindAtlas.cmake | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/cmake/FindAtlas.cmake b/cmake/FindAtlas.cmake
+index 13f092d..8c2dd2f 100644
+--- a/cmake/FindAtlas.cmake
++++ b/cmake/FindAtlas.cmake
+@@ -20,10 +20,10 @@ if(ATLAS_LAPACK)
+   endif()
+   unset(CMAKE_REQUIRED_LIBRARIES CACHE)
+ else()
+-  find_file(ATLAS_LAPACK liblapack.so.3 PATHS /usr/lib/atlas /usr/lib64/atlas)
+-  find_library(ATLAS_LAPACK NAMES lapack)
+-  set(CMAKE_REQUIRED_LIBRARIES ${LAPACK_LIBRARIES} ${ATLAS_CBLAS})
+-  check_library_exists("${ATLAS_LAPACK}" clapack_dpotrf "" FOUND_CLAPACK)
++  # find_file(ATLAS_LAPACK liblapack.so.3 PATHS /usr/lib/atlas /usr/lib64/atlas)
++  # find_library(ATLAS_LAPACK NAMES lapack)
++  # set(CMAKE_REQUIRED_LIBRARIES ${LAPACK_LIBRARIES} ${ATLAS_CBLAS})
++  check_library_exists("${ATLAS_LIBRARIES}" clapack_dpotrf "" FOUND_CLAPACK)
+   if(NOT FOUND_CLAPACK)
+     unset(ATLAS_LAPACK CACHE)
+   endif()
diff --git a/sci-libs/shogun/metadata.xml b/sci-libs/shogun/metadata.xml
index 70e3e2616088..d0c30a0c09fb 100644
--- a/sci-libs/shogun/metadata.xml
+++ b/sci-libs/shogun/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<longdescription lang="en">
+  <herd>sci</herd>
+  <longdescription lang="en">
   SHOGUN - is a new machine learning toolbox with focus on large
   scale kernel methods and especially on Support Vector Machines
   (SVM) with focus to bioinformatics. It provides a generic SVM
@@ -21,17 +21,17 @@
   (e.g. substracting the mean) can be attached to each feature object
   allowing for on-the-fly pre-processing.
 </longdescription>
-<use>
-  <flag name="arpack">Enable support for <pkg>sci-libs/arpack</pkg></flag>
-  <flag name="eigen">Enable support for matrix package <pkg>dev-cpp/eigen</pkg></flag>
-  <flag name="glpk">Enable support for <pkg>sci-mathematics/glpk</pkg></flag>
-  <flag name="json">Enable support for parsing JSON format</flag>
-  <flag name="lpsolve">Enable support for Linear Programming Solver</flag>
-  <flag name="nlopt">Enable support non linear optimization from
+  <use>
+    <flag name="arpack">Enable support for <pkg>sci-libs/arpack</pkg></flag>
+    <flag name="eigen">Enable support for matrix package <pkg>dev-cpp/eigen</pkg></flag>
+    <flag name="glpk">Enable support for <pkg>sci-mathematics/glpk</pkg></flag>
+    <flag name="json">Enable support for parsing JSON format</flag>
+    <flag name="lpsolve">Enable support for Linear Programming Solver</flag>
+    <flag name="nlopt">Enable support non linear optimization from
   <pkg>sci-libs/nlopt</pkg></flag>
-  <flag name="R">Enable support for <pkg>dev-lang/R</pkg></flag>
-  <flag name="octave">Enable support for <pkg>sci-mathematics/octave</pkg></flag>
-  <flag name="snappy">Enable support for snappy compression</flag>
-  <flag name="superlu">Enable support for <pkg>sci-libs/superlu</pkg></flag>
-</use>
+    <flag name="R">Enable support for <pkg>dev-lang/R</pkg></flag>
+    <flag name="octave">Enable support for <pkg>sci-mathematics/octave</pkg></flag>
+    <flag name="snappy">Enable support for snappy compression</flag>
+    <flag name="superlu">Enable support for <pkg>sci-libs/superlu</pkg></flag>
+  </use>
 </pkgmetadata>
diff --git a/sci-libs/shogun/shogun-3.2.0.ebuild b/sci-libs/shogun/shogun-3.2.0.ebuild
index e7e0b4d95702..4bce5a8850a0 100644
--- a/sci-libs/shogun/shogun-3.2.0.ebuild
+++ b/sci-libs/shogun/shogun-3.2.0.ebuild
@@ -1,27 +1,32 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/shogun/shogun-3.2.0.ebuild,v 1.1 2014/04/06 01:47:16 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/shogun/shogun-3.2.0.ebuild,v 1.2 2015/01/25 17:41:02 jlec Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3} )
-inherit cmake-utils multilib versionator toolchain-funcs python-single-r1
+PYTHON_COMPAT=( python2_7 python{3,4} )
+
+inherit cmake-utils multilib python-single-r1 toolchain-funcs versionator
 
 MYPV=$(get_version_component_range 1-2)
 MYPD=${PN}-data-0.8
 
 DESCRIPTION="Large Scale Machine Learning Toolbox"
 HOMEPAGE="http://shogun-toolbox.org/"
-SRC_URI="ftp://shogun-toolbox.org/shogun/releases/${MYPV}/sources/${P}.tar.bz2
+SRC_URI="
+	ftp://shogun-toolbox.org/shogun/releases/${MYPV}/sources/${P}.tar.bz2
 	test? ( ftp://shogun-toolbox.org/shogun/data/${MYPD}.tar.bz2 )
 	examples? ( ftp://shogun-toolbox.org/shogun/data/${MYPD}.tar.bz2 )"
 
 LICENSE="GPL-3 free-noncomm"
 SLOT="0/16"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
 IUSE="doc examples lua mono octave python R ruby static-libs test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( python )
+	"
 
 RDEPEND="
 	app-arch/bzip2:=
@@ -62,13 +67,20 @@ DEPEND="${RDEPEND}
 	python? ( >=dev-lang/swig-2.0.4 test? ( sci-libs/scipy ) )
 	R? ( >=dev-lang/swig-2.0.4 )
 	ruby? ( >=dev-lang/swig-2.0.4 )
-	test? ( dev-python/jinja )"
+	test? (
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-cpp/gmock
+		)"
 
 # javamodular needs jblas (painful to package properly)
 # permodular work in progress (as 3.2.0)
 # could actually support multiple pythons, multiple rubys
 # feel free to do work for it
 
+PATCHES=(
+	"${FILESDIR}"/${P}-atlas.patch
+)
+
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
@@ -88,6 +100,7 @@ src_configure() {
 		-DENABLE_COVERAGE=OFF
 		-DJavaModular=OFF
 		-DPerlModular=OFF
+		-DLIB_INSTALL_DIR=$(get_libdir)
 		$(cmake-utils_use lua LuaModular)
 		$(cmake-utils_use mono CSharpModular)
 		$(cmake-utils_use octave OctaveModular)