6 files changed, 135 insertions, 2 deletions
diff --git a/net-wireless/ipw2100/ChangeLog b/net-wireless/ipw2100/ChangeLog
index 4ffaf0f2e769..3822f95b4b5f 100644
--- a/net-wireless/ipw2100/ChangeLog
+++ b/net-wireless/ipw2100/ChangeLog
@@ -1,6 +1,11 @@
 # 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.75 2005/06/18 09:20:38 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ChangeLog,v 1.76 2005/06/24 21:31:21 brix Exp $
+
+  24 Jun 2005; <brix@gentoo.org>
+  +files/ipw2100-1.0.5-is_multicast_ether_addr.patch,
+  +files/ipw2100-1.0.5-suspend2.patch, +ipw2100-1.0.5.ebuild:
+  Resurrected for the 2005.1 livecd.
 
   18 Jun 2005; <brix@gentoo.org>
   +files/ipw2100-1.1.0-is_multicast_ether_addr.patch, ipw2100-1.1.0.ebuild:
diff --git a/net-wireless/ipw2100/Manifest b/net-wireless/ipw2100/Manifest
index bb7d1a690975..dcd8955410b5 100644
--- a/net-wireless/ipw2100/Manifest
+++ b/net-wireless/ipw2100/Manifest
@@ -1,6 +1,10 @@
 MD5 b498b43592d0c62f499e9f9b965ff9ce ipw2100-1.1.0.ebuild 2258
-MD5 5ddaba07700ef7b7f86a8e3613c29bff ChangeLog 14417
+MD5 34d532fa038ae1419123985c02b63f66 ChangeLog 14604
 MD5 172db10566470c8f64b5911609a8e5f9 metadata.xml 318
+MD5 1b7615492915d073d55006a6079d5031 ipw2100-1.0.5.ebuild 2157
 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
 MD5 8c080b5455def312dc8b8fb2da3ffa12 files/digest-ipw2100-1.1.0 62
+MD5 45b8329213881abb9eb1569b92b1c080 files/ipw2100-1.0.5-suspend2.patch 1173
 MD5 963a9937088ce7886c88a7553921d142 files/ipw2100-1.1.0-is_multicast_ether_addr.patch 695
diff --git a/net-wireless/ipw2100/files/digest-ipw2100-1.0.5 b/net-wireless/ipw2100/files/digest-ipw2100-1.0.5
new file mode 100644
index 000000000000..728f5496bf3d
--- /dev/null
+++ b/net-wireless/ipw2100/files/digest-ipw2100-1.0.5
@@ -0,0 +1 @@
+MD5 26f96a9a20eed00d8e4e6c963ed41d37 ipw2100-1.0.5.tgz 135129
diff --git a/net-wireless/ipw2100/files/ipw2100-1.0.5-is_multicast_ether_addr.patch b/net-wireless/ipw2100/files/ipw2100-1.0.5-is_multicast_ether_addr.patch
new file mode 100644
index 000000000000..50ef2fb59c40
--- /dev/null
+++ b/net-wireless/ipw2100/files/ipw2100-1.0.5-is_multicast_ether_addr.patch
@@ -0,0 +1,16 @@
+diff -urp ipw2100-1.0.5/ieee80211.h ipw2100-1.0.5-is_multicast_ether_addr/ieee80211.h
+--- ipw2100-1.0.5/ieee80211.h	2005-02-08 21:38:23.000000000 +0100
++++ ipw2100-1.0.5-is_multicast_ether_addr/ieee80211.h	2005-06-24 23:18:54.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/ipw2100/files/ipw2100-1.0.5-suspend2.patch b/net-wireless/ipw2100/files/ipw2100-1.0.5-suspend2.patch
new file mode 100644
index 000000000000..630b46ff0dc6
--- /dev/null
+++ b/net-wireless/ipw2100/files/ipw2100-1.0.5-suspend2.patch
@@ -0,0 +1,29 @@
+diff -urp ipw2100-1.0.5/ipw2100.c ipw2100-1.0.5-suspend2/ipw2100.c
+--- ipw2100-1.0.5/ipw2100.c	2005-02-08 21:38:23.000000000 +0100
++++ ipw2100-1.0.5-suspend2/ipw2100.c	2005-06-24 23:19:22.000000000 +0200
+@@ -6401,7 +6401,7 @@ static struct net_device *ipw2100_alloc_
+ 	INIT_STAT(&priv->fw_pend_stat);
+ 
+ 
+-#ifdef CONFIG_SOFTWARE_SUSPEND2
++#ifdef CONFIG_SOFTWARE_SUSPEND2_BUILTIN
+ 	priv->workqueue = create_workqueue(DRV_NAME, 0);
+ #else
+ 	priv->workqueue = create_workqueue(DRV_NAME);
+diff -urp ipw2100-1.0.5/ipw2100.h ipw2100-1.0.5-suspend2/ipw2100.h
+--- ipw2100-1.0.5/ipw2100.h	2005-02-08 21:38:23.000000000 +0100
++++ ipw2100-1.0.5-suspend2/ipw2100.h	2005-06-24 23:19:22.000000000 +0200
+@@ -57,6 +57,13 @@ typedef void irqreturn_t;
+ #define IW_QUAL_NOISE_INVALID 0x40
+ #endif
+ 
++#if !defined(CONFIG_SOFTWARE_SUSPEND2_BUILTIN) && \
++	(defined(CONFIG_SUSPEND2) || \
++	defined(CONFIG_SOFTWARE_SUSPEND2) ||		\
++	defined(CONFIG_SOFTWARE_SUSPEND2_MODULE))
++#define CONFIG_SOFTWARE_SUSPEND2_BUILTIN
++#endif
++
+ #if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,5) )
+ #define pci_dma_sync_single_for_cpu	pci_dma_sync_single
+ #define pci_dma_sync_single_for_device	pci_dma_sync_single
diff --git a/net-wireless/ipw2100/ipw2100-1.0.5.ebuild b/net-wireless/ipw2100/ipw2100-1.0.5.ebuild
new file mode 100644
index 000000000000..aced94b8b284
--- /dev/null
+++ b/net-wireless/ipw2100/ipw2100-1.0.5.ebuild
@@ -0,0 +1,78 @@
+# 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.5 2005/06/24 21:31:21 brix Exp $
+
+inherit eutils linux-mod
+
+FW_VERSION="1.3"
+
+DESCRIPTION="Driver for the Intel PRO/Wireless 2100 3B miniPCI adapter"
+
+HOMEPAGE="http://ipw2100.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86"
+
+IUSE="debug"
+RDEPEND="=net-wireless/ipw2100-firmware-${FW_VERSION}
+		>=net-wireless/wireless-tools-27_pre23
+		!net-wireless/ipw2200"
+
+BUILD_TARGETS="all"
+
+MODULE_NAMES="ipw2100(net:)
+			ieee80211(net:)
+			ieee80211_crypt(net:)
+			ieee80211_crypt_wep(net:)
+			ieee80211_crypt_ccmp(net:)
+			ieee80211_crypt_tkip(net:)"
+MODULESD_IPW2100_DOCS="README.ipw2100"
+
+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}-suspend2.patch
+	epatch ${FILESDIR}/${P}-is_multicast_ether_addr.patch
+
+	use debug && debug="y"
+	sed -i \
+		-e "s:^\(CONFIG_IPW_DEBUG\)=.*:\1=$debug:" \
+		-e "s:^\(CONFIG_IEEE80211_DEBUG\)=.*:\1=$debug:" \
+		${S}/Makefile
+
+	convert_to_m ${S}/Makefile
+}
+
+src_install() {
+	linux-mod_src_install
+
+	dodoc CHANGES ISSUES
+}