From 4cbcc855382a06088e2f016f62cafdbcb7e40665 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 20 Mar 2022 00:40:44 +0000 Subject: gentoo resync : 20.03.2022 --- kde-apps/akonadi/Manifest | 6 +- kde-apps/akonadi/akonadi-21.12.1.ebuild | 127 -------------------------------- kde-apps/akonadi/akonadi-21.12.3.ebuild | 127 ++++++++++++++++++++++++++++++++ kde-apps/akonadi/files/README.gentoo | 4 +- 4 files changed, 132 insertions(+), 132 deletions(-) delete mode 100644 kde-apps/akonadi/akonadi-21.12.1.ebuild create mode 100644 kde-apps/akonadi/akonadi-21.12.3.ebuild (limited to 'kde-apps/akonadi') diff --git a/kde-apps/akonadi/Manifest b/kde-apps/akonadi/Manifest index 60e6f04beecc..2e2ec5ef21f4 100644 --- a/kde-apps/akonadi/Manifest +++ b/kde-apps/akonadi/Manifest @@ -1,7 +1,7 @@ -AUX README.gentoo 1607 BLAKE2B c5f6ae8c403ff0306e7c83f54d7b0bea5ae273e090d9ba1cb1c13ded4c292d7194433998a2d02ec7ccadc0f27bf12b6b64539338effcd49e242edd24a4230e58 SHA512 e4480205a76d2a5acb7882984de7de27322a816cccd1ef40886be2f90e551806d93ede5968c40a72a9e3b3dbf13cc58384dbbeb50224f74be198a861c5eb1dec +AUX README.gentoo 1599 BLAKE2B aba3a897768323c2fa40a487fefd45529ce024a4ba11b1fd0dd9ff5fa6305d477820a6618609dd124a848593166bfeb52cc5e807dfa3c2125ac5116dd538de25 SHA512 d0dc40edf06f833bbebfbc96c4a1e27b0bc0a1108f059ffefc1e565b4497fabf3d997fdc7a769d918508fc92e1170d57470f676ead8fd874bf7c3911ea0d03af AUX akonadi-21.03.80-mysql56-crash.patch 2534 BLAKE2B bc36e6a80f6f93695e35fc19edf9d8a1139508b9fe3cd1f81a1e6a1ca7723def4ed81fb9bdc75822b00835ad65333bb1dc44a552d33f09bfd331a4ddb8e23d13 SHA512 acb0432f98a96d5af609d43dc5aa25d3d5d0668c9493c62b2339add0f3ef78d54449137884eafc0201b9f0f4de4543a584ef6cd746cd3634d1a84169cd0e4219 DIST akonadi-21.08.3.tar.xz 1607984 BLAKE2B 676881d442e196ca385c3203110ac7c9bc4ff5529550e5ffb68ff085cda7b03d01a4aadace33ebddf280dcece8830dd21baad596fbaf6c18268f9c151ac7636d SHA512 6305d8574e2be4e9b95b08e7990682eb32298e2dc89bf4d2372b5842e2880d69e95d598f34104e6207c985a0170ce92f23a8bf9c5c0e82c4ae0d85dc6bbfcaa4 -DIST akonadi-21.12.1.tar.xz 1611076 BLAKE2B fd86bc1bc19792fba5096368ef4e1ef362d9ee797cfaae7facc1a511f2559d46d785d65a13192dd30fb84fdfa9419d58d424e1429e3fc8ba324953a1d8110f80 SHA512 3295c8309527dbed0f0d1bcd4c29662ca1e8012eed4d026d60afd86d17bfb9a1b0703c5253817d5bc62bb8cc8f3251277143721a7f7f794a650345f237223046 +DIST akonadi-21.12.3.tar.xz 1611056 BLAKE2B f1382194094b24e2a4810d7c50347c5fc0b3562c6f33798efaa6aa202fc467bf439f45b85714143559af6f8eb865a9d76a2f31a4da08f381f2f7eda9b90be30c SHA512 0e215fbfc4a598706cb78177526e3b9708b24a2106a7dbb3fc9a8d316c1dbf4a3135e938990236307f4f6acae55189b30537512cea74f988742bf2aef08eee44 EBUILD akonadi-21.08.3.ebuild 3450 BLAKE2B 5e094bf7db1530d67527e56c18c5a6db96ad648285c93092ad799c0f71ee12d693c492cd1005484bb651c452f6298374cb31e3fa60304e70219eaba91bfd2ef0 SHA512 d22e4d3c8f01cc5ada38a9b215b7965686b93ef10c911f83f9439c697d101452d349dcd51c1c6a88ffcb003f53959450a495ac08b51c172df2cd00431d833f8c -EBUILD akonadi-21.12.1.ebuild 3478 BLAKE2B 46ba3607366d274ec49b7601e8882ac6d6a1715bf2c8784c548fbd228831e57bbce38ad1c6e28e231027b40c2e6c2b47b33e9c044b9f2553cc0ac9d581a58cf5 SHA512 2fce1307e699199c5c4c8da5652f7ab36c6eb56aaab4ca4f010fd1a9296a1c255b5d36fa8e14739198b1408df2480aa00ecffab0fa4f7d638724d8c282834991 +EBUILD akonadi-21.12.3.ebuild 3478 BLAKE2B 46ba3607366d274ec49b7601e8882ac6d6a1715bf2c8784c548fbd228831e57bbce38ad1c6e28e231027b40c2e6c2b47b33e9c044b9f2553cc0ac9d581a58cf5 SHA512 2fce1307e699199c5c4c8da5652f7ab36c6eb56aaab4ca4f010fd1a9296a1c255b5d36fa8e14739198b1408df2480aa00ecffab0fa4f7d638724d8c282834991 MISC metadata.xml 560 BLAKE2B d9e5a78a01139f88ec170123145375cb66824e6a0be029af75e95dee4ea69d8f2ffc6044951b50f32ef0c6bd905ceaca34022107a624b6b7830aad09e1369aff SHA512 e93981baa6ea40338301da4565134e52668c2f03f0f8f25edf98fed3d586759c423282953930004402a4adf5476ba2235aa4b66065674d450cfa32a17e713808 diff --git a/kde-apps/akonadi/akonadi-21.12.1.ebuild b/kde-apps/akonadi/akonadi-21.12.1.ebuild deleted file mode 100644 index aa8db076118c..000000000000 --- a/kde-apps/akonadi/akonadi-21.12.1.ebuild +++ /dev/null @@ -1,127 +0,0 @@ -# Copyright 1999-2022 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.88.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 ~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/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-1.16 - ) - 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.12.3.ebuild b/kde-apps/akonadi/akonadi-21.12.3.ebuild new file mode 100644 index 000000000000..aa8db076118c --- /dev/null +++ b/kde-apps/akonadi/akonadi-21.12.3.ebuild @@ -0,0 +1,127 @@ +# Copyright 1999-2022 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.88.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 ~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/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-1.16 + ) + 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/files/README.gentoo b/kde-apps/akonadi/files/README.gentoo index c778f6d1a211..69bb68c1f000 100644 --- a/kde-apps/akonadi/files/README.gentoo +++ b/kde-apps/akonadi/files/README.gentoo @@ -28,8 +28,8 @@ Note: 3) Optional: You may have come here with an already defunct akonadi service. To manually fix the akonadi MariaDB backend: - $ mysql_upgrade -S /run/user/$(id -u)/akonadi/default/mysql.socket \ - --defaults-file=~/.local/share/akonadi/mysql.conf + $ mysql_upgrade --defaults-file=~/.local/share/akonadi/mysql.conf \ + -S /run/user/$(id -u)/akonadi/mysql.socket Don't forget to restart the akonadi service afterwards: $ akonadictl restart -- cgit v1.2.3