Allow compiling against sys-kernel/suspend2-sources-2.6.13.

Package-Manager: portage-2.0.51.22-r2

5 files changed, 111 insertions, 2 deletions

diff --git a/net-wireless/ipw2100/ChangeLog b/net-wireless/ipw2100/ChangeLog
index c1085c6c6af8..18485dda5023 100644
--- a/net-wireless/ipw2100/ChangeLog
+++ b/net-wireless/ipw2100/ChangeLog
@@ -1,6 +1,12 @@
 # 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.81 2005/08/16 12:31:36 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ChangeLog,v 1.82 2005/08/29 20:05:01 brix Exp $
+
+*ipw2100-1.1.2-r2 (29 Aug 2005)
+
+  29 Aug 2005; Henrik Brix Andersen <brix@gentoo.org>
+  +files/ipw2100-1.1.2-suspend2.patch, +ipw2100-1.1.2-r2.ebuild:
+  Allow compiling against sys-kernel/suspend2-sources-2.6.13.
 
   16 Aug 2005; Henrik Brix Andersen <brix@gentoo.org>
   ipw2100-1.1.2-r1.ebuild:
diff --git a/net-wireless/ipw2100/files/digest-ipw2100-1.1.2-r2 b/net-wireless/ipw2100/files/digest-ipw2100-1.1.2-r2
new file mode 100644
index 000000000000..4b331357f2ff
--- /dev/null
+++ b/net-wireless/ipw2100/files/digest-ipw2100-1.1.2-r2
@@ -0,0 +1 @@
+MD5 604d44b15a0e0653897ca323310253dc ipw2100-1.1.2.tgz 99001
diff --git a/net-wireless/ipw2100/files/ipw2100-1.1.2-suspend2.patch b/net-wireless/ipw2100/files/ipw2100-1.1.2-suspend2.patch
new file mode 100644
index 000000000000..0b3ca2a88e5e
--- /dev/null
+++ b/net-wireless/ipw2100/files/ipw2100-1.1.2-suspend2.patch
@@ -0,0 +1,16 @@
+diff -urp ipw2100-1.1.2/ipw2100.c ipw2100-1.1.2-suspend2/ipw2100.c
+--- ipw2100-1.1.2/ipw2100.c	2005-07-13 20:59:37.000000000 +0200
++++ ipw2100-1.1.2-suspend2/ipw2100.c	2005-08-29 18:19:16.000000000 +0200
+@@ -6150,12 +6150,7 @@ static struct net_device *ipw2100_alloc_
+ 	INIT_LIST_HEAD(&priv->fw_pend_list);
+ 	INIT_STAT(&priv->fw_pend_stat);
+ 
+-
+-#ifdef PF_SYNCTHREAD
+-	priv->workqueue = create_workqueue(DRV_NAME, 0);
+-#else
+ 	priv->workqueue = create_workqueue(DRV_NAME);
+-#endif
+ 	INIT_WORK(&priv->reset_work,
+ 		  (void (*)(void *))ipw2100_reset_adapter, priv);
+ 	INIT_WORK(&priv->security_work,
diff --git a/net-wireless/ipw2100/ipw2100-1.1.2-r2.ebuild b/net-wireless/ipw2100/ipw2100-1.1.2-r2.ebuild
new file mode 100644
index 000000000000..831aece08ce4
--- /dev/null
+++ b/net-wireless/ipw2100/ipw2100-1.1.2-r2.ebuild
@@ -0,0 +1,86 @@
+# 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.2-r2.ebuild,v 1.1 2005/08/29 20:05:01 brix Exp $
+
+inherit eutils linux-mod
+
+# The following works with both pre-releases and releases
+MY_P=${P/_/-}
+S=${WORKDIR}/${MY_P}
+
+IEEE80211_VERSION="1.0.3"
+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}/${MY_P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+
+IUSE="debug"
+DEPEND=">=net-wireless/ieee80211-${IEEE80211_VERSION}"
+RDEPEND="${DEPEND}
+		=net-wireless/ipw2100-firmware-${FW_VERSION}
+		>=net-wireless/wireless-tools-27_pre23"
+
+BUILD_TARGETS="all"
+MODULE_NAMES="ipw2100(net/wireless:)"
+MODULESD_IPW2100_DOCS="README.ipw2100"
+
+CONFIG_CHECK="NET_RADIO FW_LOADER"
+ERROR_NET_RADIO="${P} requires support for Wireless LAN drivers (non-hamradio) & Wireless Extensions (CONFIG_NET_RADIO)."
+ERROR_FW_LOADER="${P} requires Hotplug firmware loading support (CONFIG_FW_LOADER)."
+
+pkg_setup() {
+	linux-mod_pkg_setup
+
+	if kernel_is 2 4; then
+		die "${P} does not support building against kernel 2.4.x"
+	fi
+
+	BUILD_PARAMS="KSRC=${KV_DIR} KSRC_OUTPUT=${KV_OUT_DIR} IEEE80211_INC=/usr/include"
+}
+
+src_unpack() {
+	local debug="n"
+
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-ieee80211-1.0.3.patch
+	epatch ${FILESDIR}/${P}-suspend2.patch
+
+	use debug && debug="y"
+	sed -i -e "s:^\(CONFIG_IPW_DEBUG\)=.*:\1=$debug:" ${S}/Makefile
+}
+
+src_compile() {
+	einfo
+	einfo "You may safely ignore any errors from compilation that contain"
+	einfo "warnings about undefined references to the ieee80211 subsystem."
+	einfo
+
+	linux-mod_src_compile
+}
+
+src_install() {
+	linux-mod_src_install
+
+	dodoc CHANGES
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+
+	if [ -f /lib/modules/${KV_FULL}/net/${PN}.ko ]; then
+		einfo
+		einfo "Modules from an earlier installation detected. You will need to manually"
+		einfo "remove those modules by running the following commands:"
+		einfo "  # rm -f /lib/modules/${KV_FULL}/net/${PN}.ko"
+		einfo "  # rm -f /lib/modules/${KV_FULL}/net/ieee80211*.ko"
+		einfo "  # depmod -a"
+		einfo
+	fi
+}
diff --git a/net-wireless/ipw2200/Manifest b/net-wireless/ipw2200/Manifest
index 8bab478aa937..7057b65c1547 100644
--- a/net-wireless/ipw2200/Manifest
+++ b/net-wireless/ipw2200/Manifest
@@ -3,7 +3,7 @@ MD5 7afca8db2613b9fc32d5f7005b4db15d ipw2200-1.0.6.ebuild 2158
 MD5 a1d82c4728a3f608b762fe63c4910f42 ipw2200-1.0.1.ebuild 2488
 MD5 b2138b76ba85eeea301d8fa9f72470df ipw2200-1.0.3.ebuild 2488
 MD5 8a1b21691e17dc6de38c7238cd4e4522 ipw2200-1.0.5.ebuild 2145
-MD5 9988232d1056d06428dcd595af12385d ipw2200-1.0.6-r1.ebuild 2259
+MD5 7453a3247e41a7bf8c6e939cf55c45f0 ipw2200-1.0.6-r1.ebuild 2260
 MD5 c9ecaa12f13b8d289f63ed4fb95744f8 ChangeLog 7186
 MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
 MD5 2dc4d1d726fc4dce22dee416d6028353 files/ipw2200-1.0.4-is_multicast_ether_addr.patch 647