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.

Package-Manager: portage-2.1.5.2

4 files changed, 53 insertions, 32 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/Manifest b/sci-visualization/paraview/Manifest
index c1f85d36b912..3dccc5edd166 100644
--- a/sci-visualization/paraview/Manifest
+++ b/sci-visualization/paraview/Manifest
@@ -5,13 +5,13 @@ AUX paraview-3.2-libxml2-fix.patch 1774 RMD160 11ab022b0abca2a226deb648d48fe69cb
 AUX paraview-3.2-support-qt4.3.patch 3835 RMD160 06d572100ee65f6f68c042bf7204b49c062c4e3a SHA1 ea7a30324e36ea9ed58129818769bafab30c078d SHA256 c2a412b2418f4b34e210851e6d1d7f7d5112d1ead93ddcadd5c8119ea40c160e
 AUX paraview-3.2.1-openmpi.patch 1651 RMD160 64025fcb74f62939e0b71f4cfc0de09e83aa38fb SHA1 f3863c718d8c2d9da4201b194b24fb75c2794269 SHA256 148d4e22419b31af9f1c357b478820a09bffff0eada0acd3758e6dca7da3209b
 AUX paraview-3.3_pre20080514-gcc4.3.patch 1792 RMD160 56781fb8ac9fa8bc50bb7c34d2167986228a2602 SHA1 e700406300648ef10c131c073832b42a88f7e02c SHA256 fe24d033ca80da86af324fa6afef2fdbe67fe3b3cd0e4ca6abeb796caf83b032
-AUX paraview-3.3_pre20080514-qt.patch 3055 RMD160 0d92c040b00b61e90a45f6bdd6caf2adc8dcc93c SHA1 92c37b5315384be681550c9c0865b4380a9b4ecc SHA256 3e0076fdfb8a73446ba9a4832caeabf8c51658f451d35ce4dbf1f69f0b7ac48a
+AUX paraview-3.3_pre20080514-qt4.4.patch 3750 RMD160 1115e784a8e9dbafc65f2be11e277350ab0f4760 SHA1 a813195455b97c83d6b0ea50753c0003d0a955eb SHA256 34fdc79f8f52669a7285b5d0b12d6567b8b5489397f739571f1ef6094e0fda92
 DIST ParaView-2.6.2.tar.gz 75658768 RMD160 068f3fbfea17166d34c488b4e6bd8d8fb07d3cd9 SHA1 ac5efb1c850e89b76dda4f28ecfa4575e45aa22e SHA256 de7cbd808e1ab1730ad87436d30c0a752096a65fe9aa6b82f35a39fc3b67d7c7
 DIST paraview-3.2.1-OpenFOAM.patch.bz2 35956 RMD160 b4f6d3f64e6a0cc952b73d70b59168d33f09b7d5 SHA1 4b63ca09cae3b9197b840319e3bbb7b6594a66d3 SHA256 16bf34d126c65966de20644cb44685bf90cd81f97f9ddb8b6d1749ed97918c7e
 DIST paraview-3.2.1.tar.gz 21360301 RMD160 f7df024f4668901900b7633cf6dbe78337991b49 SHA1 a14e46cbeb7292f5511e1361afeb37455689c325 SHA256 d613d6a86f8a9173f42333760c9f0c29b5fcaa85554ba4b9bf61b6fddfae0cb9
 DIST paraview-3.3_pre20080514.tar.bz2 19931958 RMD160 bcca09c71c84deaa721261fcb514897af052f360 SHA1 fcd8061d7a7679f635c06a1940a34d62acb77c23 SHA256 a1e75e5342bb95c18033ba2906514ba34693515b81a94d157a5928719fb9e4de
 EBUILD paraview-2.6.2.ebuild 3613 RMD160 937e650413d5fa4638b056ad88087986e59feacf SHA1 a8bc36ff2e02204585281ee7d095799eba462bbc SHA256 ce22dfad39ecc56f6618231e1771596bcef87f36cbf500b70192b6fd05b1c136
 EBUILD paraview-3.2.1.ebuild 5495 RMD160 3dfeba96dd8ce1bc5c4a13beaa8b12ef0a32b6fd SHA1 67e0c5014f2ea4ba80f63f7ec719231e97c7cc48 SHA256 343515bf51520f5af48af0cfa6d425c1c5bedc6b0a4f7ba9b5b51893ae0d293d
-EBUILD paraview-3.3_pre20080514.ebuild 5386 RMD160 158698d05cec0c5bd5c6e8b6fb9f69f6f53ab481 SHA1 2fc7edb927c1e220d26d0cadf559bc65790ecf08 SHA256 143611083d3da48ff2cd2cc0fa5f7f28c7485ef11826464ae51ef5c1a772008c
-MISC ChangeLog 3837 RMD160 1cc6a42ebb2fee47f2b9434ea857db23f71fcd6f SHA1 14715bd0d2ccb6c41c2e9f48cb71d866d27249cf SHA256 f480df6a12439725f1d3462fe5b07c0d6c56161e3ba3d7f115a7084327d1543f
+EBUILD paraview-3.3_pre20080514.ebuild 5561 RMD160 052086cb2938ec9d107523d6f4a71494fddf4157 SHA1 cfa0b07827bc02be4ca95695f14be8b5f14ee1fd SHA256 c37f9d1f24d657ae2f2ce82af92357ec11ea74b77e8b00c221a0c9cb6feba8d2
+MISC ChangeLog 4188 RMD160 fea7dd67a2b0b7f1070e4bf8712d39a506891605 SHA1 c9fcddd023de7e0e0a3d27200d5b24e4c6927226 SHA256 7686d1d96599df5707ce3f1cba81d3335ee93bd25040868659d761c6db3c1fc9
 MISC metadata.xml 254 RMD160 8e9562c9dd3bd05fdf2dd40bcc5b2ed3dbe9ab75 SHA1 53acb8f334765223c1030a8eb242d584ad376706 SHA256 131c089c8a699c3fb7e8b914f68af259e0b0ad341fba3a8f87827871fc7be701
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"
 
 }