Added patch from upstream.

(Portage version: 2.0.54)

5 files changed, 164 insertions, 2 deletions

diff --git a/net-wireless/ipw2100/ChangeLog b/net-wireless/ipw2100/ChangeLog
index a4764f73a256..38f676acb770 100644
--- a/net-wireless/ipw2100/ChangeLog
+++ b/net-wireless/ipw2100/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-wireless/ipw2100
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ChangeLog,v 1.97 2006/03/26 16:47:22 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ChangeLog,v 1.98 2006/04/14 11:13:05 brix Exp $
+
+*ipw2100-1.2.1-r1 (14 Apr 2006)
+
+  14 Apr 2006; Henrik Brix Andersen <brix@gentoo.org>
+  +files/ipw2100-1.2.1-cflags.patch, +ipw2100-1.2.1-r1.ebuild:
+  Added patch from upstream.
 
   26 Mar 2006; Henrik Brix Andersen <brix@gentoo.org> ipw2100-1.2.1.ebuild:
   Stable on x86.
diff --git a/net-wireless/ipw2100/Manifest b/net-wireless/ipw2100/Manifest
index aa2d5d8175f8..1fd8b47881fd 100644
--- a/net-wireless/ipw2100/Manifest
+++ b/net-wireless/ipw2100/Manifest
@@ -1,16 +1,19 @@
-MD5 ed7e91043148a4ff19748a96faf29a1e ChangeLog 18128
+MD5 c08728b35fa1d620daad732de7f2ea82 ChangeLog 18308
 MD5 a2710d2b53f18e1009a57175de157a6d files/digest-ipw2100-1.1.3 62
 MD5 130019ef74064b072c141fa049af835f files/digest-ipw2100-1.1.4 62
 MD5 d69f5fb05a014523977145698122527b files/digest-ipw2100-1.1.5 62
 MD5 d69f5fb05a014523977145698122527b files/digest-ipw2100-1.1.5-r1 62
 MD5 395f0df9b0f5a24f14faec7396eaedc2 files/digest-ipw2100-1.2.0 62
 MD5 9d6f6530388ce26964e63a00aa3d2a48 files/digest-ipw2100-1.2.1 62
+MD5 9d6f6530388ce26964e63a00aa3d2a48 files/digest-ipw2100-1.2.1-r1 62
 MD5 3c8b5ded879dc4ce3cd1a7bdc40b61a3 files/ipw2100-1.1.4-old_kernel_fix2.patch 2267
 MD5 aad064a04c398eb7ec70511704632992 files/ipw2100-1.1.5-debug.patch 2869
+MD5 3f437a010335dd4afb6c22bb04bfea09 files/ipw2100-1.2.1-cflags.patch 1750
 MD5 97d078d03bd32ae3d3e737865ac4a19b ipw2100-1.1.3.ebuild 2656
 MD5 df267499e0ff082857aa4f7384658808 ipw2100-1.1.4.ebuild 2723
 MD5 ff8d9323ccc70b8f87fff13d51816600 ipw2100-1.1.5-r1.ebuild 2717
 MD5 ddf1c33daf41c6a64b759115ce0f24fb ipw2100-1.1.5.ebuild 2657
 MD5 3b9de7301447c5d643653cfcc9a80212 ipw2100-1.2.0.ebuild 2662
+MD5 c7e76ce6aafaba112d7722a1a10f4ed1 ipw2100-1.2.1-r1.ebuild 2629
 MD5 159fb33cc70fed791c17ff90ecea9fd4 ipw2100-1.2.1.ebuild 2661
 MD5 172db10566470c8f64b5911609a8e5f9 metadata.xml 318
diff --git a/net-wireless/ipw2100/files/digest-ipw2100-1.2.1-r1 b/net-wireless/ipw2100/files/digest-ipw2100-1.2.1-r1
new file mode 100644
index 000000000000..8dc0c9a79268
--- /dev/null
+++ b/net-wireless/ipw2100/files/digest-ipw2100-1.2.1-r1
@@ -0,0 +1 @@
+MD5 9db50b836c63dc3a7e56653d2009717a ipw2100-1.2.1.tgz 106297
diff --git a/net-wireless/ipw2100/files/ipw2100-1.2.1-cflags.patch b/net-wireless/ipw2100/files/ipw2100-1.2.1-cflags.patch
new file mode 100644
index 000000000000..1dba47af13d1
--- /dev/null
+++ b/net-wireless/ipw2100/files/ipw2100-1.2.1-cflags.patch
@@ -0,0 +1,55 @@
+diff -u ipw2100-1.2.1/ipw2100.c ipw2100-1.2.1-cflags/ipw2100.c
+--- ipw2100-1.2.1/ipw2100.c	2006-02-21 19:46:17.000000000 +0100
++++ ipw2100-1.2.1-cflags/ipw2100.c	2006-04-04 18:07:42.000000000 +0200
+@@ -184,7 +184,9 @@
+ MODULE_AUTHOR(DRV_COPYRIGHT);
+ MODULE_LICENSE("GPL");
+ 
++#ifdef CONFIG_IPW2100_DEBUG
+ static int debug = 0;
++#endif
+ static int mode = 0;
+ static int channel = 0;
+ static int associate = 1;
+@@ -194,13 +196,17 @@
+ #endif
+ 
+ #include <linux/moduleparam.h>
++#ifdef CONFIG_IPW2100_DEBUG
+ module_param(debug, int, 0444);
++#endif
+ module_param(mode, int, 0444);
+ module_param(channel, int, 0444);
+ module_param(associate, int, 0444);
+ module_param(disable, int, 0444);
+ 
+-MODULE_PARM_DESC(debug, "debug level");
++#ifdef CONFIG_IPW2100_DEBUG
++MODULE_PARM_DESC(debug, "debug output mask");
++#endif
+ MODULE_PARM_DESC(mode, "network mode (0=BSS,1=IBSS,2=Monitor)");
+ MODULE_PARM_DESC(channel, "channel");
+ MODULE_PARM_DESC(associate, "auto associate when scanning (default on)");
+Only in ipw2100-1.2.1-cflags/: ipw2100.c~
+diff -u ipw2100-1.2.1/Makefile ipw2100-1.2.1-cflags/Makefile
+--- ipw2100-1.2.1/Makefile	2006-02-21 19:46:16.000000000 +0100
++++ ipw2100-1.2.1-cflags/Makefile	2006-04-04 18:03:09.000000000 +0200
+@@ -70,14 +70,11 @@
+ EXTRA_CFLAGS += -DCONFIG_PM
+ 
+ ifeq ($(EXTERNAL_BUILD),y)
+-ifdef CONFIG_IPW2100_DEBUG
+-EXTRA_CFLAGS += -DCONFIG_IPW2100_DEBUG=$(CONFIG_IPW2100_DEBUG)
++ifeq ($(CONFIG_IPW2100_DEBUG),y)
++EXTRA_CFLAGS += -DCONFIG_IPW2100_DEBUG
+ endif
+-ifdef CONFIG_IPW2100_MONITOR
+-EXTRA_CFLAGS += -DCONFIG_IPW2100_MONITOR=$(CONFIG_IPW2100_MONITOR)
+-endif
+-ifdef CONFIG_IPW_QOS
+-EXTRA_CFLAGS += -DCONFIG_IPW_QOS=$(CONFIG_IPW_QOS)
++ifeq ($(CONFIG_IPW2100_MONITOR),y)
++EXTRA_CFLAGS += -DCONFIG_IPW2100_MONITOR
+ endif
+ endif
+ 
diff --git a/net-wireless/ipw2100/ipw2100-1.2.1-r1.ebuild b/net-wireless/ipw2100/ipw2100-1.2.1-r1.ebuild
new file mode 100644
index 000000000000..d83aa20bcb6d
--- /dev/null
+++ b/net-wireless/ipw2100/ipw2100-1.2.1-r1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ipw2100-1.2.1-r1.ebuild,v 1.1 2006/04/14 11:13:05 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.1.12"
+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 !IPW2100"
+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)."
+ERROR_IPW2100="${P} requires the in-kernel version of the IPW2100 driver to be disabled (CONFIG_IPW2100)"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+
+	if kernel_is 2 4; then
+		die "${P} does not support building against kernel 2.4.x"
+	fi
+
+	if [[ ! -f ${ROOT}/lib/modules/${KV_FULL}/net/ieee80211/ieee80211.${KV_OBJ} ]]; then
+		eerror
+		eerror "Looks like you forgot to remerge net-wireless/ieee80211 after"
+		eerror "upgrading your kernel."
+		eerror
+		eerror "Hint: use sys-kernel/module-rebuild for keeping track of which"
+		eerror "modules needs to be remerged after a kernel upgrade."
+		eerror
+		die "${ROOT}/lib/modules/${KV_FULL}/net/ieee80211/ieee80211.${KV_OBJ} not found"
+	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}-cflags.patch
+
+	use debug && debug="y"
+	sed -i -e "s:^\(CONFIG_IPW2100_DEBUG\)=.*:\1=$debug:" ${S}/Makefile
+}
+
+src_compile() {
+	linux-mod_src_compile
+
+	einfo
+	einfo "You may safely ignore any warnings from above compilation about"
+	einfo "undefined references to the ieee80211 subsystem."
+	einfo
+}
+
+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
+}