summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Huber <johu@gentoo.org>2014-04-21 13:45:37 +0000
committerJohannes Huber <johu@gentoo.org>2014-04-21 13:45:37 +0000
commit4fa431c2900ed5dc0a9992f6c83e8e3eed732ff3 (patch)
tree964c8394a1d83e82419c996eadd5e130d8b64e74 /app-office
parentAdd use dep on app-office/akonadi-server[soprano]. (diff)
downloadgentoo-2-4fa431c2900ed5dc0a9992f6c83e8e3eed732ff3.tar.gz
gentoo-2-4fa431c2900ed5dc0a9992f6c83e8e3eed732ff3.tar.bz2
gentoo-2-4fa431c2900ed5dc0a9992f6c83e8e3eed732ff3.zip
Add USE flag soprano, bug #508040.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD)
Diffstat (limited to 'app-office')
-rw-r--r--app-office/akonadi-server/ChangeLog6
-rw-r--r--app-office/akonadi-server/akonadi-server-1.12.1.ebuild9
-rw-r--r--app-office/akonadi-server/metadata.xml5
3 files changed, 14 insertions, 6 deletions
diff --git a/app-office/akonadi-server/ChangeLog b/app-office/akonadi-server/ChangeLog
index 5dd77fcf51f7..47d714223326 100644
--- a/app-office/akonadi-server/ChangeLog
+++ b/app-office/akonadi-server/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-office/akonadi-server
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/ChangeLog,v 1.139 2014/04/20 14:49:47 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/ChangeLog,v 1.140 2014/04/21 13:45:37 johu Exp $
+
+ 21 Apr 2014; Johannes Huber <johu@gentoo.org> akonadi-server-1.12.1.ebuild,
+ metadata.xml:
+ Add USE flag soprano, bug #508040.
20 Apr 2014; Johannes Huber <johu@gentoo.org> -akonadi-server-1.10.3.ebuild:
Remove old.
diff --git a/app-office/akonadi-server/akonadi-server-1.12.1.ebuild b/app-office/akonadi-server/akonadi-server-1.12.1.ebuild
index 24e121a4ad57..04b511721999 100644
--- a/app-office/akonadi-server/akonadi-server-1.12.1.ebuild
+++ b/app-office/akonadi-server/akonadi-server-1.12.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/akonadi-server-1.12.1.ebuild,v 1.1 2014/04/08 14:16:31 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/akonadi-server-1.12.1.ebuild,v 1.2 2014/04/21 13:45:37 johu Exp $
EAPI=5
@@ -22,13 +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
@@ -38,7 +37,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,7 +45,9 @@ CDEPEND="
dev-qt/qttest:5
dev-qt/qtwidgets:5
dev-qt/qtxml:5
+ soprano? ( dev-libs/soprano[-qt4,qt5] )
)
+ soprano? ( dev-libs/soprano )
sqlite? ( dev-db/sqlite:3 )
"
DEPEND="${CDEPEND}
@@ -94,6 +94,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 8d1e86a9cefb..3142906f9f28 100644
--- a/app-office/akonadi-server/metadata.xml
+++ b/app-office/akonadi-server/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>kde</herd>
+ <herd>kde</herd>
+ <use>
+ <flag name="soprano">Enable deprecated <pkg>dev-libs/soprano</pkg>, needed for nepomuk search</flag>
+ </use>
</pkgmetadata>