From 0706fc6986773f4e4d391deff4ad5143c464ea4e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 24 Mar 2019 17:44:59 +0000 Subject: Revert "gentoo resync : 24.03.2019" This reverts commit aa3411e241a201d53a2689766fe419f2756819f3. --- kde-apps/akonadi/Manifest | 5 +- kde-apps/akonadi/akonadi-18.08.3-r1.ebuild | 113 +++++++++++++++++++++ kde-apps/akonadi/akonadi-18.12.3.ebuild | 2 +- .../files/akonadi-17.03.80-mysql56-crash.patch | 40 ++++++++ 4 files changed, 158 insertions(+), 2 deletions(-) create mode 100644 kde-apps/akonadi/akonadi-18.08.3-r1.ebuild create mode 100644 kde-apps/akonadi/files/akonadi-17.03.80-mysql56-crash.patch (limited to 'kde-apps/akonadi') diff --git a/kde-apps/akonadi/Manifest b/kde-apps/akonadi/Manifest index 680d9c80ba69..d091d9e61303 100644 --- a/kde-apps/akonadi/Manifest +++ b/kde-apps/akonadi/Manifest @@ -1,4 +1,7 @@ +AUX akonadi-17.03.80-mysql56-crash.patch 2064 BLAKE2B a4107b5732d0147e3001484c7c4c5e3bba64909d21656686142cf9d58304d7496dea8d11b72836bbdeee09691d9c1e160445ecf94fc280cca3c35f45c078d969 SHA512 35e89ac8fa7640354a0a0f50abff06ec34075722e4e8f3b6297da7384a3deef62f7826c1a7a08aef72329ab0b6ef3b20b1bbec231674e20733fa15fd388195f7 AUX akonadi-18.12.2-mysql56-crash.patch 2196 BLAKE2B d12643c870da557f540f199f78462f97fc569ffe160415f56f166d89b7e94e0f6682fa68ed84c9629e66639ddac61b5c54376c309a8921d84a1d52ba351a9aab SHA512 093a0b4243668344db59b0419809500e411f7399137ba3d9c439b4d5300a2f867fb231f7d5a8bc5d95ad2d1ccb6921804caff8200ddddba74a62ddcdfa9ac623 +DIST akonadi-18.08.3.tar.xz 1538188 BLAKE2B 333c86802418f86f2336408d1e63ce16a9fc50267f7d5cb39f177eb6aab1ddc8479fa9384f323f8aad0ac4157d8abfe8de237bcc6bd058b19fe596442c7f20e1 SHA512 ba883902ad83c989bb480712c0b3871e683307ecb121f1d7b3e433b9211056cda209d9640a7bae520fb4b6611950863180b879269797a606af2ac25ae4f24cc0 DIST akonadi-18.12.3.tar.xz 1555044 BLAKE2B 20eb8cf2027c1589e65ef4d907f6252faaedc7ab48c45be79bf66b5f9ae9652cbf654d00261f4a09765edaa0b0c03c798ee079796d902de4f522e5d0cfce5491 SHA512 f97e716be612001a8176f20afbe80a1cf4c78c6d348d92e542307ea951e1ff74189d2f0847675ed44ad65845b52a5180346b3866f5a8d82b55ed613d107ac346 -EBUILD akonadi-18.12.3.ebuild 2952 BLAKE2B 0918e04166a36075d896c2067d3af4c7c2e75fb07967c926c22b5c5b5d5e096b6862e3bb37cb8b435f2e1637b0fb6835dab5f11099594584ef3764410471fada SHA512 ba78bc17fb52d899dfb6aa6a39e810187c98646f7651477a7e196f860b2696d438971775e4e6d6af23d8c4e728dcf3fe5994c3a8396ba817f9b8521f6e4f543f +EBUILD akonadi-18.08.3-r1.ebuild 2952 BLAKE2B 48d6a61ce0246bbec6d67c47a9ae9e77dc395b85660098033ff49c7ee63d5458547233521df0613fac15af791aedc31ad489c9e0c4cfce69e6ae8de1d8badc85 SHA512 bc09fc8a03bcc0ac5ac22a6ee72283ba852167feba801b27b91b40b1de1bc1c962d73ebe602197dbd4fdd4e0e1a422da27428e7aaff7c738d900cd598bb4bc40 +EBUILD akonadi-18.12.3.ebuild 2954 BLAKE2B 794d5f2910330af2298de9b9904b76bc861e7df0500a1716495e7c49b6aba4ead8fc95bd5491fce17fdf9f8a4b182860a07ea943b7d45cc967606aa6114cab11 SHA512 92fc7c600076f119f2fdec476068236fe0b0e1952c33cd0001e58a13d37faf322ece4fe6bdc6ee7a1cd810799084d9c1606a152d9ec5a4f9e0edc19ec885d024 MISC metadata.xml 410 BLAKE2B 259694dd8c348fbd80f1ef1dd2b2c6e5aa876cfcd2d4b781dd51f3882b22f8899bea347c6c993be3912c5acc3d996bdf88b63f8455bb822490f3d33cc45ce8bd SHA512 28d1be9310a2e9b91f2b93089bd2588da14b0aded9a057f9885782153df3222cd62c885d03374dd59216e408c1e0717074c03445e38b3dfdc7b3ed0b3dd739fa diff --git a/kde-apps/akonadi/akonadi-18.08.3-r1.ebuild b/kde-apps/akonadi/akonadi-18.08.3-r1.ebuild new file mode 100644 index 000000000000..b138b2cd70e1 --- /dev/null +++ b/kde-apps/akonadi/akonadi-18.08.3-r1.ebuild @@ -0,0 +1,113 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +KDE_DESIGNERPLUGIN="true" +KDE_TEST="forceoptional" +VIRTUALDBUS_TEST="true" +VIRTUALX_REQUIRED="test" +inherit kde5 + +DESCRIPTION="Storage service for PIM data and libraries for PIM apps" +HOMEPAGE="https://community.kde.org/KDE_PIM/akonadi" + +KEYWORDS="amd64 ~arm x86" +LICENSE="LGPL-2.1+" +IUSE="+mysql postgres sqlite tools xml" + +REQUIRED_USE="|| ( mysql postgres sqlite ) test? ( tools )" + +COMMON_DEPEND=" + $(add_frameworks_dep kcompletion) + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kcrash) + $(add_frameworks_dep kdbusaddons) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kiconthemes) + $(add_frameworks_dep kio) + $(add_frameworks_dep kitemmodels) + $(add_frameworks_dep kitemviews) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kwindowsystem) + $(add_frameworks_dep kxmlgui) + $(add_qt_dep qtdbus) + $(add_qt_dep qtgui) + $(add_qt_dep qtnetwork) + $(add_qt_dep qtsql 'mysql?,postgres?') + $(add_qt_dep qtwidgets) + $(add_qt_dep qtxml) + x11-misc/shared-mime-info + sqlite? ( + $(add_qt_dep qtsql 'sqlite' '' '5=') + dev-db/sqlite:3 + ) + xml? ( dev-libs/libxml2 ) +" +DEPEND="${COMMON_DEPEND} + dev-libs/boost + dev-libs/libxslt + test? ( sys-apps/dbus ) +" +RDEPEND="${COMMON_DEPEND} + ! "${T}"/akonadiserverrc +[%General] +Driver=${DRIVER} +EOF + insinto /usr/share/config/akonadi + doins "${T}"/akonadiserverrc + + kde5_src_install +} + +pkg_postinst() { + kde5_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-18.12.3.ebuild b/kde-apps/akonadi/akonadi-18.12.3.ebuild index c3035abbece3..420a6ab14057 100644 --- a/kde-apps/akonadi/akonadi-18.12.3.ebuild +++ b/kde-apps/akonadi/akonadi-18.12.3.ebuild @@ -12,7 +12,7 @@ inherit kde5 DESCRIPTION="Storage service for PIM data and libraries for PIM apps" HOMEPAGE="https://community.kde.org/KDE_PIM/akonadi" -KEYWORDS="amd64 ~arm ~arm64 x86" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" LICENSE="LGPL-2.1+" IUSE="+mysql postgres sqlite tools xml" diff --git a/kde-apps/akonadi/files/akonadi-17.03.80-mysql56-crash.patch b/kde-apps/akonadi/files/akonadi-17.03.80-mysql56-crash.patch new file mode 100644 index 000000000000..0b5e381b155d --- /dev/null +++ b/kde-apps/akonadi/files/akonadi-17.03.80-mysql56-crash.patch @@ -0,0 +1,40 @@ +Gentoo-bug: 530012 + +diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp +index 50421714d..dfae09c20 100644 +--- a/src/server/storage/dbconfigmysql.cpp ++++ b/src/server/storage/dbconfigmysql.cpp +@@ -81,6 +81,7 @@ bool DbConfigMysql::init(QSettings &settings) + << 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"); +@@ -511,7 +512,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) + }); + } +@@ -525,6 +526,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) + }); + } +@@ -539,7 +541,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) + }); + } -- cgit v1.2.3