Fixing multilib problem and removing old versions.

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

4 files changed, 10 insertions, 84 deletions

diff --git a/net-wireless/crda/ChangeLog b/net-wireless/crda/ChangeLog
index 67703f0ba124..f9940cdf57fc 100644
--- a/net-wireless/crda/ChangeLog
+++ b/net-wireless/crda/ChangeLog
@@ -1,6 +1,12 @@
 # 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.29 2011/11/07 21:07:54 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/crda/ChangeLog,v 1.30 2011/11/12 09:46:20 gurligebis Exp $
+
+*crda-1.1.2-r2 (12 Nov 2011)
+
+  12 Nov 2011; <gurligebis@gentoo.org> -crda-1.0.2.ebuild, -crda-1.1.2.ebuild,
+  -crda-1.1.2-r1.ebuild, +crda-1.1.2-r2.ebuild:
+  Fixing multilib problem and removing old versions.
 
 *crda-1.1.2-r1 (07 Nov 2011)
 
diff --git a/net-wireless/crda/crda-1.0.2.ebuild b/net-wireless/crda/crda-1.0.2.ebuild
deleted file mode 100644
index 9e35117c3139..000000000000
--- a/net-wireless/crda/crda-1.0.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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.0.2.ebuild,v 1.2 2011/10/27 16:07:00 jer Exp $
-
-EAPI="1"
-
-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:1.1
-	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-r1.ebuild b/net-wireless/crda/crda-1.1.2-r2.ebuild
index c1a1a5eab1bf..983f0b31ad53 100644
--- a/net-wireless/crda/crda-1.1.2-r1.ebuild
+++ b/net-wireless/crda/crda-1.1.2-r2.ebuild
@@ -1,6 +1,6 @@
 # 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-r1.ebuild,v 1.1 2011/11/07 21:07:54 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/crda/crda-1.1.2-r2.ebuild,v 1.1 2011/11/12 09:46:20 gurligebis Exp $
 
 EAPI=4
 inherit eutils toolchain-funcs
@@ -31,7 +31,7 @@ src_prepare() {
 }
 
 src_compile() {
-	emake UDEV_RULE_DIR=/etc/udev/rules.d/ USE_OPENSSL=1 CC="$(tc-getCC)" all_noverify
+	emake UDEV_RULE_DIR=/etc/udev/rules.d/ REG_BIN=/usr/$(get_libdir)/crda/regulatory.bin USE_OPENSSL=1 CC="$(tc-getCC)" all_noverify
 }
 
 src_test() {
@@ -39,6 +39,6 @@ src_test() {
 }
 
 src_install() {
-	emake UDEV_RULE_DIR=/etc/udev/rules.d/ USE_OPENSSL=1 DESTDIR="${D}" install
+	emake UDEV_RULE_DIR=/etc/udev/rules.d/ REG_BIN=/usr/$(get_libdir)/crda/regulatory.bin USE_OPENSSL=1 DESTDIR="${D}" install
 	keepdir /etc/wireless-regdb/pubkeys
 }
diff --git a/net-wireless/crda/crda-1.1.2.ebuild b/net-wireless/crda/crda-1.1.2.ebuild
deleted file mode 100644
index 44de826a5753..000000000000
--- a/net-wireless/crda/crda-1.1.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# 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.7 2011/10/30 16:47:07 ssuominen Exp $
-
-EAPI=4
-inherit eutils toolchain-funcs
-
-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 ~mips ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/libgcrypt
-	dev-libs/libnl:1.1
-	net-wireless/wireless-regdb"
-DEPEND="${RDEPEND}
-	dev-python/m2crypto"
-RDEPEND="${RDEPEND}
-	>=sys-fs/udev-152"
-
-src_prepare() {
-	epatch "${FILESDIR}"/libnl31-support.diff
-
-	sed -i \
-		-e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
-		Makefile || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" all_noverify
-}
-
-src_test() {
-	emake CC="$(tc-getCC)" verify
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-}