Gentoo Archives: gentoo-commits

From: Davide Pesavento <pesa@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/
Date: Mon, 23 Jun 2014 22:38:53
Message-Id: 1403563130.79561754caa51a6ad6dbf5294de211b162b4f1c5.pesa@gentoo
1 commit: 79561754caa51a6ad6dbf5294de211b162b4f1c5
2 Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jun 23 22:38:50 2014 +0000
4 Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
5 CommitDate: Mon Jun 23 22:38:50 2014 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=79561754
7
8 [dev-qt/qtsql:4] Add MULTILIB_USEDEP to libiodbc dep too.
9
10 Package-Manager: portage-2.2.10
11
12 ---
13 dev-qt/qtsql/qtsql-4.8.6.ebuild | 2 +-
14 dev-qt/qtsql/qtsql-4.8.9999.ebuild | 2 +-
15 2 files changed, 2 insertions(+), 2 deletions(-)
16
17 diff --git a/dev-qt/qtsql/qtsql-4.8.6.ebuild b/dev-qt/qtsql/qtsql-4.8.6.ebuild
18 index de5d65d..6ee8d7a 100644
19 --- a/dev-qt/qtsql/qtsql-4.8.6.ebuild
20 +++ b/dev-qt/qtsql/qtsql-4.8.6.ebuild
21 @@ -26,7 +26,7 @@ DEPEND="
22 freetds? ( dev-db/freetds )
23 mysql? ( virtual/mysql )
24 oci8? ( dev-db/oracle-instantclient-basic[${MULTILIB_USEDEP}] )
25 - odbc? ( || ( dev-db/unixODBC[${MULTILIB_USEDEP}] dev-db/libiodbc ) )
26 + odbc? ( || ( dev-db/unixODBC[${MULTILIB_USEDEP}] dev-db/libiodbc[${MULTILIB_USEDEP}] ) )
27 postgres? ( dev-db/postgresql-base )
28 sqlite? ( dev-db/sqlite:3[${MULTILIB_USEDEP}] )
29 "
30
31 diff --git a/dev-qt/qtsql/qtsql-4.8.9999.ebuild b/dev-qt/qtsql/qtsql-4.8.9999.ebuild
32 index de5d65d..6ee8d7a 100644
33 --- a/dev-qt/qtsql/qtsql-4.8.9999.ebuild
34 +++ b/dev-qt/qtsql/qtsql-4.8.9999.ebuild
35 @@ -26,7 +26,7 @@ DEPEND="
36 freetds? ( dev-db/freetds )
37 mysql? ( virtual/mysql )
38 oci8? ( dev-db/oracle-instantclient-basic[${MULTILIB_USEDEP}] )
39 - odbc? ( || ( dev-db/unixODBC[${MULTILIB_USEDEP}] dev-db/libiodbc ) )
40 + odbc? ( || ( dev-db/unixODBC[${MULTILIB_USEDEP}] dev-db/libiodbc[${MULTILIB_USEDEP}] ) )
41 postgres? ( dev-db/postgresql-base )
42 sqlite? ( dev-db/sqlite:3[${MULTILIB_USEDEP}] )
43 "