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

["Michael Palimaka" <kensington@gentoo.org>]

commit:     1589c52d73fec56308a9f55735c8a4296553dd3e
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Wed Jun 15 16:24:15 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Jun 15 16:24:15 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=1589c52d

kde-apps/akonadi: Fix configure with updated patch

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 +-
 .../files/akonadi-15.12-mysql56-crash.patch        | 23 ----------------------
 3 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/kde-apps/akonadi/akonadi-16.04.2.ebuild b/kde-apps/akonadi/akonadi-16.04.2.ebuild
index ceb6560..b75a579 100644
--- a/kde-apps/akonadi/akonadi-16.04.2.ebuild
+++ b/kde-apps/akonadi/akonadi-16.04.2.ebuild
@@ -59,7 +59,7 @@ RDEPEND="${COMMON_DEPEND}
 # some akonadi tests time out, that probably needs more work as it's ~700 tests
 RESTRICT="test"
 
-PATCHES=( "${FILESDIR}/${PN}-15.12-mysql56-crash.patch" )
+PATCHES=( "${FILESDIR}/${PN}-16.07.80-mysql56-crash.patch" )
 
 pkg_setup() {
 	# Set default storage backend in order: MySQL, SQLite PostgreSQL

diff --git a/kde-apps/akonadi/akonadi-16.04.49.9999.ebuild b/kde-apps/akonadi/akonadi-16.04.49.9999.ebuild
index 9ba8545..21fbf51 100644
--- a/kde-apps/akonadi/akonadi-16.04.49.9999.ebuild
+++ b/kde-apps/akonadi/akonadi-16.04.49.9999.ebuild
@@ -59,7 +59,7 @@ RDEPEND="${COMMON_DEPEND}
 # some akonadi tests time out, that probably needs more work as it's ~700 tests
 RESTRICT="test"
 
-PATCHES=( "${FILESDIR}/${PN}-15.12-mysql56-crash.patch" )
+PATCHES=( "${FILESDIR}/${PN}-16.07.80-mysql56-crash.patch" )
 
 pkg_setup() {
 	# Set default storage backend in order: MySQL, SQLite PostgreSQL

diff --git a/kde-apps/akonadi/files/akonadi-15.12-mysql56-crash.patch b/kde-apps/akonadi/files/akonadi-15.12-mysql56-crash.patch
deleted file mode 100644
index d67c964..0000000
--- a/kde-apps/akonadi/files/akonadi-15.12-mysql56-crash.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Gentoo-bug: 530012
-
-diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp
-index 517f4bc..a7a3f38 100644
---- a/src/server/storage/dbconfigmysql.cpp
-+++ b/src/server/storage/dbconfigmysql.cpp
-@@ -78,6 +78,7 @@ bool DbConfigMysql::init(QSettings &settings)
-                                          << 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");
-@@ -287,7 +288,7 @@ bool DbConfigMysql::startInternalServer()
-     // first run, some MySQL versions need a mysql_install_db run for that
-     const QString confFile = XdgBaseDirs::findResourceFile("config", QStringLiteral("akonadi/mysql-global.conf"));
-     if (QDir(dataDir).entryList(QDir::NoDotAndDotDot | QDir::AllEntries).isEmpty() && !mMysqlInstallDbPath.isEmpty()) {
--        const QStringList arguments = QStringList() << QStringLiteral("--force") << QStringLiteral("--defaults-file=%1").arg(confFile) << QStringLiteral("--datadir=%1/").arg(dataDir);
-+        const QStringList arguments = QStringList() << QStringLiteral("--force") << QStringLiteral("--defaults-file=%1").arg(confFile) << QStringLiteral("--datadir=%1/").arg(dataDir) << QString::fromLatin1( "--basedir=/usr" ) ;
-         QProcess::execute(mMysqlInstallDbPath, arguments);
-     }
-