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, 01 Sep 2014 00:02:24
Message-Id: 1409529709.3365067c12459d608326702d4d72d86a7bbe7d47.pesa@gentoo
1 commit: 3365067c12459d608326702d4d72d86a7bbe7d47
2 Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
3 AuthorDate: Mon Sep 1 00:01:49 2014 +0000
4 Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 1 00:01:49 2014 +0000
6 URL: http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=3365067c
7
8 [dev-qt/qtsql:4] Raise minimum deps to ensure correct multilib USE deps.
9
10 Package-Manager: portage-2.2.12-r1
11
12 ---
13 dev-qt/qtsql/qtsql-4.8.6.ebuild | 9 ++++++---
14 dev-qt/qtsql/qtsql-4.8.9999.ebuild | 9 ++++++---
15 2 files changed, 12 insertions(+), 6 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 05c40bb..bbe669b 100644
19 --- a/dev-qt/qtsql/qtsql-4.8.6.ebuild
20 +++ b/dev-qt/qtsql/qtsql-4.8.6.ebuild
21 @@ -24,10 +24,13 @@ DEPEND="
22 ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
23 freetds? ( dev-db/freetds )
24 mysql? ( >=virtual/mysql-5.6-r2:=[${MULTILIB_USEDEP}] )
25 - oci8? ( dev-db/oracle-instantclient-basic[${MULTILIB_USEDEP}] )
26 - odbc? ( || ( dev-db/unixODBC[${MULTILIB_USEDEP}] dev-db/libiodbc[${MULTILIB_USEDEP}] ) )
27 + oci8? ( >=dev-db/oracle-instantclient-basic-11.2.0.4[${MULTILIB_USEDEP}] )
28 + odbc? ( || (
29 + >=dev-db/unixODBC-2.3.2[${MULTILIB_USEDEP}]
30 + >=dev-db/libiodbc-3.52.8[${MULTILIB_USEDEP}]
31 + ) )
32 postgres? ( dev-db/postgresql-base:* )
33 - sqlite? ( dev-db/sqlite:3[${MULTILIB_USEDEP}] )
34 + sqlite? ( >=dev-db/sqlite-3.8.3:3[${MULTILIB_USEDEP}] )
35 "
36 RDEPEND="${DEPEND}"
37
38
39 diff --git a/dev-qt/qtsql/qtsql-4.8.9999.ebuild b/dev-qt/qtsql/qtsql-4.8.9999.ebuild
40 index 05c40bb..bbe669b 100644
41 --- a/dev-qt/qtsql/qtsql-4.8.9999.ebuild
42 +++ b/dev-qt/qtsql/qtsql-4.8.9999.ebuild
43 @@ -24,10 +24,13 @@ DEPEND="
44 ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
45 freetds? ( dev-db/freetds )
46 mysql? ( >=virtual/mysql-5.6-r2:=[${MULTILIB_USEDEP}] )
47 - oci8? ( dev-db/oracle-instantclient-basic[${MULTILIB_USEDEP}] )
48 - odbc? ( || ( dev-db/unixODBC[${MULTILIB_USEDEP}] dev-db/libiodbc[${MULTILIB_USEDEP}] ) )
49 + oci8? ( >=dev-db/oracle-instantclient-basic-11.2.0.4[${MULTILIB_USEDEP}] )
50 + odbc? ( || (
51 + >=dev-db/unixODBC-2.3.2[${MULTILIB_USEDEP}]
52 + >=dev-db/libiodbc-3.52.8[${MULTILIB_USEDEP}]
53 + ) )
54 postgres? ( dev-db/postgresql-base:* )
55 - sqlite? ( dev-db/sqlite:3[${MULTILIB_USEDEP}] )
56 + sqlite? ( >=dev-db/sqlite-3.8.3:3[${MULTILIB_USEDEP}] )
57 "
58 RDEPEND="${DEPEND}"