From: Diego Elio Pettenò <flameeyes@gentoo.org>
Date: Sat, 9 Dec 2006 18:59:08 +0000 (+0000)
Subject: Fix dependencies to accept the new now-merged gnupg package.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=43b064f44ac022262d3b45db4d8850d2216e03e9;p=gentoo.git

Fix dependencies to accept the new now-merged gnupg package.
Package-Manager: portage-2.1.2_rc3
---

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ò <flameeyes@gentoo.org>
+  certmanager-3.5.2-r1.ebuild, certmanager-3.5.5.ebuild:
+  Fix dependencies to accept the new now-merged gnupg package.
 
   06 Dec 2006; <kloeri@gentoo.org> 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-1.9"
+	|| ( >=app-crypt/gnupg-2.0.1-r1 <app-crypt/gnupg-1.9 )"
 	# We use GnuPG 1.4.x for OpenPGP and 1.9 (via gpgme) for s/mime as upstream advises.
 #RDEPEND="${DEPEND}
 #	>=app-crypt/dirmngr-0.9.3"
diff --git a/kde-base/certmanager/certmanager-3.5.5.ebuild b/kde-base/certmanager/certmanager-3.5.5.ebuild
index 7a0884a857e9..87424f9e8d93 100644
--- a/kde-base/certmanager/certmanager-3.5.5.ebuild
+++ b/kde-base/certmanager/certmanager-3.5.5.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.5.ebuild,v 1.7 2006/12/06 12:06:02 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/certmanager/certmanager-3.5.5.ebuild,v 1.8 2006/12/09 18:57:49 flameeyes Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -13,7 +13,7 @@ IUSE=""
 
 DEPEND="$(deprange 3.5.4 $MAXKDEVER kde-base/libkdenetwork)
 	>=app-crypt/gpgme-1.1.2-r1
-	<app-crypt/gnupg-1.9"
+	|| ( >=app-crypt/gnupg-2.0.1-r1 <app-crypt/gnupg-1.9 )"
 	# We use GnuPG 1.4.x for OpenPGP and 1.9 (via gpgme) for s/mime as upstream advises.
 #RDEPEND="${DEPEND}
 #	>=app-crypt/dirmngr-0.9.3"
diff --git a/kde-base/kdepim/ChangeLog b/kde-base/kdepim/ChangeLog
index fd0ea2d71e9b..64d5f692d798 100644
--- a/kde-base/kdepim/ChangeLog
+++ b/kde-base/kdepim/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdepim
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/ChangeLog,v 1.235 2006/12/06 12:20:04 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/ChangeLog,v 1.236 2006/12/09 18:59:07 flameeyes Exp $
+
+  09 Dec 2006; Diego Pettenò <flameeyes@gentoo.org> 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; <kloeri@gentoo.org> 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/gnupg-1.9 ) )
 	x11-libs/libXScrnSaver"
 
 DEPEND="${DEPEND}
diff --git a/kde-base/kdepim/kdepim-3.5.2-r4.ebuild b/kde-base/kdepim/kdepim-3.5.2-r4.ebuild
index 6a72ae1f4c97..a5e5e27b0e2c 100644
--- a/kde-base/kdepim/kdepim-3.5.2-r4.ebuild
+++ b/kde-base/kdepim/kdepim-3.5.2-r4.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-r4.ebuild,v 1.2 2006/10/17 09:43:25 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.5.2-r4.ebuild,v 1.3 2006/12/09 18:59:07 flameeyes Exp $
 
 inherit kde-dist
 
@@ -18,7 +18,7 @@ DEPEND="~kde-base/kdebase-${PV}
 	pda? ( app-pda/pilot-link dev-libs/libmal )
 	gnokii? ( app-mobilephone/gnokii )
 	crypt? ( >=app-crypt/gpgme-1.1.2-r1
-		 <app-crypt/gnupg-1.9 )
+		|| ( >=app-crypt/gnupg-2.0.1-r1 <app-crypt/gnupg-1.9 ) )
 		x11-libs/libXScrnSaver"
 
 RDEPEND="${DEPEND}
diff --git a/kde-base/kdepim/kdepim-3.5.5-r2.ebuild b/kde-base/kdepim/kdepim-3.5.5-r2.ebuild
index d6325e8e132a..f910f456ad4e 100644
--- a/kde-base/kdepim/kdepim-3.5.5-r2.ebuild
+++ b/kde-base/kdepim/kdepim-3.5.5-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.5-r2.ebuild,v 1.8 2006/12/06 12:20:04 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.5.5-r2.ebuild,v 1.9 2006/12/09 18:59:07 flameeyes Exp $
 
 inherit kde-dist
 
@@ -18,7 +18,7 @@ DEPEND="~kde-base/kdebase-${PV}
 	pda? ( app-pda/pilot-link dev-libs/libmal )
 	gnokii? ( app-mobilephone/gnokii )
 	crypt? ( >=app-crypt/gpgme-1.1.2-r1
-		 <app-crypt/gnupg-1.9 )
+		|| ( >=app-crypt/gnupg-2.0.1-r1 <app-crypt/gnupg-1.9 ) )
 		x11-libs/libXScrnSaver"
 
 RDEPEND="${DEPEND}