Removed qt3 support as it is no longer in the tree

Package-Manager: portage-2.2_rc62/cvs/Linux i686

4 files changed, 25 insertions, 52 deletions

diff --git a/sci-libs/vtk/ChangeLog b/sci-libs/vtk/ChangeLog
index c2c2bee4e23a..768e0f86b71c 100644
--- a/sci-libs/vtk/ChangeLog
+++ b/sci-libs/vtk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/vtk
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.61 2010/01/21 23:38:26 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.62 2010/02/11 07:38:19 jlec Exp $
+
+  11 Feb 2010; Justin Lecher (jlec) <jlec@j-schmitz.net> vtk-5.4.2.ebuild,
+  vtk-5.4.2-r1.ebuild:
+  Removed qt3 support as it is no longer in the tree
 
   21 Jan 2010; Markus Dittrich <markusle@gentoo.org> vtk-5.4.2-r1.ebuild,
   +files/vtk-5.4.2-boost-property_map.patch:
diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index 521ebf4bbbd0..a2319870cd14 100644
--- a/sci-libs/vtk/Manifest
+++ b/sci-libs/vtk/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX vtk-5.0.3-mpi.patch 2653 RMD160 16c80c11c88cd4a671968da9ef3a29c67a979648 SHA1 c1979686901883aa05091845c05235ce8e24e89f SHA256 dd03a1e55674e6f0c3740b996e6a81a68a6e253c5dac60cf0f2fd2e3ead1dcf3
 AUX vtk-5.0.4-gcc4.3.patch 1222 RMD160 28a724ce4e999e68482bfcadc3e776ef37a1e6a6 SHA1 5db37dabd42dca1d93e483e2fd3356fb5a2c653e SHA256 66627b05fd0f71a51b1f5645edaaa369d11896245598acdb3a30818ec716806f
 AUX vtk-5.2.0-tcl-install.patch 580 RMD160 e3654b90212a4f48f707cd4cfaf6069b9cbc4d49 SHA1 94269da0a6d83312d0fc00c3f7adf964531a7d20 SHA256 7373a02d9408f59546486b50efb8934fc2fa14067928e27bd46b2691b80d2fc6
@@ -6,7 +9,14 @@ AUX vtk-5.4.2-cg-path.patch 1112 RMD160 8b4dca2322f62ed005585ed35cf5e11bc7ea0614
 DIST vtk-5.4.2.tar.gz 18265310 RMD160 607df8babe7413b92a5bd4d8c264fd69798df83f SHA1 508106a15c32326aa9ac737c7f0e7212c150d55f SHA256 037c0582ee7483e0b495e45a00c4f08784691ef82c4ea159ef86731c3beda73d
 DIST vtkDocHtml-5.4.2.tar.gz 229828672 RMD160 d6372984b74ede33713501219fecd6768edcfad3 SHA1 13da1373bb95f34b1f868b307f0e84fef6626020 SHA256 54dfe1c242c488db1d1099bbf9114f49ee2bd07859c067e77e2d6bd3c077ee25
 DIST vtkdata-5.4.2.tar.gz 52810062 RMD160 0cc24fc7a6a9bb80c619a0555eb288cc97554001 SHA1 5030523c0a9e17c47bf94fe9005e5c91069a571a SHA256 84c9895b72aec96977b8043a4be26ff58e14ae04ab2be9f19a02ca613dc3be26
-EBUILD vtk-5.4.2-r1.ebuild 6952 RMD160 1e4f35e47be821ff625e147cc4dd58c9045ac392 SHA1 5ec3199db8878ead9b8b96d90e94aceda885df76 SHA256 e8e8897a2b4ac6ad4495bb334e1ad608b2efddf0f623c6da91e40c019a6fac56
-EBUILD vtk-5.4.2.ebuild 10002 RMD160 3903566411bab7e95766ca0dc71e84d9fcbf8175 SHA1 dc81774ad814bb9d331a014b90bdacd836f589d0 SHA256 8dc7dcd684cb9538f0a7e44e4eb597a01fd5e351f6ac94e56f216143ed3c275b
-MISC ChangeLog 10534 RMD160 8828ba62463483f42228262416eea5e658e09805 SHA1 248d79d5b43a958d7fd7a538e037f7ef2d4f28ed SHA256 4cae476f1b584e131d4a41ee0ac8424f401ac55dc997c16b46e5bf3da5122bd8
+EBUILD vtk-5.4.2-r1.ebuild 6252 RMD160 d0226b84c386870fb6f9e3096da7723c8e5355ff SHA1 760eafccf171ed4378449890df2a85624c347f50 SHA256 f0a81a3e8a30e3c6ab8800f9189d34b16d3b8fe886aeba7ca05508efe1d8b2bf
+EBUILD vtk-5.4.2.ebuild 9230 RMD160 f11179ecea0e9e03c3456c7ad2851abc29f45cd2 SHA1 86870e4bea6b7d8e7350c0ed9ebf2db8657bd755 SHA256 48535d9cc5861fbe3564620d6039b8a9851446c9d2f392f357ecfc8e2b4bbf07
+MISC ChangeLog 10682 RMD160 6c7af879be22ff9d7cc2a662a74ffbb64e8dd688 SHA1 6bcc1512b26c1cf97d9de957d072ff12de184f53 SHA256 2284f019eace0d915e3f59fcb60cfc19d34d6cd3aa836700aafb27ec9f487f31
 MISC metadata.xml 432 RMD160 2b5009d16ed172daa9ae089e59ceadabeaab5884 SHA1 4163aa67aa3d1d46b8efc21d2af85a2105f6a77c SHA256 8dadae25a4cdeedb63f94cbaf7fc6a8ce7a1950feae7047e859839d2eee30747
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAktzs/IACgkQgAnW8HDreRZ/1gCfW7dNB0M0pY8OgfnB4hbcbdr8
+c+MAoJKFBLaMfp4Oi2LELO3oaQbXWFD1
+=ykWJ
+-----END PGP SIGNATURE-----
diff --git a/sci-libs/vtk/vtk-5.4.2-r1.ebuild b/sci-libs/vtk/vtk-5.4.2-r1.ebuild
index 479517e67f02..1b9ac9493c6e 100644
--- a/sci-libs/vtk/vtk-5.4.2-r1.ebuild
+++ b/sci-libs/vtk/vtk-5.4.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.4.2-r1.ebuild,v 1.3 2010/01/21 23:38:26 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.4.2-r1.ebuild,v 1.4 2010/02/11 07:38:19 jlec Exp $
 
 EAPI="2"
 inherit eutils flag-o-matic toolchain-funcs versionator java-pkg-opt-2 python qt3 qt4 cmake-utils
@@ -17,7 +17,7 @@ SRC_URI="http://www.${PN}.org/files/release/${SPV}/${P}.tar.gz
 LICENSE="BSD LGPL-2"
 KEYWORDS="~amd64 ~x86"
 SLOT="0"
-IUSE="boost cg doc examples mpi patented python tcl tk threads qt3 qt4"
+IUSE="boost cg doc examples mpi patented python tcl tk threads qt4"
 RDEPEND="mpi? ( || (
 					sys-cluster/openmpi
 					sys-cluster/lam-mpi
@@ -27,7 +27,6 @@ RDEPEND="mpi? ( || (
 	tcl? ( >=dev-lang/tcl-8.2.3 )
 	tk? ( >=dev-lang/tk-8.2.3 )
 	java? ( >=virtual/jre-1.5 )
-	!qt4? ( qt3? ( >=x11-libs/qt-3.3.4:3 ) )
 	qt4? ( x11-libs/qt-core:4
 			x11-libs/qt-opengl:4
 			x11-libs/qt-gui:4 )
@@ -58,12 +57,6 @@ pkg_setup() {
 	epause 5
 
 	java-pkg-opt-2_pkg_setup
-	if use qt3 && use qt4; then
-		echo
-		ewarn "qt3 and qt4 support for vtk are mutually exclusive and"
-		ewarn "qt4 support has therefore been enabled by default."
-		echo
-	fi
 
 	if use qt4; then
 		qt4_pkg_setup
@@ -143,7 +136,7 @@ src_configure() {
 			-DVTK_PYTHON_SETUP_ARGS:STRING=--root="${D}")
 	fi
 
-	if use qt3 || use qt4 ; then
+	if use qt4 ; then
 		mycmakeargs+=(
 			-DVTK_USE_GUISUPPORT=ON
 			-DVTK_USE_QVTK=ON
@@ -152,20 +145,6 @@ src_configure() {
 			-DQT_WRAP_UI=ON)
 	fi
 
-	# these options we only enable if the use request qt3
-	# only. In case of qt3 && qt4 or qt4 only qt4 always
-	# overrides qt3
-	if use qt3 && use !qt4; then
-		mycmakeargs+=(
-			-DVTK_INSTALL_QT_DIR=/qt/3/plugins/${PN}
-			-DDESIRED_QT_VERSION=3
-			-DQT_MOC_EXECUTABLE=/usr/qt/3/bin/moc
-			-DQT_UIC_EXECUTABLE=/usr/qt/3/bin/uic
-			-DQT_INCLUDE_DIR=/usr/qt/3/include
-			-DQT_QT_LIBRARY=/usr/qt/3/$(get_libdir)/libqt.so
-			-DQT_QMAKE_EXECUTABLE=/usr/qt/3/bin/qmake)
-	fi
-
 	if use qt4; then
 		mycmakeargs+=(
 			-DVTK_INSTALL_QT_DIR=/$(get_libdir)/qt4/plugins/${PN}
diff --git a/sci-libs/vtk/vtk-5.4.2.ebuild b/sci-libs/vtk/vtk-5.4.2.ebuild
index 93e1fcf8fcdf..51d86e962479 100644
--- a/sci-libs/vtk/vtk-5.4.2.ebuild
+++ b/sci-libs/vtk/vtk-5.4.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.4.2.ebuild,v 1.5 2009/12/17 23:43:31 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.4.2.ebuild,v 1.6 2010/02/11 07:38:19 jlec Exp $
 
 EAPI="2"
 inherit distutils eutils flag-o-matic toolchain-funcs versionator java-pkg-opt-2 python qt3 qt4
@@ -17,7 +17,7 @@ SRC_URI="http://www.${PN}.org/files/release/${SPV}/${P}.tar.gz
 LICENSE="BSD LGPL-2"
 KEYWORDS="~amd64 ~x86"
 SLOT="0"
-IUSE="boost cg doc examples mpi patented python tcl tk threads qt3 qt4"
+IUSE="boost cg doc examples mpi patented python tcl tk threads qt4"
 RDEPEND="mpi? ( || (
 					sys-cluster/openmpi
 					sys-cluster/lam-mpi
@@ -27,7 +27,6 @@ RDEPEND="mpi? ( || (
 	tcl? ( >=dev-lang/tcl-8.2.3 )
 	tk? ( >=dev-lang/tk-8.2.3 )
 	java? ( >=virtual/jre-1.5 )
-	!qt4? ( qt3? ( >=x11-libs/qt-3.3.4:3 ) )
 	qt4? ( x11-libs/qt-core:4
 			x11-libs/qt-opengl:4
 			x11-libs/qt-gui:4 )
@@ -58,13 +57,6 @@ pkg_setup() {
 	epause 5
 
 	java-pkg-opt-2_pkg_setup
-	if use qt3 && use qt4; then
-		echo
-		ewarn "qt3 and qt4 support for vtk are mutually exclusive and"
-		ewarn "qt4 support has therefore been enabled by default."
-		echo
-	fi
-
 	if use qt4; then
 		qt4_pkg_setup
 	fi
@@ -138,24 +130,12 @@ src_compile() {
 		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_PYTHON_SETUP_ARGS:STRING=\"--prefix=${D}/usr\""
 	fi
 
-	if use qt3 || use qt4 ; then
+	if 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} -DVTK_USE_QVTK_QTOPENGL:BOOL=ON"
 		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DQT_WRAP_CPP:BOOL=ON"
 		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DQT_WRAP_UI:BOOL=ON"
-	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"