[gentoo-commits] repo/gentoo:master commit in: dev-db/kdb/files/, app-office/kexi/, dev-db/kdb/

[Andreas Sturmlechner]

commit:     f1c14f509a934577cff01732f4f897649ee820fe
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 13 01:48:49 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 12 13:18:07 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1c14f50

dev-db/kdb: Port away from kde5.eclass, add HOMEPAGE, python3_8, py27--

Fix build with PostgreSQL 12

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 app-office/kexi/kexi-3.2.0-r1.ebuild          |  2 +-
 dev-db/kdb/files/kdb-3.2.0-build-w-pg12.patch | 35 +++++++++++++++++++++++
 dev-db/kdb/files/kdb-3.2.0-cmake-pg12.patch   | 24 ++++++++++++++++
 dev-db/kdb/kdb-3.2.0.ebuild                   | 41 +++++++++++++++++----------
 4 files changed, 86 insertions(+), 16 deletions(-)

diff --git a/app-office/kexi/kexi-3.2.0-r1.ebuild b/app-office/kexi/kexi-3.2.0-r1.ebuild
index 2a339bcd773..fa3280cd275 100644
--- a/app-office/kexi/kexi-3.2.0-r1.ebuild
+++ b/app-office/kexi/kexi-3.2.0-r1.ebuild
@@ -15,7 +15,7 @@ https://userbase.kde.org/Kexi"
 
 if [[ ${KDE_BUILD_TYPE} != live ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/src/${P}.tar.xz"
-	KEYWORDS="amd64 x86"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="GPL-2" # TODO: CHECK

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 00000000000..5329fae80d8
--- /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@×××.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 00000000000..4258fdc4745
--- /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@×××.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 ede80bfcaf1..b96351cf4d1 100644
--- a/dev-db/kdb/kdb-3.2.0.ebuild
+++ b/dev-db/kdb/kdb-3.2.0.ebuild
@@ -1,43 +1,54 @@
-# 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() {
@@ -48,5 +59,5 @@ src_configure() {
 		$(cmake_use_find_package sqlite Sqlite)
 	)
 
-	kde5_src_configure
+	ecm_src_configure
 }