Merge branch 'no-semantic-desktop'

60 files changed, 113 insertions, 224 deletions

diff --git a/app-office/calligra/calligra-2.6.90.ebuild b/app-office/calligra/calligra-2.6.90.ebuild
index 6723ac329dd..89eee3297b9 100644
--- a/app-office/calligra/calligra-2.6.90.ebuild
+++ b/app-office/calligra/calligra-2.6.90.ebuild
@@ -44,8 +44,8 @@ KEYWORDS="~amd64 ~arm ~x86"
 
 IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
 gsl +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +okular opengtl openexr
-+pdf postgres +semantic-desktop spacenav +ssl sybase test tiff +threads +truetype
-word-perfect xbase +xml +xslt"
++pdf postgres spacenav +ssl sybase test tiff +threads +truetype word-perfect xbase
++xml +xslt"
 
 # please do not sort here, order is same as in CMakeLists.txt
 CAL_FTS="author kexi words flow plan stage sheets krita karbon braindump"
@@ -59,7 +59,7 @@ REQUIRED_USE="
 	calligra_features_kexi? ( calligra_features_sheets )
 	calligra_features_words? ( calligra_features_sheets )
 	calligra_features_krita? ( eigen exif lcms )
-	calligra_features_plan? ( kdepim semantic-desktop )
+	calligra_features_plan? ( kdepim )
 	calligra_features_sheets? ( eigen )
 	test? ( calligra_features_karbon )
 "
@@ -76,9 +76,11 @@ RDEPEND="
 	!app-office/krita
 	!app-office/kspread
 	!app-office/kword
+	$(add_kdebase_dep kdelibs 'semantic-desktop(+)')
 	dev-lang/perl
 	dev-libs/boost
 	dev-libs/libxml2
+	dev-libs/soprano
 	$(add_kdebase_dep knewstuff)
 	media-libs/libpng
 	sys-libs/zlib
@@ -99,7 +101,7 @@ RDEPEND="
 	jpeg? ( virtual/jpeg )
 	jpeg2k? ( media-libs/openjpeg )
 	kdcraw? ( $(add_kdebase_dep libkdcraw) )
-	kdepim? ( $(add_kdebase_dep kdepimlibs 'semantic-desktop') )
+	kdepim? ( $(add_kdebase_dep kdepimlibs 'semantic-desktop(+)') )
 	lcms? ( media-libs/lcms:2 )
 	marble? ( $(add_kdebase_dep marble) )
 	mysql? ( virtual/mysql )
@@ -115,7 +117,6 @@ RDEPEND="
 		dev-db/postgresql-base
 		dev-libs/libpqxx
 	)
-	semantic-desktop? ( dev-libs/soprano $(add_kdebase_dep kdelibs semantic-desktop) )
 	spacenav? ( dev-libs/libspnav  )
 	ssl? ( dev-libs/openssl )
 	sybase? ( dev-db/freetds )
@@ -201,8 +202,6 @@ src_configure() {
 		$(cmake-utils_use_with pdf Pstoedit)
 		$(cmake-utils_use_with postgres PostgreSQL)
 		$(cmake-utils_use_build postgres pqxx)
-		$(cmake-utils_use_with semantic-desktop Soprano)
-		$(cmake-utils_use semantic-desktop NEPOMUK)
 		$(cmake-utils_use_with spacenav Spnav)
 		$(cmake-utils_use_with ssl OpenSSL)
 		$(cmake-utils_use_with sybase FreeTDS)
diff --git a/app-office/skrooge/skrooge-9999.ebuild b/app-office/skrooge/skrooge-9999.ebuild
index 56d648738c3..3c47fd6f2db 100644
--- a/app-office/skrooge/skrooge-9999.ebuild
+++ b/app-office/skrooge/skrooge-9999.ebuild
@@ -18,7 +18,7 @@ KEYWORDS=""
 IUSE="debug"
 
 DEPEND="
-	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
+	$(add_kdebase_dep kdepimlibs 'semantic-desktop(+)')
 	app-crypt/qca:2
 	dev-db/sqlite:3
 	dev-libs/grantlee
diff --git a/kde-base/akonadiconsole/akonadiconsole-4.10.49.9999.ebuild b/kde-base/akonadiconsole/akonadiconsole-4.10.49.9999.ebuild
index a1190cdd6f4..a616ce6ad9b 100644
--- a/kde-base/akonadiconsole/akonadiconsole-4.10.49.9999.ebuild
+++ b/kde-base/akonadiconsole/akonadiconsole-4.10.49.9999.ebuild
@@ -12,7 +12,7 @@ KEYWORDS=""
 IUSE="debug"
 
 DEPEND="
-	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
+	$(add_kdebase_dep kdepimlibs 'semantic-desktop(+)')
 	$(add_kdebase_dep kdepim-common-libs)
 	$(add_kdebase_dep nepomuk-core)
 	$(add_kdebase_dep nepomuk-widgets)
diff --git a/kde-base/akonadiconsole/akonadiconsole-9999.ebuild b/kde-base/akonadiconsole/akonadiconsole-9999.ebuild
index a1190cdd6f4..5230b58b9a1 100644
--- a/kde-base/akonadiconsole/akonadiconsole-9999.ebuild
+++ b/kde-base/akonadiconsole/akonadiconsole-9999.ebuild
@@ -12,7 +12,7 @@ KEYWORDS=""
 IUSE="debug"
 
 DEPEND="
-	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
+	$(add_kdebase_dep kdepimlibs)
 	$(add_kdebase_dep kdepim-common-libs)
 	$(add_kdebase_dep nepomuk-core)
 	$(add_kdebase_dep nepomuk-widgets)
diff --git a/kde-base/dolphin/dolphin-4.10.49.9999.ebuild b/kde-base/dolphin/dolphin-4.10.49.9999.ebuild
index 44212965a3f..582a6d60ab2 100644
--- a/kde-base/dolphin/dolphin-4.10.49.9999.ebuild
+++ b/kde-base/dolphin/dolphin-4.10.49.9999.ebuild
@@ -14,7 +14,7 @@ IUSE="debug semantic-desktop thumbnail"
 
 DEPEND="
 	$(add_kdebase_dep kactivities)
-	$(add_kdebase_dep kdelibs 'semantic-desktop?')
+	$(add_kdebase_dep kdelibs 'semantic-desktop(+)?')
 	$(add_kdebase_dep libkonq)
 	semantic-desktop? (
 		>=dev-libs/shared-desktop-ontologies-0.10.0
diff --git a/kde-base/dolphin/dolphin-9999.ebuild b/kde-base/dolphin/dolphin-9999.ebuild
index 44212965a3f..40c84bc5e91 100644
--- a/kde-base/dolphin/dolphin-9999.ebuild
+++ b/kde-base/dolphin/dolphin-9999.ebuild
@@ -10,18 +10,15 @@ inherit kde4-meta
 
 DESCRIPTION="A KDE filemanager focusing on usability"
 KEYWORDS=""
-IUSE="debug semantic-desktop thumbnail"
+IUSE="debug thumbnail"
 
 DEPEND="
 	$(add_kdebase_dep kactivities)
-	$(add_kdebase_dep kdelibs 'semantic-desktop?')
 	$(add_kdebase_dep libkonq)
-	semantic-desktop? (
-		>=dev-libs/shared-desktop-ontologies-0.10.0
-		dev-libs/soprano
-		$(add_kdebase_dep nepomuk-core)
-		$(add_kdebase_dep nepomuk-widgets)
-	)
+	$(add_kdebase_dep nepomuk-core)
+	$(add_kdebase_dep nepomuk-widgets)
+	>=dev-libs/shared-desktop-ontologies-0.10.0
+	dev-libs/soprano
 "
 RDEPEND="${DEPEND}
 	$(add_kdebase_dep kfind)
@@ -41,16 +38,6 @@ KMLOADLIBS="libkonq"
 RESTRICT="test"
 # bug 393129
 
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with semantic-desktop NepomukCore)
-		$(cmake-utils_use_with semantic-desktop NepomukWidgets)
-		$(cmake-utils_use_with semantic-desktop Soprano)
-	)
-
-	kde4-meta_src_configure
-}
-
 pkg_postinst() {
 	kde4-base_pkg_postinst
 
diff --git a/kde-base/gwenview/gwenview-4.10.49.9999.ebuild b/kde-base/gwenview/gwenview-4.10.49.9999.ebuild
index b050238cba1..4c7da0b68ca 100644
--- a/kde-base/gwenview/gwenview-4.10.49.9999.ebuild
+++ b/kde-base/gwenview/gwenview-4.10.49.9999.ebuild
@@ -15,7 +15,7 @@ IUSE="debug kipi semantic-desktop"
 RESTRICT="test"
 
 DEPEND="
-	$(add_kdebase_dep kdelibs 'semantic-desktop?')
+	$(add_kdebase_dep kdelibs 'semantic-desktop(+)?')
 	$(add_kdebase_dep libkonq)
 	$(add_kdebase_dep kactivities)
 	>=media-gfx/exiv2-0.19
diff --git a/kde-base/gwenview/gwenview-9999.ebuild b/kde-base/gwenview/gwenview-9999.ebuild
index b050238cba1..7f2ace21a40 100644
--- a/kde-base/gwenview/gwenview-9999.ebuild
+++ b/kde-base/gwenview/gwenview-9999.ebuild
@@ -9,13 +9,12 @@ inherit kde4-base
 
 DESCRIPTION="KDE image viewer"
 KEYWORDS=""
-IUSE="debug kipi semantic-desktop"
+IUSE="debug kipi"
 
 # tests hang, last checked for 4.2.96
 RESTRICT="test"
 
 DEPEND="
-	$(add_kdebase_dep kdelibs 'semantic-desktop?')
 	$(add_kdebase_dep libkonq)
 	$(add_kdebase_dep kactivities)
 	>=media-gfx/exiv2-0.19
@@ -28,16 +27,9 @@ KMLOADLIBS="libkonq"
 
 src_configure() {
 	mycmakeargs=(
-		$(cmake-utils_use_with semantic-desktop Soprano)
 		$(cmake-utils_use_with kipi)
 	)
 
-	if use semantic-desktop; then
-		mycmakeargs+=(-DGWENVIEW_SEMANTICINFO_BACKEND=Nepomuk)
-	else
-		mycmakeargs+=(-DGWENVIEW_SEMANTICINFO_BACKEND=None)
-	fi
-
 	kde4-base_src_configure
 }
 
diff --git a/kde-base/kactivities/kactivities-4.10.49.9999.ebuild b/kde-base/kactivities/kactivities-4.10.49.9999.ebuild
index f4447e75c92..0c2709c0c68 100644
--- a/kde-base/kactivities/kactivities-4.10.49.9999.ebuild
+++ b/kde-base/kactivities/kactivities-4.10.49.9999.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="KDE Activity Manager"
 KEYWORDS=""
 IUSE="semantic-desktop"
 
-DEPEND="$(add_kdebase_dep kdelibs 'semantic-desktop?')"
+DEPEND="$(add_kdebase_dep kdelibs 'semantic-desktop(+)?')"
 RDEPEND="${DEPEND}"
 
 # Split out from kdelibs in 4.7.1-r2
diff --git a/kde-base/kactivities/kactivities-9999.ebuild b/kde-base/kactivities/kactivities-9999.ebuild
index f4447e75c92..3eb0027e15b 100644
--- a/kde-base/kactivities/kactivities-9999.ebuild
+++ b/kde-base/kactivities/kactivities-9999.ebuild
@@ -9,19 +9,9 @@ inherit kde4-base
 DESCRIPTION="KDE Activity Manager"
 
 KEYWORDS=""
-IUSE="semantic-desktop"
-
-DEPEND="$(add_kdebase_dep kdelibs 'semantic-desktop?')"
-RDEPEND="${DEPEND}"
+IUSE=""
 
 # Split out from kdelibs in 4.7.1-r2
 add_blocker kdelibs 4.7.1-r1
 # Moved here in 4.8
 add_blocker activitymanager
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_with semantic-desktop NepomukCore)
-	)
-	kde4-base_src_configure
-}
diff --git a/kde-base/kaddressbook/kaddressbook-4.10.49.9999.ebuild b/kde-base/kaddressbook/kaddressbook-4.10.49.9999.ebuild
index 18555412ff3..ac559333ae1 100644
--- a/kde-base/kaddressbook/kaddressbook-4.10.49.9999.ebuild
+++ b/kde-base/kaddressbook/kaddressbook-4.10.49.9999.ebuild
@@ -14,8 +14,8 @@ IUSE="debug"
 
 DEPEND="
 	>=dev-libs/grantlee-0.2.0
-	$(add_kdebase_dep kdelibs 'semantic-desktop')
-	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
+	$(add_kdebase_dep kdelibs 'semantic-desktop(+)')
+	$(add_kdebase_dep kdepimlibs 'semantic-desktop(+)')
 	$(add_kdebase_dep kdepim-common-libs)
 "
 RDEPEND="${DEPEND}"
diff --git a/kde-base/kaddressbook/kaddressbook-9999.ebuild b/kde-base/kaddressbook/kaddressbook-9999.ebuild
index 18555412ff3..ac559333ae1 100644
--- a/kde-base/kaddressbook/kaddressbook-9999.ebuild
+++ b/kde-base/kaddressbook/kaddressbook-9999.ebuild
@@ -14,8 +14,8 @@ IUSE="debug"
 
 DEPEND="
 	>=dev-libs/grantlee-0.2.0
-	$(add_kdebase_dep kdelibs 'semantic-desktop')
-	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
+	$(add_kdebase_dep kdelibs 'semantic-desktop(+)')
+	$(add_kdebase_dep kdepimlibs 'semantic-desktop(+)')
 	$(add_kdebase_dep kdepim-common-libs)
 "
 RDEPEND="${DEPEND}"
diff --git a/kde-base/kalarm/kalarm-4.10.49.9999.ebuild b/kde-base/kalarm/kalarm-4.10.49.9999.ebuild
index 14c57871fd1..a0f0fce056e 100644
--- a/kde-base/kalarm/kalarm-4.10.49.9999.ebuild
+++ b/kde-base/kalarm/kalarm-4.10.49.9999.ebuild
@@ -13,7 +13,7 @@ KEYWORDS=""
 IUSE="debug"
 
 RDEPEND="
-	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
+	$(add_kdebase_dep kdepimlibs 'semantic-desktop(+)')
 	$(add_kdebase_dep kdepim-common-libs)
 	media-libs/phonon
 "
diff --git a/kde-base/kalarm/kalarm-9999.ebuild b/kde-base/kalarm/kalarm-9999.ebuild
index 14c57871fd1..6672f5122c8 100644
--- a/kde-base/kalarm/kalarm-9999.ebuild
+++ b/kde-base/kalarm/kalarm-9999.ebuild
@@ -13,7 +13,7 @@ KEYWORDS=""
 IUSE="debug"
 
 RDEPEND="
-	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
+	$(add_kdebase_dep kdepimlibs)
 	$(add_kdebase_dep kdepim-common-libs)
 	media-libs/phonon
 "
diff --git a/kde-base/kde-meta/kde-meta-9999.ebuild b/kde-base/kde-meta/kde-meta-9999.ebuild
index 304d0a7ef4b..4ea043047dd 100644
--- a/kde-base/kde-meta/kde-meta-9999.ebuild
+++ b/kde-base/kde-meta/kde-meta-9999.ebuild
@@ -7,7 +7,7 @@ inherit kde4-meta-pkg
 
 DESCRIPTION="KDE - merge this to pull in all split kde-base/* packages"
 KEYWORDS=""
-IUSE="accessibility nls sdk semantic-desktop"
+IUSE="accessibility nls sdk"
 
 RDEPEND="
 	$(add_kdebase_dep kate)
@@ -19,6 +19,7 @@ RDEPEND="
 	$(add_kdebase_dep kdegraphics-meta)
 	$(add_kdebase_dep kdemultimedia-meta)
 	$(add_kdebase_dep kdenetwork-meta)
+	$(add_kdebase_dep kdepim-meta "" 4.4.11.1)
 	$(add_kdebase_dep kdeplasma-addons)
 	$(add_kdebase_dep kdetoys-meta)
 	$(add_kdebase_dep kdeutils-meta)
@@ -29,7 +30,4 @@ RDEPEND="
 		$(add_kdebase_dep kdesdk-meta)
 		$(add_kdebase_dep kdewebdev-meta)
 	)
-	semantic-desktop? (
-		$(add_kdebase_dep kdepim-meta "" 4.4.11.1)
-	)
 "
diff --git a/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-9999.ebuild b/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-9999.ebuild
index 9e5547eebe8..78e4b020fa7 100644
--- a/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-9999.ebuild
+++ b/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-9999.ebuild
@@ -7,7 +7,7 @@ inherit kde4-meta-pkg
 
 DESCRIPTION="Merge this to pull in all kdebase-runtime-derived packages"
 KEYWORDS=""
-IUSE="+handbook semantic-desktop"
+IUSE="+handbook"
 
 RDEPEND="
 	$(add_kdebase_dep attica)
@@ -39,9 +39,9 @@ RDEPEND="
 	$(add_kdebase_dep kurifilter-plugins)
 	$(add_kdebase_dep kwallet)
 	$(add_kdebase_dep kwalletd)
+	$(add_kdebase_dep nepomuk)
 	$(add_kdebase_dep plasma-runtime)
 	$(add_kdebase_dep renamedlg-plugins)
 	$(add_kdebase_dep solid-runtime)
 	handbook? ( $(add_kdebase_dep khelpcenter) )
-	semantic-desktop? ( $(add_kdebase_dep nepomuk) )
 "
diff --git a/kde-base/kdelibs/kdelibs-9999.ebuild b/kde-base/kdelibs/kdelibs-9999.ebuild
index 003794a71bf..209b15a6072 100644
--- a/kde-base/kdelibs/kdelibs-9999.ebuild
+++ b/kde-base/kdelibs/kdelibs-9999.ebuild
@@ -17,8 +17,7 @@ DESCRIPTION="KDE libraries needed by all KDE programs."
 KEYWORDS=""
 LICENSE="LGPL-2.1"
 IUSE="3dnow acl alsa altivec +bzip2 debug doc fam jpeg2k kerberos lzma
-mmx nls openexr +policykit semantic-desktop spell sse sse2 ssl +udev +udisks
-+upower zeroconf"
+mmx nls openexr +policykit spell sse sse2 ssl +udev +udisks +upower zeroconf"
 
 REQUIRED_USE="
 	udisks? ( udev )
@@ -38,6 +37,8 @@ COMMONDEPEND="
 	dev-libs/libpcre[unicode]
 	dev-libs/libxml2
 	dev-libs/libxslt
+	>=dev-libs/shared-desktop-ontologies-0.10.0
+	>=dev-libs/soprano-2.9.0[dbus,raptor,redland]
 	media-libs/fontconfig
 	media-libs/freetype:2
 	media-libs/giflib
@@ -78,10 +79,6 @@ COMMONDEPEND="
 		media-libs/ilmbase:=
 	)
 	policykit? ( >=sys-auth/polkit-qt-0.103.0 )
-	semantic-desktop? (
-		>=dev-libs/shared-desktop-ontologies-0.10.0
-		>=dev-libs/soprano-2.9.0[dbus,raptor,redland]
-	)
 	spell? ( app-text/enchant )
 	ssl? ( dev-libs/openssl )
 	udev? ( virtual/udev )
@@ -108,6 +105,8 @@ RDEPEND="${COMMONDEPEND}
 "
 PDEPEND="
 	$(add_kdebase_dep katepart)
+	$(add_kdebase_dep nepomuk-core)
+	$(add_kdebase_dep nepomuk-widgets)
 	|| (
 		$(add_kdebase_dep kfmclient)
 		x11-misc/xdg-utils
@@ -117,10 +116,6 @@ PDEPEND="
 		>=kde-misc/polkit-kde-kcmodules-0.98_pre20101127
 		>=sys-auth/polkit-kde-agent-0.99
 	)
-	semantic-desktop? (
-		$(add_kdebase_dep nepomuk-core)
-		$(add_kdebase_dep nepomuk-widgets)
-	)
 "
 
 # Force the upgrade of plasma-workspace to a version that explicitly depends on kactivities
@@ -212,8 +207,6 @@ src_configure() {
 		$(cmake-utils_use_with openexr OpenEXR)
 		$(cmake-utils_use_with opengl OpenGL)
 		$(cmake-utils_use_with policykit PolkitQt-1)
-		$(cmake-utils_use_with semantic-desktop Soprano)
-		$(cmake-utils_use_with semantic-desktop SharedDesktopOntologies)
 		$(cmake-utils_use_with spell ENCHANT)
 		$(cmake-utils_use_with ssl OpenSSL)
 		$(cmake-utils_use_with udev UDev)
diff --git a/kde-base/kdepim-common-libs/kdepim-common-libs-4.10.49.9999.ebuild b/kde-base/kdepim-common-libs/kdepim-common-libs-4.10.49.9999.ebuild
index c1c4ea39eb1..47655e0f422 100644
--- a/kde-base/kdepim-common-libs/kdepim-common-libs-4.10.49.9999.ebuild
+++ b/kde-base/kdepim-common-libs/kdepim-common-libs-4.10.49.9999.ebuild
@@ -16,7 +16,7 @@ DEPEND="
 	app-crypt/gpgme
 	>=app-office/akonadi-server-1.9.0
 	>=dev-libs/shared-desktop-ontologies-0.10.0
-	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
+	$(add_kdebase_dep kdepimlibs 'semantic-desktop(+)')
 "
 RDEPEND="${DEPEND}
 	app-crypt/gnupg
diff --git a/kde-base/kdepim-common-libs/kdepim-common-libs-9999.ebuild b/kde-base/kdepim-common-libs/kdepim-common-libs-9999.ebuild
index 412db5a270f..da6a5fe8d7b 100644
--- a/kde-base/kdepim-common-libs/kdepim-common-libs-9999.ebuild
+++ b/kde-base/kdepim-common-libs/kdepim-common-libs-9999.ebuild
@@ -16,7 +16,7 @@ DEPEND="
 	app-crypt/gpgme
 	>=app-office/akonadi-server-1.9.0
 	>=dev-libs/shared-desktop-ontologies-0.10.0
-	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
+	$(add_kdebase_dep kdepimlibs)
 "
 RDEPEND="${DEPEND}
 	app-crypt/gnupg
diff --git a/kde-base/kdepim-runtime/kdepim-runtime-4.10.49.9999.ebuild b/kde-base/kdepim-runtime/kdepim-runtime-4.10.49.9999.ebuild
index 778e59116f4..51f97ce8e86 100644
--- a/kde-base/kdepim-runtime/kdepim-runtime-4.10.49.9999.ebuild
+++ b/kde-base/kdepim-runtime/kdepim-runtime-4.10.49.9999.ebuild
@@ -21,7 +21,7 @@ DEPEND="
 	dev-libs/libxml2:2
 	dev-libs/libxslt
 	>=dev-libs/shared-desktop-ontologies-0.10.0
-	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
+	$(add_kdebase_dep kdepimlibs 'semantic-desktop(+)')
 	x11-misc/shared-mime-info
 	google? ( >=net-libs/libkgapi-0.4.3[-oldpim] )
 	kolab? ( net-libs/libkolab )
diff --git a/kde-base/kdepim-runtime/kdepim-runtime-9999.ebuild b/kde-base/kdepim-runtime/kdepim-runtime-9999.ebuild
index c7e634fcca7..939bb7c378e 100644
--- a/kde-base/kdepim-runtime/kdepim-runtime-9999.ebuild
+++ b/kde-base/kdepim-runtime/kdepim-runtime-9999.ebuild
@@ -21,7 +21,7 @@ DEPEND="
 	dev-libs/libxml2:2
 	dev-libs/libxslt
 	>=dev-libs/shared-desktop-ontologies-0.10.0
-	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
+	$(add_kdebase_dep kdepimlibs)
 	x11-misc/shared-mime-info
 	facebook? ( net-libs/libkfbapi )
 	google? ( >=net-libs/libkgapi-0.4.3[-oldpim] )
diff --git a/kde-base/kdepimlibs/kdepimlibs-4.10.49.9999.ebuild b/kde-base/kdepimlibs/kdepimlibs-4.10.49.9999.ebuild
index 486eae355d2..423d1240eca 100644
--- a/kde-base/kdepimlibs/kdepimlibs-4.10.49.9999.ebuild
+++ b/kde-base/kdepimlibs/kdepimlibs-4.10.49.9999.ebuild