| 1 |
commit: 8cd065b1b19ecfd1db0053de6fa0032cd4f423fe |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jan 1 16:49:19 2019 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 1 16:49:19 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=8cd065b1 |
| 7 |
|
| 8 |
app-office/calligra: Drop unused Qt5WebKit dependency |
| 9 |
|
| 10 |
Upstream commit 9817c4c2ee1e11ae1d2eacb31b8a2a65d6ea6e8d |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.52, Repoman-2.3.12 |
| 13 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 14 |
|
| 15 |
app-office/calligra/calligra-9999.ebuild | 18 ++++++------------ |
| 16 |
1 file changed, 6 insertions(+), 12 deletions(-) |
| 17 |
|
| 18 |
diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild |
| 19 |
index c8bdc8cb76..1c65c68094 100644 |
| 20 |
--- a/app-office/calligra/calligra-9999.ebuild |
| 21 |
+++ b/app-office/calligra/calligra-9999.ebuild |
| 22 |
@@ -1,13 +1,8 @@ |
| 23 |
-# Copyright 1999-2018 Gentoo Authors |
| 24 |
+# Copyright 1999-2019 Gentoo Authors |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
|
| 27 |
EAPI=6 |
| 28 |
|
| 29 |
-if [[ ${KDE_BUILD_TYPE} == release ]]; then |
| 30 |
- SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" |
| 31 |
- KEYWORDS="~amd64 ~x86" |
| 32 |
-fi |
| 33 |
- |
| 34 |
CHECKREQS_DISK_BUILD="4G" |
| 35 |
KDE_HANDBOOK="forceoptional" |
| 36 |
KDE_TEST="forceoptional" |
| 37 |
@@ -16,6 +11,11 @@ inherit check-reqs kde5 |
| 38 |
DESCRIPTION="KDE Office Suite" |
| 39 |
HOMEPAGE="https://www.calligra.org/" |
| 40 |
|
| 41 |
+if [[ ${KDE_BUILD_TYPE} == release ]]; then |
| 42 |
+ SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" |
| 43 |
+ KEYWORDS="~amd64 ~x86" |
| 44 |
+fi |
| 45 |
+ |
| 46 |
CAL_FTS=( karbon sheets words ) |
| 47 |
|
| 48 |
LICENSE="GPL-2" |
| 49 |
@@ -96,7 +96,6 @@ COMMON_DEPEND=" |
| 50 |
x11-libs/libX11 |
| 51 |
) |
| 52 |
calligra_experimental_features_stage? ( |
| 53 |
- $(add_qt_dep qtwebkit) |
| 54 |
okular? ( $(add_kdeapps_dep okular) ) |
| 55 |
) |
| 56 |
calligra_features_sheets? ( |
| 57 |
@@ -144,11 +143,6 @@ src_prepare() { |
| 58 |
punt_bogus_dep Qt5 Declarative |
| 59 |
punt_bogus_dep Qt5 OpenGL |
| 60 |
|
| 61 |
- if ! use calligra_experimental_features_stage; then |
| 62 |
- punt_bogus_dep Qt5 WebKitWidgets |
| 63 |
- punt_bogus_dep Qt5 WebKit |
| 64 |
- fi |
| 65 |
- |
| 66 |
# Hack around the excessive use of CMake macros |
| 67 |
if use okular && ! use calligra_features_words; then |
| 68 |
sed -i -e "/add_subdirectory( *okularodtgenerator *)/ s/^/#DONT/" \ |
Archives