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: Tue, 08 Jan 2019 01:31:35
Message-Id: 1546906539.2dabddfc4d3bcc8d6b73c1d0bd19d469356b655e.pesa@gentoo
1 commit: 2dabddfc4d3bcc8d6b73c1d0bd19d469356b655e
2 Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jan 8 00:15:39 2019 +0000
4 Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
5 CommitDate: Tue Jan 8 00:15:39 2019 +0000
6 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=2dabddfc
7
8 dev-qt/qtsql: stop using deprecated virtual
9
10 Package-Manager: Portage-2.3.53, Repoman-2.3.12
11 Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>
12
13 dev-qt/qtsql/qtsql-5.12.0.ebuild | 3 +--
14 dev-qt/qtsql/qtsql-5.12.9999.ebuild | 3 +--
15 dev-qt/qtsql/qtsql-5.9999.ebuild | 3 +--
16 3 files changed, 3 insertions(+), 6 deletions(-)
17
18 diff --git a/dev-qt/qtsql/qtsql-5.12.0.ebuild b/dev-qt/qtsql/qtsql-5.12.0.ebuild
19 index d5f86389..ba13844c 100644
20 --- a/dev-qt/qtsql/qtsql-5.12.0.ebuild
21 +++ b/dev-qt/qtsql/qtsql-5.12.0.ebuild
22 @@ -21,7 +21,7 @@ REQUIRED_USE="
23 DEPEND="
24 ~dev-qt/qtcore-${PV}
25 freetds? ( dev-db/freetds )
26 - mysql? ( virtual/libmysqlclient:= )
27 + mysql? ( dev-db/mysql-connector-c:= )
28 oci8? ( dev-db/oracle-instantclient-basic )
29 odbc? ( dev-db/unixODBC )
30 postgres? ( dev-db/postgresql:* )
31 @@ -49,7 +49,6 @@ src_configure() {
32 $(usex sqlite -system-sqlite '')
33 )
34
35 - use mysql && myconf+=("-I${EPREFIX}/usr/include/mysql" "-L${EPREFIX}/usr/$(get_libdir)/mysql")
36 use oci8 && myconf+=("-I${ORACLE_HOME}/include" "-L${ORACLE_HOME}/$(get_libdir)")
37 use postgres && myconf+=("-I${EPREFIX}/usr/include/postgresql/pgsql")
38
39
40 diff --git a/dev-qt/qtsql/qtsql-5.12.9999.ebuild b/dev-qt/qtsql/qtsql-5.12.9999.ebuild
41 index d5f86389..ba13844c 100644
42 --- a/dev-qt/qtsql/qtsql-5.12.9999.ebuild
43 +++ b/dev-qt/qtsql/qtsql-5.12.9999.ebuild
44 @@ -21,7 +21,7 @@ REQUIRED_USE="
45 DEPEND="
46 ~dev-qt/qtcore-${PV}
47 freetds? ( dev-db/freetds )
48 - mysql? ( virtual/libmysqlclient:= )
49 + mysql? ( dev-db/mysql-connector-c:= )
50 oci8? ( dev-db/oracle-instantclient-basic )
51 odbc? ( dev-db/unixODBC )
52 postgres? ( dev-db/postgresql:* )
53 @@ -49,7 +49,6 @@ src_configure() {
54 $(usex sqlite -system-sqlite '')
55 )
56
57 - use mysql && myconf+=("-I${EPREFIX}/usr/include/mysql" "-L${EPREFIX}/usr/$(get_libdir)/mysql")
58 use oci8 && myconf+=("-I${ORACLE_HOME}/include" "-L${ORACLE_HOME}/$(get_libdir)")
59 use postgres && myconf+=("-I${EPREFIX}/usr/include/postgresql/pgsql")
60
61
62 diff --git a/dev-qt/qtsql/qtsql-5.9999.ebuild b/dev-qt/qtsql/qtsql-5.9999.ebuild
63 index d5f86389..ba13844c 100644
64 --- a/dev-qt/qtsql/qtsql-5.9999.ebuild
65 +++ b/dev-qt/qtsql/qtsql-5.9999.ebuild
66 @@ -21,7 +21,7 @@ REQUIRED_USE="
67 DEPEND="
68 ~dev-qt/qtcore-${PV}
69 freetds? ( dev-db/freetds )
70 - mysql? ( virtual/libmysqlclient:= )
71 + mysql? ( dev-db/mysql-connector-c:= )
72 oci8? ( dev-db/oracle-instantclient-basic )
73 odbc? ( dev-db/unixODBC )
74 postgres? ( dev-db/postgresql:* )
75 @@ -49,7 +49,6 @@ src_configure() {
76 $(usex sqlite -system-sqlite '')
77 )
78
79 - use mysql && myconf+=("-I${EPREFIX}/usr/include/mysql" "-L${EPREFIX}/usr/$(get_libdir)/mysql")
80 use oci8 && myconf+=("-I${ORACLE_HOME}/include" "-L${ORACLE_HOME}/$(get_libdir)")
81 use postgres && myconf+=("-I${EPREFIX}/usr/include/postgresql/pgsql")