From f516638b7fe9592837389826a6152a7e1b251c54 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 30 May 2020 11:44:06 +0100 Subject: gentoo resync : 30.05.2020 --- kde-apps/akonadi/Manifest | 4 +- kde-apps/akonadi/akonadi-20.04.0.ebuild | 130 -------------------------------- kde-apps/akonadi/akonadi-20.04.1.ebuild | 130 ++++++++++++++++++++++++++++++++ 3 files changed, 132 insertions(+), 132 deletions(-) delete mode 100644 kde-apps/akonadi/akonadi-20.04.0.ebuild create mode 100644 kde-apps/akonadi/akonadi-20.04.1.ebuild (limited to 'kde-apps/akonadi') diff --git a/kde-apps/akonadi/Manifest b/kde-apps/akonadi/Manifest index 37ae07ea4321..3b7a29c31cd1 100644 --- a/kde-apps/akonadi/Manifest +++ b/kde-apps/akonadi/Manifest @@ -1,6 +1,6 @@ AUX akonadi-18.12.2-mysql56-crash.patch 2196 BLAKE2B d12643c870da557f540f199f78462f97fc569ffe160415f56f166d89b7e94e0f6682fa68ed84c9629e66639ddac61b5c54376c309a8921d84a1d52ba351a9aab SHA512 093a0b4243668344db59b0419809500e411f7399137ba3d9c439b4d5300a2f867fb231f7d5a8bc5d95ad2d1ccb6921804caff8200ddddba74a62ddcdfa9ac623 DIST akonadi-19.12.3.tar.xz 1583264 BLAKE2B 32bf2f3821628624216c8afe57988739a8b62808c3e17b13d907d9e88e271f5391210ec13e5620bde7550bf706ee305775b213e84032450b499b5a32fa2242fd SHA512 d8eb31948a649e4f3ba4d5d000a384d1188075aee8971fea401cfb9e392e111c4f2b19888783ea4a9430443c9c216ea7a2a8275555935cc3965335bfc07296b0 -DIST akonadi-20.04.0.tar.xz 1584268 BLAKE2B 6f5841ff974db776c1e4b501b5bcd9e5c54206f173bb3feb004b9b3c8f1441e95638cc4ea61230176fe0fd742c29d6411fda67ba075dd91553601ebcfb245710 SHA512 043bd811f96f2ef28d561fae25a811690d537ee6698a08b16e18f39a1dce048a4f41a117462f827f1256b9cda836e9b3aef4c6331568136a21de28567421a0db +DIST akonadi-20.04.1.tar.xz 1584156 BLAKE2B 915894745ef58f93504c5b697acac7660a105bfd401dd181fc6ee46ca8bd1a16a484f6800dd37fff1b14a9998f646c25d47042ca981d27b888c07b5ac38e1b42 SHA512 25dcc2446b7a6143a6f709b4c6becb3b316e5680d0011a44f4af617289935b21c5c35936a6ccb96e56181a7ad4d00353dc0b6bcb6abe5fd042104adcb9c3e1d2 EBUILD akonadi-19.12.3.ebuild 3810 BLAKE2B c518ee8d6f6f41412323d40f3946f135dc4c670e68ade72d756fb4b43b02297860f1bd3c35347161ce733c81029af100993f342db5075146083cfd9be12974bc SHA512 82466df3a962b4021d44a80b91ca4fe19aec456023f758f350d1bd9db7f8cb7a72f7673be63de3d15f63fb31b1521307e0268a32b23e569c62a4740b954dd76c -EBUILD akonadi-20.04.0.ebuild 3731 BLAKE2B 3efe8362c747fae97aa553fff5c51818d8111ae5e7a80a9ca5baf010e2005f45fce3b763f5219959aa86fe4f414986b59b52d18716b71cc6fbb5e17e3f05373d SHA512 a528eed75d9fd4bd385990ed370c15c6e9f5b7da657a5bb79b8acfb0fb24723fb4ddd078529b02e7ac9e2d147c88b2de61edf19b03179d7a959c104ba8787d0b +EBUILD akonadi-20.04.1.ebuild 3731 BLAKE2B d40aac261a66c6a7c9306b6170076aac37f9aba030ba94908acaccc49016c400cb8973ebc68dc29e9b11d4773f6a72d1f2eafd37618ebf224006b60692baec01 SHA512 dce8050e778c809689a4319df572a75902e462a4b7db2ba6d9285383251791ed37cfe0eec95c02374f6f0c583393bee5021486bbf9359c1d02a1c6b95293a798 MISC metadata.xml 491 BLAKE2B f4d942600308e7fbc604467130f087b7dc9c22f92a21aa89224cdabe9b822b1b8f0986e14efa5e1d5206718f3dc837b00c926b559ee32b21b71cff09fe0ee0d0 SHA512 fbb184c959335ec38a98faa983f67eed457c7eaa7c401261c5b7c0401d813d7a9a4521001376c6d70d76b98286446346ae1592dfbf3771b8112591bc3fe2472e diff --git a/kde-apps/akonadi/akonadi-20.04.0.ebuild b/kde-apps/akonadi/akonadi-20.04.0.ebuild deleted file mode 100644 index bfe1c3a80142..000000000000 --- a/kde-apps/akonadi/akonadi-20.04.0.ebuild +++ /dev/null @@ -1,130 +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.69.0 -QTMIN=5.12.3 -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} - !=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.1.ebuild b/kde-apps/akonadi/akonadi-20.04.1.ebuild new file mode 100644 index 000000000000..05fbbcee791c --- /dev/null +++ b/kde-apps/akonadi/akonadi-20.04.1.ebuild @@ -0,0 +1,130 @@ +# 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.70.0 +QTMIN=5.12.3 +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} + !=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." +} -- cgit v1.2.3