summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2010-07-27 15:26:07 +0000
committerPacho Ramos <pacho@gentoo.org>2010-07-27 15:26:07 +0000
commit7bb0a371de7d15a395670d2fb776202a8a2bf118 (patch)
tree909b288887f591941b958da1931bfb75b6e789ea /net-wireless
parentMarked ~x86-linux ~amd64-linux and ~ppc-macos, bug #324129, fixed src_compile... (diff)
downloadgentoo-2-7bb0a371de7d15a395670d2fb776202a8a2bf118.tar.gz
gentoo-2-7bb0a371de7d15a395670d2fb776202a8a2bf118.tar.bz2
gentoo-2-7bb0a371de7d15a395670d2fb776202a8a2bf118.zip
It collides with gnome-bluetooth, thanks to Diego for reporting in bug #330083.
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'net-wireless')
-rw-r--r--net-wireless/bluez-gnome/ChangeLog6
-rw-r--r--net-wireless/bluez-gnome/bluez-gnome-1.8.ebuild3
2 files changed, 7 insertions, 2 deletions
diff --git a/net-wireless/bluez-gnome/ChangeLog b/net-wireless/bluez-gnome/ChangeLog
index 45df58b78192..d7fa2b8e65b4 100644
--- a/net-wireless/bluez-gnome/ChangeLog
+++ b/net-wireless/bluez-gnome/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-wireless/bluez-gnome
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-gnome/ChangeLog,v 1.48 2010/07/19 22:11:12 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-gnome/ChangeLog,v 1.49 2010/07/27 15:26:07 pacho Exp $
+
+ 27 Jul 2010; Pacho Ramos <pacho@gentoo.org> bluez-gnome-1.8.ebuild:
+ It collides with gnome-bluetooth, thanks to Diego for reporting in bug
+ #330083.
19 Jul 2010; Jeroen Roovers <jer@gentoo.org> bluez-gnome-1.8.ebuild:
Drop HPPA keywording (bug #324511).
diff --git a/net-wireless/bluez-gnome/bluez-gnome-1.8.ebuild b/net-wireless/bluez-gnome/bluez-gnome-1.8.ebuild
index 74fe46a71176..9c155b53b0f5 100644
--- a/net-wireless/bluez-gnome/bluez-gnome-1.8.ebuild
+++ b/net-wireless/bluez-gnome/bluez-gnome-1.8.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/bluez-gnome/bluez-gnome-1.8.ebuild,v 1.9 2010/07/19 22:11:12 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-gnome/bluez-gnome-1.8.ebuild,v 1.10 2010/07/27 15:26:07 pacho Exp $
EAPI="2"
@@ -27,6 +27,7 @@ DEPEND="
RDEPEND="net-wireless/bluez
gnome? ( gnome-base/nautilus gnome-base/gvfs[bluetooth] )
>=app-mobilephone/obex-data-server-0.4
+ !net-wireless/gnome-bluetooth
${COMMON_DEPEND}"
G2CONF="--disable-desktop-update