From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1STyjV-0007hi-CI for garchives@archives.gentoo.org; Mon, 14 May 2012 17:06:54 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4110BE09B2; Mon, 14 May 2012 17:06:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 0244CE09B2 for ; Mon, 14 May 2012 17:06:40 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6596A1BC0A6 for ; Mon, 14 May 2012 17:06:40 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 84225E5429 for ; Mon, 14 May 2012 17:06:37 +0000 (UTC) From: "Davide Pesavento" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Davide Pesavento" Message-ID: <1337015167.b78c84938bdf7778e09a2d312c5b6236d0158298.pesa@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: x11-libs/qt-sql/ X-VCS-Repository: proj/qt X-VCS-Files: x11-libs/qt-sql/qt-sql-4.8.9999.ebuild X-VCS-Directories: x11-libs/qt-sql/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: b78c84938bdf7778e09a2d312c5b6236d0158298 X-VCS-Branch: master Date: Mon, 14 May 2012 17:06:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: a02f2730-33b9-4250-b997-2d0cb19f1b43 X-Archives-Hash: 1680ddd318144ee748801fa6f7f8d6c2 commit: b78c84938bdf7778e09a2d312c5b6236d0158298 Author: Davide Pesavento gmail com> AuthorDate: Mon May 14 17:06:07 2012 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Mon May 14 17:06:07 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/qt.git;a=3Dco= mmit;h=3Db78c8493 [x11-libs/qt-sql] Sync with portage wrt Oracle db support. (Portage version: 2.2.0_alpha104/git/Linux x86_64, unsigned Manifest comm= it) --- 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 @@ =20 EAPI=3D4 =20 -inherit qt4-build +inherit multilib qt4-build =20 DESCRIPTION=3D"The SQL module for the Qt toolkit" SLOT=3D"4" @@ -13,10 +13,10 @@ if [[ ${QT4_BUILD_TYPE} =3D=3D live ]]; then else KEYWORDS=3D"~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~x= 86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x8= 6-solaris" fi -IUSE=3D"firebird freetds mysql odbc postgres qt3support +sqlite" +IUSE=3D"firebird freetds mysql oci8 odbc postgres qt3support +sqlite" =20 REQUIRED_USE=3D" - || ( firebird freetds mysql odbc postgres sqlite ) + || ( firebird freetds mysql oci8 odbc postgres sqlite ) " =20 DEPEND=3D" @@ -24,6 +24,7 @@ DEPEND=3D" 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() { =20 src_configure() { myconf+=3D" - $(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/in= clude/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_HO= ME}/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${EPREF= IX}/usr/include/postgresql/pgsql") + $(qt_use sqlite sql-sqlite plugin) $(use sqlite && echo -system-sqli= te) -no-sql-db2 - -no-sql-oci -no-sql-sqlite2 -no-sql-symsql $(qt_use qt3support)