gentoo resync : 29.12.2022

7 files changed, 19 insertions, 225 deletions

diff --git a/dev-db/kdb/Manifest b/dev-db/kdb/Manifest
index 2fd7a4740578..87b274952fae 100644
--- a/dev-db/kdb/Manifest
+++ b/dev-db/kdb/Manifest
@@ -1,8 +1,4 @@
-AUX kdb-3.2.0-KDEInstallDirs.patch 1926 BLAKE2B 2355a2cbcc2306a1a13aed6949502792c4d7041b1d3f22daf030e73123913ec7c0fb361fc848724d35eaf11ccebb5bbbada5980f8bce631b7f667ab4dde80100 SHA512 4f136a83ea3a1551855ec4b3f29ad1877ddb871887fa55ad0f99cf4226028c436736342d4d8affc49d448fe96101e6970856c884eb59bab309281ed77c3a54bb
-AUX kdb-3.2.0-build-w-pg12.patch 1372 BLAKE2B 7db0095bfa7f1071dad6f58ee958f4501a1e14f8ca74fb504b2757892a9ff0daff9641b23d24d7b1e30c584d4afaa2958f069196503de18f0766e46328259f6b SHA512 0b89bec94bf4649dee63937d0dc3627f50d7afe65ceb4ea5efbceae05b92dc033c4ee72cfe210f949ad508f15befbad66459eb9ee7d50552f2b8cd675d753743
-AUX kdb-3.2.0-cmake-pg12.patch 1094 BLAKE2B 4857bcef303533fdb57bf3d19b8881f872f3ae75a7519a6b7b9dea6ff5d4801c9be3b5850ef17af2695baf493cbc3fa0b110775e8914d0ec217a786aac406bac SHA512 d380ec8f779349fc854cf09d5098d1f8548572bca8001771db3f74560bce13575fee087515b7b28925d6eddbcad36fd98255009c4ae39f5c4d01d8c3ba44d06d
-AUX kdb-3.2.0-cmake-pg13.patch 1112 BLAKE2B 985e25a891dc4b6b8a6c56c0ba4cd93c8af71dd0b4b9c256dbb63014825f9ad9ee17ebd7521679d2105ded9240c1881d94f516f94ee89cb2317bc6fe8a57c85a SHA512 78e2d8d44836e62eceffffaef408976c5f7f9e239643568018d51dec30dfc766a1a985e972ad26c6f375a1fdcd8797e48b68a8c8710e16350ddf38d3ae03dc28
-AUX kdb-3.2.0-qt-5.15.patch 2768 BLAKE2B 74d3f894dfac6caa3bb2b5fab0cb20b6190d3e0341f8b495141f3f6c2d4941faa88859799daeb7c6da680afda3ea2239eea2626f5fc3f2a355b22372b7f684f1 SHA512 5c21da612fa5925734bd8f298059f547dc91ce516232c4c5e7a41ccedff90b641c21da761f5f94f0660d107ebc56fdca191b059b282c8c593e57d4a295c63cf4
+DIST kdb-3.2.0-patches.tar.xz 7448 BLAKE2B 924a3ac0db2fedfa6d757dcb96fefc48540d5bee7dd2e1239e0e7eca9765393e3b72b13365a66a8e336a655aa4c8978e800f3baa86b704e85134d0c7281b90d7 SHA512 4fe59f33059dcfe19a26bed93615ce152f321f040daa57a2e6747a397aebbc896cd6c964cd2cb1350762552173ff146e4e51b864aa098ec5ae77e0dd6c6d9a2f
 DIST kdb-3.2.0.tar.xz 650180 BLAKE2B 306152b37c2ecc670d26a2df2ae8acb950505ecb37c4994f4debd1b80c8b2ee94252658fe28b59255d9ad0d350375171f3b43dc9e94949417c3aa9ed167134fe SHA512 7df22f2c5b6e20ae3de71cb6c76b234d2f1f33b2abcdffa85be313c63d067a40a85ed102b6256207315db08ced5d69f8bc40afdf84a188463713a6b2ffdb2df7
-EBUILD kdb-3.2.0-r1.ebuild 1452 BLAKE2B bb90f8b6a09270abe37f7400b6a7bdee02b42dc04e81e9afc128f1729316d5da93f8b2b4c00081f7bcc6f4bfae38364625771d1fa298d27626a613df6ffe9d9f SHA512 94ec2d91456c8fe57de80220b56270ce04c40d828d85a6132f3765aee8dbd9605c33409d3c99383e4dd8270681e5b41ae7930ae6954c380a23c1d4c1b921652a
+EBUILD kdb-3.2.0-r2.ebuild 1633 BLAKE2B 698e0e01010ffd8572aee2e8ec0fc44c316250872004de93b8a8a746ac76ee97061be9549c64730d520d86c1323d0b29b8bc1f86c2a0b78ccd024dadabf885ca SHA512 62f815551b0abd3fd1aaa728c66d3bc3712671a9fb8c8769f2c19a7f8248c78c315e7c354a910d43de3d050f2d129a09f2c9d99d037dd2e91e7e8c86daa3b608
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/dev-db/kdb/files/kdb-3.2.0-KDEInstallDirs.patch b/dev-db/kdb/files/kdb-3.2.0-KDEInstallDirs.patch
deleted file mode 100644
index c0b8cb8c2009..000000000000
--- a/dev-db/kdb/files/kdb-3.2.0-KDEInstallDirs.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 259684d4768f64fe4f0773442cce83dec089720a Mon Sep 17 00:00:00 2001
-From: "Friedrich W. H. Kossebau" <kossebau@kde.org>
-Date: Mon, 18 Jan 2021 16:37:20 +0100
-Subject: [PATCH] Use non-deprecated KDEInstaUse non-deprecated KDEInstallDirs
- variables
-
-GIT_SILENT
----
- src/CMakeLists.txt                     | 2 +-
- src/drivers/CMakeLists.txt             | 2 +-
- src/drivers/sqlite/dump/CMakeLists.txt | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 78c91e8c..4a392b63 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -250,7 +250,7 @@ if(BUILD_TEST_COVERAGE)
- endif()
- 
- # Create a Config.cmake and a ConfigVersion.cmake file and install them
--set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/${KDB_BASE_NAME}")
-+set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/${KDB_BASE_NAME}")
- 
- ecm_setup_version(${PROJECT_VERSION}
-     VARIABLE_PREFIX KDB
-diff --git a/src/drivers/CMakeLists.txt b/src/drivers/CMakeLists.txt
-index 6fd7f14d..fb2005cc 100644
---- a/src/drivers/CMakeLists.txt
-+++ b/src/drivers/CMakeLists.txt
-@@ -5,7 +5,7 @@ endif()
- 
- #TODO  add_definitions(-DKDE_DEFAULT_DEBUG_AREA=44001)
- 
--set(KDB_PLUGIN_INSTALL_DIR ${PLUGIN_INSTALL_DIR}/${KDB_BASE_NAME_LOWER})
-+set(KDB_PLUGIN_INSTALL_DIR ${KDE_INSTALL_PLUGINDIR}/${KDB_BASE_NAME_LOWER})
- 
- # -----------------------
- macro(build_and_install_kdb_driver _name _srcs _extra_libs)
-diff --git a/src/drivers/sqlite/dump/CMakeLists.txt b/src/drivers/sqlite/dump/CMakeLists.txt
-index cfffb5c6..27093ccb 100644
---- a/src/drivers/sqlite/dump/CMakeLists.txt
-+++ b/src/drivers/sqlite/dump/CMakeLists.txt
-@@ -15,4 +15,4 @@ if(WIN32)
-                           PROPERTIES LINK_FLAGS "/SUBSYSTEM:CONSOLE")
- endif()
- 
--install(TARGETS ${KDB_SQLITE_DUMP_TOOL} ${INSTALL_TARGETS_DEFAULT_ARGS})
-+install(TARGETS ${KDB_SQLITE_DUMP_TOOL} ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
--- 
-2.31.1
-
diff --git a/dev-db/kdb/files/kdb-3.2.0-build-w-pg12.patch b/dev-db/kdb/files/kdb-3.2.0-build-w-pg12.patch
deleted file mode 100644
index 5329fae80d83..000000000000
--- a/dev-db/kdb/files/kdb-3.2.0-build-w-pg12.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 40cdaea4d7824cc1b0d26e6ad2dcb61fa2077911 Mon Sep 17 00:00:00 2001
-From: Pino Toscano <pino@kde.org>
-Date: Tue, 29 Oct 2019 07:52:32 +0100
-Subject: PgSQL driver: fix build with PostgreSQL 12+
-
-ABSTIMEOID and RELTIMEOID were removed, as their data types were dropped.
----
- src/drivers/postgresql/PostgresqlTypes.cpp | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/drivers/postgresql/PostgresqlTypes.cpp b/src/drivers/postgresql/PostgresqlTypes.cpp
-index ea576d6..0697129 100644
---- a/src/drivers/postgresql/PostgresqlTypes.cpp
-+++ b/src/drivers/postgresql/PostgresqlTypes.cpp
-@@ -36,6 +36,7 @@
- #endif
- #include <libpq-fe.h>
- #include <catalog/pg_type.h> // needed for BOOLOID, etc.
-+#include <pg_config.h> // needed for PG_VERSION_NUM
- 
- #ifdef _MSC_VER
- #pragma warning( pop )
-@@ -70,8 +71,10 @@ void PostgresqlDriver::initPgsqlToKDbMap()
-     //! @todo POLYGONOID geometric polygon '(pt1,...)'
-     m_pgsqlToKDbTypes.insert(FLOAT4OID, KDbField::Double);
-     m_pgsqlToKDbTypes.insert(FLOAT8OID, KDbField::Double);
-+#if PG_VERSION_NUM < 120000
-     m_pgsqlToKDbTypes.insert(ABSTIMEOID, KDbField::Date);
-     m_pgsqlToKDbTypes.insert(RELTIMEOID, KDbField::Date);
-+#endif
-     //! @todo TINTERVALOID (abstime,abstime), time interval
-     //! @todo CIRCLEOID geometric circle '(center,radius)'
-     //! @todo CASHOID monetary amounts, $d,ddd.cc
--- 
-cgit v1.1
diff --git a/dev-db/kdb/files/kdb-3.2.0-cmake-pg12.patch b/dev-db/kdb/files/kdb-3.2.0-cmake-pg12.patch
deleted file mode 100644
index 4258fdc47453..000000000000
--- a/dev-db/kdb/files/kdb-3.2.0-cmake-pg12.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 6bba3130f8968abb2e904bda1e8b59f83dd43bdc Mon Sep 17 00:00:00 2001
-From: Pino Toscano <pino@kde.org>
-Date: Sat, 25 May 2019 06:59:44 +0200
-Subject: cmake: find PostgreSQL 12
-
----
- cmake/modules/FindPostgreSQL.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cmake/modules/FindPostgreSQL.cmake b/cmake/modules/FindPostgreSQL.cmake
-index 8ec30db..74e6f6b 100644
---- a/cmake/modules/FindPostgreSQL.cmake
-+++ b/cmake/modules/FindPostgreSQL.cmake
-@@ -86,7 +86,7 @@ set(PostgreSQL_LIBRARY_DIR_MESSAGE "Set the PostgreSQL_LIBRARY_DIR cmake cache e
- set(PostgreSQL_ROOT_DIR_MESSAGE "Set the PostgreSQL_ROOT system variable to where PostgreSQL is found on the machine E.g C:/Program Files/PostgreSQL/8.4")
- 
- set(PostgreSQL_KNOWN_VERSIONS ${PostgreSQL_ADDITIONAL_VERSIONS}
--    "11" "10" "9.6" "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0")
-+    "12" "11" "10" "9.6" "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0")
- 
- # Define additional search paths for root directories.
- foreach (suffix ${PostgreSQL_KNOWN_VERSIONS} )
--- 
-cgit v1.1
diff --git a/dev-db/kdb/files/kdb-3.2.0-cmake-pg13.patch b/dev-db/kdb/files/kdb-3.2.0-cmake-pg13.patch
deleted file mode 100644
index 83785533fa87..000000000000
--- a/dev-db/kdb/files/kdb-3.2.0-cmake-pg13.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From fb5dafb01ffba27b5868eaeb99816f3e8c1cf91c Mon Sep 17 00:00:00 2001
-From: Pino Toscano <pino@kde.org>
-Date: Fri, 22 May 2020 18:59:11 +0200
-Subject: [PATCH] cmake: find PostgreSQL 13
-
----
- cmake/modules/FindPostgreSQL.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cmake/modules/FindPostgreSQL.cmake b/cmake/modules/FindPostgreSQL.cmake
-index 74e6f6b4..90db33ba 100644
---- a/cmake/modules/FindPostgreSQL.cmake
-+++ b/cmake/modules/FindPostgreSQL.cmake
-@@ -86,7 +86,7 @@ set(PostgreSQL_LIBRARY_DIR_MESSAGE "Set the PostgreSQL_LIBRARY_DIR cmake cache e
- set(PostgreSQL_ROOT_DIR_MESSAGE "Set the PostgreSQL_ROOT system variable to where PostgreSQL is found on the machine E.g C:/Program Files/PostgreSQL/8.4")
- 
- set(PostgreSQL_KNOWN_VERSIONS ${PostgreSQL_ADDITIONAL_VERSIONS}
--    "12" "11" "10" "9.6" "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0")
-+    "13" "12" "11" "10" "9.6" "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0")
- 
- # Define additional search paths for root directories.
- foreach (suffix ${PostgreSQL_KNOWN_VERSIONS} )
--- 
-2.31.1
-
diff --git a/dev-db/kdb/files/kdb-3.2.0-qt-5.15.patch b/dev-db/kdb/files/kdb-3.2.0-qt-5.15.patch
deleted file mode 100644
index e4a2a2d11463..000000000000
--- a/dev-db/kdb/files/kdb-3.2.0-qt-5.15.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 3a31ad05fcc7682bf3b65143af99fdb9b2e1e248 Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Mon, 16 Nov 2020 16:41:27 +0100
-Subject: [PATCH] Fix build with newer Qt
-
-(cherry picked from commit b36d74f13a1421437a725fb74502c993c359392a)
----
- src/KDb.cpp | 34 +++++++++++++++++-----------------
- 1 file changed, 17 insertions(+), 17 deletions(-)
-
-diff --git a/src/KDb.cpp b/src/KDb.cpp
-index 5c3b601f..ee92c2ee 100644
---- a/src/KDb.cpp
-+++ b/src/KDb.cpp
-@@ -1635,33 +1635,33 @@ QString KDb::escapeBLOB(const QByteArray& array, BLOBEscapingType type)
-         for (int i = 0; i < size; i++) {
-             const unsigned char val = array[i];
-             if (val < 32 || val >= 127 || val == 39 || val == 92) {
--                str[new_length++] = '\\';
--                str[new_length++] = '\\';
--                str[new_length++] = '0' + val / 64;
--                str[new_length++] = '0' + (val % 64) / 8;
--                str[new_length++] = '0' + val % 8;
-+                str[new_length++] = QLatin1Char('\\');
-+                str[new_length++] = QLatin1Char('\\');
-+                str[new_length++] = QChar::fromLatin1('0' + val / 64);
-+                str[new_length++] = QChar::fromLatin1('0' + (val % 64) / 8);
-+                str[new_length++] = QChar::fromLatin1('0' + val % 8);
-             } else {
--                str[new_length++] = val;
-+                str[new_length++] = QChar::fromLatin1(val);
-             }
-         }
-     } else {
-         for (int i = 0; i < size; i++) {
-             const unsigned char val = array[i];
--            str[new_length++] = intToHexDigit(val / 16);
--            str[new_length++] = intToHexDigit(val % 16);
-+            str[new_length++] =  QChar::fromLatin1(intToHexDigit(val / 16));
-+            str[new_length++] =  QChar::fromLatin1(intToHexDigit(val % 16));
-         }
-     }
-     if (type == BLOBEscapingType::XHex || type == BLOBEscapingType::Octal) {
--        str[new_length++] = '\'';
-+        str[new_length++] = QLatin1Char('\'');
-     } else if (type == BLOBEscapingType::ByteaHex) {
--        str[new_length++] = '\'';
--        str[new_length++] = ':';
--        str[new_length++] = ':';
--        str[new_length++] = 'b';
--        str[new_length++] = 'y';
--        str[new_length++] = 't';
--        str[new_length++] = 'e';
--        str[new_length++] = 'a';
-+        str[new_length++] = QLatin1Char('\'');
-+        str[new_length++] = QLatin1Char(':');
-+        str[new_length++] = QLatin1Char(':');
-+        str[new_length++] = QLatin1Char('b');
-+        str[new_length++] = QLatin1Char('y');
-+        str[new_length++] = QLatin1Char('t');
-+        str[new_length++] = QLatin1Char('e');
-+        str[new_length++] = QLatin1Char('a');
-     }
-     return str;
- }
--- 
-2.31.1
-
diff --git a/dev-db/kdb/kdb-3.2.0-r1.ebuild b/dev-db/kdb/kdb-3.2.0-r2.ebuild
index 672f29b8c9e0..caf82c0d8d8c 100644
--- a/dev-db/kdb/kdb-3.2.0-r1.ebuild
+++ b/dev-db/kdb/kdb-3.2.0-r2.ebuild
@@ -1,20 +1,21 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_QTHELP="true"
 ECM_TEST="true"
-PYTHON_COMPAT=( python3_{7,8,9} )
-KFMIN=5.60.0
-QTMIN=5.12.3
+PYTHON_COMPAT=( python3_{8..10} )
+KFMIN=5.82.0
+QTMIN=5.15.2
 inherit ecm kde.org python-any-r1
 
 DESCRIPTION="Database connectivity and creation framework for various vendors"
 HOMEPAGE="https://community.kde.org/KDb"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/src/${P}.tar.xz"
+	SRC_URI="mirror://kde/stable/${PN}/src/${P}.tar.xz
+	https://dev.gentoo.org/~asturm/distfiles/${P}-patches.tar.xz"
 	KEYWORDS="amd64 x86"
 fi
 
@@ -22,9 +23,6 @@ LICENSE="LGPL-2+"
 SLOT="5/4"
 IUSE="debug mysql postgres sqlite"
 
-BDEPEND="${PYTHON_DEPS}
-	dev-qt/linguist-tools:5
-"
 DEPEND="
 	dev-libs/icu:=
 	>=dev-qt/qtgui-${QTMIN}:5
@@ -34,21 +32,25 @@ DEPEND="
 	>=kde-frameworks/kcoreaddons-${KFMIN}:5
 	mysql? ( dev-db/mysql-connector-c:= )
 	postgres? (
-		>=dev-qt/qtnetwork-${QTMIN}:5
 		dev-db/postgresql:*
+		>=dev-qt/qtnetwork-${QTMIN}:5
 	)
 	sqlite? ( dev-db/sqlite:3 )
 "
 RDEPEND="${DEPEND}"
+BDEPEND="${PYTHON_DEPS}
+	dev-qt/linguist-tools:5
+"
 
 PATCHES=(
 	# 3.2 branch
-	"${FILESDIR}"/${P}-cmake-pg12.patch
-	"${FILESDIR}"/${P}-build-w-pg12.patch
-	"${FILESDIR}"/${P}-cmake-pg13.patch
-	"${FILESDIR}"/${P}-qt-5.15.patch
+	"${WORKDIR}"/${P}-patches/${P}-build-w-pg12.patch
+	"${WORKDIR}"/${P}-patches/${P}-qt-5.15.patch
+	"${WORKDIR}"/${P}-patches/${P}-cmake-pg15.patch
+	"${WORKDIR}"/${P}-patches/${P}-Q_REQUIRED_RESULT-placing.patch
+	"${WORKDIR}"/${P}-patches/${P}-gcc12.patch
 	# master
-	"${FILESDIR}"/${P}-KDEInstallDirs.patch
+	"${WORKDIR}"/${P}-patches/${P}-KDEInstallDirs.patch
 )
 
 pkg_setup() {