| 1 |
gentoofan23 08/07/03 19:56:31 |
| 2 |
|
| 3 |
Modified: vtk-5.0.4.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Migrate Dependencies to permit Split QT 4.4 to satisfy dependencies, bug #217189 |
| 6 |
(Portage version: 2.1.4.4) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.4 sci-libs/vtk/vtk-5.0.4.ebuild |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/vtk/vtk-5.0.4.ebuild?rev=1.4&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/vtk/vtk-5.0.4.ebuild?rev=1.4&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/vtk/vtk-5.0.4.ebuild?r1=1.3&r2=1.4 |
| 14 |
|
| 15 |
Index: vtk-5.0.4.ebuild |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.0.4.ebuild,v |
| 18 |
retrieving revision 1.3 |
| 19 |
retrieving revision 1.4 |
| 20 |
diff -u -r1.3 -r1.4 |
| 21 |
--- vtk-5.0.4.ebuild 24 May 2008 18:56:05 -0000 1.3 |
| 22 |
+++ vtk-5.0.4.ebuild 3 Jul 2008 19:56:31 -0000 1.4 |
| 23 |
@@ -1,9 +1,8 @@ |
| 24 |
# Copyright 1999-2008 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.0.4.ebuild,v 1.3 2008/05/24 18:56:05 markusle Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.0.4.ebuild,v 1.4 2008/07/03 19:56:31 gentoofan23 Exp $ |
| 28 |
|
| 29 |
EAPI="1" |
| 30 |
- |
| 31 |
inherit distutils eutils flag-o-matic toolchain-funcs versionator java-pkg-opt-2 python qt3 qt4 |
| 32 |
|
| 33 |
# Short package version |
| 34 |
@@ -27,8 +26,9 @@ |
| 35 |
tcl? ( >=dev-lang/tcl-8.2.3 ) |
| 36 |
tk? ( >=dev-lang/tk-8.2.3 ) |
| 37 |
java? ( >=virtual/jre-1.5 ) |
| 38 |
- qt3? ( $(qt_min_version 3.3.4) ) |
| 39 |
- qt4? ( $(qt4_min_version 4.1) ) |
| 40 |
+ !qt4? ( qt3? ( >=x11-libs/qt-3.3.4:3 ) ) |
| 41 |
+ qt4? ( |
| 42 |
+ || ( x11-libs/qt-core:4 >=x11-libs/qt-4.1:4 ) ) |
| 43 |
dev-libs/expat |
| 44 |
media-libs/freetype |
| 45 |
media-libs/jpeg |
| 46 |
@@ -52,14 +52,6 @@ |
| 47 |
echo |
| 48 |
fi |
| 49 |
|
| 50 |
- use qt4 && use examples && \ |
| 51 |
- if ! built_with_use =x11-libs/qt-4* qt3support; then |
| 52 |
- echo |
| 53 |
- eerror 'Please emerge qt4 with USE="qt3support" to' |
| 54 |
- eerror 'build the examples under qt4!' |
| 55 |
- die "qt4 setup error" |
| 56 |
- fi |
| 57 |
- |
| 58 |
if use mpi && has_version sys-cluster/mpich2; then |
| 59 |
append-flags -DMPICH_IGNORE_CXX_SEEK |
| 60 |
if ! built_with_use sys-cluster/mpich2 cxx; then |
| 61 |
@@ -67,7 +59,10 @@ |
| 62 |
fi |
| 63 |
fi |
| 64 |
|
| 65 |
- use qt4 && qt4_pkg_setup |
| 66 |
+ if use qt4 && use examples; then |
| 67 |
+ QT4_BUILT_WITH_USE_CHECK="qt3support" |
| 68 |
+ qt4_pkg_setup |
| 69 |
+ fi |
| 70 |
} |
| 71 |
|
| 72 |
src_unpack() { |
| 73 |
|
| 74 |
|
| 75 |
|
| 76 |
1.45 sci-libs/vtk/ChangeLog |
| 77 |
|
| 78 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/vtk/ChangeLog?rev=1.45&view=markup |
| 79 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/vtk/ChangeLog?rev=1.45&content-type=text/plain |
| 80 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/vtk/ChangeLog?r1=1.44&r2=1.45 |
| 81 |
|
| 82 |
Index: ChangeLog |
| 83 |
=================================================================== |
| 84 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v |
| 85 |
retrieving revision 1.44 |
| 86 |
retrieving revision 1.45 |
| 87 |
diff -u -r1.44 -r1.45 |
| 88 |
--- ChangeLog 24 May 2008 18:56:05 -0000 1.44 |
| 89 |
+++ ChangeLog 3 Jul 2008 19:56:31 -0000 1.45 |
| 90 |
@@ -1,6 +1,10 @@ |
| 91 |
# ChangeLog for sci-libs/vtk |
| 92 |
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 93 |
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.44 2008/05/24 18:56:05 markusle Exp $ |
| 94 |
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.45 2008/07/03 19:56:31 gentoofan23 Exp $ |
| 95 |
+ |
| 96 |
+ 03 Jul 2008; Thomas Anderson <gentoofan23@g.o> vtk-5.0.4.ebuild: |
| 97 |
+ Migrate Dependencies to permit Split QT 4.4 to satisfy dependencies, bug |
| 98 |
+ #217189 |
| 99 |
|
| 100 |
24 May 2008; Markus Dittrich <markusle@g.o> |
| 101 |
+files/vtk-5.0.4-gcc4.3.patch, vtk-5.0.4.ebuild: |
| 102 |
|
| 103 |
|
| 104 |
|
| 105 |
-- |
| 106 |
gentoo-commits@l.g.o mailing list |
Archives