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

diff --git a/sci-mathematics/koctave/ChangeLog b/sci-mathematics/koctave/ChangeLog
index ca4ad9e77a174b99473243f74fed2ec88154bf81..cbeb8af09d369b5fbfd62d43004b07c242bbd56f 100644 (file)
--- a/sci-mathematics/koctave/ChangeLog
+++ b/sci-mathematics/koctave/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-mathematics/koctave
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/koctave/ChangeLog,v 1.2 2004/12/28 20:11:20 swegener Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/koctave/ChangeLog,v 1.3 2005/01/15 00:16:08 danarmak Exp $
+
+  15 Jan 2005; Dan Armak <danarmak@gentoo.org> koctave-0.65.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.
 
 *koctave-0.65 (28 Dec 2004)
 

diff --git a/sci-mathematics/koctave/Manifest b/sci-mathematics/koctave/Manifest
index f0a178317e423926c4714a2dfe0bd39d477541d5..fbeb77a98e6cf6e85e0b641a999f395a89845217 100644 (file)
--- a/sci-mathematics/koctave/Manifest
+++ b/sci-mathematics/koctave/Manifest
@@ -1,14 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 e8ba51ffb8fc821c147098a38125f086 koctave-0.65.ebuild 594
-MD5 ad9fb078cc14b991d01136a36995fe22 ChangeLog 879
+MD5 9145eeacef118db5e5f4e1ecd6b923c8 koctave-0.65.ebuild 623
+MD5 89ff1b498a36a974f4ce15028b2833ad ChangeLog 1245
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
 MD5 c118f6e51940e1810fd2907f9edde38f files/digest-koctave-0.65 66
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFB0b3uI1lqEGTUzyQRAnUkAKDWCicgjTcySKDdgn2dNlFzl9Pz3ACgiIHs
-LE6jn6Re2GIP0ym2WDhxeO4=
-=1Nhy
------END PGP SIGNATURE-----

diff --git a/sci-mathematics/koctave/koctave-0.65.ebuild b/sci-mathematics/koctave/koctave-0.65.ebuild
index de6976894bd1273ec462d35de68d042003afa005..364d65e2d455c4a6adf4ffe4e081c07c1542a0e3 100644 (file)
--- a/sci-mathematics/koctave/koctave-0.65.ebuild
+++ b/sci-mathematics/koctave/koctave-0.65.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/sci-mathematics/koctave/koctave-0.65.ebuild,v 1.2 2004/12/28 14:51:26 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/koctave/koctave-0.65.ebuild,v 1.3 2005/01/15 00:16:08 danarmak Exp $
 
 inherit kde
 
@@ -16,5 +16,5 @@ IUSE=""
 
 DEPEND="virtual/libc
        sci-mathematics/octave
-       kde-base/kdebase"
+       || ( kde-base/kdebase-meta kde-base/kdebase )"
 need-kde 3