Bumping to 2.2, fixing #512606

(Portage version: 2.2.10/cvs/Linux i686, signed Manifest commit with key 15AE484C)

3 files changed, 8 insertions, 32 deletions

diff --git a/net-wireless/hostapd/ChangeLog b/net-wireless/hostapd/ChangeLog
index 1671d6ab8c68..5bf9f10aabd6 100644
--- a/net-wireless/hostapd/ChangeLog
+++ b/net-wireless/hostapd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-wireless/hostapd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/ChangeLog,v 1.148 2014/05/01 01:22:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/ChangeLog,v 1.149 2014/06/06 16:23:18 gurligebis Exp $
+
+*hostapd-2.2 (06 Jun 2014)
+
+  06 Jun 2014; <gurligebis@gentoo.org> -hostapd-2.1-r1.ebuild,
+  +hostapd-2.2.ebuild, -files/hostapd-2.1-Fix-nt_password_hash-build.patch:
+  Bumping to 2.2, fixing #512606
 
   01 May 2014; Mike Frysinger <vapier@gentoo.org>
   +files/hostapd-2.1-Fix-nt_password_hash-build.patch, hostapd-2.1-r1.ebuild:
diff --git a/net-wireless/hostapd/files/hostapd-2.1-Fix-nt_password_hash-build.patch b/net-wireless/hostapd/files/hostapd-2.1-Fix-nt_password_hash-build.patch
deleted file mode 100644
index c8f745fef17d..000000000000
--- a/net-wireless/hostapd/files/hostapd-2.1-Fix-nt_password_hash-build.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-fix from upstream git repo
-
-From 9aab81145a6ce26272b198419d288a0417e683c5 Mon Sep 17 00:00:00 2001
-From: Jouni Malinen <j@w1.fi>
-Date: Sat, 15 Feb 2014 11:49:09 +0200
-Subject: [PATCH] Fix nt_password_hash build
-
-This needs librt on some systems for clock_gettime().
-
-Signed-off-by: Jouni Malinen <j@w1.fi>
----
- hostapd/Makefile | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/hostapd/Makefile b/hostapd/Makefile
-index 5fd6481..ef093e5 100644
---- a/hostapd/Makefile
-+++ b/hostapd/Makefile
-@@ -95,6 +95,7 @@ ifeq ($(CONFIG_ELOOP), eloop)
- LIBS += -lrt
- LIBS_c += -lrt
- LIBS_h += -lrt
-+LIBS_n += -lrt
- endif
- 
- OBJS += ../src/utils/common.o
--- 
-1.9.2
-
diff --git a/net-wireless/hostapd/hostapd-2.1-r1.ebuild b/net-wireless/hostapd/hostapd-2.2.ebuild
index 0528214cc799..5be072600b33 100644
--- a/net-wireless/hostapd/hostapd-2.1-r1.ebuild
+++ b/net-wireless/hostapd/hostapd-2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/hostapd-2.1-r1.ebuild,v 1.3 2014/05/01 01:22:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/hostapd-2.2.ebuild,v 1.1 2014/06/06 16:23:18 gurligebis Exp $
 
 EAPI="4"
 
@@ -28,7 +28,6 @@ RDEPEND="${DEPEND}"
 S="${S}/${PN}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-Fix-nt_password_hash-build.patch
 	sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \
 		"${S}/hostapd.conf" || die
 }