gentoo resync : 05.12.2021

3 files changed, 2 insertions, 130 deletions

diff --git a/kde-apps/akonadi/Manifest b/kde-apps/akonadi/Manifest
index 49a2ec1a5df6..9518c8638c85 100644
--- a/kde-apps/akonadi/Manifest
+++ b/kde-apps/akonadi/Manifest
@@ -1,7 +1,5 @@
 AUX README.gentoo 1607 BLAKE2B c5f6ae8c403ff0306e7c83f54d7b0bea5ae273e090d9ba1cb1c13ded4c292d7194433998a2d02ec7ccadc0f27bf12b6b64539338effcd49e242edd24a4230e58 SHA512 e4480205a76d2a5acb7882984de7de27322a816cccd1ef40886be2f90e551806d93ede5968c40a72a9e3b3dbf13cc58384dbbeb50224f74be198a861c5eb1dec
 AUX akonadi-21.03.80-mysql56-crash.patch 2534 BLAKE2B bc36e6a80f6f93695e35fc19edf9d8a1139508b9fe3cd1f81a1e6a1ca7723def4ed81fb9bdc75822b00835ad65333bb1dc44a552d33f09bfd331a4ddb8e23d13 SHA512 acb0432f98a96d5af609d43dc5aa25d3d5d0668c9493c62b2339add0f3ef78d54449137884eafc0201b9f0f4de4543a584ef6cd746cd3634d1a84169cd0e4219
-DIST akonadi-21.04.3.tar.xz 1610436 BLAKE2B 28bd02fd19c88c20dace16df8e738a35c7f02b45a216fc93589c1772f9862f175ea86f734bd28dd22c3261c3a8a09f45f194b2e925a3ed2745f402c891b39e5c SHA512 4da83167904ba21305963ba204fd23e42d7a9ae8bb7c1538dc694cccdeeb2bfd4f76bb558e8033d8b100800755308d6e8d6f5bbccd8a4cc5eab6f85484244044
 DIST akonadi-21.08.3.tar.xz 1607984 BLAKE2B 676881d442e196ca385c3203110ac7c9bc4ff5529550e5ffb68ff085cda7b03d01a4aadace33ebddf280dcece8830dd21baad596fbaf6c18268f9c151ac7636d SHA512 6305d8574e2be4e9b95b08e7990682eb32298e2dc89bf4d2372b5842e2880d69e95d598f34104e6207c985a0170ce92f23a8bf9c5c0e82c4ae0d85dc6bbfcaa4
-EBUILD akonadi-21.04.3.ebuild 3445 BLAKE2B ed1f409fa9071cae93c60bb87c19080b9f7e99dc38a39d725d7b47d6ae730a553cca682670330aaa7b3b6e4aa16e09b3395e949051f0f77342d54355f4f40c89 SHA512 12c591753e9168abff23bab19bab947f155e39d4707a248b83fa53f59e7c82f2973d98ff60b1b12c78fd57045f41aaeada5545ee968af7c73d64bc51739687de
-EBUILD akonadi-21.08.3.ebuild 3453 BLAKE2B 5704bd49a5cd49b2291fca2cc46d02d06b260b071e6379de61642e6fd100fc826785f532bb35bcdb82f71ecb65ef30652a70a4fe958b1e27082604858650ee63 SHA512 a7872da820810dfb26fb011c4f673d0f9b1fd51158fca190b68a398ba3565fe888a2c9a82cf0fa836de19f5e2765771bc7c3e4db25c663188f4d2b0dbe594ce2
+EBUILD akonadi-21.08.3.ebuild 3450 BLAKE2B 5e094bf7db1530d67527e56c18c5a6db96ad648285c93092ad799c0f71ee12d693c492cd1005484bb651c452f6298374cb31e3fa60304e70219eaba91bfd2ef0 SHA512 d22e4d3c8f01cc5ada38a9b215b7965686b93ef10c911f83f9439c697d101452d349dcd51c1c6a88ffcb003f53959450a495ac08b51c172df2cd00431d833f8c
 MISC metadata.xml 560 BLAKE2B d9e5a78a01139f88ec170123145375cb66824e6a0be029af75e95dee4ea69d8f2ffc6044951b50f32ef0c6bd905ceaca34022107a624b6b7830aad09e1369aff SHA512 e93981baa6ea40338301da4565134e52668c2f03f0f8f25edf98fed3d586759c423282953930004402a4adf5476ba2235aa4b66065674d450cfa32a17e713808
diff --git a/kde-apps/akonadi/akonadi-21.04.3.ebuild b/kde-apps/akonadi/akonadi-21.04.3.ebuild
deleted file mode 100644
index 405e88f45ad9..000000000000
--- a/kde-apps/akonadi/akonadi-21.04.3.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_DESIGNERPLUGIN="true"
-ECM_TEST="forceoptional"
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALDBUS_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org readme.gentoo-r1
-
-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"
-IUSE="+kaccounts +mysql postgres sqlite tools xml"
-
-REQUIRED_USE="|| ( mysql postgres sqlite ) test? ( tools )"
-
-# some akonadi tests time out, that probably needs more work as it's ~700 tests
-RESTRICT+=" test"
-
-COMMON_DEPEND="
-	app-arch/xz-utils
-	>=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-20.08.3: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 )
-"
-
-PATCHES=( "${FILESDIR}/${PN}-21.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 mysql && has_version "${CATEGORY}/${PN}[mysql]" && has_version "dev-db/mariadb"; then
-		ewarn
-		ewarn "Attention: Make sure to read README.gentoo after install."
-		ewarn
-	fi
-
-	if use sqlite || has_version "<${CATEGORY}/${P}[sqlite]"; then
-		ewarn "We strongly recommend you change your Akonadi database backend to"
-		ewarn "either MariaDB/MySQL 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
-	readme.gentoo_create_doc
-}
-
-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."
-	use mysql && elog
-	use mysql && FORCE_PRINT_ELOG=1 readme.gentoo_print_elog
-}
diff --git a/kde-apps/akonadi/akonadi-21.08.3.ebuild b/kde-apps/akonadi/akonadi-21.08.3.ebuild
index aec1c3a750c3..dbf89bd42cdb 100644
--- a/kde-apps/akonadi/akonadi-21.08.3.ebuild
+++ b/kde-apps/akonadi/akonadi-21.08.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://community.kde.org/KDE_PIM/akonadi"
 
 LICENSE="LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE="+kaccounts +mysql postgres sqlite tools xml"
 
 REQUIRED_USE="|| ( mysql postgres sqlite ) test? ( tools )"