summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Armak <danarmak@gentoo.org>2005-01-15 00:13:21 +0000
committerDan Armak <danarmak@gentoo.org>2005-01-15 00:13:21 +0000
commitfb66fca505651738c1461a88da0670c9c901d06e (patch)
tree73a21196e1008a569bc2383d4fda604cefea1d43 /sci-calculators/fung-calc
parentmade dep on a monolithic kde-base package accept the equivalent -meta package... (diff)
downloadhistorical-fb66fca505651738c1461a88da0670c9c901d06e.tar.gz
historical-fb66fca505651738c1461a88da0670c9c901d06e.tar.bz2
historical-fb66fca505651738c1461a88da0670c9c901d06e.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/Manifest14
-rw-r--r--sci-calculators/fung-calc/fung-calc-1.3.2b.ebuild6
3 files changed, 13 insertions, 17 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/Manifest b/sci-calculators/fung-calc/Manifest
index 20202e8ee719..2b4847f5f18e 100644
--- a/sci-calculators/fung-calc/Manifest
+++ b/sci-calculators/fung-calc/Manifest
@@ -1,17 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 9f7a4a5d1487797b46df56bcc6cccc65 fung-calc-1.3.2b.ebuild 996
-MD5 02fde545de64f170e7073da16e7ff7d7 ChangeLog 1807
+MD5 f7abb581117dab72a1984f85a77c09ae fung-calc-1.3.2b.ebuild 1025
+MD5 d9a7a254f72de17acd174261a87e29f0 ChangeLog 2177
MD5 201497e376059503f8b7afd504d41023 metadata.xml 179
MD5 7c91a4b480fa01a6b4bfa95814ad31bd files/fung-calc-gcc34-fix 679
MD5 b0fb80ab9ac4825cc0a64bc59c7fcc3b files/digest-fung-calc-1.3.2b 69
MD5 1f03bfb698d9118e85657502d1faf8c7 files/fung-calc-fPIC 1150
MD5 93c4730063f2245c0e1608b2a2d8c731 files/fung-calc-1.3.2b-configure.patch 3567
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBzHXxI1lqEGTUzyQRArsiAJ9nGZ9mMwYPzs2Fq9NEI7PM7kEvfQCfQLgd
-1WgVppuMQKg9fdNhzsIq75I=
-=pRBj
------END PGP SIGNATURE-----
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