4 files changed, 20 insertions, 10 deletions
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"