Added a small fix for java compilation on amd64 as detailed in bug #123178. Also enabled compilation of vtk against either QT3 or QT4.

(Portage version: 2.1_pre6-r6)

4 files changed, 62 insertions, 12 deletions

diff --git a/sci-libs/vtk/ChangeLog b/sci-libs/vtk/ChangeLog
index 05ec42179694..e82de9f78ca6 100644
--- a/sci-libs/vtk/ChangeLog
+++ b/sci-libs/vtk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/vtk
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.12 2006/03/06 15:35:27 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.13 2006/03/26 19:59:09 markusle Exp $
+
+  26 Mar 2006; Markus Dittrich <markusle@gentoo.org>
+  +files/vtk-qt3-qt4-gentoo.patch, vtk-5.0.0.ebuild:
+  Added a small fix for java compilation on amd64 as detailed
+  in bug #123178. Thanks to Sebastiaan <s.breedveld@erasmusmc.nl> for 
+  the fix. Also enabled compilation of vtk against either QT3 or QT4.
 
   06 Mar 2006; Markus Dittrich <markusle@gentoo.org> vtk-5.0.0.ebuild:
   Fixed some QT3 issues and forced -j1 during emake. Thanks
diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index 9555b2e0d298..f7d34211f14e 100644
--- a/sci-libs/vtk/Manifest
+++ b/sci-libs/vtk/Manifest
@@ -1,6 +1,6 @@
-MD5 3ec86391c8d64ed0726333a6e780f299 ChangeLog 2117
-RMD160 39c447f38c69c572882f9ecaecf6d5f2d3c159c3 ChangeLog 2117
-SHA256 ad39dff28b0d9a49a93b27f65878aafd9eed1a0060c50126da5331aebe08338b ChangeLog 2117
+MD5 bfa02eee1b156f4978ac1f2e2738fcb2 ChangeLog 2427
+RMD160 31c62fa9d811aa7a9e759393ae6a7e7822c3403f ChangeLog 2427
+SHA256 2f695a759d19e0895927015aaac383fd36427db19935b7c9e95e4411f3e668a1 ChangeLog 2427
 MD5 86f6e1d7f2496767255664ba61932a73 files/digest-vtk-4.2.6 759
 RMD160 0879e3bfe67d7d6b36190d07c36078b2dcff84a7 files/digest-vtk-4.2.6 759
 SHA256 0a311502f00b1cba50cdadff5a55d329ec6fe99441e6360b6e45b580e6fc4d5d files/digest-vtk-4.2.6 759
@@ -10,12 +10,15 @@ SHA256 3a6c9807913e0fa464e7a1c161d111b61a9210522f75014765c4440bb39fa486 files/di
 MD5 7ba663b347dd89aa7ca2f19e50641057 files/vtk-4.2.6-gcc34.patch 1739
 RMD160 de155e60a0021c47beca599650f9bb77c59f0db4 files/vtk-4.2.6-gcc34.patch 1739
 SHA256 74ccd68d643424093df8f2de213cc4d7ed67a832e2272bbf3d3ea8f7595b0018 files/vtk-4.2.6-gcc34.patch 1739
+MD5 70064ac33fde02a4c8e08e6dcc9ed987 files/vtk-qt3-qt4-gentoo.patch 593
+RMD160 2baf9667618a55f30aef5322a5d824ed0053be4b files/vtk-qt3-qt4-gentoo.patch 593
+SHA256 fab69a77e7cb6dc28645cb81119c8908461045f4e428646fdf3ee9f2bc4034da files/vtk-qt3-qt4-gentoo.patch 593
 MD5 faca3b9ef12d38400a0b53e1818ce89d metadata.xml 254
 RMD160 8e9562c9dd3bd05fdf2dd40bcc5b2ed3dbe9ab75 metadata.xml 254
 SHA256 131c089c8a699c3fb7e8b914f68af259e0b0ad341fba3a8f87827871fc7be701 metadata.xml 254
 MD5 748f5f3854a501ae6f6e0169dbd5dbde vtk-4.2.6.ebuild 5768
 RMD160 96a37816b7b28dd87abc6389608b47e9a6a6c477 vtk-4.2.6.ebuild 5768
 SHA256 c0b6175c198c86d93fd34a4b01bfe0ab0af8efbe8884e740c389f861f836447f vtk-4.2.6.ebuild 5768
-MD5 7c432a62e1574ed8fd405a5a14c6b5f7 vtk-5.0.0.ebuild 6637
-RMD160 7a3694fc441aad5d9f421047fffdc79ce116e2da vtk-5.0.0.ebuild 6637
-SHA256 c3e02ef8ce2eb51be2ac65a04fb98bd954ff5d30d9a20498c35d4ed5df391112 vtk-5.0.0.ebuild 6637
+MD5 ce42a4d9de563f20c42b0c421512453b vtk-5.0.0.ebuild 7732
+RMD160 fea00c134a0c3bd6dd195ac3a395bacbb0ddf0ba vtk-5.0.0.ebuild 7732
+SHA256 b1d5bfd90c49cad795f7798f4033fbd538f3a190feab849bd4c8666395e6c36c vtk-5.0.0.ebuild 7732
diff --git a/sci-libs/vtk/files/vtk-qt3-qt4-gentoo.patch b/sci-libs/vtk/files/vtk-qt3-qt4-gentoo.patch
new file mode 100644
index 000000000000..181444aeb6a7
--- /dev/null
+++ b/sci-libs/vtk/files/vtk-qt3-qt4-gentoo.patch
@@ -0,0 +1,13 @@
+diff -Naur VTK/Examples/GUI/Qt/Events/GUI.ui VTK-new/Examples/GUI/Qt/Events/GUI.ui
+--- VTK/Examples/GUI/Qt/Events/GUI.ui	2005-01-28 14:23:54.000000000 -0600
++++ VTK-new/Examples/GUI/Qt/Events/GUI.ui	2006-03-25 18:47:26.000000000 -0600
+@@ -186,9 +186,4 @@
+     <function access="private" specifier="non virtual">init()</function>
+     <function access="private" specifier="non virtual">destroy()</function>
+ </functions>
+-<layoutdefaults spacing="6" margin="11"/>
+-<includehints>
+-    <includehint>qvtkwidget.h</includehint>
+-    <includehint>qvtkwidget.h</includehint>
+-</includehints>
+ </UI>
diff --git a/sci-libs/vtk/vtk-5.0.0.ebuild b/sci-libs/vtk/vtk-5.0.0.ebuild
index 0b777261eee9..b3ab96b978ad 100644
--- a/sci-libs/vtk/vtk-5.0.0.ebuild
+++ b/sci-libs/vtk/vtk-5.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.0.0.ebuild,v 1.2 2006/03/06 15:35:28 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.0.0.ebuild,v 1.3 2006/03/26 19:59:09 markusle Exp $
 
 # TODO: need to fix Examples/CMakeLists.txt to build other examples
 
@@ -17,7 +17,7 @@ SRC_URI="http://www.${PN}.org/files/release/${SPV}/${P}.tar.gz
 LICENSE="BSD"
 KEYWORDS="~x86"
 SLOT="0"
-IUSE="doc examples java mpi patented python tcltk threads qt"
+IUSE="doc examples java mpi patented python tcltk threads qt3 qt4"
 RDEPEND="java? ( virtual/jdk )
 	mpi? ( sys-cluster/mpich )
 	python? ( >=dev-lang/python-2.0 )
@@ -32,10 +32,18 @@ RDEPEND="java? ( virtual/jdk )
 
 DEPEND="${RDEPEND}
 		>=dev-util/cmake-2.0.6
-		qt? ( $(qt_min_version 3.3.4) )"
+		qt3? ( $(qt_min_version 3.3.4) )
+		qt4? ( >=x11-libs/qt-4.1.0 )"
 
 S="${WORKDIR}"/VTK
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/vtk-qt3-qt4-gentoo.patch
+}
+
 src_compile() {
 	# gcc versions 3.2.x seem to have sse-related bugs that are 
 	# triggered by VTK when compiling for pentium3/4
@@ -85,17 +93,30 @@ src_compile() {
 		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPYTHON_LIBRARY:PATH=/usr/$(get_libdir)/libpython${PYVER}.so"
 	fi
 
-	if use qt; then
+	if use qt3 || use qt4 ; then
 		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_GUISUPPORT:BOOL=ON"
 		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_QVTK:BOOL=ON"
 		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DQT_WRAP_CPP:BOOL=ON"
 		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DQT_WRAP_UI:BOOL=ON"
-		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_INSTALL_QT_DIR:PATH=/qt/3/plugins"
+	fi
+
+	if use qt3; then
+		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_INSTALL_QT_DIR:PATH=/qt/3/plugins/${PN}"
 		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DDESIRED_QT_VERSION:STRING=3"
 		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DQT_MOC_EXECUTABLE:FILEPATH=/usr/qt/3/bin/moc"
 		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DQT_UIC_EXECUTABLE:FILEPATH=/usr/qt/3/bin/uic"
+		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DQT_INCLUDE_DIR:PATH=/usr/qt/3/include"
+		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DQT_QMAKE_EXECUTABLE:PATH=/usr/qt/3/bin/qmake"
 	fi
 
+	if use qt4; then
+		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_INSTALL_QT_DIR:PATH=/$(get_libdir)/qt4/plugins/${PN}"
+		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DDESIRED_QT_VERSION:STRING=4"
+		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DQT_MOC_EXECUTABLE:FILEPATH=/usr/bin/moc"
+		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DQT_UIC_EXECUTABLE:FILEPATH=/usr/bin/uic"
+		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DQT_INCLUDE_DIR:PATH=/usr/include/qt4"
+		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DQT_QMAKE_EXECUTABLE:PATH=/usr/bin/qmake"
+	fi
 
 	use tcltk && CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_WRAP_TCL:BOOL=ON"
 	use threads && CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_PARALLEL:BOOL=ON"
@@ -107,6 +128,13 @@ src_compile() {
 	cmake ${CMAKE_VARIABLES} . && cmake ${CMAKE_VARIABLES} . \
 		|| die "cmake configuration failed"
 
+	# fix java.lang.OutOfMemoryError on amd64 (see bug #123178)
+	if use java && [ "${ARCH}" == "amd64" ]; then
+		sed -e "s/javac/javac -J-Xmx256m/" \
+		-i "${S}"/Wrapping/Java/CMakeFiles/VTKBuildAll.dir/build.make \
+		|| die "Failed to patch javac"
+	fi
+
 	emake -j1 || die "emake failed"
 }