Migrate Dependencies to permit Split QT 4.4 to satisfy dependencies, bug #217189

Package-Manager: portage-2.1.4.4

3 files changed, 25 insertions, 16 deletions

diff --git a/sci-libs/vtk/ChangeLog b/sci-libs/vtk/ChangeLog
index 599d04ad51c0..c90ef137dc59 100644
--- a/sci-libs/vtk/ChangeLog
+++ b/sci-libs/vtk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/vtk
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.44 2008/05/24 18:56:05 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.45 2008/07/03 19:56:31 gentoofan23 Exp $
+
+  03 Jul 2008; Thomas Anderson <gentoofan23@gentoo.org> vtk-5.0.4.ebuild:
+  Migrate Dependencies to permit Split QT 4.4 to satisfy dependencies, bug
+  #217189
 
   24 May 2008; Markus Dittrich <markusle@gentoo.org>
   +files/vtk-5.0.4-gcc4.3.patch, vtk-5.0.4.ebuild:
diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index 6e0604243ec3..b178132f2433 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
 DIST vtk-5.0.3.tar.gz 8324346 RMD160 bc844d562d69bb8e74452ba238986522de9fea9e SHA1 a0c514f6a2b3735e779b1eb5d53b27ae9ef129b6 SHA256 3ba05f6cb33cfcfb9d448c332b9292d6fca836fd979249d086762a7ac1c65d5c
@@ -6,6 +9,13 @@ DIST vtk-5.0.4.tar.gz 8344794 RMD160 9c9b3eb43c7425ba2e4fd40b75caae100c49a12c SH
 DIST vtkdata-5.0.3.tar.gz 22399159 RMD160 574afa369e58448641ec418bc4a046cb6c895eb9 SHA1 2fa9d63f95c6b294365b04912a780865f1eae9a8 SHA256 c46e6ac5728b44df3a150faf47cf3c144a3284e15bb29ff685bf4b182b1db32a
 DIST vtkdata-5.0.4.tar.gz 22403386 RMD160 af1fcadc568f15c230756bb9ee939159294b0c53 SHA1 18cccb3fdd2b78e505831b52317ec93eef42d5aa SHA256 030c4dcb5fe79ded8f046a5403a41c1f63884a6de1872c227faed5ad9a28ba99
 EBUILD vtk-5.0.3.ebuild 9115 RMD160 da8ef8fb2d3dcc2270e6b61ea6fbe1048d4cd07e SHA1 9f80346437e0a8264c1b4bf6dc65b4298fa27c98 SHA256 b67e1fc4f7c5a9ea9db9c8f52ee50d1c0467bfa493f7cb656db989a9f8a0fbdc
-EBUILD vtk-5.0.4.ebuild 9244 RMD160 c058e85d300d585e5a02ba8710befff9cfe92b31 SHA1 0a7be6c543bde365083efe56b9e7053b1e097dc0 SHA256 1cb056d33f8c31d01f4a2314b280e0ef57d0472dfe25f91b2a6ed7be0f87c640
-MISC ChangeLog 7798 RMD160 02b42afceb54aa43a99ca20e124938c0aefbd864 SHA1 df6ef86d3dff8a97d1cf41fc5828545dab59a358 SHA256 e57801a48785bd356150901c8d90a19a9c1183259847f335105ac0594e2bb35e
+EBUILD vtk-5.0.4.ebuild 9126 RMD160 5df7e0c722d627bbfc72ff94d8a1ff9a0c533343 SHA1 65f762e6c667a8396446f39ca03c7e720bf3183d SHA256 d7af8aa1a746af17ee33ca0bc19dac1e0489b5c86883fbaae04eba5bf98413a6
+MISC ChangeLog 7961 RMD160 ec7abc0cddfc72c84013a49bb3ad09cd950a6499 SHA1 aed32f0057c207eb0530cedcae27d1de85ecb17e SHA256 1a3d29d1de4886c4ab40b5cf250bcf373fc2ee4799accf2eb126b6d477e56b62
 MISC metadata.xml 273 RMD160 813d00f411ea6b62bca9352968caa1c05daaaeec SHA1 852b5371f1bb0b4d5c4934f75b434e8f252533b7 SHA256 b930aead56cb1a6abb648c097836b6e8bf08c1ffa2038ad071aa1c98d1602e56
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkhtMosACgkQF6yMcaBxwHnUEQCfW8DxLIyxuwaAzhLHmYwsJWZ7
+yjIAnjXkLnUA3/NlOBTs1yt8xPfM38y3
+=FBpz
+-----END PGP SIGNATURE-----
diff --git a/sci-libs/vtk/vtk-5.0.4.ebuild b/sci-libs/vtk/vtk-5.0.4.ebuild
index 7581c869648f..05891fea5399 100644
--- a/sci-libs/vtk/vtk-5.0.4.ebuild
+++ b/sci-libs/vtk/vtk-5.0.4.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.0.4.ebuild,v 1.3 2008/05/24 18:56:05 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.0.4.ebuild,v 1.4 2008/07/03 19:56:31 gentoofan23 Exp $
 
 EAPI="1"
-
 inherit distutils eutils flag-o-matic toolchain-funcs versionator java-pkg-opt-2 python qt3 qt4
 
 # Short package version
@@ -27,8 +26,9 @@ RDEPEND="mpi? ( || (
 	tcl? ( >=dev-lang/tcl-8.2.3 )
 	tk? ( >=dev-lang/tk-8.2.3 )
 	java? ( >=virtual/jre-1.5 )
-	qt3? ( $(qt_min_version 3.3.4) )
-	qt4? ( $(qt4_min_version 4.1) )
+	!qt4? ( qt3? ( >=x11-libs/qt-3.3.4:3 ) )
+	qt4? (
+	|| ( x11-libs/qt-core:4  >=x11-libs/qt-4.1:4 ) )
 	dev-libs/expat
 	media-libs/freetype
 	media-libs/jpeg
@@ -52,14 +52,6 @@ pkg_setup() {
 		echo
 	fi
 
-	use qt4 && use examples && \
-		if ! built_with_use =x11-libs/qt-4* qt3support; then
-			echo
-			eerror 'Please emerge qt4 with USE="qt3support" to'
-			eerror 'build the examples under qt4!'
-			die "qt4 setup error"
-		fi
-
 	if use mpi && has_version sys-cluster/mpich2; then
 		append-flags -DMPICH_IGNORE_CXX_SEEK
 		if ! built_with_use sys-cluster/mpich2 cxx; then
@@ -67,7 +59,10 @@ pkg_setup() {
 		fi
 	fi
 
-	use qt4 && qt4_pkg_setup
+	if use qt4 && use examples; then
+		QT4_BUILT_WITH_USE_CHECK="qt3support"
+		qt4_pkg_setup
+	fi
 }
 
 src_unpack() {