| 1 |
commit: 68c0ac5f55b2ed0b62477eabaaeeece2c498d63a |
| 2 |
Author: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun May 4 23:44:35 2014 +0000 |
| 4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun May 4 23:44:35 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=68c0ac5f |
| 7 |
|
| 8 |
[app-office/calligra] Sync with latest |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.10 |
| 11 |
|
| 12 |
--- |
| 13 |
app-office/calligra/calligra-2.8.0.ebuild | 28 +++++++++++++++++----------- |
| 14 |
app-office/calligra/metadata.xml | 1 - |
| 15 |
2 files changed, 17 insertions(+), 12 deletions(-) |
| 16 |
|
| 17 |
diff --git a/app-office/calligra/calligra-2.8.0.ebuild b/app-office/calligra/calligra-2.8.0.ebuild |
| 18 |
index c6f36c9..84d3cbf 100644 |
| 19 |
--- a/app-office/calligra/calligra-2.8.0.ebuild |
| 20 |
+++ b/app-office/calligra/calligra-2.8.0.ebuild |
| 21 |
@@ -40,9 +40,9 @@ SLOT="4" |
| 22 |
KEYWORDS="~amd64 ~arm ~x86" |
| 23 |
|
| 24 |
IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf |
| 25 |
-gsl +jpeg jpeg2k +kdcraw kde kdepim +lcms marble mysql +okular opengtl openexr |
| 26 |
-+pdf postgres semantic-desktop spacenav +ssl sybase test tiff +threads |
| 27 |
-+truetype vc word-perfect xbase +xml +xslt" |
| 28 |
+gsl import-filter +jpeg jpeg2k +kdcraw kde kdepim +lcms marble mysql +okular |
| 29 |
+opengtl openexr +pdf postgres semantic-desktop spacenav +ssl sybase test tiff |
| 30 |
++threads +truetype vc xbase +xml +xslt" |
| 31 |
|
| 32 |
# please do not sort here, order is same as in CMakeLists.txt |
| 33 |
CAL_FTS="author kexi words flow plan stage sheets krita karbon braindump" |
| 34 |
@@ -96,6 +96,14 @@ RDEPEND=" |
| 35 |
glib? ( dev-libs/glib:2 ) |
| 36 |
gsf? ( gnome-extra/libgsf ) |
| 37 |
gsl? ( sci-libs/gsl ) |
| 38 |
+ import-filter? ( |
| 39 |
+ app-text/libetonyek |
| 40 |
+ app-text/libodfgen |
| 41 |
+ app-text/libwpd |
| 42 |
+ app-text/libwpg |
| 43 |
+ app-text/libwps |
| 44 |
+ media-libs/libvisio |
| 45 |
+ ) |
| 46 |
jpeg? ( virtual/jpeg:0 ) |
| 47 |
jpeg2k? ( media-libs/openjpeg:0 ) |
| 48 |
kdcraw? ( $(add_kdebase_dep libkdcraw) ) |
| 49 |
@@ -125,11 +133,6 @@ RDEPEND=" |
| 50 |
tiff? ( media-libs/tiff ) |
| 51 |
truetype? ( media-libs/freetype:2 ) |
| 52 |
vc? ( dev-libs/vc ) |
| 53 |
- word-perfect? ( |
| 54 |
- app-text/libwpd |
| 55 |
- app-text/libwps |
| 56 |
- app-text/libwpg |
| 57 |
- ) |
| 58 |
xbase? ( dev-db/xbase ) |
| 59 |
xslt? ( dev-libs/libxslt ) |
| 60 |
calligra_features_kexi? ( |
| 61 |
@@ -199,6 +202,12 @@ src_configure() { |
| 62 |
$(cmake-utils_use_with glib GObject) |
| 63 |
$(cmake-utils_use_with gsf LIBGSF) |
| 64 |
$(cmake-utils_use_with gsl GSL) |
| 65 |
+ $(cmake-utils_use_with import-filter LibEtonyek) |
| 66 |
+ $(cmake-utils_use_with import-filter LibOdfGen) |
| 67 |
+ $(cmake-utils_use_with import-filter LibVisio) |
| 68 |
+ $(cmake-utils_use_with import-filter LibWpd) |
| 69 |
+ $(cmake-utils_use_with import-filter LibWpg) |
| 70 |
+ $(cmake-utils_use_with import-filter LibWps) |
| 71 |
$(cmake-utils_use_with jpeg JPEG) |
| 72 |
$(cmake-utils_use_with jpeg2k OpenJPEG) |
| 73 |
$(cmake-utils_use_with kdcraw Kdcraw) |
| 74 |
@@ -216,7 +225,6 @@ src_configure() { |
| 75 |
$(cmake-utils_use_with pdf Pstoedit) |
| 76 |
$(cmake-utils_use_with postgres PostgreSQL) |
| 77 |
$(cmake-utils_use_build postgres pqxx) |
| 78 |
- $(cmake-utils_use semantic-desktop NEPOMUK) |
| 79 |
$(cmake-utils_use_with semantic-desktop Soprano) |
| 80 |
$(cmake-utils_use_with spacenav Spnav) |
| 81 |
$(cmake-utils_use_with ssl OpenSSL) |
| 82 |
@@ -226,8 +234,6 @@ src_configure() { |
| 83 |
$(cmake-utils_use_with threads Threads) |
| 84 |
$(cmake-utils_use_with truetype Freetype) |
| 85 |
$(cmake-utils_use_with vc Vc) |
| 86 |
- $(cmake-utils_use_with word-perfect WPD) |
| 87 |
- $(cmake-utils_use_with word-perfect WPG) |
| 88 |
$(cmake-utils_use_with xbase XBase) |
| 89 |
$(cmake-utils_use_build xbase xbase) |
| 90 |
$(cmake-utils_use_with xslt LibXslt) |
| 91 |
|
| 92 |
diff --git a/app-office/calligra/metadata.xml b/app-office/calligra/metadata.xml |
| 93 |
index a213e5d..6ad4b18 100644 |
| 94 |
--- a/app-office/calligra/metadata.xml |
| 95 |
+++ b/app-office/calligra/metadata.xml |
| 96 |
@@ -17,7 +17,6 @@ |
| 97 |
<flag name="opengtl">Enable support for transformation algorithms via <pkg>media-libs/opengtl</pkg></flag> |
| 98 |
<flag name="spacenav">Enable support for the 3Dconnexion spacenav input device via <pkg>dev-libs/libspnav</pkg></flag> |
| 99 |
<flag name="vc">Enable support for <pkg>dev-libs/vc</pkg>, could be a significant speed boost on krita</flag> |
| 100 |
- <flag name="word-perfect">Enable support for various WordPerfect file formats</flag> |
| 101 |
<flag name="xbase">Enable support for xbase compatible database formats</flag> |
| 102 |
<flag name="xslt">Enable xslt and exslt support format support</flag> |
| 103 |
</use> |
Archives