| 1 |
commit: 2b3d75980f998d9ab2d0daf1d333a977edef1c88 |
| 2 |
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Aug 31 23:21:52 2014 +0000 |
| 4 |
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Aug 31 23:21:52 2014 +0000 |
| 6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=2b3d7598 |
| 7 |
|
| 8 |
[dev-qt/qtsql:4] Convert mysql plugin to multilib. |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.12-r1 |
| 11 |
|
| 12 |
--- |
| 13 |
dev-qt/qtsql/qtsql-4.8.6.ebuild | 4 ++-- |
| 14 |
dev-qt/qtsql/qtsql-4.8.9999.ebuild | 4 ++-- |
| 15 |
2 files changed, 4 insertions(+), 4 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 f2bf654..05c40bb 100644 |
| 19 |
--- a/dev-qt/qtsql/qtsql-4.8.6.ebuild |
| 20 |
+++ b/dev-qt/qtsql/qtsql-4.8.6.ebuild |
| 21 |
@@ -23,7 +23,7 @@ REQUIRED_USE=" |
| 22 |
DEPEND=" |
| 23 |
~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}] |
| 24 |
freetds? ( dev-db/freetds ) |
| 25 |
- mysql? ( virtual/mysql:= ) |
| 26 |
+ mysql? ( >=virtual/mysql-5.6-r2:=[${MULTILIB_USEDEP}] ) |
| 27 |
oci8? ( dev-db/oracle-instantclient-basic[${MULTILIB_USEDEP}] ) |
| 28 |
odbc? ( || ( dev-db/unixODBC[${MULTILIB_USEDEP}] dev-db/libiodbc[${MULTILIB_USEDEP}] ) ) |
| 29 |
postgres? ( dev-db/postgresql-base:* ) |
| 30 |
@@ -38,7 +38,7 @@ QT4_TARGET_DIRECTORIES=" |
| 31 |
multilib_src_configure() { |
| 32 |
local myconf=( |
| 33 |
$(qt_native_use freetds sql-tds plugin) |
| 34 |
- $(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") |
| 35 |
+ $(qt_use mysql sql-mysql plugin) $(use mysql && echo "-I${EPREFIX}/usr/include/mysql -L${EPREFIX}/usr/$(get_libdir)/mysql") |
| 36 |
$(qt_use oci8 sql-oci plugin) $(use oci8 && echo "-I${ORACLE_HOME}/include -L${ORACLE_HOME}/$(get_libdir)") |
| 37 |
$(qt_use odbc sql-odbc plugin) $(use odbc && echo "-I${EPREFIX}/usr/include/iodbc") |
| 38 |
$(qt_native_use postgres sql-psql plugin) $(use postgres && multilib_is_native_abi && echo "-I${EPREFIX}/usr/include/postgresql/pgsql") |
| 39 |
|
| 40 |
diff --git a/dev-qt/qtsql/qtsql-4.8.9999.ebuild b/dev-qt/qtsql/qtsql-4.8.9999.ebuild |
| 41 |
index f2bf654..05c40bb 100644 |
| 42 |
--- a/dev-qt/qtsql/qtsql-4.8.9999.ebuild |
| 43 |
+++ b/dev-qt/qtsql/qtsql-4.8.9999.ebuild |
| 44 |
@@ -23,7 +23,7 @@ REQUIRED_USE=" |
| 45 |
DEPEND=" |
| 46 |
~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}] |
| 47 |
freetds? ( dev-db/freetds ) |
| 48 |
- mysql? ( virtual/mysql:= ) |
| 49 |
+ mysql? ( >=virtual/mysql-5.6-r2:=[${MULTILIB_USEDEP}] ) |
| 50 |
oci8? ( dev-db/oracle-instantclient-basic[${MULTILIB_USEDEP}] ) |
| 51 |
odbc? ( || ( dev-db/unixODBC[${MULTILIB_USEDEP}] dev-db/libiodbc[${MULTILIB_USEDEP}] ) ) |
| 52 |
postgres? ( dev-db/postgresql-base:* ) |
| 53 |
@@ -38,7 +38,7 @@ QT4_TARGET_DIRECTORIES=" |
| 54 |
multilib_src_configure() { |
| 55 |
local myconf=( |
| 56 |
$(qt_native_use freetds sql-tds plugin) |
| 57 |
- $(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") |
| 58 |
+ $(qt_use mysql sql-mysql plugin) $(use mysql && echo "-I${EPREFIX}/usr/include/mysql -L${EPREFIX}/usr/$(get_libdir)/mysql") |
| 59 |
$(qt_use oci8 sql-oci plugin) $(use oci8 && echo "-I${ORACLE_HOME}/include -L${ORACLE_HOME}/$(get_libdir)") |
| 60 |
$(qt_use odbc sql-odbc plugin) $(use odbc && echo "-I${EPREFIX}/usr/include/iodbc") |
| 61 |
$(qt_native_use postgres sql-psql plugin) $(use postgres && multilib_is_native_abi && echo "-I${EPREFIX}/usr/include/postgresql/pgsql") |
Archives