Don't enable semantic-desktop by default (following KDE 4.3.5).

Package-Manager: portage-2.2_rc62/cvs/Linux x86_64

4 files changed, 11 insertions, 53 deletions

diff --git a/net-wireless/kbluetooth/ChangeLog b/net-wireless/kbluetooth/ChangeLog
index 17959950dbd1..5055b7adb533 100644
--- a/net-wireless/kbluetooth/ChangeLog
+++ b/net-wireless/kbluetooth/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-wireless/kbluetooth
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/kbluetooth/ChangeLog,v 1.4 2009/11/12 11:02:57 scarabeus Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kbluetooth/ChangeLog,v 1.5 2010/01/31 17:06:01 ssuominen Exp $
+
+  31 Jan 2010; Samuli Suominen <ssuominen@gentoo.org>
+  kbluetooth-0.4_rc2.ebuild:
+  Don't enable semantic-desktop by default (following KDE 4.3.5).
 
   12 Nov 2009; Tomáš Chvátal <scarabeus@gentoo.org>
   kbluetooth-0.4_rc2.ebuild:
diff --git a/net-wireless/kbluetooth/Manifest b/net-wireless/kbluetooth/Manifest
index 89a371b9d6b0..bc31be375830 100644
--- a/net-wireless/kbluetooth/Manifest
+++ b/net-wireless/kbluetooth/Manifest
@@ -1,6 +1,4 @@
-DIST 112110-kbluetooth-RC1.tar.bz2 100090 RMD160 910c950151bce4b680b84f5af560bf5ede0df346 SHA1 b1f3900f994bb6289f055797981cf8294258a199 SHA256 6c7de23d887b88cab386228d02307641923cbf348840418aa9ceef1282fc2f92
 DIST 112110-kbluetooth-RC2.tar.bz2 100564 RMD160 584a17515b7891a82b84fe30776b79834f054859 SHA1 9732cc3d1fb5cb48e00e12aa6da35896fc16ca78 SHA256 0f953f5222afe58440569100474685ef1ea6cfe503a55cae45301550e4fead83
-EBUILD kbluetooth-0.4_rc1.ebuild 1400 RMD160 d55d865669dfa621a1fcb695d3ecda5d6b91dcf2 SHA1 42489276c7b0ed8a65da412c88acc19930ae1f83 SHA256 9ec1c778ff13c8390a0ae87efe37e38e6d3953a46b1bc7293f396284d6799b26
-EBUILD kbluetooth-0.4_rc2.ebuild 1654 RMD160 aa547b5a340f2d1890fb963e8882c3faf9648030 SHA1 03481e4538f6a95387a9d0774108140e7fa8f380 SHA256 7add4d77ee9143b53c6fdb52dd8226650d62be3739de7629f7c2afbe31319a13
-MISC ChangeLog 834 RMD160 dd42691ae052fc1c5f35fd38c683cc3a31bb9030 SHA1 493edfe810ad2f9d45fb48bf03345f56a4c59cc9 SHA256 cc1f42bc0312250f7e7cb7a92274e188759fcb5e3c25ec10d04277d19304450d
+EBUILD kbluetooth-0.4_rc2.ebuild 1653 RMD160 82893ed58aaea6d6e2a8680751e63ddff25a7395 SHA1 7067e18d3473426c1fd89fa41fcc185bd489da1d SHA256 92586dfef2828b85f9d29707f8107ebf1856735fe2dc2e1b46a719a9e66f926b
+MISC ChangeLog 984 RMD160 f7f4264f2524506a880a126bb3e99b97b664d8c4 SHA1 21addb499dadbb054a3a7411b19a94e9c810a57a SHA256 089bff7e5190c5fdf8dce6462fa5947e0290747ffd46776d4d6aa66efa5b2ac7
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/net-wireless/kbluetooth/kbluetooth-0.4_rc1.ebuild b/net-wireless/kbluetooth/kbluetooth-0.4_rc1.ebuild
deleted file mode 100644
index 9cc988b94df5..000000000000
--- a/net-wireless/kbluetooth/kbluetooth-0.4_rc1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/kbluetooth/kbluetooth-0.4_rc1.ebuild,v 1.2 2009/10/18 14:51:37 ssuominen Exp $
-
-EAPI=2
-KDE_LINGUAS="da de en_GB es et fr gl km lt nds pt pt_BR ro ru sv tr uk zh_CN zh_TW"
-inherit kde4-base versionator
-
-MY_PV=$(get_version_component_range 3)
-MY_P=${PN}-${MY_PV/rc/RC}
-
-DESCRIPTION="Bluetooth utils for KDE4"
-HOMEPAGE="http://techbase.kde.org/Kbluetooth"
-SRC_URI="http://kde-apps.org/CONTENT/content-files/112110-${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug +semantic-desktop"
-
-COMMON_DEPEND=">=kde-base/solid-${KDE_MINIMAL}[bluetooth]
-	>=kde-base/libkworkspace-${KDE_MINIMAL}
-	>=kde-base/libknotificationitem-${KDE_MINIMAL}
-	>=kde-base/kdelibs-${KDE_MINIMAL}[semantic-desktop?]
-	semantic-desktop? ( >=kde-base/nepomuk-${KDE_MINIMAL} )"
-RDEPEND="${COMMON_DEPEND}
-	app-mobilephone/obex-data-server
-	app-mobilephone/obexftp"
-DEPEND="${COMMON_DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	mycmakeargs="${mycmakeargs}
-		$(cmake-utils_use_with semantic-desktop Nepomuk)"
-	kde4-base_src_configure
-}
-
-pkg_postinst() {
-	kde4-base_pkg_postinst
-	ewarn "net-wireless/bluez can't work as normal user, so you need to setup"
-	ewarn "your dbus privilege granting yourself, see bug:"
-	ewarn "http://bugs.gentoo.org/279616"
-}
diff --git a/net-wireless/kbluetooth/kbluetooth-0.4_rc2.ebuild b/net-wireless/kbluetooth/kbluetooth-0.4_rc2.ebuild
index 078876b7a341..bfa8bf1cfada 100644
--- a/net-wireless/kbluetooth/kbluetooth-0.4_rc2.ebuild
+++ b/net-wireless/kbluetooth/kbluetooth-0.4_rc2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/kbluetooth/kbluetooth-0.4_rc2.ebuild,v 1.2 2009/11/12 11:02:57 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kbluetooth/kbluetooth-0.4_rc2.ebuild,v 1.3 2010/01/31 17:06:01 ssuominen Exp $
 
 EAPI=2
 KDE_LINGUAS="da de en_GB es et fr gl km lt nds pt pt_BR ro ru sv tr uk zh_CN zh_TW"
@@ -16,7 +16,7 @@ SRC_URI="http://kde-apps.org/CONTENT/content-files/112110-${MY_P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="4"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug +semantic-desktop"
+IUSE="debug semantic-desktop"
 
 COMMON_DEPEND=">=kde-base/solid-${KDE_MINIMAL}[bluetooth]
 	>=kde-base/libkworkspace-${KDE_MINIMAL}