gentoo resync : 08.01.2021

3 files changed, 24 insertions, 15 deletions

diff --git a/kde-apps/akonadi/Manifest b/kde-apps/akonadi/Manifest
index 9ce74f7707d9..6ccf53e521bd 100644
--- a/kde-apps/akonadi/Manifest
+++ b/kde-apps/akonadi/Manifest
@@ -1,6 +1,6 @@
 AUX akonadi-18.12.2-mysql56-crash.patch 2196 BLAKE2B d12643c870da557f540f199f78462f97fc569ffe160415f56f166d89b7e94e0f6682fa68ed84c9629e66639ddac61b5c54376c309a8921d84a1d52ba351a9aab SHA512 093a0b4243668344db59b0419809500e411f7399137ba3d9c439b4d5300a2f867fb231f7d5a8bc5d95ad2d1ccb6921804caff8200ddddba74a62ddcdfa9ac623
 DIST akonadi-20.08.3.tar.xz 1591360 BLAKE2B e237fc3307ae3cd785e29da9c2177832f1cff523ab3dc46279813c9ae152ac3a030649e6b73e8d566332f478992d6441457301355c2f6abd180c4db8c8d48011 SHA512 2d278a6189732e7c68a89321356915413771f1b4b1e3fb5a491b02f0000095163cce61278cc4f7f8b17759c1d71b3e3c08dbed0c89f3fe26be21da14adbbf720
-DIST akonadi-20.12.0.tar.xz 1593204 BLAKE2B 9fdf7839752ae99001b77bdc6c04156016cf7722d2c647c8baa2f5d0e7fe75e602bff2a033ff88a9375262924026c37c6b139d1323c69b7bc99f032f127f349f SHA512 c606a974db82ef0709db04c0ca7712fb3e359a2f643cae53aa27d5a19553484e6664040d1e139c29b5fc0777d2aeb9c2832ba7936c1cf4bf24c8323bdcd2cd4f
+DIST akonadi-20.12.1.tar.xz 1593196 BLAKE2B a765faa8278dc49b191bb7c7813853826cc8a4bd3e58c2504ed0c095580f7fe0a4d24a0893cbbdf058decd25dc95e3cf38adf3dea2f36229e2fd3b2ebc6e7773 SHA512 17b90cfa4700388975b00693919a5e8f24bb94350513186227af1fd0b9dc0fe600216cd7be1d4763a2261cc3c9d3885e5b6a0633e9d1b1ac5cda371ee445c322
 EBUILD akonadi-20.08.3.ebuild 3694 BLAKE2B 5c829b9c1ed6ffe603d7eb24b6d5b24affde82fb174c053e238ec79d57400fee1ce27c027ea6e02ff873215598de6bd62c18496f8b39e141510dd9ace430fd63 SHA512 c8903c0eff409708558e65eafd22a7348c95ecdd06e190ffe6fbedd48a22fc1ee7fc2a10894bf42d70e3066732b374d90ccdbf412e974612622c1f1bda943866
-EBUILD akonadi-20.12.0.ebuild 3716 BLAKE2B 0faea9b0c66ccf08fd47aab2013d6cf62b5b93a78bc6c103947fc94c1fbbc8c2c3708a7a9e9c8b5bdff8bd205f698eb56fb38849cd4cb5a82d2db5c50a33b480 SHA512 9c7e2ab35ab81816f01e68ea2acad4ef7ab8098fc021f0e556e719401f861ac9e98cf565889625fc221211ff5ad742bdc8ca907b2935ac420b3d1e79e7ca3c02
-MISC metadata.xml 491 BLAKE2B f4d942600308e7fbc604467130f087b7dc9c22f92a21aa89224cdabe9b822b1b8f0986e14efa5e1d5206718f3dc837b00c926b559ee32b21b71cff09fe0ee0d0 SHA512 fbb184c959335ec38a98faa983f67eed457c7eaa7c401261c5b7c0401d813d7a9a4521001376c6d70d76b98286446346ae1592dfbf3771b8112591bc3fe2472e
+EBUILD akonadi-20.12.1.ebuild 4086 BLAKE2B adffec04928fff61deab1e190a370bb120d89d9ec0a3db16ed6676746904665e44346b83bd83d28bbda4bd536fe20644abc6bc89178c22ea88f9ca86e56ef849 SHA512 07e94a041c58932c1483dbb744d4e01cf566d148153f95536bd03132dcba0a91de296f091db30752e4cc36b45a7e64e6b53e9dc94608cab3a815027f0e149299
+MISC metadata.xml 588 BLAKE2B b0162943e19c7770ada2c773296d983b49904b9724dad1b10f78468c62deec785c116a5ab641214b6ea96dc2814d9d3ebf8e3972d6e38340dfba10db0cfdef81 SHA512 7f407851ce4b50e137cc6802d5a18c7ca96287044209bdc1689cce6f898ed46b0f57704111a359176004b16a3287a4cb143a266e5e707040d75e771115a576c8
diff --git a/kde-apps/akonadi/akonadi-20.12.0.ebuild b/kde-apps/akonadi/akonadi-20.12.1.ebuild
index 18a0f55ae58f..e6c5be78ba79 100644
--- a/kde-apps/akonadi/akonadi-20.12.0.ebuild
+++ b/kde-apps/akonadi/akonadi-20.12.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,16 +18,16 @@ HOMEPAGE="https://community.kde.org/KDE_PIM/akonadi"
 LICENSE="LGPL-2.1+"
 SLOT="5"
 KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-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]"; 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 8acbee94c7a6..c6b73ba5cfce 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>