Added 2.4 compile patch, fixed emake install and added symbolic links for new

5 files changed, 137 insertions, 2 deletions

diff --git a/net-wireless/ipw2100/ChangeLog b/net-wireless/ipw2100/ChangeLog
index 8f016fb377e8..cc30522c7862 100644
--- a/net-wireless/ipw2100/ChangeLog
+++ b/net-wireless/ipw2100/ChangeLog
@@ -1,6 +1,13 @@
 # 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.28 2004/09/29 20:04:57 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ChangeLog,v 1.29 2004/10/01 20:36:36 brix Exp $
+
+*ipw2100-0.55-r2 (01 Oct 2004)
+
+  01 Oct 2004; Henrik Brix Andersen <brix@gentoo.org>
+  +files/ipw2100-0.55-2.4.patch.gz, +ipw2100-0.55-r2.ebuild:
+  Added 2.4 compile patch, fixed emake install and added symbolic links for new
+  hotplug firmware location (bug #65059).
 
 *ipw2100-0.55-r1 (29 Sep 2004)
 
diff --git a/net-wireless/ipw2100/Manifest b/net-wireless/ipw2100/Manifest
index 19f66400d26f..4f635d0dcfde 100644
--- a/net-wireless/ipw2100/Manifest
+++ b/net-wireless/ipw2100/Manifest
@@ -6,9 +6,10 @@ MD5 bc62ac7fefdceafa5cb116627d0c1cb0 ipw2100-0.52.ebuild 2370
 MD5 c1821412a8df6f808806fcfed23b9558 ipw2100-0.48.ebuild 2134
 MD5 da1e52d1f749c685e506e86cd0ae5bc2 ipw2100-0.54.ebuild 2773
 MD5 aab8cce25eb67e7f98bb8139d17abb3c ipw2100-0.45.ebuild 2306
+MD5 bdb2218ec119cdce9c4d64a24d6fa86f ipw2100-0.55-r2.ebuild 3553
 MD5 60c860f649d9decb003e05d718275ea6 ipw2100-0.46-r1.ebuild 2437
 MD5 2d41d2e845e3dbe54f2667f4e96617b5 ipw2100-0.51.ebuild 2349
-MD5 6aed79e39279a522ff0bc77c2f71e476 ChangeLog 5904
+MD5 44f69e4d852ea98ac3d3185651341653 ChangeLog 6174
 MD5 6b9b3aeeb719bd5691f538b4e5c9fed8 ipw2100-0.49.ebuild 2338
 MD5 8a68b74057e911e6804f77dc21959e80 metadata.xml 282
 MD5 78f6d8f071cd7615df4ad78abf3e55d0 ipw2100-0.44.ebuild 2305
@@ -18,8 +19,10 @@ MD5 1cf135e6f2a48d58c39f62e3e49ccfd3 files/ipw2100-0.33-acpi-fix.diff 863
 MD5 15db5a26b062068727a810f0b88d2c2c files/ipw2100-0.38-makefile-1.diff 680
 MD5 20408aa8a5494274471367204c5f2caa files/ipw2100-0.38-makefile-2.diff 284
 MD5 1d1276f437b0101f8283429a0c048ec7 files/ipw2100-0.31-sched-fix.diff 1232
+MD5 5b48908c2b08136080603a2b629ba3ef files/ipw2100-0.55-2.4.patch.gz 11607
 MD5 bc734236706a08cefb81aeb4965455ff files/digest-ipw2100-0.46-r1 126
 MD5 b3a600a244bd8a64fd8ade3036a390e1 files/digest-ipw2100-0.55-r1 124
+MD5 b3a600a244bd8a64fd8ade3036a390e1 files/digest-ipw2100-0.55-r2 124
 MD5 0a8c00c1860d7bb54686e647740f23d0 files/ipw2100-0.55-modparam-perm.patch 769
 MD5 1ce1888cb1dcbc65bc76ba8f3f7875b9 files/ipw2100-0.55_manual-disable.patch 2898
 MD5 f9a4a4e4aacd5c115776d3ccc8333cab files/digest-ipw2100-0.41 123
diff --git a/net-wireless/ipw2100/files/digest-ipw2100-0.55-r2 b/net-wireless/ipw2100/files/digest-ipw2100-0.55-r2
new file mode 100644
index 000000000000..836f8c72dc3c
--- /dev/null
+++ b/net-wireless/ipw2100/files/digest-ipw2100-0.55-r2
@@ -0,0 +1,2 @@
+MD5 5675472dbfcd09ba2eed9c785038f815 ipw2100-0.55.tgz 129663
+MD5 46aa75bcda1a00efa841f9707bbbd113 ipw2100-fw-1.3.tgz 248471
diff --git a/net-wireless/ipw2100/files/ipw2100-0.55-2.4.patch.gz b/net-wireless/ipw2100/files/ipw2100-0.55-2.4.patch.gz
new file mode 100644
index 000000000000..07b5e12460b8
--- /dev/null
+++ b/net-wireless/ipw2100/files/ipw2100-0.55-2.4.patch.gz
diff --git a/net-wireless/ipw2100/ipw2100-0.55-r2.ebuild b/net-wireless/ipw2100/ipw2100-0.55-r2.ebuild
new file mode 100644
index 000000000000..3465c09e2a76
--- /dev/null
+++ b/net-wireless/ipw2100/ipw2100-0.55-r2.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ipw2100-0.55-r2.ebuild,v 1.1 2004/10/01 20:36:36 brix Exp $
+
+inherit kernel-mod eutils
+
+FW_VERSION="1.3"
+
+DESCRIPTION="Driver for the Intel Centrino wireless chipset"
+
+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="!net-wireless/ipw2200"
+RDEPEND=">=sys-apps/hotplug-20030805-r2
+	 >=net-wireless/wireless-tools-27_pre23"
+
+src_unpack() {
+	if ! egrep "^CONFIG_NET_RADIO=[ym]" ${ROOT}/usr/src/linux/.config >/dev/null
+	then
+		eerror ""
+		eerror "${PN} requires support for Wireless LAN drivers (non-hamradio) &"
+		eerror "Wireless Extensions in the kernel."
+		eerror ""
+		die "Wireless LAN support not detected."
+	fi
+	if ! egrep "^CONFIG_CRYPTO_ARC4=[ym]" ${ROOT}/usr/src/linux/.config >/dev/null
+	then
+		eerror ""
+		eerror "New versions of ${PN} require the ARC4 CryptoAPI module from"
+		eerror "the kernel."
+		eerror ""
+		die "ARC4 Crypto support not detected."
+	fi
+
+	if ! egrep "^CONFIG_FW_LOADER=[ym]" ${ROOT}/usr/src/linux/.config >/dev/null
+	then
+		eerror ""
+		eerror "New versions of ${PN} require firmware loader support from"
+		eerror "your kernel. This can be found in Device Drivers --> Generic"
+		eerror "Driver Support on 2.6 or in Library Routines on 2.4 kernels."
+		eerror ""
+		die "Firmware loading support not detected."
+	fi
+
+	if ! egrep "^CONFIG_CRC32=[ym]" ${ROOT}/usr/src/linux/.config >/dev/null
+	then
+		eerror ""
+		eerror "New versions of ${PN} require support for CRC32 in"
+		eerror "your kernel. This can be found in Library Routines in"
+		eerror "kernel configs."
+		eerror ""
+		die "CRC32 function support not detected."
+	fi
+
+	unpack ${A}
+
+	epatch ${FILESDIR}/ipw2100-0.55-2.4.patch.gz
+
+	cd ${S}
+	epatch ${FILESDIR}/ipw2100-0.55_manual-disable.patch
+	epatch ${FILESDIR}/ipw2100-0.55-modparam-perm.patch
+
+	einfo "Patching Makefile to enable WPA"
+	sed -i -e "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() {
+	if [ ${KV_MINOR} -gt 5 ] && [ ${KV_PATCH} -gt 5 ]
+	then
+		unset ARCH
+	fi
+
+	emake KSRC=${ROOT}/usr/src/linux all || die
+}
+
+src_install() {
+	if [ ${KV_MINOR} -gt 5 ] && [ ${KV_PATCH} -gt 5 ]
+	then
+		unset ARCH
+	fi
+
+	emake KSRC=${ROOT}/usr/src/linux KMISC=${D}/lib/modules/${KV}/net install || die
+
+	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}
+}