gentoo Easter resync : 12.04.2020

3 files changed, 3 insertions, 132 deletions

diff --git a/kde-apps/akonadi/Manifest b/kde-apps/akonadi/Manifest
index 899ceb2fe3a3..71327962a6cb 100644
--- a/kde-apps/akonadi/Manifest
+++ b/kde-apps/akonadi/Manifest
@@ -1,6 +1,4 @@
 AUX akonadi-18.12.2-mysql56-crash.patch 2196 BLAKE2B d12643c870da557f540f199f78462f97fc569ffe160415f56f166d89b7e94e0f6682fa68ed84c9629e66639ddac61b5c54376c309a8921d84a1d52ba351a9aab SHA512 093a0b4243668344db59b0419809500e411f7399137ba3d9c439b4d5300a2f867fb231f7d5a8bc5d95ad2d1ccb6921804caff8200ddddba74a62ddcdfa9ac623
-DIST akonadi-19.08.3.tar.xz 1579468 BLAKE2B c7df5162768a00d395d598a098a25aa789c2e9694958cef47a014a744b4e7322471b3855963fb1ec63708608a59c29f5cdbf7049848d8a44ad7e88366316c18f SHA512 612cf8860476c32462dfa565c392a94f7fdb60953dc3afe7ea87ffdd9e78ec5f01e44aaf2ba0c6b018fa0f4cc75d1c56da1211daa13eb9589f270c2761da1e6e
-DIST akonadi-19.12.2.tar.xz 1582656 BLAKE2B 7ff246a1e9bd2813c4c42b972d339009625dffe11fb72872aa1b18debbf1b9178da5a098cefe87a2cbc441cebd02690afbef495656977ad4a47b23db30f260fd SHA512 940ce14b637bcde5f77fa57e90e49d5606b07d2920f0734c12dd801fc3dd79bfa8e7278cfcec725ea2a5c7024ba71f4eaf389a2255176b376079dd409a48fe73
-EBUILD akonadi-19.08.3.ebuild 3637 BLAKE2B 281ee22e026301c8adac6744a2a407d44d44361d0f74ad70976c42febe7ea037ce3b78b8078ce6582f13a593c930baf1754771f0779a7d67d7b6ff0713bb224b SHA512 984eb91c0df1d3ba316a28633139419f8df48cc8f1d454cce738474497e740aa63f4cf5e42dde6c310ca87da59466b11617f99feb41de6c6a286384484872e99
-EBUILD akonadi-19.12.2.ebuild 3818 BLAKE2B 363347eb64217a37d2be25691f3131a72a253c4b37f2b1855b8cfe075a0622e7f6a4f78ed8386a1fec7b8fc2993743c988b1419a5d759029064e317b7ebc4386 SHA512 e78adbb9722db86f5c42ce337aee30607b2618b4f286f326828df8a58010242bc2b1cbc315c5aa4d2df91fe87e452419e71cd8ddc81310d1e57fefa335900f59
+DIST akonadi-19.12.3.tar.xz 1583264 BLAKE2B 32bf2f3821628624216c8afe57988739a8b62808c3e17b13d907d9e88e271f5391210ec13e5620bde7550bf706ee305775b213e84032450b499b5a32fa2242fd SHA512 d8eb31948a649e4f3ba4d5d000a384d1188075aee8971fea401cfb9e392e111c4f2b19888783ea4a9430443c9c216ea7a2a8275555935cc3965335bfc07296b0
+EBUILD akonadi-19.12.3.ebuild 3815 BLAKE2B 408e58b97c01cc2b8a80c72065c1bdeb6fbd31cc31c0dde34c551632fd13d56a1e9864bb2a85a2b40bd45a875fe23e89a7cdb19d3ec43ce1e58c7d4bf3b66ec1 SHA512 b95bc4ef4c6e158bc0b91d9faaee822fd1fae882170c5b5df97570f88e943cc9df740f4b187959059db5a7704969e05d7cd71b29e7d0f92240932161564b3446
 MISC metadata.xml 491 BLAKE2B f4d942600308e7fbc604467130f087b7dc9c22f92a21aa89224cdabe9b822b1b8f0986e14efa5e1d5206718f3dc837b00c926b559ee32b21b71cff09fe0ee0d0 SHA512 fbb184c959335ec38a98faa983f67eed457c7eaa7c401261c5b7c0401d813d7a9a4521001376c6d70d76b98286446346ae1592dfbf3771b8112591bc3fe2472e
diff --git a/kde-apps/akonadi/akonadi-19.08.3.ebuild b/kde-apps/akonadi/akonadi-19.08.3.ebuild
deleted file mode 100644
index 6f92902e7f16..000000000000
--- a/kde-apps/akonadi/akonadi-19.08.3.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_DESIGNERPLUGIN="true"
-ECM_TEST="forceoptional"
-VIRTUALDBUS_TEST="true"
-VIRTUALX_REQUIRED="test"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Storage service for PIM data and libraries for PIM apps"
-HOMEPAGE="https://community.kde.org/KDE_PIM/akonadi"
-
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 x86"
-LICENSE="LGPL-2.1+"
-IUSE="+mysql postgres sqlite tools xml"
-
-REQUIRED_USE="|| ( mysql postgres sqlite ) test? ( tools )"
-
-COMMON_DEPEND="
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5[mysql?,postgres?]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	sqlite? (
-		>=dev-qt/qtsql-${QTMIN}:5=[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/kapptemplate-17.11.80
-	!kde-apps/kdepim-l10n
-	!kde-apps/kdepimlibs
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql )
-"
-
-# some akonadi tests time out, that probably needs more work as it's ~700 tests
-RESTRICT+=" test"
-
-PATCHES=( "${FILESDIR}/${PN}-18.12.2-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 mysql && has_version ">=dev-db/mariadb-10.4"; then
-		ewarn "If an existing Akonadi QMYSQL database is being upgraded using"
-		ewarn ">=dev-db/mariadb-10.4 and KMail stops fetching and sending mail,"
-		ewarn "check ~/.local/share/akonadi/akonadiserver.error for errors like:"
-		ewarn "  \"Cannot add or update a child row: a foreign key constraint fails\""
-		ewarn
-		ewarn "Manual steps are required to fix it, see also:"
-		ewarn "  https://bugs.gentoo.org/688746 (see Whiteboard)"
-		ewarn "  https://bugs.kde.org/show_bug.cgi?id=409224"
-		ewarn
-	fi
-
-	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
-
-	ecm_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DAKONADI_BUILD_QSQLITE=$(usex sqlite)
-		-DBUILD_TOOLS=$(usex tools)
-		$(cmake_use_find_package xml LibXml2)
-	)
-
-	ecm_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
-
-	ecm_src_install
-}
-
-pkg_postinst() {
-	ecm_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-19.12.2.ebuild b/kde-apps/akonadi/akonadi-19.12.3.ebuild
index 99c0dfac96ed..e4b212c938e4 100644
--- a/kde-apps/akonadi/akonadi-19.12.2.ebuild
+++ b/kde-apps/akonadi/akonadi-19.12.3.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="Storage service for PIM data and libraries for PIM apps"
 HOMEPAGE="https://community.kde.org/KDE_PIM/akonadi"
 
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 LICENSE="LGPL-2.1+"
 IUSE="+kaccounts +mysql postgres sqlite tools xml"