summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilles Dartiguelongue <eva@gentoo.org>2009-11-16 22:26:03 +0000
committerGilles Dartiguelongue <eva@gentoo.org>2009-11-16 22:26:03 +0000
commit41aa9e42ab9405dc5edb615dd348430d0ab941b4 (patch)
treedfa6a10fc29bdb91440d95a45960bbf391b29eb2 /net-wireless
parentStable for HPPA (bug #293296). (diff)
downloadgentoo-2-41aa9e42ab9405dc5edb615dd348430d0ab941b4.tar.gz
gentoo-2-41aa9e42ab9405dc5edb615dd348430d0ab941b4.tar.bz2
gentoo-2-41aa9e42ab9405dc5edb615dd348430d0ab941b4.zip
Rereading bug #285043, make obexd switchable with obex-data-server.
(Portage version: 2.2_rc50/cvs/Linux x86_64)
Diffstat (limited to 'net-wireless')
-rw-r--r--net-wireless/gnome-bluetooth/ChangeLog6
-rw-r--r--net-wireless/gnome-bluetooth/gnome-bluetooth-2.28.1.ebuild6
-rw-r--r--net-wireless/gnome-bluetooth/gnome-bluetooth-2.28.3.ebuild6
3 files changed, 13 insertions, 5 deletions
diff --git a/net-wireless/gnome-bluetooth/ChangeLog b/net-wireless/gnome-bluetooth/ChangeLog
index e6680d58bcb0..4355fa5d79b2 100644
--- a/net-wireless/gnome-bluetooth/ChangeLog
+++ b/net-wireless/gnome-bluetooth/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-wireless/gnome-bluetooth
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/ChangeLog,v 1.64 2009/11/16 22:21:49 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/ChangeLog,v 1.65 2009/11/16 22:26:03 eva Exp $
+
+ 16 Nov 2009; Gilles Dartiguelongue <eva@gentoo.org>
+ gnome-bluetooth-2.28.1.ebuild, gnome-bluetooth-2.28.3.ebuild:
+ Rereading bug #285043, make obexd switchable with obex-data-server.
16 Nov 2009; Gilles Dartiguelongue <eva@gentoo.org>
-gnome-bluetooth-2.27.8.ebuild, gnome-bluetooth-2.28.1.ebuild,
diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-2.28.1.ebuild b/net-wireless/gnome-bluetooth/gnome-bluetooth-2.28.1.ebuild
index 7a4a6f5348c3..bd0f4bbb4997 100644
--- a/net-wireless/gnome-bluetooth/gnome-bluetooth-2.28.1.ebuild
+++ b/net-wireless/gnome-bluetooth/gnome-bluetooth-2.28.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/gnome-bluetooth-2.28.1.ebuild,v 1.5 2009/11/16 22:21:49 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/gnome-bluetooth-2.28.1.ebuild,v 1.6 2009/11/16 22:26:03 eva Exp $
EAPI="2"
@@ -21,7 +21,9 @@ COMMON_DEPEND=">=dev-libs/glib-2.16
dev-libs/libunique"
RDEPEND="${COMMON_DEPEND}
>=net-wireless/bluez-4.34
- app-mobilephone/obexd"
+ || (
+ app-mobilephone/obexd
+ >=app-mobilephone/obex-data-server-0.4 )"
DEPEND="${COMMON_DEPEND}
!!net-wireless/bluez-gnome
app-text/gnome-doc-utils
diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-2.28.3.ebuild b/net-wireless/gnome-bluetooth/gnome-bluetooth-2.28.3.ebuild
index 2b313193d04c..f615c4bf6c9d 100644
--- a/net-wireless/gnome-bluetooth/gnome-bluetooth-2.28.3.ebuild
+++ b/net-wireless/gnome-bluetooth/gnome-bluetooth-2.28.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/gnome-bluetooth-2.28.3.ebuild,v 1.2 2009/11/16 22:21:49 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/gnome-bluetooth-2.28.3.ebuild,v 1.3 2009/11/16 22:26:03 eva Exp $
EAPI="2"
@@ -21,7 +21,9 @@ COMMON_DEPEND=">=dev-libs/glib-2.16
dev-libs/libunique"
RDEPEND="${COMMON_DEPEND}
>=net-wireless/bluez-4.34
- app-mobilephone/obexd"
+ || (
+ app-mobilephone/obexd
+ >=app-mobilephone/obex-data-server-0.4 )"
DEPEND="${COMMON_DEPEND}
!!net-wireless/bluez-gnome
app-text/gnome-doc-utils