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: Sun, 22 Jun 2014 23:40:12
Message-Id: 1403480408.fe124e9f8db459c77d521f1c0c2007a474d1a306.pesa@gentoo
1 commit: fe124e9f8db459c77d521f1c0c2007a474d1a306
2 Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jun 22 23:40:08 2014 +0000
4 Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
5 CommitDate: Sun Jun 22 23:40:08 2014 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=fe124e9f
7
8 [dev-qt/qtsql:4] Use qt_native_use where appropriate.
9
10 Package-Manager: portage-2.2.10
11
12 ---
13 dev-qt/qtsql/qtsql-4.8.6.ebuild | 14 +++++++-------
14 dev-qt/qtsql/qtsql-4.8.9999.ebuild | 14 +++++++-------
15 2 files changed, 14 insertions(+), 14 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 c66e471..de5d65d 100644
19 --- a/dev-qt/qtsql/qtsql-4.8.6.ebuild
20 +++ b/dev-qt/qtsql/qtsql-4.8.6.ebuild
21 @@ -38,13 +38,13 @@ QT4_TARGET_DIRECTORIES="
22
23 src_configure() {
24 myconf+="
25 - $(qt_use firebird sql-ibase plugin)
26 - $(qt_use freetds sql-tds plugin)
27 - $(qt_use mysql sql-mysql plugin) $(use mysql && echo "-I${EPREFIX}/usr/include/mysql -L${EPREFIX}/usr/$(get_libdir)/mysql")
28 - $(qt_use oci8 sql-oci plugin) $(use oci8 && echo "-I${ORACLE_HOME}/include -L${ORACLE_HOME}/$(get_libdir)")
29 - $(qt_use odbc sql-odbc plugin) $(use odbc && echo "-I${EPREFIX}/usr/include/iodbc")
30 - $(qt_use postgres sql-psql plugin) $(use postgres && echo "-I${EPREFIX}/usr/include/postgresql/pgsql")
31 - $(qt_use sqlite sql-sqlite plugin) $(use sqlite && echo -system-sqlite)
32 + $(qt_native_use firebird sql-ibase plugin)
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 oci8 sql-oci plugin) $(use oci8 && echo "-I${ORACLE_HOME}/include -L${ORACLE_HOME}/$(get_libdir)")
36 + $(qt_use odbc sql-odbc plugin) $(use odbc && echo "-I${EPREFIX}/usr/include/iodbc")
37 + $(qt_native_use postgres sql-psql plugin) $(use postgres && multilib_is_native_abi && echo "-I${EPREFIX}/usr/include/postgresql/pgsql")
38 + $(qt_use sqlite sql-sqlite plugin) $(use sqlite && echo -system-sqlite)
39 -no-sql-db2
40 -no-sql-sqlite2
41 -no-sql-symsql
42
43 diff --git a/dev-qt/qtsql/qtsql-4.8.9999.ebuild b/dev-qt/qtsql/qtsql-4.8.9999.ebuild
44 index c66e471..de5d65d 100644
45 --- a/dev-qt/qtsql/qtsql-4.8.9999.ebuild
46 +++ b/dev-qt/qtsql/qtsql-4.8.9999.ebuild
47 @@ -38,13 +38,13 @@ QT4_TARGET_DIRECTORIES="
48
49 src_configure() {
50 myconf+="
51 - $(qt_use firebird sql-ibase plugin)
52 - $(qt_use freetds sql-tds plugin)
53 - $(qt_use mysql sql-mysql plugin) $(use mysql && echo "-I${EPREFIX}/usr/include/mysql -L${EPREFIX}/usr/$(get_libdir)/mysql")
54 - $(qt_use oci8 sql-oci plugin) $(use oci8 && echo "-I${ORACLE_HOME}/include -L${ORACLE_HOME}/$(get_libdir)")
55 - $(qt_use odbc sql-odbc plugin) $(use odbc && echo "-I${EPREFIX}/usr/include/iodbc")
56 - $(qt_use postgres sql-psql plugin) $(use postgres && echo "-I${EPREFIX}/usr/include/postgresql/pgsql")
57 - $(qt_use sqlite sql-sqlite plugin) $(use sqlite && echo -system-sqlite)
58 + $(qt_native_use firebird sql-ibase plugin)
59 + $(qt_native_use freetds sql-tds plugin)
60 + $(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")
61 + $(qt_use oci8 sql-oci plugin) $(use oci8 && echo "-I${ORACLE_HOME}/include -L${ORACLE_HOME}/$(get_libdir)")
62 + $(qt_use odbc sql-odbc plugin) $(use odbc && echo "-I${EPREFIX}/usr/include/iodbc")
63 + $(qt_native_use postgres sql-psql plugin) $(use postgres && multilib_is_native_abi && echo "-I${EPREFIX}/usr/include/postgresql/pgsql")
64 + $(qt_use sqlite sql-sqlite plugin) $(use sqlite && echo -system-sqlite)
65 -no-sql-db2
66 -no-sql-sqlite2
67 -no-sql-symsql