Added patch from upstream for compiling against net-wireless/ieee80211-1.0.3.

(Portage version: 2.0.51.22-r1)

5 files changed, 108 insertions, 2 deletions

diff --git a/net-wireless/ipw2100/ChangeLog b/net-wireless/ipw2100/ChangeLog
index e2e3f5580b4c..d56084851125 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.79 2005/07/14 07:13:57 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ChangeLog,v 1.80 2005/07/18 13:35:00 brix Exp $
+
+*ipw2100-1.1.2-r1 (18 Jul 2005)
+
+  18 Jul 2005; <brix@gentoo.org> +files/ipw2100-1.1.2-ieee80211-1.0.3.patch,
+  +ipw2100-1.1.2-r1.ebuild:
+  Added patch from upstream for compiling against net-wireless/ieee80211-1.0.3.
 
 *ipw2100-1.1.2 (14 Jul 2005)
 
diff --git a/net-wireless/ipw2100/Manifest b/net-wireless/ipw2100/Manifest
index 85397637582a..02d4dc74fadb 100644
--- a/net-wireless/ipw2100/Manifest
+++ b/net-wireless/ipw2100/Manifest
@@ -1,7 +1,8 @@
 MD5 b127f38ac73f49d85ec8df711c7f0b83 ipw2100-1.1.0.ebuild 2303
 MD5 a676f6646db638eab14c1a2b811ddefb ipw2100-1.1.2.ebuild 2124
+MD5 f8adcea0fcdb1879b2e357ee5210be3e ipw2100-1.1.2-r1.ebuild 2087
 MD5 b798c8a8a65771fb6b6bb0414f4f2517 ipw2100-1.1.1.ebuild 2124
-MD5 97de5f12b9eee9f5fc94aac550c5d993 ChangeLog 14937
+MD5 bbd61a6287abb29a4afa97b663ce93d3 ChangeLog 15156
 MD5 172db10566470c8f64b5911609a8e5f9 metadata.xml 318
 MD5 c32c1e1a4a1d8797a8663db73c4cebe4 ipw2100-1.0.5.ebuild 2296
 MD5 5fb2369d48eb758371baed2ff166ce10 files/ipw2100-1.1.0-suspend2.patch 1173
@@ -11,4 +12,6 @@ MD5 8c080b5455def312dc8b8fb2da3ffa12 files/digest-ipw2100-1.1.0 62
 MD5 b42adf38a171429000f5d3e54bc190c4 files/digest-ipw2100-1.1.1 61
 MD5 b99dfc5774c917655aa0b61b35a8e985 files/digest-ipw2100-1.1.2 61
 MD5 45b8329213881abb9eb1569b92b1c080 files/ipw2100-1.0.5-suspend2.patch 1173
+MD5 1d5956b3a796c4efc0ff535405df4e66 files/ipw2100-1.1.2-ieee80211-1.0.3.patch 437
+MD5 b99dfc5774c917655aa0b61b35a8e985 files/digest-ipw2100-1.1.2-r1 61
 MD5 963a9937088ce7886c88a7553921d142 files/ipw2100-1.1.0-is_multicast_ether_addr.patch 695
diff --git a/net-wireless/ipw2100/files/digest-ipw2100-1.1.2-r1 b/net-wireless/ipw2100/files/digest-ipw2100-1.1.2-r1
new file mode 100644
index 000000000000..4b331357f2ff
--- /dev/null
+++ b/net-wireless/ipw2100/files/digest-ipw2100-1.1.2-r1
@@ -0,0 +1 @@
+MD5 604d44b15a0e0653897ca323310253dc ipw2100-1.1.2.tgz 99001
diff --git a/net-wireless/ipw2100/files/ipw2100-1.1.2-ieee80211-1.0.3.patch b/net-wireless/ipw2100/files/ipw2100-1.1.2-ieee80211-1.0.3.patch
new file mode 100644
index 000000000000..56927469bc0f
--- /dev/null
+++ b/net-wireless/ipw2100/files/ipw2100-1.1.2-ieee80211-1.0.3.patch
@@ -0,0 +1,11 @@
+--- ipw2100.h	2005-07-14 10:23:54.000000000 -0500
++++ ipw2100.h	2005-07-15 10:43:54.598311608 -0500
+@@ -782,7 +786,7 @@ struct ipw2100_priv {
+ 
+ 
+ 
+-#define IPW_HEADER_802_11_SIZE		 sizeof(struct ieee80211_header_data)
++#define IPW_HEADER_802_11_SIZE		 sizeof(struct ieee80211_hdr_3addr)
+ #define IPW_MAX_80211_PAYLOAD_SIZE              2304U
+ #define IPW_MAX_802_11_PAYLOAD_LENGTH		2312
+ #define IPW_MAX_ACCEPTABLE_TX_FRAME_LENGTH	1536
diff --git a/net-wireless/ipw2100/ipw2100-1.1.2-r1.ebuild b/net-wireless/ipw2100/ipw2100-1.1.2-r1.ebuild
new file mode 100644
index 000000000000..18c703ee1e7d
--- /dev/null
+++ b/net-wireless/ipw2100/ipw2100-1.1.2-r1.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/ipw2100/ipw2100-1.1.2-r1.ebuild,v 1.1 2005/07/18 13:35:00 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
+
+	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
+}