gentoo auto-resync : 20:12:2023 - 01:53:29

4 files changed, 4 insertions, 129 deletions

diff --git a/kde-apps/akonadi/Manifest b/kde-apps/akonadi/Manifest
index b48439e0d3bd..8cd2e64a1fa8 100644
--- a/kde-apps/akonadi/Manifest
+++ b/kde-apps/akonadi/Manifest
@@ -1,9 +1,7 @@
 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.3.tar.xz 1668012 BLAKE2B a09f26c3b90885babe32af63c1d48cc476862129b6a700884f4a5ecbd73cfc6d60fa6f503e87b7ced746580ccfb7bd2d08c2d3b2454ce7ab7e81664f0d9f1806 SHA512 fc9729451ac8e39c4455748a5fd9fd1efd82573c21731d60dbad59bc02e75e3653bae6469b2d04b68c360fd5f23bc49914d07d849a71a71e1349bd76ae6c8dbc
 DIST akonadi-23.08.3.tar.xz 1662324 BLAKE2B 357da9b9a2e485817394b21dd4c351131581f56161b8bcc1cfccdf08115b7fd9fe837c86bd08e3166ff347f556c159e44b4f0a2025d375a5e338f1e5f8e84fcf SHA512 129b63e19f485925103e16fb46063d87023b2b2cf6b8de89e284eedd8ca483baf4311a6e429e55508bd204f9012e05bf4f1212735ee513406383f9f8901be09e
 DIST akonadi-23.08.4.tar.xz 1662596 BLAKE2B 194ece7916ff6349f69c50263a02a09bd3c209eb38956d9be385e883fe38f93399d265a1d5f3004f14cd45eb503892320f9ddfc7d0f1e7df9ee8eda54e683df7 SHA512 14094d320df5c0c512ce0da4ed94a3e1332c87e9abf7cc059b7cfcc2ee55efaea91e5c26817e1f1b3c0b2de79701a56ae81ac84ec54f0fd32a9099e2b09e94fe
-EBUILD akonadi-23.04.3.ebuild 3364 BLAKE2B dabe74faf29ae7bd8bb094ce7561c2b901a95ac938f4897a80fdca1c8401747e89a9836bf48effcd0f56fee487a1372548590b0ac589d0379b066707bde71bc1 SHA512 889c811390ff02692edde626b5687d23e73fcb01908e692555f7b2e6e3a9c3df8a6382eb5c775b106d33724b78771b5d46f6f8e41bfb81bfeab4b2b35ae59bf3
-EBUILD akonadi-23.08.3.ebuild 2954 BLAKE2B 4a64dcc06eac4dfb980af29bdf220b221159af8ccfa66ed75e66fe2ab5de81fc48a2fb7a0a748ef48b4d4178771df2d3c0c87f2b64ac5ac4ed3b3753d59a5ad8 SHA512 4bd3eecd7f4eabd13829fb179859d11ef24d3f16af0cb2bedaf2deaed22db05e96f7491972ec43198fb4fcf0ef5dc6f1501c1c16cb3d507f54299d688af6bc39
-EBUILD akonadi-23.08.4.ebuild 2957 BLAKE2B ce9dedb5b578f47c90e0ff216426c34d913b6415e51c86c054800ceeb29d81c4c6768109af8f54583e2964ad3e9e989b1f9cf7525753a00c44006ce9b26af10c SHA512 2d6d632bc4a69eb17670beee890c06c60ac0d98ce4ac5ae4523865112187618fd06e121f1f6278d103de8354977125eba8bbcf526338a830d8341f89462f958e
+EBUILD akonadi-23.08.3-r1.ebuild 2962 BLAKE2B 247e2ff042f65c587226d64be8e6ec47cdf0cd45133d2bbaf52dc378fd22621aa12ef0c9184ed077e35ba3bfde282390ed7327ea906391a8030535b11d55497b SHA512 ca8dfa3e6f26b243479bcfc3f83678f3b2b83ed92aaf239db95a9f68fb75aae2a8f3789e76ed39f2727440e79a7d5c788831c35b3307cffb23d235e75ae5be35
+EBUILD akonadi-23.08.4-r1.ebuild 2965 BLAKE2B 725ef0462dbb004d69146c812725d575cc0859eeba8b2c1beb28c2c9ecbe21ad66da934d1cf13e4b7ee8c988164944d2f663f72f08f21fbf274a69f4dd11d04d SHA512 1725d57e264e545641908b57385afaf017b73ec2588c5591af2df450ef723c6294dead339a6951a3cb68ca1459549867a4c71a8e907517e96b457bb66a28f304
 MISC metadata.xml 560 BLAKE2B d9e5a78a01139f88ec170123145375cb66824e6a0be029af75e95dee4ea69d8f2ffc6044951b50f32ef0c6bd905ceaca34022107a624b6b7830aad09e1369aff SHA512 e93981baa6ea40338301da4565134e52668c2f03f0f8f25edf98fed3d586759c423282953930004402a4adf5476ba2235aa4b66065674d450cfa32a17e713808
diff --git a/kde-apps/akonadi/akonadi-23.04.3.ebuild b/kde-apps/akonadi/akonadi-23.04.3.ebuild
deleted file mode 100644
index f58158e813c7..000000000000
--- a/kde-apps/akonadi/akonadi-23.04.3.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.08.3.ebuild b/kde-apps/akonadi/akonadi-23.08.3-r1.ebuild
index 5e75306ec1b8..7d6dd92d0800 100644
--- a/kde-apps/akonadi/akonadi-23.08.3.ebuild
+++ b/kde-apps/akonadi/akonadi-23.08.3-r1.ebuild
@@ -44,7 +44,7 @@ COMMON_DEPEND="
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	kaccounts? (
 		>=kde-apps/kaccounts-integration-20.08.3:5
-		>=net-libs/accounts-qt-1.16
+		>=net-libs/accounts-qt-1.16[qt5(+)]
 	)
 	xml? ( dev-libs/libxml2 )
 "
diff --git a/kde-apps/akonadi/akonadi-23.08.4.ebuild b/kde-apps/akonadi/akonadi-23.08.4-r1.ebuild
index b44808223f93..06b73725fc37 100644
--- a/kde-apps/akonadi/akonadi-23.08.4.ebuild
+++ b/kde-apps/akonadi/akonadi-23.08.4-r1.ebuild
@@ -44,7 +44,7 @@ COMMON_DEPEND="
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	kaccounts? (
 		>=kde-apps/kaccounts-integration-20.08.3:5
-		>=net-libs/accounts-qt-1.16
+		>=net-libs/accounts-qt-1.16[qt5(+)]
 	)
 	xml? ( dev-libs/libxml2 )
 "