Don't depend on libknotificationitem with KDE 4.4.x.

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

4 files changed, 8 insertions, 54 deletions

diff --git a/net-wireless/kbluetooth/ChangeLog b/net-wireless/kbluetooth/ChangeLog
index 9ecb54bd36fd..c5d4c9c1c6a2 100644
--- a/net-wireless/kbluetooth/ChangeLog
+++ b/net-wireless/kbluetooth/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-wireless/kbluetooth
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/kbluetooth/ChangeLog,v 1.6 2010/02/02 06:53:17 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kbluetooth/ChangeLog,v 1.7 2010/02/03 21:12:48 ssuominen Exp $
+
+  03 Feb 2010; Samuli Suominen <ssuominen@gentoo.org> kbluetooth-0.4.ebuild:
+  Don't depend on libknotificationitem with KDE 4.4.x.
 
 *kbluetooth-0.4 (02 Feb 2010)
 
diff --git a/net-wireless/kbluetooth/Manifest b/net-wireless/kbluetooth/Manifest
index 3cb100341869..56629008d348 100644
--- a/net-wireless/kbluetooth/Manifest
+++ b/net-wireless/kbluetooth/Manifest
@@ -1,6 +1,4 @@
 DIST 112110-kbluetooth-0.4.tar.bz2 106917 RMD160 7b4f2a51e14224432a6616bf8cebe22d7c455f48 SHA1 bbde72b0a79bbb7abfc4f90ed1ef47813ae4fc26 SHA256 9d1b9bc477c45b2f6711e99f64626928b71a167f8f42ed70c3f8bd78b51267f2
-DIST 112110-kbluetooth-RC2.tar.bz2 100564 RMD160 584a17515b7891a82b84fe30776b79834f054859 SHA1 9732cc3d1fb5cb48e00e12aa6da35896fc16ca78 SHA256 0f953f5222afe58440569100474685ef1ea6cfe503a55cae45301550e4fead83
-EBUILD kbluetooth-0.4.ebuild 1329 RMD160 61d3e480a39566a28ce9a9f4d9bf46a8e940873d SHA1 dddbaff93373f315e4e9832f32adefd4a7418fc6 SHA256 bfabaebc137d94b05e9ca345834da537f2f52392056dcc4d70e2f459b6879f46
-EBUILD kbluetooth-0.4_rc2.ebuild 1437 RMD160 53a926240fa274b11a8867c49a93b1fd9221d14b SHA1 44c4a0f5aa7ebed27729d70ba3e73259a3c70594 SHA256 dda8f86f5634215db5534c9f03352368aad96f0cd23119da6228eceb3ef68563
-MISC ChangeLog 1112 RMD160 2d90ab191cafd3cb2b7e2d72ad8522e1d2d2c2f1 SHA1 8b82440d3108e652e1c4c106066334b0653dd429 SHA256 5cabc6531d66d1585c2fd617ad909c32a12c37fd9b5320e7b55654582a117d9a
+EBUILD kbluetooth-0.4.ebuild 1348 RMD160 13f63857da7c0ba9db8740ea82709783474006bb SHA1 8b0e74c9f7197a4913ee3e4fcc0c7428069b29ff SHA256 5a7459c7f718a890c26610d2bb7f5c85d3729c103c37897ef2ef318d2ed7d409
+MISC ChangeLog 1245 RMD160 4ac87bfa744c493a997c73f56453058669f87585 SHA1 159b92617fe619936133d80319f9efa03119539e SHA256 fc32dbdc8c9b03677346f64a194ff7c9ce5d5b05ea519490981f07a4e2fab19a
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/net-wireless/kbluetooth/kbluetooth-0.4.ebuild b/net-wireless/kbluetooth/kbluetooth-0.4.ebuild
index bf41356f73f9..278eb36578a1 100644
--- a/net-wireless/kbluetooth/kbluetooth-0.4.ebuild
+++ b/net-wireless/kbluetooth/kbluetooth-0.4.ebuild
@@ -1,6 +1,6 @@
 # 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.ebuild,v 1.2 2010/02/02 07:08:53 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kbluetooth/kbluetooth-0.4.ebuild,v 1.3 2010/02/03 21:12:48 ssuominen Exp $
 
 EAPI=2
 KDE_LINGUAS="cs da de en_GB eo es et fr ga gl it km lt nds nl pa pt pt_BR ro
@@ -18,7 +18,7 @@ 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-4.4 =kde-base/libknotificationitem-4.3* )
 	>=kde-base/kdelibs-${KDE_MINIMAL}[semantic-desktop?]"
 RDEPEND="${COMMON_DEPEND}
 	app-mobilephone/obex-data-server
diff --git a/net-wireless/kbluetooth/kbluetooth-0.4_rc2.ebuild b/net-wireless/kbluetooth/kbluetooth-0.4_rc2.ebuild
deleted file mode 100644
index 2be4fba8eed4..000000000000
--- a/net-wireless/kbluetooth/kbluetooth-0.4_rc2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# 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.4 2010/02/02 07:08:53 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_prepare() {
-	kde4-base_src_prepare
-
-	sed -e 's/${KDE4WORKSPACE_SOLIDCONTROL_LIBRARY}/solidcontrol/g' \
-		-i src/CMakeLists.txt \
-		-i src/device-manager/CMakeLists.txt \
-		-i src/inputwizard/CMakeLists.txt \
-		|| die "Failed to patch CMake files"
-}
-
-src_configure() {
-	mycmakeargs="${mycmakeargs}
-		$(cmake-utils_use_with semantic-desktop Nepomuk)"
-	kde4-base_src_configure
-}