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>
