summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Huber <johu@gentoo.org>2015-08-12 21:06:31 +0200
committerJohannes Huber <johu@gentoo.org>2015-08-12 21:06:48 +0200
commitea0edc0e24ddcf5872781b704230fe4e42bb12cf (patch)
treec94937ef27fff42a6dab5a8d564ffcf18239cbe9 /app-office
parentapp-text/bibus-1.5.2-r1: x86 stable wrt bug #529412 (diff)
downloadgentoo-ea0edc0e24ddcf5872781b704230fe4e42bb12cf.tar.gz
gentoo-ea0edc0e24ddcf5872781b704230fe4e42bb12cf.tar.bz2
gentoo-ea0edc0e24ddcf5872781b704230fe4e42bb12cf.zip
app-office/akonadi-server: Drop soprano USE flag
Part of the Nepomuk removal, was only needed for KDE PIM with Nepomuk support. Package-Manager: portage-2.2.20.1
Diffstat (limited to 'app-office')
-rw-r--r--app-office/akonadi-server/akonadi-server-1.13.0-r1.ebuild8
-rw-r--r--app-office/akonadi-server/akonadi-server-1.13.0.ebuild6
-rw-r--r--app-office/akonadi-server/metadata.xml3
3 files changed, 5 insertions, 12 deletions
diff --git a/app-office/akonadi-server/akonadi-server-1.13.0-r1.ebuild b/app-office/akonadi-server/akonadi-server-1.13.0-r1.ebuild
index ee76b60912c2..761effdea10c 100644
--- a/app-office/akonadi-server/akonadi-server-1.13.0-r1.ebuild
+++ b/app-office/akonadi-server/akonadi-server-1.13.0-r1.ebuild
@@ -8,7 +8,7 @@ if [[ $PV = *9999* ]]; then
scm_eclass=git-r3
EGIT_REPO_URI=( "git://anongit.kde.org/akonadi" )
SRC_URI=""
- KEYWORDS="amd64 ppc"
+ KEYWORDS=""
else
SRC_URI="mirror://kde/stable/${PN/-server/}/src/${P/-server/}.tar.bz2"
KEYWORDS="amd64 ~arm ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
@@ -22,7 +22,7 @@ HOMEPAGE="http://pim.kde.org/akonadi"
LICENSE="LGPL-2.1"
SLOT="0"
-IUSE="+mysql postgres +qt4 qt5 soprano sqlite test"
+IUSE="+mysql postgres +qt4 qt5 sqlite test"
REQUIRED_USE="^^ ( qt4 qt5 ) || ( sqlite mysql postgres )"
@@ -45,9 +45,7 @@ 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}
@@ -105,8 +103,8 @@ pkg_setup() {
src_configure() {
local mycmakeargs=(
-DINSTALL_QSQLITE_IN_QT_PREFIX=ON
+ -DWITH_SOPRANO=FALSE
$(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/akonadi-server-1.13.0.ebuild b/app-office/akonadi-server/akonadi-server-1.13.0.ebuild
index 235b20bd1b4b..4d16b228c056 100644
--- a/app-office/akonadi-server/akonadi-server-1.13.0.ebuild
+++ b/app-office/akonadi-server/akonadi-server-1.13.0.ebuild
@@ -22,7 +22,7 @@ HOMEPAGE="http://pim.kde.org/akonadi"
LICENSE="LGPL-2.1"
SLOT="0"
-IUSE="+mysql postgres +qt4 qt5 soprano sqlite test"
+IUSE="+mysql postgres +qt4 qt5 sqlite test"
REQUIRED_USE="^^ ( qt4 qt5 ) || ( sqlite mysql postgres )"
@@ -45,9 +45,7 @@ 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}
@@ -103,8 +101,8 @@ pkg_setup() {
src_configure() {
local mycmakeargs=(
-DINSTALL_QSQLITE_IN_QT_PREFIX=ON
+ -DWITH_SOPRANO=FALSE
$(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 3142906f9f28..a23f444b67d6 100644
--- a/app-office/akonadi-server/metadata.xml
+++ b/app-office/akonadi-server/metadata.xml
@@ -2,7 +2,4 @@
<!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>