Bump and remove some old ebuilds

11 files changed, 33 insertions, 250 deletions

diff --git a/net-wireless/ipw2100/ChangeLog b/net-wireless/ipw2100/ChangeLog
index 6e081b59289e..f56d7466e4e9 100644
--- a/net-wireless/ipw2100/ChangeLog
+++ b/net-wireless/ipw2100/ChangeLog
@@ -1,6 +1,13 @@
 # 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.10 2004/03/25 04:35:39 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ChangeLog,v 1.11 2004/03/26 20:57:46 latexer Exp $
+
+*ipw2100-0.39 (26 Mar 2004)
+
+  26 Mar 2004; Peter Johanson <latexer@gentoo.org> ipw2100-0.29.ebuild,
+  ipw2100-0.30.ebuild, ipw2100-0.31.ebuild, ipw2100-0.32.ebuild,
+  ipw2100-0.39.ebuild:
+  Bump, and clean out old ebuilds.
 
 *ipw2100-0.38 (24 Mar 2004)
 
diff --git a/net-wireless/ipw2100/Manifest b/net-wireless/ipw2100/Manifest
index d8a6c9ceecfe..7d3f5c47ff3e 100644
--- a/net-wireless/ipw2100/Manifest
+++ b/net-wireless/ipw2100/Manifest
@@ -1,6 +1,7 @@
 MD5 1915e4f827e5a22c646630bf76505c6a ipw2100-0.37.ebuild 1600
 MD5 bacfed597a8a2393d4cfc6d22148b5a6 ipw2100-0.32.ebuild 1510
 MD5 7ef502a663c0882d7b486521075f54aa ipw2100-0.33-r1.ebuild 1753
+MD5 563b2c60da4b131360b8062f5a4b8ef7 ipw2100-0.39.ebuild 1864
 MD5 65a8574886461fb56c246cd0a61c9cb9 ipw2100-0.34.ebuild 1600
 MD5 52cf0394939049fc21b1b5b82d1c9c6f ipw2100-0.31.ebuild 1552
 MD5 563b2c60da4b131360b8062f5a4b8ef7 ipw2100-0.38.ebuild 1864
@@ -23,4 +24,5 @@ MD5 695174056e40f9162c57fbb578e3d661 files/digest-ipw2100-0.34 128
 MD5 a86cf7317e197c9132f5f43650739e4a files/digest-ipw2100-0.35 128
 MD5 2121348d7f60dbcd4586e7cf9c1087d0 files/digest-ipw2100-0.37 128
 MD5 2cdb3f0d9c33e503d0c304c148cb772d files/digest-ipw2100-0.38 128
+MD5 b9c335a6f59cf565015715171df0d9eb files/digest-ipw2100-0.39 128
 MD5 1939e18b58d29ee8ec02ce6777ebaa4e files/ipw2100-0.33-makefile-fix.diff 2275
diff --git a/net-wireless/ipw2100/files/digest-ipw2100-0.29 b/net-wireless/ipw2100/files/digest-ipw2100-0.29
deleted file mode 100644
index 85136b69dabd..000000000000
--- a/net-wireless/ipw2100/files/digest-ipw2100-0.29
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 189b340e78d8ead17e9e8409d5c343fc ipw2100-full-0.29.tgz 713039
-MD5 8e2d31375c0ab22b4558c463bee2cefa ipw2100-fw-1.0.tgz 88843
diff --git a/net-wireless/ipw2100/files/digest-ipw2100-0.30 b/net-wireless/ipw2100/files/digest-ipw2100-0.30
deleted file mode 100644
index 3fa54d21f0c9..000000000000
--- a/net-wireless/ipw2100/files/digest-ipw2100-0.30
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 a9c9f0aea6d05224e21c99453bc63fd7 ipw2100-full-0.30.tgz 713962
-MD5 8e2d31375c0ab22b4558c463bee2cefa ipw2100-fw-1.0.tgz 88843
diff --git a/net-wireless/ipw2100/files/digest-ipw2100-0.31 b/net-wireless/ipw2100/files/digest-ipw2100-0.31
deleted file mode 100644
index 229fe95ce565..000000000000
--- a/net-wireless/ipw2100/files/digest-ipw2100-0.31
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 c4108da74bdbe3af6d613be1551795c9 ipw2100-full-0.31.tgz 714126
-MD5 8e2d31375c0ab22b4558c463bee2cefa ipw2100-fw-1.0.tgz 88843
diff --git a/net-wireless/ipw2100/files/digest-ipw2100-0.32 b/net-wireless/ipw2100/files/digest-ipw2100-0.32
deleted file mode 100644
index 200fbb660bf6..000000000000
--- a/net-wireless/ipw2100/files/digest-ipw2100-0.32
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 f138da78d8a17f2c8dc3918d18b6212e ipw2100-full-0.32.tgz 715032
-MD5 8e2d31375c0ab22b4558c463bee2cefa ipw2100-fw-1.0.tgz 88843
diff --git a/net-wireless/ipw2100/files/digest-ipw2100-0.39 b/net-wireless/ipw2100/files/digest-ipw2100-0.39
new file mode 100644
index 000000000000..6c82a3d37336
--- /dev/null
+++ b/net-wireless/ipw2100/files/digest-ipw2100-0.39
@@ -0,0 +1,2 @@
+MD5 fb0f20b8425ea872f723ed9b294e89fc ipw2100-full-0.39.tgz 733577
+MD5 8e2d31375c0ab22b4558c463bee2cefa ipw2100-fw-1.0.tgz 88843
diff --git a/net-wireless/ipw2100/ipw2100-0.29.ebuild b/net-wireless/ipw2100/ipw2100-0.29.ebuild
deleted file mode 100644
index 4258f3653643..000000000000
--- a/net-wireless/ipw2100/ipw2100-0.29.ebuild
+++ /dev/null
@@ -1,71 +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.29.ebuild,v 1.2 2004/03/11 22:28:36 latexer Exp $
-
-inherit kernel-mod
-
-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=""
-
-src_unpack() {
-	unpack ${A}
-	kernel-mod_getversion
-
-	cd ${S}
-	if [ ${KV_MINOR} -gt 4 ]
-	then
-		ln -sf Makefile.26 Makefile
-	else
-		ln -sf Makefile.24 Makefile
-	fi
-
-	# Sed our makefile to have targets be obj-m instead of obj-$(CONFIG_VAR)
-	sed -i -e "s:\$(CONFIG_IPW2100_AVERATEC_5100P):m:" \
-		-e "s:\$(CONFIG_IPW2100):m:" \
-		Makefile
-}
-src_compile() {
-	cd ${S}
-	if [ ${KV_MINOR} -gt 4 ]
-	then
-		unset ARCH
-		mkdir ${S}/tmp
-		make -C ${ROOT}/usr/src/linux SUBDIRS=${S} \
-			MODVERDIR=${S}/tmp modules || die "Module compilation failed"
-	else
-		make -C ${ROOT}/usr/src/linux SUBDIRS=${S} \
-			modules || die "Module compilation failed"
-	fi
-}
-
-src_install() {
-	if [ ${KV_MINOR} -gt 4 ]
-	then
-		KV_OBJ="ko"
-	else
-		KV_OBJ="o"
-	fi
-
-	dodoc ISSUES README.ipw2100
-
-	insinto /lib/modules/${KV}/net
-	doins ipw2100.${KV_OBJ}
-	doins av5100.${KV_OBJ}
-
-	insinto /etc/firmware
-	doins ${WORKDIR}/${PN}-${FW_VERSION}.fw
-	doins ${WORKDIR}/LICENSE
-}
diff --git a/net-wireless/ipw2100/ipw2100-0.30.ebuild b/net-wireless/ipw2100/ipw2100-0.30.ebuild
deleted file mode 100644
index 86887b89894a..000000000000
--- a/net-wireless/ipw2100/ipw2100-0.30.ebuild
+++ /dev/null
@@ -1,71 +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.30.ebuild,v 1.2 2004/03/11 22:28:36 latexer Exp $
-
-inherit kernel-mod
-
-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=""
-
-src_unpack() {
-	unpack ${A}
-	kernel-mod_getversion
-
-	cd ${S}
-	if [ ${KV_MINOR} -gt 4 ]
-	then
-		ln -sf Makefile.26 Makefile
-	else
-		ln -sf Makefile.24 Makefile
-	fi
-
-	# Sed our makefile to have targets be obj-m instead of obj-$(CONFIG_VAR)
-	sed -i -e "s:\$(CONFIG_IPW2100_AVERATEC_5100P):m:" \
-		-e "s:\$(CONFIG_IPW2100):m:" \
-		Makefile
-}
-src_compile() {
-	cd ${S}
-	if [ ${KV_MINOR} -gt 4 ]
-	then
-		unset ARCH
-		mkdir ${S}/tmp
-		make -C ${ROOT}/usr/src/linux SUBDIRS=${S} \
-			MODVERDIR=${S}/tmp modules || die "Module compilation failed"
-	else
-		make -C ${ROOT}/usr/src/linux SUBDIRS=${S} \
-			modules || die "Module compilation failed"
-	fi
-}
-
-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 /etc/firmware
-	doins ${WORKDIR}/${PN}-${FW_VERSION}.fw
-	doins ${WORKDIR}/LICENSE
-}
diff --git a/net-wireless/ipw2100/ipw2100-0.32.ebuild b/net-wireless/ipw2100/ipw2100-0.32.ebuild
deleted file mode 100644
index ab6d1528f75e..000000000000
--- a/net-wireless/ipw2100/ipw2100-0.32.ebuild
+++ /dev/null
@@ -1,71 +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.32.ebuild,v 1.1 2004/03/13 00:06:01 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=""
-
-src_unpack() {
-	unpack ${A}
-	kernel-mod_getversion
-
-	cd ${S}
-	if [ ${KV_MINOR} -gt 4 ]
-	then
-		ln -sf Makefile.26 Makefile
-	else
-		ln -sf Makefile.24 Makefile
-	fi
-
-	# Sed our makefile to have targets be obj-m instead of obj-$(CONFIG_VAR)
-	sed -i -e "s:\$(CONFIG_IPW2100_AVERATEC_5100P):m:" \
-		-e "s:\$(CONFIG_IPW2100):m:" \
-		Makefile
-}
-src_compile() {
-	cd ${S}
-	if [ ${KV_MINOR} -gt 4 ]
-	then
-		unset ARCH
-		mkdir ${S}/tmp
-		make -C ${ROOT}/usr/src/linux SUBDIRS=${S} \
-			MODVERDIR=${S}/tmp modules || die "Module compilation failed"
-	else
-		make -C ${ROOT}/usr/src/linux SUBDIRS=${S} \
-			modules || die "Module compilation failed"
-	fi
-}
-
-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 /etc/firmware
-	doins ${WORKDIR}/${PN}-${FW_VERSION}.fw
-	doins ${WORKDIR}/LICENSE
-}
diff --git a/net-wireless/ipw2100/ipw2100-0.31.ebuild b/net-wireless/ipw2100/ipw2100-0.39.ebuild
index 5a7f696f6dfa..b5e6d57537f6 100644
--- a/net-wireless/ipw2100/ipw2100-0.31.ebuild
+++ b/net-wireless/ipw2100/ipw2100-0.39.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.31.ebuild,v 1.1 2004/03/12 21:48:21 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ipw2100-0.39.ebuild,v 1.1 2004/03/26 20:57:46 latexer Exp $
 
 inherit kernel-mod eutils
 
@@ -19,39 +19,25 @@ KEYWORDS="~x86"
 
 IUSE=""
 DEPEND=""
+RDEPEND=">=sys-apps/hotplug-20030805-r2"
 
 src_unpack() {
-	unpack ${A}
-	kernel-mod_getversion
-
-	cd ${S}
-
-	epatch ${FILESDIR}/${P}-sched-fix.diff
-
-	if [ ${KV_MINOR} -gt 4 ]
+	if ! egrep "^CONFIG_FW_LOADER=[ym]" ${ROOT}/usr/src/linux/.config >/dev/null
 	then
-		ln -sf Makefile.26 Makefile
-	else
-		ln -sf Makefile.24 Makefile
+		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
 
-	# Sed our makefile to have targets be obj-m instead of obj-$(CONFIG_VAR)
-	sed -i -e "s:\$(CONFIG_IPW2100_AVERATEC_5100P):m:" \
-		-e "s:\$(CONFIG_IPW2100):m:" \
-		Makefile
+	unpack ${A}
+	kernel-mod_getversion
 }
+
 src_compile() {
-	cd ${S}
-	if [ ${KV_MINOR} -gt 4 ]
-	then
-		unset ARCH
-		mkdir ${S}/tmp
-		make -C ${ROOT}/usr/src/linux SUBDIRS=${S} \
-			MODVERDIR=${S}/tmp modules || die "Module compilation failed"
-	else
-		make -C ${ROOT}/usr/src/linux SUBDIRS=${S} \
-			modules || die "Module compilation failed"
-	fi
+	unset ARCH
+	emake KSRC=${ROOT}/usr/src/linux all || die
 }
 
 src_install() {
@@ -62,13 +48,20 @@ src_install() {
 		KV_OBJ="o"
 	fi
 
+
 	dodoc ISSUES README.ipw2100 DESIGN
 
 	insinto /lib/modules/${KV}/net
 	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
 }
+
+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}
+}