diff options
| author |   Thomas Anderson <gentoofan23@gentoo.org> | 2008-07-03 19:56:31 +0000 |
|---|---|---|
| committer | Thomas Anderson <gentoofan23@gentoo.org> | 2008-07-03 19:56:31 +0000 |
| commit | 4c635b0fd421ef12dd134a3b1cedae93750b1e43 (patch) | |
| tree | 855726d45101685adfa766894ebee7ef295e5989 /sci-libs/vtk | |
| parent | old (diff) | |
| download | gentoo-2-4c635b0fd421ef12dd134a3b1cedae93750b1e43.tar.gz gentoo-2-4c635b0fd421ef12dd134a3b1cedae93750b1e43.tar.bz2 gentoo-2-4c635b0fd421ef12dd134a3b1cedae93750b1e43.zip | |
Migrate Dependencies to permit Split QT 4.4 to satisfy dependencies, bug #217189
(Portage version: 2.1.4.4)
Diffstat (limited to 'sci-libs/vtk')
| -rw-r--r-- | sci-libs/vtk/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-libs/vtk/vtk-5.0.4.ebuild | 21 |
2 files changed, 13 insertions, 14 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/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() { |