From aa4483395d312cd803a93b93d73eb7e63649e347 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Wed, 11 Aug 2021 08:20:00 +0200 Subject: kde-apps/akonadi: drop 20.12.3* Signed-off-by: Andreas Sturmlechner --- kde-apps/akonadi/Manifest | 1 - kde-apps/akonadi/akonadi-20.12.3.ebuild | 126 --------------------- .../files/akonadi-18.12.2-mysql56-crash.patch | 52 --------- 3 files changed, 179 deletions(-) delete mode 100644 kde-apps/akonadi/akonadi-20.12.3.ebuild delete mode 100644 kde-apps/akonadi/files/akonadi-18.12.2-mysql56-crash.patch diff --git a/kde-apps/akonadi/Manifest b/kde-apps/akonadi/Manifest index 0bfd1f2f750d..b74c328e4346 100644 --- a/kde-apps/akonadi/Manifest +++ b/kde-apps/akonadi/Manifest @@ -1,2 +1 @@ -DIST akonadi-20.12.3.tar.xz 1593588 BLAKE2B 783b75a21cf1b1771a5ed25fb25d395af374e249e43ae15f725e92921ef7afdf312cf39c60457a61ba549ba90fc3aebc8ef0b53b666ad1a89ce0cf58c43748b6 SHA512 516f240349b4a680ee8ab1986b8f3d018e9e54a8802aed404b3deb08491edd67413cc4bbb43aedc583f7110812b6bf41277f83908f54221cf21efb3b7f6e32df DIST akonadi-21.04.3.tar.xz 1610436 BLAKE2B 28bd02fd19c88c20dace16df8e738a35c7f02b45a216fc93589c1772f9862f175ea86f734bd28dd22c3261c3a8a09f45f194b2e925a3ed2745f402c891b39e5c SHA512 4da83167904ba21305963ba204fd23e42d7a9ae8bb7c1538dc694cccdeeb2bfd4f76bb558e8033d8b100800755308d6e8d6f5bbccd8a4cc5eab6f85484244044 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/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-65-gdbad