commit: 9c25182bfdb820aae4d041988032af7b33c3b98c Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> AuthorDate: Tue Mar 8 14:18:13 2016 +0000 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> CommitDate: Tue Mar 8 14:18:13 2016 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=9c25182b
app-office/akonadi-server: moved to main tree .../akonadi-server-1.13.1_pre20160203-r1.ebuild | 134 --------------------- .../akonadi-server-1.13.0-mysql56-crash.patch | 20 --- .../files/akonadi-server-1.13.1-mysql.conf.patch | 38 ------ app-office/akonadi-server/metadata.xml | 8 -- 4 files changed, 200 deletions(-) diff --git a/app-office/akonadi-server/akonadi-server-1.13.1_pre20160203-r1.ebuild b/app-office/akonadi-server/akonadi-server-1.13.1_pre20160203-r1.ebuild deleted file mode 100644 index e94e994..0000000 --- a/app-office/akonadi-server/akonadi-server-1.13.1_pre20160203-r1.ebuild +++ /dev/null @@ -1,134 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -if [[ $PV = *9999* ]]; then - scm_eclass=git-r3 - EGIT_REPO_URI=( "git://anongit.kde.org/akonadi" ) - SRC_URI="" - KEYWORDS="" -else - if [[ $PV = *_pre* ]]; then - COMMIT_ID="18ed37d89b8185ac15a8bfe245de8a88d17f2c64" - SRC_URI="https://quickgit.kde.org/?p=akonadi.git&a=snapshot&h=${COMMIT_ID}&fmt=tgz -> ${P}.tar.gz" - S="${WORKDIR}/${PN/-server/}" - else - SRC_URI="mirror://kde/stable/${PN/-server/}/src/${P/-server/}.tar.bz2" - S="${WORKDIR}/${P/-server/}" - fi - KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" -fi - -inherit cmake-utils ${scm_eclass} - -DESCRIPTION="The server part of Akonadi" -HOMEPAGE="https://pim.kde.org/akonadi"; - -LICENSE="LGPL-2.1" -SLOT="0" -IUSE="+mysql postgres sqlite test" - -REQUIRED_USE="|| ( sqlite mysql postgres )" - -CDEPEND=" - dev-libs/boost:= - >=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 - x11-misc/shared-mime-info - sqlite? ( dev-db/sqlite:3 ) -" -DEPEND="${CDEPEND} - dev-libs/libxslt - >=dev-util/automoc-0.9.88 - test? ( sys-apps/dbus ) -" -RDEPEND="${CDEPEND} - mysql? ( virtual/mysql ) - postgres? ( dev-db/postgresql[server] ) -" - -RESTRICT="test" - -PATCHES=( - "${FILESDIR}/${PN}-1.13.0-mysql56-crash.patch" - "${FILESDIR}/${PN}-1.13.1-mysql.conf.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. PostgreSQL" - ewarn "is also known to work very well but requires manual dump and import on major" - ewarn "upgrades of the DB." - 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 - -DWITH_SOPRANO=FALSE - -DAKONADI_BUILD_TESTS=$(usex test) - -DAKONADI_BUILD_QSQLITE=$(usex sqlite) - -DQT5_BUILD=OFF - ) - - 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/files/akonadi-server-1.13.0-mysql56-crash.patch b/app-office/akonadi-server/files/akonadi-server-1.13.0-mysql56-crash.patch deleted file mode 100644 index 2049618..0000000 --- a/app-office/akonadi-server/files/akonadi-server-1.13.0-mysql56-crash.patch +++ /dev/null @@ -1,20 +0,0 @@ -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 ); - } - diff --git a/app-office/akonadi-server/files/akonadi-server-1.13.1-mysql.conf.patch b/app-office/akonadi-server/files/akonadi-server-1.13.1-mysql.conf.patch deleted file mode 100644 index a090636..0000000 --- a/app-office/akonadi-server/files/akonadi-server-1.13.1-mysql.conf.patch +++ /dev/null @@ -1,38 +0,0 @@ -From: Daniel Vrátil <[email protected]> -Date: Tue, 16 Feb 2016 17:26:22 +0000 -Subject: Drop mysql.conf option removed in MySQL 5.7 -X-Git-Url: http://quickgit.kde.org/?p=akonadi.git&a=commitdiff&h=9a9f7eaa38023f70c6fa85a87359a487ccf7a48c ---- -Drop mysql.conf option removed in MySQL 5.7 - -innodb_additional_mem_pool_size option has been deprecated in MySQL 5.6 -and removed in 5.7 so MySQL will no longer start it the option is present -in mysql.conf. - -The option still seems to be supported by MariaDB, but the default value -we had in the mysql.conf was below the minimum allowed value, so the harm -in removing the option for MariaDB should be minimal. - -If options supported by MySQL and MariaDB begin to diverge more in the future -we might consider having separate config files for each database. - -* 2016-02-21: Adjusted path for 1.13 branch ---- - - ---- a/server/src/storage/mysql-global.conf -+++ b/server/src/storage/mysql-global.conf -@@ -37,9 +37,9 @@ - # use InnoDB for transactions and better crash recovery - default_storage_engine=innodb - --# memory pool InnoDB uses to store data dictionary information and other internal data structures (default:1M) --# Deprecated in MySQL >= 5.6.3 --innodb_additional_mem_pool_size=1M -+# memory pool InnoDB uses to store data dictionary information and other internal data structures (default:8M) -+# Deprecated in MySQL >= 5.6.3, removed in 5.7 (works in MariaDB) -+# innodb_additional_mem_pool_size=8M - - # memory buffer InnoDB uses to cache data and indexes of its tables (default:128M) - # Larger values means less I/O - diff --git a/app-office/akonadi-server/metadata.xml b/app-office/akonadi-server/metadata.xml deleted file mode 100644 index 2fdbf33..0000000 --- a/app-office/akonadi-server/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="project"> - <email>[email protected]</email> - <name>Gentoo KDE Project</name> - </maintainer> -</pkgmetadata>
