From 616579b5d773c50af31ee56f00105d96ce641ca2 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Aug 2021 10:30:13 +0100 Subject: gentoo resync : 14.08.2021 --- kde-apps/akonadi/Manifest | 5 +- kde-apps/akonadi/akonadi-20.12.3.ebuild | 126 --------------------- kde-apps/akonadi/akonadi-21.08.0.ebuild | 126 +++++++++++++++++++++ .../files/akonadi-18.12.2-mysql56-crash.patch | 52 --------- 4 files changed, 128 insertions(+), 181 deletions(-) delete mode 100644 kde-apps/akonadi/akonadi-20.12.3.ebuild create mode 100644 kde-apps/akonadi/akonadi-21.08.0.ebuild delete mode 100644 kde-apps/akonadi/files/akonadi-18.12.2-mysql56-crash.patch (limited to 'kde-apps/akonadi') diff --git a/kde-apps/akonadi/Manifest b/kde-apps/akonadi/Manifest index 058f6c9c90f1..43c62f707dd0 100644 --- a/kde-apps/akonadi/Manifest +++ b/kde-apps/akonadi/Manifest @@ -1,8 +1,7 @@ AUX README.gentoo 1607 BLAKE2B c5f6ae8c403ff0306e7c83f54d7b0bea5ae273e090d9ba1cb1c13ded4c292d7194433998a2d02ec7ccadc0f27bf12b6b64539338effcd49e242edd24a4230e58 SHA512 e4480205a76d2a5acb7882984de7de27322a816cccd1ef40886be2f90e551806d93ede5968c40a72a9e3b3dbf13cc58384dbbeb50224f74be198a861c5eb1dec -AUX akonadi-18.12.2-mysql56-crash.patch 2196 BLAKE2B d12643c870da557f540f199f78462f97fc569ffe160415f56f166d89b7e94e0f6682fa68ed84c9629e66639ddac61b5c54376c309a8921d84a1d52ba351a9aab SHA512 093a0b4243668344db59b0419809500e411f7399137ba3d9c439b4d5300a2f867fb231f7d5a8bc5d95ad2d1ccb6921804caff8200ddddba74a62ddcdfa9ac623 AUX akonadi-21.03.80-mysql56-crash.patch 2534 BLAKE2B bc36e6a80f6f93695e35fc19edf9d8a1139508b9fe3cd1f81a1e6a1ca7723def4ed81fb9bdc75822b00835ad65333bb1dc44a552d33f09bfd331a4ddb8e23d13 SHA512 acb0432f98a96d5af609d43dc5aa25d3d5d0668c9493c62b2339add0f3ef78d54449137884eafc0201b9f0f4de4543a584ef6cd746cd3634d1a84169cd0e4219 -DIST akonadi-20.12.3.tar.xz 1593588 BLAKE2B 783b75a21cf1b1771a5ed25fb25d395af374e249e43ae15f725e92921ef7afdf312cf39c60457a61ba549ba90fc3aebc8ef0b53b666ad1a89ce0cf58c43748b6 SHA512 516f240349b4a680ee8ab1986b8f3d018e9e54a8802aed404b3deb08491edd67413cc4bbb43aedc583f7110812b6bf41277f83908f54221cf21efb3b7f6e32df DIST akonadi-21.04.3.tar.xz 1610436 BLAKE2B 28bd02fd19c88c20dace16df8e738a35c7f02b45a216fc93589c1772f9862f175ea86f734bd28dd22c3261c3a8a09f45f194b2e925a3ed2745f402c891b39e5c SHA512 4da83167904ba21305963ba204fd23e42d7a9ae8bb7c1538dc694cccdeeb2bfd4f76bb558e8033d8b100800755308d6e8d6f5bbccd8a4cc5eab6f85484244044 -EBUILD akonadi-20.12.3.ebuild 3444 BLAKE2B 149f5e1df84514187600dcba980905b0e3a81ea1d169e15e0faf5c3a89c96979f35561fd050852314185bcf9e0d8b2396f1815c7280e62e2890d1c270f149a27 SHA512 16ebc6189f20119203af2e26c164324f5d82d7ca3d276e576a0aff2a07004ebbad400b8c99087f96cf6e451fdb849cf7f6c2d161f85a8b62c9839daf945ee3df +DIST akonadi-21.08.0.tar.xz 1607848 BLAKE2B f35447a07ab93bdd27cb5267203744bb8607c39b3e49eaf4f666ec29845a74edcc622fb3d2cc150ef687dd04d692e8cb911cf130bb8a57c42db71997ab0577e4 SHA512 2b2457f4606f15b5819942f83d5c34d0f21df12871bbeeb6c5a82a3f67742d21c1cb9110a8fda88a95b4b6d6a9e8d87c22ad507e2f4cccdc7e7e816917da3457 EBUILD akonadi-21.04.3.ebuild 3445 BLAKE2B ed1f409fa9071cae93c60bb87c19080b9f7e99dc38a39d725d7b47d6ae730a553cca682670330aaa7b3b6e4aa16e09b3395e949051f0f77342d54355f4f40c89 SHA512 12c591753e9168abff23bab19bab947f155e39d4707a248b83fa53f59e7c82f2973d98ff60b1b12c78fd57045f41aaeada5545ee968af7c73d64bc51739687de +EBUILD akonadi-21.08.0.ebuild 3448 BLAKE2B cedd3cf9403ca1466226131e529ebd772758caa01af8e5ba8df3bbc77217271606675b5b0254b470bfc01b6ba8984239751fa90e31fb377248de1b8d20a5db1b SHA512 1589a01a2439519793c8991837998ad46299eff0c61251c9190a154b6407ec214eef2a8e9112a0d6e242178a87b4e30079baa4957f599dc6e4402dcae1e5690b MISC metadata.xml 491 BLAKE2B f4d942600308e7fbc604467130f087b7dc9c22f92a21aa89224cdabe9b822b1b8f0986e14efa5e1d5206718f3dc837b00c926b559ee32b21b71cff09fe0ee0d0 SHA512 fbb184c959335ec38a98faa983f67eed457c7eaa7c401261c5b7c0401d813d7a9a4521001376c6d70d76b98286446346ae1592dfbf3771b8112591bc3fe2472e diff --git a/kde-apps/akonadi/akonadi-20.12.3.ebuild b/kde-apps/akonadi/akonadi-20.12.3.ebuild deleted file mode 100644 index 5b6a1853aeb3..000000000000 --- a/kde-apps/akonadi/akonadi-20.12.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.75.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}-18.12.2-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.0.ebuild b/kde-apps/akonadi/akonadi-21.08.0.ebuild new file mode 100644 index 000000000000..fbdd6ae5856f --- /dev/null +++ b/kde-apps/akonadi/akonadi-21.08.0.ebuild @@ -0,0 +1,126 @@ +# 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.84.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/files/akonadi-18.12.2-mysql56-crash.patch b/kde-apps/akonadi/files/akonadi-18.12.2-mysql56-crash.patch deleted file mode 100644 index ede8a19d84db..000000000000 --- a/kde-apps/akonadi/files/akonadi-18.12.2-mysql56-crash.patch +++ /dev/null @@ -1,52 +0,0 @@ -From b2ebd0e2d594ae71d4e1db4874f72a655f9eeb12 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Sat, 26 Jan 2019 21:09:14 +0100 -Subject: [PATCH] Find mysql_install_db and add required option - -Rebase patch onto 19.03.80 -Gentoo-bug: 530012 ---- - src/server/storage/dbconfigmysql.cpp | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp -index dfff6fc29..80039c8ba 100644 ---- a/src/server/storage/dbconfigmysql.cpp -+++ b/src/server/storage/dbconfigmysql.cpp -@@ -66,6 +66,7 @@ static QString findExecutable(const QString &bin) - QStringLiteral("/usr/local/sbin"), - QStringLiteral("/usr/local/libexec"), - QStringLiteral("/usr/libexec"), -+ QStringLiteral("/usr/share/mysql/scripts"), - QStringLiteral("/opt/mysql/libexec"), - QStringLiteral("/opt/local/lib/mysql5/bin"), - QStringLiteral("/opt/mysql/sbin"), -@@ -588,7 +589,7 @@ bool DbConfigMysql::initializeMariaDBDatabase(const QString &confFile, const QSt - return 0 == execute(mMysqlInstallDbPath, { - QStringLiteral("--defaults-file=%1").arg(confFile), - QStringLiteral("--force"), -- QStringLiteral("--basedir=%1").arg(baseDir), -+ QStringLiteral("--basedir=/usr"), - QStringLiteral("--datadir=%1/").arg(dataDir) - }); - } -@@ -602,6 +603,7 @@ bool DbConfigMysql::initializeMySQL5_7_6Database(const QString &confFile, const - return 0 == execute(mMysqldPath, { - QStringLiteral("--defaults-file=%1").arg(confFile), - QStringLiteral("--initialize"), -+ QStringLiteral("--basedir=/usr"), - QStringLiteral("--datadir=%1/").arg(dataDir) - }); - } -@@ -622,7 +624,7 @@ bool DbConfigMysql::initializeMySQLDatabase(const QString &confFile, const QStri - // Don't use --force, it has been removed in MySQL 5.7.5 - return 0 == execute(mMysqlInstallDbPath, { - QStringLiteral("--defaults-file=%1").arg(confFile), -- QStringLiteral("--basedir=%1").arg(baseDir), -+ QStringLiteral("--basedir=/usr"), - QStringLiteral("--datadir=%1/").arg(dataDir) - }); - } --- -2.20.1 - -- cgit v1.2.3