From 29aabba0ea759c6a2864ff5631735b67ee38e5e0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 5 Feb 2020 18:44:56 +0000 Subject: gentoo resync : 05.02.2020 --- dev-qt/qtsql/Manifest | 13 +-- ...results_when_qsqlquery_finished_is_called.patch | 43 ---------- .../qtsql/files/qtsql-5.12.5-postgresql-12.patch | 97 ---------------------- dev-qt/qtsql/qtsql-5.12.3.ebuild | 4 +- dev-qt/qtsql/qtsql-5.12.5-r1.ebuild | 60 ------------- dev-qt/qtsql/qtsql-5.12.5-r2.ebuild | 62 -------------- dev-qt/qtsql/qtsql-5.13.2.ebuild | 2 +- dev-qt/qtsql/qtsql-5.14.0.ebuild | 55 ------------ dev-qt/qtsql/qtsql-5.14.1.ebuild | 55 ++++++++++++ 9 files changed, 62 insertions(+), 329 deletions(-) delete mode 100644 dev-qt/qtsql/files/qtsql-5.12.4-mysql_free_results_when_qsqlquery_finished_is_called.patch delete mode 100644 dev-qt/qtsql/files/qtsql-5.12.5-postgresql-12.patch delete mode 100644 dev-qt/qtsql/qtsql-5.12.5-r1.ebuild delete mode 100644 dev-qt/qtsql/qtsql-5.12.5-r2.ebuild delete mode 100644 dev-qt/qtsql/qtsql-5.14.0.ebuild create mode 100644 dev-qt/qtsql/qtsql-5.14.1.ebuild (limited to 'dev-qt/qtsql') diff --git a/dev-qt/qtsql/Manifest b/dev-qt/qtsql/Manifest index c98cf69b2300..6d9eb8daa421 100644 --- a/dev-qt/qtsql/Manifest +++ b/dev-qt/qtsql/Manifest @@ -1,13 +1,8 @@ -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 -DIST qtbase-everywhere-src-5.14.0.tar.xz 49713412 BLAKE2B b59a98b12ade13ef27a055010f45621606692e7c071039cedfa20a667fdbffc74e2ba7b412b93eebc7bc748a418750045810215335972190fc5ad69947d5494c SHA512 27e640643aa2a15fece96b1a83f8f6fbfbc8a83e224f6dea4d7e6a94c8069a2b18a55ddc76943b10b40ccc95168a48dcfdf46264fdfc24b3594d1c6ea160aff6 -EBUILD qtsql-5.12.3.ebuild 1236 BLAKE2B bf435b5ee02a16ce45e16515b6d58381b2c8c176d728fee76b2f2b1514cdcc1d3531ca40b2012eb5f63ea75ae5175c98963def46dd79c19e3ba366e57aa1eaf6 SHA512 78ba45e7368ac8fc271a4f9c2945005b62d49cb6d6cf9160126c728a30edd614c8b124ee7f528ead26bbfc4c3c2811b2b3e6c3552ed09b27c1440eb40ea6a79c -EBUILD qtsql-5.12.5-r1.ebuild 1368 BLAKE2B 705a02222d2d83f26ca79c1144a5747dd3951293be3359055da5504ca192ddde932e18f5acd307c540b042917f4e29f6ee38c3960c52519bb571cf410738dd4f SHA512 c2911876f15f68df2197d818d568538c47e7955f52230cb09cfbd4da2d652a1d5e7d473e9d3c99fa215e0da55f6c6047b6d50f4ab4d27d1d8ba616b2d6c65640 -EBUILD qtsql-5.12.5-r2.ebuild 1453 BLAKE2B accd2850f411f6b56ed07654905df782a908b9751cae761a2eab1c43f868d8f39fc308f2f0e0e472b0458488dd7e6bae2c42d31817fb2e48a6a3d3b493961b00 SHA512 af04e9bbd80ecbd9f2c65b237549a72684fc6167c3780b20683d30218771482906e35ab1c0525b9ea30c963f427fcb22197abd5c6b2df6eed5641aad02db86a8 -EBUILD qtsql-5.13.2.ebuild 1342 BLAKE2B 7d734a59c6b7027a105b6b38ddd8cd6ca81d70a14e4607d1cf8522137956eeb335c75281494601f878c35af8391debbc4cc6673e8649dcaf61f8a38439582bb5 SHA512 7987b7d96490f33c6340fa0ecc9eaedf992d119f8087043af1bf82e4447472de86596645a4211a00a9f058e1b27c1f372484f4ce18b742d09251db93e38ea5fa -EBUILD qtsql-5.14.0.ebuild 1242 BLAKE2B 43bbcdce1ac4e4901e241a88c46735ae398e62070a9e4f8569e54e87f681bbe40317c80d3441d64cf22dfad537d6a6b8803f04f5e6be34ef5511565b23e89cf1 SHA512 ca9c5a6bc54d8b0b1c266fde07c99a222a0549576dd9dfa2098cf258801667157482e43a3747283666d36a7db8bb0249631f4694b97d9838d27e1b4249ba1e60 +DIST qtbase-everywhere-src-5.14.1.tar.xz 49828188 BLAKE2B d5641df96a90ec4f3f85e47444c151b2090161330df9684703883865ddc84bed507295b67953c0a8cad9c104a10727ac9fb26d7f3ec4bf2052294c843f108491 SHA512 964777323d0e3f9d355218c3493bb3b61d2750d9cb5ba71fce72cae3cd362acce88e39360f1fac0011f1b74d529a23621a7281191c622cc034ce78a77afa296b +EBUILD qtsql-5.12.3.ebuild 1201 BLAKE2B ad6a6effc813d222636b5066a6704fc89486dc3260ecb5538b27a9cc870366b2aa72575115cfc4b7cae6d985054ab7434c878b65f897e6cfd4a68696c845fc8d SHA512 619fe6c1906b9a26f23f2d619f431f76938dd8230f32cf24c4033c4b01f134ac3597501cdc5345121b7f8ac0d15115ccf31eae17e48d711ac646be611298e412 +EBUILD qtsql-5.13.2.ebuild 1341 BLAKE2B 39d662a4a82b324e96df2b1528c9e3d9a15213272bae4d32485d3db39c159f8350b2085117e466a7cf2f10f6294ae747644687007e10d0e2923e24f98181f7c3 SHA512 ac36bbd160b857a163a322b09e14692a90d5c3f21d122f7c82833534807c63b346803576e1522a02fa21ebee667e93b0ef3ea29d1a16faa482c364eedb3d409c +EBUILD qtsql-5.14.1.ebuild 1242 BLAKE2B fcff6cf0126c7beac666985a578cac5dc97baf5ca6c0c4b458c1547da5738515e2eff776c24312d8c2c3a7f49c86f4eb30f80c64eb1a69d329a0503fdc604fd5 SHA512 7669f142c47fa3ba423c415f716e1b6cd8edfb7c94f66eb0d0670da27f02c377ad8692ae81557d7c359eb318ff299b0045723d1a97e2f38d74d35bd76a1853bb MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f diff --git a/dev-qt/qtsql/files/qtsql-5.12.4-mysql_free_results_when_qsqlquery_finished_is_called.patch b/dev-qt/qtsql/files/qtsql-5.12.4-mysql_free_results_when_qsqlquery_finished_is_called.patch deleted file mode 100644 index 6bd3d3d2b9bd..000000000000 --- a/dev-qt/qtsql/files/qtsql-5.12.4-mysql_free_results_when_qsqlquery_finished_is_called.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 97d8be10cd97cf997286ed0ca0a5d8b360fa942e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= -Date: Sat, 1 Dec 2018 17:56:41 +0100 -Subject: [PATCH] MySQL: Free the results when QSqlQuery::finished() is called - -Calling mysql_stmt_free_result() frees the results of the last -executed query while keeping the prepared statement valid. This -allows one to keep around prepared QSqlQueries without the overhead -of keeping all the results in memory. - -Change-Id: I4589e90857cc4e9a6f9612799bfca967a67e2ab2 -Reviewed-by: Thiago Macieira -Reviewed-by: Andy Shaw ---- - src/plugins/sqldrivers/mysql/qsql_mysql.cpp | 10 ++++++++++ - 1 file changed, 10 insertions(+) - ---- a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp -+++ b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp -@@ -197,6 +197,7 @@ protected: - QSqlRecord record() const override; - void virtual_hook(int id, void *data) override; - bool nextResult() override; -+ void detachFromResultSet() override; - - #if MYSQL_VERSION_ID >= 40108 - bool prepare(const QString &stmt) override; -@@ -804,6 +805,15 @@ int QMYSQLResult::numRowsAffected() - return d->rowsAffected; - } - -+void QMYSQLResult::detachFromResultSet() -+{ -+ Q_D(QMYSQLResult); -+ -+ if (d->preparedQuery) { -+ mysql_stmt_free_result(d->stmt); -+ } -+} -+ - QVariant QMYSQLResult::lastInsertId() const - { - Q_D(const QMYSQLResult); 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 deleted file mode 100644 index 7e344389e5dd..000000000000 --- a/dev-qt/qtsql/files/qtsql-5.12.5-postgresql-12.patch +++ /dev/null @@ -1,97 +0,0 @@ -From 14b61d48e8bad6223a08843cf363ef48f09c479b Mon Sep 17 00:00:00 2001 -From: Christian Ehrlicher -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 ---- - 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/qtsql-5.12.3.ebuild b/dev-qt/qtsql/qtsql-5.12.3.ebuild index 32aa7a8e1df8..5380e0e1dff6 100644 --- a/dev-qt/qtsql/qtsql-5.12.3.ebuild +++ b/dev-qt/qtsql/qtsql-5.12.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -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="arm x86" fi IUSE="freetds mysql oci8 odbc postgres +sqlite" diff --git a/dev-qt/qtsql/qtsql-5.12.5-r1.ebuild b/dev-qt/qtsql/qtsql-5.12.5-r1.ebuild deleted file mode 100644 index ba8810e497a0..000000000000 --- a/dev-qt/qtsql/qtsql-5.12.5-r1.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# 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 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.12.5-r2.ebuild b/dev-qt/qtsql/qtsql-5.12.5-r2.ebuild deleted file mode 100644 index 48eb0930db10..000000000000 --- a/dev-qt/qtsql/qtsql-5.12.5-r2.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# 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 index 11dd296ac672..6582075ad558 100644 --- a/dev-qt/qtsql/qtsql-5.13.2.ebuild +++ b/dev-qt/qtsql/qtsql-5.13.2.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.14.0.ebuild b/dev-qt/qtsql/qtsql-5.14.0.ebuild deleted file mode 100644 index 5378ef3907f8..000000000000 --- a/dev-qt/qtsql/qtsql-5.14.0.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# 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 -) - -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.14.1.ebuild b/dev-qt/qtsql/qtsql-5.14.1.ebuild new file mode 100644 index 000000000000..473bf4e8bccc --- /dev/null +++ b/dev-qt/qtsql/qtsql-5.14.1.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2020 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 +) + +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 +} -- cgit v1.2.3