commit: 38058ab8d6ece54df529fc71dc6ff2e2ee33c279
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 6 11:16:48 2014 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Apr 6 11:16:48 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=38058ab8
[app-office/calligra] Version bump, remove old, bug #503544
Package-Manager: portage-2.2.10
---
...calligra-2.8.0.ebuild => calligra-2.8.1.ebuild} | 28 +++++++++++++---------
app-office/calligra/calligra-9999.ebuild | 28 +++++++++++++---------
app-office/calligra/metadata.xml | 2 +-
3 files changed, 35 insertions(+), 23 deletions(-)
diff --git a/app-office/calligra/calligra-2.8.0.ebuild
b/app-office/calligra/calligra-2.8.1.ebuild
similarity index 92%
rename from app-office/calligra/calligra-2.8.0.ebuild
rename to app-office/calligra/calligra-2.8.1.ebuild
index c6f36c9..84d3cbf 100644
--- a/app-office/calligra/calligra-2.8.0.ebuild
+++ b/app-office/calligra/calligra-2.8.1.ebuild
@@ -40,9 +40,9 @@ SLOT="4"
KEYWORDS="~amd64 ~arm ~x86"
IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
-gsl +jpeg jpeg2k +kdcraw kde kdepim +lcms marble mysql +okular opengtl openexr
-+pdf postgres semantic-desktop spacenav +ssl sybase test tiff +threads
-+truetype vc word-perfect xbase +xml +xslt"
+gsl import-filter +jpeg jpeg2k +kdcraw kde kdepim +lcms marble mysql +okular
+opengtl openexr +pdf postgres semantic-desktop spacenav +ssl sybase test tiff
++threads +truetype vc xbase +xml +xslt"
# please do not sort here, order is same as in CMakeLists.txt
CAL_FTS="author kexi words flow plan stage sheets krita karbon braindump"
@@ -96,6 +96,14 @@ RDEPEND="
glib? ( dev-libs/glib:2 )
gsf? ( gnome-extra/libgsf )
gsl? ( sci-libs/gsl )
+ import-filter? (
+ app-text/libetonyek
+ app-text/libodfgen
+ app-text/libwpd
+ app-text/libwpg
+ app-text/libwps
+ media-libs/libvisio
+ )
jpeg? ( virtual/jpeg:0 )
jpeg2k? ( media-libs/openjpeg:0 )
kdcraw? ( $(add_kdebase_dep libkdcraw) )
@@ -125,11 +133,6 @@ RDEPEND="
tiff? ( media-libs/tiff )
truetype? ( media-libs/freetype:2 )
vc? ( dev-libs/vc )
- word-perfect? (
- app-text/libwpd
- app-text/libwps
- app-text/libwpg
- )
xbase? ( dev-db/xbase )
xslt? ( dev-libs/libxslt )
calligra_features_kexi? (
@@ -199,6 +202,12 @@ src_configure() {
$(cmake-utils_use_with glib GObject)
$(cmake-utils_use_with gsf LIBGSF)
$(cmake-utils_use_with gsl GSL)
+ $(cmake-utils_use_with import-filter LibEtonyek)
+ $(cmake-utils_use_with import-filter LibOdfGen)
+ $(cmake-utils_use_with import-filter LibVisio)
+ $(cmake-utils_use_with import-filter LibWpd)
+ $(cmake-utils_use_with import-filter LibWpg)
+ $(cmake-utils_use_with import-filter LibWps)
$(cmake-utils_use_with jpeg JPEG)
$(cmake-utils_use_with jpeg2k OpenJPEG)
$(cmake-utils_use_with kdcraw Kdcraw)
@@ -216,7 +225,6 @@ src_configure() {
$(cmake-utils_use_with pdf Pstoedit)
$(cmake-utils_use_with postgres PostgreSQL)
$(cmake-utils_use_build postgres pqxx)
- $(cmake-utils_use semantic-desktop NEPOMUK)
$(cmake-utils_use_with semantic-desktop Soprano)
$(cmake-utils_use_with spacenav Spnav)
$(cmake-utils_use_with ssl OpenSSL)
@@ -226,8 +234,6 @@ src_configure() {
$(cmake-utils_use_with threads Threads)
$(cmake-utils_use_with truetype Freetype)
$(cmake-utils_use_with vc Vc)
- $(cmake-utils_use_with word-perfect WPD)
- $(cmake-utils_use_with word-perfect WPG)
$(cmake-utils_use_with xbase XBase)
$(cmake-utils_use_build xbase xbase)
$(cmake-utils_use_with xslt LibXslt)
diff --git a/app-office/calligra/calligra-9999.ebuild
b/app-office/calligra/calligra-9999.ebuild
index c6f36c9..84d3cbf 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -40,9 +40,9 @@ SLOT="4"
KEYWORDS="~amd64 ~arm ~x86"
IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
-gsl +jpeg jpeg2k +kdcraw kde kdepim +lcms marble mysql +okular opengtl openexr
-+pdf postgres semantic-desktop spacenav +ssl sybase test tiff +threads
-+truetype vc word-perfect xbase +xml +xslt"
+gsl import-filter +jpeg jpeg2k +kdcraw kde kdepim +lcms marble mysql +okular
+opengtl openexr +pdf postgres semantic-desktop spacenav +ssl sybase test tiff
++threads +truetype vc xbase +xml +xslt"
# please do not sort here, order is same as in CMakeLists.txt
CAL_FTS="author kexi words flow plan stage sheets krita karbon braindump"
@@ -96,6 +96,14 @@ RDEPEND="
glib? ( dev-libs/glib:2 )
gsf? ( gnome-extra/libgsf )
gsl? ( sci-libs/gsl )
+ import-filter? (
+ app-text/libetonyek
+ app-text/libodfgen
+ app-text/libwpd
+ app-text/libwpg
+ app-text/libwps
+ media-libs/libvisio
+ )
jpeg? ( virtual/jpeg:0 )
jpeg2k? ( media-libs/openjpeg:0 )
kdcraw? ( $(add_kdebase_dep libkdcraw) )
@@ -125,11 +133,6 @@ RDEPEND="
tiff? ( media-libs/tiff )
truetype? ( media-libs/freetype:2 )
vc? ( dev-libs/vc )
- word-perfect? (
- app-text/libwpd
- app-text/libwps
- app-text/libwpg
- )
xbase? ( dev-db/xbase )
xslt? ( dev-libs/libxslt )
calligra_features_kexi? (
@@ -199,6 +202,12 @@ src_configure() {
$(cmake-utils_use_with glib GObject)
$(cmake-utils_use_with gsf LIBGSF)
$(cmake-utils_use_with gsl GSL)
+ $(cmake-utils_use_with import-filter LibEtonyek)
+ $(cmake-utils_use_with import-filter LibOdfGen)
+ $(cmake-utils_use_with import-filter LibVisio)
+ $(cmake-utils_use_with import-filter LibWpd)
+ $(cmake-utils_use_with import-filter LibWpg)
+ $(cmake-utils_use_with import-filter LibWps)
$(cmake-utils_use_with jpeg JPEG)
$(cmake-utils_use_with jpeg2k OpenJPEG)
$(cmake-utils_use_with kdcraw Kdcraw)
@@ -216,7 +225,6 @@ src_configure() {
$(cmake-utils_use_with pdf Pstoedit)
$(cmake-utils_use_with postgres PostgreSQL)
$(cmake-utils_use_build postgres pqxx)
- $(cmake-utils_use semantic-desktop NEPOMUK)
$(cmake-utils_use_with semantic-desktop Soprano)
$(cmake-utils_use_with spacenav Spnav)
$(cmake-utils_use_with ssl OpenSSL)
@@ -226,8 +234,6 @@ src_configure() {
$(cmake-utils_use_with threads Threads)
$(cmake-utils_use_with truetype Freetype)
$(cmake-utils_use_with vc Vc)
- $(cmake-utils_use_with word-perfect WPD)
- $(cmake-utils_use_with word-perfect WPG)
$(cmake-utils_use_with xbase XBase)
$(cmake-utils_use_build xbase xbase)
$(cmake-utils_use_with xslt LibXslt)
diff --git a/app-office/calligra/metadata.xml b/app-office/calligra/metadata.xml
index 136e326..6ad4b18 100644
--- a/app-office/calligra/metadata.xml
+++ b/app-office/calligra/metadata.xml
@@ -9,6 +9,7 @@
<flag name="glew">Enable <pkg>media-libs/glew</pkg> opengl
extension library support</flag>
<flag name="glib">Enable support for C library routines from
<pkg>dev-libs/glib</pkg></flag>
<flag name="gsf">Enable support for ODT structures extraction
via <pkg>gnome-extra/libgsf</pkg></flag>
+ <flag name="import-filter">Enable support for various import
filter file formats like WordPerfect, Visio and Apple Keynote</flag>
<flag name="kdcraw">Enable support for KDE image manipulating
interface via <pkg>kde-base/libkdcraw</pkg></flag>
<flag name="kdepim">Enable support for KDEPIM resources
integration</flag>
<flag name="marble">Enable displaying of maps using
Marble</flag>
@@ -16,7 +17,6 @@
<flag name="opengtl">Enable support for transformation
algorithms via <pkg>media-libs/opengtl</pkg></flag>
<flag name="spacenav">Enable support for the 3Dconnexion
spacenav input device via <pkg>dev-libs/libspnav</pkg></flag>
<flag name="vc">Enable support for <pkg>dev-libs/vc</pkg>,
could be a significant speed boost on krita</flag>
- <flag name="word-perfect">Enable support for various
WordPerfect file formats</flag>
<flag name="xbase">Enable support for xbase compatible database
formats</flag>
<flag name="xslt">Enable xslt and exslt support format
support</flag>
</use>
