made dep on a monolithic kde-base package accept the equivalent -meta package from...

diff --git a/media-tv/kvdr/ChangeLog b/media-tv/kvdr/ChangeLog
index 75f9fadcece93104eef236160f908e5e7a8ee32f..c29373e0cc9cd1d814b4d8d2fb6335fa7e43903e 100644 (file)
--- a/media-tv/kvdr/ChangeLog
+++ b/media-tv/kvdr/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-tv/kvdr
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/kvdr/ChangeLog,v 1.4 2004/06/25 00:32:20 agriffis Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/kvdr/ChangeLog,v 1.5 2005/01/15 00:03:30 danarmak Exp $
+
+  15 Jan 2005; Dan Armak <danarmak@gentoo.org> kvdr-0.61.ebuild,
+  kvdr-0.62.ebuild:
+  Changed dep on a kde-base monolithic package to accept the equivalent split
+  or -meta package. KDE 3.4 has 'split' packages as well as monolithic, and
+  either alternative may provide the same files. This dep may have to be
+  narrowed down in the future to the precise split packages required.
 
 *kvdr-0.62 (08 Apr 2004)
 

diff --git a/media-tv/kvdr/Manifest b/media-tv/kvdr/Manifest
index 323484025e7eceae7d726f088ceb52662fae0150..fe498a943b42a0c6d8c8e5313b68dfa6e7576f8c 100644 (file)
--- a/media-tv/kvdr/Manifest
+++ b/media-tv/kvdr/Manifest
@@ -1,6 +1,6 @@
-MD5 f2b2819284909e80e9da6455d32c40ab kvdr-0.61.ebuild 732
-MD5 1b8928ec3fff2613c53848573a670d3a kvdr-0.62.ebuild 732
-MD5 12b46c574c9d941a00fd863735684fa8 ChangeLog 427
+MD5 a67959e8a54e762d97183ca1143eb88e kvdr-0.61.ebuild 761
+MD5 facf3bfc24744859e982a405a3bf49a9 kvdr-0.62.ebuild 761
+MD5 466a4ee6a544819f1741bffd28d06334 ChangeLog 810
 MD5 81d399b55522e5bbb43378a21469a3bf metadata.xml 225
 MD5 81ea43dc81615b16f9288b017f16864b files/digest-kvdr-0.61 58
 MD5 f2748d6f9b54f39ee1b9fac4a03938ff files/digest-kvdr-0.62 58

diff --git a/media-tv/kvdr/kvdr-0.61.ebuild b/media-tv/kvdr/kvdr-0.61.ebuild
index f0a188471029272c3a8fa59a1b7a19d912959964..634c2d5e1c7d4fa985e50d9960a61989ec873237 100644 (file)
--- a/media-tv/kvdr/kvdr-0.61.ebuild
+++ b/media-tv/kvdr/kvdr-0.61.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/kvdr/kvdr-0.61.ebuild,v 1.3 2004/07/14 21:10:08 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/kvdr/kvdr-0.61.ebuild,v 1.4 2005/01/15 00:03:30 danarmak Exp $
 
 S=${WORKDIR}/${PN}
 DESCRIPTION="Kvdr the KDE GUI for VDR (VideoDiskRecorder)"
@@ -15,7 +15,7 @@ LICENSE="GPL-2"
 DEPEND=">=media-tv/xawtv-3.86
        >=media-tv/linuxtv-dvb-1.0.1
        >=media-video/vdr-1.2.0
-       kde-base/kdebase
+       || ( kde-base/kdebase-meta kde-base/kdebase )
        x11-libs/qt"
 
 src_compile() {

diff --git a/media-tv/kvdr/kvdr-0.62.ebuild b/media-tv/kvdr/kvdr-0.62.ebuild
index ffc83c66c4ad037b68d072d7431ec3e74f6089db..295aa0d7e0df0b251452a3d3971539c12b4b4ef3 100644 (file)
--- a/media-tv/kvdr/kvdr-0.62.ebuild
+++ b/media-tv/kvdr/kvdr-0.62.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/kvdr/kvdr-0.62.ebuild,v 1.3 2004/07/14 21:10:08 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/kvdr/kvdr-0.62.ebuild,v 1.4 2005/01/15 00:03:30 danarmak Exp $
 
 S=${WORKDIR}/${PN}
 DESCRIPTION="Kvdr the KDE GUI for VDR (VideoDiskRecorder)"
@@ -15,7 +15,7 @@ LICENSE="GPL-2"
 DEPEND=">=media-tv/xawtv-3.86
        >=media-tv/linuxtv-dvb-1.0.1
        >=media-video/vdr-1.2.0
-       kde-base/kdebase
+       || ( kde-base/kdebase-meta kde-base/kdebase )
        x11-libs/qt"
 
 src_compile() {