drop python-r1 eclass; fix dependencies; fix llvm configuration wrt bug #531316

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

3 files changed, 56 insertions, 7 deletions

diff --git a/sci-mathematics/freemat/ChangeLog b/sci-mathematics/freemat/ChangeLog
index bca77f3fcff1..038f4130f647 100644
--- a/sci-mathematics/freemat/ChangeLog
+++ b/sci-mathematics/freemat/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-mathematics/freemat
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/freemat/ChangeLog,v 1.30 2014/12/01 00:26:34 tamiko Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/freemat/ChangeLog,v 1.31 2014/12/06 21:05:59 tamiko Exp $
+
+  06 Dec 2014; Matthias Maier <tamiko@gentoo.org>
+  +files/freemat-4.2-use_llvm.patch, freemat-4.2.ebuild:
+  drop python-r1 eclass; fix dependencies; fix llvm configuration wrt bug
+  #531316
 
 *freemat-4.2 (01 Dec 2014)
 
diff --git a/sci-mathematics/freemat/files/freemat-4.2-use_llvm.patch b/sci-mathematics/freemat/files/freemat-4.2-use_llvm.patch
new file mode 100644
index 000000000000..c29b8694ddb7
--- /dev/null
+++ b/sci-mathematics/freemat/files/freemat-4.2-use_llvm.patch
@@ -0,0 +1,45 @@
+--- libs/libMatC/CMakeLists.txt.orig	2011-11-27 01:27:43.000000000 +0100
++++ libs/libMatC/CMakeLists.txt		2012-01-29 14:39:19.842402326 +0100
+@@ -1,10 +1,14 @@
+ 
+ INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} ${QT_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR} )
+ 
++IF( USE_LLVM )
++  set(LLVM_SOURCES "CJitFuncClang.cpp")
++endif( USE_LLVM )
++
+ ADD_LIBRARY( MatC 
+ 	JITFactory.cpp
+ 	CJitFunc.cpp
+-	CJitFuncClang.cpp
++	${LLVM_SOURCES}
+ 	CArray.cpp
+ )
+ 
+--- libs/libMatC.orig/JITFactory.cpp	2011-11-27 01:27:43.000000000 +0100
++++ libs/libMatC/JITFactory.cpp		2012-01-29 14:53:17.296686846 +0100
+@@ -1,5 +1,7 @@
+ #include "JITFactory.hpp"
+-#include "CJitFuncClang.hpp"
++#ifdef HAVE_LLVM
++# include "CJitFuncClang.hpp"
++#endif
+ 
+ JITFuncBase* JITFactory::GetJITFunc(Interpreter *eval)
+ {
+--- CMakeLists.txt	2014-12-06 21:47:39.685839650 +0100
++++ CMakeLists.txt	2014-12-06 21:48:01.752127927 +0100
+@@ -249,9 +249,10 @@
+ # LLVM Support

+ ######################################################################

+ OPTION(USE_LLVM "Build with LLVM support?" ON)

+-

+-FIND_PACKAGE(LLVM)

+-FIND_PACKAGE(CLANG)

++IF(USE_LLVM)

++  FIND_PACKAGE(LLVM)

++  FIND_PACKAGE(CLANG)

++ENDIF()

+ 

+ IF (LLVM_FOUND AND CLANG_FOUND)

+   add_definitions(-DHAVE_LLVM)

diff --git a/sci-mathematics/freemat/freemat-4.2.ebuild b/sci-mathematics/freemat/freemat-4.2.ebuild
index 00a825088007..a229c3ae267a 100644
--- a/sci-mathematics/freemat/freemat-4.2.ebuild
+++ b/sci-mathematics/freemat/freemat-4.2.ebuild
@@ -1,12 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/freemat/freemat-4.2.ebuild,v 1.1 2014/12/01 00:26:34 tamiko Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/freemat/freemat-4.2.ebuild,v 1.2 2014/12/06 21:05:59 tamiko Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_{3,4}} )
-
-inherit eutils cmake-utils fdo-mime python-r1
+inherit eutils cmake-utils fdo-mime
 
 MY_PN=FreeMat
 MY_P=${MY_PN}-${PV}
@@ -34,6 +32,7 @@ RDEPEND="dev-libs/libpcre
 	dev-qt/qtgui:4
 	dev-qt/qtopengl:4
 	dev-qt/qtsvg:4
+	dev-qt/qtwebkit:4
 	volpack? ( media-libs/volpack )
 	vtk? ( sci-libs/vtk )"
 
@@ -46,8 +45,8 @@ S="${WORKDIR}/${MY_P}-Source"
 src_prepare(){
 	epatch \
 		"${FILESDIR}"/${PN}-4.1-fixes.patch \
-		"${FILESDIR}"/${PN}-4.1-use_llvm.patch \
-		"${FILESDIR}"/${PN}-4.1-python3.patch
+		"${FILESDIR}"/${PN}-4.1-python3.patch \
+		"${FILESDIR}"/${P}-use_llvm.patch
 	rm -f CMakeCache.txt
 	find . -type f -name '*.moc.cpp' -exec rm -f {} \;
 	find . -type f -name 'add.so' -exec rm -f {} \;