List net-wireless/bluez first in ||( a b ) dependency w.r.t. bug 269519.

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

8 files changed, 38 insertions, 17 deletions

diff --git a/net-wireless/bluez-hcidump/ChangeLog b/net-wireless/bluez-hcidump/ChangeLog
index 6000e82afba3..29208cda7be8 100644
--- a/net-wireless/bluez-hcidump/ChangeLog
+++ b/net-wireless/bluez-hcidump/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-wireless/bluez-hcidump
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-hcidump/ChangeLog,v 1.45 2009/04/08 21:40:04 bluebird Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-hcidump/ChangeLog,v 1.46 2009/05/12 10:13:21 loki_val Exp $
+
+  12 May 2009; Peter Alfredsen <loki_val@gentoo.org>
+  bluez-hcidump-1.42.ebuild:
+  List net-wireless/bluez first in ( a b ) dependency w.r.t. bug 269519.
 
   08 Apr 2009; Friedrich Oslage <bluebird@gentoo.org>
   bluez-hcidump-1.42.ebuild:
diff --git a/net-wireless/bluez-hcidump/bluez-hcidump-1.42.ebuild b/net-wireless/bluez-hcidump/bluez-hcidump-1.42.ebuild
index 80461936f0e0..57b933f2d4d8 100644
--- a/net-wireless/bluez-hcidump/bluez-hcidump-1.42.ebuild
+++ b/net-wireless/bluez-hcidump/bluez-hcidump-1.42.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/bluez-hcidump/bluez-hcidump-1.42.ebuild,v 1.6 2009/04/08 21:40:04 bluebird Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-hcidump/bluez-hcidump-1.42.ebuild,v 1.7 2009/05/12 10:13:21 loki_val Exp $
 
 DESCRIPTION="Bluetooth HCI packet analyzer"
 HOMEPAGE="http://bluez.sourceforge.net/"
@@ -12,7 +12,7 @@ KEYWORDS="amd64 hppa ppc sparc x86"
 
 IUSE=""
 
-DEPEND="|| ( >=net-wireless/bluez-libs-3.14 net-wireless/bluez )"
+DEPEND="|| ( net-wireless/bluez >=net-wireless/bluez-libs-3.14 )"
 RDEPEND="${DEPEND}"
 
 src_install() {
diff --git a/net-wireless/kdebluetooth/ChangeLog b/net-wireless/kdebluetooth/ChangeLog
index 4b66c5c12370..cb08aab68864 100644
--- a/net-wireless/kdebluetooth/ChangeLog
+++ b/net-wireless/kdebluetooth/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-wireless/kdebluetooth
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/kdebluetooth/ChangeLog,v 1.77 2009/05/11 19:53:12 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kdebluetooth/ChangeLog,v 1.78 2009/05/12 10:18:04 loki_val Exp $
+
+  12 May 2009; Peter Alfredsen <loki_val@gentoo.org>
+  kdebluetooth-1.0_beta8.ebuild, kdebluetooth-1.0_beta8-r1.ebuild,
+  kdebluetooth-1.0_beta8-r2.ebuild:
+  List net-wireless/bluez first in ( a b ) dependency w.r.t. bug 269519.
 
   11 May 2009; Hanno Boeck <hanno@gentoo.org>
   kdebluetooth-1.0_beta8-r2.ebuild:
diff --git a/net-wireless/kdebluetooth/kdebluetooth-1.0_beta8-r1.ebuild b/net-wireless/kdebluetooth/kdebluetooth-1.0_beta8-r1.ebuild
index 5ceb627fd6f8..c93acc78a706 100644
--- a/net-wireless/kdebluetooth/kdebluetooth-1.0_beta8-r1.ebuild
+++ b/net-wireless/kdebluetooth/kdebluetooth-1.0_beta8-r1.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/kdebluetooth/kdebluetooth-1.0_beta8-r1.ebuild,v 1.2 2009/05/10 19:21:54 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kdebluetooth/kdebluetooth-1.0_beta8-r1.ebuild,v 1.3 2009/05/12 10:18:04 loki_val Exp $
 
 inherit kde
 
@@ -24,8 +24,11 @@ DEPEND=">=dev-libs/openobex-1.1
 RDEPEND="${DEPEND}
 	|| ( ( =kde-base/kdialog-3.5* =kde-base/konqueror-3.5* )
 		=kde-base/kdebase-3.5* )
-	|| ( ( >=net-wireless/bluez-libs-3.11 >=net-wireless/bluez-utils-3.11 )
-		net-wireless/bluez )"
+	|| (
+		 net-wireless/bluez
+		( >=net-wireless/bluez-libs-3.11 >=net-wireless/bluez-utils-3.11 )
+	)
+	"
 
 need-kde 3.5
 
diff --git a/net-wireless/kdebluetooth/kdebluetooth-1.0_beta8-r2.ebuild b/net-wireless/kdebluetooth/kdebluetooth-1.0_beta8-r2.ebuild
index abc7d3239df6..815bc730c8e4 100644
--- a/net-wireless/kdebluetooth/kdebluetooth-1.0_beta8-r2.ebuild
+++ b/net-wireless/kdebluetooth/kdebluetooth-1.0_beta8-r2.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/kdebluetooth/kdebluetooth-1.0_beta8-r2.ebuild,v 1.2 2009/05/11 19:53:12 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kdebluetooth/kdebluetooth-1.0_beta8-r2.ebuild,v 1.3 2009/05/12 10:18:04 loki_val Exp $
 
 inherit kde
 
@@ -24,8 +24,11 @@ DEPEND=">=dev-libs/openobex-1.1
 RDEPEND="${DEPEND}
 	|| ( ( =kde-base/kdialog-3.5* =kde-base/konqueror-3.5* )
 		=kde-base/kdebase-3.5* )
-	|| ( ( >=net-wireless/bluez-libs-3.11 >=net-wireless/bluez-utils-3.11 )
-		net-wireless/bluez )"
+	|| (
+		 net-wireless/bluez
+		( >=net-wireless/bluez-libs-3.11 >=net-wireless/bluez-utils-3.11 )
+	)
+	"
 
 need-kde 3.5
 
diff --git a/net-wireless/kdebluetooth/kdebluetooth-1.0_beta8.ebuild b/net-wireless/kdebluetooth/kdebluetooth-1.0_beta8.ebuild
index 77c9cfb884e5..9fcb418af5ce 100644
--- a/net-wireless/kdebluetooth/kdebluetooth-1.0_beta8.ebuild
+++ b/net-wireless/kdebluetooth/kdebluetooth-1.0_beta8.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/kdebluetooth/kdebluetooth-1.0_beta8.ebuild,v 1.8 2009/05/10 19:21:54 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kdebluetooth/kdebluetooth-1.0_beta8.ebuild,v 1.9 2009/05/12 10:18:04 loki_val Exp $
 
 inherit kde
 
@@ -24,8 +24,11 @@ DEPEND=">=dev-libs/openobex-1.1
 RDEPEND="${DEPEND}
 	|| ( ( =kde-base/kdialog-3.5* =kde-base/konqueror-3.5* )
 		=kde-base/kdebase-3.5* )
-	|| ( ( >=net-wireless/bluez-libs-3.11 >=net-wireless/bluez-utils-3.11 )
-		net-wireless/bluez )"
+	|| (
+		 net-wireless/bluez
+		( >=net-wireless/bluez-libs-3.11 >=net-wireless/bluez-utils-3.11 )
+	)
+	"
 
 need-kde 3.5
 
diff --git a/net-wireless/opd/ChangeLog b/net-wireless/opd/ChangeLog
index 87afd24128d5..01b25a852740 100644
--- a/net-wireless/opd/ChangeLog
+++ b/net-wireless/opd/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-wireless/opd
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/opd/ChangeLog,v 1.10 2009/03/05 10:50:08 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/opd/ChangeLog,v 1.11 2009/05/12 10:19:41 loki_val Exp $
+
+  12 May 2009; Peter Alfredsen <loki_val@gentoo.org> opd-0.2-r1.ebuild:
+  List net-wireless/bluez first in ( a b ) dependency w.r.t. bug 269519.
 
   05 Mar 2009; Tiziano Müller <dev-zero@gentoo.org> opd-0.2-r1.ebuild:
   Added net-wireless/bluez as an option for dep/rdep (tested and works
diff --git a/net-wireless/opd/opd-0.2-r1.ebuild b/net-wireless/opd/opd-0.2-r1.ebuild
index 1aa6181d6332..0a2781a4f779 100644
--- a/net-wireless/opd/opd-0.2-r1.ebuild
+++ b/net-wireless/opd/opd-0.2-r1.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/opd/opd-0.2-r1.ebuild,v 1.6 2009/03/05 10:50:08 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/opd/opd-0.2-r1.ebuild,v 1.7 2009/05/12 10:19:41 loki_val Exp $
 
 inherit eutils
 
@@ -16,7 +16,7 @@ IUSE=""
 
 DEPEND="virtual/libc
 	dev-libs/openobex
-	|| ( >=net-wireless/bluez-libs-2.10 net-wireless/bluez )"
+	|| ( net-wireless/bluez >=net-wireless/bluez-libs-2.10 )"
 
 S=${WORKDIR}