Fix python3 generation (bug #411699), add vtk flag to avoid automagic, prefix fixes for liffi and messages

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

5 files changed, 69 insertions, 21 deletions

diff --git a/sci-mathematics/freemat/ChangeLog b/sci-mathematics/freemat/ChangeLog
index fe6473d81072..e2c40cda99ac 100644
--- a/sci-mathematics/freemat/ChangeLog
+++ b/sci-mathematics/freemat/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-mathematics/freemat
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/freemat/ChangeLog,v 1.26 2012/04/05 20:43:03 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/freemat/ChangeLog,v 1.27 2012/04/12 23:38:41 bicatali Exp $
+
+  12 Apr 2012; Sébastien Fabbro <bicatali@gentoo.org> freemat-4.1.ebuild,
+  +files/freemat-4.1-python3.patch, metadata.xml:
+  Fix python3 generation (bug #411699), add vtk flag to avoid automagic, prefix
+  fixes for liffi and messages
 
 *freemat-4.1 (05 Apr 2012)
 
diff --git a/sci-mathematics/freemat/Manifest b/sci-mathematics/freemat/Manifest
index 67dbe00cc9f2..3fe5c1331626 100644
--- a/sci-mathematics/freemat/Manifest
+++ b/sci-mathematics/freemat/Manifest
@@ -1,13 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX freemat-4.0-gcc45.patch 8460 RMD160 aaf5d080e0ab9417538778e36f1da4caf2f32040 SHA1 966565ae170233f42056d0f59b48a7c3e4754b2f SHA256 bf5699f75995583e984a858a013e5566288332eebe5d9979a60d03c527ac1275
 AUX freemat-4.0-no_implicit_GLU.patch 311 RMD160 09c5326a87932b29f8d5180847ea9e0a218fb94c SHA1 545b60f5768b56dbed1fbc31b597f74429d31a56 SHA256 22bfbc1d08bd91475130f13969d6104ca3eaec9df8517f736a2417858429ab0b
 AUX freemat-4.1-fixes.patch 671 RMD160 bd653e33ed0294f609fea363aec55ffd8ac8b091 SHA1 d77ffeefca97901b8a1601cf4a52e9895e8547f2 SHA256 8ddf6f918f56a3f6ff87ff8b5bc8ba3ed34939c89ee76388422bed71abae76b8
 AUX freemat-4.1-have_fftw.patch 2668 RMD160 551d821d00a2fef174de04eca0712afdf5ab082d SHA1 f73642fc4904513d0da14b3622844cad5391acbe SHA256 67c444fc87cc2be0eed9d2fd890adfabb0ff076c0aa9d816a92fe8ae3c872b06
 AUX freemat-4.1-local_libffi.patch 965 RMD160 8efb53ef1eb1876a6352987dede5b5561068c7b5 SHA1 1879d336a597c5f2ed94c3d91e6d75071334f38e SHA256 3e510e296354abbbed6f01ea92f0969dfa920626aae1239bc9aa5b02cfaea7bf
 AUX freemat-4.1-portaudio.patch 622 RMD160 fff3619841f3e12b2347ee3194488d797f1a0b26 SHA1 988c23860aec22a75a6a0fa8478ffd9ec016628a SHA256 7fb40c5727543e0420c7728ebb17c027bd29ea9ed776f529d3375512603d1703
+AUX freemat-4.1-python3.patch 1109 RMD160 a060f5a25dd708a7942e69ab080c1fb4bece340b SHA1 13a0e030c89f9dbe88fdc7389b42d1554212f669 SHA256 5de59c5eedaffa5c7d04eee21dc683f3a2ee29812799c0cc12b3739f646b1bba
 AUX freemat-4.1-use_llvm.patch 802 RMD160 f2747491e3677f504590929f29d11f3dcbb2d997 SHA1 b2fc243c369fc242084a3ae1351f0e9ba51dfa64 SHA256 3d8b56ee0983600f4ed152d343707f3cc49c411ac985392a948c8be3806944c0
 DIST FreeMat-4.0-Source.tar.gz 38038903 RMD160 6978890a0e4b55bb4815bee9cc5c027b6da3c1e2 SHA1 4446af7f393bc33d7e6017f78cff4bf680c411a7 SHA256 6df1707c1f9e08b34e15eca8fa58bf3cf0ec8c121f64f58ca1d34a6eafd1066b
 DIST FreeMat-4.1-Source.tar.gz 68297694 RMD160 3962371b7daa96287a9986bff4c0427909c49533 SHA1 5f05427e3e16a480ff1b347d7adf3e2364d552bb SHA256 84aaa20f0d67d8401f739c3ddcfd14e1b5b76dc5863e72dd02aa5fba2c2ce3f5
 EBUILD freemat-4.0.ebuild 1811 RMD160 26059f264668d207e11b5755870da8a84ea8a647 SHA1 5aad08cbfb1698b1c29117c1e55e9c6ec21b89c1 SHA256 4ceb5c6ab1c438954b15717b57dd4b34e6dcd60173e7046ee8308e50df01e45d
-EBUILD freemat-4.1.ebuild 2054 RMD160 36b5bbb0cb7d78256426d6a3789adcb2c27dd062 SHA1 47f44869496c0e4db8a09247b663027b1142badd SHA256 df98b06190bfbdeec5ab270142e8659369fe7f7c3e7d0dc1b185981aa438cc2f
-MISC ChangeLog 4926 RMD160 dd756b866ef2bdc3c35f5f7dcd7b862d2f5e99e3 SHA1 071b1f42a5bf38bfcb7afb631bdde65814f29b00 SHA256 7c129e729e5827b44747e203bcbe002d7843dbbd2ea123bd13eed0d344c8d502
-MISC metadata.xml 673 RMD160 bfa5a2bbe6085df6594b36bb093be8d7eea57b3f SHA1 366bbbd05e8a834db690688fa7c3f703fa6576c5 SHA256 463ad7ed239a2128136f9dc1436d86ab06391e6a38987d8c807d2a44e6c84c30
+EBUILD freemat-4.1.ebuild 2251 RMD160 bedc3e7158fbbe989d3bf3f286d2fdb624afd4d2 SHA1 f851cb199b974c643ffd08bb2144585e6e101d23 SHA256 d7cc5fd7b5873593d94543eff080814a02378ab5e7f709c38b9e2dfa1f5cde52
+MISC ChangeLog 5165 RMD160 ccd6715d68a206c54b0ccb1214c3590adfe4bc3d SHA1 0ac0039854c2306e5fd6b6ab8da003efd5983a4a SHA256 fe1b322219f0fb453e83f72509b925612252b4ee27c59c408d35da72071158ed
+MISC metadata.xml 746 RMD160 f4177f70f009ad8ab53e74b7a9061366902a3787 SHA1 65883bb42b4d3ab5abc9dd7e549232930c020930 SHA256 72cb14ce59b41654af654b3ac7e09426626a7856eb12a7df9815559853dc633d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iEYEARECAAYFAk+HZ4kACgkQ1ycZbhPLE2CiCgCcC2dc5WzPpk213BZ3stvWM4/r
+eq4AmgKCUpI92dVk5vDhrn7evLDub3r0
+=Lz96
+-----END PGP SIGNATURE-----
diff --git a/sci-mathematics/freemat/files/freemat-4.1-python3.patch b/sci-mathematics/freemat/files/freemat-4.1-python3.patch
new file mode 100644
index 000000000000..a7aad97cfc7d
--- /dev/null
+++ b/sci-mathematics/freemat/files/freemat-4.1-python3.patch
@@ -0,0 +1,24 @@
+diff -Nur tools.orig/jitgen.py tools/jitgen.py
+--- tools.orig/jitgen.py	2012-04-13 00:25:18.000000000 +0100
++++ tools/jitgen.py	2012-04-13 00:25:40.000000000 +0100
+@@ -39,7 +39,7 @@
+ f.write("// \n\n// Here, each function gets prototyped.\n");
+ f.close()
+ 
+-os.path.walk(sys.argv[1], visit, '')
++os.walk(sys.argv[1], visit, '')
+ 
+ f = open(sys.argv[2],'a')
+ f.write("static const char* jit_scalar_list[] = {");
+diff -Nur tools.orig/siggen.py tools/siggen.py
+--- tools.orig/siggen.py	2012-04-13 00:25:18.000000000 +0100
++++ tools/siggen.py	2012-04-13 00:25:53.000000000 +0100
+@@ -81,7 +81,7 @@
+                 function_name = fsplit[1]
+                 function_internal_name = fsplit[2];
+                 if (function_name == '') or (function_internal_name == ''):
+-                    print 'MISSING Function Name: <%s> <%s> <%s>'%(fline,function_name,function_internal_name)
++                    print('MISSING Function Name: <%s> <%s> <%s>'%(fline,function_name,function_internal_name))
+                 inputs = iline.split()
+                 inputs = inputs[1:]
+                 outputs = oline.split()
diff --git a/sci-mathematics/freemat/freemat-4.1.ebuild b/sci-mathematics/freemat/freemat-4.1.ebuild
index 71c8bf1dd5a9..029913d5f3c1 100644
--- a/sci-mathematics/freemat/freemat-4.1.ebuild
+++ b/sci-mathematics/freemat/freemat-4.1.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/freemat/freemat-4.1.ebuild,v 1.1 2012/04/05 20:43:03 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/freemat/freemat-4.1.ebuild,v 1.2 2012/04/12 23:38:41 bicatali Exp $
 
-EAPI="4"
-inherit eutils cmake-utils fdo-mime
+EAPI=4
+inherit eutils cmake-utils fdo-mime python
 
+RESTRICT_PYTHON_ABIS="2.4 2.5"
 MY_PN=FreeMat
 MY_P=${MY_PN}-${PV}
 
@@ -12,7 +13,7 @@ DESCRIPTION="Environment for rapid engineering and scientific processing"
 HOMEPAGE="http://freemat.sourceforge.net/"
 SRC_URI="mirror://sourceforge/freemat/${MY_P}-Source.tar.gz"
 
-IUSE="volpack"
+IUSE="volpack vtk"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
@@ -24,15 +25,18 @@ RDEPEND="dev-libs/libpcre
 	sci-libs/matio
 	sci-libs/umfpack
 	sys-libs/ncurses
-	virtual/lapack
 	virtual/glu
+	virtual/lapack
+	virtual/libffi
 	virtual/opengl
 	x11-libs/qt-gui:4
 	x11-libs/qt-opengl:4
 	x11-libs/qt-svg:4
-	volpack? ( media-libs/volpack )"
+	volpack? ( media-libs/volpack )
+	vtk? ( sci-libs/vtk )"
 
 DEPEND="${RDEPEND}
+	dev-lang/python
 	dev-util/pkgconfig"
 
 S="${WORKDIR}/${MY_P}-Source"
@@ -43,22 +47,26 @@ src_prepare(){
 		"${FILESDIR}"/${P}-have_fftw.patch \
 		"${FILESDIR}"/${P}-local_libffi.patch \
 		"${FILESDIR}"/${P}-portaudio.patch \
-		"${FILESDIR}"/${P}-use_llvm.patch
-}
-
-src_configure() {
+		"${FILESDIR}"/${P}-use_llvm.patch \
+		"${FILESDIR}"/${P}-python3.patch
 	rm -f CMakeCache.txt
 	find . -type f -name '*.moc.cpp' -exec rm -f {} \;
 	find . -type f -name 'add.so' -exec rm -f {} \;
-	mycmakeargs="${mycmakeargs}
+}
+
+src_configure() {
+	mycmakeargs+=(
 		-DUSE_LLVM=OFF
+		-DUSE_ITK=OFF
 		-DFORCE_BUNDLED_PCRE=OFF
 		-DFORCE_BUNDLED_UMFPACK=OFF
 		-DFORCE_BUNDLED_PORTAUDIO=OFF
 		-DFORCE_BUNDLED_ZLIB=OFF
 		-DFORCE_BUNDLED_AMD=OFF
-		-DFFI_INCLUDE_DIR="$(echo /usr/$(get_libdir)/libffi-*/include)"
-		$(cmake-utils_use_with volpack VOLPACK)"
+		-DFFI_INCLUDE_DIR="$(pkg-config --cflags-only-I libffi | sed -e s/-I//)"
+		$(cmake-utils_use_with volpack VOLPACK)
+		$(cmake-utils_use_with vtk VTK)
+	)
 	cmake-utils_src_configure
 }
 
@@ -72,9 +80,9 @@ src_install() {
 pkg_postinst() {
 	fdo-mime_desktop_database_update
 	elog "Before using ${MY_PN}, do (as a normal user)"
-	elog "FreeMat -i /usr/share/${MY_P}"
+	elog "FreeMat -i ${EROOT}usr/share/${MY_P}"
 	elog "Then start ${MY_PN}, choose Tools -> Path Tool,"
-	elog "select /usr/share/${MY_P}/toolbox and Add With Subfolders"
+	elog "select ${EROOT}usr/share/${MY_P}/toolbox and Add With Subfolders"
 }
 
 pkg_postrm() {
diff --git a/sci-mathematics/freemat/metadata.xml b/sci-mathematics/freemat/metadata.xml
index 3a5318af5683..9ca12c9cbaeb 100644
--- a/sci-mathematics/freemat/metadata.xml
+++ b/sci-mathematics/freemat/metadata.xml
@@ -11,7 +11,7 @@
   and visualization capabilities.
 </longdescription>
 <use>
-  <flag name='volpack'>Add volume rendering
-  via <pkg>media-libs/volpack</pkg></flag> 
+  <flag name='volpack'>Add volume rendering via <pkg>media-libs/volpack</pkg></flag> 
+  <flag name='vtk'>Add 3D capabilities via <pkg>sci-libs/vtk</pkg></flag> 
 </use>
 </pkgmetadata>