[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi-import-wizard/
commit: 32414d890f5c7eacc6550f01faf1947619e036c3
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Sep 12 19:04:12 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Sep 12 19:04:12 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=32414d89
kde-apps/akonadi-import-wizard: drop 24.08.1
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../akonadi-import-wizard-24.08.1.ebuild | 42 --
1 file changed, 42 deletions(-)
diff --git
a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-24.08.1.ebuild
b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-24.08.1.ebuild
deleted file mode 100644
index 8d49951a0f..00
--- a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-24.08.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Assistant to import PIM data from other applications into Akonadi"
-HOMEPAGE+=" https://userbase.kde.org/KMail/Import_Options";
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-DEPEND="
- >=dev-libs/qtkeychain-0.14.2:=[qt6]
- >=dev-qt/qtbase-${QTMIN}:6[gui,widgets,xml]
- >=kde-apps/akonadi-${PVCUT}:6
- >=kde-apps/kidentitymanagement-${PVCUT}:6
- >=kde-apps/kmailtransport-${PVCUT}:6
- >=kde-apps/mailcommon-${PVCUT}:6
- >=kde-apps/mailimporter-${PVCUT}:6
- >=kde-apps/messagelib-${PVCUT}:6
- >=kde-apps/pimcommon-${PVCUT}:6
- >=kde-frameworks/karchive-${KFMIN}:6
- >=kde-frameworks/kcompletion-${KFMIN}:6
- >=kde-frameworks/kconfig-${KFMIN}:6
- >=kde-frameworks/kcontacts-${KFMIN}:6
- >=kde-frameworks/kcoreaddons-${KFMIN}:6
- >=kde-frameworks/kcrash-${KFMIN}:6
- >=kde-frameworks/kdbusaddons-${KFMIN}:6
- >=kde-frameworks/ki18n-${KFMIN}:6
- >=kde-frameworks/kiconthemes-${KFMIN}:6
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:6
- >=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi-calendar/
commit: cc96ada8f70e574375017eee95840f96717903e9
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Sep 12 19:03:53 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Sep 12 19:03:53 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=cc96ada8
kde-apps/akonadi-calendar: drop 24.08.1
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../akonadi-calendar-24.08.1.ebuild| 48 --
1 file changed, 48 deletions(-)
diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-24.08.1.ebuild
b/kde-apps/akonadi-calendar/akonadi-calendar-24.08.1.ebuild
deleted file mode 100644
index 6996533b24..00
--- a/kde-apps/akonadi-calendar/akonadi-calendar-24.08.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="true"
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Library for akonadi calendar integration"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-RESTRICT="test"
-
-DEPEND="
- >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
- >=kde-apps/akonadi-${PVCUT}:6
- >=kde-apps/akonadi-contacts-${PVCUT}:6
- >=kde-apps/akonadi-mime-${PVCUT}:6
- >=kde-apps/kcalutils-${PVCUT}:6
- >=kde-apps/kidentitymanagement-${PVCUT}:6
- >=kde-apps/kmailtransport-${PVCUT}:6
- >=kde-apps/kmime-${PVCUT}:6
- >=kde-apps/libkleo-${PVCUT}:6
- >=kde-apps/messagelib-${PVCUT}:6
- >=kde-frameworks/kcalendarcore-${KFMIN}:6
- >=kde-frameworks/kcodecs-${KFMIN}:6
- >=kde-frameworks/kconfig-${KFMIN}:6
- >=kde-frameworks/kconfigwidgets-${KFMIN}:6
- >=kde-frameworks/kcoreaddons-${KFMIN}:6
- >=kde-frameworks/kdbusaddons-${KFMIN}:6
- >=kde-frameworks/ki18n-${KFMIN}:6
- >=kde-frameworks/kiconthemes-${KFMIN}:6
- >=kde-frameworks/kio-${KFMIN}:6
- >=kde-frameworks/kitemmodels-${KFMIN}:6
- >=kde-frameworks/kjobwidgets-${KFMIN}:6
- >=kde-frameworks/knotifications-${KFMIN}:6
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:6
- >=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi-contacts/
commit: 2d0fe5d19e53dd71a665b87655b3c10890b716d7
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Sep 12 19:04:06 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Sep 12 19:04:06 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=2d0fe5d1
kde-apps/akonadi-contacts: drop 24.08.1
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../akonadi-contacts-24.08.1.ebuild| 44 --
1 file changed, 44 deletions(-)
diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-24.08.1.ebuild
b/kde-apps/akonadi-contacts/akonadi-contacts-24.08.1.ebuild
deleted file mode 100644
index dbe59a6980..00
--- a/kde-apps/akonadi-contacts/akonadi-contacts-24.08.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="true"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Library for akonadi contact integration"
-
-LICENSE="GPL-2+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-# some akonadi tests time out, that probably needs more work as it's ~700 tests
-RESTRICT="test"
-
-RDEPEND="
- >=dev-libs/ktextaddons-1.5.4:6
- >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
- >=kde-apps/akonadi-${PVCUT}:6
- >=kde-apps/grantleetheme-${PVCUT}:6
- >=kde-apps/kmime-${PVCUT}:6
- >=kde-frameworks/kcodecs-${KFMIN}:6
- >=kde-frameworks/kcompletion-${KFMIN}:6
- >=kde-frameworks/kconfigwidgets-${KFMIN}:6
- >=kde-frameworks/kcontacts-${KFMIN}:6
- >=kde-frameworks/kcoreaddons-${KFMIN}:6
- >=kde-frameworks/ki18n-${KFMIN}:6
- >=kde-frameworks/kiconthemes-${KFMIN}:6
- >=kde-frameworks/kio-${KFMIN}:6
- >=kde-frameworks/kservice-${KFMIN}:6
- >=kde-frameworks/ktexttemplate-${KFMIN}:6
- >=kde-frameworks/ktextwidgets-${KFMIN}:6
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:6
- >=kde-frameworks/kxmlgui-${KFMIN}:6
- >=kde-frameworks/prison-${KFMIN}:6
-"
-DEPEND="${RDEPEND}"
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi-search/
commit: 70b88d894049f00760cfa5b67879ad8959bfb0b9
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Sep 12 19:04:30 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Sep 12 19:04:30 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=70b88d89
kde-apps/akonadi-search: drop 24.08.1
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../akonadi-search/akonadi-search-24.08.1.ebuild | 54 --
1 file changed, 54 deletions(-)
diff --git a/kde-apps/akonadi-search/akonadi-search-24.08.1.ebuild
b/kde-apps/akonadi-search/akonadi-search-24.08.1.ebuild
deleted file mode 100644
index 6dd9c4ce20..00
--- a/kde-apps/akonadi-search/akonadi-search-24.08.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="true"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Libraries and daemons to implement searching in Akonadi"
-HOMEPAGE="https://invent.kde.org/pim/akonadi-search";
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-RESTRICT="test" # perpetually broken, bug 662378
-
-RDEPEND="
- >=dev-libs/ktextaddons-1.5.4:6
- >=dev-libs/xapian-1.3:=[chert(+)]
- >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
- >=kde-apps/akonadi-${PVCUT}:6
- >=kde-apps/akonadi-mime-${PVCUT}:6
- >=kde-apps/kmime-${PVCUT}:6
- >=kde-frameworks/kcalendarcore-${KFMIN}:6
- >=kde-frameworks/kcmutils-${KFMIN}:6
- >=kde-frameworks/kcodecs-${KFMIN}:6
- >=kde-frameworks/kconfig-${KFMIN}:6
- >=kde-frameworks/kconfigwidgets-${KFMIN}:6
- >=kde-frameworks/kcontacts-${KFMIN}:6
- >=kde-frameworks/kcoreaddons-${KFMIN}:6
- >=kde-frameworks/kdbusaddons-${KFMIN}:6
- >=kde-frameworks/kio-${KFMIN}:6
- >=kde-frameworks/ki18n-${KFMIN}:6
- >=kde-frameworks/krunner-${KFMIN}:6
-"
-DEPEND="${RDEPEND}
- dev-libs/boost
- test? ( >=kde-apps/akonadi-${PVCUT}:6[mysql,postgres,sqlite] )
-"
-BDEPEND="
- test? ( >=kde-apps/akonadi-${PVCUT}:6[tools] )
-"
-
-src_configure() {
- # not packaged (bug 911819), but if present leads to rust shenanigans
(bug 927072)
- local mycmakeargs=( -DCMAKE_DISABLE_FIND_PACKAGE_Corrosion=ON )
- ecm_src_configure
-}
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi-mime/
commit: 9c4d3eebf9c08a5d1741f548e6b6c585b73c5504
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Sep 12 19:04:18 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Sep 12 19:04:18 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=9c4d3eeb
kde-apps/akonadi-mime: drop 24.08.1
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/akonadi-mime/akonadi-mime-24.08.1.ebuild | 36 ---
1 file changed, 36 deletions(-)
diff --git a/kde-apps/akonadi-mime/akonadi-mime-24.08.1.ebuild
b/kde-apps/akonadi-mime/akonadi-mime-24.08.1.ebuild
deleted file mode 100644
index 99db6b6905..00
--- a/kde-apps/akonadi-mime/akonadi-mime-24.08.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="true"
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Library for akonadi mime types"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-# some akonadi tests time out, that probably needs more work as it's ~700 tests
-RESTRICT="test"
-
-DEPEND="
- >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets,xml]
- >=kde-apps/akonadi-${PVCUT}:6
- >=kde-apps/kmime-${PVCUT}:6
- >=kde-frameworks/kconfig-${KFMIN}:6
- >=kde-frameworks/kcoreaddons-${KFMIN}:6
- >=kde-frameworks/ki18n-${KFMIN}:6
- >=kde-frameworks/kio-${KFMIN}:6
- >=kde-frameworks/kitemmodels-${KFMIN}:6
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:6
- >=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
-BDEPEND="dev-libs/libxslt"
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi-notes/
commit: b53e8d68c02ec209a5ad74a841b25a735c602854
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Sep 12 19:04:24 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Sep 12 19:04:24 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=b53e8d68
kde-apps/akonadi-notes: drop 24.08.1
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../akonadi-notes/akonadi-notes-24.08.1.ebuild | 25 --
1 file changed, 25 deletions(-)
diff --git a/kde-apps/akonadi-notes/akonadi-notes-24.08.1.ebuild
b/kde-apps/akonadi-notes/akonadi-notes-24.08.1.ebuild
deleted file mode 100644
index 5ae0f6db0c..00
--- a/kde-apps/akonadi-notes/akonadi-notes-24.08.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="true"
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Library for akonadi notes integration"
-
-LICENSE="GPL-2+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-DEPEND="
- >=dev-qt/qtbase-${QTMIN}:6[gui,xml]
- >=kde-apps/kmime-${PVCUT}:6
- >=kde-frameworks/ki18n-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi-calendar-tools-common/
commit: fda531891b0e348542c8373422b10cc79dad
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Sep 12 19:03:59 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Sep 12 19:03:59 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=fda5
kde-apps/akonadi-calendar-tools-common: drop 24.08.1
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../akonadi-calendar-tools-common-24.08.1.ebuild| 17 -
1 file changed, 17 deletions(-)
diff --git
a/kde-apps/akonadi-calendar-tools-common/akonadi-calendar-tools-common-24.08.1.ebuild
b/kde-apps/akonadi-calendar-tools-common/akonadi-calendar-tools-common-24.08.1.ebuild
deleted file mode 100644
index 0a0bb03bd6..00
---
a/kde-apps/akonadi-calendar-tools-common/akonadi-calendar-tools-common-24.08.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="true"
-KDE_ORG_NAME="${PN/-common/}"
-inherit ecm-common gear.kde.org
-
-LICENSE="GPL-2 handbook? ( FDL-1.2+ )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-
-RDEPEND="
- !
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi-calendar-tools-common/
commit: 024a5b10e7ac2a9c02a159554f8dc83c8bdeb8ae
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Aug 11 21:40:25 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Aug 21 20:53:49 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=024a5b10
kde-apps/akonadi-calendar-tools-common: new package, add
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../akonadi-calendar-tools-common-24.07.90.ebuild | 17 +
.../akonadi-calendar-tools-common-24.08.0.ebuild| 17 +
.../akonadi-calendar-tools-common-24.08.49..ebuild | 17 +
.../akonadi-calendar-tools-common-.ebuild | 17 +
kde-apps/akonadi-calendar-tools-common/metadata.xml | 12
5 files changed, 80 insertions(+)
diff --git
a/kde-apps/akonadi-calendar-tools-common/akonadi-calendar-tools-common-24.07.90.ebuild
b/kde-apps/akonadi-calendar-tools-common/akonadi-calendar-tools-common-24.07.90.ebuild
new file mode 100644
index 00..0a0bb03bd6
--- /dev/null
+++
b/kde-apps/akonadi-calendar-tools-common/akonadi-calendar-tools-common-24.07.90.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="true"
+KDE_ORG_NAME="${PN/-common/}"
+inherit ecm-common gear.kde.org
+
+LICENSE="GPL-2 handbook? ( FDL-1.2+ )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND="
+ !
+https://www.gentoo.org/dtd/metadata.dtd";>
+
+
+ k...@gentoo.org
+ Gentoo KDE Project
+
+
+ https://bugs.kde.org/
+ pim/akonadi-calendar-tools
+
+
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi-contacts/
commit: 5e35ce6eefe751533d7cd794440fdcdf555f5cc6
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Aug 10 19:24:48 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Aug 11 06:20:02 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=5e35ce6e
kde-apps/akonadi-contacts: Add new dependency
Upstream commit 4dccb5afafe80324393f90019c6b0f7782bbd7b9
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/akonadi-contacts/akonadi-contacts-.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-.ebuild
b/kde-apps/akonadi-contacts/akonadi-contacts-.ebuild
index 2ca9b3f417..5dca1de8ef 100644
--- a/kde-apps/akonadi-contacts/akonadi-contacts-.ebuild
+++ b/kde-apps/akonadi-contacts/akonadi-contacts-.ebuild
@@ -31,6 +31,7 @@ RDEPEND="
>=kde-frameworks/kconfigwidgets-${KFMIN}:6
>=kde-frameworks/kcontacts-${KFMIN}:6
>=kde-frameworks/kcoreaddons-${KFMIN}:6
+ >=kde-frameworks/kguiaddons-${KFMIN}:6
>=kde-frameworks/ki18n-${KFMIN}:6
>=kde-frameworks/kiconthemes-${KFMIN}:6
>=kde-frameworks/kio-${KFMIN}:6
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi-calendar/
commit: dc32eff7cd8b4a3e9f1c3ca160aaed8c3bb0d5db
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Aug 10 19:37:05 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Aug 11 06:20:05 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=dc32eff7
kde-apps/akonadi-calendar: Add new dependency
Upstream commit e6a527dfa5f83152660ac501a14a1ca36d7713f2
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/akonadi-calendar/akonadi-calendar-.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-.ebuild
b/kde-apps/akonadi-calendar/akonadi-calendar-.ebuild
index 54b4a45a02..693a3ddfa3 100644
--- a/kde-apps/akonadi-calendar/akonadi-calendar-.ebuild
+++ b/kde-apps/akonadi-calendar/akonadi-calendar-.ebuild
@@ -35,6 +35,7 @@ DEPEND="
>=kde-frameworks/kconfig-${KFMIN}:6
>=kde-frameworks/kconfigwidgets-${KFMIN}:6
>=kde-frameworks/kcoreaddons-${KFMIN}:6
+ >=kde-frameworks/kcrash-${KFMIN}:6
>=kde-frameworks/kdbusaddons-${KFMIN}:6
>=kde-frameworks/ki18n-${KFMIN}:6
>=kde-frameworks/kiconthemes-${KFMIN}:6
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi-contacts/
commit: cc853862be62f1c2b4b43b58a8f0ed2c642a1040
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Aug 10 19:22:19 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Aug 10 19:43:47 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=cc853862
kde-apps/akonadi-contacts: Drop unused dependency
Upstream commit 7aa566123887555274cf3f9d065900073afa1666
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/akonadi-contacts/akonadi-contacts-.ebuild | 1 -
1 file changed, 1 deletion(-)
diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-.ebuild
b/kde-apps/akonadi-contacts/akonadi-contacts-.ebuild
index 98a2b7e027..2ca9b3f417 100644
--- a/kde-apps/akonadi-contacts/akonadi-contacts-.ebuild
+++ b/kde-apps/akonadi-contacts/akonadi-contacts-.ebuild
@@ -28,7 +28,6 @@ RDEPEND="
>=kde-apps/kmime-${PVCUT}:6
>=kde-frameworks/kcodecs-${KFMIN}:6
>=kde-frameworks/kcompletion-${KFMIN}:6
- >=kde-frameworks/kconfig-${KFMIN}:6
>=kde-frameworks/kconfigwidgets-${KFMIN}:6
>=kde-frameworks/kcontacts-${KFMIN}:6
>=kde-frameworks/kcoreaddons-${KFMIN}:6
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi-import-wizard/
commit: 5c6529d0b3080e2167a227ec8f34b012042c8b69
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Aug 10 19:14:09 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Aug 10 19:43:47 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=5c6529d0
kde-apps/akonadi-import-wizard: Add new dependency
Upstream commit 0cec8b6febefe8c5a45ae45cf75de20a689b2355
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/akonadi-import-wizard/akonadi-import-wizard-.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-.ebuild
b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-.ebuild
index c0cbfe833f..8c7fe50630 100644
--- a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-.ebuild
+++ b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-.ebuild
@@ -35,6 +35,7 @@ DEPEND="
>=kde-frameworks/kcrash-${KFMIN}:6
>=kde-frameworks/kdbusaddons-${KFMIN}:6
>=kde-frameworks/ki18n-${KFMIN}:6
+ >=kde-frameworks/kiconthemes-${KFMIN}:6
>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
>=kde-frameworks/kxmlgui-${KFMIN}:6
"
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/
commit: b0834fee82a09403cccb3351a2d15531e098b37a
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Jun 30 10:20:54 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Jul 1 18:42:38 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=b0834fee
kde-apps/akonadi: Rename IUSE kaccounts -> webengine
kde-apps/kaccounts-integration inevitably pulls in -providers which
pulls in dev-qt/qtwebengine.
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/akonadi/akonadi-24.05.49..ebuild | 8
kde-apps/akonadi/akonadi-.ebuild | 8
kde-apps/akonadi/metadata.xml | 2 +-
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/kde-apps/akonadi/akonadi-24.05.49..ebuild
b/kde-apps/akonadi/akonadi-24.05.49..ebuild
index 4e486ebcef..6b18fe18c3 100644
--- a/kde-apps/akonadi/akonadi-24.05.49..ebuild
+++ b/kde-apps/akonadi/akonadi-24.05.49..ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://community.kde.org/KDE_PIM/akonadi";
LICENSE="LGPL-2.1+"
SLOT="6"
KEYWORDS=""
-IUSE="+kaccounts +mysql postgres sqlite tools xml"
+IUSE="+mysql postgres sqlite tools +webengine xml"
REQUIRED_USE="|| ( mysql postgres sqlite ) test? ( tools )"
@@ -36,7 +36,7 @@ COMMON_DEPEND="
>=kde-frameworks/kitemmodels-${KFMIN}:6
>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
>=kde-frameworks/kxmlgui-${KFMIN}:6
- kaccounts? (
+ webengine? (
kde-apps/kaccounts-integration:6
>=net-libs/accounts-qt-1.16_p20220803[qt6]
)
@@ -65,9 +65,9 @@ pkg_setup() {
src_configure() {
local mycmakeargs=(
- $(cmake_use_find_package kaccounts AccountsQt6)
- $(cmake_use_find_package kaccounts KAccounts6)
-DBUILD_TOOLS=$(usex tools)
+ $(cmake_use_find_package webengine AccountsQt6)
+ $(cmake_use_find_package webengine KAccounts6)
$(cmake_use_find_package xml LibXml2)
)
diff --git a/kde-apps/akonadi/akonadi-.ebuild
b/kde-apps/akonadi/akonadi-.ebuild
index 4e486ebcef..6b18fe18c3 100644
--- a/kde-apps/akonadi/akonadi-.ebuild
+++ b/kde-apps/akonadi/akonadi-.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://community.kde.org/KDE_PIM/akonadi";
LICENSE="LGPL-2.1+"
SLOT="6"
KEYWORDS=""
-IUSE="+kaccounts +mysql postgres sqlite tools xml"
+IUSE="+mysql postgres sqlite tools +webengine xml"
REQUIRED_USE="|| ( mysql postgres sqlite ) test? ( tools )"
@@ -36,7 +36,7 @@ COMMON_DEPEND="
>=kde-frameworks/kitemmodels-${KFMIN}:6
>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
>=kde-frameworks/kxmlgui-${KFMIN}:6
- kaccounts? (
+ webengine? (
kde-apps/kaccounts-integration:6
>=net-libs/accounts-qt-1.16_p20220803[qt6]
)
@@ -65,9 +65,9 @@ pkg_setup() {
src_configure() {
local mycmakeargs=(
- $(cmake_use_find_package kaccounts AccountsQt6)
- $(cmake_use_find_package kaccounts KAccounts6)
-DBUILD_TOOLS=$(usex tools)
+ $(cmake_use_find_package webengine AccountsQt6)
+ $(cmake_use_find_package webengine KAccounts6)
$(cmake_use_find_package xml LibXml2)
)
diff --git a/kde-apps/akonadi/metadata.xml b/kde-apps/akonadi/metadata.xml
index 33648cb541..2ef8e35f08 100644
--- a/kde-apps/akonadi/metadata.xml
+++ b/kde-apps/akonadi/metadata.xml
@@ -10,7 +10,7 @@
Install plugin for
dev-qt/designer
- Enable support for system-wide defined
KAccounts
Install tools for developers and
testing
+ Enable support for system-wide defined
KAccounts
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/
commit: 319ee1e71e62c8182f9038ac6d2d550538445a2e
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Fri May 17 19:14:26 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Fri May 17 19:14:26 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=319ee1e7
kde-apps/akonadi: Drop unused dependency
Upstream commit 850103f5c2d8ab2cfabc3c910ccc5b2c72cac876
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/akonadi/akonadi-24.04.90.ebuild | 1 -
kde-apps/akonadi/akonadi-24.05.49..ebuild | 1 -
kde-apps/akonadi/akonadi-.ebuild | 1 -
3 files changed, 3 deletions(-)
diff --git a/kde-apps/akonadi/akonadi-24.04.90.ebuild
b/kde-apps/akonadi/akonadi-24.04.90.ebuild
index 89843e0289..cf996b964a 100644
--- a/kde-apps/akonadi/akonadi-24.04.90.ebuild
+++ b/kde-apps/akonadi/akonadi-24.04.90.ebuild
@@ -33,7 +33,6 @@ COMMON_DEPEND="
>=kde-frameworks/kcrash-${KFMIN}:6
>=kde-frameworks/ki18n-${KFMIN}:6
>=kde-frameworks/kiconthemes-${KFMIN}:6
- >=kde-frameworks/kio-${KFMIN}:6
>=kde-frameworks/kitemmodels-${KFMIN}:6
>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
>=kde-frameworks/kxmlgui-${KFMIN}:6
diff --git a/kde-apps/akonadi/akonadi-24.05.49..ebuild
b/kde-apps/akonadi/akonadi-24.05.49..ebuild
index 2716368949..8eaacb90ff 100644
--- a/kde-apps/akonadi/akonadi-24.05.49..ebuild
+++ b/kde-apps/akonadi/akonadi-24.05.49..ebuild
@@ -33,7 +33,6 @@ COMMON_DEPEND="
>=kde-frameworks/kcrash-${KFMIN}:6
>=kde-frameworks/ki18n-${KFMIN}:6
>=kde-frameworks/kiconthemes-${KFMIN}:6
- >=kde-frameworks/kio-${KFMIN}:6
>=kde-frameworks/kitemmodels-${KFMIN}:6
>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
>=kde-frameworks/kxmlgui-${KFMIN}:6
diff --git a/kde-apps/akonadi/akonadi-.ebuild
b/kde-apps/akonadi/akonadi-.ebuild
index 2716368949..8eaacb90ff 100644
--- a/kde-apps/akonadi/akonadi-.ebuild
+++ b/kde-apps/akonadi/akonadi-.ebuild
@@ -33,7 +33,6 @@ COMMON_DEPEND="
>=kde-frameworks/kcrash-${KFMIN}:6
>=kde-frameworks/ki18n-${KFMIN}:6
>=kde-frameworks/kiconthemes-${KFMIN}:6
- >=kde-frameworks/kio-${KFMIN}:6
>=kde-frameworks/kitemmodels-${KFMIN}:6
>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
>=kde-frameworks/kxmlgui-${KFMIN}:6
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi-search/
commit: f8231d02be2b06b9965fc07047e870082fdd9e94
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Fri May 17 19:09:34 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Fri May 17 19:09:34 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=f8231d02
kde-apps/akonadi-search: Raise minimum dev-libs/ktextaddons version
Upstream commit bdf195786895514a4be2f0f8f4f12e9d0c523a64
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/akonadi-search/akonadi-search-24.04.90.ebuild | 2 +-
kde-apps/akonadi-search/akonadi-search-24.05.49..ebuild | 2 +-
kde-apps/akonadi-search/akonadi-search-.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/kde-apps/akonadi-search/akonadi-search-24.04.90.ebuild
b/kde-apps/akonadi-search/akonadi-search-24.04.90.ebuild
index 89e4b06922..7857369bd1 100644
--- a/kde-apps/akonadi-search/akonadi-search-24.04.90.ebuild
+++ b/kde-apps/akonadi-search/akonadi-search-24.04.90.ebuild
@@ -21,7 +21,7 @@ IUSE=""
RESTRICT="test" # perpetually broken, bug 662378
RDEPEND="
- >=dev-libs/ktextaddons-1.5.3:6
+ >=dev-libs/ktextaddons-1.5.4:6
>=dev-libs/xapian-1.3:=[chert(+)]
>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
>=kde-apps/akonadi-${PVCUT}:6
diff --git a/kde-apps/akonadi-search/akonadi-search-24.05.49..ebuild
b/kde-apps/akonadi-search/akonadi-search-24.05.49..ebuild
index a0e0629249..eb8cb361bd 100644
--- a/kde-apps/akonadi-search/akonadi-search-24.05.49..ebuild
+++ b/kde-apps/akonadi-search/akonadi-search-24.05.49..ebuild
@@ -21,7 +21,7 @@ IUSE=""
RESTRICT="test" # perpetually broken, bug 662378
RDEPEND="
- >=dev-libs/ktextaddons-1.5.3:6
+ >=dev-libs/ktextaddons-1.5.4:6
>=dev-libs/xapian-1.3:=[chert(+)]
>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
>=kde-apps/akonadi-${PVCUT}:6
diff --git a/kde-apps/akonadi-search/akonadi-search-.ebuild
b/kde-apps/akonadi-search/akonadi-search-.ebuild
index a0e0629249..eb8cb361bd 100644
--- a/kde-apps/akonadi-search/akonadi-search-.ebuild
+++ b/kde-apps/akonadi-search/akonadi-search-.ebuild
@@ -21,7 +21,7 @@ IUSE=""
RESTRICT="test" # perpetually broken, bug 662378
RDEPEND="
- >=dev-libs/ktextaddons-1.5.3:6
+ >=dev-libs/ktextaddons-1.5.4:6
>=dev-libs/xapian-1.3:=[chert(+)]
>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
>=kde-apps/akonadi-${PVCUT}:6
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi-contacts/
commit: 5df9843434a22ad66d11367dbfec9307206ca93f
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Fri May 17 19:12:37 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Fri May 17 19:12:37 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=5df98434
kde-apps/akonadi-contacts: Raise minimum dev-libs/ktextaddons version
Upstream commit 2e564ffefc74eb3d0b36d952c627de48484ac64b
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/akonadi-contacts/akonadi-contacts-24.04.90.ebuild | 2 +-
kde-apps/akonadi-contacts/akonadi-contacts-24.05.49..ebuild | 2 +-
kde-apps/akonadi-contacts/akonadi-contacts-.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-24.04.90.ebuild
b/kde-apps/akonadi-contacts/akonadi-contacts-24.04.90.ebuild
index e220625c9f..d7e5ed28ac 100644
--- a/kde-apps/akonadi-contacts/akonadi-contacts-24.04.90.ebuild
+++ b/kde-apps/akonadi-contacts/akonadi-contacts-24.04.90.ebuild
@@ -21,7 +21,7 @@ IUSE=""
RESTRICT="test"
RDEPEND="
- >=dev-libs/ktextaddons-1.5.3:6
+ >=dev-libs/ktextaddons-1.5.4:6
>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
>=kde-apps/akonadi-${PVCUT}:6
>=kde-apps/grantleetheme-${PVCUT}:6
diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-24.05.49..ebuild
b/kde-apps/akonadi-contacts/akonadi-contacts-24.05.49..ebuild
index 092175ec95..2c08e84374 100644
--- a/kde-apps/akonadi-contacts/akonadi-contacts-24.05.49..ebuild
+++ b/kde-apps/akonadi-contacts/akonadi-contacts-24.05.49..ebuild
@@ -21,7 +21,7 @@ IUSE=""
RESTRICT="test"
RDEPEND="
- >=dev-libs/ktextaddons-1.5.3:6
+ >=dev-libs/ktextaddons-1.5.4:6
>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
>=kde-apps/akonadi-${PVCUT}:6
>=kde-apps/grantleetheme-${PVCUT}:6
diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-.ebuild
b/kde-apps/akonadi-contacts/akonadi-contacts-.ebuild
index 092175ec95..2c08e84374 100644
--- a/kde-apps/akonadi-contacts/akonadi-contacts-.ebuild
+++ b/kde-apps/akonadi-contacts/akonadi-contacts-.ebuild
@@ -21,7 +21,7 @@ IUSE=""
RESTRICT="test"
RDEPEND="
- >=dev-libs/ktextaddons-1.5.3:6
+ >=dev-libs/ktextaddons-1.5.4:6
>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
>=kde-apps/akonadi-${PVCUT}:6
>=kde-apps/grantleetheme-${PVCUT}:6
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi-search/
commit: b78cd89d33757c65ad7b736160c36630d15afa9d
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Fri Mar 15 14:29:39 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Fri Mar 15 14:30:00 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=b78cd89d
kde-apps/akonadi-search: Corrosion prevention
Bug: https://bugs.gentoo.org/927072
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/akonadi-search/akonadi-search-24.02.49..ebuild | 6 ++
kde-apps/akonadi-search/akonadi-search-.ebuild | 6 ++
2 files changed, 12 insertions(+)
diff --git a/kde-apps/akonadi-search/akonadi-search-24.02.49..ebuild
b/kde-apps/akonadi-search/akonadi-search-24.02.49..ebuild
index 99349cd049..c747b6b3f5 100644
--- a/kde-apps/akonadi-search/akonadi-search-24.02.49..ebuild
+++ b/kde-apps/akonadi-search/akonadi-search-24.02.49..ebuild
@@ -46,3 +46,9 @@ DEPEND="${RDEPEND}
BDEPEND="
test? ( >=kde-apps/akonadi-${PVCUT}:6[tools] )
"
+
+src_configure() {
+ # not packaged (bug 911819), but if present leads to rust shenanigans
(bug 927072)
+ local mycmakeargs=( -DCMAKE_DISABLE_FIND_PACKAGE_Corrosion=ON )
+ ecm_src_configure
+}
diff --git a/kde-apps/akonadi-search/akonadi-search-.ebuild
b/kde-apps/akonadi-search/akonadi-search-.ebuild
index f06e45d4fa..a0e0629249 100644
--- a/kde-apps/akonadi-search/akonadi-search-.ebuild
+++ b/kde-apps/akonadi-search/akonadi-search-.ebuild
@@ -46,3 +46,9 @@ DEPEND="${RDEPEND}
BDEPEND="
test? ( >=kde-apps/akonadi-${PVCUT}:6[tools] )
"
+
+src_configure() {
+ # not packaged (bug 911819), but if present leads to rust shenanigans
(bug 927072)
+ local mycmakeargs=( -DCMAKE_DISABLE_FIND_PACKAGE_Corrosion=ON )
+ ecm_src_configure
+}
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/, kde-apps/akonadi/files/
commit: 59a5303f2a71097271369f8a58640896e29288b7
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Mar 2 20:54:06 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Mar 9 23:04:30 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=59a5303f
kde-apps/akonadi: Drop obsolete README
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/akonadi/akonadi-24.02.49..ebuild | 11 +---
kde-apps/akonadi/akonadi-.ebuild | 11 +---
kde-apps/akonadi/files/README.gentoo | 39 ---
3 files changed, 2 insertions(+), 59 deletions(-)
diff --git a/kde-apps/akonadi/akonadi-24.02.49..ebuild
b/kde-apps/akonadi/akonadi-24.02.49..ebuild
index 648dfc52b8..2716368949 100644
--- a/kde-apps/akonadi/akonadi-24.02.49..ebuild
+++ b/kde-apps/akonadi/akonadi-24.02.49..ebuild
@@ -9,7 +9,7 @@ ECM_TEST="forceoptional"
KFMIN=6.0.0
QTMIN=6.6.2
VIRTUALDBUS_TEST="true"
-inherit ecm gear.kde.org readme.gentoo-r1
+inherit ecm gear.kde.org
DESCRIPTION="Storage service for PIM data and libraries for PIM apps"
HOMEPAGE="https://community.kde.org/KDE_PIM/akonadi";
@@ -61,12 +61,6 @@ pkg_setup() {
use postgres && DRIVER="QPSQL"
use mysql && DRIVER="QMYSQL"
- if use mysql && has_version "${CATEGORY}/${PN}[mysql]" && has_version
"dev-db/mariadb"; then
- ewarn
- ewarn "Attention: Make sure to read README.gentoo after
install."
- ewarn
- fi
-
ecm_pkg_setup
}
@@ -91,7 +85,6 @@ EOF
doins "${T}"/akonadiserverrc
ecm_src_install
- readme.gentoo_create_doc
}
pkg_postinst() {
@@ -102,6 +95,4 @@ pkg_postinst() {
use postgres && elog " QPSQL"
use sqlite && elog " QSQLITE"
elog "${DRIVER} has been set as your default akonadi storage backend."
- use mysql && elog
- use mysql && FORCE_PRINT_ELOG=1 readme.gentoo_print_elog
}
diff --git a/kde-apps/akonadi/akonadi-.ebuild
b/kde-apps/akonadi/akonadi-.ebuild
index 648dfc52b8..2716368949 100644
--- a/kde-apps/akonadi/akonadi-.ebuild
+++ b/kde-apps/akonadi/akonadi-.ebuild
@@ -9,7 +9,7 @@ ECM_TEST="forceoptional"
KFMIN=6.0.0
QTMIN=6.6.2
VIRTUALDBUS_TEST="true"
-inherit ecm gear.kde.org readme.gentoo-r1
+inherit ecm gear.kde.org
DESCRIPTION="Storage service for PIM data and libraries for PIM apps"
HOMEPAGE="https://community.kde.org/KDE_PIM/akonadi";
@@ -61,12 +61,6 @@ pkg_setup() {
use postgres && DRIVER="QPSQL"
use mysql && DRIVER="QMYSQL"
- if use mysql && has_version "${CATEGORY}/${PN}[mysql]" && has_version
"dev-db/mariadb"; then
- ewarn
- ewarn "Attention: Make sure to read README.gentoo after
install."
- ewarn
- fi
-
ecm_pkg_setup
}
@@ -91,7 +85,6 @@ EOF
doins "${T}"/akonadiserverrc
ecm_src_install
- readme.gentoo_create_doc
}
pkg_postinst() {
@@ -102,6 +95,4 @@ pkg_postinst() {
use postgres && elog " QPSQL"
use sqlite && elog " QSQLITE"
elog "${DRIVER} has been set as your default akonadi storage backend."
- use mysql && elog
- use mysql && FORCE_PRINT_ELOG=1 readme.gentoo_print_elog
}
diff --git a/kde-apps/akonadi/files/README.gentoo
b/kde-apps/akonadi/files/README.gentoo
deleted file mode 100644
index 69bb68c1f0..00
--- a/kde-apps/akonadi/files/README.gentoo
+++ /dev/null
@@ -1,39 +0,0 @@
-Akonadi QMYSQL backends that were created using https://bugs.gentoo.org/688746
- [2] https://bugs.kde.org/show_bug.cgi?id=409224
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi-contacts/
commit: 0ef963dd196169410c16b5335fd371371c64d171
Author: Sam James gentoo org>
AuthorDate: Thu Feb 29 03:13:24 2024 +
Commit: Sam James gentoo org>
CommitDate: Thu Feb 29 03:13:24 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=0ef963dd
kde-apps/akonadi-contacts: add ktextaddons dep
Closes: https://bugs.gentoo.org/924817
Signed-off-by: Sam James gentoo.org>
kde-apps/akonadi-contacts/akonadi-contacts-24.02.49..ebuild | 1 +
kde-apps/akonadi-contacts/akonadi-contacts-.ebuild | 1 +
2 files changed, 2 insertions(+)
diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-24.02.49..ebuild
b/kde-apps/akonadi-contacts/akonadi-contacts-24.02.49..ebuild
index b68497751f..12b40fecb4 100644
--- a/kde-apps/akonadi-contacts/akonadi-contacts-24.02.49..ebuild
+++ b/kde-apps/akonadi-contacts/akonadi-contacts-24.02.49..ebuild
@@ -21,6 +21,7 @@ IUSE=""
RESTRICT="test"
RDEPEND="
+ >=dev-libs/ktextaddons-1.5.2:6
>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
>=kde-apps/akonadi-${PVCUT}:6
>=kde-apps/grantleetheme-${PVCUT}:6
diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-.ebuild
b/kde-apps/akonadi-contacts/akonadi-contacts-.ebuild
index b68497751f..00bed02c02 100644
--- a/kde-apps/akonadi-contacts/akonadi-contacts-.ebuild
+++ b/kde-apps/akonadi-contacts/akonadi-contacts-.ebuild
@@ -21,6 +21,7 @@ IUSE=""
RESTRICT="test"
RDEPEND="
+ >=dev-libs/ktextaddons-1.5.3:6
>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
>=kde-apps/akonadi-${PVCUT}:6
>=kde-apps/grantleetheme-${PVCUT}:6
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi-search/
commit: 55b4a5df1f13ee29b8399b91cf6495737952dbf5
Author: Sam James gentoo org>
AuthorDate: Thu Feb 29 03:08:34 2024 +
Commit: Sam James gentoo org>
CommitDate: Thu Feb 29 03:08:43 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=55b4a5df
kde-apps/akonadi-search: add ktextaddons dep
Closes: https://github.com/gentoo/gentoo/pull/35570
Closes: https://bugs.gentoo.org/925729
Signed-off-by: Sam James gentoo.org>
kde-apps/akonadi-search/akonadi-search-24.02.49..ebuild | 1 +
kde-apps/akonadi-search/akonadi-search-.ebuild | 1 +
2 files changed, 2 insertions(+)
diff --git a/kde-apps/akonadi-search/akonadi-search-24.02.49..ebuild
b/kde-apps/akonadi-search/akonadi-search-24.02.49..ebuild
index 60a6384315..50336ce5b6 100644
--- a/kde-apps/akonadi-search/akonadi-search-24.02.49..ebuild
+++ b/kde-apps/akonadi-search/akonadi-search-24.02.49..ebuild
@@ -21,6 +21,7 @@ IUSE=""
RESTRICT="test" # perpetually broken, bug 662378
RDEPEND="
+ >=dev-libs/ktextaddons-1.5.2:6
>=dev-libs/xapian-1.3:=[chert(+)]
>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
>=kde-apps/akonadi-${PVCUT}:6
diff --git a/kde-apps/akonadi-search/akonadi-search-.ebuild
b/kde-apps/akonadi-search/akonadi-search-.ebuild
index 60a6384315..4b16dfa2e3 100644
--- a/kde-apps/akonadi-search/akonadi-search-.ebuild
+++ b/kde-apps/akonadi-search/akonadi-search-.ebuild
@@ -21,6 +21,7 @@ IUSE=""
RESTRICT="test" # perpetually broken, bug 662378
RDEPEND="
+ >=dev-libs/ktextaddons-1.5.3:6
>=dev-libs/xapian-1.3:=[chert(+)]
>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
>=kde-apps/akonadi-${PVCUT}:6
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi-mime/
commit: f675d050dc8dca32edebc755ac42670908bfbae7
Author: Sam James gentoo org>
AuthorDate: Sun Feb 25 22:19:00 2024 +
Commit: Sam James gentoo org>
CommitDate: Sun Feb 25 22:19:24 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=f675d050
kde-apps/akonadi-mime: refresh deps
* Needs qtbase[xml] (upstream commit 55a742ed1469d3a671601a971a502d2df6ff33de)
Signed-off-by: Sam James gentoo.org>
kde-apps/akonadi-mime/akonadi-mime-24.02.0.ebuild | 2 +-
kde-apps/akonadi-mime/akonadi-mime-24.02.49..ebuild | 2 +-
kde-apps/akonadi-mime/akonadi-mime-.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/kde-apps/akonadi-mime/akonadi-mime-24.02.0.ebuild
b/kde-apps/akonadi-mime/akonadi-mime-24.02.0.ebuild
index d0596ad078..33ac5cbb99 100644
--- a/kde-apps/akonadi-mime/akonadi-mime-24.02.0.ebuild
+++ b/kde-apps/akonadi-mime/akonadi-mime-24.02.0.ebuild
@@ -21,7 +21,7 @@ IUSE=""
RESTRICT="test"
DEPEND="
- >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
+ >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets,xml]
>=kde-apps/akonadi-${PVCUT}:6
>=kde-apps/kmime-${PVCUT}:6
>=kde-frameworks/kconfig-${KFMIN}:6
diff --git a/kde-apps/akonadi-mime/akonadi-mime-24.02.49..ebuild
b/kde-apps/akonadi-mime/akonadi-mime-24.02.49..ebuild
index 3e6d953852..92ed5ca43f 100644
--- a/kde-apps/akonadi-mime/akonadi-mime-24.02.49..ebuild
+++ b/kde-apps/akonadi-mime/akonadi-mime-24.02.49..ebuild
@@ -21,7 +21,7 @@ IUSE=""
RESTRICT="test"
DEPEND="
- >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
+ >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets,xml]
>=kde-apps/akonadi-${PVCUT}:6
>=kde-apps/kmime-${PVCUT}:6
>=kde-frameworks/kconfig-${KFMIN}:6
diff --git a/kde-apps/akonadi-mime/akonadi-mime-.ebuild
b/kde-apps/akonadi-mime/akonadi-mime-.ebuild
index 3e6d953852..92ed5ca43f 100644
--- a/kde-apps/akonadi-mime/akonadi-mime-.ebuild
+++ b/kde-apps/akonadi-mime/akonadi-mime-.ebuild
@@ -21,7 +21,7 @@ IUSE=""
RESTRICT="test"
DEPEND="
- >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
+ >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets,xml]
>=kde-apps/akonadi-${PVCUT}:6
>=kde-apps/kmime-${PVCUT}:6
>=kde-frameworks/kconfig-${KFMIN}:6
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi-import-wizard/
commit: 387daf4809478d69c11cb08fead2035bbff81808
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Jan 2 21:26:05 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Jan 2 21:26:05 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=387daf48
kde-apps/akonadi-import-wizard: Raise dev-libs/qtkeychain to 0.14.2
Upstream commit e2cd39aa3ac1b7ed2041b351f451065cb4cb51e0
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/akonadi-import-wizard/akonadi-import-wizard-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-.ebuild
b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-.ebuild
index 0f2a3f9683..09e67d03f2 100644
--- a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-.ebuild
+++ b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-.ebuild
@@ -18,7 +18,7 @@ KEYWORDS=""
IUSE=""
DEPEND="
- >=dev-libs/qtkeychain-0.14.1-r1:=[qt6]
+ >=dev-libs/qtkeychain-0.14.2:=[qt6]
>=dev-qt/qtbase-${QTMIN}:6[gui,widgets,xml]
>=kde-apps/akonadi-${PVCUT}:6
>=kde-apps/kidentitymanagement-${PVCUT}:6
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi-mime/
commit: 0a627764c3f4ec041e3f81cb8a30015ee7a06793
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Jan 2 21:54:49 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Jan 2 21:54:49 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=0a627764
kde-apps/akonadi-mime: Move dev-libs/libxslt to BDEPEND
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/akonadi-mime/akonadi-mime-23.08.49..ebuild | 2 +-
kde-apps/akonadi-mime/akonadi-mime-.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/kde-apps/akonadi-mime/akonadi-mime-23.08.49..ebuild
b/kde-apps/akonadi-mime/akonadi-mime-23.08.49..ebuild
index c634469481..d27fa347e9 100644
--- a/kde-apps/akonadi-mime/akonadi-mime-23.08.49..ebuild
+++ b/kde-apps/akonadi-mime/akonadi-mime-23.08.49..ebuild
@@ -21,7 +21,6 @@ IUSE=""
RESTRICT="test"
DEPEND="
- dev-libs/libxslt
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtwidgets-${QTMIN}:5
@@ -36,3 +35,4 @@ DEPEND="
>=kde-frameworks/kxmlgui-${KFMIN}:5
"
RDEPEND="${DEPEND}"
+BDEPEND="dev-libs/libxslt"
diff --git a/kde-apps/akonadi-mime/akonadi-mime-.ebuild
b/kde-apps/akonadi-mime/akonadi-mime-.ebuild
index 3f51a79784..b7d850b4eb 100644
--- a/kde-apps/akonadi-mime/akonadi-mime-.ebuild
+++ b/kde-apps/akonadi-mime/akonadi-mime-.ebuild
@@ -21,7 +21,6 @@ IUSE=""
RESTRICT="test"
DEPEND="
- dev-libs/libxslt
>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
>=kde-apps/akonadi-${PVCUT}:6
>=kde-apps/kmime-${PVCUT}:6
@@ -34,3 +33,4 @@ DEPEND="
>=kde-frameworks/kxmlgui-${KFMIN}:6
"
RDEPEND="${DEPEND}"
+BDEPEND="dev-libs/libxslt"
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/
commit: 4ec5a1df2f9532be71795379eacff396d5cefd97
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Dec 19 21:41:37 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Dec 19 21:41:37 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=4ec5a1df
kde-apps/akonadi: Accept kde-apps/kaccounts-integration:6[qt5]
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/akonadi/akonadi-23.08.49..ebuild | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/kde-apps/akonadi/akonadi-23.08.49..ebuild
b/kde-apps/akonadi/akonadi-23.08.49..ebuild
index b6773b0863..76e8350b73 100644
--- a/kde-apps/akonadi/akonadi-23.08.49..ebuild
+++ b/kde-apps/akonadi/akonadi-23.08.49..ebuild
@@ -43,7 +43,10 @@ COMMON_DEPEND="
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
>=kde-frameworks/kxmlgui-${KFMIN}:5
kaccounts? (
- >=kde-apps/kaccounts-integration-20.08.3:5
+ || (
+ kde-apps/kaccounts-integration:6[qt5]
+ kde-apps/kaccounts-integration:5
+ )
>=net-libs/accounts-qt-1.16-r1[qt5]
)
xml? ( dev-libs/libxml2 )
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/
commit: 06244f9438f7964f419644f45d5873f401cb0a1b
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Dec 19 12:33:46 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Dec 19 12:34:35 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=06244f94
kde-apps/akonadi: Fix IUSE kaccounts deps and cmake arg
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/akonadi/akonadi-.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/kde-apps/akonadi/akonadi-.ebuild
b/kde-apps/akonadi/akonadi-.ebuild
index d0f41f29e6..e32bae9a85 100644
--- a/kde-apps/akonadi/akonadi-.ebuild
+++ b/kde-apps/akonadi/akonadi-.ebuild
@@ -39,7 +39,7 @@ COMMON_DEPEND="
>=kde-frameworks/kxmlgui-${KFMIN}:6
kaccounts? (
>=kde-apps/kaccounts-integration-20.08.3:6
- >=net-libs/accounts-qt-1.16
+ >=net-libs/accounts-qt-1.16-r1[qt6]
)
xml? ( dev-libs/libxml2 )
"
@@ -73,7 +73,7 @@ pkg_setup() {
src_configure() {
local mycmakeargs=(
$(cmake_use_find_package kaccounts AccountsQt6)
- $(cmake_use_find_package kaccounts KAccounts)
+ $(cmake_use_find_package kaccounts KAccounts6)
-DBUILD_TOOLS=$(usex tools)
$(cmake_use_find_package xml LibXml2)
)
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/
commit: e5c8003a60fb57dad72674a1c5c765c963af223d
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Dec 18 20:03:01 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Dec 18 20:03:01 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=e5c8003a
kde-apps/akonadi: Adjust deps to new qt5,qt6 IUSE additions
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/akonadi/akonadi-23.08.49..ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kde-apps/akonadi/akonadi-23.08.49..ebuild
b/kde-apps/akonadi/akonadi-23.08.49..ebuild
index 13fb6fa5e9..b6773b0863 100644
--- a/kde-apps/akonadi/akonadi-23.08.49..ebuild
+++ b/kde-apps/akonadi/akonadi-23.08.49..ebuild
@@ -44,7 +44,7 @@ COMMON_DEPEND="
>=kde-frameworks/kxmlgui-${KFMIN}:5
kaccounts? (
>=kde-apps/kaccounts-integration-20.08.3:5
- >=net-libs/accounts-qt-1.16
+ >=net-libs/accounts-qt-1.16-r1[qt5]
)
xml? ( dev-libs/libxml2 )
"
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi-contacts/
commit: 5247e7b7c8a4231d8ae48904c172eda9b41b583a
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Aug 6 19:52:05 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Aug 6 19:52:05 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=5247e7b7
kde-apps/akonadi-contacts: Drop unused dependency
Upstream commit b2b40d0030da55914363e5afdfc02bc3051b2b22
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/akonadi-contacts/akonadi-contacts-.ebuild | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-.ebuild
b/kde-apps/akonadi-contacts/akonadi-contacts-.ebuild
index 43fe018b76..a5ca64ed6e 100644
--- a/kde-apps/akonadi-contacts/akonadi-contacts-.ebuild
+++ b/kde-apps/akonadi-contacts/akonadi-contacts-.ebuild
@@ -43,6 +43,4 @@ RDEPEND="
>=kde-frameworks/kxmlgui-${KFMIN}:5
>=kde-frameworks/prison-${KFMIN}:5
"
-DEPEND="${RDEPEND}
- >=kde-frameworks/kcmutils-${KFMIN}:5
-"
+DEPEND="${RDEPEND}"
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/
commit: c322b60f4811cf3892eeb9ef81ccb1460e5af8a8
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Aug 6 17:43:40 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Aug 6 17:48:11 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=c322b60f
kde-apps/akonadi: Drop obsolete QSQLITE3 deps, args, ewarn
tl;dr: Upstream QSQLITE driver is considered stable, more up to date,
old (and by now outdated) QSQLITE3 fork was removed.
See also: https://invent.kde.org/pim/akonadi/-/merge_requests/143
Upstream commit e70a7a5521b4d8fe0bb36a5b3392c547851507b0
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/akonadi/akonadi-.ebuild | 17 +++--
1 file changed, 3 insertions(+), 14 deletions(-)
diff --git a/kde-apps/akonadi/akonadi-.ebuild
b/kde-apps/akonadi/akonadi-.ebuild
index 92f8881503..13fb6fa5e9 100644
--- a/kde-apps/akonadi/akonadi-.ebuild
+++ b/kde-apps/akonadi/akonadi-.ebuild
@@ -29,7 +29,7 @@ COMMON_DEPEND="
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtsql-${QTMIN}:5[mysql?,postgres?]
+ >=dev-qt/qtsql-${QTMIN}:5[mysql?,postgres?,sqlite?]
>=dev-qt/qtwidgets-${QTMIN}:5
>=dev-qt/qtxml-${QTMIN}:5
>=kde-frameworks/kconfig-${KFMIN}:5
@@ -46,10 +46,6 @@ COMMON_DEPEND="
>=kde-apps/kaccounts-integration-20.08.3:5
>=net-libs/accounts-qt-1.16
)
- sqlite? (
- dev-db/sqlite:3
- >=dev-qt/qtsql-${QTMIN}:5=[sqlite]
- )
xml? ( dev-libs/libxml2 )
"
DEPEND="${COMMON_DEPEND}
@@ -66,7 +62,7 @@ PATCHES=( "${FILESDIR}/${PN}-21.03.80-mysql56-crash.patch" )
pkg_setup() {
# Set default storage backend in order: MySQL, PostgreSQL, SQLite
# reverse driver check to keep the order
- use sqlite && DRIVER="QSQLITE3"
+ use sqlite && DRIVER="QSQLITE"
use postgres && DRIVER="QPSQL"
use mysql && DRIVER="QMYSQL"
@@ -76,12 +72,6 @@ pkg_setup() {
ewarn
fi
- if use sqlite || has_version "<${CATEGORY}/${P}[sqlite]"; then
- ewarn "We strongly recommend you change your Akonadi database
backend to"
- ewarn "either MariaDB/MySQL or PostgreSQL in your user
configuration."
- ewarn "In particular, kde-apps/kmail does not work properly
with the sqlite backend."
- fi
-
ecm_pkg_setup
}
@@ -89,7 +79,6 @@ src_configure() {
local mycmakeargs=(
$(cmake_use_find_package kaccounts AccountsQt5)
$(cmake_use_find_package kaccounts KAccounts)
- -DAKONADI_BUILD_QSQLITE=$(usex sqlite)
-DBUILD_TOOLS=$(usex tools)
$(cmake_use_find_package xml LibXml2)
)
@@ -116,7 +105,7 @@ pkg_postinst() {
elog "Available drivers are:"
use mysql && elog " QMYSQL"
use postgres && elog " QPSQL"
- use sqlite && elog " QSQLITE3"
+ use sqlite && elog " QSQLITE"
elog "${DRIVER} has been set as your default akonadi storage backend."
use mysql && elog
use mysql && FORCE_PRINT_ELOG=1 readme.gentoo_print_elog
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi-calendar/
commit: c434723ba3c66034e9b20982d22fca018b222092
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Aug 6 19:36:34 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Aug 6 19:38:10 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=c434723b
kde-apps/akonadi-calendar: Update dependencies, set ECM_QTHELP="true"
Upstream commits:
e954fd504c87e13d0c530f9fce5585768090e9a4
0841cbc08ca55dc7a05c20dfb32582a5e46cf644
8e04d6d92153f37c9b9e118a991da1135534c774
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/akonadi-calendar/akonadi-calendar-.ebuild | 3 +++
1 file changed, 3 insertions(+)
diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-.ebuild
b/kde-apps/akonadi-calendar/akonadi-calendar-.ebuild
index 6d6627365e..c3a4160fea 100644
--- a/kde-apps/akonadi-calendar/akonadi-calendar-.ebuild
+++ b/kde-apps/akonadi-calendar/akonadi-calendar-.ebuild
@@ -3,6 +3,7 @@
EAPI=8
+ECM_QTHELP="true"
ECM_TEST="true"
PVCUT=$(ver_cut 1-3)
KFMIN=5.106.0
@@ -29,6 +30,8 @@ DEPEND="
>=kde-apps/kidentitymanagement-${PVCUT}:5
>=kde-apps/kmailtransport-${PVCUT}:5
>=kde-apps/kmime-${PVCUT}:5
+ >=kde-apps/libkleo-${PVCUT}:5
+ >=kde-apps/messagelib-${PVCUT}:5
>=kde-frameworks/kcalendarcore-${KFMIN}:5
>=kde-frameworks/kcodecs-${KFMIN}:5
>=kde-frameworks/kconfig-${KFMIN}:5
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi-import-wizard/
commit: 31fff0016872e35fa924103e01bb61c1f304aae3
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Oct 11 14:58:38 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Oct 11 15:17:12 2022 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=31fff001
kde-apps/akonadi-import-wizard: Add dev-libs/qtkeychain[qt5(+)] USEdep
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/akonadi-import-wizard/akonadi-import-wizard-22.08.2.ebuild | 2 +-
.../akonadi-import-wizard/akonadi-import-wizard-22.08.49..ebuild| 2 +-
kde-apps/akonadi-import-wizard/akonadi-import-wizard-.ebuild| 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git
a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-22.08.2.ebuild
b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-22.08.2.ebuild
index 48bb4e1b7b..ba6db9001e 100644
--- a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-22.08.2.ebuild
+++ b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-22.08.2.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
IUSE=""
DEPEND="
- dev-libs/qtkeychain:=
+ dev-libs/qtkeychain:=[qt5(+)]
>=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtwidgets-${QTMIN}:5
>=dev-qt/qtxml-${QTMIN}:5
diff --git
a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-22.08.49..ebuild
b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-22.08.49..ebuild
index 039292a17f..adae953eac 100644
--- a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-22.08.49..ebuild
+++ b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-22.08.49..ebuild
@@ -18,7 +18,7 @@ KEYWORDS=""
IUSE=""
DEPEND="
- dev-libs/qtkeychain:=
+ dev-libs/qtkeychain:=[qt5(+)]
>=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtwidgets-${QTMIN}:5
>=dev-qt/qtxml-${QTMIN}:5
diff --git a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-.ebuild
b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-.ebuild
index e6f892b441..397020487e 100644
--- a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-.ebuild
+++ b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-.ebuild
@@ -18,7 +18,7 @@ KEYWORDS=""
IUSE=""
DEPEND="
- dev-libs/qtkeychain:=
+ dev-libs/qtkeychain:=[qt5(+)]
>=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtwidgets-${QTMIN}:5
>=dev-qt/qtxml-${QTMIN}:5
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi-contacts/, kde-apps/akonadi-calendar/
commit: 82d56ff5641f309e783510087e0a1e7a468db622
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Mar 24 12:55:43 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Mar 24 14:53:09 2022 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=82d56ff5
kde-apps/akonadi-contacts: Update DEPENDs
Upstream commits:
c5ba92f1b5d6e83f1a4647d5cd64ec0339bd8994
f395fd2c25ac2e77a7d72b1ee3f5cb71bd181b4c
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/akonadi-calendar/akonadi-calendar-.ebuild | 2 ++
kde-apps/akonadi-contacts/akonadi-contacts-.ebuild | 1 -
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-.ebuild
b/kde-apps/akonadi-calendar/akonadi-calendar-.ebuild
index 3f0e708cbe..4a09e5cb46 100644
--- a/kde-apps/akonadi-calendar/akonadi-calendar-.ebuild
+++ b/kde-apps/akonadi-calendar/akonadi-calendar-.ebuild
@@ -34,11 +34,13 @@ DEPEND="
>=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/kitemmodels-${KFMIN}:5
>=kde-frameworks/kjobwidgets-${KFMIN}:5
+ >=kde-frameworks/knotifications-${KFMIN}:5
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
>=kde-frameworks/kxmlgui-${KFMIN}:5
"
diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-.ebuild
b/kde-apps/akonadi-contacts/akonadi-contacts-.ebuild
index 862b702bb0..820bccd139 100644
--- a/kde-apps/akonadi-contacts/akonadi-contacts-.ebuild
+++ b/kde-apps/akonadi-contacts/akonadi-contacts-.ebuild
@@ -28,7 +28,6 @@ RDEPEND="
>=kde-apps/akonadi-${PVCUT}:5
>=kde-apps/grantleetheme-${PVCUT}:5
>=kde-apps/kmime-${PVCUT}:5
- >=kde-apps/libkleo-${PVCUT}:5
>=kde-frameworks/kcodecs-${KFMIN}:5
>=kde-frameworks/kcompletion-${KFMIN}:5
>=kde-frameworks/kconfig-${KFMIN}:5
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/files/
commit: 3f270384bb3680af84a39b5dd741e03ba9e7fa3f Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Feb 10 19:04:27 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Feb 10 19:07:17 2022 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=3f270384 kde-apps/akonadi: Fix README.gentoo with newer mariadb/akonadi Bug: https://bugs.gentoo.org/792741 Reported-by: Theo Baumgartner gmail.com> Reported-by: Sven Eden prydeworx.com> Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/akonadi/files/README.gentoo | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kde-apps/akonadi/files/README.gentoo b/kde-apps/akonadi/files/README.gentoo index c778f6d1a2..69bb68c1f0 100644 --- a/kde-apps/akonadi/files/README.gentoo +++ b/kde-apps/akonadi/files/README.gentoo @@ -28,8 +28,8 @@ Note: 3) Optional: You may have come here with an already defunct akonadi service. To manually fix the akonadi MariaDB backend: - $ mysql_upgrade -S /run/user/$(id -u)/akonadi/default/mysql.socket \ - --defaults-file=~/.local/share/akonadi/mysql.conf + $ mysql_upgrade --defaults-file=~/.local/share/akonadi/mysql.conf \ + -S /run/user/$(id -u)/akonadi/mysql.socket Don't forget to restart the akonadi service afterwards: $ akonadictl restart
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi-calendar/
commit: f3d1e0c32a30fee8d5d649140b5b00baeafd70e1
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Nov 15 10:54:21 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Nov 15 10:54:21 2021 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=f3d1e0c3
kde-apps/akonadi-calendar: Minor ebuild style fix
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/akonadi-calendar/akonadi-calendar-.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-.ebuild
b/kde-apps/akonadi-calendar/akonadi-calendar-.ebuild
index f5444babef..993467c588 100644
--- a/kde-apps/akonadi-calendar/akonadi-calendar-.ebuild
+++ b/kde-apps/akonadi-calendar/akonadi-calendar-.ebuild
@@ -16,6 +16,8 @@ SLOT="5"
KEYWORDS=""
IUSE=""
+RESTRICT="test"
+
DEPEND="
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtgui-${QTMIN}:5
@@ -41,5 +43,3 @@ DEPEND="
>=kde-frameworks/kxmlgui-${KFMIN}:5
"
RDEPEND="${DEPEND}"
-
-RESTRICT="test"
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi-import-wizard/
commit: 6b8d08e7d178f873e97583dd5545ffd6faf79a4a
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Nov 15 10:36:20 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Nov 15 10:36:20 2021 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=6b8d08e7
kde-apps/akonadi-import-wizard: Drop unused DEPEND
Upstream commit 31f5d52b854fa2ab5b3677374fa4c6a2b6c419e7
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/akonadi-import-wizard/akonadi-import-wizard-.ebuild | 1 -
1 file changed, 1 deletion(-)
diff --git a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-.ebuild
b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-.ebuild
index 42a40d2b67..b5e3a06ce1 100644
--- a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-.ebuild
+++ b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-.ebuild
@@ -23,7 +23,6 @@ DEPEND="
>=dev-qt/qtwidgets-${QTMIN}:5
>=dev-qt/qtxml-${QTMIN}:5
>=kde-apps/akonadi-${PVCUT}:5
- >=kde-apps/grantleetheme-${PVCUT}:5
>=kde-apps/kidentitymanagement-${PVCUT}:5
>=kde-apps/kmailtransport-${PVCUT}:5
>=kde-apps/mailcommon-${PVCUT}:5
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi-mime/
commit: 615cf70fd9934d6df9979781571a1291a63ea01f Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Nov 15 10:34:56 2021 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Nov 15 10:34:56 2021 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=615cf70f kde-apps/akonadi-mime: Set ECM_QTHELP=true Upstream commit ccf04481a7d1fea62a68ee6ffb641115c2c055b7 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/akonadi-mime/akonadi-mime-.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/kde-apps/akonadi-mime/akonadi-mime-.ebuild b/kde-apps/akonadi-mime/akonadi-mime-.ebuild index 3acae11711..5822e673e7 100644 --- a/kde-apps/akonadi-mime/akonadi-mime-.ebuild +++ b/kde-apps/akonadi-mime/akonadi-mime-.ebuild @@ -3,6 +3,7 @@ EAPI=8 +ECM_QTHELP="true" ECM_TEST="true" PVCUT=$(ver_cut 1-3) KFMIN=5.85.0
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi-search/
commit: 06abd34a6c9712a67e94ce23c3f6a68c5f76d6a1
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Nov 15 10:31:58 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Nov 15 10:31:58 2021 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=06abd34a
kde-apps/akonadi-search: Set ECM_QTHELP=true
Upstream commit 429d8fd5d9deed113c5d5201f30849ba62a5cd78
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/akonadi-search/akonadi-search-.ebuild | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/kde-apps/akonadi-search/akonadi-search-.ebuild
b/kde-apps/akonadi-search/akonadi-search-.ebuild
index 608963643f..0e2e137591 100644
--- a/kde-apps/akonadi-search/akonadi-search-.ebuild
+++ b/kde-apps/akonadi-search/akonadi-search-.ebuild
@@ -3,6 +3,7 @@
EAPI=8
+ECM_QTHELP="true"
ECM_TEST="forceoptional"
PVCUT=$(ver_cut 1-3)
KFMIN=5.85.0
@@ -20,9 +21,6 @@ IUSE=""
RESTRICT="test" # perpetually broken, bug 662378
-BDEPEND="
- test? ( >=kde-apps/akonadi-${PVCUT}:5[tools] )
-"
RDEPEND="
>=dev-libs/xapian-1.3:=[chert(+)]
>=dev-qt/qtdbus-${QTMIN}:5
@@ -47,3 +45,6 @@ DEPEND="${RDEPEND}
dev-libs/boost
test? ( >=kde-apps/akonadi-${PVCUT}:5[mysql,postgres,sqlite] )
"
+BDEPEND="
+ test? ( >=kde-apps/akonadi-${PVCUT}:5[tools] )
+"
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi-contacts/
commit: ab9c1f470a245df6a203242edd5ab1e611bdce25 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Nov 15 10:39:13 2021 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Nov 15 10:39:13 2021 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=ab9c1f47 kde-apps/akonadi-contacts: Set ECM_QTHELP=true Upstream commit 1c29e2c5a0fec619b8ec37dac05d4d6c72b32888 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/akonadi-contacts/akonadi-contacts-.ebuild | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-.ebuild b/kde-apps/akonadi-contacts/akonadi-contacts-.ebuild index aee334d336..bad4437ca8 100644 --- a/kde-apps/akonadi-contacts/akonadi-contacts-.ebuild +++ b/kde-apps/akonadi-contacts/akonadi-contacts-.ebuild @@ -3,6 +3,7 @@ EAPI=8 +ECM_QTHELP="true" ECM_TEST="forceoptional" PVCUT=$(ver_cut 1-3) KFMIN=5.85.0 @@ -11,9 +12,9 @@ inherit ecm kde.org DESCRIPTION="Library for akonadi contact integration" +LICENSE="GPL-2+" SLOT="5" KEYWORDS="" -LICENSE="GPL-2+" IUSE="" # some akonadi tests time out, that probably needs more work as it's ~700 tests
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/
commit: bac6af34c17372e195bfe42b1905e7e688453d09 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Nov 15 10:03:22 2021 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Nov 15 10:03:22 2021 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=bac6af34 kde-apps/akonadi: Set ECM_QTHELP=true Upstream commit b0ff923f6e907050fac215f4e9c0382440df42a0 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/akonadi/akonadi-.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/kde-apps/akonadi/akonadi-.ebuild b/kde-apps/akonadi/akonadi-.ebuild index 62404a1cb6..155de15150 100644 --- a/kde-apps/akonadi/akonadi-.ebuild +++ b/kde-apps/akonadi/akonadi-.ebuild @@ -4,6 +4,7 @@ EAPI=8 ECM_DESIGNERPLUGIN="true" +ECM_QTHELP="true" ECM_TEST="forceoptional" KFMIN=5.85.0 QTMIN=5.15.2
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi-notes/
commit: d9a389bef2c551c2229e151287cf4af94a93d396 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Nov 15 10:33:20 2021 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Nov 15 10:33:20 2021 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=d9a389be kde-apps/akonadi-notes: Set ECM_QTHELP=true Upstream commit f7270628ca1f4972ab91c30a31336c32a33af4d4 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/akonadi-notes/akonadi-notes-.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/kde-apps/akonadi-notes/akonadi-notes-.ebuild b/kde-apps/akonadi-notes/akonadi-notes-.ebuild index 1ca2f92fe1..62291d7208 100644 --- a/kde-apps/akonadi-notes/akonadi-notes-.ebuild +++ b/kde-apps/akonadi-notes/akonadi-notes-.ebuild @@ -3,6 +3,7 @@ EAPI=8 +ECM_QTHELP="true" ECM_TEST="true" PVCUT=$(ver_cut 1-3) KFMIN=5.85.0
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi-import-wizard/
commit: 18aba7900dc6ccb5bbc1c682c3dbfd25ee8f9873
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Apr 15 20:18:15 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Apr 15 22:30:39 2021 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=18aba790
kde-apps/akonadi-import-wizard: Update DEPENDs
Upstream commits:
25462a349b426c4da5d0abf45437f2003f6f502c
231372812e0b23b9065eed918a2820f59c9dcd09
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/akonadi-import-wizard/akonadi-import-wizard-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-.ebuild
b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-.ebuild
index f5004f1cc1..3b3a8bf3c4 100644
--- a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-.ebuild
+++ b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-.ebuild
@@ -18,6 +18,7 @@ KEYWORDS=""
IUSE=""
DEPEND="
+ dev-libs/qtkeychain:=
>=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtwidgets-${QTMIN}:5
>=dev-qt/qtxml-${QTMIN}:5
@@ -36,7 +37,6 @@ DEPEND="
>=kde-frameworks/kcrash-${KFMIN}:5
>=kde-frameworks/kdbusaddons-${KFMIN}:5
>=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kwallet-${KFMIN}:5
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
>=kde-frameworks/kxmlgui-${KFMIN}:5
"
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/files/, kde-apps/akonadi/
commit: c64308088b7b68117d4243ee02d0cbf3adbaf432
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Mar 16 23:04:33 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Apr 4 19:50:18 2021 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=c6430808
kde-apps/akonadi: Update IUSE=mysql instructions using readme.gentoo
Provide detailed instructions for how to fix existing backends.
Bug: https://bugs.gentoo.org/688746
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/akonadi/akonadi-.ebuild | 15 ++
kde-apps/akonadi/files/README.gentoo | 39
2 files changed, 45 insertions(+), 9 deletions(-)
diff --git a/kde-apps/akonadi/akonadi-.ebuild
b/kde-apps/akonadi/akonadi-.ebuild
index f7739ae681..e2f976fc2c 100644
--- a/kde-apps/akonadi/akonadi-.ebuild
+++ b/kde-apps/akonadi/akonadi-.ebuild
@@ -9,7 +9,7 @@ KFMIN=5.75.0
QTMIN=5.15.2
VIRTUALDBUS_TEST="true"
VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
+inherit ecm kde.org readme.gentoo-r1
DESCRIPTION="Storage service for PIM data and libraries for PIM apps"
HOMEPAGE="https://community.kde.org/KDE_PIM/akonadi";
@@ -73,15 +73,9 @@ pkg_setup() {
use postgres && DRIVER="QPSQL"
use mysql && DRIVER="QMYSQL"
- if use mysql && has_version ">=dev-db/mariadb-10.4"; then
- ewarn "If an existing Akonadi QMYSQL database is being upgraded
using"
- ewarn ">=dev-db/mariadb-10.4 and KMail stops fetching and
sending mail,"
- ewarn "check ~/.local/share/akonadi/akonadiserver.error for
errors like:"
- ewarn " \"Cannot add or update a child row: a foreign key
constraint fails\""
+ if use mysql && has_version "${CATEGORY}/${PN}[mysql]" && has_version
"dev-db/mariadb"; then
ewarn
- ewarn "Manual steps are required to fix it, see also:"
- ewarn " https://bugs.gentoo.org/688746 (see Whiteboard)"
- ewarn " https://bugs.kde.org/show_bug.cgi?id=409224";
+ ewarn "Attention: Make sure to read README.gentoo after
install."
ewarn
fi
@@ -116,6 +110,7 @@ EOF
doins "${T}"/akonadiserverrc
ecm_src_install
+ readme.gentoo_create_doc
}
pkg_postinst() {
@@ -126,4 +121,6 @@ pkg_postinst() {
use postgres && elog " QPSQL"
use sqlite && elog " QSQLITE3"
elog "${DRIVER} has been set as your default akonadi storage backend."
+ use mysql && elog
+ use mysql && FORCE_PRINT_ELOG=1 readme.gentoo_print_elog
}
diff --git a/kde-apps/akonadi/files/README.gentoo
b/kde-apps/akonadi/files/README.gentoo
new file mode 100644
index 00..c778f6d1a2
--- /dev/null
+++ b/kde-apps/akonadi/files/README.gentoo
@@ -0,0 +1,39 @@
+Akonadi QMYSQL backends that were created using https://bugs.gentoo.org/688746
+ [2] https://bugs.kde.org/show_bug.cgi?id=409224
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi-search/
commit: f89bb4967379917829edea82bccab43143f4f949
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Feb 16 22:55:51 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Feb 16 22:56:12 2021 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=f89bb496
kde-apps/akonadi-search: kde-apps/akonadi[mariadb -> mysql]
Reverting commit 34468217.
Follow-up to b555756d45fff488bc600669bb655aa027b89bb8.
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/akonadi-search/akonadi-search-20.12.49..ebuild | 2 +-
kde-apps/akonadi-search/akonadi-search-.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/kde-apps/akonadi-search/akonadi-search-20.12.49..ebuild
b/kde-apps/akonadi-search/akonadi-search-20.12.49..ebuild
index 173da5b674..9d5b0b198d 100644
--- a/kde-apps/akonadi-search/akonadi-search-20.12.49..ebuild
+++ b/kde-apps/akonadi-search/akonadi-search-20.12.49..ebuild
@@ -45,5 +45,5 @@ RDEPEND="
"
DEPEND="${RDEPEND}
dev-libs/boost
- test? ( >=kde-apps/akonadi-${PVCUT}:5[mariadb,postgres,sqlite] )
+ test? ( >=kde-apps/akonadi-${PVCUT}:5[mysql,postgres,sqlite] )
"
diff --git a/kde-apps/akonadi-search/akonadi-search-.ebuild
b/kde-apps/akonadi-search/akonadi-search-.ebuild
index 173da5b674..9d5b0b198d 100644
--- a/kde-apps/akonadi-search/akonadi-search-.ebuild
+++ b/kde-apps/akonadi-search/akonadi-search-.ebuild
@@ -45,5 +45,5 @@ RDEPEND="
"
DEPEND="${RDEPEND}
dev-libs/boost
- test? ( >=kde-apps/akonadi-${PVCUT}:5[mariadb,postgres,sqlite] )
+ test? ( >=kde-apps/akonadi-${PVCUT}:5[mysql,postgres,sqlite] )
"
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/
commit: b555756d45fff488bc600669bb655aa027b89bb8
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Feb 16 22:25:09 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Feb 16 22:47:30 2021 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=b555756d
kde-apps/akonadi: Switch back IUSE=mariadb -> mysql
This is reverting commit 6b90510a (kde overlay), fix is already upstream.
Upstream commit: 9c666d0d6039a87f6286014c7d9c7281a5bd9dd1
KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=421922
Reported-by: Stephan Karacson gmx.at>
Thanks-to: Victor Mataré posteo.de>
Thanks-to: Thomas Deutschmann gentoo.org>
Bug: https://bugs.gentoo.org/709812
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/akonadi/akonadi-20.12.49..ebuild | 34 ++-
kde-apps/akonadi/akonadi-.ebuild | 34 ++-
kde-apps/akonadi/metadata.xml | 1 -
3 files changed, 26 insertions(+), 43 deletions(-)
diff --git a/kde-apps/akonadi/akonadi-20.12.49..ebuild
b/kde-apps/akonadi/akonadi-20.12.49..ebuild
index e7d3dad598..49786040c9 100644
--- a/kde-apps/akonadi/akonadi-20.12.49..ebuild
+++ b/kde-apps/akonadi/akonadi-20.12.49..ebuild
@@ -17,16 +17,19 @@ HOMEPAGE="https://community.kde.org/KDE_PIM/akonadi";
LICENSE="LGPL-2.1+"
SLOT="5"
KEYWORDS=""
-IUSE="+kaccounts +mariadb postgres sqlite tools xml"
+IUSE="+kaccounts +mysql postgres sqlite tools xml"
-REQUIRED_USE="|| ( mariadb postgres sqlite ) test? ( tools )"
+REQUIRED_USE="|| ( mysql postgres sqlite ) test? ( tools )"
+
+# some akonadi tests time out, that probably needs more work as it's ~700 tests
+RESTRICT+=" test"
COMMON_DEPEND="
app-arch/xz-utils
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtsql-${QTMIN}:5[postgres?]
+ >=dev-qt/qtsql-${QTMIN}:5[mysql?,postgres?]
>=dev-qt/qtwidgets-${QTMIN}:5
>=dev-qt/qtxml-${QTMIN}:5
>=kde-frameworks/kconfig-${KFMIN}:5
@@ -45,7 +48,6 @@ COMMON_DEPEND="
>=kde-apps/kaccounts-integration-20.08.3:5
net-libs/accounts-qt
)
- mariadb? ( >=dev-qt/qtsql-${QTMIN}:5[mysql] )
sqlite? (
dev-db/sqlite:3
>=dev-qt/qtsql-${QTMIN}:5=[sqlite]
@@ -58,24 +60,21 @@ DEPEND="${COMMON_DEPEND}
test? ( sys-apps/dbus )
"
RDEPEND="${COMMON_DEPEND}
- mariadb? ( >=dev-db/mariadb-10.4:* )
+ mysql? ( virtual/mysql )
postgres? ( dev-db/postgresql )
"
-# some akonadi tests time out, that probably needs more work as it's ~700 tests
-RESTRICT+=" test"
-
PATCHES=( "${FILESDIR}/${PN}-18.12.2-mysql56-crash.patch" )
pkg_setup() {
- # Set default storage backend in order: MariaDB, PostgreSQL, SQLite
+ # Set default storage backend in order: MySQL, PostgreSQL, SQLite
# reverse driver check to keep the order
use sqlite && DRIVER="QSQLITE3"
use postgres && DRIVER="QPSQL"
- use mariadb && DRIVER="QMYSQL"
+ use mysql && DRIVER="QMYSQL"
- if use mariadb && has_version ">=dev-db/mariadb-10.4"; then
- ewarn "If an existing Akonadi MariaDB database is being
upgraded using"
+ if use mysql && has_version ">=dev-db/mariadb-10.4"; then
+ ewarn "If an existing Akonadi QMYSQL database is being upgraded
using"
ewarn ">=dev-db/mariadb-10.4 and KMail stops fetching and
sending mail,"
ewarn "check ~/.local/share/akonadi/akonadiserver.error for
errors like:"
ewarn " \"Cannot add or update a child row: a foreign key
constraint fails\""
@@ -88,17 +87,10 @@ pkg_setup() {
if use sqlite || has_version "<${CATEGORY}/${P}[sqlite]"; then
ewarn "We strongly recommend you change your Akonadi database
backend to"
- ewarn "either MariaDB or PostgreSQL in your user configuration."
+ ewarn "either MariaDB/MySQL or PostgreSQL in your user
configuration."
ewarn "In particular, kde-apps/kmail does not work properly
with the sqlite backend."
fi
- if has_version "kde-apps/akonadi[mysql]"; then
- ewarn "Due to configuration incompatibilities we are unable to
provide"
- ewarn "the option to use dev-db/mysql. You must switch to
dev-db/mariadb."
- ewarn " https://bugs.gentoo.org/709812";
- ewarn " https://bugs.kde.org/show_bug.cgi?id=421922";
- fi
-
ecm_pkg_setup
}
@@ -130,7 +122,7 @@ pkg_postinst() {
ecm_pkg_postinst
elog "You can select the storage backend in
~/.config/akonadi/akonadiserverrc."
elog "Available drivers are:"
- use mariadb && elog " QMYSQL"
+ use mysql && elog " QMYSQL"
use postgres && elog " QPSQL"
use sqlite && elog "
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/
commit: b587a500eea0b119ca5dbc26472c43a9c354883e
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Feb 15 11:48:32 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Feb 15 14:12:55 2021 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=b587a500
kde-apps/akonadi: Unrestrict kde-apps/kaccounts-integration dep
Let's take upstream's word for it.
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/akonadi/akonadi-20.12.49..ebuild | 3 +--
kde-apps/akonadi/akonadi-.ebuild | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/kde-apps/akonadi/akonadi-20.12.49..ebuild
b/kde-apps/akonadi/akonadi-20.12.49..ebuild
index c493b65d7e..e7d3dad598 100644
--- a/kde-apps/akonadi/akonadi-20.12.49..ebuild
+++ b/kde-apps/akonadi/akonadi-20.12.49..ebuild
@@ -5,7 +5,6 @@ EAPI=7
ECM_DESIGNERPLUGIN="true"
ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
KFMIN=5.75.0
QTMIN=5.15.2
VIRTUALDBUS_TEST="true"
@@ -43,7 +42,7 @@ COMMON_DEPEND="
>=kde-frameworks/kwindowsystem-${KFMIN}:5
>=kde-frameworks/kxmlgui-${KFMIN}:5
kaccounts? (
- >=kde-apps/kaccounts-integration-${PVCUT}:5
+ >=kde-apps/kaccounts-integration-20.08.3:5
net-libs/accounts-qt
)
mariadb? ( >=dev-qt/qtsql-${QTMIN}:5[mysql] )
diff --git a/kde-apps/akonadi/akonadi-.ebuild
b/kde-apps/akonadi/akonadi-.ebuild
index c493b65d7e..e7d3dad598 100644
--- a/kde-apps/akonadi/akonadi-.ebuild
+++ b/kde-apps/akonadi/akonadi-.ebuild
@@ -5,7 +5,6 @@ EAPI=7
ECM_DESIGNERPLUGIN="true"
ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
KFMIN=5.75.0
QTMIN=5.15.2
VIRTUALDBUS_TEST="true"
@@ -43,7 +42,7 @@ COMMON_DEPEND="
>=kde-frameworks/kwindowsystem-${KFMIN}:5
>=kde-frameworks/kxmlgui-${KFMIN}:5
kaccounts? (
- >=kde-apps/kaccounts-integration-${PVCUT}:5
+ >=kde-apps/kaccounts-integration-20.08.3:5
net-libs/accounts-qt
)
mariadb? ( >=dev-qt/qtsql-${QTMIN}:5[mysql] )
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/, kde-apps/akonadi/files/
commit: 3225f48c9c6e133d09233cd9a673a0146b18cef3
Author: Manuel Nickschas quassel-irc org>
AuthorDate: Wed Feb 10 10:43:47 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Feb 15 14:12:55 2021 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=3225f48c
kde-apps/akonadi: Rebase mysql crash patch for live version
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Manuel Nickschas quassel-irc.org>
Closes: https://github.com/gentoo/kde/pull/896
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/akonadi/akonadi-.ebuild | 2 +-
.../files/akonadi-21.03.80-mysql56-crash.patch | 51 ++
2 files changed, 52 insertions(+), 1 deletion(-)
diff --git a/kde-apps/akonadi/akonadi-.ebuild
b/kde-apps/akonadi/akonadi-.ebuild
index e7d3dad598..3320293e8a 100644
--- a/kde-apps/akonadi/akonadi-.ebuild
+++ b/kde-apps/akonadi/akonadi-.ebuild
@@ -65,7 +65,7 @@ RDEPEND="${COMMON_DEPEND}
# some akonadi tests time out, that probably needs more work as it's ~700 tests
RESTRICT+=" test"
-PATCHES=( "${FILESDIR}/${PN}-18.12.2-mysql56-crash.patch" )
+PATCHES=( "${FILESDIR}/${PN}-21.03.80-mysql56-crash.patch" )
pkg_setup() {
# Set default storage backend in order: MariaDB, PostgreSQL, SQLite
diff --git a/kde-apps/akonadi/files/akonadi-21.03.80-mysql56-crash.patch
b/kde-apps/akonadi/files/akonadi-21.03.80-mysql56-crash.patch
new file mode 100644
index 00..7cee0b0e81
--- /dev/null
+++ b/kde-apps/akonadi/files/akonadi-21.03.80-mysql56-crash.patch
@@ -0,0 +1,51 @@
+From ca023c075e5e239dd6d254722c8866b17a524a3c Mon Sep 17 00:00:00 2001
+From: Manuel Nickschas
+Date: Wed, 10 Feb 2021 09:40:44 +0100
+Subject: [PATCH] Find mysql_install_db and add required option
+
+Rebase patch onto 21.03.80
+Gentoo-bug: 530012
+---
+ src/server/storage/dbconfigmysql.cpp | 7 ---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/src/server/storage/dbconfigmysql.cpp
b/src/server/storage/dbconfigmysql.cpp
+index fd057670e..c19cff0e0 100644
+--- a/src/server/storage/dbconfigmysql.cpp
b/src/server/storage/dbconfigmysql.cpp
+@@ -53,6 +53,7 @@ static QString findExecutable(const QString &bin)
+ QStringLiteral("/usr/local/sbin"),
+ QStringLiteral("/usr/local/libexec"),
+ QStringLiteral("/usr/libexec"),
++QStringLiteral("/usr/share/mysql/scripts"),
+ QStringLiteral("/opt/mysql/libexec"),
+ QStringLiteral("/opt/local/lib/mysql5/bin"),
+ QStringLiteral("/opt/mysql/sbin"),
+@@ -597,7 +598,7 @@ bool DbConfigMysql::initializeMariaDBDatabase(const
QString &confFile, const QSt
+ == execute(mMysqlInstallDbPath,
+{QStringLiteral("--defaults-file=%1").arg(confFile),
+ QStringLiteral("--force"),
+-QStringLiteral("--basedir=%1").arg(baseDir),
++QStringLiteral("--basedir=/usr"),
+ QStringLiteral("--datadir=%1/").arg(dataDir)});
+ }
+
+@@ -609,7 +610,7 @@ bool DbConfigMysql::initializeMySQL5_7_6Database(const
QString &confFile, const
+ {
+ return 0
+ == execute(mMysqldPath,
+- {QStringLiteral("--defaults-file=%1").arg(confFile),
QStringLiteral("--initialize"), QStringLiteral("--datadir=%1/").arg(dataDir)});
++ {QStringLiteral("--defaults-file=%1").arg(confFile),
QStringLiteral("--initialize"), QStringLiteral("--basedir=/usr"),
QStringLiteral("--datadir=%1/").arg(dataDir)});
+ }
+
+ bool DbConfigMysql::initializeMySQLDatabase(const QString &confFile, const
QString &dataDir) const
+@@ -629,5 +630,5 @@ bool DbConfigMysql::initializeMySQLDatabase(const QString
&confFile, const QStri
+ return 0
+ == execute(
+mMysqlInstallDbPath,
+- {QStringLiteral("--defaults-file=%1").arg(confFile),
QStringLiteral("--basedir=%1").arg(baseDir),
QStringLiteral("--datadir=%1/").arg(dataDir)});
++ {QStringLiteral("--defaults-file=%1").arg(confFile),
QStringLiteral("--basedir=/usr"),
QStringLiteral("--datadir=%1/").arg(dataDir)});
+ }
+--
+2.30.0
+
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/
commit: 23ca1542bee46f67c22de5406d425e2a48178966
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Jan 7 17:34:38 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Feb 4 12:57:57 2021 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=23ca1542
kde-apps/akonadi: Show message if kde-apps/akonadi[mysql] was enabled
dev-db/mysql would have been gone by the time kde-apps/akonadi is slated.
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/akonadi/akonadi-20.12.2.ebuild | 2 +-
kde-apps/akonadi/akonadi-20.12.49..ebuild | 2 +-
kde-apps/akonadi/akonadi-.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/kde-apps/akonadi/akonadi-20.12.2.ebuild
b/kde-apps/akonadi/akonadi-20.12.2.ebuild
index ad18390716..ec7b1bb392 100644
--- a/kde-apps/akonadi/akonadi-20.12.2.ebuild
+++ b/kde-apps/akonadi/akonadi-20.12.2.ebuild
@@ -93,7 +93,7 @@ pkg_setup() {
ewarn "In particular, kde-apps/kmail does not work properly
with the sqlite backend."
fi
- if has_version "kde-apps/akonadi[mysql]" && has_version "dev-db/mysql";
then
+ if has_version "kde-apps/akonadi[mysql]"; then
ewarn "Due to configuration incompatibilities we are unable to
provide"
ewarn "the option to use dev-db/mysql. You must switch to
dev-db/mariadb."
ewarn " https://bugs.gentoo.org/709812";
diff --git a/kde-apps/akonadi/akonadi-20.12.49..ebuild
b/kde-apps/akonadi/akonadi-20.12.49..ebuild
index 501b68dfba..c493b65d7e 100644
--- a/kde-apps/akonadi/akonadi-20.12.49..ebuild
+++ b/kde-apps/akonadi/akonadi-20.12.49..ebuild
@@ -93,7 +93,7 @@ pkg_setup() {
ewarn "In particular, kde-apps/kmail does not work properly
with the sqlite backend."
fi
- if has_version "kde-apps/akonadi[mysql]" && has_version "dev-db/mysql";
then
+ if has_version "kde-apps/akonadi[mysql]"; then
ewarn "Due to configuration incompatibilities we are unable to
provide"
ewarn "the option to use dev-db/mysql. You must switch to
dev-db/mariadb."
ewarn " https://bugs.gentoo.org/709812";
diff --git a/kde-apps/akonadi/akonadi-.ebuild
b/kde-apps/akonadi/akonadi-.ebuild
index 501b68dfba..c493b65d7e 100644
--- a/kde-apps/akonadi/akonadi-.ebuild
+++ b/kde-apps/akonadi/akonadi-.ebuild
@@ -93,7 +93,7 @@ pkg_setup() {
ewarn "In particular, kde-apps/kmail does not work properly
with the sqlite backend."
fi
- if has_version "kde-apps/akonadi[mysql]" && has_version "dev-db/mysql";
then
+ if has_version "kde-apps/akonadi[mysql]"; then
ewarn "Due to configuration incompatibilities we are unable to
provide"
ewarn "the option to use dev-db/mysql. You must switch to
dev-db/mariadb."
ewarn " https://bugs.gentoo.org/709812";
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi-search/
commit: 34468217e0f206e6848b1b169783263479a884bf
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Fri Jan 1 11:45:26 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Fri Jan 1 12:22:33 2021 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=34468217
kde-apps/akonadi-search: kde-apps/akonadi[mysql -> mariadb]
Follow-up to 6b90510ab328d1bdbba167d9ccd4c6ba0cb4bfed
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/akonadi-search/akonadi-search-20.12.49..ebuild | 2 +-
kde-apps/akonadi-search/akonadi-search-.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/kde-apps/akonadi-search/akonadi-search-20.12.49..ebuild
b/kde-apps/akonadi-search/akonadi-search-20.12.49..ebuild
index ada3606e79..9c39386185 100644
--- a/kde-apps/akonadi-search/akonadi-search-20.12.49..ebuild
+++ b/kde-apps/akonadi-search/akonadi-search-20.12.49..ebuild
@@ -45,5 +45,5 @@ RDEPEND="
"
DEPEND="${RDEPEND}
dev-libs/boost
- test? ( >=kde-apps/akonadi-${PVCUT}:5[mysql,postgres,sqlite] )
+ test? ( >=kde-apps/akonadi-${PVCUT}:5[mariadb,postgres,sqlite] )
"
diff --git a/kde-apps/akonadi-search/akonadi-search-.ebuild
b/kde-apps/akonadi-search/akonadi-search-.ebuild
index ada3606e79..9c39386185 100644
--- a/kde-apps/akonadi-search/akonadi-search-.ebuild
+++ b/kde-apps/akonadi-search/akonadi-search-.ebuild
@@ -45,5 +45,5 @@ RDEPEND="
"
DEPEND="${RDEPEND}
dev-libs/boost
- test? ( >=kde-apps/akonadi-${PVCUT}:5[mysql,postgres,sqlite] )
+ test? ( >=kde-apps/akonadi-${PVCUT}:5[mariadb,postgres,sqlite] )
"
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/
commit: 6b90510ab328d1bdbba167d9ccd4c6ba0cb4bfed
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Fri Dec 25 21:36:01 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Fri Dec 25 21:41:15 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=6b90510a
kde-apps/akonadi: Switch QMYSQL from virtual/mysql -> dev-db/mariadb
Bug: https://bugs.gentoo.org/709812
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/akonadi/akonadi-20.12.49..ebuild | 30 +--
kde-apps/akonadi/akonadi-.ebuild | 30 +--
kde-apps/akonadi/metadata.xml | 1 +
3 files changed, 39 insertions(+), 22 deletions(-)
diff --git a/kde-apps/akonadi/akonadi-20.12.49..ebuild
b/kde-apps/akonadi/akonadi-20.12.49..ebuild
index f452132cba..71e0c4e882 100644
--- a/kde-apps/akonadi/akonadi-20.12.49..ebuild
+++ b/kde-apps/akonadi/akonadi-20.12.49..ebuild
@@ -18,16 +18,16 @@ HOMEPAGE="https://community.kde.org/KDE_PIM/akonadi";
LICENSE="LGPL-2.1+"
SLOT="5"
KEYWORDS=""
-IUSE="+kaccounts +mysql postgres sqlite tools xml"
+IUSE="+kaccounts +mariadb postgres sqlite tools xml"
-REQUIRED_USE="|| ( mysql postgres sqlite ) test? ( tools )"
+REQUIRED_USE="|| ( mariadb postgres sqlite ) test? ( tools )"
COMMON_DEPEND="
app-arch/xz-utils
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtsql-${QTMIN}:5[mysql?,postgres?]
+ >=dev-qt/qtsql-${QTMIN}:5[postgres?]
>=dev-qt/qtwidgets-${QTMIN}:5
>=dev-qt/qtxml-${QTMIN}:5
>=kde-frameworks/kconfig-${KFMIN}:5
@@ -46,6 +46,7 @@ COMMON_DEPEND="
>=kde-apps/kaccounts-integration-${PVCUT}:5
net-libs/accounts-qt
)
+ mariadb? ( >=dev-qt/qtsql-${QTMIN}:5[mysql] )
sqlite? (
dev-db/sqlite:3
>=dev-qt/qtsql-${QTMIN}:5=[sqlite]
@@ -58,7 +59,7 @@ DEPEND="${COMMON_DEPEND}
test? ( sys-apps/dbus )
"
RDEPEND="${COMMON_DEPEND}
- mysql? ( virtual/mysql )
+ mariadb? ( >=dev-db/mariadb-10.4:* )
postgres? ( dev-db/postgresql )
"
@@ -68,14 +69,14 @@ RESTRICT+=" test"
PATCHES=( "${FILESDIR}/${PN}-18.12.2-mysql56-crash.patch" )
pkg_setup() {
- # Set default storage backend in order: MySQL, PostgreSQL, SQLite
+ # Set default storage backend in order: MariaDB, PostgreSQL, SQLite
# reverse driver check to keep the order
use sqlite && DRIVER="QSQLITE3"
use postgres && DRIVER="QPSQL"
- use mysql && DRIVER="QMYSQL"
+ use mariadb && DRIVER="QMYSQL"
- if use mysql && has_version ">=dev-db/mariadb-10.4"; then
- ewarn "If an existing Akonadi QMYSQL database is being upgraded
using"
+ if use mariadb && has_version ">=dev-db/mariadb-10.4"; then
+ ewarn "If an existing Akonadi MariaDB database is being
upgraded using"
ewarn ">=dev-db/mariadb-10.4 and KMail stops fetching and
sending mail,"
ewarn "check ~/.local/share/akonadi/akonadiserver.error for
errors like:"
ewarn " \"Cannot add or update a child row: a foreign key
constraint fails\""
@@ -87,11 +88,18 @@ pkg_setup() {
fi
if use sqlite || has_version "<${CATEGORY}/${P}[sqlite]"; then
- ewarn "We strongly recommend you change your Akonadi database
backend to either MySQL"
- ewarn "or PostgreSQL in your user configuration."
+ ewarn "We strongly recommend you change your Akonadi database
backend to"
+ ewarn "either MariaDB or PostgreSQL in your user configuration."
ewarn "In particular, kde-apps/kmail does not work properly
with the sqlite backend."
fi
+ if has_version "kde-apps/akonadi[mysql]" && has_version "dev-db/mysql";
then
+ ewarn "Due to configuration incompatibilities we are unable to
provide"
+ ewarn "the option to use dev-db/mysql. You must switch to
dev-db/mariadb."
+ ewarn " https://bugs.gentoo.org/709812";
+ ewarn " https://bugs.kde.org/show_bug.cgi?id=421922";
+ fi
+
ecm_pkg_setup
}
@@ -123,7 +131,7 @@ pkg_postinst() {
ecm_pkg_postinst
elog "You can select the storage backend in
~/.config/akonadi/akonadiserverrc."
elog "Available drivers are:"
- use mysql && elog " QMYSQL"
+ use mariadb && elog " QMYSQL"
use postgres && elog " QPSQL"
use sqlite && elog " QSQLITE3"
elog "${DRIVER} has been set as your default akonadi storage backend."
diff --git a/kde-apps/akonadi/akonadi-.ebuild
b/kde-apps/akonadi/akonadi-.ebuild
index f452132cba..71e0c4e882 100644
--- a/kde-apps/akonadi/akonadi-.ebuild
+++ b/kde-apps/akonadi/akonadi-.ebuild
@@ -18,16 +18,16 @@ HOMEPAGE=
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/
commit: 9f23b65c831d367efb7d38673a51f8078cdb1864
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Oct 10 20:52:43 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Oct 10 20:52:43 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=9f23b65c
kde-apps/akonadi: Add new DEPEND
Upstream commit 2bf3a5c987c050c1193aa2ba0330a87b70050f80
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/akonadi/akonadi-.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/kde-apps/akonadi/akonadi-.ebuild
b/kde-apps/akonadi/akonadi-.ebuild
index 6f2bd42d16..2a2169962b 100644
--- a/kde-apps/akonadi/akonadi-.ebuild
+++ b/kde-apps/akonadi/akonadi-.ebuild
@@ -23,6 +23,7 @@ IUSE="+kaccounts +mysql postgres sqlite tools xml"
REQUIRED_USE="|| ( mysql postgres sqlite ) test? ( tools )"
COMMON_DEPEND="
+ app-arch/xz-utils
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtnetwork-${QTMIN}:5
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/
commit: c71bd7f74932791555a2184ab855925783a5c58b Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Sep 28 21:23:21 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Sep 28 21:23:26 2020 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=c71bd7f7 kde-apps/akonadi: Fix variables order Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/akonadi/akonadi-20.08.49..ebuild | 2 +- kde-apps/akonadi/akonadi-.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kde-apps/akonadi/akonadi-20.08.49..ebuild b/kde-apps/akonadi/akonadi-20.08.49..ebuild index fe36dd49d4..d1e5d5e595 100644 --- a/kde-apps/akonadi/akonadi-20.08.49..ebuild +++ b/kde-apps/akonadi/akonadi-20.08.49..ebuild @@ -15,9 +15,9 @@ inherit ecm kde.org DESCRIPTION="Storage service for PIM data and libraries for PIM apps" HOMEPAGE="https://community.kde.org/KDE_PIM/akonadi"; +LICENSE="LGPL-2.1+" SLOT="5" KEYWORDS="" -LICENSE="LGPL-2.1+" IUSE="+kaccounts +mysql postgres sqlite tools xml" REQUIRED_USE="|| ( mysql postgres sqlite ) test? ( tools )" diff --git a/kde-apps/akonadi/akonadi-.ebuild b/kde-apps/akonadi/akonadi-.ebuild index b2f8e00e47..6f2bd42d16 100644 --- a/kde-apps/akonadi/akonadi-.ebuild +++ b/kde-apps/akonadi/akonadi-.ebuild @@ -15,9 +15,9 @@ inherit ecm kde.org DESCRIPTION="Storage service for PIM data and libraries for PIM apps" HOMEPAGE="https://community.kde.org/KDE_PIM/akonadi"; +LICENSE="LGPL-2.1+" SLOT="5" KEYWORDS="" -LICENSE="LGPL-2.1+" IUSE="+kaccounts +mysql postgres sqlite tools xml" REQUIRED_USE="|| ( mysql postgres sqlite ) test? ( tools )"
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi-search/, kde-apps/libkmahjongg/, kde-apps/juk/, ...
uild kde-apps/kalarm/kalarm-.ebuild kde-apps/kalarmcal/kalarmcal-.ebuild kde-apps/kalgebra/kalgebra-.ebuild kde-apps/kalzium/kalzium-.ebuild kde-apps/kamera/kamera-.ebuild kde-apps/kamoso/kamoso-.ebuild kde-apps/kanagram/kanagram-.ebuild kde-apps/kapman/kapman-.ebuild kde-apps/kapptemplate/kapptemplate-.ebuild kde-apps/kate/kate-.ebuild kde-apps/katomic/katomic-.ebuild kde-apps/kbackup/kbackup-.ebuild kde-apps/kblackbox/kblackbox-.ebuild kde-apps/kblocks/kblocks-.ebuild kde-apps/kbounce/kbounce-.ebuild kde-apps/kbreakout/kbreakout-.ebuild kde-apps/kbruch/kbruch-.ebuild kde-apps/kcachegrind/kcachegrind-.ebuild kde-apps/kcalc/kcalc-.ebuild kde-apps/kcalutils/kcalutils-.ebuild kde-apps/kcharselect/kcharselect-.ebuild kde-apps/kcolorchooser/kcolorchooser-.ebuild kde-apps/kcron/kcron-.ebuild kde-apps/kde-dev-scripts/kde-dev-scripts-.ebuild kde-apps/kde-dev-utils/kde-dev-utils-.ebuild kde-ap ps/kdebugsettings/kdebugsettings-.ebuild kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-.ebuild kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-.ebuild kde-apps/kdenlive/kdenlive-.ebuild kde-apps/kdepim-addons/kdepim-addons-.ebuild kde-apps/kdepim-apps-libs/kdepim-apps-libs-.ebuild kde-apps/kdepim-runtime/kdepim-runtime-.ebuild kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-.ebuild kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-.ebuild kde-apps/kdf/kdf-.ebuild kde-apps/kdialog/kdialog-.ebuild kde-apps/kdiamond/kdiamond-.ebuild kde-apps/keditbookmarks/keditbookmarks-.ebuild kde-apps/kfind/kfind-.ebuild kde-apps/kfloppy/kfloppy-.ebuild kde-apps/kfourinline/kfourinline-.ebuild kde-apps/kgeography/kgeography-.ebuild kde-apps/kget/kget-.ebuild kde-apps/kgoldrunner/kgoldrunner-.ebuild kde-apps/kgpg/kgpg-.ebuild kde-apps/khangman/khangman-.ebuild kde-apps/khelpcenter/khelpcenter-.ebuild kde -apps/kidentitymanagement/kidentitymanagement-.eb uild kde-apps/kig/kig-.ebuild kde-apps/kigo/kigo-.ebuild kde-apps/killbots/killbots-.ebuild kde-apps/kimagemapeditor/kimagemapeditor-.ebuild kde-apps/kimap/kimap-.ebuild kde-apps/kio-extras/kio-extras-.ebuild kde-apps/kipi-plugins/kipi-plugins-.ebuild kde-apps/kiriki/kiriki-.ebuild kde-apps/kiten/kiten-.ebuild kde-apps/kitinerary/kitinerary-.ebuild kde-apps/kjumpingcube/kjumpingcube-.ebuild kde-apps/kldap/kldap-.ebuild kde-apps/kleopatra/kleopatra-.ebuild kde-apps/klettres/klettres-.ebuild kde-apps/klickety/klickety-.ebuild kde-apps/klines/klines-.ebuild kde-apps/kmag/kmag-.ebuild kde-apps/kmahjongg/kmahjongg-.ebuild kde-apps/kmail-account-wizard/kmail-account-wizard-.ebuild kde-apps/kmail/kmail-.ebuild kde-apps/kmailtransport/kmailtransport-.ebuild kde-apps/kmime/kmime-.ebuild kde-apps/kmines/kmines-.ebuild kde-apps/kmix/kmix-.ebuild kde-apps/kmousetool/kmousetool-.ebuild kde-apps/kmo uth/kmouth-.ebuild kde-apps/kmplot/kmplot-.ebuild kde-apps/knavalbattle/knavalbattle-.ebuild kde-apps/knetwalk/knetwalk-.ebuild kde-apps/knights/knights-.ebuild kde-apps/knotes/knotes-.ebuild kde-apps/kolf/kolf-.ebuild kde-apps/kollision/kollision-.ebuild kde-apps/kolourpaint/kolourpaint-.ebuild kde-apps/kompare/kompare-.ebuild kde-apps/konqueror/konqueror-.ebuild kde-apps/konquest/konquest-.ebuild kde-apps/konsole/konsole-.ebuild kde-apps/konsolekalendar/konsolekalendar-.ebuild kde-apps/kontact/kontact-.ebuild kde-apps/kontactinterface/kontactinterface-.ebuild kde-apps/kopete/kopete-.ebuild kde-apps/korganizer/korganizer-.ebuild kde-apps/kpat/kpat-.ebuild kde-apps/kpimtextedit/kpimtextedit-.ebuild kde-apps/kpkpass/kpkpass-.ebuild kde-apps/krdc/krdc-.ebuild kde-apps/kreversi/kreversi-.ebuild kde-apps/krfb/krfb-.ebuild kde-apps/kross-interpreters/kross-interpreters-.ebuild kde-apps/kru ler/kruler-.ebuild kde-apps/kscd/kscd-.ebuild kde-apps/kshisen/kshisen-.ebuild kde-apps/ksirk/ksirk-.ebuild kde-apps/ksmtp/ksmtp-.ebuild kde-apps/ksnakeduel/ksnakeduel-.ebuild kde-apps/kspaceduel/kspaceduel-.ebuild kde-apps/ksquares/ksquares-.ebuild kde-apps/ksudoku/ksudoku-.ebuild kde-apps/ksystemlog/ksystemlog-.ebuild kde-apps/kteatime/kteatime-.ebuild kde-apps/ktimer/ktimer-.ebuild kde-apps/ktouch/ktouch-.ebuild kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-.ebuild kde-apps/ktp-approver/ktp-approver-.ebuild kde-apps/ktp-auth-handler/ktp-auth-handler-.ebuild kde-apps/ktp-call-ui/ktp-call-ui-.ebuild kde-apps/ktp-common-internals/ktp-common-internals-.ebuild kde-apps/ktp-contact-list/ktp-contact-list-.ebuild kde-apps/ktp-contact-runner/ktp-contact-runner-.ebuild kde-apps/ktp-deskto
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi-search/
commit: 98dcbe039aa68b44158a6f345a6ad00d7fd7413b
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Mar 17 23:20:17 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Jul 12 23:05:14 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=98dcbe03
kde-apps/akonadi-search: Restrict hopeless tests
Bug: https://bugs.gentoo.org/662378
Package-Manager: Portage-2.3.94, Repoman-2.3.21
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/akonadi-search/akonadi-search-20.08.49..ebuild | 2 ++
kde-apps/akonadi-search/akonadi-search-.ebuild | 2 ++
2 files changed, 4 insertions(+)
diff --git a/kde-apps/akonadi-search/akonadi-search-20.08.49..ebuild
b/kde-apps/akonadi-search/akonadi-search-20.08.49..ebuild
index 12c3a43cc2..742ced180f 100644
--- a/kde-apps/akonadi-search/akonadi-search-20.08.49..ebuild
+++ b/kde-apps/akonadi-search/akonadi-search-20.08.49..ebuild
@@ -18,6 +18,8 @@ SLOT="5"
KEYWORDS=""
IUSE=""
+RESTRICT+=" test" # perpetually broken, bug 662378
+
BDEPEND="
test? ( >=kde-apps/akonadi-${PVCUT}:5[tools] )
"
diff --git a/kde-apps/akonadi-search/akonadi-search-.ebuild
b/kde-apps/akonadi-search/akonadi-search-.ebuild
index 12c3a43cc2..742ced180f 100644
--- a/kde-apps/akonadi-search/akonadi-search-.ebuild
+++ b/kde-apps/akonadi-search/akonadi-search-.ebuild
@@ -18,6 +18,8 @@ SLOT="5"
KEYWORDS=""
IUSE=""
+RESTRICT+=" test" # perpetually broken, bug 662378
+
BDEPEND="
test? ( >=kde-apps/akonadi-${PVCUT}:5[tools] )
"
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi-import-wizard/
commit: deadd83f42bc59af18cfb5855905699309c26349
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Jun 15 21:23:24 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Jun 15 21:23:24 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=deadd83f
kde-apps/akonadi-import-wizard: Drop unused DEPEND
Upstream commit 1d4eeb58fc408dfcb4baf667b8f4a171f7945432
Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/akonadi-import-wizard/akonadi-import-wizard-.ebuild | 1 -
1 file changed, 1 deletion(-)
diff --git a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-.ebuild
b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-.ebuild
index cbdfabcb06..1ab80aa8e6 100644
--- a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-.ebuild
+++ b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-.ebuild
@@ -24,7 +24,6 @@ DEPEND="
>=kde-apps/akonadi-${PVCUT}:5
>=kde-apps/kidentitymanagement-${PVCUT}:5
>=kde-apps/kmailtransport-${PVCUT}:5
- >=kde-apps/libkdepim-${PVCUT}:5
>=kde-apps/mailcommon-${PVCUT}:5
>=kde-apps/mailimporter-${PVCUT}:5
>=kde-apps/messagelib-${PVCUT}:5
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi-import-wizard/
commit: cabeb39ee1d7cca4e631e91fe11decfc565e4f1f Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed May 20 19:27:45 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed May 20 19:28:44 2020 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=cabeb39e kde-apps/akonadi-import-wizard: Update HOMEPAGE Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner gentoo.org> .../akonadi-import-wizard/akonadi-import-wizard-20.04.49..ebuild| 2 +- kde-apps/akonadi-import-wizard/akonadi-import-wizard-.ebuild| 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-20.04.49..ebuild b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-20.04.49..ebuild index e127dd5874..83876164cb 100644 --- a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-20.04.49..ebuild +++ b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-20.04.49..ebuild @@ -10,7 +10,7 @@ QTMIN=5.14.1 inherit ecm kde.org DESCRIPTION="Assistant to import PIM data from other applications into Akonadi" -HOMEPAGE+=" https://userbase.kde.org/Kmail/Import_Options"; +HOMEPAGE+=" https://userbase.kde.org/KMail/Import_Options"; LICENSE="GPL-2+ handbook? ( FDL-1.2+ )" SLOT="5" diff --git a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-.ebuild b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-.ebuild index e127dd5874..83876164cb 100644 --- a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-.ebuild +++ b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-.ebuild @@ -10,7 +10,7 @@ QTMIN=5.14.1 inherit ecm kde.org DESCRIPTION="Assistant to import PIM data from other applications into Akonadi" -HOMEPAGE+=" https://userbase.kde.org/Kmail/Import_Options"; +HOMEPAGE+=" https://userbase.kde.org/KMail/Import_Options"; LICENSE="GPL-2+ handbook? ( FDL-1.2+ )" SLOT="5"
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/
commit: 624bf63046891b21e0034672213c6ed2efc3d8a3
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Feb 23 14:54:01 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Feb 23 14:54:01 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=624bf630
kde-apps/akonadi: Drop unused DEPEND
Upstream commit 9910dccb52a62fecb62d89685963acf869503eed
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/akonadi/akonadi-.ebuild | 1 -
1 file changed, 1 deletion(-)
diff --git a/kde-apps/akonadi/akonadi-.ebuild
b/kde-apps/akonadi/akonadi-.ebuild
index 6f8339e324..232484180b 100644
--- a/kde-apps/akonadi/akonadi-.ebuild
+++ b/kde-apps/akonadi/akonadi-.ebuild
@@ -33,7 +33,6 @@ COMMON_DEPEND="
>=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
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi-contacts/
commit: c713dfe1581630041a90d2b9edb6b31536c9e997
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Feb 23 11:37:08 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Feb 23 11:37:08 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=c713dfe1
kde-apps/akonadi-contacts: Sort DEPENDs
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/akonadi-contacts/akonadi-contacts-.ebuild | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-.ebuild
b/kde-apps/akonadi-contacts/akonadi-contacts-.ebuild
index 7944d54139..a01b7cd8fb 100644
--- a/kde-apps/akonadi-contacts/akonadi-contacts-.ebuild
+++ b/kde-apps/akonadi-contacts/akonadi-contacts-.ebuild
@@ -20,6 +20,11 @@ IUSE=""
RESTRICT+=" test"
DEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=kde-apps/akonadi-${PVCUT}:5
+ >=kde-apps/kmime-${PVCUT}:5
>=kde-frameworks/kcodecs-${KFMIN}:5
>=kde-frameworks/kcompletion-${KFMIN}:5
>=kde-frameworks/kconfig-${KFMIN}:5
@@ -34,11 +39,6 @@ DEPEND="
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
>=kde-frameworks/kxmlgui-${KFMIN}:5
>=kde-frameworks/prison-${KFMIN}:5
- >=kde-apps/akonadi-${PVCUT}:5
- >=kde-apps/kmime-${PVCUT}:5
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
"
RDEPEND="${DEPEND}
!
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi-contacts/
commit: cc5e92cc64537b858a5f9be078652b1f0480ed7a
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Feb 23 11:36:27 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Feb 23 11:36:27 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=cc5e92cc
kde-apps/akonadi-contacts: Drop unused DEPEND
Upstream commit a0502bdf32dc52e0a3dbf8a78640f1f25b18ab0e
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/akonadi-contacts/akonadi-contacts-.ebuild | 1 -
1 file changed, 1 deletion(-)
diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-.ebuild
b/kde-apps/akonadi-contacts/akonadi-contacts-.ebuild
index a22efd7647..7944d54139 100644
--- a/kde-apps/akonadi-contacts/akonadi-contacts-.ebuild
+++ b/kde-apps/akonadi-contacts/akonadi-contacts-.ebuild
@@ -26,7 +26,6 @@ DEPEND="
>=kde-frameworks/kconfigwidgets-${KFMIN}:5
>=kde-frameworks/kcontacts-${KFMIN}:5
>=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kdbusaddons-${KFMIN}:5
>=kde-frameworks/kiconthemes-${KFMIN}:5
>=kde-frameworks/ki18n-${KFMIN}:5
>=kde-frameworks/kio-${KFMIN}:5
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi-mime/
commit: 3d1b8833c3fd6b2b5832754995dd97f04b04e72b
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Feb 22 17:38:59 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Feb 22 17:38:59 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=3d1b8833
kde-apps/akonadi-mime: Drop unused DEPEND
Upstream commit c1f5a76298e71cc795bfb63f5c0629dba91f9bec
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/akonadi-mime/akonadi-mime-.ebuild | 1 -
1 file changed, 1 deletion(-)
diff --git a/kde-apps/akonadi-mime/akonadi-mime-.ebuild
b/kde-apps/akonadi-mime/akonadi-mime-.ebuild
index 23a243df5a..958966ec49 100644
--- a/kde-apps/akonadi-mime/akonadi-mime-.ebuild
+++ b/kde-apps/akonadi-mime/akonadi-mime-.ebuild
@@ -28,7 +28,6 @@ DEPEND="
>=kde-apps/kmime-${PVCUT}:5
>=kde-frameworks/kconfig-${KFMIN}:5
>=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kdbusaddons-${KFMIN}:5
>=kde-frameworks/ki18n-${KFMIN}:5
>=kde-frameworks/kio-${KFMIN}:5
>=kde-frameworks/kitemmodels-${KFMIN}:5
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi-calendar/
commit: 3735e0f2d0ee798f080b8da49628cf0bc44805d4
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Feb 22 17:40:58 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Feb 22 17:40:58 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=3735e0f2
kde-apps/akonadi-calendar: Sort DEPENDs
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../akonadi-calendar/akonadi-calendar-.ebuild| 20 ++--
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-.ebuild
b/kde-apps/akonadi-calendar/akonadi-calendar-.ebuild
index 5b79b0715d..2fc8d0d162 100644
--- a/kde-apps/akonadi-calendar/akonadi-calendar-.ebuild
+++ b/kde-apps/akonadi-calendar/akonadi-calendar-.ebuild
@@ -17,6 +17,16 @@ KEYWORDS=""
IUSE=""
DEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=kde-apps/akonadi-${PVCUT}:5
+ >=kde-apps/akonadi-contacts-${PVCUT}:5
+ >=kde-apps/akonadi-mime-${PVCUT}:5
+ >=kde-apps/kcalutils-${PVCUT}:5
+ >=kde-apps/kidentitymanagement-${PVCUT}:5
+ >=kde-apps/kmailtransport-${PVCUT}:5
+ >=kde-apps/kmime-${PVCUT}:5
>=kde-frameworks/kcalendarcore-${KFMIN}:5
>=kde-frameworks/kcodecs-${KFMIN}:5
>=kde-frameworks/kconfig-${KFMIN}:5
@@ -29,16 +39,6 @@ DEPEND="
>=kde-frameworks/kjobwidgets-${KFMIN}:5
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
>=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-apps/akonadi-${PVCUT}:5
- >=kde-apps/akonadi-contacts-${PVCUT}:5
- >=kde-apps/akonadi-mime-${PVCUT}:5
- >=kde-apps/kcalutils-${PVCUT}:5
- >=kde-apps/kidentitymanagement-${PVCUT}:5
- >=kde-apps/kmailtransport-${PVCUT}:5
- >=kde-apps/kmime-${PVCUT}:5
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
"
RDEPEND="${DEPEND}
!
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi-calendar/
commit: 98ae8aa96ca1caaa12a3ef7e909e81dc2fe114d7
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Feb 22 17:25:16 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Feb 22 17:25:16 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=98ae8aa9
kde-apps/akonadi-calendar: Drop unused DEPEND
Upstream commit 40d97399ec959ed0cca6222fbd17f5939e04c23b
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/akonadi-calendar/akonadi-calendar-.ebuild | 1 -
1 file changed, 1 deletion(-)
diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-.ebuild
b/kde-apps/akonadi-calendar/akonadi-calendar-.ebuild
index 560993e4b1..5b79b0715d 100644
--- a/kde-apps/akonadi-calendar/akonadi-calendar-.ebuild
+++ b/kde-apps/akonadi-calendar/akonadi-calendar-.ebuild
@@ -22,7 +22,6 @@ DEPEND="
>=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
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi-calendar/, kde-apps/kblog/, kde-apps/kleopatra/, ...
commit: ed50bcdb4dc236da63aa3d50997bd8c8fad76d9e Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Jan 11 23:18:31 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Jan 11 23:24:41 2020 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=ed50bcdb kde-apps: Drop obsolete blockers Do some sorting along the way. Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner gentoo.org> .../akonadi-calendar-19.12.49..ebuild | 1 - .../akonadi-calendar/akonadi-calendar-.ebuild | 1 - .../akonadi-contacts-19.12.49..ebuild | 1 - .../akonadi-contacts/akonadi-contacts-.ebuild | 1 - .../akonadi-import-wizard-19.12.49..ebuild | 27 +- .../akonadi-import-wizard-.ebuild | 27 +- .../akonadi-mime/akonadi-mime-19.12.49..ebuild | 2 - kde-apps/akonadi-mime/akonadi-mime-.ebuild | 14 +++--- .../akonadi-notes-19.12.49..ebuild | 8 ++- kde-apps/akonadi-notes/akonadi-notes-.ebuild | 8 ++- .../akonadi-search-19.12.49..ebuild| 21 kde-apps/akonadi-search/akonadi-search-.ebuild | 21 kde-apps/akonadi/akonadi-19.12.49..ebuild | 2 - kde-apps/akonadi/akonadi-.ebuild | 4 +- kde-apps/akregator/akregator-19.12.49..ebuild | 7 +-- kde-apps/akregator/akregator-.ebuild | 31 ++-- .../calendarjanitor-19.12.49..ebuild | 12 ++--- .../calendarjanitor/calendarjanitor-.ebuild| 12 ++--- .../calendarsupport-19.12.49..ebuild | 4 +- .../calendarsupport/calendarsupport-.ebuild| 32 ++-- .../eventviews/eventviews-19.12.49..ebuild | 4 +- kde-apps/eventviews/eventviews-.ebuild | 26 +- .../grantlee-editor-19.12.49..ebuild | 7 +-- .../grantlee-editor/grantlee-editor-.ebuild| 23 - .../grantleetheme-19.12.49..ebuild | 13 ++--- kde-apps/grantleetheme/grantleetheme-.ebuild | 13 ++--- .../incidenceeditor-19.12.49..ebuild | 5 +- .../incidenceeditor/incidenceeditor-.ebuild| 39 +++ .../kaddressbook/kaddressbook-19.12.49..ebuild | 1 - kde-apps/kaddressbook/kaddressbook-.ebuild | 33 ++-- kde-apps/kalarm/kalarm-19.12.49..ebuild| 1 - kde-apps/kalarm/kalarm-.ebuild | 37 +++--- kde-apps/kalarmcal/kalarmcal-19.12.49..ebuild | 1 - kde-apps/kalarmcal/kalarmcal-.ebuild | 9 ++-- kde-apps/kblog/kblog-19.12.49..ebuild | 4 +- kde-apps/kblog/kblog-.ebuild | 4 +- kde-apps/kcalutils/kcalutils-19.12.49..ebuild | 4 +- kde-apps/kcalutils/kcalutils-.ebuild | 12 ++--- kde-apps/kdav/kdav-19.12.49..ebuild| 4 +- kde-apps/kdav/kdav-.ebuild | 8 ++- .../kdepim-addons-19.12.49..ebuild | 9 +--- kde-apps/kdepim-addons/kdepim-addons-.ebuild | 9 +--- .../kdepim-apps-libs-19.12.49..ebuild | 4 +- .../kdepim-apps-libs/kdepim-apps-libs-.ebuild | 22 .../kdepim-meta/kdepim-meta-19.12.49..ebuild | 1 - kde-apps/kdepim-meta/kdepim-meta-.ebuild | 1 - .../kdepim-runtime-19.12.49..ebuild| 1 - kde-apps/kdepim-runtime/kdepim-runtime-.ebuild | 58 ++ .../kidentitymanagement-19.12.49..ebuild | 14 +++--- .../kidentitymanagement-.ebuild| 4 +- kde-apps/kimap/kimap-19.12.49..ebuild | 13 ++--- kde-apps/kimap/kimap-.ebuild | 13 ++--- kde-apps/kldap/kldap-19.12.49..ebuild | 10 ++-- kde-apps/kldap/kldap-.ebuild | 4 +- kde-apps/kleopatra/kleopatra-19.12.49..ebuild | 1 - kde-apps/kleopatra/kleopatra-.ebuild | 23 - .../kmail-account-wizard-19.12.49..ebuild | 28 +-- .../kmail-account-wizard-.ebuild | 28 +-- kde-apps/kmail/kmail-19.12.49..ebuild | 2 - kde-apps/kmail/kmail-.ebuild | 52 ++- .../kmailtransport-19.12.49..ebuild| 8 +-- kde-apps/kmailtransport/kmailtransport-.ebuild | 26 -- kde-apps/kmime/kmime-19.12.49..ebuild | 4 +- kde-apps/kmime/kmime-.ebuild | 4 +- kde-apps/knotes/knotes-19.12.49..ebuild| 1 - kde-apps/knotes/knotes-.ebuild | 35 +++-- .../konsolekalendar-19.12.49..ebuild | 4 +- .../konsolekalendar/konsolekalendar-.ebuild| 12 ++--- kde-apps/kontact/kontact-19.12.49..ebuild | 4 +- kde-apps/kontact/kontact-.ebuild | 26 +- .../kontactinterface-19.12.49..ebuild | 4 +- .../kontactinterface/kontactinterface-.eb
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/
commit: 08ce1d718d494f6daf046cee6e1f747722fb1a4e
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Dec 11 19:10:23 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Dec 12 18:13:07 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=08ce1d71
kde-apps/akonadi: Drop unused DEPEND
Upstream commit 254f2ec442f156ee2a34fa63cdcde4a016595449
Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/akonadi/akonadi-.ebuild | 1 -
1 file changed, 1 deletion(-)
diff --git a/kde-apps/akonadi/akonadi-.ebuild
b/kde-apps/akonadi/akonadi-.ebuild
index 67819868e3..353eafc9b5 100644
--- a/kde-apps/akonadi/akonadi-.ebuild
+++ b/kde-apps/akonadi/akonadi-.ebuild
@@ -29,7 +29,6 @@ COMMON_DEPEND="
>=dev-qt/qtsql-${QTMIN}:5[mysql?,postgres?]
>=dev-qt/qtwidgets-${QTMIN}:5
>=dev-qt/qtxml-${QTMIN}:5
- >=kde-frameworks/kcompletion-${KFMIN}:5
>=kde-frameworks/kconfig-${KFMIN}:5
>=kde-frameworks/kconfigwidgets-${KFMIN}:5
>=kde-frameworks/kcoreaddons-${KFMIN}:5
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/
commit: 7b8207bae2020409f3d74ab00c40e85730e3d599
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Nov 24 23:57:36 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Nov 24 23:57:36 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=7b8207ba
kde-apps/akonadi: Sort DEPENDs
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/akonadi/akonadi-19.12.49..ebuild | 12 ++--
kde-apps/akonadi/akonadi-.ebuild | 12 ++--
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/kde-apps/akonadi/akonadi-19.12.49..ebuild
b/kde-apps/akonadi/akonadi-19.12.49..ebuild
index 0b331053c3..41834cf81f 100644
--- a/kde-apps/akonadi/akonadi-19.12.49..ebuild
+++ b/kde-apps/akonadi/akonadi-19.12.49..ebuild
@@ -23,6 +23,12 @@ IUSE="+kaccounts +mysql postgres sqlite tools xml"
REQUIRED_USE="|| ( mysql postgres sqlite ) test? ( tools )"
COMMON_DEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtsql-${QTMIN}:5[mysql?,postgres?]
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
>=kde-frameworks/kcompletion-${KFMIN}:5
>=kde-frameworks/kconfig-${KFMIN}:5
>=kde-frameworks/kconfigwidgets-${KFMIN}:5
@@ -37,12 +43,6 @@ COMMON_DEPEND="
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
>=kde-frameworks/kwindowsystem-${KFMIN}:5
>=kde-frameworks/kxmlgui-${KFMIN}:5
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtsql-${QTMIN}:5[mysql?,postgres?]
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
kaccounts? (
>=kde-apps/kaccounts-integration-${PVCUT}:5
net-libs/accounts-qt
diff --git a/kde-apps/akonadi/akonadi-.ebuild
b/kde-apps/akonadi/akonadi-.ebuild
index 2d6cbb4a9d..67819868e3 100644
--- a/kde-apps/akonadi/akonadi-.ebuild
+++ b/kde-apps/akonadi/akonadi-.ebuild
@@ -23,6 +23,12 @@ IUSE="+kaccounts +mysql postgres sqlite tools xml"
REQUIRED_USE="|| ( mysql postgres sqlite ) test? ( tools )"
COMMON_DEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtsql-${QTMIN}:5[mysql?,postgres?]
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
>=kde-frameworks/kcompletion-${KFMIN}:5
>=kde-frameworks/kconfig-${KFMIN}:5
>=kde-frameworks/kconfigwidgets-${KFMIN}:5
@@ -37,12 +43,6 @@ COMMON_DEPEND="
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
>=kde-frameworks/kwindowsystem-${KFMIN}:5
>=kde-frameworks/kxmlgui-${KFMIN}:5
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtsql-${QTMIN}:5[mysql?,postgres?]
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
kaccounts? (
>=kde-apps/kaccounts-integration-${PVCUT}:5
net-libs/accounts-qt
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/, kde-apps/akonadi/files/
commit: 158d589c8aa05a7f1695fa6b39c94e285ccca927
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Nov 17 21:54:09 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Nov 17 21:54:09 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=158d589c
kde-apps/akonadi: Fix build with Qt 5.14
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/akonadi/akonadi-19.11.80.ebuild | 6 ++-
.../akonadi/files/akonadi-19.11.80-qt-5.14.patch | 46 ++
2 files changed, 51 insertions(+), 1 deletion(-)
diff --git a/kde-apps/akonadi/akonadi-19.11.80.ebuild
b/kde-apps/akonadi/akonadi-19.11.80.ebuild
index 886147b825..41ff83a435 100644
--- a/kde-apps/akonadi/akonadi-19.11.80.ebuild
+++ b/kde-apps/akonadi/akonadi-19.11.80.ebuild
@@ -37,6 +37,7 @@ COMMON_DEPEND="
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
>=kde-frameworks/kwindowsystem-${KFMIN}:5
>=kde-frameworks/kxmlgui-${KFMIN}:5
+ >=dev-qt/qtcore-${QTMIN}:5=
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtnetwork-${QTMIN}:5
@@ -69,7 +70,10 @@ RDEPEND="${COMMON_DEPEND}
# some akonadi tests time out, that probably needs more work as it's ~700 tests
RESTRICT+=" test"
-PATCHES=( "${FILESDIR}/${PN}-18.12.2-mysql56-crash.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-18.12.2-mysql56-crash.patch"
+ "${FILESDIR}/${P}-qt-5.14.patch"
+)
pkg_setup() {
# Set default storage backend in order: MySQL, PostgreSQL, SQLite
diff --git a/kde-apps/akonadi/files/akonadi-19.11.80-qt-5.14.patch
b/kde-apps/akonadi/files/akonadi-19.11.80-qt-5.14.patch
new file mode 100644
index 00..c3165698b2
--- /dev/null
+++ b/kde-apps/akonadi/files/akonadi-19.11.80-qt-5.14.patch
@@ -0,0 +1,46 @@
+From 1d4bb01a60548ae9a5439186fbe155f9f7d492e4 Mon Sep 17 00:00:00 2001
+From: Heiko Becker
+Date: Sun, 17 Nov 2019 18:45:49 +0100
+Subject: Fix build with Qt 5.14
+
+Summary:
+std::hash is already specialized in Qt 5.14 [1], so we need
+to avoid redifining it with this version.
+
+[1] 4469e36d7203a55a4e158a50f0e9effc3f2fa3c2 in qtbase.git
+
+Test Plan: Builds fine with Qt 5.14.0-beta3
+
+Reviewers: #kde_pim
+
+Subscribers: kde-pim
+
+Tags: #kde_pim
+
+Differential Revision: https://phabricator.kde.org/D25356
+---
+ src/shared/akstd.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/shared/akstd.h b/src/shared/akstd.h
+index 4078ee4..774c432 100644
+--- a/src/shared/akstd.h
b/src/shared/akstd.h
+@@ -29,6 +29,7 @@
+
+ namespace std {
+
++#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
+ template<>
+ struct hash {
+ using argument_type = QString;
+@@ -39,6 +40,7 @@ struct hash {
+ return qHash(s);
+ }
+ };
++#endif
+
+ }
+
+--
+cgit v1.1
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/
commit: 8b098c5fd657fe9a328f231598daf1c6184250fe
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Sep 11 07:57:40 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Sep 11 07:57:40 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=8b098c5f
kde-apps/akonadi: Add USE kaccounts
Upstream commit b2b0dd482b213ba774d582e427c37b400dc4b997
Package-Manager: Portage-2.3.75, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/akonadi/akonadi-.ebuild | 8 +++-
kde-apps/akonadi/metadata.xml| 1 +
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/kde-apps/akonadi/akonadi-.ebuild
b/kde-apps/akonadi/akonadi-.ebuild
index 1f4f1246fc..dd0a75af1c 100644
--- a/kde-apps/akonadi/akonadi-.ebuild
+++ b/kde-apps/akonadi/akonadi-.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://community.kde.org/KDE_PIM/akonadi";
KEYWORDS=""
LICENSE="LGPL-2.1+"
-IUSE="+mysql postgres sqlite tools xml"
+IUSE="+kaccounts +mysql postgres sqlite tools xml"
REQUIRED_USE="|| ( mysql postgres sqlite ) test? ( tools )"
@@ -39,6 +39,10 @@ COMMON_DEPEND="
$(add_qt_dep qtsql 'mysql?,postgres?')
$(add_qt_dep qtwidgets)
$(add_qt_dep qtxml)
+ kaccounts? (
+ $(add_kdeapps_dep kaccounts-integration)
+ net-libs/accounts-qt
+ )
sqlite? (
$(add_qt_dep qtsql 'sqlite' '' '5=')
dev-db/sqlite:3
@@ -93,6 +97,8 @@ pkg_setup() {
src_configure() {
local mycmakeargs=(
+ $(cmake-utils_use_find_package kaccounts AccountsQt5)
+ $(cmake-utils_use_find_package kaccounts KAccounts)
-DAKONADI_BUILD_QSQLITE=$(usex sqlite)
-DBUILD_TOOLS=$(usex tools)
$(cmake-utils_use_find_package xml LibXml2)
diff --git a/kde-apps/akonadi/metadata.xml b/kde-apps/akonadi/metadata.xml
index 58d880b38b..8acbee94c7 100644
--- a/kde-apps/akonadi/metadata.xml
+++ b/kde-apps/akonadi/metadata.xml
@@ -7,6 +7,7 @@
Install plugin for
dev-qt/designer
+ Enable support for system-wide defined
KAccounts
Install tools for developers and
testing
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi-calendar/
commit: 29e7d56941eb5465022be8659bd1eace3b9538cc Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Sep 8 16:14:31 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Sep 8 16:14:31 2019 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=29e7d569 kde-apps/akonadi-calendar: Re-add missing DEPEND Closes: https://bugs.gentoo.org/693664 Package-Manager: Portage-2.3.75, Repoman-2.3.17 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/akonadi-calendar/akonadi-calendar-19.08.49..ebuild | 1 + kde-apps/akonadi-calendar/akonadi-calendar-.ebuild | 1 + 2 files changed, 2 insertions(+) diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-19.08.49..ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-19.08.49..ebuild index 2d5a3cae97..454805cea2 100644 --- a/kde-apps/akonadi-calendar/akonadi-calendar-19.08.49..ebuild +++ b/kde-apps/akonadi-calendar/akonadi-calendar-19.08.49..ebuild @@ -25,6 +25,7 @@ DEPEND=" $(add_frameworks_dep kwidgetsaddons) $(add_frameworks_dep kxmlgui) $(add_kdeapps_dep akonadi) + $(add_kdeapps_dep akonadi-contacts) $(add_kdeapps_dep akonadi-mime) $(add_kdeapps_dep kcalcore) $(add_kdeapps_dep kcalutils) diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-.ebuild index 2d5a3cae97..454805cea2 100644 --- a/kde-apps/akonadi-calendar/akonadi-calendar-.ebuild +++ b/kde-apps/akonadi-calendar/akonadi-calendar-.ebuild @@ -25,6 +25,7 @@ DEPEND=" $(add_frameworks_dep kwidgetsaddons) $(add_frameworks_dep kxmlgui) $(add_kdeapps_dep akonadi) + $(add_kdeapps_dep akonadi-contacts) $(add_kdeapps_dep akonadi-mime) $(add_kdeapps_dep kcalcore) $(add_kdeapps_dep kcalutils)
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/
commit: 05571f02d4e290a6fcb696f72a7a6e1ac8d5212d
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Fri Jul 26 15:25:16 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Jul 27 14:05:23 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=05571f02
kde-apps/akonadi: External QMYSQL w/o lower_case_table_names=1 fixed
Package-Manager: Portage-2.3.66, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/akonadi/akonadi-19.07.80.ebuild | 10 --
kde-apps/akonadi/akonadi-19.08.49..ebuild | 10 --
kde-apps/akonadi/akonadi-.ebuild | 10 --
3 files changed, 30 deletions(-)
diff --git a/kde-apps/akonadi/akonadi-19.07.80.ebuild
b/kde-apps/akonadi/akonadi-19.07.80.ebuild
index 18abc722e0..60a1a49252 100644
--- a/kde-apps/akonadi/akonadi-19.07.80.ebuild
+++ b/kde-apps/akonadi/akonadi-19.07.80.ebuild
@@ -70,16 +70,6 @@ pkg_setup() {
use postgres && DRIVER="QPSQL"
use mysql && DRIVER="QMYSQL"
- if use mysql; then
- ewarn "If using an Akonadi external QMYSQL DB without
lower_case_table_names=1,"
- ewarn "${CATEGORY}/${PN}-19.04.3 and later may fail to start.
Running without"
- ewarn "that option was never supported but not enforced by the
setup GUI."
- ewarn
- ewarn "Manual steps are required to fix it, see also:"
- ewarn " https://bugs.kde.org/show_bug.cgi?id=409753 (comment
#4)"
- ewarn
- fi
-
if use mysql && has_version ">=dev-db/mariadb-10.4"; then
ewarn "If an existing Akonadi QMYSQL database is being upgraded
using"
ewarn ">=dev-db/mariadb-10.4 and KMail stops fetching and
sending mail,"
diff --git a/kde-apps/akonadi/akonadi-19.08.49..ebuild
b/kde-apps/akonadi/akonadi-19.08.49..ebuild
index deb486dea5..1f4f1246fc 100644
--- a/kde-apps/akonadi/akonadi-19.08.49..ebuild
+++ b/kde-apps/akonadi/akonadi-19.08.49..ebuild
@@ -70,16 +70,6 @@ pkg_setup() {
use postgres && DRIVER="QPSQL"
use mysql && DRIVER="QMYSQL"
- if use mysql; then
- ewarn "If using an Akonadi external QMYSQL DB without
lower_case_table_names=1,"
- ewarn "${CATEGORY}/${PN}-19.04.3 and later may fail to start.
Running without"
- ewarn "that option was never supported but not enforced by the
setup GUI."
- ewarn
- ewarn "Manual steps are required to fix it, see also:"
- ewarn " https://bugs.kde.org/show_bug.cgi?id=409753 (comment
#4)"
- ewarn
- fi
-
if use mysql && has_version ">=dev-db/mariadb-10.4"; then
ewarn "If an existing Akonadi QMYSQL database is being upgraded
using"
ewarn ">=dev-db/mariadb-10.4 and KMail stops fetching and
sending mail,"
diff --git a/kde-apps/akonadi/akonadi-.ebuild
b/kde-apps/akonadi/akonadi-.ebuild
index deb486dea5..1f4f1246fc 100644
--- a/kde-apps/akonadi/akonadi-.ebuild
+++ b/kde-apps/akonadi/akonadi-.ebuild
@@ -70,16 +70,6 @@ pkg_setup() {
use postgres && DRIVER="QPSQL"
use mysql && DRIVER="QMYSQL"
- if use mysql; then
- ewarn "If using an Akonadi external QMYSQL DB without
lower_case_table_names=1,"
- ewarn "${CATEGORY}/${PN}-19.04.3 and later may fail to start.
Running without"
- ewarn "that option was never supported but not enforced by the
setup GUI."
- ewarn
- ewarn "Manual steps are required to fix it, see also:"
- ewarn " https://bugs.kde.org/show_bug.cgi?id=409753 (comment
#4)"
- ewarn
- fi
-
if use mysql && has_version ">=dev-db/mariadb-10.4"; then
ewarn "If an existing Akonadi QMYSQL database is being upgraded
using"
ewarn ">=dev-db/mariadb-10.4 and KMail stops fetching and
sending mail,"
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/
commit: b7b95f71ddff77ab067caba16374081b4949f8d0
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Jul 23 18:49:27 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Jul 24 11:29:25 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=b7b95f71
kde-apps/akonadi: Warn users about the trouble with USE mysql
External DBs can't be fixed automatically, and >=mariadb-10.4 still can't
be upgraded automatically, at least add warnings that hopefully will be read.
Bug: https://bugs.gentoo.org/688746
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/akonadi/akonadi-19.07.80.ebuild | 22 ++
kde-apps/akonadi/akonadi-19.08.49..ebuild | 22 ++
kde-apps/akonadi/akonadi-.ebuild | 22 ++
3 files changed, 66 insertions(+)
diff --git a/kde-apps/akonadi/akonadi-19.07.80.ebuild
b/kde-apps/akonadi/akonadi-19.07.80.ebuild
index f8fd5fa4cf..18abc722e0 100644
--- a/kde-apps/akonadi/akonadi-19.07.80.ebuild
+++ b/kde-apps/akonadi/akonadi-19.07.80.ebuild
@@ -70,6 +70,28 @@ pkg_setup() {
use postgres && DRIVER="QPSQL"
use mysql && DRIVER="QMYSQL"
+ if use mysql; then
+ ewarn "If using an Akonadi external QMYSQL DB without
lower_case_table_names=1,"
+ ewarn "${CATEGORY}/${PN}-19.04.3 and later may fail to start.
Running without"
+ ewarn "that option was never supported but not enforced by the
setup GUI."
+ ewarn
+ ewarn "Manual steps are required to fix it, see also:"
+ ewarn " https://bugs.kde.org/show_bug.cgi?id=409753 (comment
#4)"
+ ewarn
+ fi
+
+ if use mysql && has_version ">=dev-db/mariadb-10.4"; then
+ ewarn "If an existing Akonadi QMYSQL database is being upgraded
using"
+ ewarn ">=dev-db/mariadb-10.4 and KMail stops fetching and
sending mail,"
+ ewarn "check ~/.local/share/akonadi/akonadiserver.error for
errors like:"
+ ewarn " \"Cannot add or update a child row: a foreign key
constraint fails\""
+ ewarn
+ ewarn "Manual steps are required to fix it, see also:"
+ ewarn " https://bugs.gentoo.org/688746 (see Whiteboard)"
+ ewarn " https://bugs.kde.org/show_bug.cgi?id=409224";
+ ewarn
+ fi
+
if use sqlite || has_version "<${CATEGORY}/${P}[sqlite]"; then
ewarn "We strongly recommend you change your Akonadi database
backend to either MySQL"
ewarn "or PostgreSQL in your user configuration."
diff --git a/kde-apps/akonadi/akonadi-19.08.49..ebuild
b/kde-apps/akonadi/akonadi-19.08.49..ebuild
index 9070a6e386..deb486dea5 100644
--- a/kde-apps/akonadi/akonadi-19.08.49..ebuild
+++ b/kde-apps/akonadi/akonadi-19.08.49..ebuild
@@ -70,6 +70,28 @@ pkg_setup() {
use postgres && DRIVER="QPSQL"
use mysql && DRIVER="QMYSQL"
+ if use mysql; then
+ ewarn "If using an Akonadi external QMYSQL DB without
lower_case_table_names=1,"
+ ewarn "${CATEGORY}/${PN}-19.04.3 and later may fail to start.
Running without"
+ ewarn "that option was never supported but not enforced by the
setup GUI."
+ ewarn
+ ewarn "Manual steps are required to fix it, see also:"
+ ewarn " https://bugs.kde.org/show_bug.cgi?id=409753 (comment
#4)"
+ ewarn
+ fi
+
+ if use mysql && has_version ">=dev-db/mariadb-10.4"; then
+ ewarn "If an existing Akonadi QMYSQL database is being upgraded
using"
+ ewarn ">=dev-db/mariadb-10.4 and KMail stops fetching and
sending mail,"
+ ewarn "check ~/.local/share/akonadi/akonadiserver.error for
errors like:"
+ ewarn " \"Cannot add or update a child row: a foreign key
constraint fails\""
+ ewarn
+ ewarn "Manual steps are required to fix it, see also:"
+ ewarn " https://bugs.gentoo.org/688746 (see Whiteboard)"
+ ewarn " https://bugs.kde.org/show_bug.cgi?id=409224";
+ ewarn
+ fi
+
if use sqlite || has_version "<${CATEGORY}/${P}[sqlite]"; then
ewarn "We strongly recommend you change your Akonadi database
backend to either MySQL"
ewarn "or PostgreSQL in your user configuration."
diff --git a/kde-apps/akonadi/akonadi-.ebuild
b/kde-apps/akonadi/akonadi-.ebuild
index 9070a6e386..deb486dea5 100644
--- a/kde-apps/akonadi/akonadi-.ebuild
+++ b/kde-apps/akonadi/akonadi-.ebuild
@@ -70,6 +70,28 @@ pkg_setup() {
use postgres && DRIVER="QPSQL"
use mysql && DRIVER="QMYSQL"
+ if use mysql; then
+ ewarn "If using an Akonadi external QMYSQL DB without
lower_case_table_names
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi-notes/
commit: afb2a5a41e0a36ac0dbe96547f935934bd04a3ce
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Jul 16 10:24:21 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Jul 16 10:24:21 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=afb2a5a4
kde-apps/akonadi-notes: Drop unused DEPEND
Upstream commit bbaa8676daef93d01331ce187d3fbdf7ba8344ea
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/akonadi-notes/akonadi-notes-19.08.49..ebuild | 10 ++
kde-apps/akonadi-notes/akonadi-notes-.ebuild | 10 ++
2 files changed, 4 insertions(+), 16 deletions(-)
diff --git a/kde-apps/akonadi-notes/akonadi-notes-19.08.49..ebuild
b/kde-apps/akonadi-notes/akonadi-notes-19.08.49..ebuild
index e8162fc5ea..78047e113e 100644
--- a/kde-apps/akonadi-notes/akonadi-notes-19.08.49..ebuild
+++ b/kde-apps/akonadi-notes/akonadi-notes-19.08.49..ebuild
@@ -11,18 +11,12 @@ KEYWORDS=""
LICENSE="GPL-2+"
IUSE=""
-# some akonadi tests time out, that probably needs more work as it's ~700 tests
-RESTRICT+=" test"
-
-COMMON_DEPEND="
+DEPEND="
$(add_frameworks_dep ki18n)
$(add_kdeapps_dep kmime)
$(add_qt_dep qtgui)
$(add_qt_dep qtxml)
"
-DEPEND="${COMMON_DEPEND}
- $(add_kdeapps_dep akonadi)
-"
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
!kde-apps/kdepim-l10n
"
diff --git a/kde-apps/akonadi-notes/akonadi-notes-.ebuild
b/kde-apps/akonadi-notes/akonadi-notes-.ebuild
index e8162fc5ea..78047e113e 100644
--- a/kde-apps/akonadi-notes/akonadi-notes-.ebuild
+++ b/kde-apps/akonadi-notes/akonadi-notes-.ebuild
@@ -11,18 +11,12 @@ KEYWORDS=""
LICENSE="GPL-2+"
IUSE=""
-# some akonadi tests time out, that probably needs more work as it's ~700 tests
-RESTRICT+=" test"
-
-COMMON_DEPEND="
+DEPEND="
$(add_frameworks_dep ki18n)
$(add_kdeapps_dep kmime)
$(add_qt_dep qtgui)
$(add_qt_dep qtxml)
"
-DEPEND="${COMMON_DEPEND}
- $(add_kdeapps_dep akonadi)
-"
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
!kde-apps/kdepim-l10n
"
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi-calendar/
commit: 835a380f136ad0f98ca9c1fa7ddd8ae60ec48379 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon May 27 18:38:38 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon May 27 18:38:40 2019 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=835a380f kde-apps/akonadi-calendar: Drop unused DEPENDs Upstream commit d18ba909b43e83194fd976ef21ce5ad018f1c8f5 Package-Manager: Portage-2.3.67, Repoman-2.3.13 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/akonadi-calendar/akonadi-calendar-.ebuild | 3 --- 1 file changed, 3 deletions(-) diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-.ebuild index a2e187bd07..2d5a3cae97 100644 --- a/kde-apps/akonadi-calendar/akonadi-calendar-.ebuild +++ b/kde-apps/akonadi-calendar/akonadi-calendar-.ebuild @@ -23,14 +23,11 @@ DEPEND=" $(add_frameworks_dep kitemmodels) $(add_frameworks_dep kjobwidgets) $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kwallet) $(add_frameworks_dep kxmlgui) $(add_kdeapps_dep akonadi) - $(add_kdeapps_dep akonadi-contacts) $(add_kdeapps_dep akonadi-mime) $(add_kdeapps_dep kcalcore) $(add_kdeapps_dep kcalutils) - $(add_kdeapps_dep kcontacts) $(add_kdeapps_dep kidentitymanagement) $(add_kdeapps_dep kmailtransport) $(add_kdeapps_dep kmime)
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi-search/
commit: 671f0e4c6291aaf31ab69bf4f2fafed5a4e20aad
Author: Michael Palimaka gentoo org>
AuthorDate: Mon Apr 1 10:25:12 2019 +
Commit: Michael Palimaka gentoo org>
CommitDate: Mon Apr 1 10:25:32 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=671f0e4c
kde-apps/akonadi-search: fix dev-libs/xapian[chert] USE dependency default
Bug: https://bugs.gentoo.org/681590
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Michael Palimaka gentoo.org>
kde-apps/akonadi-search/akonadi-search-19.03.80.ebuild | 2 +-
kde-apps/akonadi-search/akonadi-search-19.04.49..ebuild | 2 +-
kde-apps/akonadi-search/akonadi-search-.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/kde-apps/akonadi-search/akonadi-search-19.03.80.ebuild
b/kde-apps/akonadi-search/akonadi-search-19.03.80.ebuild
index a96f264525..de2275bc35 100644
--- a/kde-apps/akonadi-search/akonadi-search-19.03.80.ebuild
+++ b/kde-apps/akonadi-search/akonadi-search-19.03.80.ebuild
@@ -34,7 +34,7 @@ COMMON_DEPEND="
$(add_qt_dep qtdbus)
$(add_qt_dep qtgui)
$(add_qt_dep qtwidgets)
- >=dev-libs/xapian-1.3:=[chert]
+ >=dev-libs/xapian-1.3:=[chert(+)]
"
DEPEND="${COMMON_DEPEND}
dev-libs/boost
diff --git a/kde-apps/akonadi-search/akonadi-search-19.04.49..ebuild
b/kde-apps/akonadi-search/akonadi-search-19.04.49..ebuild
index d1a645f968..793a4c3645 100644
--- a/kde-apps/akonadi-search/akonadi-search-19.04.49..ebuild
+++ b/kde-apps/akonadi-search/akonadi-search-19.04.49..ebuild
@@ -34,7 +34,7 @@ COMMON_DEPEND="
$(add_qt_dep qtdbus)
$(add_qt_dep qtgui)
$(add_qt_dep qtwidgets)
- >=dev-libs/xapian-1.3:=[chert]
+ >=dev-libs/xapian-1.3:=[chert(+)]
"
DEPEND="${COMMON_DEPEND}
dev-libs/boost
diff --git a/kde-apps/akonadi-search/akonadi-search-.ebuild
b/kde-apps/akonadi-search/akonadi-search-.ebuild
index d1a645f968..793a4c3645 100644
--- a/kde-apps/akonadi-search/akonadi-search-.ebuild
+++ b/kde-apps/akonadi-search/akonadi-search-.ebuild
@@ -34,7 +34,7 @@ COMMON_DEPEND="
$(add_qt_dep qtdbus)
$(add_qt_dep qtgui)
$(add_qt_dep qtwidgets)
- >=dev-libs/xapian-1.3:=[chert]
+ >=dev-libs/xapian-1.3:=[chert(+)]
"
DEPEND="${COMMON_DEPEND}
dev-libs/boost
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/, kde-apps/akonadi/files/
commit: c0b9ffd1e40c1db3ad006507826b7cefcd38ecf9
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Jan 29 22:01:58 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Jan 29 22:01:58 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=c0b9ffd1
kde-apps/akonadi: Rebase mysql56 patch onto 18.12.2
Upstream commit a57dd124b3d231ad64f95529f24a3ad07a3c6f63
Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/akonadi/akonadi-18.12.49..ebuild | 2 +-
kde-apps/akonadi/akonadi-.ebuild | 2 +-
.../files/akonadi-17.03.80-mysql56-crash.patch | 40 --
...h.patch => akonadi-18.12.2-mysql56-crash.patch} | 0
4 files changed, 2 insertions(+), 42 deletions(-)
diff --git a/kde-apps/akonadi/akonadi-18.12.49..ebuild
b/kde-apps/akonadi/akonadi-18.12.49..ebuild
index 2b61792555..d99ac65c40 100644
--- a/kde-apps/akonadi/akonadi-18.12.49..ebuild
+++ b/kde-apps/akonadi/akonadi-18.12.49..ebuild
@@ -63,7 +63,7 @@ RDEPEND="${COMMON_DEPEND}
# some akonadi tests time out, that probably needs more work as it's ~700 tests
RESTRICT+=" test"
-PATCHES=( "${FILESDIR}/${PN}-17.03.80-mysql56-crash.patch" )
+PATCHES=( "${FILESDIR}/${PN}-18.12.2-mysql56-crash.patch" )
pkg_setup() {
# Set default storage backend in order: MySQL, PostgreSQL, SQLite
diff --git a/kde-apps/akonadi/akonadi-.ebuild
b/kde-apps/akonadi/akonadi-.ebuild
index 169ec3761b..36490bdf17 100644
--- a/kde-apps/akonadi/akonadi-.ebuild
+++ b/kde-apps/akonadi/akonadi-.ebuild
@@ -63,7 +63,7 @@ RDEPEND="${COMMON_DEPEND}
# some akonadi tests time out, that probably needs more work as it's ~700 tests
RESTRICT+=" test"
-PATCHES=( "${FILESDIR}/${PN}-19.03.80-mysql56-crash.patch" )
+PATCHES=( "${FILESDIR}/${PN}-18.12.2-mysql56-crash.patch" )
pkg_setup() {
# Set default storage backend in order: MySQL, PostgreSQL, SQLite
diff --git a/kde-apps/akonadi/files/akonadi-17.03.80-mysql56-crash.patch
b/kde-apps/akonadi/files/akonadi-17.03.80-mysql56-crash.patch
deleted file mode 100644
index 0b5e381b15..00
--- a/kde-apps/akonadi/files/akonadi-17.03.80-mysql56-crash.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Gentoo-bug: 530012
-
-diff --git a/src/server/storage/dbconfigmysql.cpp
b/src/server/storage/dbconfigmysql.cpp
-index 50421714d..dfae09c20 100644
a/src/server/storage/dbconfigmysql.cpp
-+++ b/src/server/storage/dbconfigmysql.cpp
-@@ -81,6 +81,7 @@ bool DbConfigMysql::init(QSettings &settings)
- << QStringLiteral("/usr/local/sbin")
- <<
QStringLiteral("/usr/local/libexec")
- << QStringLiteral("/usr/libexec")
-+ <<
QStringLiteral("/usr/share/mysql/scripts")
- <<
QStringLiteral("/opt/mysql/libexec")
- <<
QStringLiteral("/opt/local/lib/mysql5/bin")
- << QStringLiteral("/opt/mysql/sbin");
-@@ -511,7 +512,7 @@ bool DbConfigMysql::initializeMariaDBDatabase(const
QString &confFile, const QSt
- return 0 == execute(mMysqlInstallDbPath, {
- QStringLiteral("--defaults-file=%1").arg(confFile),
- QStringLiteral("--force"),
--QStringLiteral("--basedir=%1").arg(baseDir),
-+QStringLiteral("--basedir=/usr"),
- QStringLiteral("--datadir=%1/").arg(dataDir)
- });
- }
-@@ -525,6 +526,7 @@ bool DbConfigMysql::initializeMySQL5_7_6Database(const
QString &confFile, const
- return 0 == execute(mMysqldPath, {
- QStringLiteral("--defaults-file=%1").arg(confFile),
- QStringLiteral("--initialize"),
-+QStringLiteral("--basedir=/usr"),
- QStringLiteral("--datadir=%1/").arg(dataDir)
- });
- }
-@@ -539,7 +541,7 @@ bool DbConfigMysql::initializeMySQLDatabase(const QString
&confFile, const QStri
- // Don't use --force, it has been removed in MySQL 5.7.5
- return 0 == execute(mMysqlInstallDbPath, {
- QStringLiteral("--defaults-file=%1").arg(confFile),
--QStringLiteral("--basedir=%1").arg(baseDir),
-+QStringLiteral("--basedir=/usr"),
- QStringLiteral("--datadir=%1/").arg(dataDir)
- });
- }
diff --git a/kde-apps/akonadi/files/akonadi-19.03.80-mysql56-crash.patch
b/kde-apps/akonadi/files/akonadi-18.12.2-mysql56-crash.patch
similarity index 100%
rename from kde-apps/akonadi/files/akonadi-19.03.80-mysql56-crash.patch
rename to kde-apps/akonadi/files/akonadi-18.12.2-mysql56-crash.patch
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/files/, kde-apps/akonadi/
commit: 03848542392d626356b8c6ad37cd217b29e168f1
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Jan 26 20:15:54 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Jan 26 20:28:44 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=03848542
kde-apps/akonadi: Rebase mysql56 patch onto 19.03.80
Package-Manager: Portage-2.3.58, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/akonadi/akonadi-.ebuild | 2 +-
.../files/akonadi-19.03.80-mysql56-crash.patch | 52 ++
2 files changed, 53 insertions(+), 1 deletion(-)
diff --git a/kde-apps/akonadi/akonadi-.ebuild
b/kde-apps/akonadi/akonadi-.ebuild
index afeedcf928..169ec3761b 100644
--- a/kde-apps/akonadi/akonadi-.ebuild
+++ b/kde-apps/akonadi/akonadi-.ebuild
@@ -63,7 +63,7 @@ RDEPEND="${COMMON_DEPEND}
# some akonadi tests time out, that probably needs more work as it's ~700 tests
RESTRICT+=" test"
-PATCHES=( "${FILESDIR}/${PN}-17.03.80-mysql56-crash.patch" )
+PATCHES=( "${FILESDIR}/${PN}-19.03.80-mysql56-crash.patch" )
pkg_setup() {
# Set default storage backend in order: MySQL, PostgreSQL, SQLite
diff --git a/kde-apps/akonadi/files/akonadi-19.03.80-mysql56-crash.patch
b/kde-apps/akonadi/files/akonadi-19.03.80-mysql56-crash.patch
new file mode 100644
index 00..ede8a19d84
--- /dev/null
+++ b/kde-apps/akonadi/files/akonadi-19.03.80-mysql56-crash.patch
@@ -0,0 +1,52 @@
+From b2ebd0e2d594ae71d4e1db4874f72a655f9eeb12 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner
+Date: Sat, 26 Jan 2019 21:09:14 +0100
+Subject: [PATCH] Find mysql_install_db and add required option
+
+Rebase patch onto 19.03.80
+Gentoo-bug: 530012
+---
+ src/server/storage/dbconfigmysql.cpp | 6 --
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/server/storage/dbconfigmysql.cpp
b/src/server/storage/dbconfigmysql.cpp
+index dfff6fc29..80039c8ba 100644
+--- a/src/server/storage/dbconfigmysql.cpp
b/src/server/storage/dbconfigmysql.cpp
+@@ -66,6 +66,7 @@ static QString findExecutable(const QString &bin)
+ QStringLiteral("/usr/local/sbin"),
+ QStringLiteral("/usr/local/libexec"),
+ QStringLiteral("/usr/libexec"),
++QStringLiteral("/usr/share/mysql/scripts"),
+ QStringLiteral("/opt/mysql/libexec"),
+ QStringLiteral("/opt/local/lib/mysql5/bin"),
+ QStringLiteral("/opt/mysql/sbin"),
+@@ -588,7 +589,7 @@ bool DbConfigMysql::initializeMariaDBDatabase(const
QString &confFile, const QSt
+ return 0 == execute(mMysqlInstallDbPath, {
+ QStringLiteral("--defaults-file=%1").arg(confFile),
+ QStringLiteral("--force"),
+-QStringLiteral("--basedir=%1").arg(baseDir),
++QStringLiteral("--basedir=/usr"),
+ QStringLiteral("--datadir=%1/").arg(dataDir)
+ });
+ }
+@@ -602,6 +603,7 @@ bool DbConfigMysql::initializeMySQL5_7_6Database(const
QString &confFile, const
+ return 0 == execute(mMysqldPath, {
+ QStringLiteral("--defaults-file=%1").arg(confFile),
+ QStringLiteral("--initialize"),
++QStringLiteral("--basedir=/usr"),
+ QStringLiteral("--datadir=%1/").arg(dataDir)
+ });
+ }
+@@ -622,7 +624,7 @@ bool DbConfigMysql::initializeMySQLDatabase(const QString
&confFile, const QStri
+ // Don't use --force, it has been removed in MySQL 5.7.5
+ return 0 == execute(mMysqlInstallDbPath, {
+ QStringLiteral("--defaults-file=%1").arg(confFile),
+-QStringLiteral("--basedir=%1").arg(baseDir),
++QStringLiteral("--basedir=/usr"),
+ QStringLiteral("--datadir=%1/").arg(dataDir)
+ });
+ }
+--
+2.20.1
+
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/
commit: 65b1053461acc2942035e0170463d7ee72170fc3
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Jan 10 08:42:36 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Jan 10 08:42:36 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=65b10534
kde-apps/akonadi: Add qtsql[sqlite] slot op if USE=sqlite
Bug: https://bugs.gentoo.org/675058
Package-Manager: Portage-2.3.54, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/akonadi/akonadi-18.12.1.ebuild | 5 -
kde-apps/akonadi/akonadi-18.12.49..ebuild | 5 -
kde-apps/akonadi/akonadi-.ebuild | 5 -
3 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/kde-apps/akonadi/akonadi-18.12.1.ebuild
b/kde-apps/akonadi/akonadi-18.12.1.ebuild
index e80a4b6a95..2702be7798 100644
--- a/kde-apps/akonadi/akonadi-18.12.1.ebuild
+++ b/kde-apps/akonadi/akonadi-18.12.1.ebuild
@@ -40,7 +40,10 @@ COMMON_DEPEND="
$(add_qt_dep qtwidgets)
$(add_qt_dep qtxml)
x11-misc/shared-mime-info
- sqlite? ( dev-db/sqlite:3 )
+ sqlite? (
+ $(add_qt_dep qtsql 'sqlite' '' '5=')
+ dev-db/sqlite:3
+ )
xml? ( dev-libs/libxml2 )
"
DEPEND="${COMMON_DEPEND}
diff --git a/kde-apps/akonadi/akonadi-18.12.49..ebuild
b/kde-apps/akonadi/akonadi-18.12.49..ebuild
index 7ddc4ea8c4..2b61792555 100644
--- a/kde-apps/akonadi/akonadi-18.12.49..ebuild
+++ b/kde-apps/akonadi/akonadi-18.12.49..ebuild
@@ -40,7 +40,10 @@ COMMON_DEPEND="
$(add_qt_dep qtwidgets)
$(add_qt_dep qtxml)
x11-misc/shared-mime-info
- sqlite? ( dev-db/sqlite:3 )
+ sqlite? (
+ $(add_qt_dep qtsql 'sqlite' '' '5=')
+ dev-db/sqlite:3
+ )
xml? ( dev-libs/libxml2 )
"
DEPEND="${COMMON_DEPEND}
diff --git a/kde-apps/akonadi/akonadi-.ebuild
b/kde-apps/akonadi/akonadi-.ebuild
index 89eddb63f3..447c51f57c 100644
--- a/kde-apps/akonadi/akonadi-.ebuild
+++ b/kde-apps/akonadi/akonadi-.ebuild
@@ -40,7 +40,10 @@ COMMON_DEPEND="
$(add_qt_dep qtwidgets)
$(add_qt_dep qtxml)
x11-misc/shared-mime-info
- sqlite? ( dev-db/sqlite:3 )
+ sqlite? (
+ $(add_qt_dep qtsql 'sqlite' '' '5=')
+ dev-db/sqlite:3
+ )
xml? ( dev-libs/libxml2 )
"
DEPEND="${COMMON_DEPEND}
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi-search/, kde-apps/akonadi-search/files/
commit: d77da763447580a4dcf3776d8915b016b69bfeb0
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Dec 20 20:41:17 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Dec 22 12:10:24 2018 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=d77da763
kde-apps/akonadi-search: Fix cmake for odd Frameworks version mix
Reported-by: Martin Bednar serafean.cz>
Closes: https://bugs.gentoo.org/673430
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../akonadi-search-18.12.49..ebuild| 2 +
.../files/akonadi-search-18.12.0-cmake.patch | 62 ++
2 files changed, 64 insertions(+)
diff --git a/kde-apps/akonadi-search/akonadi-search-18.12.49..ebuild
b/kde-apps/akonadi-search/akonadi-search-18.12.49..ebuild
index 5fd27df032..1d9c2196b3 100644
--- a/kde-apps/akonadi-search/akonadi-search-18.12.49..ebuild
+++ b/kde-apps/akonadi-search/akonadi-search-18.12.49..ebuild
@@ -40,3 +40,5 @@ DEPEND="${COMMON_DEPEND}
RDEPEND="${COMMON_DEPEND}
!kde-apps/kdepim-l10n
"
+
+PATCHES=( "${FILESDIR}/${PN}-18.12.0-cmake.patch" )
diff --git a/kde-apps/akonadi-search/files/akonadi-search-18.12.0-cmake.patch
b/kde-apps/akonadi-search/files/akonadi-search-18.12.0-cmake.patch
new file mode 100644
index 00..e6a6bd79d4
--- /dev/null
+++ b/kde-apps/akonadi-search/files/akonadi-search-18.12.0-cmake.patch
@@ -0,0 +1,62 @@
+From f5af0d46904125f0c4c874b462c9f44d4688a528 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner
+Date: Wed, 19 Dec 2018 14:21:13 +0100
+Subject: [PATCH] Use KF5_MIN_VERSION instead of KF5_VERSION
+
+Summary:
+KF5_VERSION is overridden by first KF5 find_package version found result,
which may be higher
+than other installed Frameworks versions at the time, leading to cmake error.
+
+Reviewers: #kde_pim, dvratil
+
+Reviewed By: #kde_pim, dvratil
+
+Subscribers: dvratil, kde-pim
+
+Tags: #kde_pim
+
+Differential Revision: https://phabricator.kde.org/D17684
+---
+ CMakeLists.txt | 10 --
+ 1 file changed, 4 insertions(+), 6 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f54a17f..708a266 100644
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -4,9 +4,9 @@ set(PIM_VERSION "5.10.0")
+ project(AkonadiSearch VERSION ${PIM_VERSION})
+
+ # ECM setup
+-set(KF5_VERSION "5.51.0")
++set(KF5_MIN_VERSION "5.51.0")
+
+-find_package(ECM ${KF5_VERSION} CONFIG REQUIRED)
++find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED)
+ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
+
+ include(GenerateExportHeader)
+@@ -39,9 +39,9 @@ set(KMIME_LIB_VERSION "5.10.0")
+ set(QT_REQUIRED_VERSION "5.9.0")
+
+ find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Core Test)
+-find_package(KF5 ${KF5_VERSION} REQUIRED COMPONENTS I18n Config Crash
KCMUtils)
++find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS I18n Config Crash
DBusAddons KCMUtils KIO)
+ if (AKONADISEARCH_ENABLE_KRUNNER_RUNNER)
+-find_package(KF5Runner ${KF5_VERSION} REQUIRED)
++find_package(KF5Runner ${KF5_MIN_VERSION} REQUIRED)
+ endif()
+
+
+@@ -57,8 +57,6 @@ find_package(KF5Contacts ${KCONTACTS_LIB_VERSION} CONFIG
REQUIRED)
+ find_package(KF5Mime ${KMIME_LIB_VERSION} CONFIG REQUIRED)
+ find_package(KF5AkonadiMime ${AKONADI_MIMELIB_VERSION} CONFIG REQUIRED)
+ find_package(KF5CalendarCore ${KCALENDARCORE_LIB_VERSION} CONFIG REQUIRED)
+-find_package(KF5KIO ${KF5_VERSION} CONFIG REQUIRED)
+-find_package(KF5DBusAddons ${KF5_VERSION} CONFIG REQUIRED)
+
+ ecm_setup_version(PROJECT
+ VARIABLE_PREFIX AKONADISEARCH
+--
+2.20.1
+
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi-search/
commit: 08ea4b8c3721723b8c0fced3c7828cf0c51e462c
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Jan 4 00:53:07 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Apr 21 13:51:34 2018 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=08ea4b8c
kde-apps/akonadi-search: Set VIRTUALX_REQUIRED="test", test deps
Tests don't pass yet.
Thanks-to: Paolo Pedroni iol.it>
Bug: https://bugs.gentoo.org/642414
Package-Manager: Portage-2.3.19, Repoman-2.3.6
kde-apps/akonadi-search/akonadi-search-18.04.49..ebuild | 3 +++
kde-apps/akonadi-search/akonadi-search-.ebuild | 3 +++
2 files changed, 6 insertions(+)
diff --git a/kde-apps/akonadi-search/akonadi-search-18.04.49..ebuild
b/kde-apps/akonadi-search/akonadi-search-18.04.49..ebuild
index ffda1a5709..b2a3295832 100644
--- a/kde-apps/akonadi-search/akonadi-search-18.04.49..ebuild
+++ b/kde-apps/akonadi-search/akonadi-search-18.04.49..ebuild
@@ -3,6 +3,8 @@
EAPI=6
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
inherit kde5
DESCRIPTION="Libraries and daemons to implement searching in Akonadi"
@@ -33,6 +35,7 @@ COMMON_DEPEND="
"
DEPEND="${COMMON_DEPEND}
dev-libs/boost
+ test? ( $(add_kdeapps_dep akonadi 'mysql,postgres,sqlite,tools') )
"
RDEPEND="${COMMON_DEPEND}
!kde-apps/kdepim-l10n
diff --git a/kde-apps/akonadi-search/akonadi-search-.ebuild
b/kde-apps/akonadi-search/akonadi-search-.ebuild
index ffda1a5709..b2a3295832 100644
--- a/kde-apps/akonadi-search/akonadi-search-.ebuild
+++ b/kde-apps/akonadi-search/akonadi-search-.ebuild
@@ -3,6 +3,8 @@
EAPI=6
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
inherit kde5
DESCRIPTION="Libraries and daemons to implement searching in Akonadi"
@@ -33,6 +35,7 @@ COMMON_DEPEND="
"
DEPEND="${COMMON_DEPEND}
dev-libs/boost
+ test? ( $(add_kdeapps_dep akonadi 'mysql,postgres,sqlite,tools') )
"
RDEPEND="${COMMON_DEPEND}
!kde-apps/kdepim-l10n
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi-mime/
commit: a2533b4d1c0b0a9d25167561a6a08c049c78fcd4 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Mar 8 20:32:14 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Mar 8 20:32:14 2018 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=a2533b4d kde-apps/akonadi-mime: Block
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi-contacts/
commit: de05108b80f457b1fbb156df3650a3a070f81dd2 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Mar 8 20:31:17 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Mar 8 20:31:24 2018 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=de05108b kde-apps/akonadi-contacts: Block
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi-calendar/
commit: 0505d27159d617fc9b41245d14c29e8a9b241737 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Mar 8 20:29:26 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Mar 8 20:29:26 2018 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=0505d271 kde-apps/akonadi-calendar: Block
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi-contacts/
commit: f7725c206ad9def4f6de1f51a23184a710c09849 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Mar 5 17:13:31 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Mar 5 17:13:31 2018 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=f7725c20 kde-apps/akonadi-contacts: Drop unused DEPEND Package-Manager: Portage-2.3.24, Repoman-2.3.6 kde-apps/akonadi-contacts/akonadi-contacts-.ebuild | 1 - 1 file changed, 1 deletion(-) diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-.ebuild b/kde-apps/akonadi-contacts/akonadi-contacts-.ebuild index 10d9fd57f8..d3fe1edad4 100644 --- a/kde-apps/akonadi-contacts/akonadi-contacts-.ebuild +++ b/kde-apps/akonadi-contacts/akonadi-contacts-.ebuild @@ -30,7 +30,6 @@ DEPEND=" $(add_frameworks_dep kxmlgui) $(add_frameworks_dep prison) $(add_kdeapps_dep akonadi) - $(add_kdeapps_dep akonadi-mime) $(add_kdeapps_dep kcontacts) $(add_kdeapps_dep kmime) $(add_qt_dep qtdbus)
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi-search/
commit: 30b9d25c7cf348657d0c8a3ce419e4c403abaef2
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Fri Jan 5 00:59:47 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Fri Jan 5 00:59:47 2018 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=30b9d25c
kde-apps/akonadi-search: Set VIRTUALX_REQUIRED="test", test deps
Tests don't pass yet.
Package-Manager: Portage-2.3.19, Repoman-2.3.6
kde-apps/akonadi-search/akonadi-search-17.12.49..ebuild | 3 +++
1 file changed, 3 insertions(+)
diff --git a/kde-apps/akonadi-search/akonadi-search-17.12.49..ebuild
b/kde-apps/akonadi-search/akonadi-search-17.12.49..ebuild
index ffda1a5709..3c6cfc3697 100644
--- a/kde-apps/akonadi-search/akonadi-search-17.12.49..ebuild
+++ b/kde-apps/akonadi-search/akonadi-search-17.12.49..ebuild
@@ -3,6 +3,8 @@
EAPI=6
+KDE_TEST="forceoptional-recursive"
+VIRTUALX_REQUIRED="test"
inherit kde5
DESCRIPTION="Libraries and daemons to implement searching in Akonadi"
@@ -33,6 +35,7 @@ COMMON_DEPEND="
"
DEPEND="${COMMON_DEPEND}
dev-libs/boost
+ test? ( $(add_kdeapps_dep akonadi 'mysql,postgres,sqlite,tools') )
"
RDEPEND="${COMMON_DEPEND}
!kde-apps/kdepim-l10n
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi-contacts/
commit: 3e8ae7d792b0f81ba26af93ce94710df2c18e4b7 Author: Michael Palimaka gentoo org> AuthorDate: Mon Dec 25 10:13:30 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Mon Dec 25 10:14:23 2017 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=3e8ae7d7 kde-apps/akonadi-contacts: update dependencies Package-Manager: Portage-2.3.14, Repoman-2.3.6 kde-apps/akonadi-contacts/akonadi-contacts-17.12.49..ebuild | 3 +-- kde-apps/akonadi-contacts/akonadi-contacts-.ebuild | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-17.12.49..ebuild b/kde-apps/akonadi-contacts/akonadi-contacts-17.12.49..ebuild index 714e1fa3c4..cbc4b1ff29 100644 --- a/kde-apps/akonadi-contacts/akonadi-contacts-17.12.49..ebuild +++ b/kde-apps/akonadi-contacts/akonadi-contacts-17.12.49..ebuild @@ -22,9 +22,8 @@ DEPEND=" $(add_frameworks_dep kcoreaddons) $(add_frameworks_dep kdbusaddons) $(add_frameworks_dep kiconthemes) + $(add_frameworks_dep ki18n) $(add_frameworks_dep kio) - $(add_frameworks_dep kitemmodels) - $(add_frameworks_dep kjobwidgets) $(add_frameworks_dep kservice) $(add_frameworks_dep ktextwidgets) $(add_frameworks_dep kwidgetsaddons) diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-.ebuild b/kde-apps/akonadi-contacts/akonadi-contacts-.ebuild index 714e1fa3c4..cbc4b1ff29 100644 --- a/kde-apps/akonadi-contacts/akonadi-contacts-.ebuild +++ b/kde-apps/akonadi-contacts/akonadi-contacts-.ebuild @@ -22,9 +22,8 @@ DEPEND=" $(add_frameworks_dep kcoreaddons) $(add_frameworks_dep kdbusaddons) $(add_frameworks_dep kiconthemes) + $(add_frameworks_dep ki18n) $(add_frameworks_dep kio) - $(add_frameworks_dep kitemmodels) - $(add_frameworks_dep kjobwidgets) $(add_frameworks_dep kservice) $(add_frameworks_dep ktextwidgets) $(add_frameworks_dep kwidgetsaddons)
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/
commit: f71a8924f9891f3893a61f87cfd0d657c45adf96 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Nov 14 21:19:42 2017 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Nov 14 21:20:03 2017 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=f71a8924 kde-apps/akonadi: Block
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/
commit: fec9724f07126ec4330eef8bacb3047c072bf83e
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Oct 30 10:32:09 2017 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Oct 30 10:32:32 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=fec9724f
kde-apps/akonadi: Drop USE=networkmanager again
Upstream reverted the feature.
Upstream commit 91089ee4550187acf85edcc867d11ae02f482656
Package-Manager: Portage-2.3.8, Repoman-2.3.3
kde-apps/akonadi/akonadi-.ebuild | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/kde-apps/akonadi/akonadi-.ebuild
b/kde-apps/akonadi/akonadi-.ebuild
index 3cd41b9245..7aa020039e 100644
--- a/kde-apps/akonadi/akonadi-.ebuild
+++ b/kde-apps/akonadi/akonadi-.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://community.kde.org/KDE_PIM/akonadi";
KEYWORDS=""
LICENSE="LGPL-2.1+"
-IUSE="+mysql networkmanager postgres sqlite tools xml"
+IUSE="+mysql postgres sqlite tools xml"
REQUIRED_USE="|| ( mysql postgres sqlite ) test? ( tools )"
@@ -40,7 +40,6 @@ COMMON_DEPEND="
$(add_qt_dep qtwidgets)
$(add_qt_dep qtxml)
x11-misc/shared-mime-info
- networkmanager? ( $(add_frameworks_dep networkmanager-qt) )
sqlite? ( dev-db/sqlite:3 )
xml? ( dev-libs/libxml2 )
"
@@ -79,7 +78,6 @@ pkg_setup() {
src_configure() {
local mycmakeargs=(
- $(cmake-utils_use_find_package networkmanager
KF5NetworkManagerQt)
-DAKONADI_BUILD_QSQLITE=$(usex sqlite)
-DBUILD_TOOLS=$(usex tools)
$(cmake-utils_use_find_package xml LibXml2)
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi-contacts/
commit: 66ab0bdce55a866fffdf8e38cfd906059c37694a
Author: Johannes Huber gentoo org>
AuthorDate: Wed Oct 11 05:19:37 2017 +
Commit: Johannes Huber gentoo org>
CommitDate: Wed Oct 11 05:19:37 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=66ab0bdc
kde-apps/akonadi-contacts: Update dependencies
Upstream commit 32c9536a24224b28027d764a9c2968480b0425a0
Package-Manager: Portage-2.3.11, Repoman-2.3.3
kde-apps/akonadi-contacts/akonadi-contacts-.ebuild | 2 --
1 file changed, 2 deletions(-)
diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-.ebuild
b/kde-apps/akonadi-contacts/akonadi-contacts-.ebuild
index f5cd2e864e..714e1fa3c4 100644
--- a/kde-apps/akonadi-contacts/akonadi-contacts-.ebuild
+++ b/kde-apps/akonadi-contacts/akonadi-contacts-.ebuild
@@ -36,9 +36,7 @@ DEPEND="
$(add_kdeapps_dep kmime)
$(add_qt_dep qtdbus)
$(add_qt_dep qtgui)
- $(add_qt_dep qtwebengine 'widgets')
$(add_qt_dep qtwidgets)
- >=dev-libs/grantlee-5.1.0:5
"
RDEPEND="${DEPEND}
!kde-apps/kdepim-l10n
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/
commit: 9aed38a15df19a462635f2d9f12982c63988cdfc
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Oct 9 18:58:30 2017 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Oct 9 19:02:53 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=9aed38a1
kde-apps/akonadi: Add USE=networkmanager
Upstream commit a5adf445616d3d5384f752a26cb9c46172c5315a
Package-Manager: Portage-2.3.11, Repoman-2.3.3
kde-apps/akonadi/akonadi-.ebuild | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/kde-apps/akonadi/akonadi-.ebuild
b/kde-apps/akonadi/akonadi-.ebuild
index 8fe5659f29..3cd41b9245 100644
--- a/kde-apps/akonadi/akonadi-.ebuild
+++ b/kde-apps/akonadi/akonadi-.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://community.kde.org/KDE_PIM/akonadi";
KEYWORDS=""
LICENSE="LGPL-2.1+"
-IUSE="+mysql postgres sqlite tools xml"
+IUSE="+mysql networkmanager postgres sqlite tools xml"
REQUIRED_USE="|| ( mysql postgres sqlite ) test? ( tools )"
@@ -33,7 +33,6 @@ COMMON_DEPEND="
$(add_frameworks_dep kwidgetsaddons)
$(add_frameworks_dep kwindowsystem)
$(add_frameworks_dep kxmlgui)
- $(add_frameworks_dep networkmanager-qt)
$(add_qt_dep qtdbus)
$(add_qt_dep qtgui)
$(add_qt_dep qtnetwork)
@@ -41,6 +40,7 @@ COMMON_DEPEND="
$(add_qt_dep qtwidgets)
$(add_qt_dep qtxml)
x11-misc/shared-mime-info
+ networkmanager? ( $(add_frameworks_dep networkmanager-qt) )
sqlite? ( dev-db/sqlite:3 )
xml? ( dev-libs/libxml2 )
"
@@ -79,6 +79,7 @@ pkg_setup() {
src_configure() {
local mycmakeargs=(
+ $(cmake-utils_use_find_package networkmanager
KF5NetworkManagerQt)
-DAKONADI_BUILD_QSQLITE=$(usex sqlite)
-DBUILD_TOOLS=$(usex tools)
$(cmake-utils_use_find_package xml LibXml2)
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/
commit: 9394cad8a5f40da7595998868f4bbae6b4f9f97d
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Sep 25 13:27:00 2017 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Sep 25 15:50:37 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=9394cad8
kde-apps/akonadi: Depend on fixed dev-qt/qtsql-5.7.1-r1
Gentoo-bug: 626464
Package-Manager: Portage-2.3.10, Repoman-2.3.3
kde-apps/akonadi/akonadi-17.08.49..ebuild | 7 ++-
kde-apps/akonadi/akonadi-.ebuild | 5 +
2 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/kde-apps/akonadi/akonadi-17.08.49..ebuild
b/kde-apps/akonadi/akonadi-17.08.49..ebuild
index 66799666c5..02dccca7f5 100644
--- a/kde-apps/akonadi/akonadi-17.08.49..ebuild
+++ b/kde-apps/akonadi/akonadi-17.08.49..ebuild
@@ -37,7 +37,7 @@ COMMON_DEPEND="
$(add_qt_dep qtdbus)
$(add_qt_dep qtgui '' '' '5=')
$(add_qt_dep qtnetwork)
- $(add_qt_dep qtsql 'mysql?,postgres?')
+ $(add_qt_dep qtsql 'mysql?,postgres?' 5.7.1-r1)
$(add_qt_dep qtwidgets)
$(add_qt_dep qtxml)
x11-misc/shared-mime-info
@@ -52,10 +52,7 @@ DEPEND="${COMMON_DEPEND}
RDEPEND="${COMMON_DEPEND}
!kde-apps/kdepim-l10n
!kde-apps/kdepimlibs
- mysql? (
- !>=dev-db/mariadb-10.2
- virtual/mysql
- )
+ mysql? ( virtual/mysql )
postgres? ( dev-db/postgresql )
"
diff --git a/kde-apps/akonadi/akonadi-.ebuild
b/kde-apps/akonadi/akonadi-.ebuild
index afbf68988f..351b0deb27 100644
--- a/kde-apps/akonadi/akonadi-.ebuild
+++ b/kde-apps/akonadi/akonadi-.ebuild
@@ -53,10 +53,7 @@ DEPEND="${COMMON_DEPEND}
RDEPEND="${COMMON_DEPEND}
!kde-apps/kdepim-l10n
!kde-apps/kdepimlibs
- mysql? (
- !>=dev-db/mariadb-10.2
- virtual/mysql
- )
+ mysql? ( virtual/mysql )
postgres? ( dev-db/postgresql )
"
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/
commit: 02e8b99f2426faddbe40df6554707f0200e91fa0
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Fri Sep 22 16:08:20 2017 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Fri Sep 22 16:08:20 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=02e8b99f
kde-apps/akonadi: Block >=dev-db/mariadb-10.2 if USE=mysql
Gentoo-bug: 626464
Package-Manager: Portage-2.3.8, Repoman-2.3.1
kde-apps/akonadi/akonadi-17.08.49..ebuild | 5 -
kde-apps/akonadi/akonadi-.ebuild | 5 -
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/kde-apps/akonadi/akonadi-17.08.49..ebuild
b/kde-apps/akonadi/akonadi-17.08.49..ebuild
index be837a6439..66799666c5 100644
--- a/kde-apps/akonadi/akonadi-17.08.49..ebuild
+++ b/kde-apps/akonadi/akonadi-17.08.49..ebuild
@@ -52,7 +52,10 @@ DEPEND="${COMMON_DEPEND}
RDEPEND="${COMMON_DEPEND}
!kde-apps/kdepim-l10n
!kde-apps/kdepimlibs
- mysql? ( virtual/mysql )
+ mysql? (
+ !>=dev-db/mariadb-10.2
+ virtual/mysql
+ )
postgres? ( dev-db/postgresql )
"
diff --git a/kde-apps/akonadi/akonadi-.ebuild
b/kde-apps/akonadi/akonadi-.ebuild
index 351b0deb27..afbf68988f 100644
--- a/kde-apps/akonadi/akonadi-.ebuild
+++ b/kde-apps/akonadi/akonadi-.ebuild
@@ -53,7 +53,10 @@ DEPEND="${COMMON_DEPEND}
RDEPEND="${COMMON_DEPEND}
!kde-apps/kdepim-l10n
!kde-apps/kdepimlibs
- mysql? ( virtual/mysql )
+ mysql? (
+ !>=dev-db/mariadb-10.2
+ virtual/mysql
+ )
postgres? ( dev-db/postgresql )
"
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi-search/
commit: c71dcd7c511c6416712bf00284daf018e2b84c3e Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Sep 13 17:28:45 2017 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Sep 13 17:51:36 2017 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=c71dcd7c kde-apps/akonadi-search: Fix DEPENDs Upstream commit fbc7df31d443da1b96cad683939441539cdef20d Package-Manager: Portage-2.3.8, Repoman-2.3.3 kde-apps/akonadi-search/akonadi-search-.ebuild | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kde-apps/akonadi-search/akonadi-search-.ebuild b/kde-apps/akonadi-search/akonadi-search-.ebuild index eabf32ad23..3c13cd4b7b 100644 --- a/kde-apps/akonadi-search/akonadi-search-.ebuild +++ b/kde-apps/akonadi-search/akonadi-search-.ebuild @@ -17,7 +17,8 @@ COMMON_DEPEND=" $(add_frameworks_dep kconfig) $(add_frameworks_dep kconfigwidgets) $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kdelibs4support) + $(add_frameworks_dep kdbusaddons) + $(add_frameworks_dep kio) $(add_frameworks_dep ki18n) $(add_frameworks_dep krunner) $(add_kdeapps_dep akonadi)
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi-calendar/
commit: 85050a5f2db834975025be20a81ceb064c412b13 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Sep 13 17:43:04 2017 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Sep 13 17:51:36 2017 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=85050a5f kde-apps/akonadi-calendar: Drop obsolete DEPEND Package-Manager: Portage-2.3.8, Repoman-2.3.3 kde-apps/akonadi-calendar/akonadi-calendar-.ebuild | 1 - 1 file changed, 1 deletion(-) diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-.ebuild index f185608894..c71e70815c 100644 --- a/kde-apps/akonadi-calendar/akonadi-calendar-.ebuild +++ b/kde-apps/akonadi-calendar/akonadi-calendar-.ebuild @@ -17,7 +17,6 @@ DEPEND=" $(add_frameworks_dep kconfigwidgets) $(add_frameworks_dep kcoreaddons) $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep kdelibs4support) $(add_frameworks_dep ki18n) $(add_frameworks_dep kiconthemes) $(add_frameworks_dep kio)
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi-contacts/
commit: 1aad81f1e95f32e45b962e565e3346c52468517c
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Sep 13 17:02:42 2017 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Sep 13 17:09:15 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=1aad81f1
kde-apps/akonadi-contacts: Drop USE=prison, no longer optional
Gentoo-bug: d6c7309b032f340f446586d90030b840a3a9d3ee
Package-Manager: Portage-2.3.8, Repoman-2.3.3
.../akonadi-contacts/akonadi-contacts-17.08.49..ebuild | 12 ++--
kde-apps/akonadi-contacts/akonadi-contacts-.ebuild | 12 ++--
kde-apps/akonadi-contacts/metadata.xml | 3 ---
3 files changed, 4 insertions(+), 23 deletions(-)
diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-17.08.49..ebuild
b/kde-apps/akonadi-contacts/akonadi-contacts-17.08.49..ebuild
index 367373cda6..f5cd2e864e 100644
--- a/kde-apps/akonadi-contacts/akonadi-contacts-17.08.49..ebuild
+++ b/kde-apps/akonadi-contacts/akonadi-contacts-17.08.49..ebuild
@@ -9,7 +9,7 @@ inherit kde5
DESCRIPTION="Library for akonadi contact integration"
KEYWORDS=""
LICENSE="GPL-2+"
-IUSE="prison"
+IUSE=""
# some akonadi tests time out, that probably needs more work as it's ~700 tests
RESTRICT+=" test"
@@ -29,6 +29,7 @@ DEPEND="
$(add_frameworks_dep ktextwidgets)
$(add_frameworks_dep kwidgetsaddons)
$(add_frameworks_dep kxmlgui)
+ $(add_frameworks_dep prison)
$(add_kdeapps_dep akonadi)
$(add_kdeapps_dep akonadi-mime)
$(add_kdeapps_dep kcontacts)
@@ -38,16 +39,7 @@ DEPEND="
$(add_qt_dep qtwebengine 'widgets')
$(add_qt_dep qtwidgets)
>=dev-libs/grantlee-5.1.0:5
- prison? ( $(add_frameworks_dep prison) )
"
RDEPEND="${DEPEND}
!kde-apps/kdepim-l10n
"
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_find_package prison KF5Prison)
- )
-
- kde5_src_configure
-}
diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-.ebuild
b/kde-apps/akonadi-contacts/akonadi-contacts-.ebuild
index 367373cda6..f5cd2e864e 100644
--- a/kde-apps/akonadi-contacts/akonadi-contacts-.ebuild
+++ b/kde-apps/akonadi-contacts/akonadi-contacts-.ebuild
@@ -9,7 +9,7 @@ inherit kde5
DESCRIPTION="Library for akonadi contact integration"
KEYWORDS=""
LICENSE="GPL-2+"
-IUSE="prison"
+IUSE=""
# some akonadi tests time out, that probably needs more work as it's ~700 tests
RESTRICT+=" test"
@@ -29,6 +29,7 @@ DEPEND="
$(add_frameworks_dep ktextwidgets)
$(add_frameworks_dep kwidgetsaddons)
$(add_frameworks_dep kxmlgui)
+ $(add_frameworks_dep prison)
$(add_kdeapps_dep akonadi)
$(add_kdeapps_dep akonadi-mime)
$(add_kdeapps_dep kcontacts)
@@ -38,16 +39,7 @@ DEPEND="
$(add_qt_dep qtwebengine 'widgets')
$(add_qt_dep qtwidgets)
>=dev-libs/grantlee-5.1.0:5
- prison? ( $(add_frameworks_dep prison) )
"
RDEPEND="${DEPEND}
!kde-apps/kdepim-l10n
"
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_find_package prison KF5Prison)
- )
-
- kde5_src_configure
-}
diff --git a/kde-apps/akonadi-contacts/metadata.xml
b/kde-apps/akonadi-contacts/metadata.xml
index b17398a5cb..2fdbf33d96 100644
--- a/kde-apps/akonadi-contacts/metadata.xml
+++ b/kde-apps/akonadi-contacts/metadata.xml
@@ -5,7 +5,4 @@
k...@gentoo.org
Gentoo KDE Project
-
- Enable support for QRcodes in
contacts
-
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/
commit: 2a242d06282128bd87672d17e59eae2f1f8fd841 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Sep 6 21:38:18 2017 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Sep 6 21:38:48 2017 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=2a242d06 kde-apps/akonadi: Add missing DEPEND Upstream commit 0158097ae239deab8c12584b8e9d0908bf83ac25 Package-Manager: Portage-2.3.8, Repoman-2.3.3 kde-apps/akonadi/akonadi-.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/kde-apps/akonadi/akonadi-.ebuild b/kde-apps/akonadi/akonadi-.ebuild index be837a6439..351b0deb27 100644 --- a/kde-apps/akonadi/akonadi-.ebuild +++ b/kde-apps/akonadi/akonadi-.ebuild @@ -34,6 +34,7 @@ COMMON_DEPEND=" $(add_frameworks_dep kwidgetsaddons) $(add_frameworks_dep kwindowsystem) $(add_frameworks_dep kxmlgui) + $(add_frameworks_dep networkmanager-qt) $(add_qt_dep qtdbus) $(add_qt_dep qtgui '' '' '5=') $(add_qt_dep qtnetwork)
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/
commit: dd9f269f1672a6dd96cdbf079a2fb3f7442c4fa5 Author: Michael Palimaka gentoo org> AuthorDate: Sat Aug 26 12:39:56 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Sat Aug 26 13:04:26 2017 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=dd9f269f kde-apps/akonadi: update HOMEPAGE Package-Manager: Portage-2.3.6, Repoman-2.3.3 kde-apps/akonadi/akonadi-17.08.49..ebuild | 2 +- kde-apps/akonadi/akonadi-.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kde-apps/akonadi/akonadi-17.08.49..ebuild b/kde-apps/akonadi/akonadi-17.08.49..ebuild index 83e59f81c1..be837a6439 100644 --- a/kde-apps/akonadi/akonadi-17.08.49..ebuild +++ b/kde-apps/akonadi/akonadi-17.08.49..ebuild @@ -10,7 +10,7 @@ VIRTUALX_REQUIRED="test" inherit kde5 DESCRIPTION="Storage service for PIM data and libraries for PIM apps" -HOMEPAGE="https://pim.kde.org/akonadi"; +HOMEPAGE="https://community.kde.org/KDE_PIM/akonadi"; KEYWORDS="" LICENSE="LGPL-2.1+" diff --git a/kde-apps/akonadi/akonadi-.ebuild b/kde-apps/akonadi/akonadi-.ebuild index 83e59f81c1..be837a6439 100644 --- a/kde-apps/akonadi/akonadi-.ebuild +++ b/kde-apps/akonadi/akonadi-.ebuild @@ -10,7 +10,7 @@ VIRTUALX_REQUIRED="test" inherit kde5 DESCRIPTION="Storage service for PIM data and libraries for PIM apps" -HOMEPAGE="https://pim.kde.org/akonadi"; +HOMEPAGE="https://community.kde.org/KDE_PIM/akonadi"; KEYWORDS="" LICENSE="LGPL-2.1+"
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi-search/
commit: 8ced556ccb5687228c9174e405b19e890e532cd0 Author: Michael Palimaka gentoo org> AuthorDate: Sat Aug 26 12:39:18 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Sat Aug 26 13:04:26 2017 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=8ced556c kde-apps/akonadi-search: update HOMEPAGE Package-Manager: Portage-2.3.6, Repoman-2.3.3 kde-apps/akonadi-search/akonadi-search-17.08.49..ebuild | 2 +- kde-apps/akonadi-search/akonadi-search-.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kde-apps/akonadi-search/akonadi-search-17.08.49..ebuild b/kde-apps/akonadi-search/akonadi-search-17.08.49..ebuild index f05b5a67cf..eabf32ad23 100644 --- a/kde-apps/akonadi-search/akonadi-search-17.08.49..ebuild +++ b/kde-apps/akonadi-search/akonadi-search-17.08.49..ebuild @@ -6,7 +6,7 @@ EAPI=6 inherit kde5 DESCRIPTION="Libraries and daemons to implement searching in Akonadi" -HOMEPAGE="https://projects.kde.org/projects/playground/pim/akonadi-search"; +HOMEPAGE="https://cgit.kde.org/akonadi-search.git"; LICENSE="GPL-2+ LGPL-2.1+" KEYWORDS="" IUSE="" diff --git a/kde-apps/akonadi-search/akonadi-search-.ebuild b/kde-apps/akonadi-search/akonadi-search-.ebuild index f05b5a67cf..eabf32ad23 100644 --- a/kde-apps/akonadi-search/akonadi-search-.ebuild +++ b/kde-apps/akonadi-search/akonadi-search-.ebuild @@ -6,7 +6,7 @@ EAPI=6 inherit kde5 DESCRIPTION="Libraries and daemons to implement searching in Akonadi" -HOMEPAGE="https://projects.kde.org/projects/playground/pim/akonadi-search"; +HOMEPAGE="https://cgit.kde.org/akonadi-search.git"; LICENSE="GPL-2+ LGPL-2.1+" KEYWORDS="" IUSE=""
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/
commit: eed37f8bca645a01f013d2b473a77c61eb8c925c
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Aug 17 12:07:42 2017 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Aug 17 12:07:42 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=eed37f8b
kde-apps/akonadi: Re-add USE=sqlite for reverse deps
Gentoo-bug: 627992
Package-Manager: Portage-2.3.8, Repoman-2.3.3
kde-apps/akonadi/akonadi-17.08.0.ebuild | 20 +++-
kde-apps/akonadi/akonadi-17.08.49..ebuild | 20 +++-
kde-apps/akonadi/akonadi-.ebuild | 20 +++-
3 files changed, 45 insertions(+), 15 deletions(-)
diff --git a/kde-apps/akonadi/akonadi-17.08.0.ebuild
b/kde-apps/akonadi/akonadi-17.08.0.ebuild
index c11ecfc98e..600445c2f7 100644
--- a/kde-apps/akonadi/akonadi-17.08.0.ebuild
+++ b/kde-apps/akonadi/akonadi-17.08.0.ebuild
@@ -14,9 +14,9 @@ HOMEPAGE="https://pim.kde.org/akonadi";
KEYWORDS="~amd64 ~arm ~x86"
LICENSE="LGPL-2.1+"
-IUSE="+mysql postgres tools xml"
+IUSE="+mysql postgres sqlite tools xml"
-REQUIRED_USE="|| ( mysql postgres ) test? ( tools )"
+REQUIRED_USE="|| ( mysql postgres sqlite ) test? ( tools )"
# drop qtgui subslot operator when QT_MINIMAL >= 5.9.0
COMMON_DEPEND="
@@ -41,6 +41,7 @@ COMMON_DEPEND="
$(add_qt_dep qtwidgets)
$(add_qt_dep qtxml)
x11-misc/shared-mime-info
+ sqlite? ( dev-db/sqlite:3 )
xml? ( dev-libs/libxml2 )
"
DEPEND="${COMMON_DEPEND}
@@ -64,16 +65,24 @@ RESTRICT+=" test"
PATCHES=( "${FILESDIR}/${PN}-17.03.80-mysql56-crash.patch" )
pkg_setup() {
- # Set default storage backend in order: MySQL, PostgreSQL
+ # Set default storage backend in order: MySQL, PostgreSQL, SQLite
# reverse driver check to keep the order
+ use sqlite && DRIVER="QSQLITE3"
use postgres && DRIVER="QPSQL"
use mysql && DRIVER="QMYSQL"
+
+ if use sqlite || has_version "<${CATEGORY}/${P}[sqlite]"; then
+ ewarn "We strongly recommend you change your Akonadi database
backend to either MySQL"
+ ewarn "or PostgreSQL in your user configuration."
+ ewarn "In particular, kde-apps/kmail does not work properly
with the sqlite backend."
+ fi
+
kde5_pkg_setup
}
src_configure() {
local mycmakeargs=(
- -DAKONADI_BUILD_QSQLITE=OFF
+ -DAKONADI_BUILD_QSQLITE=$(usex sqlite)
-DBUILD_TOOLS=$(usex tools)
$(cmake-utils_use_find_package xml LibXml2)
)
@@ -97,7 +106,8 @@ pkg_postinst() {
kde5_pkg_postinst
elog "You can select the storage backend in
~/.config/akonadi/akonadiserverrc."
elog "Available drivers are:"
- use postgres && elog " QPSQL"
use mysql && elog " QMYSQL"
+ use postgres && elog " QPSQL"
+ use sqlite && elog " QSQLITE3"
elog "${DRIVER} has been set as your default akonadi storage backend."
}
diff --git a/kde-apps/akonadi/akonadi-17.08.49..ebuild
b/kde-apps/akonadi/akonadi-17.08.49..ebuild
index 575f051e83..83e59f81c1 100644
--- a/kde-apps/akonadi/akonadi-17.08.49..ebuild
+++ b/kde-apps/akonadi/akonadi-17.08.49..ebuild
@@ -14,9 +14,9 @@ HOMEPAGE="https://pim.kde.org/akonadi";
KEYWORDS=""
LICENSE="LGPL-2.1+"
-IUSE="+mysql postgres tools xml"
+IUSE="+mysql postgres sqlite tools xml"
-REQUIRED_USE="|| ( mysql postgres ) test? ( tools )"
+REQUIRED_USE="|| ( mysql postgres sqlite ) test? ( tools )"
# drop qtgui subslot operator when QT_MINIMAL >= 5.9.0
COMMON_DEPEND="
@@ -41,6 +41,7 @@ COMMON_DEPEND="
$(add_qt_dep qtwidgets)
$(add_qt_dep qtxml)
x11-misc/shared-mime-info
+ sqlite? ( dev-db/sqlite:3 )
xml? ( dev-libs/libxml2 )
"
DEPEND="${COMMON_DEPEND}
@@ -61,16 +62,24 @@ RESTRICT+=" test"
PATCHES=( "${FILESDIR}/${PN}-17.03.80-mysql56-crash.patch" )
pkg_setup() {
- # Set default storage backend in order: MySQL, PostgreSQL
+ # Set default storage backend in order: MySQL, PostgreSQL, SQLite
# reverse driver check to keep the order
+ use sqlite && DRIVER="QSQLITE3"
use postgres && DRIVER="QPSQL"
use mysql && DRIVER="QMYSQL"
+
+ if use sqlite || has_version "<${CATEGORY}/${P}[sqlite]"; then
+ ewarn "We strongly recommend you change your Akonadi database
backend to either MySQL"
+ ewarn "or PostgreSQL in your user configuration."
+ ewarn "In particular, kde-apps/kmail does not work properly
with the sqlite backend."
+ fi
+
kde5_pkg_setup
}
src_configure() {
local mycmakeargs=(
- -DAKONADI_BUILD_QSQLITE=OFF
+ -DAKONADI_BUILD_QSQLITE=$(usex sqlite)
-DBUILD_TOOLS=$(usex tools)
$(cmake-utils_use_find_package xml LibXml2)
)
@@ -94,7 +103,8 @@ pkg_postinst() {
kde5_pkg_postinst
elo
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/
commit: 1253e0f0671412b16a920f9749dc2495681ad448
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Aug 12 12:30:36 2017 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Aug 12 12:30:36 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=1253e0f0
kde-apps/akonadi: Drop USE=sqlite, cleanup ebuild
Sync with tree.
Package-Manager: Portage-2.3.6, Repoman-2.3.3
kde-apps/akonadi/akonadi-17.08.0.ebuild | 52 +--
kde-apps/akonadi/akonadi-17.08.49..ebuild | 47 +++-
kde-apps/akonadi/akonadi-.ebuild | 47 +++-
3 files changed, 43 insertions(+), 103 deletions(-)
diff --git a/kde-apps/akonadi/akonadi-17.08.0.ebuild
b/kde-apps/akonadi/akonadi-17.08.0.ebuild
index 0994b20e33..c11ecfc98e 100644
--- a/kde-apps/akonadi/akonadi-17.08.0.ebuild
+++ b/kde-apps/akonadi/akonadi-17.08.0.ebuild
@@ -11,11 +11,12 @@ inherit kde5
DESCRIPTION="Storage service for PIM data and libraries for PIM apps"
HOMEPAGE="https://pim.kde.org/akonadi";
+
KEYWORDS="~amd64 ~arm ~x86"
LICENSE="LGPL-2.1+"
-IUSE="+mysql postgres sqlite tools xml"
+IUSE="+mysql postgres tools xml"
-REQUIRED_USE="|| ( sqlite mysql postgres ) test? ( tools )"
+REQUIRED_USE="|| ( mysql postgres ) test? ( tools )"
# drop qtgui subslot operator when QT_MINIMAL >= 5.9.0
COMMON_DEPEND="
@@ -40,7 +41,6 @@ COMMON_DEPEND="
$(add_qt_dep qtwidgets)
$(add_qt_dep qtxml)
x11-misc/shared-mime-info
- sqlite? ( dev-db/sqlite:3 )
xml? ( dev-libs/libxml2 )
"
DEPEND="${COMMON_DEPEND}
@@ -51,7 +51,10 @@ DEPEND="${COMMON_DEPEND}
RDEPEND="${COMMON_DEPEND}
!kde-apps/kdepim-l10n
!kde-apps/kdepimlibs
- mysql? ( virtual/mysql )
+ mysql? (
+ virtual/mysql
+ !>=dev-db/mariadb-10.2
+ )
postgres? ( dev-db/postgresql )
"
@@ -61,42 +64,18 @@ RESTRICT+=" test"
PATCHES=( "${FILESDIR}/${PN}-17.03.80-mysql56-crash.patch" )
pkg_setup() {
- # Set default storage backend in order: MySQL, SQLite PostgreSQL
+ # Set default storage backend in order: MySQL, PostgreSQL
# reverse driver check to keep the order
- if use postgres; then
- DRIVER="QPSQL"
- AVAILABLE+=" ${DRIVER}"
- fi
-
- if use sqlite; then
- DRIVER="QSQLITE3"
- AVAILABLE+=" ${DRIVER}"
- fi
-
- if use mysql; then
- DRIVER="QMYSQL"
- AVAILABLE+=" ${DRIVER}"
- fi
-
- # Notify about MySQL is recommend by upstream
- if use sqlite || has_version "<${CATEGORY}/${P}[sqlite]"; then
- ewarn
- ewarn "We strongly recommend you change your Akonadi database
backend to MySQL in your"
- ewarn "user configuration. This is the backend recommended by
KDE upstream."
- ewarn "In particular, kde-apps/kmail-4.10 does not work
properly with the sqlite"
- ewarn "backend anymore."
- ewarn "You can select the backend in your
~/.config/akonadi/akonadiserverrc."
- ewarn "Available drivers are:${AVAILABLE}"
- ewarn
- fi
+ use postgres && DRIVER="QPSQL"
+ use mysql && DRIVER="QMYSQL"
+ kde5_pkg_setup
}
src_configure() {
local mycmakeargs=(
- -DAKONADI_BUILD_QSQLITE=$(usex sqlite)
+ -DAKONADI_BUILD_QSQLITE=OFF
-DBUILD_TOOLS=$(usex tools)
$(cmake-utils_use_find_package xml LibXml2)
- -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
)
kde5_src_configure
@@ -115,7 +94,10 @@ EOF
}
pkg_postinst() {
+ kde5_pkg_postinst
+ elog "You can select the storage backend in
~/.config/akonadi/akonadiserverrc."
+ elog "Available drivers are:"
+ use postgres && elog " QPSQL"
+ use mysql && elog " QMYSQL"
elog "${DRIVER} has been set as your default akonadi storage backend."
- elog "You can override it in your ~/.config/akonadi/akonadiserverrc."
- elog "Available drivers are: ${AVAILABLE}"
}
diff --git a/kde-apps/akonadi/akonadi-17.08.49..ebuild
b/kde-apps/akonadi/akonadi-17.08.49..ebuild
index 0da9f2e8d0..575f051e83 100644
--- a/kde-apps/akonadi/akonadi-17.08.49..ebuild
+++ b/kde-apps/akonadi/akonadi-17.08.49..ebuild
@@ -11,11 +11,12 @@ inherit kde5
DESCRIPTION="Storage service for PIM data and libraries for PIM apps"
HOMEPAGE="https://pim.kde.org/akonadi";
+
KEYWORDS=""
LICENSE="LGPL-2.1+"
-IUSE="+mysql postgres sqlite tools xml"
+IUSE="+mysql postgres tools xml"
-REQUIRED_USE="|| ( sqlite mysql postgres ) test? ( tools )"
+REQUIRED_USE="|| ( mysql postgres ) test? ( tools )"
# drop qtgui subslot operator when QT_MINIMAL >= 5.9.0
COMMON_DEPEND="
@@ -40,7 +41,6 @@ COMMON_DEPEND="
$(add_qt_dep qtwidgets)
$(add_qt_dep qtxml)
x11-misc/shared-mime
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi-import-wizard/
commit: 722563f76a42f1b2a0673702e965cae627241a95 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Mar 21 02:30:27 2017 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Mar 21 02:30:27 2017 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=722563f7 kde-apps/akonadi-import-wizard: Drop unused DEPEND Package-Manager: Portage-2.3.3, Repoman-2.3.1 .../akonadi-import-wizard/akonadi-import-wizard-17.04.49..ebuild | 3 +-- kde-apps/akonadi-import-wizard/akonadi-import-wizard-.ebuild | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-17.04.49..ebuild b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-17.04.49..ebuild index e61eaba19d..2747971b71 100644 --- a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-17.04.49..ebuild +++ b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-17.04.49..ebuild @@ -13,7 +13,6 @@ KEYWORDS="" IUSE="" DEPEND=" - $(add_frameworks_dep kauth) $(add_frameworks_dep kcompletion) $(add_frameworks_dep kconfig) $(add_frameworks_dep kcoreaddons) @@ -27,10 +26,10 @@ DEPEND=" $(add_kdeapps_dep kcontacts) $(add_kdeapps_dep kidentitymanagement) $(add_kdeapps_dep kmailtransport) + $(add_kdeapps_dep libkdepim) $(add_kdeapps_dep mailcommon) $(add_kdeapps_dep mailimporter) $(add_kdeapps_dep messagelib) - $(add_kdeapps_dep libkdepim) $(add_kdeapps_dep pimcommon) $(add_qt_dep qtgui) $(add_qt_dep qtwidgets) diff --git a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-.ebuild b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-.ebuild index e61eaba19d..2747971b71 100644 --- a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-.ebuild +++ b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-.ebuild @@ -13,7 +13,6 @@ KEYWORDS="" IUSE="" DEPEND=" - $(add_frameworks_dep kauth) $(add_frameworks_dep kcompletion) $(add_frameworks_dep kconfig) $(add_frameworks_dep kcoreaddons) @@ -27,10 +26,10 @@ DEPEND=" $(add_kdeapps_dep kcontacts) $(add_kdeapps_dep kidentitymanagement) $(add_kdeapps_dep kmailtransport) + $(add_kdeapps_dep libkdepim) $(add_kdeapps_dep mailcommon) $(add_kdeapps_dep mailimporter) $(add_kdeapps_dep messagelib) - $(add_kdeapps_dep libkdepim) $(add_kdeapps_dep pimcommon) $(add_qt_dep qtgui) $(add_qt_dep qtwidgets)
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/files/, kde-apps/akonadi/
commit: 5997acdb424e5071c46b4b9fd42cb583b28fba45
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Feb 11 20:48:47 2017 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Feb 11 20:48:55 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=5997acdb
kde-apps/akonadi: Build akonadixml unconditionally
kde-apps/akonadiconsole depends on it.
Package-Manager: portage-2.3.3
kde-apps/akonadi/akonadi-16.12.49..ebuild | 4 +++-
kde-apps/akonadi/akonadi-.ebuild | 3 ++-
.../akonadi/files/akonadi-16.12.3-akonadixml.patch | 22 ++
3 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/kde-apps/akonadi/akonadi-16.12.49..ebuild
b/kde-apps/akonadi/akonadi-16.12.49..ebuild
index 74c041d5d5..c0f6dc55b7 100644
--- a/kde-apps/akonadi/akonadi-16.12.49..ebuild
+++ b/kde-apps/akonadi/akonadi-16.12.49..ebuild
@@ -42,7 +42,7 @@ COMMON_DEPEND="
$(add_qt_dep qtxml)
x11-misc/shared-mime-info
sqlite? ( dev-db/sqlite:3 )
- tools? ( xml? ( dev-libs/libxml2 ) )
+ xml? ( dev-libs/libxml2 )
"
DEPEND="${COMMON_DEPEND}
dev-libs/boost
@@ -62,6 +62,7 @@ PATCHES=(
"${FILESDIR}/${PN}-16.12.0-mysql56-crash.patch"
"${FILESDIR}/${PN}-16.12.1-revert-abs-path.patch"
"${FILESDIR}/${PN}-16.12.1-rename-header.patch"
+ "${FILESDIR}/${PN}-16.12.3-akonadixml.patch"
)
pkg_setup() {
@@ -99,6 +100,7 @@ src_configure() {
local mycmakeargs=(
-DAKONADI_BUILD_QSQLITE=$(usex sqlite)
-DBUILD_TOOLS=$(usex tools)
+ $(cmake-utils_use_find_package xml LibXml2)
-DKDE_INSTALL_USE_QT_SYS_PATHS=ON
)
diff --git a/kde-apps/akonadi/akonadi-.ebuild
b/kde-apps/akonadi/akonadi-.ebuild
index 91792b8665..744cc3ac40 100644
--- a/kde-apps/akonadi/akonadi-.ebuild
+++ b/kde-apps/akonadi/akonadi-.ebuild
@@ -42,7 +42,7 @@ COMMON_DEPEND="
$(add_qt_dep qtxml)
x11-misc/shared-mime-info
sqlite? ( dev-db/sqlite:3 )
- tools? ( xml? ( dev-libs/libxml2 ) )
+ xml? ( dev-libs/libxml2 )
"
DEPEND="${COMMON_DEPEND}
dev-libs/boost
@@ -95,6 +95,7 @@ src_configure() {
local mycmakeargs=(
-DAKONADI_BUILD_QSQLITE=$(usex sqlite)
-DBUILD_TOOLS=$(usex tools)
+ $(cmake-utils_use_find_package xml LibXml2)
-DKDE_INSTALL_USE_QT_SYS_PATHS=ON
)
diff --git a/kde-apps/akonadi/files/akonadi-16.12.3-akonadixml.patch
b/kde-apps/akonadi/files/akonadi-16.12.3-akonadixml.patch
new file mode 100644
index 00..6acd5b86dc
--- /dev/null
+++ b/kde-apps/akonadi/files/akonadi-16.12.3-akonadixml.patch
@@ -0,0 +1,22 @@
+commit 2fe8bf8b73b9f5f5d19c87099b71a71f2595e70f
+Author: Andreas Sturmlechner
+Date: Sat Feb 11 21:29:05 2017 +0100
+
+Build akonadixml unconditionally
+
+It makes more sense now that akonadiconsole depends on it.
+
+REVIEW: 129941
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 4141947..4e79dc0 100644
+--- a/src/CMakeLists.txt
b/src/CMakeLists.txt
+@@ -16,6 +16,4 @@ add_subdirectory(core)
+ add_subdirectory(agentbase)
+ add_subdirectory(widgets)
+ add_subdirectory(selftest)
+-if(BUILD_TOOLS)
+-add_subdirectory(xml)
+-endif()
++add_subdirectory(xml)
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/files/, kde-apps/akonadi/
commit: a8464c31b62cdd678b50ac0a81c0c6773f53a355
Author: Elias Probst eliasprobst eu>
AuthorDate: Sat Jan 7 21:34:30 2017 +
Commit: Johannes Huber gentoo org>
CommitDate: Sun Jan 8 11:15:56 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=a8464c31
kde-apps/akonadi: Update MySQL 5.6 crash patch
Upstream changed the code style in master/ddf0db43
Package-Manager: Portage-2.3.0, Repoman-2.3.1
Closes: https://github.com/gentoo/kde/pull/853
Signed-off-by: Johannes Huber gentoo.org>
kde-apps/akonadi/akonadi-.ebuild | 2 +-
.../files/akonadi-17.03.80-mysql56-crash.patch | 40 ++
2 files changed, 41 insertions(+), 1 deletion(-)
diff --git a/kde-apps/akonadi/akonadi-.ebuild
b/kde-apps/akonadi/akonadi-.ebuild
index 8ae3948..91792b8 100644
--- a/kde-apps/akonadi/akonadi-.ebuild
+++ b/kde-apps/akonadi/akonadi-.ebuild
@@ -58,7 +58,7 @@ RDEPEND="${COMMON_DEPEND}
# some akonadi tests time out, that probably needs more work as it's ~700 tests
RESTRICT+=" test"
-PATCHES=( "${FILESDIR}/${PN}-16.12.0-mysql56-crash.patch" )
+PATCHES=( "${FILESDIR}/${PN}-17.03.80-mysql56-crash.patch" )
pkg_setup() {
# Set default storage backend in order: MySQL, SQLite PostgreSQL
diff --git a/kde-apps/akonadi/files/akonadi-17.03.80-mysql56-crash.patch
b/kde-apps/akonadi/files/akonadi-17.03.80-mysql56-crash.patch
new file mode 100644
index 000..0b5e381
--- /dev/null
+++ b/kde-apps/akonadi/files/akonadi-17.03.80-mysql56-crash.patch
@@ -0,0 +1,40 @@
+Gentoo-bug: 530012
+
+diff --git a/src/server/storage/dbconfigmysql.cpp
b/src/server/storage/dbconfigmysql.cpp
+index 50421714d..dfae09c20 100644
+--- a/src/server/storage/dbconfigmysql.cpp
b/src/server/storage/dbconfigmysql.cpp
+@@ -81,6 +81,7 @@ bool DbConfigMysql::init(QSettings &settings)
+ << QStringLiteral("/usr/local/sbin")
+ <<
QStringLiteral("/usr/local/libexec")
+ << QStringLiteral("/usr/libexec")
++ <<
QStringLiteral("/usr/share/mysql/scripts")
+ <<
QStringLiteral("/opt/mysql/libexec")
+ <<
QStringLiteral("/opt/local/lib/mysql5/bin")
+ << QStringLiteral("/opt/mysql/sbin");
+@@ -511,7 +512,7 @@ bool DbConfigMysql::initializeMariaDBDatabase(const
QString &confFile, const QSt
+ return 0 == execute(mMysqlInstallDbPath, {
+ QStringLiteral("--defaults-file=%1").arg(confFile),
+ QStringLiteral("--force"),
+-QStringLiteral("--basedir=%1").arg(baseDir),
++QStringLiteral("--basedir=/usr"),
+ QStringLiteral("--datadir=%1/").arg(dataDir)
+ });
+ }
+@@ -525,6 +526,7 @@ bool DbConfigMysql::initializeMySQL5_7_6Database(const
QString &confFile, const
+ return 0 == execute(mMysqldPath, {
+ QStringLiteral("--defaults-file=%1").arg(confFile),
+ QStringLiteral("--initialize"),
++QStringLiteral("--basedir=/usr"),
+ QStringLiteral("--datadir=%1/").arg(dataDir)
+ });
+ }
+@@ -539,7 +541,7 @@ bool DbConfigMysql::initializeMySQLDatabase(const QString
&confFile, const QStri
+ // Don't use --force, it has been removed in MySQL 5.7.5
+ return 0 == execute(mMysqlInstallDbPath, {
+ QStringLiteral("--defaults-file=%1").arg(confFile),
+-QStringLiteral("--basedir=%1").arg(baseDir),
++QStringLiteral("--basedir=/usr"),
+ QStringLiteral("--datadir=%1/").arg(dataDir)
+ });
+ }
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/, kde-apps/akonadi/files/
commit: a345b0125e742258af851925482b72336e76317c
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Jan 7 23:06:55 2017 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Jan 7 23:06:55 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=a345b012
kde-apps/akonadi: Remove hardcoded absolute path to stdlib header
This breaks on any GCC upgrade.
Package-Manager: portage-2.3.0
kde-apps/akonadi/akonadi-16.12.49..ebuild | 6 +-
.../files/akonadi-16.12.1-rename-header.patch | 77 ++
.../files/akonadi-16.12.1-revert-abs-path.patch| 70
3 files changed, 152 insertions(+), 1 deletion(-)
diff --git a/kde-apps/akonadi/akonadi-16.12.49..ebuild
b/kde-apps/akonadi/akonadi-16.12.49..ebuild
index 8ae3948..74c041d 100644
--- a/kde-apps/akonadi/akonadi-16.12.49..ebuild
+++ b/kde-apps/akonadi/akonadi-16.12.49..ebuild
@@ -58,7 +58,11 @@ RDEPEND="${COMMON_DEPEND}
# some akonadi tests time out, that probably needs more work as it's ~700 tests
RESTRICT+=" test"
-PATCHES=( "${FILESDIR}/${PN}-16.12.0-mysql56-crash.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-16.12.0-mysql56-crash.patch"
+ "${FILESDIR}/${PN}-16.12.1-revert-abs-path.patch"
+ "${FILESDIR}/${PN}-16.12.1-rename-header.patch"
+)
pkg_setup() {
# Set default storage backend in order: MySQL, SQLite PostgreSQL
diff --git a/kde-apps/akonadi/files/akonadi-16.12.1-rename-header.patch
b/kde-apps/akonadi/files/akonadi-16.12.1-rename-header.patch
new file mode 100644
index 000..73347f0
--- /dev/null
+++ b/kde-apps/akonadi/files/akonadi-16.12.1-rename-header.patch
@@ -0,0 +1,77 @@
+commit 248671e8200ff0883877b6d0e56700ef99ff3b51
+Author: Andreas Sturmlechner
+Date: Sat Jan 7 14:38:17 2017 +0100
+
+Rename exception.h to exceptionbase.h
+
+REVIEW: 129788
+
+diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
+index 6ac851e..fa996b9 100644
+--- a/src/core/CMakeLists.txt
b/src/core/CMakeLists.txt
+@@ -95,7 +95,7 @@ ecm_generate_headers(AkonadiCore_base_HEADERS
+ EntityDeletedAttribute
+ EntityDisplayAttribute
+ EntityHiddenAttribute
+-Exception
++ExceptionBase
+ GidExtractorInterface
+ IndexPolicyAttribute
+ Item
+diff --git a/src/core/exception.cpp b/src/core/exception.cpp
+index f229c1a..14f7330 100644
+--- a/src/core/exception.cpp
b/src/core/exception.cpp
+@@ -17,7 +17,7 @@
+ 02110-1301, USA.
+ */
+
+-#include "exception.h"
++#include "exceptionbase.h"
+
+ #include
+
+diff --git a/src/core/exception.h b/src/core/exceptionbase.h
+similarity index 100%
+rename from src/core/exception.h
+rename to src/core/exceptionbase.h
+diff --git a/src/core/item.h b/src/core/item.h
+index de71cad..5ec62c8 100644
+--- a/src/core/item.h
b/src/core/item.h
+@@ -23,7 +23,7 @@
+
+ #include "akonadicore_export.h"
+ #include "attribute.h"
+-#include "exception.h"
++#include "exceptionbase.h"
+ #include "tag.h"
+ #include "collection.h"
+ #include "relation.h"
+diff --git a/src/core/itempayloadinternals_p.h
b/src/core/itempayloadinternals_p.h
+index 0a4de3c..1626f10 100644
+--- a/src/core/itempayloadinternals_p.h
b/src/core/itempayloadinternals_p.h
+@@ -32,7 +32,7 @@
+
+ #include
+
+-#include "exception.h"
++#include "exceptionbase.h"
+
+ //@cond PRIVATE Doxygen 1.7.1 hangs processing this file. so skip it.
+ //for more info, see https://bugzilla.gnome.org/show_bug.cgi?id=531637
+diff --git a/src/core/protocolhelper.cpp b/src/core/protocolhelper.cpp
+index f740e9d..c218f0c 100644
+--- a/src/core/protocolhelper.cpp
b/src/core/protocolhelper.cpp
+@@ -23,7 +23,7 @@
+ #include "collectionstatistics.h"
+ #include "item_p.h"
+ #include "collection_p.h"
+-#include "exception.h"
++#include "exceptionbase.h"
+ #include "itemserializer_p.h"
+ #include "itemserializerplugin.h"
+ #include "servermanager.h"
diff --git a/kde-apps/akonadi/files/akonadi-16.12.1-revert-abs-path.patch
b/kde-apps/akonadi/files/akonadi-16.12.1-revert-abs-path.patch
new file mode 100644
index 000..3b48253
--- /dev/null
+++ b/kde-apps/akonadi/files/akonadi-16.12.1-revert-abs-path.patch
@@ -0,0 +1,70 @@
+commit d98e29a07f4acc3bf01f06f25b3eef5522397e2e
+Author: Andreas Sturmlechner
+Date: Thu Jan 5 22:41:02 2017 +0100
+
+Revert "Workaround an include loop on case-insensitive systems"
+
+Do not hardcode absolute patchs to GCC headers.
+
+This reverts commit 59b9d6b79425c9ec1e5df059a2593580048c4adf.
+
+REVIEW: 129788
+
+diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
+index 72589cd..6ac851e 100644
+--- a/src/core/CMakeLists.txt
b/src/core/CMakeLists.txt
+@@ -257,21 +257,6 @@ ecm_generate_headers(AkonadiCore_jobs_HEADERS
+ RELATIVE jobs
+ )
+
+-# This is a workaround for conflict between our "Exception" fancy header and
+-# C++ stdlib's "exception" header which occurs in case-insensitive systems.
+-# For that reason we gen
