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

Package-Manager: portage-2.1.12.2/cvs/Linux x86_64
Manifest-Sign-Key: 0x675D0D2C

5 files changed, 35 insertions, 38 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/Manifest b/app-office/calligra/Manifest
index 084ead585747..021896d40bc3 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -7,25 +7,19 @@ AUX calligra-2.5.0-kexi-automagic.patch 953 SHA256 c0acf337441978b9098bd5fa8636d
 AUX calligra-2.5.2-lcms24.patch 615 SHA256 c8ce91acd7cfd35316a09ee04bb29c2112e314265073e69306a5035244e0f93e SHA512 c62b7ebbf879c3595d0ce953ae08c9f7f193b5a1e672262b68a653a2dc52eecac0bba3e43a0f5e3b3526000e4dcf7ee6f7d0608e3463331bb6cef8d9e4e84b5f WHIRLPOOL a1bf312f3924105410a6adbc09b0c69c6004b0d9f4d4d4f58bcc6d9fd2ef6e2e8e6ac1df0c550a0c8a9d93fbd7e27d93f2b5ef48911412c253cb23da7b1ed930
 DIST calligra-2.5.3.tar.bz2 119327013 SHA256 b147463d518b3f7380a61cf1f6621bdd04c0150598e1df2765a93203e51c3aca SHA512 67969088d323b181c243fd7c0e1548dc9fcecbd58d7ce5fa2fbbf8aaf57ad4e949ca324a91b146bbaa76d41621569b4c54f0355c557d7d3efb45d2810f368b23 WHIRLPOOL bc45b44823815f9cb833dbaf120e916b0a4628db827d1025193ab29df8eb6735372315ab2a1da4624dbc71dd141132efcf2116af559526e10adf9c2ecf05f09f
 DIST calligra-2.6.3.tar.bz2 126545368 SHA256 72479e23098f221bc6b5dff92fc62906897061f1009223a632e513fa3b60bfef SHA512 55da2f4552ee68bbf6494fb6ec9abc0958cff762719b1ba5a172793a5cff5283ec63a965f26fe0347ccb1ea71cc4ceb4d70edd72b058d7bfd316421595b48cb5 WHIRLPOOL 5281272864a7c30f518bb91e0a53ce24780e3e91efe9aa5d7c5ee83dc0b577816e40c27d67968987ab805eb60e6cbcef9c3c765d2026969f37083dba6caac59c
-EBUILD calligra-2.5.3.ebuild 6717 SHA256 46fd15b357f838e039132d2dd97a47c359606773ee106af2c9a6251a1bd7124b SHA512 dae486d8fe258ba4786a6aa4cc38506d05ce07ddf1934ff79225c8e28fad29f5e9ab6f66aa8443b7662c786bbbb7abef43a86c78a2eae4245370159cc05f6065 WHIRLPOOL 49b33ac14f942aa93cac9437b28c36a1f1aa0d62fb1f77a0198f71bcb91beb3a5443f6d7c9ed9d441ce451672ec0fe5e2ffd07000a33a6b6eebdb858b3cb68b4
-EBUILD calligra-2.6.3.ebuild 6751 SHA256 748ce4b45a771506432c45cd8cd0eb871fe827fdefee8a6ef5c3b8e5bc69ce6f SHA512 d982138146fd66ebd683e15b26055601072eb08a988c199c430ca34ac279abf34d6732b7329751e1761ed07f74a74b1dc9a2aa3c6cb61d309f1c245ad4ce9afe WHIRLPOOL cddbc350fca6a3b98930e3d563362e23cfe72bbb30a89dd8093dee57b67fa3a2853da5e25a8b058b4bf2868f285edb5731fd1c0e2fcc3bde2aa646edd705f55c
-EBUILD calligra-9999.ebuild 6751 SHA256 32732f2edd4cc2c42424230bd002cf1d0bc637dbb67d3a17ad2d9defe62e25a4 SHA512 e54ed027314a36884a0f1fc5abf7deff5b844b9b3c7097c92dcf891a0eb441fff1ca3d43dcdf485f2f0cefac7d964d98639c09854d93155f229dc8f39cfad517 WHIRLPOOL 0565a616eb320b449dc4f069add3ce39df833704666e49fcbe8e00b0a52d703f006a1d07511841304967e5f1b6d8bf12d026b7d229989931b5b27923a6ed83c1
-MISC ChangeLog 14707 SHA256 92955a3d8b68e80946bf6d5efcf9241dd4d6a86ca59a2cdc9ae48400688478ed SHA512 0198ec0f74f866a64479f8b6f08b64927870ca89a586e6e23730d6d036768d74c8dc5da22ebcd537ccb786eaf0422e7d9632ae2e8ce50219ff20ca9841509da8 WHIRLPOOL 8d9cb3d71ab202589c8221bb8abc3524f879405935a2c64ec43e6350af65295b78411bc2acdc1e0c775630fde836bc8c93ca46abc58e161ffdef72bad682d54a
+EBUILD calligra-2.5.3.ebuild 6727 SHA256 5173048c93453a695245ce9752c161cdac2b9a70059d68ae3b9d881670e4d6a6 SHA512 dab4ca7b3316abcbe902a1029d231a56e3c697e9a2b2a8242af8e658b64615a7d02f778fd4c6c5fb0c994941e1c1dff45ae526aac4d4c991e86d9e7b38b8ae82 WHIRLPOOL 9bbf5f81216a7c393b27722968654f5db0486ad6264ab3234ab46f60ec790b4619d8f665f0a893a67cc3519edd5e9e2d07d3b34012a44afff7b2069c6f6e7705
+EBUILD calligra-2.6.3.ebuild 6607 SHA256 c718c69e11df48a81acc88d1c9fd8301a8785f11f2b8afca23c0abaca1f1ced6 SHA512 93771d7fbb6702f9b22c0bbc1053e6a5bf86107344d5fbfedba9366b3293bc43f715fca4bbf87d0018cfd205d117a6cc47f1e7579e69cc60935cda1d96020d62 WHIRLPOOL e791f6ef3a59eb1a4f00ffe3cff9ed3bea2829412ed306e64bbceeec3cee9bbe3ad090366d675c989d89097880c58db13cfeec498945e38c9b56f6aeec67cff1
+EBUILD calligra-9999.ebuild 6607 SHA256 11ca08c4fa1f4ef8931248dc8c088ce38f1a14fe4043d0f4366d91f431ce5fc4 SHA512 3845bcfcd0388b9975d7f573b769920ca3a7cb989492c4f4cd673dcba6267b195a594ea59c02b59996fe800517b7f994395b7bc628c17b450a53d89d1909cbe7 WHIRLPOOL 8a722d82c53c35afefd44dd9edab4fb95b4160e7b1afc7b7c567293e8d18833d5cf45fd69c8d2991285bbc789e926272328b1f96f3f03db241af201275285776
+MISC ChangeLog 14988 SHA256 9b96d4255b794bdd8a491ef4b6df6e7c733085c609b9c641db117f55001cfc3c SHA512 17aa73357f0bd6e7db8599b58165657dbd90f3dd0aeac709141091ea4c280681461d3213064b750820034fd239d8519905523cd34484dc507d8e20fb5b3884f0 WHIRLPOOL b0097cddff4bc1530c2b46c021a33fb0016b8dc284952f421f6ab8a533d933b68146ed2259ff5b937db370a5d6e42676dab35cd1407a61f1319dcc56160261cc
 MISC metadata.xml 1466 SHA256 98b54f594a8ccb798746be3f384be9857d99083e7573eab6f1c653874cf3e894 SHA512 06352ab873f12a6e0b3d44b4cb491b7ba2a1e12b671a1dc77e88efdead7c54f51f6adbe0faaa466487be50307320e03b260c50e848605fdd4e83fa174ed2e775 WHIRLPOOL 978e11c29c82bff2b8e281c386eefd8d044eb9b5fc8e7ba33a296507b62ed0bd15135c324e343207323f8d58b5a2b7a7a933aee75af52ab9af45c16f15c164ba
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRe8TIAAoJEOSiRoyO7jvoTecQAKSvzpcGE6M9sc/z1Orm+nSh
-uJYXftn+nT0lq9fBLHID6aJ+OqCKTbfWXl0U49DWQFHpQ9eqLjMNR+NR7CcH9lXR
-5tqG2QcmeTxiUKenxCUtPwOQ8WzdmbLvTzw+dnM43t0Fbrqn3P+vf2pBRmNZRZCt
-4Q3lS/sqo5kmTm2MI/QEHBqaD+wlqKg/UMMlb5CIPQi+SVSMpMVBu/gjLEXT1LMh
-IuS8qFo/8aRmlnMjqaDTLcCf3/uD89RJdJxamkurnmxoFGQBbP9NGjigC2ulOD8x
-5xb/8dUS7slRYZBg93z/xZRIzuQMF4kFBe/31v8hn4kFSjL3TiWgCHgtlQ6H2+8B
-7dpj+TUySFe7oLkdOTTJl7EJrK9YJQSmSzQLOaA39yLgAXBbjocWx00A4KYxCIcR
-udMYml+TmsYQO0jFV+VnEMCgNQlYIRkWI+uBMvQ/w+3i0XqXgPsjt/OnyVnn7dxY
-lf6cYiUMtvaOEm5F/Z69Z/ewR7IzjhbUOdFzrOtM1o4VPa/H4PAMLkffUGqab/it
-Du5qYqpH5lH49OAsNO4pI32LOwtKFKj5h8b0fNk9aknjhNyDr5MVaaLJ72sQquen
-j9mhxP+Q5jmvhR07Cj1Ie5OYAdQG6Of+x79O+euUXd3gt/wKULcNJhjSVZC9D0rn
-rLu+mn58Nv2OSESJyTQp
-=Ieul
+iQEcBAEBCAAGBQJRpz4IAAoJEMbwO6tnXQ0stlEIAIuiAOhVkjwcCTfgk0PZqUDA
+mZ3SWev2iXZAuiZaxn4iheGpUBlow5nTSKPjjbvXqZDjwFDJqam5ahhRa6f7ZMSG
+leWGAu+0fbC1oERzMHCQVGYemiU+TgbKbkLzdydAn76hrXdi1mgSq9gnfVadPTQj
+OgsHkCZGBdNp5B/4iMofbqlfMPkfjNfPOL0HGdhMUPdB0oLVMcIvcglDrCAmccdD
+EM5VPjmY3OsEbq3Wn1GSnt17QS1qwmRci7jM+fc000e905SbEbB34FRtwoCc5poi
+0z1kQ8ytsPk9cJH+qxgk+FHFLEXNUiWCEPGME4kwHBzb8pW8uhC4RWzALeSQjU0=
+=NxzN
 -----END PGP SIGNATURE-----
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)