gentoo resync : 20.03.2022

3 files changed, 18 insertions, 17 deletions

diff --git a/app-office/kexi/Manifest b/app-office/kexi/Manifest
index c1e02e748efa..01db1310d5b9 100644
--- a/app-office/kexi/Manifest
+++ b/app-office/kexi/Manifest
@@ -1,7 +1,7 @@
 AUX kexi-3.2.0-fix-find-marble.patch 2537 BLAKE2B a78cbaa2edcdc8f424c366b9d8dcdf930db685155bff343828bc8c4c18993ba86a64025893aa0e1505d3955e4fcc836f8eb7f87a8640f786177c08c1ff47739a SHA512 4a579862f9941163d47e7bd5e7cd36f35419499e34381627963149b9e5a9ab82d6c673651e5303f68c5be1a733e7315b51711e6fe45841175a11eee3a1d5af02
 AUX kexi-3.2.0-glib-2.68.patch 1223 BLAKE2B 354fbb183b30bf678eb0b896fee5ae607bf873b915245a9765738b2ef07bf4fd1838c869287de365d544aec25bbce97f2a4320a620e1e49d36d4f9320f14c624 SHA512 e9a75f4f7aaf93fc1bc6d08705d1e3389b5e24611aa5f903c033ad55824ac912f1d6cb31674c2af8c097b91e4007c7b62de82305f061be447f119004ccce98bc
 AUX kexi-3.2.0-missing-header.patch 739 BLAKE2B da09cf24f4852222040112a7774bd5d0463f85d52d52c352b453f4d0502085a0faa67ae3ae8fd44102c2fa3b8840525929e53c9ad1a05acfb5c23747cdbb6d91 SHA512 14779c27e47d7e3c0f3f8de917deae8fed7b38673bcc5ec53fa0ca7c89c354a3601af80c6fe17ab3231f633852c47c0dcd2858834cee79a961fc3d02a1043fa1
-AUX kexi-3.2.0-postgresql-9.12.patch 1094 BLAKE2B ac9ba4ff8f5c29ae8ebdcfa6820ed8663aa0f13a9fb55f4eff85265fa3d76a3e33e6c1000400a7a21721e9f45ba58006dbb97c312fd4b96f9d0e9e49dfd88690 SHA512 cfde38090e163ff441477c7f8262629589c9ab49c2687eefe7e0a107f4d70fd447cc35e1031612a6ce970e3b3ec3b9394f13e6e2876c29614cb43ba0b9fc9fbd
+AUX kexi-3.2.0-postgresql-9.14.patch 1114 BLAKE2B f4be17057626a66baf65ca0f2aaa5760ffa95f9110bb9541d90c89d2f1c227465d6832aeb47fb743f08e619a42b7d7d3f327d8a7a45aa9a86d687aeacb1e6059 SHA512 0ad16ed8737ee0d559517d16c7188f9156e01c45cfd4511be65113018d3b42df68ead147e9e43f022e2fcf71063871984baba103774a75f8ff27f5dfb3b00829
 DIST kexi-3.2.0.tar.xz 3624956 BLAKE2B 8d0b3712f07d13f606c4c0d714b3d4ea0fe9f56e4d4a3aeeb144ffda56cd5ef89e4f08d5660550364103c86acd60923ddc74fcea135a23fffbae87853a7c00f4 SHA512 5cb9e0747c8e7ea19020b62345571ba10f65278dcc718bb0772827721bf8812d0ffee3c35d53b57285884c66e0406520835c7b00789fbe5459717722dff13e93
-EBUILD kexi-3.2.0-r2.ebuild 2563 BLAKE2B 7e59fb8d1e99e0330db54cdcfba82c0e32836fc7fbc70792373ede56522d9365b4d51e7f9a002b0c3ea948876cc22cc356547ba94f7694f888bbe30ac9f36772 SHA512 0a800fde2d0f76566ae6e33d03d777518dc12f6a56fcb28cababd6781ee44dbcc798211b36133b84eb80a9ac2a208c612d6fe7cfe850beb230dd5ad8dfbfc0f3
+EBUILD kexi-3.2.0-r3.ebuild 2545 BLAKE2B 2b7718bea30a0964547e332745ea0b8da4fd72573b5667750871b1509032582d2cf95047b63c0dc7261df1d919596b78861ae56212fd6241b080a446682a36f1 SHA512 1546a41bb36640adff31ff8960abe658f4b5b5e3e164efdc060501335084478e909fbb25c63107d77bd006e1fedd202161f47b06f6216c05e4a819efb2be3ae1
 MISC metadata.xml 575 BLAKE2B 1dca47de7a2eb1ddd144ce3973ae4a9ed10cdf26ee7e5fae40db8758f644337c47a8af5025a1e93ef709aa379f50af59a442c8d9946853686089968a0865f29f SHA512 e4043a2476ebed2ce2af0ea7b1dc16f9ddd8370319882a3390384f27c8277358bb98800dc456f75b57d254cc991adbfd1c822639eb5c5022327bb68e4b724f79
diff --git a/app-office/kexi/files/kexi-3.2.0-postgresql-9.12.patch b/app-office/kexi/files/kexi-3.2.0-postgresql-9.14.patch
index 8835c5ea13db..faea50c0ac85 100644
--- a/app-office/kexi/files/kexi-3.2.0-postgresql-9.12.patch
+++ b/app-office/kexi/files/kexi-3.2.0-postgresql-9.14.patch
@@ -1,14 +1,14 @@
-From 88ac2b4a1386bc05f0e3965f31949039eaf4d3ff Mon Sep 17 00:00:00 2001
+From 49c3b55019ebb563852c8ee1172def3288cd0fda Mon Sep 17 00:00:00 2001
 From: Pino Toscano <pino@kde.org>
-Date: Sat, 25 May 2019 07:12:17 +0200
-Subject: cmake: find PostgreSQL 12
+Date: Fri, 21 May 2021 13:33:49 +0200
+Subject: [PATCH] cmake: find PostgreSQL 14
 
 ---
  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 56e6e56..1579be0 100644
+index 16e3cc32a..12b1469b4 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
@@ -16,9 +16,10 @@ index 56e6e56..1579be0 100644
  
  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")
++    "14" "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} )
 -- 
-cgit v1.1
+GitLab
+
diff --git a/app-office/kexi/kexi-3.2.0-r2.ebuild b/app-office/kexi/kexi-3.2.0-r3.ebuild
index af75314b961f..e022c45179ae 100644
--- a/app-office/kexi/kexi-3.2.0-r2.ebuild
+++ b/app-office/kexi/kexi-3.2.0-r3.ebuild
@@ -1,12 +1,12 @@
-# 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_HANDBOOK="true"
 ECM_TEST="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
+KFMIN=5.82.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Visual database applications creator"
@@ -22,7 +22,6 @@ LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
 IUSE="debug experimental marble mdb mysql postgres sqlite"
 
-BDEPEND="sys-devel/gettext"
 DEPEND="
 	>=dev-db/kdb-3.1.0-r1:5=[debug?,mysql?,postgres?,sqlite?]
 	>=dev-libs/kproperty-3.1.0:5=
@@ -50,7 +49,7 @@ DEPEND="
 	>=kde-frameworks/ktextwidgets-${KFMIN}:5
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	marble? ( >=kde-apps/marble-19.04.3:5= )
+	marble? ( kde-apps/marble:5= )
 	mdb? (
 		dev-libs/glib:2
 		virtual/libiconv
@@ -62,17 +61,18 @@ DEPEND="
 	)
 "
 RDEPEND="${DEPEND}"
+BDEPEND="sys-devel/gettext"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-missing-header.patch
-	"${FILESDIR}"/${P}-postgresql-9.12.patch
+	"${FILESDIR}"/${P}-postgresql-9.14.patch
 	"${FILESDIR}"/${P}-glib-2.68.patch # bug 784974
 	"${FILESDIR}"/${P}-fix-find-marble.patch # bug 812392
 )
 
 src_prepare() {
-	ecm_punt_bogus_dep Qt5 WebKit
-	ecm_punt_bogus_dep Qt5 WebKitWidgets
+	ecm_punt_qt_module WebKit
+	ecm_punt_qt_module WebKitWidgets
 
 	ecm_src_prepare
 }