New upstream release, incorporating build & coding style fixes by Diego E. "Flameeyes" Pettenò <flameeyes@gentoo.org>. Removed old ebuild.

(Portage version: 2.1.6_rc2/cvs/Linux 2.6.28-rc6-00007-ged31348-dirty x86_64)

3 files changed, 11 insertions, 62 deletions

diff --git a/net-wireless/crda/ChangeLog b/net-wireless/crda/ChangeLog
index 9a7c9763b34e..8bc5f25ad532 100644
--- a/net-wireless/crda/ChangeLog
+++ b/net-wireless/crda/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-wireless/crda
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/crda/ChangeLog,v 1.3 2008/12/01 18:23:05 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/crda/ChangeLog,v 1.4 2008/12/02 11:09:31 chainsaw Exp $
+
+*crda-0.9.5 (02 Dec 2008)
+
+  02 Dec 2008; <chainsaw@gentoo.org> -files/0.9.4-as-needed.patch,
+  -crda-0.9.4.ebuild, +crda-0.9.5.ebuild:
+  New upstream release, incorporating build & coding style fixes by Diego E.
+  "Flameeyes" Pettenò <flameeyes@gentoo.org>. Removed old ebuild.
 
   01 Dec 2008; Diego E. Pettenò <flameeyes@gentoo.org>
   files/0.9.4-as-needed.patch:
diff --git a/net-wireless/crda/crda-0.9.4.ebuild b/net-wireless/crda/crda-0.9.5.ebuild
index 04ff50db3b63..93a9968bfa05 100644
--- a/net-wireless/crda/crda-0.9.4.ebuild
+++ b/net-wireless/crda/crda-0.9.5.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/crda/crda-0.9.4.ebuild,v 1.2 2008/12/01 14:06:51 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/crda/crda-0.9.5.ebuild,v 1.1 2008/12/02 11:09:31 chainsaw Exp $
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Central Regulatory Domain Agent for wireless networks."
 HOMEPAGE="http://wireless.kernel.org/en/developers/Regulatory"
@@ -18,14 +18,8 @@ DEPEND="dev-libs/libgcrypt
 	net-wireless/wireless-regdb"
 RDEPEND="${DEPEND}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PV}-as-needed.patch"
-}
-
 src_compile() {
-	emake -j1 CC="$(tc-getCC)" || die "Compilation failed"
+	emake CC="$(tc-getCC)" || die "Compilation failed"
 }
 
 src_install() {
diff --git a/net-wireless/crda/files/0.9.4-as-needed.patch b/net-wireless/crda/files/0.9.4-as-needed.patch
deleted file mode 100644
index d1ec507477f4..000000000000
--- a/net-wireless/crda/files/0.9.4-as-needed.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Fix building with --as-needed LD flag.
-
-From: Diego E. 'Flameeyes' Pettenò <flameeyes@gmail.com>
-
-When using GNU ld --as-needed option, you need to ensure that the
-order of parameters to the linker is formally correct, with libraries
-coming after the object files. For this reason, don't use LDFLAGS for
-passing the libraries, and make sure that LDLIBS goes at the end of
-the line.
-
-Signed-off-by: Diego E. 'Flameeyes' Pettenò <flameeyes@gmail.com>
----
-
- Makefile |   10 +++++-----
- 1 files changed, 5 insertions(+), 5 deletions(-)
-
-
-diff --git a/Makefile b/Makefile
-index 91c4329..25a92fe 100644
---- a/Makefile
-+++ b/Makefile
-@@ -7,9 +7,9 @@ PUBKEY_DIR=pubkeys
- 
- CFLAGS += -Wall -g
- #CFLAGS += -DUSE_OPENSSL `pkg-config --cflags openssl`
--#LDFLAGS += `pkg-config --libs openssl`
-+#LDLIBS += `pkg-config --libs openssl`
- CFLAGS += -DUSE_GCRYPT
--LDFLAGS += -lgcrypt
-+LDLIBS += -lgcrypt
- 
- MKDIR ?= mkdir -p
- INSTALL ?= install
-@@ -35,15 +35,15 @@ keys-%.c: utils/key2pub.py $(PUBKEY_DIR)/$(wildcard *.pem)
- 
- crda: keys-ssl.c keys-gcrypt.c reglib.o crda.o
- 	$(NQ) '  LD  ' $@
--	$(Q)$(CC) $(CFLAGS) $(LDFLAGS) `pkg-config --libs libnl-1` -o $@ reglib.o crda.o
-+	$(Q)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ reglib.o crda.o `pkg-config --libs libnl-1` $(LDLIBS)
- 
- regdbdump: keys-ssl.c keys-gcrypt.c reglib.o regdbdump.o
- 	$(NQ) '  LD  ' $@
--	$(Q)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ reglib.o regdbdump.o
-+	$(Q)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ reglib.o regdbdump.o $(LDLIBS)
- 
- intersect: keys-ssl.c keys-gcrypt.c reglib.o intersect.o
- 	$(NQ) '  LD  ' $@
--	$(Q)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ reglib.o intersect.o
-+	$(Q)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ reglib.o intersect.o $(LDLIBS)
- 
- verify: $(REG_BIN) regdbdump
- 	$(NQ) '  CHK  $(REG_BIN)'