commit: c45a166021ff7b81c96a138823bb8dd590e96e61
Author: Alfred Wingate <parona <AT> protonmail <DOT> com>
AuthorDate: Wed Jan 3 02:06:56 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Mar 3 15:04:24 2024 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=c45a1660
kde-apps/kdepim-runtime: update dependencies
* Drop ECM_HANDBOOK, removed in upstream commit 9a2aa4db.
* Hook up tests a bit despite not un-RESTRICTing them.
* Add kde-apps/akonadi itself to the dependencies.
* Disabled automagic and drop a slew on unused dependencies.
Upstream commits:
d0c43cdf9fbbff73d8eb0eaa1e5451ef45ada5e4
2dda00cb700679633593b456e4085ae9a4fe8e44
Signed-off-by: Alfred Wingate <parona <AT> protonmail.com>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../kdepim-runtime/kdepim-runtime-24.02.49.9999.ebuild | 14 ++++++++------
kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild | 14 ++++++++------
2 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-24.02.49.9999.ebuild
b/kde-apps/kdepim-runtime/kdepim-runtime-24.02.49.9999.ebuild
index fefb6b6a7f..210a48a296 100644
--- a/kde-apps/kdepim-runtime/kdepim-runtime-24.02.49.9999.ebuild
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-24.02.49.9999.ebuild
@@ -3,7 +3,6 @@
EAPI=8
-ECM_HANDBOOK="optional"
ECM_TEST="forceoptional"
PVCUT=$(ver_cut 1-3)
KFMIN=6.0.0
@@ -20,12 +19,12 @@ IUSE="speech"
RESTRICT="test"
-# TODO kolab
+# TODO etebase, kolab
RDEPEND="
>=app-crypt/qca-2.3.7:2[qt6]
dev-libs/cyrus-sasl:2
- dev-libs/libical:=
>=dev-libs/qtkeychain-0.14.1-r1:=[qt6]
+ >=dev-libs/ktextaddons-1.5.3:6
>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets,xml]
>=dev-qt/qtnetworkauth-${QTMIN}:6
>=dev-qt/qtwebengine-${QTMIN}:6[widgets]
@@ -41,7 +40,6 @@ RDEPEND="
>=kde-apps/kmailtransport-${PVCUT}:6
>=kde-apps/kmbox-${PVCUT}:6
>=kde-apps/kmime-${PVCUT}:6
- >=kde-apps/libkdepim-${PVCUT}:6
>=kde-apps/libkgapi-${PVCUT}:6
>=kde-frameworks/kcalendarcore-${KFMIN}:6
>=kde-frameworks/kcmutils-${KFMIN}:6
@@ -52,7 +50,6 @@ RDEPEND="
>=kde-frameworks/kcontacts-${KFMIN}:6
>=kde-frameworks/kcoreaddons-${KFMIN}:6
>=kde-frameworks/kdav-${KFMIN}:6
- >=kde-frameworks/kholidays-${KFMIN}:6
>=kde-frameworks/ki18n-${KFMIN}:6
>=kde-frameworks/kio-${KFMIN}:6
>=kde-frameworks/kitemmodels-${KFMIN}:6
@@ -68,11 +65,16 @@ RDEPEND="
speech? ( >=dev-qt/qtspeech-${QTMIN}:6 )
"
DEPEND="${RDEPEND}
- test? ( >=kde-apps/kimap-${PVCUT}:6[test] )
+ test? (
+ >=kde-apps/akonadi-${PVCUT}:6[tools]
+ >=kde-apps/kimap-${PVCUT}:6[test]
+ )
"
src_configure() {
local mycmakeargs=(
+ -DKDEPIM_RUN_AKONADI_TEST=$(usex test)
+ -DCMAKE_DISABLE_FIND_PACKAGE_Etebase=ON
-DCMAKE_DISABLE_FIND_PACKAGE_Libkolabxml=ON
$(cmake_use_find_package speech Qt6TextToSpeech)
)
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild
b/kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild
index fefb6b6a7f..210a48a296 100644
--- a/kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild
@@ -3,7 +3,6 @@
EAPI=8
-ECM_HANDBOOK="optional"
ECM_TEST="forceoptional"
PVCUT=$(ver_cut 1-3)
KFMIN=6.0.0
@@ -20,12 +19,12 @@ IUSE="speech"
RESTRICT="test"
-# TODO kolab
+# TODO etebase, kolab
RDEPEND="
>=app-crypt/qca-2.3.7:2[qt6]
dev-libs/cyrus-sasl:2
- dev-libs/libical:=
>=dev-libs/qtkeychain-0.14.1-r1:=[qt6]
+ >=dev-libs/ktextaddons-1.5.3:6
>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets,xml]
>=dev-qt/qtnetworkauth-${QTMIN}:6
>=dev-qt/qtwebengine-${QTMIN}:6[widgets]
@@ -41,7 +40,6 @@ RDEPEND="
>=kde-apps/kmailtransport-${PVCUT}:6
>=kde-apps/kmbox-${PVCUT}:6
>=kde-apps/kmime-${PVCUT}:6
- >=kde-apps/libkdepim-${PVCUT}:6
>=kde-apps/libkgapi-${PVCUT}:6
>=kde-frameworks/kcalendarcore-${KFMIN}:6
>=kde-frameworks/kcmutils-${KFMIN}:6
@@ -52,7 +50,6 @@ RDEPEND="
>=kde-frameworks/kcontacts-${KFMIN}:6
>=kde-frameworks/kcoreaddons-${KFMIN}:6
>=kde-frameworks/kdav-${KFMIN}:6
- >=kde-frameworks/kholidays-${KFMIN}:6
>=kde-frameworks/ki18n-${KFMIN}:6
>=kde-frameworks/kio-${KFMIN}:6
>=kde-frameworks/kitemmodels-${KFMIN}:6
@@ -68,11 +65,16 @@ RDEPEND="
speech? ( >=dev-qt/qtspeech-${QTMIN}:6 )
"
DEPEND="${RDEPEND}
- test? ( >=kde-apps/kimap-${PVCUT}:6[test] )
+ test? (
+ >=kde-apps/akonadi-${PVCUT}:6[tools]
+ >=kde-apps/kimap-${PVCUT}:6[test]
+ )
"
src_configure() {
local mycmakeargs=(
+ -DKDEPIM_RUN_AKONADI_TEST=$(usex test)
+ -DCMAKE_DISABLE_FIND_PACKAGE_Etebase=ON
-DCMAKE_DISABLE_FIND_PACKAGE_Libkolabxml=ON
$(cmake_use_find_package speech Qt6TextToSpeech)
)
