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

[Johannes Huber]

commit:     c20e933e7284062e90e581ad24391e269749290d
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri May  2 22:59:31 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=c20e933e

[kde-base/kdelibs] Introduce nepomuk USE flag, bug #508350

Package-Manager: portage-2.2.10

---
 kde-base/kdelibs/kdelibs-4.13.49.9999.ebuild | 26 +++++++++++++-------------
 kde-base/kdelibs/kdelibs-4.9999.ebuild       | 26 +++++++++++++-------------
 kde-base/kdelibs/metadata.xml                |  1 +
 3 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/kde-base/kdelibs/kdelibs-4.13.49.9999.ebuild b/kde-base/kdelibs/kdelibs-4.13.49.9999.ebuild
index a5e7ae0..1dbece3 100644
--- a/kde-base/kdelibs/kdelibs-4.13.49.9999.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.13.49.9999.ebuild
@@ -16,9 +16,9 @@ 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"
+IUSE="3dnow acl alsa altivec +bzip2 debug doc fam jpeg2k kerberos lzma mmx
+nepomuk nls openexr +policykit spell sse sse2 ssl +udev +udisks +upower
+zeroconf"
 
 REQUIRED_USE="
 	udisks? ( udev )
@@ -73,15 +73,15 @@ COMMONDEPEND="
 	fam? ( virtual/fam )
 	jpeg2k? ( media-libs/jasper )
 	kerberos? ( virtual/krb5 )
+	nepomuk? (
+		>=dev-libs/shared-desktop-ontologies-0.11.0
+		>=dev-libs/soprano-2.9.0[dbus,raptor,redland]
+	)
 	openexr? (
 		media-libs/openexr:=
 		media-libs/ilmbase:=
 	)
 	policykit? ( >=sys-auth/polkit-qt-0.103.0 )
-	semantic-desktop? (
-		>=dev-libs/shared-desktop-ontologies-0.11.0
-		>=dev-libs/soprano-2.9.0[dbus,raptor,redland]
-	)
 	spell? ( app-text/enchant )
 	ssl? ( dev-libs/openssl )
 	udev? ( virtual/udev )
@@ -115,13 +115,13 @@ PDEPEND="
 		x11-misc/xdg-utils
 	)
 	handbook? ( $(add_kdebase_dep khelpcenter) )
-	policykit? (
-		>=sys-auth/polkit-kde-agent-0.99
-	)
-	semantic-desktop? (
+	nepomuk? (
 		$(add_kdebase_dep nepomuk-core)
 		$(add_kdebase_dep nepomuk-widgets)
 	)
+	policykit? (
+		>=sys-auth/polkit-kde-agent-0.99
+	)
 "
 
 PATCHES=(
@@ -203,12 +203,12 @@ src_configure() {
 		$(cmake-utils_use_with jpeg2k Jasper)
 		$(cmake-utils_use_with kerberos GSSAPI)
 		$(cmake-utils_use_with lzma LibLZMA)
+		$(cmake-utils_use_with nepomuk Soprano)
+		$(cmake-utils_use_with nepomuk SharedDesktopOntologies)
 		$(cmake-utils_use_with nls Libintl)
 		$(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/kdelibs/kdelibs-4.9999.ebuild b/kde-base/kdelibs/kdelibs-4.9999.ebuild
index c22f10c..83bc9b8 100644
--- a/kde-base/kdelibs/kdelibs-4.9999.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.9999.ebuild
@@ -16,9 +16,9 @@ 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"
+IUSE="3dnow acl alsa altivec +bzip2 debug doc fam jpeg2k kerberos lzma mmx
+nepomuk nls openexr +policykit spell sse sse2 ssl +udev +udisks +upower
+zeroconf"
 
 REQUIRED_USE="
 	udisks? ( udev )
@@ -73,15 +73,15 @@ COMMONDEPEND="
 	fam? ( virtual/fam )
 	jpeg2k? ( media-libs/jasper )
 	kerberos? ( virtual/krb5 )
+	nepomuk? (
+		>=dev-libs/shared-desktop-ontologies-0.11.0
+		>=dev-libs/soprano-2.9.0[dbus,raptor,redland]
+	)
 	openexr? (
 		media-libs/openexr:=
 		media-libs/ilmbase:=
 	)
 	policykit? ( >=sys-auth/polkit-qt-0.103.0 )
-	semantic-desktop? (
-		>=dev-libs/shared-desktop-ontologies-0.11.0
-		>=dev-libs/soprano-2.9.0[dbus,raptor,redland]
-	)
 	spell? ( app-text/enchant )
 	ssl? ( dev-libs/openssl )
 	udev? ( virtual/udev )
@@ -115,13 +115,13 @@ PDEPEND="
 		x11-misc/xdg-utils
 	)
 	handbook? ( $(add_kdebase_dep khelpcenter) )
-	policykit? (
-		>=sys-auth/polkit-kde-agent-0.99
-	)
-	semantic-desktop? (
+	nepomuk? (
 		$(add_kdebase_dep nepomuk-core)
 		$(add_kdebase_dep nepomuk-widgets)
 	)
+	policykit? (
+		>=sys-auth/polkit-kde-agent-0.99
+	)
 "
 
 PATCHES=(
@@ -203,12 +203,12 @@ src_configure() {
 		$(cmake-utils_use_with jpeg2k Jasper)
 		$(cmake-utils_use_with kerberos GSSAPI)
 		$(cmake-utils_use_with lzma LibLZMA)
+		$(cmake-utils_use_with nepomuk Soprano)
+		$(cmake-utils_use_with nepomuk SharedDesktopOntologies)
 		$(cmake-utils_use_with nls Libintl)
 		$(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/kdelibs/metadata.xml b/kde-base/kdelibs/metadata.xml
index 7f86002..a328202 100644
--- a/kde-base/kdelibs/metadata.xml
+++ b/kde-base/kdelibs/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
   <herd>kde</herd>
   <use>
+	<flag name="nepomuk">Enable Nepomuk based semantic desktop support (deprecated)</flag>
 	<flag name="opengl">Enable OpenGL support for Plasma (GLApplet)</flag>
 	<flag name="udisks">Use udisks for block device access (e.g., automounting)</flag>
 	<flag name="upower">Use upower for power management</flag>