Revision bump adds patch by Brian Evans <grknight@gentoo.org>, fixes a crash with dev-db/mysql-5.6m bug #530012.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xFDF4F788

5 files changed, 191 insertions, 10 deletions

diff --git a/app-office/akonadi-server/ChangeLog b/app-office/akonadi-server/ChangeLog
index fd1fa63d1992..d8e6d668267c 100644
--- a/app-office/akonadi-server/ChangeLog
+++ b/app-office/akonadi-server/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-office/akonadi-server
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/ChangeLog,v 1.155 2014/12/28 14:53:20 titanofold Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/ChangeLog,v 1.156 2015/06/26 22:30:31 johu Exp $
+
+*akonadi-server-1.13.0-r1 (26 Jun 2015)
+
+  26 Jun 2015; Johannes Huber <johu@gentoo.org>
+  +akonadi-server-1.13.0-r1.ebuild,
+  +files/akonadi-server-1.13.0-mysql56-crash.patch,
+  akonadi-server-1.13.0.ebuild:
+  Revision bump adds patch by Brian Evans <grknight@gentoo.org>, fixes a crash
+  with dev-db/mysql-5.6m bug #530012.
 
   28 Dec 2014; Aaron W. Swenson <titanofold@gentoo.org>
   akonadi-server-1.13.0.ebuild:
diff --git a/app-office/akonadi-server/Manifest b/app-office/akonadi-server/Manifest
index 45fbe8346457..2700022ae900 100644
--- a/app-office/akonadi-server/Manifest
+++ b/app-office/akonadi-server/Manifest
@@ -1,14 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX akonadi-server-1.13.0-mysql56-crash.patch 1520 SHA256 e54b17ec4312321260794214a72b8070af4eae8ea37bcdcb5e79073ad1795d9b SHA512 2a2686bace71d4f8704137065ff2d39da25462365b33c712d1cc30905102313149d6173ee4acb641550b05556f2dc5063e85f52706fa098d983d63a353e8892f WHIRLPOOL 216dd9bcfd7f9bbbe3bfc6cc0cd6575d4e550d27943103f7db7884a7c66832a56611a3e8fb519aaa6627804e015ba03dfb797305637e6b85bd540ef70c8d0543
 DIST akonadi-1.13.0.tar.bz2 294198 SHA256 8c7f690002ea22c139f3a64394aef2e816e00ca47fd971af7d54a66087356dd2 SHA512 4bf2026c3807b5493c9f63d0c2bff2e6db00fbe97a4e2c2f707aaa3bf4a848b70dd9657d8fa1743690e8eeefd967de4895c1329c6bb817a1d023fe398285222f WHIRLPOOL edc18247dd864af48395f4e3187f6a52cdaf4737959b317e3decb10caf138b97258a661eeb11a2ad11f2365fdd053a7c6fe63097ba71c24a12417ee71de54afb
-EBUILD akonadi-server-1.13.0.ebuild 3379 SHA256 41d8073fe32d8e26fbfd2261f38c35b5c7446fc9beda430b27ece076426ff73a SHA512 e2a38209abc3a57ca65a8ee3612552a2abaf62afb1416a445ca3585afb671d3a841638f6ca8dcadb6cc20ce7ac2acfc80663046f00cc33a1cb1a28137b6068ab WHIRLPOOL bdf74a9d373f82d1404b56ecf0aa09ea53c1f784dcf0c2181db970d7c58b2b68c93f36c29c4945cc688a4153f81e6b45cc765423d2a8ed7d226fef57c9ba8c59
-MISC ChangeLog 22885 SHA256 c49fecea005effe8fa6f6fac361a170eda742dea9df029269cf6cdbc16936ce3 SHA512 40c965491fe86a7cf5e426f81e44e4ff0a9614f455c6cfa4bf6b5141218e52fa8f67fc55977ec11dcabd155abbdb6531c8fee0173713bbcaf1294d4821b448da WHIRLPOOL b238f8855e246703b98841bc6110977907ae33c249b7f19735563ede37783b9a7fd3e90742e7b2b700b133ec3ef63be39c09159d9c788fbabd93fd1be2ee6a32
+EBUILD akonadi-server-1.13.0-r1.ebuild 3432 SHA256 9f3e2965abf3302e3b3d5c8ae1f20bf120584ea9e05263857d35de8a8b7165f6 SHA512 30e30735d3dabccb4a1ba40e49ed1755ec285d826c5a0a60c8c985cfd97aad6cccbc36e965188ef55acc1a971f53590bb92a5228236c70602f298cac7a067fc9 WHIRLPOOL 41fb6b37f7e67b699478588aea96164ef479f49dbd1a76309ffa9cc204c31b577abfa914b216cdf482e10322fdfa47c9a8c998f1496d1a4fef4faa3d441c1b61
+EBUILD akonadi-server-1.13.0.ebuild 3374 SHA256 abd2b688afb6aff1ac2f121a3c594f94dc8dd258857a8e161e3795b9849e3178 SHA512 1a810756b51e853db7b64ea533fa565b61b585fecba9e8df8af861d86cdfa09e9ff0dd2b25455e705fd1d93b19c214c203e099e46ad5f85166e0a278350da1d4 WHIRLPOOL 6d7d7c4fc1833bf059a4a47dc9b7ae3b6ed082a5af3ec350ad55c281b1eb0f195efff3df88a0f0aff8e4beeb90a8d3b088b62b5701b7d961f6678e3863bea9ce
+MISC ChangeLog 23206 SHA256 dbf0c686b7bff512fecfb3a162fc5c19f2dfc085e6881ae5fa656a818ed84709 SHA512 09d41621c9301e8b4212a79d5ee2eaf7f1c838d4e4733922c3725636d8a5942a4be222d5d026043c3c8616ceb5d1c187d2a01e3fb71ca16f5b1c22b073477830 WHIRLPOOL 2304913191d4e814f3bf4f41b1c49fe72251487ca96ee3f47a7ac8c48a456b0fb46818c8f68d4f2c80c6df83d08c5817666599850ebd617271c06ec45e7bf088
 MISC metadata.xml 275 SHA256 0602f046fd341806f78a5850c099f697359bcac7eb67327fafb3339bb44c3700 SHA512 18330303bd7767d1dfc9398a35fd59fea5337227056dba883f25f5624ab9fbebbe3bbee7a3f678f82033c07660f95da7c73325ac5a41fd7fed8db6950c2cfdbd WHIRLPOOL c7e9aa255e46fd3bacfa0a1a036673311fcf0dfdd03f28b7076c5c0361f635293095d2a9210750ece0755591ca3fd2d35a1e28bffa00b92c618a22403cec367b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iF0EAREIAAYFAlSgGWEACgkQVxOqA9G7/aDAVAD2LRoRprrPMJxh1D7Q96i4ur1u
-UokXyJHM55r+vRJFCgD+PW/EtwJywxLxGZfULpk64HVZqmL2cyT9e1Fp3/nEiTM=
-=0lT7
+iQJ8BAEBCABmBQJVjdK+XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0N0Y0MTczMjZGRTRGODM5M0MzOTU4RDAy
+OTU0NDVDRUY5MDcyRDJGAAoJEClURc75By0vLNgP/3Gc555/sGEC3Tw8f7hk9lob
+pBZUpd+RAehNuyBIfMkPPZt1mAWlEEsiNMW1W0OopWQtZlD8oTdnPr0pzwX5uMW/
+7WKsjVfATDxMJ+Yc/Ye4C86UfX5IkwtP5whSjMbUm1UtbFZBX7ki2dF9Rw1uojWB
++nfmqI/NOS8O8c2QS63K5NYDD2DxNsdRguaIJdY49zxnzS8p1mRVvbkHH3OwgALk
+ypQeLG78GINgzxa55yPAH9dw2DhKlIs0rzjwG9zJ+zzutJrQP14oFDxjk5bOJwy6
+5dhwlzyZ2ndmpGjXwWxiMJ9IiwFFPjfjZRL3Pq7LDCxWeyZxd89QGC7QDMeQFrWQ
+mnPwoa3yeJnkB59kDea5pUCN9afv0WZ40uXDnPO4w2IPOsvKv/rvdZ8ZFvIIpQrT
+xzucFdJ+vsAyi4Zb3/oA4LuIAQHPOITeHabM6+mlYqfYz2lp3DuBSCcX6wkIuZEg
+S3JvNcXrc9nYwwCXYCJtOMP2Jl1q8a4TEooxWhKJKksoXu8GQBUMq5ldo4nyDjfO
+qvp6YmIHxhmEAeOYeGTEnvxzntUF5WWY+pBdlk9dR4q+6FG7VW3ymphTW81YfFtn
+Gv8Qaq8Fktm8fygAyOTB7ir3OZbChVEywmYDPfOCyrQQo1Hu1VhqNLxgDR3znb0S
+AmpDUMdZ8HuHiB8uYb2T
+=n6qa
 -----END PGP SIGNATURE-----
diff --git a/app-office/akonadi-server/akonadi-server-1.13.0-r1.ebuild b/app-office/akonadi-server/akonadi-server-1.13.0-r1.ebuild
new file mode 100644
index 000000000000..291873229918
--- /dev/null
+++ b/app-office/akonadi-server/akonadi-server-1.13.0-r1.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/akonadi-server-1.13.0-r1.ebuild,v 1.1 2015/06/26 22:30:31 johu Exp $
+
+EAPI=5
+
+if [[ $PV = *9999* ]]; then
+	scm_eclass=git-r3
+	EGIT_REPO_URI=( "git://anongit.kde.org/akonadi" )
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="mirror://kde/stable/${PN/-server/}/src/${P/-server/}.tar.bz2"
+	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	S="${WORKDIR}/${P/-server/}"
+fi
+
+inherit cmake-utils ${scm_eclass}
+
+DESCRIPTION="The server part of Akonadi"
+HOMEPAGE="http://pim.kde.org/akonadi"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="+mysql postgres +qt4 qt5 soprano sqlite test"
+
+REQUIRED_USE="^^ ( qt4 qt5 ) || ( sqlite mysql postgres )"
+
+CDEPEND="
+	dev-libs/boost:=
+	x11-misc/shared-mime-info
+	qt4? (
+		>=dev-qt/qtcore-4.8.5:4
+		>=dev-qt/qtdbus-4.8.5:4
+		>=dev-qt/qtgui-4.8.5:4
+		>=dev-qt/qtsql-4.8.5:4[mysql?,postgres?]
+		>=dev-qt/qttest-4.8.5:4
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtsql:5[mysql?,postgres?]
+		dev-qt/qttest:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml:5
+		soprano? ( dev-libs/soprano[-qt4,qt5] )
+	)
+	soprano? ( dev-libs/soprano )
+	sqlite? ( dev-db/sqlite:3 )
+"
+DEPEND="${CDEPEND}
+	dev-libs/libxslt
+	>=dev-util/automoc-0.9.88
+	test? ( sys-apps/dbus )
+"
+RDEPEND="${CDEPEND}
+	postgres? ( dev-db/postgresql[server] )
+"
+
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}/${P}-mysql56-crash.patch" )
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		[[ $(gcc-major-version) -lt 4 ]] || \
+			( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]] ) \
+			&& die "Sorry, but gcc-4.6 and earlier won't work (see bug #520102)."
+	fi
+}
+
+pkg_setup() {
+	# Set default storage backend in order: MySQL, SQLite PostgreSQL
+	# reverse driver check to keep the order
+	if use postgres; then
+		DRIVER="QPSQL"
+		AVAILABLE+=" ${DRIVER}"
+	fi
+
+	if use sqlite; then
+		DRIVER="QSQLITE3"
+		AVAILABLE+=" ${DRIVER}"
+	fi
+
+	if use mysql; then
+		DRIVER="QMYSQL"
+		AVAILABLE+=" ${DRIVER}"
+	fi
+
+	# Notify about MySQL is recommend by upstream
+	if use sqlite || has_version "<${CATEGORY}/${P}[sqlite]"; then
+		ewarn
+		ewarn "We strongly recommend you change your Akonadi database backend to MySQL in your"
+		ewarn "user configuration. This is the backend recommended by KDE upstream."
+		ewarn "In particular, kde-base/kmail-4.10 does not work properly with the sqlite"
+		ewarn "backend anymore."
+		ewarn "You can select the backend in your ~/.config/akonadi/akonadiserverrc."
+		ewarn "Available drivers are:${AVAILABLE}"
+		ewarn
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DINSTALL_QSQLITE_IN_QT_PREFIX=ON
+		$(cmake-utils_use test AKONADI_BUILD_TESTS)
+		$(cmake-utils_use_with soprano)
+		$(cmake-utils_use sqlite AKONADI_BUILD_QSQLITE)
+		$(cmake-utils_use qt5 QT5_BUILD)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	export $(dbus-launch)
+	cmake-utils_src_test
+}
+
+src_install() {
+	# Who knows, maybe it accidentally fixes our permission issues
+	cat <<-EOF > "${T}"/akonadiserverrc
+[%General]
+Driver=${DRIVER}
+EOF
+	insinto /usr/share/config/akonadi
+	doins "${T}"/akonadiserverrc
+
+	cmake-utils_src_install
+}
+
+pkg_postinst() {
+	elog "${DRIVER} has been set as your default akonadi storage backend."
+	elog "You can override it in your ~/.config/akonadi/akonadiserverrc."
+	elog "Available drivers are: ${AVAILABLE}"
+}
diff --git a/app-office/akonadi-server/akonadi-server-1.13.0.ebuild b/app-office/akonadi-server/akonadi-server-1.13.0.ebuild
index 08ca8a454911..c8a7fac8c6b7 100644
--- a/app-office/akonadi-server/akonadi-server-1.13.0.ebuild
+++ b/app-office/akonadi-server/akonadi-server-1.13.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/akonadi-server-1.13.0.ebuild,v 1.9 2014/12/28 14:53:20 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/akonadi-server-1.13.0.ebuild,v 1.10 2015/06/26 22:30:31 johu Exp $
 
 EAPI=5
 
diff --git a/app-office/akonadi-server/files/akonadi-server-1.13.0-mysql56-crash.patch b/app-office/akonadi-server/files/akonadi-server-1.13.0-mysql56-crash.patch
new file mode 100644
index 000000000000..204961832767
--- /dev/null
+++ b/app-office/akonadi-server/files/akonadi-server-1.13.0-mysql56-crash.patch
@@ -0,0 +1,20 @@
+diff -aruN akonadi-1.13.0.old/server/src/storage/dbconfigmysql.cpp akonadi-1.13.0/server/src/storage/dbconfigmysql.cpp
+--- akonadi-1.13.0.old/server/src/storage/dbconfigmysql.cpp	2014-08-10 06:38:58.000000000 -0400
++++ akonadi-1.13.0/server/src/storage/dbconfigmysql.cpp	2015-01-08 15:08:36.906134212 -0500
+@@ -76,6 +76,7 @@
+       << QLatin1String( "/usr/local/sbin" )
+       << QLatin1String( "/usr/local/libexec" )
+       << QLatin1String( "/usr/libexec" )
++      << QLatin1String( "/usr/share/mysql/scripts" )
+       << QLatin1String( "/opt/mysql/libexec" )
+       << QLatin1String( "/opt/local/lib/mysql5/bin" )
+       << QLatin1String( "/opt/mysql/sbin" );
+@@ -278,7 +279,7 @@
+   // first run, some MySQL versions need a mysql_install_db run for that
+   const QString confFile = XdgBaseDirs::findResourceFile( "config", QLatin1String( "akonadi/mysql-global.conf" ) );
+   if ( QDir( dataDir ).entryList( QDir::NoDotAndDotDot | QDir::AllEntries ).isEmpty() && !mMysqlInstallDbPath.isEmpty() ) {
+-    const QStringList arguments = QStringList() << QString::fromLatin1( "--force" ) << QString::fromLatin1( "--defaults-file=%1" ).arg( confFile ) << QString::fromLatin1( "--datadir=%1/" ).arg( dataDir );
++    const QStringList arguments = QStringList() << QString::fromLatin1( "--force" ) << QString::fromLatin1( "--defaults-file=%1" ).arg( confFile ) << QString::fromLatin1( "--datadir=%1/" ).arg( dataDir ) << QString::fromLatin1( "--basedir=/usr" ) ;
+     QProcess::execute( mMysqlInstallDbPath, arguments );
+   }
+