[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/
@ 2020-02-23 14:57 Andreas Sturmlechner
  0 siblings, 0 replies; 38+ messages in thread
From: Andreas Sturmlechner @ 2020-02-23 14:57 UTC (permalink / raw
  To: gentoo-commits

commit:     624bf63046891b21e0034672213c6ed2efc3d8a3
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 23 14:54:01 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 23 14:54:01 2020 +0000
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 <asturm <AT> gentoo.org>

 kde-apps/akonadi/akonadi-9999.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/kde-apps/akonadi/akonadi-9999.ebuild b/kde-apps/akonadi/akonadi-9999.ebuild
index 6f8339e324..232484180b 100644
--- a/kde-apps/akonadi/akonadi-9999.ebuild
+++ b/kde-apps/akonadi/akonadi-9999.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


^ permalink raw reply related	[flat|nested] 38+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/
@ 2024-11-09 17:34 Andreas Sturmlechner
  0 siblings, 0 replies; 38+ messages in thread
From: Andreas Sturmlechner @ 2024-11-09 17:34 UTC (permalink / raw
  To: gentoo-commits

commit:     1eb36fc5de4b81b7a5c8d4f1aafcc783b8b16c15
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 12 13:38:51 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Nov  9 17:33:58 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=1eb36fc5

kde-apps/akonadi: Drop IUSE mysql,postgres,sqlite and akonadiserverrc

Moved to kde-apps/akonadi-config. These flags were never ticking build
system arguments to begin with.

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-apps/akonadi/akonadi-9999.ebuild | 41 ++++--------------------------------
 1 file changed, 4 insertions(+), 37 deletions(-)

diff --git a/kde-apps/akonadi/akonadi-9999.ebuild b/kde-apps/akonadi/akonadi-9999.ebuild
index acce748709..b5c930ac73 100644
--- a/kde-apps/akonadi/akonadi-9999.ebuild
+++ b/kde-apps/akonadi/akonadi-9999.ebuild
@@ -17,16 +17,16 @@ HOMEPAGE="https://community.kde.org/KDE_PIM/akonadi"
 LICENSE="LGPL-2.1+"
 SLOT="6"
 KEYWORDS=""
-IUSE="+mysql postgres sqlite tools +webengine xml"
+IUSE="tools +webengine xml"
 
-REQUIRED_USE="|| ( mysql postgres sqlite ) test? ( tools )"
+REQUIRED_USE="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/qtbase-${QTMIN}:6[dbus,gui,mysql?,network,postgres?,sql,sqlite?,widgets,xml]
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,sql,widgets,xml]
 	>=kde-frameworks/kconfig-${KFMIN}:6
 	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
 	>=kde-frameworks/kcoreaddons-${KFMIN}:6
@@ -47,20 +47,9 @@ DEPEND="${COMMON_DEPEND}
 	test? ( sys-apps/dbus )
 "
 RDEPEND="${COMMON_DEPEND}
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql )
+	kde-apps/akonadi-config
 "
 
-pkg_setup() {
-	# Set default storage backend in order: MySQL, PostgreSQL, SQLite
-	# reverse driver check to keep the order
-	use sqlite && DRIVER="QSQLITE"
-	use postgres && DRIVER="QPSQL"
-	use mysql && DRIVER="QMYSQL"
-
-	ecm_pkg_setup
-}
-
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_TOOLS=$(usex tools)
@@ -71,25 +60,3 @@ src_configure() {
 
 	ecm_src_configure
 }
-
-src_install() {
-	# Who knows, maybe it accidentally fixes our permission issues
-	cat <<-EOF > "${T}"/akonadiserverrc
-[%General]
-Driver=${DRIVER}
-EOF
-	insinto /usr/share/config/akonadi
-	doins "${T}"/akonadiserverrc
-
-	ecm_src_install
-}
-
-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 postgres && elog "  QPSQL"
-	use sqlite && elog "  QSQLITE"
-	elog "${DRIVER} has been set as your default akonadi storage backend."
-}


^ permalink raw reply related	[flat|nested] 38+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/
@ 2024-10-04 21:55 Andreas Sturmlechner
  0 siblings, 0 replies; 38+ messages in thread
From: Andreas Sturmlechner @ 2024-10-04 21:55 UTC (permalink / raw
  To: gentoo-commits

commit:     e6963ac3b817e40adcf5a9af3b8be96f701abe86
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  4 18:58:02 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Oct  4 21:54:48 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=e6963ac3

kde-apps/akonadi: Prepare for IUSE qt6 USEdep droppage

... in net-libs/accounts-qt

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-apps/akonadi/akonadi-24.08.49.9999.ebuild | 2 +-
 kde-apps/akonadi/akonadi-9999.ebuild          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kde-apps/akonadi/akonadi-24.08.49.9999.ebuild b/kde-apps/akonadi/akonadi-24.08.49.9999.ebuild
index 5cc8c86811..04bb428e58 100644
--- a/kde-apps/akonadi/akonadi-24.08.49.9999.ebuild
+++ b/kde-apps/akonadi/akonadi-24.08.49.9999.ebuild
@@ -38,7 +38,7 @@ COMMON_DEPEND="
 	>=kde-frameworks/kxmlgui-${KFMIN}:6
 	webengine? (
 		kde-apps/kaccounts-integration:6
-		>=net-libs/accounts-qt-1.16_p20220803[qt6]
+		>=net-libs/accounts-qt-1.17[qt6(+)]
 	)
 	xml? ( dev-libs/libxml2 )
 "

diff --git a/kde-apps/akonadi/akonadi-9999.ebuild b/kde-apps/akonadi/akonadi-9999.ebuild
index 5cc8c86811..04bb428e58 100644
--- a/kde-apps/akonadi/akonadi-9999.ebuild
+++ b/kde-apps/akonadi/akonadi-9999.ebuild
@@ -38,7 +38,7 @@ COMMON_DEPEND="
 	>=kde-frameworks/kxmlgui-${KFMIN}:6
 	webengine? (
 		kde-apps/kaccounts-integration:6
-		>=net-libs/accounts-qt-1.16_p20220803[qt6]
+		>=net-libs/accounts-qt-1.17[qt6(+)]
 	)
 	xml? ( dev-libs/libxml2 )
 "


^ permalink raw reply related	[flat|nested] 38+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/
@ 2024-07-01 19:10 Andreas Sturmlechner
  0 siblings, 0 replies; 38+ messages in thread
From: Andreas Sturmlechner @ 2024-07-01 19:10 UTC (permalink / raw
  To: gentoo-commits

commit:     b0834fee82a09403cccb3351a2d15531e098b37a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 30 10:20:54 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jul  1 18:42:38 2024 +0000
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 <asturm <AT> gentoo.org>

 kde-apps/akonadi/akonadi-24.05.49.9999.ebuild | 8 ++++----
 kde-apps/akonadi/akonadi-9999.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.9999.ebuild b/kde-apps/akonadi/akonadi-24.05.49.9999.ebuild
index 4e486ebcef..6b18fe18c3 100644
--- a/kde-apps/akonadi/akonadi-24.05.49.9999.ebuild
+++ b/kde-apps/akonadi/akonadi-24.05.49.9999.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-9999.ebuild b/kde-apps/akonadi/akonadi-9999.ebuild
index 4e486ebcef..6b18fe18c3 100644
--- a/kde-apps/akonadi/akonadi-9999.ebuild
+++ b/kde-apps/akonadi/akonadi-9999.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 @@
 	</upstream>
 	<use>
 		<flag name="designer">Install plugin for <pkg>dev-qt/designer</pkg></flag>
-		<flag name="kaccounts">Enable support for system-wide defined KAccounts</flag>
 		<flag name="tools">Install tools for developers and testing</flag>
+		<flag name="webengine">Enable support for system-wide defined KAccounts</flag>
 	</use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 38+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/
@ 2024-05-17 19:50 Andreas Sturmlechner
  0 siblings, 0 replies; 38+ messages in thread
From: Andreas Sturmlechner @ 2024-05-17 19:50 UTC (permalink / raw
  To: gentoo-commits

commit:     319ee1e71e62c8182f9038ac6d2d550538445a2e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri May 17 19:14:26 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri May 17 19:14:26 2024 +0000
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 <asturm <AT> gentoo.org>

 kde-apps/akonadi/akonadi-24.04.90.ebuild      | 1 -
 kde-apps/akonadi/akonadi-24.05.49.9999.ebuild | 1 -
 kde-apps/akonadi/akonadi-9999.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.9999.ebuild b/kde-apps/akonadi/akonadi-24.05.49.9999.ebuild
index 2716368949..8eaacb90ff 100644
--- a/kde-apps/akonadi/akonadi-24.05.49.9999.ebuild
+++ b/kde-apps/akonadi/akonadi-24.05.49.9999.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-9999.ebuild b/kde-apps/akonadi/akonadi-9999.ebuild
index 2716368949..8eaacb90ff 100644
--- a/kde-apps/akonadi/akonadi-9999.ebuild
+++ b/kde-apps/akonadi/akonadi-9999.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


^ permalink raw reply related	[flat|nested] 38+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/
@ 2023-12-19 22:00 Andreas Sturmlechner
  0 siblings, 0 replies; 38+ messages in thread
From: Andreas Sturmlechner @ 2023-12-19 22:00 UTC (permalink / raw
  To: gentoo-commits

commit:     4ec5a1df2f9532be71795379eacff396d5cefd97
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 19 21:41:37 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Dec 19 21:41:37 2023 +0000
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 <asturm <AT> gentoo.org>

 kde-apps/akonadi/akonadi-23.08.49.9999.ebuild | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/kde-apps/akonadi/akonadi-23.08.49.9999.ebuild b/kde-apps/akonadi/akonadi-23.08.49.9999.ebuild
index b6773b0863..76e8350b73 100644
--- a/kde-apps/akonadi/akonadi-23.08.49.9999.ebuild
+++ b/kde-apps/akonadi/akonadi-23.08.49.9999.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 )


^ permalink raw reply related	[flat|nested] 38+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/
@ 2023-12-19 12:34 Andreas Sturmlechner
  0 siblings, 0 replies; 38+ messages in thread
From: Andreas Sturmlechner @ 2023-12-19 12:34 UTC (permalink / raw
  To: gentoo-commits

commit:     06244f9438f7964f419644f45d5873f401cb0a1b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 19 12:33:46 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Dec 19 12:34:35 2023 +0000
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 <asturm <AT> gentoo.org>

 kde-apps/akonadi/akonadi-9999.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kde-apps/akonadi/akonadi-9999.ebuild b/kde-apps/akonadi/akonadi-9999.ebuild
index d0f41f29e6..e32bae9a85 100644
--- a/kde-apps/akonadi/akonadi-9999.ebuild
+++ b/kde-apps/akonadi/akonadi-9999.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)
 	)


^ permalink raw reply related	[flat|nested] 38+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/
@ 2023-12-18 21:30 Andreas Sturmlechner
  0 siblings, 0 replies; 38+ messages in thread
From: Andreas Sturmlechner @ 2023-12-18 21:30 UTC (permalink / raw
  To: gentoo-commits

commit:     e5c8003a60fb57dad72674a1c5c765c963af223d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 18 20:03:01 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Dec 18 20:03:01 2023 +0000
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 <asturm <AT> gentoo.org>

 kde-apps/akonadi/akonadi-23.08.49.9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-apps/akonadi/akonadi-23.08.49.9999.ebuild b/kde-apps/akonadi/akonadi-23.08.49.9999.ebuild
index 13fb6fa5e9..b6773b0863 100644
--- a/kde-apps/akonadi/akonadi-23.08.49.9999.ebuild
+++ b/kde-apps/akonadi/akonadi-23.08.49.9999.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 )
 "


^ permalink raw reply related	[flat|nested] 38+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/
@ 2023-08-06 20:39 Andreas Sturmlechner
  0 siblings, 0 replies; 38+ messages in thread
From: Andreas Sturmlechner @ 2023-08-06 20:39 UTC (permalink / raw
  To: gentoo-commits

commit:     c322b60f4811cf3892eeb9ef81ccb1460e5af8a8
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  6 17:43:40 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Aug  6 17:48:11 2023 +0000
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 <asturm <AT> gentoo.org>

 kde-apps/akonadi/akonadi-9999.ebuild | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/kde-apps/akonadi/akonadi-9999.ebuild b/kde-apps/akonadi/akonadi-9999.ebuild
index 92f8881503..13fb6fa5e9 100644
--- a/kde-apps/akonadi/akonadi-9999.ebuild
+++ b/kde-apps/akonadi/akonadi-9999.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


^ permalink raw reply related	[flat|nested] 38+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/
@ 2021-11-15 10:59 Andreas Sturmlechner
  0 siblings, 0 replies; 38+ messages in thread
From: Andreas Sturmlechner @ 2021-11-15 10:59 UTC (permalink / raw
  To: gentoo-commits

commit:     bac6af34c17372e195bfe42b1905e7e688453d09
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 15 10:03:22 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Nov 15 10:03:22 2021 +0000
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 <asturm <AT> gentoo.org>

 kde-apps/akonadi/akonadi-9999.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kde-apps/akonadi/akonadi-9999.ebuild b/kde-apps/akonadi/akonadi-9999.ebuild
index 62404a1cb6..155de15150 100644
--- a/kde-apps/akonadi/akonadi-9999.ebuild
+++ b/kde-apps/akonadi/akonadi-9999.ebuild
@@ -4,6 +4,7 @@
 EAPI=8
 
 ECM_DESIGNERPLUGIN="true"
+ECM_QTHELP="true"
 ECM_TEST="forceoptional"
 KFMIN=5.85.0
 QTMIN=5.15.2


^ permalink raw reply related	[flat|nested] 38+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/
@ 2021-02-16 22:48 Andreas Sturmlechner
  0 siblings, 0 replies; 38+ messages in thread
From: Andreas Sturmlechner @ 2021-02-16 22:48 UTC (permalink / raw
  To: gentoo-commits

commit:     b555756d45fff488bc600669bb655aa027b89bb8
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 16 22:25:09 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Feb 16 22:47:30 2021 +0000
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 <stkaopen <AT> gmx.at>
Thanks-to: Victor Mataré <vmatare+gbug <AT> posteo.de>
Thanks-to: Thomas Deutschmann <whissi <AT> gentoo.org>
Bug: https://bugs.gentoo.org/709812
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-apps/akonadi/akonadi-20.12.49.9999.ebuild | 34 ++++++++++-----------------
 kde-apps/akonadi/akonadi-9999.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.9999.ebuild b/kde-apps/akonadi/akonadi-20.12.49.9999.ebuild
index e7d3dad598..49786040c9 100644
--- a/kde-apps/akonadi/akonadi-20.12.49.9999.ebuild
+++ b/kde-apps/akonadi/akonadi-20.12.49.9999.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 "  QSQLITE3"
 	elog "${DRIVER} has been set as your default akonadi storage backend."

diff --git a/kde-apps/akonadi/akonadi-9999.ebuild b/kde-apps/akonadi/akonadi-9999.ebuild
index 3320293e8a..f7739ae681 100644
--- a/kde-apps/akonadi/akonadi-9999.ebuild
+++ b/kde-apps/akonadi/akonadi-9999.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}-21.03.80-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 "  QSQLITE3"
 	elog "${DRIVER} has been set as your default akonadi storage backend."

diff --git a/kde-apps/akonadi/metadata.xml b/kde-apps/akonadi/metadata.xml
index c6b73ba5cf..8acbee94c7 100644
--- a/kde-apps/akonadi/metadata.xml
+++ b/kde-apps/akonadi/metadata.xml
@@ -8,7 +8,6 @@
 	<use>
 		<flag name="designer">Install plugin for <pkg>dev-qt/designer</pkg></flag>
 		<flag name="kaccounts">Enable support for system-wide defined KAccounts</flag>
-		<flag name="mariadb">Enable support for using <pkg>dev-db/mariadb</pkg> storage backend</flag>
 		<flag name="tools">Install tools for developers and testing</flag>
 	</use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 38+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/
@ 2021-02-15 14:39 Andreas Sturmlechner
  0 siblings, 0 replies; 38+ messages in thread
From: Andreas Sturmlechner @ 2021-02-15 14:39 UTC (permalink / raw
  To: gentoo-commits

commit:     b587a500eea0b119ca5dbc26472c43a9c354883e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 15 11:48:32 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Feb 15 14:12:55 2021 +0000
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 <asturm <AT> gentoo.org>

 kde-apps/akonadi/akonadi-20.12.49.9999.ebuild | 3 +--
 kde-apps/akonadi/akonadi-9999.ebuild          | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/kde-apps/akonadi/akonadi-20.12.49.9999.ebuild b/kde-apps/akonadi/akonadi-20.12.49.9999.ebuild
index c493b65d7e..e7d3dad598 100644
--- a/kde-apps/akonadi/akonadi-20.12.49.9999.ebuild
+++ b/kde-apps/akonadi/akonadi-20.12.49.9999.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-9999.ebuild b/kde-apps/akonadi/akonadi-9999.ebuild
index c493b65d7e..e7d3dad598 100644
--- a/kde-apps/akonadi/akonadi-9999.ebuild
+++ b/kde-apps/akonadi/akonadi-9999.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] )


^ permalink raw reply related	[flat|nested] 38+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/
@ 2021-02-04 13:16 Andreas Sturmlechner
  0 siblings, 0 replies; 38+ messages in thread
From: Andreas Sturmlechner @ 2021-02-04 13:16 UTC (permalink / raw
  To: gentoo-commits

commit:     23ca1542bee46f67c22de5406d425e2a48178966
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jan  7 17:34:38 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb  4 12:57:57 2021 +0000
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 <asturm <AT> gentoo.org>

 kde-apps/akonadi/akonadi-20.12.2.ebuild       | 2 +-
 kde-apps/akonadi/akonadi-20.12.49.9999.ebuild | 2 +-
 kde-apps/akonadi/akonadi-9999.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.9999.ebuild b/kde-apps/akonadi/akonadi-20.12.49.9999.ebuild
index 501b68dfba..c493b65d7e 100644
--- a/kde-apps/akonadi/akonadi-20.12.49.9999.ebuild
+++ b/kde-apps/akonadi/akonadi-20.12.49.9999.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-9999.ebuild b/kde-apps/akonadi/akonadi-9999.ebuild
index 501b68dfba..c493b65d7e 100644
--- a/kde-apps/akonadi/akonadi-9999.ebuild
+++ b/kde-apps/akonadi/akonadi-9999.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"


^ permalink raw reply related	[flat|nested] 38+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/
@ 2020-12-25 21:51 Andreas Sturmlechner
  0 siblings, 0 replies; 38+ messages in thread
From: Andreas Sturmlechner @ 2020-12-25 21:51 UTC (permalink / raw
  To: gentoo-commits

commit:     6b90510ab328d1bdbba167d9ccd4c6ba0cb4bfed
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 25 21:36:01 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Dec 25 21:41:15 2020 +0000
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 <asturm <AT> gentoo.org>

 kde-apps/akonadi/akonadi-20.12.49.9999.ebuild | 30 +++++++++++++++++----------
 kde-apps/akonadi/akonadi-9999.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.9999.ebuild b/kde-apps/akonadi/akonadi-20.12.49.9999.ebuild
index f452132cba..71e0c4e882 100644
--- a/kde-apps/akonadi/akonadi-20.12.49.9999.ebuild
+++ b/kde-apps/akonadi/akonadi-20.12.49.9999.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-9999.ebuild b/kde-apps/akonadi/akonadi-9999.ebuild
index f452132cba..71e0c4e882 100644
--- a/kde-apps/akonadi/akonadi-9999.ebuild
+++ b/kde-apps/akonadi/akonadi-9999.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/metadata.xml b/kde-apps/akonadi/metadata.xml
index 8acbee94c7..c6b73ba5cf 100644
--- a/kde-apps/akonadi/metadata.xml
+++ b/kde-apps/akonadi/metadata.xml
@@ -8,6 +8,7 @@
 	<use>
 		<flag name="designer">Install plugin for <pkg>dev-qt/designer</pkg></flag>
 		<flag name="kaccounts">Enable support for system-wide defined KAccounts</flag>
+		<flag name="mariadb">Enable support for using <pkg>dev-db/mariadb</pkg> storage backend</flag>
 		<flag name="tools">Install tools for developers and testing</flag>
 	</use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 38+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/
@ 2020-10-10 21:39 Andreas Sturmlechner
  0 siblings, 0 replies; 38+ messages in thread
From: Andreas Sturmlechner @ 2020-10-10 21:39 UTC (permalink / raw
  To: gentoo-commits

commit:     9f23b65c831d367efb7d38673a51f8078cdb1864
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 10 20:52:43 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Oct 10 20:52:43 2020 +0000
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 <asturm <AT> gentoo.org>

 kde-apps/akonadi/akonadi-9999.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kde-apps/akonadi/akonadi-9999.ebuild b/kde-apps/akonadi/akonadi-9999.ebuild
index 6f2bd42d16..2a2169962b 100644
--- a/kde-apps/akonadi/akonadi-9999.ebuild
+++ b/kde-apps/akonadi/akonadi-9999.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


^ permalink raw reply related	[flat|nested] 38+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/
@ 2020-09-28 21:26 Andreas Sturmlechner
  0 siblings, 0 replies; 38+ messages in thread
From: Andreas Sturmlechner @ 2020-09-28 21:26 UTC (permalink / raw
  To: gentoo-commits

commit:     c71bd7f74932791555a2184ab855925783a5c58b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 28 21:23:21 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Sep 28 21:23:26 2020 +0000
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 <asturm <AT> gentoo.org>

 kde-apps/akonadi/akonadi-20.08.49.9999.ebuild | 2 +-
 kde-apps/akonadi/akonadi-9999.ebuild          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kde-apps/akonadi/akonadi-20.08.49.9999.ebuild b/kde-apps/akonadi/akonadi-20.08.49.9999.ebuild
index fe36dd49d4..d1e5d5e595 100644
--- a/kde-apps/akonadi/akonadi-20.08.49.9999.ebuild
+++ b/kde-apps/akonadi/akonadi-20.08.49.9999.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-9999.ebuild b/kde-apps/akonadi/akonadi-9999.ebuild
index b2f8e00e47..6f2bd42d16 100644
--- a/kde-apps/akonadi/akonadi-9999.ebuild
+++ b/kde-apps/akonadi/akonadi-9999.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 )"


^ permalink raw reply related	[flat|nested] 38+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/
@ 2019-12-12 18:22 Andreas Sturmlechner
  0 siblings, 0 replies; 38+ messages in thread
From: Andreas Sturmlechner @ 2019-12-12 18:22 UTC (permalink / raw
  To: gentoo-commits

commit:     08ce1d718d494f6daf046cee6e1f747722fb1a4e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 11 19:10:23 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Dec 12 18:13:07 2019 +0000
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 <asturm <AT> gentoo.org>

 kde-apps/akonadi/akonadi-9999.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/kde-apps/akonadi/akonadi-9999.ebuild b/kde-apps/akonadi/akonadi-9999.ebuild
index 67819868e3..353eafc9b5 100644
--- a/kde-apps/akonadi/akonadi-9999.ebuild
+++ b/kde-apps/akonadi/akonadi-9999.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


^ permalink raw reply related	[flat|nested] 38+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/
@ 2019-11-25  0:21 Andreas Sturmlechner
  0 siblings, 0 replies; 38+ messages in thread
From: Andreas Sturmlechner @ 2019-11-25  0:21 UTC (permalink / raw
  To: gentoo-commits

commit:     7b8207bae2020409f3d74ab00c40e85730e3d599
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 24 23:57:36 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Nov 24 23:57:36 2019 +0000
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 <asturm <AT> gentoo.org>

 kde-apps/akonadi/akonadi-19.12.49.9999.ebuild | 12 ++++++------
 kde-apps/akonadi/akonadi-9999.ebuild          | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/kde-apps/akonadi/akonadi-19.12.49.9999.ebuild b/kde-apps/akonadi/akonadi-19.12.49.9999.ebuild
index 0b331053c3..41834cf81f 100644
--- a/kde-apps/akonadi/akonadi-19.12.49.9999.ebuild
+++ b/kde-apps/akonadi/akonadi-19.12.49.9999.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-9999.ebuild b/kde-apps/akonadi/akonadi-9999.ebuild
index 2d6cbb4a9d..67819868e3 100644
--- a/kde-apps/akonadi/akonadi-9999.ebuild
+++ b/kde-apps/akonadi/akonadi-9999.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


^ permalink raw reply related	[flat|nested] 38+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/
@ 2019-09-11  8:09 Andreas Sturmlechner
  0 siblings, 0 replies; 38+ messages in thread
From: Andreas Sturmlechner @ 2019-09-11  8:09 UTC (permalink / raw
  To: gentoo-commits

commit:     8b098c5fd657fe9a328f231598daf1c6184250fe
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 11 07:57:40 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Sep 11 07:57:40 2019 +0000
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 <asturm <AT> gentoo.org>

 kde-apps/akonadi/akonadi-9999.ebuild | 8 +++++++-
 kde-apps/akonadi/metadata.xml        | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/kde-apps/akonadi/akonadi-9999.ebuild b/kde-apps/akonadi/akonadi-9999.ebuild
index 1f4f1246fc..dd0a75af1c 100644
--- a/kde-apps/akonadi/akonadi-9999.ebuild
+++ b/kde-apps/akonadi/akonadi-9999.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 @@
 	</maintainer>
 	<use>
 		<flag name="designer">Install plugin for <pkg>dev-qt/designer</pkg></flag>
+		<flag name="kaccounts">Enable support for system-wide defined KAccounts</flag>
 		<flag name="tools">Install tools for developers and testing</flag>
 	</use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 38+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/
@ 2019-07-27 14:05 Andreas Sturmlechner
  0 siblings, 0 replies; 38+ messages in thread
From: Andreas Sturmlechner @ 2019-07-27 14:05 UTC (permalink / raw
  To: gentoo-commits

commit:     05571f02d4e290a6fcb696f72a7a6e1ac8d5212d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 26 15:25:16 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jul 27 14:05:23 2019 +0000
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 <asturm <AT> gentoo.org>

 kde-apps/akonadi/akonadi-19.07.80.ebuild      | 10 ----------
 kde-apps/akonadi/akonadi-19.08.49.9999.ebuild | 10 ----------
 kde-apps/akonadi/akonadi-9999.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.9999.ebuild b/kde-apps/akonadi/akonadi-19.08.49.9999.ebuild
index deb486dea5..1f4f1246fc 100644
--- a/kde-apps/akonadi/akonadi-19.08.49.9999.ebuild
+++ b/kde-apps/akonadi/akonadi-19.08.49.9999.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-9999.ebuild b/kde-apps/akonadi/akonadi-9999.ebuild
index deb486dea5..1f4f1246fc 100644
--- a/kde-apps/akonadi/akonadi-9999.ebuild
+++ b/kde-apps/akonadi/akonadi-9999.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,"


^ permalink raw reply related	[flat|nested] 38+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/
@ 2019-07-24 11:32 Andreas Sturmlechner
  0 siblings, 0 replies; 38+ messages in thread
From: Andreas Sturmlechner @ 2019-07-24 11:32 UTC (permalink / raw
  To: gentoo-commits

commit:     b7b95f71ddff77ab067caba16374081b4949f8d0
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 23 18:49:27 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jul 24 11:29:25 2019 +0000
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 <asturm <AT> gentoo.org>

 kde-apps/akonadi/akonadi-19.07.80.ebuild      | 22 ++++++++++++++++++++++
 kde-apps/akonadi/akonadi-19.08.49.9999.ebuild | 22 ++++++++++++++++++++++
 kde-apps/akonadi/akonadi-9999.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.9999.ebuild b/kde-apps/akonadi/akonadi-19.08.49.9999.ebuild
index 9070a6e386..deb486dea5 100644
--- a/kde-apps/akonadi/akonadi-19.08.49.9999.ebuild
+++ b/kde-apps/akonadi/akonadi-19.08.49.9999.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-9999.ebuild b/kde-apps/akonadi/akonadi-9999.ebuild
index 9070a6e386..deb486dea5 100644
--- a/kde-apps/akonadi/akonadi-9999.ebuild
+++ b/kde-apps/akonadi/akonadi-9999.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."


^ permalink raw reply related	[flat|nested] 38+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/
@ 2019-01-10  8:43 Andreas Sturmlechner
  0 siblings, 0 replies; 38+ messages in thread
From: Andreas Sturmlechner @ 2019-01-10  8:43 UTC (permalink / raw
  To: gentoo-commits

commit:     65b1053461acc2942035e0170463d7ee72170fc3
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 10 08:42:36 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jan 10 08:42:36 2019 +0000
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 <asturm <AT> gentoo.org>

 kde-apps/akonadi/akonadi-18.12.1.ebuild       | 5 ++++-
 kde-apps/akonadi/akonadi-18.12.49.9999.ebuild | 5 ++++-
 kde-apps/akonadi/akonadi-9999.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.9999.ebuild b/kde-apps/akonadi/akonadi-18.12.49.9999.ebuild
index 7ddc4ea8c4..2b61792555 100644
--- a/kde-apps/akonadi/akonadi-18.12.49.9999.ebuild
+++ b/kde-apps/akonadi/akonadi-18.12.49.9999.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-9999.ebuild b/kde-apps/akonadi/akonadi-9999.ebuild
index 89eddb63f3..447c51f57c 100644
--- a/kde-apps/akonadi/akonadi-9999.ebuild
+++ b/kde-apps/akonadi/akonadi-9999.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}


^ permalink raw reply related	[flat|nested] 38+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/
@ 2017-11-14 21:20 Andreas Sturmlechner
  0 siblings, 0 replies; 38+ messages in thread
From: Andreas Sturmlechner @ 2017-11-14 21:20 UTC (permalink / raw
  To: gentoo-commits

commit:     f71a8924f9891f3893a61f87cfd0d657c45adf96
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 14 21:19:42 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Nov 14 21:20:03 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=f71a8924

kde-apps/akonadi: Block <kde-apps/kapptemplate-17.11.80

 * Detected file collision(s):
 *
 *      /usr/share/kdevappwizard/templates/akonadiserializer.tar.bz2
 *      /usr/share/kdevappwizard/templates/akonadiresource.tar.bz2

Package-Manager: Portage-2.3.14, Repoman-2.3.5

 kde-apps/akonadi/akonadi-17.12.49.9999.ebuild | 1 +
 kde-apps/akonadi/akonadi-9999.ebuild          | 1 +
 2 files changed, 2 insertions(+)

diff --git a/kde-apps/akonadi/akonadi-17.12.49.9999.ebuild b/kde-apps/akonadi/akonadi-17.12.49.9999.ebuild
index 7aa020039e..3a8b593b7f 100644
--- a/kde-apps/akonadi/akonadi-17.12.49.9999.ebuild
+++ b/kde-apps/akonadi/akonadi-17.12.49.9999.ebuild
@@ -49,6 +49,7 @@ DEPEND="${COMMON_DEPEND}
 	test? ( sys-apps/dbus )
 "
 RDEPEND="${COMMON_DEPEND}
+	!<kde-apps/kapptemplate-17.11.80
 	!kde-apps/kdepim-l10n
 	!kde-apps/kdepimlibs
 	mysql? ( virtual/mysql )

diff --git a/kde-apps/akonadi/akonadi-9999.ebuild b/kde-apps/akonadi/akonadi-9999.ebuild
index 7aa020039e..3a8b593b7f 100644
--- a/kde-apps/akonadi/akonadi-9999.ebuild
+++ b/kde-apps/akonadi/akonadi-9999.ebuild
@@ -49,6 +49,7 @@ DEPEND="${COMMON_DEPEND}
 	test? ( sys-apps/dbus )
 "
 RDEPEND="${COMMON_DEPEND}
+	!<kde-apps/kapptemplate-17.11.80
 	!kde-apps/kdepim-l10n
 	!kde-apps/kdepimlibs
 	mysql? ( virtual/mysql )


^ permalink raw reply related	[flat|nested] 38+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/
@ 2017-10-30 10:32 Andreas Sturmlechner
  0 siblings, 0 replies; 38+ messages in thread
From: Andreas Sturmlechner @ 2017-10-30 10:32 UTC (permalink / raw
  To: gentoo-commits

commit:     fec9724f07126ec4330eef8bacb3047c072bf83e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 30 10:32:09 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Oct 30 10:32:32 2017 +0000
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-9999.ebuild | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/kde-apps/akonadi/akonadi-9999.ebuild b/kde-apps/akonadi/akonadi-9999.ebuild
index 3cd41b9245..7aa020039e 100644
--- a/kde-apps/akonadi/akonadi-9999.ebuild
+++ b/kde-apps/akonadi/akonadi-9999.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)


^ permalink raw reply related	[flat|nested] 38+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/
@ 2017-10-09 19:17 Andreas Sturmlechner
  0 siblings, 0 replies; 38+ messages in thread
From: Andreas Sturmlechner @ 2017-10-09 19:17 UTC (permalink / raw
  To: gentoo-commits

commit:     9aed38a15df19a462635f2d9f12982c63988cdfc
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Oct  9 18:58:30 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Oct  9 19:02:53 2017 +0000
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-9999.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/kde-apps/akonadi/akonadi-9999.ebuild b/kde-apps/akonadi/akonadi-9999.ebuild
index 8fe5659f29..3cd41b9245 100644
--- a/kde-apps/akonadi/akonadi-9999.ebuild
+++ b/kde-apps/akonadi/akonadi-9999.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)


^ permalink raw reply related	[flat|nested] 38+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/
@ 2017-09-25 15:50 Andreas Sturmlechner
  0 siblings, 0 replies; 38+ messages in thread
From: Andreas Sturmlechner @ 2017-09-25 15:50 UTC (permalink / raw
  To: gentoo-commits

commit:     9394cad8a5f40da7595998868f4bbae6b4f9f97d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 25 13:27:00 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Sep 25 15:50:37 2017 +0000
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.9999.ebuild | 7 ++-----
 kde-apps/akonadi/akonadi-9999.ebuild          | 5 +----
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/kde-apps/akonadi/akonadi-17.08.49.9999.ebuild b/kde-apps/akonadi/akonadi-17.08.49.9999.ebuild
index 66799666c5..02dccca7f5 100644
--- a/kde-apps/akonadi/akonadi-17.08.49.9999.ebuild
+++ b/kde-apps/akonadi/akonadi-17.08.49.9999.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-9999.ebuild b/kde-apps/akonadi/akonadi-9999.ebuild
index afbf68988f..351b0deb27 100644
--- a/kde-apps/akonadi/akonadi-9999.ebuild
+++ b/kde-apps/akonadi/akonadi-9999.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 )
 "
 


^ permalink raw reply related	[flat|nested] 38+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/
@ 2017-09-22 16:08 Andreas Sturmlechner
  0 siblings, 0 replies; 38+ messages in thread
From: Andreas Sturmlechner @ 2017-09-22 16:08 UTC (permalink / raw
  To: gentoo-commits

commit:     02e8b99f2426faddbe40df6554707f0200e91fa0
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 22 16:08:20 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Sep 22 16:08:20 2017 +0000
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.9999.ebuild | 5 ++++-
 kde-apps/akonadi/akonadi-9999.ebuild          | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/kde-apps/akonadi/akonadi-17.08.49.9999.ebuild b/kde-apps/akonadi/akonadi-17.08.49.9999.ebuild
index be837a6439..66799666c5 100644
--- a/kde-apps/akonadi/akonadi-17.08.49.9999.ebuild
+++ b/kde-apps/akonadi/akonadi-17.08.49.9999.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-9999.ebuild b/kde-apps/akonadi/akonadi-9999.ebuild
index 351b0deb27..afbf68988f 100644
--- a/kde-apps/akonadi/akonadi-9999.ebuild
+++ b/kde-apps/akonadi/akonadi-9999.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 )
 "
 


^ permalink raw reply related	[flat|nested] 38+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/
@ 2017-09-06 21:39 Andreas Sturmlechner
  0 siblings, 0 replies; 38+ messages in thread
From: Andreas Sturmlechner @ 2017-09-06 21:39 UTC (permalink / raw
  To: gentoo-commits

commit:     2a242d06282128bd87672d17e59eae2f1f8fd841
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Sep  6 21:38:18 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Sep  6 21:38:48 2017 +0000
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-9999.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kde-apps/akonadi/akonadi-9999.ebuild b/kde-apps/akonadi/akonadi-9999.ebuild
index be837a6439..351b0deb27 100644
--- a/kde-apps/akonadi/akonadi-9999.ebuild
+++ b/kde-apps/akonadi/akonadi-9999.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)


^ permalink raw reply related	[flat|nested] 38+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/
@ 2017-08-26 13:04 Michael Palimaka
  0 siblings, 0 replies; 38+ messages in thread
From: Michael Palimaka @ 2017-08-26 13:04 UTC (permalink / raw
  To: gentoo-commits

commit:     dd9f269f1672a6dd96cdbf079a2fb3f7442c4fa5
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 26 12:39:56 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Aug 26 13:04:26 2017 +0000
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.9999.ebuild | 2 +-
 kde-apps/akonadi/akonadi-9999.ebuild          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kde-apps/akonadi/akonadi-17.08.49.9999.ebuild b/kde-apps/akonadi/akonadi-17.08.49.9999.ebuild
index 83e59f81c1..be837a6439 100644
--- a/kde-apps/akonadi/akonadi-17.08.49.9999.ebuild
+++ b/kde-apps/akonadi/akonadi-17.08.49.9999.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-9999.ebuild b/kde-apps/akonadi/akonadi-9999.ebuild
index 83e59f81c1..be837a6439 100644
--- a/kde-apps/akonadi/akonadi-9999.ebuild
+++ b/kde-apps/akonadi/akonadi-9999.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+"


^ permalink raw reply related	[flat|nested] 38+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/
@ 2017-08-17 12:24 Andreas Sturmlechner
  0 siblings, 0 replies; 38+ messages in thread
From: Andreas Sturmlechner @ 2017-08-17 12:24 UTC (permalink / raw
  To: gentoo-commits

commit:     eed37f8bca645a01f013d2b473a77c61eb8c925c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 17 12:07:42 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Aug 17 12:07:42 2017 +0000
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.9999.ebuild | 20 +++++++++++++++-----
 kde-apps/akonadi/akonadi-9999.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.9999.ebuild b/kde-apps/akonadi/akonadi-17.08.49.9999.ebuild
index 575f051e83..83e59f81c1 100644
--- a/kde-apps/akonadi/akonadi-17.08.49.9999.ebuild
+++ b/kde-apps/akonadi/akonadi-17.08.49.9999.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
 	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-9999.ebuild b/kde-apps/akonadi/akonadi-9999.ebuild
index 575f051e83..83e59f81c1 100644
--- a/kde-apps/akonadi/akonadi-9999.ebuild
+++ b/kde-apps/akonadi/akonadi-9999.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
 	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."
 }


^ permalink raw reply related	[flat|nested] 38+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/
@ 2017-08-12 12:32 Andreas Sturmlechner
  0 siblings, 0 replies; 38+ messages in thread
From: Andreas Sturmlechner @ 2017-08-12 12:32 UTC (permalink / raw
  To: gentoo-commits

commit:     1253e0f0671412b16a920f9749dc2495681ad448
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 12 12:30:36 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Aug 12 12:30:36 2017 +0000
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.9999.ebuild | 47 +++++++-----------------
 kde-apps/akonadi/akonadi-9999.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.9999.ebuild b/kde-apps/akonadi/akonadi-17.08.49.9999.ebuild
index 0da9f2e8d0..575f051e83 100644
--- a/kde-apps/akonadi/akonadi-17.08.49.9999.ebuild
+++ b/kde-apps/akonadi/akonadi-17.08.49.9999.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-info
-	sqlite? ( dev-db/sqlite:3 )
 	xml? ( dev-libs/libxml2 )
 "
 DEPEND="${COMMON_DEPEND}
@@ -61,42 +61,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 +91,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-9999.ebuild b/kde-apps/akonadi/akonadi-9999.ebuild
index 0da9f2e8d0..575f051e83 100644
--- a/kde-apps/akonadi/akonadi-9999.ebuild
+++ b/kde-apps/akonadi/akonadi-9999.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-info
-	sqlite? ( dev-db/sqlite:3 )
 	xml? ( dev-libs/libxml2 )
 "
 DEPEND="${COMMON_DEPEND}
@@ -61,42 +61,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 +91,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}"
 }


^ permalink raw reply related	[flat|nested] 38+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/
@ 2016-10-30 12:56 Johannes Huber
  0 siblings, 0 replies; 38+ messages in thread
From: Johannes Huber @ 2016-10-30 12:56 UTC (permalink / raw
  To: gentoo-commits

commit:     74b7137b0ce6c6dc43f4de37383c40151deddd92
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 30 12:50:12 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Oct 30 12:50:12 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=74b7137b

kde-apps/akonadi: Remove blocker on app-office/akonadi-server

Was moved to kde-apps/akonadi:4, handled by kde5.eclass.

Package-Manager: portage-2.3.2

 kde-apps/akonadi/akonadi-16.08.49.9999.ebuild | 1 -
 kde-apps/akonadi/akonadi-9999.ebuild          | 1 -
 2 files changed, 2 deletions(-)

diff --git a/kde-apps/akonadi/akonadi-16.08.49.9999.ebuild b/kde-apps/akonadi/akonadi-16.08.49.9999.ebuild
index f1d4c5c..de02e78 100644
--- a/kde-apps/akonadi/akonadi-16.08.49.9999.ebuild
+++ b/kde-apps/akonadi/akonadi-16.08.49.9999.ebuild
@@ -51,7 +51,6 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	mysql? ( virtual/mysql )
 	postgres? ( dev-db/postgresql )
-	!app-office/akonadi-server
 	!kde-apps/kdepimlibs
 "
 

diff --git a/kde-apps/akonadi/akonadi-9999.ebuild b/kde-apps/akonadi/akonadi-9999.ebuild
index c8e64f2..a27abc2 100644
--- a/kde-apps/akonadi/akonadi-9999.ebuild
+++ b/kde-apps/akonadi/akonadi-9999.ebuild
@@ -52,7 +52,6 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	mysql? ( virtual/mysql )
 	postgres? ( dev-db/postgresql )
-	!app-office/akonadi-server
 	!kde-apps/kdepimlibs
 "
 


^ permalink raw reply related	[flat|nested] 38+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/
@ 2016-09-07  8:57 Michael Palimaka
  0 siblings, 0 replies; 38+ messages in thread
From: Michael Palimaka @ 2016-09-07  8:57 UTC (permalink / raw
  To: gentoo-commits

commit:     9c7b149992f73f9bb9314342e5c5df961ec36cea
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Tue Sep  6 18:24:48 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Sep  6 18:24:48 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=9c7b1499

kde-apps/akonadi: Add missing DEPEND

Upstream commit 769fe236f43293afdee00dd58687b820e20dd1fd

Package-Manager: portage-2.2.28

 kde-apps/akonadi/akonadi-9999.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kde-apps/akonadi/akonadi-9999.ebuild b/kde-apps/akonadi/akonadi-9999.ebuild
index f1d4c5c..9e1e6bb 100644
--- a/kde-apps/akonadi/akonadi-9999.ebuild
+++ b/kde-apps/akonadi/akonadi-9999.ebuild
@@ -24,6 +24,7 @@ COMMON_DEPEND="
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
 	$(add_frameworks_dep kdbusaddons)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kiconthemes)


^ permalink raw reply related	[flat|nested] 38+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/
@ 2016-06-23 11:54 Michael Palimaka
  0 siblings, 0 replies; 38+ messages in thread
From: Michael Palimaka @ 2016-06-23 11:54 UTC (permalink / raw
  To: gentoo-commits

commit:     1102e4feee17e29a17c6bc3d5537bb5bcd82b06e
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 23 11:50:11 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Jun 23 11:54:33 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=1102e4fe

kde-apps/akonadi: add temporary Qt subslot operator

Package-Manager: portage-2.3.0_rc1

 kde-apps/akonadi/akonadi-16.04.2.ebuild       | 3 ++-
 kde-apps/akonadi/akonadi-16.04.49.9999.ebuild | 3 ++-
 kde-apps/akonadi/akonadi-9999.ebuild          | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/kde-apps/akonadi/akonadi-16.04.2.ebuild b/kde-apps/akonadi/akonadi-16.04.2.ebuild
index 1b086b1..68a10ac 100644
--- a/kde-apps/akonadi/akonadi-16.04.2.ebuild
+++ b/kde-apps/akonadi/akonadi-16.04.2.ebuild
@@ -18,6 +18,7 @@ IUSE="+mysql postgres sqlite tools xml"
 
 REQUIRED_USE="|| ( sqlite mysql postgres ) test? ( tools )"
 
+# drop qtgui subslot operator when QT_MINIMAL >= 5.7.0
 COMMON_DEPEND="
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
@@ -34,7 +35,7 @@ COMMON_DEPEND="
 	$(add_frameworks_dep kwindowsystem)
 	$(add_frameworks_dep kxmlgui)
 	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
+	$(add_qt_dep qtgui '' '' '5=')
 	$(add_qt_dep qtnetwork)
 	$(add_qt_dep qtsql 'mysql?,postgres?')
 	$(add_qt_dep qtwidgets)

diff --git a/kde-apps/akonadi/akonadi-16.04.49.9999.ebuild b/kde-apps/akonadi/akonadi-16.04.49.9999.ebuild
index 1f399d7..3436e24 100644
--- a/kde-apps/akonadi/akonadi-16.04.49.9999.ebuild
+++ b/kde-apps/akonadi/akonadi-16.04.49.9999.ebuild
@@ -18,6 +18,7 @@ IUSE="+mysql postgres sqlite tools xml"
 
 REQUIRED_USE="|| ( sqlite mysql postgres ) test? ( tools )"
 
+# drop qtgui subslot operator when QT_MINIMAL >= 5.7.0
 COMMON_DEPEND="
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
@@ -34,7 +35,7 @@ COMMON_DEPEND="
 	$(add_frameworks_dep kwindowsystem)
 	$(add_frameworks_dep kxmlgui)
 	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
+	$(add_qt_dep qtgui '' '' '5=')
 	$(add_qt_dep qtnetwork)
 	$(add_qt_dep qtsql 'mysql?,postgres?')
 	$(add_qt_dep qtwidgets)

diff --git a/kde-apps/akonadi/akonadi-9999.ebuild b/kde-apps/akonadi/akonadi-9999.ebuild
index 99e6758..3ad61cf 100644
--- a/kde-apps/akonadi/akonadi-9999.ebuild
+++ b/kde-apps/akonadi/akonadi-9999.ebuild
@@ -19,6 +19,7 @@ IUSE="+mysql postgres sqlite tools xml"
 
 REQUIRED_USE="|| ( sqlite mysql postgres ) test? ( tools )"
 
+# drop qtgui subslot operator when QT_MINIMAL >= 5.7.0
 COMMON_DEPEND="
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
@@ -34,7 +35,7 @@ COMMON_DEPEND="
 	$(add_frameworks_dep kwindowsystem)
 	$(add_frameworks_dep kxmlgui)
 	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
+	$(add_qt_dep qtgui '' '' '5=')
 	$(add_qt_dep qtnetwork)
 	$(add_qt_dep qtsql 'mysql?,postgres?')
 	$(add_qt_dep qtwidgets)


^ permalink raw reply related	[flat|nested] 38+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/
@ 2016-06-17 10:25 Michael Palimaka
  0 siblings, 0 replies; 38+ messages in thread
From: Michael Palimaka @ 2016-06-17 10:25 UTC (permalink / raw
  To: gentoo-commits

commit:     f9103b10068899b7a5b1fc9f22b507c0c9061ce6
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Thu Jun 16 20:39:50 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Jun 16 20:44:46 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=f9103b10

kde-apps/akonadi: Fix LICENSE

Package-Manager: portage-2.2.28

 kde-apps/akonadi/akonadi-16.04.2.ebuild       | 2 +-
 kde-apps/akonadi/akonadi-16.04.49.9999.ebuild | 2 +-
 kde-apps/akonadi/akonadi-9999.ebuild          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/kde-apps/akonadi/akonadi-16.04.2.ebuild b/kde-apps/akonadi/akonadi-16.04.2.ebuild
index b75a579..1b086b1 100644
--- a/kde-apps/akonadi/akonadi-16.04.2.ebuild
+++ b/kde-apps/akonadi/akonadi-16.04.2.ebuild
@@ -13,7 +13,7 @@ inherit kde5
 DESCRIPTION="Storage service for PIM data and libraries for PIM apps"
 HOMEPAGE="https://pim.kde.org/akonadi"
 KEYWORDS="~amd64 ~x86"
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1+"
 IUSE="+mysql postgres sqlite tools xml"
 
 REQUIRED_USE="|| ( sqlite mysql postgres ) test? ( tools )"

diff --git a/kde-apps/akonadi/akonadi-16.04.49.9999.ebuild b/kde-apps/akonadi/akonadi-16.04.49.9999.ebuild
index 21fbf51..1f399d7 100644
--- a/kde-apps/akonadi/akonadi-16.04.49.9999.ebuild
+++ b/kde-apps/akonadi/akonadi-16.04.49.9999.ebuild
@@ -13,7 +13,7 @@ inherit kde5
 DESCRIPTION="Storage service for PIM data and libraries for PIM apps"
 HOMEPAGE="https://pim.kde.org/akonadi"
 KEYWORDS=""
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1+"
 IUSE="+mysql postgres sqlite tools xml"
 
 REQUIRED_USE="|| ( sqlite mysql postgres ) test? ( tools )"

diff --git a/kde-apps/akonadi/akonadi-9999.ebuild b/kde-apps/akonadi/akonadi-9999.ebuild
index 43bfeaf..99e6758 100644
--- a/kde-apps/akonadi/akonadi-9999.ebuild
+++ b/kde-apps/akonadi/akonadi-9999.ebuild
@@ -14,7 +14,7 @@ inherit kde5
 DESCRIPTION="Storage service for PIM data and libraries for PIM apps"
 HOMEPAGE="https://pim.kde.org/akonadi"
 KEYWORDS=""
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1+"
 IUSE="+mysql postgres sqlite tools xml"
 
 REQUIRED_USE="|| ( sqlite mysql postgres ) test? ( tools )"


^ permalink raw reply related	[flat|nested] 38+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/
@ 2016-06-05 18:59 Michael Palimaka
  0 siblings, 0 replies; 38+ messages in thread
From: Michael Palimaka @ 2016-06-05 18:59 UTC (permalink / raw
  To: gentoo-commits

commit:     cbf9fed3838960a561fb7285214499d1f9e449f5
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat May 14 13:47:59 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jun  5 18:56:56 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=cbf9fed3

kde-apps/akonadi: Use KDE_DESIGNERPLUGIN, force tests optional

Package-Manager: portage-2.2.28

 kde-apps/akonadi/akonadi-16.04.1.ebuild       | 14 ++++++--------
 kde-apps/akonadi/akonadi-16.04.49.9999.ebuild | 14 ++++++--------
 kde-apps/akonadi/akonadi-9999.ebuild          | 14 ++++++--------
 3 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/kde-apps/akonadi/akonadi-16.04.1.ebuild b/kde-apps/akonadi/akonadi-16.04.1.ebuild
index 8327472..99ad093 100644
--- a/kde-apps/akonadi/akonadi-16.04.1.ebuild
+++ b/kde-apps/akonadi/akonadi-16.04.1.ebuild
@@ -4,17 +4,18 @@
 
 EAPI=6
 
-KDE_DOXYGEN=true
-KDE_TEST=true
-VIRTUALDBUS_TEST=true
-VIRTUALX_REQUIRED=test
+KDE_DESIGNERPLUGIN="true"
+KDE_DOXYGEN="true"
+KDE_TEST="true"
+VIRTUALDBUS_TEST="true"
+VIRTUALX_REQUIRED="test"
 inherit kde5
 
 DESCRIPTION="Storage service for PIM data and libraries for PIM apps"
 HOMEPAGE="https://pim.kde.org/akonadi"
 KEYWORDS="~amd64 ~x86"
 LICENSE="LGPL-2.1"
-IUSE="designer +mysql postgres sqlite tools xml"
+IUSE="+mysql postgres sqlite tools xml"
 
 REQUIRED_USE="|| ( sqlite mysql postgres ) test? ( tools )"
 
@@ -24,7 +25,6 @@ COMMON_DEPEND="
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdesignerplugin)
 	$(add_frameworks_dep kguiaddons)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kiconthemes)
@@ -41,7 +41,6 @@ COMMON_DEPEND="
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtxml)
 	x11-misc/shared-mime-info
-	designer? ( $(add_qt_dep designer) )
 	sqlite? ( dev-db/sqlite:3 )
 	tools? ( xml? ( dev-libs/libxml2 ) )
 "
@@ -96,7 +95,6 @@ pkg_setup() {
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package designer Qt5Designer)
 		-DAKONADI_BUILD_QSQLITE=$(usex sqlite)
 		-DBUILD_TOOLS=$(usex tools)
 		-DKDE_INSTALL_USE_QT_SYS_PATHS=ON

diff --git a/kde-apps/akonadi/akonadi-16.04.49.9999.ebuild b/kde-apps/akonadi/akonadi-16.04.49.9999.ebuild
index 1333734..85b3060 100644
--- a/kde-apps/akonadi/akonadi-16.04.49.9999.ebuild
+++ b/kde-apps/akonadi/akonadi-16.04.49.9999.ebuild
@@ -4,17 +4,18 @@
 
 EAPI=6
 
-KDE_DOXYGEN=true
-KDE_TEST=true
-VIRTUALDBUS_TEST=true
-VIRTUALX_REQUIRED=test
+KDE_DESIGNERPLUGIN="true"
+KDE_DOXYGEN="true"
+KDE_TEST="true"
+VIRTUALDBUS_TEST="true"
+VIRTUALX_REQUIRED="test"
 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="designer +mysql postgres sqlite tools xml"
+IUSE="+mysql postgres sqlite tools xml"
 
 REQUIRED_USE="|| ( sqlite mysql postgres ) test? ( tools )"
 
@@ -24,7 +25,6 @@ COMMON_DEPEND="
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdesignerplugin)
 	$(add_frameworks_dep kguiaddons)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kiconthemes)
@@ -41,7 +41,6 @@ COMMON_DEPEND="
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtxml)
 	x11-misc/shared-mime-info
-	designer? ( $(add_qt_dep designer) )
 	sqlite? ( dev-db/sqlite:3 )
 	tools? ( xml? ( dev-libs/libxml2 ) )
 "
@@ -96,7 +95,6 @@ pkg_setup() {
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package designer Qt5Designer)
 		-DAKONADI_BUILD_QSQLITE=$(usex sqlite)
 		-DBUILD_TOOLS=$(usex tools)
 		-DKDE_INSTALL_USE_QT_SYS_PATHS=ON

diff --git a/kde-apps/akonadi/akonadi-9999.ebuild b/kde-apps/akonadi/akonadi-9999.ebuild
index 849a687..7bc0012 100644
--- a/kde-apps/akonadi/akonadi-9999.ebuild
+++ b/kde-apps/akonadi/akonadi-9999.ebuild
@@ -4,18 +4,19 @@
 
 EAPI=6
 
-KDE_DOXYGEN=true
-KDE_TEST=true
-VIRTUALDBUS_TEST=true
-VIRTUALX_REQUIRED=test
+KDE_DESIGNERPLUGIN="true"
+KDE_DOXYGEN="true"
+KDE_TEST="forceoptional"
 QT_MINIMAL="5.6.0"
+VIRTUALDBUS_TEST="true"
+VIRTUALX_REQUIRED="test"
 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="designer +mysql postgres sqlite tools xml"
+IUSE="+mysql postgres sqlite tools xml"
 
 REQUIRED_USE="|| ( sqlite mysql postgres ) test? ( tools )"
 
@@ -25,7 +26,6 @@ COMMON_DEPEND="
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdesignerplugin)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kiconthemes)
 	$(add_frameworks_dep kio)
@@ -41,7 +41,6 @@ COMMON_DEPEND="
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtxml)
 	x11-misc/shared-mime-info
-	designer? ( $(add_qt_dep designer) )
 	sqlite? ( dev-db/sqlite:3 )
 	tools? ( xml? ( dev-libs/libxml2 ) )
 "
@@ -96,7 +95,6 @@ pkg_setup() {
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package designer Qt5Designer)
 		-DAKONADI_BUILD_QSQLITE=$(usex sqlite)
 		-DBUILD_TOOLS=$(usex tools)
 		-DKDE_INSTALL_USE_QT_SYS_PATHS=ON


^ permalink raw reply related	[flat|nested] 38+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/
@ 2015-10-31 14:49 Michael Palimaka
  0 siblings, 0 replies; 38+ messages in thread
From: Michael Palimaka @ 2015-10-31 14:49 UTC (permalink / raw
  To: gentoo-commits

commit:     ee9a7a1c4e7cda51cf9f20dcacf779bb861fd136
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 31 14:49:07 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Oct 31 14:49:44 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=ee9a7a1c

kde-apps/akonadi: explicitly depend on virtual/mysql

This used to be pulled via dev-qt/qtsql[mysql], but the dependency there
recently changed to virtual/libmysqlclient, which does not guarantee that
mysqld will be installed.

Package-Manager: portage-2.2.20.1

 kde-apps/akonadi/akonadi-15.08.2.ebuild       | 1 +
 kde-apps/akonadi/akonadi-15.08.49.9999.ebuild | 1 +
 kde-apps/akonadi/akonadi-9999.ebuild          | 1 +
 3 files changed, 3 insertions(+)

diff --git a/kde-apps/akonadi/akonadi-15.08.2.ebuild b/kde-apps/akonadi/akonadi-15.08.2.ebuild
index 44204d1..5c53ee3 100644
--- a/kde-apps/akonadi/akonadi-15.08.2.ebuild
+++ b/kde-apps/akonadi/akonadi-15.08.2.ebuild
@@ -32,6 +32,7 @@ DEPEND="${CDEPEND}
 	test? ( sys-apps/dbus )
 "
 RDEPEND="${CDEPEND}
+	mysql? ( virtual/mysql )
 	postgres? ( dev-db/postgresql )
 	!app-office/akonadi-server
 "

diff --git a/kde-apps/akonadi/akonadi-15.08.49.9999.ebuild b/kde-apps/akonadi/akonadi-15.08.49.9999.ebuild
index f5a3052..41703c6 100644
--- a/kde-apps/akonadi/akonadi-15.08.49.9999.ebuild
+++ b/kde-apps/akonadi/akonadi-15.08.49.9999.ebuild
@@ -32,6 +32,7 @@ DEPEND="${CDEPEND}
 	test? ( sys-apps/dbus )
 "
 RDEPEND="${CDEPEND}
+	mysql? ( virtual/mysql )
 	postgres? ( dev-db/postgresql )
 	!app-office/akonadi-server
 "

diff --git a/kde-apps/akonadi/akonadi-9999.ebuild b/kde-apps/akonadi/akonadi-9999.ebuild
index 2af4002..f310a4c 100644
--- a/kde-apps/akonadi/akonadi-9999.ebuild
+++ b/kde-apps/akonadi/akonadi-9999.ebuild
@@ -32,6 +32,7 @@ DEPEND="${CDEPEND}
 	test? ( sys-apps/dbus )
 "
 RDEPEND="${CDEPEND}
+	mysql? ( virtual/mysql )
 	postgres? ( dev-db/postgresql )
 	!app-office/akonadi-server
 "


^ permalink raw reply related	[flat|nested] 38+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/
@ 2015-10-02 19:15 Michael Palimaka
  0 siblings, 0 replies; 38+ messages in thread
From: Michael Palimaka @ 2015-10-02 19:15 UTC (permalink / raw
  To: gentoo-commits

commit:     1d21d0a7b2aa23fb3e1bb1418db0b4f2a5070fbc
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  2 19:14:49 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Oct  2 19:14:49 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=1d21d0a7

kde-apps/akonadi: revbump for previous commit

Package-Manager: portage-2.2.20.1

 kde-apps/akonadi/{akonadi-15.08.1.ebuild => akonadi-15.08.1-r1.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/kde-apps/akonadi/akonadi-15.08.1.ebuild b/kde-apps/akonadi/akonadi-15.08.1-r1.ebuild
similarity index 100%
rename from kde-apps/akonadi/akonadi-15.08.1.ebuild
rename to kde-apps/akonadi/akonadi-15.08.1-r1.ebuild


^ permalink raw reply	[flat|nested] 38+ messages in thread

end of thread, other threads:[~2024-11-09 17:34 UTC | newest]

Thread overview: 38+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-02-23 14:57 [gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/ Andreas Sturmlechner
  -- strict thread matches above, loose matches on Subject: below --
2024-11-09 17:34 Andreas Sturmlechner
2024-10-04 21:55 Andreas Sturmlechner
2024-07-01 19:10 Andreas Sturmlechner
2024-05-17 19:50 Andreas Sturmlechner
2023-12-19 22:00 Andreas Sturmlechner
2023-12-19 12:34 Andreas Sturmlechner
2023-12-18 21:30 Andreas Sturmlechner
2023-08-06 20:39 Andreas Sturmlechner
2021-11-15 10:59 Andreas Sturmlechner
2021-02-16 22:48 Andreas Sturmlechner
2021-02-15 14:39 Andreas Sturmlechner
2021-02-04 13:16 Andreas Sturmlechner
2020-12-25 21:51 Andreas Sturmlechner
2020-10-10 21:39 Andreas Sturmlechner
2020-09-28 21:26 Andreas Sturmlechner
2019-12-12 18:22 Andreas Sturmlechner
2019-11-25  0:21 Andreas Sturmlechner
2019-09-11  8:09 Andreas Sturmlechner
2019-07-27 14:05 Andreas Sturmlechner
2019-07-24 11:32 Andreas Sturmlechner
2019-01-10  8:43 Andreas Sturmlechner
2017-11-14 21:20 Andreas Sturmlechner
2017-10-30 10:32 Andreas Sturmlechner
2017-10-09 19:17 Andreas Sturmlechner
2017-09-25 15:50 Andreas Sturmlechner
2017-09-22 16:08 Andreas Sturmlechner
2017-09-06 21:39 Andreas Sturmlechner
2017-08-26 13:04 Michael Palimaka
2017-08-17 12:24 Andreas Sturmlechner
2017-08-12 12:32 Andreas Sturmlechner
2016-10-30 12:56 Johannes Huber
2016-09-07  8:57 Michael Palimaka
2016-06-23 11:54 Michael Palimaka
2016-06-17 10:25 Michael Palimaka
2016-06-05 18:59 Michael Palimaka
2015-10-31 14:49 Michael Palimaka
2015-10-02 19:15 Michael Palimaka

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox