Imported support for dbs from sci overlay, 327601, thanks Francois Bissey

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 42 insertions, 16 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/Manifest b/sci-libs/vtk/Manifest
index 0425a1314802..c95da42608cf 100644
--- a/sci-libs/vtk/Manifest
+++ b/sci-libs/vtk/Manifest
@@ -11,6 +11,7 @@ AUX vtk-5.6.0-R.patch 2463 RMD160 be1ca5c2bd56ce2bf14d23817c1fe69901503345 SHA1
 AUX vtk-5.6.0-boost-property_map.patch 547 RMD160 3ae309e296febc8a5c5d86795fd7766fe12dcdf8 SHA1 e97b4273d94c1647c959469f6f1829101fabb108 SHA256 de594eb23b9a7c18c4c6bb67b507dd627e580fcc7e2ba8c151da94bf2949d3f1
 AUX vtk-5.6.0-cg-path.patch 1106 RMD160 a6cb9f4855dfe417d83e7bba04a02da88af869a6 SHA1 fa5afd4b1a943f255e2f20fa35f440518f9d9d95 SHA256 7ad4eb9a82664a2e9c51d8763e594634027051b54ce48bb1c2fca6d1a42635c9
 AUX vtk-5.6.0-libpng14.patch 734 RMD160 d54626d332130fe242b3a5b1300a650e45763d29 SHA1 e6480b68a14345d7dfa78f6d37ff7301366d99d8 SHA256 81565709c8cfb4df3c28d69df8094d15923d824345330ab5ba101a9780e6e9f9
+AUX vtk-5.6.0-odbc.patch 328 RMD160 888680f3e503f8ce624c73df9bb0402309c1384b SHA1 02022f5f345ccfe8a13d99201828edb0371d7cc5 SHA256 eca7a508fcd07eb6d40e609e3670d12ce2d2d39dda11b60f418acd279ca03c25
 DIST vtk-5.4.2.tar.gz 18265310 RMD160 607df8babe7413b92a5bd4d8c264fd69798df83f SHA1 508106a15c32326aa9ac737c7f0e7212c150d55f SHA256 037c0582ee7483e0b495e45a00c4f08784691ef82c4ea159ef86731c3beda73d
 DIST vtk-5.6.0.tar.gz 20709970 RMD160 b7abf3b9bb14a3db81608c7aa2721935ae653295 SHA1 355209c485304f1b0feefcda3585d45217ffd230 SHA256 2987938ad906c5fd30ddbf60889f899d1dd8c61d80320c55ac1acadc00a95d3e
 DIST vtkDocHtml-5.4.2.tar.gz 229828672 RMD160 d6372984b74ede33713501219fecd6768edcfad3 SHA1 13da1373bb95f34b1f868b307f0e84fef6626020 SHA256 54dfe1c242c488db1d1099bbf9114f49ee2bd07859c067e77e2d6bd3c077ee25
@@ -18,13 +19,13 @@ DIST vtkDocHtml-5.6.0.tar.gz 103149113 RMD160 da6a562345c4c143470ddcc8b926820eec
 DIST vtkdata-5.4.2.tar.gz 52810062 RMD160 0cc24fc7a6a9bb80c619a0555eb288cc97554001 SHA1 5030523c0a9e17c47bf94fe9005e5c91069a571a SHA256 84c9895b72aec96977b8043a4be26ff58e14ae04ab2be9f19a02ca613dc3be26
 DIST vtkdata-5.6.0.tar.gz 76716069 RMD160 8499816f6d714408c0f7f584fb4d781f4426e444 SHA1 e0aa26dafd653da1db21fc97ce15aa0599d9c5ad SHA256 e6eed8e5c8d8410d7c7cf007de8c5b56bde77d38fa0522c1ac7751138323c9cf
 EBUILD vtk-5.4.2-r1.ebuild 6385 RMD160 1530aa9f606111429a4ce728eb6c3c023ea90043 SHA1 6b6a6152e0eb2d00ee9e349d539773a7dc47a4c5 SHA256 ca7eff8edc8684323a49294cf572eb6e73105d53f8c1b9c68e9b9c1cf93a4130
-EBUILD vtk-5.6.0-r2.ebuild 6845 RMD160 baff7613cfc9ae8edc1ec058c539eb9be2c4f288 SHA1 113fc220e15c24bcb5bdbb52b77cb2b7b655a489 SHA256 2006433a443134e3a3ca34520f2a5e56973bb8e42567c1edd1cfe3f1f6369b1f
-MISC ChangeLog 12614 RMD160 a108a3a7508b669f9bd15f9a3255b1565f3cb9c4 SHA1 a18b03bafef9392cf5b723e8ffba445354e77693 SHA256 7be6087d1efae90bb00764651a574391d73ea2e429d5ff03435db9bfe33be53e
+EBUILD vtk-5.6.0-r2.ebuild 7211 RMD160 2428170e79a7c7e4f9b05bd6b243a83d3651a97d SHA1 ef25d90805e7b699913a15cb6db3ff2bde039f19 SHA256 aa3f95d64bd8e491460c0c728eca48f55641309408a062a3dfebea6ffaf28c52
+MISC ChangeLog 12786 RMD160 5378f8dca11f9309cd5c06cd49a39392e7ae3582 SHA1 1d9908807629775ac1ada0c4b59f908e15e79ddb SHA256 29cad13cf4809a49b319298f27aa6f8c8df36e6968b3416eae0ab662adf94b53
 MISC metadata.xml 574 RMD160 ccd927f3a387710bbf53f3f0f88c971dc814c605 SHA1 8160c080306039e0b3b18ced75ae6b81b8590ddc SHA256 9a3ca872da01db519865e7753e9c0922fe56972f4d6e27cbf5622afd41d23300
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwZh5MACgkQ4MrvBE1wQ8kXQQCfSjquWc9hOiUf195NE+HqkMZX
-h9UAniN972bkWmqZmfcgVlvUWf/FAcQi
-=e1fs
+iEYEARECAAYFAkw53TAACgkQgAnW8HDreRbAPgCdGvP20VT2IVzjWtla5Qe0HKE6
+S2EAnA3uGbH4D1nw0FP5WasHFSkRmJj5
+=REub
 -----END PGP SIGNATURE-----
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)