Added support for libnl-3.1

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

6 files changed, 77 insertions, 74 deletions

diff --git a/net-wireless/crda/ChangeLog b/net-wireless/crda/ChangeLog
index 9a344589fea9..dbb2425ab43f 100644
--- a/net-wireless/crda/ChangeLog
+++ b/net-wireless/crda/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-wireless/crda
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/crda/ChangeLog,v 1.22 2011/09/06 18:32:29 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/crda/ChangeLog,v 1.23 2011/09/10 07:24:04 gurligebis Exp $
+
+  10 Sep 2011; <gurligebis@gentoo.org> +files/libnl31-support.diff,
+  -crda-1.1.0.ebuild, -crda-1.1.1.ebuild, crda-1.1.2.ebuild, metadata.xml:
+  Adding myself to maintainers, removing old versions and adding
+  support for libnl-3.1 .
 
   06 Sep 2011; Matt Turner <mattst88@gentoo.org> crda-1.1.2.ebuild:
   Added ~mips, bug 374735
diff --git a/net-wireless/crda/crda-1.1.0.ebuild b/net-wireless/crda/crda-1.1.0.ebuild
deleted file mode 100644
index b24e8243da7a..000000000000
--- a/net-wireless/crda/crda-1.1.0.ebuild
+++ /dev/null
@@ -1,35 +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/crda/crda-1.1.0.ebuild,v 1.1 2009/05/13 13:23:37 chainsaw Exp $
-
-inherit toolchain-funcs multilib
-
-DESCRIPTION="Central Regulatory Domain Agent for wireless networks."
-HOMEPAGE="http://wireless.kernel.org/en/developers/Regulatory"
-SRC_URI="http://wireless.kernel.org/download/crda/${P}.tar.bz2"
-LICENSE="as-is"
-SLOT="0"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-RDEPEND="dev-libs/libgcrypt
-	dev-libs/libnl
-	net-wireless/wireless-regdb"
-DEPEND="${RDEPEND}
-	dev-python/m2crypto"
-
-src_unpack() {
-	unpack ${A}
-
-	##Make sure we install the rules where udev rules go...
-	sed -i -e "/^UDEV_RULE_DIR/s:lib:$(get_libdir):" "${S}"/Makefile || die \
-	"Makefile sed failed"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" || die "Compilation failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-}
diff --git a/net-wireless/crda/crda-1.1.1.ebuild b/net-wireless/crda/crda-1.1.1.ebuild
deleted file mode 100644
index 5f0f9fea05f3..000000000000
--- a/net-wireless/crda/crda-1.1.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/crda/crda-1.1.1.ebuild,v 1.1 2010/01/26 17:02:57 chainsaw Exp $
-
-inherit toolchain-funcs multilib
-
-DESCRIPTION="Central Regulatory Domain Agent for wireless networks."
-HOMEPAGE="http://wireless.kernel.org/en/developers/Regulatory"
-SRC_URI="http://wireless.kernel.org/download/crda/${P}.tar.bz2"
-LICENSE="as-is"
-SLOT="0"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-RDEPEND="dev-libs/libgcrypt
-	dev-libs/libnl
-	net-wireless/wireless-regdb"
-DEPEND="${RDEPEND}
-	dev-python/m2crypto"
-
-src_unpack() {
-	unpack ${A}
-
-	##Make sure we install the rules where udev rules go...
-	sed -i -e "/^UDEV_RULE_DIR/s:lib:$(get_libdir):" "${S}"/Makefile || die \
-	"Makefile sed failed"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" || die "Compilation failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-}
diff --git a/net-wireless/crda/crda-1.1.2.ebuild b/net-wireless/crda/crda-1.1.2.ebuild
index c6b9c6a36425..22d4d603668c 100644
--- a/net-wireless/crda/crda-1.1.2.ebuild
+++ b/net-wireless/crda/crda-1.1.2.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/crda/crda-1.1.2.ebuild,v 1.3 2011/09/06 18:32:29 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/crda/crda-1.1.2.ebuild,v 1.4 2011/09/10 07:24:04 gurligebis Exp $
 
-inherit toolchain-funcs multilib
+EAPI="2"
+
+inherit toolchain-funcs multilib eutils
 
 DESCRIPTION="Central Regulatory Domain Agent for wireless networks."
 HOMEPAGE="http://wireless.kernel.org/en/developers/Regulatory"
-SRC_URI="http://wireless.kernel.org/download/crda/${P}.tar.bz2"
+SRC_URI="http://linuxwireless.org/download/crda/${P}.tar.bz2"
 LICENSE="as-is"
 SLOT="0"
 
@@ -20,6 +22,10 @@ DEPEND="${RDEPEND}
 RDEPEND="${RDEPEND}
 	>=sys-fs/udev-152"
 
+src_prepare() {
+	epatch "${FILESDIR}/libnl31-support.diff"
+}
+
 src_compile() {
 	emake CC="$(tc-getCC)" all_noverify || die "Compilation failed"
 }
diff --git a/net-wireless/crda/files/libnl31-support.diff b/net-wireless/crda/files/libnl31-support.diff
new file mode 100644
index 000000000000..caa28997096f
--- /dev/null
+++ b/net-wireless/crda/files/libnl31-support.diff
@@ -0,0 +1,58 @@
+diff -aurp a/crda.c b/crda.c
+--- a/crda.c	2011-09-09 23:36:23.742094512 +0000
++++ b/crda.c	2011-09-09 23:36:02.109096391 +0000
+@@ -21,7 +21,7 @@
+ #include "regdb.h"
+ #include "reglib.h"
+ 
+-#if !defined(CONFIG_LIBNL20) && !defined(CONFIG_LIBNL30)
++#if !defined(CONFIG_LIBNL20) && !defined(CONFIG_LIBNL30) && !defined(CONFIG_LIBNL31)
+ /* libnl 2.0 compatibility code */
+ static inline struct nl_handle *nl_socket_alloc(void)
+ {
+@@ -44,7 +44,7 @@ static inline int __genl_ctrl_alloc_cach
+ 
+ #define genl_ctrl_alloc_cache __genl_ctrl_alloc_cache
+ #define nl_sock nl_handle
+-#endif /* CONFIG_LIBNL20 && CONFIG_LIBNL30 */
++#endif /* CONFIG_LIBNL20 && CONFIG_LIBNL30 && CONFIG_LIBNL31 */
+ 
+ struct nl80211_state {
+ 	struct nl_sock *nl_sock;
+diff -aurp a/Makefile b/Makefile
+--- a/Makefile	2011-09-09 23:36:23.743094561 +0000
++++ b/Makefile	2011-09-09 23:36:02.109096391 +0000
+@@ -48,19 +48,26 @@ INSTALL ?= install
+ 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 ($(NL3FOUND),Y)
++ifeq ($(NL31FOUND),Y)
+ CFLAGS += -DCONFIG_LIBNL30
+ NLLIBS += -lnl-genl
+-NLLIBNAME = libnl-3.0
++NLLIBNAME = libnl-3.1
+ else
+-	ifeq ($(NL2FOUND),Y)
+-	CFLAGS += -DCONFIG_LIBNL20
++	ifeq ($(NL3FOUND),Y)
++	CFLAGS += -DCONFIG_LIBNL30
+ 	NLLIBS += -lnl-genl
+-	NLLIBNAME = libnl-2.0
++	NLLIBNAME = libnl-3.0
+ 	else
+-		ifeq ($(NL1FOUND),Y)
+-		NLLIBNAME = libnl-1
++		ifeq ($(NL2FOUND),Y)
++		CFLAGS += -DCONFIG_LIBNL20
++		NLLIBS += -lnl-genl
++		NLLIBNAME = libnl-2.0
++		else
++			ifeq ($(NL1FOUND),Y)
++			NLLIBNAME = libnl-1
++			endif
+ 		endif
+ 	endif
+ endif
diff --git a/net-wireless/crda/metadata.xml b/net-wireless/crda/metadata.xml
index 38462a3ac7d3..eab5dd556fc2 100644
--- a/net-wireless/crda/metadata.xml
+++ b/net-wireless/crda/metadata.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
+		<email>gurligebis@gentoo.org</email>
+		<name>Bjarke Istrup Pedersen</name>
+	</maintainer>
+	<maintainer>
 		<email>chainsaw@gentoo.org</email>
 		<name>Tony Vroon</name>
 	</maintainer>