Block upcoming net-wireless/ieee80211 package.

(Portage version: 2.0.51.22-r1)

8 files changed, 36 insertions, 19 deletions

diff --git a/net-wireless/ipw2100/ChangeLog b/net-wireless/ipw2100/ChangeLog
index 3822f95b4b5f..98ef04604c27 100644
--- a/net-wireless/ipw2100/ChangeLog
+++ b/net-wireless/ipw2100/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-wireless/ipw2100
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ChangeLog,v 1.76 2005/06/24 21:31:21 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ChangeLog,v 1.77 2005/07/11 16:45:03 brix Exp $
+
+  11 Jul 2005; <brix@gentoo.org> ipw2100-1.0.5.ebuild, ipw2100-1.1.0.ebuild:
+  Block upcoming net-wireless/ieee80211 package.
 
   24 Jun 2005; <brix@gentoo.org>
   +files/ipw2100-1.0.5-is_multicast_ether_addr.patch,
diff --git a/net-wireless/ipw2100/Manifest b/net-wireless/ipw2100/Manifest
index a83c8ddd9c0c..5a962e7ba7d6 100644
--- a/net-wireless/ipw2100/Manifest
+++ b/net-wireless/ipw2100/Manifest
@@ -1,7 +1,7 @@
-MD5 b498b43592d0c62f499e9f9b965ff9ce ipw2100-1.1.0.ebuild 2258
+MD5 5d8c6d28d04cc501d10b35a34dc8f2e9 ipw2100-1.1.0.ebuild 2303
 MD5 2a7565c8389ad0e3edc4d6d6ab716d17 ChangeLog 14604
 MD5 172db10566470c8f64b5911609a8e5f9 metadata.xml 318
-MD5 eb7415fde9cc62fd36535696f0846c67 ipw2100-1.0.5.ebuild 2251
+MD5 50879ebb5d8f2348330831ff75df9c08 ipw2100-1.0.5.ebuild 2296
 MD5 5fb2369d48eb758371baed2ff166ce10 files/ipw2100-1.1.0-suspend2.patch 1173
 MD5 35e41d40e65c6248a9b9ed4d76d671d2 files/ipw2100-1.0.5-is_multicast_ether_addr.patch 631
 MD5 fa1d9b13fc88f31abe34565753ff0b90 files/digest-ipw2100-1.0.5 62
diff --git a/net-wireless/ipw2100/ipw2100-1.0.5.ebuild b/net-wireless/ipw2100/ipw2100-1.0.5.ebuild
index 985a6e4a2152..3e327bb4e139 100644
--- a/net-wireless/ipw2100/ipw2100-1.0.5.ebuild
+++ b/net-wireless/ipw2100/ipw2100-1.0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ipw2100-1.0.5.ebuild,v 1.6 2005/06/24 21:33:55 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ipw2100-1.0.5.ebuild,v 1.7 2005/07/11 16:45:03 brix Exp $
 
 inherit eutils linux-mod
 
@@ -16,9 +16,11 @@ SLOT="0"
 KEYWORDS="x86"
 
 IUSE="debug"
-RDEPEND="=net-wireless/ipw2100-firmware-${FW_VERSION}
-		>=net-wireless/wireless-tools-27_pre23
+DEPEND="!net-wireless/ieee80211
 		!net-wireless/ipw2200"
+RDEPEND="${DEPEND}
+		=net-wireless/ipw2100-firmware-${FW_VERSION}
+		>=net-wireless/wireless-tools-27_pre23"
 
 BUILD_TARGETS="all"
 
diff --git a/net-wireless/ipw2100/ipw2100-1.1.0.ebuild b/net-wireless/ipw2100/ipw2100-1.1.0.ebuild
index 7a1852ead607..527e5f29728c 100644
--- a/net-wireless/ipw2100/ipw2100-1.1.0.ebuild
+++ b/net-wireless/ipw2100/ipw2100-1.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ipw2100-1.1.0.ebuild,v 1.4 2005/06/18 09:20:38 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ipw2100-1.1.0.ebuild,v 1.5 2005/07/11 16:45:03 brix Exp $
 
 inherit eutils linux-mod
 
@@ -16,9 +16,11 @@ SLOT="0"
 KEYWORDS="x86"
 
 IUSE="debug"
-RDEPEND="=net-wireless/ipw2100-firmware-${FW_VERSION}
-		>=net-wireless/wireless-tools-27_pre23
+DEPEND="!net-wireless/ieee80211
 		!net-wireless/ipw2200"
+RDEPEND="${DEPEND}
+		=net-wireless/ipw2100-firmware-${FW_VERSION}
+		>=net-wireless/wireless-tools-27_pre23"
 
 BUILD_TARGETS="all"
 
diff --git a/net-wireless/ipw2200/ChangeLog b/net-wireless/ipw2200/ChangeLog
index 4e25175ac400..474a44f7ed5b 100644
--- a/net-wireless/ipw2200/ChangeLog
+++ b/net-wireless/ipw2200/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-wireless/ipw2200
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2200/ChangeLog,v 1.36 2005/06/24 21:42:06 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2200/ChangeLog,v 1.37 2005/07/11 16:47:50 brix Exp $
+
+  11 Jul 2005; <brix@gentoo.org> ipw2200-1.0.1.ebuild, ipw2200-1.0.3.ebuild,
+  ipw2200-1.0.4.ebuild:
+  Block upcoming net-wireless/ieee80211 package.
 
   24 Jun 2005; <brix@gentoo.org>
   +files/ipw2200-1.0.1-is_multicast_ether_addr.patch,
diff --git a/net-wireless/ipw2200/ipw2200-1.0.1.ebuild b/net-wireless/ipw2200/ipw2200-1.0.1.ebuild
index c4f5cd1ac120..925f836485d3 100644
--- a/net-wireless/ipw2200/ipw2200-1.0.1.ebuild
+++ b/net-wireless/ipw2200/ipw2200-1.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2200/ipw2200-1.0.1.ebuild,v 1.7 2005/06/24 21:44:10 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2200/ipw2200-1.0.1.ebuild,v 1.8 2005/07/11 16:47:50 brix Exp $
 
 inherit eutils linux-mod
 
@@ -20,9 +20,11 @@ SLOT="0"
 KEYWORDS="x86 ~amd64"
 
 IUSE="debug"
-RDEPEND="=net-wireless/ipw2200-firmware-${FW_VERSION}
-		net-wireless/wireless-tools
+DEPEND="!net-wireless/ieee80211
 		!net-wireless/ipw2100"
+RDEPEND="${DEPEND}
+		=net-wireless/ipw2200-firmware-${FW_VERSION}
+		net-wireless/wireless-tools"
 
 BUILD_TARGETS="all"
 
diff --git a/net-wireless/ipw2200/ipw2200-1.0.3.ebuild b/net-wireless/ipw2200/ipw2200-1.0.3.ebuild
index 31c0748fc286..9c5ab63ab0b5 100644
--- a/net-wireless/ipw2200/ipw2200-1.0.3.ebuild
+++ b/net-wireless/ipw2200/ipw2200-1.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2200/ipw2200-1.0.3.ebuild,v 1.4 2005/06/20 10:26:41 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2200/ipw2200-1.0.3.ebuild,v 1.5 2005/07/11 16:47:50 brix Exp $
 
 inherit eutils linux-mod
 
@@ -20,9 +20,11 @@ SLOT="0"
 KEYWORDS="x86 ~amd64"
 
 IUSE="debug"
-RDEPEND="=net-wireless/ipw2200-firmware-${FW_VERSION}
-		net-wireless/wireless-tools
+DEPEND="!net-wireless/ieee80211
 		!net-wireless/ipw2100"
+RDEPEND="${DEPEND}
+		=net-wireless/ipw2200-firmware-${FW_VERSION}
+		net-wireless/wireless-tools"
 
 BUILD_TARGETS="all"
 
diff --git a/net-wireless/ipw2200/ipw2200-1.0.4.ebuild b/net-wireless/ipw2200/ipw2200-1.0.4.ebuild
index c828816d212e..7d099f4a803b 100644
--- a/net-wireless/ipw2200/ipw2200-1.0.4.ebuild
+++ b/net-wireless/ipw2200/ipw2200-1.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2200/ipw2200-1.0.4.ebuild,v 1.2 2005/06/18 09:25:21 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2200/ipw2200-1.0.4.ebuild,v 1.3 2005/07/11 16:47:50 brix Exp $
 
 inherit eutils linux-mod
 
@@ -20,9 +20,11 @@ SLOT="0"
 KEYWORDS="~x86 ~amd64"
 
 IUSE="debug"
-RDEPEND="=net-wireless/ipw2200-firmware-${FW_VERSION}
-		net-wireless/wireless-tools
+DEPEND="!net-wireless/ieee80211
 		!net-wireless/ipw2100"
+RDEPEND="${DEPEND}
+		=net-wireless/ipw2200-firmware-${FW_VERSION}
+		net-wireless/wireless-tools"
 
 BUILD_TARGETS="all"