5 files changed, 24 insertions, 65 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/Manifest b/net-wireless/crda/Manifest
index 82669f7f1fbd..9990699d3881 100644
--- a/net-wireless/crda/Manifest
+++ b/net-wireless/crda/Manifest
@@ -1,7 +1,14 @@
-DIST crda-0.9.5.tar.bz2 17484 RMD160 360627f2074caefabfb63a5ffad29f11048fd812 SHA1 2b01b8d403be1902017bbc62edd6f6534bbebac6 SHA256 94b62ed0566437e82f8053e5d30c9c61e011699ae4435e3b289e5f33a9af7267
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST crda-1.0.1.tar.bz2 21013 RMD160 9fd99a0cac4e09926b9a97ded4f3f6e3f27298b2 SHA1 5574374fed2de53a0bee49702d6e7448c0c1bf5c SHA256 6b0cfb4d0340b6e239488a46ce92c8d26cec84fe0da06d4c7b7327bf0e932f1f
-EBUILD crda-0.9.5.ebuild 772 RMD160 f89c81c4af8a1f860a71c3f31ec8a058dfb2c264 SHA1 3b9e552c1783e595b14be707ac0d42262c8787af SHA256 bdc745ec1adea66f870aae5ec9046bf436ee8c0f91ce4005793782f8bdd82a70
-EBUILD crda-1.0.1-r1.ebuild 967 RMD160 8b4c0a8b5ec1a37372e89db57ec351d8d59b4000 SHA1 b2bc5ae7c5b09550f1b2d6a61e0cfa038c796a1f SHA256 ea8e9561b9bffc6e518b17f0e224c0cb6521bf846ae86b434236b79c8ff2d9af
-EBUILD crda-1.0.1.ebuild 774 RMD160 d382a84d17ccbe2098de49766cf257114a1b923d SHA1 e818b88d19e5c42b722c1db88262e2e20452a83d SHA256 bf0c68a8a26a3b23d17e85da40d5ab501abbc329badae9a566b25747484547f5
-MISC ChangeLog 2559 RMD160 e1c33cb1d188c8266c55d3e336a5c6625536eb55 SHA1 4dff947f523e098daba6b27bc04b05ce6b6a21e2 SHA256 44d45e6675fc2348be73521d5af3a6a36c9e693c79903cefd489b4d55be83545
+EBUILD crda-1.0.1-r1.ebuild 970 RMD160 b714775198f46eb77696d9ebb71506f83a9986bf SHA1 0e24f4007edd69303ed05c54ef5adfd191fcb901 SHA256 ee6bf339586794d1d835c19ff625f1f7c0c35cbd11c3c8843958ea1b6023ba51
+MISC ChangeLog 2849 RMD160 9992933d04f71acde68bded7caad7a55075ec5d3 SHA1 f9a6dc58dd21c709d888c067dc43253820884a36 SHA256 8aac5a7fd3083568493dea586a5b207ed03a52c31ee79ad00e22aba9e7f2ea70
 MISC metadata.xml 336 RMD160 5387d69e2ba5c7a8060b0f9bcdf7bfc37e5fd8f2 SHA1 34ec6dc7cb06c173cbba3ce497251270854c4d77 SHA256 07f98714b59da38fd6421dff80c36347116f7913f306397f327f24fb3292f02a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.10 (GNU/Linux)
+
+iEYEARECAAYFAknBDWkACgkQp5vW4rUFj5rivgCeMsODj0JI1cVHeA3Rjo3zOotW
+X6MAniBKZdj+TySZR8va963Px1kqpCkL
+=qU4D
+-----END PGP SIGNATURE-----
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"
-}