diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2010-02-03 21:12:48 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-02-03 21:12:48 +0000 |
commit | 08f3a9bdb26d594700ec2a7c18a51024ebcaf9a3 (patch) | |
tree | 299a80f1252310d639505a8f45b953b575dd8f70 /net-wireless | |
parent | Stable on amd64 wrt bug #250850 (diff) | |
download | gentoo-2-08f3a9bdb26d594700ec2a7c18a51024ebcaf9a3.tar.gz gentoo-2-08f3a9bdb26d594700ec2a7c18a51024ebcaf9a3.tar.bz2 gentoo-2-08f3a9bdb26d594700ec2a7c18a51024ebcaf9a3.zip |
Don't depend on libknotificationitem with KDE 4.4.x.
(Portage version: 2.2_rc62/cvs/Linux x86_64)
Diffstat (limited to 'net-wireless')
-rw-r--r-- | net-wireless/kbluetooth/ChangeLog | 5 | ||||
-rw-r--r-- | net-wireless/kbluetooth/kbluetooth-0.4.ebuild | 4 | ||||
-rw-r--r-- | net-wireless/kbluetooth/kbluetooth-0.4_rc2.ebuild | 47 |
3 files changed, 6 insertions, 50 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/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 -} |