[gentoo-commits] proj/qt:master commit in: x11-libs/qt-sql/

["Davide Pesavento" <pesa@gentoo.org>]

commit:     b78c84938bdf7778e09a2d312c5b6236d0158298
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Mon May 14 17:06:07 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon May 14 17:06:07 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=b78c8493

[x11-libs/qt-sql] Sync with portage wrt Oracle db support.

(Portage version: 2.2.0_alpha104/git/Linux x86_64, unsigned Manifest commit)

---
 x11-libs/qt-sql/qt-sql-4.8.9999.ebuild |   21 +++++++++++----------
 1 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/x11-libs/qt-sql/qt-sql-4.8.9999.ebuild b/x11-libs/qt-sql/qt-sql-4.8.9999.ebuild
index d783419..a992e42 100644
--- a/x11-libs/qt-sql/qt-sql-4.8.9999.ebuild
+++ b/x11-libs/qt-sql/qt-sql-4.8.9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-inherit qt4-build
+inherit multilib qt4-build
 
 DESCRIPTION="The SQL module for the Qt toolkit"
 SLOT="4"
@@ -13,10 +13,10 @@ if [[ ${QT4_BUILD_TYPE} == live ]]; then
 else
 	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
-IUSE="firebird freetds mysql odbc postgres qt3support +sqlite"
+IUSE="firebird freetds mysql oci8 odbc postgres qt3support +sqlite"
 
 REQUIRED_USE="
-	|| ( firebird freetds mysql odbc postgres sqlite )
+	|| ( firebird freetds mysql oci8 odbc postgres sqlite )
 "
 
 DEPEND="
@@ -24,6 +24,7 @@ DEPEND="
 	firebird? ( dev-db/firebird )
 	freetds? ( dev-db/freetds )
 	mysql? ( virtual/mysql )
+	oci8? ( dev-db/oracle-instantclient-basic )
 	odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
 	postgres? ( dev-db/postgresql-base )
 	sqlite? ( dev-db/sqlite:3 )
@@ -49,14 +50,14 @@ pkg_setup() {
 
 src_configure() {
 	myconf+="
-		$(qt_use firebird sql-ibase plugin)
-		$(qt_use freetds sql-tds plugin)
-		$(qt_use mysql sql-mysql plugin) $(use mysql && echo "-I${EPREFIX}/usr/include/mysql -L${EPREFIX}/usr/$(get_libdir)/mysql")
-		$(qt_use odbc sql-odbc plugin) $(use odbc && echo "-I${EPREFIX}/usr/include/iodbc")
-		$(qt_use postgres sql-psql plugin) $(use postgres && echo "-I${EPREFIX}/usr/include/postgresql/pgsql")
-		$(qt_use sqlite sql-sqlite plugin) $(use sqlite && echo -system-sqlite)
+		$(qt_use firebird sql-ibase  plugin)
+		$(qt_use freetds  sql-tds    plugin)
+		$(qt_use mysql    sql-mysql  plugin) $(use mysql && echo "-I${EPREFIX}/usr/include/mysql -L${EPREFIX}/usr/$(get_libdir)/mysql")
+		$(qt_use oci8     sql-oci    plugin) $(use oci8 && echo "-I${ORACLE_HOME}/include -L${ORACLE_HOME}/$(get_libdir)")
+		$(qt_use odbc     sql-odbc   plugin) $(use odbc && echo "-I${EPREFIX}/usr/include/iodbc")
+		$(qt_use postgres sql-psql   plugin) $(use postgres && echo "-I${EPREFIX}/usr/include/postgresql/pgsql")
+		$(qt_use sqlite   sql-sqlite plugin) $(use sqlite && echo -system-sqlite)
 		-no-sql-db2
-		-no-sql-oci
 		-no-sql-sqlite2
 		-no-sql-symsql
 		$(qt_use qt3support)