diff options
| author |   Henrik Brix Andersen <brix@gentoo.org> | 2005-07-11 16:47:50 +0000 |
|---|---|---|
| committer | Henrik Brix Andersen <brix@gentoo.org> | 2005-07-11 16:47:50 +0000 |
| commit | 7f1374fc798cb4607e61491a44262c9384484326 (patch) | |
| tree | 4d7ab2809dd77d91fd66699b5ef80ba920c725ad /net-wireless/ipw2100 | |
| parent | amd64 patch is unconditional upstream so apply it for everyone. (diff) | |
| download | gentoo-2-7f1374fc798cb4607e61491a44262c9384484326.tar.gz gentoo-2-7f1374fc798cb4607e61491a44262c9384484326.tar.bz2 gentoo-2-7f1374fc798cb4607e61491a44262c9384484326.zip | |
Block upcoming net-wireless/ieee80211 package.
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'net-wireless/ipw2100')
| -rw-r--r-- | net-wireless/ipw2100/ChangeLog | 5 | ||||
| -rw-r--r-- | net-wireless/ipw2100/Manifest | 4 | ||||
| -rw-r--r-- | net-wireless/ipw2100/ipw2100-1.0.5.ebuild | 8 | ||||
| -rw-r--r-- | net-wireless/ipw2100/ipw2100-1.1.0.ebuild | 8 |
4 files changed, 16 insertions, 9 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" |