Rereading bug #285043, make obexd switchable with obex-data-server.

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

4 files changed, 19 insertions, 11 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/Manifest b/net-wireless/gnome-bluetooth/Manifest
index c203a68f1dba..5ef675a6e500 100644
--- a/net-wireless/gnome-bluetooth/Manifest
+++ b/net-wireless/gnome-bluetooth/Manifest
@@ -10,14 +10,14 @@ DIST gnome-bluetooth-2.28.3.tar.bz2 907126 RMD160 e625ab145cdc34ad8b432e3b07fea8
 EBUILD gnome-bluetooth-0.11.0.ebuild 1524 RMD160 1bccff392c432f6f5f8a451f3a9cfd6bbee89a0a SHA1 de4e09a22d54d8e53f2886b31d012414a3e6212f SHA256 402f36a4806050713d8025db8b01ead4c8272877f56a79c4622a47036b9bb5e1
 EBUILD gnome-bluetooth-0.12.0.ebuild 1007 RMD160 6a06bbf94607a7f1c500064b995bcb67bab21a77 SHA1 3cefa89fbadfe1e8a4818b6cb529f188c030e818 SHA256 f12862f8d6d0c6008dd1431a1772d5d894f6e8bd9c6deaa77729fda46ba560fd
 EBUILD gnome-bluetooth-0.9.1.ebuild 1582 RMD160 cf286eb1f18651b76fc8a87a5f1a901b5a2ddff1 SHA1 b41b700ba8612c85f013a7b5f46152f2f77e6c6d SHA256 9d0d8cbca9a9929dda470d0a5f1c191b5b1e0f15a6b91cd185929c2b98b469df
-EBUILD gnome-bluetooth-2.28.1.ebuild 1315 RMD160 7bb34016c51577d728d494d5bf723b92f29a61c9 SHA1 0e8857f2c1ba3a0bceba1f930f5a8866b301dcb6 SHA256 81dc9c10edc7afd2e52c631ef8969ecf44107cf71bf6b2543df7dc4525e32124
-EBUILD gnome-bluetooth-2.28.3.ebuild 1101 RMD160 a6f507b89e934bdd70356f7b4e152d53f92b1826 SHA1 44350937385111f76b47fbd022dc6c43389176b5 SHA256 dd93bce78a7332406dfececb454fed21930351dcc006e0fbe7e491a8f1e2a455
-MISC ChangeLog 11208 RMD160 46ebb3cf691b1e4875dfcae55adf40185510b608 SHA1 c84850c585354b02594b388e4fbcc51d850b7138 SHA256 b9793b682837a3ca6294a18cb7cc8f8844353ae7e1750255981d553b7af71efb
+EBUILD gnome-bluetooth-2.28.1.ebuild 1365 RMD160 e21239885bdaaa9a41db0b4274d6c1642217995c SHA1 ad35efa94adbd9dbe51704787f675572dfda900c SHA256 f3543c845b44449164ebcbdb94e5a84e57405f2ba4798c19758622e0dff58553
+EBUILD gnome-bluetooth-2.28.3.ebuild 1151 RMD160 33c12f15607c23c5dae5d57d4dba888a5c8808d6 SHA1 c0179a08297e558326a18f54d8e3a574010991a0 SHA256 ac1f6fb32f8e5e66b4e49d1458fe3a827573eb82b2b949481dbeed9fe2135960
+MISC ChangeLog 11397 RMD160 fa7af0ab445e3e77e371b23e2b46780d2a02984a SHA1 a6cb12a5a85eeacfa66fb8ecd8ee44aca721bbf5 SHA256 e33d0da0c8f3d0f0c008f5743d60e7f6a12eff0f675fa2561c591f5ce264eee1
 MISC metadata.xml 195 RMD160 e6211b251685833c4a0eed62d735e0f4ea7d870a SHA1 d635b8b23bd26fcb7ec9fe2cb015c7618fd034ad SHA256 81b6400e7c415f0000de8250b5ddefa56d81f5e374d834a45505795b55f4e205
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.13 (GNU/Linux)
 
-iEYEARECAAYFAksB0IcACgkQ1fmVwcYIWAbAbwCgoioK+WIF9laHaLCTu/hctOsP
-hOcAoKMgcFv5K9Vtyfaelvn2XV/yZZb3
-=+Z4X
+iEYEARECAAYFAksB0YEACgkQ1fmVwcYIWAaGsgCeJeOZIb/JtyP8ayUXm26+lGK/
+4qcAn3SiBPOncOFCRpiWtPUEumVlIOlI
+=wofG
 -----END PGP SIGNATURE-----
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