summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Armak <danarmak@gentoo.org>2005-01-15 00:16:08 +0000
committerDan Armak <danarmak@gentoo.org>2005-01-15 00:16:08 +0000
commitea2e033062ea54f8a75452742fc33f0b25db0de2 (patch)
tree53a6586d9ffe30c1e03e381b60b36b9f7262a315 /sci-mathematics/koctave
parentAdded support for net-analyzer/net-snmp (for a ksim plugin). Should also fix ... (diff)
downloadgentoo-2-ea2e033062ea54f8a75452742fc33f0b25db0de2.tar.gz
gentoo-2-ea2e033062ea54f8a75452742fc33f0b25db0de2.tar.bz2
gentoo-2-ea2e033062ea54f8a75452742fc33f0b25db0de2.zip
made dep on a monolithic kde-base package accept the equivalent -meta package from the split ebuilds as an alternative
Diffstat (limited to 'sci-mathematics/koctave')
-rw-r--r--sci-mathematics/koctave/ChangeLog10
-rw-r--r--sci-mathematics/koctave/koctave-0.65.ebuild6
2 files changed, 11 insertions, 5 deletions
diff --git a/sci-mathematics/koctave/ChangeLog b/sci-mathematics/koctave/ChangeLog
index ca4ad9e77a17..cbeb8af09d36 100644
--- 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/koctave-0.65.ebuild b/sci-mathematics/koctave/koctave-0.65.ebuild
index de6976894bd1..364d65e2d455 100644
--- 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