Let the qt4 eclass check for qt3support.

Package-Manager: portage-2.1.4

3 files changed, 17 insertions, 20 deletions

diff --git a/sci-visualization/paraview/ChangeLog b/sci-visualization/paraview/ChangeLog
index 323a5f3da22c..147a73d03934 100644
--- a/sci-visualization/paraview/ChangeLog
+++ b/sci-visualization/paraview/ChangeLog
@@ -1,6 +1,9 @@
 # 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.11 2008/01/05 11:18:47 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/ChangeLog,v 1.12 2008/01/19 11:21:15 markusle Exp $
+
+  19 Jan 2008; Markus Dittrich <markusle@gentoo.org> paraview-3.2.1.ebuild:
+  Let the qt4 eclass check for qt3support.
 
   05 Jan 2008; Markus Dittrich <markusle@gentoo.org> paraview-3.2.1.ebuild:
   Added patch to support OpenFOAM (see bug #202685). Thanks much to
diff --git a/sci-visualization/paraview/Manifest b/sci-visualization/paraview/Manifest
index 922d9f1618c2..be04f7164fd0 100644
--- a/sci-visualization/paraview/Manifest
+++ b/sci-visualization/paraview/Manifest
@@ -21,14 +21,14 @@ EBUILD paraview-2.6.2.ebuild 3572 RMD160 7025e7f2415be473138931ee219ddfed6512fe1
 MD5 6d90511c96022f07053b537d0c57925a paraview-2.6.2.ebuild 3572
 RMD160 7025e7f2415be473138931ee219ddfed6512fe1b paraview-2.6.2.ebuild 3572
 SHA256 f3aec359c523386fab46b3eb98e1d023ac4a1c752db4d1b1358f20d9f7f0c7e0 paraview-2.6.2.ebuild 3572
-EBUILD paraview-3.2.1.ebuild 5323 RMD160 f03e0a8319136182c60a0559607ec58e600f50e1 SHA1 05ce4f8ef0575c8adcbb8404c7409e1968b940bf SHA256 74c13ad99dd79d5d3013115de20c41c47fb7e36837096917cb8923d62d0409ab
-MD5 fec8815bdda1833c76c78dd1aa6c134a paraview-3.2.1.ebuild 5323
-RMD160 f03e0a8319136182c60a0559607ec58e600f50e1 paraview-3.2.1.ebuild 5323
-SHA256 74c13ad99dd79d5d3013115de20c41c47fb7e36837096917cb8923d62d0409ab paraview-3.2.1.ebuild 5323
-MISC ChangeLog 2502 RMD160 d863a281bc7f22cce8ed2619ba24a0c1bac560d4 SHA1 4dd3cc8b8a7faa0a66835ffde6971d4359b1ccc0 SHA256 2dd286d536203fc31c0a23a235d70d208cd8bb7d2b11a2528b36ace19eb90569
-MD5 9bdf9eb5191cc6fd129d4004d128d3db ChangeLog 2502
-RMD160 d863a281bc7f22cce8ed2619ba24a0c1bac560d4 ChangeLog 2502
-SHA256 2dd286d536203fc31c0a23a235d70d208cd8bb7d2b11a2528b36ace19eb90569 ChangeLog 2502
+EBUILD paraview-3.2.1.ebuild 5187 RMD160 e968b2f74c281958065958fadc8f7fa091c17f0e SHA1 94522ec8dac9e8a730497189fc4e951ea7eea73d SHA256 81809aeb1fd6cd8284a705e44198ce94050da4eec6c919132b50c25c6c463939
+MD5 3f83072c3d994ff77e5d0d18131133e4 paraview-3.2.1.ebuild 5187
+RMD160 e968b2f74c281958065958fadc8f7fa091c17f0e paraview-3.2.1.ebuild 5187
+SHA256 81809aeb1fd6cd8284a705e44198ce94050da4eec6c919132b50c25c6c463939 paraview-3.2.1.ebuild 5187
+MISC ChangeLog 2622 RMD160 84d1de4580ac19b88da778c9339b12cb56381ce0 SHA1 3da970d1374864ab699195cb834b366e3bc67f49 SHA256 153be0eac0575eb724bd850694ede20f2d38cc25dddcb3d0c08bb2412595abcb
+MD5 5c9f34f980f4c66791150338c3da4a2e ChangeLog 2622
+RMD160 84d1de4580ac19b88da778c9339b12cb56381ce0 ChangeLog 2622
+SHA256 153be0eac0575eb724bd850694ede20f2d38cc25dddcb3d0c08bb2412595abcb ChangeLog 2622
 MISC metadata.xml 254 RMD160 8e9562c9dd3bd05fdf2dd40bcc5b2ed3dbe9ab75 SHA1 53acb8f334765223c1030a8eb242d584ad376706 SHA256 131c089c8a699c3fb7e8b914f68af259e0b0ad341fba3a8f87827871fc7be701
 MD5 faca3b9ef12d38400a0b53e1818ce89d metadata.xml 254
 RMD160 8e9562c9dd3bd05fdf2dd40bcc5b2ed3dbe9ab75 metadata.xml 254
diff --git a/sci-visualization/paraview/paraview-3.2.1.ebuild b/sci-visualization/paraview/paraview-3.2.1.ebuild
index c09f6377cf0c..a42d2305e3e7 100644
--- a/sci-visualization/paraview/paraview-3.2.1.ebuild
+++ b/sci-visualization/paraview/paraview-3.2.1.ebuild
@@ -1,8 +1,8 @@
 # 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.2.1.ebuild,v 1.3 2008/01/05 11:18:47 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/paraview-3.2.1.ebuild,v 1.4 2008/01/19 11:21:15 markusle Exp $
 
-inherit distutils eutils flag-o-matic toolchain-funcs versionator python
+inherit distutils eutils flag-o-matic toolchain-funcs versionator python qt4
 
 MY_PV=3.2.1
 MY_MAJOR_PV=$(get_version_component_range 1-2)
@@ -20,7 +20,7 @@ RDEPEND="hdf5? ( sci-libs/hdf5 )
 	doc? ( app-doc/doxygen )
 	mpi? ( sys-cluster/mpich )
 	python? ( >=dev-lang/python-2.0 )
-	qt4? ( >=x11-libs/qt-4.3.0 )
+	qt4? ( $(qt4_min_version 4.3) )
 	dev-libs/libxml2
 	media-libs/libpng
 	media-libs/jpeg
@@ -39,6 +39,8 @@ PVLIBDIR="$(get_libdir)/${PN}-${MY_MAJOR_PV}"
 BUILDDIR="${WORKDIR}/build"
 S="${WORKDIR}"/ParaView${MY_PV}
 
+QT4_BUILT_WITH_USE_CHECK="qt3support"
+
 src_unpack() {
 	unpack ${A}
 	mkdir "${BUILDDIR}" || die "Failed to generate build directory"
@@ -49,14 +51,6 @@ src_unpack() {
 
 	# rename paraview's assistant wrapper
 	if use qt4; then
-
-		# make sure we have qt3 support
-		if ! built_with_use =x11-libs/qt-4* qt3support; then
-			echo
-			eerror 'Please emerge qt4 with USE="qt3support"!'
-			die "qt4 setup error"
-		fi
-
 		sed -e "s:\"assistant\":\"paraview-assistant\":" \
 			-i Applications/Client/MainWindow.cxx \
 			|| die "Failed to fix assistant wrapper call"