6 files changed, 3 insertions, 306 deletions
diff --git a/kde-apps/akonadi/Manifest b/kde-apps/akonadi/Manifest
index 7577acf5238d..ec2a7261d870 100644
--- a/kde-apps/akonadi/Manifest
+++ b/kde-apps/akonadi/Manifest
@@ -1,10 +1,4 @@
-AUX akonadi-1.13.0-mysql56-crash.patch 1520 BLAKE2B c0ae3186a8167c2cfb983bf29b856877da272ab0c1fbc71f242123b664739506cb9286f269791cf4ff07924d93299b9fed96b98f751cd9584cab9d392498549d SHA512 2a2686bace71d4f8704137065ff2d39da25462365b33c712d1cc30905102313149d6173ee4acb641550b05556f2dc5063e85f52706fa098d983d63a353e8892f
-AUX akonadi-1.13.1-mysql.conf.patch 1554 BLAKE2B 3cc948b4500e9f581b19ddfc01d5eaf06459264f483aa7173becb15b090b0a7137d395714bfe5e0d629d0ddff160e0cfb1dd6de5cfc10a4ebeafe4aab78c347f SHA512 ac0bde2a2e6c938f3921dc9386fbeabba0dcc6835d6072ab2859772868fc08392be26f300fff907c574bda993e33636f9d0610d4935429384bfb7dfd669c50de
 AUX akonadi-17.03.80-mysql56-crash.patch 2064 BLAKE2B a4107b5732d0147e3001484c7c4c5e3bba64909d21656686142cf9d58304d7496dea8d11b72836bbdeee09691d9c1e160445ecf94fc280cca3c35f45c078d969 SHA512 35e89ac8fa7640354a0a0f50abff06ec34075722e4e8f3b6297da7384a3deef62f7826c1a7a08aef72329ab0b6ef3b20b1bbec231674e20733fa15fd388195f7
-DIST akonadi-1.13.1_pre20160203.tar.gz 384556 SHA256 4243b32e529be6aadc38dc4463cb6e7cede9442c05cfc04ba679dde28f37aa96 SHA512 0ef8213f504ad1e500a2c1ce19a7575cd1fd8b7ffc7e5fb0bd2437639d8c458c47bbfea7734fcd3e200136a661331dde32af0b064f0b25d324138ce6e35d15f3 WHIRLPOOL 69eff1889a19f8d5714d7e71a106871172cd25c651ea30046ab81270cf7e46c7a1983cf20fd8d5fd8ad243d70e881be705d57b0b93b54248d086e7b253a4873a
-DIST akonadi-17.04.3.tar.xz 1302964 SHA256 89e0476892a9b43ae0686e059f6caa0e2bba47955920e3424f5315b1cba7ad31 SHA512 1e7380bdadb9d73b20fcbe1a5b5a44246c273da8aca92bf12a9dcc2b0c69c58f2f107a7a42af81c25c0697305ad4e401252a492e7bdd47285a9d523f4b3b0090 WHIRLPOOL 8a9d52b368f7f852c08271ccb98af2000b1863923cc500915acd0d62b8ea0636e6d9aa1bcaec79150b00b4b501d96cdb447f988c7dd374da05446c43ceff2559
-DIST akonadi-17.08.3.tar.xz 1427896 SHA256 54098782c6de7db9f3e3a30e26f56d71d8ffd8e8f9b42b9b393b1db30a035607 SHA512 bd2a8832ba02b4c39aa2d004722559921a40c39d5bfd6660a0c1fe1d3a2f7103bda59849a45523f3d53b6a02d8686770cb304cbc04ad056fb9627d602b992adb WHIRLPOOL 0c068bc1e2a9876d2535dd92074665eb588a6889c51ad1881fd96abc6bd09b302bc8edad77df6b6918bde39ab1b9016ae3bd74af0877e59efe207dcebe19d3d2
-EBUILD akonadi-1.13.1_pre20160203-r1.ebuild 3145 BLAKE2B b6eeb1fce5af13c7236e94563c40e74cd4acd512b748fb48842acc9074640d5b5951b3acd5ebc2b1a9fab7ac0f7ebb969ae9d7401d84ba0e9abfb5b637261db2 SHA512 3ed71f6027512abddf44ac8abcbee8e32204a210146c04786d9c30754d45943766d4c2ab326dbaa6c7f65e2375b1e986e86dd9a26756c25b1a3f8601d9d44e76
-EBUILD akonadi-17.04.3-r1.ebuild 2959 BLAKE2B a132b8641c8a04f01bb0eadbbe2b75f5a957d07e9a5eddf22315b79b773d25d589cdade20a83565e3042ccd1697501ff8e4c83a9b0c0c101f30437516ac05a6b SHA512 a156ca7a0e586b508de581ae2c3b25acde99c572326834408c8f7f5e9562720da155e3166263c869357f6ebad157cece97a1ff64d9cce1cafd95a982e5cf2b2f
-EBUILD akonadi-17.08.3.ebuild 2956 BLAKE2B 820e98afd0af71e4a77caf97e570ba0058dc7b277d212d141ce146371b887aaf7dc2eb87ea8a9a91518319ba5990253658c15b39eb561320b68f4d97e3d783a4 SHA512 c33db647ce08a1ea02c00d390aa877d4ddd5b5beb146c650955adf0e5a8b5e62541de316d3b6060a8ff69a729aa38124bb26e1f4f19746822b39e44c8c0e4507
+DIST akonadi-17.08.3.tar.xz 1427896 BLAKE2B 37e19d5afb0911bf2002392e0579ea33429a5dc8ec5ddbf3c8e8fa5ec21b014dea5267e353cf5ab94927fa8444cacf9948c001de34a9acc730a891b96da7c0a5 SHA512 bd2a8832ba02b4c39aa2d004722559921a40c39d5bfd6660a0c1fe1d3a2f7103bda59849a45523f3d53b6a02d8686770cb304cbc04ad056fb9627d602b992adb
+EBUILD akonadi-17.08.3.ebuild 2954 BLAKE2B 6767c7c38275bca9ab36869e077a1dda34e278ff0f162f25e50031f46ea2df202aa934a62ef286e13dae428f741dfedab53db0391898e0b73eb236a757555a55 SHA512 ef19796ef4ac0152e6eb105dbad17373fdf22bf034385d06f4cb9c6cf435285d7469ea1b2f93bd6ee52591c74ea0497d41d1432cf702ea3cc2b786718b208c3a
 MISC metadata.xml 410 BLAKE2B 259694dd8c348fbd80f1ef1dd2b2c6e5aa876cfcd2d4b781dd51f3882b22f8899bea347c6c993be3912c5acc3d996bdf88b63f8455bb822490f3d33cc45ce8bd SHA512 28d1be9310a2e9b91f2b93089bd2588da14b0aded9a057f9885782153df3222cd62c885d03374dd59216e408c1e0717074c03445e38b3dfdc7b3ed0b3dd739fa
diff --git a/kde-apps/akonadi/akonadi-1.13.1_pre20160203-r1.ebuild b/kde-apps/akonadi/akonadi-1.13.1_pre20160203-r1.ebuild
deleted file mode 100644
index bdc92a8cd73f..000000000000
--- a/kde-apps/akonadi/akonadi-1.13.1_pre20160203-r1.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} = *_pre* ]]; then
-	# KDE quickgit https certificate issue
-	# COMMIT_ID="18ed37d89b8185ac15a8bfe245de8a88d17f2c64"
-	# SRC_URI="https://quickgit.kde.org/?p=${PN}.git&a=snapshot&h=${COMMIT_ID}&fmt=tgz -> ${P}.tar.gz"
-	SRC_URI="https://dev.gentoo.org/~johu/distfiles/${P}.tar.gz"
-	S="${WORKDIR}/${PN}"
-else
-	SRC_URI="mirror://kde/stable/${PN}/src/${P}.tar.bz2"
-fi
-inherit cmake-utils
-
-DESCRIPTION="The server part of Akonadi"
-HOMEPAGE="https://pim.kde.org/akonadi"
-
-LICENSE="LGPL-2.1"
-SLOT="4"
-KEYWORDS="amd64 ~arm x86"
-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 ]] && tc-is-gcc; 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/kde-apps/akonadi/akonadi-17.04.3-r1.ebuild b/kde-apps/akonadi/akonadi-17.04.3-r1.ebuild
deleted file mode 100644
index db5b68776557..000000000000
--- a/kde-apps/akonadi/akonadi-17.04.3-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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 ~arm x86"
-LICENSE="LGPL-2.1+"
-IUSE="+mysql postgres sqlite tools xml"
-
-REQUIRED_USE="|| ( mysql postgres sqlite ) 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 kcrash)
-	$(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 )
-	xml? ( dev-libs/libxml2 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	dev-libs/libxslt
-	test? ( sys-apps/dbus )
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-l10n
-	!kde-apps/kdepimlibs
-	mysql? (
-		virtual/mysql
-		!>=dev-db/mariadb-10.2
-	)
-	postgres? ( dev-db/postgresql )
-"
-
-# 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" )
-
-pkg_setup() {
-	# Set default storage backend in order: MySQL, PostgreSQL, SQLite
-	# reverse driver check to keep the order
-	use sqlite && DRIVER="QSQLITE3"
-	use postgres && DRIVER="QPSQL"
-	use mysql && DRIVER="QMYSQL"
-
-	if use sqlite || has_version "<${CATEGORY}/${P}[sqlite]"; then
-		ewarn "We strongly recommend you change your Akonadi database backend to either MySQL"
-		ewarn "or PostgreSQL in your user configuration."
-		ewarn "In particular, kde-apps/kmail does not work properly with the sqlite backend."
-	fi
-
-	kde5_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DAKONADI_BUILD_QSQLITE=$(usex sqlite)
-		-DBUILD_TOOLS=$(usex tools)
-		$(cmake-utils_use_find_package xml LibXml2)
-	)
-
-	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() {
-	kde5_pkg_postinst
-	elog "You can select the storage backend in ~/.config/akonadi/akonadiserverrc."
-	elog "Available drivers are:"
-	use mysql && elog "  QMYSQL"
-	use postgres && elog "  QPSQL"
-	use sqlite && elog "  QSQLITE3"
-	elog "${DRIVER} has been set as your default akonadi storage backend."
-}
diff --git a/kde-apps/akonadi/akonadi-17.08.3.ebuild b/kde-apps/akonadi/akonadi-17.08.3.ebuild
index 570fcee42d36..d8f7fe958d80 100644
--- a/kde-apps/akonadi/akonadi-17.08.3.ebuild
+++ b/kde-apps/akonadi/akonadi-17.08.3.ebuild
@@ -12,7 +12,7 @@ inherit kde5
 DESCRIPTION="Storage service for PIM data and libraries for PIM apps"
 HOMEPAGE="https://community.kde.org/KDE_PIM/akonadi"
 
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 LICENSE="LGPL-2.1+"
 IUSE="+mysql postgres sqlite tools xml"
 
diff --git a/kde-apps/akonadi/files/akonadi-1.13.0-mysql56-crash.patch b/kde-apps/akonadi/files/akonadi-1.13.0-mysql56-crash.patch
deleted file mode 100644
index 204961832767..000000000000
--- a/kde-apps/akonadi/files/akonadi-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/kde-apps/akonadi/files/akonadi-1.13.1-mysql.conf.patch b/kde-apps/akonadi/files/akonadi-1.13.1-mysql.conf.patch
deleted file mode 100644
index a090636e7256..000000000000
--- a/kde-apps/akonadi/files/akonadi-1.13.1-mysql.conf.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From: Daniel Vrátil <dvratil@kde.org>
-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
-