summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Palimaka <kensington@gentoo.org>2016-09-15 21:33:27 +1000
committerMichael Palimaka <kensington@gentoo.org>2016-09-15 21:38:26 +1000
commit5bc2531e9317b8679cc9e1ae68ee5883518bb613 (patch)
tree29fde51ed18962fcd1f1c5cf98f58ba728bc67f7 /kde-apps/akonadi
parentprofiles: mask >=kde-apps/minuet-16.08.0 as it requires masked Qt 5.7 (diff)
downloadgentoo-5bc2531e9317b8679cc9e1ae68ee5883518bb613.tar.gz
gentoo-5bc2531e9317b8679cc9e1ae68ee5883518bb613.tar.bz2
gentoo-5bc2531e9317b8679cc9e1ae68ee5883518bb613.zip
kde-apps: version bump 16.08.1
Package-Manager: portage-2.3.0
Diffstat (limited to 'kde-apps/akonadi')
-rw-r--r--kde-apps/akonadi/Manifest1
-rw-r--r--kde-apps/akonadi/akonadi-16.08.1.ebuild120
-rw-r--r--kde-apps/akonadi/files/akonadi-16.07.80-mysql56-crash.patch42
-rw-r--r--kde-apps/akonadi/metadata.xml12
4 files changed, 175 insertions, 0 deletions
diff --git a/kde-apps/akonadi/Manifest b/kde-apps/akonadi/Manifest
new file mode 100644
index 000000000000..fd39d6d13940
--- /dev/null
+++ b/kde-apps/akonadi/Manifest
@@ -0,0 +1 @@
+DIST akonadi-16.08.1.tar.xz 1021900 SHA256 c109ad2b370513be89328926c77c00239266ab28193de07759297c9474c4a4ce SHA512 4dadab4920df60fa8607ba508946f22884e1a9e6dc9685e672d00093ac84108bfe7609656a1c9f3e593fed4a3907c5c153714216e420bcecf209ec1c917af4b8 WHIRLPOOL 7c703b64ae52183c24e85df9e1f94cfe05c8fc8e60f6eac7a9eb9d2c1a1e4a51d86fa45c6edd3caccda60e4ea54deaca1e17b60be0a0c208b1c1da5a0a2ff422
diff --git a/kde-apps/akonadi/akonadi-16.08.1.ebuild b/kde-apps/akonadi/akonadi-16.08.1.ebuild
new file mode 100644
index 000000000000..72ba8029757d
--- /dev/null
+++ b/kde-apps/akonadi/akonadi-16.08.1.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_DESIGNERPLUGIN="true"
+KDE_TEST="forceoptional"
+VIRTUALDBUS_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Storage service for PIM data and libraries for PIM apps"
+HOMEPAGE="https://pim.kde.org/akonadi"
+KEYWORDS="~amd64 ~x86"
+LICENSE="LGPL-2.1+"
+IUSE="+mysql postgres sqlite tools xml"
+
+REQUIRED_USE="|| ( sqlite mysql postgres ) test? ( tools )"
+
+# drop qtgui subslot operator when QT_MINIMAL >= 5.7.0
+COMMON_DEPEND="
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kitemmodels)
+ $(add_frameworks_dep kitemviews)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtgui '' '' '5=')
+ $(add_qt_dep qtnetwork)
+ $(add_qt_dep qtsql 'mysql?,postgres?')
+ $(add_qt_dep qtwidgets)
+ $(add_qt_dep qtxml)
+ x11-misc/shared-mime-info
+ sqlite? ( dev-db/sqlite:3 )
+ tools? ( xml? ( dev-libs/libxml2 ) )
+"
+DEPEND="${COMMON_DEPEND}
+ dev-libs/boost
+ dev-libs/libxslt
+ test? ( sys-apps/dbus )
+"
+RDEPEND="${COMMON_DEPEND}
+ mysql? ( virtual/mysql )
+ postgres? ( dev-db/postgresql )
+ !app-office/akonadi-server
+ !kde-apps/kdepimlibs
+"
+
+# some akonadi tests time out, that probably needs more work as it's ~700 tests
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}/${PN}-16.07.80-mysql56-crash.patch" )
+
+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-apps/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=(
+ -DAKONADI_BUILD_QSQLITE=$(usex sqlite)
+ -DBUILD_TOOLS=$(usex tools)
+ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
+ )
+
+ kde5_src_configure
+}
+
+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
+
+ kde5_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/kde-apps/akonadi/files/akonadi-16.07.80-mysql56-crash.patch b/kde-apps/akonadi/files/akonadi-16.07.80-mysql56-crash.patch
new file mode 100644
index 000000000000..773b523f9d81
--- /dev/null
+++ b/kde-apps/akonadi/files/akonadi-16.07.80-mysql56-crash.patch
@@ -0,0 +1,42 @@
+Gentoo-bug: 530012
+
+diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp
+index db0c100..cdd8c6b 100644
+--- a/src/server/storage/dbconfigmysql.cpp
++++ b/src/server/storage/dbconfigmysql.cpp
+@@ -80,6 +80,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");
+@@ -500,7 +501,8 @@ bool DbConfigMysql::initializeMariaDBDatabase(const QString &confFile, const QSt
+ return 0 == execute(mMysqlInstallDbPath,
+ { QStringLiteral("--defaults-file=%1").arg(confFile),
+ QStringLiteral("--force"),
+- QStringLiteral("--datadir=%1/").arg(dataDir) });
++ QStringLiteral("--datadir=%1/").arg(dataDir),
++ QStringLiteral("--basedir=/usr") });
+ }
+
+ /**
+@@ -512,7 +514,8 @@ 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("--datadir=%1/").arg(dataDir),
++ QStringLiteral("--basedir=/usr") });
+ }
+
+ bool DbConfigMysql::initializeMySQLDatabase(const QString &confFile, const QString &dataDir) const
+@@ -520,5 +523,6 @@ 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("--datadir=%1/").arg(dataDir) });
++ QStringLiteral("--datadir=%1/").arg(dataDir),
++ QStringLiteral("--basedir=/usr") });
+ }
diff --git a/kde-apps/akonadi/metadata.xml b/kde-apps/akonadi/metadata.xml
new file mode 100644
index 000000000000..58d880b38b44
--- /dev/null
+++ b/kde-apps/akonadi/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
+ <use>
+ <flag name="designer">Install plugin for <pkg>dev-qt/designer</pkg></flag>
+ <flag name="tools">Install tools for developers and testing</flag>
+ </use>
+</pkgmetadata>