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

diff --git a/x11-misc/rss-glx/ChangeLog b/x11-misc/rss-glx/ChangeLog
index a138e1694f9a190195538b67a1ce1a7804461841..93715b5db98739e54de74092f76478bce70374bb 100644 (file)
--- a/x11-misc/rss-glx/ChangeLog
+++ b/x11-misc/rss-glx/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/rss-glx
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/rss-glx/ChangeLog,v 1.24 2004/10/21 23:42:58 mr_bones_ Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/rss-glx/ChangeLog,v 1.25 2005/01/15 00:18:40 danarmak Exp $
+
+  15 Jan 2005; Dan Armak <danarmak@gentoo.org> rss-glx-0.7.6.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.
 
   21 Oct 2004; Michael Sterrett <mr_bones_@gentoo.org>
   -rss-glx-0.7.4-r1.ebuild:

diff --git a/x11-misc/rss-glx/Manifest b/x11-misc/rss-glx/Manifest
index f286af880a8d39c7eff4bb02a7ffd3b5ff5bccb0..b767098efe5f62fccbd28899340cac9ec86e764b 100644 (file)
--- a/x11-misc/rss-glx/Manifest
+++ b/x11-misc/rss-glx/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 a50406e3f4912a0870db7131fa3715b0 ChangeLog 4207
+MD5 c0a9ce2f835a5514567a89a02e0c436f rss-glx-0.7.6.ebuild 4084
+MD5 e96f536985a6127a53501942ba708dbb ChangeLog 4573
 MD5 77ca606d4e2b3bbbc172c408468e0156 metadata.xml 280
-MD5 f7d6e8cce3d481bba2e6c76b9b5a9cbc rss-glx-0.7.6.ebuild 4050
 MD5 c569bd57d6615d7b3d0d66db78c86bb9 files/digest-rss-glx-0.7.6 67
 MD5 0bb415e3a8164c510eaa9369bd233c19 files/rss-glx-0.7.4-gcc33.patch 10901
 MD5 2f47a2d4b9947332e2817ec81f2ec0d7 files/rss-glx-0.7.4-kdedesktop.patch 833
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBhHgpHTu7gpaalycRAqDWAKCD6+HaCIq2inyRHMsDLNrhbCLKKwCg1Kyl
-Qw/U5adBBFOxxMCicX6wF94=
-=sDpj
------END PGP SIGNATURE-----

diff --git a/x11-misc/rss-glx/rss-glx-0.7.6.ebuild b/x11-misc/rss-glx/rss-glx-0.7.6.ebuild
index 2d77b6e2e072003aebacca641e1480ab402e4bfb..028ae975c9ba60deac79169e3ad1de3d9e3163c0 100644 (file)
--- a/x11-misc/rss-glx/rss-glx-0.7.6.ebuild
+++ b/x11-misc/rss-glx/rss-glx-0.7.6.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/x11-misc/rss-glx/rss-glx-0.7.6.ebuild,v 1.16 2004/10/31 05:28:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/rss-glx/rss-glx-0.7.6.ebuild,v 1.17 2005/01/15 00:18:40 danarmak Exp $
 
 inherit flag-o-matic eutils kde
 
@@ -18,7 +18,7 @@ IUSE="kde sse 3dnow openal"
 DEPEND="virtual/x11
        virtual/opengl
        >=media-gfx/imagemagick-5.5.7
-       kde? ( kde-base/kdeartwork )
+       kde? ( || ( kde-base/kdeartwork-meta kde-base/kdeartwork ) )
        !kde? ( x11-misc/xscreensaver )
        openal? ( media-libs/openal )"