[gentoo-commits] proj/kde:master commit in: kde-base/plasma-workspace/

["Johannes Huber" <johu@gentoo.org>]

commit:     1b68dc65f049d93d588691c5fce0ea36fc625714
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri Aug  7 22:16:34 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri Aug  7 22:16:34 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=1b68dc65

[kde-base/plasma-workspace] Drop deprecated Nepomuk support

Package-Manager: portage-2.2.20

 kde-base/plasma-workspace/metadata.xml                     |  1 -
 .../plasma-workspace/plasma-workspace-4.11.49.9999.ebuild  | 14 +++++---------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/kde-base/plasma-workspace/metadata.xml b/kde-base/plasma-workspace/metadata.xml
index efbee28..9be2aba 100644
--- a/kde-base/plasma-workspace/metadata.xml
+++ b/kde-base/plasma-workspace/metadata.xml
@@ -4,7 +4,6 @@
 	<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>

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 c60b89f..9bc6965 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 +kdepim nepomuk python qalculate"
+IUSE="debug gps json +kdepim python qalculate"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
@@ -23,7 +23,7 @@ COMMONDEPEND="
 	>=dev-qt/qtcore-4.8.4-r3:4
 	!kde-misc/ktouchpadenabler
 	$(add_kdebase_dep kactivities)
-	$(add_kdebase_dep kdelibs 'nepomuk?')
+	$(add_kdebase_dep kdelibs)
 	$(add_kdebase_dep kephal)
 	$(add_kdebase_dep ksysguard)
 	$(add_kdebase_dep libkworkspace)
@@ -40,10 +40,6 @@ COMMONDEPEND="
 	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}]
@@ -99,15 +95,15 @@ src_unpack() {
 
 src_configure() {
 	local mycmakeargs=(
+		-DWITH_NepomukCore=OFF
+		-DWITH_Soprano=OFF
+		-DWITH_Xmms=OFF
 		$(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)
-		-DWITH_Xmms=OFF
 	)
 
 	kde4-meta_src_configure