gentoo resync : 28.04.2021

6 files changed, 111 insertions, 104 deletions

diff --git a/kde-apps/akonadi/Manifest b/kde-apps/akonadi/Manifest
index ee65794f32a1..511d26e498d4 100644
--- a/kde-apps/akonadi/Manifest
+++ b/kde-apps/akonadi/Manifest
@@ -1,7 +1,8 @@
+AUX README.gentoo 1607 BLAKE2B c5f6ae8c403ff0306e7c83f54d7b0bea5ae273e090d9ba1cb1c13ded4c292d7194433998a2d02ec7ccadc0f27bf12b6b64539338effcd49e242edd24a4230e58 SHA512 e4480205a76d2a5acb7882984de7de27322a816cccd1ef40886be2f90e551806d93ede5968c40a72a9e3b3dbf13cc58384dbbeb50224f74be198a861c5eb1dec
 AUX akonadi-18.12.2-mysql56-crash.patch 2196 BLAKE2B d12643c870da557f540f199f78462f97fc569ffe160415f56f166d89b7e94e0f6682fa68ed84c9629e66639ddac61b5c54376c309a8921d84a1d52ba351a9aab SHA512 093a0b4243668344db59b0419809500e411f7399137ba3d9c439b4d5300a2f867fb231f7d5a8bc5d95ad2d1ccb6921804caff8200ddddba74a62ddcdfa9ac623
-AUX akonadi-20.12.2-mysql8-conf.patch 2392 BLAKE2B 10d34a17d0af283d273186c32770af4dd3ea86893ac96d600203872dde8a0b1f62463315f1b3f46a91be86e44f7d49f88fdfbc1ff3ce56c51057cfa40cf6c51f SHA512 04fed8d69129ea410938edfa73af302f4aafa26894061480f4ef25b7b38b16df71ce813e404c78cc55d70af62b8bd2c4ed940f22b8030444bea66cef3adc5871
-DIST akonadi-20.12.2.tar.xz 1593452 BLAKE2B e3d058a43685a8b8bf92ffbb169f1c17b8e831712567a4ef8eba6ef1eee6321ae45f82a72a4c44a71835b65c18075497d26c8802b7a2f0a10c9baa21efefa65e SHA512 2c21db5d6ab6b8d9cedabad2f726fd518ba8219db3cb6f8f72820edc71ed72efa31efcb2c4cd8ff36e52e4c0a38a97dd890789bf6816ab524f0568892254523c
+AUX akonadi-21.03.80-mysql56-crash.patch 2534 BLAKE2B bc36e6a80f6f93695e35fc19edf9d8a1139508b9fe3cd1f81a1e6a1ca7723def4ed81fb9bdc75822b00835ad65333bb1dc44a552d33f09bfd331a4ddb8e23d13 SHA512 acb0432f98a96d5af609d43dc5aa25d3d5d0668c9493c62b2339add0f3ef78d54449137884eafc0201b9f0f4de4543a584ef6cd746cd3634d1a84169cd0e4219
 DIST akonadi-20.12.3.tar.xz 1593588 BLAKE2B 783b75a21cf1b1771a5ed25fb25d395af374e249e43ae15f725e92921ef7afdf312cf39c60457a61ba549ba90fc3aebc8ef0b53b666ad1a89ce0cf58c43748b6 SHA512 516f240349b4a680ee8ab1986b8f3d018e9e54a8802aed404b3deb08491edd67413cc4bbb43aedc583f7110812b6bf41277f83908f54221cf21efb3b7f6e32df
-EBUILD akonadi-20.12.2-r1.ebuild 3751 BLAKE2B 969d2aad7e56fa8fee1fd4964789657a63f606e705f97f26d599110762b789f65c074f0e30d8900e47d5bbaa25c82dbaf68b4313f5489c3567fee4e752dc982b SHA512 4d497021179b8b05d9733502f24be27a05c9aca4ec7e4d91e4abe209901c36feb6690fc8fe7ff5128e43d3e575a36dc90f0f7c518bb9d7236da53676924534f5
-EBUILD akonadi-20.12.3.ebuild 3702 BLAKE2B 2aeb6c738953c0466de1bba7b4becd7bd5f4e3579cfe9caabbf3fe2c779bdeb11b9266ad1baf96048a1ae29d110f001e7d2ab668a1c841e786d02bf6cf7cbb3d SHA512 8e961ec95e57bd37509af8e4f619ae5c8c317485fc8ac31c109c57304b8c979a529c53e082890c3ade84332482c5f553b7b0653f2682ee0e037106371ea2316f
+DIST akonadi-21.04.0.tar.xz 1598612 BLAKE2B 647dc2490cd421ca1afee6758ec413495ae22ce48cf1af7de073aa5e607d5e6aceb3bbe2481d328eec978e6a077ce76cbabf48b153745f13d88126b7f782f7cb SHA512 7d8336e745728eab6756313088dc0f2b3dde2c8330abb1fc973e5a557955d06be67bea0da026b7d26bf4eeb2f27abb79c609d7d4b56cbf543eaae1f49b634440
+EBUILD akonadi-20.12.3.ebuild 3444 BLAKE2B 149f5e1df84514187600dcba980905b0e3a81ea1d169e15e0faf5c3a89c96979f35561fd050852314185bcf9e0d8b2396f1815c7280e62e2890d1c270f149a27 SHA512 16ebc6189f20119203af2e26c164324f5d82d7ca3d276e576a0aff2a07004ebbad400b8c99087f96cf6e451fdb849cf7f6c2d161f85a8b62c9839daf945ee3df
+EBUILD akonadi-21.04.0.ebuild 3448 BLAKE2B 923417260107f35463dccf16a7045ef952d4dbeb6766fa9a3a1fdd28230ac83959a7e08340cb9b9e59252e6b4e3e0e3e046a3055568a9cd48d9776d492d7bd0a SHA512 fabaac9fea2a96546e6b44103bec66f5e4b40dcb236919177bc1c02289a516b5efccd7dfe10d83443f73d704563f21f00ab4b080f4c4edf0b1bb93b5da58505c
 MISC metadata.xml 491 BLAKE2B f4d942600308e7fbc604467130f087b7dc9c22f92a21aa89224cdabe9b822b1b8f0986e14efa5e1d5206718f3dc837b00c926b559ee32b21b71cff09fe0ee0d0 SHA512 fbb184c959335ec38a98faa983f67eed457c7eaa7c401261c5b7c0401d813d7a9a4521001376c6d70d76b98286446346ae1592dfbf3771b8112591bc3fe2472e
diff --git a/kde-apps/akonadi/akonadi-20.12.3.ebuild b/kde-apps/akonadi/akonadi-20.12.3.ebuild
index 6f78d4f5ff9f..5b6a1853aeb3 100644
--- a/kde-apps/akonadi/akonadi-20.12.3.ebuild
+++ b/kde-apps/akonadi/akonadi-20.12.3.ebuild
@@ -9,14 +9,14 @@ KFMIN=5.75.0
 QTMIN=5.15.2
 VIRTUALDBUS_TEST="true"
 VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
+inherit ecm kde.org readme.gentoo-r1
 
 DESCRIPTION="Storage service for PIM data and libraries for PIM apps"
 HOMEPAGE="https://community.kde.org/KDE_PIM/akonadi"
 
 LICENSE="LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="+kaccounts +mysql postgres sqlite tools xml"
 
 REQUIRED_USE="|| ( mysql postgres sqlite ) test? ( tools )"
@@ -73,15 +73,9 @@ pkg_setup() {
 	use postgres && DRIVER="QPSQL"
 	use mysql && DRIVER="QMYSQL"
 
-	if use mysql && has_version ">=dev-db/mariadb-10.4"; then
-		ewarn "If an existing Akonadi QMYSQL database is being upgraded using"
-		ewarn ">=dev-db/mariadb-10.4 and KMail stops fetching and sending mail,"
-		ewarn "check ~/.local/share/akonadi/akonadiserver.error for errors like:"
-		ewarn "  \"Cannot add or update a child row: a foreign key constraint fails\""
+	if use mysql && has_version "${CATEGORY}/${PN}[mysql]" && has_version "dev-db/mariadb"; then
 		ewarn
-		ewarn "Manual steps are required to fix it, see also:"
-		ewarn "  https://bugs.gentoo.org/688746 (see Whiteboard)"
-		ewarn "  https://bugs.kde.org/show_bug.cgi?id=409224"
+		ewarn "Attention: Make sure to read README.gentoo after install."
 		ewarn
 	fi
 
@@ -116,6 +110,7 @@ EOF
 	doins "${T}"/akonadiserverrc
 
 	ecm_src_install
+	readme.gentoo_create_doc
 }
 
 pkg_postinst() {
@@ -126,4 +121,6 @@ pkg_postinst() {
 	use postgres && elog "  QPSQL"
 	use sqlite && elog "  QSQLITE3"
 	elog "${DRIVER} has been set as your default akonadi storage backend."
+	use mysql && elog
+	use mysql && FORCE_PRINT_ELOG=1 readme.gentoo_print_elog
 }
diff --git a/kde-apps/akonadi/akonadi-20.12.2-r1.ebuild b/kde-apps/akonadi/akonadi-21.04.0.ebuild
index c0e9eb4ea8cc..7e807c4a6a14 100644
--- a/kde-apps/akonadi/akonadi-20.12.2-r1.ebuild
+++ b/kde-apps/akonadi/akonadi-21.04.0.ebuild
@@ -5,18 +5,18 @@ EAPI=7
 
 ECM_DESIGNERPLUGIN="true"
 ECM_TEST="forceoptional"
-KFMIN=5.75.0
+KFMIN=5.80.0
 QTMIN=5.15.2
 VIRTUALDBUS_TEST="true"
 VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
+inherit ecm kde.org readme.gentoo-r1
 
 DESCRIPTION="Storage service for PIM data and libraries for PIM apps"
 HOMEPAGE="https://community.kde.org/KDE_PIM/akonadi"
 
 LICENSE="LGPL-2.1+"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="+kaccounts +mysql postgres sqlite tools xml"
 
 REQUIRED_USE="|| ( mysql postgres sqlite ) test? ( tools )"
@@ -64,10 +64,7 @@ RDEPEND="${COMMON_DEPEND}
 	postgres? ( dev-db/postgresql )
 "
 
-PATCHES=(
-	"${FILESDIR}/${PN}-18.12.2-mysql56-crash.patch"
-	"${FILESDIR}/${P}-mysql8-conf.patch" # bug 709812
-)
+PATCHES=( "${FILESDIR}/${PN}-21.03.80-mysql56-crash.patch" )
 
 pkg_setup() {
 	# Set default storage backend in order: MySQL, PostgreSQL, SQLite
@@ -76,15 +73,9 @@ pkg_setup() {
 	use postgres && DRIVER="QPSQL"
 	use mysql && DRIVER="QMYSQL"
 
-	if use mysql && has_version ">=dev-db/mariadb-10.4"; then
-		ewarn "If an existing Akonadi QMYSQL database is being upgraded using"
-		ewarn ">=dev-db/mariadb-10.4 and KMail stops fetching and sending mail,"
-		ewarn "check ~/.local/share/akonadi/akonadiserver.error for errors like:"
-		ewarn "  \"Cannot add or update a child row: a foreign key constraint fails\""
+	if use mysql && has_version "${CATEGORY}/${PN}[mysql]" && has_version "dev-db/mariadb"; then
 		ewarn
-		ewarn "Manual steps are required to fix it, see also:"
-		ewarn "  https://bugs.gentoo.org/688746 (see Whiteboard)"
-		ewarn "  https://bugs.kde.org/show_bug.cgi?id=409224"
+		ewarn "Attention: Make sure to read README.gentoo after install."
 		ewarn
 	fi
 
@@ -119,6 +110,7 @@ EOF
 	doins "${T}"/akonadiserverrc
 
 	ecm_src_install
+	readme.gentoo_create_doc
 }
 
 pkg_postinst() {
@@ -129,4 +121,6 @@ pkg_postinst() {
 	use postgres && elog "  QPSQL"
 	use sqlite && elog "  QSQLITE3"
 	elog "${DRIVER} has been set as your default akonadi storage backend."
+	use mysql && elog
+	use mysql && FORCE_PRINT_ELOG=1 readme.gentoo_print_elog
 }
diff --git a/kde-apps/akonadi/files/README.gentoo b/kde-apps/akonadi/files/README.gentoo
new file mode 100644
index 000000000000..c778f6d1a211
--- /dev/null
+++ b/kde-apps/akonadi/files/README.gentoo
@@ -0,0 +1,39 @@
+Akonadi QMYSQL backends that were created using <dev-db/mariadb-10.5.9-r3 may
+be in need of a manual fix. Failure to do so could result in akonadi service
+to stop fetching and sending mail for KMail or any other kind of issues in PIM
+applications depending on akonadi like KOrganizer, KAddressBook etc.
+
+Note:
+  - All commands that follow are to be run by a regular user.
+  - They will have to be repeated for any other user of KDE PIM.
+  - Use your favorite terminal.
+
+  1) Check if "mysql" system db is present:
+     $ mysql -S /run/user/$(id -u)/akonadi/mysql.socket -e 'select schema_name \
+         from information_schema.schemata where schema_name = "mysql"'
+
+     The output obtained should look like this:
+        +-------------+
+        | schema_name |
+        +-------------+
+        | mysql       |
+        +-------------+
+
+     If so, then automatic DB upgrades will succeed, no further action necessary.
+
+  2) If, however, the above query returned empty, add the missing database:
+     $ mysql -S /run/user/$(id -u)/akonadi/mysql.socket -e 'create database mysql'
+
+     Future MariaDB releases should upgrade without manual intervention now.
+
+  3) Optional: You may have come here with an already defunct akonadi service.
+     To manually fix the akonadi MariaDB backend:
+     $ mysql_upgrade -S /run/user/$(id -u)/akonadi/default/mysql.socket \
+         --defaults-file=~/.local/share/akonadi/mysql.conf
+
+     Don't forget to restart the akonadi service afterwards:
+     $ akonadictl restart
+
+References:
+  [1] https://bugs.gentoo.org/688746
+  [2] https://bugs.kde.org/show_bug.cgi?id=409224
diff --git a/kde-apps/akonadi/files/akonadi-20.12.2-mysql8-conf.patch b/kde-apps/akonadi/files/akonadi-20.12.2-mysql8-conf.patch
deleted file mode 100644
index 8edf9d605dde..000000000000
--- a/kde-apps/akonadi/files/akonadi-20.12.2-mysql8-conf.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 9c666d0d6039a87f6286014c7d9c7281a5bd9dd1 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Tue, 16 Feb 2021 21:38:14 +0100
-Subject: [PATCH] MySQL server settings: Make use of 'loose_' option prefix
-
-Idea by one of the Gentoo MySQL maintainers. This makes MySQL skip over
-unsupported options rather than fail, which is important with >=MySQL-8.
-
-See also:
-https://dev.mysql.com/doc/refman/8.0/en/option-files.html#option-file-syntax
-https://mariadb.com/kb/en/configuring-mariadb-with-option-files/#option-prefixes
-
-BUG: 421922
-
-Thanks-to: Thomas Deutschmann <whissi@gentoo.org>
----
- src/server/storage/mysql-global-mobile.conf | 6 +++---
- src/server/storage/mysql-global.conf        | 6 +++---
- 2 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/src/server/storage/mysql-global-mobile.conf b/src/server/storage/mysql-global-mobile.conf
-index 19649d347..48e150af7 100644
---- a/src/server/storage/mysql-global-mobile.conf
-+++ b/src/server/storage/mysql-global-mobile.conf
-@@ -65,7 +65,7 @@ innodb_large_prefix=1
- log_error=mysql.err
- 
- # print warnings and connection errors (default:1)
--log_warnings=2
-+loose_log_warnings=2
- 
- # Convert table named to lowercase
- lower_case_table_names=1
-@@ -80,10 +80,10 @@ max_connections=256
- # (make sense when having the same query multiple times)
- 
- # Memory allocated for caching query results (default:0 (disabled))
--query_cache_size=0
-+loose_query_cache_size=0
- 
- # Do not cache results (default:1)
--query_cache_type=0
-+loose_query_cache_type=0
- 
- # Do not use the privileges mechanisms
- skip_grant_tables
-diff --git a/src/server/storage/mysql-global.conf b/src/server/storage/mysql-global.conf
-index ab4a4a1e3..b67a4ec1e 100644
---- a/src/server/storage/mysql-global.conf
-+++ b/src/server/storage/mysql-global.conf
-@@ -62,7 +62,7 @@ innodb_log_file_size=64M
- log_error=mysql.err
- 
- # print warnings and connection errors (default:1)
--log_warnings=2
-+loose_log_warnings=2
- 
- # Convert table named to lowercase
- lower_case_table_names=1
-@@ -77,10 +77,10 @@ max_connections=256
- # (make sense when having the same query multiple times)
- 
- # Memory allocated for caching query results (default:0 (disabled))
--query_cache_size=0
-+loose_query_cache_size=0
- 
- # Do not cache results (default:1)
--query_cache_type=0
-+loose_query_cache_type=0
- 
- # Do not use the privileges mechanisms
- skip_grant_tables
--- 
-2.30.1
-
diff --git a/kde-apps/akonadi/files/akonadi-21.03.80-mysql56-crash.patch b/kde-apps/akonadi/files/akonadi-21.03.80-mysql56-crash.patch
new file mode 100644
index 000000000000..7cee0b0e815f
--- /dev/null
+++ b/kde-apps/akonadi/files/akonadi-21.03.80-mysql56-crash.patch
@@ -0,0 +1,51 @@
+From ca023c075e5e239dd6d254722c8866b17a524a3c Mon Sep 17 00:00:00 2001
+From: Manuel Nickschas <sputnick@quassel-irc.org>
+Date: Wed, 10 Feb 2021 09:40:44 +0100
+Subject: [PATCH] Find mysql_install_db and add required option
+
+Rebase patch onto 21.03.80
+Gentoo-bug: 530012
+---
+ src/server/storage/dbconfigmysql.cpp | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp
+index fd057670e..c19cff0e0 100644
+--- a/src/server/storage/dbconfigmysql.cpp
++++ b/src/server/storage/dbconfigmysql.cpp
+@@ -53,6 +53,7 @@ static QString findExecutable(const QString &bin)
+         QStringLiteral("/usr/local/sbin"),
+         QStringLiteral("/usr/local/libexec"),
+         QStringLiteral("/usr/libexec"),
++        QStringLiteral("/usr/share/mysql/scripts"),
+         QStringLiteral("/opt/mysql/libexec"),
+         QStringLiteral("/opt/local/lib/mysql5/bin"),
+         QStringLiteral("/opt/mysql/sbin"),
+@@ -597,7 +598,7 @@ bool DbConfigMysql::initializeMariaDBDatabase(const QString &confFile, const QSt
+         == execute(mMysqlInstallDbPath,
+                    {QStringLiteral("--defaults-file=%1").arg(confFile),
+                     QStringLiteral("--force"),
+-                    QStringLiteral("--basedir=%1").arg(baseDir),
++                    QStringLiteral("--basedir=/usr"),
+                     QStringLiteral("--datadir=%1/").arg(dataDir)});
+ }
+ 
+@@ -609,7 +610,7 @@ bool DbConfigMysql::initializeMySQL5_7_6Database(const QString &confFile, const
+ {
+     return 0
+         == execute(mMysqldPath,
+-                   {QStringLiteral("--defaults-file=%1").arg(confFile), QStringLiteral("--initialize"), QStringLiteral("--datadir=%1/").arg(dataDir)});
++                   {QStringLiteral("--defaults-file=%1").arg(confFile), QStringLiteral("--initialize"), QStringLiteral("--basedir=/usr"), QStringLiteral("--datadir=%1/").arg(dataDir)});
+ }
+ 
+ bool DbConfigMysql::initializeMySQLDatabase(const QString &confFile, const QString &dataDir) const
+@@ -629,5 +630,5 @@ bool DbConfigMysql::initializeMySQLDatabase(const QString &confFile, const QStri
+     return 0
+         == execute(
+                mMysqlInstallDbPath,
+-               {QStringLiteral("--defaults-file=%1").arg(confFile), QStringLiteral("--basedir=%1").arg(baseDir), QStringLiteral("--datadir=%1/").arg(dataDir)});
++               {QStringLiteral("--defaults-file=%1").arg(confFile), QStringLiteral("--basedir=/usr"), QStringLiteral("--datadir=%1/").arg(dataDir)});
+ }
+-- 
+2.30.0
+