| 1 |
commit: f11c40750fff879e9c8269303c678f72c9863414 |
| 2 |
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jan 7 23:57:06 2019 +0000 |
| 4 |
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 7 23:57:06 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=f11c4075 |
| 7 |
|
| 8 |
dev-qt/qtsql: apparently upstream doesn't support libiodbc anymore |
| 9 |
|
| 10 |
The configure test fails to detect it. Probably easy to fix, but |
| 11 |
I doubt anyone cares, given that it's been broken since 5.8.0 and |
| 12 |
no one complained. |
| 13 |
|
| 14 |
Package-Manager: Portage-2.3.53, Repoman-2.3.12 |
| 15 |
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org> |
| 16 |
|
| 17 |
dev-qt/qtsql/qtsql-5.12.0.ebuild | 7 +++---- |
| 18 |
dev-qt/qtsql/qtsql-5.12.9999.ebuild | 7 +++---- |
| 19 |
dev-qt/qtsql/qtsql-5.9999.ebuild | 7 +++---- |
| 20 |
3 files changed, 9 insertions(+), 12 deletions(-) |
| 21 |
|
| 22 |
diff --git a/dev-qt/qtsql/qtsql-5.12.0.ebuild b/dev-qt/qtsql/qtsql-5.12.0.ebuild |
| 23 |
index 09b2d085..d5f86389 100644 |
| 24 |
--- a/dev-qt/qtsql/qtsql-5.12.0.ebuild |
| 25 |
+++ b/dev-qt/qtsql/qtsql-5.12.0.ebuild |
| 26 |
@@ -1,4 +1,4 @@ |
| 27 |
-# Copyright 1999-2018 Gentoo Authors |
| 28 |
+# Copyright 1999-2019 Gentoo Authors |
| 29 |
# Distributed under the terms of the GNU General Public License v2 |
| 30 |
|
| 31 |
EAPI=6 |
| 32 |
@@ -23,9 +23,9 @@ DEPEND=" |
| 33 |
freetds? ( dev-db/freetds ) |
| 34 |
mysql? ( virtual/libmysqlclient:= ) |
| 35 |
oci8? ( dev-db/oracle-instantclient-basic ) |
| 36 |
- odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) ) |
| 37 |
+ odbc? ( dev-db/unixODBC ) |
| 38 |
postgres? ( dev-db/postgresql:* ) |
| 39 |
- sqlite? ( >=dev-db/sqlite-3.8.10.2:3 ) |
| 40 |
+ sqlite? ( dev-db/sqlite:3 ) |
| 41 |
" |
| 42 |
RDEPEND="${DEPEND}" |
| 43 |
|
| 44 |
@@ -51,7 +51,6 @@ src_configure() { |
| 45 |
|
| 46 |
use mysql && myconf+=("-I${EPREFIX}/usr/include/mysql" "-L${EPREFIX}/usr/$(get_libdir)/mysql") |
| 47 |
use oci8 && myconf+=("-I${ORACLE_HOME}/include" "-L${ORACLE_HOME}/$(get_libdir)") |
| 48 |
- use odbc && myconf+=("-I${EPREFIX}/usr/include/iodbc") |
| 49 |
use postgres && myconf+=("-I${EPREFIX}/usr/include/postgresql/pgsql") |
| 50 |
|
| 51 |
qt5-build_src_configure |
| 52 |
|
| 53 |
diff --git a/dev-qt/qtsql/qtsql-5.12.9999.ebuild b/dev-qt/qtsql/qtsql-5.12.9999.ebuild |
| 54 |
index 2ce2c9a9..d5f86389 100644 |
| 55 |
--- a/dev-qt/qtsql/qtsql-5.12.9999.ebuild |
| 56 |
+++ b/dev-qt/qtsql/qtsql-5.12.9999.ebuild |
| 57 |
@@ -1,4 +1,4 @@ |
| 58 |
-# Copyright 1999-2018 Gentoo Foundation |
| 59 |
+# Copyright 1999-2019 Gentoo Authors |
| 60 |
# Distributed under the terms of the GNU General Public License v2 |
| 61 |
|
| 62 |
EAPI=6 |
| 63 |
@@ -23,9 +23,9 @@ DEPEND=" |
| 64 |
freetds? ( dev-db/freetds ) |
| 65 |
mysql? ( virtual/libmysqlclient:= ) |
| 66 |
oci8? ( dev-db/oracle-instantclient-basic ) |
| 67 |
- odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) ) |
| 68 |
+ odbc? ( dev-db/unixODBC ) |
| 69 |
postgres? ( dev-db/postgresql:* ) |
| 70 |
- sqlite? ( >=dev-db/sqlite-3.8.10.2:3 ) |
| 71 |
+ sqlite? ( dev-db/sqlite:3 ) |
| 72 |
" |
| 73 |
RDEPEND="${DEPEND}" |
| 74 |
|
| 75 |
@@ -51,7 +51,6 @@ src_configure() { |
| 76 |
|
| 77 |
use mysql && myconf+=("-I${EPREFIX}/usr/include/mysql" "-L${EPREFIX}/usr/$(get_libdir)/mysql") |
| 78 |
use oci8 && myconf+=("-I${ORACLE_HOME}/include" "-L${ORACLE_HOME}/$(get_libdir)") |
| 79 |
- use odbc && myconf+=("-I${EPREFIX}/usr/include/iodbc") |
| 80 |
use postgres && myconf+=("-I${EPREFIX}/usr/include/postgresql/pgsql") |
| 81 |
|
| 82 |
qt5-build_src_configure |
| 83 |
|
| 84 |
diff --git a/dev-qt/qtsql/qtsql-5.9999.ebuild b/dev-qt/qtsql/qtsql-5.9999.ebuild |
| 85 |
index 2ce2c9a9..d5f86389 100644 |
| 86 |
--- a/dev-qt/qtsql/qtsql-5.9999.ebuild |
| 87 |
+++ b/dev-qt/qtsql/qtsql-5.9999.ebuild |
| 88 |
@@ -1,4 +1,4 @@ |
| 89 |
-# Copyright 1999-2018 Gentoo Foundation |
| 90 |
+# Copyright 1999-2019 Gentoo Authors |
| 91 |
# Distributed under the terms of the GNU General Public License v2 |
| 92 |
|
| 93 |
EAPI=6 |
| 94 |
@@ -23,9 +23,9 @@ DEPEND=" |
| 95 |
freetds? ( dev-db/freetds ) |
| 96 |
mysql? ( virtual/libmysqlclient:= ) |
| 97 |
oci8? ( dev-db/oracle-instantclient-basic ) |
| 98 |
- odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) ) |
| 99 |
+ odbc? ( dev-db/unixODBC ) |
| 100 |
postgres? ( dev-db/postgresql:* ) |
| 101 |
- sqlite? ( >=dev-db/sqlite-3.8.10.2:3 ) |
| 102 |
+ sqlite? ( dev-db/sqlite:3 ) |
| 103 |
" |
| 104 |
RDEPEND="${DEPEND}" |
| 105 |
|
| 106 |
@@ -51,7 +51,6 @@ src_configure() { |
| 107 |
|
| 108 |
use mysql && myconf+=("-I${EPREFIX}/usr/include/mysql" "-L${EPREFIX}/usr/$(get_libdir)/mysql") |
| 109 |
use oci8 && myconf+=("-I${ORACLE_HOME}/include" "-L${ORACLE_HOME}/$(get_libdir)") |
| 110 |
- use odbc && myconf+=("-I${EPREFIX}/usr/include/iodbc") |
| 111 |
use postgres && myconf+=("-I${EPREFIX}/usr/include/postgresql/pgsql") |
| 112 |
|
| 113 |
qt5-build_src_configure |
Archives