Updated/added patch for suspending with kernel 2.6.10.

18 files changed, 731 insertions, 15 deletions

diff --git a/net-wireless/ipw2100/ChangeLog b/net-wireless/ipw2100/ChangeLog
index 77fb64b4e8ac..5ef79ff9030d 100644
--- a/net-wireless/ipw2100/ChangeLog
+++ b/net-wireless/ipw2100/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-wireless/ipw2100
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ChangeLog,v 1.55 2004/12/16 08:25:52 brix Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ChangeLog,v 1.56 2005/01/02 15:17:24 brix Exp $
+
+*ipw2100-0.56-r2 (02 Jan 2005)
+
+  02 Jan 2005; Henrik Brix Andersen <brix@gentoo.org>
+  +files/ipw2100-0.56-2.6.10-susp.2.patch,
+  +files/ipw2100-1.0.0-2.6.10-susp.patch,
+  +files/ipw2100-1.0.1-2.6.10-susp.patch,
+  +files/ipw2100-1.0.2-2.6.10-susp.patch, +ipw2100-0.56-r2.ebuild,
+  +ipw2100-1.0.0-r1.ebuild, +ipw2100-1.0.1-r1.ebuild,
+  +ipw2100-1.0.2-r1.ebuild:
+  Updated/added patch for suspending with kernel 2.6.10.
 
   16 Dec 2004; Henrik Brix Andersen <brix@gentoo.org> ipw2100-1.0.2.ebuild:
   Added Giuseppe Della Ricca's kernel 2.4 backport patch.
diff --git a/net-wireless/ipw2100/Manifest b/net-wireless/ipw2100/Manifest
index 32fc996c7ad7..dceca2585dd5 100644
--- a/net-wireless/ipw2100/Manifest
+++ b/net-wireless/ipw2100/Manifest
@@ -1,14 +1,26 @@
-MD5 6b0a88fc389aa4d78270fbd0bac6b17e ipw2100-1.0.2.ebuild 3431
-MD5 e4fb9f9e2184d215b9238a04495accba ipw2100-1.0.1.ebuild 3905
-MD5 a5620b55402273b14f29c39e0f294299 ipw2100-0.56-r1.ebuild 3996
-MD5 6f423a3ba84176fe74594ebc178c3925 ChangeLog 10727
+MD5 d5244acd4e731d8873704f6d96fc4e1d ipw2100-1.0.2.ebuild 3431
+MD5 9b7bc235dc33c1b645c3fce7bcb0834b ipw2100-0.56-r2.ebuild 3998
+MD5 7137bb15af0b35725bf92eaafe836ae1 ipw2100-1.0.2-r1.ebuild 3487
+MD5 981129c978b2f88c4b1103e5f1f4bac0 ipw2100-1.0.1.ebuild 3905
+MD5 865ee1a0b7026c8496265eb909513ca2 ipw2100-0.56-r1.ebuild 3996
+MD5 20cfc727bbb02242be63f266d3542e09 ipw2100-1.0.1-r1.ebuild 3961
+MD5 35a869af34b0195c221115ec9df59ca2 ChangeLog 11147
 MD5 172db10566470c8f64b5911609a8e5f9 metadata.xml 318
-MD5 5d4b6432364194f1da3e03d63c98de75 ipw2100-1.0.0.ebuild 3818
+MD5 412ed39ad25227de67690a57eefa21be ipw2100-1.0.0.ebuild 3818
+MD5 d24dd5b5de1586a45f52b7423f502a3d ipw2100-1.0.0-r1.ebuild 3874
 MD5 b80746d07b956e30d091d5b070694b15 files/ipw2100-0.56-2.6.10-susp.patch 1484
+MD5 95df3f923a43eed84d3a727e5cfa715c files/ipw2100-0.56-2.6.10-susp.2.patch 1516
 MD5 65f9c3d1b61f2e64d1e47a5d876946e4 files/ipw2100-0.56-wpa_eapol_fix.patch 624
 MD5 b43aa27d23c37eae087e1fbc203e91ac files/ipw2100-1.0.2-set_security.patch 940
+MD5 5b908302d975420881895ae8024598a1 files/ipw2100-1.0.1-2.6.10-susp.patch 450
 MD5 20fe178fabb9591d81a6cbf182fd520a files/digest-ipw2100-1.0.0 125
 MD5 e268f53cf63bf9a02d4c67252d0ca889 files/digest-ipw2100-1.0.1 197
 MD5 9fd4b97cffd1a381e8e34e126d4cc0c2 files/digest-ipw2100-1.0.2 197
 MD5 3281ce7f4f675298655322854f41fdd6 files/digest-ipw2100-0.56-r1 195
+MD5 3281ce7f4f675298655322854f41fdd6 files/digest-ipw2100-0.56-r2 195
+MD5 20fe178fabb9591d81a6cbf182fd520a files/digest-ipw2100-1.0.0-r1 125
+MD5 e268f53cf63bf9a02d4c67252d0ca889 files/digest-ipw2100-1.0.1-r1 197
+MD5 9fd4b97cffd1a381e8e34e126d4cc0c2 files/digest-ipw2100-1.0.2-r1 197
+MD5 b98ff1fd62c4b394070a81df3f582021 files/ipw2100-1.0.2-2.6.10-susp.patch 450
 MD5 aca6bf1c2d71e72adfc952d903c77f6b files/ipw2100-0.56-ieee80211_scan_age.2.patch 1718
+MD5 a3c145c628f8694f780d445db4d83390 files/ipw2100-1.0.0-2.6.10-susp.patch 450
diff --git a/net-wireless/ipw2100/files/digest-ipw2100-0.56-r2 b/net-wireless/ipw2100/files/digest-ipw2100-0.56-r2
new file mode 100644
index 000000000000..24cce39e0ed2
--- /dev/null
+++ b/net-wireless/ipw2100/files/digest-ipw2100-0.56-r2
@@ -0,0 +1,3 @@
+MD5 96473874bb682e2701c4e8e6dd662a64 ipw2100-0.56.tgz 132854
+MD5 46aa75bcda1a00efa841f9707bbbd113 ipw2100-fw-1.3.tgz 248471
+MD5 5367fe7ad991a70f3af0797ba0d83e2d ipw2100-0.56-2.4-v9.patch.gz 8832
diff --git a/net-wireless/ipw2100/files/digest-ipw2100-1.0.0-r1 b/net-wireless/ipw2100/files/digest-ipw2100-1.0.0-r1
new file mode 100644
index 000000000000..ce5cdd399da7
--- /dev/null
+++ b/net-wireless/ipw2100/files/digest-ipw2100-1.0.0-r1
@@ -0,0 +1,2 @@
+MD5 a76362f9a3d3d751a9e93208e08824fd ipw2100-1.0.0.tgz 136668
+MD5 46aa75bcda1a00efa841f9707bbbd113 ipw2100-fw-1.3.tgz 248471
diff --git a/net-wireless/ipw2100/files/digest-ipw2100-1.0.1-r1 b/net-wireless/ipw2100/files/digest-ipw2100-1.0.1-r1
new file mode 100644
index 000000000000..72db9231324e
--- /dev/null
+++ b/net-wireless/ipw2100/files/digest-ipw2100-1.0.1-r1
@@ -0,0 +1,3 @@
+MD5 8970e45a43450e32724859c2f5c781df ipw2100-1.0.1.tgz 137602
+MD5 46aa75bcda1a00efa841f9707bbbd113 ipw2100-fw-1.3.tgz 248471
+MD5 b72a89024f04860b885922f0a9fda812 ipw2100-1.0.1-2.4-v1.patch.gz 9132
diff --git a/net-wireless/ipw2100/files/digest-ipw2100-1.0.2-r1 b/net-wireless/ipw2100/files/digest-ipw2100-1.0.2-r1
new file mode 100644
index 000000000000..e82b0a856beb
--- /dev/null
+++ b/net-wireless/ipw2100/files/digest-ipw2100-1.0.2-r1
@@ -0,0 +1,3 @@
+MD5 5ba45b7586ee61e319681d6c5f77616e ipw2100-1.0.2.tgz 138288
+MD5 46aa75bcda1a00efa841f9707bbbd113 ipw2100-fw-1.3.tgz 248471
+MD5 4079de13bea12b656ddfd9e05527b9a6 ipw2100-1.0.2-2.4-v1.patch.gz 8891
diff --git a/net-wireless/ipw2100/files/ipw2100-0.56-2.6.10-susp.2.patch b/net-wireless/ipw2100/files/ipw2100-0.56-2.6.10-susp.2.patch
new file mode 100644
index 000000000000..543710c3a249
--- /dev/null
+++ b/net-wireless/ipw2100/files/ipw2100-0.56-2.6.10-susp.2.patch
@@ -0,0 +1,49 @@
+diff -urp ipw2100-0.56/ipw2100.c ipw2100-0.56/ipw2100.c
+--- ipw2100-0.56/ipw2100.c	2004-10-14 03:06:57.000000000 +0800
++++ ipw2100-0.56/ipw2100.c	2004-10-28 15:57:10.000000000 +0800
+@@ -6475,7 +6475,6 @@ static int ipw2100_pci_init_one(struct p
+ 		pci_write_config_dword(pdev, 0x40, val & 0xffff00ff);
+ 
+ 	pci_set_power_state(pdev, 0);
+-	pci_restore_state(pdev, NULL);
+ 
+ 	if (!ipw2100_hw_is_adapter_in_system(dev)) {
+ 		err = -ENODEV;
+@@ -6666,8 +6665,11 @@ static int ipw2100_suspend(struct pci_de
+ 	/* Remove the PRESENT state of the device */
+ 	netif_device_detach(dev);
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)
+ 	pci_save_state(pdev, priv->pm_state);
+-	pci_disable_device(pdev);       // needed?
++#else
++	pci_save_state(pdev);
++#endif
+ 	pci_set_power_state(pdev, state);
+ 	
+ 	return 0;
+@@ -6686,7 +6686,11 @@ static int ipw2100_resume(struct pci_dev
+ 	       dev->name);
+ 
+ 	pci_set_power_state(pdev, 0);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)
+ 	pci_restore_state(pdev, priv->pm_state);
++#else
++	pci_restore_state(pdev);
++#endif
+ 
+ 	/*
+ 	 * Suspend/Resume resets the PCI configuration space, so we have to
+diff -urp ipw2100-0.56/ipw2100.h ipw2100-0.56/ipw2100.h
+--- ipw2100-0.56/ipw2100.h	2004-10-14 03:06:57.000000000 +0800
++++ ipw2100-0.56/ipw2100.h	2004-10-27 11:16:36.000000000 +0800
+@@ -608,7 +608,9 @@ struct ipw2100_priv {
+ 	spinlock_t low_lock;
+ 
+ 	wait_queue_head_t wait_command_queue;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)
+ 	u32 pm_state[PM_STATE_SIZE];
++#endif
+ };
+ 
+ 
diff --git a/net-wireless/ipw2100/files/ipw2100-1.0.0-2.6.10-susp.patch b/net-wireless/ipw2100/files/ipw2100-1.0.0-2.6.10-susp.patch
new file mode 100644
index 000000000000..2160ca375709
--- /dev/null
+++ b/net-wireless/ipw2100/files/ipw2100-1.0.0-2.6.10-susp.patch
@@ -0,0 +1,12 @@
+diff -urp ipw2100-1.0.0/ipw2100.c ipw2100-1.0.0-2.6.10-susp/ipw2100.c
+--- ipw2100-1.0.0/ipw2100.c	2004-11-12 21:45:33.000000000 +0100
++++ ipw2100-1.0.0-2.6.10-susp/ipw2100.c	2005-01-02 16:07:55.488841880 +0100
+@@ -6664,6 +6664,8 @@ static int ipw2100_suspend(struct pci_de
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)
+ 	pci_save_state(pci_dev, priv->pm_state);
++#else
++	pci_save_state(pci_dev);
+ #endif
+ 	pci_set_power_state(pci_dev, state);
+ 
diff --git a/net-wireless/ipw2100/files/ipw2100-1.0.1-2.6.10-susp.patch b/net-wireless/ipw2100/files/ipw2100-1.0.1-2.6.10-susp.patch
new file mode 100644
index 000000000000..9a7c019e9e28
--- /dev/null
+++ b/net-wireless/ipw2100/files/ipw2100-1.0.1-2.6.10-susp.patch
@@ -0,0 +1,12 @@
+diff -urp ipw2100-1.0.1/ipw2100.c ipw2100-1.0.1-2.6.10-susp/ipw2100.c
+--- ipw2100-1.0.1/ipw2100.c	2004-11-19 16:36:28.000000000 +0100
++++ ipw2100-1.0.1-2.6.10-susp/ipw2100.c	2005-01-02 16:08:33.344087008 +0100
+@@ -6709,6 +6709,8 @@ static int ipw2100_suspend(struct pci_de
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)
+ 	pci_save_state(pci_dev, priv->pm_state);
++#else
++	pci_save_state(pci_dev);
+ #endif
+ 	pci_set_power_state(pci_dev, state);
+ 
diff --git a/net-wireless/ipw2100/files/ipw2100-1.0.2-2.6.10-susp.patch b/net-wireless/ipw2100/files/ipw2100-1.0.2-2.6.10-susp.patch
new file mode 100644
index 000000000000..c143cc4faa1c
--- /dev/null
+++ b/net-wireless/ipw2100/files/ipw2100-1.0.2-2.6.10-susp.patch
@@ -0,0 +1,12 @@
+diff -urp ipw2100-1.0.2/ipw2100.c ipw2100-1.0.2-2.6.10-susp/ipw2100.c
+--- ipw2100-1.0.2/ipw2100.c	2004-12-14 07:29:32.000000000 +0100
++++ ipw2100-1.0.2-2.6.10-susp/ipw2100.c	2005-01-02 16:09:26.989931600 +0100
+@@ -6718,6 +6718,8 @@ static int ipw2100_suspend(struct pci_de
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)
+ 	pci_save_state(pci_dev, priv->pm_state);
++#else
++	pci_save_state(pci_dev);
+ #endif
+ 	pci_set_power_state(pci_dev, state);
+ 
diff --git a/net-wireless/ipw2100/ipw2100-0.56-r1.ebuild b/net-wireless/ipw2100/ipw2100-0.56-r1.ebuild
index e48028b0d029..e34faaa0f353 100644
--- a/net-wireless/ipw2100/ipw2100-0.56-r1.ebuild
+++ b/net-wireless/ipw2100/ipw2100-0.56-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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-0.56-r1.ebuild,v 1.7 2004/11/12 07:08:25 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ipw2100-0.56-r1.ebuild,v 1.8 2005/01/02 15:17:24 brix Exp $
 
 inherit kernel-mod eutils
 
diff --git a/net-wireless/ipw2100/ipw2100-0.56-r2.ebuild b/net-wireless/ipw2100/ipw2100-0.56-r2.ebuild
new file mode 100644
index 000000000000..a32399f260c6
--- /dev/null
+++ b/net-wireless/ipw2100/ipw2100-0.56-r2.ebuild
@@ -0,0 +1,152 @@
+# 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-0.56-r2.ebuild,v 1.1 2005/01/02 15:17:24 brix Exp $
+
+inherit kernel-mod eutils
+
+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
+		mirror://gentoo/${PN}-fw-${FW_VERSION}.tgz
+		mirror://gentoo/${P}-2.4-v9.patch.gz"
+
+LICENSE="GPL-2 ipw2100-fw"
+SLOT="0"
+KEYWORDS="x86"
+
+IUSE=""
+DEPEND="virtual/linux-sources
+		!net-wireless/ipw2200
+		sys-apps/sed"
+RDEPEND=">=sys-apps/hotplug-20030805-r2
+		>=net-wireless/wireless-tools-27_pre23"
+
+pkg_setup() {
+	local DIE=0
+
+	if ! kernel-mod_configoption_present NET_RADIO
+	then
+		eerror ""
+		eerror "${P} requires support for Wireless LAN drivers (non-hamradio) &"
+		eerror "Wireless Extensions (CONFIG_NET_RADIO) in the kernel."
+		DIE=1
+	fi
+
+	if ! kernel-mod_configoption_present CRYPTO_ARC4
+	then
+		eerror ""
+		eerror "${P} requires support for ARC4 cipher algorithm (CONFIG_CRYPTO_ARC4)"
+		eerror "in the kernel."
+		DIE=1
+	fi
+
+	if ! kernel-mod_configoption_present CRYPTO_MICHAEL_MIC
+	then
+		eerror ""
+		eerror "${P} requires support for Michael MIC keyed digest algorithm"
+		eerror "(CONFIG_CRYPTO_MICHAEL_MIC) in the kernel."
+		DIE=1
+	fi
+
+	if ! kernel-mod_configoption_present CRYPTO_AES_586 && ! kernel-mod_configoption_present CRYPTO_AES
+	then
+		eerror ""
+		eerror "${P} requires support for AES cipher algorithms (i586)"
+		eerror "(CONFIG_CRYPTO_AES_586) in the kernel."
+		eerror ""
+		eerror "This is called CONFIG_CRYPTO_AES in kernels prior to 2.6.8."
+		DIE=1
+	fi
+
+	if ! kernel-mod_configoption_present FW_LOADER
+	then
+		eerror ""
+		eerror "${P} requires Hotplug firmware loading support (CONFIG_FW_LOADER)"
+		eerror "in the kernel."
+		DIE=1
+	fi
+
+	if ! kernel-mod_configoption_present CRC32
+	then
+		eerror ""
+		eerror "${P} requires support for CRC32 functions (CONFIG_CRC32) in the"
+		eerror "kernel."
+		DIE=1
+	fi
+
+	kernel-mod_check_modules_supported
+
+	if [ $DIE -eq 1 ]
+	then
+		eerror ""
+		die "You kernel is missing the required option(s) listed above."
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+
+	if kernel-mod_is_2_4_kernel
+	then
+		cd ${S}
+		epatch ${WORKDIR}/${P}-2.4-v9.patch
+	fi
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-wpa_eapol_fix.patch
+	epatch ${FILESDIR}/${P}-ieee80211_scan_age.2.patch
+	epatch ${FILESDIR}/${P}-2.6.10-susp.2.patch
+
+	einfo "Patching Makefile to enable WPA"
+	sed -i "s:^# CONFIG_IEEE80211_WPA=:CONFIG_IEEE80211_WPA=:" \
+		${S}/Makefile
+
+	# let pkg_postinst() handle depmod
+	sed -i "s:/sbin/depmod -a::" ${S}/Makefile
+
+	kernel-mod_getversion
+
+	if [ ${KV_MINOR} -gt 5 ] && [ ${KV_PATCH} -gt 5 ]
+	then
+		sed -i 's:SUBDIRS=:M=:g' ${S}/Makefile
+	fi
+}
+
+src_compile() {
+	set_arch_to_kernel
+
+	emake KSRC=${ROOT}/usr/src/linux all || die
+}
+
+src_install() {
+	set_arch_to_kernel
+
+	emake KSRC=${ROOT}/usr/src/linux KMISC=${D}/lib/modules/${KV}/net install || die
+
+	set_arch_to_portage
+
+	dodoc ISSUES README.ipw2100 CHANGES LICENSE
+
+	insinto /lib/firmware
+	doins ${WORKDIR}/${PN}-${FW_VERSION}.fw
+	doins ${WORKDIR}/${PN}-${FW_VERSION}-p.fw
+	doins ${WORKDIR}/${PN}-${FW_VERSION}-i.fw
+	newins ${WORKDIR}/LICENSE ${PN}-${FW_VERSION}-LICENSE
+
+	# Create symbolic links for old (<=hotplug-20040920) firmware location
+	# See bug #65059
+	dodir /usr/lib/hotplug/firmware
+	dosym /lib/firmware/${PN}-${FW_VERSION}.fw      /usr/lib/hotplug/firmware/${PN}-${FW_VERSION}.fw
+	dosym /lib/firmware/${PN}-${FW_VERSION}-p.fw    /usr/lib/hotplug/firmware/${PN}-${FW_VERSION}-p.fw
+	dosym /lib/firmware/${PN}-${FW_VERSION}-i.fw    /usr/lib/hotplug/firmware/${PN}-${FW_VERSION}-i.fw
+	dosym /lib/firmware/${PN}-${FW_VERSION}-LICENSE /usr/lib/hotplug/firmware/${PN}-${FW_VERSION}-LICENSE
+}
+
+pkg_postinst() {
+	einfo "Checking kernel module dependencies"
+	test -r "${ROOT}/usr/src/linux/System.map" && \
+		depmod -ae -F "${ROOT}/usr/src/linux/System.map" -b "${ROOT}" -r ${KV}
+}
diff --git a/net-wireless/ipw2100/ipw2100-1.0.0-r1.ebuild b/net-wireless/ipw2100/ipw2100-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..36eae1d780d2
--- /dev/null
+++ b/net-wireless/ipw2100/ipw2100-1.0.0-r1.ebuild
@@ -0,0 +1,148 @@
+# 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.0-r1.ebuild,v 1.1 2005/01/02 15:17:24 brix Exp $
+
+inherit kernel-mod eutils
+
+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
+		mirror://gentoo/${PN}-fw-${FW_VERSION}.tgz"
+
+LICENSE="GPL-2 ipw2100-fw"
+SLOT="0"
+KEYWORDS="~x86"
+
+IUSE=""
+DEPEND="virtual/linux-sources
+		!net-wireless/ipw2200
+		sys-apps/sed"
+RDEPEND=">=sys-apps/hotplug-20030805-r2
+		>=net-wireless/wireless-tools-27_pre23"
+
+pkg_setup() {
+	local DIE=0
+
+	if kernel-mod_is_2_4_kernel
+	then
+		die "${P} does not support building against kernel 2.4.x"
+	fi
+
+	if ! kernel-mod_configoption_present NET_RADIO
+	then
+		eerror ""
+		eerror "${P} requires support for Wireless LAN drivers (non-hamradio) &"
+		eerror "Wireless Extensions (CONFIG_NET_RADIO) in the kernel."
+		DIE=1
+	fi
+
+	if ! kernel-mod_configoption_present CRYPTO_ARC4
+	then
+		eerror ""
+		eerror "${P} requires support for ARC4 cipher algorithm (CONFIG_CRYPTO_ARC4)"
+		eerror "in the kernel."
+		DIE=1
+	fi
+
+	if ! kernel-mod_configoption_present CRYPTO_MICHAEL_MIC
+	then
+		eerror ""
+		eerror "${P} requires support for Michael MIC keyed digest algorithm"
+		eerror "(CONFIG_CRYPTO_MICHAEL_MIC) in the kernel."
+		DIE=1
+	fi
+
+	if ! kernel-mod_configoption_present CRYPTO_AES_586 && ! kernel-mod_configoption_present CRYPTO_AES
+	then
+		eerror ""
+		eerror "${P} requires support for AES cipher algorithms (i586)"
+		eerror "(CONFIG_CRYPTO_AES_586) in the kernel."
+		eerror ""
+		eerror "This is called CONFIG_CRYPTO_AES in kernels prior to 2.6.8."
+		DIE=1
+	fi
+
+	if ! kernel-mod_configoption_present FW_LOADER
+	then
+		eerror ""
+		eerror "${P} requires Hotplug firmware loading support (CONFIG_FW_LOADER)"
+		eerror "in the kernel."
+		DIE=1
+	fi
+
+	if ! kernel-mod_configoption_present CRC32
+	then
+		eerror ""
+		eerror "${P} requires support for CRC32 functions (CONFIG_CRC32) in the"
+		eerror "kernel."
+		DIE=1
+	fi
+
+	kernel-mod_check_modules_supported
+
+	if [ $DIE -eq 1 ]
+	then
+		eerror ""
+		die "You kernel is missing the required option(s) listed above."
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-2.6.10-susp.patch
+
+	einfo "Patching Makefile to enable WPA"
+	sed -i "s:^# CONFIG_IEEE80211_WPA=:CONFIG_IEEE80211_WPA=:" \
+		${S}/Makefile
+
+	# let pkg_postinst() handle depmod
+	sed -i "s:/sbin/depmod -a::" ${S}/Makefile
+
+	kernel-mod_getversion
+
+	if [ ${KV_MINOR} -gt 5 ] && [ ${KV_PATCH} -gt 5 ]
+	then
+		sed -i 's:SUBDIRS=:M=:g' ${S}/Makefile
+	fi
+}
+
+src_compile() {
+	set_arch_to_kernel
+
+	emake KSRC=${ROOT}/usr/src/linux all || die
+}
+
+src_install() {
+	set_arch_to_kernel
+
+	emake KSRC=${ROOT}/usr/src/linux KMISC=${D}/lib/modules/${KV}/net install || die
+
+	set_arch_to_portage
+
+	dodoc ISSUES README.ipw2100 CHANGES LICENSE
+
+	insinto /lib/firmware
+	doins ${WORKDIR}/${PN}-${FW_VERSION}.fw
+	doins ${WORKDIR}/${PN}-${FW_VERSION}-p.fw
+	doins ${WORKDIR}/${PN}-${FW_VERSION}-i.fw
+	newins ${WORKDIR}/LICENSE ${PN}-${FW_VERSION}-LICENSE
+
+	# Create symbolic links for old (<=hotplug-20040920) firmware location
+	# See bug #65059
+	dodir /usr/lib/hotplug/firmware
+	dosym /lib/firmware/${PN}-${FW_VERSION}.fw      /usr/lib/hotplug/firmware/${PN}-${FW_VERSION}.fw
+	dosym /lib/firmware/${PN}-${FW_VERSION}-p.fw    /usr/lib/hotplug/firmware/${PN}-${FW_VERSION}-p.fw
+	dosym /lib/firmware/${PN}-${FW_VERSION}-i.fw    /usr/lib/hotplug/firmware/${PN}-${FW_VERSION}-i.fw
+	dosym /lib/firmware/${PN}-${FW_VERSION}-LICENSE /usr/lib/hotplug/firmware/${PN}-${FW_VERSION}-LICENSE
+}
+
+pkg_postinst() {
+	einfo "Checking kernel module dependencies"
+	test -r "${ROOT}/usr/src/linux/System.map" && \
+		depmod -ae -F "${ROOT}/usr/src/linux/System.map" -b "${ROOT}" -r ${KV}
+}
diff --git a/net-wireless/ipw2100/ipw2100-1.0.0.ebuild b/net-wireless/ipw2100/ipw2100-1.0.0.ebuild
index f4793ff8121e..34f9e43e2542 100644
--- a/net-wireless/ipw2100/ipw2100-1.0.0.ebuild
+++ b/net-wireless/ipw2100/ipw2100-1.0.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.0.ebuild,v 1.1 2004/11/15 19:45:29 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ipw2100-1.0.0.ebuild,v 1.2 2005/01/02 15:17:24 brix Exp $
 
 inherit kernel-mod eutils
 
diff --git a/net-wireless/ipw2100/ipw2100-1.0.1-r1.ebuild b/net-wireless/ipw2100/ipw2100-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..536cee64338d
--- /dev/null
+++ b/net-wireless/ipw2100/ipw2100-1.0.1-r1.ebuild
@@ -0,0 +1,151 @@
+# 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.1-r1.ebuild,v 1.1 2005/01/02 15:17:24 brix Exp $
+
+inherit kernel-mod eutils
+
+FW_VERSION="1.3"
+PATCH_2_4_VERSION="1"
+
+DESCRIPTION="Driver for the Intel PRO/Wireless 2100 3B miniPCI adapter"
+
+HOMEPAGE="http://ipw2100.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz
+		mirror://gentoo/${PN}-fw-${FW_VERSION}.tgz
+		mirror://gentoo/${P}-2.4-v${PATCH_2_4_VERSION}.patch.gz"
+
+LICENSE="GPL-2 ipw2100-fw"
+SLOT="0"
+KEYWORDS="~x86"
+
+IUSE=""
+DEPEND="virtual/linux-sources
+		!net-wireless/ipw2200
+		sys-apps/sed"
+RDEPEND=">=sys-apps/hotplug-20030805-r2
+		>=net-wireless/wireless-tools-27_pre23"
+
+pkg_setup() {
+	local DIE=0
+
+	if ! kernel-mod_configoption_present NET_RADIO
+	then
+		eerror ""
+		eerror "${P} requires support for Wireless LAN drivers (non-hamradio) &"
+		eerror "Wireless Extensions (CONFIG_NET_RADIO) in the kernel."
+		DIE=1
+	fi
+
+	if ! kernel-mod_configoption_present CRYPTO_ARC4
+	then
+		eerror ""
+		eerror "${P} requires support for ARC4 cipher algorithm (CONFIG_CRYPTO_ARC4)"
+		eerror "in the kernel."
+		DIE=1
+	fi
+
+	if ! kernel-mod_configoption_present CRYPTO_MICHAEL_MIC
+	then
+		eerror ""
+		eerror "${P} requires support for Michael MIC keyed digest algorithm"
+		eerror "(CONFIG_CRYPTO_MICHAEL_MIC) in the kernel."
+		DIE=1
+	fi
+
+	if ! kernel-mod_configoption_present CRYPTO_AES_586 && ! kernel-mod_configoption_present CRYPTO_AES
+	then
+		eerror ""
+		eerror "${P} requires support for AES cipher algorithms (i586)"
+		eerror "(CONFIG_CRYPTO_AES_586) in the kernel."
+		eerror ""
+		eerror "This is called CONFIG_CRYPTO_AES in kernels prior to 2.6.8."
+		DIE=1
+	fi
+
+	if ! kernel-mod_configoption_present FW_LOADER
+	then
+		eerror ""
+		eerror "${P} requires Hotplug firmware loading support (CONFIG_FW_LOADER)"
+		eerror "in the kernel."
+		DIE=1
+	fi
+
+	if ! kernel-mod_configoption_present CRC32
+	then
+		eerror ""
+		eerror "${P} requires support for CRC32 functions (CONFIG_CRC32) in the"
+		eerror "kernel."
+		DIE=1
+	fi
+
+	kernel-mod_check_modules_supported
+
+	if [ $DIE -eq 1 ]
+	then
+		eerror ""
+		die "You kernel is missing the required option(s) listed above."
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-2.6.10-susp.patch
+
+	if kernel-mod_is_2_4_kernel
+	then
+		cd ${S}
+		epatch ${WORKDIR}/${P}-2.4-v${PATCH_2_4_VERSION}.patch
+	fi
+
+	einfo "Patching Makefile to enable WPA"
+	sed -i "s:^# CONFIG_IEEE80211_WPA=:CONFIG_IEEE80211_WPA=:" \
+		${S}/Makefile
+
+	# let pkg_postinst() handle depmod
+	sed -i "s:/sbin/depmod -a::" ${S}/Makefile
+
+	kernel-mod_getversion
+
+	if [ ${KV_MINOR} -gt 5 ] && [ ${KV_PATCH} -gt 5 ]
+	then
+		sed -i 's:SUBDIRS=:M=:g' ${S}/Makefile
+	fi
+}
+
+src_compile() {
+	set_arch_to_kernel
+
+	emake KSRC=${ROOT}/usr/src/linux all || die
+}
+
+src_install() {
+	set_arch_to_kernel
+
+	emake KSRC=${ROOT}/usr/src/linux KMISC=${D}/lib/modules/${KV}/net install || die
+
+	set_arch_to_portage
+
+	dodoc ISSUES README.ipw2100 CHANGES LICENSE
+
+	insinto /lib/firmware
+	doins ${WORKDIR}/${PN}-${FW_VERSION}.fw
+	doins ${WORKDIR}/${PN}-${FW_VERSION}-p.fw
+	doins ${WORKDIR}/${PN}-${FW_VERSION}-i.fw
+	newins ${WORKDIR}/LICENSE ${PN}-${FW_VERSION}-LICENSE
+
+	# Create symbolic links for old (<=hotplug-20040920) firmware location
+	# See bug #65059
+	dodir /usr/lib/hotplug/firmware
+	dosym /lib/firmware/${PN}-${FW_VERSION}.fw      /usr/lib/hotplug/firmware/${PN}-${FW_VERSION}.fw
+	dosym /lib/firmware/${PN}-${FW_VERSION}-p.fw    /usr/lib/hotplug/firmware/${PN}-${FW_VERSION}-p.fw
+	dosym /lib/firmware/${PN}-${FW_VERSION}-i.fw    /usr/lib/hotplug/firmware/${PN}-${FW_VERSION}-i.fw
+	dosym /lib/firmware/${PN}-${FW_VERSION}-LICENSE /usr/lib/hotplug/firmware/${PN}-${FW_VERSION}-LICENSE
+}
+
+pkg_postinst() {
+	einfo "Checking kernel module dependencies"
+	test -r "${ROOT}/usr/src/linux/System.map" && \
+		depmod -ae -F "${ROOT}/usr/src/linux/System.map" -b "${ROOT}" -r ${KV}
+}
diff --git a/net-wireless/ipw2100/ipw2100-1.0.1.ebuild b/net-wireless/ipw2100/ipw2100-1.0.1.ebuild
index 8f0e5e52d5ac..e25979e2b37d 100644
--- a/net-wireless/ipw2100/ipw2100-1.0.1.ebuild
+++ b/net-wireless/ipw2100/ipw2100-1.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.1.ebuild,v 1.2 2004/11/20 17:41:24 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ipw2100-1.0.1.ebuild,v 1.3 2005/01/02 15:17:24 brix Exp $
 
 inherit kernel-mod eutils
 
diff --git a/net-wireless/ipw2100/ipw2100-1.0.2-r1.ebuild b/net-wireless/ipw2100/ipw2100-1.0.2-r1.ebuild
new file mode 100644
index 000000000000..f801630e51b3
--- /dev/null
+++ b/net-wireless/ipw2100/ipw2100-1.0.2-r1.ebuild
@@ -0,0 +1,146 @@
+# 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.2-r1.ebuild,v 1.1 2005/01/02 15:17:24 brix Exp $
+
+inherit kernel-mod eutils
+
+FW_VERSION="1.3"
+PATCH_2_4_VERSION="1"
+
+DESCRIPTION="Driver for the Intel PRO/Wireless 2100 3B miniPCI adapter"
+
+HOMEPAGE="http://ipw2100.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz
+		mirror://gentoo/${PN}-fw-${FW_VERSION}.tgz
+		mirror://gentoo/${P}-2.4-v${PATCH_2_4_VERSION}.patch.gz"
+
+LICENSE="GPL-2 ipw2100-fw"
+SLOT="0"
+KEYWORDS="~x86"
+
+IUSE=""
+DEPEND="virtual/linux-sources
+		!net-wireless/ipw2200
+		sys-apps/sed"
+RDEPEND=">=sys-apps/hotplug-20040923
+		>=net-wireless/wireless-tools-27_pre23"
+
+pkg_setup() {
+	local DIE=0
+
+	if ! kernel-mod_configoption_present NET_RADIO
+	then
+		eerror ""
+		eerror "${P} requires support for Wireless LAN drivers (non-hamradio) &"
+		eerror "Wireless Extensions (CONFIG_NET_RADIO) in the kernel."
+		DIE=1
+	fi
+
+	if ! kernel-mod_configoption_present CRYPTO_ARC4
+	then
+		eerror ""
+		eerror "${P} requires support for ARC4 cipher algorithm (CONFIG_CRYPTO_ARC4)"
+		eerror "in the kernel."
+		DIE=1
+	fi
+
+	if ! kernel-mod_configoption_present CRYPTO_MICHAEL_MIC
+	then
+		eerror ""
+		eerror "${P} requires support for Michael MIC keyed digest algorithm"
+		eerror "(CONFIG_CRYPTO_MICHAEL_MIC) in the kernel."
+		DIE=1
+	fi
+
+	if ! kernel-mod_configoption_present CRYPTO_AES_586 && ! kernel-mod_configoption_present CRYPTO_AES
+	then
+		eerror ""
+		eerror "${P} requires support for AES cipher algorithms (i586)"
+		eerror "(CONFIG_CRYPTO_AES_586) in the kernel."
+		eerror ""
+		eerror "This is called CONFIG_CRYPTO_AES in kernels prior to 2.6.8."
+		DIE=1
+	fi
+
+	if ! kernel-mod_configoption_present FW_LOADER
+	then
+		eerror ""
+		eerror "${P} requires Hotplug firmware loading support (CONFIG_FW_LOADER)"
+		eerror "in the kernel."
+		DIE=1
+	fi
+
+	if ! kernel-mod_configoption_present CRC32
+	then
+		eerror ""
+		eerror "${P} requires support for CRC32 functions (CONFIG_CRC32) in the"
+		eerror "kernel."
+		DIE=1
+	fi
+
+	kernel-mod_check_modules_supported
+
+	if [ $DIE -eq 1 ]
+	then
+		eerror ""
+		die "You kernel is missing the required option(s) listed above."
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-2.6.10-susp.patch
+
+	if kernel-mod_is_2_4_kernel
+	then
+		cd ${S}
+		epatch ${WORKDIR}/${P}-2.4-v${PATCH_2_4_VERSION}.patch
+	fi
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-set_security.patch
+
+	einfo "Patching Makefile to enable WPA"
+	sed -i "s:^# CONFIG_IEEE80211_WPA=:CONFIG_IEEE80211_WPA=:" \
+		${S}/Makefile
+
+	# let pkg_postinst() handle depmod
+	sed -i "s:/sbin/depmod -a::" ${S}/Makefile
+
+	kernel-mod_getversion
+
+	if [ ${KV_MINOR} -gt 5 ] && [ ${KV_PATCH} -gt 5 ]
+	then
+		sed -i 's:SUBDIRS=:M=:g' ${S}/Makefile
+	fi
+}
+
+src_compile() {
+	set_arch_to_kernel
+
+	emake KSRC=${ROOT}/usr/src/linux all || die
+}
+
+src_install() {
+	set_arch_to_kernel
+
+	emake KSRC=${ROOT}/usr/src/linux KMISC=${D}/lib/modules/${KV}/net install || die
+
+	set_arch_to_portage
+
+	dodoc ISSUES README.ipw2100 CHANGES LICENSE
+
+	insinto /lib/firmware
+	doins ${WORKDIR}/${PN}-${FW_VERSION}.fw
+	doins ${WORKDIR}/${PN}-${FW_VERSION}-p.fw
+	doins ${WORKDIR}/${PN}-${FW_VERSION}-i.fw
+	newins ${WORKDIR}/LICENSE ${PN}-${FW_VERSION}-LICENSE
+}
+
+pkg_postinst() {
+	einfo "Checking kernel module dependencies"
+	test -r "${ROOT}/usr/src/linux/System.map" && \
+		depmod -ae -F "${ROOT}/usr/src/linux/System.map" -b "${ROOT}" -r ${KV}
+}
diff --git a/net-wireless/ipw2100/ipw2100-1.0.2.ebuild b/net-wireless/ipw2100/ipw2100-1.0.2.ebuild
index cc74e3ff520b..fd3b82d4b71e 100644
--- a/net-wireless/ipw2100/ipw2100-1.0.2.ebuild
+++ b/net-wireless/ipw2100/ipw2100-1.0.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.2.ebuild,v 1.2 2004/12/16 08:25:52 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ipw2100-1.0.2.ebuild,v 1.3 2005/01/02 15:17:24 brix Exp $
 
 inherit kernel-mod eutils