Version bump. Again.

4 files changed, 156 insertions, 2 deletions

diff --git a/net-wireless/ipw2100/ChangeLog b/net-wireless/ipw2100/ChangeLog
index 35796b081324..204d32e05941 100644
--- a/net-wireless/ipw2100/ChangeLog
+++ b/net-wireless/ipw2100/ChangeLog
@@ -1,6 +1,11 @@
 # 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.44 2004/11/04 12:00:28 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ChangeLog,v 1.45 2004/11/05 10:18:17 brix Exp $
+
+*ipw2100-0.60 (05 Nov 2004)
+
+  05 Nov 2004; Henrik Brix Andersen <brix@gentoo.org> +ipw2100-0.60.ebuild:
+  Version bump.
 
   04 Nov 2004; Henrik Brix Andersen <brix@gentoo.org> -files/hostap_crypt.h,
   -files/ipw2100-0.55-modparam-perm.patch,
diff --git a/net-wireless/ipw2100/Manifest b/net-wireless/ipw2100/Manifest
index 8b59d8f3d63b..df6aa1744fd2 100644
--- a/net-wireless/ipw2100/Manifest
+++ b/net-wireless/ipw2100/Manifest
@@ -1,10 +1,11 @@
 MD5 6bc8f40845cc7b96b79ccbcd6e1fa2fb ipw2100-0.57.ebuild 3817
 MD5 ed6da81014c34267a8374e46f567a022 ipw2100-0.59.ebuild 3817
 MD5 c4a97eb25e8d493065e9168268ddb856 ipw2100-0.54.ebuild 2772
+MD5 facd102d6cf36943f3c9433fee5a68ee ipw2100-0.60.ebuild 3717
 MD5 750e2e1318bb6ccf995199399d7a1e9f ipw2100-0.56.ebuild 3999
 MD5 131945f7f5e180c4c060b3661c773880 ipw2100-0.56-r1.ebuild 3997
 MD5 c98f3cde3235a2e9e022f3205c8952f4 ipw2100-0.58.ebuild 3817
-MD5 b3621e8084871facd7eb2a8858a2e673 ChangeLog 9170
+MD5 83834438659e1f7281cef87aef805f69 ChangeLog 9292
 MD5 8a68b74057e911e6804f77dc21959e80 metadata.xml 282
 MD5 b80746d07b956e30d091d5b070694b15 files/ipw2100-0.56-2.6.10-susp.patch 1484
 MD5 65f9c3d1b61f2e64d1e47a5d876946e4 files/ipw2100-0.56-wpa_eapol_fix.patch 624
@@ -14,4 +15,5 @@ MD5 5fa9f803ddce8467b15e0397a8155057 files/digest-ipw2100-0.56 195
 MD5 97e5b39dd6c08d7d582c250e3af2f950 files/digest-ipw2100-0.57 124
 MD5 8928c2c9c01fd33dc6af010e74190332 files/digest-ipw2100-0.58 124
 MD5 3e6d6af3cead7c15b2c76688e3a38c17 files/digest-ipw2100-0.59 124
+MD5 005566287ad835c4fcf048ae0323e666 files/digest-ipw2100-0.60 124
 MD5 aca6bf1c2d71e72adfc952d903c77f6b files/ipw2100-0.56-ieee80211_scan_age.2.patch 1718
diff --git a/net-wireless/ipw2100/files/digest-ipw2100-0.60 b/net-wireless/ipw2100/files/digest-ipw2100-0.60
new file mode 100644
index 000000000000..61782a9673f7
--- /dev/null
+++ b/net-wireless/ipw2100/files/digest-ipw2100-0.60
@@ -0,0 +1,2 @@
+MD5 a91cf341acc580ec3e20f2d567c3f971 ipw2100-0.60.tgz 135422
+MD5 46aa75bcda1a00efa841f9707bbbd113 ipw2100-fw-1.3.tgz 248471
diff --git a/net-wireless/ipw2100/ipw2100-0.60.ebuild b/net-wireless/ipw2100/ipw2100-0.60.ebuild
new file mode 100644
index 000000000000..0f75930968d9
--- /dev/null
+++ b/net-wireless/ipw2100/ipw2100-0.60.ebuild
@@ -0,0 +1,145 @@
+# 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.60.ebuild,v 1.1 2004/11/05 10:18:17 brix Exp $
+
+inherit kernel-mod eutils
+
+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}/${P}.tgz
+		mirror://gentoo/${PN}-fw-${FW_VERSION}.tgz"
+
+LICENSE="GPL-2 ipw2100-fw"
+SLOT="0"
+KEYWORDS="~x86"
+
+IUSE=""
+DEPEND="virtual/linux-sources
+		!net-wireless/ipw2200
+		sys-apps/sed"
+RDEPEND=">=sys-apps/hotplug-20030805-r2
+		>=net-wireless/wireless-tools-27_pre23"
+
+pkg_setup() {
+	local DIE=0
+
+	if kernel-mod_is_2_4_kernel
+	then
+		die "${P} does not support building against kernel 2.4.x"
+	fi
+
+	if ! kernel-mod_configoption_present NET_RADIO
+	then
+		eerror ""
+		eerror "${P} requires support for Wireless LAN drivers (non-hamradio) &"
+		eerror "Wireless Extensions (CONFIG_NET_RADIO) in the kernel."
+		DIE=1
+	fi
+
+	if ! kernel-mod_configoption_present CRYPTO_ARC4
+	then
+		eerror ""
+		eerror "${P} requires support for ARC4 cipher algorithm (CONFIG_CRYPTO_ARC4)"
+		eerror "in the kernel."
+		DIE=1
+	fi
+
+	if ! kernel-mod_configoption_present CRYPTO_MICHAEL_MIC
+	then
+		eerror ""
+		eerror "${P} requires support for Michael MIC keyed digest algorithm"
+		eerror "(CONFIG_CRYPTO_MICHAEL_MIC) in the kernel."
+		DIE=1
+	fi
+
+	if ! kernel-mod_configoption_present CRYPTO_AES_586 && ! kernel-mod_configoption_present CRYPTO_AES
+	then
+		eerror ""
+		eerror "${P} requires support for AES cipher algorithms (i586)"
+		eerror "(CONFIG_CRYPTO_AES_586) in the kernel."
+		eerror ""
+		eerror "This is called CONFIG_CRYPTO_AES in kernels prior to 2.6.8."
+		DIE=1
+	fi
+
+	if ! kernel-mod_configoption_present FW_LOADER
+	then
+		eerror ""
+		eerror "${P} requires Hotplug firmware loading support (CONFIG_FW_LOADER)"
+		eerror "in the kernel."
+		DIE=1
+	fi
+
+	if ! kernel-mod_configoption_present CRC32
+	then
+		eerror ""
+		eerror "${P} requires support for CRC32 functions (CONFIG_CRC32) in the"
+		eerror "kernel."
+		DIE=1
+	fi
+
+	kernel-mod_check_modules_supported
+
+	if [ $DIE -eq 1 ]
+	then
+		eerror ""
+		die "You kernel is missing the required option(s) listed above."
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+
+	einfo "Patching Makefile to enable WPA"
+	sed -i "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() {
+	set_arch_to_kernel
+
+	emake KSRC=${ROOT}/usr/src/linux all || die
+}
+
+src_install() {
+	set_arch_to_kernel
+
+	emake KSRC=${ROOT}/usr/src/linux KMISC=${D}/lib/modules/${KV}/net install || die
+
+	set_arch_to_portage
+
+	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}
+}