[gentoo-commits] proj/kde:master commit in: app-office/akonadi-server/

["Johannes Huber" <johu@gentoo.org>]

commit:     e6519e7bea4b31f942135e718c884caedea657b6
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 21 12:32:07 2014 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Apr 21 12:32:07 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=e6519e7b

[app-office/akonadi-server] Add USE flag soprano, bug #508040

Package-Manager: portage-2.2.10

---
 app-office/akonadi-server/akonadi-server-9999.ebuild | 11 +++++++----
 app-office/akonadi-server/metadata.xml               |  3 +++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/app-office/akonadi-server/akonadi-server-9999.ebuild b/app-office/akonadi-server/akonadi-server-9999.ebuild
index d48db9d..361da4e 100644
--- a/app-office/akonadi-server/akonadi-server-9999.ebuild
+++ b/app-office/akonadi-server/akonadi-server-9999.ebuild
@@ -22,14 +22,12 @@ HOMEPAGE="http://pim.kde.org/akonadi"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="+mysql postgres +qt4 qt5 sqlite test"
+IUSE="+mysql postgres +qt4 qt5 soprano sqlite test"
 
 REQUIRED_USE="^^ ( qt4 qt5 ) || ( sqlite mysql postgres )"
 
 CDEPEND="
 	dev-libs/boost:=
-	>=dev-libs/soprano-2.6.51
-	x11-misc/shared-mime-info
 	qt4? (
 		>=dev-qt/qtcore-4.8.5:4
 		>=dev-qt/qtdbus-4.8.5:4
@@ -38,7 +36,6 @@ CDEPEND="
 		>=dev-qt/qttest-4.8.5:4
 	)
 	qt5? (
-		>=dev-libs/soprano-2.6.51[-qt4,qt5]
 		dev-qt/qtcore:5
 		dev-qt/qtdbus:5
 		dev-qt/qtgui:5
@@ -47,6 +44,11 @@ CDEPEND="
 		dev-qt/qttest:5
 		dev-qt/qtwidgets:5
 		dev-qt/qtxml:5
+		soprano? ( dev-libs/soprano[-qt4,qt5] )
+	)
+	soprano? (
+		dev-libs/soprano
+		x11-misc/shared-mime-info
 	)
 	sqlite? ( dev-db/sqlite:3 )
 "
@@ -94,6 +96,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DINSTALL_QSQLITE_IN_QT_PREFIX=ON
 		$(cmake-utils_use test AKONADI_BUILD_TESTS)
+		$(cmake-utils_use_with soprano)
 		$(cmake-utils_use sqlite AKONADI_BUILD_QSQLITE)
 		$(cmake-utils_use qt5 QT5_BUILD)
 	)

diff --git a/app-office/akonadi-server/metadata.xml b/app-office/akonadi-server/metadata.xml
index a23f444..3142906 100644
--- a/app-office/akonadi-server/metadata.xml
+++ b/app-office/akonadi-server/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>kde</herd>
+	<use>
+		<flag name="soprano">Enable deprecated <pkg>dev-libs/soprano</pkg>, needed for nepomuk search</flag>
+	</use>
 </pkgmetadata>