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

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xBD3A97A3

4 files changed, 73 insertions, 23 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/Manifest b/sci-mathematics/freemat/Manifest
index e772fceda16b..779a86834d4d 100644
--- a/sci-mathematics/freemat/Manifest
+++ b/sci-mathematics/freemat/Manifest
@@ -9,28 +9,29 @@ AUX freemat-4.1-local_libffi.patch 965 SHA256 3e510e296354abbbed6f01ea92f0969dfa
 AUX freemat-4.1-portaudio.patch 622 SHA256 7fb40c5727543e0420c7728ebb17c027bd29ea9ed776f529d3375512603d1703 SHA512 0c30695436d5d738e5f043fb3499701b2141cd92bdc8b74963a2a26f499de1bfd78e1e73e498cd9d85f064bdda2d9a8c32f044cf3305558cadb5374ba0aef86c WHIRLPOOL 38682fc5bda7b6e6a6f4968f3fffc4de9be52e35fcecb652d44a28d21d42dc6cdb8d427b801085220d9312556b3738efed909d623b325c2f6f294652769c8587
 AUX freemat-4.1-python3.patch 1109 SHA256 5de59c5eedaffa5c7d04eee21dc683f3a2ee29812799c0cc12b3739f646b1bba SHA512 fd01bb11d56c2b5e479d9d940d8efa3ce197156d8eb5b5fd2dc9fe1a5271c5a2f8a10582d2bdecbe6515ed3df62b9326e964db851c85a598c0da9c2e8b31f58e WHIRLPOOL 235a6c1aa428c794de4a3256cc72ee6ed8175a330175e890638a662610b03f564c9a5f29dccbde7bbc4ac32f17922ffcade67cdee6691e4ebd56b9e7569a7a15
 AUX freemat-4.1-use_llvm.patch 802 SHA256 3d8b56ee0983600f4ed152d343707f3cc49c411ac985392a948c8be3806944c0 SHA512 5a43337cdf0431e7e9d4d7267f4daa20984a1c3f01a7735bf3c9578aff03be79c336d294e9ac03220505734d56636eece2253fabd8fc182b05fd256c5c9093a6 WHIRLPOOL 9313ec9476ac53e5994ee09d3397e6cb034b48638d4b51943b68eb1438540e9278045ed274aea2101f4a19fe342bc3be2d5841e78a1ab357b05960af16798a6e
+AUX freemat-4.2-use_llvm.patch 1260 SHA256 8468175bcb199a034618ac5965f9d1acb8249cc6d20b69f40f23790d4c9511f4 SHA512 3ed58e601f494692ea7c630e06791d24ea1dcc31d44f9e6bedb54ba7e172c856cb3779e43cbfca6be3d1bcec9df53080711a2787259802ebafca3d8cd73cb518 WHIRLPOOL 7b7c9fa7728e011160e361134d9c728a05b5453a5a20b49a72ca734291b7ebc047916e4496d82e6f3bd8e87553f486977a514b326d03d7541f308333133ce28e
 DIST FreeMat-4.0-Source.tar.gz 38038903 SHA256 6df1707c1f9e08b34e15eca8fa58bf3cf0ec8c121f64f58ca1d34a6eafd1066b
-DIST FreeMat-4.1-Source.tar.gz 68297694 SHA256 84aaa20f0d67d8401f739c3ddcfd14e1b5b76dc5863e72dd02aa5fba2c2ce3f5
+DIST FreeMat-4.1-Source.tar.gz 68297694 SHA256 84aaa20f0d67d8401f739c3ddcfd14e1b5b76dc5863e72dd02aa5fba2c2ce3f5 SHA512 44e083dd30aa9d5c0e321831ec01c7cc77fc1bc78d72a4dce38e4db5310b519f14bbfc429e4aa86b9f2180eb11ceffd6f4edc9042d4e18ea4b0307efcdd69b37 WHIRLPOOL 28540dedf3f1649ff4c1d92293bd5fdabe060a8f80a5e30289c277be97e3a20b156c0caeaf2b306ae2a8d4f0c05b67466b29d457bfc0d17fcd5ebf3e57aba267
 DIST FreeMat-4.2-Source.tar.gz 106222549 SHA256 5f56dc18458da72fb8143d47faeb7a66fa104f8ac9160558e032f6d2d68c9ffb SHA512 85f56ab910358bac63bb50d9ef8fac51a486c32ffc246b47aea02fc6a629c36f0cd8d55feb755c4697530a87cf08fa8cc7b69ebde0f09535561014ea280b902a WHIRLPOOL 94b72375f451afd3da6bc756b9fa3e9a782edf8827a1b90f3d30723235df99c093ea7c4455b7d5cca1633f1d8d95302b237e0b389647ed242504626dd3f2c304
 EBUILD freemat-4.0.ebuild 1800 SHA256 508bad52d9d0c2effa15e7eea1c1105cb870e9f1d900cf92ac4efa0b598b4785 SHA512 f1ad48c79fc1f5dc35b0d288a6f021d6befa8489e756e087804c31f9ad56d41625f8aa461b34d1b244392ab4b411f83f9714109bcc38596a74e7a01ed8f95aee WHIRLPOOL 85a3f534fcd0d45f93760b0e2930c826ba8a87f24244cb3f0424077a2316e6acdf8c962f0ca96bfb14e324c91bfe9ceb41f48b4876dd5c9e80f4f8ed426f213e
 EBUILD freemat-4.1.ebuild 2241 SHA256 0caf4c11431c8206405e535e152cd64e314043ec515de1006953e42fc012b853 SHA512 1315874fbffb41869d7fc04b21d761bd5a3014252eb21bd74cac04159c88bfd5a7c3d1648b031cba853331e64767b9ce8aaf596ffa53a84c9fc5f69d55fc38a2 WHIRLPOOL f40f28cf0b1bfb7549e5794e9dfed42b7b401efcfc2f378abb8a280e94266a3d05a0c1f138463f347993223a4c5660095f83369effa097b53f8c28687e937357
-EBUILD freemat-4.2.ebuild 2029 SHA256 c432d2ed4df7fd3b8ee69069b86c5cc2a5a0cb7b5fc31c37f8c8b31ec52cea51 SHA512 883c59ef3c6bc837e2a94872a68ab4dda18b93862e1e688b3c05b6c3815307f6ed5514da6a8d63a10fcee21d3dbaccbf19747ad6221124c0b217aedd7a8b1f57 WHIRLPOOL 5f4b0f170684531318448fde9907c99d6a2c9324cd433585b6c0933f2f217ea07af83371ac55bfa58f49c62084c60c169de68aac7046aa83744f05d98c8eeeb8
-MISC ChangeLog 5550 SHA256 4ebc6683da5cf64383d0837d808a26e7369af72753a0f818fc8c673ae570cf76 SHA512 ad679e0039041f99a9ebbe3ab9e7c2060418ec3c2a9eda88ae2d44dbff5212bfd520e8df1f5ad473ff3869c4c0e41b9deffde45e9dd3add5b20d48f1bf24a419 WHIRLPOOL 70e1d6f93f2ce14a98da937e804c265b573d4bfed8c19cc7c6662c7f8abb532d7062da6788b5ee44578e36cb840615f531a26c26a700e205a8f93efaa2563606
+EBUILD freemat-4.2.ebuild 1994 SHA256 fa15c79a8e08c51b613aff89367b4971d9a206e4b5c85f89b5f96a612abfc104 SHA512 3629215354b1230f376d34b15c39d9a0dc81e28640ef8401ab8864a1efc0a37ee89352227aec81e2df1b2ae77dd262958c70b4f99cb38788dc4f5f39639c8986 WHIRLPOOL 43c4b2a37ece862abbe30d0769a098310daeef10e7fefa7be10947da526e342b20a5933d52fb872a65f8f7e82a30718fec535122afe252dc0429f66d0666f224
+MISC ChangeLog 5742 SHA256 a8d29b14bf228d386c0992772407a9d18fbc1fce10c91918a7a265f4bbaff105 SHA512 e9f069d91f1aba18a92388ddc41e1a9e938354b2481e5604a62fd0018d1a220125d75f588d4bdac34a730fce22334ee2a37c624a61cfde731445001d8fb6f5e7 WHIRLPOOL e12687847abbe48055cf391c1add207011936ad4eaeeef65c443019f21dc11c4852794e42a703fb76ec79da330600942ce54a27ff93d201778156f106de43727
 MISC metadata.xml 746 SHA256 72cb14ce59b41654af654b3ac7e09426626a7856eb12a7df9815559853dc633d SHA512 27fe56bb74dfc5240a9ebe8fd7d703b88bbbf863abbfa234fa044cd17c0f5e0c26297ca208922b2f54f10c77ceff97a1441c5238e26533d050806df939fb2924 WHIRLPOOL ce59823b3fea732f6c9fa27656c5c611e38daa2f5ad95904674da3e7f3940308dc8b697bbb66a7c3dbfa68e637b6b40657bd95fd95487d4ffb4246e28f84e991
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.1
 
-iQIcBAEBCAAGBQJUe7W7AAoJELhOzYlK7nn/EmQP/0BbMwLHQNX9kGom5hMnwmiq
-1onv3wmI8dsQBZjMWsfgT1Gx2fzpNzOWch7mTC0DjP/QhBzzuRcciIgzkRlOOFoD
-zKHLAgvCn6Db3pJL4Y9cnvQRScHJEPR5SkWKa1cBT6pIZdLq2bmfsVhPcWzAXVXH
-NemV7pXGx/lmF+dzxx8g3WHRtTsJefJWOxlqxYYgiMFuTy6hztlfRqCTCf3fmtFC
-jv5b++j/Tny+7fNauF1aucapQhE3IX6KxMAY/moQjJGVfukPiL47epT2soXP4PkU
-FzXw9gWxv3ZrTRHB+SAf9RP81WG+TUrRKENTOWsX6WgWV6R66VsfciulPKJORMEO
-rmTHTXIRTH8rDMkt7PIQL/pZm8L5fvgPGckMDOEMBFFEeKCOWKB7MkU7yidtqaKF
-1wiurW+N3M5UIwWNeYZhovz3S9BsVxPrP0vSDn1MwkHzmuse9ASwSSbUZYwuHNKZ
-mCZXyGUYMMZGtEQg5Al9EISjl+wQxouQWUAAf7cAXGr8GeYJK7TwJBE4P0b0UQpA
-utwpTw/G85TpJSNGhPbSx0Rbkt1OI/6IAYQBw6pxrHA07nZotwj7r8yuKAUOEQ1x
-3FgZBA6nTOZHVvnkhdIH74eDyIawv+x5PlTiqop1MY+3A9cuAgJE0NmoA9PkzkaD
-L4L3iyIxrKviVCDlyW2G
-=quJV
+iQIcBAEBCAAGBQJUg2+4AAoJELhOzYlK7nn/O0UP/RRld6aQeejliFMQDTGsAHyR
+CViXTUpyABmEeJ8ZU2YdyLYQA3Ac6GuyVlZrToCbVXjJatlt2/09WayvmxjoauXK
+lLiRPN294eLd+nNvad6dP5n1R+DtbUkEGt2o2ug6FwicGQlfSjWmZkdvCa+c6Yht
+t8fMFLKaG2BYAi56iOP0++jeZXFgzj/KycJxnWEgt6Gbt9S7OWDAUQgyd82RjA1m
+ZrtT18kejLZ2+QCCnzd3QYngcAu0AVDCi05lU7PhPPpM8L8aJIgGVdaEMZ2USvM5
+cp9KuAp7eQpOnHkyIoaBR0FGWdRkp37+jDqV1SSxqxKo2EfI/I3zii/RfNcbCsJ6
++WBzzv1q0tXOkxysJOikdDeqkaUiRxslrYWqz7HqswKFtVN/FoEcUQH1FfbyaYyS
+OPBg9ep9O6SFgOdURpMRT9+uGmjXGnU6gcReW5V3O6giiqbtrjZoBO5y2EtokILC
+izSvwoh7x9wGv052tzb80cAuYCIg+eANl45bRVA3mVI3erkSEAbsT0f3ZprPXmah
+MwxlPurghojir5pz3wfOnVSaNcTMjFntC9q75b7mQRPAb87fxKBxFDqm+KmTLKjh
+e3dvZJ60NiLhR0sj1JJTCz2h8jh3qAFBlg+3hxTilfCbGDpn1C0E3uwqHVw/M7wX
+KUo8tEVWsKtFx6dvWpHv
+=nDpe
 -----END PGP SIGNATURE-----
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 {} \;