summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2014-12-30 11:41:23 +0000
committerPacho Ramos <pacho@gentoo.org>2014-12-30 11:41:23 +0000
commit05e46f963b6048b35e71bbb60ebf0ccee209d3f4 (patch)
tree12d636b50bfc2d83511a55223fbb4019cd2847e5 /app-crypt/seahorse
parentlibXi-1.7.4 or newer needed to prevent bug #525218 (by Yuriy, Damien Granger,... (diff)
downloadgentoo-2-05e46f963b6048b35e71bbb60ebf0ccee209d3f4.tar.gz
gentoo-2-05e46f963b6048b35e71bbb60ebf0ccee209d3f4.tar.bz2
gentoo-2-05e46f963b6048b35e71bbb60ebf0ccee209d3f4.zip
Move away from || () gnupg dependency to plain >= requirement, bug #528460 by Kristian Fiskerstrand and Alon Bar-Lev
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
Diffstat (limited to 'app-crypt/seahorse')
-rw-r--r--app-crypt/seahorse/ChangeLog7
-rw-r--r--app-crypt/seahorse/seahorse-3.12.2.ebuild6
-rw-r--r--app-crypt/seahorse/seahorse-3.14.0.ebuild6
3 files changed, 10 insertions, 9 deletions
diff --git a/app-crypt/seahorse/ChangeLog b/app-crypt/seahorse/ChangeLog
index 0bedeaf32843..e9c8418a383a 100644
--- a/app-crypt/seahorse/ChangeLog
+++ b/app-crypt/seahorse/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for app-crypt/seahorse
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/ChangeLog,v 1.187 2014/12/15 23:03:10 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/ChangeLog,v 1.188 2014/12/30 11:41:23 pacho Exp $
+
+ 30 Dec 2014; Pacho Ramos <pacho@gentoo.org> seahorse-3.12.2.ebuild,
+ seahorse-3.14.0.ebuild:
+ Move away from || () gnupg dependency to plain >= requirement, bug #528460 by
+ Kristian Fiskerstrand and Alon Bar-Lev
*seahorse-3.14.0 (15 Dec 2014)
diff --git a/app-crypt/seahorse/seahorse-3.12.2.ebuild b/app-crypt/seahorse/seahorse-3.12.2.ebuild
index 3c12b82ce2a3..9119a719485e 100644
--- a/app-crypt/seahorse/seahorse-3.12.2.ebuild
+++ b/app-crypt/seahorse/seahorse-3.12.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-3.12.2.ebuild,v 1.3 2014/07/23 15:13:09 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-3.12.2.ebuild,v 1.4 2014/12/30 11:41:23 pacho Exp $
EAPI="5"
GCONF_DEBUG="yes"
@@ -25,9 +25,7 @@ COMMON_DEPEND="
net-misc/openssh
>=app-crypt/gpgme-1
- || (
- =app-crypt/gnupg-2.0*
- =app-crypt/gnupg-1.4* )
+ >=app-crypt/gnupg-1.4
avahi? ( >=net-dns/avahi-0.6:= )
ldap? ( net-nds/openldap:= )
diff --git a/app-crypt/seahorse/seahorse-3.14.0.ebuild b/app-crypt/seahorse/seahorse-3.14.0.ebuild
index 9e830c1900b1..d9a9b50c12a7 100644
--- a/app-crypt/seahorse/seahorse-3.14.0.ebuild
+++ b/app-crypt/seahorse/seahorse-3.14.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-3.14.0.ebuild,v 1.1 2014/12/15 23:03:10 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-3.14.0.ebuild,v 1.2 2014/12/30 11:41:23 pacho Exp $
EAPI="5"
GCONF_DEBUG="yes"
@@ -25,9 +25,7 @@ COMMON_DEPEND="
net-misc/openssh
>=app-crypt/gpgme-1
- || (
- =app-crypt/gnupg-2.0*
- =app-crypt/gnupg-1.4* )
+ >=app-crypt/gnupg-1.4
avahi? ( >=net-dns/avahi-0.6:= )
ldap? ( net-nds/openldap:= )