summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIngmar Vanhassel <ingmar@gentoo.org>2008-03-07 20:30:44 +0000
committerIngmar Vanhassel <ingmar@gentoo.org>2008-03-07 20:30:44 +0000
commit51fa687e10a93407ffd76dcf460e7108ded11b2c (patch)
treef18744e418d77f420bf9a8a407cacf5496156b4e /kde-base/kaddressbook-plugins
parentQA cleanup: Fix quoting. (diff)
downloadgentoo-2-51fa687e10a93407ffd76dcf460e7108ded11b2c.tar.gz
gentoo-2-51fa687e10a93407ffd76dcf460e7108ded11b2c.tar.bz2
gentoo-2-51fa687e10a93407ffd76dcf460e7108ded11b2c.zip
Allow mixing of split & monolithic ebuilds, where possible, thanks to Arfrever Frehtes Taifersar Arahesis!
(Portage version: 2.1.4.4)
Diffstat (limited to 'kde-base/kaddressbook-plugins')
-rw-r--r--kde-base/kaddressbook-plugins/ChangeLog7
-rw-r--r--kde-base/kaddressbook-plugins/kaddressbook-plugins-3.5.9.ebuild4
2 files changed, 8 insertions, 3 deletions
diff --git a/kde-base/kaddressbook-plugins/ChangeLog b/kde-base/kaddressbook-plugins/ChangeLog
index 06b478d84dc4..83734d0a82d8 100644
--- a/kde-base/kaddressbook-plugins/ChangeLog
+++ b/kde-base/kaddressbook-plugins/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for kde-base/kaddressbook-plugins
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook-plugins/ChangeLog,v 1.78 2008/03/04 06:53:05 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook-plugins/ChangeLog,v 1.79 2008/03/07 20:30:44 ingmar Exp $
+
+ 07 Mar 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+ kaddressbook-plugins-3.5.9.ebuild:
+ Allow mixing of split & monolithic ebuilds, where possible, thanks to
+ Arfrever Frehtes Taifersar Arahesis!
04 Mar 2008; Jeroen Roovers <jer@gentoo.org>
kaddressbook-plugins-3.5.8.ebuild, kaddressbook-plugins-3.5.9.ebuild:
diff --git a/kde-base/kaddressbook-plugins/kaddressbook-plugins-3.5.9.ebuild b/kde-base/kaddressbook-plugins/kaddressbook-plugins-3.5.9.ebuild
index 029681d13ffb..04aa235da94a 100644
--- a/kde-base/kaddressbook-plugins/kaddressbook-plugins-3.5.9.ebuild
+++ b/kde-base/kaddressbook-plugins/kaddressbook-plugins-3.5.9.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook-plugins/kaddressbook-plugins-3.5.9.ebuild,v 1.2 2008/03/04 06:53:05 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook-plugins/kaddressbook-plugins-3.5.9.ebuild,v 1.3 2008/03/07 20:30:43 ingmar Exp $
KMNAME=kdeaddons
KMNOMODULE=true
KMEXTRA=kaddressbook-plugins/
@@ -10,6 +10,6 @@ inherit kde-meta
DESCRIPTION="Plugins for KAB"
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
IUSE=""
-DEPEND=">=kde-base/kaddressbook-${PV}:${SLOT}"
+DEPEND="|| ( >=kde-base/kaddressbook-${PV}:${SLOT} >=kde-base/kdepim-${PV}:${SLOT} )"
RDEPEND="${DEPEND}"