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-calculators/fung-calc
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-calculators/fung-calc')
-rw-r--r--sci-calculators/fung-calc/ChangeLog10
-rw-r--r--sci-calculators/fung-calc/fung-calc-1.3.2b.ebuild6
2 files changed, 11 insertions, 5 deletions
diff --git a/sci-calculators/fung-calc/ChangeLog b/sci-calculators/fung-calc/ChangeLog
index bde5bad417a3..bc740953c7f0 100644
--- a/sci-calculators/fung-calc/ChangeLog
+++ b/sci-calculators/fung-calc/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for sci-calculators/fung-calc
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-calculators/fung-calc/ChangeLog,v 1.2 2004/12/24 20:02:51 swegener Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-calculators/fung-calc/ChangeLog,v 1.3 2005/01/15 00:13:21 danarmak Exp $
+
+ 15 Jan 2005; Dan Armak <danarmak@gentoo.org> fung-calc-1.3.2b.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.
*fung-calc-1.3.2b (24 Dec 2004)
diff --git a/sci-calculators/fung-calc/fung-calc-1.3.2b.ebuild b/sci-calculators/fung-calc/fung-calc-1.3.2b.ebuild
index 06cfbd93677b..47d1f73344eb 100644
--- a/sci-calculators/fung-calc/fung-calc-1.3.2b.ebuild
+++ b/sci-calculators/fung-calc/fung-calc-1.3.2b.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-calculators/fung-calc/fung-calc-1.3.2b.ebuild,v 1.1 2004/12/24 14:53:02 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-calculators/fung-calc/fung-calc-1.3.2b.ebuild,v 1.2 2005/01/15 00:13:21 danarmak Exp $
inherit kde eutils flag-o-matic
@@ -18,7 +18,7 @@ DEPEND=">=sys-libs/zlib-1
>=media-libs/jpeg-6
virtual/libc
opengl? ( virtual/opengl )
- >=kde-base/kdebase-3.1"
+ || ( kde-base/kdebase-meta >=kde-base/kdebase-3.1 )"
need-kde 3.1
need-qt 3.1