Add USE dependency default in preparation for the removal of the semantic-desktop USE flag. Remove semantic-desktop USE flag from testing versions.

(Portage version: 2.1.12.2/cvs/Linux x86_64, signed Manifest commit with key 675D0D2C)

4 files changed, 23 insertions, 20 deletions

diff --git a/app-office/calligra/ChangeLog b/app-office/calligra/ChangeLog
index b80acbf0f47b..ae2fc43aee84 100644
--- a/app-office/calligra/ChangeLog
+++ b/app-office/calligra/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/calligra
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/ChangeLog,v 1.84 2013/04/27 12:29:59 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/ChangeLog,v 1.85 2013/05/30 11:56:02 kensington Exp $
+
+  30 May 2013; Michael Palimaka <kensington@gentoo.org> calligra-2.5.3.ebuild,
+  calligra-2.6.3.ebuild, calligra-9999.ebuild:
+  Add USE dependency default in preparation for the removal of the semantic-
+  desktop USE flag. Remove semantic-desktop USE flag from testing versions.
 
   27 Apr 2013; Tomáš Chvátal <scarabeus@gentoo.org> calligra-2.6.3.ebuild,
   calligra-9999.ebuild:
diff --git a/app-office/calligra/calligra-2.5.3.ebuild b/app-office/calligra/calligra-2.5.3.ebuild
index 085ca3a9c9a9..20bc150851a5 100644
--- a/app-office/calligra/calligra-2.5.3.ebuild
+++ b/app-office/calligra/calligra-2.5.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.5.3.ebuild,v 1.3 2013/03/02 19:34:55 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.5.3.ebuild,v 1.4 2013/05/30 11:56:02 kensington Exp $
 
 # note: files that need to be checked for dependencies etc:
 # CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
@@ -101,7 +101,7 @@ RDEPEND="
 	jpeg? ( virtual/jpeg )
 	jpeg2k? ( media-libs/openjpeg )
 	kdcraw? ( $(add_kdebase_dep libkdcraw) )
-	kdepim? ( $(add_kdebase_dep kdepimlibs 'semantic-desktop') )
+	kdepim? ( $(add_kdebase_dep kdepimlibs 'semantic-desktop(+)') )
 	lcms? ( media-libs/lcms:2 )
 	marble? ( $(add_kdebase_dep marble) )
 	mysql? ( virtual/mysql )
@@ -117,7 +117,7 @@ RDEPEND="
 		dev-db/postgresql-base
 		dev-libs/libpqxx
 	)
-	semantic-desktop? ( dev-libs/soprano $(add_kdebase_dep kdelibs semantic-desktop) )
+	semantic-desktop? ( dev-libs/soprano $(add_kdebase_dep kdelibs 'semantic-desktop(+)') )
 	spacenav? ( dev-libs/libspnav  )
 	ssl? ( dev-libs/openssl )
 	sybase? ( dev-db/freetds )
diff --git a/app-office/calligra/calligra-2.6.3.ebuild b/app-office/calligra/calligra-2.6.3.ebuild
index 6723ac329ddb..9bbcd47e6f19 100644
--- a/app-office/calligra/calligra-2.6.3.ebuild
+++ b/app-office/calligra/calligra-2.6.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.6.3.ebuild,v 1.3 2013/04/27 12:29:59 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.6.3.ebuild,v 1.4 2013/05/30 11:56:02 kensington Exp $
 
 # note: files that need to be checked for dependencies etc:
 # CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
@@ -44,8 +44,8 @@ KEYWORDS="~amd64 ~arm ~x86"
 
 IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
 gsl +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +okular opengtl openexr
-+pdf postgres +semantic-desktop spacenav +ssl sybase test tiff +threads +truetype
-word-perfect xbase +xml +xslt"
++pdf postgres spacenav +ssl sybase test tiff +threads +truetype word-perfect 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"
@@ -59,7 +59,7 @@ REQUIRED_USE="
 	calligra_features_kexi? ( calligra_features_sheets )
 	calligra_features_words? ( calligra_features_sheets )
 	calligra_features_krita? ( eigen exif lcms )
-	calligra_features_plan? ( kdepim semantic-desktop )
+	calligra_features_plan? ( kdepim )
 	calligra_features_sheets? ( eigen )
 	test? ( calligra_features_karbon )
 "
@@ -76,9 +76,11 @@ RDEPEND="
 	!app-office/krita
 	!app-office/kspread
 	!app-office/kword
+	$(add_kdebase_dep kdelibs 'semantic-desktop(+)')
 	dev-lang/perl
 	dev-libs/boost
 	dev-libs/libxml2
+	dev-libs/soprano
 	$(add_kdebase_dep knewstuff)
 	media-libs/libpng
 	sys-libs/zlib
@@ -99,7 +101,7 @@ RDEPEND="
 	jpeg? ( virtual/jpeg )
 	jpeg2k? ( media-libs/openjpeg )
 	kdcraw? ( $(add_kdebase_dep libkdcraw) )
-	kdepim? ( $(add_kdebase_dep kdepimlibs 'semantic-desktop') )
+	kdepim? ( $(add_kdebase_dep kdepimlibs 'semantic-desktop(+)') )
 	lcms? ( media-libs/lcms:2 )
 	marble? ( $(add_kdebase_dep marble) )
 	mysql? ( virtual/mysql )
@@ -115,7 +117,6 @@ RDEPEND="
 		dev-db/postgresql-base
 		dev-libs/libpqxx
 	)
-	semantic-desktop? ( dev-libs/soprano $(add_kdebase_dep kdelibs semantic-desktop) )
 	spacenav? ( dev-libs/libspnav  )
 	ssl? ( dev-libs/openssl )
 	sybase? ( dev-db/freetds )
@@ -201,8 +202,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 semantic-desktop NEPOMUK)
 		$(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 d31cef708a57..fa17db394c88 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-9999.ebuild,v 1.36 2013/04/27 12:29:59 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-9999.ebuild,v 1.37 2013/05/30 11:56:02 kensington Exp $
 
 # note: files that need to be checked for dependencies etc:
 # CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
@@ -44,8 +44,8 @@ KEYWORDS="~amd64 ~arm ~x86"
 
 IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
 gsl +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +okular opengtl openexr
-+pdf postgres +semantic-desktop spacenav +ssl sybase test tiff +threads +truetype
-word-perfect xbase +xml +xslt"
++pdf postgres spacenav +ssl sybase test tiff +threads +truetype word-perfect 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"
@@ -59,7 +59,7 @@ REQUIRED_USE="
 	calligra_features_kexi? ( calligra_features_sheets )
 	calligra_features_words? ( calligra_features_sheets )
 	calligra_features_krita? ( eigen exif lcms )
-	calligra_features_plan? ( kdepim semantic-desktop )
+	calligra_features_plan? ( kdepim )
 	calligra_features_sheets? ( eigen )
 	test? ( calligra_features_karbon )
 "
@@ -76,9 +76,11 @@ RDEPEND="
 	!app-office/krita
 	!app-office/kspread
 	!app-office/kword
+	$(add_kdebase_dep kdelibs 'semantic-desktop(+)')
 	dev-lang/perl
 	dev-libs/boost
 	dev-libs/libxml2
+	dev-libs/soprano
 	$(add_kdebase_dep knewstuff)
 	media-libs/libpng
 	sys-libs/zlib
@@ -99,7 +101,7 @@ RDEPEND="
 	jpeg? ( virtual/jpeg )
 	jpeg2k? ( media-libs/openjpeg )
 	kdcraw? ( $(add_kdebase_dep libkdcraw) )
-	kdepim? ( $(add_kdebase_dep kdepimlibs 'semantic-desktop') )
+	kdepim? ( $(add_kdebase_dep kdepimlibs 'semantic-desktop(+)') )
 	lcms? ( media-libs/lcms:2 )
 	marble? ( $(add_kdebase_dep marble) )
 	mysql? ( virtual/mysql )
@@ -115,7 +117,6 @@ RDEPEND="
 		dev-db/postgresql-base
 		dev-libs/libpqxx
 	)
-	semantic-desktop? ( dev-libs/soprano $(add_kdebase_dep kdelibs semantic-desktop) )
 	spacenav? ( dev-libs/libspnav  )
 	ssl? ( dev-libs/openssl )
 	sybase? ( dev-db/freetds )
@@ -201,8 +202,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 semantic-desktop NEPOMUK)
 		$(cmake-utils_use_with spacenav Spnav)
 		$(cmake-utils_use_with ssl OpenSSL)
 		$(cmake-utils_use_with sybase FreeTDS)