commit: f246878d0e03e559b8d7f3f290b074505ebe58fb
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Tue May 13 11:40:21 2014 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue May 13 11:40:21 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=f246878d
[app-office/calligra] USE flag changes
* Fix build for calligra features krita by requiring glew by Frank Krömmelbein
<kroemmelbein <AT> gmx.de>
* Introduce nepomuk USE flag bug #508350
Package-Manager: portage-2.2.10
---
app-office/calligra/calligra-2.8.2.ebuild | 20 +++++++++-----------
app-office/calligra/calligra-9999.ebuild | 20 +++++++++-----------
app-office/calligra/metadata.xml | 1 +
3 files changed, 19 insertions(+), 22 deletions(-)
diff --git a/app-office/calligra/calligra-2.8.2.ebuild
b/app-office/calligra/calligra-2.8.2.ebuild
index 84d3cbf..a2b231e 100644
--- a/app-office/calligra/calligra-2.8.2.ebuild
+++ b/app-office/calligra/calligra-2.8.2.ebuild
@@ -12,6 +12,7 @@ OPENGL_REQUIRED=optional
KDE_HANDBOOK=optional
KDE_LINGUAS_LIVE_OVERRIDE=true
CHECKREQS_DISK_BUILD="4G"
+KDE_MINIMAL="4.13.1"
inherit check-reqs kde4-base versionator
DESCRIPTION="KDE Office Suite"
@@ -39,10 +40,10 @@ SLOT="4"
[[ ${PV} == *9999 ]] || \
KEYWORDS="~amd64 ~arm ~x86"
-IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
-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"
+IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +gif +glew +glib +gsf
+gsl import-filter +jpeg jpeg2k +kdcraw kde kdepim +lcms marble mysql nepomuk
++okular opengtl openexr +pdf postgres 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"
@@ -55,10 +56,9 @@ REQUIRED_USE="
calligra_features_author? ( calligra_features_words )
calligra_features_kexi? ( calligra_features_sheets )
calligra_features_words? ( calligra_features_sheets )
- calligra_features_krita? ( eigen exif lcms )
+ calligra_features_krita? ( eigen exif glew lcms )
calligra_features_plan? ( kdepim )
calligra_features_sheets? ( eigen )
- kdepim? ( semantic-desktop )
vc? ( calligra_features_krita )
test? ( calligra_features_karbon )
"
@@ -75,7 +75,7 @@ RDEPEND="
!app-office/krita
!app-office/kspread
!app-office/kword
- $(add_kdebase_dep kdelibs 'semantic-desktop?')
+ $(add_kdebase_dep kdelibs 'nepomuk?')
dev-lang/perl
dev-libs/boost
dev-libs/libxml2
@@ -112,6 +112,7 @@ RDEPEND="
lcms? ( media-libs/lcms:2 )
marble? ( $(add_kdebase_dep marble) )
mysql? ( virtual/mysql )
+ nepomuk? ( dev-libs/soprano )
okular? ( $(add_kdebase_dep okular) )
opengl? ( virtual/glu )
opengtl? ( >=media-libs/opengtl-0.9.15 )
@@ -124,9 +125,6 @@ RDEPEND="
dev-db/postgresql-base
dev-libs/libpqxx
)
- semantic-desktop? (
- dev-libs/soprano
- )
spacenav? ( dev-libs/libspnav )
ssl? ( dev-libs/openssl )
sybase? ( dev-db/freetds )
@@ -217,6 +215,7 @@ src_configure() {
$(cmake-utils_use_with marble Marble)
$(cmake-utils_use_with mysql MySQL)
$(cmake-utils_use_build mysql mySQL)
+ $(cmake-utils_use_with nepomuk Soprano)
$(cmake-utils_use_with okular Okular)
$(cmake-utils_use_with opengtl OpenCTL)
$(cmake-utils_use_with openexr OpenEXR)
@@ -225,7 +224,6 @@ src_configure() {
$(cmake-utils_use_with pdf Pstoedit)
$(cmake-utils_use_with postgres PostgreSQL)
$(cmake-utils_use_build postgres pqxx)
- $(cmake-utils_use_with semantic-desktop Soprano)
$(cmake-utils_use_with spacenav Spnav)
$(cmake-utils_use_with ssl OpenSSL)
$(cmake-utils_use_with sybase FreeTDS)
diff --git a/app-office/calligra/calligra-9999.ebuild
b/app-office/calligra/calligra-9999.ebuild
index 84d3cbf..a2b231e 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -12,6 +12,7 @@ OPENGL_REQUIRED=optional
KDE_HANDBOOK=optional
KDE_LINGUAS_LIVE_OVERRIDE=true
CHECKREQS_DISK_BUILD="4G"
+KDE_MINIMAL="4.13.1"
inherit check-reqs kde4-base versionator
DESCRIPTION="KDE Office Suite"
@@ -39,10 +40,10 @@ SLOT="4"
[[ ${PV} == *9999 ]] || \
KEYWORDS="~amd64 ~arm ~x86"
-IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
-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"
+IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +gif +glew +glib +gsf
+gsl import-filter +jpeg jpeg2k +kdcraw kde kdepim +lcms marble mysql nepomuk
++okular opengtl openexr +pdf postgres 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"
@@ -55,10 +56,9 @@ REQUIRED_USE="
calligra_features_author? ( calligra_features_words )
calligra_features_kexi? ( calligra_features_sheets )
calligra_features_words? ( calligra_features_sheets )
- calligra_features_krita? ( eigen exif lcms )
+ calligra_features_krita? ( eigen exif glew lcms )
calligra_features_plan? ( kdepim )
calligra_features_sheets? ( eigen )
- kdepim? ( semantic-desktop )
vc? ( calligra_features_krita )
test? ( calligra_features_karbon )
"
@@ -75,7 +75,7 @@ RDEPEND="
!app-office/krita
!app-office/kspread
!app-office/kword
- $(add_kdebase_dep kdelibs 'semantic-desktop?')
+ $(add_kdebase_dep kdelibs 'nepomuk?')
dev-lang/perl
dev-libs/boost
dev-libs/libxml2
@@ -112,6 +112,7 @@ RDEPEND="
lcms? ( media-libs/lcms:2 )
marble? ( $(add_kdebase_dep marble) )
mysql? ( virtual/mysql )
+ nepomuk? ( dev-libs/soprano )
okular? ( $(add_kdebase_dep okular) )
opengl? ( virtual/glu )
opengtl? ( >=media-libs/opengtl-0.9.15 )
@@ -124,9 +125,6 @@ RDEPEND="
dev-db/postgresql-base
dev-libs/libpqxx
)
- semantic-desktop? (
- dev-libs/soprano
- )
spacenav? ( dev-libs/libspnav )
ssl? ( dev-libs/openssl )
sybase? ( dev-db/freetds )
@@ -217,6 +215,7 @@ src_configure() {
$(cmake-utils_use_with marble Marble)
$(cmake-utils_use_with mysql MySQL)
$(cmake-utils_use_build mysql mySQL)
+ $(cmake-utils_use_with nepomuk Soprano)
$(cmake-utils_use_with okular Okular)
$(cmake-utils_use_with opengtl OpenCTL)
$(cmake-utils_use_with openexr OpenEXR)
@@ -225,7 +224,6 @@ src_configure() {
$(cmake-utils_use_with pdf Pstoedit)
$(cmake-utils_use_with postgres PostgreSQL)
$(cmake-utils_use_build postgres pqxx)
- $(cmake-utils_use_with semantic-desktop Soprano)
$(cmake-utils_use_with spacenav Spnav)
$(cmake-utils_use_with ssl OpenSSL)
$(cmake-utils_use_with sybase FreeTDS)
diff --git a/app-office/calligra/metadata.xml b/app-office/calligra/metadata.xml
index 6ad4b18..af43b2c 100644
--- a/app-office/calligra/metadata.xml
+++ b/app-office/calligra/metadata.xml
@@ -13,6 +13,7 @@
<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>
+ <flag name="nepomuk">Enable Nepomuk based semantic desktop
support (deprecated)</flag>
<flag name="okular">Enable bindings for
<pkg>kde-base/okular</pkg></flag>
<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>
