gentoo resync : 15.01.2020

4 files changed, 91 insertions, 19 deletions

diff --git a/dev-db/kdb/Manifest b/dev-db/kdb/Manifest
index a4208b55c6cd..bd0acd350c86 100644
--- a/dev-db/kdb/Manifest
+++ b/dev-db/kdb/Manifest
@@ -1,3 +1,5 @@
+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
 DIST kdb-3.2.0.tar.xz 650180 BLAKE2B 306152b37c2ecc670d26a2df2ae8acb950505ecb37c4994f4debd1b80c8b2ee94252658fe28b59255d9ad0d350375171f3b43dc9e94949417c3aa9ed167134fe SHA512 7df22f2c5b6e20ae3de71cb6c76b234d2f1f33b2abcdffa85be313c63d067a40a85ed102b6256207315db08ced5d69f8bc40afdf84a188463713a6b2ffdb2df7
-EBUILD kdb-3.2.0.ebuild 1131 BLAKE2B f6953a932cf9f23afb435e47fff7c4e5887cee5762d3afcee1a855cf82c6116b3e3a0a0c89511cb31a38a2d8687cf874dce6a9bb5e9d29638912b4795fd38216 SHA512 583f35410f0c6ee3c844c776b66838c1670a79e5c8f07925e33d7de83d03b0ff519acd88920606b1b05e00c7cad9036998ee72f86400801a8f5d39dc9cba513e
+EBUILD kdb-3.2.0.ebuild 1316 BLAKE2B 49ac4ff6cc7d4dcab60b5ae098f1da90c97931e060050dcfdd35b46e9e7a0508cd06794be47fc03ed6e6a342ccbbb4daa233db29daa7b9f030599f01e834af1b SHA512 a9e80239f052092480bd5deb54e70da21f045207a746335ed4a1b6b1cb99453470a318af77c0bcf4636a077b1651e61541ef2288ca0d84ae8b54736512d046fa
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
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
new file mode 100644
index 000000000000..5329fae80d83
--- /dev/null
+++ b/dev-db/kdb/files/kdb-3.2.0-build-w-pg12.patch
@@ -0,0 +1,35 @@
+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
new file mode 100644
index 000000000000..4258fdc47453
--- /dev/null
+++ b/dev-db/kdb/files/kdb-3.2.0-cmake-pg12.patch
@@ -0,0 +1,24 @@
+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/kdb-3.2.0.ebuild b/dev-db/kdb/kdb-3.2.0.ebuild
index cc81d3aad20c..b96351cf4d17 100644
--- a/dev-db/kdb/kdb-3.2.0.ebuild
+++ b/dev-db/kdb/kdb-3.2.0.ebuild
@@ -1,52 +1,63 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-KDE_QTHELP="true"
-KDE_TEST="true"
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-inherit kde5 python-any-r1
+ECM_QTHELP="true"
+ECM_TEST="true"
+PYTHON_COMPAT=( python3_{6,7,8} )
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org python-any-r1
 
 DESCRIPTION="Database connectivity and creation framework for various vendors"
-[[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="mirror://kde/stable/${PN}/src/${P}.tar.xz"
+HOMEPAGE="https://community.kde.org/KDb"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/src/${P}.tar.xz"
+	KEYWORDS="amd64 x86"
+fi
 
 LICENSE="LGPL-2+"
 SLOT="5/4"
-KEYWORDS="amd64 x86"
 IUSE="debug mysql postgres sqlite"
 
 BDEPEND="${PYTHON_DEPS}
 	dev-qt/linguist-tools:5
 "
 DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
 	dev-libs/icu:=
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
 	mysql? ( dev-db/mysql-connector-c:= )
 	postgres? (
-		$(add_qt_dep qtnetwork)
+		>=dev-qt/qtnetwork-${QTMIN}:5
 		dev-db/postgresql:*
 	)
 	sqlite? ( dev-db/sqlite:3 )
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-cmake-pg12.patch
+	"${FILESDIR}"/${P}-build-w-pg12.patch
+)
+
 pkg_setup() {
 	python-any-r1_pkg_setup
-	kde5_pkg_setup
+	ecm_pkg_setup
 }
 
 src_configure() {
 	local mycmakeargs=(
 		-DKDB_DEBUG_GUI=$(usex debug)
-		$(cmake-utils_use_find_package mysql MySQL)
-		$(cmake-utils_use_find_package postgres PostgreSQL)
-		$(cmake-utils_use_find_package sqlite Sqlite)
+		$(cmake_use_find_package mysql MySQL)
+		$(cmake_use_find_package postgres PostgreSQL)
+		$(cmake_use_find_package sqlite Sqlite)
 	)
 
-	kde5_src_configure
+	ecm_src_configure
 }