From: Dan Armak Date: Fri, 14 Jan 2005 23:42:07 +0000 (+0000) Subject: made dep on a monolithic kde-base package accept the equivalent -meta package from... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0489b71ba86a058561cb937a1527205bc10c59a6;p=gentoo.git made dep on a monolithic kde-base package accept the equivalent -meta package from the split ebuilds as an alternative --- diff --git a/mail-client/kbiff/ChangeLog b/mail-client/kbiff/ChangeLog index 613beac1f375..9dc3b00f961f 100644 --- a/mail-client/kbiff/ChangeLog +++ b/mail-client/kbiff/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for mail-client/kbiff -# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/kbiff/ChangeLog,v 1.12 2004/12/16 11:25:27 motaboy Exp $ +# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/mail-client/kbiff/ChangeLog,v 1.13 2005/01/14 23:42:07 danarmak Exp $ + + 15 Jan 2005; Dan Armak kbiff-3.6.3.ebuild, + kbiff-3.7.1.ebuild, kbiff-3.7.ebuild: + Changed dep on kdebase to accept kdebase-meta, the split 'meta' package. + This dep will be narrowed down in the future to the precise split packages + required. 16 Dec 2004; Simone Gotti kbiff-3.7.1.ebuild: Stable on x86. diff --git a/mail-client/kbiff/Manifest b/mail-client/kbiff/Manifest index 209e643bb2c4..565683ee0b19 100644 --- a/mail-client/kbiff/Manifest +++ b/mail-client/kbiff/Manifest @@ -1,7 +1,7 @@ -MD5 4b9dd8fd36c02cb11256f4356be7858c kbiff-3.6.3.ebuild 489 -MD5 ab2a24a6c0b6c2353764b2b195158dc7 kbiff-3.7.1.ebuild 605 -MD5 6cb024137ddab3120f6881750cd84ac7 kbiff-3.7.ebuild 599 -MD5 43420a6099b09ddcdb1ef2b97826105c ChangeLog 2440 +MD5 853a3e473bef00e87f438b81ff025284 kbiff-3.6.3.ebuild 521 +MD5 6ed706f1a8a640bee401d529696e9b71 kbiff-3.7.1.ebuild 635 +MD5 5ede01f54ec330a0aabc4f622833fa70 kbiff-3.7.ebuild 632 +MD5 504db305b4d02f7005732ace9ddd5bf4 ChangeLog 2713 MD5 f8d9c020bae3c62facebc7e19dd70e30 metadata.xml 184 MD5 991f80c39e336d0b83e6c7e5c3817393 files/digest-kbiff-3.7 62 MD5 cc9bbe8cd86ed11daedf19d99995007e files/kbiff-3.7.1-configure-arts.patch 3567 diff --git a/mail-client/kbiff/kbiff-3.6.3.ebuild b/mail-client/kbiff/kbiff-3.6.3.ebuild index 536d5c9643bd..648da12e6ed2 100644 --- a/mail-client/kbiff/kbiff-3.6.3.ebuild +++ b/mail-client/kbiff/kbiff-3.6.3.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/mail-client/kbiff/kbiff-3.6.3.ebuild,v 1.3 2004/06/28 23:56:28 carlo Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/kbiff/kbiff-3.6.3.ebuild,v 1.4 2005/01/14 23:42:07 danarmak Exp $ inherit kde @@ -13,5 +13,5 @@ LICENSE="GPL-2" KEYWORDS="x86 sparc" IUSE="" -DEPEND=">=kde-base/kdebase-3" +DEPEND="|| ( kde-base/kdebase-meta >=kde-base/kdebase-3 )" need-kde 3 \ No newline at end of file diff --git a/mail-client/kbiff/kbiff-3.7.1.ebuild b/mail-client/kbiff/kbiff-3.7.1.ebuild index 6cbafece2889..035a8bff384a 100644 --- a/mail-client/kbiff/kbiff-3.7.1.ebuild +++ b/mail-client/kbiff/kbiff-3.7.1.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/mail-client/kbiff/kbiff-3.7.1.ebuild,v 1.3 2004/12/16 11:25:27 motaboy Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/kbiff/kbiff-3.7.1.ebuild,v 1.4 2005/01/14 23:42:07 danarmak Exp $ inherit kde eutils @@ -13,7 +13,7 @@ LICENSE="GPL-2" KEYWORDS="x86 ~sparc ~ppc ~amd64" IUSE="" -DEPEND=">=kde-base/kdebase-3" +DEPEND="|| ( kde-base/kdebase-meta >=kde-base/kdebase-3 )" need-kde 3 src_unpack() { diff --git a/mail-client/kbiff/kbiff-3.7.ebuild b/mail-client/kbiff/kbiff-3.7.ebuild index ab13695eaaa7..9af857783ca0 100644 --- a/mail-client/kbiff/kbiff-3.7.ebuild +++ b/mail-client/kbiff/kbiff-3.7.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/mail-client/kbiff/kbiff-3.7.ebuild,v 1.9 2004/12/06 15:15:59 ticho Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/kbiff/kbiff-3.7.ebuild,v 1.10 2005/01/14 23:42:07 danarmak Exp $ inherit kde eutils @@ -13,7 +13,7 @@ LICENSE="GPL-2" KEYWORDS="x86 sparc ~ppc ~amd64" IUSE="" -DEPEND=">=kde-base/kdebase-3" +DEPEND="|| ( kde-base/kdebase-meta >=kde-base/kdebase-3 )" need-kde 3 src_unpack() {