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

[Davide Pesavento]

commit:     2b3d75980f998d9ab2d0daf1d333a977edef1c88
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 31 23:21:52 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Aug 31 23:21:52 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=2b3d7598

[dev-qt/qtsql:4] Convert mysql plugin to multilib.

Package-Manager: portage-2.2.12-r1

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

diff --git a/dev-qt/qtsql/qtsql-4.8.6.ebuild b/dev-qt/qtsql/qtsql-4.8.6.ebuild
index f2bf654..05c40bb 100644
--- a/dev-qt/qtsql/qtsql-4.8.6.ebuild
+++ b/dev-qt/qtsql/qtsql-4.8.6.ebuild
@@ -23,7 +23,7 @@ REQUIRED_USE="
 DEPEND="
        ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
        freetds? ( dev-db/freetds )
-       mysql? ( virtual/mysql:= )
+       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}] ) )
        postgres? ( dev-db/postgresql-base:* )
@@ -38,7 +38,7 @@ QT4_TARGET_DIRECTORIES="
 multilib_src_configure() {
        local myconf=(
                $(qt_native_use freetds  sql-tds    plugin)
-               $(qt_native_use mysql    sql-mysql  plugin) $(use mysql && 
multilib_is_native_abi && echo "-I${EPREFIX}/usr/include/mysql 
-L${EPREFIX}/usr/$(get_libdir)/mysql")
+               $(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_native_use postgres sql-psql   plugin) $(use postgres && 
multilib_is_native_abi && echo "-I${EPREFIX}/usr/include/postgresql/pgsql")

diff --git a/dev-qt/qtsql/qtsql-4.8.9999.ebuild 
b/dev-qt/qtsql/qtsql-4.8.9999.ebuild
index f2bf654..05c40bb 100644
--- a/dev-qt/qtsql/qtsql-4.8.9999.ebuild
+++ b/dev-qt/qtsql/qtsql-4.8.9999.ebuild
@@ -23,7 +23,7 @@ REQUIRED_USE="
 DEPEND="
        ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
        freetds? ( dev-db/freetds )
-       mysql? ( virtual/mysql:= )
+       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}] ) )
        postgres? ( dev-db/postgresql-base:* )
@@ -38,7 +38,7 @@ QT4_TARGET_DIRECTORIES="
 multilib_src_configure() {
        local myconf=(
                $(qt_native_use freetds  sql-tds    plugin)
-               $(qt_native_use mysql    sql-mysql  plugin) $(use mysql && 
multilib_is_native_abi && echo "-I${EPREFIX}/usr/include/mysql 
-L${EPREFIX}/usr/$(get_libdir)/mysql")
+               $(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_native_use postgres sql-psql   plugin) $(use postgres && 
multilib_is_native_abi && echo "-I${EPREFIX}/usr/include/postgresql/pgsql")