summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2010-07-11 15:03:06 +0000
committerJustin Lecher <jlec@gentoo.org>2010-07-11 15:03:06 +0000
commit03cc3fd72d69206f9c73582c1a6ea542b0f66451 (patch)
tree8852f889009843dfff33e41cf1d4583f37c86696 /sci-libs/vtk
parentDrop hppa keywords and old versions per bug 324511 (diff)
downloadgentoo-2-03cc3fd72d69206f9c73582c1a6ea542b0f66451.tar.gz
gentoo-2-03cc3fd72d69206f9c73582c1a6ea542b0f66451.tar.bz2
gentoo-2-03cc3fd72d69206f9c73582c1a6ea542b0f66451.zip
Imported support for dbs from sci overlay, 327601, thanks Francois Bissey
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'sci-libs/vtk')
-rw-r--r--sci-libs/vtk/ChangeLog6
-rw-r--r--sci-libs/vtk/files/vtk-5.6.0-odbc.patch12
-rw-r--r--sci-libs/vtk/vtk-5.6.0-r2.ebuild27
3 files changed, 35 insertions, 10 deletions
diff --git a/sci-libs/vtk/ChangeLog b/sci-libs/vtk/ChangeLog
index 99a56438b9be..ffe1e0e957f1 100644
--- a/sci-libs/vtk/ChangeLog
+++ b/sci-libs/vtk/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sci-libs/vtk
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.76 2010/06/17 02:25:18 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.77 2010/07/11 15:03:05 jlec Exp $
+
+ 11 Jul 2010; Justin Lecher <jlec@gentoo.org> vtk-5.6.0-r2.ebuild,
+ +files/vtk-5.6.0-odbc.patch:
+ Imported support for dbs from sci overlay, 327601, thanks yFrancois Bissey
17 Jun 2010; Justin Bronder <jsbronder@gentoo.org> vtk-5.4.2-r1.ebuild:
Remove sys-cluster/lam-mpi handling, see #324415.
diff --git a/sci-libs/vtk/files/vtk-5.6.0-odbc.patch b/sci-libs/vtk/files/vtk-5.6.0-odbc.patch
new file mode 100644
index 000000000000..be24af11ac33
--- /dev/null
+++ b/sci-libs/vtk/files/vtk-5.6.0-odbc.patch
@@ -0,0 +1,12 @@
+diff -Naur CMake/FindODBC.cmake.orig CMake/FindODBC.cmake
+--- CMake/FindODBC.cmake.orig 2008-10-08 13:51:36.000000000 -0400
++++ CMake/FindODBC.cmake 2010-01-21 22:11:26.000000000 -0500
+@@ -30,7 +30,7 @@
+ )
+
+ FIND_LIBRARY( ODBC_LIBRARY
+- NAMES iodbc unixodbc
++ NAMES iodbc unixodbc odbc
+ PATHS
+ /usr/lib
+ /usr/lib/odbc
diff --git a/sci-libs/vtk/vtk-5.6.0-r2.ebuild b/sci-libs/vtk/vtk-5.6.0-r2.ebuild
index 10e388da143c..8da62a026137 100644
--- a/sci-libs/vtk/vtk-5.6.0-r2.ebuild
+++ b/sci-libs/vtk/vtk-5.6.0-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.6.0-r2.ebuild,v 1.3 2010/06/07 17:45:09 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.6.0-r2.ebuild,v 1.4 2010/07/11 15:03:05 jlec Exp $
EAPI="3"
PYTHON_DEPEND="python? 2"
@@ -19,23 +19,27 @@ SRC_URI="http://www.${PN}.org/files/release/${SPV}/${P}.tar.gz
LICENSE="BSD LGPL-2"
KEYWORDS="~amd64 ~x86"
SLOT="0"
-IUSE="boost cg doc examples java mpi patented python qt4 tcl theora tk threads R"
+IUSE="boost cg doc examples ffmpeg java mpi mysql odbc patented postgres python qt4 tcl theora tk threads R"
RDEPEND="
- mpi? ( virtual/mpi[cxx,romio] )
cg? ( media-gfx/nvidia-cg-toolkit )
- tcl? ( >=dev-lang/tcl-8.2.3 )
- tk? ( >=dev-lang/tk-8.2.3 )
+ examples? (
+ x11-libs/qt-core:4[qt3support]
+ x11-libs/qt-gui:4[qt3support] )
+ ffmpeg? ( media-video/ffmpeg )
java? ( >=virtual/jre-1.5 )
+ mpi? ( virtual/mpi[cxx,romio] )
+ mysql? ( virtual/mysql )
+ odbc? ( dev-db/unixODBC )
+ postgres? ( dev-db/postgresql-base )
qt4? (
x11-libs/qt-core:4
x11-libs/qt-gui:4
x11-libs/qt-opengl:4
x11-libs/qt-sql:4
x11-libs/qt-webkit:4 )
- examples? (
- x11-libs/qt-core:4[qt3support]
- x11-libs/qt-gui:4[qt3support] )
+ tcl? ( >=dev-lang/tcl-8.2.3 )
theora? ( media-libs/libtheora )
+ tk? ( >=dev-lang/tk-8.2.3 )
R? ( dev-lang/R )
dev-libs/expat
dev-libs/libxml2
@@ -77,6 +81,7 @@ src_prepare() {
epatch "${FILESDIR}"/${P}-boost-property_map.patch
epatch "${FILESDIR}"/${P}-libpng14.patch
epatch "${FILESDIR}"/${P}-R.patch
+ epatch "${FILESDIR}"/${P}-odbc.patch
sed -e "s:@VTK_TCL_LIBRARY_DIR@:/usr/$(get_libdir):" \
-i Wrapping/Tcl/pkgIndex.tcl.in \
|| die "Failed to fix tcl pkgIndex file"
@@ -118,9 +123,13 @@ src_configure() {
$(cmake-utils_use qt4 VTK_USE_QT)
$(cmake-utils_use tcl VTK_WRAP_TCL)
$(cmake-utils_use theora VTK_USE_OGGTHEORA_ENCODER)
+ $(cmake-utils_use ffmpeg VTK_USE_FFMPEG_ENCODER)
$(cmake-utils_use tk VTK_USE_TK)
$(cmake-utils_use threads VTK_USE_PARALLEL)
- $(cmake-utils_use R VTK_USE_GNU_R) )
+ $(cmake-utils_use R VTK_USE_GNU_R)
+ $(cmake-utils_use mysql VTK_USE_MYSQL)
+ $(cmake-utils_use postgres VTK_USE_POSTGRES)
+ $(cmake-utils_use odbc VTK_USE_ODBC) )
use theora &&
mycmakeargs+=(-DVTK_USE_SYSTEM_OGGTHEORA=ON)