gentoo resync : 03.11.2019

6 files changed, 323 insertions, 2 deletions

diff --git a/dev-qt/qtsql/Manifest b/dev-qt/qtsql/Manifest
index feae3cff3196..50e28cc259f7 100644
--- a/dev-qt/qtsql/Manifest
+++ b/dev-qt/qtsql/Manifest
@@ -1,6 +1,11 @@
 AUX qtsql-5.12.4-mysql_free_results_when_qsqlquery_finished_is_called.patch 1436 BLAKE2B 24fa12fb72f862f8f8cba401bf773b91c74dd9b0af7a7801ee3b2298ff5176981833ffbf47b4d565bd0cfd71bff9735689ce4c5dd67ea6349458af78e37dcf3c SHA512 ea8fc7333dfd966d8b850b46f83906daa508d51294e8cba19553520f0583864c86f5319627c31cb633d2dc3ef22ad1873801b780da28ee786ae3bb91a10e478e
+AUX qtsql-5.12.5-postgresql-12.patch 4570 BLAKE2B 410fd080a3c97be1a2cf480c9fd35d0c3c0c0530e1413aaaf558d64be0b45887dba571701305a37b7bde481d6b91d302b4bf227eb197bc79a6fce47030e123b9 SHA512 fe90e928ccf186c85d582bc4324270133ed9f235f640b6e7d80762d2e3f20f37c6038482a5f510afa41d6af8f3d2c8bf46297d1f806b7f34e138b9292dc2e6cb
+AUX qtsql-5.13.1-postgresql-12.patch 4639 BLAKE2B 85edeacc1c2021bf5e6abe9f76d40c1ed64a1cd1c64ccad1b3f39397e87aa9ef14a26c96df471831a53e1f24ee75aa64fed72767de39e488d4f5f0a92540af1f SHA512 7d10071ab49f31971c6f8045e2d0a2d7fc74ed9bab16b0e7dcbde796a3f9ca430b2db9fbe6c3a8217ab8d998abcf29770b7ee4572a524ca1923691a878e13567
 DIST qtbase-everywhere-src-5.12.3.tar.xz 48382148 BLAKE2B 779c43a75403e0f21357a90228bbcc3f216495613f4f17a2f442c7aa93f277a79cc7addf5ae44e22964069580f4932cfd14ba4773aa0ab30405d5587577a545c SHA512 1dab927573eb22b1ae772de3a418f7d3999ea78d6e667a7f2494390dd1f0981ea93f4f892cb6e124ac18812c780ee71da3021b485c61eaf1ef2234a5c12b7fe2
 DIST qtbase-everywhere-src-5.12.5.tar.xz 48463288 BLAKE2B db394becd1c0c2be9f86658f58dbadb5e3b81af82edf2e8b69652a8587a2aa30f481774fa20d55ce7e8b9cc158dedd343dc3964e4ff0bcf111e8c4feceb27e0a SHA512 9a95060318cadfcd6dace6b28353fa868a8dcfe9def0bd884edf7d9f72606bae625de0269323a94b81d594a6c398106c266304106329b79c7dae4e5b88269660
+DIST qtbase-everywhere-src-5.13.2.tar.xz 48735704 BLAKE2B 50b8d69212602427b76dce6efefb9195e91e4bf5a09b732e564b66a4e27cfaf193fd860139b2c4cc774b0b1132af1426b79e381fb42eafd506239096bd87837e SHA512 b00ad017cc95876698615fd6e41c6ade366146c1f7057e1925bc1b72918f091aa39aa6bf0ea450fc6cd4d8f9810b228770d981dcb6cbe8ad30abb2c42804a204
 EBUILD qtsql-5.12.3.ebuild 1236 BLAKE2B bf435b5ee02a16ce45e16515b6d58381b2c8c176d728fee76b2f2b1514cdcc1d3531ca40b2012eb5f63ea75ae5175c98963def46dd79c19e3ba366e57aa1eaf6 SHA512 78ba45e7368ac8fc271a4f9c2945005b62d49cb6d6cf9160126c728a30edd614c8b124ee7f528ead26bbfc4c3c2811b2b3e6c3552ed09b27c1440eb40ea6a79c
-EBUILD qtsql-5.12.5-r1.ebuild 1371 BLAKE2B fa4bf05366b3f75ff684c81df2f8a88bf778adc0087b14274ce46135405e2995236eb10373c468849f4e9674ef1dda7cbed3f6ced84e67c2b1cf541e3d5bf44d SHA512 4dd3fd8a84abf62afb7e3edc27c53e4f5d15f772b7ca4ca1323fb39bec293f6d7b890c677e0f722a0103ca588051eded8c657d51358ff454af827d9cd98a4c3e
+EBUILD qtsql-5.12.5-r1.ebuild 1369 BLAKE2B 44a8c1be3de579a70d8e25721dbea9c612eeae888924c708807040fc3815720de389122ef399d46c09bf17d053a5badaed3fe438b1a73af3883daaf4134885f8 SHA512 910fced01abebed322199d7e5ce924cc7f8e5bccbf7aac16dc1d72de195ffc34b59fee99bbc9e0f1b02701cbc0a89cef476fcfa0203b2fd0789a5bd01fe808c0
+EBUILD qtsql-5.12.5-r2.ebuild 1453 BLAKE2B accd2850f411f6b56ed07654905df782a908b9751cae761a2eab1c43f868d8f39fc308f2f0e0e472b0458488dd7e6bae2c42d31817fb2e48a6a3d3b493961b00 SHA512 af04e9bbd80ecbd9f2c65b237549a72684fc6167c3780b20683d30218771482906e35ab1c0525b9ea30c963f427fcb22197abd5c6b2df6eed5641aad02db86a8
+EBUILD qtsql-5.13.2.ebuild 1346 BLAKE2B d328d52552bab0f6dc3c29bac1f2239486385d3417ca99ceee23d02f0da337d81a47366f67ffcd0c898ce404860fe993c780a0f742352176b9414381ab833f7f SHA512 e0787aabc57932e5a8328a37f4796335388b3e0727c7f68715e006a8a5cdcc65f16293e0d2999a74e929f6f911e311a824b23de254f85ae372edbaad19a45922
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtsql/files/qtsql-5.12.5-postgresql-12.patch b/dev-qt/qtsql/files/qtsql-5.12.5-postgresql-12.patch
new file mode 100644
index 000000000000..7e344389e5dd
--- /dev/null
+++ b/dev-qt/qtsql/files/qtsql-5.12.5-postgresql-12.patch
@@ -0,0 +1,97 @@
+From 14b61d48e8bad6223a08843cf363ef48f09c479b Mon Sep 17 00:00:00 2001
+From: Christian Ehrlicher <ch.ehrlicher@gmx.de>
+Date: Fri, 11 Oct 2019 20:53:49 +0200
+Subject: [PATCH] QPSQL: Add support for PostgreSQL 12
+
+Add proper version check and replace long deprecated and now removed
+access to pg_attrdef.adsrc.
+
+[ChangeLog][QtSql][QPSQL] added support for PostgreSQL 12
+
+Fixes: QTBUG-79033
+Fixes: QTBUG-79064
+Change-Id: Iec1b13945c34ea017139ad1c5539ab5b7f1e03aa
+Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
+---
+ src/plugins/sqldrivers/psql/qsql_psql.cpp | 43 +++++++++++++++++--------------
+ src/plugins/sqldrivers/psql/qsql_psql_p.h |  1 +
+ 2 files changed, 25 insertions(+), 19 deletions(-)
+
+diff --git a/src/plugins/sqldrivers/psql/qsql_psql.cpp b/src/plugins/sqldrivers/psql/qsql_psql.cpp
+index 3803f05b9f9..760685f64b4 100644
+--- a/src/plugins/sqldrivers/psql/qsql_psql.cpp
++++ b/src/plugins/sqldrivers/psql/qsql_psql.cpp
+@@ -1078,8 +1078,10 @@ static QPSQLDriver::Protocol qMakePSQLVersion(int vMaj, int vMin)
+         return QPSQLDriver::Version10;
+     case 11:
+         return QPSQLDriver::Version11;
++    case 12:
++        return QPSQLDriver::Version12;
+     default:
+-        if (vMaj > 11)
++        if (vMaj > 12)
+             return QPSQLDriver::UnknownLaterVersion;
+         break;
+     }
+@@ -1439,26 +1441,29 @@ QSqlRecord QPSQLDriver::record(const QString &tablename) const
+     else
+         schema = std::move(schema).toLower();
+ 
+-    QString stmt = QLatin1String("select pg_attribute.attname, pg_attribute.atttypid::int, "
+-                                 "pg_attribute.attnotnull, pg_attribute.attlen, pg_attribute.atttypmod, "
+-                                 "pg_attrdef.adsrc "
+-                                 "from pg_class, pg_attribute "
+-                                 "left join pg_attrdef on (pg_attrdef.adrelid = "
+-                                 "pg_attribute.attrelid and pg_attrdef.adnum = pg_attribute.attnum) "
+-                                 "where %1 "
+-                                 "and pg_class.relname = '%2' "
+-                                 "and pg_attribute.attnum > 0 "
+-                                 "and pg_attribute.attrelid = pg_class.oid "
+-                                 "and pg_attribute.attisdropped = false "
+-                                 "order by pg_attribute.attnum");
+-    if (schema.isEmpty())
+-        stmt = stmt.arg(QLatin1String("pg_table_is_visible(pg_class.oid)"));
+-    else
+-        stmt = stmt.arg(QString::fromLatin1("pg_class.relnamespace = (select oid from "
+-                                            "pg_namespace where pg_namespace.nspname = '%1')").arg(schema));
++    const QString adsrc = protocol() < Version8
++        ? QStringLiteral("pg_attrdef.adsrc")
++        : QStringLiteral("pg_get_expr(pg_attrdef.adbin, pg_attrdef.adrelid)");
++    const QString nspname = schema.isEmpty()
++        ? QStringLiteral("pg_table_is_visible(pg_class.oid)")
++        : QStringLiteral("pg_class.relnamespace = (SELECT oid FROM "
++                         "pg_namespace WHERE pg_namespace.nspname = '%1')").arg(schema);
++    const QString stmt =
++        QStringLiteral("SELECT pg_attribute.attname, pg_attribute.atttypid::int, "
++                       "pg_attribute.attnotnull, pg_attribute.attlen, pg_attribute.atttypmod, "
++                       "%1 "
++                       "FROM pg_class, pg_attribute "
++                       "LEFT JOIN pg_attrdef ON (pg_attrdef.adrelid = "
++                       "pg_attribute.attrelid AND pg_attrdef.adnum = pg_attribute.attnum) "
++                       "WHERE %2 "
++                       "AND pg_class.relname = '%3' "
++                       "AND pg_attribute.attnum > 0 "
++                       "AND pg_attribute.attrelid = pg_class.oid "
++                       "AND pg_attribute.attisdropped = false "
++                       "ORDER BY pg_attribute.attnum").arg(adsrc, nspname, tbl);
+ 
+     QSqlQuery query(createResult());
+-    query.exec(stmt.arg(tbl));
++    query.exec(stmt);
+     while (query.next()) {
+         int len = query.value(3).toInt();
+         int precision = query.value(4).toInt();
+diff --git a/src/plugins/sqldrivers/psql/qsql_psql_p.h b/src/plugins/sqldrivers/psql/qsql_psql_p.h
+index 99e0b5f60f5..9ac1fb50d79 100644
+--- a/src/plugins/sqldrivers/psql/qsql_psql_p.h
++++ b/src/plugins/sqldrivers/psql/qsql_psql_p.h
+@@ -93,6 +93,7 @@ public:
+         Version9_6 = 22,
+         Version10 = 23,
+         Version11 = 24,
++        Version12 = 25,
+         UnknownLaterVersion = 100000
+     };
+ 
+-- 
+2.16.3
diff --git a/dev-qt/qtsql/files/qtsql-5.13.1-postgresql-12.patch b/dev-qt/qtsql/files/qtsql-5.13.1-postgresql-12.patch
new file mode 100644
index 000000000000..f41755adff95
--- /dev/null
+++ b/dev-qt/qtsql/files/qtsql-5.13.1-postgresql-12.patch
@@ -0,0 +1,97 @@
+From 14b61d48e8bad6223a08843cf363ef48f09c479b Mon Sep 17 00:00:00 2001
+From: Christian Ehrlicher <ch.ehrlicher@gmx.de>
+Date: Fri, 11 Oct 2019 20:53:49 +0200
+Subject: [PATCH] QPSQL: Add support for PostgreSQL 12
+
+Add proper version check and replace long deprecated and now removed
+access to pg_attrdef.adsrc.
+
+[ChangeLog][QtSql][QPSQL] added support for PostgreSQL 12
+
+Fixes: QTBUG-79033
+Fixes: QTBUG-79064
+Change-Id: Iec1b13945c34ea017139ad1c5539ab5b7f1e03aa
+Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
+---
+ src/plugins/sqldrivers/psql/qsql_psql.cpp | 43 +++++++++++++++++--------------
+ src/plugins/sqldrivers/psql/qsql_psql_p.h |  1 +
+ 2 files changed, 25 insertions(+), 19 deletions(-)
+
+diff --git a/src/plugins/sqldrivers/psql/qsql_psql.cpp b/src/plugins/sqldrivers/psql/qsql_psql.cpp
+index 3803f05b9f9..760685f64b4 100644
+--- a/src/plugins/sqldrivers/psql/qsql_psql.cpp
++++ b/src/plugins/sqldrivers/psql/qsql_psql.cpp
+@@ -1078,8 +1078,10 @@ static QPSQLDriver::Protocol qMakePSQLVersion(int vMaj, int vMin)
+         return QPSQLDriver::Version10;
+     case 11:
+         return QPSQLDriver::Version11;
++    case 12:
++        return QPSQLDriver::Version12;
+     default:
+-        if (vMaj > 11)
++        if (vMaj > 12)
+             return QPSQLDriver::UnknownLaterVersion;
+         break;
+     }
+@@ -1439,26 +1441,29 @@ QSqlRecord QPSQLDriver::record(const QString &tablename) const
+     schema = stripDelimiters(schema, QSqlDriver::TableName);
+     tbl = stripDelimiters(tbl, QSqlDriver::TableName);
+ 
+-    QString stmt = QStringLiteral("SELECT pg_attribute.attname, pg_attribute.atttypid::int, "
+-                                  "pg_attribute.attnotnull, pg_attribute.attlen, pg_attribute.atttypmod, "
+-                                  "pg_attrdef.adsrc "
+-                                  "FROM pg_class, pg_attribute "
+-                                  "LEFT JOIN pg_attrdef ON (pg_attrdef.adrelid = "
+-                                  "pg_attribute.attrelid AND pg_attrdef.adnum = pg_attribute.attnum) "
+-                                  "WHERE %1 "
+-                                  "AND pg_class.relname = '%2' "
+-                                  "AND pg_attribute.attnum > 0 "
+-                                  "AND pg_attribute.attrelid = pg_class.oid "
+-                                  "AND pg_attribute.attisdropped = false "
+-                                  "ORDER BY pg_attribute.attnum");
+-    if (schema.isEmpty())
+-        stmt = stmt.arg(QStringLiteral("pg_table_is_visible(pg_class.oid)"));
+-    else
+-        stmt = stmt.arg(QStringLiteral("pg_class.relnamespace = (SELECT oid FROM "
+-                                            "pg_namespace WHERE pg_namespace.nspname = '%1')").arg(schema));
++    const QString adsrc = protocol() < Version8
++        ? QStringLiteral("pg_attrdef.adsrc")
++        : QStringLiteral("pg_get_expr(pg_attrdef.adbin, pg_attrdef.adrelid)");
++    const QString nspname = schema.isEmpty()
++        ? QStringLiteral("pg_table_is_visible(pg_class.oid)")
++        : QStringLiteral("pg_class.relnamespace = (SELECT oid FROM "
++                         "pg_namespace WHERE pg_namespace.nspname = '%1')").arg(schema);
++    const QString stmt =
++        QStringLiteral("SELECT pg_attribute.attname, pg_attribute.atttypid::int, "
++                       "pg_attribute.attnotnull, pg_attribute.attlen, pg_attribute.atttypmod, "
++                       "%1 "
++                       "FROM pg_class, pg_attribute "
++                       "LEFT JOIN pg_attrdef ON (pg_attrdef.adrelid = "
++                       "pg_attribute.attrelid AND pg_attrdef.adnum = pg_attribute.attnum) "
++                       "WHERE %2 "
++                       "AND pg_class.relname = '%3' "
++                       "AND pg_attribute.attnum > 0 "
++                       "AND pg_attribute.attrelid = pg_class.oid "
++                       "AND pg_attribute.attisdropped = false "
++                       "ORDER BY pg_attribute.attnum").arg(adsrc, nspname, tbl);
+ 
+     QSqlQuery query(createResult());
+-    query.exec(stmt.arg(tbl));
++    query.exec(stmt);
+     while (query.next()) {
+         int len = query.value(3).toInt();
+         int precision = query.value(4).toInt();
+diff --git a/src/plugins/sqldrivers/psql/qsql_psql_p.h b/src/plugins/sqldrivers/psql/qsql_psql_p.h
+index 99e0b5f60f5..9ac1fb50d79 100644
+--- a/src/plugins/sqldrivers/psql/qsql_psql_p.h
++++ b/src/plugins/sqldrivers/psql/qsql_psql_p.h
+@@ -93,6 +93,7 @@ public:
+         Version9_6 = 22,
+         Version10 = 23,
+         Version11 = 24,
++        Version12 = 25,
+         UnknownLaterVersion = 100000
+     };
+ 
+-- 
+2.16.3
diff --git a/dev-qt/qtsql/qtsql-5.12.5-r1.ebuild b/dev-qt/qtsql/qtsql-5.12.5-r1.ebuild
index 920cf5d7da7b..16a48d02f10e 100644
--- a/dev-qt/qtsql/qtsql-5.12.5-r1.ebuild
+++ b/dev-qt/qtsql/qtsql-5.12.5-r1.ebuild
@@ -9,7 +9,7 @@ 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 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc ~x86"
 fi
 
 IUSE="freetds mysql oci8 odbc postgres +sqlite"
diff --git a/dev-qt/qtsql/qtsql-5.12.5-r2.ebuild b/dev-qt/qtsql/qtsql-5.12.5-r2.ebuild
new file mode 100644
index 000000000000..48eb0930db10
--- /dev/null
+++ b/dev-qt/qtsql/qtsql-5.12.5-r2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=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 ~sparc ~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? ( dev-db/mysql-connector-c:= )
+	oci8? ( dev-db/oracle-instantclient:=[sdk] )
+	odbc? ( dev-db/unixODBC )
+	postgres? ( dev-db/postgresql:* )
+	sqlite? ( dev-db/sqlite:3 )
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/sql
+	src/plugins/sqldrivers
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+	:sql
+)
+
+PATCHES+=(
+	# Backport from 5.14 branch, bug #696870
+	"${FILESDIR}/${P}-postgresql-12.patch"
+	# Backport from dev branch
+	"${FILESDIR}/${PN}-5.12.4-mysql_free_results_when_qsqlquery_finished_is_called.patch"
+)
+
+src_configure() {
+	local myconf=(
+		$(qt_use freetds  sql-tds    plugin)
+		$(qt_use mysql    sql-mysql  plugin)
+		$(qt_use oci8     sql-oci    plugin)
+		$(qt_use odbc     sql-odbc   plugin)
+		$(qt_use postgres sql-psql   plugin)
+		$(qt_use sqlite   sql-sqlite plugin)
+		$(usex sqlite -system-sqlite '')
+	)
+
+	use oci8 && myconf+=("-I${ORACLE_HOME}/include" "-L${ORACLE_HOME}/$(get_libdir)")
+
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtsql/qtsql-5.13.2.ebuild b/dev-qt/qtsql/qtsql-5.13.2.ebuild
new file mode 100644
index 000000000000..256a4b3099e8
--- /dev/null
+++ b/dev-qt/qtsql/qtsql-5.13.2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=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 ~sparc ~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? ( dev-db/mysql-connector-c:= )
+	oci8? ( dev-db/oracle-instantclient:=[sdk] )
+	odbc? ( dev-db/unixODBC )
+	postgres? ( dev-db/postgresql:* )
+	sqlite? ( dev-db/sqlite:3 )
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/sql
+	src/plugins/sqldrivers
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+	:sql
+)
+
+PATCHES+=(
+	# Backport from 5.14 branch, bug #696870
+	"${FILESDIR}/${PN}-5.13.1-postgresql-12.patch"
+)
+
+src_configure() {
+	local myconf=(
+		$(qt_use freetds  sql-tds    plugin)
+		$(qt_use mysql    sql-mysql  plugin)
+		$(qt_use oci8     sql-oci    plugin)
+		$(qt_use odbc     sql-odbc   plugin)
+		$(qt_use postgres sql-psql   plugin)
+		$(qt_use sqlite   sql-sqlite plugin)
+		$(usex sqlite -system-sqlite '')
+	)
+
+	use oci8 && myconf+=("-I${ORACLE_HOME}/include" "-L${ORACLE_HOME}/$(get_libdir)")
+
+	qt5-build_src_configure
+}