Cleaned up dvb-dependencies

(Portage version: 2.1_pre6-r3)

6 files changed, 46 insertions, 24 deletions

diff --git a/media-video/vls/ChangeLog b/media-video/vls/ChangeLog
index bdf1cb350a2b..226f4f45d586 100644
--- a/media-video/vls/ChangeLog
+++ b/media-video/vls/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/vls
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vls/ChangeLog,v 1.22 2006/03/01 17:54:36 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vls/ChangeLog,v 1.23 2006/03/18 12:34:34 zzam Exp $
+
+  18 Mar 2006; Matthias Schwarzott <zzam@gentoo.org> vls-0.5.5-r1.ebuild,
+  vls-0.5.6-r1.ebuild, vls-0.5.6-r2.ebuild:
+  Cleaned up dvb-dependencies
 
   01 Mar 2006; Patrick McLean <chutzpah@gentoo.org> vls-0.5.6-r2.ebuild:
   Add ~amd64.
diff --git a/media-video/vls/Manifest b/media-video/vls/Manifest
index 760437a7d435..91f3d8e3058d 100644
--- a/media-video/vls/Manifest
+++ b/media-video/vls/Manifest
@@ -4,9 +4,9 @@ SHA256 9e1559ac720e6ebca39ad216615c65c95118de827ee41ec5f18cae6c91496b67 ChangeLo
 MD5 c02a9033fcb3db177a39b972ffb0cc6d files/digest-vls-0.5.5 61
 RMD160 575d034dda77eb56f6bdfda846bcf0f66c050d15 files/digest-vls-0.5.5 61
 SHA256 e1d0d7ce214237cd217eec2ed58d0424fe17ef77444096269b2a0e759f7b2c16 files/digest-vls-0.5.5 61
-MD5 c02a9033fcb3db177a39b972ffb0cc6d files/digest-vls-0.5.5-r1 61
-RMD160 575d034dda77eb56f6bdfda846bcf0f66c050d15 files/digest-vls-0.5.5-r1 61
-SHA256 e1d0d7ce214237cd217eec2ed58d0424fe17ef77444096269b2a0e759f7b2c16 files/digest-vls-0.5.5-r1 61
+MD5 01f568090383ac992cc0fd1c50cbc1c6 files/digest-vls-0.5.5-r1 229
+RMD160 39c204daa45b6a4f7f126efe150aa704bf3d1794 files/digest-vls-0.5.5-r1 229
+SHA256 0da4034e641805ec1267fbf55029db25c0348b8a32ffdc323b1cbc3194208393 files/digest-vls-0.5.5-r1 229
 MD5 17bf9416e2bf4aca59217e79371eb8ac files/digest-vls-0.5.6-r1 61
 RMD160 3571104f075378e82ab8cc6f01475dcc2f479588 files/digest-vls-0.5.6-r1 61
 SHA256 3b6585ede638930175ddfcfd2fbcc7ba4f760b7f67a74ff4bf7838d7ed71bf9b files/digest-vls-0.5.6-r1 61
@@ -19,15 +19,15 @@ SHA256 3446c02b63d8e5155f5326be1ee8671921c697ae7b1d37abf78d8fc7108ec197 files/vl
 MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d metadata.xml 225
 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5 metadata.xml 225
-MD5 52744eb89fffd04d8138ae5c00d6cc0c vls-0.5.5-r1.ebuild 881
-RMD160 43df5ad6c178e92fa1d878f0b5bc973ceb5c1aba vls-0.5.5-r1.ebuild 881
-SHA256 96f73cccb3f6bd3da53214e6ead1b49c23b463dc231642cabb1bc78dbcf5b95f vls-0.5.5-r1.ebuild 881
+MD5 408a207e6bb3a556d56d2877d4bb119f vls-0.5.5-r1.ebuild 1053
+RMD160 3b6d9e06b357543650fbe289f98562f8961bec7f vls-0.5.5-r1.ebuild 1053
+SHA256 aada72f9cd2f5754114816840f9680d9f5373f6705ed7b9d3ec7ebe84bd637c7 vls-0.5.5-r1.ebuild 1053
 MD5 48e1a9390b117c0525b135c88ccfd0f4 vls-0.5.5.ebuild 760
 RMD160 964ec0fee46d8ea7f58633a308921e32bec575ce vls-0.5.5.ebuild 760
 SHA256 35aa91177767ebe8ba5a8da8497fe834e296877ac62d0197f410d53d6209ac5e vls-0.5.5.ebuild 760
-MD5 60fa4a8e9faf3a00dc2a8df953e3c5c3 vls-0.5.6-r1.ebuild 1039
-RMD160 ec215e03e515901c5145bfd808977d477ecdb439 vls-0.5.6-r1.ebuild 1039
-SHA256 47dc240938b47f74dc97c3d426f6a68df83a1479bdd407da744761294f36341c vls-0.5.6-r1.ebuild 1039
-MD5 71c06af112cbef70209c136f96f61a42 vls-0.5.6-r2.ebuild 1114
-RMD160 d60149573371365e89904258c8e7134abd21f034 vls-0.5.6-r2.ebuild 1114
-SHA256 532bf22ade7f9ae8dee55a3c97a579ca88aacaa10a0a7691f8f6c3cf6fa08319 vls-0.5.6-r2.ebuild 1114
+MD5 6fa867c2edc26ff0252bae1ae69367d2 vls-0.5.6-r1.ebuild 1039
+RMD160 78d4f38a559075c078f991e3874e8362445b495e vls-0.5.6-r1.ebuild 1039
+SHA256 f24192bb7b788d903632df884474935d9d35bf622cda3fb0203fb79ebc333406 vls-0.5.6-r1.ebuild 1039
+MD5 c794d73b35fecd3759a452c6c6f3c218 vls-0.5.6-r2.ebuild 1148
+RMD160 bace5a8ea14752fc170b05aad55dcd1252033bd7 vls-0.5.6-r2.ebuild 1148
+SHA256 e207e9c95818ba3ee7357600857034fa6991ff80ed254a0b113ce01d6171c000 vls-0.5.6-r2.ebuild 1148
diff --git a/media-video/vls/files/digest-vls-0.5.5-r1 b/media-video/vls/files/digest-vls-0.5.5-r1
index 63c5addfa138..63d2937a617b 100644
--- a/media-video/vls/files/digest-vls-0.5.5-r1
+++ b/media-video/vls/files/digest-vls-0.5.5-r1
@@ -1 +1,3 @@
 MD5 c4ea13e1fa22572b383e7c666215d68b vls-0.5.5.tar.gz 659096
+RMD160 9cca36377221879f64797729cffd75535e6e8aab vls-0.5.5.tar.gz 659096
+SHA256 5a1db24322ab5026f898d11514d57dbdd3ca37867e3032184975411783307c40 vls-0.5.5.tar.gz 659096
diff --git a/media-video/vls/vls-0.5.5-r1.ebuild b/media-video/vls/vls-0.5.5-r1.ebuild
index 8dbb43beaaba..8b0d20ae361d 100644
--- a/media-video/vls/vls-0.5.5-r1.ebuild
+++ b/media-video/vls/vls-0.5.5-r1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vls/vls-0.5.5-r1.ebuild,v 1.6 2005/11/03 12:15:31 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vls/vls-0.5.5-r1.ebuild,v 1.7 2006/03/18 12:34:34 zzam Exp $
+
+inherit flag-o-matic
 
 IUSE="debug dvd dvb"
 
@@ -14,7 +16,11 @@ KEYWORDS="~x86 ~ppc ~sparc ~alpha"
 
 DEPEND="dvd? ( >=media-libs/libdvdread-0.9.4
 	>=media-libs/libdvdcss-1.2.8 )
-	dvb? ( >=media-libs/libdvbpsi-0.1.3 )"
+	dvb? (
+		media-tv/linuxtv-dvb-headers
+		media-libs/libdvb
+	)
+	>=media-libs/libdvbpsi-0.1.3"
 
 src_compile() {
 	local myconf
@@ -22,7 +28,10 @@ src_compile() {
 
 	use dvd || myconf="${myconf} --disable-dvd"
 
-	use dvb && myconf="${myconf} --enable-dvb"
+	if use dvb; then
+		append-flags "-I/usr/include/libdvb"
+		myconf="${myconf} --enable-dvb --with-libdvb=/usr/lib"
+	fi
 
 	econf ${myconf} || die "econf failed"
 
diff --git a/media-video/vls/vls-0.5.6-r1.ebuild b/media-video/vls/vls-0.5.6-r1.ebuild
index 9ff457601857..72bccd679308 100644
--- a/media-video/vls/vls-0.5.6-r1.ebuild
+++ b/media-video/vls/vls-0.5.6-r1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vls/vls-0.5.6-r1.ebuild,v 1.7 2005/11/03 12:15:31 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vls/vls-0.5.6-r1.ebuild,v 1.8 2006/03/18 12:34:34 zzam Exp $
+
+inherit flag-o-matic
 
 IUSE="debug dvd dvb"
 
@@ -14,7 +16,10 @@ KEYWORDS="~x86 ~ppc ~sparc ~alpha"
 
 DEPEND="dvd? ( >=media-libs/libdvdread-0.9.4
 	>=media-libs/libdvdcss-1.2.8 )
-	dvb? ( >=media-libs/libdvb-0.5.0 )
+	dvb? (
+		>=media-libs/libdvb-0.5.0
+		media-tv/linuxtv-dvb-headers
+	)
 	>=media-libs/libdvbpsi-0.1.3"
 
 src_compile() {
@@ -24,8 +29,7 @@ src_compile() {
 	use dvd || myconf="${myconf} --disable-dvd"
 
 	if use dvb; then
-		export CCFLAGS="-I/usr/include/libdvb"
-		export CPPFLAGS="${CPPFLAGS} -I/usr/include/libdvb"
+		append-flags "-I/usr/include/libdvb"
 		myconf="${myconf} --enable-dvb --with-libdvb=/usr/lib/"
 	fi
 
diff --git a/media-video/vls/vls-0.5.6-r2.ebuild b/media-video/vls/vls-0.5.6-r2.ebuild
index ec20cec9722c..e2644f9f428c 100644
--- a/media-video/vls/vls-0.5.6-r2.ebuild
+++ b/media-video/vls/vls-0.5.6-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vls/vls-0.5.6-r2.ebuild,v 1.9 2006/03/01 17:54:36 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vls/vls-0.5.6-r2.ebuild,v 1.10 2006/03/18 12:34:34 zzam Exp $
 
 inherit eutils
 
@@ -16,7 +16,10 @@ KEYWORDS="~alpha ~amd64 ~ppc ~sparc x86"
 
 DEPEND="dvd? ( >=media-libs/libdvdread-0.9.4
 	>=media-libs/libdvdcss-1.2.8 )
-	dvb? ( >=media-libs/libdvb-0.5.0 )
+	dvb? (
+		>=media-libs/libdvb-0.5.0
+		media-tv/linuxtv-dvb-headers
+	)
 	>=media-libs/libdvbpsi-0.1.3"
 
 src_unpack() {