Version bump.

8 files changed, 191 insertions, 3 deletions

diff --git a/net-wireless/hostap-driver/ChangeLog b/net-wireless/hostap-driver/ChangeLog
index 7770b62550ea..63970c5dcf89 100644
--- a/net-wireless/hostap-driver/ChangeLog
+++ b/net-wireless/hostap-driver/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-wireless/hostap-driver
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-driver/ChangeLog,v 1.14 2004/09/14 16:22:46 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-driver/ChangeLog,v 1.15 2004/10/25 15:15:30 brix Exp $
+
+*hostap-driver-0.2.5 (25 Oct 2004)
+
+  25 Oct 2004; Henrik Brix Andersen <brix@gentoo.org>
+  +hostap-driver-0.2.5.ebuild:
+  Version bump. Cleaned up the ebuild beyond recognition, dropped hostap-* USE
+  flags since the package no longer supports building only some of the modules.
 
 *hostap-driver-0.2.4 (14 Sep 2004)
 
diff --git a/net-wireless/hostap-driver/Manifest b/net-wireless/hostap-driver/Manifest
index 7cdc61145e98..a4e8f8cba2a2 100644
--- a/net-wireless/hostap-driver/Manifest
+++ b/net-wireless/hostap-driver/Manifest
@@ -1,6 +1,7 @@
 MD5 e473de19e03877a875c8398fbf2ee3d0 hostap-driver-0.1.3.ebuild 2903
 MD5 1a4e9f348ea1158f85e73de05b21a333 hostap-driver-0.1.2-r1.ebuild 3818
 MD5 878a0269474add253e99017cbaf1b6ff hostap-driver-0.1.2.ebuild 3715
+MD5 5ef678ebab365208cbf4281887da49c1 hostap-driver-0.2.5.ebuild 3070
 MD5 a2593a329214efd6d27d3f814027f62d hostap-driver-0.1.2-r2.ebuild 2801
 MD5 afb4b160091427936002d9fab6bfc44b ChangeLog 2395
 MD5 e4c2a5b184138acc2d5252edc1be21bc metadata.xml 822
@@ -13,4 +14,5 @@ MD5 75dda0e477834ba5a6c5c88cfb402fe7 files/digest-hostap-driver-0.1.1 71
 MD5 5c57e0825ccb41c219c9d86c6a9114e5 files/digest-hostap-driver-0.1.2 71
 MD5 44d9961555b48c6445ebe7bd24d33b4a files/digest-hostap-driver-0.1.3 515
 MD5 fe9ca923fd63e570f4f47be989fd810f files/digest-hostap-driver-0.2.4 441
+MD5 702e5e315551f06833fde599816fd65a files/digest-hostap-driver-0.2.5 441
 MD5 afb604f5408986228ad8cc60236339dc files/hostap-driver-0.1.2.firmware.diff.bz2 590
diff --git a/net-wireless/hostap-driver/files/digest-hostap-driver-0.2.5 b/net-wireless/hostap-driver/files/digest-hostap-driver-0.2.5
new file mode 100644
index 000000000000..cbb75bc1293e
--- /dev/null
+++ b/net-wireless/hostap-driver/files/digest-hostap-driver-0.2.5
@@ -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 6afe257b11554b17c228f7ca8c7ce0d4 hostap-driver-0.2.5.tar.gz 195923
diff --git a/net-wireless/hostap-driver/hostap-driver-0.2.5.ebuild b/net-wireless/hostap-driver/hostap-driver-0.2.5.ebuild
new file mode 100644
index 000000000000..b4e46a80d0f7
--- /dev/null
+++ b/net-wireless/hostap-driver/hostap-driver-0.2.5.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2004 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.5.ebuild,v 1.1 2004/10/25 15:15:30 brix Exp $
+
+inherit pcmcia kernel-mod eutils
+
+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"
+IUSE=""
+SLOT="0"
+
+DEPEND="!net-wireless/hostap
+		virtual/linux-sources
+		sys-apps/sed"
+RDEPEND=">=net-wireless/wireless-tools-25"
+
+src_unpack() {
+	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."
+		eerror ""
+		die "CONFIG_NET_RADIO support not detected."
+	fi
+
+	kernel-mod_check_modules_supported
+
+	unpack ${A}
+
+	# unpack the pcmcia-cs sources if needed
+	pcmcia_src_unpack
+
+	# set compiler options
+	sed -i "s:gcc:${CC}:" ${S}/Makefile
+
+	# 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=:PCMCIA_PATH=${PCMCIA_SOURCE_DIR}:" ${S}/Makefile
+	fi
+
+	# install to /lib/modules/${KV}/net
+	sed -i "s:\$(MODPATH)/kernel/drivers/net/wireless:\$(MODPATH)/net:g" ${S}/Makefile
+	sed -i "s:MODPATH_CS \:= \$(MODPATH)/pcmcia:MODPATH_CS \:= \$(MODPATH)/net:" ${S}/Makefile
+
+	# let pkg_postinst() handle depmod
+	sed -i "s:/sbin/depmod -ae; \\\:\\\:" ${S}/Makefile
+	sed -i "s:/sbin/depmod -ae::" ${S}/Makefile
+
+	if ! use pcmcia &> /dev/null
+	then
+		# remove install_pccard dependency from install_2.4 target
+		sed -i "s#^\(install_2.4:.*\)install_pccard#\1#" ${S}/Makefile
+	fi
+
+	kernel-mod_getversion
+
+	if [ ${KV_MINOR} -gt 5 ] && [ ${KV_PATCH} -gt 5 ]
+	then
+		sed -i "s:SUBDIRS=:M=:" ${S}/Makefile
+	fi
+}
+
+src_compile() {
+	pcmcia_configure
+
+	set_arch_to_kernel
+	emake all || die "emake failed"
+	set_arch_to_portage
+}
+
+src_install() {
+	# Makefile relies on existing /lib/modules/${KV}
+	dodir /lib/modules/${KV}
+
+	if use pcmcia &> /dev/null
+	then
+		# pcmcia configuration file is only installed if /etc/pcmcia exist
+		dodir /etc/pcmcia
+	else
+		# make sure we do not install the hostap_cs module
+		rm -rf ${S}/driver/modules/hostap_cs.*o
+	fi
+
+	set_arch_to_kernel
+	emake DESTDIR=${D} install || die "emake install failed"
+	set_arch_to_portage
+
+	dodoc README ChangeLog
+}
+
+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}
+
+	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 ""
+
+}
diff --git a/net-wireless/hostapd/ChangeLog b/net-wireless/hostapd/ChangeLog
index 2625e8bafdf3..d43f3b018852 100644
--- a/net-wireless/hostapd/ChangeLog
+++ b/net-wireless/hostapd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-wireless/hostapd
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/ChangeLog,v 1.6 2004/09/14 16:27:09 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/ChangeLog,v 1.7 2004/10/25 15:18:01 brix Exp $
+
+*hostapd-0.2.5 (25 Oct 2004)
+
+  25 Oct 2004; Henrik Brix Andersen <brix@gentoo.org> +hostapd-0.2.5.ebuild:
+  Version bump. Cleaned up ebuild.
 
 *hostapd-0.2.4 (14 Sep 2004)
 
diff --git a/net-wireless/hostapd/Manifest b/net-wireless/hostapd/Manifest
index f0949d6e6337..f84794c85b1c 100644
--- a/net-wireless/hostapd/Manifest
+++ b/net-wireless/hostapd/Manifest
@@ -1,9 +1,11 @@
+MD5 f0ab503fd41547f20614c8cbda8adfbb hostapd-0.2.5.ebuild 916
 MD5 8c5cbf74029fa880a86e6295b68dbd46 hostapd-0.2.4.ebuild 1053
 MD5 ca46d551f562c29077111b2addbcac49 hostapd-0.1.3.ebuild 1057
-MD5 37607b14abd3dcecd37b48d7ad9972a9 ChangeLog 814
+MD5 d84550fc1d709ea8b15d37e8ef1ef992 ChangeLog 957
 MD5 755b0c19833b65f75572eb3b0f7fe2c8 hostapd-0.1.0.ebuild 1050
 MD5 b852e83aa853d08d6f30ce4a89bf557d metadata.xml 461
 MD5 ebaf0a97df860deb10127e44d8c9f4de files/digest-hostapd-0.1.0 64
 MD5 7c806d26277486d29515a6658707a2fe files/digest-hostapd-0.1.3 64
 MD5 44285ed8dadd7473eb41d3b67f318120 files/digest-hostapd-0.2.4 65
+MD5 ba14f3282c1fe345b2b9bc3233bc2f6d files/digest-hostapd-0.2.5 65
 MD5 cf287b50f0ccd832a08fb3031281cd4f files/hostapd.init.d 858
diff --git a/net-wireless/hostapd/files/digest-hostapd-0.2.5 b/net-wireless/hostapd/files/digest-hostapd-0.2.5
new file mode 100644
index 000000000000..0a3165540090
--- /dev/null
+++ b/net-wireless/hostapd/files/digest-hostapd-0.2.5
@@ -0,0 +1 @@
+MD5 4714f9f405001be1e14c63c985eaa7e8 hostapd-0.2.5.tar.gz 139697
diff --git a/net-wireless/hostapd/hostapd-0.2.5.ebuild b/net-wireless/hostapd/hostapd-0.2.5.ebuild
new file mode 100644
index 000000000000..292b21b1ae9a
--- /dev/null
+++ b/net-wireless/hostapd/hostapd-0.2.5.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/hostapd-0.2.5.ebuild,v 1.1 2004/10/25 15:18:01 brix Exp $
+
+inherit eutils
+
+DESCRIPTION="HostAP wireless daemon"
+HOMEPAGE="http://hostap.epitest.fi"
+SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz"
+LICENSE="GPL-2"
+
+KEYWORDS="~x86"
+IUSE=""
+SLOT="0"
+
+DEPEND=">=net-wireless/hostap-driver-0.1.0"
+
+src_unpack() {
+	unpack ${A}
+
+	sed -i "s:^CC=gcc:CC=${CC}:" ${S}/Makefile
+}
+
+src_compile() {
+	emake || die "emake failed"
+}
+
+src_install() {
+	insinto /etc/hostapd
+	doins hostapd.conf hostapd.accept hostapd.deny
+
+	dosed 's:\(accept_mac_file=\)/etc/hostapd.accept:\1/etc/hostapd/hostapd.accept:g' \
+		/etc/hostapd/hostapd.conf
+	dosed 's:\(deny_mac_file=\)/etc/hostapd.deny:\1/etc/hostapd/hostapd.deny:g' \
+		/etc/hostapd/hostapd.conf
+
+	dosbin hostapd
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/hostapd.init.d hostapd
+
+	dodoc ChangeLog developer.txt README
+}