Correctly separate out DEPEND/RDEPEND based on wireless.kernel.org dependency listings. Closes bug #262914 filed by Wolfram Schlich <wschlich@gentoo.org>. Delete obsolete ebuilds.

(Portage version: 2.1.6.7/cvs/Linux x86_64)

4 files changed, 12 insertions, 60 deletions

diff --git a/net-wireless/crda/ChangeLog b/net-wireless/crda/ChangeLog
index c0160881ee00..17b8ea776608 100644
--- a/net-wireless/crda/ChangeLog
+++ b/net-wireless/crda/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-wireless/crda
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/crda/ChangeLog,v 1.14 2009/03/15 13:55:01 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/crda/ChangeLog,v 1.15 2009/03/18 15:06:02 chainsaw Exp $
+
+  18 Mar 2009; <chainsaw@gentoo.org> -crda-0.9.5.ebuild, -crda-1.0.1.ebuild,
+  crda-1.0.1-r1.ebuild:
+  Correctly separate out DEPEND/RDEPEND based on wireless.kernel.org
+  dependency listings. Closes bug #262914 filed by Wolfram Schlich
+  <wschlich@gentoo.org>. Delete obsolete ebuilds.
 
   15 Mar 2009; Brent Baude <ranger@gentoo.org> crda-1.0.1-r1.ebuild:
   Marking crda-1.0.1-r1 ppc64 for bug 256245
diff --git a/net-wireless/crda/crda-0.9.5.ebuild b/net-wireless/crda/crda-0.9.5.ebuild
deleted file mode 100644
index 1fcfc0687bf0..000000000000
--- a/net-wireless/crda/crda-0.9.5.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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.5.ebuild,v 1.4 2008/12/02 17:03:21 ranger Exp $
-
-inherit toolchain-funcs
-
-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=""
-DEPEND="dev-libs/libgcrypt
-	dev-libs/libnl
-	dev-python/m2crypto
-	net-wireless/wireless-regdb"
-RDEPEND="${DEPEND}"
-
-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.0.1-r1.ebuild b/net-wireless/crda/crda-1.0.1-r1.ebuild
index daea644d0e75..ff5c171305a5 100644
--- a/net-wireless/crda/crda-1.0.1-r1.ebuild
+++ b/net-wireless/crda/crda-1.0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.0.1-r1.ebuild,v 1.5 2009/03/15 13:55:01 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/crda/crda-1.0.1-r1.ebuild,v 1.6 2009/03/18 15:06:02 chainsaw Exp $
 
 inherit toolchain-funcs multilib
 
@@ -12,11 +12,11 @@ SLOT="0"
 
 KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
-DEPEND="dev-libs/libgcrypt
-	dev-libs/libnl
-	dev-python/m2crypto
+RDEPEND="dev-libs/libnl
 	net-wireless/wireless-regdb"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	dev-libs/libgcrypt
+	dev-python/m2crypto"
 
 src_unpack() {
 	unpack ${A}
diff --git a/net-wireless/crda/crda-1.0.1.ebuild b/net-wireless/crda/crda-1.0.1.ebuild
deleted file mode 100644
index 4fccaa26d926..000000000000
--- a/net-wireless/crda/crda-1.0.1.ebuild
+++ /dev/null
@@ -1,27 +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.0.1.ebuild,v 1.1 2009/01/24 22:15:24 chainsaw Exp $
-
-inherit toolchain-funcs
-
-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=""
-DEPEND="dev-libs/libgcrypt
-	dev-libs/libnl
-	dev-python/m2crypto
-	net-wireless/wireless-regdb"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	emake CC="$(tc-getCC)" || die "Compilation failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-}