Resurrected for the 2005.1 livecd.

(Portage version: 2.0.51.22-r1)

6 files changed, 125 insertions, 2 deletions

diff --git a/net-wireless/ipw2200/ChangeLog b/net-wireless/ipw2200/ChangeLog
index f4fa07cef68b..4e25175ac400 100644
--- a/net-wireless/ipw2200/ChangeLog
+++ b/net-wireless/ipw2200/ChangeLog
@@ -1,6 +1,11 @@
 # 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.35 2005/06/20 10:26:41 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2200/ChangeLog,v 1.36 2005/06/24 21:42:06 brix Exp $
+
+  24 Jun 2005; <brix@gentoo.org>
+  +files/ipw2200-1.0.1-is_multicast_ether_addr.patch,
+  +files/ipw2200-1.0.1-suspend2.patch, +ipw2200-1.0.1.ebuild:
+  Resurrected for the 2005.1 livecd.
 
   20 Jun 2005; <brix@gentoo.org>
   +files/ipw2200-1.0.3-is_multicast_ether_addr.patch, ipw2200-1.0.3.ebuild:
diff --git a/net-wireless/ipw2200/Manifest b/net-wireless/ipw2200/Manifest
index 98299dfc3dcc..b6dfe4f11d7d 100644
--- a/net-wireless/ipw2200/Manifest
+++ b/net-wireless/ipw2200/Manifest
@@ -1,9 +1,13 @@
 MD5 304f6cf7496078e2132d324412f88ea0 ipw2200-1.0.4.ebuild 2404
+MD5 326c1319c23ae801768f1599622db9b1 ipw2200-1.0.1.ebuild 2343
 MD5 2e4345ff1436a7d3d07927fbb3749a37 ipw2200-1.0.3.ebuild 2443
-MD5 f827242b40dac6b02377326a953a4434 ChangeLog 6134
+MD5 0c6fc9c480a7372e7ca1e81889ef2886 ChangeLog 6321
 MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
 MD5 2dc4d1d726fc4dce22dee416d6028353 files/ipw2200-1.0.4-is_multicast_ether_addr.patch 647
+MD5 9e25eeda7c745bca8c5cf72537dd31f5 files/ipw2200-1.0.1-suspend2.patch 448
+MD5 af6756863c64cdfc93cd53556f8b397b files/ipw2200-1.0.1-is_multicast_ether_addr.patch 631
 MD5 7a64b674dbd99046028827c6417409e1 files/ipw2200-1.0.3-is_multicast_ether_addr.patch 715
 MD5 ba6c39e9a44ef971292c5f8e6a7c6897 files/ipw2200-1.0.3-suspend2.patch 522
+MD5 d2a1aca212498ad4de9f4a79ac12026b files/digest-ipw2200-1.0.1 62
 MD5 1953868cbb8ae6ee8eee55c5848417ab files/digest-ipw2200-1.0.3 62
 MD5 bcf142294729f1a55d7b3fd29c1a8239 files/digest-ipw2200-1.0.4 62
diff --git a/net-wireless/ipw2200/files/digest-ipw2200-1.0.1 b/net-wireless/ipw2200/files/digest-ipw2200-1.0.1
new file mode 100644
index 000000000000..d3e73c753246
--- /dev/null
+++ b/net-wireless/ipw2200/files/digest-ipw2200-1.0.1
@@ -0,0 +1 @@
+MD5 dd5f54b88c6615dbfe6dc3e7fc592a8e ipw2200-1.0.1.tgz 130026
diff --git a/net-wireless/ipw2200/files/ipw2200-1.0.1-is_multicast_ether_addr.patch b/net-wireless/ipw2200/files/ipw2200-1.0.1-is_multicast_ether_addr.patch
new file mode 100644
index 000000000000..a2fb8deb90f6
--- /dev/null
+++ b/net-wireless/ipw2200/files/ipw2200-1.0.1-is_multicast_ether_addr.patch
@@ -0,0 +1,16 @@
+diff -urp ipw2200-1.0.1/ieee80211.h ipw2200-1.0.1-is_multicast_ether_addr/ieee80211.h
+--- ipw2200-1.0.1/ieee80211.h	2005-02-08 23:24:04.000000000 +0100
++++ ipw2200-1.0.1-is_multicast_ether_addr/ieee80211.h	2005-06-24 23:26:36.000000000 +0200
+@@ -643,10 +643,12 @@ enum ieee80211_state {
+ #define MAC_ARG(x) ((u8*)(x))[0],((u8*)(x))[1],((u8*)(x))[2],((u8*)(x))[3],((u8*)(x))[4],((u8*)(x))[5]
+ 
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,12)
+ extern inline int is_multicast_ether_addr(const u8 *addr)
+ {
+ 	return ((addr[0] != 0xff) && (0x01 & addr[0]));
+ }
++#endif
+ 
+ extern inline int is_broadcast_ether_addr(const u8 *addr)
+ {
diff --git a/net-wireless/ipw2200/files/ipw2200-1.0.1-suspend2.patch b/net-wireless/ipw2200/files/ipw2200-1.0.1-suspend2.patch
new file mode 100644
index 000000000000..c1fdb39894d4
--- /dev/null
+++ b/net-wireless/ipw2200/files/ipw2200-1.0.1-suspend2.patch
@@ -0,0 +1,12 @@
+diff -urp ipw2200-1.0.1/ipw2200.c ipw2200-1.0.1-suspend2/ipw2200.c
+--- ipw2200-1.0.1/ipw2200.c	2005-02-08 23:24:04.000000000 +0100
++++ ipw2200-1.0.1-suspend2/ipw2200.c	2005-06-24 23:30:48.000000000 +0200
+@@ -7345,7 +7345,7 @@ static int ipw_setup_deferred_work(struc
+ {
+ 	int ret = 0;
+ 
+-#ifdef CONFIG_SOFTWARE_SUSPEND2
++#ifdef PF_SYNCTHREAD
+ 	priv->workqueue = create_workqueue(DRV_NAME, 0);
+ #else
+ 	priv->workqueue = create_workqueue(DRV_NAME);
diff --git a/net-wireless/ipw2200/ipw2200-1.0.1.ebuild b/net-wireless/ipw2200/ipw2200-1.0.1.ebuild
new file mode 100644
index 000000000000..9b6a0e1eaeb6
--- /dev/null
+++ b/net-wireless/ipw2200/ipw2200-1.0.1.ebuild
@@ -0,0 +1,85 @@
+# 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.6 2005/06/24 21:42:06 brix Exp $
+
+inherit eutils linux-mod
+
+# The following works with both pre-releases and releases
+MY_P=${P/_/-}
+S=${WORKDIR}/${MY_P}
+
+FW_VERSION="2.3"
+
+DESCRIPTION="Driver for the Intel PRO/Wireless 2200BG/2915ABG miniPCI and 2225BG PCI adapters"
+
+HOMEPAGE="http://ipw2200.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+
+IUSE="debug"
+RDEPEND="=net-wireless/ipw2200-firmware-${FW_VERSION}
+		net-wireless/wireless-tools
+		!net-wireless/ipw2100"
+
+BUILD_TARGETS="all"
+
+MODULE_NAMES="ipw2200(net:)
+			ieee80211(net:)
+			ieee80211_crypt(net:)
+			ieee80211_crypt_wep(net:)
+			ieee80211_crypt_ccmp(net:)
+			ieee80211_crypt_tkip(net:)"
+MODULESD_IPW2200_DOCS="README.ipw2200"
+
+CONFIG_CHECK="NET_RADIO CRYPTO_ARC4 CRYPTO_MICHAEL_MIC FW_LOADER CRC32"
+ERROR_NET_RADIO="${P} requires support for Wireless LAN drivers (non-hamradio) & Wireless Extensions (CONFIG_NET_RADIO)."
+ERROR_CRYPTO_ARC4="${P} requires support for ARC4 cipher algorithm (CONFIG_CRYPTO_ARC4)."
+ERROR_CRYPTO_MICHAEL_MIC="${P} requires support for Michael MIC keyed digest algorithm (CONFIG_CRYPTO_MICHAEL_MIC)."
+ERROR_FW_LOADER="${P} requires Hotplug firmware loading support (CONFIG_FW_LOADER)."
+ERROR_CRC32="${P} requires support for CRC32 functions (CONFIG_CRC32)."
+
+pkg_setup() {
+	if kernel_is 2 4; then
+		die "${P} does not support building against kernel 2.4.x"
+	fi
+
+	if ! (linux_chkconfig_present CRYPTO_AES_586 || linux_chkconfig_present CRYPTO_AES); then
+		eerror "${P} requires support for AES cipher algorithms (i586) (CONFIG_CRYPTO_AES_586)."
+		eerror "This option is called CONFIG_CRYPTO_AES in kernels prior to 2.6.8."
+		die "CONFIG_CRYPTO_AES_586 support not detected"
+	fi
+
+	linux-mod_pkg_setup
+
+	BUILD_PARAMS="KSRC=${KV_DIR}"
+}
+
+src_unpack() {
+	local debug="n"
+
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-is_multicast_ether_addr.patch
+	epatch ${FILESDIR}/${P}-suspend2.patch
+
+	use debug && debug="y"
+	sed -i \
+		-e "s:^\(CONFIG_IPW_DEBUG\)=.*:\1=$debug:" \
+		-e "s:^\(CONFIG_IEEE80211_DEBUG\)=.*:\1=$debug:" \
+		${S}/Makefile
+
+	if use_m; then
+		sed -i -e "s:\${SUBDIRS}:\${M}:" ${S}/Makefile
+	fi
+	convert_to_m ${S}/Makefile
+}
+
+src_install() {
+	linux-mod_src_install
+
+	dodoc CHANGES ISSUES
+}