| 1 |
jlec 10/02/11 07:38:20 |
| 2 |
|
| 3 |
Modified: vtk-5.4.2-r1.ebuild vtk-5.4.2.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Removed qt3 support as it is no longer in the tree |
| 6 |
(Portage version: 2.2_rc62/cvs/Linux i686) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.4 sci-libs/vtk/vtk-5.4.2-r1.ebuild |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/vtk/vtk-5.4.2-r1.ebuild?rev=1.4&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/vtk/vtk-5.4.2-r1.ebuild?rev=1.4&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/vtk/vtk-5.4.2-r1.ebuild?r1=1.3&r2=1.4 |
| 14 |
|
| 15 |
Index: vtk-5.4.2-r1.ebuild |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.4.2-r1.ebuild,v |
| 18 |
retrieving revision 1.3 |
| 19 |
retrieving revision 1.4 |
| 20 |
diff -u -r1.3 -r1.4 |
| 21 |
--- vtk-5.4.2-r1.ebuild 21 Jan 2010 23:38:26 -0000 1.3 |
| 22 |
+++ vtk-5.4.2-r1.ebuild 11 Feb 2010 07:38:19 -0000 1.4 |
| 23 |
@@ -1,6 +1,6 @@ |
| 24 |
# Copyright 1999-2010 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.4.2-r1.ebuild,v 1.3 2010/01/21 23:38:26 markusle Exp $ |
| 27 |
+# $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 $ |
| 28 |
|
| 29 |
EAPI="2" |
| 30 |
inherit eutils flag-o-matic toolchain-funcs versionator java-pkg-opt-2 python qt3 qt4 cmake-utils |
| 31 |
@@ -17,7 +17,7 @@ |
| 32 |
LICENSE="BSD LGPL-2" |
| 33 |
KEYWORDS="~amd64 ~x86" |
| 34 |
SLOT="0" |
| 35 |
-IUSE="boost cg doc examples mpi patented python tcl tk threads qt3 qt4" |
| 36 |
+IUSE="boost cg doc examples mpi patented python tcl tk threads qt4" |
| 37 |
RDEPEND="mpi? ( || ( |
| 38 |
sys-cluster/openmpi |
| 39 |
sys-cluster/lam-mpi |
| 40 |
@@ -27,7 +27,6 @@ |
| 41 |
tcl? ( >=dev-lang/tcl-8.2.3 ) |
| 42 |
tk? ( >=dev-lang/tk-8.2.3 ) |
| 43 |
java? ( >=virtual/jre-1.5 ) |
| 44 |
- !qt4? ( qt3? ( >=x11-libs/qt-3.3.4:3 ) ) |
| 45 |
qt4? ( x11-libs/qt-core:4 |
| 46 |
x11-libs/qt-opengl:4 |
| 47 |
x11-libs/qt-gui:4 ) |
| 48 |
@@ -58,12 +57,6 @@ |
| 49 |
epause 5 |
| 50 |
|
| 51 |
java-pkg-opt-2_pkg_setup |
| 52 |
- if use qt3 && use qt4; then |
| 53 |
- echo |
| 54 |
- ewarn "qt3 and qt4 support for vtk are mutually exclusive and" |
| 55 |
- ewarn "qt4 support has therefore been enabled by default." |
| 56 |
- echo |
| 57 |
- fi |
| 58 |
|
| 59 |
if use qt4; then |
| 60 |
qt4_pkg_setup |
| 61 |
@@ -143,7 +136,7 @@ |
| 62 |
-DVTK_PYTHON_SETUP_ARGS:STRING=--root="${D}") |
| 63 |
fi |
| 64 |
|
| 65 |
- if use qt3 || use qt4 ; then |
| 66 |
+ if use qt4 ; then |
| 67 |
mycmakeargs+=( |
| 68 |
-DVTK_USE_GUISUPPORT=ON |
| 69 |
-DVTK_USE_QVTK=ON |
| 70 |
@@ -152,20 +145,6 @@ |
| 71 |
-DQT_WRAP_UI=ON) |
| 72 |
fi |
| 73 |
|
| 74 |
- # these options we only enable if the use request qt3 |
| 75 |
- # only. In case of qt3 && qt4 or qt4 only qt4 always |
| 76 |
- # overrides qt3 |
| 77 |
- if use qt3 && use !qt4; then |
| 78 |
- mycmakeargs+=( |
| 79 |
- -DVTK_INSTALL_QT_DIR=/qt/3/plugins/${PN} |
| 80 |
- -DDESIRED_QT_VERSION=3 |
| 81 |
- -DQT_MOC_EXECUTABLE=/usr/qt/3/bin/moc |
| 82 |
- -DQT_UIC_EXECUTABLE=/usr/qt/3/bin/uic |
| 83 |
- -DQT_INCLUDE_DIR=/usr/qt/3/include |
| 84 |
- -DQT_QT_LIBRARY=/usr/qt/3/$(get_libdir)/libqt.so |
| 85 |
- -DQT_QMAKE_EXECUTABLE=/usr/qt/3/bin/qmake) |
| 86 |
- fi |
| 87 |
- |
| 88 |
if use qt4; then |
| 89 |
mycmakeargs+=( |
| 90 |
-DVTK_INSTALL_QT_DIR=/$(get_libdir)/qt4/plugins/${PN} |
| 91 |
|
| 92 |
|
| 93 |
|
| 94 |
1.6 sci-libs/vtk/vtk-5.4.2.ebuild |
| 95 |
|
| 96 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/vtk/vtk-5.4.2.ebuild?rev=1.6&view=markup |
| 97 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/vtk/vtk-5.4.2.ebuild?rev=1.6&content-type=text/plain |
| 98 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/vtk/vtk-5.4.2.ebuild?r1=1.5&r2=1.6 |
| 99 |
|
| 100 |
Index: vtk-5.4.2.ebuild |
| 101 |
=================================================================== |
| 102 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.4.2.ebuild,v |
| 103 |
retrieving revision 1.5 |
| 104 |
retrieving revision 1.6 |
| 105 |
diff -u -r1.5 -r1.6 |
| 106 |
--- vtk-5.4.2.ebuild 17 Dec 2009 23:43:31 -0000 1.5 |
| 107 |
+++ vtk-5.4.2.ebuild 11 Feb 2010 07:38:19 -0000 1.6 |
| 108 |
@@ -1,6 +1,6 @@ |
| 109 |
-# Copyright 1999-2009 Gentoo Foundation |
| 110 |
+# Copyright 1999-2010 Gentoo Foundation |
| 111 |
# Distributed under the terms of the GNU General Public License v2 |
| 112 |
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.4.2.ebuild,v 1.5 2009/12/17 23:43:31 markusle Exp $ |
| 113 |
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.4.2.ebuild,v 1.6 2010/02/11 07:38:19 jlec Exp $ |
| 114 |
|
| 115 |
EAPI="2" |
| 116 |
inherit distutils eutils flag-o-matic toolchain-funcs versionator java-pkg-opt-2 python qt3 qt4 |
| 117 |
@@ -17,7 +17,7 @@ |
| 118 |
LICENSE="BSD LGPL-2" |
| 119 |
KEYWORDS="~amd64 ~x86" |
| 120 |
SLOT="0" |
| 121 |
-IUSE="boost cg doc examples mpi patented python tcl tk threads qt3 qt4" |
| 122 |
+IUSE="boost cg doc examples mpi patented python tcl tk threads qt4" |
| 123 |
RDEPEND="mpi? ( || ( |
| 124 |
sys-cluster/openmpi |
| 125 |
sys-cluster/lam-mpi |
| 126 |
@@ -27,7 +27,6 @@ |
| 127 |
tcl? ( >=dev-lang/tcl-8.2.3 ) |
| 128 |
tk? ( >=dev-lang/tk-8.2.3 ) |
| 129 |
java? ( >=virtual/jre-1.5 ) |
| 130 |
- !qt4? ( qt3? ( >=x11-libs/qt-3.3.4:3 ) ) |
| 131 |
qt4? ( x11-libs/qt-core:4 |
| 132 |
x11-libs/qt-opengl:4 |
| 133 |
x11-libs/qt-gui:4 ) |
| 134 |
@@ -58,13 +57,6 @@ |
| 135 |
epause 5 |
| 136 |
|
| 137 |
java-pkg-opt-2_pkg_setup |
| 138 |
- if use qt3 && use qt4; then |
| 139 |
- echo |
| 140 |
- ewarn "qt3 and qt4 support for vtk are mutually exclusive and" |
| 141 |
- ewarn "qt4 support has therefore been enabled by default." |
| 142 |
- echo |
| 143 |
- fi |
| 144 |
- |
| 145 |
if use qt4; then |
| 146 |
qt4_pkg_setup |
| 147 |
fi |
| 148 |
@@ -138,24 +130,12 @@ |
| 149 |
CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_PYTHON_SETUP_ARGS:STRING=\"--prefix=${D}/usr\"" |
| 150 |
fi |
| 151 |
|
| 152 |
- if use qt3 || use qt4 ; then |
| 153 |
+ if use qt4 ; then |
| 154 |
CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_GUISUPPORT:BOOL=ON" |
| 155 |
CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_QVTK:BOOL=ON" |
| 156 |
CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_QVTK_QTOPENGL:BOOL=ON" |
| 157 |
CMAKE_VARIABLES="${CMAKE_VARIABLES} -DQT_WRAP_CPP:BOOL=ON" |
| 158 |
CMAKE_VARIABLES="${CMAKE_VARIABLES} -DQT_WRAP_UI:BOOL=ON" |
| 159 |
- fi |
| 160 |
- |
| 161 |
- if use qt3; then |
| 162 |
- CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_INSTALL_QT_DIR:PATH=/qt/3/plugins/${PN}" |
| 163 |
- CMAKE_VARIABLES="${CMAKE_VARIABLES} -DDESIRED_QT_VERSION:STRING=3" |
| 164 |
- CMAKE_VARIABLES="${CMAKE_VARIABLES} -DQT_MOC_EXECUTABLE:FILEPATH=/usr/qt/3/bin/moc" |
| 165 |
- CMAKE_VARIABLES="${CMAKE_VARIABLES} -DQT_UIC_EXECUTABLE:FILEPATH=/usr/qt/3/bin/uic" |
| 166 |
- CMAKE_VARIABLES="${CMAKE_VARIABLES} -DQT_INCLUDE_DIR:PATH=/usr/qt/3/include" |
| 167 |
- CMAKE_VARIABLES="${CMAKE_VARIABLES} -DQT_QMAKE_EXECUTABLE:PATH=/usr/qt/3/bin/qmake" |
| 168 |
- fi |
| 169 |
- |
| 170 |
- if use qt4; then |
| 171 |
CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_INSTALL_QT_DIR:PATH=/$(get_libdir)/qt4/plugins/${PN}" |
| 172 |
CMAKE_VARIABLES="${CMAKE_VARIABLES} -DDESIRED_QT_VERSION:STRING=4" |
| 173 |
CMAKE_VARIABLES="${CMAKE_VARIABLES} -DQT_MOC_EXECUTABLE:FILEPATH=/usr/bin/moc" |
| 174 |
|
| 175 |
|
| 176 |
|
| 177 |
1.62 sci-libs/vtk/ChangeLog |
| 178 |
|
| 179 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/vtk/ChangeLog?rev=1.62&view=markup |
| 180 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/vtk/ChangeLog?rev=1.62&content-type=text/plain |
| 181 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/vtk/ChangeLog?r1=1.61&r2=1.62 |
| 182 |
|
| 183 |
Index: ChangeLog |
| 184 |
=================================================================== |
| 185 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v |
| 186 |
retrieving revision 1.61 |
| 187 |
retrieving revision 1.62 |
| 188 |
diff -u -r1.61 -r1.62 |
| 189 |
--- ChangeLog 21 Jan 2010 23:38:26 -0000 1.61 |
| 190 |
+++ ChangeLog 11 Feb 2010 07:38:19 -0000 1.62 |
| 191 |
@@ -1,6 +1,10 @@ |
| 192 |
# ChangeLog for sci-libs/vtk |
| 193 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 194 |
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.61 2010/01/21 23:38:26 markusle Exp $ |
| 195 |
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.62 2010/02/11 07:38:19 jlec Exp $ |
| 196 |
+ |
| 197 |
+ 11 Feb 2010; Justin Lecher (jlec) <jlec@×××××××××.net> vtk-5.4.2.ebuild, |
| 198 |
+ vtk-5.4.2-r1.ebuild: |
| 199 |
+ Removed qt3 support as it is no longer in the tree |
| 200 |
|
| 201 |
21 Jan 2010; Markus Dittrich <markusle@g.o> vtk-5.4.2-r1.ebuild, |
| 202 |
+files/vtk-5.4.2-boost-property_map.patch: |
Archives