commit:     145464c303b744c6b89138f2f55f417fbe75dee2
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun May  4 21:41:02 2014 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun May  4 22:48:49 2014 +0000
URL:        
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=145464c3

[kde-base/plasma-workspace] Introduce nepomuk and kdepim USE flags, bug #508350

Package-Manager: portage-2.2.10

---
 kde-base/plasma-workspace/metadata.xml             | 12 ++++++-----
 .../plasma-workspace-4.11.49.9999.ebuild           | 24 +++++++++++-----------
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/kde-base/plasma-workspace/metadata.xml 
b/kde-base/plasma-workspace/metadata.xml
index 3b3fc4f..efbee28 100644
--- a/kde-base/plasma-workspace/metadata.xml
+++ b/kde-base/plasma-workspace/metadata.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-<herd>kde</herd>
-<use>
-       <flag name="json">Enable JSON support via 
<pkg>dev-libs/qjson</pkg></flag>
-       <flag name="qalculate">Enable Qalculate runner using 
<pkg>sci-libs/libqalculate</pkg></flag>
-</use>
+       <herd>kde</herd>
+       <use>
+               <flag name="kdepim">KDE PIM integration via 
<pkg>kde-base/kdepimlibs</pkg></flag>
+               <flag name="nepomuk">Enable Nepomuk based semantic desktop 
support (deprecated)</flag>
+               <flag name="json">Enable JSON support via 
<pkg>dev-libs/qjson</pkg></flag>
+               <flag name="qalculate">Enable Qalculate runner using 
<pkg>sci-libs/libqalculate</pkg></flag>
+       </use>
 </pkgmetadata>

diff --git a/kde-base/plasma-workspace/plasma-workspace-4.11.49.9999.ebuild 
b/kde-base/plasma-workspace/plasma-workspace-4.11.49.9999.ebuild
index ed3b700..58fa355 100644
--- a/kde-base/plasma-workspace/plasma-workspace-4.11.49.9999.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-4.11.49.9999.ebuild
@@ -14,7 +14,7 @@ inherit python-single-r1 kde4-meta
 
 DESCRIPTION="Plasma: KDE desktop framework"
 KEYWORDS=""
-IUSE="debug gps json python qalculate semantic-desktop"
+IUSE="debug gps json +kdepim nepomuk python qalculate"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
@@ -23,11 +23,11 @@ COMMONDEPEND="
        >=dev-qt/qtcore-4.8.4-r3:4
        !kde-misc/ktouchpadenabler
        $(add_kdebase_dep kactivities)
-       $(add_kdebase_dep kdelibs 'semantic-desktop?')
+       $(add_kdebase_dep kdelibs 'nepomuk?')
        $(add_kdebase_dep kephal)
        $(add_kdebase_dep ksysguard)
        $(add_kdebase_dep libkworkspace)
-       $(add_kdebase_dep libplasmaclock 'semantic-desktop?')
+       $(add_kdebase_dep libplasmaclock 'kdepim?')
        $(add_kdebase_dep libplasmagenericshell)
        $(add_kdebase_dep libtaskmanager)
        x11-libs/libX11
@@ -39,17 +39,17 @@ COMMONDEPEND="
        x11-libs/libXrender
        gps? ( >=sci-geosciences/gpsd-2.37 )
        json? ( dev-libs/qjson )
+       kdepim? ( $(add_kdebase_dep kdepimlibs) )
+       nepomuk? (
+               dev-libs/soprano
+               $(add_kdebase_dep nepomuk-core)
+       )
        python? (
                ${PYTHON_DEPS}
                >=dev-python/PyQt4-4.4.0[X,${PYTHON_USEDEP}]
                $(add_kdebase_dep pykde4 "${PYTHON_USEDEP}")
        )
        qalculate? ( sci-libs/libqalculate )
-       semantic-desktop? (
-               dev-libs/soprano
-               $(add_kdebase_dep kdepimlibs)
-               $(add_kdebase_dep nepomuk-core)
-       )
 "
 DEPEND="${COMMONDEPEND}
        dev-libs/boost
@@ -101,12 +101,12 @@ src_configure() {
        mycmakeargs=(
                $(cmake-utils_use_with gps libgps)
                $(cmake-utils_use_with json QJSON)
+               $(cmake-utils_use_with kdepim Akonadi)
+               $(cmake-utils_use_with kdepim KdepimLibs)
+               $(cmake-utils_use_with nepomuk NepomukCore)
+               $(cmake-utils_use_with nepomuk Soprano)
                $(cmake-utils_use_with python PythonLibrary)
                $(cmake-utils_use_with qalculate)
-               $(cmake-utils_use_with semantic-desktop Akonadi)
-               $(cmake-utils_use_with semantic-desktop KdepimLibs)
-               $(cmake-utils_use_with semantic-desktop NepomukCore)
-               $(cmake-utils_use_with semantic-desktop Soprano)
                -DWITH_Xmms=OFF
        )
 

Reply via email to