Bumping to 3.1

Package-Manager: portage-2.2.0_alpha54/cvs/Linux i686

4 files changed, 111 insertions, 10 deletions

diff --git a/net-wireless/iw/ChangeLog b/net-wireless/iw/ChangeLog
index 9c8f426a072b..07804f89b643 100644
--- a/net-wireless/iw/ChangeLog
+++ b/net-wireless/iw/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-wireless/iw
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/iw/ChangeLog,v 1.35 2011/08/19 09:19:40 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/iw/ChangeLog,v 1.36 2011/09/09 23:17:31 gurligebis Exp $
+
+*iw-3.1 (09 Sep 2011)
+
+  09 Sep 2011; <gurligebis@gentoo.org> -iw-3.0.ebuild, +iw-3.1.ebuild,
+  +files/iw-3.1_libnl-3-support.patch:
+  Bumping to 3.1 and adding support for libnl 3.0 and 3.1
 
 *iw-3.0 (19 Aug 2011)
 
diff --git a/net-wireless/iw/Manifest b/net-wireless/iw/Manifest
index 30e045f97244..20e6913925c6 100644
--- a/net-wireless/iw/Manifest
+++ b/net-wireless/iw/Manifest
@@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX iw-3.1_libnl-3-support.patch 2236 RMD160 37fcef0593849eb04c82af14f7b681656355864e SHA1 560dff546b4b3a087b0edc847b9d1879d14b9abf SHA256 134b1a5426ee37d58a6babc4f590842ed14ec9f75c3f9eb6dbb25092a33eb1aa
 DIST iw-0.9.17.tar.bz2 38410 RMD160 2f43b0a85a5831b824c461abf5083d024cb80e1d SHA1 ca2afc3cdf553a9231fcd7ad59e74cf964fb4b9d SHA256 fe41d6a9034ccc6d60d1d074db3f90ed1d186e34dfacdf941ced51148d5f7c6e
 DIST iw-0.9.22.tar.bz2 50526 RMD160 bfc65cb72f1dbd73674b5207577882500c7ac253 SHA1 a91226daab473d1aa0b6586c61f1c62db9618b7d SHA256 138ce4dc827d8b0af55fe1c444e749b985c1540d791b27922aad880d12908bb1
-DIST iw-3.0.tar.bz2 56543 RMD160 fbdaf430e0f03aa975cf5a416bd6604740c32318 SHA1 46817671757fae640d4ec3b36d54f4cc73604bad SHA256 a0ccbf1ce71ae4bdb05495ca18ab00a87c06dce2c3bf8b8358c615e60c4632fb
+DIST iw-3.1.tar.bz2 57450 RMD160 fee741d20e2f253d51eab0062d2ff2df61159618 SHA1 559636c4f73485db6fd4bf6f438e60fe5f23f569 SHA256 24e69f2596827669b2f47f033bd502c003e6f1ff58ccbeeb1cff9cdc56ae828a
 EBUILD iw-0.9.17.ebuild 739 RMD160 05fe3ef618cd1ab53f7de2ad0adac151587451b8 SHA1 0ac2a33d0d478925b01980dc21ccc3b491b3b746 SHA256 53beb92709f764471afefbd252f6ffa954586313671ee0acce9c35707ec7c3ff
 EBUILD iw-0.9.22.ebuild 740 RMD160 93097e834f009ef55ea0396196924eefffb0824d SHA1 77c1fece6443d8365183964e379c26aa3f185843 SHA256 f6776f7120c82fa61f42f541cc2464f2896bf2d2e09a8bbd35c420b249931820
-EBUILD iw-3.0.ebuild 743 RMD160 c01c36ae75ea83861a22e373be04e07116ab8a2f SHA1 becc6da17cc386a686b116324c4f572d49ea1598 SHA256 3d23751725362a28b2885ed902e371d4dbad59ec4e50e8e8e1e8cf37d02691a7
-MISC ChangeLog 4900 RMD160 58760344cfc93d11dc9119d158763af18ac04a9d SHA1 0676fd266e3d342121baf36ca5a60aad30063f1e SHA256 eaa9392c2461f05b9b567806b7fcc16eef4c758be0ff563a592762cae2e1938d
+EBUILD iw-3.1.ebuild 826 RMD160 520cf473dd186820e9b5551701e34e19d83e022f SHA1 8cb32f2e490f9a91bbf4a402f7c37bee0eae39db SHA256 34550d92fe5c0c17d0860bd890024b3eea0e75b3ae8078c90f39b87703b04e73
+MISC ChangeLog 5092 RMD160 656ca6d8c7d36a630eabda9d8befa3e5d0db14e0 SHA1 e7a018f3ef7225e261ad0f434e007a8e8e1bb0df SHA256 92bac5c0e4afdbdb96b63079b3b0fa4d46b70f49ef338284fb5235497bd4fd9f
 MISC metadata.xml 266 RMD160 974ea7dd6366f634220e0ea386461698cda21c6d SHA1 f83af88a6910d8264de7b7daf3ebfad2692fb94c SHA256 864d85997e305935d284c9aa53fd2b81f261fed43be238e699682f7e8d360904
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5OKmsACgkQsR7PQhRXYEl5WACfRisT4hjyB9zsSW5+C++DjDlB
-TwAAniCe/1pKwaOESE3Yw8ocTFJeKDpY
-=6t6H
+iEYEARECAAYFAk5qnpEACgkQsR7PQhRXYEnJlACfSBJdY0tnd/GNUZ5HpqQTme6/
+SZ8An2v6OqqlqAoc8RHYipZDIdd7MwXI
+=maaF
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/iw/files/iw-3.1_libnl-3-support.patch b/net-wireless/iw/files/iw-3.1_libnl-3-support.patch
new file mode 100644
index 000000000000..001d3a64c3b4
--- /dev/null
+++ b/net-wireless/iw/files/iw-3.1_libnl-3-support.patch
@@ -0,0 +1,88 @@
+diff -aurp a/iw.c b/iw.c
+--- a/iw.c	2011-09-09 23:08:55.539173966 +0000
++++ b/iw.c	2011-09-09 23:10:31.139170016 +0000
+@@ -23,9 +23,8 @@
+ #include "nl80211.h"
+ #include "iw.h"
+ 
+-#ifndef CONFIG_LIBNL20
+-/* libnl 2.0 compatibility code */
+-
++/* libnl 1.x compatibility code */
++#if !defined(CONFIG_LIBNL20) && !defined(CONFIG_LIBNL30) && !defined(CONFIG_LIBNL31)
+ static inline struct nl_handle *nl_socket_alloc(void)
+ {
+ 	return nl_handle_alloc();
+@@ -45,7 +44,7 @@ static inline int __genl_ctrl_alloc_cach
+ 	return 0;
+ }
+ #define genl_ctrl_alloc_cache __genl_ctrl_alloc_cache
+-#endif /* CONFIG_LIBNL20 */
++#endif /* CONFIG_LIBNL20 && CONFIG_LIBNL30 && CONFIG_LIBNL31 */
+ 
+ int iw_debug = 0;
+ 
+diff -aurp a/iw.h b/iw.h
+--- a/iw.h	2011-09-09 23:08:55.539173966 +0000
++++ b/iw.h	2011-09-09 23:11:28.149167067 +0000
+@@ -11,7 +11,8 @@
+ 
+ #define ETH_ALEN 6
+ 
+-#ifndef CONFIG_LIBNL20
++/* libnl 1.x compatibility code */
++#if !defined(CONFIG_LIBNL20) && !defined(CONFIG_LIBNL30) && !defined(CONFIG_LIBNL31)
+ #  define nl_sock nl_handle
+ #endif
+ 
+diff -aurp a/Makefile b/Makefile
+--- a/Makefile	2011-09-09 23:08:55.539173966 +0000
++++ b/Makefile	2011-09-09 23:12:49.528163734 +0000
+@@ -24,6 +24,8 @@ ALL = iw
+ 
+ NL1FOUND := $(shell $(PKG_CONFIG) --atleast-version=1 libnl-1 && echo Y)
+ NL2FOUND := $(shell $(PKG_CONFIG) --atleast-version=2 libnl-2.0 && echo Y)
++NL3FOUND := $(shell $(PKG_CONFIG) --atleast-version=3 libnl-3.0 && echo Y)
++NL31FOUND := $(shell $(PKG_CONFIG) --atleast-version=3 libnl-3.1 && echo Y)
+ 
+ ifeq ($(NL1FOUND),Y)
+ NLLIBNAME = libnl-1
+@@ -35,6 +37,18 @@ LIBS += -lnl-genl
+ NLLIBNAME = libnl-2.0
+ endif
+ 
++ifeq ($(NL3FOUND),Y)
++CFLAGS += -DCONFIG_LIBNL30
++LIBS += -lnl-genl
++NLLIBNAME = libnl-3.0
++endif
++
++ifeq ($(NL31FOUND),Y)
++CFLAGS += -DCONFIG_LIBNL31
++LIBS += -lnl-genl
++NLLIBNAME = libnl-3.1
++endif
++
+ ifeq ($(NLLIBNAME),)
+ $(error Cannot find development files for any supported version of libnl)
+ endif
+@@ -53,6 +67,10 @@ endif
+ all: version_check $(ALL)
+ 
+ version_check:
++ifeq ($(NL31FOUND),Y)
++else
++ifeq ($(NL3FOUND),Y)
++else
+ ifeq ($(NL2FOUND),Y)
+ else
+ ifeq ($(NL1FOUND),Y)
+@@ -60,6 +78,8 @@ else
+ 	$(error No libnl found)
+ endif
+ endif
++endif
++endif
+ 
+ 
+ VERSION_OBJS := $(filter-out version.o, $(OBJS))
diff --git a/net-wireless/iw/iw-3.0.ebuild b/net-wireless/iw/iw-3.1.ebuild
index fda0ff891529..549d855a8e3e 100644
--- a/net-wireless/iw/iw-3.0.ebuild
+++ b/net-wireless/iw/iw-3.1.ebuild
@@ -1,12 +1,14 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/iw/iw-3.0.ebuild,v 1.1 2011/08/19 09:19:40 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/iw/iw-3.1.ebuild,v 1.1 2011/09/09 23:17:31 gurligebis Exp $
 
-inherit toolchain-funcs
+EAPI="2"
+
+inherit toolchain-funcs eutils
 
 DESCRIPTION="nl80211-based configuration utility for wireless devices using the mac80211 kernel stack"
 HOMEPAGE="http://wireless.kernel.org/en/users/Documentation/iw"
-SRC_URI="http://wireless.kernel.org/download/${PN}/${P}.tar.bz2"
+SRC_URI="http://linuxwireless.org/download/${PN}/${P}.tar.bz2"
 
 LICENSE="as-is"
 SLOT="0"
@@ -20,6 +22,10 @@ DEPEND="${RDEPEND}
 CC=$(tc-getCC)
 LD=$(tc-getLD)
 
+src_prepare() {
+	epatch "${FILESDIR}/${P}_libnl-3-support.patch"
+}
+
 src_install() {
 	emake install DESTDIR="${D}" || die "Failed to install"
 }