Bumping to 1.0 and removing old version

(Portage version: 2.2.0_alpha103/cvs/Linux i686)

3 files changed, 10 insertions, 192 deletions

diff --git a/net-wireless/hostapd/ChangeLog b/net-wireless/hostapd/ChangeLog
index ff917ca16206..63995079a377 100644
--- a/net-wireless/hostapd/ChangeLog
+++ b/net-wireless/hostapd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-wireless/hostapd
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/ChangeLog,v 1.118 2012/04/17 11:29:32 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/ChangeLog,v 1.119 2012/05/10 20:02:41 gurligebis Exp $
+
+*hostapd-1.0 (10 May 2012)
+
+  10 May 2012; <gurligebis@gentoo.org> -hostapd-0.6.9.ebuild,
+  -hostapd-1.0_rc3.ebuild, +hostapd-1.0.ebuild:
+  Bumping to 1.0 and removing old version
 
 *hostapd-1.0_rc3 (17 Apr 2012)
 
diff --git a/net-wireless/hostapd/hostapd-0.6.9.ebuild b/net-wireless/hostapd/hostapd-0.6.9.ebuild
deleted file mode 100644
index 8e0e926935cf..000000000000
--- a/net-wireless/hostapd/hostapd-0.6.9.ebuild
+++ /dev/null
@@ -1,187 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/hostapd-0.6.9.ebuild,v 1.7 2011/10/27 17:12:33 jer Exp $
-
-EAPI="2"
-
-inherit toolchain-funcs
-
-DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
-HOMEPAGE="http://hostap.epitest.fi"
-SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz"
-
-LICENSE="|| ( GPL-2 BSD )"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="ipv6 logwatch madwifi +ssl +wps"
-
-DEPEND="ssl? ( dev-libs/openssl )
-	dev-libs/libnl:1.1
-	madwifi? ( ||
-		( >net-wireless/madwifi-ng-tools-0.9.3
-		net-wireless/madwifi-old ) )"
-RDEPEND="${DEPEND}"
-
-S="${S}/hostapd"
-
-src_prepare() {
-	sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \
-		"${S}/hostapd.conf"
-}
-
-src_configure() {
-	local CONFIG="${S}/.config"
-
-	# toolchain setup
-	echo "CC = $(tc-getCC)" > ${CONFIG}
-
-	# EAP authentication methods
-	echo "CONFIG_EAP=y" >> ${CONFIG}
-	echo "CONFIG_EAP_MD5=y" >> ${CONFIG}
-
-	if use ssl; then
-		# SSL authentication methods
-		echo "CONFIG_EAP_TLS=y" >> ${CONFIG}
-		echo "CONFIG_EAP_TTLS=y" >> ${CONFIG}
-		echo "CONFIG_EAP_MSCHAPV2=y" >> ${CONFIG}
-		echo "CONFIG_EAP_PEAP=y" >> ${CONFIG}
-	fi
-
-	if use wps; then
-		# Enable Wi-Fi Protected Setup
-		echo "CONFIG_WPS=y" >> ${CONFIG}
-		echo "CONFIG_WPS_UPNP=y" >> ${CONFIG}
-		einfo "Enabling Wi-Fi Protected Setup support"
-	fi
-
-	echo "CONFIG_EAP_GTC=y" >> ${CONFIG}
-	echo "CONFIG_EAP_SIM=y" >> ${CONFIG}
-	echo "CONFIG_EAP_AKA=y" >> ${CONFIG}
-	echo "CONFIG_EAP_PAX=y" >> ${CONFIG}
-	echo "CONFIG_EAP_PSK=y" >> ${CONFIG}
-	echo "CONFIG_EAP_SAKE=y" >> ${CONFIG}
-	echo "CONFIG_EAP_GPSK=y" >> ${CONFIG}
-	echo "CONFIG_EAP_GPSK_SHA256=y" >> ${CONFIG}
-
-	einfo "Enabling drivers: "
-
-	# drivers
-	echo "CONFIG_DRIVER_HOSTAP=y" >> ${CONFIG}
-	einfo "  HostAP driver enabled"
-	echo "CONFIG_DRIVER_WIRED=y" >> ${CONFIG}
-	einfo "  Wired driver enabled"
-	echo "CONFIG_DRIVER_PRISM54=y" >> ${CONFIG}
-	einfo "  Prism54 driver enabled"
-
-	if use madwifi; then
-		# Add include path for madwifi-driver headers
-		einfo "  Madwifi driver enabled"
-		echo "CFLAGS += -I/usr/include/madwifi" >> ${CONFIG}
-		echo "CONFIG_DRIVER_MADWIFI=y" >> ${CONFIG}
-	else
-		einfo "  Madwifi driver disabled"
-	fi
-
-	einfo "  nl80211 driver enabled"
-	echo "CONFIG_DRIVER_NL80211=y" >> ${CONFIG}
-	echo "CFLAGS += -I/usr/include/netlink" >> ${CONFIG}
-	echo "LIBS += -L/usr/lib" >> ${CONFIG}
-
-	# misc
-	echo "CONFIG_PKCS12=y" >> ${CONFIG}
-	echo "CONFIG_RADIUS_SERVER=y" >> ${CONFIG}
-	echo "CONFIG_IAPP=y" >> ${CONFIG}
-	echo "CONFIG_IEEE80211R=y" >> ${CONFIG}
-	echo "CONFIG_IEEE80211W=y" >> ${CONFIG}
-	echo "CONFIG_IEEE80211N=y" >> ${CONFIG}
-	echo "CONFIG_PEERKEY=y" >> ${CONFIG}
-	echo "CONFIG_RSN_PREAUTH=y" >> ${CONFIG}
-
-	if use ipv6; then
-		# IPv6 support
-		echo "CONFIG_IPV6=y" >> ${CONFIG}
-	fi
-
-	# TODO: Add support for BSD drivers
-
-	default_src_configure
-}
-
-src_compile() {
-	default_src_compile
-
-	#emake || die "emake failed"
-
-	if use ssl; then
-		emake nt_password_hash || die "emake nt_password_hash failed"
-		emake hlr_auc_gw || die "emake hlr_auc_gw failed"
-	fi
-}
-
-src_install() {
-	insinto /etc/hostapd
-	doins hostapd.conf hostapd.accept hostapd.deny \
-		hostapd.eap_user hostapd.radius_clients hostapd.sim_db hostapd.wpa_psk
-
-	dosbin hostapd
-	dobin hostapd_cli
-
-	use ssl && dobin nt_password_hash
-	use ssl && dobin hlr_auc_gw
-
-	newinitd "${FILESDIR}"/${PN}-init.d hostapd
-	newconfd "${FILESDIR}"/${PN}-conf.d hostapd
-
-	doman hostapd.8 hostapd_cli.1
-
-	dodoc ChangeLog README
-	if use wps; then
-		dodoc README-WPS
-	fi
-
-	docinto examples
-	dodoc wired.conf
-
-	if use logwatch; then
-		insinto /etc/log.d/conf/services/
-		doins logwatch/hostapd.conf
-
-		exeinto /etc/log.d/scripts/services/
-		doexe logwatch/hostapd
-	fi
-}
-
-pkg_postinst() {
-	einfo
-	einfo "In order to use ${PN} you need to set up your wireless card"
-	einfo "for master mode in /etc/conf.d/net and then start"
-	einfo "/etc/init.d/hostapd."
-	einfo
-	einfo "Example configuration:"
-	einfo
-	einfo "config_wlan0=( \"192.168.1.1/24\" )"
-	einfo "channel_wlan0=\"6\""
-	einfo "essid_wlan0=\"test\""
-	einfo "mode_wlan0=\"master\""
-	einfo
-	if use madwifi; then
-		einfo "This package compiles against the headers installed by"
-		einfo "madwifi-old, madwifi-ng or madwifi-ng-tools."
-		einfo "You should remerge ${PN} after upgrading these packages."
-		einfo
-		einfo "Since you are using the madwifi-ng driver, you should disable or"
-		einfo "comment out wme_enabled from hostapd.conf, since it will"
-		einfo "cause problems otherwise (see bug #260377"
-	fi
-	#if [ -e "${KV_DIR}"/net/mac80211 ]; then
-	#	einfo "This package now compiles against the headers installed by"
-	#	einfo "the kernel source for the mac80211 driver. You should "
-	#	einfo "re-emerge ${PN} after upgrading your kernel source."
-	#fi
-
-	if use wps; then
-		einfo "You have enabled Wi-Fi Protected Setup support, please"
-		einfo "read the README-WPS file in /usr/share/doc/${P}"
-		einfo "for info on how to use WPS"
-	fi
-}
diff --git a/net-wireless/hostapd/hostapd-1.0_rc3.ebuild b/net-wireless/hostapd/hostapd-1.0.ebuild
index 7a66ca035df4..05a88193fa21 100644
--- a/net-wireless/hostapd/hostapd-1.0_rc3.ebuild
+++ b/net-wireless/hostapd/hostapd-1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/hostapd-1.0_rc3.ebuild,v 1.1 2012/04/17 11:29:32 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/hostapd-1.0.ebuild,v 1.1 2012/05/10 20:02:41 gurligebis Exp $
 
 EAPI="2"
 
@@ -8,12 +8,11 @@ inherit toolchain-funcs eutils
 
 DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
 HOMEPAGE="http://hostap.epitest.fi"
-#SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz"
-SRC_URI="http://dev.gentoo.org/~gurligebis/files/hostapd/hostapd-1.0_rc3.tar.gz"
+SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz"
 
 LICENSE="|| ( GPL-2 BSD )"
 SLOT="0"
-KEYWORDS="-*"
+KEYWORDS="~amd64 ~mips ~ppc ~x86"
 IUSE="debug ipv6 logwatch madwifi +ssl +wps"
 
 DEPEND="ssl? ( dev-libs/openssl )