Bump to latest release, and clean out a few old ebuilds.

7 files changed, 40 insertions, 89 deletions

diff --git a/net-wireless/ipw2100/ChangeLog b/net-wireless/ipw2100/ChangeLog
index 1747f2359ff2..d01fd3c25d19 100644
--- a/net-wireless/ipw2100/ChangeLog
+++ b/net-wireless/ipw2100/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-wireless/ipw2100
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ChangeLog,v 1.14 2004/05/18 02:12:33 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ChangeLog,v 1.15 2004/05/31 13:31:29 latexer Exp $
+
+*ipw2100-0.45 (31 May 2004)
+
+  31 May 2004; Peter Johanson <latexer@gentoo.org> ipw2100-0.37.ebuild,
+  ipw2100-0.38.ebuild, ipw2100-0.45.ebuild:
+  Bump to latest releaes, and clean out a few old ebuilds.
 
 *ipw2100-0.44 (17 May 2004)
 
diff --git a/net-wireless/ipw2100/Manifest b/net-wireless/ipw2100/Manifest
index fa856a878729..7650052432dc 100644
--- a/net-wireless/ipw2100/Manifest
+++ b/net-wireless/ipw2100/Manifest
@@ -1,6 +1,7 @@
 MD5 d011a6d2ead424ccb64f49f9aa0e9194 ipw2100-0.41.ebuild 2229
 MD5 1915e4f827e5a22c646630bf76505c6a ipw2100-0.37.ebuild 1600
 MD5 8dac5cba8f5fac7506d7fb1bced2c4d0 ipw2100-0.39.ebuild 1600
+MD5 e1a31409ed5321a114f3cc9ca3e9cd9c ipw2100-0.45.ebuild 2314
 MD5 563b2c60da4b131360b8062f5a4b8ef7 ipw2100-0.38.ebuild 1864
 MD5 c3b22b5f143611eeec5b294625c244f5 ChangeLog 3557
 MD5 db76d51212bff92212cb8dd316a0931d metadata.xml 222
@@ -15,5 +16,6 @@ MD5 2cdb3f0d9c33e503d0c304c148cb772d files/digest-ipw2100-0.38 128
 MD5 b9c335a6f59cf565015715171df0d9eb files/digest-ipw2100-0.39 128
 MD5 f9a4a4e4aacd5c115776d3ccc8333cab files/digest-ipw2100-0.41 123
 MD5 5ccd21f930c68d8fd53afe3a87bcd56e files/digest-ipw2100-0.44 124
+MD5 3d2b283cc098381a32b94d472e5b11dc files/digest-ipw2100-0.45 124
 MD5 1939e18b58d29ee8ec02ce6777ebaa4e files/ipw2100-0.33-makefile-fix.diff 2275
 MD5 99cced47568e9cb3fd2e3ceaed896c88 files/hostap_crypt.h 1344
diff --git a/net-wireless/ipw2100/files/digest-ipw2100-0.37 b/net-wireless/ipw2100/files/digest-ipw2100-0.37
deleted file mode 100644
index c7283a1143fb..000000000000
--- a/net-wireless/ipw2100/files/digest-ipw2100-0.37
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 d5a55dfdf4b29519a77c92f1fa0fc619 ipw2100-full-0.37.tgz 731321
-MD5 8e2d31375c0ab22b4558c463bee2cefa ipw2100-fw-1.0.tgz 88843
diff --git a/net-wireless/ipw2100/files/digest-ipw2100-0.38 b/net-wireless/ipw2100/files/digest-ipw2100-0.38
deleted file mode 100644
index c568923b7952..000000000000
--- a/net-wireless/ipw2100/files/digest-ipw2100-0.38
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 af43ad462477f48c36d15322b88c515e ipw2100-full-0.38.tgz 732563
-MD5 8e2d31375c0ab22b4558c463bee2cefa ipw2100-fw-1.0.tgz 88843
diff --git a/net-wireless/ipw2100/files/digest-ipw2100-0.45 b/net-wireless/ipw2100/files/digest-ipw2100-0.45
new file mode 100644
index 000000000000..c88596f1df9a
--- /dev/null
+++ b/net-wireless/ipw2100/files/digest-ipw2100-0.45
@@ -0,0 +1,2 @@
+MD5 e39bccabee7adc18c5678e59236f8a59 ipw2100-0.45.tgz 109660
+MD5 959df2696321b12ceed230397584ec4b ipw2100-fw-1.1.tgz 247766
diff --git a/net-wireless/ipw2100/ipw2100-0.37.ebuild b/net-wireless/ipw2100/ipw2100-0.37.ebuild
deleted file mode 100644
index c38a2a4cdfad..000000000000
--- a/net-wireless/ipw2100/ipw2100-0.37.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ipw2100-0.37.ebuild,v 1.1 2004/03/25 04:35:39 latexer Exp $
-
-inherit kernel-mod eutils
-
-MY_P=${P/ipw2100/ipw2100-full}
-FW_VERSION="1.0"
-
-DESCRIPTION="Driver for the Intel Centrino wireless chipset"
-
-HOMEPAGE="http://ipw2100.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz
-		mirror://gentoo/${PN}-fw-${FW_VERSION}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-
-IUSE=""
-DEPEND=""
-RDEPEND=">=sys-apps/hotplug-20030805-r2"
-
-src_unpack() {
-	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."
-		die "Firmware loading support not detected."
-	fi
-
-	unpack ${A}
-	kernel-mod_getversion
-}
-
-src_compile() {
-	unset ARCH
-	emake KSRC=${ROOT}/usr/src/linux all || die
-}
-
-src_install() {
-	if [ ${KV_MINOR} -gt 4 ]
-	then
-		KV_OBJ="ko"
-	else
-		KV_OBJ="o"
-	fi
-
-
-	dodoc ISSUES README.ipw2100 DESIGN
-
-	insinto /lib/modules/${KV}/net
-	doins ipw2100.${KV_OBJ}
-	doins av5100.${KV_OBJ}
-
-	insinto /usr/lib/hotplug/firmware
-	doins ${WORKDIR}/${PN}-${FW_VERSION}.fw
-	doins ${WORKDIR}/LICENSE
-}
-
-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}
-}
diff --git a/net-wireless/ipw2100/ipw2100-0.38.ebuild b/net-wireless/ipw2100/ipw2100-0.45.ebuild
index 4016592019af..45a5b959108e 100644
--- a/net-wireless/ipw2100/ipw2100-0.38.ebuild
+++ b/net-wireless/ipw2100/ipw2100-0.45.ebuild
@@ -1,16 +1,15 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ipw2100-0.38.ebuild,v 1.1 2004/03/25 04:35:39 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ipw2100-0.45.ebuild,v 1.1 2004/05/31 13:31:29 latexer Exp $
 
 inherit kernel-mod eutils
 
-MY_P=${P/ipw2100/ipw2100-full}
-FW_VERSION="1.0"
+FW_VERSION="1.1"
 
 DESCRIPTION="Driver for the Intel Centrino wireless chipset"
 
 HOMEPAGE="http://ipw2100.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz
 		mirror://gentoo/${PN}-fw-${FW_VERSION}.tgz"
 
 LICENSE="GPL-2"
@@ -19,7 +18,8 @@ KEYWORDS="~x86"
 
 IUSE=""
 DEPEND=""
-RDEPEND=">=sys-apps/hotplug-20030805-r2"
+RDEPEND=">=sys-apps/hotplug-20030805-r2
+	 >=net-wireless/hostap-driver-0.1.3"
 
 src_unpack() {
 	if ! egrep "^CONFIG_FW_LOADER=[ym]" ${ROOT}/usr/src/linux/.config >/dev/null
@@ -35,18 +35,13 @@ src_unpack() {
 	kernel-mod_getversion
 
 	cd ${S}
-	EPATCH_SINGLE_MSG="Patching to fix resume crash" \
-		epatch ${FILESDIR}/${P}-resume.patch
-
-	EPATCH_SINGLE_MSG="Makefile fix #1" \
-		epatch ${FILESDIR}/${P}-makefile-1.diff
-	EPATCH_SINGLE_MSG="Makefile fix #2" \
-		epatch ${FILESDIR}/${P}-makefile-2.diff
+	mkdir -p hostap-driver-0.1.3/driver/modules
+	cp ${FILESDIR}/hostap_crypt.h hostap-driver-0.1.3/driver/modules
 }
 
 src_compile() {
 	unset ARCH
-	emake KSRC=${ROOT}/usr/src/linux all || die
+	emake KSRC=${ROOT}/usr/src/linux HOSTAP=hostap-driver-0.1.3 all || die
 }
 
 src_install() {
@@ -57,20 +52,37 @@ src_install() {
 		KV_OBJ="o"
 	fi
 
-
-	dodoc ISSUES README.ipw2100 DESIGN
+	dodoc ISSUES README.ipw2100 CHANGES
 
 	insinto /lib/modules/${KV}/net
-	doins ipw2100.${KV_OBJ}
-	doins av5100.${KV_OBJ}
+	doins ipw2100.${KV_OBJ} av5100.${KV_OBJ} pbe5.${KV_OBJ}
 
 	insinto /usr/lib/hotplug/firmware
 	doins ${WORKDIR}/${PN}-${FW_VERSION}.fw
+	doins ${WORKDIR}/${PN}-${FW_VERSION}-p.fw
+	doins ${WORKDIR}/${PN}-${FW_VERSION}-i.fw
 	doins ${WORKDIR}/LICENSE
 }
 
 pkg_postinst() {
+	if [ ${KV_MINOR} -gt 4 ]
+	then
+		KV_OBJ="ko"
+	else
+		KV_OBJ="o"
+	fi
+
 	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}
+
+	if [ ! -f ${ROOT}/lib/modules/${KV}/net/hostap_crypt_wep.${KV_OBJ} ]
+	then
+		eerror ""
+		eerror "Modules for hostap-driver not found!"
+		eerror "For WEP to work, you need the hostap-driver modules available for your kernel"
+		eerror "If you upgrade kernels, you need to re-emerge BOTH ipw2100 and hostap-driver"
+		eerror "to ensure that all the needed kernel modules are present!"
+		eerror ""
+	fi
 }