gentoo auto-resync : 02:08:2023 - 22:51:19

3 files changed, 2 insertions, 127 deletions

diff --git a/kde-apps/akonadi/Manifest b/kde-apps/akonadi/Manifest
index 6dc8cc8fd927..44eef3ad9e43 100644
--- a/kde-apps/akonadi/Manifest
+++ b/kde-apps/akonadi/Manifest
@@ -1,7 +1,5 @@
 AUX README.gentoo 1599 BLAKE2B aba3a897768323c2fa40a487fefd45529ce024a4ba11b1fd0dd9ff5fa6305d477820a6618609dd124a848593166bfeb52cc5e807dfa3c2125ac5116dd538de25 SHA512 d0dc40edf06f833bbebfbc96c4a1e27b0bc0a1108f059ffefc1e565b4497fabf3d997fdc7a769d918508fc92e1170d57470f676ead8fd874bf7c3911ea0d03af
 AUX akonadi-21.03.80-mysql56-crash.patch 2534 BLAKE2B bc36e6a80f6f93695e35fc19edf9d8a1139508b9fe3cd1f81a1e6a1ca7723def4ed81fb9bdc75822b00835ad65333bb1dc44a552d33f09bfd331a4ddb8e23d13 SHA512 acb0432f98a96d5af609d43dc5aa25d3d5d0668c9493c62b2339add0f3ef78d54449137884eafc0201b9f0f4de4543a584ef6cd746cd3634d1a84169cd0e4219
-DIST akonadi-23.04.2.tar.xz 1667968 BLAKE2B 1c023612dab0be52a3f081fcc266b8267e95ddc5477d8c7dff61a7cabd87ad6d507f9b24f5366939624254b15337bfe227233c923711022ea58f24504fd8bd19 SHA512 5a0723e165a6c44bfa534403afc8052a119f38bf2d857ba6f7961657c26ea05fc44ad04ce3054293d3f27bf8380ced593eb317de9fc61d1dcf82a9d53828d05b
 DIST akonadi-23.04.3.tar.xz 1668012 BLAKE2B a09f26c3b90885babe32af63c1d48cc476862129b6a700884f4a5ecbd73cfc6d60fa6f503e87b7ced746580ccfb7bd2d08c2d3b2454ce7ab7e81664f0d9f1806 SHA512 fc9729451ac8e39c4455748a5fd9fd1efd82573c21731d60dbad59bc02e75e3653bae6469b2d04b68c360fd5f23bc49914d07d849a71a71e1349bd76ae6c8dbc
-EBUILD akonadi-23.04.2.ebuild 3364 BLAKE2B dabe74faf29ae7bd8bb094ce7561c2b901a95ac938f4897a80fdca1c8401747e89a9836bf48effcd0f56fee487a1372548590b0ac589d0379b066707bde71bc1 SHA512 889c811390ff02692edde626b5687d23e73fcb01908e692555f7b2e6e3a9c3df8a6382eb5c775b106d33724b78771b5d46f6f8e41bfb81bfeab4b2b35ae59bf3
-EBUILD akonadi-23.04.3.ebuild 3367 BLAKE2B e2efeb1c40c3f19fa688cb54254f2485958517ab09eb041b4612f1b27b42b3f5b103571f27b2fbeaeaae61f946b1a732fe2e198f59e8121664be7fe79c9c40fa SHA512 7b30510b9e3c090d00b5b5dcc74729672d2c258088a361bcde892f30eb8beb3d9e65e6b5c5157f54442af2a19d8714d1e2a9aad50167ae6e14f44a532673a31a
+EBUILD akonadi-23.04.3.ebuild 3364 BLAKE2B dabe74faf29ae7bd8bb094ce7561c2b901a95ac938f4897a80fdca1c8401747e89a9836bf48effcd0f56fee487a1372548590b0ac589d0379b066707bde71bc1 SHA512 889c811390ff02692edde626b5687d23e73fcb01908e692555f7b2e6e3a9c3df8a6382eb5c775b106d33724b78771b5d46f6f8e41bfb81bfeab4b2b35ae59bf3
 MISC metadata.xml 560 BLAKE2B d9e5a78a01139f88ec170123145375cb66824e6a0be029af75e95dee4ea69d8f2ffc6044951b50f32ef0c6bd905ceaca34022107a624b6b7830aad09e1369aff SHA512 e93981baa6ea40338301da4565134e52668c2f03f0f8f25edf98fed3d586759c423282953930004402a4adf5476ba2235aa4b66065674d450cfa32a17e713808
diff --git a/kde-apps/akonadi/akonadi-23.04.2.ebuild b/kde-apps/akonadi/akonadi-23.04.2.ebuild
deleted file mode 100644
index f58158e813c7..000000000000
--- a/kde-apps/akonadi/akonadi-23.04.2.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_DESIGNERPLUGIN="true"
-ECM_QTHELP="true"
-ECM_TEST="forceoptional"
-KFMIN=5.106.0
-QTMIN=5.15.9
-VIRTUALDBUS_TEST="true"
-inherit ecm gear.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 ~loong ~ppc64 ~riscv 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/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	kaccounts? (
-		>=kde-apps/kaccounts-integration-20.08.3:5
-		>=net-libs/accounts-qt-1.16
-	)
-	sqlite? (
-		dev-db/sqlite:3
-		>=dev-qt/qtsql-${QTMIN}:5=[sqlite]
-	)
-	xml? ( dev-libs/libxml2 )
-"
-DEPEND="${COMMON_DEPEND}
-	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-23.04.3.ebuild b/kde-apps/akonadi/akonadi-23.04.3.ebuild
index 19f6e53fc523..f58158e813c7 100644
--- a/kde-apps/akonadi/akonadi-23.04.3.ebuild
+++ b/kde-apps/akonadi/akonadi-23.04.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://community.kde.org/KDE_PIM/akonadi"
 
 LICENSE="LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86"
 IUSE="+kaccounts +mysql postgres sqlite tools xml"
 
 REQUIRED_USE="|| ( mysql postgres sqlite ) test? ( tools )"