Dependency cleanup

(Portage version: 2.0.53)

8 files changed, 36 insertions, 26 deletions

diff --git a/media-libs/libdvb/ChangeLog b/media-libs/libdvb/ChangeLog
index e312e668c8d1..0a218525a840 100644
--- a/media-libs/libdvb/ChangeLog
+++ b/media-libs/libdvb/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libdvb
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvb/ChangeLog,v 1.21 2005/12/11 14:48:07 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvb/ChangeLog,v 1.22 2005/12/13 11:37:30 zzam Exp $
+
+  13 Dec 2005; Matthias Schwarzott <zzam@gentoo.org> libdvb-0.5.0-r1.ebuild,
+  libdvb-0.5.0-r2.ebuild, libdvb-0.5.5.ebuild, libdvb-0.5.5-r1.ebuild,
+  libdvb-0.5.5.1.ebuild, libdvb-0.5.5.1-r1.ebuild:
+  Dependency cleanup
 
   11 Dec 2005; Matthias Schwarzott <zzam@gentoo.org> libdvb-0.5.0-r2.ebuild,
   libdvb-0.5.5-r1.ebuild, libdvb-0.5.5.1.ebuild, libdvb-0.5.5.1-r1.ebuild:
diff --git a/media-libs/libdvb/Manifest b/media-libs/libdvb/Manifest
index 3feada31a79e..97eae15a8f5b 100644
--- a/media-libs/libdvb/Manifest
+++ b/media-libs/libdvb/Manifest
@@ -9,10 +9,10 @@ MD5 69502406503f38e60bd8e35f2f80e586 files/errno.patch 258
 MD5 76dfb6639fdd6868d34b0eec46123c06 files/libdvb-0.5.0-gentoo.patch 2448
 MD5 2be0eba6ba9919ca334c327d3310a254 files/libdvb-0.5.5-gentoo.patch 1065
 MD5 34510a9d50277d893ab3a8b316291349 files/libdvb-0.5.5.1-gentoo.patch 1052
-MD5 ea65129ec98a5fa97e7ed60dd668379b libdvb-0.5.0-r1.ebuild 1099
-MD5 752cc635811b37bae3c243f7c998a6c7 libdvb-0.5.0-r2.ebuild 1116
-MD5 90b30f47a95776e89ce2871606f8c875 libdvb-0.5.5-r1.ebuild 1341
-MD5 b1f6eca3c6dbca2c54e3764895176d6f libdvb-0.5.5.1-r1.ebuild 1246
-MD5 4a26b4c9792672096d17cf555b800eb0 libdvb-0.5.5.1.ebuild 1230
-MD5 e235f63dea425107a874d58b48cee69f libdvb-0.5.5.ebuild 1324
+MD5 3449653217abe959a85f6aec2815847d libdvb-0.5.0-r1.ebuild 1062
+MD5 1d19f55e68f1d5267bd20504aba906b4 libdvb-0.5.0-r2.ebuild 1120
+MD5 6501e2a7f8c376de325a11bebcc417c3 libdvb-0.5.5-r1.ebuild 1345
+MD5 a91de9e92434597a82129176ef11a610 libdvb-0.5.5.1-r1.ebuild 1268
+MD5 1d65cad04d83606a59d73d7251557183 libdvb-0.5.5.1.ebuild 1234
+MD5 a4aaf0f426a3475595848c0dfb882a79 libdvb-0.5.5.ebuild 1330
 MD5 46b3654b1563aad69c575e55e8d67b61 metadata.xml 220
diff --git a/media-libs/libdvb/libdvb-0.5.0-r1.ebuild b/media-libs/libdvb/libdvb-0.5.0-r1.ebuild
index 0f0c0934dba3..a15c5dce8361 100644
--- a/media-libs/libdvb/libdvb-0.5.0-r1.ebuild
+++ b/media-libs/libdvb/libdvb-0.5.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvb/libdvb-0.5.0-r1.ebuild,v 1.11 2005/08/06 12:02:19 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvb/libdvb-0.5.0-r1.ebuild,v 1.12 2005/12/13 11:37:30 zzam Exp $
 
 inherit eutils
 
@@ -13,11 +13,9 @@ SLOT="0"
 KEYWORDS="~alpha amd64 ~ia64 ppc x86"
 IUSE=""
 
-DEPEND=">=sys-apps/sed-4
-	|| (
-		>=sys-kernel/linux-headers-2.6.11-r2
-		media-tv/linuxtv-dvb
-	)"
+RDEPEND="media-tv/linuxtv-dvb-headers"
+
+DEPEND="${RDEPEND}"
 
 src_unpack() {
 	unpack ${A} && cd "${S}"
diff --git a/media-libs/libdvb/libdvb-0.5.0-r2.ebuild b/media-libs/libdvb/libdvb-0.5.0-r2.ebuild
index e88d22678858..fd665ff18e0c 100644
--- a/media-libs/libdvb/libdvb-0.5.0-r2.ebuild
+++ b/media-libs/libdvb/libdvb-0.5.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvb/libdvb-0.5.0-r2.ebuild,v 1.2 2005/12/11 14:48:07 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvb/libdvb-0.5.0-r2.ebuild,v 1.3 2005/12/13 11:37:30 zzam Exp $
 
 inherit eutils
 
@@ -13,8 +13,9 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86"
 IUSE=""
 
-DEPEND=">=sys-apps/sed-4
-	media-tv/linuxtv-dvb-headers"
+RDEPEND="media-tv/linuxtv-dvb-headers"
+
+DEPEND="${RDEPEND}"
 
 src_unpack() {
 	unpack ${A} && cd "${S}"
diff --git a/media-libs/libdvb/libdvb-0.5.5-r1.ebuild b/media-libs/libdvb/libdvb-0.5.5-r1.ebuild
index 3bc2581a2973..20e24cbac490 100644
--- a/media-libs/libdvb/libdvb-0.5.5-r1.ebuild
+++ b/media-libs/libdvb/libdvb-0.5.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvb/libdvb-0.5.5-r1.ebuild,v 1.2 2005/12/11 14:48:07 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvb/libdvb-0.5.5-r1.ebuild,v 1.3 2005/12/13 11:37:30 zzam Exp $
 
 inherit eutils
 
@@ -13,8 +13,9 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86"
 IUSE="doc"
 
-DEPEND=">=sys-apps/sed-4
-	media-tv/linuxtv-dvb-headers"
+RDEPEND="media-tv/linuxtv-dvb-headers"
+
+DEPEND="${RDEPEND}"
 
 src_unpack() {
 	unpack ${A} && cd "${S}"
diff --git a/media-libs/libdvb/libdvb-0.5.5.1-r1.ebuild b/media-libs/libdvb/libdvb-0.5.5.1-r1.ebuild
index 9c2bf97ade14..5b248472d150 100644
--- a/media-libs/libdvb/libdvb-0.5.5.1-r1.ebuild
+++ b/media-libs/libdvb/libdvb-0.5.5.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvb/libdvb-0.5.5.1-r1.ebuild,v 1.3 2005/12/11 14:48:07 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvb/libdvb-0.5.5.1-r1.ebuild,v 1.4 2005/12/13 11:37:30 zzam Exp $
 
 inherit eutils
 
@@ -13,7 +13,9 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86"
 IUSE="doc"
 
-DEPEND="media-tv/linuxtv-dvb-headers"
+RDEPEND="media-tv/linuxtv-dvb-headers"
+
+DEPEND="${RDEPEND}"
 
 src_unpack() {
 	unpack ${A}
diff --git a/media-libs/libdvb/libdvb-0.5.5.1.ebuild b/media-libs/libdvb/libdvb-0.5.5.1.ebuild
index 1b2d8c0b4a75..fe9291c6f1de 100644
--- a/media-libs/libdvb/libdvb-0.5.5.1.ebuild
+++ b/media-libs/libdvb/libdvb-0.5.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvb/libdvb-0.5.5.1.ebuild,v 1.2 2005/12/11 14:48:07 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvb/libdvb-0.5.5.1.ebuild,v 1.3 2005/12/13 11:37:30 zzam Exp $
 
 inherit eutils
 
@@ -13,8 +13,9 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86"
 IUSE="doc"
 
-DEPEND=">=sys-apps/sed-4
-	media-tv/linuxtv-dvb-headers"
+RDEPEND="media-tv/linuxtv-dvb-headers"
+
+DEPEND="${RDEPEND}"
 
 src_unpack() {
 	unpack ${A} && cd "${S}"
diff --git a/media-libs/libdvb/libdvb-0.5.5.ebuild b/media-libs/libdvb/libdvb-0.5.5.ebuild
index 79458d43c58b..5dc92fac840a 100644
--- a/media-libs/libdvb/libdvb-0.5.5.ebuild
+++ b/media-libs/libdvb/libdvb-0.5.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvb/libdvb-0.5.5.ebuild,v 1.6 2005/10/18 01:35:56 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvb/libdvb-0.5.5.ebuild,v 1.7 2005/12/13 11:37:30 zzam Exp $
 
 inherit eutils
 
@@ -13,12 +13,14 @@ SLOT="0"
 KEYWORDS="alpha ~amd64 ia64 ppc ~x86"
 IUSE="doc"
 
-DEPEND=">=sys-apps/sed-4
+RDEPEND="
 	|| (
 		>=sys-kernel/linux-headers-2.6.11-r2
 		media-tv/linuxtv-dvb
 	)"
 
+DEPEND="${RDEPEND}"
+
 src_unpack() {
 	unpack ${A} && cd "${S}"