subject:"\[gentoo\-commits\] proj\/qt\:master commit in\: dev\-qt\/qtsql\/"

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2022-03-04 Thread Andreas Sturmlechner

commit: e4d622e596b72133a4acc10fdf999ce15d440f0c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Mar  4 09:39:41 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Mar  4 09:39:41 2022 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=e4d622e5

dev-qt/qtsql: Rebased to 5.15.3 branch

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/qtsql/{qtsql-5.15.2..ebuild => qtsql-5.15.3..ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-5.15.2..ebuild 
b/dev-qt/qtsql/qtsql-5.15.3..ebuild
similarity index 100%
rename from dev-qt/qtsql/qtsql-5.15.2..ebuild
rename to dev-qt/qtsql/qtsql-5.15.3..ebuild

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2022-09-08 Thread Andreas Sturmlechner

commit: 329abd7714f92996a62a6995262cefddd1967914
Author: WANG Xuerui  gentoo  org>
AuthorDate: Tue Jun 28 04:17:46 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Sep  8 09:28:59 2022 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=329abd77

dev-qt/qtsql: keyword 5.15.5 for ~loong

Signed-off-by: WANG Xuerui  gentoo.org>
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/qtsql/qtsql-5.15.5..ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qtsql/qtsql-5.15.5..ebuild 
b/dev-qt/qtsql/qtsql-5.15.5..ebuild
index 0620d299..9ff37dd5 100644
--- a/dev-qt/qtsql/qtsql-5.15.5..ebuild
+++ b/dev-qt/qtsql/qtsql-5.15.5..ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="SQL abstraction library for the Qt5 framework"
 SLOT=5/${QT5_PV} # bug 639140
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc 
~x86"
 fi
 
 IUSE="freetds mysql oci8 odbc postgres +sqlite"

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2022-05-14 Thread Andreas Sturmlechner

commit: 7463d34d7ae8fb2c2ed71e32108e679c96313301
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat May 14 21:08:26 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat May 14 21:14:20 2022 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=7463d34d

dev-qt/qtsql: Rebased to 5.15.4 branch

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/qtsql/{qtsql-5.15.3..ebuild => qtsql-5.15.4..ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qtsql/qtsql-5.15.3..ebuild 
b/dev-qt/qtsql/qtsql-5.15.4..ebuild
similarity index 97%
rename from dev-qt/qtsql/qtsql-5.15.3..ebuild
rename to dev-qt/qtsql/qtsql-5.15.4..ebuild
index 0a3163e6..0620d299 100644
--- a/dev-qt/qtsql/qtsql-5.15.3..ebuild
+++ b/dev-qt/qtsql/qtsql-5.15.4..ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2022-06-15 Thread Andreas Sturmlechner

commit: 96638eca6a3b43ee1abd9068f1c24769efea79da
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Jun 14 17:06:52 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Jun 14 18:21:17 2022 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=96638eca

dev-qt/qtsql: Use pkgconfig to find mysql-connector-c

Patch by Debian to fix cross-compile is now part of gentoo-patchset.

Also ends the which-hunt.

Closes: https://github.com/gentoo/qt/pull/234
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/qtsql/Manifest | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev-qt/qtsql/Manifest b/dev-qt/qtsql/Manifest
new file mode 100644
index ..1e41118d
--- /dev/null
+++ b/dev-qt/qtsql/Manifest
@@ -0,0 +1 @@
+DIST qtbase-5.15-gentoo-patchset-1.tar.xz 4204 BLAKE2B 
1399eb6f4c776d370e1837351a72b604440658a3a2d1bd0c725b9ef149b09d236347f5f4b37f652c33310048a0a7df54e24453b404dc45507fd4f7c5fdf144cd
 SHA512 
c857fc746bacb047321cdb762f3c7c48ce2a0d24045a9e708edd38532568dbbc74e9e971425a72a3c2a5ca0662b3e6333831f6c1b7746525b99d46000b63111f

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2021-08-20 Thread Andreas Sturmlechner

commit: fa58c981a4d5fe22935e20852567a7e53403493d
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Aug 19 18:38:03 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Aug 20 12:34:09 2021 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=fa58c981

dev-qt/qtsql: EAPI-8 bump

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/qtsql/qtsql-5.15..ebuild | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-5.15..ebuild 
b/dev-qt/qtsql/qtsql-5.15..ebuild
index a68df2c8..203d656f 100644
--- a/dev-qt/qtsql/qtsql-5.15..ebuild
+++ b/dev-qt/qtsql/qtsql-5.15..ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 QT5_MODULE="qtbase"
 inherit qt5-build
@@ -14,7 +14,6 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
 fi
 
 IUSE="freetds mysql oci8 odbc postgres +sqlite"
-
 REQUIRED_USE="
|| ( freetds mysql oci8 odbc postgres sqlite )
 "
@@ -47,7 +46,7 @@ src_configure() {
$(qt_use odbc sql-odbc   plugin)
$(qt_use postgres sql-psql   plugin)
$(qt_use sqlite   sql-sqlite plugin)
-   $(usex sqlite -system-sqlite '')
+   $(usev sqlite -system-sqlite)
)
 
use oci8 && myconf+=("-I${ORACLE_HOME}/include" 
"-L${ORACLE_HOME}/$(get_libdir)")

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2015-12-03 Thread Davide Pesavento

commit: 2f0365278f103c8c64b7acdf5a0c7bf295808795
Author: Davide Pesavento  gentoo  org>
AuthorDate: Thu Dec  3 16:40:43 2015 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Thu Dec  3 16:40:43 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=2f036527

dev-qt/qtsql: raise sqlite dep to match bundled copy version

Package-Manager: portage-2.2.26

 dev-qt/qtsql/qtsql-5.6..ebuild | 2 +-
 dev-qt/qtsql/qtsql-5..ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-5.6..ebuild 
b/dev-qt/qtsql/qtsql-5.6..ebuild
index a01c4e7..2839078 100644
--- a/dev-qt/qtsql/qtsql-5.6..ebuild
+++ b/dev-qt/qtsql/qtsql-5.6..ebuild
@@ -25,7 +25,7 @@ DEPEND="
oci8? ( dev-db/oracle-instantclient-basic )
odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
postgres? ( dev-db/postgresql:* )
-   sqlite? ( >=dev-db/sqlite-3.8.8.2:3 )
+   sqlite? ( >=dev-db/sqlite-3.8.10.2:3 )
 "
 RDEPEND="${DEPEND}"
 

diff --git a/dev-qt/qtsql/qtsql-5..ebuild b/dev-qt/qtsql/qtsql-5..ebuild
index a01c4e7..2839078 100644
--- a/dev-qt/qtsql/qtsql-5..ebuild
+++ b/dev-qt/qtsql/qtsql-5..ebuild
@@ -25,7 +25,7 @@ DEPEND="
oci8? ( dev-db/oracle-instantclient-basic )
odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
postgres? ( dev-db/postgresql:* )
-   sqlite? ( >=dev-db/sqlite-3.8.8.2:3 )
+   sqlite? ( >=dev-db/sqlite-3.8.10.2:3 )
 "
 RDEPEND="${DEPEND}"

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2016-06-12 Thread Davide Pesavento

commit: 2ae8c074355e103f83ef99b68d5c44b68719f601
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sun Jun 12 23:48:52 2016 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Mon Jun 13 00:11:06 2016 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=2ae8c074

dev-qt/qtsql: convert to usex

Package-Manager: portage-2.3.0_rc1

 dev-qt/qtsql/qtsql-5.6.1.ebuild| 2 +-
 dev-qt/qtsql/qtsql-5.6..ebuild | 2 +-
 dev-qt/qtsql/qtsql-5.7.0_rc.ebuild | 2 +-
 dev-qt/qtsql/qtsql-5.7..ebuild | 2 +-
 dev-qt/qtsql/qtsql-5..ebuild   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-5.6.1.ebuild b/dev-qt/qtsql/qtsql-5.6.1.ebuild
index 426b32e..016251f 100644
--- a/dev-qt/qtsql/qtsql-5.6.1.ebuild
+++ b/dev-qt/qtsql/qtsql-5.6.1.ebuild
@@ -42,7 +42,7 @@ src_configure() {
$(qt_use odbc sql-odbc   plugin)
$(qt_use postgres sql-psql   plugin)
$(qt_use sqlite   sql-sqlite plugin)
-   $(use sqlite && echo -system-sqlite)
+   $(usex sqlite -system-sqlite '')
)
 
use mysql && myconf+=("-I${EPREFIX}/usr/include/mysql" 
"-L${EPREFIX}/usr/$(get_libdir)/mysql")

diff --git a/dev-qt/qtsql/qtsql-5.6..ebuild 
b/dev-qt/qtsql/qtsql-5.6..ebuild
index 426b32e..016251f 100644
--- a/dev-qt/qtsql/qtsql-5.6..ebuild
+++ b/dev-qt/qtsql/qtsql-5.6..ebuild
@@ -42,7 +42,7 @@ src_configure() {
$(qt_use odbc sql-odbc   plugin)
$(qt_use postgres sql-psql   plugin)
$(qt_use sqlite   sql-sqlite plugin)
-   $(use sqlite && echo -system-sqlite)
+   $(usex sqlite -system-sqlite '')
)
 
use mysql && myconf+=("-I${EPREFIX}/usr/include/mysql" 
"-L${EPREFIX}/usr/$(get_libdir)/mysql")

diff --git a/dev-qt/qtsql/qtsql-5.7.0_rc.ebuild 
b/dev-qt/qtsql/qtsql-5.7.0_rc.ebuild
index 426b32e..016251f 100644
--- a/dev-qt/qtsql/qtsql-5.7.0_rc.ebuild
+++ b/dev-qt/qtsql/qtsql-5.7.0_rc.ebuild
@@ -42,7 +42,7 @@ src_configure() {
$(qt_use odbc sql-odbc   plugin)
$(qt_use postgres sql-psql   plugin)
$(qt_use sqlite   sql-sqlite plugin)
-   $(use sqlite && echo -system-sqlite)
+   $(usex sqlite -system-sqlite '')
)
 
use mysql && myconf+=("-I${EPREFIX}/usr/include/mysql" 
"-L${EPREFIX}/usr/$(get_libdir)/mysql")

diff --git a/dev-qt/qtsql/qtsql-5.7..ebuild 
b/dev-qt/qtsql/qtsql-5.7..ebuild
index 426b32e..016251f 100644
--- a/dev-qt/qtsql/qtsql-5.7..ebuild
+++ b/dev-qt/qtsql/qtsql-5.7..ebuild
@@ -42,7 +42,7 @@ src_configure() {
$(qt_use odbc sql-odbc   plugin)
$(qt_use postgres sql-psql   plugin)
$(qt_use sqlite   sql-sqlite plugin)
-   $(use sqlite && echo -system-sqlite)
+   $(usex sqlite -system-sqlite '')
)
 
use mysql && myconf+=("-I${EPREFIX}/usr/include/mysql" 
"-L${EPREFIX}/usr/$(get_libdir)/mysql")

diff --git a/dev-qt/qtsql/qtsql-5..ebuild b/dev-qt/qtsql/qtsql-5..ebuild
index 426b32e..016251f 100644
--- a/dev-qt/qtsql/qtsql-5..ebuild
+++ b/dev-qt/qtsql/qtsql-5..ebuild
@@ -42,7 +42,7 @@ src_configure() {
$(qt_use odbc sql-odbc   plugin)
$(qt_use postgres sql-psql   plugin)
$(qt_use sqlite   sql-sqlite plugin)
-   $(use sqlite && echo -system-sqlite)
+   $(usex sqlite -system-sqlite '')
)
 
use mysql && myconf+=("-I${EPREFIX}/usr/include/mysql" 
"-L${EPREFIX}/usr/$(get_libdir)/mysql")

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2016-05-31 Thread Davide Pesavento

commit: fa53034cf989fdb7e00b4234747df64720aa4363
Author: Davide Pesavento  gentoo  org>
AuthorDate: Tue May 31 22:37:46 2016 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Tue May 31 22:37:46 2016 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=fa53034c

dev-qt/qtsql: drop unused inherit multilib

Package-Manager: portage-2.3.0_rc1

 dev-qt/qtsql/qtsql-5.6..ebuild   | 2 +-
 dev-qt/qtsql/qtsql-5.7.0_beta.ebuild | 2 +-
 dev-qt/qtsql/qtsql-5.7..ebuild   | 2 +-
 dev-qt/qtsql/qtsql-5..ebuild | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-5.6..ebuild 
b/dev-qt/qtsql/qtsql-5.6..ebuild
index 69b981e..426b32e 100644
--- a/dev-qt/qtsql/qtsql-5.6..ebuild
+++ b/dev-qt/qtsql/qtsql-5.6..ebuild
@@ -4,7 +4,7 @@
 
 EAPI=6
 QT5_MODULE="qtbase"
-inherit multilib qt5-build
+inherit qt5-build
 
 DESCRIPTION="SQL abstraction library for the Qt5 tooolkit"
 

diff --git a/dev-qt/qtsql/qtsql-5.7.0_beta.ebuild 
b/dev-qt/qtsql/qtsql-5.7.0_beta.ebuild
index 69b981e..426b32e 100644
--- a/dev-qt/qtsql/qtsql-5.7.0_beta.ebuild
+++ b/dev-qt/qtsql/qtsql-5.7.0_beta.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=6
 QT5_MODULE="qtbase"
-inherit multilib qt5-build
+inherit qt5-build
 
 DESCRIPTION="SQL abstraction library for the Qt5 tooolkit"
 

diff --git a/dev-qt/qtsql/qtsql-5.7..ebuild 
b/dev-qt/qtsql/qtsql-5.7..ebuild
index 69b981e..426b32e 100644
--- a/dev-qt/qtsql/qtsql-5.7..ebuild
+++ b/dev-qt/qtsql/qtsql-5.7..ebuild
@@ -4,7 +4,7 @@
 
 EAPI=6
 QT5_MODULE="qtbase"
-inherit multilib qt5-build
+inherit qt5-build
 
 DESCRIPTION="SQL abstraction library for the Qt5 tooolkit"
 

diff --git a/dev-qt/qtsql/qtsql-5..ebuild b/dev-qt/qtsql/qtsql-5..ebuild
index 69b981e..426b32e 100644
--- a/dev-qt/qtsql/qtsql-5..ebuild
+++ b/dev-qt/qtsql/qtsql-5..ebuild
@@ -4,7 +4,7 @@
 
 EAPI=6
 QT5_MODULE="qtbase"
-inherit multilib qt5-build
+inherit qt5-build
 
 DESCRIPTION="SQL abstraction library for the Qt5 tooolkit"

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2018-02-02 Thread Michael Palimaka

commit: a14de820c4cadb41d8311d0d934454fcffa304ea
Author: Michael Palimaka  gentoo  org>
AuthorDate: Fri Jan 26 06:47:34 2018 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Fri Feb  2 11:53:56 2018 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=a14de820

dev-qt/qtsql: add QT5_GENTOO_PRIVATE_CONFIG

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 dev-qt/qtsql/qtsql-5.10.0.ebuild| 6 +-
 dev-qt/qtsql/qtsql-5.10..ebuild | 6 +-
 dev-qt/qtsql/qtsql-5.11..ebuild | 4 
 dev-qt/qtsql/qtsql-5.9.4.ebuild | 4 
 dev-qt/qtsql/qtsql-5.9..ebuild  | 6 +-
 dev-qt/qtsql/qtsql-5..ebuild| 6 +-
 6 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-5.10.0.ebuild b/dev-qt/qtsql/qtsql-5.10.0.ebuild
index 0560c4a2..8b17279a 100644
--- a/dev-qt/qtsql/qtsql-5.10.0.ebuild
+++ b/dev-qt/qtsql/qtsql-5.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -33,6 +33,10 @@ QT5_TARGET_SUBDIRS=(
src/plugins/sqldrivers
 )
 
+QT5_GENTOO_PRIVATE_CONFIG=(
+   :sql
+)
+
 src_configure() {
local myconf=(
$(qt_use freetds  sql-tdsplugin)

diff --git a/dev-qt/qtsql/qtsql-5.10..ebuild 
b/dev-qt/qtsql/qtsql-5.10..ebuild
index 0560c4a2..8b17279a 100644
--- a/dev-qt/qtsql/qtsql-5.10..ebuild
+++ b/dev-qt/qtsql/qtsql-5.10..ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -33,6 +33,10 @@ QT5_TARGET_SUBDIRS=(
src/plugins/sqldrivers
 )
 
+QT5_GENTOO_PRIVATE_CONFIG=(
+   :sql
+)
+
 src_configure() {
local myconf=(
$(qt_use freetds  sql-tdsplugin)

diff --git a/dev-qt/qtsql/qtsql-5.11..ebuild 
b/dev-qt/qtsql/qtsql-5.11..ebuild
index 2b398a53..8b17279a 100644
--- a/dev-qt/qtsql/qtsql-5.11..ebuild
+++ b/dev-qt/qtsql/qtsql-5.11..ebuild
@@ -33,6 +33,10 @@ QT5_TARGET_SUBDIRS=(
src/plugins/sqldrivers
 )
 
+QT5_GENTOO_PRIVATE_CONFIG=(
+   :sql
+)
+
 src_configure() {
local myconf=(
$(qt_use freetds  sql-tdsplugin)

diff --git a/dev-qt/qtsql/qtsql-5.9.4.ebuild b/dev-qt/qtsql/qtsql-5.9.4.ebuild
index 2b398a53..8b17279a 100644
--- a/dev-qt/qtsql/qtsql-5.9.4.ebuild
+++ b/dev-qt/qtsql/qtsql-5.9.4.ebuild
@@ -33,6 +33,10 @@ QT5_TARGET_SUBDIRS=(
src/plugins/sqldrivers
 )
 
+QT5_GENTOO_PRIVATE_CONFIG=(
+   :sql
+)
+
 src_configure() {
local myconf=(
$(qt_use freetds  sql-tdsplugin)

diff --git a/dev-qt/qtsql/qtsql-5.9..ebuild 
b/dev-qt/qtsql/qtsql-5.9..ebuild
index 0560c4a2..8b17279a 100644
--- a/dev-qt/qtsql/qtsql-5.9..ebuild
+++ b/dev-qt/qtsql/qtsql-5.9..ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -33,6 +33,10 @@ QT5_TARGET_SUBDIRS=(
src/plugins/sqldrivers
 )
 
+QT5_GENTOO_PRIVATE_CONFIG=(
+   :sql
+)
+
 src_configure() {
local myconf=(
$(qt_use freetds  sql-tdsplugin)

diff --git a/dev-qt/qtsql/qtsql-5..ebuild b/dev-qt/qtsql/qtsql-5..ebuild
index 0560c4a2..8b17279a 100644
--- a/dev-qt/qtsql/qtsql-5..ebuild
+++ b/dev-qt/qtsql/qtsql-5..ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -33,6 +33,10 @@ QT5_TARGET_SUBDIRS=(
src/plugins/sqldrivers
 )
 
+QT5_GENTOO_PRIVATE_CONFIG=(
+   :sql
+)
+
 src_configure() {
local myconf=(
$(qt_use freetds  sql-tdsplugin)

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2015-07-29 Thread Davide Pesavento

commit: 29facc1c5ae5108c8fbe4a53dd573a8a2c6ecfea
Author: Davide Pesavento  gentoo  org>
AuthorDate: Wed Jul 29 14:34:01 2015 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Wed Jul 29 14:34:01 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=29facc1c

[dev-qt/qtsql] Switch to virtual/libmysqlclient.

Package-Manager: portage-2.2.20

 dev-qt/qtsql/qtsql-4.8..ebuild | 2 +-
 dev-qt/qtsql/qtsql-5.5.0.ebuild| 2 +-
 dev-qt/qtsql/qtsql-5.5..ebuild | 2 +-
 dev-qt/qtsql/qtsql-5..ebuild   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-4.8..ebuild 
b/dev-qt/qtsql/qtsql-4.8..ebuild
index c3a7bf0..93e7e19 100644
--- a/dev-qt/qtsql/qtsql-4.8..ebuild
+++ b/dev-qt/qtsql/qtsql-4.8..ebuild
@@ -20,7 +20,7 @@ REQUIRED_USE="
 DEPEND="
~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
freetds? ( dev-db/freetds )
-   mysql? ( >=virtual/mysql-5.6-r2:=[${MULTILIB_USEDEP}] )
+   mysql? ( virtual/libmysqlclient:=[${MULTILIB_USEDEP}] )
oci8? ( 
>=dev-db/oracle-instantclient-basic-11.2.0.4[${MULTILIB_USEDEP}] )
odbc? ( || (
>=dev-db/unixODBC-2.3.2-r2[${MULTILIB_USEDEP}]

diff --git a/dev-qt/qtsql/qtsql-5.5.0.ebuild b/dev-qt/qtsql/qtsql-5.5.0.ebuild
index 42efef7..aca1154 100644
--- a/dev-qt/qtsql/qtsql-5.5.0.ebuild
+++ b/dev-qt/qtsql/qtsql-5.5.0.ebuild
@@ -21,7 +21,7 @@ REQUIRED_USE="
 DEPEND="
~dev-qt/qtcore-${PV}
freetds? ( dev-db/freetds )
-   mysql? ( virtual/mysql:= )
+   mysql? ( virtual/libmysqlclient:= )
oci8? ( dev-db/oracle-instantclient-basic )
odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
postgres? ( dev-db/postgresql:* )

diff --git a/dev-qt/qtsql/qtsql-5.5..ebuild 
b/dev-qt/qtsql/qtsql-5.5..ebuild
index 42efef7..aca1154 100644
--- a/dev-qt/qtsql/qtsql-5.5..ebuild
+++ b/dev-qt/qtsql/qtsql-5.5..ebuild
@@ -21,7 +21,7 @@ REQUIRED_USE="
 DEPEND="
~dev-qt/qtcore-${PV}
freetds? ( dev-db/freetds )
-   mysql? ( virtual/mysql:= )
+   mysql? ( virtual/libmysqlclient:= )
oci8? ( dev-db/oracle-instantclient-basic )
odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
postgres? ( dev-db/postgresql:* )

diff --git a/dev-qt/qtsql/qtsql-5..ebuild b/dev-qt/qtsql/qtsql-5..ebuild
index 42efef7..aca1154 100644
--- a/dev-qt/qtsql/qtsql-5..ebuild
+++ b/dev-qt/qtsql/qtsql-5..ebuild
@@ -21,7 +21,7 @@ REQUIRED_USE="
 DEPEND="
~dev-qt/qtcore-${PV}
freetds? ( dev-db/freetds )
-   mysql? ( virtual/mysql:= )
+   mysql? ( virtual/libmysqlclient:= )
oci8? ( dev-db/oracle-instantclient-basic )
odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
postgres? ( dev-db/postgresql:* )

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2018-02-22 Thread Andreas Sturmlechner

commit: e6c56e5f15410af81f4b789b2a532a8abda0569c
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Thu Feb 22 10:11:29 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Feb 22 22:14:14 2018 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=e6c56e5f

dev-qt/qtsql: Drop 5.10.1 (r0)

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 dev-qt/qtsql/qtsql-5.10.1.ebuild | 57 
 1 file changed, 57 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-5.10.1.ebuild b/dev-qt/qtsql/qtsql-5.10.1.ebuild
deleted file mode 100644
index 8b17279a..
--- a/dev-qt/qtsql/qtsql-5.10.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="SQL abstraction library for the Qt5 tooolkit"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-fi
-
-IUSE="freetds mysql oci8 odbc postgres +sqlite"
-
-REQUIRED_USE="
-   || ( freetds mysql oci8 odbc postgres sqlite )
-"
-
-DEPEND="
-   ~dev-qt/qtcore-${PV}
-   freetds? ( dev-db/freetds )
-   mysql? ( virtual/libmysqlclient:= )
-   oci8? ( dev-db/oracle-instantclient-basic )
-   odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
-   postgres? ( dev-db/postgresql:* )
-   sqlite? ( >=dev-db/sqlite-3.8.10.2:3 )
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-   src/sql
-   src/plugins/sqldrivers
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-   :sql
-)
-
-src_configure() {
-   local myconf=(
-   $(qt_use freetds  sql-tdsplugin)
-   $(qt_use mysqlsql-mysql  plugin)
-   $(qt_use oci8 sql-ociplugin)
-   $(qt_use odbc sql-odbc   plugin)
-   $(qt_use postgres sql-psql   plugin)
-   $(qt_use sqlite   sql-sqlite plugin)
-   $(usex sqlite -system-sqlite '')
-   )
-
-   use mysql && myconf+=("-I${EPREFIX}/usr/include/mysql" 
"-L${EPREFIX}/usr/$(get_libdir)/mysql")
-   use oci8 && myconf+=("-I${ORACLE_HOME}/include" 
"-L${ORACLE_HOME}/$(get_libdir)")
-   use odbc && myconf+=("-I${EPREFIX}/usr/include/iodbc")
-   use postgres && myconf+=("-I${EPREFIX}/usr/include/postgresql/pgsql")
-
-   qt5-build_src_configure
-}

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2018-02-22 Thread Andreas Sturmlechner

commit: b00f1b5c451dacea8caf919ee63696f593f17e9b
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Thu Feb 22 19:35:13 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Feb 22 22:14:14 2018 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=b00f1b5c

dev-qt/qtsql: Fix description

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 dev-qt/qtsql/qtsql-5.10.1-r1.ebuild| 2 +-
 dev-qt/qtsql/qtsql-5.11.0_alpha.ebuild | 2 +-
 dev-qt/qtsql/qtsql-5.11..ebuild| 2 +-
 dev-qt/qtsql/qtsql-5.9..ebuild | 2 +-
 dev-qt/qtsql/qtsql-5..ebuild   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-5.10.1-r1.ebuild 
b/dev-qt/qtsql/qtsql-5.10.1-r1.ebuild
index 7765a7bb..f6e32554 100644
--- a/dev-qt/qtsql/qtsql-5.10.1-r1.ebuild
+++ b/dev-qt/qtsql/qtsql-5.10.1-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 QT5_MODULE="qtbase"
 inherit qt5-build
 
-DESCRIPTION="SQL abstraction library for the Qt5 tooolkit"
+DESCRIPTION="SQL abstraction library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"

diff --git a/dev-qt/qtsql/qtsql-5.11.0_alpha.ebuild 
b/dev-qt/qtsql/qtsql-5.11.0_alpha.ebuild
index 7765a7bb..f6e32554 100644
--- a/dev-qt/qtsql/qtsql-5.11.0_alpha.ebuild
+++ b/dev-qt/qtsql/qtsql-5.11.0_alpha.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 QT5_MODULE="qtbase"
 inherit qt5-build
 
-DESCRIPTION="SQL abstraction library for the Qt5 tooolkit"
+DESCRIPTION="SQL abstraction library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"

diff --git a/dev-qt/qtsql/qtsql-5.11..ebuild 
b/dev-qt/qtsql/qtsql-5.11..ebuild
index 7765a7bb..f6e32554 100644
--- a/dev-qt/qtsql/qtsql-5.11..ebuild
+++ b/dev-qt/qtsql/qtsql-5.11..ebuild
@@ -5,7 +5,7 @@ EAPI=6
 QT5_MODULE="qtbase"
 inherit qt5-build
 
-DESCRIPTION="SQL abstraction library for the Qt5 tooolkit"
+DESCRIPTION="SQL abstraction library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"

diff --git a/dev-qt/qtsql/qtsql-5.9..ebuild 
b/dev-qt/qtsql/qtsql-5.9..ebuild
index 7765a7bb..f6e32554 100644
--- a/dev-qt/qtsql/qtsql-5.9..ebuild
+++ b/dev-qt/qtsql/qtsql-5.9..ebuild
@@ -5,7 +5,7 @@ EAPI=6
 QT5_MODULE="qtbase"
 inherit qt5-build
 
-DESCRIPTION="SQL abstraction library for the Qt5 tooolkit"
+DESCRIPTION="SQL abstraction library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"

diff --git a/dev-qt/qtsql/qtsql-5..ebuild b/dev-qt/qtsql/qtsql-5..ebuild
index 7765a7bb..f6e32554 100644
--- a/dev-qt/qtsql/qtsql-5..ebuild
+++ b/dev-qt/qtsql/qtsql-5..ebuild
@@ -5,7 +5,7 @@ EAPI=6
 QT5_MODULE="qtbase"
 inherit qt5-build
 
-DESCRIPTION="SQL abstraction library for the Qt5 tooolkit"
+DESCRIPTION="SQL abstraction library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2018-04-11 Thread Jimi Huotari

commit: 76d56567a6897296ff4003f33ca93ddf5b41358e
Author: Jimi Huotari  gentoo  org>
AuthorDate: Wed Apr 11 12:19:28 2018 +
Commit: Jimi Huotari  gentoo  org>
CommitDate: Wed Apr 11 12:20:54 2018 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=76d56567

dev-qt/qtsql: remove upstreamed MariaDB patch from 5.11.

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 dev-qt/qtsql/qtsql-5.11..ebuild | 5 -
 1 file changed, 5 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-5.11..ebuild 
b/dev-qt/qtsql/qtsql-5.11..ebuild
index ae735814..db29e42d 100644
--- a/dev-qt/qtsql/qtsql-5.11..ebuild
+++ b/dev-qt/qtsql/qtsql-5.11..ebuild
@@ -28,11 +28,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=(
-   "${FILESDIR}/${PN}-5.9.5-mariadb-10.2.patch"
-   # See also: https://codereview.qt-project.org/#/c/206850/
-)
-
 QT5_TARGET_SUBDIRS=(
src/sql
src/plugins/sqldrivers

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2018-04-11 Thread Jimi Huotari

commit: ab940d09e3920194961368e5e52c9bf715222d60
Author: Jimi Huotari  gentoo  org>
AuthorDate: Wed Apr 11 14:56:37 2018 +
Commit: Jimi Huotari  gentoo  org>
CommitDate: Wed Apr 11 14:56:37 2018 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=ab940d09

dev-qt/qtsql: remove upstreamed MariaDB patch from 5.

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 dev-qt/qtsql/qtsql-5..ebuild | 5 -
 1 file changed, 5 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-5..ebuild b/dev-qt/qtsql/qtsql-5..ebuild
index ae735814..db29e42d 100644
--- a/dev-qt/qtsql/qtsql-5..ebuild
+++ b/dev-qt/qtsql/qtsql-5..ebuild
@@ -28,11 +28,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=(
-   "${FILESDIR}/${PN}-5.9.5-mariadb-10.2.patch"
-   # See also: https://codereview.qt-project.org/#/c/206850/
-)
-
 QT5_TARGET_SUBDIRS=(
src/sql
src/plugins/sqldrivers

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2014-06-22 Thread Davide Pesavento

commit: fe124e9f8db459c77d521f1c0c2007a474d1a306
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sun Jun 22 23:40:08 2014 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sun Jun 22 23:40:08 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=fe124e9f

[dev-qt/qtsql:4] Use qt_native_use where appropriate.

Package-Manager: portage-2.2.10

---
 dev-qt/qtsql/qtsql-4.8.6.ebuild| 14 +++---
 dev-qt/qtsql/qtsql-4.8..ebuild | 14 +++---
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-4.8.6.ebuild b/dev-qt/qtsql/qtsql-4.8.6.ebuild
index c66e471..de5d65d 100644
--- a/dev-qt/qtsql/qtsql-4.8.6.ebuild
+++ b/dev-qt/qtsql/qtsql-4.8.6.ebuild
@@ -38,13 +38,13 @@ QT4_TARGET_DIRECTORIES="
 
 src_configure() {
myconf+="
-   $(qt_use firebird sql-ibase  plugin)
-   $(qt_use freetds  sql-tdsplugin)
-   $(qt_use mysqlsql-mysql  plugin) $(use mysql && echo 
"-I${EPREFIX}/usr/include/mysql -L${EPREFIX}/usr/$(get_libdir)/mysql")
-   $(qt_use oci8 sql-ociplugin) $(use oci8 && echo 
"-I${ORACLE_HOME}/include -L${ORACLE_HOME}/$(get_libdir)")
-   $(qt_use odbc sql-odbc   plugin) $(use odbc && echo 
"-I${EPREFIX}/usr/include/iodbc")
-   $(qt_use postgres sql-psql   plugin) $(use postgres && echo 
"-I${EPREFIX}/usr/include/postgresql/pgsql")
-   $(qt_use sqlite   sql-sqlite plugin) $(use sqlite && echo 
-system-sqlite)
+   $(qt_native_use firebird sql-ibase  plugin)
+   $(qt_native_use freetds  sql-tdsplugin)
+   $(qt_native_use mysqlsql-mysql  plugin) $(use mysql && 
multilib_is_native_abi && echo "-I${EPREFIX}/usr/include/mysql 
-L${EPREFIX}/usr/$(get_libdir)/mysql")
+   $(qt_useoci8 sql-ociplugin) $(use oci8 && echo 
"-I${ORACLE_HOME}/include -L${ORACLE_HOME}/$(get_libdir)")
+   $(qt_useodbc sql-odbc   plugin) $(use odbc && echo 
"-I${EPREFIX}/usr/include/iodbc")
+   $(qt_native_use postgres sql-psql   plugin) $(use postgres && 
multilib_is_native_abi && echo "-I${EPREFIX}/usr/include/postgresql/pgsql")
+   $(qt_usesqlite   sql-sqlite plugin) $(use sqlite && 
echo -system-sqlite)
-no-sql-db2
-no-sql-sqlite2
-no-sql-symsql

diff --git a/dev-qt/qtsql/qtsql-4.8..ebuild 
b/dev-qt/qtsql/qtsql-4.8..ebuild
index c66e471..de5d65d 100644
--- a/dev-qt/qtsql/qtsql-4.8..ebuild
+++ b/dev-qt/qtsql/qtsql-4.8..ebuild
@@ -38,13 +38,13 @@ QT4_TARGET_DIRECTORIES="
 
 src_configure() {
myconf+="
-   $(qt_use firebird sql-ibase  plugin)
-   $(qt_use freetds  sql-tdsplugin)
-   $(qt_use mysqlsql-mysql  plugin) $(use mysql && echo 
"-I${EPREFIX}/usr/include/mysql -L${EPREFIX}/usr/$(get_libdir)/mysql")
-   $(qt_use oci8 sql-ociplugin) $(use oci8 && echo 
"-I${ORACLE_HOME}/include -L${ORACLE_HOME}/$(get_libdir)")
-   $(qt_use odbc sql-odbc   plugin) $(use odbc && echo 
"-I${EPREFIX}/usr/include/iodbc")
-   $(qt_use postgres sql-psql   plugin) $(use postgres && echo 
"-I${EPREFIX}/usr/include/postgresql/pgsql")
-   $(qt_use sqlite   sql-sqlite plugin) $(use sqlite && echo 
-system-sqlite)
+   $(qt_native_use firebird sql-ibase  plugin)
+   $(qt_native_use freetds  sql-tdsplugin)
+   $(qt_native_use mysqlsql-mysql  plugin) $(use mysql && 
multilib_is_native_abi && echo "-I${EPREFIX}/usr/include/mysql 
-L${EPREFIX}/usr/$(get_libdir)/mysql")
+   $(qt_useoci8 sql-ociplugin) $(use oci8 && echo 
"-I${ORACLE_HOME}/include -L${ORACLE_HOME}/$(get_libdir)")
+   $(qt_useodbc sql-odbc   plugin) $(use odbc && echo 
"-I${EPREFIX}/usr/include/iodbc")
+   $(qt_native_use postgres sql-psql   plugin) $(use postgres && 
multilib_is_native_abi && echo "-I${EPREFIX}/usr/include/postgresql/pgsql")
+   $(qt_usesqlite   sql-sqlite plugin) $(use sqlite && 
echo -system-sqlite)
-no-sql-db2
-no-sql-sqlite2
-no-sql-symsql

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2014-06-23 Thread Davide Pesavento

commit: 79561754caa51a6ad6dbf5294de211b162b4f1c5
Author: Davide Pesavento  gentoo  org>
AuthorDate: Mon Jun 23 22:38:50 2014 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Mon Jun 23 22:38:50 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=79561754

[dev-qt/qtsql:4] Add MULTILIB_USEDEP to libiodbc dep too.

Package-Manager: portage-2.2.10

---
 dev-qt/qtsql/qtsql-4.8.6.ebuild| 2 +-
 dev-qt/qtsql/qtsql-4.8..ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-4.8.6.ebuild b/dev-qt/qtsql/qtsql-4.8.6.ebuild
index de5d65d..6ee8d7a 100644
--- a/dev-qt/qtsql/qtsql-4.8.6.ebuild
+++ b/dev-qt/qtsql/qtsql-4.8.6.ebuild
@@ -26,7 +26,7 @@ DEPEND="
freetds? ( dev-db/freetds )
mysql? ( virtual/mysql )
oci8? ( dev-db/oracle-instantclient-basic[${MULTILIB_USEDEP}] )
-   odbc? ( || ( dev-db/unixODBC[${MULTILIB_USEDEP}] dev-db/libiodbc ) )
+   odbc? ( || ( dev-db/unixODBC[${MULTILIB_USEDEP}] 
dev-db/libiodbc[${MULTILIB_USEDEP}] ) )
postgres? ( dev-db/postgresql-base )
sqlite? ( dev-db/sqlite:3[${MULTILIB_USEDEP}] )
 "

diff --git a/dev-qt/qtsql/qtsql-4.8..ebuild 
b/dev-qt/qtsql/qtsql-4.8..ebuild
index de5d65d..6ee8d7a 100644
--- a/dev-qt/qtsql/qtsql-4.8..ebuild
+++ b/dev-qt/qtsql/qtsql-4.8..ebuild
@@ -26,7 +26,7 @@ DEPEND="
freetds? ( dev-db/freetds )
mysql? ( virtual/mysql )
oci8? ( dev-db/oracle-instantclient-basic[${MULTILIB_USEDEP}] )
-   odbc? ( || ( dev-db/unixODBC[${MULTILIB_USEDEP}] dev-db/libiodbc ) )
+   odbc? ( || ( dev-db/unixODBC[${MULTILIB_USEDEP}] 
dev-db/libiodbc[${MULTILIB_USEDEP}] ) )
postgres? ( dev-db/postgresql-base )
sqlite? ( dev-db/sqlite:3[${MULTILIB_USEDEP}] )
 "

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2014-05-27 Thread Davide Pesavento

commit: af637d5e7a960b70feacc6f8a054cebedc34f5bf
Author: Davide Pesavento  gentoo  org>
AuthorDate: Tue May 27 22:31:29 2014 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Tue May 27 22:31:29 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=af637d5e

[dev-qt/qtsql:4] src.pro and tools.pro are not used.

Package-Manager: portage-2.2.10

---
 dev-qt/qtsql/qtsql-4.8..ebuild | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-4.8..ebuild 
b/dev-qt/qtsql/qtsql-4.8..ebuild
index e3fe7c7..05ad99c 100644
--- a/dev-qt/qtsql/qtsql-4.8..ebuild
+++ b/dev-qt/qtsql/qtsql-4.8..ebuild
@@ -40,10 +40,8 @@ QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
include/Qt
include/QtCore
include/QtSql
-   src/src.pro
src/corelib
-   src/plugins
-   src/tools/tools.pro"
+   src/plugins"
 
 src_configure() {
myconf+="

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2014-07-01 Thread Davide Pesavento

commit: 570166eb1297564a8986ae4d91c4364a5c4f3483
Author: Davide Pesavento  gentoo  org>
AuthorDate: Tue Jul  1 16:31:21 2014 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Tue Jul  1 16:31:21 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=570166eb

[dev-qt/qtsql] Remove firebird USE flag.

dev-db/firebird has been masked for removal.

Package-Manager: portage-2.2.10

---
 dev-qt/qtsql/qtsql-4.8.6.ebuild| 7 +++
 dev-qt/qtsql/qtsql-4.8..ebuild | 7 +++
 dev-qt/qtsql/qtsql-5.3.1.ebuild| 6 ++
 dev-qt/qtsql/qtsql-5.3..ebuild | 6 ++
 dev-qt/qtsql/qtsql-5..ebuild   | 6 ++
 5 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-4.8.6.ebuild b/dev-qt/qtsql/qtsql-4.8.6.ebuild
index 6ee8d7a..803a39a 100644
--- a/dev-qt/qtsql/qtsql-4.8.6.ebuild
+++ b/dev-qt/qtsql/qtsql-4.8.6.ebuild
@@ -14,15 +14,14 @@ else
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 
~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
-IUSE="firebird freetds mysql oci8 odbc postgres qt3support +sqlite"
+IUSE="freetds mysql oci8 odbc postgres qt3support +sqlite"
 
 REQUIRED_USE="
-   || ( firebird freetds mysql oci8 odbc postgres sqlite )
+   || ( freetds mysql oci8 odbc postgres sqlite )
 "
 
 DEPEND="
~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
-   firebird? ( dev-db/firebird )
freetds? ( dev-db/freetds )
mysql? ( virtual/mysql )
oci8? ( dev-db/oracle-instantclient-basic[${MULTILIB_USEDEP}] )
@@ -38,7 +37,6 @@ QT4_TARGET_DIRECTORIES="
 
 src_configure() {
myconf+="
-   $(qt_native_use firebird sql-ibase  plugin)
$(qt_native_use freetds  sql-tdsplugin)
$(qt_native_use mysqlsql-mysql  plugin) $(use mysql && 
multilib_is_native_abi && echo "-I${EPREFIX}/usr/include/mysql 
-L${EPREFIX}/usr/$(get_libdir)/mysql")
$(qt_useoci8 sql-ociplugin) $(use oci8 && echo 
"-I${ORACLE_HOME}/include -L${ORACLE_HOME}/$(get_libdir)")
@@ -46,6 +44,7 @@ src_configure() {
$(qt_native_use postgres sql-psql   plugin) $(use postgres && 
multilib_is_native_abi && echo "-I${EPREFIX}/usr/include/postgresql/pgsql")
$(qt_usesqlite   sql-sqlite plugin) $(use sqlite && 
echo -system-sqlite)
-no-sql-db2
+   -no-sql-ibase
-no-sql-sqlite2
-no-sql-symsql
$(qt_use qt3support)

diff --git a/dev-qt/qtsql/qtsql-4.8..ebuild 
b/dev-qt/qtsql/qtsql-4.8..ebuild
index 6ee8d7a..803a39a 100644
--- a/dev-qt/qtsql/qtsql-4.8..ebuild
+++ b/dev-qt/qtsql/qtsql-4.8..ebuild
@@ -14,15 +14,14 @@ else
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 
~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
-IUSE="firebird freetds mysql oci8 odbc postgres qt3support +sqlite"
+IUSE="freetds mysql oci8 odbc postgres qt3support +sqlite"
 
 REQUIRED_USE="
-   || ( firebird freetds mysql oci8 odbc postgres sqlite )
+   || ( freetds mysql oci8 odbc postgres sqlite )
 "
 
 DEPEND="
~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
-   firebird? ( dev-db/firebird )
freetds? ( dev-db/freetds )
mysql? ( virtual/mysql )
oci8? ( dev-db/oracle-instantclient-basic[${MULTILIB_USEDEP}] )
@@ -38,7 +37,6 @@ QT4_TARGET_DIRECTORIES="
 
 src_configure() {
myconf+="
-   $(qt_native_use firebird sql-ibase  plugin)
$(qt_native_use freetds  sql-tdsplugin)
$(qt_native_use mysqlsql-mysql  plugin) $(use mysql && 
multilib_is_native_abi && echo "-I${EPREFIX}/usr/include/mysql 
-L${EPREFIX}/usr/$(get_libdir)/mysql")
$(qt_useoci8 sql-ociplugin) $(use oci8 && echo 
"-I${ORACLE_HOME}/include -L${ORACLE_HOME}/$(get_libdir)")
@@ -46,6 +44,7 @@ src_configure() {
$(qt_native_use postgres sql-psql   plugin) $(use postgres && 
multilib_is_native_abi && echo "-I${EPREFIX}/usr/include/postgresql/pgsql")
$(qt_usesqlite   sql-sqlite plugin) $(use sqlite && 
echo -system-sqlite)
-no-sql-db2
+   -no-sql-ibase
-no-sql-sqlite2
-no-sql-symsql
$(qt_use qt3support)

diff --git a/dev-qt/qtsql/qtsql-5.3.1.ebuild b/dev-qt/qtsql/qtsql-5.3.1.ebuild
index 8db3a2e..392cd48 100644
--- a/dev-qt/qtsql/qtsql-5.3.1.ebuild
+++ b/dev-qt/qtsql/qtsql-5.3.1.ebuild
@@ -16,15 +16,14 @@ else
KEYWORDS="~amd64 ~x86"
 fi
 
-IUSE="firebird freetds mysql oci8 odbc postgres +sqlite"
+IUSE="freetds mysql oci8 odbc postgres +sqlite"
 
 REQUIRED_USE="
-   || ( firebird freetds mysql oci8 odbc postg

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2014-12-30 Thread Michael Palimaka

commit: 661418dfaa7785747e71bb38b7609273b694ec5e
Author: Michael Palimaka  gentoo  org>
AuthorDate: Tue Dec 30 16:42:02 2014 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Tue Dec 30 16:42:02 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=661418df

[dev-qt/qtsql] Account for postgresql package changes.

Package-Manager: portage-2.2.15

---
 dev-qt/qtsql/qtsql-4.8..ebuild | 2 +-
 dev-qt/qtsql/qtsql-5.4..ebuild | 2 +-
 dev-qt/qtsql/qtsql-5..ebuild   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-4.8..ebuild 
b/dev-qt/qtsql/qtsql-4.8..ebuild
index 3334caa..87edbe4 100644
--- a/dev-qt/qtsql/qtsql-4.8..ebuild
+++ b/dev-qt/qtsql/qtsql-4.8..ebuild
@@ -29,7 +29,7 @@ DEPEND="
>=dev-db/unixODBC-2.3.2-r2[${MULTILIB_USEDEP}]
>=dev-db/libiodbc-3.52.8-r2[${MULTILIB_USEDEP}]
) )
-   postgres? ( virtual/postgresql:* )
+   postgres? ( dev-db/postgresql:* )
sqlite? ( >=dev-db/sqlite-3.8.3:3[${MULTILIB_USEDEP}] )
 "
 RDEPEND="${DEPEND}"

diff --git a/dev-qt/qtsql/qtsql-5.4..ebuild 
b/dev-qt/qtsql/qtsql-5.4..ebuild
index 2eca5d3..8d7a320 100644
--- a/dev-qt/qtsql/qtsql-5.4..ebuild
+++ b/dev-qt/qtsql/qtsql-5.4..ebuild
@@ -28,7 +28,7 @@ DEPEND="
mysql? ( virtual/mysql:= )
oci8? ( dev-db/oracle-instantclient-basic )
odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
-   postgres? ( virtual/postgresql:* )
+   postgres? ( dev-db/postgresql:* )
sqlite? ( dev-db/sqlite:3 )
 "
 RDEPEND="${DEPEND}"

diff --git a/dev-qt/qtsql/qtsql-5..ebuild b/dev-qt/qtsql/qtsql-5..ebuild
index 2eca5d3..8d7a320 100644
--- a/dev-qt/qtsql/qtsql-5..ebuild
+++ b/dev-qt/qtsql/qtsql-5..ebuild
@@ -28,7 +28,7 @@ DEPEND="
mysql? ( virtual/mysql:= )
oci8? ( dev-db/oracle-instantclient-basic )
odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
-   postgres? ( virtual/postgresql:* )
+   postgres? ( dev-db/postgresql:* )
sqlite? ( dev-db/sqlite:3 )
 "
 RDEPEND="${DEPEND}"

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2014-12-15 Thread Davide Pesavento

commit: 6bf9a164afc731eff0e2d5ec1f4dd2198f724b5b
Author: Davide Pesavento  gentoo  org>
AuthorDate: Mon Dec 15 21:57:16 2014 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Mon Dec 15 21:57:16 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=6bf9a164

[dev-qt/qtsql:4] Sync.

Package-Manager: portage-2.2.15

---
 dev-qt/qtsql/qtsql-4.8..ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-4.8..ebuild 
b/dev-qt/qtsql/qtsql-4.8..ebuild
index 8db5317..3334caa 100644
--- a/dev-qt/qtsql/qtsql-4.8..ebuild
+++ b/dev-qt/qtsql/qtsql-4.8..ebuild
@@ -26,8 +26,8 @@ DEPEND="
mysql? ( >=virtual/mysql-5.6-r2:=[${MULTILIB_USEDEP}] )
oci8? ( 
>=dev-db/oracle-instantclient-basic-11.2.0.4[${MULTILIB_USEDEP}] )
odbc? ( || (
-   >=dev-db/unixODBC-2.3.2[${MULTILIB_USEDEP}]
-   >=dev-db/libiodbc-3.52.8[${MULTILIB_USEDEP}]
+   >=dev-db/unixODBC-2.3.2-r2[${MULTILIB_USEDEP}]
+   >=dev-db/libiodbc-3.52.8-r2[${MULTILIB_USEDEP}]
) )
postgres? ( virtual/postgresql:* )
sqlite? ( >=dev-db/sqlite-3.8.3:3[${MULTILIB_USEDEP}] )

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2015-03-25 Thread Davide Pesavento

commit: ab914bf6535bee60664f9decdf1729cc198d1546
Author: Davide Pesavento  gentoo  org>
AuthorDate: Thu Mar 26 01:41:10 2015 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Thu Mar 26 01:41:10 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=ab914bf6

[dev-qt/qtsql:5] Raise sqlite dep based on the bundled copy version.

Package-Manager: portage-2.2.18

 dev-qt/qtsql/qtsql-5.5..ebuild | 2 +-
 dev-qt/qtsql/qtsql-5..ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-5.5..ebuild 
b/dev-qt/qtsql/qtsql-5.5..ebuild
index 3061e4f..cd4d55d 100644
--- a/dev-qt/qtsql/qtsql-5.5..ebuild
+++ b/dev-qt/qtsql/qtsql-5.5..ebuild
@@ -29,7 +29,7 @@ DEPEND="
oci8? ( dev-db/oracle-instantclient-basic )
odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
postgres? ( dev-db/postgresql:* )
-   sqlite? ( dev-db/sqlite:3 )
+   sqlite? ( >=dev-db/sqlite-3.8.8.2:3 )
 "
 RDEPEND="${DEPEND}"
 

diff --git a/dev-qt/qtsql/qtsql-5..ebuild b/dev-qt/qtsql/qtsql-5..ebuild
index 3061e4f..cd4d55d 100644
--- a/dev-qt/qtsql/qtsql-5..ebuild
+++ b/dev-qt/qtsql/qtsql-5..ebuild
@@ -29,7 +29,7 @@ DEPEND="
oci8? ( dev-db/oracle-instantclient-basic )
odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
postgres? ( dev-db/postgresql:* )
-   sqlite? ( dev-db/sqlite:3 )
+   sqlite? ( >=dev-db/sqlite-3.8.8.2:3 )
 "
 RDEPEND="${DEPEND}"

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2014-08-31 Thread Davide Pesavento

commit: 2b3d75980f998d9ab2d0daf1d333a977edef1c88
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sun Aug 31 23:21:52 2014 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sun Aug 31 23:21:52 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=2b3d7598

[dev-qt/qtsql:4] Convert mysql plugin to multilib.

Package-Manager: portage-2.2.12-r1

---
 dev-qt/qtsql/qtsql-4.8.6.ebuild| 4 ++--
 dev-qt/qtsql/qtsql-4.8..ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-4.8.6.ebuild b/dev-qt/qtsql/qtsql-4.8.6.ebuild
index f2bf654..05c40bb 100644
--- a/dev-qt/qtsql/qtsql-4.8.6.ebuild
+++ b/dev-qt/qtsql/qtsql-4.8.6.ebuild
@@ -23,7 +23,7 @@ REQUIRED_USE="
 DEPEND="
~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
freetds? ( dev-db/freetds )
-   mysql? ( virtual/mysql:= )
+   mysql? ( >=virtual/mysql-5.6-r2:=[${MULTILIB_USEDEP}] )
oci8? ( dev-db/oracle-instantclient-basic[${MULTILIB_USEDEP}] )
odbc? ( || ( dev-db/unixODBC[${MULTILIB_USEDEP}] 
dev-db/libiodbc[${MULTILIB_USEDEP}] ) )
postgres? ( dev-db/postgresql-base:* )
@@ -38,7 +38,7 @@ QT4_TARGET_DIRECTORIES="
 multilib_src_configure() {
local myconf=(
$(qt_native_use freetds  sql-tdsplugin)
-   $(qt_native_use mysqlsql-mysql  plugin) $(use mysql && 
multilib_is_native_abi && echo "-I${EPREFIX}/usr/include/mysql 
-L${EPREFIX}/usr/$(get_libdir)/mysql")
+   $(qt_usemysqlsql-mysql  plugin) $(use mysql && echo 
"-I${EPREFIX}/usr/include/mysql -L${EPREFIX}/usr/$(get_libdir)/mysql")
$(qt_useoci8 sql-ociplugin) $(use oci8 && echo 
"-I${ORACLE_HOME}/include -L${ORACLE_HOME}/$(get_libdir)")
$(qt_useodbc sql-odbc   plugin) $(use odbc && echo 
"-I${EPREFIX}/usr/include/iodbc")
$(qt_native_use postgres sql-psql   plugin) $(use postgres && 
multilib_is_native_abi && echo "-I${EPREFIX}/usr/include/postgresql/pgsql")

diff --git a/dev-qt/qtsql/qtsql-4.8..ebuild 
b/dev-qt/qtsql/qtsql-4.8..ebuild
index f2bf654..05c40bb 100644
--- a/dev-qt/qtsql/qtsql-4.8..ebuild
+++ b/dev-qt/qtsql/qtsql-4.8..ebuild
@@ -23,7 +23,7 @@ REQUIRED_USE="
 DEPEND="
~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
freetds? ( dev-db/freetds )
-   mysql? ( virtual/mysql:= )
+   mysql? ( >=virtual/mysql-5.6-r2:=[${MULTILIB_USEDEP}] )
oci8? ( dev-db/oracle-instantclient-basic[${MULTILIB_USEDEP}] )
odbc? ( || ( dev-db/unixODBC[${MULTILIB_USEDEP}] 
dev-db/libiodbc[${MULTILIB_USEDEP}] ) )
postgres? ( dev-db/postgresql-base:* )
@@ -38,7 +38,7 @@ QT4_TARGET_DIRECTORIES="
 multilib_src_configure() {
local myconf=(
$(qt_native_use freetds  sql-tdsplugin)
-   $(qt_native_use mysqlsql-mysql  plugin) $(use mysql && 
multilib_is_native_abi && echo "-I${EPREFIX}/usr/include/mysql 
-L${EPREFIX}/usr/$(get_libdir)/mysql")
+   $(qt_usemysqlsql-mysql  plugin) $(use mysql && echo 
"-I${EPREFIX}/usr/include/mysql -L${EPREFIX}/usr/$(get_libdir)/mysql")
$(qt_useoci8 sql-ociplugin) $(use oci8 && echo 
"-I${ORACLE_HOME}/include -L${ORACLE_HOME}/$(get_libdir)")
$(qt_useodbc sql-odbc   plugin) $(use odbc && echo 
"-I${EPREFIX}/usr/include/iodbc")
$(qt_native_use postgres sql-psql   plugin) $(use postgres && 
multilib_is_native_abi && echo "-I${EPREFIX}/usr/include/postgresql/pgsql")

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2014-08-31 Thread Davide Pesavento

commit: 3365067c12459d608326702d4d72d86a7bbe7d47
Author: Davide Pesavento  gentoo  org>
AuthorDate: Mon Sep  1 00:01:49 2014 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Mon Sep  1 00:01:49 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=3365067c

[dev-qt/qtsql:4] Raise minimum deps to ensure correct multilib USE deps.

Package-Manager: portage-2.2.12-r1

---
 dev-qt/qtsql/qtsql-4.8.6.ebuild| 9 ++---
 dev-qt/qtsql/qtsql-4.8..ebuild | 9 ++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-4.8.6.ebuild b/dev-qt/qtsql/qtsql-4.8.6.ebuild
index 05c40bb..bbe669b 100644
--- a/dev-qt/qtsql/qtsql-4.8.6.ebuild
+++ b/dev-qt/qtsql/qtsql-4.8.6.ebuild
@@ -24,10 +24,13 @@ DEPEND="
~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
freetds? ( dev-db/freetds )
mysql? ( >=virtual/mysql-5.6-r2:=[${MULTILIB_USEDEP}] )
-   oci8? ( dev-db/oracle-instantclient-basic[${MULTILIB_USEDEP}] )
-   odbc? ( || ( dev-db/unixODBC[${MULTILIB_USEDEP}] 
dev-db/libiodbc[${MULTILIB_USEDEP}] ) )
+   oci8? ( 
>=dev-db/oracle-instantclient-basic-11.2.0.4[${MULTILIB_USEDEP}] )
+   odbc? ( || (
+   >=dev-db/unixODBC-2.3.2[${MULTILIB_USEDEP}]
+   >=dev-db/libiodbc-3.52.8[${MULTILIB_USEDEP}]
+   ) )
postgres? ( dev-db/postgresql-base:* )
-   sqlite? ( dev-db/sqlite:3[${MULTILIB_USEDEP}] )
+   sqlite? ( >=dev-db/sqlite-3.8.3:3[${MULTILIB_USEDEP}] )
 "
 RDEPEND="${DEPEND}"
 

diff --git a/dev-qt/qtsql/qtsql-4.8..ebuild 
b/dev-qt/qtsql/qtsql-4.8..ebuild
index 05c40bb..bbe669b 100644
--- a/dev-qt/qtsql/qtsql-4.8..ebuild
+++ b/dev-qt/qtsql/qtsql-4.8..ebuild
@@ -24,10 +24,13 @@ DEPEND="
~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
freetds? ( dev-db/freetds )
mysql? ( >=virtual/mysql-5.6-r2:=[${MULTILIB_USEDEP}] )
-   oci8? ( dev-db/oracle-instantclient-basic[${MULTILIB_USEDEP}] )
-   odbc? ( || ( dev-db/unixODBC[${MULTILIB_USEDEP}] 
dev-db/libiodbc[${MULTILIB_USEDEP}] ) )
+   oci8? ( 
>=dev-db/oracle-instantclient-basic-11.2.0.4[${MULTILIB_USEDEP}] )
+   odbc? ( || (
+   >=dev-db/unixODBC-2.3.2[${MULTILIB_USEDEP}]
+   >=dev-db/libiodbc-3.52.8[${MULTILIB_USEDEP}]
+   ) )
postgres? ( dev-db/postgresql-base:* )
-   sqlite? ( dev-db/sqlite:3[${MULTILIB_USEDEP}] )
+   sqlite? ( >=dev-db/sqlite-3.8.3:3[${MULTILIB_USEDEP}] )
 "
 RDEPEND="${DEPEND}"

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2014-11-03 Thread Davide Pesavento

commit: 6e2b3777aafc562ddd6b116c74e9ed3525486b7d
Author: Davide Pesavento  gentoo  org>
AuthorDate: Mon Nov  3 14:29:20 2014 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Mon Nov  3 14:29:20 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=6e2b3777

[dev-qt/qtsql] Switch to virtual/postgresql.

Package-Manager: portage-2.2.14

---
 dev-qt/qtsql/qtsql-4.8.6.ebuild  | 2 +-
 dev-qt/qtsql/qtsql-4.8..ebuild   | 2 +-
 dev-qt/qtsql/qtsql-5.3..ebuild   | 2 +-
 dev-qt/qtsql/qtsql-5.4.0_beta.ebuild | 2 +-
 dev-qt/qtsql/qtsql-5.4..ebuild   | 2 +-
 dev-qt/qtsql/qtsql-5..ebuild | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-4.8.6.ebuild b/dev-qt/qtsql/qtsql-4.8.6.ebuild
index bbe669b..8db5317 100644
--- a/dev-qt/qtsql/qtsql-4.8.6.ebuild
+++ b/dev-qt/qtsql/qtsql-4.8.6.ebuild
@@ -29,7 +29,7 @@ DEPEND="
>=dev-db/unixODBC-2.3.2[${MULTILIB_USEDEP}]
>=dev-db/libiodbc-3.52.8[${MULTILIB_USEDEP}]
) )
-   postgres? ( dev-db/postgresql-base:* )
+   postgres? ( virtual/postgresql:* )
sqlite? ( >=dev-db/sqlite-3.8.3:3[${MULTILIB_USEDEP}] )
 "
 RDEPEND="${DEPEND}"

diff --git a/dev-qt/qtsql/qtsql-4.8..ebuild 
b/dev-qt/qtsql/qtsql-4.8..ebuild
index bbe669b..8db5317 100644
--- a/dev-qt/qtsql/qtsql-4.8..ebuild
+++ b/dev-qt/qtsql/qtsql-4.8..ebuild
@@ -29,7 +29,7 @@ DEPEND="
>=dev-db/unixODBC-2.3.2[${MULTILIB_USEDEP}]
>=dev-db/libiodbc-3.52.8[${MULTILIB_USEDEP}]
) )
-   postgres? ( dev-db/postgresql-base:* )
+   postgres? ( virtual/postgresql:* )
sqlite? ( >=dev-db/sqlite-3.8.3:3[${MULTILIB_USEDEP}] )
 "
 RDEPEND="${DEPEND}"

diff --git a/dev-qt/qtsql/qtsql-5.3..ebuild 
b/dev-qt/qtsql/qtsql-5.3..ebuild
index 979dff5..8d606dd 100644
--- a/dev-qt/qtsql/qtsql-5.3..ebuild
+++ b/dev-qt/qtsql/qtsql-5.3..ebuild
@@ -28,7 +28,7 @@ DEPEND="
mysql? ( virtual/mysql:= )
oci8? ( dev-db/oracle-instantclient-basic )
odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
-   postgres? ( dev-db/postgresql-base:* )
+   postgres? ( virtual/postgresql:* )
sqlite? ( dev-db/sqlite:3 )
 "
 RDEPEND="${DEPEND}"

diff --git a/dev-qt/qtsql/qtsql-5.4.0_beta.ebuild 
b/dev-qt/qtsql/qtsql-5.4.0_beta.ebuild
index 4acdb2e..2eca5d3 100644
--- a/dev-qt/qtsql/qtsql-5.4.0_beta.ebuild
+++ b/dev-qt/qtsql/qtsql-5.4.0_beta.ebuild
@@ -28,7 +28,7 @@ DEPEND="
mysql? ( virtual/mysql:= )
oci8? ( dev-db/oracle-instantclient-basic )
odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
-   postgres? ( dev-db/postgresql-base:* )
+   postgres? ( virtual/postgresql:* )
sqlite? ( dev-db/sqlite:3 )
 "
 RDEPEND="${DEPEND}"

diff --git a/dev-qt/qtsql/qtsql-5.4..ebuild 
b/dev-qt/qtsql/qtsql-5.4..ebuild
index 4acdb2e..2eca5d3 100644
--- a/dev-qt/qtsql/qtsql-5.4..ebuild
+++ b/dev-qt/qtsql/qtsql-5.4..ebuild
@@ -28,7 +28,7 @@ DEPEND="
mysql? ( virtual/mysql:= )
oci8? ( dev-db/oracle-instantclient-basic )
odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
-   postgres? ( dev-db/postgresql-base:* )
+   postgres? ( virtual/postgresql:* )
sqlite? ( dev-db/sqlite:3 )
 "
 RDEPEND="${DEPEND}"

diff --git a/dev-qt/qtsql/qtsql-5..ebuild b/dev-qt/qtsql/qtsql-5..ebuild
index 4acdb2e..2eca5d3 100644
--- a/dev-qt/qtsql/qtsql-5..ebuild
+++ b/dev-qt/qtsql/qtsql-5..ebuild
@@ -28,7 +28,7 @@ DEPEND="
mysql? ( virtual/mysql:= )
oci8? ( dev-db/oracle-instantclient-basic )
odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
-   postgres? ( dev-db/postgresql-base:* )
+   postgres? ( virtual/postgresql:* )
sqlite? ( dev-db/sqlite:3 )
 "
 RDEPEND="${DEPEND}"

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2014-08-14 Thread Davide Pesavento

commit: ed1efa703c9954b839a504303f08d29c5d6d0e1d
Author: Davide Pesavento  gentoo  org>
AuthorDate: Thu Aug 14 23:31:01 2014 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Thu Aug 14 23:31:01 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=ed1efa70

[dev-qt/qtsql] Add slot operators to mysql and postgresql deps.

Package-Manager: portage-2.2.12

---
 dev-qt/qtsql/qtsql-4.8.6.ebuild| 4 ++--
 dev-qt/qtsql/qtsql-4.8..ebuild | 4 ++--
 dev-qt/qtsql/qtsql-5.3.1.ebuild| 4 ++--
 dev-qt/qtsql/qtsql-5.3..ebuild | 4 ++--
 dev-qt/qtsql/qtsql-5.4..ebuild | 4 ++--
 dev-qt/qtsql/qtsql-5..ebuild   | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-4.8.6.ebuild b/dev-qt/qtsql/qtsql-4.8.6.ebuild
index cd5918f..f2bf654 100644
--- a/dev-qt/qtsql/qtsql-4.8.6.ebuild
+++ b/dev-qt/qtsql/qtsql-4.8.6.ebuild
@@ -23,10 +23,10 @@ REQUIRED_USE="
 DEPEND="
~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
freetds? ( dev-db/freetds )
-   mysql? ( virtual/mysql )
+   mysql? ( virtual/mysql:= )
oci8? ( dev-db/oracle-instantclient-basic[${MULTILIB_USEDEP}] )
odbc? ( || ( dev-db/unixODBC[${MULTILIB_USEDEP}] 
dev-db/libiodbc[${MULTILIB_USEDEP}] ) )
-   postgres? ( dev-db/postgresql-base )
+   postgres? ( dev-db/postgresql-base:* )
sqlite? ( dev-db/sqlite:3[${MULTILIB_USEDEP}] )
 "
 RDEPEND="${DEPEND}"

diff --git a/dev-qt/qtsql/qtsql-4.8..ebuild 
b/dev-qt/qtsql/qtsql-4.8..ebuild
index cd5918f..f2bf654 100644
--- a/dev-qt/qtsql/qtsql-4.8..ebuild
+++ b/dev-qt/qtsql/qtsql-4.8..ebuild
@@ -23,10 +23,10 @@ REQUIRED_USE="
 DEPEND="
~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
freetds? ( dev-db/freetds )
-   mysql? ( virtual/mysql )
+   mysql? ( virtual/mysql:= )
oci8? ( dev-db/oracle-instantclient-basic[${MULTILIB_USEDEP}] )
odbc? ( || ( dev-db/unixODBC[${MULTILIB_USEDEP}] 
dev-db/libiodbc[${MULTILIB_USEDEP}] ) )
-   postgres? ( dev-db/postgresql-base )
+   postgres? ( dev-db/postgresql-base:* )
sqlite? ( dev-db/sqlite:3[${MULTILIB_USEDEP}] )
 "
 RDEPEND="${DEPEND}"

diff --git a/dev-qt/qtsql/qtsql-5.3.1.ebuild b/dev-qt/qtsql/qtsql-5.3.1.ebuild
index 2713a7f..e287559 100644
--- a/dev-qt/qtsql/qtsql-5.3.1.ebuild
+++ b/dev-qt/qtsql/qtsql-5.3.1.ebuild
@@ -25,10 +25,10 @@ REQUIRED_USE="
 DEPEND="
~dev-qt/qtcore-${PV}[debug=]
freetds? ( dev-db/freetds )
-   mysql? ( virtual/mysql )
+   mysql? ( virtual/mysql:= )
oci8? ( dev-db/oracle-instantclient-basic )
odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
-   postgres? ( dev-db/postgresql-base )
+   postgres? ( dev-db/postgresql-base:* )
sqlite? ( dev-db/sqlite:3 )
 "
 RDEPEND="${DEPEND}"

diff --git a/dev-qt/qtsql/qtsql-5.3..ebuild 
b/dev-qt/qtsql/qtsql-5.3..ebuild
index 2713a7f..e287559 100644
--- a/dev-qt/qtsql/qtsql-5.3..ebuild
+++ b/dev-qt/qtsql/qtsql-5.3..ebuild
@@ -25,10 +25,10 @@ REQUIRED_USE="
 DEPEND="
~dev-qt/qtcore-${PV}[debug=]
freetds? ( dev-db/freetds )
-   mysql? ( virtual/mysql )
+   mysql? ( virtual/mysql:= )
oci8? ( dev-db/oracle-instantclient-basic )
odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
-   postgres? ( dev-db/postgresql-base )
+   postgres? ( dev-db/postgresql-base:* )
sqlite? ( dev-db/sqlite:3 )
 "
 RDEPEND="${DEPEND}"

diff --git a/dev-qt/qtsql/qtsql-5.4..ebuild 
b/dev-qt/qtsql/qtsql-5.4..ebuild
index dc22e1c..4acdb2e 100644
--- a/dev-qt/qtsql/qtsql-5.4..ebuild
+++ b/dev-qt/qtsql/qtsql-5.4..ebuild
@@ -25,10 +25,10 @@ REQUIRED_USE="
 DEPEND="
~dev-qt/qtcore-${PV}[debug=]
freetds? ( dev-db/freetds )
-   mysql? ( virtual/mysql )
+   mysql? ( virtual/mysql:= )
oci8? ( dev-db/oracle-instantclient-basic )
odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
-   postgres? ( dev-db/postgresql-base )
+   postgres? ( dev-db/postgresql-base:* )
sqlite? ( dev-db/sqlite:3 )
 "
 RDEPEND="${DEPEND}"

diff --git a/dev-qt/qtsql/qtsql-5..ebuild b/dev-qt/qtsql/qtsql-5..ebuild
index dc22e1c..4acdb2e 100644
--- a/dev-qt/qtsql/qtsql-5..ebuild
+++ b/dev-qt/qtsql/qtsql-5..ebuild
@@ -25,10 +25,10 @@ REQUIRED_USE="
 DEPEND="
~dev-qt/qtcore-${PV}[debug=]
freetds? ( dev-db/freetds )
-   mysql? ( virtual/mysql )
+   mysql? ( virtual/mysql:= )
oci8? ( dev-db/oracle-instantclient-basic )
odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
-   postgres? ( dev-db/postgresql-base )
+   postgres? ( dev-db/postgresql-base:* )
sqlite? ( dev-db/sqlite:3 )
 "
 RDEPEND="${DEPEND}"

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2018-07-21 Thread Davide Pesavento

commit: 12b2494645a034d98355b0e319ac3097c49467ce
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sat Jul 21 18:20:17 2018 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sat Jul 21 18:20:17 2018 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=12b24946

dev-qt/qtsql: sync with gentoo repo

Package-Manager: Portage-2.3.43, Repoman-2.3.10

 dev-qt/qtsql/qtsql-5.11..ebuild | 1 +
 dev-qt/qtsql/qtsql-5.9..ebuild  | 1 +
 dev-qt/qtsql/qtsql-5..ebuild| 1 +
 3 files changed, 3 insertions(+)

diff --git a/dev-qt/qtsql/qtsql-5.11..ebuild 
b/dev-qt/qtsql/qtsql-5.11..ebuild
index db29e42d..40fde45f 100644
--- a/dev-qt/qtsql/qtsql-5.11..ebuild
+++ b/dev-qt/qtsql/qtsql-5.11..ebuild
@@ -6,6 +6,7 @@ QT5_MODULE="qtbase"
 inherit qt5-build
 
 DESCRIPTION="SQL abstraction library for the Qt5 framework"
+SLOT=5/$(ver_cut 1-3) # bug 639140
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd"

diff --git a/dev-qt/qtsql/qtsql-5.9..ebuild 
b/dev-qt/qtsql/qtsql-5.9..ebuild
index ae735814..325786e3 100644
--- a/dev-qt/qtsql/qtsql-5.9..ebuild
+++ b/dev-qt/qtsql/qtsql-5.9..ebuild
@@ -6,6 +6,7 @@ QT5_MODULE="qtbase"
 inherit qt5-build
 
 DESCRIPTION="SQL abstraction library for the Qt5 framework"
+SLOT=5/$(ver_cut 1-3) # bug 639140
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd"

diff --git a/dev-qt/qtsql/qtsql-5..ebuild b/dev-qt/qtsql/qtsql-5..ebuild
index db29e42d..40fde45f 100644
--- a/dev-qt/qtsql/qtsql-5..ebuild
+++ b/dev-qt/qtsql/qtsql-5..ebuild
@@ -6,6 +6,7 @@ QT5_MODULE="qtbase"
 inherit qt5-build
 
 DESCRIPTION="SQL abstraction library for the Qt5 framework"
+SLOT=5/$(ver_cut 1-3) # bug 639140
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd"

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2019-01-07 Thread Davide Pesavento

commit: 176f0fbf1ff794f7770c9725aced16025579368a
Author: Davide Pesavento  gentoo  org>
AuthorDate: Tue Jan  8 01:28:33 2019 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Tue Jan  8 01:28:33 2019 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=176f0fbf

dev-qt/qtsql: switch to dev-db/oracle-instantclient

Bug: https://bugs.gentoo.org/669274
Package-Manager: Portage-2.3.53, Repoman-2.3.12
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qtsql/qtsql-5.12.0.ebuild| 2 +-
 dev-qt/qtsql/qtsql-5.12..ebuild | 2 +-
 dev-qt/qtsql/qtsql-5..ebuild| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-5.12.0.ebuild b/dev-qt/qtsql/qtsql-5.12.0.ebuild
index e46b3da3..92ce286d 100644
--- a/dev-qt/qtsql/qtsql-5.12.0.ebuild
+++ b/dev-qt/qtsql/qtsql-5.12.0.ebuild
@@ -22,7 +22,7 @@ DEPEND="
~dev-qt/qtcore-${PV}
freetds? ( dev-db/freetds )
mysql? ( dev-db/mysql-connector-c:= )
-   oci8? ( dev-db/oracle-instantclient-basic )
+   oci8? ( dev-db/oracle-instantclient:=[sdk] )
odbc? ( dev-db/unixODBC )
postgres? ( dev-db/postgresql:* )
sqlite? ( dev-db/sqlite:3 )

diff --git a/dev-qt/qtsql/qtsql-5.12..ebuild 
b/dev-qt/qtsql/qtsql-5.12..ebuild
index e46b3da3..92ce286d 100644
--- a/dev-qt/qtsql/qtsql-5.12..ebuild
+++ b/dev-qt/qtsql/qtsql-5.12..ebuild
@@ -22,7 +22,7 @@ DEPEND="
~dev-qt/qtcore-${PV}
freetds? ( dev-db/freetds )
mysql? ( dev-db/mysql-connector-c:= )
-   oci8? ( dev-db/oracle-instantclient-basic )
+   oci8? ( dev-db/oracle-instantclient:=[sdk] )
odbc? ( dev-db/unixODBC )
postgres? ( dev-db/postgresql:* )
sqlite? ( dev-db/sqlite:3 )

diff --git a/dev-qt/qtsql/qtsql-5..ebuild b/dev-qt/qtsql/qtsql-5..ebuild
index e46b3da3..92ce286d 100644
--- a/dev-qt/qtsql/qtsql-5..ebuild
+++ b/dev-qt/qtsql/qtsql-5..ebuild
@@ -22,7 +22,7 @@ DEPEND="
~dev-qt/qtcore-${PV}
freetds? ( dev-db/freetds )
mysql? ( dev-db/mysql-connector-c:= )
-   oci8? ( dev-db/oracle-instantclient-basic )
+   oci8? ( dev-db/oracle-instantclient:=[sdk] )
odbc? ( dev-db/unixODBC )
postgres? ( dev-db/postgresql:* )
sqlite? ( dev-db/sqlite:3 )

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2019-01-07 Thread Davide Pesavento

commit: 2dabddfc4d3bcc8d6b73c1d0bd19d469356b655e
Author: Davide Pesavento  gentoo  org>
AuthorDate: Tue Jan  8 00:15:39 2019 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Tue Jan  8 00:15:39 2019 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=2dabddfc

dev-qt/qtsql: stop using deprecated virtual

Package-Manager: Portage-2.3.53, Repoman-2.3.12
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qtsql/qtsql-5.12.0.ebuild| 3 +--
 dev-qt/qtsql/qtsql-5.12..ebuild | 3 +--
 dev-qt/qtsql/qtsql-5..ebuild| 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-5.12.0.ebuild b/dev-qt/qtsql/qtsql-5.12.0.ebuild
index d5f86389..ba13844c 100644
--- a/dev-qt/qtsql/qtsql-5.12.0.ebuild
+++ b/dev-qt/qtsql/qtsql-5.12.0.ebuild
@@ -21,7 +21,7 @@ REQUIRED_USE="
 DEPEND="
~dev-qt/qtcore-${PV}
freetds? ( dev-db/freetds )
-   mysql? ( virtual/libmysqlclient:= )
+   mysql? ( dev-db/mysql-connector-c:= )
oci8? ( dev-db/oracle-instantclient-basic )
odbc? ( dev-db/unixODBC )
postgres? ( dev-db/postgresql:* )
@@ -49,7 +49,6 @@ src_configure() {
$(usex sqlite -system-sqlite '')
)
 
-   use mysql && myconf+=("-I${EPREFIX}/usr/include/mysql" 
"-L${EPREFIX}/usr/$(get_libdir)/mysql")
use oci8 && myconf+=("-I${ORACLE_HOME}/include" 
"-L${ORACLE_HOME}/$(get_libdir)")
use postgres && myconf+=("-I${EPREFIX}/usr/include/postgresql/pgsql")
 

diff --git a/dev-qt/qtsql/qtsql-5.12..ebuild 
b/dev-qt/qtsql/qtsql-5.12..ebuild
index d5f86389..ba13844c 100644
--- a/dev-qt/qtsql/qtsql-5.12..ebuild
+++ b/dev-qt/qtsql/qtsql-5.12..ebuild
@@ -21,7 +21,7 @@ REQUIRED_USE="
 DEPEND="
~dev-qt/qtcore-${PV}
freetds? ( dev-db/freetds )
-   mysql? ( virtual/libmysqlclient:= )
+   mysql? ( dev-db/mysql-connector-c:= )
oci8? ( dev-db/oracle-instantclient-basic )
odbc? ( dev-db/unixODBC )
postgres? ( dev-db/postgresql:* )
@@ -49,7 +49,6 @@ src_configure() {
$(usex sqlite -system-sqlite '')
)
 
-   use mysql && myconf+=("-I${EPREFIX}/usr/include/mysql" 
"-L${EPREFIX}/usr/$(get_libdir)/mysql")
use oci8 && myconf+=("-I${ORACLE_HOME}/include" 
"-L${ORACLE_HOME}/$(get_libdir)")
use postgres && myconf+=("-I${EPREFIX}/usr/include/postgresql/pgsql")
 

diff --git a/dev-qt/qtsql/qtsql-5..ebuild b/dev-qt/qtsql/qtsql-5..ebuild
index d5f86389..ba13844c 100644
--- a/dev-qt/qtsql/qtsql-5..ebuild
+++ b/dev-qt/qtsql/qtsql-5..ebuild
@@ -21,7 +21,7 @@ REQUIRED_USE="
 DEPEND="
~dev-qt/qtcore-${PV}
freetds? ( dev-db/freetds )
-   mysql? ( virtual/libmysqlclient:= )
+   mysql? ( dev-db/mysql-connector-c:= )
oci8? ( dev-db/oracle-instantclient-basic )
odbc? ( dev-db/unixODBC )
postgres? ( dev-db/postgresql:* )
@@ -49,7 +49,6 @@ src_configure() {
$(usex sqlite -system-sqlite '')
)
 
-   use mysql && myconf+=("-I${EPREFIX}/usr/include/mysql" 
"-L${EPREFIX}/usr/$(get_libdir)/mysql")
use oci8 && myconf+=("-I${ORACLE_HOME}/include" 
"-L${ORACLE_HOME}/$(get_libdir)")
use postgres && myconf+=("-I${EPREFIX}/usr/include/postgresql/pgsql")

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2019-01-07 Thread Davide Pesavento

commit: 5ecb95fc789370b10bcee04ba4b3fdccd2fad189
Author: Davide Pesavento  gentoo  org>
AuthorDate: Tue Jan  8 00:48:02 2019 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Tue Jan  8 00:48:02 2019 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=5ecb95fc

dev-qt/qtsql: upstream learned to use pkg-config

Package-Manager: Portage-2.3.53, Repoman-2.3.12
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qtsql/qtsql-5.12.0.ebuild| 1 -
 dev-qt/qtsql/qtsql-5.12..ebuild | 1 -
 dev-qt/qtsql/qtsql-5..ebuild| 1 -
 3 files changed, 3 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-5.12.0.ebuild b/dev-qt/qtsql/qtsql-5.12.0.ebuild
index ba13844c..e46b3da3 100644
--- a/dev-qt/qtsql/qtsql-5.12.0.ebuild
+++ b/dev-qt/qtsql/qtsql-5.12.0.ebuild
@@ -50,7 +50,6 @@ src_configure() {
)
 
use oci8 && myconf+=("-I${ORACLE_HOME}/include" 
"-L${ORACLE_HOME}/$(get_libdir)")
-   use postgres && myconf+=("-I${EPREFIX}/usr/include/postgresql/pgsql")
 
qt5-build_src_configure
 }

diff --git a/dev-qt/qtsql/qtsql-5.12..ebuild 
b/dev-qt/qtsql/qtsql-5.12..ebuild
index ba13844c..e46b3da3 100644
--- a/dev-qt/qtsql/qtsql-5.12..ebuild
+++ b/dev-qt/qtsql/qtsql-5.12..ebuild
@@ -50,7 +50,6 @@ src_configure() {
)
 
use oci8 && myconf+=("-I${ORACLE_HOME}/include" 
"-L${ORACLE_HOME}/$(get_libdir)")
-   use postgres && myconf+=("-I${EPREFIX}/usr/include/postgresql/pgsql")
 
qt5-build_src_configure
 }

diff --git a/dev-qt/qtsql/qtsql-5..ebuild b/dev-qt/qtsql/qtsql-5..ebuild
index ba13844c..e46b3da3 100644
--- a/dev-qt/qtsql/qtsql-5..ebuild
+++ b/dev-qt/qtsql/qtsql-5..ebuild
@@ -50,7 +50,6 @@ src_configure() {
)
 
use oci8 && myconf+=("-I${ORACLE_HOME}/include" 
"-L${ORACLE_HOME}/$(get_libdir)")
-   use postgres && myconf+=("-I${EPREFIX}/usr/include/postgresql/pgsql")
 
qt5-build_src_configure
 }

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2019-01-07 Thread Davide Pesavento

commit: f11c40750fff879e9c8269303c678f72c9863414
Author: Davide Pesavento  gentoo  org>
AuthorDate: Mon Jan  7 23:57:06 2019 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Mon Jan  7 23:57:06 2019 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=f11c4075

dev-qt/qtsql: apparently upstream doesn't support libiodbc anymore

The configure test fails to detect it. Probably easy to fix, but
I doubt anyone cares, given that it's been broken since 5.8.0 and
no one complained.

Package-Manager: Portage-2.3.53, Repoman-2.3.12
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qtsql/qtsql-5.12.0.ebuild| 7 +++
 dev-qt/qtsql/qtsql-5.12..ebuild | 7 +++
 dev-qt/qtsql/qtsql-5..ebuild| 7 +++
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-5.12.0.ebuild b/dev-qt/qtsql/qtsql-5.12.0.ebuild
index 09b2d085..d5f86389 100644
--- a/dev-qt/qtsql/qtsql-5.12.0.ebuild
+++ b/dev-qt/qtsql/qtsql-5.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,9 +23,9 @@ DEPEND="
freetds? ( dev-db/freetds )
mysql? ( virtual/libmysqlclient:= )
oci8? ( dev-db/oracle-instantclient-basic )
-   odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
+   odbc? ( dev-db/unixODBC )
postgres? ( dev-db/postgresql:* )
-   sqlite? ( >=dev-db/sqlite-3.8.10.2:3 )
+   sqlite? ( dev-db/sqlite:3 )
 "
 RDEPEND="${DEPEND}"
 
@@ -51,7 +51,6 @@ src_configure() {
 
use mysql && myconf+=("-I${EPREFIX}/usr/include/mysql" 
"-L${EPREFIX}/usr/$(get_libdir)/mysql")
use oci8 && myconf+=("-I${ORACLE_HOME}/include" 
"-L${ORACLE_HOME}/$(get_libdir)")
-   use odbc && myconf+=("-I${EPREFIX}/usr/include/iodbc")
use postgres && myconf+=("-I${EPREFIX}/usr/include/postgresql/pgsql")
 
qt5-build_src_configure

diff --git a/dev-qt/qtsql/qtsql-5.12..ebuild 
b/dev-qt/qtsql/qtsql-5.12..ebuild
index 2ce2c9a9..d5f86389 100644
--- a/dev-qt/qtsql/qtsql-5.12..ebuild
+++ b/dev-qt/qtsql/qtsql-5.12..ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,9 +23,9 @@ DEPEND="
freetds? ( dev-db/freetds )
mysql? ( virtual/libmysqlclient:= )
oci8? ( dev-db/oracle-instantclient-basic )
-   odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
+   odbc? ( dev-db/unixODBC )
postgres? ( dev-db/postgresql:* )
-   sqlite? ( >=dev-db/sqlite-3.8.10.2:3 )
+   sqlite? ( dev-db/sqlite:3 )
 "
 RDEPEND="${DEPEND}"
 
@@ -51,7 +51,6 @@ src_configure() {
 
use mysql && myconf+=("-I${EPREFIX}/usr/include/mysql" 
"-L${EPREFIX}/usr/$(get_libdir)/mysql")
use oci8 && myconf+=("-I${ORACLE_HOME}/include" 
"-L${ORACLE_HOME}/$(get_libdir)")
-   use odbc && myconf+=("-I${EPREFIX}/usr/include/iodbc")
use postgres && myconf+=("-I${EPREFIX}/usr/include/postgresql/pgsql")
 
qt5-build_src_configure

diff --git a/dev-qt/qtsql/qtsql-5..ebuild b/dev-qt/qtsql/qtsql-5..ebuild
index 2ce2c9a9..d5f86389 100644
--- a/dev-qt/qtsql/qtsql-5..ebuild
+++ b/dev-qt/qtsql/qtsql-5..ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,9 +23,9 @@ DEPEND="
freetds? ( dev-db/freetds )
mysql? ( virtual/libmysqlclient:= )
oci8? ( dev-db/oracle-instantclient-basic )
-   odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
+   odbc? ( dev-db/unixODBC )
postgres? ( dev-db/postgresql:* )
-   sqlite? ( >=dev-db/sqlite-3.8.10.2:3 )
+   sqlite? ( dev-db/sqlite:3 )
 "
 RDEPEND="${DEPEND}"
 
@@ -51,7 +51,6 @@ src_configure() {
 
use mysql && myconf+=("-I${EPREFIX}/usr/include/mysql" 
"-L${EPREFIX}/usr/$(get_libdir)/mysql")
use oci8 && myconf+=("-I${ORACLE_HOME}/include" 
"-L${ORACLE_HOME}/$(get_libdir)")
-   use odbc && myconf+=("-I${EPREFIX}/usr/include/iodbc")
use postgres && myconf+=("-I${EPREFIX}/usr/include/postgresql/pgsql")
 
qt5-build_src_configure

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2014-12-15 Thread Davide Pesavento

commit: 6bf9a164afc731eff0e2d5ec1f4dd2198f724b5b
Author: Davide Pesavento  gentoo  org>
AuthorDate: Mon Dec 15 21:57:16 2014 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Mon Dec 15 21:57:16 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=6bf9a164

[dev-qt/qtsql:4] Sync.

Package-Manager: portage-2.2.15

---
 dev-qt/qtsql/qtsql-4.8..ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-4.8..ebuild 
b/dev-qt/qtsql/qtsql-4.8..ebuild
index 8db5317..3334caa 100644
--- a/dev-qt/qtsql/qtsql-4.8..ebuild
+++ b/dev-qt/qtsql/qtsql-4.8..ebuild
@@ -26,8 +26,8 @@ DEPEND="
mysql? ( >=virtual/mysql-5.6-r2:=[${MULTILIB_USEDEP}] )
oci8? ( 
>=dev-db/oracle-instantclient-basic-11.2.0.4[${MULTILIB_USEDEP}] )
odbc? ( || (
-   >=dev-db/unixODBC-2.3.2[${MULTILIB_USEDEP}]
-   >=dev-db/libiodbc-3.52.8[${MULTILIB_USEDEP}]
+   >=dev-db/unixODBC-2.3.2-r2[${MULTILIB_USEDEP}]
+   >=dev-db/libiodbc-3.52.8-r2[${MULTILIB_USEDEP}]
) )
postgres? ( virtual/postgresql:* )
sqlite? ( >=dev-db/sqlite-3.8.3:3[${MULTILIB_USEDEP}] )

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2014-12-30 Thread Michael Palimaka

commit: 661418dfaa7785747e71bb38b7609273b694ec5e
Author: Michael Palimaka  gentoo  org>
AuthorDate: Tue Dec 30 16:42:02 2014 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Tue Dec 30 16:42:02 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=661418df

[dev-qt/qtsql] Account for postgresql package changes.

Package-Manager: portage-2.2.15

---
 dev-qt/qtsql/qtsql-4.8..ebuild | 2 +-
 dev-qt/qtsql/qtsql-5.4..ebuild | 2 +-
 dev-qt/qtsql/qtsql-5..ebuild   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-4.8..ebuild 
b/dev-qt/qtsql/qtsql-4.8..ebuild
index 3334caa..87edbe4 100644
--- a/dev-qt/qtsql/qtsql-4.8..ebuild
+++ b/dev-qt/qtsql/qtsql-4.8..ebuild
@@ -29,7 +29,7 @@ DEPEND="
>=dev-db/unixODBC-2.3.2-r2[${MULTILIB_USEDEP}]
>=dev-db/libiodbc-3.52.8-r2[${MULTILIB_USEDEP}]
) )
-   postgres? ( virtual/postgresql:* )
+   postgres? ( dev-db/postgresql:* )
sqlite? ( >=dev-db/sqlite-3.8.3:3[${MULTILIB_USEDEP}] )
 "
 RDEPEND="${DEPEND}"

diff --git a/dev-qt/qtsql/qtsql-5.4..ebuild 
b/dev-qt/qtsql/qtsql-5.4..ebuild
index 2eca5d3..8d7a320 100644
--- a/dev-qt/qtsql/qtsql-5.4..ebuild
+++ b/dev-qt/qtsql/qtsql-5.4..ebuild
@@ -28,7 +28,7 @@ DEPEND="
mysql? ( virtual/mysql:= )
oci8? ( dev-db/oracle-instantclient-basic )
odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
-   postgres? ( virtual/postgresql:* )
+   postgres? ( dev-db/postgresql:* )
sqlite? ( dev-db/sqlite:3 )
 "
 RDEPEND="${DEPEND}"

diff --git a/dev-qt/qtsql/qtsql-5..ebuild b/dev-qt/qtsql/qtsql-5..ebuild
index 2eca5d3..8d7a320 100644
--- a/dev-qt/qtsql/qtsql-5..ebuild
+++ b/dev-qt/qtsql/qtsql-5..ebuild
@@ -28,7 +28,7 @@ DEPEND="
mysql? ( virtual/mysql:= )
oci8? ( dev-db/oracle-instantclient-basic )
odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
-   postgres? ( virtual/postgresql:* )
+   postgres? ( dev-db/postgresql:* )
sqlite? ( dev-db/sqlite:3 )
 "
 RDEPEND="${DEPEND}"

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2014-11-03 Thread Davide Pesavento

commit: 6e2b3777aafc562ddd6b116c74e9ed3525486b7d
Author: Davide Pesavento  gentoo  org>
AuthorDate: Mon Nov  3 14:29:20 2014 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Mon Nov  3 14:29:20 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=6e2b3777

[dev-qt/qtsql] Switch to virtual/postgresql.

Package-Manager: portage-2.2.14

---
 dev-qt/qtsql/qtsql-4.8.6.ebuild  | 2 +-
 dev-qt/qtsql/qtsql-4.8..ebuild   | 2 +-
 dev-qt/qtsql/qtsql-5.3..ebuild   | 2 +-
 dev-qt/qtsql/qtsql-5.4.0_beta.ebuild | 2 +-
 dev-qt/qtsql/qtsql-5.4..ebuild   | 2 +-
 dev-qt/qtsql/qtsql-5..ebuild | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-4.8.6.ebuild b/dev-qt/qtsql/qtsql-4.8.6.ebuild
index bbe669b..8db5317 100644
--- a/dev-qt/qtsql/qtsql-4.8.6.ebuild
+++ b/dev-qt/qtsql/qtsql-4.8.6.ebuild
@@ -29,7 +29,7 @@ DEPEND="
>=dev-db/unixODBC-2.3.2[${MULTILIB_USEDEP}]
>=dev-db/libiodbc-3.52.8[${MULTILIB_USEDEP}]
) )
-   postgres? ( dev-db/postgresql-base:* )
+   postgres? ( virtual/postgresql:* )
sqlite? ( >=dev-db/sqlite-3.8.3:3[${MULTILIB_USEDEP}] )
 "
 RDEPEND="${DEPEND}"

diff --git a/dev-qt/qtsql/qtsql-4.8..ebuild 
b/dev-qt/qtsql/qtsql-4.8..ebuild
index bbe669b..8db5317 100644
--- a/dev-qt/qtsql/qtsql-4.8..ebuild
+++ b/dev-qt/qtsql/qtsql-4.8..ebuild
@@ -29,7 +29,7 @@ DEPEND="
>=dev-db/unixODBC-2.3.2[${MULTILIB_USEDEP}]
>=dev-db/libiodbc-3.52.8[${MULTILIB_USEDEP}]
) )
-   postgres? ( dev-db/postgresql-base:* )
+   postgres? ( virtual/postgresql:* )
sqlite? ( >=dev-db/sqlite-3.8.3:3[${MULTILIB_USEDEP}] )
 "
 RDEPEND="${DEPEND}"

diff --git a/dev-qt/qtsql/qtsql-5.3..ebuild 
b/dev-qt/qtsql/qtsql-5.3..ebuild
index 979dff5..8d606dd 100644
--- a/dev-qt/qtsql/qtsql-5.3..ebuild
+++ b/dev-qt/qtsql/qtsql-5.3..ebuild
@@ -28,7 +28,7 @@ DEPEND="
mysql? ( virtual/mysql:= )
oci8? ( dev-db/oracle-instantclient-basic )
odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
-   postgres? ( dev-db/postgresql-base:* )
+   postgres? ( virtual/postgresql:* )
sqlite? ( dev-db/sqlite:3 )
 "
 RDEPEND="${DEPEND}"

diff --git a/dev-qt/qtsql/qtsql-5.4.0_beta.ebuild 
b/dev-qt/qtsql/qtsql-5.4.0_beta.ebuild
index 4acdb2e..2eca5d3 100644
--- a/dev-qt/qtsql/qtsql-5.4.0_beta.ebuild
+++ b/dev-qt/qtsql/qtsql-5.4.0_beta.ebuild
@@ -28,7 +28,7 @@ DEPEND="
mysql? ( virtual/mysql:= )
oci8? ( dev-db/oracle-instantclient-basic )
odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
-   postgres? ( dev-db/postgresql-base:* )
+   postgres? ( virtual/postgresql:* )
sqlite? ( dev-db/sqlite:3 )
 "
 RDEPEND="${DEPEND}"

diff --git a/dev-qt/qtsql/qtsql-5.4..ebuild 
b/dev-qt/qtsql/qtsql-5.4..ebuild
index 4acdb2e..2eca5d3 100644
--- a/dev-qt/qtsql/qtsql-5.4..ebuild
+++ b/dev-qt/qtsql/qtsql-5.4..ebuild
@@ -28,7 +28,7 @@ DEPEND="
mysql? ( virtual/mysql:= )
oci8? ( dev-db/oracle-instantclient-basic )
odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
-   postgres? ( dev-db/postgresql-base:* )
+   postgres? ( virtual/postgresql:* )
sqlite? ( dev-db/sqlite:3 )
 "
 RDEPEND="${DEPEND}"

diff --git a/dev-qt/qtsql/qtsql-5..ebuild b/dev-qt/qtsql/qtsql-5..ebuild
index 4acdb2e..2eca5d3 100644
--- a/dev-qt/qtsql/qtsql-5..ebuild
+++ b/dev-qt/qtsql/qtsql-5..ebuild
@@ -28,7 +28,7 @@ DEPEND="
mysql? ( virtual/mysql:= )
oci8? ( dev-db/oracle-instantclient-basic )
odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
-   postgres? ( dev-db/postgresql-base:* )
+   postgres? ( virtual/postgresql:* )
sqlite? ( dev-db/sqlite:3 )
 "
 RDEPEND="${DEPEND}"

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2014-05-27 Thread Davide Pesavento

commit: af637d5e7a960b70feacc6f8a054cebedc34f5bf
Author: Davide Pesavento  gentoo  org>
AuthorDate: Tue May 27 22:31:29 2014 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Tue May 27 22:31:29 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=af637d5e

[dev-qt/qtsql:4] src.pro and tools.pro are not used.

Package-Manager: portage-2.2.10

---
 dev-qt/qtsql/qtsql-4.8..ebuild | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-4.8..ebuild 
b/dev-qt/qtsql/qtsql-4.8..ebuild
index e3fe7c7..05ad99c 100644
--- a/dev-qt/qtsql/qtsql-4.8..ebuild
+++ b/dev-qt/qtsql/qtsql-4.8..ebuild
@@ -40,10 +40,8 @@ QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
include/Qt
include/QtCore
include/QtSql
-   src/src.pro
src/corelib
-   src/plugins
-   src/tools/tools.pro"
+   src/plugins"
 
 src_configure() {
myconf+="

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2014-06-22 Thread Davide Pesavento

commit: fe124e9f8db459c77d521f1c0c2007a474d1a306
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sun Jun 22 23:40:08 2014 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sun Jun 22 23:40:08 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=fe124e9f

[dev-qt/qtsql:4] Use qt_native_use where appropriate.

Package-Manager: portage-2.2.10

---
 dev-qt/qtsql/qtsql-4.8.6.ebuild| 14 +++---
 dev-qt/qtsql/qtsql-4.8..ebuild | 14 +++---
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-4.8.6.ebuild b/dev-qt/qtsql/qtsql-4.8.6.ebuild
index c66e471..de5d65d 100644
--- a/dev-qt/qtsql/qtsql-4.8.6.ebuild
+++ b/dev-qt/qtsql/qtsql-4.8.6.ebuild
@@ -38,13 +38,13 @@ QT4_TARGET_DIRECTORIES="
 
 src_configure() {
myconf+="
-   $(qt_use firebird sql-ibase  plugin)
-   $(qt_use freetds  sql-tdsplugin)
-   $(qt_use mysqlsql-mysql  plugin) $(use mysql && echo 
"-I${EPREFIX}/usr/include/mysql -L${EPREFIX}/usr/$(get_libdir)/mysql")
-   $(qt_use oci8 sql-ociplugin) $(use oci8 && echo 
"-I${ORACLE_HOME}/include -L${ORACLE_HOME}/$(get_libdir)")
-   $(qt_use odbc sql-odbc   plugin) $(use odbc && echo 
"-I${EPREFIX}/usr/include/iodbc")
-   $(qt_use postgres sql-psql   plugin) $(use postgres && echo 
"-I${EPREFIX}/usr/include/postgresql/pgsql")
-   $(qt_use sqlite   sql-sqlite plugin) $(use sqlite && echo 
-system-sqlite)
+   $(qt_native_use firebird sql-ibase  plugin)
+   $(qt_native_use freetds  sql-tdsplugin)
+   $(qt_native_use mysqlsql-mysql  plugin) $(use mysql && 
multilib_is_native_abi && echo "-I${EPREFIX}/usr/include/mysql 
-L${EPREFIX}/usr/$(get_libdir)/mysql")
+   $(qt_useoci8 sql-ociplugin) $(use oci8 && echo 
"-I${ORACLE_HOME}/include -L${ORACLE_HOME}/$(get_libdir)")
+   $(qt_useodbc sql-odbc   plugin) $(use odbc && echo 
"-I${EPREFIX}/usr/include/iodbc")
+   $(qt_native_use postgres sql-psql   plugin) $(use postgres && 
multilib_is_native_abi && echo "-I${EPREFIX}/usr/include/postgresql/pgsql")
+   $(qt_usesqlite   sql-sqlite plugin) $(use sqlite && 
echo -system-sqlite)
-no-sql-db2
-no-sql-sqlite2
-no-sql-symsql

diff --git a/dev-qt/qtsql/qtsql-4.8..ebuild 
b/dev-qt/qtsql/qtsql-4.8..ebuild
index c66e471..de5d65d 100644
--- a/dev-qt/qtsql/qtsql-4.8..ebuild
+++ b/dev-qt/qtsql/qtsql-4.8..ebuild
@@ -38,13 +38,13 @@ QT4_TARGET_DIRECTORIES="
 
 src_configure() {
myconf+="
-   $(qt_use firebird sql-ibase  plugin)
-   $(qt_use freetds  sql-tdsplugin)
-   $(qt_use mysqlsql-mysql  plugin) $(use mysql && echo 
"-I${EPREFIX}/usr/include/mysql -L${EPREFIX}/usr/$(get_libdir)/mysql")
-   $(qt_use oci8 sql-ociplugin) $(use oci8 && echo 
"-I${ORACLE_HOME}/include -L${ORACLE_HOME}/$(get_libdir)")
-   $(qt_use odbc sql-odbc   plugin) $(use odbc && echo 
"-I${EPREFIX}/usr/include/iodbc")
-   $(qt_use postgres sql-psql   plugin) $(use postgres && echo 
"-I${EPREFIX}/usr/include/postgresql/pgsql")
-   $(qt_use sqlite   sql-sqlite plugin) $(use sqlite && echo 
-system-sqlite)
+   $(qt_native_use firebird sql-ibase  plugin)
+   $(qt_native_use freetds  sql-tdsplugin)
+   $(qt_native_use mysqlsql-mysql  plugin) $(use mysql && 
multilib_is_native_abi && echo "-I${EPREFIX}/usr/include/mysql 
-L${EPREFIX}/usr/$(get_libdir)/mysql")
+   $(qt_useoci8 sql-ociplugin) $(use oci8 && echo 
"-I${ORACLE_HOME}/include -L${ORACLE_HOME}/$(get_libdir)")
+   $(qt_useodbc sql-odbc   plugin) $(use odbc && echo 
"-I${EPREFIX}/usr/include/iodbc")
+   $(qt_native_use postgres sql-psql   plugin) $(use postgres && 
multilib_is_native_abi && echo "-I${EPREFIX}/usr/include/postgresql/pgsql")
+   $(qt_usesqlite   sql-sqlite plugin) $(use sqlite && 
echo -system-sqlite)
-no-sql-db2
-no-sql-sqlite2
-no-sql-symsql

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2014-06-23 Thread Davide Pesavento

commit: 79561754caa51a6ad6dbf5294de211b162b4f1c5
Author: Davide Pesavento  gentoo  org>
AuthorDate: Mon Jun 23 22:38:50 2014 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Mon Jun 23 22:38:50 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=79561754

[dev-qt/qtsql:4] Add MULTILIB_USEDEP to libiodbc dep too.

Package-Manager: portage-2.2.10

---
 dev-qt/qtsql/qtsql-4.8.6.ebuild| 2 +-
 dev-qt/qtsql/qtsql-4.8..ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-4.8.6.ebuild b/dev-qt/qtsql/qtsql-4.8.6.ebuild
index de5d65d..6ee8d7a 100644
--- a/dev-qt/qtsql/qtsql-4.8.6.ebuild
+++ b/dev-qt/qtsql/qtsql-4.8.6.ebuild
@@ -26,7 +26,7 @@ DEPEND="
freetds? ( dev-db/freetds )
mysql? ( virtual/mysql )
oci8? ( dev-db/oracle-instantclient-basic[${MULTILIB_USEDEP}] )
-   odbc? ( || ( dev-db/unixODBC[${MULTILIB_USEDEP}] dev-db/libiodbc ) )
+   odbc? ( || ( dev-db/unixODBC[${MULTILIB_USEDEP}] 
dev-db/libiodbc[${MULTILIB_USEDEP}] ) )
postgres? ( dev-db/postgresql-base )
sqlite? ( dev-db/sqlite:3[${MULTILIB_USEDEP}] )
 "

diff --git a/dev-qt/qtsql/qtsql-4.8..ebuild 
b/dev-qt/qtsql/qtsql-4.8..ebuild
index de5d65d..6ee8d7a 100644
--- a/dev-qt/qtsql/qtsql-4.8..ebuild
+++ b/dev-qt/qtsql/qtsql-4.8..ebuild
@@ -26,7 +26,7 @@ DEPEND="
freetds? ( dev-db/freetds )
mysql? ( virtual/mysql )
oci8? ( dev-db/oracle-instantclient-basic[${MULTILIB_USEDEP}] )
-   odbc? ( || ( dev-db/unixODBC[${MULTILIB_USEDEP}] dev-db/libiodbc ) )
+   odbc? ( || ( dev-db/unixODBC[${MULTILIB_USEDEP}] 
dev-db/libiodbc[${MULTILIB_USEDEP}] ) )
postgres? ( dev-db/postgresql-base )
sqlite? ( dev-db/sqlite:3[${MULTILIB_USEDEP}] )
 "

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2014-07-01 Thread Davide Pesavento

commit: 570166eb1297564a8986ae4d91c4364a5c4f3483
Author: Davide Pesavento  gentoo  org>
AuthorDate: Tue Jul  1 16:31:21 2014 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Tue Jul  1 16:31:21 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=570166eb

[dev-qt/qtsql] Remove firebird USE flag.

dev-db/firebird has been masked for removal.

Package-Manager: portage-2.2.10

---
 dev-qt/qtsql/qtsql-4.8.6.ebuild| 7 +++
 dev-qt/qtsql/qtsql-4.8..ebuild | 7 +++
 dev-qt/qtsql/qtsql-5.3.1.ebuild| 6 ++
 dev-qt/qtsql/qtsql-5.3..ebuild | 6 ++
 dev-qt/qtsql/qtsql-5..ebuild   | 6 ++
 5 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-4.8.6.ebuild b/dev-qt/qtsql/qtsql-4.8.6.ebuild
index 6ee8d7a..803a39a 100644
--- a/dev-qt/qtsql/qtsql-4.8.6.ebuild
+++ b/dev-qt/qtsql/qtsql-4.8.6.ebuild
@@ -14,15 +14,14 @@ else
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 
~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
-IUSE="firebird freetds mysql oci8 odbc postgres qt3support +sqlite"
+IUSE="freetds mysql oci8 odbc postgres qt3support +sqlite"
 
 REQUIRED_USE="
-   || ( firebird freetds mysql oci8 odbc postgres sqlite )
+   || ( freetds mysql oci8 odbc postgres sqlite )
 "
 
 DEPEND="
~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
-   firebird? ( dev-db/firebird )
freetds? ( dev-db/freetds )
mysql? ( virtual/mysql )
oci8? ( dev-db/oracle-instantclient-basic[${MULTILIB_USEDEP}] )
@@ -38,7 +37,6 @@ QT4_TARGET_DIRECTORIES="
 
 src_configure() {
myconf+="
-   $(qt_native_use firebird sql-ibase  plugin)
$(qt_native_use freetds  sql-tdsplugin)
$(qt_native_use mysqlsql-mysql  plugin) $(use mysql && 
multilib_is_native_abi && echo "-I${EPREFIX}/usr/include/mysql 
-L${EPREFIX}/usr/$(get_libdir)/mysql")
$(qt_useoci8 sql-ociplugin) $(use oci8 && echo 
"-I${ORACLE_HOME}/include -L${ORACLE_HOME}/$(get_libdir)")
@@ -46,6 +44,7 @@ src_configure() {
$(qt_native_use postgres sql-psql   plugin) $(use postgres && 
multilib_is_native_abi && echo "-I${EPREFIX}/usr/include/postgresql/pgsql")
$(qt_usesqlite   sql-sqlite plugin) $(use sqlite && 
echo -system-sqlite)
-no-sql-db2
+   -no-sql-ibase
-no-sql-sqlite2
-no-sql-symsql
$(qt_use qt3support)

diff --git a/dev-qt/qtsql/qtsql-4.8..ebuild 
b/dev-qt/qtsql/qtsql-4.8..ebuild
index 6ee8d7a..803a39a 100644
--- a/dev-qt/qtsql/qtsql-4.8..ebuild
+++ b/dev-qt/qtsql/qtsql-4.8..ebuild
@@ -14,15 +14,14 @@ else
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 
~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
-IUSE="firebird freetds mysql oci8 odbc postgres qt3support +sqlite"
+IUSE="freetds mysql oci8 odbc postgres qt3support +sqlite"
 
 REQUIRED_USE="
-   || ( firebird freetds mysql oci8 odbc postgres sqlite )
+   || ( freetds mysql oci8 odbc postgres sqlite )
 "
 
 DEPEND="
~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
-   firebird? ( dev-db/firebird )
freetds? ( dev-db/freetds )
mysql? ( virtual/mysql )
oci8? ( dev-db/oracle-instantclient-basic[${MULTILIB_USEDEP}] )
@@ -38,7 +37,6 @@ QT4_TARGET_DIRECTORIES="
 
 src_configure() {
myconf+="
-   $(qt_native_use firebird sql-ibase  plugin)
$(qt_native_use freetds  sql-tdsplugin)
$(qt_native_use mysqlsql-mysql  plugin) $(use mysql && 
multilib_is_native_abi && echo "-I${EPREFIX}/usr/include/mysql 
-L${EPREFIX}/usr/$(get_libdir)/mysql")
$(qt_useoci8 sql-ociplugin) $(use oci8 && echo 
"-I${ORACLE_HOME}/include -L${ORACLE_HOME}/$(get_libdir)")
@@ -46,6 +44,7 @@ src_configure() {
$(qt_native_use postgres sql-psql   plugin) $(use postgres && 
multilib_is_native_abi && echo "-I${EPREFIX}/usr/include/postgresql/pgsql")
$(qt_usesqlite   sql-sqlite plugin) $(use sqlite && 
echo -system-sqlite)
-no-sql-db2
+   -no-sql-ibase
-no-sql-sqlite2
-no-sql-symsql
$(qt_use qt3support)

diff --git a/dev-qt/qtsql/qtsql-5.3.1.ebuild b/dev-qt/qtsql/qtsql-5.3.1.ebuild
index 8db3a2e..392cd48 100644
--- a/dev-qt/qtsql/qtsql-5.3.1.ebuild
+++ b/dev-qt/qtsql/qtsql-5.3.1.ebuild
@@ -16,15 +16,14 @@ else
KEYWORDS="~amd64 ~x86"
 fi
 
-IUSE="firebird freetds mysql oci8 odbc postgres +sqlite"
+IUSE="freetds mysql oci8 odbc postgres +sqlite"
 
 REQUIRED_USE="
-   || ( firebird freetds mysql oci8 odbc postg

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2014-08-14 Thread Davide Pesavento

commit: ed1efa703c9954b839a504303f08d29c5d6d0e1d
Author: Davide Pesavento  gentoo  org>
AuthorDate: Thu Aug 14 23:31:01 2014 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Thu Aug 14 23:31:01 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=ed1efa70

[dev-qt/qtsql] Add slot operators to mysql and postgresql deps.

Package-Manager: portage-2.2.12

---
 dev-qt/qtsql/qtsql-4.8.6.ebuild| 4 ++--
 dev-qt/qtsql/qtsql-4.8..ebuild | 4 ++--
 dev-qt/qtsql/qtsql-5.3.1.ebuild| 4 ++--
 dev-qt/qtsql/qtsql-5.3..ebuild | 4 ++--
 dev-qt/qtsql/qtsql-5.4..ebuild | 4 ++--
 dev-qt/qtsql/qtsql-5..ebuild   | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-4.8.6.ebuild b/dev-qt/qtsql/qtsql-4.8.6.ebuild
index cd5918f..f2bf654 100644
--- a/dev-qt/qtsql/qtsql-4.8.6.ebuild
+++ b/dev-qt/qtsql/qtsql-4.8.6.ebuild
@@ -23,10 +23,10 @@ REQUIRED_USE="
 DEPEND="
~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
freetds? ( dev-db/freetds )
-   mysql? ( virtual/mysql )
+   mysql? ( virtual/mysql:= )
oci8? ( dev-db/oracle-instantclient-basic[${MULTILIB_USEDEP}] )
odbc? ( || ( dev-db/unixODBC[${MULTILIB_USEDEP}] 
dev-db/libiodbc[${MULTILIB_USEDEP}] ) )
-   postgres? ( dev-db/postgresql-base )
+   postgres? ( dev-db/postgresql-base:* )
sqlite? ( dev-db/sqlite:3[${MULTILIB_USEDEP}] )
 "
 RDEPEND="${DEPEND}"

diff --git a/dev-qt/qtsql/qtsql-4.8..ebuild 
b/dev-qt/qtsql/qtsql-4.8..ebuild
index cd5918f..f2bf654 100644
--- a/dev-qt/qtsql/qtsql-4.8..ebuild
+++ b/dev-qt/qtsql/qtsql-4.8..ebuild
@@ -23,10 +23,10 @@ REQUIRED_USE="
 DEPEND="
~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
freetds? ( dev-db/freetds )
-   mysql? ( virtual/mysql )
+   mysql? ( virtual/mysql:= )
oci8? ( dev-db/oracle-instantclient-basic[${MULTILIB_USEDEP}] )
odbc? ( || ( dev-db/unixODBC[${MULTILIB_USEDEP}] 
dev-db/libiodbc[${MULTILIB_USEDEP}] ) )
-   postgres? ( dev-db/postgresql-base )
+   postgres? ( dev-db/postgresql-base:* )
sqlite? ( dev-db/sqlite:3[${MULTILIB_USEDEP}] )
 "
 RDEPEND="${DEPEND}"

diff --git a/dev-qt/qtsql/qtsql-5.3.1.ebuild b/dev-qt/qtsql/qtsql-5.3.1.ebuild
index 2713a7f..e287559 100644
--- a/dev-qt/qtsql/qtsql-5.3.1.ebuild
+++ b/dev-qt/qtsql/qtsql-5.3.1.ebuild
@@ -25,10 +25,10 @@ REQUIRED_USE="
 DEPEND="
~dev-qt/qtcore-${PV}[debug=]
freetds? ( dev-db/freetds )
-   mysql? ( virtual/mysql )
+   mysql? ( virtual/mysql:= )
oci8? ( dev-db/oracle-instantclient-basic )
odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
-   postgres? ( dev-db/postgresql-base )
+   postgres? ( dev-db/postgresql-base:* )
sqlite? ( dev-db/sqlite:3 )
 "
 RDEPEND="${DEPEND}"

diff --git a/dev-qt/qtsql/qtsql-5.3..ebuild 
b/dev-qt/qtsql/qtsql-5.3..ebuild
index 2713a7f..e287559 100644
--- a/dev-qt/qtsql/qtsql-5.3..ebuild
+++ b/dev-qt/qtsql/qtsql-5.3..ebuild
@@ -25,10 +25,10 @@ REQUIRED_USE="
 DEPEND="
~dev-qt/qtcore-${PV}[debug=]
freetds? ( dev-db/freetds )
-   mysql? ( virtual/mysql )
+   mysql? ( virtual/mysql:= )
oci8? ( dev-db/oracle-instantclient-basic )
odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
-   postgres? ( dev-db/postgresql-base )
+   postgres? ( dev-db/postgresql-base:* )
sqlite? ( dev-db/sqlite:3 )
 "
 RDEPEND="${DEPEND}"

diff --git a/dev-qt/qtsql/qtsql-5.4..ebuild 
b/dev-qt/qtsql/qtsql-5.4..ebuild
index dc22e1c..4acdb2e 100644
--- a/dev-qt/qtsql/qtsql-5.4..ebuild
+++ b/dev-qt/qtsql/qtsql-5.4..ebuild
@@ -25,10 +25,10 @@ REQUIRED_USE="
 DEPEND="
~dev-qt/qtcore-${PV}[debug=]
freetds? ( dev-db/freetds )
-   mysql? ( virtual/mysql )
+   mysql? ( virtual/mysql:= )
oci8? ( dev-db/oracle-instantclient-basic )
odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
-   postgres? ( dev-db/postgresql-base )
+   postgres? ( dev-db/postgresql-base:* )
sqlite? ( dev-db/sqlite:3 )
 "
 RDEPEND="${DEPEND}"

diff --git a/dev-qt/qtsql/qtsql-5..ebuild b/dev-qt/qtsql/qtsql-5..ebuild
index dc22e1c..4acdb2e 100644
--- a/dev-qt/qtsql/qtsql-5..ebuild
+++ b/dev-qt/qtsql/qtsql-5..ebuild
@@ -25,10 +25,10 @@ REQUIRED_USE="
 DEPEND="
~dev-qt/qtcore-${PV}[debug=]
freetds? ( dev-db/freetds )
-   mysql? ( virtual/mysql )
+   mysql? ( virtual/mysql:= )
oci8? ( dev-db/oracle-instantclient-basic )
odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
-   postgres? ( dev-db/postgresql-base )
+   postgres? ( dev-db/postgresql-base:* )
sqlite? ( dev-db/sqlite:3 )
 "
 RDEPEND="${DEPEND}"

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2014-08-31 Thread Davide Pesavento

commit: 2b3d75980f998d9ab2d0daf1d333a977edef1c88
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sun Aug 31 23:21:52 2014 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sun Aug 31 23:21:52 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=2b3d7598

[dev-qt/qtsql:4] Convert mysql plugin to multilib.

Package-Manager: portage-2.2.12-r1

---
 dev-qt/qtsql/qtsql-4.8.6.ebuild| 4 ++--
 dev-qt/qtsql/qtsql-4.8..ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-4.8.6.ebuild b/dev-qt/qtsql/qtsql-4.8.6.ebuild
index f2bf654..05c40bb 100644
--- a/dev-qt/qtsql/qtsql-4.8.6.ebuild
+++ b/dev-qt/qtsql/qtsql-4.8.6.ebuild
@@ -23,7 +23,7 @@ REQUIRED_USE="
 DEPEND="
~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
freetds? ( dev-db/freetds )
-   mysql? ( virtual/mysql:= )
+   mysql? ( >=virtual/mysql-5.6-r2:=[${MULTILIB_USEDEP}] )
oci8? ( dev-db/oracle-instantclient-basic[${MULTILIB_USEDEP}] )
odbc? ( || ( dev-db/unixODBC[${MULTILIB_USEDEP}] 
dev-db/libiodbc[${MULTILIB_USEDEP}] ) )
postgres? ( dev-db/postgresql-base:* )
@@ -38,7 +38,7 @@ QT4_TARGET_DIRECTORIES="
 multilib_src_configure() {
local myconf=(
$(qt_native_use freetds  sql-tdsplugin)
-   $(qt_native_use mysqlsql-mysql  plugin) $(use mysql && 
multilib_is_native_abi && echo "-I${EPREFIX}/usr/include/mysql 
-L${EPREFIX}/usr/$(get_libdir)/mysql")
+   $(qt_usemysqlsql-mysql  plugin) $(use mysql && echo 
"-I${EPREFIX}/usr/include/mysql -L${EPREFIX}/usr/$(get_libdir)/mysql")
$(qt_useoci8 sql-ociplugin) $(use oci8 && echo 
"-I${ORACLE_HOME}/include -L${ORACLE_HOME}/$(get_libdir)")
$(qt_useodbc sql-odbc   plugin) $(use odbc && echo 
"-I${EPREFIX}/usr/include/iodbc")
$(qt_native_use postgres sql-psql   plugin) $(use postgres && 
multilib_is_native_abi && echo "-I${EPREFIX}/usr/include/postgresql/pgsql")

diff --git a/dev-qt/qtsql/qtsql-4.8..ebuild 
b/dev-qt/qtsql/qtsql-4.8..ebuild
index f2bf654..05c40bb 100644
--- a/dev-qt/qtsql/qtsql-4.8..ebuild
+++ b/dev-qt/qtsql/qtsql-4.8..ebuild
@@ -23,7 +23,7 @@ REQUIRED_USE="
 DEPEND="
~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
freetds? ( dev-db/freetds )
-   mysql? ( virtual/mysql:= )
+   mysql? ( >=virtual/mysql-5.6-r2:=[${MULTILIB_USEDEP}] )
oci8? ( dev-db/oracle-instantclient-basic[${MULTILIB_USEDEP}] )
odbc? ( || ( dev-db/unixODBC[${MULTILIB_USEDEP}] 
dev-db/libiodbc[${MULTILIB_USEDEP}] ) )
postgres? ( dev-db/postgresql-base:* )
@@ -38,7 +38,7 @@ QT4_TARGET_DIRECTORIES="
 multilib_src_configure() {
local myconf=(
$(qt_native_use freetds  sql-tdsplugin)
-   $(qt_native_use mysqlsql-mysql  plugin) $(use mysql && 
multilib_is_native_abi && echo "-I${EPREFIX}/usr/include/mysql 
-L${EPREFIX}/usr/$(get_libdir)/mysql")
+   $(qt_usemysqlsql-mysql  plugin) $(use mysql && echo 
"-I${EPREFIX}/usr/include/mysql -L${EPREFIX}/usr/$(get_libdir)/mysql")
$(qt_useoci8 sql-ociplugin) $(use oci8 && echo 
"-I${ORACLE_HOME}/include -L${ORACLE_HOME}/$(get_libdir)")
$(qt_useodbc sql-odbc   plugin) $(use odbc && echo 
"-I${EPREFIX}/usr/include/iodbc")
$(qt_native_use postgres sql-psql   plugin) $(use postgres && 
multilib_is_native_abi && echo "-I${EPREFIX}/usr/include/postgresql/pgsql")

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2014-08-31 Thread Davide Pesavento

commit: 3365067c12459d608326702d4d72d86a7bbe7d47
Author: Davide Pesavento  gentoo  org>
AuthorDate: Mon Sep  1 00:01:49 2014 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Mon Sep  1 00:01:49 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=3365067c

[dev-qt/qtsql:4] Raise minimum deps to ensure correct multilib USE deps.

Package-Manager: portage-2.2.12-r1

---
 dev-qt/qtsql/qtsql-4.8.6.ebuild| 9 ++---
 dev-qt/qtsql/qtsql-4.8..ebuild | 9 ++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-4.8.6.ebuild b/dev-qt/qtsql/qtsql-4.8.6.ebuild
index 05c40bb..bbe669b 100644
--- a/dev-qt/qtsql/qtsql-4.8.6.ebuild
+++ b/dev-qt/qtsql/qtsql-4.8.6.ebuild
@@ -24,10 +24,13 @@ DEPEND="
~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
freetds? ( dev-db/freetds )
mysql? ( >=virtual/mysql-5.6-r2:=[${MULTILIB_USEDEP}] )
-   oci8? ( dev-db/oracle-instantclient-basic[${MULTILIB_USEDEP}] )
-   odbc? ( || ( dev-db/unixODBC[${MULTILIB_USEDEP}] 
dev-db/libiodbc[${MULTILIB_USEDEP}] ) )
+   oci8? ( 
>=dev-db/oracle-instantclient-basic-11.2.0.4[${MULTILIB_USEDEP}] )
+   odbc? ( || (
+   >=dev-db/unixODBC-2.3.2[${MULTILIB_USEDEP}]
+   >=dev-db/libiodbc-3.52.8[${MULTILIB_USEDEP}]
+   ) )
postgres? ( dev-db/postgresql-base:* )
-   sqlite? ( dev-db/sqlite:3[${MULTILIB_USEDEP}] )
+   sqlite? ( >=dev-db/sqlite-3.8.3:3[${MULTILIB_USEDEP}] )
 "
 RDEPEND="${DEPEND}"
 

diff --git a/dev-qt/qtsql/qtsql-4.8..ebuild 
b/dev-qt/qtsql/qtsql-4.8..ebuild
index 05c40bb..bbe669b 100644
--- a/dev-qt/qtsql/qtsql-4.8..ebuild
+++ b/dev-qt/qtsql/qtsql-4.8..ebuild
@@ -24,10 +24,13 @@ DEPEND="
~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
freetds? ( dev-db/freetds )
mysql? ( >=virtual/mysql-5.6-r2:=[${MULTILIB_USEDEP}] )
-   oci8? ( dev-db/oracle-instantclient-basic[${MULTILIB_USEDEP}] )
-   odbc? ( || ( dev-db/unixODBC[${MULTILIB_USEDEP}] 
dev-db/libiodbc[${MULTILIB_USEDEP}] ) )
+   oci8? ( 
>=dev-db/oracle-instantclient-basic-11.2.0.4[${MULTILIB_USEDEP}] )
+   odbc? ( || (
+   >=dev-db/unixODBC-2.3.2[${MULTILIB_USEDEP}]
+   >=dev-db/libiodbc-3.52.8[${MULTILIB_USEDEP}]
+   ) )
postgres? ( dev-db/postgresql-base:* )
-   sqlite? ( dev-db/sqlite:3[${MULTILIB_USEDEP}] )
+   sqlite? ( >=dev-db/sqlite-3.8.3:3[${MULTILIB_USEDEP}] )
 "
 RDEPEND="${DEPEND}"

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2015-03-25 Thread Davide Pesavento

commit: ab914bf6535bee60664f9decdf1729cc198d1546
Author: Davide Pesavento  gentoo  org>
AuthorDate: Thu Mar 26 01:41:10 2015 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Thu Mar 26 01:41:10 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=ab914bf6

[dev-qt/qtsql:5] Raise sqlite dep based on the bundled copy version.

Package-Manager: portage-2.2.18

 dev-qt/qtsql/qtsql-5.5..ebuild | 2 +-
 dev-qt/qtsql/qtsql-5..ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-5.5..ebuild 
b/dev-qt/qtsql/qtsql-5.5..ebuild
index 3061e4f..cd4d55d 100644
--- a/dev-qt/qtsql/qtsql-5.5..ebuild
+++ b/dev-qt/qtsql/qtsql-5.5..ebuild
@@ -29,7 +29,7 @@ DEPEND="
oci8? ( dev-db/oracle-instantclient-basic )
odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
postgres? ( dev-db/postgresql:* )
-   sqlite? ( dev-db/sqlite:3 )
+   sqlite? ( >=dev-db/sqlite-3.8.8.2:3 )
 "
 RDEPEND="${DEPEND}"
 

diff --git a/dev-qt/qtsql/qtsql-5..ebuild b/dev-qt/qtsql/qtsql-5..ebuild
index 3061e4f..cd4d55d 100644
--- a/dev-qt/qtsql/qtsql-5..ebuild
+++ b/dev-qt/qtsql/qtsql-5..ebuild
@@ -29,7 +29,7 @@ DEPEND="
oci8? ( dev-db/oracle-instantclient-basic )
odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
postgres? ( dev-db/postgresql:* )
-   sqlite? ( dev-db/sqlite:3 )
+   sqlite? ( >=dev-db/sqlite-3.8.8.2:3 )
 "
 RDEPEND="${DEPEND}"

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2015-07-29 Thread Davide Pesavento

commit: 29facc1c5ae5108c8fbe4a53dd573a8a2c6ecfea
Author: Davide Pesavento  gentoo  org>
AuthorDate: Wed Jul 29 14:34:01 2015 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Wed Jul 29 14:34:01 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=29facc1c

[dev-qt/qtsql] Switch to virtual/libmysqlclient.

Package-Manager: portage-2.2.20

 dev-qt/qtsql/qtsql-4.8..ebuild | 2 +-
 dev-qt/qtsql/qtsql-5.5.0.ebuild| 2 +-
 dev-qt/qtsql/qtsql-5.5..ebuild | 2 +-
 dev-qt/qtsql/qtsql-5..ebuild   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-4.8..ebuild 
b/dev-qt/qtsql/qtsql-4.8..ebuild
index c3a7bf0..93e7e19 100644
--- a/dev-qt/qtsql/qtsql-4.8..ebuild
+++ b/dev-qt/qtsql/qtsql-4.8..ebuild
@@ -20,7 +20,7 @@ REQUIRED_USE="
 DEPEND="
~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
freetds? ( dev-db/freetds )
-   mysql? ( >=virtual/mysql-5.6-r2:=[${MULTILIB_USEDEP}] )
+   mysql? ( virtual/libmysqlclient:=[${MULTILIB_USEDEP}] )
oci8? ( 
>=dev-db/oracle-instantclient-basic-11.2.0.4[${MULTILIB_USEDEP}] )
odbc? ( || (
>=dev-db/unixODBC-2.3.2-r2[${MULTILIB_USEDEP}]

diff --git a/dev-qt/qtsql/qtsql-5.5.0.ebuild b/dev-qt/qtsql/qtsql-5.5.0.ebuild
index 42efef7..aca1154 100644
--- a/dev-qt/qtsql/qtsql-5.5.0.ebuild
+++ b/dev-qt/qtsql/qtsql-5.5.0.ebuild
@@ -21,7 +21,7 @@ REQUIRED_USE="
 DEPEND="
~dev-qt/qtcore-${PV}
freetds? ( dev-db/freetds )
-   mysql? ( virtual/mysql:= )
+   mysql? ( virtual/libmysqlclient:= )
oci8? ( dev-db/oracle-instantclient-basic )
odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
postgres? ( dev-db/postgresql:* )

diff --git a/dev-qt/qtsql/qtsql-5.5..ebuild 
b/dev-qt/qtsql/qtsql-5.5..ebuild
index 42efef7..aca1154 100644
--- a/dev-qt/qtsql/qtsql-5.5..ebuild
+++ b/dev-qt/qtsql/qtsql-5.5..ebuild
@@ -21,7 +21,7 @@ REQUIRED_USE="
 DEPEND="
~dev-qt/qtcore-${PV}
freetds? ( dev-db/freetds )
-   mysql? ( virtual/mysql:= )
+   mysql? ( virtual/libmysqlclient:= )
oci8? ( dev-db/oracle-instantclient-basic )
odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
postgres? ( dev-db/postgresql:* )

diff --git a/dev-qt/qtsql/qtsql-5..ebuild b/dev-qt/qtsql/qtsql-5..ebuild
index 42efef7..aca1154 100644
--- a/dev-qt/qtsql/qtsql-5..ebuild
+++ b/dev-qt/qtsql/qtsql-5..ebuild
@@ -21,7 +21,7 @@ REQUIRED_USE="
 DEPEND="
~dev-qt/qtcore-${PV}
freetds? ( dev-db/freetds )
-   mysql? ( virtual/mysql:= )
+   mysql? ( virtual/libmysqlclient:= )
oci8? ( dev-db/oracle-instantclient-basic )
odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
postgres? ( dev-db/postgresql:* )

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2015-12-03 Thread Davide Pesavento

commit: 2f0365278f103c8c64b7acdf5a0c7bf295808795
Author: Davide Pesavento  gentoo  org>
AuthorDate: Thu Dec  3 16:40:43 2015 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Thu Dec  3 16:40:43 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=2f036527

dev-qt/qtsql: raise sqlite dep to match bundled copy version

Package-Manager: portage-2.2.26

 dev-qt/qtsql/qtsql-5.6..ebuild | 2 +-
 dev-qt/qtsql/qtsql-5..ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-5.6..ebuild 
b/dev-qt/qtsql/qtsql-5.6..ebuild
index a01c4e7..2839078 100644
--- a/dev-qt/qtsql/qtsql-5.6..ebuild
+++ b/dev-qt/qtsql/qtsql-5.6..ebuild
@@ -25,7 +25,7 @@ DEPEND="
oci8? ( dev-db/oracle-instantclient-basic )
odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
postgres? ( dev-db/postgresql:* )
-   sqlite? ( >=dev-db/sqlite-3.8.8.2:3 )
+   sqlite? ( >=dev-db/sqlite-3.8.10.2:3 )
 "
 RDEPEND="${DEPEND}"
 

diff --git a/dev-qt/qtsql/qtsql-5..ebuild b/dev-qt/qtsql/qtsql-5..ebuild
index a01c4e7..2839078 100644
--- a/dev-qt/qtsql/qtsql-5..ebuild
+++ b/dev-qt/qtsql/qtsql-5..ebuild
@@ -25,7 +25,7 @@ DEPEND="
oci8? ( dev-db/oracle-instantclient-basic )
odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
postgres? ( dev-db/postgresql:* )
-   sqlite? ( >=dev-db/sqlite-3.8.8.2:3 )
+   sqlite? ( >=dev-db/sqlite-3.8.10.2:3 )
 "
 RDEPEND="${DEPEND}"

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2016-06-12 Thread Davide Pesavento

commit: 2ae8c074355e103f83ef99b68d5c44b68719f601
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sun Jun 12 23:48:52 2016 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Mon Jun 13 00:11:06 2016 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=2ae8c074

dev-qt/qtsql: convert to usex

Package-Manager: portage-2.3.0_rc1

 dev-qt/qtsql/qtsql-5.6.1.ebuild| 2 +-
 dev-qt/qtsql/qtsql-5.6..ebuild | 2 +-
 dev-qt/qtsql/qtsql-5.7.0_rc.ebuild | 2 +-
 dev-qt/qtsql/qtsql-5.7..ebuild | 2 +-
 dev-qt/qtsql/qtsql-5..ebuild   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-5.6.1.ebuild b/dev-qt/qtsql/qtsql-5.6.1.ebuild
index 426b32e..016251f 100644
--- a/dev-qt/qtsql/qtsql-5.6.1.ebuild
+++ b/dev-qt/qtsql/qtsql-5.6.1.ebuild
@@ -42,7 +42,7 @@ src_configure() {
$(qt_use odbc sql-odbc   plugin)
$(qt_use postgres sql-psql   plugin)
$(qt_use sqlite   sql-sqlite plugin)
-   $(use sqlite && echo -system-sqlite)
+   $(usex sqlite -system-sqlite '')
)
 
use mysql && myconf+=("-I${EPREFIX}/usr/include/mysql" 
"-L${EPREFIX}/usr/$(get_libdir)/mysql")

diff --git a/dev-qt/qtsql/qtsql-5.6..ebuild 
b/dev-qt/qtsql/qtsql-5.6..ebuild
index 426b32e..016251f 100644
--- a/dev-qt/qtsql/qtsql-5.6..ebuild
+++ b/dev-qt/qtsql/qtsql-5.6..ebuild
@@ -42,7 +42,7 @@ src_configure() {
$(qt_use odbc sql-odbc   plugin)
$(qt_use postgres sql-psql   plugin)
$(qt_use sqlite   sql-sqlite plugin)
-   $(use sqlite && echo -system-sqlite)
+   $(usex sqlite -system-sqlite '')
)
 
use mysql && myconf+=("-I${EPREFIX}/usr/include/mysql" 
"-L${EPREFIX}/usr/$(get_libdir)/mysql")

diff --git a/dev-qt/qtsql/qtsql-5.7.0_rc.ebuild 
b/dev-qt/qtsql/qtsql-5.7.0_rc.ebuild
index 426b32e..016251f 100644
--- a/dev-qt/qtsql/qtsql-5.7.0_rc.ebuild
+++ b/dev-qt/qtsql/qtsql-5.7.0_rc.ebuild
@@ -42,7 +42,7 @@ src_configure() {
$(qt_use odbc sql-odbc   plugin)
$(qt_use postgres sql-psql   plugin)
$(qt_use sqlite   sql-sqlite plugin)
-   $(use sqlite && echo -system-sqlite)
+   $(usex sqlite -system-sqlite '')
)
 
use mysql && myconf+=("-I${EPREFIX}/usr/include/mysql" 
"-L${EPREFIX}/usr/$(get_libdir)/mysql")

diff --git a/dev-qt/qtsql/qtsql-5.7..ebuild 
b/dev-qt/qtsql/qtsql-5.7..ebuild
index 426b32e..016251f 100644
--- a/dev-qt/qtsql/qtsql-5.7..ebuild
+++ b/dev-qt/qtsql/qtsql-5.7..ebuild
@@ -42,7 +42,7 @@ src_configure() {
$(qt_use odbc sql-odbc   plugin)
$(qt_use postgres sql-psql   plugin)
$(qt_use sqlite   sql-sqlite plugin)
-   $(use sqlite && echo -system-sqlite)
+   $(usex sqlite -system-sqlite '')
)
 
use mysql && myconf+=("-I${EPREFIX}/usr/include/mysql" 
"-L${EPREFIX}/usr/$(get_libdir)/mysql")

diff --git a/dev-qt/qtsql/qtsql-5..ebuild b/dev-qt/qtsql/qtsql-5..ebuild
index 426b32e..016251f 100644
--- a/dev-qt/qtsql/qtsql-5..ebuild
+++ b/dev-qt/qtsql/qtsql-5..ebuild
@@ -42,7 +42,7 @@ src_configure() {
$(qt_use odbc sql-odbc   plugin)
$(qt_use postgres sql-psql   plugin)
$(qt_use sqlite   sql-sqlite plugin)
-   $(use sqlite && echo -system-sqlite)
+   $(usex sqlite -system-sqlite '')
)
 
use mysql && myconf+=("-I${EPREFIX}/usr/include/mysql" 
"-L${EPREFIX}/usr/$(get_libdir)/mysql")

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2016-05-31 Thread Davide Pesavento

commit: fa53034cf989fdb7e00b4234747df64720aa4363
Author: Davide Pesavento  gentoo  org>
AuthorDate: Tue May 31 22:37:46 2016 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Tue May 31 22:37:46 2016 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=fa53034c

dev-qt/qtsql: drop unused inherit multilib

Package-Manager: portage-2.3.0_rc1

 dev-qt/qtsql/qtsql-5.6..ebuild   | 2 +-
 dev-qt/qtsql/qtsql-5.7.0_beta.ebuild | 2 +-
 dev-qt/qtsql/qtsql-5.7..ebuild   | 2 +-
 dev-qt/qtsql/qtsql-5..ebuild | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-5.6..ebuild 
b/dev-qt/qtsql/qtsql-5.6..ebuild
index 69b981e..426b32e 100644
--- a/dev-qt/qtsql/qtsql-5.6..ebuild
+++ b/dev-qt/qtsql/qtsql-5.6..ebuild
@@ -4,7 +4,7 @@
 
 EAPI=6
 QT5_MODULE="qtbase"
-inherit multilib qt5-build
+inherit qt5-build
 
 DESCRIPTION="SQL abstraction library for the Qt5 tooolkit"
 

diff --git a/dev-qt/qtsql/qtsql-5.7.0_beta.ebuild 
b/dev-qt/qtsql/qtsql-5.7.0_beta.ebuild
index 69b981e..426b32e 100644
--- a/dev-qt/qtsql/qtsql-5.7.0_beta.ebuild
+++ b/dev-qt/qtsql/qtsql-5.7.0_beta.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=6
 QT5_MODULE="qtbase"
-inherit multilib qt5-build
+inherit qt5-build
 
 DESCRIPTION="SQL abstraction library for the Qt5 tooolkit"
 

diff --git a/dev-qt/qtsql/qtsql-5.7..ebuild 
b/dev-qt/qtsql/qtsql-5.7..ebuild
index 69b981e..426b32e 100644
--- a/dev-qt/qtsql/qtsql-5.7..ebuild
+++ b/dev-qt/qtsql/qtsql-5.7..ebuild
@@ -4,7 +4,7 @@
 
 EAPI=6
 QT5_MODULE="qtbase"
-inherit multilib qt5-build
+inherit qt5-build
 
 DESCRIPTION="SQL abstraction library for the Qt5 tooolkit"
 

diff --git a/dev-qt/qtsql/qtsql-5..ebuild b/dev-qt/qtsql/qtsql-5..ebuild
index 69b981e..426b32e 100644
--- a/dev-qt/qtsql/qtsql-5..ebuild
+++ b/dev-qt/qtsql/qtsql-5..ebuild
@@ -4,7 +4,7 @@
 
 EAPI=6
 QT5_MODULE="qtbase"
-inherit multilib qt5-build
+inherit qt5-build
 
 DESCRIPTION="SQL abstraction library for the Qt5 tooolkit"

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2019-01-07 Thread Davide Pesavento

commit: 176f0fbf1ff794f7770c9725aced16025579368a
Author: Davide Pesavento  gentoo  org>
AuthorDate: Tue Jan  8 01:28:33 2019 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Tue Jan  8 01:28:33 2019 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=176f0fbf

dev-qt/qtsql: switch to dev-db/oracle-instantclient

Bug: https://bugs.gentoo.org/669274
Package-Manager: Portage-2.3.53, Repoman-2.3.12
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qtsql/qtsql-5.12.0.ebuild| 2 +-
 dev-qt/qtsql/qtsql-5.12..ebuild | 2 +-
 dev-qt/qtsql/qtsql-5..ebuild| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-5.12.0.ebuild b/dev-qt/qtsql/qtsql-5.12.0.ebuild
index e46b3da3..92ce286d 100644
--- a/dev-qt/qtsql/qtsql-5.12.0.ebuild
+++ b/dev-qt/qtsql/qtsql-5.12.0.ebuild
@@ -22,7 +22,7 @@ DEPEND="
~dev-qt/qtcore-${PV}
freetds? ( dev-db/freetds )
mysql? ( dev-db/mysql-connector-c:= )
-   oci8? ( dev-db/oracle-instantclient-basic )
+   oci8? ( dev-db/oracle-instantclient:=[sdk] )
odbc? ( dev-db/unixODBC )
postgres? ( dev-db/postgresql:* )
sqlite? ( dev-db/sqlite:3 )

diff --git a/dev-qt/qtsql/qtsql-5.12..ebuild 
b/dev-qt/qtsql/qtsql-5.12..ebuild
index e46b3da3..92ce286d 100644
--- a/dev-qt/qtsql/qtsql-5.12..ebuild
+++ b/dev-qt/qtsql/qtsql-5.12..ebuild
@@ -22,7 +22,7 @@ DEPEND="
~dev-qt/qtcore-${PV}
freetds? ( dev-db/freetds )
mysql? ( dev-db/mysql-connector-c:= )
-   oci8? ( dev-db/oracle-instantclient-basic )
+   oci8? ( dev-db/oracle-instantclient:=[sdk] )
odbc? ( dev-db/unixODBC )
postgres? ( dev-db/postgresql:* )
sqlite? ( dev-db/sqlite:3 )

diff --git a/dev-qt/qtsql/qtsql-5..ebuild b/dev-qt/qtsql/qtsql-5..ebuild
index e46b3da3..92ce286d 100644
--- a/dev-qt/qtsql/qtsql-5..ebuild
+++ b/dev-qt/qtsql/qtsql-5..ebuild
@@ -22,7 +22,7 @@ DEPEND="
~dev-qt/qtcore-${PV}
freetds? ( dev-db/freetds )
mysql? ( dev-db/mysql-connector-c:= )
-   oci8? ( dev-db/oracle-instantclient-basic )
+   oci8? ( dev-db/oracle-instantclient:=[sdk] )
odbc? ( dev-db/unixODBC )
postgres? ( dev-db/postgresql:* )
sqlite? ( dev-db/sqlite:3 )

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2019-01-07 Thread Davide Pesavento

commit: 2dabddfc4d3bcc8d6b73c1d0bd19d469356b655e
Author: Davide Pesavento  gentoo  org>
AuthorDate: Tue Jan  8 00:15:39 2019 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Tue Jan  8 00:15:39 2019 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=2dabddfc

dev-qt/qtsql: stop using deprecated virtual

Package-Manager: Portage-2.3.53, Repoman-2.3.12
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qtsql/qtsql-5.12.0.ebuild| 3 +--
 dev-qt/qtsql/qtsql-5.12..ebuild | 3 +--
 dev-qt/qtsql/qtsql-5..ebuild| 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-5.12.0.ebuild b/dev-qt/qtsql/qtsql-5.12.0.ebuild
index d5f86389..ba13844c 100644
--- a/dev-qt/qtsql/qtsql-5.12.0.ebuild
+++ b/dev-qt/qtsql/qtsql-5.12.0.ebuild
@@ -21,7 +21,7 @@ REQUIRED_USE="
 DEPEND="
~dev-qt/qtcore-${PV}
freetds? ( dev-db/freetds )
-   mysql? ( virtual/libmysqlclient:= )
+   mysql? ( dev-db/mysql-connector-c:= )
oci8? ( dev-db/oracle-instantclient-basic )
odbc? ( dev-db/unixODBC )
postgres? ( dev-db/postgresql:* )
@@ -49,7 +49,6 @@ src_configure() {
$(usex sqlite -system-sqlite '')
)
 
-   use mysql && myconf+=("-I${EPREFIX}/usr/include/mysql" 
"-L${EPREFIX}/usr/$(get_libdir)/mysql")
use oci8 && myconf+=("-I${ORACLE_HOME}/include" 
"-L${ORACLE_HOME}/$(get_libdir)")
use postgres && myconf+=("-I${EPREFIX}/usr/include/postgresql/pgsql")
 

diff --git a/dev-qt/qtsql/qtsql-5.12..ebuild 
b/dev-qt/qtsql/qtsql-5.12..ebuild
index d5f86389..ba13844c 100644
--- a/dev-qt/qtsql/qtsql-5.12..ebuild
+++ b/dev-qt/qtsql/qtsql-5.12..ebuild
@@ -21,7 +21,7 @@ REQUIRED_USE="
 DEPEND="
~dev-qt/qtcore-${PV}
freetds? ( dev-db/freetds )
-   mysql? ( virtual/libmysqlclient:= )
+   mysql? ( dev-db/mysql-connector-c:= )
oci8? ( dev-db/oracle-instantclient-basic )
odbc? ( dev-db/unixODBC )
postgres? ( dev-db/postgresql:* )
@@ -49,7 +49,6 @@ src_configure() {
$(usex sqlite -system-sqlite '')
)
 
-   use mysql && myconf+=("-I${EPREFIX}/usr/include/mysql" 
"-L${EPREFIX}/usr/$(get_libdir)/mysql")
use oci8 && myconf+=("-I${ORACLE_HOME}/include" 
"-L${ORACLE_HOME}/$(get_libdir)")
use postgres && myconf+=("-I${EPREFIX}/usr/include/postgresql/pgsql")
 

diff --git a/dev-qt/qtsql/qtsql-5..ebuild b/dev-qt/qtsql/qtsql-5..ebuild
index d5f86389..ba13844c 100644
--- a/dev-qt/qtsql/qtsql-5..ebuild
+++ b/dev-qt/qtsql/qtsql-5..ebuild
@@ -21,7 +21,7 @@ REQUIRED_USE="
 DEPEND="
~dev-qt/qtcore-${PV}
freetds? ( dev-db/freetds )
-   mysql? ( virtual/libmysqlclient:= )
+   mysql? ( dev-db/mysql-connector-c:= )
oci8? ( dev-db/oracle-instantclient-basic )
odbc? ( dev-db/unixODBC )
postgres? ( dev-db/postgresql:* )
@@ -49,7 +49,6 @@ src_configure() {
$(usex sqlite -system-sqlite '')
)
 
-   use mysql && myconf+=("-I${EPREFIX}/usr/include/mysql" 
"-L${EPREFIX}/usr/$(get_libdir)/mysql")
use oci8 && myconf+=("-I${ORACLE_HOME}/include" 
"-L${ORACLE_HOME}/$(get_libdir)")
use postgres && myconf+=("-I${EPREFIX}/usr/include/postgresql/pgsql")

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2019-01-07 Thread Davide Pesavento

commit: 5ecb95fc789370b10bcee04ba4b3fdccd2fad189
Author: Davide Pesavento  gentoo  org>
AuthorDate: Tue Jan  8 00:48:02 2019 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Tue Jan  8 00:48:02 2019 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=5ecb95fc

dev-qt/qtsql: upstream learned to use pkg-config

Package-Manager: Portage-2.3.53, Repoman-2.3.12
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qtsql/qtsql-5.12.0.ebuild| 1 -
 dev-qt/qtsql/qtsql-5.12..ebuild | 1 -
 dev-qt/qtsql/qtsql-5..ebuild| 1 -
 3 files changed, 3 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-5.12.0.ebuild b/dev-qt/qtsql/qtsql-5.12.0.ebuild
index ba13844c..e46b3da3 100644
--- a/dev-qt/qtsql/qtsql-5.12.0.ebuild
+++ b/dev-qt/qtsql/qtsql-5.12.0.ebuild
@@ -50,7 +50,6 @@ src_configure() {
)
 
use oci8 && myconf+=("-I${ORACLE_HOME}/include" 
"-L${ORACLE_HOME}/$(get_libdir)")
-   use postgres && myconf+=("-I${EPREFIX}/usr/include/postgresql/pgsql")
 
qt5-build_src_configure
 }

diff --git a/dev-qt/qtsql/qtsql-5.12..ebuild 
b/dev-qt/qtsql/qtsql-5.12..ebuild
index ba13844c..e46b3da3 100644
--- a/dev-qt/qtsql/qtsql-5.12..ebuild
+++ b/dev-qt/qtsql/qtsql-5.12..ebuild
@@ -50,7 +50,6 @@ src_configure() {
)
 
use oci8 && myconf+=("-I${ORACLE_HOME}/include" 
"-L${ORACLE_HOME}/$(get_libdir)")
-   use postgres && myconf+=("-I${EPREFIX}/usr/include/postgresql/pgsql")
 
qt5-build_src_configure
 }

diff --git a/dev-qt/qtsql/qtsql-5..ebuild b/dev-qt/qtsql/qtsql-5..ebuild
index ba13844c..e46b3da3 100644
--- a/dev-qt/qtsql/qtsql-5..ebuild
+++ b/dev-qt/qtsql/qtsql-5..ebuild
@@ -50,7 +50,6 @@ src_configure() {
)
 
use oci8 && myconf+=("-I${ORACLE_HOME}/include" 
"-L${ORACLE_HOME}/$(get_libdir)")
-   use postgres && myconf+=("-I${EPREFIX}/usr/include/postgresql/pgsql")
 
qt5-build_src_configure
 }

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2019-01-07 Thread Davide Pesavento

commit: f11c40750fff879e9c8269303c678f72c9863414
Author: Davide Pesavento  gentoo  org>
AuthorDate: Mon Jan  7 23:57:06 2019 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Mon Jan  7 23:57:06 2019 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=f11c4075

dev-qt/qtsql: apparently upstream doesn't support libiodbc anymore

The configure test fails to detect it. Probably easy to fix, but
I doubt anyone cares, given that it's been broken since 5.8.0 and
no one complained.

Package-Manager: Portage-2.3.53, Repoman-2.3.12
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qtsql/qtsql-5.12.0.ebuild| 7 +++
 dev-qt/qtsql/qtsql-5.12..ebuild | 7 +++
 dev-qt/qtsql/qtsql-5..ebuild| 7 +++
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-5.12.0.ebuild b/dev-qt/qtsql/qtsql-5.12.0.ebuild
index 09b2d085..d5f86389 100644
--- a/dev-qt/qtsql/qtsql-5.12.0.ebuild
+++ b/dev-qt/qtsql/qtsql-5.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,9 +23,9 @@ DEPEND="
freetds? ( dev-db/freetds )
mysql? ( virtual/libmysqlclient:= )
oci8? ( dev-db/oracle-instantclient-basic )
-   odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
+   odbc? ( dev-db/unixODBC )
postgres? ( dev-db/postgresql:* )
-   sqlite? ( >=dev-db/sqlite-3.8.10.2:3 )
+   sqlite? ( dev-db/sqlite:3 )
 "
 RDEPEND="${DEPEND}"
 
@@ -51,7 +51,6 @@ src_configure() {
 
use mysql && myconf+=("-I${EPREFIX}/usr/include/mysql" 
"-L${EPREFIX}/usr/$(get_libdir)/mysql")
use oci8 && myconf+=("-I${ORACLE_HOME}/include" 
"-L${ORACLE_HOME}/$(get_libdir)")
-   use odbc && myconf+=("-I${EPREFIX}/usr/include/iodbc")
use postgres && myconf+=("-I${EPREFIX}/usr/include/postgresql/pgsql")
 
qt5-build_src_configure

diff --git a/dev-qt/qtsql/qtsql-5.12..ebuild 
b/dev-qt/qtsql/qtsql-5.12..ebuild
index 2ce2c9a9..d5f86389 100644
--- a/dev-qt/qtsql/qtsql-5.12..ebuild
+++ b/dev-qt/qtsql/qtsql-5.12..ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,9 +23,9 @@ DEPEND="
freetds? ( dev-db/freetds )
mysql? ( virtual/libmysqlclient:= )
oci8? ( dev-db/oracle-instantclient-basic )
-   odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
+   odbc? ( dev-db/unixODBC )
postgres? ( dev-db/postgresql:* )
-   sqlite? ( >=dev-db/sqlite-3.8.10.2:3 )
+   sqlite? ( dev-db/sqlite:3 )
 "
 RDEPEND="${DEPEND}"
 
@@ -51,7 +51,6 @@ src_configure() {
 
use mysql && myconf+=("-I${EPREFIX}/usr/include/mysql" 
"-L${EPREFIX}/usr/$(get_libdir)/mysql")
use oci8 && myconf+=("-I${ORACLE_HOME}/include" 
"-L${ORACLE_HOME}/$(get_libdir)")
-   use odbc && myconf+=("-I${EPREFIX}/usr/include/iodbc")
use postgres && myconf+=("-I${EPREFIX}/usr/include/postgresql/pgsql")
 
qt5-build_src_configure

diff --git a/dev-qt/qtsql/qtsql-5..ebuild b/dev-qt/qtsql/qtsql-5..ebuild
index 2ce2c9a9..d5f86389 100644
--- a/dev-qt/qtsql/qtsql-5..ebuild
+++ b/dev-qt/qtsql/qtsql-5..ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,9 +23,9 @@ DEPEND="
freetds? ( dev-db/freetds )
mysql? ( virtual/libmysqlclient:= )
oci8? ( dev-db/oracle-instantclient-basic )
-   odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
+   odbc? ( dev-db/unixODBC )
postgres? ( dev-db/postgresql:* )
-   sqlite? ( >=dev-db/sqlite-3.8.10.2:3 )
+   sqlite? ( dev-db/sqlite:3 )
 "
 RDEPEND="${DEPEND}"
 
@@ -51,7 +51,6 @@ src_configure() {
 
use mysql && myconf+=("-I${EPREFIX}/usr/include/mysql" 
"-L${EPREFIX}/usr/$(get_libdir)/mysql")
use oci8 && myconf+=("-I${ORACLE_HOME}/include" 
"-L${ORACLE_HOME}/$(get_libdir)")
-   use odbc && myconf+=("-I${EPREFIX}/usr/include/iodbc")
use postgres && myconf+=("-I${EPREFIX}/usr/include/postgresql/pgsql")
 
qt5-build_src_configure

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2018-07-21 Thread Davide Pesavento

commit: 12b2494645a034d98355b0e319ac3097c49467ce
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sat Jul 21 18:20:17 2018 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sat Jul 21 18:20:17 2018 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=12b24946

dev-qt/qtsql: sync with gentoo repo

Package-Manager: Portage-2.3.43, Repoman-2.3.10

 dev-qt/qtsql/qtsql-5.11..ebuild | 1 +
 dev-qt/qtsql/qtsql-5.9..ebuild  | 1 +
 dev-qt/qtsql/qtsql-5..ebuild| 1 +
 3 files changed, 3 insertions(+)

diff --git a/dev-qt/qtsql/qtsql-5.11..ebuild 
b/dev-qt/qtsql/qtsql-5.11..ebuild
index db29e42d..40fde45f 100644
--- a/dev-qt/qtsql/qtsql-5.11..ebuild
+++ b/dev-qt/qtsql/qtsql-5.11..ebuild
@@ -6,6 +6,7 @@ QT5_MODULE="qtbase"
 inherit qt5-build
 
 DESCRIPTION="SQL abstraction library for the Qt5 framework"
+SLOT=5/$(ver_cut 1-3) # bug 639140
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd"

diff --git a/dev-qt/qtsql/qtsql-5.9..ebuild 
b/dev-qt/qtsql/qtsql-5.9..ebuild
index ae735814..325786e3 100644
--- a/dev-qt/qtsql/qtsql-5.9..ebuild
+++ b/dev-qt/qtsql/qtsql-5.9..ebuild
@@ -6,6 +6,7 @@ QT5_MODULE="qtbase"
 inherit qt5-build
 
 DESCRIPTION="SQL abstraction library for the Qt5 framework"
+SLOT=5/$(ver_cut 1-3) # bug 639140
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd"

diff --git a/dev-qt/qtsql/qtsql-5..ebuild b/dev-qt/qtsql/qtsql-5..ebuild
index db29e42d..40fde45f 100644
--- a/dev-qt/qtsql/qtsql-5..ebuild
+++ b/dev-qt/qtsql/qtsql-5..ebuild
@@ -6,6 +6,7 @@ QT5_MODULE="qtbase"
 inherit qt5-build
 
 DESCRIPTION="SQL abstraction library for the Qt5 framework"
+SLOT=5/$(ver_cut 1-3) # bug 639140
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd"

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2018-02-22 Thread Andreas Sturmlechner

commit: e6c56e5f15410af81f4b789b2a532a8abda0569c
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Thu Feb 22 10:11:29 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Feb 22 22:14:14 2018 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=e6c56e5f

dev-qt/qtsql: Drop 5.10.1 (r0)

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 dev-qt/qtsql/qtsql-5.10.1.ebuild | 57 
 1 file changed, 57 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-5.10.1.ebuild b/dev-qt/qtsql/qtsql-5.10.1.ebuild
deleted file mode 100644
index 8b17279a..
--- a/dev-qt/qtsql/qtsql-5.10.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="SQL abstraction library for the Qt5 tooolkit"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-fi
-
-IUSE="freetds mysql oci8 odbc postgres +sqlite"
-
-REQUIRED_USE="
-   || ( freetds mysql oci8 odbc postgres sqlite )
-"
-
-DEPEND="
-   ~dev-qt/qtcore-${PV}
-   freetds? ( dev-db/freetds )
-   mysql? ( virtual/libmysqlclient:= )
-   oci8? ( dev-db/oracle-instantclient-basic )
-   odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
-   postgres? ( dev-db/postgresql:* )
-   sqlite? ( >=dev-db/sqlite-3.8.10.2:3 )
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-   src/sql
-   src/plugins/sqldrivers
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-   :sql
-)
-
-src_configure() {
-   local myconf=(
-   $(qt_use freetds  sql-tdsplugin)
-   $(qt_use mysqlsql-mysql  plugin)
-   $(qt_use oci8 sql-ociplugin)
-   $(qt_use odbc sql-odbc   plugin)
-   $(qt_use postgres sql-psql   plugin)
-   $(qt_use sqlite   sql-sqlite plugin)
-   $(usex sqlite -system-sqlite '')
-   )
-
-   use mysql && myconf+=("-I${EPREFIX}/usr/include/mysql" 
"-L${EPREFIX}/usr/$(get_libdir)/mysql")
-   use oci8 && myconf+=("-I${ORACLE_HOME}/include" 
"-L${ORACLE_HOME}/$(get_libdir)")
-   use odbc && myconf+=("-I${EPREFIX}/usr/include/iodbc")
-   use postgres && myconf+=("-I${EPREFIX}/usr/include/postgresql/pgsql")
-
-   qt5-build_src_configure
-}

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2018-02-22 Thread Andreas Sturmlechner

commit: b00f1b5c451dacea8caf919ee63696f593f17e9b
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Thu Feb 22 19:35:13 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Feb 22 22:14:14 2018 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=b00f1b5c

dev-qt/qtsql: Fix description

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 dev-qt/qtsql/qtsql-5.10.1-r1.ebuild| 2 +-
 dev-qt/qtsql/qtsql-5.11.0_alpha.ebuild | 2 +-
 dev-qt/qtsql/qtsql-5.11..ebuild| 2 +-
 dev-qt/qtsql/qtsql-5.9..ebuild | 2 +-
 dev-qt/qtsql/qtsql-5..ebuild   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-5.10.1-r1.ebuild 
b/dev-qt/qtsql/qtsql-5.10.1-r1.ebuild
index 7765a7bb..f6e32554 100644
--- a/dev-qt/qtsql/qtsql-5.10.1-r1.ebuild
+++ b/dev-qt/qtsql/qtsql-5.10.1-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 QT5_MODULE="qtbase"
 inherit qt5-build
 
-DESCRIPTION="SQL abstraction library for the Qt5 tooolkit"
+DESCRIPTION="SQL abstraction library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"

diff --git a/dev-qt/qtsql/qtsql-5.11.0_alpha.ebuild 
b/dev-qt/qtsql/qtsql-5.11.0_alpha.ebuild
index 7765a7bb..f6e32554 100644
--- a/dev-qt/qtsql/qtsql-5.11.0_alpha.ebuild
+++ b/dev-qt/qtsql/qtsql-5.11.0_alpha.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 QT5_MODULE="qtbase"
 inherit qt5-build
 
-DESCRIPTION="SQL abstraction library for the Qt5 tooolkit"
+DESCRIPTION="SQL abstraction library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"

diff --git a/dev-qt/qtsql/qtsql-5.11..ebuild 
b/dev-qt/qtsql/qtsql-5.11..ebuild
index 7765a7bb..f6e32554 100644
--- a/dev-qt/qtsql/qtsql-5.11..ebuild
+++ b/dev-qt/qtsql/qtsql-5.11..ebuild
@@ -5,7 +5,7 @@ EAPI=6
 QT5_MODULE="qtbase"
 inherit qt5-build
 
-DESCRIPTION="SQL abstraction library for the Qt5 tooolkit"
+DESCRIPTION="SQL abstraction library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"

diff --git a/dev-qt/qtsql/qtsql-5.9..ebuild 
b/dev-qt/qtsql/qtsql-5.9..ebuild
index 7765a7bb..f6e32554 100644
--- a/dev-qt/qtsql/qtsql-5.9..ebuild
+++ b/dev-qt/qtsql/qtsql-5.9..ebuild
@@ -5,7 +5,7 @@ EAPI=6
 QT5_MODULE="qtbase"
 inherit qt5-build
 
-DESCRIPTION="SQL abstraction library for the Qt5 tooolkit"
+DESCRIPTION="SQL abstraction library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"

diff --git a/dev-qt/qtsql/qtsql-5..ebuild b/dev-qt/qtsql/qtsql-5..ebuild
index 7765a7bb..f6e32554 100644
--- a/dev-qt/qtsql/qtsql-5..ebuild
+++ b/dev-qt/qtsql/qtsql-5..ebuild
@@ -5,7 +5,7 @@ EAPI=6
 QT5_MODULE="qtbase"
 inherit qt5-build
 
-DESCRIPTION="SQL abstraction library for the Qt5 tooolkit"
+DESCRIPTION="SQL abstraction library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2018-04-11 Thread Jimi Huotari

commit: 76d56567a6897296ff4003f33ca93ddf5b41358e
Author: Jimi Huotari  gentoo  org>
AuthorDate: Wed Apr 11 12:19:28 2018 +
Commit: Jimi Huotari  gentoo  org>
CommitDate: Wed Apr 11 12:20:54 2018 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=76d56567

dev-qt/qtsql: remove upstreamed MariaDB patch from 5.11.

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 dev-qt/qtsql/qtsql-5.11..ebuild | 5 -
 1 file changed, 5 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-5.11..ebuild 
b/dev-qt/qtsql/qtsql-5.11..ebuild
index ae735814..db29e42d 100644
--- a/dev-qt/qtsql/qtsql-5.11..ebuild
+++ b/dev-qt/qtsql/qtsql-5.11..ebuild
@@ -28,11 +28,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=(
-   "${FILESDIR}/${PN}-5.9.5-mariadb-10.2.patch"
-   # See also: https://codereview.qt-project.org/#/c/206850/
-)
-
 QT5_TARGET_SUBDIRS=(
src/sql
src/plugins/sqldrivers

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2018-04-11 Thread Jimi Huotari

commit: ab940d09e3920194961368e5e52c9bf715222d60
Author: Jimi Huotari  gentoo  org>
AuthorDate: Wed Apr 11 14:56:37 2018 +
Commit: Jimi Huotari  gentoo  org>
CommitDate: Wed Apr 11 14:56:37 2018 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=ab940d09

dev-qt/qtsql: remove upstreamed MariaDB patch from 5.

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 dev-qt/qtsql/qtsql-5..ebuild | 5 -
 1 file changed, 5 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-5..ebuild b/dev-qt/qtsql/qtsql-5..ebuild
index ae735814..db29e42d 100644
--- a/dev-qt/qtsql/qtsql-5..ebuild
+++ b/dev-qt/qtsql/qtsql-5..ebuild
@@ -28,11 +28,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=(
-   "${FILESDIR}/${PN}-5.9.5-mariadb-10.2.patch"
-   # See also: https://codereview.qt-project.org/#/c/206850/
-)
-
 QT5_TARGET_SUBDIRS=(
src/sql
src/plugins/sqldrivers

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2018-02-02 Thread Michael Palimaka

commit: a14de820c4cadb41d8311d0d934454fcffa304ea
Author: Michael Palimaka  gentoo  org>
AuthorDate: Fri Jan 26 06:47:34 2018 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Fri Feb  2 11:53:56 2018 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=a14de820

dev-qt/qtsql: add QT5_GENTOO_PRIVATE_CONFIG

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 dev-qt/qtsql/qtsql-5.10.0.ebuild| 6 +-
 dev-qt/qtsql/qtsql-5.10..ebuild | 6 +-
 dev-qt/qtsql/qtsql-5.11..ebuild | 4 
 dev-qt/qtsql/qtsql-5.9.4.ebuild | 4 
 dev-qt/qtsql/qtsql-5.9..ebuild  | 6 +-
 dev-qt/qtsql/qtsql-5..ebuild| 6 +-
 6 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-5.10.0.ebuild b/dev-qt/qtsql/qtsql-5.10.0.ebuild
index 0560c4a2..8b17279a 100644
--- a/dev-qt/qtsql/qtsql-5.10.0.ebuild
+++ b/dev-qt/qtsql/qtsql-5.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -33,6 +33,10 @@ QT5_TARGET_SUBDIRS=(
src/plugins/sqldrivers
 )
 
+QT5_GENTOO_PRIVATE_CONFIG=(
+   :sql
+)
+
 src_configure() {
local myconf=(
$(qt_use freetds  sql-tdsplugin)

diff --git a/dev-qt/qtsql/qtsql-5.10..ebuild 
b/dev-qt/qtsql/qtsql-5.10..ebuild
index 0560c4a2..8b17279a 100644
--- a/dev-qt/qtsql/qtsql-5.10..ebuild
+++ b/dev-qt/qtsql/qtsql-5.10..ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -33,6 +33,10 @@ QT5_TARGET_SUBDIRS=(
src/plugins/sqldrivers
 )
 
+QT5_GENTOO_PRIVATE_CONFIG=(
+   :sql
+)
+
 src_configure() {
local myconf=(
$(qt_use freetds  sql-tdsplugin)

diff --git a/dev-qt/qtsql/qtsql-5.11..ebuild 
b/dev-qt/qtsql/qtsql-5.11..ebuild
index 2b398a53..8b17279a 100644
--- a/dev-qt/qtsql/qtsql-5.11..ebuild
+++ b/dev-qt/qtsql/qtsql-5.11..ebuild
@@ -33,6 +33,10 @@ QT5_TARGET_SUBDIRS=(
src/plugins/sqldrivers
 )
 
+QT5_GENTOO_PRIVATE_CONFIG=(
+   :sql
+)
+
 src_configure() {
local myconf=(
$(qt_use freetds  sql-tdsplugin)

diff --git a/dev-qt/qtsql/qtsql-5.9.4.ebuild b/dev-qt/qtsql/qtsql-5.9.4.ebuild
index 2b398a53..8b17279a 100644
--- a/dev-qt/qtsql/qtsql-5.9.4.ebuild
+++ b/dev-qt/qtsql/qtsql-5.9.4.ebuild
@@ -33,6 +33,10 @@ QT5_TARGET_SUBDIRS=(
src/plugins/sqldrivers
 )
 
+QT5_GENTOO_PRIVATE_CONFIG=(
+   :sql
+)
+
 src_configure() {
local myconf=(
$(qt_use freetds  sql-tdsplugin)

diff --git a/dev-qt/qtsql/qtsql-5.9..ebuild 
b/dev-qt/qtsql/qtsql-5.9..ebuild
index 0560c4a2..8b17279a 100644
--- a/dev-qt/qtsql/qtsql-5.9..ebuild
+++ b/dev-qt/qtsql/qtsql-5.9..ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -33,6 +33,10 @@ QT5_TARGET_SUBDIRS=(
src/plugins/sqldrivers
 )
 
+QT5_GENTOO_PRIVATE_CONFIG=(
+   :sql
+)
+
 src_configure() {
local myconf=(
$(qt_use freetds  sql-tdsplugin)

diff --git a/dev-qt/qtsql/qtsql-5..ebuild b/dev-qt/qtsql/qtsql-5..ebuild
index 0560c4a2..8b17279a 100644
--- a/dev-qt/qtsql/qtsql-5..ebuild
+++ b/dev-qt/qtsql/qtsql-5..ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -33,6 +33,10 @@ QT5_TARGET_SUBDIRS=(
src/plugins/sqldrivers
 )
 
+QT5_GENTOO_PRIVATE_CONFIG=(
+   :sql
+)
+
 src_configure() {
local myconf=(
$(qt_use freetds  sql-tdsplugin)

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2022-03-04 Thread Andreas Sturmlechner

commit: e4d622e596b72133a4acc10fdf999ce15d440f0c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Mar  4 09:39:41 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Mar  4 09:39:41 2022 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=e4d622e5

dev-qt/qtsql: Rebased to 5.15.3 branch

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/qtsql/{qtsql-5.15.2..ebuild => qtsql-5.15.3..ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-5.15.2..ebuild 
b/dev-qt/qtsql/qtsql-5.15.3..ebuild
similarity index 100%
rename from dev-qt/qtsql/qtsql-5.15.2..ebuild
rename to dev-qt/qtsql/qtsql-5.15.3..ebuild

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2014-06-22 Thread Davide Pesavento

commit: fe124e9f8db459c77d521f1c0c2007a474d1a306
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sun Jun 22 23:40:08 2014 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sun Jun 22 23:40:08 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=fe124e9f

[dev-qt/qtsql:4] Use qt_native_use where appropriate.

Package-Manager: portage-2.2.10

---
 dev-qt/qtsql/qtsql-4.8.6.ebuild| 14 +++---
 dev-qt/qtsql/qtsql-4.8..ebuild | 14 +++---
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-4.8.6.ebuild b/dev-qt/qtsql/qtsql-4.8.6.ebuild
index c66e471..de5d65d 100644
--- a/dev-qt/qtsql/qtsql-4.8.6.ebuild
+++ b/dev-qt/qtsql/qtsql-4.8.6.ebuild
@@ -38,13 +38,13 @@ QT4_TARGET_DIRECTORIES="
 
 src_configure() {
myconf+="
-   $(qt_use firebird sql-ibase  plugin)
-   $(qt_use freetds  sql-tdsplugin)
-   $(qt_use mysqlsql-mysql  plugin) $(use mysql && echo 
"-I${EPREFIX}/usr/include/mysql -L${EPREFIX}/usr/$(get_libdir)/mysql")
-   $(qt_use oci8 sql-ociplugin) $(use oci8 && echo 
"-I${ORACLE_HOME}/include -L${ORACLE_HOME}/$(get_libdir)")
-   $(qt_use odbc sql-odbc   plugin) $(use odbc && echo 
"-I${EPREFIX}/usr/include/iodbc")
-   $(qt_use postgres sql-psql   plugin) $(use postgres && echo 
"-I${EPREFIX}/usr/include/postgresql/pgsql")
-   $(qt_use sqlite   sql-sqlite plugin) $(use sqlite && echo 
-system-sqlite)
+   $(qt_native_use firebird sql-ibase  plugin)
+   $(qt_native_use freetds  sql-tdsplugin)
+   $(qt_native_use mysqlsql-mysql  plugin) $(use mysql && 
multilib_is_native_abi && echo "-I${EPREFIX}/usr/include/mysql 
-L${EPREFIX}/usr/$(get_libdir)/mysql")
+   $(qt_useoci8 sql-ociplugin) $(use oci8 && echo 
"-I${ORACLE_HOME}/include -L${ORACLE_HOME}/$(get_libdir)")
+   $(qt_useodbc sql-odbc   plugin) $(use odbc && echo 
"-I${EPREFIX}/usr/include/iodbc")
+   $(qt_native_use postgres sql-psql   plugin) $(use postgres && 
multilib_is_native_abi && echo "-I${EPREFIX}/usr/include/postgresql/pgsql")
+   $(qt_usesqlite   sql-sqlite plugin) $(use sqlite && 
echo -system-sqlite)
-no-sql-db2
-no-sql-sqlite2
-no-sql-symsql

diff --git a/dev-qt/qtsql/qtsql-4.8..ebuild 
b/dev-qt/qtsql/qtsql-4.8..ebuild
index c66e471..de5d65d 100644
--- a/dev-qt/qtsql/qtsql-4.8..ebuild
+++ b/dev-qt/qtsql/qtsql-4.8..ebuild
@@ -38,13 +38,13 @@ QT4_TARGET_DIRECTORIES="
 
 src_configure() {
myconf+="
-   $(qt_use firebird sql-ibase  plugin)
-   $(qt_use freetds  sql-tdsplugin)
-   $(qt_use mysqlsql-mysql  plugin) $(use mysql && echo 
"-I${EPREFIX}/usr/include/mysql -L${EPREFIX}/usr/$(get_libdir)/mysql")
-   $(qt_use oci8 sql-ociplugin) $(use oci8 && echo 
"-I${ORACLE_HOME}/include -L${ORACLE_HOME}/$(get_libdir)")
-   $(qt_use odbc sql-odbc   plugin) $(use odbc && echo 
"-I${EPREFIX}/usr/include/iodbc")
-   $(qt_use postgres sql-psql   plugin) $(use postgres && echo 
"-I${EPREFIX}/usr/include/postgresql/pgsql")
-   $(qt_use sqlite   sql-sqlite plugin) $(use sqlite && echo 
-system-sqlite)
+   $(qt_native_use firebird sql-ibase  plugin)
+   $(qt_native_use freetds  sql-tdsplugin)
+   $(qt_native_use mysqlsql-mysql  plugin) $(use mysql && 
multilib_is_native_abi && echo "-I${EPREFIX}/usr/include/mysql 
-L${EPREFIX}/usr/$(get_libdir)/mysql")
+   $(qt_useoci8 sql-ociplugin) $(use oci8 && echo 
"-I${ORACLE_HOME}/include -L${ORACLE_HOME}/$(get_libdir)")
+   $(qt_useodbc sql-odbc   plugin) $(use odbc && echo 
"-I${EPREFIX}/usr/include/iodbc")
+   $(qt_native_use postgres sql-psql   plugin) $(use postgres && 
multilib_is_native_abi && echo "-I${EPREFIX}/usr/include/postgresql/pgsql")
+   $(qt_usesqlite   sql-sqlite plugin) $(use sqlite && 
echo -system-sqlite)
-no-sql-db2
-no-sql-sqlite2
-no-sql-symsql

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2014-06-23 Thread Davide Pesavento

commit: 79561754caa51a6ad6dbf5294de211b162b4f1c5
Author: Davide Pesavento  gentoo  org>
AuthorDate: Mon Jun 23 22:38:50 2014 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Mon Jun 23 22:38:50 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=79561754

[dev-qt/qtsql:4] Add MULTILIB_USEDEP to libiodbc dep too.

Package-Manager: portage-2.2.10

---
 dev-qt/qtsql/qtsql-4.8.6.ebuild| 2 +-
 dev-qt/qtsql/qtsql-4.8..ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-4.8.6.ebuild b/dev-qt/qtsql/qtsql-4.8.6.ebuild
index de5d65d..6ee8d7a 100644
--- a/dev-qt/qtsql/qtsql-4.8.6.ebuild
+++ b/dev-qt/qtsql/qtsql-4.8.6.ebuild
@@ -26,7 +26,7 @@ DEPEND="
freetds? ( dev-db/freetds )
mysql? ( virtual/mysql )
oci8? ( dev-db/oracle-instantclient-basic[${MULTILIB_USEDEP}] )
-   odbc? ( || ( dev-db/unixODBC[${MULTILIB_USEDEP}] dev-db/libiodbc ) )
+   odbc? ( || ( dev-db/unixODBC[${MULTILIB_USEDEP}] 
dev-db/libiodbc[${MULTILIB_USEDEP}] ) )
postgres? ( dev-db/postgresql-base )
sqlite? ( dev-db/sqlite:3[${MULTILIB_USEDEP}] )
 "

diff --git a/dev-qt/qtsql/qtsql-4.8..ebuild 
b/dev-qt/qtsql/qtsql-4.8..ebuild
index de5d65d..6ee8d7a 100644
--- a/dev-qt/qtsql/qtsql-4.8..ebuild
+++ b/dev-qt/qtsql/qtsql-4.8..ebuild
@@ -26,7 +26,7 @@ DEPEND="
freetds? ( dev-db/freetds )
mysql? ( virtual/mysql )
oci8? ( dev-db/oracle-instantclient-basic[${MULTILIB_USEDEP}] )
-   odbc? ( || ( dev-db/unixODBC[${MULTILIB_USEDEP}] dev-db/libiodbc ) )
+   odbc? ( || ( dev-db/unixODBC[${MULTILIB_USEDEP}] 
dev-db/libiodbc[${MULTILIB_USEDEP}] ) )
postgres? ( dev-db/postgresql-base )
sqlite? ( dev-db/sqlite:3[${MULTILIB_USEDEP}] )
 "

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2014-05-27 Thread Davide Pesavento

commit: af637d5e7a960b70feacc6f8a054cebedc34f5bf
Author: Davide Pesavento  gentoo  org>
AuthorDate: Tue May 27 22:31:29 2014 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Tue May 27 22:31:29 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=af637d5e

[dev-qt/qtsql:4] src.pro and tools.pro are not used.

Package-Manager: portage-2.2.10

---
 dev-qt/qtsql/qtsql-4.8..ebuild | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-4.8..ebuild 
b/dev-qt/qtsql/qtsql-4.8..ebuild
index e3fe7c7..05ad99c 100644
--- a/dev-qt/qtsql/qtsql-4.8..ebuild
+++ b/dev-qt/qtsql/qtsql-4.8..ebuild
@@ -40,10 +40,8 @@ QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
include/Qt
include/QtCore
include/QtSql
-   src/src.pro
src/corelib
-   src/plugins
-   src/tools/tools.pro"
+   src/plugins"
 
 src_configure() {
myconf+="

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2014-12-30 Thread Michael Palimaka

commit: 661418dfaa7785747e71bb38b7609273b694ec5e
Author: Michael Palimaka  gentoo  org>
AuthorDate: Tue Dec 30 16:42:02 2014 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Tue Dec 30 16:42:02 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=661418df

[dev-qt/qtsql] Account for postgresql package changes.

Package-Manager: portage-2.2.15

---
 dev-qt/qtsql/qtsql-4.8..ebuild | 2 +-
 dev-qt/qtsql/qtsql-5.4..ebuild | 2 +-
 dev-qt/qtsql/qtsql-5..ebuild   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-4.8..ebuild 
b/dev-qt/qtsql/qtsql-4.8..ebuild
index 3334caa..87edbe4 100644
--- a/dev-qt/qtsql/qtsql-4.8..ebuild
+++ b/dev-qt/qtsql/qtsql-4.8..ebuild
@@ -29,7 +29,7 @@ DEPEND="
>=dev-db/unixODBC-2.3.2-r2[${MULTILIB_USEDEP}]
>=dev-db/libiodbc-3.52.8-r2[${MULTILIB_USEDEP}]
) )
-   postgres? ( virtual/postgresql:* )
+   postgres? ( dev-db/postgresql:* )
sqlite? ( >=dev-db/sqlite-3.8.3:3[${MULTILIB_USEDEP}] )
 "
 RDEPEND="${DEPEND}"

diff --git a/dev-qt/qtsql/qtsql-5.4..ebuild 
b/dev-qt/qtsql/qtsql-5.4..ebuild
index 2eca5d3..8d7a320 100644
--- a/dev-qt/qtsql/qtsql-5.4..ebuild
+++ b/dev-qt/qtsql/qtsql-5.4..ebuild
@@ -28,7 +28,7 @@ DEPEND="
mysql? ( virtual/mysql:= )
oci8? ( dev-db/oracle-instantclient-basic )
odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
-   postgres? ( virtual/postgresql:* )
+   postgres? ( dev-db/postgresql:* )
sqlite? ( dev-db/sqlite:3 )
 "
 RDEPEND="${DEPEND}"

diff --git a/dev-qt/qtsql/qtsql-5..ebuild b/dev-qt/qtsql/qtsql-5..ebuild
index 2eca5d3..8d7a320 100644
--- a/dev-qt/qtsql/qtsql-5..ebuild
+++ b/dev-qt/qtsql/qtsql-5..ebuild
@@ -28,7 +28,7 @@ DEPEND="
mysql? ( virtual/mysql:= )
oci8? ( dev-db/oracle-instantclient-basic )
odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
-   postgres? ( virtual/postgresql:* )
+   postgres? ( dev-db/postgresql:* )
sqlite? ( dev-db/sqlite:3 )
 "
 RDEPEND="${DEPEND}"

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2014-12-15 Thread Davide Pesavento

commit: 6bf9a164afc731eff0e2d5ec1f4dd2198f724b5b
Author: Davide Pesavento  gentoo  org>
AuthorDate: Mon Dec 15 21:57:16 2014 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Mon Dec 15 21:57:16 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=6bf9a164

[dev-qt/qtsql:4] Sync.

Package-Manager: portage-2.2.15

---
 dev-qt/qtsql/qtsql-4.8..ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-4.8..ebuild 
b/dev-qt/qtsql/qtsql-4.8..ebuild
index 8db5317..3334caa 100644
--- a/dev-qt/qtsql/qtsql-4.8..ebuild
+++ b/dev-qt/qtsql/qtsql-4.8..ebuild
@@ -26,8 +26,8 @@ DEPEND="
mysql? ( >=virtual/mysql-5.6-r2:=[${MULTILIB_USEDEP}] )
oci8? ( 
>=dev-db/oracle-instantclient-basic-11.2.0.4[${MULTILIB_USEDEP}] )
odbc? ( || (
-   >=dev-db/unixODBC-2.3.2[${MULTILIB_USEDEP}]
-   >=dev-db/libiodbc-3.52.8[${MULTILIB_USEDEP}]
+   >=dev-db/unixODBC-2.3.2-r2[${MULTILIB_USEDEP}]
+   >=dev-db/libiodbc-3.52.8-r2[${MULTILIB_USEDEP}]
) )
postgres? ( virtual/postgresql:* )
sqlite? ( >=dev-db/sqlite-3.8.3:3[${MULTILIB_USEDEP}] )

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2015-03-25 Thread Davide Pesavento

commit: ab914bf6535bee60664f9decdf1729cc198d1546
Author: Davide Pesavento  gentoo  org>
AuthorDate: Thu Mar 26 01:41:10 2015 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Thu Mar 26 01:41:10 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=ab914bf6

[dev-qt/qtsql:5] Raise sqlite dep based on the bundled copy version.

Package-Manager: portage-2.2.18

 dev-qt/qtsql/qtsql-5.5..ebuild | 2 +-
 dev-qt/qtsql/qtsql-5..ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-5.5..ebuild 
b/dev-qt/qtsql/qtsql-5.5..ebuild
index 3061e4f..cd4d55d 100644
--- a/dev-qt/qtsql/qtsql-5.5..ebuild
+++ b/dev-qt/qtsql/qtsql-5.5..ebuild
@@ -29,7 +29,7 @@ DEPEND="
oci8? ( dev-db/oracle-instantclient-basic )
odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
postgres? ( dev-db/postgresql:* )
-   sqlite? ( dev-db/sqlite:3 )
+   sqlite? ( >=dev-db/sqlite-3.8.8.2:3 )
 "
 RDEPEND="${DEPEND}"
 

diff --git a/dev-qt/qtsql/qtsql-5..ebuild b/dev-qt/qtsql/qtsql-5..ebuild
index 3061e4f..cd4d55d 100644
--- a/dev-qt/qtsql/qtsql-5..ebuild
+++ b/dev-qt/qtsql/qtsql-5..ebuild
@@ -29,7 +29,7 @@ DEPEND="
oci8? ( dev-db/oracle-instantclient-basic )
odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
postgres? ( dev-db/postgresql:* )
-   sqlite? ( dev-db/sqlite:3 )
+   sqlite? ( >=dev-db/sqlite-3.8.8.2:3 )
 "
 RDEPEND="${DEPEND}"

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2022-06-15 Thread Andreas Sturmlechner

commit: 96638eca6a3b43ee1abd9068f1c24769efea79da
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Jun 14 17:06:52 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Jun 14 18:21:17 2022 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=96638eca

dev-qt/qtsql: Use pkgconfig to find mysql-connector-c

Patch by Debian to fix cross-compile is now part of gentoo-patchset.

Also ends the which-hunt.

Closes: https://github.com/gentoo/qt/pull/234
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/qtsql/Manifest | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev-qt/qtsql/Manifest b/dev-qt/qtsql/Manifest
new file mode 100644
index ..1e41118d
--- /dev/null
+++ b/dev-qt/qtsql/Manifest
@@ -0,0 +1 @@
+DIST qtbase-5.15-gentoo-patchset-1.tar.xz 4204 BLAKE2B 
1399eb6f4c776d370e1837351a72b604440658a3a2d1bd0c725b9ef149b09d236347f5f4b37f652c33310048a0a7df54e24453b404dc45507fd4f7c5fdf144cd
 SHA512 
c857fc746bacb047321cdb762f3c7c48ce2a0d24045a9e708edd38532568dbbc74e9e971425a72a3c2a5ca0662b3e6333831f6c1b7746525b99d46000b63111f

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2014-11-03 Thread Davide Pesavento

commit: 6e2b3777aafc562ddd6b116c74e9ed3525486b7d
Author: Davide Pesavento  gentoo  org>
AuthorDate: Mon Nov  3 14:29:20 2014 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Mon Nov  3 14:29:20 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=6e2b3777

[dev-qt/qtsql] Switch to virtual/postgresql.

Package-Manager: portage-2.2.14

---
 dev-qt/qtsql/qtsql-4.8.6.ebuild  | 2 +-
 dev-qt/qtsql/qtsql-4.8..ebuild   | 2 +-
 dev-qt/qtsql/qtsql-5.3..ebuild   | 2 +-
 dev-qt/qtsql/qtsql-5.4.0_beta.ebuild | 2 +-
 dev-qt/qtsql/qtsql-5.4..ebuild   | 2 +-
 dev-qt/qtsql/qtsql-5..ebuild | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-4.8.6.ebuild b/dev-qt/qtsql/qtsql-4.8.6.ebuild
index bbe669b..8db5317 100644
--- a/dev-qt/qtsql/qtsql-4.8.6.ebuild
+++ b/dev-qt/qtsql/qtsql-4.8.6.ebuild
@@ -29,7 +29,7 @@ DEPEND="
>=dev-db/unixODBC-2.3.2[${MULTILIB_USEDEP}]
>=dev-db/libiodbc-3.52.8[${MULTILIB_USEDEP}]
) )
-   postgres? ( dev-db/postgresql-base:* )
+   postgres? ( virtual/postgresql:* )
sqlite? ( >=dev-db/sqlite-3.8.3:3[${MULTILIB_USEDEP}] )
 "
 RDEPEND="${DEPEND}"

diff --git a/dev-qt/qtsql/qtsql-4.8..ebuild 
b/dev-qt/qtsql/qtsql-4.8..ebuild
index bbe669b..8db5317 100644
--- a/dev-qt/qtsql/qtsql-4.8..ebuild
+++ b/dev-qt/qtsql/qtsql-4.8..ebuild
@@ -29,7 +29,7 @@ DEPEND="
>=dev-db/unixODBC-2.3.2[${MULTILIB_USEDEP}]
>=dev-db/libiodbc-3.52.8[${MULTILIB_USEDEP}]
) )
-   postgres? ( dev-db/postgresql-base:* )
+   postgres? ( virtual/postgresql:* )
sqlite? ( >=dev-db/sqlite-3.8.3:3[${MULTILIB_USEDEP}] )
 "
 RDEPEND="${DEPEND}"

diff --git a/dev-qt/qtsql/qtsql-5.3..ebuild 
b/dev-qt/qtsql/qtsql-5.3..ebuild
index 979dff5..8d606dd 100644
--- a/dev-qt/qtsql/qtsql-5.3..ebuild
+++ b/dev-qt/qtsql/qtsql-5.3..ebuild
@@ -28,7 +28,7 @@ DEPEND="
mysql? ( virtual/mysql:= )
oci8? ( dev-db/oracle-instantclient-basic )
odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
-   postgres? ( dev-db/postgresql-base:* )
+   postgres? ( virtual/postgresql:* )
sqlite? ( dev-db/sqlite:3 )
 "
 RDEPEND="${DEPEND}"

diff --git a/dev-qt/qtsql/qtsql-5.4.0_beta.ebuild 
b/dev-qt/qtsql/qtsql-5.4.0_beta.ebuild
index 4acdb2e..2eca5d3 100644
--- a/dev-qt/qtsql/qtsql-5.4.0_beta.ebuild
+++ b/dev-qt/qtsql/qtsql-5.4.0_beta.ebuild
@@ -28,7 +28,7 @@ DEPEND="
mysql? ( virtual/mysql:= )
oci8? ( dev-db/oracle-instantclient-basic )
odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
-   postgres? ( dev-db/postgresql-base:* )
+   postgres? ( virtual/postgresql:* )
sqlite? ( dev-db/sqlite:3 )
 "
 RDEPEND="${DEPEND}"

diff --git a/dev-qt/qtsql/qtsql-5.4..ebuild 
b/dev-qt/qtsql/qtsql-5.4..ebuild
index 4acdb2e..2eca5d3 100644
--- a/dev-qt/qtsql/qtsql-5.4..ebuild
+++ b/dev-qt/qtsql/qtsql-5.4..ebuild
@@ -28,7 +28,7 @@ DEPEND="
mysql? ( virtual/mysql:= )
oci8? ( dev-db/oracle-instantclient-basic )
odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
-   postgres? ( dev-db/postgresql-base:* )
+   postgres? ( virtual/postgresql:* )
sqlite? ( dev-db/sqlite:3 )
 "
 RDEPEND="${DEPEND}"

diff --git a/dev-qt/qtsql/qtsql-5..ebuild b/dev-qt/qtsql/qtsql-5..ebuild
index 4acdb2e..2eca5d3 100644
--- a/dev-qt/qtsql/qtsql-5..ebuild
+++ b/dev-qt/qtsql/qtsql-5..ebuild
@@ -28,7 +28,7 @@ DEPEND="
mysql? ( virtual/mysql:= )
oci8? ( dev-db/oracle-instantclient-basic )
odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
-   postgres? ( dev-db/postgresql-base:* )
+   postgres? ( virtual/postgresql:* )
sqlite? ( dev-db/sqlite:3 )
 "
 RDEPEND="${DEPEND}"

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2016-06-12 Thread Davide Pesavento

commit: 2ae8c074355e103f83ef99b68d5c44b68719f601
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sun Jun 12 23:48:52 2016 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Mon Jun 13 00:11:06 2016 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=2ae8c074

dev-qt/qtsql: convert to usex

Package-Manager: portage-2.3.0_rc1

 dev-qt/qtsql/qtsql-5.6.1.ebuild| 2 +-
 dev-qt/qtsql/qtsql-5.6..ebuild | 2 +-
 dev-qt/qtsql/qtsql-5.7.0_rc.ebuild | 2 +-
 dev-qt/qtsql/qtsql-5.7..ebuild | 2 +-
 dev-qt/qtsql/qtsql-5..ebuild   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-5.6.1.ebuild b/dev-qt/qtsql/qtsql-5.6.1.ebuild
index 426b32e..016251f 100644
--- a/dev-qt/qtsql/qtsql-5.6.1.ebuild
+++ b/dev-qt/qtsql/qtsql-5.6.1.ebuild
@@ -42,7 +42,7 @@ src_configure() {
$(qt_use odbc sql-odbc   plugin)
$(qt_use postgres sql-psql   plugin)
$(qt_use sqlite   sql-sqlite plugin)
-   $(use sqlite && echo -system-sqlite)
+   $(usex sqlite -system-sqlite '')
)
 
use mysql && myconf+=("-I${EPREFIX}/usr/include/mysql" 
"-L${EPREFIX}/usr/$(get_libdir)/mysql")

diff --git a/dev-qt/qtsql/qtsql-5.6..ebuild 
b/dev-qt/qtsql/qtsql-5.6..ebuild
index 426b32e..016251f 100644
--- a/dev-qt/qtsql/qtsql-5.6..ebuild
+++ b/dev-qt/qtsql/qtsql-5.6..ebuild
@@ -42,7 +42,7 @@ src_configure() {
$(qt_use odbc sql-odbc   plugin)
$(qt_use postgres sql-psql   plugin)
$(qt_use sqlite   sql-sqlite plugin)
-   $(use sqlite && echo -system-sqlite)
+   $(usex sqlite -system-sqlite '')
)
 
use mysql && myconf+=("-I${EPREFIX}/usr/include/mysql" 
"-L${EPREFIX}/usr/$(get_libdir)/mysql")

diff --git a/dev-qt/qtsql/qtsql-5.7.0_rc.ebuild 
b/dev-qt/qtsql/qtsql-5.7.0_rc.ebuild
index 426b32e..016251f 100644
--- a/dev-qt/qtsql/qtsql-5.7.0_rc.ebuild
+++ b/dev-qt/qtsql/qtsql-5.7.0_rc.ebuild
@@ -42,7 +42,7 @@ src_configure() {
$(qt_use odbc sql-odbc   plugin)
$(qt_use postgres sql-psql   plugin)
$(qt_use sqlite   sql-sqlite plugin)
-   $(use sqlite && echo -system-sqlite)
+   $(usex sqlite -system-sqlite '')
)
 
use mysql && myconf+=("-I${EPREFIX}/usr/include/mysql" 
"-L${EPREFIX}/usr/$(get_libdir)/mysql")

diff --git a/dev-qt/qtsql/qtsql-5.7..ebuild 
b/dev-qt/qtsql/qtsql-5.7..ebuild
index 426b32e..016251f 100644
--- a/dev-qt/qtsql/qtsql-5.7..ebuild
+++ b/dev-qt/qtsql/qtsql-5.7..ebuild
@@ -42,7 +42,7 @@ src_configure() {
$(qt_use odbc sql-odbc   plugin)
$(qt_use postgres sql-psql   plugin)
$(qt_use sqlite   sql-sqlite plugin)
-   $(use sqlite && echo -system-sqlite)
+   $(usex sqlite -system-sqlite '')
)
 
use mysql && myconf+=("-I${EPREFIX}/usr/include/mysql" 
"-L${EPREFIX}/usr/$(get_libdir)/mysql")

diff --git a/dev-qt/qtsql/qtsql-5..ebuild b/dev-qt/qtsql/qtsql-5..ebuild
index 426b32e..016251f 100644
--- a/dev-qt/qtsql/qtsql-5..ebuild
+++ b/dev-qt/qtsql/qtsql-5..ebuild
@@ -42,7 +42,7 @@ src_configure() {
$(qt_use odbc sql-odbc   plugin)
$(qt_use postgres sql-psql   plugin)
$(qt_use sqlite   sql-sqlite plugin)
-   $(use sqlite && echo -system-sqlite)
+   $(usex sqlite -system-sqlite '')
)
 
use mysql && myconf+=("-I${EPREFIX}/usr/include/mysql" 
"-L${EPREFIX}/usr/$(get_libdir)/mysql")

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2016-05-31 Thread Davide Pesavento

commit: fa53034cf989fdb7e00b4234747df64720aa4363
Author: Davide Pesavento  gentoo  org>
AuthorDate: Tue May 31 22:37:46 2016 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Tue May 31 22:37:46 2016 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=fa53034c

dev-qt/qtsql: drop unused inherit multilib

Package-Manager: portage-2.3.0_rc1

 dev-qt/qtsql/qtsql-5.6..ebuild   | 2 +-
 dev-qt/qtsql/qtsql-5.7.0_beta.ebuild | 2 +-
 dev-qt/qtsql/qtsql-5.7..ebuild   | 2 +-
 dev-qt/qtsql/qtsql-5..ebuild | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-5.6..ebuild 
b/dev-qt/qtsql/qtsql-5.6..ebuild
index 69b981e..426b32e 100644
--- a/dev-qt/qtsql/qtsql-5.6..ebuild
+++ b/dev-qt/qtsql/qtsql-5.6..ebuild
@@ -4,7 +4,7 @@
 
 EAPI=6
 QT5_MODULE="qtbase"
-inherit multilib qt5-build
+inherit qt5-build
 
 DESCRIPTION="SQL abstraction library for the Qt5 tooolkit"
 

diff --git a/dev-qt/qtsql/qtsql-5.7.0_beta.ebuild 
b/dev-qt/qtsql/qtsql-5.7.0_beta.ebuild
index 69b981e..426b32e 100644
--- a/dev-qt/qtsql/qtsql-5.7.0_beta.ebuild
+++ b/dev-qt/qtsql/qtsql-5.7.0_beta.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=6
 QT5_MODULE="qtbase"
-inherit multilib qt5-build
+inherit qt5-build
 
 DESCRIPTION="SQL abstraction library for the Qt5 tooolkit"
 

diff --git a/dev-qt/qtsql/qtsql-5.7..ebuild 
b/dev-qt/qtsql/qtsql-5.7..ebuild
index 69b981e..426b32e 100644
--- a/dev-qt/qtsql/qtsql-5.7..ebuild
+++ b/dev-qt/qtsql/qtsql-5.7..ebuild
@@ -4,7 +4,7 @@
 
 EAPI=6
 QT5_MODULE="qtbase"
-inherit multilib qt5-build
+inherit qt5-build
 
 DESCRIPTION="SQL abstraction library for the Qt5 tooolkit"
 

diff --git a/dev-qt/qtsql/qtsql-5..ebuild b/dev-qt/qtsql/qtsql-5..ebuild
index 69b981e..426b32e 100644
--- a/dev-qt/qtsql/qtsql-5..ebuild
+++ b/dev-qt/qtsql/qtsql-5..ebuild
@@ -4,7 +4,7 @@
 
 EAPI=6
 QT5_MODULE="qtbase"
-inherit multilib qt5-build
+inherit qt5-build
 
 DESCRIPTION="SQL abstraction library for the Qt5 tooolkit"

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2015-12-03 Thread Davide Pesavento

commit: 2f0365278f103c8c64b7acdf5a0c7bf295808795
Author: Davide Pesavento  gentoo  org>
AuthorDate: Thu Dec  3 16:40:43 2015 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Thu Dec  3 16:40:43 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=2f036527

dev-qt/qtsql: raise sqlite dep to match bundled copy version

Package-Manager: portage-2.2.26

 dev-qt/qtsql/qtsql-5.6..ebuild | 2 +-
 dev-qt/qtsql/qtsql-5..ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-5.6..ebuild 
b/dev-qt/qtsql/qtsql-5.6..ebuild
index a01c4e7..2839078 100644
--- a/dev-qt/qtsql/qtsql-5.6..ebuild
+++ b/dev-qt/qtsql/qtsql-5.6..ebuild
@@ -25,7 +25,7 @@ DEPEND="
oci8? ( dev-db/oracle-instantclient-basic )
odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
postgres? ( dev-db/postgresql:* )
-   sqlite? ( >=dev-db/sqlite-3.8.8.2:3 )
+   sqlite? ( >=dev-db/sqlite-3.8.10.2:3 )
 "
 RDEPEND="${DEPEND}"
 

diff --git a/dev-qt/qtsql/qtsql-5..ebuild b/dev-qt/qtsql/qtsql-5..ebuild
index a01c4e7..2839078 100644
--- a/dev-qt/qtsql/qtsql-5..ebuild
+++ b/dev-qt/qtsql/qtsql-5..ebuild
@@ -25,7 +25,7 @@ DEPEND="
oci8? ( dev-db/oracle-instantclient-basic )
odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
postgres? ( dev-db/postgresql:* )
-   sqlite? ( >=dev-db/sqlite-3.8.8.2:3 )
+   sqlite? ( >=dev-db/sqlite-3.8.10.2:3 )
 "
 RDEPEND="${DEPEND}"

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2015-07-29 Thread Davide Pesavento

commit: 29facc1c5ae5108c8fbe4a53dd573a8a2c6ecfea
Author: Davide Pesavento  gentoo  org>
AuthorDate: Wed Jul 29 14:34:01 2015 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Wed Jul 29 14:34:01 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=29facc1c

[dev-qt/qtsql] Switch to virtual/libmysqlclient.

Package-Manager: portage-2.2.20

 dev-qt/qtsql/qtsql-4.8..ebuild | 2 +-
 dev-qt/qtsql/qtsql-5.5.0.ebuild| 2 +-
 dev-qt/qtsql/qtsql-5.5..ebuild | 2 +-
 dev-qt/qtsql/qtsql-5..ebuild   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-4.8..ebuild 
b/dev-qt/qtsql/qtsql-4.8..ebuild
index c3a7bf0..93e7e19 100644
--- a/dev-qt/qtsql/qtsql-4.8..ebuild
+++ b/dev-qt/qtsql/qtsql-4.8..ebuild
@@ -20,7 +20,7 @@ REQUIRED_USE="
 DEPEND="
~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
freetds? ( dev-db/freetds )
-   mysql? ( >=virtual/mysql-5.6-r2:=[${MULTILIB_USEDEP}] )
+   mysql? ( virtual/libmysqlclient:=[${MULTILIB_USEDEP}] )
oci8? ( 
>=dev-db/oracle-instantclient-basic-11.2.0.4[${MULTILIB_USEDEP}] )
odbc? ( || (
>=dev-db/unixODBC-2.3.2-r2[${MULTILIB_USEDEP}]

diff --git a/dev-qt/qtsql/qtsql-5.5.0.ebuild b/dev-qt/qtsql/qtsql-5.5.0.ebuild
index 42efef7..aca1154 100644
--- a/dev-qt/qtsql/qtsql-5.5.0.ebuild
+++ b/dev-qt/qtsql/qtsql-5.5.0.ebuild
@@ -21,7 +21,7 @@ REQUIRED_USE="
 DEPEND="
~dev-qt/qtcore-${PV}
freetds? ( dev-db/freetds )
-   mysql? ( virtual/mysql:= )
+   mysql? ( virtual/libmysqlclient:= )
oci8? ( dev-db/oracle-instantclient-basic )
odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
postgres? ( dev-db/postgresql:* )

diff --git a/dev-qt/qtsql/qtsql-5.5..ebuild 
b/dev-qt/qtsql/qtsql-5.5..ebuild
index 42efef7..aca1154 100644
--- a/dev-qt/qtsql/qtsql-5.5..ebuild
+++ b/dev-qt/qtsql/qtsql-5.5..ebuild
@@ -21,7 +21,7 @@ REQUIRED_USE="
 DEPEND="
~dev-qt/qtcore-${PV}
freetds? ( dev-db/freetds )
-   mysql? ( virtual/mysql:= )
+   mysql? ( virtual/libmysqlclient:= )
oci8? ( dev-db/oracle-instantclient-basic )
odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
postgres? ( dev-db/postgresql:* )

diff --git a/dev-qt/qtsql/qtsql-5..ebuild b/dev-qt/qtsql/qtsql-5..ebuild
index 42efef7..aca1154 100644
--- a/dev-qt/qtsql/qtsql-5..ebuild
+++ b/dev-qt/qtsql/qtsql-5..ebuild
@@ -21,7 +21,7 @@ REQUIRED_USE="
 DEPEND="
~dev-qt/qtcore-${PV}
freetds? ( dev-db/freetds )
-   mysql? ( virtual/mysql:= )
+   mysql? ( virtual/libmysqlclient:= )
oci8? ( dev-db/oracle-instantclient-basic )
odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
postgres? ( dev-db/postgresql:* )

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2018-07-21 Thread Davide Pesavento

commit: 12b2494645a034d98355b0e319ac3097c49467ce
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sat Jul 21 18:20:17 2018 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sat Jul 21 18:20:17 2018 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=12b24946

dev-qt/qtsql: sync with gentoo repo

Package-Manager: Portage-2.3.43, Repoman-2.3.10

 dev-qt/qtsql/qtsql-5.11..ebuild | 1 +
 dev-qt/qtsql/qtsql-5.9..ebuild  | 1 +
 dev-qt/qtsql/qtsql-5..ebuild| 1 +
 3 files changed, 3 insertions(+)

diff --git a/dev-qt/qtsql/qtsql-5.11..ebuild 
b/dev-qt/qtsql/qtsql-5.11..ebuild
index db29e42d..40fde45f 100644
--- a/dev-qt/qtsql/qtsql-5.11..ebuild
+++ b/dev-qt/qtsql/qtsql-5.11..ebuild
@@ -6,6 +6,7 @@ QT5_MODULE="qtbase"
 inherit qt5-build
 
 DESCRIPTION="SQL abstraction library for the Qt5 framework"
+SLOT=5/$(ver_cut 1-3) # bug 639140
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd"

diff --git a/dev-qt/qtsql/qtsql-5.9..ebuild 
b/dev-qt/qtsql/qtsql-5.9..ebuild
index ae735814..325786e3 100644
--- a/dev-qt/qtsql/qtsql-5.9..ebuild
+++ b/dev-qt/qtsql/qtsql-5.9..ebuild
@@ -6,6 +6,7 @@ QT5_MODULE="qtbase"
 inherit qt5-build
 
 DESCRIPTION="SQL abstraction library for the Qt5 framework"
+SLOT=5/$(ver_cut 1-3) # bug 639140
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd"

diff --git a/dev-qt/qtsql/qtsql-5..ebuild b/dev-qt/qtsql/qtsql-5..ebuild
index db29e42d..40fde45f 100644
--- a/dev-qt/qtsql/qtsql-5..ebuild
+++ b/dev-qt/qtsql/qtsql-5..ebuild
@@ -6,6 +6,7 @@ QT5_MODULE="qtbase"
 inherit qt5-build
 
 DESCRIPTION="SQL abstraction library for the Qt5 framework"
+SLOT=5/$(ver_cut 1-3) # bug 639140
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd"

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2022-05-14 Thread Andreas Sturmlechner

commit: 7463d34d7ae8fb2c2ed71e32108e679c96313301
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat May 14 21:08:26 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat May 14 21:14:20 2022 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=7463d34d

dev-qt/qtsql: Rebased to 5.15.4 branch

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/qtsql/{qtsql-5.15.3..ebuild => qtsql-5.15.4..ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qtsql/qtsql-5.15.3..ebuild 
b/dev-qt/qtsql/qtsql-5.15.4..ebuild
similarity index 97%
rename from dev-qt/qtsql/qtsql-5.15.3..ebuild
rename to dev-qt/qtsql/qtsql-5.15.4..ebuild
index 0a3163e6..0620d299 100644
--- a/dev-qt/qtsql/qtsql-5.15.3..ebuild
+++ b/dev-qt/qtsql/qtsql-5.15.4..ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2022-06-15 Thread Andreas Sturmlechner

commit: 96638eca6a3b43ee1abd9068f1c24769efea79da
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Jun 14 17:06:52 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Jun 14 18:21:17 2022 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=96638eca

dev-qt/qtsql: Use pkgconfig to find mysql-connector-c

Patch by Debian to fix cross-compile is now part of gentoo-patchset.

Also ends the which-hunt.

Closes: https://github.com/gentoo/qt/pull/234
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/qtsql/Manifest | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev-qt/qtsql/Manifest b/dev-qt/qtsql/Manifest
new file mode 100644
index ..1e41118d
--- /dev/null
+++ b/dev-qt/qtsql/Manifest
@@ -0,0 +1 @@
+DIST qtbase-5.15-gentoo-patchset-1.tar.xz 4204 BLAKE2B 
1399eb6f4c776d370e1837351a72b604440658a3a2d1bd0c725b9ef149b09d236347f5f4b37f652c33310048a0a7df54e24453b404dc45507fd4f7c5fdf144cd
 SHA512 
c857fc746bacb047321cdb762f3c7c48ce2a0d24045a9e708edd38532568dbbc74e9e971425a72a3c2a5ca0662b3e6333831f6c1b7746525b99d46000b63111f

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2022-03-04 Thread Andreas Sturmlechner

commit: e4d622e596b72133a4acc10fdf999ce15d440f0c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Mar  4 09:39:41 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Mar  4 09:39:41 2022 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=e4d622e5

dev-qt/qtsql: Rebased to 5.15.3 branch

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/qtsql/{qtsql-5.15.2..ebuild => qtsql-5.15.3..ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-5.15.2..ebuild 
b/dev-qt/qtsql/qtsql-5.15.3..ebuild
similarity index 100%
rename from dev-qt/qtsql/qtsql-5.15.2..ebuild
rename to dev-qt/qtsql/qtsql-5.15.3..ebuild

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2021-08-20 Thread Andreas Sturmlechner

commit: fa58c981a4d5fe22935e20852567a7e53403493d
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Aug 19 18:38:03 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Aug 20 12:34:09 2021 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=fa58c981

dev-qt/qtsql: EAPI-8 bump

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/qtsql/qtsql-5.15..ebuild | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-5.15..ebuild 
b/dev-qt/qtsql/qtsql-5.15..ebuild
index a68df2c8..203d656f 100644
--- a/dev-qt/qtsql/qtsql-5.15..ebuild
+++ b/dev-qt/qtsql/qtsql-5.15..ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 QT5_MODULE="qtbase"
 inherit qt5-build
@@ -14,7 +14,6 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
 fi
 
 IUSE="freetds mysql oci8 odbc postgres +sqlite"
-
 REQUIRED_USE="
|| ( freetds mysql oci8 odbc postgres sqlite )
 "
@@ -47,7 +46,7 @@ src_configure() {
$(qt_use odbc sql-odbc   plugin)
$(qt_use postgres sql-psql   plugin)
$(qt_use sqlite   sql-sqlite plugin)
-   $(usex sqlite -system-sqlite '')
+   $(usev sqlite -system-sqlite)
)
 
use oci8 && myconf+=("-I${ORACLE_HOME}/include" 
"-L${ORACLE_HOME}/$(get_libdir)")

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2021-08-20 Thread Andreas Sturmlechner

commit: fa58c981a4d5fe22935e20852567a7e53403493d
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Aug 19 18:38:03 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Aug 20 12:34:09 2021 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=fa58c981

dev-qt/qtsql: EAPI-8 bump

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/qtsql/qtsql-5.15..ebuild | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-5.15..ebuild 
b/dev-qt/qtsql/qtsql-5.15..ebuild
index a68df2c8..203d656f 100644
--- a/dev-qt/qtsql/qtsql-5.15..ebuild
+++ b/dev-qt/qtsql/qtsql-5.15..ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 QT5_MODULE="qtbase"
 inherit qt5-build
@@ -14,7 +14,6 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
 fi
 
 IUSE="freetds mysql oci8 odbc postgres +sqlite"
-
 REQUIRED_USE="
|| ( freetds mysql oci8 odbc postgres sqlite )
 "
@@ -47,7 +46,7 @@ src_configure() {
$(qt_use odbc sql-odbc   plugin)
$(qt_use postgres sql-psql   plugin)
$(qt_use sqlite   sql-sqlite plugin)
-   $(usex sqlite -system-sqlite '')
+   $(usev sqlite -system-sqlite)
)
 
use oci8 && myconf+=("-I${ORACLE_HOME}/include" 
"-L${ORACLE_HOME}/$(get_libdir)")

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2022-09-08 Thread Andreas Sturmlechner

commit: 329abd7714f92996a62a6995262cefddd1967914
Author: WANG Xuerui  gentoo  org>
AuthorDate: Tue Jun 28 04:17:46 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Sep  8 09:28:59 2022 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=329abd77

dev-qt/qtsql: keyword 5.15.5 for ~loong

Signed-off-by: WANG Xuerui  gentoo.org>
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/qtsql/qtsql-5.15.5..ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qtsql/qtsql-5.15.5..ebuild 
b/dev-qt/qtsql/qtsql-5.15.5..ebuild
index 0620d299..9ff37dd5 100644
--- a/dev-qt/qtsql/qtsql-5.15.5..ebuild
+++ b/dev-qt/qtsql/qtsql-5.15.5..ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="SQL abstraction library for the Qt5 framework"
 SLOT=5/${QT5_PV} # bug 639140
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc 
~x86"
 fi
 
 IUSE="freetds mysql oci8 odbc postgres +sqlite"

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2022-05-14 Thread Andreas Sturmlechner

commit: 7463d34d7ae8fb2c2ed71e32108e679c96313301
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat May 14 21:08:26 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat May 14 21:14:20 2022 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=7463d34d

dev-qt/qtsql: Rebased to 5.15.4 branch

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/qtsql/{qtsql-5.15.3..ebuild => qtsql-5.15.4..ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qtsql/qtsql-5.15.3..ebuild 
b/dev-qt/qtsql/qtsql-5.15.4..ebuild
similarity index 97%
rename from dev-qt/qtsql/qtsql-5.15.3..ebuild
rename to dev-qt/qtsql/qtsql-5.15.4..ebuild
index 0a3163e6..0620d299 100644
--- a/dev-qt/qtsql/qtsql-5.15.3..ebuild
+++ b/dev-qt/qtsql/qtsql-5.15.4..ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2018-02-02 Thread Michael Palimaka

commit: a14de820c4cadb41d8311d0d934454fcffa304ea
Author: Michael Palimaka  gentoo  org>
AuthorDate: Fri Jan 26 06:47:34 2018 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Fri Feb  2 11:53:56 2018 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=a14de820

dev-qt/qtsql: add QT5_GENTOO_PRIVATE_CONFIG

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 dev-qt/qtsql/qtsql-5.10.0.ebuild| 6 +-
 dev-qt/qtsql/qtsql-5.10..ebuild | 6 +-
 dev-qt/qtsql/qtsql-5.11..ebuild | 4 
 dev-qt/qtsql/qtsql-5.9.4.ebuild | 4 
 dev-qt/qtsql/qtsql-5.9..ebuild  | 6 +-
 dev-qt/qtsql/qtsql-5..ebuild| 6 +-
 6 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-5.10.0.ebuild b/dev-qt/qtsql/qtsql-5.10.0.ebuild
index 0560c4a2..8b17279a 100644
--- a/dev-qt/qtsql/qtsql-5.10.0.ebuild
+++ b/dev-qt/qtsql/qtsql-5.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -33,6 +33,10 @@ QT5_TARGET_SUBDIRS=(
src/plugins/sqldrivers
 )
 
+QT5_GENTOO_PRIVATE_CONFIG=(
+   :sql
+)
+
 src_configure() {
local myconf=(
$(qt_use freetds  sql-tdsplugin)

diff --git a/dev-qt/qtsql/qtsql-5.10..ebuild 
b/dev-qt/qtsql/qtsql-5.10..ebuild
index 0560c4a2..8b17279a 100644
--- a/dev-qt/qtsql/qtsql-5.10..ebuild
+++ b/dev-qt/qtsql/qtsql-5.10..ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -33,6 +33,10 @@ QT5_TARGET_SUBDIRS=(
src/plugins/sqldrivers
 )
 
+QT5_GENTOO_PRIVATE_CONFIG=(
+   :sql
+)
+
 src_configure() {
local myconf=(
$(qt_use freetds  sql-tdsplugin)

diff --git a/dev-qt/qtsql/qtsql-5.11..ebuild 
b/dev-qt/qtsql/qtsql-5.11..ebuild
index 2b398a53..8b17279a 100644
--- a/dev-qt/qtsql/qtsql-5.11..ebuild
+++ b/dev-qt/qtsql/qtsql-5.11..ebuild
@@ -33,6 +33,10 @@ QT5_TARGET_SUBDIRS=(
src/plugins/sqldrivers
 )
 
+QT5_GENTOO_PRIVATE_CONFIG=(
+   :sql
+)
+
 src_configure() {
local myconf=(
$(qt_use freetds  sql-tdsplugin)

diff --git a/dev-qt/qtsql/qtsql-5.9.4.ebuild b/dev-qt/qtsql/qtsql-5.9.4.ebuild
index 2b398a53..8b17279a 100644
--- a/dev-qt/qtsql/qtsql-5.9.4.ebuild
+++ b/dev-qt/qtsql/qtsql-5.9.4.ebuild
@@ -33,6 +33,10 @@ QT5_TARGET_SUBDIRS=(
src/plugins/sqldrivers
 )
 
+QT5_GENTOO_PRIVATE_CONFIG=(
+   :sql
+)
+
 src_configure() {
local myconf=(
$(qt_use freetds  sql-tdsplugin)

diff --git a/dev-qt/qtsql/qtsql-5.9..ebuild 
b/dev-qt/qtsql/qtsql-5.9..ebuild
index 0560c4a2..8b17279a 100644
--- a/dev-qt/qtsql/qtsql-5.9..ebuild
+++ b/dev-qt/qtsql/qtsql-5.9..ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -33,6 +33,10 @@ QT5_TARGET_SUBDIRS=(
src/plugins/sqldrivers
 )
 
+QT5_GENTOO_PRIVATE_CONFIG=(
+   :sql
+)
+
 src_configure() {
local myconf=(
$(qt_use freetds  sql-tdsplugin)

diff --git a/dev-qt/qtsql/qtsql-5..ebuild b/dev-qt/qtsql/qtsql-5..ebuild
index 0560c4a2..8b17279a 100644
--- a/dev-qt/qtsql/qtsql-5..ebuild
+++ b/dev-qt/qtsql/qtsql-5..ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -33,6 +33,10 @@ QT5_TARGET_SUBDIRS=(
src/plugins/sqldrivers
 )
 
+QT5_GENTOO_PRIVATE_CONFIG=(
+   :sql
+)
+
 src_configure() {
local myconf=(
$(qt_use freetds  sql-tdsplugin)

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2018-02-22 Thread Andreas Sturmlechner

commit: e6c56e5f15410af81f4b789b2a532a8abda0569c
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Thu Feb 22 10:11:29 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Feb 22 22:14:14 2018 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=e6c56e5f

dev-qt/qtsql: Drop 5.10.1 (r0)

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 dev-qt/qtsql/qtsql-5.10.1.ebuild | 57 
 1 file changed, 57 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-5.10.1.ebuild b/dev-qt/qtsql/qtsql-5.10.1.ebuild
deleted file mode 100644
index 8b17279a..
--- a/dev-qt/qtsql/qtsql-5.10.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="SQL abstraction library for the Qt5 tooolkit"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-fi
-
-IUSE="freetds mysql oci8 odbc postgres +sqlite"
-
-REQUIRED_USE="
-   || ( freetds mysql oci8 odbc postgres sqlite )
-"
-
-DEPEND="
-   ~dev-qt/qtcore-${PV}
-   freetds? ( dev-db/freetds )
-   mysql? ( virtual/libmysqlclient:= )
-   oci8? ( dev-db/oracle-instantclient-basic )
-   odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
-   postgres? ( dev-db/postgresql:* )
-   sqlite? ( >=dev-db/sqlite-3.8.10.2:3 )
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-   src/sql
-   src/plugins/sqldrivers
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-   :sql
-)
-
-src_configure() {
-   local myconf=(
-   $(qt_use freetds  sql-tdsplugin)
-   $(qt_use mysqlsql-mysql  plugin)
-   $(qt_use oci8 sql-ociplugin)
-   $(qt_use odbc sql-odbc   plugin)
-   $(qt_use postgres sql-psql   plugin)
-   $(qt_use sqlite   sql-sqlite plugin)
-   $(usex sqlite -system-sqlite '')
-   )
-
-   use mysql && myconf+=("-I${EPREFIX}/usr/include/mysql" 
"-L${EPREFIX}/usr/$(get_libdir)/mysql")
-   use oci8 && myconf+=("-I${ORACLE_HOME}/include" 
"-L${ORACLE_HOME}/$(get_libdir)")
-   use odbc && myconf+=("-I${EPREFIX}/usr/include/iodbc")
-   use postgres && myconf+=("-I${EPREFIX}/usr/include/postgresql/pgsql")
-
-   qt5-build_src_configure
-}

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2018-02-22 Thread Andreas Sturmlechner

commit: b00f1b5c451dacea8caf919ee63696f593f17e9b
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Thu Feb 22 19:35:13 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Feb 22 22:14:14 2018 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=b00f1b5c

dev-qt/qtsql: Fix description

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 dev-qt/qtsql/qtsql-5.10.1-r1.ebuild| 2 +-
 dev-qt/qtsql/qtsql-5.11.0_alpha.ebuild | 2 +-
 dev-qt/qtsql/qtsql-5.11..ebuild| 2 +-
 dev-qt/qtsql/qtsql-5.9..ebuild | 2 +-
 dev-qt/qtsql/qtsql-5..ebuild   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-5.10.1-r1.ebuild 
b/dev-qt/qtsql/qtsql-5.10.1-r1.ebuild
index 7765a7bb..f6e32554 100644
--- a/dev-qt/qtsql/qtsql-5.10.1-r1.ebuild
+++ b/dev-qt/qtsql/qtsql-5.10.1-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 QT5_MODULE="qtbase"
 inherit qt5-build
 
-DESCRIPTION="SQL abstraction library for the Qt5 tooolkit"
+DESCRIPTION="SQL abstraction library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"

diff --git a/dev-qt/qtsql/qtsql-5.11.0_alpha.ebuild 
b/dev-qt/qtsql/qtsql-5.11.0_alpha.ebuild
index 7765a7bb..f6e32554 100644
--- a/dev-qt/qtsql/qtsql-5.11.0_alpha.ebuild
+++ b/dev-qt/qtsql/qtsql-5.11.0_alpha.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 QT5_MODULE="qtbase"
 inherit qt5-build
 
-DESCRIPTION="SQL abstraction library for the Qt5 tooolkit"
+DESCRIPTION="SQL abstraction library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"

diff --git a/dev-qt/qtsql/qtsql-5.11..ebuild 
b/dev-qt/qtsql/qtsql-5.11..ebuild
index 7765a7bb..f6e32554 100644
--- a/dev-qt/qtsql/qtsql-5.11..ebuild
+++ b/dev-qt/qtsql/qtsql-5.11..ebuild
@@ -5,7 +5,7 @@ EAPI=6
 QT5_MODULE="qtbase"
 inherit qt5-build
 
-DESCRIPTION="SQL abstraction library for the Qt5 tooolkit"
+DESCRIPTION="SQL abstraction library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"

diff --git a/dev-qt/qtsql/qtsql-5.9..ebuild 
b/dev-qt/qtsql/qtsql-5.9..ebuild
index 7765a7bb..f6e32554 100644
--- a/dev-qt/qtsql/qtsql-5.9..ebuild
+++ b/dev-qt/qtsql/qtsql-5.9..ebuild
@@ -5,7 +5,7 @@ EAPI=6
 QT5_MODULE="qtbase"
 inherit qt5-build
 
-DESCRIPTION="SQL abstraction library for the Qt5 tooolkit"
+DESCRIPTION="SQL abstraction library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"

diff --git a/dev-qt/qtsql/qtsql-5..ebuild b/dev-qt/qtsql/qtsql-5..ebuild
index 7765a7bb..f6e32554 100644
--- a/dev-qt/qtsql/qtsql-5..ebuild
+++ b/dev-qt/qtsql/qtsql-5..ebuild
@@ -5,7 +5,7 @@ EAPI=6
 QT5_MODULE="qtbase"
 inherit qt5-build
 
-DESCRIPTION="SQL abstraction library for the Qt5 tooolkit"
+DESCRIPTION="SQL abstraction library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2021-08-20 Thread Andreas Sturmlechner

commit: fa58c981a4d5fe22935e20852567a7e53403493d
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Aug 19 18:38:03 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Aug 20 12:34:09 2021 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=fa58c981

dev-qt/qtsql: EAPI-8 bump

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/qtsql/qtsql-5.15..ebuild | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-5.15..ebuild 
b/dev-qt/qtsql/qtsql-5.15..ebuild
index a68df2c8..203d656f 100644
--- a/dev-qt/qtsql/qtsql-5.15..ebuild
+++ b/dev-qt/qtsql/qtsql-5.15..ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 QT5_MODULE="qtbase"
 inherit qt5-build
@@ -14,7 +14,6 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
 fi
 
 IUSE="freetds mysql oci8 odbc postgres +sqlite"
-
 REQUIRED_USE="
|| ( freetds mysql oci8 odbc postgres sqlite )
 "
@@ -47,7 +46,7 @@ src_configure() {
$(qt_use odbc sql-odbc   plugin)
$(qt_use postgres sql-psql   plugin)
$(qt_use sqlite   sql-sqlite plugin)
-   $(usex sqlite -system-sqlite '')
+   $(usev sqlite -system-sqlite)
)
 
use oci8 && myconf+=("-I${ORACLE_HOME}/include" 
"-L${ORACLE_HOME}/$(get_libdir)")

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2022-03-04 Thread Andreas Sturmlechner

commit: e4d622e596b72133a4acc10fdf999ce15d440f0c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Mar  4 09:39:41 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Mar  4 09:39:41 2022 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=e4d622e5

dev-qt/qtsql: Rebased to 5.15.3 branch

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/qtsql/{qtsql-5.15.2..ebuild => qtsql-5.15.3..ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-5.15.2..ebuild 
b/dev-qt/qtsql/qtsql-5.15.3..ebuild
similarity index 100%
rename from dev-qt/qtsql/qtsql-5.15.2..ebuild
rename to dev-qt/qtsql/qtsql-5.15.3..ebuild

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2015-12-03 Thread Davide Pesavento

commit: 2f0365278f103c8c64b7acdf5a0c7bf295808795
Author: Davide Pesavento  gentoo  org>
AuthorDate: Thu Dec  3 16:40:43 2015 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Thu Dec  3 16:40:43 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=2f036527

dev-qt/qtsql: raise sqlite dep to match bundled copy version

Package-Manager: portage-2.2.26

 dev-qt/qtsql/qtsql-5.6..ebuild | 2 +-
 dev-qt/qtsql/qtsql-5..ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-5.6..ebuild 
b/dev-qt/qtsql/qtsql-5.6..ebuild
index a01c4e7..2839078 100644
--- a/dev-qt/qtsql/qtsql-5.6..ebuild
+++ b/dev-qt/qtsql/qtsql-5.6..ebuild
@@ -25,7 +25,7 @@ DEPEND="
oci8? ( dev-db/oracle-instantclient-basic )
odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
postgres? ( dev-db/postgresql:* )
-   sqlite? ( >=dev-db/sqlite-3.8.8.2:3 )
+   sqlite? ( >=dev-db/sqlite-3.8.10.2:3 )
 "
 RDEPEND="${DEPEND}"
 

diff --git a/dev-qt/qtsql/qtsql-5..ebuild b/dev-qt/qtsql/qtsql-5..ebuild
index a01c4e7..2839078 100644
--- a/dev-qt/qtsql/qtsql-5..ebuild
+++ b/dev-qt/qtsql/qtsql-5..ebuild
@@ -25,7 +25,7 @@ DEPEND="
oci8? ( dev-db/oracle-instantclient-basic )
odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
postgres? ( dev-db/postgresql:* )
-   sqlite? ( >=dev-db/sqlite-3.8.8.2:3 )
+   sqlite? ( >=dev-db/sqlite-3.8.10.2:3 )
 "
 RDEPEND="${DEPEND}"

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2018-04-11 Thread Jimi Huotari

commit: 76d56567a6897296ff4003f33ca93ddf5b41358e
Author: Jimi Huotari  gentoo  org>
AuthorDate: Wed Apr 11 12:19:28 2018 +
Commit: Jimi Huotari  gentoo  org>
CommitDate: Wed Apr 11 12:20:54 2018 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=76d56567

dev-qt/qtsql: remove upstreamed MariaDB patch from 5.11.

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 dev-qt/qtsql/qtsql-5.11..ebuild | 5 -
 1 file changed, 5 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-5.11..ebuild 
b/dev-qt/qtsql/qtsql-5.11..ebuild
index ae735814..db29e42d 100644
--- a/dev-qt/qtsql/qtsql-5.11..ebuild
+++ b/dev-qt/qtsql/qtsql-5.11..ebuild
@@ -28,11 +28,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=(
-   "${FILESDIR}/${PN}-5.9.5-mariadb-10.2.patch"
-   # See also: https://codereview.qt-project.org/#/c/206850/
-)
-
 QT5_TARGET_SUBDIRS=(
src/sql
src/plugins/sqldrivers

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2018-04-11 Thread Jimi Huotari

commit: ab940d09e3920194961368e5e52c9bf715222d60
Author: Jimi Huotari  gentoo  org>
AuthorDate: Wed Apr 11 14:56:37 2018 +
Commit: Jimi Huotari  gentoo  org>
CommitDate: Wed Apr 11 14:56:37 2018 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=ab940d09

dev-qt/qtsql: remove upstreamed MariaDB patch from 5.

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 dev-qt/qtsql/qtsql-5..ebuild | 5 -
 1 file changed, 5 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-5..ebuild b/dev-qt/qtsql/qtsql-5..ebuild
index ae735814..db29e42d 100644
--- a/dev-qt/qtsql/qtsql-5..ebuild
+++ b/dev-qt/qtsql/qtsql-5..ebuild
@@ -28,11 +28,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=(
-   "${FILESDIR}/${PN}-5.9.5-mariadb-10.2.patch"
-   # See also: https://codereview.qt-project.org/#/c/206850/
-)
-
 QT5_TARGET_SUBDIRS=(
src/sql
src/plugins/sqldrivers

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2019-01-07 Thread Davide Pesavento

commit: 176f0fbf1ff794f7770c9725aced16025579368a
Author: Davide Pesavento  gentoo  org>
AuthorDate: Tue Jan  8 01:28:33 2019 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Tue Jan  8 01:28:33 2019 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=176f0fbf

dev-qt/qtsql: switch to dev-db/oracle-instantclient

Bug: https://bugs.gentoo.org/669274
Package-Manager: Portage-2.3.53, Repoman-2.3.12
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qtsql/qtsql-5.12.0.ebuild| 2 +-
 dev-qt/qtsql/qtsql-5.12..ebuild | 2 +-
 dev-qt/qtsql/qtsql-5..ebuild| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-5.12.0.ebuild b/dev-qt/qtsql/qtsql-5.12.0.ebuild
index e46b3da3..92ce286d 100644
--- a/dev-qt/qtsql/qtsql-5.12.0.ebuild
+++ b/dev-qt/qtsql/qtsql-5.12.0.ebuild
@@ -22,7 +22,7 @@ DEPEND="
~dev-qt/qtcore-${PV}
freetds? ( dev-db/freetds )
mysql? ( dev-db/mysql-connector-c:= )
-   oci8? ( dev-db/oracle-instantclient-basic )
+   oci8? ( dev-db/oracle-instantclient:=[sdk] )
odbc? ( dev-db/unixODBC )
postgres? ( dev-db/postgresql:* )
sqlite? ( dev-db/sqlite:3 )

diff --git a/dev-qt/qtsql/qtsql-5.12..ebuild 
b/dev-qt/qtsql/qtsql-5.12..ebuild
index e46b3da3..92ce286d 100644
--- a/dev-qt/qtsql/qtsql-5.12..ebuild
+++ b/dev-qt/qtsql/qtsql-5.12..ebuild
@@ -22,7 +22,7 @@ DEPEND="
~dev-qt/qtcore-${PV}
freetds? ( dev-db/freetds )
mysql? ( dev-db/mysql-connector-c:= )
-   oci8? ( dev-db/oracle-instantclient-basic )
+   oci8? ( dev-db/oracle-instantclient:=[sdk] )
odbc? ( dev-db/unixODBC )
postgres? ( dev-db/postgresql:* )
sqlite? ( dev-db/sqlite:3 )

diff --git a/dev-qt/qtsql/qtsql-5..ebuild b/dev-qt/qtsql/qtsql-5..ebuild
index e46b3da3..92ce286d 100644
--- a/dev-qt/qtsql/qtsql-5..ebuild
+++ b/dev-qt/qtsql/qtsql-5..ebuild
@@ -22,7 +22,7 @@ DEPEND="
~dev-qt/qtcore-${PV}
freetds? ( dev-db/freetds )
mysql? ( dev-db/mysql-connector-c:= )
-   oci8? ( dev-db/oracle-instantclient-basic )
+   oci8? ( dev-db/oracle-instantclient:=[sdk] )
odbc? ( dev-db/unixODBC )
postgres? ( dev-db/postgresql:* )
sqlite? ( dev-db/sqlite:3 )

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2019-01-07 Thread Davide Pesavento

commit: 2dabddfc4d3bcc8d6b73c1d0bd19d469356b655e
Author: Davide Pesavento  gentoo  org>
AuthorDate: Tue Jan  8 00:15:39 2019 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Tue Jan  8 00:15:39 2019 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=2dabddfc

dev-qt/qtsql: stop using deprecated virtual

Package-Manager: Portage-2.3.53, Repoman-2.3.12
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qtsql/qtsql-5.12.0.ebuild| 3 +--
 dev-qt/qtsql/qtsql-5.12..ebuild | 3 +--
 dev-qt/qtsql/qtsql-5..ebuild| 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-5.12.0.ebuild b/dev-qt/qtsql/qtsql-5.12.0.ebuild
index d5f86389..ba13844c 100644
--- a/dev-qt/qtsql/qtsql-5.12.0.ebuild
+++ b/dev-qt/qtsql/qtsql-5.12.0.ebuild
@@ -21,7 +21,7 @@ REQUIRED_USE="
 DEPEND="
~dev-qt/qtcore-${PV}
freetds? ( dev-db/freetds )
-   mysql? ( virtual/libmysqlclient:= )
+   mysql? ( dev-db/mysql-connector-c:= )
oci8? ( dev-db/oracle-instantclient-basic )
odbc? ( dev-db/unixODBC )
postgres? ( dev-db/postgresql:* )
@@ -49,7 +49,6 @@ src_configure() {
$(usex sqlite -system-sqlite '')
)
 
-   use mysql && myconf+=("-I${EPREFIX}/usr/include/mysql" 
"-L${EPREFIX}/usr/$(get_libdir)/mysql")
use oci8 && myconf+=("-I${ORACLE_HOME}/include" 
"-L${ORACLE_HOME}/$(get_libdir)")
use postgres && myconf+=("-I${EPREFIX}/usr/include/postgresql/pgsql")
 

diff --git a/dev-qt/qtsql/qtsql-5.12..ebuild 
b/dev-qt/qtsql/qtsql-5.12..ebuild
index d5f86389..ba13844c 100644
--- a/dev-qt/qtsql/qtsql-5.12..ebuild
+++ b/dev-qt/qtsql/qtsql-5.12..ebuild
@@ -21,7 +21,7 @@ REQUIRED_USE="
 DEPEND="
~dev-qt/qtcore-${PV}
freetds? ( dev-db/freetds )
-   mysql? ( virtual/libmysqlclient:= )
+   mysql? ( dev-db/mysql-connector-c:= )
oci8? ( dev-db/oracle-instantclient-basic )
odbc? ( dev-db/unixODBC )
postgres? ( dev-db/postgresql:* )
@@ -49,7 +49,6 @@ src_configure() {
$(usex sqlite -system-sqlite '')
)
 
-   use mysql && myconf+=("-I${EPREFIX}/usr/include/mysql" 
"-L${EPREFIX}/usr/$(get_libdir)/mysql")
use oci8 && myconf+=("-I${ORACLE_HOME}/include" 
"-L${ORACLE_HOME}/$(get_libdir)")
use postgres && myconf+=("-I${EPREFIX}/usr/include/postgresql/pgsql")
 

diff --git a/dev-qt/qtsql/qtsql-5..ebuild b/dev-qt/qtsql/qtsql-5..ebuild
index d5f86389..ba13844c 100644
--- a/dev-qt/qtsql/qtsql-5..ebuild
+++ b/dev-qt/qtsql/qtsql-5..ebuild
@@ -21,7 +21,7 @@ REQUIRED_USE="
 DEPEND="
~dev-qt/qtcore-${PV}
freetds? ( dev-db/freetds )
-   mysql? ( virtual/libmysqlclient:= )
+   mysql? ( dev-db/mysql-connector-c:= )
oci8? ( dev-db/oracle-instantclient-basic )
odbc? ( dev-db/unixODBC )
postgres? ( dev-db/postgresql:* )
@@ -49,7 +49,6 @@ src_configure() {
$(usex sqlite -system-sqlite '')
)
 
-   use mysql && myconf+=("-I${EPREFIX}/usr/include/mysql" 
"-L${EPREFIX}/usr/$(get_libdir)/mysql")
use oci8 && myconf+=("-I${ORACLE_HOME}/include" 
"-L${ORACLE_HOME}/$(get_libdir)")
use postgres && myconf+=("-I${EPREFIX}/usr/include/postgresql/pgsql")

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2019-01-07 Thread Davide Pesavento

commit: 5ecb95fc789370b10bcee04ba4b3fdccd2fad189
Author: Davide Pesavento  gentoo  org>
AuthorDate: Tue Jan  8 00:48:02 2019 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Tue Jan  8 00:48:02 2019 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=5ecb95fc

dev-qt/qtsql: upstream learned to use pkg-config

Package-Manager: Portage-2.3.53, Repoman-2.3.12
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qtsql/qtsql-5.12.0.ebuild| 1 -
 dev-qt/qtsql/qtsql-5.12..ebuild | 1 -
 dev-qt/qtsql/qtsql-5..ebuild| 1 -
 3 files changed, 3 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-5.12.0.ebuild b/dev-qt/qtsql/qtsql-5.12.0.ebuild
index ba13844c..e46b3da3 100644
--- a/dev-qt/qtsql/qtsql-5.12.0.ebuild
+++ b/dev-qt/qtsql/qtsql-5.12.0.ebuild
@@ -50,7 +50,6 @@ src_configure() {
)
 
use oci8 && myconf+=("-I${ORACLE_HOME}/include" 
"-L${ORACLE_HOME}/$(get_libdir)")
-   use postgres && myconf+=("-I${EPREFIX}/usr/include/postgresql/pgsql")
 
qt5-build_src_configure
 }

diff --git a/dev-qt/qtsql/qtsql-5.12..ebuild 
b/dev-qt/qtsql/qtsql-5.12..ebuild
index ba13844c..e46b3da3 100644
--- a/dev-qt/qtsql/qtsql-5.12..ebuild
+++ b/dev-qt/qtsql/qtsql-5.12..ebuild
@@ -50,7 +50,6 @@ src_configure() {
)
 
use oci8 && myconf+=("-I${ORACLE_HOME}/include" 
"-L${ORACLE_HOME}/$(get_libdir)")
-   use postgres && myconf+=("-I${EPREFIX}/usr/include/postgresql/pgsql")
 
qt5-build_src_configure
 }

diff --git a/dev-qt/qtsql/qtsql-5..ebuild b/dev-qt/qtsql/qtsql-5..ebuild
index ba13844c..e46b3da3 100644
--- a/dev-qt/qtsql/qtsql-5..ebuild
+++ b/dev-qt/qtsql/qtsql-5..ebuild
@@ -50,7 +50,6 @@ src_configure() {
)
 
use oci8 && myconf+=("-I${ORACLE_HOME}/include" 
"-L${ORACLE_HOME}/$(get_libdir)")
-   use postgres && myconf+=("-I${EPREFIX}/usr/include/postgresql/pgsql")
 
qt5-build_src_configure
 }

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2019-01-07 Thread Davide Pesavento

commit: f11c40750fff879e9c8269303c678f72c9863414
Author: Davide Pesavento  gentoo  org>
AuthorDate: Mon Jan  7 23:57:06 2019 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Mon Jan  7 23:57:06 2019 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=f11c4075

dev-qt/qtsql: apparently upstream doesn't support libiodbc anymore

The configure test fails to detect it. Probably easy to fix, but
I doubt anyone cares, given that it's been broken since 5.8.0 and
no one complained.

Package-Manager: Portage-2.3.53, Repoman-2.3.12
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qtsql/qtsql-5.12.0.ebuild| 7 +++
 dev-qt/qtsql/qtsql-5.12..ebuild | 7 +++
 dev-qt/qtsql/qtsql-5..ebuild| 7 +++
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-5.12.0.ebuild b/dev-qt/qtsql/qtsql-5.12.0.ebuild
index 09b2d085..d5f86389 100644
--- a/dev-qt/qtsql/qtsql-5.12.0.ebuild
+++ b/dev-qt/qtsql/qtsql-5.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,9 +23,9 @@ DEPEND="
freetds? ( dev-db/freetds )
mysql? ( virtual/libmysqlclient:= )
oci8? ( dev-db/oracle-instantclient-basic )
-   odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
+   odbc? ( dev-db/unixODBC )
postgres? ( dev-db/postgresql:* )
-   sqlite? ( >=dev-db/sqlite-3.8.10.2:3 )
+   sqlite? ( dev-db/sqlite:3 )
 "
 RDEPEND="${DEPEND}"
 
@@ -51,7 +51,6 @@ src_configure() {
 
use mysql && myconf+=("-I${EPREFIX}/usr/include/mysql" 
"-L${EPREFIX}/usr/$(get_libdir)/mysql")
use oci8 && myconf+=("-I${ORACLE_HOME}/include" 
"-L${ORACLE_HOME}/$(get_libdir)")
-   use odbc && myconf+=("-I${EPREFIX}/usr/include/iodbc")
use postgres && myconf+=("-I${EPREFIX}/usr/include/postgresql/pgsql")
 
qt5-build_src_configure

diff --git a/dev-qt/qtsql/qtsql-5.12..ebuild 
b/dev-qt/qtsql/qtsql-5.12..ebuild
index 2ce2c9a9..d5f86389 100644
--- a/dev-qt/qtsql/qtsql-5.12..ebuild
+++ b/dev-qt/qtsql/qtsql-5.12..ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,9 +23,9 @@ DEPEND="
freetds? ( dev-db/freetds )
mysql? ( virtual/libmysqlclient:= )
oci8? ( dev-db/oracle-instantclient-basic )
-   odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
+   odbc? ( dev-db/unixODBC )
postgres? ( dev-db/postgresql:* )
-   sqlite? ( >=dev-db/sqlite-3.8.10.2:3 )
+   sqlite? ( dev-db/sqlite:3 )
 "
 RDEPEND="${DEPEND}"
 
@@ -51,7 +51,6 @@ src_configure() {
 
use mysql && myconf+=("-I${EPREFIX}/usr/include/mysql" 
"-L${EPREFIX}/usr/$(get_libdir)/mysql")
use oci8 && myconf+=("-I${ORACLE_HOME}/include" 
"-L${ORACLE_HOME}/$(get_libdir)")
-   use odbc && myconf+=("-I${EPREFIX}/usr/include/iodbc")
use postgres && myconf+=("-I${EPREFIX}/usr/include/postgresql/pgsql")
 
qt5-build_src_configure

diff --git a/dev-qt/qtsql/qtsql-5..ebuild b/dev-qt/qtsql/qtsql-5..ebuild
index 2ce2c9a9..d5f86389 100644
--- a/dev-qt/qtsql/qtsql-5..ebuild
+++ b/dev-qt/qtsql/qtsql-5..ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,9 +23,9 @@ DEPEND="
freetds? ( dev-db/freetds )
mysql? ( virtual/libmysqlclient:= )
oci8? ( dev-db/oracle-instantclient-basic )
-   odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
+   odbc? ( dev-db/unixODBC )
postgres? ( dev-db/postgresql:* )
-   sqlite? ( >=dev-db/sqlite-3.8.10.2:3 )
+   sqlite? ( dev-db/sqlite:3 )
 "
 RDEPEND="${DEPEND}"
 
@@ -51,7 +51,6 @@ src_configure() {
 
use mysql && myconf+=("-I${EPREFIX}/usr/include/mysql" 
"-L${EPREFIX}/usr/$(get_libdir)/mysql")
use oci8 && myconf+=("-I${ORACLE_HOME}/include" 
"-L${ORACLE_HOME}/$(get_libdir)")
-   use odbc && myconf+=("-I${EPREFIX}/usr/include/iodbc")
use postgres && myconf+=("-I${EPREFIX}/usr/include/postgresql/pgsql")
 
qt5-build_src_configure

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2022-09-08 Thread Andreas Sturmlechner

commit: 329abd7714f92996a62a6995262cefddd1967914
Author: WANG Xuerui  gentoo  org>
AuthorDate: Tue Jun 28 04:17:46 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Sep  8 09:28:59 2022 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=329abd77

dev-qt/qtsql: keyword 5.15.5 for ~loong

Signed-off-by: WANG Xuerui  gentoo.org>
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/qtsql/qtsql-5.15.5..ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qtsql/qtsql-5.15.5..ebuild 
b/dev-qt/qtsql/qtsql-5.15.5..ebuild
index 0620d299..9ff37dd5 100644
--- a/dev-qt/qtsql/qtsql-5.15.5..ebuild
+++ b/dev-qt/qtsql/qtsql-5.15.5..ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="SQL abstraction library for the Qt5 framework"
 SLOT=5/${QT5_PV} # bug 639140
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc 
~x86"
 fi
 
 IUSE="freetds mysql oci8 odbc postgres +sqlite"

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2018-07-21 Thread Davide Pesavento

commit: 12b2494645a034d98355b0e319ac3097c49467ce
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sat Jul 21 18:20:17 2018 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sat Jul 21 18:20:17 2018 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=12b24946

dev-qt/qtsql: sync with gentoo repo

Package-Manager: Portage-2.3.43, Repoman-2.3.10

 dev-qt/qtsql/qtsql-5.11..ebuild | 1 +
 dev-qt/qtsql/qtsql-5.9..ebuild  | 1 +
 dev-qt/qtsql/qtsql-5..ebuild| 1 +
 3 files changed, 3 insertions(+)

diff --git a/dev-qt/qtsql/qtsql-5.11..ebuild 
b/dev-qt/qtsql/qtsql-5.11..ebuild
index db29e42d..40fde45f 100644
--- a/dev-qt/qtsql/qtsql-5.11..ebuild
+++ b/dev-qt/qtsql/qtsql-5.11..ebuild
@@ -6,6 +6,7 @@ QT5_MODULE="qtbase"
 inherit qt5-build
 
 DESCRIPTION="SQL abstraction library for the Qt5 framework"
+SLOT=5/$(ver_cut 1-3) # bug 639140
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd"

diff --git a/dev-qt/qtsql/qtsql-5.9..ebuild 
b/dev-qt/qtsql/qtsql-5.9..ebuild
index ae735814..325786e3 100644
--- a/dev-qt/qtsql/qtsql-5.9..ebuild
+++ b/dev-qt/qtsql/qtsql-5.9..ebuild
@@ -6,6 +6,7 @@ QT5_MODULE="qtbase"
 inherit qt5-build
 
 DESCRIPTION="SQL abstraction library for the Qt5 framework"
+SLOT=5/$(ver_cut 1-3) # bug 639140
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd"

diff --git a/dev-qt/qtsql/qtsql-5..ebuild b/dev-qt/qtsql/qtsql-5..ebuild
index db29e42d..40fde45f 100644
--- a/dev-qt/qtsql/qtsql-5..ebuild
+++ b/dev-qt/qtsql/qtsql-5..ebuild
@@ -6,6 +6,7 @@ QT5_MODULE="qtbase"
 inherit qt5-build
 
 DESCRIPTION="SQL abstraction library for the Qt5 framework"
+SLOT=5/$(ver_cut 1-3) # bug 639140
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd"

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2018-04-11 Thread Jimi Huotari

commit: 76d56567a6897296ff4003f33ca93ddf5b41358e
Author: Jimi Huotari  gentoo  org>
AuthorDate: Wed Apr 11 12:19:28 2018 +
Commit: Jimi Huotari  gentoo  org>
CommitDate: Wed Apr 11 12:20:54 2018 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=76d56567

dev-qt/qtsql: remove upstreamed MariaDB patch from 5.11.

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 dev-qt/qtsql/qtsql-5.11..ebuild | 5 -
 1 file changed, 5 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-5.11..ebuild 
b/dev-qt/qtsql/qtsql-5.11..ebuild
index ae735814..db29e42d 100644
--- a/dev-qt/qtsql/qtsql-5.11..ebuild
+++ b/dev-qt/qtsql/qtsql-5.11..ebuild
@@ -28,11 +28,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=(
-   "${FILESDIR}/${PN}-5.9.5-mariadb-10.2.patch"
-   # See also: https://codereview.qt-project.org/#/c/206850/
-)
-
 QT5_TARGET_SUBDIRS=(
src/sql
src/plugins/sqldrivers

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2018-04-11 Thread Jimi Huotari

commit: ab940d09e3920194961368e5e52c9bf715222d60
Author: Jimi Huotari  gentoo  org>
AuthorDate: Wed Apr 11 14:56:37 2018 +
Commit: Jimi Huotari  gentoo  org>
CommitDate: Wed Apr 11 14:56:37 2018 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=ab940d09

dev-qt/qtsql: remove upstreamed MariaDB patch from 5.

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 dev-qt/qtsql/qtsql-5..ebuild | 5 -
 1 file changed, 5 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-5..ebuild b/dev-qt/qtsql/qtsql-5..ebuild
index ae735814..db29e42d 100644
--- a/dev-qt/qtsql/qtsql-5..ebuild
+++ b/dev-qt/qtsql/qtsql-5..ebuild
@@ -28,11 +28,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=(
-   "${FILESDIR}/${PN}-5.9.5-mariadb-10.2.patch"
-   # See also: https://codereview.qt-project.org/#/c/206850/
-)
-
 QT5_TARGET_SUBDIRS=(
src/sql
src/plugins/sqldrivers

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2016-06-12 Thread Davide Pesavento

commit: 2ae8c074355e103f83ef99b68d5c44b68719f601
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sun Jun 12 23:48:52 2016 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Mon Jun 13 00:11:06 2016 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=2ae8c074

dev-qt/qtsql: convert to usex

Package-Manager: portage-2.3.0_rc1

 dev-qt/qtsql/qtsql-5.6.1.ebuild| 2 +-
 dev-qt/qtsql/qtsql-5.6..ebuild | 2 +-
 dev-qt/qtsql/qtsql-5.7.0_rc.ebuild | 2 +-
 dev-qt/qtsql/qtsql-5.7..ebuild | 2 +-
 dev-qt/qtsql/qtsql-5..ebuild   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-5.6.1.ebuild b/dev-qt/qtsql/qtsql-5.6.1.ebuild
index 426b32e..016251f 100644
--- a/dev-qt/qtsql/qtsql-5.6.1.ebuild
+++ b/dev-qt/qtsql/qtsql-5.6.1.ebuild
@@ -42,7 +42,7 @@ src_configure() {
$(qt_use odbc sql-odbc   plugin)
$(qt_use postgres sql-psql   plugin)
$(qt_use sqlite   sql-sqlite plugin)
-   $(use sqlite && echo -system-sqlite)
+   $(usex sqlite -system-sqlite '')
)
 
use mysql && myconf+=("-I${EPREFIX}/usr/include/mysql" 
"-L${EPREFIX}/usr/$(get_libdir)/mysql")

diff --git a/dev-qt/qtsql/qtsql-5.6..ebuild 
b/dev-qt/qtsql/qtsql-5.6..ebuild
index 426b32e..016251f 100644
--- a/dev-qt/qtsql/qtsql-5.6..ebuild
+++ b/dev-qt/qtsql/qtsql-5.6..ebuild
@@ -42,7 +42,7 @@ src_configure() {
$(qt_use odbc sql-odbc   plugin)
$(qt_use postgres sql-psql   plugin)
$(qt_use sqlite   sql-sqlite plugin)
-   $(use sqlite && echo -system-sqlite)
+   $(usex sqlite -system-sqlite '')
)
 
use mysql && myconf+=("-I${EPREFIX}/usr/include/mysql" 
"-L${EPREFIX}/usr/$(get_libdir)/mysql")

diff --git a/dev-qt/qtsql/qtsql-5.7.0_rc.ebuild 
b/dev-qt/qtsql/qtsql-5.7.0_rc.ebuild
index 426b32e..016251f 100644
--- a/dev-qt/qtsql/qtsql-5.7.0_rc.ebuild
+++ b/dev-qt/qtsql/qtsql-5.7.0_rc.ebuild
@@ -42,7 +42,7 @@ src_configure() {
$(qt_use odbc sql-odbc   plugin)
$(qt_use postgres sql-psql   plugin)
$(qt_use sqlite   sql-sqlite plugin)
-   $(use sqlite && echo -system-sqlite)
+   $(usex sqlite -system-sqlite '')
)
 
use mysql && myconf+=("-I${EPREFIX}/usr/include/mysql" 
"-L${EPREFIX}/usr/$(get_libdir)/mysql")

diff --git a/dev-qt/qtsql/qtsql-5.7..ebuild 
b/dev-qt/qtsql/qtsql-5.7..ebuild
index 426b32e..016251f 100644
--- a/dev-qt/qtsql/qtsql-5.7..ebuild
+++ b/dev-qt/qtsql/qtsql-5.7..ebuild
@@ -42,7 +42,7 @@ src_configure() {
$(qt_use odbc sql-odbc   plugin)
$(qt_use postgres sql-psql   plugin)
$(qt_use sqlite   sql-sqlite plugin)
-   $(use sqlite && echo -system-sqlite)
+   $(usex sqlite -system-sqlite '')
)
 
use mysql && myconf+=("-I${EPREFIX}/usr/include/mysql" 
"-L${EPREFIX}/usr/$(get_libdir)/mysql")

diff --git a/dev-qt/qtsql/qtsql-5..ebuild b/dev-qt/qtsql/qtsql-5..ebuild
index 426b32e..016251f 100644
--- a/dev-qt/qtsql/qtsql-5..ebuild
+++ b/dev-qt/qtsql/qtsql-5..ebuild
@@ -42,7 +42,7 @@ src_configure() {
$(qt_use odbc sql-odbc   plugin)
$(qt_use postgres sql-psql   plugin)
$(qt_use sqlite   sql-sqlite plugin)
-   $(use sqlite && echo -system-sqlite)
+   $(usex sqlite -system-sqlite '')
)
 
use mysql && myconf+=("-I${EPREFIX}/usr/include/mysql" 
"-L${EPREFIX}/usr/$(get_libdir)/mysql")

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2018-02-02 Thread Michael Palimaka

commit: a14de820c4cadb41d8311d0d934454fcffa304ea
Author: Michael Palimaka  gentoo  org>
AuthorDate: Fri Jan 26 06:47:34 2018 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Fri Feb  2 11:53:56 2018 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=a14de820

dev-qt/qtsql: add QT5_GENTOO_PRIVATE_CONFIG

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 dev-qt/qtsql/qtsql-5.10.0.ebuild| 6 +-
 dev-qt/qtsql/qtsql-5.10..ebuild | 6 +-
 dev-qt/qtsql/qtsql-5.11..ebuild | 4 
 dev-qt/qtsql/qtsql-5.9.4.ebuild | 4 
 dev-qt/qtsql/qtsql-5.9..ebuild  | 6 +-
 dev-qt/qtsql/qtsql-5..ebuild| 6 +-
 6 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-5.10.0.ebuild b/dev-qt/qtsql/qtsql-5.10.0.ebuild
index 0560c4a2..8b17279a 100644
--- a/dev-qt/qtsql/qtsql-5.10.0.ebuild
+++ b/dev-qt/qtsql/qtsql-5.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -33,6 +33,10 @@ QT5_TARGET_SUBDIRS=(
src/plugins/sqldrivers
 )
 
+QT5_GENTOO_PRIVATE_CONFIG=(
+   :sql
+)
+
 src_configure() {
local myconf=(
$(qt_use freetds  sql-tdsplugin)

diff --git a/dev-qt/qtsql/qtsql-5.10..ebuild 
b/dev-qt/qtsql/qtsql-5.10..ebuild
index 0560c4a2..8b17279a 100644
--- a/dev-qt/qtsql/qtsql-5.10..ebuild
+++ b/dev-qt/qtsql/qtsql-5.10..ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -33,6 +33,10 @@ QT5_TARGET_SUBDIRS=(
src/plugins/sqldrivers
 )
 
+QT5_GENTOO_PRIVATE_CONFIG=(
+   :sql
+)
+
 src_configure() {
local myconf=(
$(qt_use freetds  sql-tdsplugin)

diff --git a/dev-qt/qtsql/qtsql-5.11..ebuild 
b/dev-qt/qtsql/qtsql-5.11..ebuild
index 2b398a53..8b17279a 100644
--- a/dev-qt/qtsql/qtsql-5.11..ebuild
+++ b/dev-qt/qtsql/qtsql-5.11..ebuild
@@ -33,6 +33,10 @@ QT5_TARGET_SUBDIRS=(
src/plugins/sqldrivers
 )
 
+QT5_GENTOO_PRIVATE_CONFIG=(
+   :sql
+)
+
 src_configure() {
local myconf=(
$(qt_use freetds  sql-tdsplugin)

diff --git a/dev-qt/qtsql/qtsql-5.9.4.ebuild b/dev-qt/qtsql/qtsql-5.9.4.ebuild
index 2b398a53..8b17279a 100644
--- a/dev-qt/qtsql/qtsql-5.9.4.ebuild
+++ b/dev-qt/qtsql/qtsql-5.9.4.ebuild
@@ -33,6 +33,10 @@ QT5_TARGET_SUBDIRS=(
src/plugins/sqldrivers
 )
 
+QT5_GENTOO_PRIVATE_CONFIG=(
+   :sql
+)
+
 src_configure() {
local myconf=(
$(qt_use freetds  sql-tdsplugin)

diff --git a/dev-qt/qtsql/qtsql-5.9..ebuild 
b/dev-qt/qtsql/qtsql-5.9..ebuild
index 0560c4a2..8b17279a 100644
--- a/dev-qt/qtsql/qtsql-5.9..ebuild
+++ b/dev-qt/qtsql/qtsql-5.9..ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -33,6 +33,10 @@ QT5_TARGET_SUBDIRS=(
src/plugins/sqldrivers
 )
 
+QT5_GENTOO_PRIVATE_CONFIG=(
+   :sql
+)
+
 src_configure() {
local myconf=(
$(qt_use freetds  sql-tdsplugin)

diff --git a/dev-qt/qtsql/qtsql-5..ebuild b/dev-qt/qtsql/qtsql-5..ebuild
index 0560c4a2..8b17279a 100644
--- a/dev-qt/qtsql/qtsql-5..ebuild
+++ b/dev-qt/qtsql/qtsql-5..ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -33,6 +33,10 @@ QT5_TARGET_SUBDIRS=(
src/plugins/sqldrivers
 )
 
+QT5_GENTOO_PRIVATE_CONFIG=(
+   :sql
+)
+
 src_configure() {
local myconf=(
$(qt_use freetds  sql-tdsplugin)

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2018-02-22 Thread Andreas Sturmlechner

commit: e6c56e5f15410af81f4b789b2a532a8abda0569c
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Thu Feb 22 10:11:29 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Feb 22 22:14:14 2018 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=e6c56e5f

dev-qt/qtsql: Drop 5.10.1 (r0)

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 dev-qt/qtsql/qtsql-5.10.1.ebuild | 57 
 1 file changed, 57 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-5.10.1.ebuild b/dev-qt/qtsql/qtsql-5.10.1.ebuild
deleted file mode 100644
index 8b17279a..
--- a/dev-qt/qtsql/qtsql-5.10.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="SQL abstraction library for the Qt5 tooolkit"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-fi
-
-IUSE="freetds mysql oci8 odbc postgres +sqlite"
-
-REQUIRED_USE="
-   || ( freetds mysql oci8 odbc postgres sqlite )
-"
-
-DEPEND="
-   ~dev-qt/qtcore-${PV}
-   freetds? ( dev-db/freetds )
-   mysql? ( virtual/libmysqlclient:= )
-   oci8? ( dev-db/oracle-instantclient-basic )
-   odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
-   postgres? ( dev-db/postgresql:* )
-   sqlite? ( >=dev-db/sqlite-3.8.10.2:3 )
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-   src/sql
-   src/plugins/sqldrivers
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-   :sql
-)
-
-src_configure() {
-   local myconf=(
-   $(qt_use freetds  sql-tdsplugin)
-   $(qt_use mysqlsql-mysql  plugin)
-   $(qt_use oci8 sql-ociplugin)
-   $(qt_use odbc sql-odbc   plugin)
-   $(qt_use postgres sql-psql   plugin)
-   $(qt_use sqlite   sql-sqlite plugin)
-   $(usex sqlite -system-sqlite '')
-   )
-
-   use mysql && myconf+=("-I${EPREFIX}/usr/include/mysql" 
"-L${EPREFIX}/usr/$(get_libdir)/mysql")
-   use oci8 && myconf+=("-I${ORACLE_HOME}/include" 
"-L${ORACLE_HOME}/$(get_libdir)")
-   use odbc && myconf+=("-I${EPREFIX}/usr/include/iodbc")
-   use postgres && myconf+=("-I${EPREFIX}/usr/include/postgresql/pgsql")
-
-   qt5-build_src_configure
-}

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2018-02-22 Thread Andreas Sturmlechner

commit: b00f1b5c451dacea8caf919ee63696f593f17e9b
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Thu Feb 22 19:35:13 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Feb 22 22:14:14 2018 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=b00f1b5c

dev-qt/qtsql: Fix description

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 dev-qt/qtsql/qtsql-5.10.1-r1.ebuild| 2 +-
 dev-qt/qtsql/qtsql-5.11.0_alpha.ebuild | 2 +-
 dev-qt/qtsql/qtsql-5.11..ebuild| 2 +-
 dev-qt/qtsql/qtsql-5.9..ebuild | 2 +-
 dev-qt/qtsql/qtsql-5..ebuild   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-5.10.1-r1.ebuild 
b/dev-qt/qtsql/qtsql-5.10.1-r1.ebuild
index 7765a7bb..f6e32554 100644
--- a/dev-qt/qtsql/qtsql-5.10.1-r1.ebuild
+++ b/dev-qt/qtsql/qtsql-5.10.1-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 QT5_MODULE="qtbase"
 inherit qt5-build
 
-DESCRIPTION="SQL abstraction library for the Qt5 tooolkit"
+DESCRIPTION="SQL abstraction library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"

diff --git a/dev-qt/qtsql/qtsql-5.11.0_alpha.ebuild 
b/dev-qt/qtsql/qtsql-5.11.0_alpha.ebuild
index 7765a7bb..f6e32554 100644
--- a/dev-qt/qtsql/qtsql-5.11.0_alpha.ebuild
+++ b/dev-qt/qtsql/qtsql-5.11.0_alpha.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 QT5_MODULE="qtbase"
 inherit qt5-build
 
-DESCRIPTION="SQL abstraction library for the Qt5 tooolkit"
+DESCRIPTION="SQL abstraction library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"

diff --git a/dev-qt/qtsql/qtsql-5.11..ebuild 
b/dev-qt/qtsql/qtsql-5.11..ebuild
index 7765a7bb..f6e32554 100644
--- a/dev-qt/qtsql/qtsql-5.11..ebuild
+++ b/dev-qt/qtsql/qtsql-5.11..ebuild
@@ -5,7 +5,7 @@ EAPI=6
 QT5_MODULE="qtbase"
 inherit qt5-build
 
-DESCRIPTION="SQL abstraction library for the Qt5 tooolkit"
+DESCRIPTION="SQL abstraction library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"

diff --git a/dev-qt/qtsql/qtsql-5.9..ebuild 
b/dev-qt/qtsql/qtsql-5.9..ebuild
index 7765a7bb..f6e32554 100644
--- a/dev-qt/qtsql/qtsql-5.9..ebuild
+++ b/dev-qt/qtsql/qtsql-5.9..ebuild
@@ -5,7 +5,7 @@ EAPI=6
 QT5_MODULE="qtbase"
 inherit qt5-build
 
-DESCRIPTION="SQL abstraction library for the Qt5 tooolkit"
+DESCRIPTION="SQL abstraction library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"

diff --git a/dev-qt/qtsql/qtsql-5..ebuild b/dev-qt/qtsql/qtsql-5..ebuild
index 7765a7bb..f6e32554 100644
--- a/dev-qt/qtsql/qtsql-5..ebuild
+++ b/dev-qt/qtsql/qtsql-5..ebuild
@@ -5,7 +5,7 @@ EAPI=6
 QT5_MODULE="qtbase"
 inherit qt5-build
 
-DESCRIPTION="SQL abstraction library for the Qt5 tooolkit"
+DESCRIPTION="SQL abstraction library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2019-01-07 Thread Davide Pesavento

commit: 176f0fbf1ff794f7770c9725aced16025579368a
Author: Davide Pesavento  gentoo  org>
AuthorDate: Tue Jan  8 01:28:33 2019 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Tue Jan  8 01:28:33 2019 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=176f0fbf

dev-qt/qtsql: switch to dev-db/oracle-instantclient

Bug: https://bugs.gentoo.org/669274
Package-Manager: Portage-2.3.53, Repoman-2.3.12
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qtsql/qtsql-5.12.0.ebuild| 2 +-
 dev-qt/qtsql/qtsql-5.12..ebuild | 2 +-
 dev-qt/qtsql/qtsql-5..ebuild| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-5.12.0.ebuild b/dev-qt/qtsql/qtsql-5.12.0.ebuild
index e46b3da3..92ce286d 100644
--- a/dev-qt/qtsql/qtsql-5.12.0.ebuild
+++ b/dev-qt/qtsql/qtsql-5.12.0.ebuild
@@ -22,7 +22,7 @@ DEPEND="
~dev-qt/qtcore-${PV}
freetds? ( dev-db/freetds )
mysql? ( dev-db/mysql-connector-c:= )
-   oci8? ( dev-db/oracle-instantclient-basic )
+   oci8? ( dev-db/oracle-instantclient:=[sdk] )
odbc? ( dev-db/unixODBC )
postgres? ( dev-db/postgresql:* )
sqlite? ( dev-db/sqlite:3 )

diff --git a/dev-qt/qtsql/qtsql-5.12..ebuild 
b/dev-qt/qtsql/qtsql-5.12..ebuild
index e46b3da3..92ce286d 100644
--- a/dev-qt/qtsql/qtsql-5.12..ebuild
+++ b/dev-qt/qtsql/qtsql-5.12..ebuild
@@ -22,7 +22,7 @@ DEPEND="
~dev-qt/qtcore-${PV}
freetds? ( dev-db/freetds )
mysql? ( dev-db/mysql-connector-c:= )
-   oci8? ( dev-db/oracle-instantclient-basic )
+   oci8? ( dev-db/oracle-instantclient:=[sdk] )
odbc? ( dev-db/unixODBC )
postgres? ( dev-db/postgresql:* )
sqlite? ( dev-db/sqlite:3 )

diff --git a/dev-qt/qtsql/qtsql-5..ebuild b/dev-qt/qtsql/qtsql-5..ebuild
index e46b3da3..92ce286d 100644
--- a/dev-qt/qtsql/qtsql-5..ebuild
+++ b/dev-qt/qtsql/qtsql-5..ebuild
@@ -22,7 +22,7 @@ DEPEND="
~dev-qt/qtcore-${PV}
freetds? ( dev-db/freetds )
mysql? ( dev-db/mysql-connector-c:= )
-   oci8? ( dev-db/oracle-instantclient-basic )
+   oci8? ( dev-db/oracle-instantclient:=[sdk] )
odbc? ( dev-db/unixODBC )
postgres? ( dev-db/postgresql:* )
sqlite? ( dev-db/sqlite:3 )

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2019-01-07 Thread Davide Pesavento

commit: 2dabddfc4d3bcc8d6b73c1d0bd19d469356b655e
Author: Davide Pesavento  gentoo  org>
AuthorDate: Tue Jan  8 00:15:39 2019 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Tue Jan  8 00:15:39 2019 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=2dabddfc

dev-qt/qtsql: stop using deprecated virtual

Package-Manager: Portage-2.3.53, Repoman-2.3.12
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qtsql/qtsql-5.12.0.ebuild| 3 +--
 dev-qt/qtsql/qtsql-5.12..ebuild | 3 +--
 dev-qt/qtsql/qtsql-5..ebuild| 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-5.12.0.ebuild b/dev-qt/qtsql/qtsql-5.12.0.ebuild
index d5f86389..ba13844c 100644
--- a/dev-qt/qtsql/qtsql-5.12.0.ebuild
+++ b/dev-qt/qtsql/qtsql-5.12.0.ebuild
@@ -21,7 +21,7 @@ REQUIRED_USE="
 DEPEND="
~dev-qt/qtcore-${PV}
freetds? ( dev-db/freetds )
-   mysql? ( virtual/libmysqlclient:= )
+   mysql? ( dev-db/mysql-connector-c:= )
oci8? ( dev-db/oracle-instantclient-basic )
odbc? ( dev-db/unixODBC )
postgres? ( dev-db/postgresql:* )
@@ -49,7 +49,6 @@ src_configure() {
$(usex sqlite -system-sqlite '')
)
 
-   use mysql && myconf+=("-I${EPREFIX}/usr/include/mysql" 
"-L${EPREFIX}/usr/$(get_libdir)/mysql")
use oci8 && myconf+=("-I${ORACLE_HOME}/include" 
"-L${ORACLE_HOME}/$(get_libdir)")
use postgres && myconf+=("-I${EPREFIX}/usr/include/postgresql/pgsql")
 

diff --git a/dev-qt/qtsql/qtsql-5.12..ebuild 
b/dev-qt/qtsql/qtsql-5.12..ebuild
index d5f86389..ba13844c 100644
--- a/dev-qt/qtsql/qtsql-5.12..ebuild
+++ b/dev-qt/qtsql/qtsql-5.12..ebuild
@@ -21,7 +21,7 @@ REQUIRED_USE="
 DEPEND="
~dev-qt/qtcore-${PV}
freetds? ( dev-db/freetds )
-   mysql? ( virtual/libmysqlclient:= )
+   mysql? ( dev-db/mysql-connector-c:= )
oci8? ( dev-db/oracle-instantclient-basic )
odbc? ( dev-db/unixODBC )
postgres? ( dev-db/postgresql:* )
@@ -49,7 +49,6 @@ src_configure() {
$(usex sqlite -system-sqlite '')
)
 
-   use mysql && myconf+=("-I${EPREFIX}/usr/include/mysql" 
"-L${EPREFIX}/usr/$(get_libdir)/mysql")
use oci8 && myconf+=("-I${ORACLE_HOME}/include" 
"-L${ORACLE_HOME}/$(get_libdir)")
use postgres && myconf+=("-I${EPREFIX}/usr/include/postgresql/pgsql")
 

diff --git a/dev-qt/qtsql/qtsql-5..ebuild b/dev-qt/qtsql/qtsql-5..ebuild
index d5f86389..ba13844c 100644
--- a/dev-qt/qtsql/qtsql-5..ebuild
+++ b/dev-qt/qtsql/qtsql-5..ebuild
@@ -21,7 +21,7 @@ REQUIRED_USE="
 DEPEND="
~dev-qt/qtcore-${PV}
freetds? ( dev-db/freetds )
-   mysql? ( virtual/libmysqlclient:= )
+   mysql? ( dev-db/mysql-connector-c:= )
oci8? ( dev-db/oracle-instantclient-basic )
odbc? ( dev-db/unixODBC )
postgres? ( dev-db/postgresql:* )
@@ -49,7 +49,6 @@ src_configure() {
$(usex sqlite -system-sqlite '')
)
 
-   use mysql && myconf+=("-I${EPREFIX}/usr/include/mysql" 
"-L${EPREFIX}/usr/$(get_libdir)/mysql")
use oci8 && myconf+=("-I${ORACLE_HOME}/include" 
"-L${ORACLE_HOME}/$(get_libdir)")
use postgres && myconf+=("-I${EPREFIX}/usr/include/postgresql/pgsql")

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2019-01-07 Thread Davide Pesavento

commit: 5ecb95fc789370b10bcee04ba4b3fdccd2fad189
Author: Davide Pesavento  gentoo  org>
AuthorDate: Tue Jan  8 00:48:02 2019 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Tue Jan  8 00:48:02 2019 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=5ecb95fc

dev-qt/qtsql: upstream learned to use pkg-config

Package-Manager: Portage-2.3.53, Repoman-2.3.12
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qtsql/qtsql-5.12.0.ebuild| 1 -
 dev-qt/qtsql/qtsql-5.12..ebuild | 1 -
 dev-qt/qtsql/qtsql-5..ebuild| 1 -
 3 files changed, 3 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-5.12.0.ebuild b/dev-qt/qtsql/qtsql-5.12.0.ebuild
index ba13844c..e46b3da3 100644
--- a/dev-qt/qtsql/qtsql-5.12.0.ebuild
+++ b/dev-qt/qtsql/qtsql-5.12.0.ebuild
@@ -50,7 +50,6 @@ src_configure() {
)
 
use oci8 && myconf+=("-I${ORACLE_HOME}/include" 
"-L${ORACLE_HOME}/$(get_libdir)")
-   use postgres && myconf+=("-I${EPREFIX}/usr/include/postgresql/pgsql")
 
qt5-build_src_configure
 }

diff --git a/dev-qt/qtsql/qtsql-5.12..ebuild 
b/dev-qt/qtsql/qtsql-5.12..ebuild
index ba13844c..e46b3da3 100644
--- a/dev-qt/qtsql/qtsql-5.12..ebuild
+++ b/dev-qt/qtsql/qtsql-5.12..ebuild
@@ -50,7 +50,6 @@ src_configure() {
)
 
use oci8 && myconf+=("-I${ORACLE_HOME}/include" 
"-L${ORACLE_HOME}/$(get_libdir)")
-   use postgres && myconf+=("-I${EPREFIX}/usr/include/postgresql/pgsql")
 
qt5-build_src_configure
 }

diff --git a/dev-qt/qtsql/qtsql-5..ebuild b/dev-qt/qtsql/qtsql-5..ebuild
index ba13844c..e46b3da3 100644
--- a/dev-qt/qtsql/qtsql-5..ebuild
+++ b/dev-qt/qtsql/qtsql-5..ebuild
@@ -50,7 +50,6 @@ src_configure() {
)
 
use oci8 && myconf+=("-I${ORACLE_HOME}/include" 
"-L${ORACLE_HOME}/$(get_libdir)")
-   use postgres && myconf+=("-I${EPREFIX}/usr/include/postgresql/pgsql")
 
qt5-build_src_configure
 }

[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/

2019-01-07 Thread Davide Pesavento

commit: f11c40750fff879e9c8269303c678f72c9863414
Author: Davide Pesavento  gentoo  org>
AuthorDate: Mon Jan  7 23:57:06 2019 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Mon Jan  7 23:57:06 2019 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=f11c4075

dev-qt/qtsql: apparently upstream doesn't support libiodbc anymore

The configure test fails to detect it. Probably easy to fix, but
I doubt anyone cares, given that it's been broken since 5.8.0 and
no one complained.

Package-Manager: Portage-2.3.53, Repoman-2.3.12
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qtsql/qtsql-5.12.0.ebuild| 7 +++
 dev-qt/qtsql/qtsql-5.12..ebuild | 7 +++
 dev-qt/qtsql/qtsql-5..ebuild| 7 +++
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/dev-qt/qtsql/qtsql-5.12.0.ebuild b/dev-qt/qtsql/qtsql-5.12.0.ebuild
index 09b2d085..d5f86389 100644
--- a/dev-qt/qtsql/qtsql-5.12.0.ebuild
+++ b/dev-qt/qtsql/qtsql-5.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,9 +23,9 @@ DEPEND="
freetds? ( dev-db/freetds )
mysql? ( virtual/libmysqlclient:= )
oci8? ( dev-db/oracle-instantclient-basic )
-   odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
+   odbc? ( dev-db/unixODBC )
postgres? ( dev-db/postgresql:* )
-   sqlite? ( >=dev-db/sqlite-3.8.10.2:3 )
+   sqlite? ( dev-db/sqlite:3 )
 "
 RDEPEND="${DEPEND}"
 
@@ -51,7 +51,6 @@ src_configure() {
 
use mysql && myconf+=("-I${EPREFIX}/usr/include/mysql" 
"-L${EPREFIX}/usr/$(get_libdir)/mysql")
use oci8 && myconf+=("-I${ORACLE_HOME}/include" 
"-L${ORACLE_HOME}/$(get_libdir)")
-   use odbc && myconf+=("-I${EPREFIX}/usr/include/iodbc")
use postgres && myconf+=("-I${EPREFIX}/usr/include/postgresql/pgsql")
 
qt5-build_src_configure

diff --git a/dev-qt/qtsql/qtsql-5.12..ebuild 
b/dev-qt/qtsql/qtsql-5.12..ebuild
index 2ce2c9a9..d5f86389 100644
--- a/dev-qt/qtsql/qtsql-5.12..ebuild
+++ b/dev-qt/qtsql/qtsql-5.12..ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,9 +23,9 @@ DEPEND="
freetds? ( dev-db/freetds )
mysql? ( virtual/libmysqlclient:= )
oci8? ( dev-db/oracle-instantclient-basic )
-   odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
+   odbc? ( dev-db/unixODBC )
postgres? ( dev-db/postgresql:* )
-   sqlite? ( >=dev-db/sqlite-3.8.10.2:3 )
+   sqlite? ( dev-db/sqlite:3 )
 "
 RDEPEND="${DEPEND}"
 
@@ -51,7 +51,6 @@ src_configure() {
 
use mysql && myconf+=("-I${EPREFIX}/usr/include/mysql" 
"-L${EPREFIX}/usr/$(get_libdir)/mysql")
use oci8 && myconf+=("-I${ORACLE_HOME}/include" 
"-L${ORACLE_HOME}/$(get_libdir)")
-   use odbc && myconf+=("-I${EPREFIX}/usr/include/iodbc")
use postgres && myconf+=("-I${EPREFIX}/usr/include/postgresql/pgsql")
 
qt5-build_src_configure

diff --git a/dev-qt/qtsql/qtsql-5..ebuild b/dev-qt/qtsql/qtsql-5..ebuild
index 2ce2c9a9..d5f86389 100644
--- a/dev-qt/qtsql/qtsql-5..ebuild
+++ b/dev-qt/qtsql/qtsql-5..ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,9 +23,9 @@ DEPEND="
freetds? ( dev-db/freetds )
mysql? ( virtual/libmysqlclient:= )
oci8? ( dev-db/oracle-instantclient-basic )
-   odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
+   odbc? ( dev-db/unixODBC )
postgres? ( dev-db/postgresql:* )
-   sqlite? ( >=dev-db/sqlite-3.8.10.2:3 )
+   sqlite? ( dev-db/sqlite:3 )
 "
 RDEPEND="${DEPEND}"
 
@@ -51,7 +51,6 @@ src_configure() {
 
use mysql && myconf+=("-I${EPREFIX}/usr/include/mysql" 
"-L${EPREFIX}/usr/$(get_libdir)/mysql")
use oci8 && myconf+=("-I${ORACLE_HOME}/include" 
"-L${ORACLE_HOME}/$(get_libdir)")
-   use odbc && myconf+=("-I${EPREFIX}/usr/include/iodbc")
use postgres && myconf+=("-I${EPREFIX}/usr/include/postgresql/pgsql")
 
qt5-build_src_configure

1 2 3 >

1 - 100 of 290 matches

Mail list logo