Read udev.pc pkg-config file for correct udevdir. Missing virtual/pkgconfig DEPEND wrt #421057.

(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)

3 files changed, 68 insertions, 3 deletions

diff --git a/net-wireless/crda/ChangeLog b/net-wireless/crda/ChangeLog
index 846a2b318755..841d3b9be957 100644
--- a/net-wireless/crda/ChangeLog
+++ b/net-wireless/crda/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-wireless/crda
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/crda/ChangeLog,v 1.41 2012/08/08 20:00:00 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/crda/ChangeLog,v 1.42 2012/08/10 08:55:44 ssuominen Exp $
+
+*crda-1.1.2-r4 (10 Aug 2012)
+
+  10 Aug 2012; Samuli Suominen <ssuominen@gentoo.org> +crda-1.1.2-r4.ebuild:
+  Read udev.pc pkg-config file for correct udevdir. Missing virtual/pkgconfig
+  DEPEND wrt #421057.
 
   08 Aug 2012; Brent Baude <ranger@gentoo.org> crda-1.1.2-r3.ebuild:
   Marking crda-1.1.2-r3 ppc for bug 419909
diff --git a/net-wireless/crda/crda-1.1.2-r3.ebuild b/net-wireless/crda/crda-1.1.2-r3.ebuild
index 599903852823..801189761575 100644
--- a/net-wireless/crda/crda-1.1.2-r3.ebuild
+++ b/net-wireless/crda/crda-1.1.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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-r3.ebuild,v 1.7 2012/08/08 20:00:00 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/crda/crda-1.1.2-r3.ebuild,v 1.8 2012/08/10 08:55:44 ssuominen Exp $
 
 EAPI=4
 inherit eutils toolchain-funcs python
@@ -19,7 +19,8 @@ RDEPEND="dev-libs/openssl
 	net-wireless/wireless-regdb"
 DEPEND="${RDEPEND}
 	dev-python/m2crypto
-	=dev-lang/python-2*"
+	=dev-lang/python-2*
+	virtual/pkgconfig"
 RDEPEND="${RDEPEND}
 	>=sys-fs/udev-152"
 
diff --git a/net-wireless/crda/crda-1.1.2-r4.ebuild b/net-wireless/crda/crda-1.1.2-r4.ebuild
new file mode 100644
index 000000000000..b67e09e8af4d
--- /dev/null
+++ b/net-wireless/crda/crda-1.1.2-r4.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2012 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-r4.ebuild,v 1.1 2012/08/10 08:55:44 ssuominen Exp $
+
+EAPI=4
+inherit eutils toolchain-funcs python
+
+DESCRIPTION="Central Regulatory Domain Agent for wireless networks."
+HOMEPAGE="http://wireless.kernel.org/en/developers/Regulatory"
+SRC_URI="http://linuxwireless.org/download/crda/${P}.tar.bz2"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="dev-libs/openssl:0
+	dev-libs/libnl
+	net-wireless/wireless-regdb
+	>=sys-fs/udev-152"
+DEPEND="${RDEPEND}
+	dev-python/m2crypto
+	=dev-lang/python-2*
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/libnl31-support.diff
+
+	python_convert_shebangs 2 utils/key2pub.py
+
+	sed -i \
+		-e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
+		Makefile || die
+}
+
+src_compile() {
+	emake \
+		UDEV_RULE_DIR="$($(tc-getPKG_CONFIG) --variable=udevdir udev)/rules.d" \
+		REG_BIN=/usr/$(get_libdir)/crda/regulatory.bin \
+		USE_OPENSSL=1 \
+		CC="$(tc-getCC)" \
+		all_noverify
+}
+
+src_test() {
+	emake USE_OPENSSL=1 CC="$(tc-getCC)" verify
+}
+
+src_install() {
+	emake \
+		UDEV_RULE_DIR="$($(tc-getPKG_CONFIG) --variable=udevdir udev)/rules.d" \
+		REG_BIN=/usr/$(get_libdir)/crda/regulatory.bin \
+		USE_OPENSSL=1 \
+		DESTDIR="${D}" \
+		install
+
+	keepdir /etc/wireless-regdb/pubkeys
+}