| 1 |
jlec 10/05/28 11:51:25 |
| 2 |
|
| 3 |
Modified: vtk-5.4.2-r1.ebuild ChangeLog metadata.xml |
| 4 |
Added: vtk-5.6.0.ebuild |
| 5 |
Log: |
| 6 |
Version Bump #321505; Added support for ogg R; prelimary support for PREFIX |
| 7 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.11 sci-libs/vtk/vtk-5.4.2-r1.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/vtk-5.4.2-r1.ebuild?rev=1.11&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/vtk-5.4.2-r1.ebuild?rev=1.11&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/vtk-5.4.2-r1.ebuild?r1=1.10&r2=1.11 |
| 15 |
|
| 16 |
Index: vtk-5.4.2-r1.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.4.2-r1.ebuild,v |
| 19 |
retrieving revision 1.10 |
| 20 |
retrieving revision 1.11 |
| 21 |
diff -u -r1.10 -r1.11 |
| 22 |
--- vtk-5.4.2-r1.ebuild 22 May 2010 09:19:22 -0000 1.10 |
| 23 |
+++ vtk-5.4.2-r1.ebuild 28 May 2010 11:51:24 -0000 1.11 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2010 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.4.2-r1.ebuild,v 1.10 2010/05/22 09:19:22 jlec Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.4.2-r1.ebuild,v 1.11 2010/05/28 11:51:24 jlec Exp $ |
| 29 |
|
| 30 |
EAPI="3" |
| 31 |
PYTHON_DEPEND="python? 2" |
| 32 |
@@ -24,7 +24,6 @@ |
| 33 |
sys-cluster/openmpi |
| 34 |
sys-cluster/lam-mpi |
| 35 |
sys-cluster/mpich2[cxx] ) ) |
| 36 |
- python? ( >=dev-lang/python-2.0 ) |
| 37 |
cg? ( media-gfx/nvidia-cg-toolkit ) |
| 38 |
tcl? ( >=dev-lang/tcl-8.2.3 ) |
| 39 |
tk? ( >=dev-lang/tk-8.2.3 ) |
| 40 |
|
| 41 |
|
| 42 |
|
| 43 |
1.68 sci-libs/vtk/ChangeLog |
| 44 |
|
| 45 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/ChangeLog?rev=1.68&view=markup |
| 46 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/ChangeLog?rev=1.68&content-type=text/plain |
| 47 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/ChangeLog?r1=1.67&r2=1.68 |
| 48 |
|
| 49 |
Index: ChangeLog |
| 50 |
=================================================================== |
| 51 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v |
| 52 |
retrieving revision 1.67 |
| 53 |
retrieving revision 1.68 |
| 54 |
diff -u -r1.67 -r1.68 |
| 55 |
--- ChangeLog 22 May 2010 09:19:22 -0000 1.67 |
| 56 |
+++ ChangeLog 28 May 2010 11:51:24 -0000 1.68 |
| 57 |
@@ -1,6 +1,14 @@ |
| 58 |
# ChangeLog for sci-libs/vtk |
| 59 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 60 |
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.67 2010/05/22 09:19:22 jlec Exp $ |
| 61 |
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.68 2010/05/28 11:51:24 jlec Exp $ |
| 62 |
+ |
| 63 |
+*vtk-5.6.0 (28 May 2010) |
| 64 |
+ |
| 65 |
+ 28 May 2010; Justin Lecher <jlec@g.o> vtk-5.4.2-r1.ebuild, |
| 66 |
+ +vtk-5.6.0.ebuild, +files/vtk-5.6.0-boost-property_map.patch, |
| 67 |
+ +files/vtk-5.6.0-cg-path.patch, +files/vtk-5.6.0-libpng14.patch: |
| 68 |
+ Version Bump #321505; Added support for ogg R; prelimary support for |
| 69 |
+ PREFIX |
| 70 |
|
| 71 |
22 May 2010; Justin Lecher <jlec@g.o> vtk-5.4.2.ebuild, |
| 72 |
vtk-5.4.2-r1.ebuild: |
| 73 |
|
| 74 |
|
| 75 |
|
| 76 |
1.6 sci-libs/vtk/metadata.xml |
| 77 |
|
| 78 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/metadata.xml?rev=1.6&view=markup |
| 79 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/metadata.xml?rev=1.6&content-type=text/plain |
| 80 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/metadata.xml?r1=1.5&r2=1.6 |
| 81 |
|
| 82 |
Index: metadata.xml |
| 83 |
=================================================================== |
| 84 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/vtk/metadata.xml,v |
| 85 |
retrieving revision 1.5 |
| 86 |
retrieving revision 1.6 |
| 87 |
diff -u -r1.5 -r1.6 |
| 88 |
--- metadata.xml 2 Oct 2008 23:37:56 -0000 1.5 |
| 89 |
+++ metadata.xml 28 May 2010 11:51:25 -0000 1.6 |
| 90 |
@@ -8,8 +8,9 @@ |
| 91 |
<name>Markus Dittrich</name> |
| 92 |
</maintainer> |
| 93 |
<use> |
| 94 |
- <flag name='patented'>Build patented classes</flag> |
| 95 |
<flag name='boost'>Add support for boost</flag> |
| 96 |
<flag name='cg'>Use nvidia's cg shaders</flag> |
| 97 |
+ <flag name='patented'>Build patented classes</flag> |
| 98 |
+ <flag name='R'>Enable support for dev-lang/R</flag> |
| 99 |
</use> |
| 100 |
</pkgmetadata> |
| 101 |
|
| 102 |
|
| 103 |
|
| 104 |
1.1 sci-libs/vtk/vtk-5.6.0.ebuild |
| 105 |
|
| 106 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/vtk-5.6.0.ebuild?rev=1.1&view=markup |
| 107 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/vtk-5.6.0.ebuild?rev=1.1&content-type=text/plain |
| 108 |
|
| 109 |
Index: vtk-5.6.0.ebuild |
| 110 |
=================================================================== |
| 111 |
# Copyright 1999-2010 Gentoo Foundation |
| 112 |
# Distributed under the terms of the GNU General Public License v2 |
| 113 |
# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.6.0.ebuild,v 1.1 2010/05/28 11:51:24 jlec Exp $ |
| 114 |
|
| 115 |
EAPI="3" |
| 116 |
PYTHON_DEPEND="python? 2" |
| 117 |
|
| 118 |
inherit eutils flag-o-matic java-pkg-opt-2 python qt4 versionator toolchain-funcs cmake-utils |
| 119 |
|
| 120 |
# Short package version |
| 121 |
SPV="$(get_version_component_range 1-2)" |
| 122 |
|
| 123 |
DESCRIPTION="The Visualization Toolkit" |
| 124 |
HOMEPAGE="http://www.vtk.org" |
| 125 |
SRC_URI="http://www.${PN}.org/files/release/${SPV}/${P}.tar.gz |
| 126 |
examples? ( http://www.${PN}.org/files/release/${SPV}/${PN}data-${PV}.tar.gz ) |
| 127 |
doc? ( http://www.${PN}.org/doc/release/${SPV}/${PN}DocHtml-${PV}.tar.gz )" |
| 128 |
|
| 129 |
LICENSE="BSD LGPL-2" |
| 130 |
KEYWORDS="~amd64 ~x86" |
| 131 |
SLOT="0" |
| 132 |
IUSE="boost cg doc examples java mpi ogg patented python qt4 tcl tk threads R" |
| 133 |
RDEPEND=" |
| 134 |
mpi? ( virtual/mpi[cxx,romio] ) |
| 135 |
cg? ( media-gfx/nvidia-cg-toolkit ) |
| 136 |
tcl? ( >=dev-lang/tcl-8.2.3 ) |
| 137 |
tk? ( >=dev-lang/tk-8.2.3 ) |
| 138 |
java? ( >=virtual/jre-1.5 ) |
| 139 |
qt4? ( |
| 140 |
x11-libs/qt-core:4 |
| 141 |
x11-libs/qt-opengl:4 |
| 142 |
x11-libs/qt-gui:4 |
| 143 |
x11-libs/qt-sql ) |
| 144 |
examples? ( |
| 145 |
x11-libs/qt-core:4[qt3support] |
| 146 |
x11-libs/qt-gui:4[qt3support] ) |
| 147 |
R? ( dev-lang/R ) |
| 148 |
dev-libs/expat |
| 149 |
dev-libs/libxml2 |
| 150 |
media-libs/freetype |
| 151 |
media-libs/jpeg |
| 152 |
media-libs/libpng |
| 153 |
media-libs/tiff |
| 154 |
virtual/opengl |
| 155 |
x11-libs/libXmu" |
| 156 |
|
| 157 |
DEPEND="${RDEPEND} |
| 158 |
java? ( >=virtual/jdk-1.5 ) |
| 159 |
boost? ( >=dev-libs/boost-1.40.0 ) |
| 160 |
mpi? ( >=dev-util/cmake-2.8 ) |
| 161 |
>=dev-util/cmake-2.6" |
| 162 |
|
| 163 |
S="${WORKDIR}"/VTK |
| 164 |
|
| 165 |
pkg_setup() { |
| 166 |
echo |
| 167 |
einfo "Please note that the VTK build occasionally fails when" |
| 168 |
einfo "using parallel make. Hence, if you experience a build" |
| 169 |
einfo "failure please try re-emerging with MAKEOPTS=\"-j1\" first." |
| 170 |
echo |
| 171 |
|
| 172 |
java-pkg-opt-2_pkg_setup |
| 173 |
|
| 174 |
use python && python_set_active_version 2 |
| 175 |
use qt4 && qt4_pkg_setup |
| 176 |
} |
| 177 |
|
| 178 |
src_prepare() { |
| 179 |
epatch "${FILESDIR}"/${P}-cg-path.patch |
| 180 |
epatch "${FILESDIR}"/${PN}-5.2.0-tcl-install.patch |
| 181 |
epatch "${FILESDIR}"/${P}-boost-property_map.patch |
| 182 |
epatch "${FILESDIR}"/${P}-libpng14.patch |
| 183 |
sed -e "s:@VTK_TCL_LIBRARY_DIR@:/usr/$(get_libdir):" \ |
| 184 |
-i Wrapping/Tcl/pkgIndex.tcl.in \ |
| 185 |
|| die "Failed to fix tcl pkgIndex file" |
| 186 |
} |
| 187 |
|
| 188 |
src_configure() { |
| 189 |
# general configuration |
| 190 |
local mycmakeargs=( |
| 191 |
-Wno-dev |
| 192 |
-DVTK_INSTALL_PACKAGE_DIR=/$(get_libdir)/${PN}-${SPV} |
| 193 |
-DCMAKE_SKIP_RPATH=YES |
| 194 |
-DVTK_DIR="${S}" |
| 195 |
-DVTK_INSTALL_LIB_DIR=/$(get_libdir)/ |
| 196 |
-DVTK_DATA_ROOT:PATH="${EPREFIX}"/usr/share/${PN}/data |
| 197 |
-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr |
| 198 |
-DBUILD_SHARED_LIBS=ON |
| 199 |
-DVTK_USE_SYSTEM_FREETYPE=ON |
| 200 |
-DVTK_USE_SYSTEM_JPEG=ON |
| 201 |
-DVTK_USE_SYSTEM_PNG=ON |
| 202 |
-DVTK_USE_SYSTEM_TIFF=ON |
| 203 |
-DVTK_USE_SYSTEM_ZLIB=ON |
| 204 |
-DVTK_USE_SYSTEM_EXPAT=ON |
| 205 |
-DVTK_USE_SYSTEM_LIBXML2=ON |
| 206 |
-DBUILD_TESTING=OFF |
| 207 |
-DBUILD_EXAMPLES=OFF |
| 208 |
-DVTK_USE_HYBRID=ON |
| 209 |
-DVTK_USE_GL2PS=ON |
| 210 |
-DVTK_USE_RENDERING=ON) |
| 211 |
|
| 212 |
# use flag triggered options |
| 213 |
mycmakeargs+=( |
| 214 |
$(cmake-utils_use boost VTK_USE_BOOST) |
| 215 |
$(cmake-utils_use cg VTK_USE_CG_SHADERS) |
| 216 |
$(cmake-utils_use doc DOCUMENTATION_HTML_HELP) |
| 217 |
$(cmake-utils_use_build doc DOCUMENTATION) |
| 218 |
$(cmake-utils_use java VTK_USE_JAVA) |
| 219 |
$(cmake-utils_use mpi VTK_USE_MPI) |
| 220 |
$(cmake-utils_use ogg VTK_USE_OGGTHEORA_ENCODER) |
| 221 |
$(cmake-utils_use patented VTK_USE_PATENTED) |
| 222 |
$(cmake-utils_use qt4 VTK_USE_QT) |
| 223 |
$(cmake-utils_use tcl VTK_WRAP_TCL) |
| 224 |
$(cmake-utils_use tk VTK_USE_TK) |
| 225 |
$(cmake-utils_use threads VTK_USE_PARALLEL) |
| 226 |
$(cmake-utils_use R VTK_USE_GNU_R) ) |
| 227 |
|
| 228 |
# mpi needs the parallel framework |
| 229 |
if use mpi && use !threads; then |
| 230 |
mycmakeargs+=(-DVTK_USE_PARALLEL=ON) |
| 231 |
fi |
| 232 |
|
| 233 |
if use java; then |
| 234 |
mycmakeargs+=( |
| 235 |
-DVTK_WRAP_JAVA=ON |
| 236 |
-DJAVA_AWT_INCLUDE_PATH=`java-config -O`/include |
| 237 |
-DJAVA_INCLUDE_PATH:PATH=`java-config -O`/include |
| 238 |
-DJAVA_INCLUDE_PATH2:PATH=`java-config -O`/include/linux) |
| 239 |
|
| 240 |
if [ "${ARCH}" == "amd64" ]; then |
| 241 |
mycmakeargs+=(-DJAVA_AWT_LIBRARY=`java-config -O`/jre/lib/${ARCH}/libjawt.so) |
| 242 |
else |
| 243 |
mycmakeargs+=(-DJAVA_AWT_LIBRARY:PATH=`java-config -O`/jre/lib/i386/libjawt.so) |
| 244 |
fi |
| 245 |
fi |
| 246 |
|
| 247 |
if use python; then |
| 248 |
mycmakeargs+=( |
| 249 |
-DVTK_WRAP_PYTHON=ON |
| 250 |
-DPYTHON_INCLUDE_PATH=$(python_get_includedir) |
| 251 |
-DPYTHON_LIBRARY=$(python_get_library) |
| 252 |
-DVTK_PYTHON_SETUP_ARGS:STRING=--root="${D}") |
| 253 |
fi |
| 254 |
|
| 255 |
if use qt4 ; then |
| 256 |
mycmakeargs+=( |
| 257 |
-DVTK_USE_GUISUPPORT=ON |
| 258 |
-DVTK_USE_QVTK=ON |
| 259 |
-DVTK_USE_QVTK_QTOPENGL=ON |
| 260 |
-DQT_WRAP_CPP=ON |
| 261 |
-DQT_WRAP_UI=ON |
| 262 |
-DVTK_INSTALL_QT_DIR=/$(get_libdir)/qt4/plugins/${PN} |
| 263 |
-DDESIRED_QT_VERSION=4 |
| 264 |
-DQT_MOC_EXECUTABLE="${EPREFIX}"/usr/bin/moc |
| 265 |
-DQT_UIC_EXECUTABLE="${EPREFIX}"/usr/bin/uic |
| 266 |
-DQT_INCLUDE_DIR="${EPREFIX}"/usr/include/qt4 |
| 267 |
-DQT_QMAKE_EXECUTABLE="${EPREFIX}"/usr/bin/qmake) |
| 268 |
fi |
| 269 |
|
| 270 |
cmake-utils_src_configure |
| 271 |
} |
| 272 |
|
| 273 |
src_install() { |
| 274 |
cmake-utils_src_install |
| 275 |
|
| 276 |
# install docs |
| 277 |
dohtml "${S}"/README.html || die "Failed to install docs" |
| 278 |
|
| 279 |
# install Tcl docs |
| 280 |
docinto vtk_tcl |
| 281 |
dodoc "${S}"/Wrapping/Tcl/README || \ |
| 282 |
die "Failed to install Tcl docs" |
| 283 |
|
| 284 |
# install examples |
| 285 |
if use examples; then |
| 286 |
dodir /usr/share/${PN} || \ |
| 287 |
die "Failed to create data/examples directory" |
| 288 |
|
| 289 |
cp -pPR "${S}"/Examples "${D}"/usr/share/${PN}/examples || \ |
| 290 |
die "Failed to copy example files" |
| 291 |
|
| 292 |
# fix example's permissions |
| 293 |
find "${D}"/usr/share/${PN}/examples -type d -exec \ |
| 294 |
chmod 0755 {} \; || \ |
| 295 |
die "Failed to fix example directories permissions" |
| 296 |
find "${D}"/usr/share/${PN}/examples -type f -exec \ |
| 297 |
chmod 0644 {} \; || \ |
| 298 |
die "Failed to fix example files permissions" |
| 299 |
|
| 300 |
cp -pPR "${WORKDIR}"/VTKData "${D}"/usr/share/${PN}/data || \ |
| 301 |
die "Failed to copy data files" |
| 302 |
|
| 303 |
# fix data's permissions |
| 304 |
find "${D}"/usr/share/${PN}/data -type d -exec \ |
| 305 |
chmod 0755 {} \; || \ |
| 306 |
die "Failed to fix data directories permissions" |
| 307 |
find "${D}"/usr/share/${PN}/data -type f -exec \ |
| 308 |
chmod 0644 {} \; || \ |
| 309 |
die "Failed to fix data files permissions" |
| 310 |
fi |
| 311 |
|
| 312 |
#install big docs |
| 313 |
if use doc; then |
| 314 |
cd "${WORKDIR}"/html |
| 315 |
rm -f *.md5 || die "Failed to remove superfluous hashes" |
| 316 |
einfo "Installing API docs. This may take some time." |
| 317 |
insinto "/usr/share/doc/${PF}/api-docs" |
| 318 |
doins -r ./* || die "Failed to install docs" |
| 319 |
fi |
| 320 |
|
| 321 |
# environment |
| 322 |
echo "VTK_DATA_ROOT=/usr/share/${PN}/data" >> "${T}"/40${PN} |
| 323 |
echo "VTK_DIR=/usr/$(get_libdir)/${PN}-${SPV}" >> "${T}"/40${PN} |
| 324 |
echo "VTKHOME=/usr" >> "${T}"/40${PN} |
| 325 |
doenvd "${T}"/40${PN} |
| 326 |
} |
| 327 |
|
| 328 |
pkg_postinst() { |
| 329 |
if use patented; then |
| 330 |
ewarn "Using patented code in VTK may require a license." |
| 331 |
ewarn "For more information, please read:" |
| 332 |
ewarn "http://public.kitware.com/cgi-bin/vtkfaq?req=show&file=faq07.005.htp" |
| 333 |
fi |
| 334 |
|
| 335 |
if use python; then |
| 336 |
python_mod_optimize vtk |
| 337 |
fi |
| 338 |
} |
| 339 |
|
| 340 |
pkg_postrm() { |
| 341 |
if use python; then |
| 342 |
python_mod_cleanup vtk |
| 343 |
fi |
| 344 |
} |
Archives