Version bump, patches are upstream (bug #257443).

(Portage version: 2.1.6.7/cvs/Linux x86_64)

6 files changed, 11 insertions, 143 deletions

diff --git a/net-wireless/iw/ChangeLog b/net-wireless/iw/ChangeLog
index e7105ccaa260..b32630acec61 100644
--- a/net-wireless/iw/ChangeLog
+++ b/net-wireless/iw/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-wireless/iw
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/iw/ChangeLog,v 1.3 2009/01/13 21:05:41 rbu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/iw/ChangeLog,v 1.4 2009/02/04 20:13:50 rbu Exp $
+
+*iw-0.9.9 (04 Feb 2009)
+
+  04 Feb 2009; Robert Buchholz <rbu@gentoo.org>
+  -files/iw-0.9.7-cflags.patch, -files/iw-0.9.7-ldflags.patch,
+  -files/iw-0_p20080605-ldflags.patch, -iw-0_p20080605.ebuild,
+  -iw-0.9.7.ebuild, +iw-0.9.9.ebuild:
+  Version bump, patches are upstream (bug #257443).
 
   13 Jan 2009; Robert Buchholz <rbu@gentoo.org> iw-0.9.7.ebuild:
   iw-0.9.7 needs >=dev-libs/libnl-1.1, bug #254402 by selex
diff --git a/net-wireless/iw/files/iw-0.9.7-cflags.patch b/net-wireless/iw/files/iw-0.9.7-cflags.patch
deleted file mode 100644
index 6fbebd437c2b..000000000000
--- a/net-wireless/iw/files/iw-0.9.7-cflags.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From da069ce18c72ec1bf2a15121a0aefb69a6756490 Mon Sep 17 00:00:00 2001
-From: Robert Buchholz <rbu@goodpoint.de>
-Date: Wed, 7 Jan 2009 15:46:13 +0100
-Subject: [PATCH] Do not set -O2 -g CFLAGS if CFLAGS are already defined (in the env).
-
----
- Makefile |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 8a97bae..5a0385b 100644
---- a/Makefile
-+++ b/Makefile
-@@ -10,8 +10,8 @@ MKDIR ?= mkdir -p
- INSTALL ?= install
- CC ?= "gcc"
- 
-+CFLAGS ?= -O2 -g
- CFLAGS += -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing -fno-common -Werror-implicit-function-declaration `pkg-config --cflags libnl-1`
--CFLAGS += -O2 -g
- LIBS += `pkg-config --libs libnl-1`
- NLVERSION = 1.0
- 
--- 
-1.6.0.4
-
diff --git a/net-wireless/iw/files/iw-0.9.7-ldflags.patch b/net-wireless/iw/files/iw-0.9.7-ldflags.patch
deleted file mode 100644
index 9f876a58dd53..000000000000
--- a/net-wireless/iw/files/iw-0.9.7-ldflags.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 9b2e7e6e695370ae3d01c3f341f4ab9d8d13efcf Mon Sep 17 00:00:00 2001
-From: Mike Auty <mike.auty@gmail.com>
-Date: Fri, 12 Dec 2008 22:47:16 +0100
-Subject: [PATCH] allow compilation using --as-needed
-
----
- Makefile |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index df59b51..8a97bae 100644
---- a/Makefile
-+++ b/Makefile
-@@ -12,7 +12,7 @@ CC ?= "gcc"
- 
- CFLAGS += -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing -fno-common -Werror-implicit-function-declaration `pkg-config --cflags libnl-1`
- CFLAGS += -O2 -g
--LDFLAGS += `pkg-config --libs libnl-1`
-+LIBS += `pkg-config --libs libnl-1`
- NLVERSION = 1.0
- 
- OBJS = iw.o info.o phy.o interface.o station.o util.o mpath.o reg.o mesh.o genl.o
-@@ -42,7 +42,7 @@ version.h: version.sh
- 
- iw:	$(OBJS)
- 	@$(NQ) ' CC  ' iw
--	$(Q)$(CC) $(LDFLAGS) $(OBJS) -o iw
-+	$(Q)$(CC) $(LDFLAGS) $(OBJS) $(LIBS) -o iw
- 
- check:
- 	$(Q)$(MAKE) all CC="REAL_CC=$(CC) CHECK=\"sparse -Wall\" cgcc"
--- 
-1.6.0.4
-
diff --git a/net-wireless/iw/files/iw-0_p20080605-ldflags.patch b/net-wireless/iw/files/iw-0_p20080605-ldflags.patch
deleted file mode 100644
index 80f2aa012b69..000000000000
--- a/net-wireless/iw/files/iw-0_p20080605-ldflags.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 28da3ed85b4f876b91d9412f83cefb0318185c8e Mon Sep 17 00:00:00 2001
-From: Robert Buchholz <rbu@goodpoint.de>
-Date: Mon, 5 Jan 2009 05:53:56 +0100
-Subject: [PATCH] Make iw use LIBS instead of LDFLAGS
-
-When linking with LDFLAGS such as -Wl,--as-needed, gcc behaves
-strictly with respect to the order of object and libraries.
-LDFLAGS need to be specified before objects whereas libraries
-need to be specified after objects using their symbols.
-
-Furthermore, do not impose -O2 -g CFLAGS on anyone who
-has global CFLAGS defined.
----
- Makefile |    6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index f8f07ed..1f1ce44 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,10 +1,10 @@
- MAKEFLAGS += --no-print-directory
- 
- CC ?= "gcc"
-+CFLAGS ?= -O2 -g
- CFLAGS += -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing -fno-common -Werror-implicit-function-declaration
- CFLAGS += -I/lib/modules/`uname -r`/build/include
--CFLAGS += -O2 -g
--LDFLAGS += -lnl
-+LIBS += -lnl
- 
- OBJS = iw.o interface.o info.o station.o util.o mpath.o
- ALL = iw
-@@ -25,7 +25,7 @@ all: $(ALL)
- 
- iw:	$(OBJS)
- 	@$(NQ) ' LD       ' iw
--	$(Q)$(CC) $(LDFLAGS) $(OBJS) -o iw
-+	$(Q)$(CC) $(LDFLAGS) $(OBJS) $(LIBS) -o iw
- 
- check:
- 	$(Q)$(MAKE) all CC="REAL_CC=$(CC) CHECK=\"sparse -Wall\" cgcc"
--- 
-1.6.0.4
-
diff --git a/net-wireless/iw/iw-0.9.7.ebuild b/net-wireless/iw/iw-0.9.9.ebuild
index 752c6c968609..476daccdd113 100644
--- a/net-wireless/iw/iw-0.9.7.ebuild
+++ b/net-wireless/iw/iw-0.9.9.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/iw/iw-0.9.7.ebuild,v 1.2 2009/01/13 21:05:41 rbu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/iw/iw-0.9.9.ebuild,v 1.1 2009/02/04 20:13:50 rbu Exp $
 
-EAPI=2
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="nl80211-based configuration utility for wireless devices using the mac80211 kernel stack"
 HOMEPAGE="http://wireless.kernel.org/en/users/Documentation/iw"
@@ -21,11 +20,6 @@ RDEPEND=">=dev-libs/libnl-1.1"
 CC=$(tc-getCC)
 LD=$(tc-getLD)
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ldflags.patch
-	epatch "${FILESDIR}"/${P}-cflags.patch
-}
-
 src_install() {
 	emake install DESTDIR="${D}" || die "Failed to install"
 }
diff --git a/net-wireless/iw/iw-0_p20080605.ebuild b/net-wireless/iw/iw-0_p20080605.ebuild
deleted file mode 100644
index 28ebcc0d8c93..000000000000
--- a/net-wireless/iw/iw-0_p20080605.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/iw/iw-0_p20080605.ebuild,v 1.1 2009/01/05 05:03:08 rbu Exp $
-
-EAPI=2
-inherit eutils toolchain-funcs
-
-DESCRIPTION="nl80211 userspace tool for use with aircrack-ng"
-HOMEPAGE="http://www.aircrack-ng.org"
-SRC_URI="http://dl.aircrack-ng.org/${PN}.tar.bz2 -> ${P}.tar.bz2"
-
-IUSE=""
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND=">=dev-libs/libnl-1.1"
-RDEPEND="${DEPEND}"
-
-CC=$(tc-getCC)
-LD=$(tc-getLD)
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ldflags.patch
-}
-
-src_install() {
-	emake DESTDIR="${D}/usr" install
-}