| 1 |
commit: 3f27a08f9a269ebecdf2bc7d73d9ba66d489ae95 |
| 2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed May 29 18:40:37 2013 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed May 29 18:40:37 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=3f27a08f |
| 7 |
|
| 8 |
[app-office/calligra] Fix dependency in preparation for USE="-semantic-desktop" removal. |
| 9 |
|
| 10 |
Package-Manager: portage-2.1.12.2 |
| 11 |
|
| 12 |
--- |
| 13 |
app-office/calligra/calligra-2.6.90.ebuild | 13 ++++++------- |
| 14 |
1 file changed, 6 insertions(+), 7 deletions(-) |
| 15 |
|
| 16 |
diff --git a/app-office/calligra/calligra-2.6.90.ebuild b/app-office/calligra/calligra-2.6.90.ebuild |
| 17 |
index 6723ac3..89eee32 100644 |
| 18 |
--- a/app-office/calligra/calligra-2.6.90.ebuild |
| 19 |
+++ b/app-office/calligra/calligra-2.6.90.ebuild |
| 20 |
@@ -44,8 +44,8 @@ KEYWORDS="~amd64 ~arm ~x86" |
| 21 |
|
| 22 |
IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf |
| 23 |
gsl +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +okular opengtl openexr |
| 24 |
-+pdf postgres +semantic-desktop spacenav +ssl sybase test tiff +threads +truetype |
| 25 |
-word-perfect xbase +xml +xslt" |
| 26 |
++pdf postgres spacenav +ssl sybase test tiff +threads +truetype word-perfect xbase |
| 27 |
++xml +xslt" |
| 28 |
|
| 29 |
# please do not sort here, order is same as in CMakeLists.txt |
| 30 |
CAL_FTS="author kexi words flow plan stage sheets krita karbon braindump" |
| 31 |
@@ -59,7 +59,7 @@ REQUIRED_USE=" |
| 32 |
calligra_features_kexi? ( calligra_features_sheets ) |
| 33 |
calligra_features_words? ( calligra_features_sheets ) |
| 34 |
calligra_features_krita? ( eigen exif lcms ) |
| 35 |
- calligra_features_plan? ( kdepim semantic-desktop ) |
| 36 |
+ calligra_features_plan? ( kdepim ) |
| 37 |
calligra_features_sheets? ( eigen ) |
| 38 |
test? ( calligra_features_karbon ) |
| 39 |
" |
| 40 |
@@ -76,9 +76,11 @@ RDEPEND=" |
| 41 |
!app-office/krita |
| 42 |
!app-office/kspread |
| 43 |
!app-office/kword |
| 44 |
+ $(add_kdebase_dep kdelibs 'semantic-desktop(+)') |
| 45 |
dev-lang/perl |
| 46 |
dev-libs/boost |
| 47 |
dev-libs/libxml2 |
| 48 |
+ dev-libs/soprano |
| 49 |
$(add_kdebase_dep knewstuff) |
| 50 |
media-libs/libpng |
| 51 |
sys-libs/zlib |
| 52 |
@@ -99,7 +101,7 @@ RDEPEND=" |
| 53 |
jpeg? ( virtual/jpeg ) |
| 54 |
jpeg2k? ( media-libs/openjpeg ) |
| 55 |
kdcraw? ( $(add_kdebase_dep libkdcraw) ) |
| 56 |
- kdepim? ( $(add_kdebase_dep kdepimlibs 'semantic-desktop') ) |
| 57 |
+ kdepim? ( $(add_kdebase_dep kdepimlibs 'semantic-desktop(+)') ) |
| 58 |
lcms? ( media-libs/lcms:2 ) |
| 59 |
marble? ( $(add_kdebase_dep marble) ) |
| 60 |
mysql? ( virtual/mysql ) |
| 61 |
@@ -115,7 +117,6 @@ RDEPEND=" |
| 62 |
dev-db/postgresql-base |
| 63 |
dev-libs/libpqxx |
| 64 |
) |
| 65 |
- semantic-desktop? ( dev-libs/soprano $(add_kdebase_dep kdelibs semantic-desktop) ) |
| 66 |
spacenav? ( dev-libs/libspnav ) |
| 67 |
ssl? ( dev-libs/openssl ) |
| 68 |
sybase? ( dev-db/freetds ) |
| 69 |
@@ -201,8 +202,6 @@ src_configure() { |
| 70 |
$(cmake-utils_use_with pdf Pstoedit) |
| 71 |
$(cmake-utils_use_with postgres PostgreSQL) |
| 72 |
$(cmake-utils_use_build postgres pqxx) |
| 73 |
- $(cmake-utils_use_with semantic-desktop Soprano) |
| 74 |
- $(cmake-utils_use semantic-desktop NEPOMUK) |
| 75 |
$(cmake-utils_use_with spacenav Spnav) |
| 76 |
$(cmake-utils_use_with ssl OpenSSL) |
| 77 |
$(cmake-utils_use_with sybase FreeTDS) |
Archives