[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/

[Ionen Wolkens]

commit:     e3d179c3b2154a61563100259f181ced4a85aa04
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 13 05:29:01 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Sep 13 16:40:17 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3d179c3

dev-qt/qtbase: update sql options in 6.6+

tds option was removed entirely, likely not coming back.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 dev-qt/qtbase/qtbase-6.6.9999.ebuild | 2 +-
 dev-qt/qtbase/qtbase-6.9999.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-qt/qtbase/qtbase-6.6.9999.ebuild 
b/dev-qt/qtbase/qtbase-6.6.9999.ebuild
index bf8d33b74e87..980755e275ba 100644
--- a/dev-qt/qtbase/qtbase-6.6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.6.9999.ebuild
@@ -210,6 +210,7 @@ src_configure() {
        use sql && mycmakeargs+=(
                -DQT_FEATURE_sql_db2=OFF # unpackaged
                -DQT_FEATURE_sql_ibase=OFF # unpackaged
+               -DQT_FEATURE_sql_mimer=OFF # unpackaged
                $(qt_feature mysql sql_mysql)
                $(qt_feature oci8 sql_oci)
                $(usev oci8 
-DOracle_ROOT="${ESYSROOT}"/usr/$(get_libdir)/oracle/client)
@@ -217,7 +218,6 @@ src_configure() {
                $(qt_feature postgres sql_psql)
                $(qt_feature sqlite sql_sqlite)
                $(qt_feature sqlite system_sqlite)
-               -DQT_FEATURE_sql_tds=OFF # currently a no-op in CMakeLists.txt
        )
 
        if use amd64 || use x86; then

diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild 
b/dev-qt/qtbase/qtbase-6.9999.ebuild
index bf8d33b74e87..980755e275ba 100644
--- a/dev-qt/qtbase/qtbase-6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -210,6 +210,7 @@ src_configure() {
        use sql && mycmakeargs+=(
                -DQT_FEATURE_sql_db2=OFF # unpackaged
                -DQT_FEATURE_sql_ibase=OFF # unpackaged
+               -DQT_FEATURE_sql_mimer=OFF # unpackaged
                $(qt_feature mysql sql_mysql)
                $(qt_feature oci8 sql_oci)
                $(usev oci8 
-DOracle_ROOT="${ESYSROOT}"/usr/$(get_libdir)/oracle/client)
@@ -217,7 +218,6 @@ src_configure() {
                $(qt_feature postgres sql_psql)
                $(qt_feature sqlite sql_sqlite)
                $(qt_feature sqlite system_sqlite)
-               -DQT_FEATURE_sql_tds=OFF # currently a no-op in CMakeLists.txt
        )
 
        if use amd64 || use x86; then