diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-12-09 18:57:49 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-12-09 18:57:49 +0000 |
| commit | 6c2f12fa27f1e2df7dc064a07f04aaf354652c5d (patch) | |
| tree | 8641948bb056f068685dac69d5154b3a009159a0 /kde-base | |
| parent | Fix digest; thanks to Christian Kellenberger for reporting; bug 157622 (diff) | |
| download | gentoo-2-6c2f12fa27f1e2df7dc064a07f04aaf354652c5d.tar.gz gentoo-2-6c2f12fa27f1e2df7dc064a07f04aaf354652c5d.tar.bz2 gentoo-2-6c2f12fa27f1e2df7dc064a07f04aaf354652c5d.zip | |
Fix dependencies to accept the new now-merged gnupg package.
(Portage version: 2.1.2_rc3)
Diffstat (limited to 'kde-base')
| -rw-r--r-- | kde-base/certmanager/ChangeLog | 6 | ||||
| -rw-r--r-- | kde-base/certmanager/certmanager-3.5.2-r1.ebuild | 4 | ||||
| -rw-r--r-- | kde-base/certmanager/certmanager-3.5.5.ebuild | 4 |
3 files changed, 9 insertions, 5 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ò <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" |