gentoo resync : 10.02.2019

3 files changed, 60 insertions, 6 deletions

diff --git a/kde-apps/akonadi/Manifest b/kde-apps/akonadi/Manifest
index dbf3dc37e144..c82939f3c87e 100644
--- a/kde-apps/akonadi/Manifest
+++ b/kde-apps/akonadi/Manifest
@@ -1,6 +1,7 @@
 AUX akonadi-17.03.80-mysql56-crash.patch 2064 BLAKE2B a4107b5732d0147e3001484c7c4c5e3bba64909d21656686142cf9d58304d7496dea8d11b72836bbdeee09691d9c1e160445ecf94fc280cca3c35f45c078d969 SHA512 35e89ac8fa7640354a0a0f50abff06ec34075722e4e8f3b6297da7384a3deef62f7826c1a7a08aef72329ab0b6ef3b20b1bbec231674e20733fa15fd388195f7
+AUX akonadi-18.12.2-mysql56-crash.patch 2196 BLAKE2B d12643c870da557f540f199f78462f97fc569ffe160415f56f166d89b7e94e0f6682fa68ed84c9629e66639ddac61b5c54376c309a8921d84a1d52ba351a9aab SHA512 093a0b4243668344db59b0419809500e411f7399137ba3d9c439b4d5300a2f867fb231f7d5a8bc5d95ad2d1ccb6921804caff8200ddddba74a62ddcdfa9ac623
 DIST akonadi-18.08.3.tar.xz 1538188 BLAKE2B 333c86802418f86f2336408d1e63ce16a9fc50267f7d5cb39f177eb6aab1ddc8479fa9384f323f8aad0ac4157d8abfe8de237bcc6bd058b19fe596442c7f20e1 SHA512 ba883902ad83c989bb480712c0b3871e683307ecb121f1d7b3e433b9211056cda209d9640a7bae520fb4b6611950863180b879269797a606af2ac25ae4f24cc0
-DIST akonadi-18.12.1.tar.xz 1552724 BLAKE2B 7e47c48ecbc25b450df9cffabb6b019003f03a66c5fc214db0d183085b9dd9fbbd8443fb6906837e85d3e554a0d603f8e657db8ddf6bb5795a055f9f51b84aac SHA512 9d20f4b283c00f20a0b3c1a40041bb5b1adff6197fef5d6bc12ff7ea013de2809bafa3ffac0f70494b659e5972bc00f73e7df9d7d3d3157deabbebad5811c5ec
+DIST akonadi-18.12.2.tar.xz 1553596 BLAKE2B 7b5378cad08f858a51315d624bf83a6ad2a09af11f288a0009461449ba9e3f3118dd0fbd22b8f99c78c70dd486e2e70f89f6cc58b39d95481b58852dc2bbd4cc SHA512 a78ac757452360252eac2fcafbc01dcc5c84756db16da89c29c7ee8d7fa6deef3bc5b5bc1101c5e99e68b260fcdf1f96a780bef19b7d07198d4c00e546224431
 EBUILD akonadi-18.08.3-r1.ebuild 2952 BLAKE2B 48d6a61ce0246bbec6d67c47a9ae9e77dc395b85660098033ff49c7ee63d5458547233521df0613fac15af791aedc31ad489c9e0c4cfce69e6ae8de1d8badc85 SHA512 bc09fc8a03bcc0ac5ac22a6ee72283ba852167feba801b27b91b40b1de1bc1c962d73ebe602197dbd4fdd4e0e1a422da27428e7aaff7c738d900cd598bb4bc40
-EBUILD akonadi-18.12.1.ebuild 2975 BLAKE2B 3e125b389874d899dfadbf756ff9dc31b11e9c2b522b972e6d3f18c5fa2f76a9b38a917d691107425357de4c94ee79d3cf40cc6efb8112691e0fa388107cb853 SHA512 3e9aae737e1a8d70aa54987b52a69fd52e4781d7953e7f482163c68ddde64e5faf54e083f5808df5bdfe5191eab9235ace72e049e19f936963f4c1b28a4a38ac
+EBUILD akonadi-18.12.2.ebuild 2959 BLAKE2B 6a5d0fe4c2df357065d2f76bcc9c75f997b348f08749651f4dd8b123d87269b08b02d3a468a8a7d7bf0f4afddadd7e2a68a1c4c049f9f79bf7d22e86615be473 SHA512 58045c3c4b3c7312ea81c34b251bc3f52a589609466de27d301582ee4d45fc98e72b401e64b78eb572eb004c6dc1de73f2462520daab1f24b61728cd757c7842
 MISC metadata.xml 410 BLAKE2B 259694dd8c348fbd80f1ef1dd2b2c6e5aa876cfcd2d4b781dd51f3882b22f8899bea347c6c993be3912c5acc3d996bdf88b63f8455bb822490f3d33cc45ce8bd SHA512 28d1be9310a2e9b91f2b93089bd2588da14b0aded9a057f9885782153df3222cd62c885d03374dd59216e408c1e0717074c03445e38b3dfdc7b3ed0b3dd739fa
diff --git a/kde-apps/akonadi/akonadi-18.12.1.ebuild b/kde-apps/akonadi/akonadi-18.12.2.ebuild
index 2702be779843..a4342c4ffe4f 100644
--- a/kde-apps/akonadi/akonadi-18.12.1.ebuild
+++ b/kde-apps/akonadi/akonadi-18.12.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 KDE_DESIGNERPLUGIN="true"
 KDE_TEST="forceoptional"
@@ -18,6 +18,9 @@ IUSE="+mysql postgres sqlite tools xml"
 
 REQUIRED_USE="|| ( mysql postgres sqlite ) test? ( tools )"
 
+BDEPEND="
+	test? ( sys-apps/dbus )
+"
 COMMON_DEPEND="
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
@@ -39,7 +42,6 @@ COMMON_DEPEND="
 	$(add_qt_dep qtsql 'mysql?,postgres?')
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtxml)
-	x11-misc/shared-mime-info
 	sqlite? (
 		$(add_qt_dep qtsql 'sqlite' '' '5=')
 		dev-db/sqlite:3
@@ -49,7 +51,6 @@ COMMON_DEPEND="
 DEPEND="${COMMON_DEPEND}
 	dev-libs/boost
 	dev-libs/libxslt
-	test? ( sys-apps/dbus )
 "
 RDEPEND="${COMMON_DEPEND}
 	!kde-apps/akonadi:4
@@ -63,7 +64,7 @@ RDEPEND="${COMMON_DEPEND}
 # some akonadi tests time out, that probably needs more work as it's ~700 tests
 RESTRICT+=" test"
 
-PATCHES=( "${FILESDIR}/${PN}-17.03.80-mysql56-crash.patch" )
+PATCHES=( "${FILESDIR}/${PN}-18.12.2-mysql56-crash.patch" )
 
 pkg_setup() {
 	# Set default storage backend in order: MySQL, PostgreSQL, SQLite
diff --git a/kde-apps/akonadi/files/akonadi-18.12.2-mysql56-crash.patch b/kde-apps/akonadi/files/akonadi-18.12.2-mysql56-crash.patch
new file mode 100644
index 000000000000..ede8a19d84db
--- /dev/null
+++ b/kde-apps/akonadi/files/akonadi-18.12.2-mysql56-crash.patch
@@ -0,0 +1,52 @@
+From b2ebd0e2d594ae71d4e1db4874f72a655f9eeb12 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Sat, 26 Jan 2019 21:09:14 +0100
+Subject: [PATCH] Find mysql_install_db and add required option
+
+Rebase patch onto 19.03.80
+Gentoo-bug: 530012
+---
+ src/server/storage/dbconfigmysql.cpp | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp
+index dfff6fc29..80039c8ba 100644
+--- a/src/server/storage/dbconfigmysql.cpp
++++ b/src/server/storage/dbconfigmysql.cpp
+@@ -66,6 +66,7 @@ static QString findExecutable(const QString &bin)
+         QStringLiteral("/usr/local/sbin"),
+         QStringLiteral("/usr/local/libexec"),
+         QStringLiteral("/usr/libexec"),
++        QStringLiteral("/usr/share/mysql/scripts"),
+         QStringLiteral("/opt/mysql/libexec"),
+         QStringLiteral("/opt/local/lib/mysql5/bin"),
+         QStringLiteral("/opt/mysql/sbin"),
+@@ -588,7 +589,7 @@ bool DbConfigMysql::initializeMariaDBDatabase(const QString &confFile, const QSt
+     return 0 == execute(mMysqlInstallDbPath, {
+         QStringLiteral("--defaults-file=%1").arg(confFile),
+         QStringLiteral("--force"),
+-        QStringLiteral("--basedir=%1").arg(baseDir),
++        QStringLiteral("--basedir=/usr"),
+         QStringLiteral("--datadir=%1/").arg(dataDir)
+     });
+ }
+@@ -602,6 +603,7 @@ bool DbConfigMysql::initializeMySQL5_7_6Database(const QString &confFile, const
+     return 0 == execute(mMysqldPath, {
+         QStringLiteral("--defaults-file=%1").arg(confFile),
+         QStringLiteral("--initialize"),
++        QStringLiteral("--basedir=/usr"),
+         QStringLiteral("--datadir=%1/").arg(dataDir)
+     });
+ }
+@@ -622,7 +624,7 @@ bool DbConfigMysql::initializeMySQLDatabase(const QString &confFile, const QStri
+     // Don't use --force, it has been removed in MySQL 5.7.5
+     return 0 == execute(mMysqlInstallDbPath, {
+         QStringLiteral("--defaults-file=%1").arg(confFile),
+-        QStringLiteral("--basedir=%1").arg(baseDir),
++        QStringLiteral("--basedir=/usr"),
+         QStringLiteral("--datadir=%1/").arg(dataDir)
+     });
+ }
+-- 
+2.20.1
+