summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository mirror & CI <repomirrorci@gentoo.org>2022-02-21 17:07:30 +0000
committerRepository mirror & CI <repomirrorci@gentoo.org>2022-02-21 17:07:30 +0000
commitb4c66d326473fb3cc46888d45002aa1894738e46 (patch)
treee7bc5873fe2e4f4e72e4031a0d4e1b56a54e0d83
parent2022-02-21 16:51:54 UTC (diff)
parentapp-office/ktimetracker: EAPI-8 bump, several upstream fixes (diff)
downloadgentoo-b4c66d326473fb3cc46888d45002aa1894738e46.tar.gz
gentoo-b4c66d326473fb3cc46888d45002aa1894738e46.tar.bz2
gentoo-b4c66d326473fb3cc46888d45002aa1894738e46.zip
Merge updates from master
-rw-r--r--app-editors/okteta/files/okteta-0.26.6-crashfix.patch34
-rw-r--r--app-editors/okteta/okteta-0.26.6-r1.ebuild71
-rw-r--r--app-office/kexi/files/kexi-3.2.0-postgresql-9.14.patch25
-rw-r--r--app-office/kexi/kexi-3.2.0-r3.ebuild93
-rw-r--r--app-office/ktimetracker/files/ktimetracker-5.0.1-fix-edit-history-dialog-crash.patch31
-rw-r--r--app-office/ktimetracker/files/ktimetracker-5.0.1-fix-formatTime-in-non-decimal-mode.patch33
-rw-r--r--app-office/ktimetracker/files/ktimetracker-5.0.1-fix-sorting-of-time-columns.patch38
-rw-r--r--app-office/ktimetracker/files/ktimetracker-5.0.1-fix-table-column-visibility.patch34
-rw-r--r--app-office/ktimetracker/ktimetracker-5.0.1-r1.ebuild52
-rw-r--r--dev-libs/kpeoplevcard/files/kpeoplevcard-0.1-emit-initial-fetch-complete-signal.patch29
-rw-r--r--dev-libs/kpeoplevcard/kpeoplevcard-0.1-r1.ebuild34
-rw-r--r--dev-vcs/kdesvn/Manifest1
-rw-r--r--dev-vcs/kdesvn/kdesvn-2.1.0-r1.ebuild74
-rw-r--r--eclass/cmake.eclass11
-rw-r--r--kde-misc/wacomtablet/Manifest1
-rw-r--r--kde-misc/wacomtablet/files/wacomtablet-3.2.0-qt-5.15.patch24
-rw-r--r--kde-misc/wacomtablet/wacomtablet-3.2.0-r1.ebuild70
-rw-r--r--kde-misc/wacomtablet/wacomtablet-3.2.0.ebuild4
-rw-r--r--net-im/choqok/Manifest1
-rw-r--r--net-im/choqok/choqok-1.7.0-r1.ebuild74
-rw-r--r--sys-auth/polkit-qt/files/polkit-qt-0.114.0-cmake.patch301
-rw-r--r--sys-auth/polkit-qt/files/polkit-qt-0.114.0-glib-2.36.patch188
-rw-r--r--sys-auth/polkit-qt/polkit-qt-0.114.0-r1.ebuild45
23 files changed, 1242 insertions, 26 deletions
diff --git a/app-editors/okteta/files/okteta-0.26.6-crashfix.patch b/app-editors/okteta/files/okteta-0.26.6-crashfix.patch
new file mode 100644
index 000000000000..8967fc788f5c
--- /dev/null
+++ b/app-editors/okteta/files/okteta-0.26.6-crashfix.patch
@@ -0,0 +1,34 @@
+From 607390315750815b0009b95ecd65699e2a1d110a Mon Sep 17 00:00:00 2001
+From: "Friedrich W. H. Kossebau" <kossebau@kde.org>
+Date: Thu, 11 Nov 2021 15:57:54 +0100
+Subject: [PATCH] String extraction tool: fix crash with marked strings in
+ closed view
+
+BUG: 444405
+
+FIXED-IN: 0.26.7
+---
+ .../controllers/view/stringsextract/stringsextracttool.cpp | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/kasten/controllers/view/stringsextract/stringsextracttool.cpp b/kasten/controllers/view/stringsextract/stringsextracttool.cpp
+index 0d629999a..bcb6b6734 100644
+--- a/kasten/controllers/view/stringsextract/stringsextracttool.cpp
++++ b/kasten/controllers/view/stringsextract/stringsextracttool.cpp
+@@ -58,7 +58,12 @@ QString StringsExtractTool::title() const { return i18nc("@title:window of the t
+ void StringsExtractTool::setTargetModel(AbstractModel* model)
+ {
+ if (mByteArrayView) {
+- mByteArrayView->disconnect(this);
++ // disconnect explicitly from all connects but QObject::detroyed,
++ // for the case mSourceByteArrayView is mByteArrayView
++ disconnect(mByteArrayView, &ByteArrayView::selectedDataChanged,
++ this, &StringsExtractTool::onSelectionChanged);
++ disconnect(mByteArrayView, &ByteArrayView::offsetCodingChanged,
++ this, &StringsExtractTool::offsetCodingChanged);
+ }
+
+ mByteArrayView = model ? model->findBaseModel<ByteArrayView*>() : nullptr;
+--
+GitLab
+
diff --git a/app-editors/okteta/okteta-0.26.6-r1.ebuild b/app-editors/okteta/okteta-0.26.6-r1.ebuild
new file mode 100644
index 000000000000..069fb020a206
--- /dev/null
+++ b/app-editors/okteta/okteta-0.26.6-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_DESIGNERPLUGIN="true"
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+KFMIN=5.82.0
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Hex editor by KDE"
+HOMEPAGE="https://apps.kde.org/okteta/ https://utils.kde.org/projects/okteta/"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+ SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+ KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="GPL-2 handbook? ( FDL-1.2 )"
+SLOT="5"
+IUSE="crypt"
+
+DEPEND="
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtprintsupport-${QTMIN}:5
+ >=dev-qt/qtscript-${QTMIN}:5[scripttools]
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+ >=kde-frameworks/kbookmarks-${KFMIN}:5
+ >=kde-frameworks/kcmutils-${KFMIN}:5
+ >=kde-frameworks/kcodecs-${KFMIN}:5
+ >=kde-frameworks/kcompletion-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kcrash-${KFMIN}:5
+ >=kde-frameworks/kdbusaddons-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kiconthemes-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/kjobwidgets-${KFMIN}:5
+ >=kde-frameworks/knewstuff-${KFMIN}:5
+ >=kde-frameworks/kparts-${KFMIN}:5
+ >=kde-frameworks/kservice-${KFMIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+ >=kde-frameworks/kxmlgui-${KFMIN}:5
+ crypt? ( >=app-crypt/qca-2.3.0:2 )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-crashfix.patch" )
+
+src_configure() {
+ local mycmakeargs=(
+ -DOMIT_EXAMPLES=ON
+ $(cmake_use_find_package crypt Qca-qt5)
+ )
+
+ ecm_src_configure
+}
+
+src_test() {
+ local myctestargs=( -j1 )
+
+ ecm_src_test
+}
diff --git a/app-office/kexi/files/kexi-3.2.0-postgresql-9.14.patch b/app-office/kexi/files/kexi-3.2.0-postgresql-9.14.patch
new file mode 100644
index 000000000000..faea50c0ac85
--- /dev/null
+++ b/app-office/kexi/files/kexi-3.2.0-postgresql-9.14.patch
@@ -0,0 +1,25 @@
+From 49c3b55019ebb563852c8ee1172def3288cd0fda Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino@kde.org>
+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 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
+ 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")
++ "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} )
+--
+GitLab
+
diff --git a/app-office/kexi/kexi-3.2.0-r3.ebuild b/app-office/kexi/kexi-3.2.0-r3.ebuild
new file mode 100644
index 000000000000..dc023a04abd9
--- /dev/null
+++ b/app-office/kexi/kexi-3.2.0-r3.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ECM_HANDBOOK="true"
+ECM_TEST="forceoptional"
+KFMIN=5.82.0
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="Visual database applications creator"
+HOMEPAGE="https://apps.kde.org/kexi-3.3/ http://kexi-project.org/
+https://userbase.kde.org/Kexi"
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+ SRC_URI="mirror://kde/stable/${PN}/src/${P}.tar.xz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+IUSE="debug experimental marble mdb mysql postgres sqlite"
+
+DEPEND="
+ >=dev-db/kdb-3.1.0-r1:5=[debug?,mysql?,postgres?,sqlite?]
+ >=dev-libs/kproperty-3.1.0:5=
+ >=dev-libs/kreport-3.1.0:5=[scripting]
+ >=dev-qt/designer-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtprintsupport-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+ >=kde-frameworks/breeze-icons-rcc-${KFMIN}:5
+ >=kde-frameworks/karchive-${KFMIN}:5
+ >=kde-frameworks/kcodecs-${KFMIN}:5
+ >=kde-frameworks/kcompletion-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kcrash-${KFMIN}:5
+ >=kde-frameworks/kguiaddons-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kiconthemes-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/kitemviews-${KFMIN}:5
+ >=kde-frameworks/ktexteditor-${KFMIN}:5
+ >=kde-frameworks/ktextwidgets-${KFMIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+ >=kde-frameworks/kxmlgui-${KFMIN}:5
+ marble? ( kde-apps/marble:5= )
+ mdb? (
+ dev-libs/glib:2
+ virtual/libiconv
+ )
+ mysql? ( dev-db/mysql-connector-c:= )
+ postgres? (
+ dev-db/postgresql:*
+ dev-libs/libpqxx
+ )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="sys-devel/gettext"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-missing-header.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_qt_module WebKit
+ ecm_punt_qt_module WebKitWidgets
+
+ ecm_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DKEXI_MIGRATEMANAGER_DEBUG=$(usex debug)
+ -DKEXI_AUTORISE_TABBED_TOOLBAR=$(usex experimental)
+ -DKEXI_SCRIPTS_SUPPORT=$(usex experimental)
+ $(cmake_use_find_package marble Marble)
+ $(cmake_use_find_package mdb GLIB2)
+ $(cmake_use_find_package mysql MySQL)
+ $(cmake_use_find_package postgres PostgreSQL)
+ )
+ use experimental && mycmakeargs+=( -DKEXI_SCRIPTING_DEBUG=$(usex debug) )
+
+ ecm_src_configure
+}
diff --git a/app-office/ktimetracker/files/ktimetracker-5.0.1-fix-edit-history-dialog-crash.patch b/app-office/ktimetracker/files/ktimetracker-5.0.1-fix-edit-history-dialog-crash.patch
new file mode 100644
index 000000000000..a27b7b6ae4d7
--- /dev/null
+++ b/app-office/ktimetracker/files/ktimetracker-5.0.1-fix-edit-history-dialog-crash.patch
@@ -0,0 +1,31 @@
+From 065d7c154641f83c46e490cbb5d15b6cff92121b Mon Sep 17 00:00:00 2001
+From: Marc Orcau <budalokko@gmail.com>
+Date: Tue, 27 Apr 2021 17:17:18 +0200
+Subject: [PATCH] Fix edit history dialog crash when event has non existent
+ related entity
+
+Replaced qFatal() by qCWarning(). Faulty event does not appear on the list then.
+
+BUG: 424993
+---
+ src/dialogs/historydialog.cpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/dialogs/historydialog.cpp b/src/dialogs/historydialog.cpp
+index ca2f10a..458c147 100644
+--- a/src/dialogs/historydialog.cpp
++++ b/src/dialogs/historydialog.cpp
+@@ -131,7 +131,9 @@ QString HistoryDialog::listAllEvents()
+
+ const Task *parent = dynamic_cast<Task*>(m_projectModel->tasksModel()->taskByUID(event->relatedTo()));
+ if (!parent) {
+- qFatal("orphan event");
++ qCWarning(KTT_LOG) << "Unable to load 'relatedTo' entry for " << event->summary();
++ err = "NoRelatedToForEvent";
++ continue;
+ }
+
+ auto *item = new QTableWidgetItem(parent->name());
+--
+GitLab
+
diff --git a/app-office/ktimetracker/files/ktimetracker-5.0.1-fix-formatTime-in-non-decimal-mode.patch b/app-office/ktimetracker/files/ktimetracker-5.0.1-fix-formatTime-in-non-decimal-mode.patch
new file mode 100644
index 000000000000..ad5be92794a3
--- /dev/null
+++ b/app-office/ktimetracker/files/ktimetracker-5.0.1-fix-formatTime-in-non-decimal-mode.patch
@@ -0,0 +1,33 @@
+From 310c0fee25f142c6f6a0e7a0b4445af2e8785c79 Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino@kde.org>
+Date: Wed, 21 Oct 2020 10:49:20 +0200
+Subject: [PATCH] Fix formatTime() in non-decimal mode on 32bit archs
+
+int64_t is not long int on 32bit architectures but long long int, thus
+the "%ld" printf modifer gets truncated/wrong values.
+
+As solution, do not use int64_t but long long int, so the "%lld" can be
+always used.
+---
+ src/ktimetrackerutility.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/ktimetrackerutility.cpp b/src/ktimetrackerutility.cpp
+index aca00e8..fe449ba 100644
+--- a/src/ktimetrackerutility.cpp
++++ b/src/ktimetrackerutility.cpp
+@@ -33,9 +33,9 @@ QString formatTime(double minutes, bool decimal)
+ time.sprintf("%.2f", minutes / 60.0);
+ time.replace('.', QLocale().decimalPoint());
+ } else {
+- const auto absMinutes = static_cast<int64_t>(std::round(std::fabs(minutes)));
++ const auto absMinutes = static_cast<long long int>(std::round(std::fabs(minutes)));
+ time.sprintf(
+- "%s%ld:%02ld",
++ "%s%lld:%02lld",
+ minutes < 0 ? QString(QLocale().negativeSign()).toUtf8().data() : "",
+ absMinutes / 60, absMinutes % 60);
+ }
+--
+GitLab
+
diff --git a/app-office/ktimetracker/files/ktimetracker-5.0.1-fix-sorting-of-time-columns.patch b/app-office/ktimetracker/files/ktimetracker-5.0.1-fix-sorting-of-time-columns.patch
new file mode 100644
index 000000000000..f30ed30eaf6c
--- /dev/null
+++ b/app-office/ktimetracker/files/ktimetracker-5.0.1-fix-sorting-of-time-columns.patch
@@ -0,0 +1,38 @@
+From 7b17dccec643ffbf9e51a011d2aa1547169e9686 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= <l.lunak@centrum.cz>
+Date: Sat, 8 May 2021 13:05:34 +0200
+Subject: [PATCH] fix sorting of time columns
+
+Commit 910b2939a07ee241 changed QVariant types for sorting from qlonglong
+to int64_t, but QSortFilterProxyModel::lessThan() docs explicitly list
+types that are compared numerically, int64_t is not one of them, so it
+gets sorted as a string. This meant that '0:02' was sorted before '0:17'.
+---
+ src/model/task.cpp | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/model/task.cpp b/src/model/task.cpp
+index 106e719..ff68b24 100644
+--- a/src/model/task.cpp
++++ b/src/model/task.cpp
+@@ -509,13 +509,13 @@ QVariant Task::data(int column, int role) const
+ case 0:
+ return m_name;
+ case 1:
+- return QVariant::fromValue<int64_t>(m_sessionTime);
++ return QVariant::fromValue<qlonglong>(m_sessionTime);
+ case 2:
+- return QVariant::fromValue<int64_t>(m_time);
++ return QVariant::fromValue<qlonglong>(m_time);
+ case 3:
+- return QVariant::fromValue<int64_t>(m_totalSessionTime);
++ return QVariant::fromValue<qlonglong>(m_totalSessionTime);
+ case 4:
+- return QVariant::fromValue<int64_t>(m_totalTime);
++ return QVariant::fromValue<qlonglong>(m_totalTime);
+ case 5:
+ return QVariant::fromValue<int>(m_priority);
+ case 6:
+--
+GitLab
+
diff --git a/app-office/ktimetracker/files/ktimetracker-5.0.1-fix-table-column-visibility.patch b/app-office/ktimetracker/files/ktimetracker-5.0.1-fix-table-column-visibility.patch
new file mode 100644
index 000000000000..13edc84a6114
--- /dev/null
+++ b/app-office/ktimetracker/files/ktimetracker-5.0.1-fix-table-column-visibility.patch
@@ -0,0 +1,34 @@
+From ddc87a47089b900ee1c62be10b23d0d4bb2361f1 Mon Sep 17 00:00:00 2001
+From: Alexander Potashev <aspotashev@gmail.com>
+Date: Mon, 24 Feb 2020 23:01:23 +0100
+Subject: [PATCH] TaskView: Change visibility of table columns after the view
+ is connected to model
+
+Otherwise setColumnHidden() has no effect.
+
+BUG: 417988
+---
+ src/taskview.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/taskview.cpp b/src/taskview.cpp
+index 3b9578f..c1b7580 100644
+--- a/src/taskview.cpp
++++ b/src/taskview.cpp
+@@ -164,12 +164,12 @@ void TaskView::load(const QUrl &url)
+ m_tasksWidget->setRootIsDecorated(true);
+
+ reconfigureModel();
+- m_tasksWidget->reconfigure();
+
+ // Connect to the new model created by TimeTrackerStorage::load()
+ auto *tasksModel = m_storage->tasksModel();
+ m_filterProxyModel->setSourceModel(tasksModel);
+ m_tasksWidget->setSourceModel(tasksModel);
++ m_tasksWidget->reconfigure();
+ for (int i = 0; i <= tasksModel->columnCount(QModelIndex()); ++i) {
+ m_tasksWidget->resizeColumnToContents(i);
+ }
+--
+GitLab
+
diff --git a/app-office/ktimetracker/ktimetracker-5.0.1-r1.ebuild b/app-office/ktimetracker/ktimetracker-5.0.1-r1.ebuild
new file mode 100644
index 000000000000..8174fe9a4bfa
--- /dev/null
+++ b/app-office/ktimetracker/ktimetracker-5.0.1-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+KDE_ORG_CATEGORY="pim"
+KFMIN=5.82.0
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="Todo management and time tracker"
+HOMEPAGE="https://userbase.kde.org/KTimeTracker"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+ SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+ KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
+SLOT="5"
+IUSE=""
+
+DEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+ >=kde-frameworks/kcalendarcore-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kdbusaddons-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kidletime-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/kjobwidgets-${KFMIN}:5
+ >=kde-frameworks/knotifications-${KFMIN}:5
+ >=kde-frameworks/ktextwidgets-${KFMIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5
+ >=kde-frameworks/kxmlgui-${KFMIN}:5
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${P}-fix-table-column-visibility.patch" # KDE-bug 417988
+ "${FILESDIR}/${P}-fix-formatTime-in-non-decimal-mode.patch"
+ "${FILESDIR}/${P}-fix-edit-history-dialog-crash.patch" # KDE-bug 424993
+ "${FILESDIR}/${P}-fix-sorting-of-time-columns.patch"
+)
diff --git a/dev-libs/kpeoplevcard/files/kpeoplevcard-0.1-emit-initial-fetch-complete-signal.patch b/dev-libs/kpeoplevcard/files/kpeoplevcard-0.1-emit-initial-fetch-complete-signal.patch
new file mode 100644
index 000000000000..3f16d9f5b674
--- /dev/null
+++ b/dev-libs/kpeoplevcard/files/kpeoplevcard-0.1-emit-initial-fetch-complete-signal.patch
@@ -0,0 +1,29 @@
+From 778d03445f41c536f2ca9116ee6acb5f4f01b868 Mon Sep 17 00:00:00 2001
+From: Dimitar Petrovski <dimeptr@gmail.com>
+Date: Mon, 6 Jul 2020 18:36:31 +0200
+Subject: [PATCH] Emit the Initial Fetch Complete signal
+
+BUG: 423845
+The plugin does not emit the initialFetchComplete signal which seems
+needed by AllContactsMonitor and PersonsModel does not get initialized
+since it waitd for the signal from all plugins
+---
+ src/kpeoplevcard.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/kpeoplevcard.cpp b/src/kpeoplevcard.cpp
+index bfaf71e..20531f6 100644
+--- a/src/kpeoplevcard.cpp
++++ b/src/kpeoplevcard.cpp
+@@ -153,6 +153,8 @@ KPeopleVCard::KPeopleVCard()
+
+ processDirectory(QFileInfo(*vcardsLocation));
+
++ emitInitialFetchComplete(true);
++
+ connect(m_fs, &KDirWatch::dirty, this, [this](const QString& path) {
+ const QFileInfo fi(path);
+ if (fi.isFile())
+--
+GitLab
+
diff --git a/dev-libs/kpeoplevcard/kpeoplevcard-0.1-r1.ebuild b/dev-libs/kpeoplevcard/kpeoplevcard-0.1-r1.ebuild
new file mode 100644
index 000000000000..3f8700aecede
--- /dev/null
+++ b/dev-libs/kpeoplevcard/kpeoplevcard-0.1-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_CATEGORY="pim"
+KFMIN=5.82.0
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="Library to expose vcards to KPeople"
+HOMEPAGE="https://invent.kde.org/pim/kpeoplevcard"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+ SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+ KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+fi
+
+LICENSE="LGPL-2.1+"
+SLOT="5"
+
+DEPEND="
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=kde-frameworks/kcontacts-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kpeople-${KFMIN}:5
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${P}-emit-initial-fetch-complete-signal.patch" # KDE-bug 423845
+)
diff --git a/dev-vcs/kdesvn/Manifest b/dev-vcs/kdesvn/Manifest
index 8eb941a0a38c..aef6190249fa 100644
--- a/dev-vcs/kdesvn/Manifest
+++ b/dev-vcs/kdesvn/Manifest
@@ -1 +1,2 @@
+DIST kdesvn-2.1.0-patchset-1.tar.xz 7368 BLAKE2B 6da62bdad00a4846a4046535f26559d5c7738fd5a799bbbb4c7d4e3e03f0fa0afba763bfee067cb5bc745df56ef51dcafd4187784a69bce743fe6ac3d90372d1 SHA512 046b335ab2e68ff46849a6f7a3331de7f0f3da653a9971a2fe20cc12fe4af0e1aa192340c77fbadac81e58eeb238f3ec269a99032f87b0bed55bcbb5fc90d920
DIST kdesvn-2.1.0.tar.xz 2096108 BLAKE2B b2807e6222d5743858a9592fe568c851e466f1349bb97869c3acab892b6ef9ce730d6ec1875b720b2ebb5e2099f6d4287bf76995d7b95800f0814499736b97c7 SHA512 ec1ad8422fd698a9c07d43c3051aabff615ea774c0e988ae07843f1935a2a5c3390cf175db5c10acfe3d94abcd7a2b9b41680047598c4e7b53162cdb4e74768d
diff --git a/dev-vcs/kdesvn/kdesvn-2.1.0-r1.ebuild b/dev-vcs/kdesvn/kdesvn-2.1.0-r1.ebuild
new file mode 100644
index 000000000000..46954106702e
--- /dev/null
+++ b/dev-vcs/kdesvn/kdesvn-2.1.0-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.82.0
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="Frontend to the subversion vcs"
+HOMEPAGE="https://apps.kde.org/kdesvn/"
+
+if [[ ${PV} != 9999* ]]; then
+ SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz
+ https://dev.gentoo.org/~asturm/distfiles/${P}-patchset-1.tar.xz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="5"
+IUSE="+man"
+
+DEPEND="
+ dev-libs/apr:1
+ dev-libs/apr-util:1
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtsql-${QTMIN}:5[sqlite]
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+ dev-vcs/subversion
+ >=kde-frameworks/kbookmarks-${KFMIN}:5
+ >=kde-frameworks/kcodecs-${KFMIN}:5
+ >=kde-frameworks/kcompletion-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kdbusaddons-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kiconthemes-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/kitemviews-${KFMIN}:5
+ >=kde-frameworks/kjobwidgets-${KFMIN}:5
+ >=kde-frameworks/knotifications-${KFMIN}:5
+ >=kde-frameworks/kparts-${KFMIN}:5
+ >=kde-frameworks/kservice-${KFMIN}:5
+ >=kde-frameworks/ktextwidgets-${KFMIN}:5
+ >=kde-frameworks/kwallet-${KFMIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+ >=kde-frameworks/kxmlgui-${KFMIN}:5
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+ man? ( >=kde-frameworks/kdoctools-${KFMIN}:5 )
+"
+
+PATCHES=(
+ "${WORKDIR}"/${P}-remove-help-button.patch # KDE-bug 410566
+ "${WORKDIR}"/${P}-fix-openwith-context-menu.patch # KDE-bug 410585
+ "${WORKDIR}"/${P}-fix-dupl-cli-options.patch
+ "${WORKDIR}"/${P}-crashfix-w-o-local-checkout-path.patch # KDE-bug 419906
+ "${WORKDIR}"/${P}-crashfix-closing-repo.patch # KDE-bug 437948
+ "${WORKDIR}"/${P}-hidpi-{1,2}.patch
+ "${WORKDIR}"/${P}-fix-deprecated.patch
+)
+
+src_prepare(){
+ ecm_src_prepare
+
+ if ! use man ; then
+ sed -i -e "/kdoctools_create_manpage/ s/^/#/" doc/CMakeLists.txt || die
+ fi
+}
diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index 02683634af9f..c9ff40f42c2e 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -406,6 +406,12 @@ cmake_src_prepare() {
_CMAKE_SRC_PREPARE_HAS_RUN=1
}
+# @VARIABLE: MYCMAKEARGS
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# User-controlled environment variable containing arguments to be passed to
+# cmake in cmake_src_configure.
+
# @FUNCTION: cmake_src_configure
# @DESCRIPTION:
# General function for configuring with cmake. Default behaviour is to start an
@@ -593,9 +599,12 @@ cmake_src_configure() {
"${mycmakeargs_local[@]}"
-DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}"
-DCMAKE_TOOLCHAIN_FILE="${toolchain_file}"
- "${MYCMAKEARGS}"
)
+ if [[ -n ${MYCMAKEARGS} ]] ; then
+ cmakeargs+=( "${MYCMAKEARGS}" )
+ fi
+
if [[ -n "${CMAKE_EXTRA_CACHE_FILE}" ]] ; then
cmakeargs+=( -C "${CMAKE_EXTRA_CACHE_FILE}" )
fi
diff --git a/kde-misc/wacomtablet/Manifest b/kde-misc/wacomtablet/Manifest
index d848982dd35e..b1170c608238 100644
--- a/kde-misc/wacomtablet/Manifest
+++ b/kde-misc/wacomtablet/Manifest
@@ -1 +1,2 @@
+DIST wacomtablet-3.2.0-patchset-1.tar.xz 7796 BLAKE2B 4fa998a0f4376579d1e0d06a8aa9edababedca22d579dbdae651eee3699decc880a7a1d277f04c2bc24adba87908c07ab711989a5985b68af5b295d3b3260d33 SHA512 ff96f05831e4760ce99920061f0dc927aa6a2d5ef4b7443c3129bb1431262cb4bc1434097595976672393e3b611438014ccb528fc948e7c0407fc9a2d52ade8d
DIST wacomtablet-3.2.0.tar.xz 728468 BLAKE2B f741c8989f94cdc5b4839df5d91a6728c48308880c489e031d4615a58e82dddda75dcd1cd04b941035c1aece3ed4f7889508629100852cbcaafc063d7e0f8d1e SHA512 acbabd6d6546bc85f0ed4e245668dc89b1c2ecaedd3754bf7ad8027b90f3ae81e5312395376de272dcbd416a9a1115bff2481351bd3f418bef7fa06d0db0c5a6
diff --git a/kde-misc/wacomtablet/files/wacomtablet-3.2.0-qt-5.15.patch b/kde-misc/wacomtablet/files/wacomtablet-3.2.0-qt-5.15.patch
deleted file mode 100644
index 572450b0b113..000000000000
--- a/kde-misc/wacomtablet/files/wacomtablet-3.2.0-qt-5.15.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 4f73ff02b3efd5e8728b18fcf1067eca166704ee Mon Sep 17 00:00:00 2001
-From: Christophe Giboudeaux <christophe@krop.fr>
-Date: Thu, 4 Jun 2020 16:00:38 +0200
-Subject: Fix build with Qt 5.15
-
----
- src/kcmodule/pressurecurvewidget.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/kcmodule/pressurecurvewidget.cpp b/src/kcmodule/pressurecurvewidget.cpp
-index 0c943b3..f047a6c 100644
---- a/src/kcmodule/pressurecurvewidget.cpp
-+++ b/src/kcmodule/pressurecurvewidget.cpp
-@@ -22,6 +22,7 @@
- //Qt includes
- #include <QDebug>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QMouseEvent>
- #include <QResizeEvent>
- #include <QTabletEvent>
---
-cgit v1.1
-
diff --git a/kde-misc/wacomtablet/wacomtablet-3.2.0-r1.ebuild b/kde-misc/wacomtablet/wacomtablet-3.2.0-r1.ebuild
new file mode 100644
index 000000000000..9a4c1ff47f25
--- /dev/null
+++ b/kde-misc/wacomtablet/wacomtablet-3.2.0-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.82.0
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="System settings module for Wacom tablets"
+HOMEPAGE="https://apps.kde.org/wacomtablet/
+https://userbase.kde.org/Wacomtablet"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz
+https://dev.gentoo.org/~asturm/distfiles/${P}-patchset-1.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ >=dev-libs/libwacom-0.30
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtx11extras-${QTMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kdbusaddons-${KFMIN}:5
+ >=kde-frameworks/kglobalaccel-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/knotifications-${KFMIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5
+ >=kde-frameworks/kxmlgui-${KFMIN}:5
+ >=kde-frameworks/plasma-${KFMIN}:5
+ >=x11-drivers/xf86-input-wacom-0.20.0
+ x11-libs/libXi
+ x11-libs/libxcb
+"
+DEPEND="${RDEPEND}
+ x11-base/xorg-proto
+ x11-libs/libX11
+"
+BDEPEND="sys-devel/gettext"
+
+PATCHES=(
+ "${WORKDIR}/${P}-qt-5.15.patch"
+ "${WORKDIR}/${P}-qt-5.15-obsoletions.patch"
+ "${WORKDIR}/${P}-no-override-screenspace-w-missing-screen.patch" # KDE-bug 419392
+ "${WORKDIR}/${P}-fix-xsetwacom-adapter.patch"
+ "${WORKDIR}/${P}-Intuos-M-bluetooth.patch" # KDE-bug 418827
+ "${WORKDIR}/${P}-correct-icons.patch"
+ "${WORKDIR}/${P}-drop-empty-X-KDE-PluginInfo-Depends.patch"
+ "${WORKDIR}/${P}-fix-QProcess-invocation.patch"
+ "${WORKDIR}/${P}-turn-off-gesture-support-by-default.patch" # KDE-bug 440556
+ "${WORKDIR}/${P}-only-show-on-X11.patch"
+)
+
+src_test() {
+ # test needs DBus, bug 675548
+ local myctestargs=(
+ -E "(Test.KDED.DBusTabletService)"
+ )
+
+ ecm_src_test
+}
diff --git a/kde-misc/wacomtablet/wacomtablet-3.2.0.ebuild b/kde-misc/wacomtablet/wacomtablet-3.2.0.ebuild
index 01eecd353f26..f75a218f027c 100644
--- a/kde-misc/wacomtablet/wacomtablet-3.2.0.ebuild
+++ b/kde-misc/wacomtablet/wacomtablet-3.2.0.ebuild
@@ -12,6 +12,8 @@ inherit ecm kde.org
DESCRIPTION="System settings module for Wacom tablets"
HOMEPAGE="https://apps.kde.org/wacomtablet/
https://userbase.kde.org/Wacomtablet"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz
+https://dev.gentoo.org/~asturm/distfiles/${P}-patchset-1.tar.xz"
LICENSE="GPL-2"
SLOT="5"
@@ -45,7 +47,7 @@ DEPEND="${RDEPEND}
x11-libs/libX11
"
-PATCHES=( "${FILESDIR}/${P}-qt-5.15.patch" )
+PATCHES=( "${WORKDIR}/${P}-qt-5.15.patch" )
src_test() {
# test needs DBus, bug 675548
diff --git a/net-im/choqok/Manifest b/net-im/choqok/Manifest
index 968126781e45..0b4997cb0391 100644
--- a/net-im/choqok/Manifest
+++ b/net-im/choqok/Manifest
@@ -1 +1,2 @@
+DIST choqok-1.7.0-patchset-1.tar.xz 3260 BLAKE2B 48612da4e92c9ed4a877858940f73075df4142d68da3854c42892bcfb13a59ab5dd45b06597c404badfb55ebaeddf7485bc0970e65ae29898a742742353d6caa SHA512 78e31f4d8de9d5294c8439959d8966b5b966bf6bc8f26d1b9cb1ffd12bf182d167269b26deb2dfa7d7dd8cf09bcaa0c77a560418075105f40a74fa50c96d48d0
DIST choqok-1.7.0.tar.xz 1202092 BLAKE2B 62e0c561579c36198f645bb550822d9bec583d8337b37e3336e4352199800b1807b80931f8c7c8141f74dfb91ade9f89b371723a8a3ea3e7bde97854634b82b2 SHA512 6f5998078e555f7b4a40270ad0a4defa2d15bb8440b810320fc4cfc38d78cb34bb9b2f6a38eb33eb3217b51a78a7fbc7f79224cd0ddb0fcbf8c9035d8e600e96
diff --git a/net-im/choqok/choqok-1.7.0-r1.ebuild b/net-im/choqok/choqok-1.7.0-r1.ebuild
new file mode 100644
index 000000000000..b4f8be17c0aa
--- /dev/null
+++ b/net-im/choqok/choqok-1.7.0-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.82.0
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="Free/Open Source micro-blogging client by KDE"
+HOMEPAGE="https://choqok.kde.org/ https://apps.kde.org/choqok/"
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+ SRC_URI="mirror://kde/stable/${PN}/${PV%.0}/src/${P}.tar.xz
+ https://dev.gentoo.org/~asturm/distfiles/${P}-patchset-1.tar.xz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2+"
+SLOT="5"
+IUSE="attica share telepathy"
+
+DEPEND="
+ >=app-crypt/qca-2.3.0:2
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetworkauth-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+ >=kde-frameworks/kcmutils-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kemoticons-${KFMIN}:5
+ >=kde-frameworks/kglobalaccel-${KFMIN}:5
+ >=kde-frameworks/kguiaddons-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/kjobwidgets-${KFMIN}:5
+ >=kde-frameworks/knotifications-${KFMIN}:5
+ >=kde-frameworks/knotifyconfig-${KFMIN}:5
+ >=kde-frameworks/kservice-${KFMIN}:5
+ >=kde-frameworks/ktextwidgets-${KFMIN}:5
+ >=kde-frameworks/kwallet-${KFMIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+ >=kde-frameworks/kxmlgui-${KFMIN}:5
+ >=kde-frameworks/sonnet-${KFMIN}:5
+ attica? ( >=kde-frameworks/attica-${KFMIN}:5 )
+ share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
+ telepathy? ( >=net-libs/telepathy-qt-0.9.8 )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS README changelog )
+
+PATCHES=(
+ "${WORKDIR}/${P}-optional-purpose.patch" # bug 708464, upstream MR #11
+ "${WORKDIR}/${P}-fix-retrieve-twitter.patch" # KDE-bug 417193
+ "${WORKDIR}/${P}-choqokplugin.patch"
+ "${WORKDIR}/${P}-fix-layout-of-tweets.patch" # KDE-bug 424938
+ "${WORKDIR}/${P}-fix-partially-static-signatures.patch" # KDE-bug 417297
+)
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package attica KF5Attica)
+ -DCMAKE_DISABLE_FIND_PACKAGE_KF5WebKit=ON
+ $(cmake_use_find_package share KF5Purpose)
+ $(cmake_use_find_package telepathy TelepathyQt5)
+ )
+
+ ecm_src_configure
+}
diff --git a/sys-auth/polkit-qt/files/polkit-qt-0.114.0-cmake.patch b/sys-auth/polkit-qt/files/polkit-qt-0.114.0-cmake.patch
new file mode 100644
index 000000000000..232dcb502604
--- /dev/null
+++ b/sys-auth/polkit-qt/files/polkit-qt-0.114.0-cmake.patch
@@ -0,0 +1,301 @@
+From 1f151d81381106c15084280f1e11209d259ae45c Mon Sep 17 00:00:00 2001
+From: John Zimmermann <me@johnnynator.dev>
+Date: Sat, 19 Jun 2021 15:47:56 +0200
+Subject: [PATCH] Change installed .cmake and .pc files to contain realtive
+ paths
+
+The LIB_DESTINATION and INCLUDE_DESTIONATION variables do hold little
+value, since one can just override the normal CMAKE variables as needed.
+Furthermore using CMAKE_INSTALL_FULL_LIBDIR is harmful, since this
+prevents CMake to use it's logic to install relocatable .cmake files.
+Also libdir and includedir in pkgconfig files need to be prefixed by
+either ${exec_prefix} or ${prefix} for the same relocation reasons.
+---
+ CMakeLists.txt | 27 +++++++++++----------------
+ PolkitQt-1Config.cmake.in | 4 ++--
+ agent/CMakeLists.txt | 6 +++---
+ core/CMakeLists.txt | 6 +++---
+ gui/CMakeLists.txt | 6 +++---
+ polkit-qt-1.pc.cmake | 4 ++--
+ polkit-qt-agent-1.pc.cmake | 4 ++--
+ polkit-qt-core-1.pc.cmake | 4 ++--
+ polkit-qt-gui-1.pc.cmake | 4 ++--
+ polkit-qt5-1.pc.cmake | 4 ++--
+ polkit-qt5-agent-1.pc.cmake | 4 ++--
+ polkit-qt5-core-1.pc.cmake | 4 ++--
+ polkit-qt5-gui-1.pc.cmake | 4 ++--
+ 13 files changed, 38 insertions(+), 43 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 32eb737..a82f8cb 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -21,11 +21,6 @@ include(GNUInstallDirs)
+
+ include(FeatureSummary)
+
+-# Set the different paths
+-set(LIB_DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}" CACHE PATH "Library directory name")
+-set(INCLUDE_DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}" CACHE PATH "The subdirectory to the header prefix")
+-
+-
+ set(REQUIRED_QT_VERSION 5.5.0)
+ set(CMAKE_CXX_STANDARD 11)
+
+@@ -103,7 +98,7 @@ install(FILES
+ ${CMAKE_CURRENT_BINARY_DIR}/agent/polkitqt1-agent-export.h
+
+ DESTINATION
+- ${INCLUDE_DESTINATION}/${POLKITQT-1_INCLUDE_PATH} COMPONENT Devel)
++ ${CMAKE_INSTALL_INCLUDEDIR}/${POLKITQT-1_INCLUDE_PATH} COMPONENT Devel)
+
+ install(FILES
+ includes/PolkitQt1/Authority
+@@ -113,40 +108,40 @@ install(FILES
+ includes/PolkitQt1/TemporaryAuthorization
+ includes/PolkitQt1/ActionDescription
+ DESTINATION
+- ${INCLUDE_DESTINATION}/${POLKITQT-1_INCLUDE_PATH}/PolkitQt1 COMPONENT Devel)
++ ${CMAKE_INSTALL_INCLUDEDIR}/${POLKITQT-1_INCLUDE_PATH}/PolkitQt1 COMPONENT Devel)
+
+ install(FILES
+ includes/PolkitQt1/Gui/Action
+ includes/PolkitQt1/Gui/ActionButton
+ includes/PolkitQt1/Gui/ActionButtons
+ DESTINATION
+- ${INCLUDE_DESTINATION}/${POLKITQT-1_INCLUDE_PATH}/PolkitQt1/Gui COMPONENT Devel)
++ ${CMAKE_INSTALL_INCLUDEDIR}/${POLKITQT-1_INCLUDE_PATH}/PolkitQt1/Gui COMPONENT Devel)
+
+ install(FILES
+ includes/PolkitQt1/Agent/Listener
+ includes/PolkitQt1/Agent/Session
+ DESTINATION
+- ${INCLUDE_DESTINATION}/${POLKITQT-1_INCLUDE_PATH}/PolkitQt1/Agent COMPONENT Devel)
++ ${CMAKE_INSTALL_INCLUDEDIR}/${POLKITQT-1_INCLUDE_PATH}/PolkitQt1/Agent COMPONENT Devel)
+
+ if(NOT WIN32)
+ # Pkgconfig
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${POLKITQT-1_PCNAME}.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/${POLKITQT-1_PCNAME}.pc @ONLY)
+- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${POLKITQT-1_PCNAME}.pc DESTINATION ${LIB_DESTINATION}/pkgconfig )
++ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${POLKITQT-1_PCNAME}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig )
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${POLKITQT-1_CORE_PCNAME}.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/${POLKITQT-1_CORE_PCNAME}.pc
+ @ONLY)
+- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${POLKITQT-1_CORE_PCNAME}.pc DESTINATION ${LIB_DESTINATION}/pkgconfig )
++ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${POLKITQT-1_CORE_PCNAME}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig )
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${POLKITQT-1_GUI_PCNAME}.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/${POLKITQT-1_GUI_PCNAME}.pc @ONLY)
+- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${POLKITQT-1_GUI_PCNAME}.pc DESTINATION ${LIB_DESTINATION}/pkgconfig )
++ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${POLKITQT-1_GUI_PCNAME}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig )
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${POLKITQT-1_AGENT_PCNAME}.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/${POLKITQT-1_AGENT_PCNAME}.pc
+ @ONLY)
+- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${POLKITQT-1_AGENT_PCNAME}.pc DESTINATION ${LIB_DESTINATION}/pkgconfig )
++ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${POLKITQT-1_AGENT_PCNAME}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig )
+ endif(NOT WIN32)
+
+
+ if(USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR)
+- set(_PolkitQt-1Config_INSTALL_DIR ${LIB_DESTINATION}/cmake/${POLKITQT-1_CAMEL_NAME})
++ set(_PolkitQt-1Config_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/${POLKITQT-1_CAMEL_NAME})
+ else(USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR)
+- set(_PolkitQt-1Config_INSTALL_DIR ${LIB_DESTINATION}/${POLKITQT-1_CAMEL_NAME}/cmake)
++ set(_PolkitQt-1Config_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/${POLKITQT-1_CAMEL_NAME}/cmake)
+ endif(USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR)
+
+
+@@ -154,7 +149,7 @@ endif(USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR)
+ configure_package_config_file(PolkitQt-1Config.cmake.in
+ ${CMAKE_BINARY_DIR}/${POLKITQT-1_CAMEL_NAME}Config.cmake
+ INSTALL_DESTINATION ${_PolkitQt-1Config_INSTALL_DIR}
+- PATH_VARS LIB_DESTINATION INCLUDE_DESTINATION
++ PATH_VARS CMAKE_INSTALL_LIBDIR CMAKE_INSTALL_INCLUDEDIR
+ )
+
+ write_basic_package_version_file(${CMAKE_BINARY_DIR}/${POLKITQT-1_CAMEL_NAME}ConfigVersion.cmake
+diff --git a/PolkitQt-1Config.cmake.in b/PolkitQt-1Config.cmake.in
+index f39480c..e09678c 100644
+--- a/PolkitQt-1Config.cmake.in
++++ b/PolkitQt-1Config.cmake.in
+@@ -20,9 +20,9 @@ if(NOT POLKITQT-1_INSTALL_DIR)
+ set(POLKITQT-1_INSTALL_DIR "@CMAKE_INSTALL_PREFIX@")
+ endif(NOT POLKITQT-1_INSTALL_DIR)
+
+-set_and_check(POLKITQT-1_INCLUDE_DIR "@PACKAGE_INCLUDE_DESTINATION@/@POLKITQT-1_INCLUDE_PATH@")
++set_and_check(POLKITQT-1_INCLUDE_DIR "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@/@POLKITQT-1_INCLUDE_PATH@")
+ set_and_check(POLKITQT-1_INCLUDE_DIRS "${POLKITQT-1_INCLUDE_DIR}")
+-set_and_check(POLKITQT-1_LIB_DIR "@PACKAGE_LIB_DESTINATION@")
++set_and_check(POLKITQT-1_LIB_DIR "@PACKAGE_CMAKE_INSTALL_LIBDIR@")
+ set(POLKITQT-1_POLICY_FILES_INSTALL_DIR "${POLKITQT-1_INSTALL_DIR}/share/polkit-1/actions")
+ ##################################
+
+diff --git a/agent/CMakeLists.txt b/agent/CMakeLists.txt
+index ccf2711..1a86cd8 100644
+--- a/agent/CMakeLists.txt
++++ b/agent/CMakeLists.txt
+@@ -29,11 +29,11 @@ set_target_properties(${POLKITQT-1_AGENT_PCNAME} PROPERTIES VERSION ${POLKITQT-1
+
+ target_include_directories(${POLKITQT-1_AGENT_PCNAME}
+ INTERFACE
+- $<INSTALL_INTERFACE:${INCLUDE_DESTINATION}/${POLKITQT-1_INCLUDE_PATH}>
++ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/${POLKITQT-1_INCLUDE_PATH}>
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
+ )
+
+-install(TARGETS ${POLKITQT-1_AGENT_PCNAME} EXPORT ${POLKITQT-1_CAMEL_NAME}Export ARCHIVE DESTINATION ${LIB_DESTINATION}
+- LIBRARY DESTINATION ${LIB_DESTINATION}
++install(TARGETS ${POLKITQT-1_AGENT_PCNAME} EXPORT ${POLKITQT-1_CAMEL_NAME}Export ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ RUNTIME DESTINATION bin)
+diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
+index 3a80adc..8225871 100644
+--- a/core/CMakeLists.txt
++++ b/core/CMakeLists.txt
+@@ -32,12 +32,12 @@ set_target_properties(${POLKITQT-1_CORE_PCNAME} PROPERTIES VERSION ${POLKITQT-1_
+
+ target_include_directories(${POLKITQT-1_CORE_PCNAME}
+ INTERFACE
+- $<INSTALL_INTERFACE:${INCLUDE_DESTINATION}/${POLKITQT-1_INCLUDE_PATH}>
++ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/${POLKITQT-1_INCLUDE_PATH}>
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
+ )
+
+-install(TARGETS ${POLKITQT-1_CORE_PCNAME} EXPORT ${POLKITQT-1_CAMEL_NAME}Export ARCHIVE DESTINATION ${LIB_DESTINATION}
+- LIBRARY DESTINATION ${LIB_DESTINATION}
++install(TARGETS ${POLKITQT-1_CORE_PCNAME} EXPORT ${POLKITQT-1_CAMEL_NAME}Export ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ RUNTIME DESTINATION bin)
+
+diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt
+index d9d800d..c22deba 100644
+--- a/gui/CMakeLists.txt
++++ b/gui/CMakeLists.txt
+@@ -28,11 +28,11 @@ set_target_properties(${POLKITQT-1_GUI_PCNAME} PROPERTIES VERSION ${POLKITQT-1_L
+
+ target_include_directories(${POLKITQT-1_GUI_PCNAME}
+ INTERFACE
+- $<INSTALL_INTERFACE:${INCLUDE_DESTINATION}/${POLKITQT-1_INCLUDE_PATH}>
++ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/${POLKITQT-1_INCLUDE_PATH}>
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
+ )
+
+-install(TARGETS ${POLKITQT-1_GUI_PCNAME} EXPORT ${POLKITQT-1_CAMEL_NAME}Export ARCHIVE DESTINATION ${LIB_DESTINATION}
+- LIBRARY DESTINATION ${LIB_DESTINATION}
++install(TARGETS ${POLKITQT-1_GUI_PCNAME} EXPORT ${POLKITQT-1_CAMEL_NAME}Export ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ RUNTIME DESTINATION bin)
+diff --git a/polkit-qt-1.pc.cmake b/polkit-qt-1.pc.cmake
+index 7cc55a9..ba8e46e 100644
+--- a/polkit-qt-1.pc.cmake
++++ b/polkit-qt-1.pc.cmake
+@@ -1,7 +1,7 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=@CMAKE_INSTALL_PREFIX@
+-libdir=@LIB_DESTINATION@
+-includedir=@INCLUDE_DESTINATION@/@POLKITQT-1_INCLUDE_PATH@
++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
++includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@POLKITQT-1_INCLUDE_PATH@
+
+ Name: @POLKITQT-1_PCNAME@
+ Description: Convenience library for using polkit with a Qt-styled API
+diff --git a/polkit-qt-agent-1.pc.cmake b/polkit-qt-agent-1.pc.cmake
+index 001925d..23b2cae 100644
+--- a/polkit-qt-agent-1.pc.cmake
++++ b/polkit-qt-agent-1.pc.cmake
+@@ -1,7 +1,7 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=@CMAKE_INSTALL_PREFIX@
+-libdir=@LIB_DESTINATION@
+-includedir=@INCLUDE_DESTINATION@/@POLKITQT-1_INCLUDE_PATH@
++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
++includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@POLKITQT-1_INCLUDE_PATH@
+
+ Name: @POLKITQT-1_AGENT_PCNAME@
+ Description: Convenience library for using polkit Agent with a Qt-styled API
+diff --git a/polkit-qt-core-1.pc.cmake b/polkit-qt-core-1.pc.cmake
+index ca435a6..fa501f0 100644
+--- a/polkit-qt-core-1.pc.cmake
++++ b/polkit-qt-core-1.pc.cmake
+@@ -1,7 +1,7 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=@CMAKE_INSTALL_PREFIX@
+-libdir=@LIB_DESTINATION@
+-includedir=@INCLUDE_DESTINATION@/@POLKITQT-1_INCLUDE_PATH@
++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
++includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@POLKITQT-1_INCLUDE_PATH@
+
+ Name: @POLKITQT-1_CORE_PCNAME@
+ Description: Convenience library for using polkit with a Qt-styled API, non-GUI classes
+diff --git a/polkit-qt-gui-1.pc.cmake b/polkit-qt-gui-1.pc.cmake
+index e7279d1..7261b0c 100644
+--- a/polkit-qt-gui-1.pc.cmake
++++ b/polkit-qt-gui-1.pc.cmake
+@@ -1,7 +1,7 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=@CMAKE_INSTALL_PREFIX@
+-libdir=@LIB_DESTINATION@
+-includedir=@INCLUDE_DESTINATION@/@POLKITQT-1_INCLUDE_PATH@
++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
++includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@POLKITQT-1_INCLUDE_PATH@
+
+ Name: @POLKITQT-1_GUI_PCNAME@
+ Description: Convenience library for using polkit with a Qt-styled API, GUI classes
+diff --git a/polkit-qt5-1.pc.cmake b/polkit-qt5-1.pc.cmake
+index 7cc55a9..ba8e46e 100644
+--- a/polkit-qt5-1.pc.cmake
++++ b/polkit-qt5-1.pc.cmake
+@@ -1,7 +1,7 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=@CMAKE_INSTALL_PREFIX@
+-libdir=@LIB_DESTINATION@
+-includedir=@INCLUDE_DESTINATION@/@POLKITQT-1_INCLUDE_PATH@
++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
++includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@POLKITQT-1_INCLUDE_PATH@
+
+ Name: @POLKITQT-1_PCNAME@
+ Description: Convenience library for using polkit with a Qt-styled API
+diff --git a/polkit-qt5-agent-1.pc.cmake b/polkit-qt5-agent-1.pc.cmake
+index fabc0db..709a24e 100644
+--- a/polkit-qt5-agent-1.pc.cmake
++++ b/polkit-qt5-agent-1.pc.cmake
+@@ -1,7 +1,7 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=@CMAKE_INSTALL_PREFIX@
+-libdir=@LIB_DESTINATION@
+-includedir=@INCLUDE_DESTINATION@/@POLKITQT-1_INCLUDE_PATH@
++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
++includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@POLKITQT-1_INCLUDE_PATH@
+
+ Name: @POLKITQT-1_AGENT_PCNAME@
+ Description: Convenience library for using polkit Agent with a Qt-styled API
+diff --git a/polkit-qt5-core-1.pc.cmake b/polkit-qt5-core-1.pc.cmake
+index 33687c2..588f267 100644
+--- a/polkit-qt5-core-1.pc.cmake
++++ b/polkit-qt5-core-1.pc.cmake
+@@ -1,7 +1,7 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=@CMAKE_INSTALL_PREFIX@
+-libdir=@LIB_DESTINATION@
+-includedir=@INCLUDE_DESTINATION@/@POLKITQT-1_INCLUDE_PATH@
++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
++includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@POLKITQT-1_INCLUDE_PATH@
+
+ Name: @POLKITQT-1_CORE_PCNAME@
+ Description: Convenience library for using polkit with a Qt-styled API, non-GUI classes
+diff --git a/polkit-qt5-gui-1.pc.cmake b/polkit-qt5-gui-1.pc.cmake
+index 4280226..1c012dd 100644
+--- a/polkit-qt5-gui-1.pc.cmake
++++ b/polkit-qt5-gui-1.pc.cmake
+@@ -1,7 +1,7 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=@CMAKE_INSTALL_PREFIX@
+-libdir=@LIB_DESTINATION@
+-includedir=@INCLUDE_DESTINATION@/@POLKITQT-1_INCLUDE_PATH@
++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
++includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@POLKITQT-1_INCLUDE_PATH@
+
+ Name: @POLKITQT-1_GUI_PCNAME@
+ Description: Convenience library for using polkit with a Qt-styled API, GUI classes
+--
+GitLab
+
diff --git a/sys-auth/polkit-qt/files/polkit-qt-0.114.0-glib-2.36.patch b/sys-auth/polkit-qt/files/polkit-qt-0.114.0-glib-2.36.patch
new file mode 100644
index 000000000000..bc9da1c4dc4f
--- /dev/null
+++ b/sys-auth/polkit-qt/files/polkit-qt-0.114.0-glib-2.36.patch
@@ -0,0 +1,188 @@
+From 2656bf02e19f282ee963309a48ba497873e9fa40 Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid@kde.org>
+Date: Fri, 6 Aug 2021 11:57:43 +0200
+Subject: [PATCH] Require glib 2.36 and remove "do nothing" g_type_init
+
+g_type_init deprecated and a no-op since glib 2.36
+
+glib 2.36 was released in 2013, i think it's a reasonable min dependency
+nowadays
+---
+ CMakeLists.txt | 2 +-
+ agent/polkitqt1-agent-listener.cpp | 4 ----
+ agent/polkitqtlistener.cpp | 1 -
+ core/polkitqt1-actiondescription.cpp | 2 --
+ core/polkitqt1-authority.cpp | 2 --
+ core/polkitqt1-details.cpp | 2 --
+ core/polkitqt1-identity.cpp | 2 --
+ core/polkitqt1-subject.cpp | 5 -----
+ core/polkitqt1-temporaryauthorization.cpp | 1 -
+ examples/agent/pkagentexample.cpp | 2 --
+ 10 files changed, 1 insertion(+), 22 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a82f8cb..dd0977e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -40,7 +40,7 @@ set(POLKITQT-1_INCLUDE_PATH "polkit-qt5-1")
+
+ pkg_check_modules(POLKIT_GOBJECT polkit-gobject-1 REQUIRED IMPORTED_TARGET)
+ pkg_check_modules(POLKIT_AGENT polkit-agent-1 REQUIRED IMPORTED_TARGET)
+-pkg_check_modules(GLIB2 glib-2.0 REQUIRED IMPORTED_TARGET)
++pkg_check_modules(GLIB2 glib-2.0>=2.36 REQUIRED IMPORTED_TARGET)
+ pkg_check_modules(GOBJECT gobject-2.0 REQUIRED IMPORTED_TARGET)
+
+ add_definitions(-DQT_NO_KEYWORDS)
+diff --git a/agent/polkitqt1-agent-listener.cpp b/agent/polkitqt1-agent-listener.cpp
+index cb99299..27348b1 100644
+--- a/agent/polkitqt1-agent-listener.cpp
++++ b/agent/polkitqt1-agent-listener.cpp
+@@ -34,8 +34,6 @@ public:
+ Listener::Listener(QObject *parent)
+ : QObject(parent), d(new ListenerPrivate)
+ {
+- g_type_init();
+-
+ d->listener = polkit_qt_listener_new();
+
+ qDebug() << "New PolkitAgentListener " << d->listener;
+@@ -46,8 +44,6 @@ Listener::Listener(QObject *parent)
+ Listener::Listener(PolkitAgentListener *listener, QObject *parent)
+ : QObject(parent), d(new ListenerPrivate)
+ {
+- g_type_init();
+-
+ d->listener = listener;
+
+ if (d->listener != nullptr) {
+diff --git a/agent/polkitqtlistener.cpp b/agent/polkitqtlistener.cpp
+index 69c4f8a..e8713b5 100644
+--- a/agent/polkitqtlistener.cpp
++++ b/agent/polkitqtlistener.cpp
+@@ -49,7 +49,6 @@ G_DEFINE_TYPE(PolkitQtListener, polkit_qt_listener, POLKIT_AGENT_TYPE_LISTENER)
+
+ static void polkit_qt_listener_init(PolkitQtListener *listener)
+ {
+- g_type_init();
+ }
+
+ static void polkit_qt_listener_finalize(GObject *object)
+diff --git a/core/polkitqt1-actiondescription.cpp b/core/polkitqt1-actiondescription.cpp
+index f865c37..c08f5c4 100644
+--- a/core/polkitqt1-actiondescription.cpp
++++ b/core/polkitqt1-actiondescription.cpp
+@@ -55,8 +55,6 @@ ActionDescription::ActionDescription()
+ ActionDescription::ActionDescription(PolkitActionDescription *polkitActionDescription)
+ : d(new Data)
+ {
+- g_type_init();
+-
+ d->actionId = QString::fromUtf8(polkit_action_description_get_action_id(polkitActionDescription));
+ d->description = QString::fromUtf8(polkit_action_description_get_description(polkitActionDescription));
+ d->message = QString::fromUtf8(polkit_action_description_get_message(polkitActionDescription));
+diff --git a/core/polkitqt1-authority.cpp b/core/polkitqt1-authority.cpp
+index a891b92..73dd97e 100644
+--- a/core/polkitqt1-authority.cpp
++++ b/core/polkitqt1-authority.cpp
+@@ -172,8 +172,6 @@ void Authority::Private::init()
+ QDBusError error;
+ QDBusError dbus_error;
+
+- g_type_init();
+-
+ m_systemBus = new QDBusConnection(QDBusConnection::connectToBus(QDBusConnection::SystemBus,
+ QStringLiteral("polkit_qt_system_bus")));
+
+diff --git a/core/polkitqt1-details.cpp b/core/polkitqt1-details.cpp
+index b9494f0..ba107b1 100644
+--- a/core/polkitqt1-details.cpp
++++ b/core/polkitqt1-details.cpp
+@@ -39,14 +39,12 @@ public:
+ Details::Details()
+ : d(new Data)
+ {
+- g_type_init();
+ d->polkitDetails = polkit_details_new();
+ }
+
+ Details::Details(PolkitDetails *pkDetails)
+ : d(new Data)
+ {
+- g_type_init();
+ d->polkitDetails = pkDetails;
+
+ if (d->polkitDetails != nullptr) {
+diff --git a/core/polkitqt1-identity.cpp b/core/polkitqt1-identity.cpp
+index 2489c33..0924c5a 100644
+--- a/core/polkitqt1-identity.cpp
++++ b/core/polkitqt1-identity.cpp
+@@ -39,13 +39,11 @@ public:
+ Identity::Identity()
+ : d(new Data)
+ {
+- g_type_init();
+ }
+
+ Identity::Identity(PolkitIdentity *polkitIdentity)
+ : d(new Data)
+ {
+- g_type_init();
+ d->identity = polkitIdentity;
+
+ if (d->identity) {
+diff --git a/core/polkitqt1-subject.cpp b/core/polkitqt1-subject.cpp
+index 3d86437..3dae3bd 100644
+--- a/core/polkitqt1-subject.cpp
++++ b/core/polkitqt1-subject.cpp
+@@ -39,13 +39,11 @@ public:
+ Subject::Subject()
+ : d(new Data)
+ {
+- g_type_init();
+ }
+
+ Subject::Subject(PolkitSubject *subject)
+ : d(new Data)
+ {
+- g_type_init();
+ d->subject = subject;
+
+ if (d->subject != nullptr) {
+@@ -95,9 +93,6 @@ QString Subject::toString() const
+
+ Subject Subject::fromString(const QString &string)
+ {
+- // should be in polkit library!!! but for strange reason it's necessary to have it here
+- g_type_init();
+-
+ Subject subject;
+ GError *error = nullptr;
+ subject.d->subject = polkit_subject_from_string(string.toUtf8().data(), &error);
+diff --git a/core/polkitqt1-temporaryauthorization.cpp b/core/polkitqt1-temporaryauthorization.cpp
+index 64209ff..ae40f3b 100644
+--- a/core/polkitqt1-temporaryauthorization.cpp
++++ b/core/polkitqt1-temporaryauthorization.cpp
+@@ -38,7 +38,6 @@ public:
+ TemporaryAuthorization::TemporaryAuthorization(PolkitTemporaryAuthorization *pkTemporaryAuthorization)
+ : d(new Data)
+ {
+- g_type_init();
+ d->id = QString::fromUtf8(polkit_temporary_authorization_get_id(pkTemporaryAuthorization));
+ d->actionId = QString::fromUtf8(polkit_temporary_authorization_get_action_id(pkTemporaryAuthorization));
+ d->subject = Subject::fromString(polkit_subject_to_string(polkit_temporary_authorization_get_subject(pkTemporaryAuthorization)));
+diff --git a/examples/agent/pkagentexample.cpp b/examples/agent/pkagentexample.cpp
+index 8b1128b..da555c7 100644
+--- a/examples/agent/pkagentexample.cpp
++++ b/examples/agent/pkagentexample.cpp
+@@ -9,8 +9,6 @@
+ PkAgentExample::PkAgentExample(int &argc, char **argv)
+ : QCoreApplication(argc, argv)
+ {
+- g_type_init();
+-
+ PolkitQt1::UnixSessionSubject session(getpid());
+
+ m_listener.registerListener(session, "/org/kde/PolicyKit1/AuthenticationAgent");
+--
+GitLab
+
diff --git a/sys-auth/polkit-qt/polkit-qt-0.114.0-r1.ebuild b/sys-auth/polkit-qt/polkit-qt-0.114.0-r1.ebuild
new file mode 100644
index 000000000000..d2ed0e07d44f
--- /dev/null
+++ b/sys-auth/polkit-qt/polkit-qt-0.114.0-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_CATEGORY="libraries"
+KDE_ORG_NAME="polkit-qt-1"
+inherit cmake kde.org
+
+DESCRIPTION="Qt wrapper around polkit-1 client libraries"
+HOMEPAGE="https://api.kde.org/polkit-qt-1/html/"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+ SRC_URI="mirror://kde/stable/${KDE_ORG_NAME}/${KDE_ORG_NAME}-${PV}.tar.xz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-libs/glib:2
+ dev-qt/qtcore:5
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ >=sys-auth/polkit-0.103
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( AUTHORS README README.porting TODO )
+
+PATCHES=(
+ "${FILESDIR}/${P}-cmake.patch"
+ "${FILESDIR}/${P}-glib-2.36.patch"
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_EXAMPLES=OFF
+ )
+ cmake_src_configure
+}