[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

[Davide Pesavento]

commit:     3365067c12459d608326702d4d72d86a7bbe7d47
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon Sep  1 00:01:49 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Sep  1 00:01:49 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=3365067c

[dev-qt/qtsql:4] Raise minimum deps to ensure correct multilib USE deps.

Package-Manager: portage-2.2.12-r1

---
 dev-qt/qtsql/qtsql-4.8.6.ebuild    | 9 ++++++---
 dev-qt/qtsql/qtsql-4.8.9999.ebuild | 9 ++++++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-4.8.6.ebuild b/dev-qt/qtsql/qtsql-4.8.6.ebuild
index 05c40bb..bbe669b 100644
--- a/dev-qt/qtsql/qtsql-4.8.6.ebuild
+++ b/dev-qt/qtsql/qtsql-4.8.6.ebuild
@@ -24,10 +24,13 @@ DEPEND="
        ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
        freetds? ( dev-db/freetds )
        mysql? ( >=virtual/mysql-5.6-r2:=[${MULTILIB_USEDEP}] )
-       oci8? ( dev-db/oracle-instantclient-basic[${MULTILIB_USEDEP}] )
-       odbc? ( || ( dev-db/unixODBC[${MULTILIB_USEDEP}] 
dev-db/libiodbc[${MULTILIB_USEDEP}] ) )
+       oci8? ( 
>=dev-db/oracle-instantclient-basic-11.2.0.4[${MULTILIB_USEDEP}] )
+       odbc? ( || (
+               >=dev-db/unixODBC-2.3.2[${MULTILIB_USEDEP}]
+               >=dev-db/libiodbc-3.52.8[${MULTILIB_USEDEP}]
+       ) )
        postgres? ( dev-db/postgresql-base:* )
-       sqlite? ( dev-db/sqlite:3[${MULTILIB_USEDEP}] )
+       sqlite? ( >=dev-db/sqlite-3.8.3:3[${MULTILIB_USEDEP}] )
 "
 RDEPEND="${DEPEND}"
 

diff --git a/dev-qt/qtsql/qtsql-4.8.9999.ebuild 
b/dev-qt/qtsql/qtsql-4.8.9999.ebuild
index 05c40bb..bbe669b 100644
--- a/dev-qt/qtsql/qtsql-4.8.9999.ebuild
+++ b/dev-qt/qtsql/qtsql-4.8.9999.ebuild
@@ -24,10 +24,13 @@ DEPEND="
        ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
        freetds? ( dev-db/freetds )
        mysql? ( >=virtual/mysql-5.6-r2:=[${MULTILIB_USEDEP}] )
-       oci8? ( dev-db/oracle-instantclient-basic[${MULTILIB_USEDEP}] )
-       odbc? ( || ( dev-db/unixODBC[${MULTILIB_USEDEP}] 
dev-db/libiodbc[${MULTILIB_USEDEP}] ) )
+       oci8? ( 
>=dev-db/oracle-instantclient-basic-11.2.0.4[${MULTILIB_USEDEP}] )
+       odbc? ( || (
+               >=dev-db/unixODBC-2.3.2[${MULTILIB_USEDEP}]
+               >=dev-db/libiodbc-3.52.8[${MULTILIB_USEDEP}]
+       ) )
        postgres? ( dev-db/postgresql-base:* )
-       sqlite? ( dev-db/sqlite:3[${MULTILIB_USEDEP}] )
+       sqlite? ( >=dev-db/sqlite-3.8.3:3[${MULTILIB_USEDEP}] )
 "
 RDEPEND="${DEPEND}"