commit: ea0edc0e24ddcf5872781b704230fe4e42bb12cf
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 12 19:06:31 2015 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Aug 12 19:06:48 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea0edc0e
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
app-office/akonadi-server/akonadi-server-1.13.0-r1.ebuild | 8 +++-----
app-office/akonadi-server/akonadi-server-1.13.0.ebuild | 6 ++----
app-office/akonadi-server/metadata.xml | 3 ---
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 ee76b60..761effd 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 235b20b..4d16b22 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 3142906..a23f444 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>
