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

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 ee76b60912c2f17de165662a4ff8ea243ed02681..761effdea10c236e5bbf964e744a4af15dffa005 100644 (file)
--- 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 235b20bd1b4b8d39678134b8b3f727fa9255e618..4d16b228c056e4b7f3e2d638670965b62434ae32 100644 (file)
--- 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 3142906f9f286e91287a0a0aea77b09b0697af72..a23f444b67d6ce6905070de7246a3dd27591b0fd 100644 (file)
--- 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>