commit: 72e3e39afb23a77afb3685a9c25db784f7874aa0 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Fri Aug 16 12:47:02 2019 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Fri Aug 16 14:40:32 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72e3e39a
app-office/calligraplan: EAPI-7 bump, backported unused-deps patch Package-Manager: Portage-2.3.71, Repoman-2.3.17 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../calligraplan/calligraplan-3.1.0-r1.ebuild | 97 ++++++++++++++++++++++ .../files/calligraplan-3.1.0-unused-deps.patch | 57 +++++++++++++ 2 files changed, 154 insertions(+) diff --git a/app-office/calligraplan/calligraplan-3.1.0-r1.ebuild b/app-office/calligraplan/calligraplan-3.1.0-r1.ebuild new file mode 100644 index 00000000000..98cc37a7595 --- /dev/null +++ b/app-office/calligraplan/calligraplan-3.1.0-r1.ebuild @@ -0,0 +1,97 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +KDE_HANDBOOK="forceoptional" +KDE_TEST="forceoptional" +inherit kde5 + +DESCRIPTION="Project management application" +HOMEPAGE="https://www.calligra.org/"; +SRC_URI="mirror://kde/stable/${PN/plan/}/${PV}/${P}.tar.xz" + +LICENSE="GPL-2" +KEYWORDS="amd64 x86" +IUSE="activities +holidays kwallet pim X" + +# FIXME: Disabled by upstream for good reason +# Crashes (https://bugs.kde.org/show_bug.cgi?id=311940) +# $(add_kdeapps_dep akonadi) +# $(add_kdeapps_dep akonadi-contacts) +# Currently upstream-disabled: +# =dev-libs/kproperty-3.0*:5 +# =dev-libs/kreport-3.0*:5 +DEPEND=" + $(add_frameworks_dep karchive) + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kdbusaddons) + $(add_frameworks_dep kglobalaccel) + $(add_frameworks_dep kguiaddons) + $(add_frameworks_dep khtml) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kiconthemes) + $(add_frameworks_dep kio) + $(add_frameworks_dep kitemviews) + $(add_frameworks_dep kjobwidgets) + $(add_frameworks_dep knotifications) + $(add_frameworks_dep kparts) + $(add_frameworks_dep kservice) + $(add_frameworks_dep ktextwidgets) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kwindowsystem) + $(add_frameworks_dep kxmlgui) + $(add_qt_dep designer) + $(add_qt_dep qtdbus) + $(add_qt_dep qtgui) + $(add_qt_dep qtprintsupport) + $(add_qt_dep qtwidgets) + $(add_qt_dep qtxml) + dev-lang/perl + dev-libs/kdiagram:5 + sys-libs/zlib + activities? ( $(add_frameworks_dep kactivities) ) + holidays? ( $(add_frameworks_dep kholidays) ) + kwallet? ( + $(add_frameworks_dep kwallet) + app-crypt/qca:2[qt5(+)] + ) + pim? ( + <kde-apps/kcalcore-19.04.50:5 + $(add_kdeapps_dep kcontacts) + ) + X? ( + $(add_qt_dep qtx11extras) + x11-libs/libX11 + ) +" +RDEPEND="${DEPEND} + !app-office/calligra[calligra_features_plan(-)] + !app-office/calligra-l10n:4 + $(add_qt_dep qtsvg) +" + +RESTRICT+=" test" + +PATCHES=( + "${FILESDIR}"/${P}-qt-5.11.patch + "${FILESDIR}"/${P}-qca.patch + "${FILESDIR}"/${P}-missing-header.patch + "${FILESDIR}"/${P}-unused-deps.patch +) + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_find_package activities KF5Activities) + $(cmake-utils_use_find_package holidays KF5Holidays) + $(cmake-utils_use_find_package pim KF5CalendarCore) + $(cmake-utils_use_find_package pim KF5Contacts) + $(cmake-utils_use_find_package kwallet Qca-qt5) + $(cmake-utils_use_find_package kwallet KF5Wallet) + ) + # Qt5DBus can't be disabled because of KF5DBusAddons dependency + + kde5_src_configure +} diff --git a/app-office/calligraplan/files/calligraplan-3.1.0-unused-deps.patch b/app-office/calligraplan/files/calligraplan-3.1.0-unused-deps.patch new file mode 100644 index 00000000000..707b6c8cdd5 --- /dev/null +++ b/app-office/calligraplan/files/calligraplan-3.1.0-unused-deps.patch @@ -0,0 +1,57 @@ +From 5924e3ad82b5dfc95acf9f6751946d5f086d9ce7 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <andreas.sturmlech...@gmail.com> +Date: Tue, 1 Jan 2019 20:13:57 +0100 +Subject: Drop unused dependencies + +Test Plan: Built fine with deps removed. + +Reviewers: #calligra:_3.0, danders + +Reviewed By: #calligra:_3.0, danders + +Subscribers: danders + +Differential Revision: https://phabricator.kde.org/D17903 +--- + CMakeLists.txt | 14 ++------------ + 1 file changed, 2 insertions(+), 12 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3cb4b63..a6a3c79 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -121,7 +121,6 @@ find_package(KF5 ${REQUIRED_KF5_VERSION} REQUIRED + IconThemes + ItemViews + JobWidgets +- KCMUtils + KIO + Notifications + # NotifyConfig +@@ -169,22 +168,13 @@ find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED + COMPONENTS + Core + Gui +- Network + PrintSupport +- Svg + Test + Widgets + Xml + ) +- find_package(Qt5 ${REQUIRED_QT_VERSION} QUIET +- COMPONENTS +- DBus +- OpenGL +- # Quick +- # Sql +- # WebKit +- # WebKitWidgets +- ) ++ find_package(Qt5DBus ${REQUIRED_QT_VERSION} QUIET) ++ + # Qt5Declarative was removed in Qt 5.6.0 so search for it in a separate call + # Including it in a collected find_package(Qt5 ...) call can lead to a fatal not-found error: + # * Qt5 (required version >= 5.3.0) +-- +cgit v1.1
