| 1 |
commit: 33074d531e1385e0e569d6b21f084818837bc848 |
| 2 |
Author: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Feb 25 22:00:49 2017 +0000 |
| 4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Feb 25 22:05:09 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33074d53 |
| 7 |
|
| 8 |
app-office/calligra: Drop marble use flag |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
| 11 |
|
| 12 |
app-office/calligra/calligra-2.9.11-r1.ebuild | 5 ++--- |
| 13 |
app-office/calligra/calligra-2.9.11.ebuild | 9 ++++----- |
| 14 |
app-office/calligra/metadata.xml | 1 - |
| 15 |
3 files changed, 6 insertions(+), 9 deletions(-) |
| 16 |
|
| 17 |
diff --git a/app-office/calligra/calligra-2.9.11-r1.ebuild b/app-office/calligra/calligra-2.9.11-r1.ebuild |
| 18 |
index 9fcd32a7a8..b18093c2d1 100644 |
| 19 |
--- a/app-office/calligra/calligra-2.9.11-r1.ebuild |
| 20 |
+++ b/app-office/calligra/calligra-2.9.11-r1.ebuild |
| 21 |
@@ -41,7 +41,7 @@ if [[ ${KDE_BUILD_TYPE} == release ]] ; then |
| 22 |
fi |
| 23 |
|
| 24 |
IUSE="color-management +crypt +eigen +exif fftw +fontconfig freetds +glew +glib |
| 25 |
-+gsf gsl import-filter +jpeg jpeg2k +kdcraw +lcms marble mysql +okular openexr |
| 26 |
++gsf gsl import-filter +jpeg jpeg2k +kdcraw +lcms mysql +okular openexr |
| 27 |
+pdf +pim postgres spacenav sybase test tiff +threads +truetype vc xbase +xml" |
| 28 |
|
| 29 |
# Don't use Active, it's broken on desktops. |
| 30 |
@@ -95,7 +95,6 @@ RDEPEND=" |
| 31 |
media-libs/lcms:2 |
| 32 |
x11-libs/libX11 |
| 33 |
) |
| 34 |
- marble? ( $(add_kdeapps_dep marble) ) |
| 35 |
mysql? ( virtual/mysql ) |
| 36 |
okular? ( kde-apps/okular:4=[aqua=] ) |
| 37 |
openexr? ( media-libs/openexr:= ) |
| 38 |
@@ -177,6 +176,7 @@ src_configure() { |
| 39 |
-DPACKAGERS_BUILD=OFF |
| 40 |
-DWITH_Soprano=OFF |
| 41 |
-DWITH_KActivities=OFF |
| 42 |
+ -DWITH_CalligraMarble=OFF |
| 43 |
-DWITH_Iconv=ON |
| 44 |
-DWITH_OCIO=$(usex color-management) |
| 45 |
-DWITH_QCA2=$(usex crypt) |
| 46 |
@@ -198,7 +198,6 @@ src_configure() { |
| 47 |
-DWITH_OpenJPEG=$(usex jpeg2k) |
| 48 |
-DWITH_Kdcraw=$(usex kdcraw) |
| 49 |
-DWITH_LCMS2=$(usex lcms) |
| 50 |
- -DWITH_CalligraMarble=$(usex marble) |
| 51 |
-DWITH_MySQL=$(usex mysql) |
| 52 |
-DWITH_Okular=$(usex okular) |
| 53 |
-DWITH_OpenEXR=$(usex openexr) |
| 54 |
|
| 55 |
diff --git a/app-office/calligra/calligra-2.9.11.ebuild b/app-office/calligra/calligra-2.9.11.ebuild |
| 56 |
index 361b71f6cb..f48bdda5b6 100644 |
| 57 |
--- a/app-office/calligra/calligra-2.9.11.ebuild |
| 58 |
+++ b/app-office/calligra/calligra-2.9.11.ebuild |
| 59 |
@@ -1,4 +1,4 @@ |
| 60 |
-# Copyright 1999-2016 Gentoo Foundation |
| 61 |
+# Copyright 1999-2017 Gentoo Foundation |
| 62 |
# Distributed under the terms of the GNU General Public License v2 |
| 63 |
# $Id$ |
| 64 |
|
| 65 |
@@ -41,7 +41,7 @@ if [[ ${KDE_BUILD_TYPE} == release ]] ; then |
| 66 |
fi |
| 67 |
|
| 68 |
IUSE="attica color-management +crypt +eigen +exif fftw +fontconfig freetds |
| 69 |
-+glew +glib +gsf gsl import-filter +jpeg jpeg2k +kdcraw +lcms marble mysql |
| 70 |
++glew +glib +gsf gsl import-filter +jpeg jpeg2k +kdcraw +lcms mysql |
| 71 |
+okular openexr +pdf +pim postgres spacenav sybase test tiff +threads |
| 72 |
+truetype vc xbase +xml" |
| 73 |
|
| 74 |
@@ -97,7 +97,6 @@ RDEPEND=" |
| 75 |
media-libs/lcms:2 |
| 76 |
x11-libs/libX11 |
| 77 |
) |
| 78 |
- marble? ( $(add_kdeapps_dep marble) ) |
| 79 |
mysql? ( virtual/mysql ) |
| 80 |
okular? ( >=kde-apps/okular-4.4:4=[aqua=] ) |
| 81 |
opengl? ( |
| 82 |
@@ -181,7 +180,8 @@ src_configure() { |
| 83 |
"-DCREATIVEONLY=OFF" |
| 84 |
"-DPACKAGERS_BUILD=OFF" |
| 85 |
"-DWITH_Soprano=OFF" |
| 86 |
- "-DWITH_KActivities=OFF" # deprecated Plasma 4 activities integration |
| 87 |
+ "-DWITH_KActivities=OFF" |
| 88 |
+ "-DWITH_CalligraMarble=OFF" |
| 89 |
) |
| 90 |
|
| 91 |
# regular options |
| 92 |
@@ -207,7 +207,6 @@ src_configure() { |
| 93 |
$(cmake-utils_use_with jpeg2k OpenJPEG) |
| 94 |
$(cmake-utils_use_with kdcraw Kdcraw) |
| 95 |
$(cmake-utils_use_with lcms LCMS2) |
| 96 |
- $(cmake-utils_use_with marble CalligraMarble) |
| 97 |
$(cmake-utils_use_with mysql MySQL) |
| 98 |
$(cmake-utils_use_with okular Okular) |
| 99 |
$(cmake-utils_use_with openexr OpenEXR) |
| 100 |
|
| 101 |
diff --git a/app-office/calligra/metadata.xml b/app-office/calligra/metadata.xml |
| 102 |
index 9c760ee454..c3442894b6 100644 |
| 103 |
--- a/app-office/calligra/metadata.xml |
| 104 |
+++ b/app-office/calligra/metadata.xml |
| 105 |
@@ -20,7 +20,6 @@ |
| 106 |
<flag name="import-filter">Enable support for various import filter file formats like WordPerfect, Visio and Apple Keynote</flag> |
| 107 |
<flag name="kdcraw">Enable support for KDE image manipulating interface via <pkg>kde-apps/libkdcraw</pkg></flag> |
| 108 |
<flag name="lcms">Build colorengine plugins using <pkg>media-libs/lcms</pkg></flag> |
| 109 |
- <flag name="marble">Enable displaying of maps using Marble</flag> |
| 110 |
<flag name="okular">Enable bindings for <pkg>kde-apps/okular</pkg></flag> |
| 111 |
<flag name="phonon">Build stage/eventplugins and videoshape plugin using <pkg>media-libs/phonon</pkg></flag> |
| 112 |
<flag name="pim">Enable support for KDE PIM resources integration</flag> |
Archives