Added support for qt4, fixed bogus /usr/plugin install directory and depend explicitly on eselect-opengl to avoid missing declarations in older glext header files.

(Portage version: 2.1.5.2)

3 files changed, 50 insertions, 29 deletions

diff --git a/sci-visualization/paraview/ChangeLog b/sci-visualization/paraview/ChangeLog
index 4e1860dab5db..212c3c11cfa2 100644
--- a/sci-visualization/paraview/ChangeLog
+++ b/sci-visualization/paraview/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-visualization/paraview
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/ChangeLog,v 1.19 2008/05/16 01:45:09 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/ChangeLog,v 1.20 2008/05/26 16:22:52 markusle Exp $
+
+  26 May 2008; Markus Dittrich <markusle@gentoo.org>
+  -files/paraview-3.3_pre20080514-qt.patch,
+  +files/paraview-3.3_pre20080514-qt4.4.patch,
+  paraview-3.3_pre20080514.ebuild:
+  Added support for qt4, fixed bogus /usr/plugin install directory and
+  depend explicitly on eselect-opengl to avoid missing declarations 
+  in older glext header files.
 
 *paraview-3.3_pre20080514 (15 May 2008)
 
diff --git a/sci-visualization/paraview/files/paraview-3.3_pre20080514-qt.patch b/sci-visualization/paraview/files/paraview-3.3_pre20080514-qt4.4.patch
index f9993a0b830e..fcf0591b5ad8 100644
--- a/sci-visualization/paraview/files/paraview-3.3_pre20080514-qt.patch
+++ b/sci-visualization/paraview/files/paraview-3.3_pre20080514-qt4.4.patch
@@ -1,6 +1,6 @@
 diff -Naur ParaView3/Applications/Client/CMakeLists.txt ParaView3.new/Applications/Client/CMakeLists.txt
 --- ParaView3/Applications/Client/CMakeLists.txt	2008-04-01 12:47:19.000000000 -0400
-+++ ParaView3.new/Applications/Client/CMakeLists.txt	2008-05-15 12:23:11.000000000 -0400
++++ ParaView3.new/Applications/Client/CMakeLists.txt	2008-05-25 21:13:29.000000000 -0400
 @@ -516,34 +516,34 @@
    ENDIF(FFMPEG_${fmpglib}_LIBRARY)
  ENDFOREACH(fmpglib)
@@ -22,7 +22,10 @@ diff -Naur ParaView3/Applications/Client/CMakeLists.txt ParaView3.new/Applicatio
 -IF(NOT Q_WS_MAC)
 -  FOREACH(qtlib ${QTLIBLIST})
 -    IF (NOT WIN32)
--      #INSTALL(FILES ${QT_${qtlib}_LIBRARY_RELEASE} DESTINATION ${PV_INSTALL_LIB_DIR_CM24})
++#IF(NOT Q_WS_MAC)
++#  FOREACH(qtlib ${QTLIBLIST})
++#    IF (NOT WIN32)
+       #INSTALL(FILES ${QT_${qtlib}_LIBRARY_RELEASE} DESTINATION ${PV_INSTALL_LIB_DIR_CM24})
 -      GET_FILENAME_COMPONENT(QT_LIB_DIR_tmp ${QT_${qtlib}_LIBRARY_RELEASE} PATH)
 -      GET_FILENAME_COMPONENT(QT_LIB_NAME_tmp ${QT_${qtlib}_LIBRARY_RELEASE} NAME)
 -      FILE(GLOB QT_LIB_LIST RELATIVE ${QT_LIB_DIR_tmp} "${QT_${qtlib}_LIBRARY_RELEASE}*")
@@ -36,29 +39,36 @@ diff -Naur ParaView3/Applications/Client/CMakeLists.txt ParaView3.new/Applicatio
 -      GET_FILENAME_COMPONENT(QT_DLL_PATH_tmp ${QT_QMAKE_EXECUTABLE} PATH)
 -      INSTALL(FILES ${QT_DLL_PATH_tmp}/${qtlib}4.dll DESTINATION ${PV_INSTALL_BIN_DIR_CM24} COMPONENT Runtime)
 -    ENDIF (NOT WIN32)
--    
++      #      GET_FILENAME_COMPONENT(QT_LIB_DIR_tmp ${QT_${qtlib}_LIBRARY_RELEASE} PATH)
++      #      GET_FILENAME_COMPONENT(QT_LIB_NAME_tmp ${QT_${qtlib}_LIBRARY_RELEASE} NAME)
++      #FILE(GLOB QT_LIB_LIST RELATIVE ${QT_LIB_DIR_tmp} "${QT_${qtlib}_LIBRARY_RELEASE}*")
++      #      INSTALL(CODE "
++      #MESSAGE(STATUS \"Installing \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR_CM24}/${QT_LIB_NAME_tmp}\")
++      #EXECUTE_PROCESS (WORKING_DIRECTORY ${QT_LIB_DIR_tmp}
++      #           COMMAND tar c ${QT_LIB_LIST}
++      #           COMMAND tar -xC \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR_CM24})
++      #  " COMPONENT Runtime)
++      # ELSE (NOT WIN32)
++      #   GET_FILENAME_COMPONENT(QT_DLL_PATH_tmp ${QT_QMAKE_EXECUTABLE} PATH)
++      #     INSTALL(FILES ${QT_DLL_PATH_tmp}/${qtlib}4.dll DESTINATION ${PV_INSTALL_BIN_DIR_CM24} COMPONENT Runtime)
++      #  ENDIF (NOT WIN32)
+     
 -  ENDFOREACH(qtlib)
 -ENDIF(NOT Q_WS_MAC)
-+#IF(NOT Q_WS_MAC)
-+#  FOREACH(qtlib ${QTLIBLIST})
-+#    IF (NOT WIN32)
-+#      #INSTALL(FILES ${QT_${qtlib}_LIBRARY_RELEASE} DESTINATION ${PV_INSTALL_LIB_DIR_CM24})
-+#      GET_FILENAME_COMPONENT(QT_LIB_DIR_tmp ${QT_${qtlib}_LIBRARY_RELEASE} PATH)
-+#      GET_FILENAME_COMPONENT(QT_LIB_NAME_tmp ${QT_${qtlib}_LIBRARY_RELEASE} NAME)
-+#      FILE(GLOB QT_LIB_LIST RELATIVE ${QT_LIB_DIR_tmp} "${QT_${qtlib}_LIBRARY_RELEASE}*")
-+#      INSTALL(CODE "
-+#MESSAGE(STATUS \"Installing \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR_CM24}/${QT_LIB_NAME_tmp}\")
-+#EXECUTE_PROCESS (WORKING_DIRECTORY ${QT_LIB_DIR_tmp}
-+#                 COMMAND tar c ${QT_LIB_LIST}
-+#                 COMMAND tar -xC \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR_CM24})
-+#        " COMPONENT Runtime)
-+#    ELSE (NOT WIN32)
-+#      GET_FILENAME_COMPONENT(QT_DLL_PATH_tmp ${QT_QMAKE_EXECUTABLE} PATH)
-+#      INSTALL(FILES ${QT_DLL_PATH_tmp}/${qtlib}4.dll DESTINATION ${PV_INSTALL_BIN_DIR_CM24} COMPONENT Runtime)
-+#    ENDIF (NOT WIN32)
-+#    
-+#  ENDFOREACH(qtlib)
-+#ENDIF(NOT Q_WS_MAC)
++      #  ENDFOREACH(qtlib)
++      #ENDIF(NOT Q_WS_MAC)
  
  # Hard-coded install rules for anything left to install. These should
  # probably go to a local cmake file. Change to match the build system's
+diff -Naur ParaView3/CMakeLists.txt ParaView3.new/CMakeLists.txt
+--- ParaView3/CMakeLists.txt	2008-04-16 13:06:41.000000000 -0400
++++ ParaView3.new/CMakeLists.txt	2008-05-25 21:01:03.000000000 -0400
+@@ -89,7 +89,7 @@
+     MESSAGE(SEND_ERROR "Qt ${QT_MIN_VERSION} or greater not found.  Please check the QT_QMAKE_EXECUTABLE variable.")
+   ELSE(NOT QT4_FOUND)
+     # don't go greater than supported version
+-    STRING(REGEX MATCH "^4\\.3\\.[0-9]+" qt_version_tmp "${QTVERSION}")
++    STRING(REGEX MATCH "^4\\.[3-4]\\.[0-9]+" qt_version_tmp "${QTVERSION}")
+     IF (NOT qt_version_tmp)
+       MESSAGE(SEND_ERROR "Qt ${QTVERSION} not supported.  Please use Qt 4.3 (you may need to clean your dirtied cache).")
+     ENDIF (NOT qt_version_tmp)
diff --git a/sci-visualization/paraview/paraview-3.3_pre20080514.ebuild b/sci-visualization/paraview/paraview-3.3_pre20080514.ebuild
index 6acd4c249fbd..76cc5cb44560 100644
--- a/sci-visualization/paraview/paraview-3.3_pre20080514.ebuild
+++ b/sci-visualization/paraview/paraview-3.3_pre20080514.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/paraview-3.3_pre20080514.ebuild,v 1.1 2008/05/16 01:45:09 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/paraview-3.3_pre20080514.ebuild,v 1.2 2008/05/26 16:22:52 markusle Exp $
 
 EAPI="1"
 
@@ -21,6 +21,9 @@ RDEPEND="hdf5? ( sci-libs/hdf5 )
 				sys-cluster/openmpi
 				sys-cluster/mpich2 ) )
 	python? ( >=dev-lang/python-2.0 )
+	qt4? ( || ( ( x11-libs/qt-gui:4 x11-libs/qt-qt3support:4
+				x11-libs/qt-assistant:4 )
+		>=x11-libs/qt-4.3:4 ) )
 	dev-libs/libxml2
 	media-libs/libpng
 	media-libs/jpeg
@@ -28,6 +31,7 @@ RDEPEND="hdf5? ( sci-libs/hdf5 )
 	dev-libs/expat
 	sys-libs/zlib
 	media-libs/freetype
+	>=app-admin/eselect-opengl-1.0.6-r1
 	virtual/opengl
 	sci-libs/netcdf
 	x11-libs/libXmu"
@@ -56,7 +60,7 @@ src_unpack() {
 	mkdir "${BUILDDIR}" || die "Failed to generate build directory"
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-gcc4.3.patch
-	epatch "${FILESDIR}"/${P}-qt.patch
+	epatch "${FILESDIR}"/${P}-qt4.4.patch
 	epatch "${FILESDIR}"/${PN}-3.2.1-openmpi.patch
 
 	# rename paraview's assistant wrapper
@@ -125,6 +129,7 @@ src_compile() {
 
 	if use qt4; then
 		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_QT_GUI:BOOL=ON"
+		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_INSTALL_QT_DIR=/${PVLIBDIR}/plugins/designer"
 	else
 		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPARAVIEW_BUILD_QT_GUI:BOOL=OFF"
 	fi
@@ -135,12 +140,10 @@ src_compile() {
 		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DCMAKE_USE_PTHREADS:BOOL=OFF"
 	fi
 
-	#CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_OFFSCREEN=TRUE"
-
 	cmake ${CMAKE_VARIABLES} "${S}" \
 		|| die "cmake configuration failed"
 
-	emake -j1 || die "emake failed"
+	emake || die "emake failed"
 
 }