gentoo resync : 25.11.2020

3 files changed, 5 insertions, 136 deletions

diff --git a/kde-apps/akonadi/Manifest b/kde-apps/akonadi/Manifest
index f7bdc61ba1c1..7833487d90b5 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-20.04.3.tar.xz 1584704 BLAKE2B 7dfcc8406946779338de7cbbe7752d200078335e04372c26f84dd68409a2a2fed7c6a6025ecbf3e3b6299ce5ed044755a942fc6abbf3fb413a044551a515931b SHA512 29612920af6794f096d6ae51d98830f38f4d94bfb3669e11b748fbf7556b2396fac1837f1ee14cfdbc2285164c8b08206d2d46a62d0929354af47c77d9978698
-DIST akonadi-20.08.1.tar.xz 1584016 BLAKE2B 4da5cb23ffa77ff3b57d1302083a43f4fddf6955d6eeead8824acc76acbbff9b54e4578ebcf22aca69ae870b359944f8802e8cce50a1a6f8f25d2733b91fc9aa SHA512 e444f7449d4ac6ed184702d854785d3ce9a3c42878cb030934901a712a372cfc95c07d3e7b3ee70a1f0081a920f64d44372fbd194eb6c7c32b9938b69ab9ac5a
-EBUILD akonadi-20.04.3.ebuild 3694 BLAKE2B c9f4d2413ce23340fef04396112f9043bc893757023abfa3ce2a5204473fd934aee2eee920857431822237088793f1efcf4301318ccc8587ca2bfb98a8c4dc01 SHA512 befcd458aad3098783a8a7a8d913fb4db0a4afa2dbd207e842db450fe67cb9638f24756f4d42979fb69c4d25be6f3c72ec67af8c95f4382a7f9eac942cdc967d
-EBUILD akonadi-20.08.1.ebuild 3697 BLAKE2B 66ff5029fd168959e71cd2c3f4cc541710bb0aa66782d7c56eb25df3a39b06cd0d7306c34618c77c66a0e852b35eba9ec7c0946facece4670c429747de4e4150 SHA512 fe1fa52186c9bc24220a3b16643fbb2d7e7b40b34dc654c59aa6aea950ebf4d45421d904a094db363f2c43dad3e05afc3a4422f1ff1ae3599b368eff07555159
+DIST akonadi-20.08.3.tar.xz 1591360 BLAKE2B e237fc3307ae3cd785e29da9c2177832f1cff523ab3dc46279813c9ae152ac3a030649e6b73e8d566332f478992d6441457301355c2f6abd180c4db8c8d48011 SHA512 2d278a6189732e7c68a89321356915413771f1b4b1e3fb5a491b02f0000095163cce61278cc4f7f8b17759c1d71b3e3c08dbed0c89f3fe26be21da14adbbf720
+EBUILD akonadi-20.08.3.ebuild 3694 BLAKE2B 5c829b9c1ed6ffe603d7eb24b6d5b24affde82fb174c053e238ec79d57400fee1ce27c027ea6e02ff873215598de6bd62c18496f8b39e141510dd9ace430fd63 SHA512 c8903c0eff409708558e65eafd22a7348c95ecdd06e190ffe6fbedd48a22fc1ee7fc2a10894bf42d70e3066732b374d90ccdbf412e974612622c1f1bda943866
 MISC metadata.xml 491 BLAKE2B f4d942600308e7fbc604467130f087b7dc9c22f92a21aa89224cdabe9b822b1b8f0986e14efa5e1d5206718f3dc837b00c926b559ee32b21b71cff09fe0ee0d0 SHA512 fbb184c959335ec38a98faa983f67eed457c7eaa7c401261c5b7c0401d813d7a9a4521001376c6d70d76b98286446346ae1592dfbf3771b8112591bc3fe2472e
diff --git a/kde-apps/akonadi/akonadi-20.08.1.ebuild b/kde-apps/akonadi/akonadi-20.08.1.ebuild
deleted file mode 100644
index 729ae7326179..000000000000
--- a/kde-apps/akonadi/akonadi-20.08.1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_DESIGNERPLUGIN="true"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.72.0
-QTMIN=5.14.2
-VIRTUALDBUS_TEST="true"
-VIRTUALX_REQUIRED="test"
-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 ~arm64 ~ppc64 ~x86"
-LICENSE="LGPL-2.1+"
-IUSE="+kaccounts +mysql postgres sqlite tools xml"
-
-REQUIRED_USE="|| ( mysql postgres sqlite ) test? ( tools )"
-
-COMMON_DEPEND="
-	>=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
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${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
-	kaccounts? (
-		>=kde-apps/kaccounts-integration-${PVCUT}:5
-		net-libs/accounts-qt
-	)
-	sqlite? (
-		dev-db/sqlite:3
-		>=dev-qt/qtsql-${QTMIN}:5=[sqlite]
-	)
-	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 )
-"
-
-# 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=(
-		$(cmake_use_find_package kaccounts AccountsQt5)
-		$(cmake_use_find_package kaccounts KAccounts)
-		-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-20.04.3.ebuild b/kde-apps/akonadi/akonadi-20.08.3.ebuild
index bb269dcae449..cd1506e09ba6 100644
--- a/kde-apps/akonadi/akonadi-20.04.3.ebuild
+++ b/kde-apps/akonadi/akonadi-20.08.3.ebuild
@@ -6,8 +6,8 @@ EAPI=7
 ECM_DESIGNERPLUGIN="true"
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.14.2
+KFMIN=5.74.0
+QTMIN=5.15.1
 VIRTUALDBUS_TEST="true"
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
@@ -15,9 +15,9 @@ inherit ecm kde.org
 DESCRIPTION="Storage service for PIM data and libraries for PIM apps"
 HOMEPAGE="https://community.kde.org/KDE_PIM/akonadi"
 
+LICENSE="LGPL-2.1+"
 SLOT="5"
 KEYWORDS="amd64 arm64 ~ppc64 x86"
-LICENSE="LGPL-2.1+"
 IUSE="+kaccounts +mysql postgres sqlite tools xml"
 
 REQUIRED_USE="|| ( mysql postgres sqlite ) test? ( tools )"