Removed a stale one, added a dep on hotplug, and a check for CONFIG_FW_LOADER as this is needed with new versions.

6 files changed, 46 insertions, 14 deletions

diff --git a/net-wireless/ipw2100/ChangeLog b/net-wireless/ipw2100/ChangeLog
index 225190eea47b..1ceb4f45ba66 100644
--- a/net-wireless/ipw2100/ChangeLog
+++ b/net-wireless/ipw2100/ChangeLog
@@ -1,6 +1,19 @@
 # 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.7 2004/03/17 21:22:03 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ChangeLog,v 1.8 2004/03/18 02:35:31 latexer Exp $
+
+*ipw2100-0.34 (17 Mar 2004)
+
+  17 Mar 2004; Peter Johanson <latexer@gentoo.org> ipw2100-0.33-r1.ebuild,
+  ipw2100-0.33.ebuild, ipw2100-0.34.ebuild:
+  Removed a version that was no good, added RDEPEND on hotplug with firmware
+  support, and added a check for CONFIG_FW_LOADER.
+
+*ipw2100-0.34 (17 Mar 2004)
+
+  17 Mar 2004; Peter Johanson <latexer@gentoo.org> ipw2100-0.34.ebuild:
+  Bump. Includes most of the stuff from 0.33-r1, plus a few new devices in /proc
+  for debugging.
 
 *ipw2100-0.33-r1 (17 Mar 2004)
 
diff --git a/net-wireless/ipw2100/Manifest b/net-wireless/ipw2100/Manifest
index d97364c38227..f4672247b147 100644
--- a/net-wireless/ipw2100/Manifest
+++ b/net-wireless/ipw2100/Manifest
@@ -1,9 +1,9 @@
 MD5 bacfed597a8a2393d4cfc6d22148b5a6 ipw2100-0.32.ebuild 1510
-MD5 fc5a0b28a0f0512510e48f83003e30c7 ipw2100-0.33-r1.ebuild 1336
+MD5 7ef502a663c0882d7b486521075f54aa ipw2100-0.33-r1.ebuild 1753
+MD5 65a8574886461fb56c246cd0a61c9cb9 ipw2100-0.34.ebuild 1600
 MD5 52cf0394939049fc21b1b5b82d1c9c6f ipw2100-0.31.ebuild 1552
-MD5 8fe3f7faed305f56b8872a49a9ac8865 ipw2100-0.33.ebuild 1237
 MD5 a54d36b57412d5b2477ebe9b11df402c ipw2100-0.29.ebuild 1496
-MD5 823c52e3f7f50f5a2fa85dab2ccc98b9 ChangeLog 1822
+MD5 5cc1f171df339df9d60ee358b7b30ef2 ChangeLog 2299
 MD5 db76d51212bff92212cb8dd316a0931d metadata.xml 222
 MD5 c25ca603853e256cd2067a2e13a540b3 ipw2100-0.30.ebuild 1503
 MD5 1cf135e6f2a48d58c39f62e3e49ccfd3 files/ipw2100-0.33-acpi-fix.diff 863
@@ -13,5 +13,5 @@ MD5 b8a2ee5b58b07a06d43eee780062c44f files/digest-ipw2100-0.29 128
 MD5 368679a4039ed10926222fce17e426e9 files/digest-ipw2100-0.30 128
 MD5 f161ddf8b6d1e61b46ddfaa5da0d52e9 files/digest-ipw2100-0.31 128
 MD5 a9b360ec5e2fc1b06d28990d4e2665c5 files/digest-ipw2100-0.32 128
-MD5 5f17d2de90a1512f71b1d9285d830215 files/digest-ipw2100-0.33 128
+MD5 695174056e40f9162c57fbb578e3d661 files/digest-ipw2100-0.34 128
 MD5 1939e18b58d29ee8ec02ce6777ebaa4e files/ipw2100-0.33-makefile-fix.diff 2275
diff --git a/net-wireless/ipw2100/files/digest-ipw2100-0.33 b/net-wireless/ipw2100/files/digest-ipw2100-0.33
deleted file mode 100644
index 5dee2d0a9282..000000000000
--- a/net-wireless/ipw2100/files/digest-ipw2100-0.33
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 98c8cf2aaf8fb724e490c8e3b6b9542d ipw2100-full-0.33.tgz 718118
-MD5 8e2d31375c0ab22b4558c463bee2cefa ipw2100-fw-1.0.tgz 88843
diff --git a/net-wireless/ipw2100/files/digest-ipw2100-0.34 b/net-wireless/ipw2100/files/digest-ipw2100-0.34
new file mode 100644
index 000000000000..4acde1cfd467
--- /dev/null
+++ b/net-wireless/ipw2100/files/digest-ipw2100-0.34
@@ -0,0 +1,2 @@
+MD5 aa1abb0f57db4e67eea37952695ac548 ipw2100-full-0.34.tgz 718974
+MD5 8e2d31375c0ab22b4558c463bee2cefa ipw2100-fw-1.0.tgz 88843
diff --git a/net-wireless/ipw2100/ipw2100-0.33-r1.ebuild b/net-wireless/ipw2100/ipw2100-0.33-r1.ebuild
index 69abe5c545f0..2cd998ffe5a0 100644
--- a/net-wireless/ipw2100/ipw2100-0.33-r1.ebuild
+++ b/net-wireless/ipw2100/ipw2100-0.33-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.33-r1.ebuild,v 1.1 2004/03/17 21:22:03 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ipw2100-0.33-r1.ebuild,v 1.2 2004/03/18 02:35:31 latexer Exp $
 
 inherit kernel-mod eutils
 
@@ -19,8 +19,18 @@ 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
 
@@ -29,6 +39,7 @@ src_unpack() {
 	EPATCH_SINGLE_MSG="Patch to fix locks with C3 state" \
 		epatch ${FILESDIR}/${P}-acpi-fix.diff
 }
+
 src_compile() {
 	unset ARCH
 	emake KSRC=${ROOT}/usr/src/linux all || die
@@ -49,7 +60,7 @@ src_install() {
 	doins ipw2100.${KV_OBJ}
 	doins av5100.${KV_OBJ}
 
-	insinto /etc/firmware
+	insinto /usr/lib/hotplug/firmware/
 	doins ${WORKDIR}/${PN}-${FW_VERSION}.fw
 	doins ${WORKDIR}/LICENSE
 }
diff --git a/net-wireless/ipw2100/ipw2100-0.33.ebuild b/net-wireless/ipw2100/ipw2100-0.34.ebuild
index 50eb0861307e..fa75b82c07fc 100644
--- a/net-wireless/ipw2100/ipw2100-0.33.ebuild
+++ b/net-wireless/ipw2100/ipw2100-0.34.ebuild
@@ -1,6 +1,6 @@
 # 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.33.ebuild,v 1.1 2004/03/17 03:21:07 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ipw2100-0.34.ebuild,v 1.1 2004/03/18 02:35:31 latexer Exp $
 
 inherit kernel-mod eutils
 
@@ -19,14 +19,22 @@ 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
-
-	cd ${S}
-	epatch ${FILESDIR}/${P}-makefile-fix.diff
 }
+
 src_compile() {
 	unset ARCH
 	emake KSRC=${ROOT}/usr/src/linux all || die
@@ -47,7 +55,7 @@ src_install() {
 	doins ipw2100.${KV_OBJ}
 	doins av5100.${KV_OBJ}
 
-	insinto /etc/firmware
+	insinto /usr/lib/hotplug/firmware
 	doins ${WORKDIR}/${PN}-${FW_VERSION}.fw
 	doins ${WORKDIR}/LICENSE
 }