Ported to use linux-mod.eclass, bumping because of modules.d file additions.

6 files changed, 240 insertions, 2 deletions

diff --git a/net-wireless/hostap-driver/ChangeLog b/net-wireless/hostap-driver/ChangeLog
index 82699e9c7795..f59ff002d903 100644
--- a/net-wireless/hostap-driver/ChangeLog
+++ b/net-wireless/hostap-driver/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-wireless/hostap-driver
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-driver/ChangeLog,v 1.27 2005/01/03 11:04:49 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-driver/ChangeLog,v 1.28 2005/01/04 00:13:10 brix Exp $
+
+*hostap-driver-0.2.6-r1 (04 Jan 2005)
+
+  04 Jan 2005; Henrik Brix Andersen <brix@gentoo.org>
+  +hostap-driver-0.2.6-r1.ebuild, +hostap-driver-0.3.3-r1.ebuild:
+  Ported to use linux-mod.eclass, bumping because of modules.d file additions.
 
 *hostap-driver-0.3.3 (03 Jan 2005)
 
diff --git a/net-wireless/hostap-driver/Manifest b/net-wireless/hostap-driver/Manifest
index be5f2fe8dc02..b13f0f0d5275 100644
--- a/net-wireless/hostap-driver/Manifest
+++ b/net-wireless/hostap-driver/Manifest
@@ -1,15 +1,19 @@
 MD5 bf9d830724975fbb5ad0b8af8050e4a9 hostap-driver-0.3.2.ebuild 3621
 MD5 33f83a798f2d7446b33f681e84db44c8 hostap-driver-0.2.6.ebuild 3621
+MD5 22cfe97559b8397e9cbb8f09f0a25c1e hostap-driver-0.2.6-r1.ebuild 2868
+MD5 cc5e31889933e2f4d3509bb6642026de hostap-driver-0.3.3-r1.ebuild 2868
 MD5 52632d04c78163775e618e2e1ee37c08 hostap-driver-0.2.5.ebuild 3201
 MD5 498b6d437d20985d1f028a3dc001fb84 hostap-driver-0.3.3.ebuild 3598
 MD5 c94b7e9fe75e00370db3af612d4b4761 hostap-driver-0.2.5-r1.ebuild 3607
 MD5 19d1f40524a05555c709a81614cdbfc8 hostap-driver-0.3.0.ebuild 3621
-MD5 b8496e107904f8bc1b89746145c1dcc2 ChangeLog 5027
+MD5 f6372175f0a9cde139601f1fcf2934f2 ChangeLog 5266
 MD5 5f6ec5c50fa3a91a429fec8670cf241b metadata.xml 722
 MD5 c3a13c9ecb4fb1fb73d88f7040afa5fd hostap-driver-0.2.4.ebuild 2700
 MD5 f7a49c3b2764821383db2a933661eacb files/hostap-driver-0.3.2-firmware.patch 739
 MD5 c45be0cf6326f054520ce15096361e84 files/hostap-driver-0.3.0-firmware.patch 739
 MD5 702e5e315551f06833fde599816fd65a files/digest-hostap-driver-0.2.5-r1 441
+MD5 2867dcc26d843b380c5c6be06a89a9af files/digest-hostap-driver-0.2.6-r1 441
+MD5 d9b1b7ab5bfa090d1eca4d8865f5465c files/digest-hostap-driver-0.3.3-r1 441
 MD5 fe9ca923fd63e570f4f47be989fd810f files/digest-hostap-driver-0.2.4 441
 MD5 702e5e315551f06833fde599816fd65a files/digest-hostap-driver-0.2.5 441
 MD5 2867dcc26d843b380c5c6be06a89a9af files/digest-hostap-driver-0.2.6 441
diff --git a/net-wireless/hostap-driver/files/digest-hostap-driver-0.2.6-r1 b/net-wireless/hostap-driver/files/digest-hostap-driver-0.2.6-r1
new file mode 100644
index 000000000000..f5cd35b6b549
--- /dev/null
+++ b/net-wireless/hostap-driver/files/digest-hostap-driver-0.2.6-r1
@@ -0,0 +1,6 @@
+MD5 44dbc0a8978fe618eee242b0bd25392c pcmcia-cs-3.2.5.tar.gz 1266494
+MD5 33325ed642b5277a9695d10bd19b3d7a pcmcia-cs-3.2.5-module-init-tools.diff.gz 460
+MD5 ee4f8227cc28f9a29a609f6e9561ef54 pcmcia-cs-3.2.5-SMP-fix.diff.gz 320
+MD5 2b2cba3fdd498b001ea3c27d8b2da31b pcmcia-cs-3.2.5-3.2.6.diff.gz 23034
+MD5 f2feda5eb46c1a2b99ae9db274879afc pcmcia-cs-3.2.5-3.2.7.diff.gz 28244
+MD5 1815e82419cb83d32d6e416f090e9330 hostap-driver-0.2.6.tar.gz 196183
diff --git a/net-wireless/hostap-driver/files/digest-hostap-driver-0.3.3-r1 b/net-wireless/hostap-driver/files/digest-hostap-driver-0.3.3-r1
new file mode 100644
index 000000000000..1b13d3e0e360
--- /dev/null
+++ b/net-wireless/hostap-driver/files/digest-hostap-driver-0.3.3-r1
@@ -0,0 +1,6 @@
+MD5 44dbc0a8978fe618eee242b0bd25392c pcmcia-cs-3.2.5.tar.gz 1266494
+MD5 33325ed642b5277a9695d10bd19b3d7a pcmcia-cs-3.2.5-module-init-tools.diff.gz 460
+MD5 ee4f8227cc28f9a29a609f6e9561ef54 pcmcia-cs-3.2.5-SMP-fix.diff.gz 320
+MD5 2b2cba3fdd498b001ea3c27d8b2da31b pcmcia-cs-3.2.5-3.2.6.diff.gz 23034
+MD5 f2feda5eb46c1a2b99ae9db274879afc pcmcia-cs-3.2.5-3.2.7.diff.gz 28244
+MD5 5a3d50df56cad3151339b05eacabeea0 hostap-driver-0.3.3.tar.gz 200123
diff --git a/net-wireless/hostap-driver/hostap-driver-0.2.6-r1.ebuild b/net-wireless/hostap-driver/hostap-driver-0.2.6-r1.ebuild
new file mode 100644
index 000000000000..0980c72f6327
--- /dev/null
+++ b/net-wireless/hostap-driver/hostap-driver-0.2.6-r1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-driver/hostap-driver-0.2.6-r1.ebuild,v 1.1 2005/01/04 00:13:10 brix Exp $
+
+inherit toolchain-funcs eutils pcmcia linux-mod
+
+DESCRIPTION="HostAP wireless drivers"
+HOMEPAGE="http://hostap.epitest.fi"
+SRC_URI="${SRC_URI} http://hostap.epitest.fi/releases/${P}.tar.gz"
+LICENSE="GPL-2"
+
+KEYWORDS="~x86 ~ppc"
+IUSE="pcmcia"
+SLOT="0"
+
+RDEPEND=">=net-wireless/wireless-tools-25"
+
+CONFIG_CHECK="NET_RADIO"
+NET_RADIO_ERROR="${P} requires support for Wireless LAN drivers (non-hamradio) & Wireless Extensions (CONFIG_NET_RADIO)."
+
+pkg_setup() {
+	MODULE_NAMES="hostap(net:${S}/driver/modules)
+				hostap_pci(net:${S}/driver/modules)
+				hostap_plx(net:${S}/driver/modules)
+				hostap_crypt_wep(net:${S}/driver/modules)
+				hostap_crypt_ccmp(net:${S}/driver/modules)
+				hostap_crypt_tkip(net:${S}/driver/modules)"
+
+	if use pcmcia; then
+		MODULE_NAMES="${MODULE_NAMES} hostap_cs(net:${S}/driver/modules)"
+	fi
+
+	linux-mod_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-firmware.patch
+
+	# set compiler
+	sed -i "s:gcc:$(tc-getCC):" ${S}/Makefile
+
+	# unpack the pcmcia-cs sources if needed
+	pcmcia_src_unpack
+
+	# fix for new coreutils (#31801)
+	sed -i "s:tail -1:tail -n 1:" ${S}/Makefile
+
+	# set correct pcmcia path (PCMCIA_VERSION gets set from pcmcia_src_unpack)
+	if [ -n "${PCMCIA_VERSION}" ]; then
+		sed -i "s:^\(PCMCIA_PATH\)=:\1=${PCMCIA_SOURCE_DIR}:" ${S}/Makefile
+	fi
+
+	convert_to_m ${S}/Makefile
+}
+
+src_compile() {
+	pcmcia_configure
+
+	# hostap-driver expects 'make' to be called in the top-level directory
+	# linux-mod_src_compile() currently can not honor that (2005-01-04 brix)
+	set_arch_to_kernel
+	emake || die "emake failed"
+	set_arch_to_portage
+}
+
+src_install() {
+	if use pcmcia; then
+		insinto /etc/pcmcia
+		doins driver/etc/hostap_cs.conf
+	fi
+
+	dodoc ChangeLog README
+
+	linux-mod_src_install
+}
+
+pkg_postinst() {
+	if [ -e /etc/pcmcia/prism2.conf ]
+	then
+		einfo ""
+		einfo "You may need to edit or remove /etc/pcmcia/prism2.conf"
+		einfo "This is usually a result of conflicts with the"
+		einfo "net-wireless/linux-wlan-ng drivers."
+		einfo ""
+	fi
+
+	einfo ""
+	einfo "Please notice that all ${PN} modules are now installed to"
+	einfo "/lib/modules/${KV}/net/."
+	einfo ""
+	einfo "You may have to manually delete the old modules if upgrading from from"
+	einfo "<=net-wireless/${PN}-0.2.4."
+	einfo ""
+
+	ewarn ""
+	ewarn "Please note that this installation of HostAP contains support"
+	ewarn "for downloading binary firmware images into the non-volatile"
+	ewarn "(permanent) flash memory of wireless LAN cards."
+	ewarn ""
+	ewarn "Albeit being a great feature, this can lead to A DEAD CARD"
+	ewarn "when inappropriately used (e.g. wrong firmware)."
+	ewarn ""
+
+	linux-mod_pkg_postinst
+}
diff --git a/net-wireless/hostap-driver/hostap-driver-0.3.3-r1.ebuild b/net-wireless/hostap-driver/hostap-driver-0.3.3-r1.ebuild
new file mode 100644
index 000000000000..be79d6d15769
--- /dev/null
+++ b/net-wireless/hostap-driver/hostap-driver-0.3.3-r1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-driver/hostap-driver-0.3.3-r1.ebuild,v 1.1 2005/01/04 00:13:10 brix Exp $
+
+inherit toolchain-funcs eutils pcmcia linux-mod
+
+DESCRIPTION="HostAP wireless drivers"
+HOMEPAGE="http://hostap.epitest.fi"
+SRC_URI="${SRC_URI} http://hostap.epitest.fi/releases/${P}.tar.gz"
+LICENSE="GPL-2"
+
+KEYWORDS="~x86 ~ppc"
+IUSE="pcmcia"
+SLOT="0"
+
+RDEPEND=">=net-wireless/wireless-tools-25"
+
+CONFIG_CHECK="NET_RADIO"
+NET_RADIO_ERROR="${P} requires support for Wireless LAN drivers (non-hamradio) & Wireless Extensions (CONFIG_NET_RADIO)."
+
+pkg_setup() {
+	MODULE_NAMES="hostap(net:${S}/driver/modules)
+				hostap_pci(net:${S}/driver/modules)
+				hostap_plx(net:${S}/driver/modules)
+				hostap_crypt_wep(net:${S}/driver/modules)
+				hostap_crypt_ccmp(net:${S}/driver/modules)
+				hostap_crypt_tkip(net:${S}/driver/modules)"
+
+	if use pcmcia; then
+		MODULE_NAMES="${MODULE_NAMES} hostap_cs(net:${S}/driver/modules)"
+	fi
+
+	linux-mod_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-firmware.patch
+
+	# set compiler
+	sed -i "s:gcc:$(tc-getCC):" ${S}/Makefile
+
+	# unpack the pcmcia-cs sources if needed
+	pcmcia_src_unpack
+
+	# fix for new coreutils (#31801)
+	sed -i "s:tail -1:tail -n 1:" ${S}/Makefile
+
+	# set correct pcmcia path (PCMCIA_VERSION gets set from pcmcia_src_unpack)
+	if [ -n "${PCMCIA_VERSION}" ]; then
+		sed -i "s:^\(PCMCIA_PATH\)=:\1=${PCMCIA_SOURCE_DIR}:" ${S}/Makefile
+	fi
+
+	convert_to_m ${S}/Makefile
+}
+
+src_compile() {
+	pcmcia_configure
+
+	# hostap-driver expects 'make' to be called in the top-level directory
+	# linux-mod_src_compile() currently can not honor that (2005-01-04 brix)
+	set_arch_to_kernel
+	emake || die "emake failed"
+	set_arch_to_portage
+}
+
+src_install() {
+	if use pcmcia; then
+		insinto /etc/pcmcia
+		doins driver/etc/hostap_cs.conf
+	fi
+
+	dodoc ChangeLog README
+
+	linux-mod_src_install
+}
+
+pkg_postinst() {
+	if [ -e /etc/pcmcia/prism2.conf ]
+	then
+		einfo ""
+		einfo "You may need to edit or remove /etc/pcmcia/prism2.conf"
+		einfo "This is usually a result of conflicts with the"
+		einfo "net-wireless/linux-wlan-ng drivers."
+		einfo ""
+	fi
+
+	einfo ""
+	einfo "Please notice that all ${PN} modules are now installed to"
+	einfo "/lib/modules/${KV}/net/."
+	einfo ""
+	einfo "You may have to manually delete the old modules if upgrading from from"
+	einfo "<=net-wireless/${PN}-0.2.4."
+	einfo ""
+
+	ewarn ""
+	ewarn "Please note that this installation of HostAP contains support"
+	ewarn "for downloading binary firmware images into the non-volatile"
+	ewarn "(permanent) flash memory of wireless LAN cards."
+	ewarn ""
+	ewarn "Albeit being a great feature, this can lead to A DEAD CARD"
+	ewarn "when inappropriately used (e.g. wrong firmware)."
+	ewarn ""
+
+	linux-mod_pkg_postinst
+}