Version bump.

4 files changed, 136 insertions, 2 deletions

diff --git a/net-wireless/ipw2200/ChangeLog b/net-wireless/ipw2200/ChangeLog
index 3a277a6ddd4f..1b3f0c06db3c 100644
--- a/net-wireless/ipw2200/ChangeLog
+++ b/net-wireless/ipw2200/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-wireless/ipw2200
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2200/ChangeLog,v 1.9 2004/10/01 17:43:32 jbms Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2200/ChangeLog,v 1.10 2004/10/16 18:48:56 jbms Exp $
+
+*ipw2200-0.12 (16 Oct 2004)
+
+  16 Oct 2004; Jeremy Maitin-Shepard <jbms@gentoo.org> +ipw2200-0.12.ebuild:
+  Version bump. Firmware is now installed to /lib/firmware, with a symlink to
+  /usr/lib/hotplug/firmware, rather than the reverse. Resolves bug #67641.
 
 *ipw2200-0.11 (01 Oct 2004)
 
diff --git a/net-wireless/ipw2200/Manifest b/net-wireless/ipw2200/Manifest
index 4e8e51c51e76..5af78b589568 100644
--- a/net-wireless/ipw2200/Manifest
+++ b/net-wireless/ipw2200/Manifest
@@ -1,12 +1,13 @@
 MD5 f5b8b18f65282da1c2e011e7ac9a4816 ipw2200-0.8.ebuild 2710
 MD5 de516e64385db3ced64f2ec4861cdc38 ipw2200-0.3.ebuild 2129
+MD5 369c5ff45bb429862f90b87b8abf85c6 ipw2200-0.12.ebuild 3633
 MD5 e63f86f5a39d7f5c6b1f1c08790c9376 ipw2200-0.5.ebuild 2636
 MD5 7b9b63fe9b15540f7e7349b80761294d ipw2200-0.7.ebuild 2636
 MD5 e0d907bf16ff8360de006e279dc0d8b5 ipw2200-0.11.ebuild 3633
 MD5 6560f2c5f03b5d00cab56743f3cae61d ipw2200-0.4.ebuild 2525
 MD5 6bf446c6177f9a0e3a88e7450e6bea0e ipw2200-0.4-r1.ebuild 2639
 MD5 5a61bb208ed909f35cd0e72a387dade4 ipw2200-0.6.ebuild 2636
-MD5 27e47e7aeea8ce29451dc8cd64eaa8b4 ChangeLog 1952
+MD5 d4db9bd22140fc025b16de883f27928d ChangeLog 2212
 MD5 e33c43b256ce937ba82846532879e312 metadata.xml 219
 MD5 13bdb18aad2ee350659575449ba67113 files/digest-ipw2200-0.3 122
 MD5 4bf7fd9d6b68afc2a846b35e57bad566 files/digest-ipw2200-0.4 122
@@ -15,4 +16,5 @@ MD5 6cff0de0da9eee2345b4955c5ccf9ab7 files/digest-ipw2200-0.6 122
 MD5 373cecb0258af7f08eb59e3c9a2757e5 files/digest-ipw2200-0.7 122
 MD5 67d6cb99c9b5497da126f0a18b3909b7 files/digest-ipw2200-0.8 123
 MD5 601ee5ee19593a86cd81b66b97e69b93 files/digest-ipw2200-0.11 124
+MD5 840c3b4bb0f0e094cf22be064b5ba8ad files/digest-ipw2200-0.12 124
 MD5 4bf7fd9d6b68afc2a846b35e57bad566 files/digest-ipw2200-0.4-r1 122
diff --git a/net-wireless/ipw2200/files/digest-ipw2200-0.12 b/net-wireless/ipw2200/files/digest-ipw2200-0.12
new file mode 100644
index 000000000000..4f8ba2a162c0
--- /dev/null
+++ b/net-wireless/ipw2200/files/digest-ipw2200-0.12
@@ -0,0 +1,2 @@
+MD5 32d1ca16394ee07601593db74b31a02e ipw2200-0.12.tgz 113728
+MD5 8bdad731fb923a9fe1921358202f4f0f ipw2200-fw-2.0.tgz 163989
diff --git a/net-wireless/ipw2200/ipw2200-0.12.ebuild b/net-wireless/ipw2200/ipw2200-0.12.ebuild
new file mode 100644
index 000000000000..468fa4fe5f0d
--- /dev/null
+++ b/net-wireless/ipw2200/ipw2200-0.12.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2200/ipw2200-0.12.ebuild,v 1.1 2004/10/16 18:48:56 jbms Exp $
+
+inherit kernel-mod eutils
+
+FW_VERSION="2.0"
+
+DESCRIPTION="Driver for the Intel PRO/Wireless 2200BG miniPCI adapter"
+
+HOMEPAGE="http://ipw2200.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz
+		mirror://gentoo/${PN}-fw-${FW_VERSION}.tgz"
+
+LICENSE="GPL-2 ipw2200-fw"
+SLOT="0"
+KEYWORDS="~x86"
+
+IUSE=""
+
+# net-wireless/ipw2100 builds a possibly incompatible ieee80211
+# module, so it is blocked.  This problem will likely be resolved
+# upstream eventually.
+DEPEND="!net-wireless/ipw2100"
+RDEPEND="!net-wireless/ipw2100 >=sys-apps/hotplug-20030805-r2"
+
+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}
+
+	cd "${S}"
+
+	einfo "Patching Makefile"
+	sed -i -e 's/CONFIG_IPW_DEBUG=y/CONFIG_IPW_DEBUG=n/' "${S}/Makefile"
+	sed -i -e 's/CONFIG_IEEE80211_DEBUG=y/CONFIG_IEEE80211_DEBUG=n/' "${S}/Makefile"
+	sed -i -e 's/# CONFIG_IPW_PROMISC=/CONFIG_IPW_PROMISC=/' "${S}/Makefile"
+	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 KMISC=${D}/lib/modules/${KV}/net install || die
+
+	dodoc ISSUES README.${PN} CHANGES
+
+	insinto /lib/firmware
+	doins ${WORKDIR}/${PN}_boot.fw
+	doins ${WORKDIR}/${PN}_bss.fw
+	doins ${WORKDIR}/${PN}_ibss.fw
+	doins ${WORKDIR}/${PN}_ucode.fw
+
+	# Create symbolic links for old hotplug firmware location
+	dodir /usr/lib/hotplug/firmware
+	dosym /lib/firmware/${PN}_boot.fw /usr/lib/hotplug/firmware/${PN}_boot.fw
+	dosym /lib/firmware/${PN}_bss.fw /usr/lib/hotplug/firmware/${PN}_bss.fw
+	dosym /lib/firmware/${PN}_ibss.fw /usr/lib/hotplug/firmware/${PN}_ibss.fw
+	dosym /lib/firmware/${PN}_ucode.fw /usr/lib/hotplug/firmware/${PN}_ucode.fw
+}
+
+pkg_postinst() {
+	einfo "Checking kernel module dependancies"
+	test -r "${ROOT}/usr/src/linux/System.map" && \
+		depmod -ae -F "${ROOT}/usr/src/linux/System.map" -b "${ROOT}" -r ${KV}
+}