From 43b064f44ac022262d3b45db4d8850d2216e03e9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Diego=20Elio=20Petten=C3=B2?= Date: Sat, 9 Dec 2006 18:59:08 +0000 Subject: [PATCH] Fix dependencies to accept the new now-merged gnupg package. Package-Manager: portage-2.1.2_rc3 --- kde-base/certmanager/ChangeLog | 6 +++++- kde-base/certmanager/certmanager-3.5.2-r1.ebuild | 4 ++-- kde-base/certmanager/certmanager-3.5.5.ebuild | 4 ++-- kde-base/kdepim/ChangeLog | 6 +++++- kde-base/kdepim/kdepim-3.5.2-r2.ebuild | 5 +++-- kde-base/kdepim/kdepim-3.5.2-r4.ebuild | 4 ++-- kde-base/kdepim/kdepim-3.5.5-r2.ebuild | 4 ++-- 7 files changed, 21 insertions(+), 12 deletions(-) diff --git a/kde-base/certmanager/ChangeLog b/kde-base/certmanager/ChangeLog index 855b13c3d486..a960c2c32d5d 100644 --- a/kde-base/certmanager/ChangeLog +++ b/kde-base/certmanager/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/certmanager # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/certmanager/ChangeLog,v 1.71 2006/12/06 12:06:02 kloeri Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/certmanager/ChangeLog,v 1.72 2006/12/09 18:57:49 flameeyes Exp $ + + 09 Dec 2006; Diego Pettenò + certmanager-3.5.2-r1.ebuild, certmanager-3.5.5.ebuild: + Fix dependencies to accept the new now-merged gnupg package. 06 Dec 2006; certmanager-3.5.5.ebuild: Stable on Alpha. diff --git a/kde-base/certmanager/certmanager-3.5.2-r1.ebuild b/kde-base/certmanager/certmanager-3.5.2-r1.ebuild index 087a31a6ba55..dbd98696ae97 100644 --- a/kde-base/certmanager/certmanager-3.5.2-r1.ebuild +++ b/kde-base/certmanager/certmanager-3.5.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/certmanager/certmanager-3.5.2-r1.ebuild,v 1.10 2006/09/03 12:33:05 kloeri Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/certmanager/certmanager-3.5.2-r1.ebuild,v 1.11 2006/12/09 18:57:49 flameeyes Exp $ KMNAME=kdepim MAXKDEVER=$PV @@ -14,7 +14,7 @@ IUSE="" DEPEND="$(deprange 3.5.0 $MAXKDEVER kde-base/libkpgp) $(deprange 3.5.0 $MAXKDEVER kde-base/libkdenetwork) >=app-crypt/gpgme-1.1.2-r1 - =app-crypt/gnupg-2.0.1-r1 =app-crypt/gnupg-2.0.1-r1 kdepim-3.5.2-r2.ebuild, + kdepim-3.5.2-r4.ebuild, kdepim-3.5.5-r2.ebuild: + Fix dependencies to accept the new now-merged gnupg package. 06 Dec 2006; kdepim-3.5.5-r2.ebuild: Stable on Alpha. diff --git a/kde-base/kdepim/kdepim-3.5.2-r2.ebuild b/kde-base/kdepim/kdepim-3.5.2-r2.ebuild index 6f92ca26b5e5..81bbbd0090e6 100644 --- a/kde-base/kdepim/kdepim-3.5.2-r2.ebuild +++ b/kde-base/kdepim/kdepim-3.5.2-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.5.2-r2.ebuild,v 1.12 2006/10/17 09:43:25 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.5.2-r2.ebuild,v 1.13 2006/12/09 18:59:08 flameeyes Exp $ inherit kde-dist @@ -13,7 +13,8 @@ RDEPEND="~kde-base/kdebase-${PV} >=dev-libs/cyrus-sasl-2 pda? ( app-pda/pilot-link dev-libs/libmal ) gnokii? ( app-mobilephone/gnokii ) - crypt? ( >=app-crypt/gpgme-0.9.0-r1 ) + crypt? ( >=app-crypt/gpgme-0.9.0-r1 + || ( >=app-crypt/gnupg-2.0.1-r1 =app-crypt/gpgme-1.1.2-r1 - =app-crypt/gnupg-2.0.1-r1 =app-crypt/gpgme-1.1.2-r1 - =app-crypt/gnupg-2.0.1-r1