* [gentoo-commits] gentoo-x86 commit in mail-client/evolution: ChangeLog evolution-2.28.3.1-r1.ebuild evolution-2.30.3.ebuild
@ 2010-09-30 18:52 Samuli Suominen (ssuominen)
0 siblings, 0 replies; only message in thread
From: Samuli Suominen (ssuominen) @ 2010-09-30 18:52 UTC (permalink / raw
To: gentoo-commits
ssuominen 10/09/30 18:52:28
Modified: ChangeLog evolution-2.28.3.1-r1.ebuild
evolution-2.30.3.ebuild
Log:
Fix pinentry dependencies on latest 2.28 and 2.30 series wrt #339265.
(Portage version: 2.2_rc88/cvs/Linux x86_64)
Revision Changes Path
1.307 mail-client/evolution/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/evolution/ChangeLog?rev=1.307&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/evolution/ChangeLog?rev=1.307&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/evolution/ChangeLog?r1=1.306&r2=1.307
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v
retrieving revision 1.306
retrieving revision 1.307
diff -u -r1.306 -r1.307
--- ChangeLog 11 Sep 2010 18:52:47 -0000 1.306
+++ ChangeLog 30 Sep 2010 18:52:28 -0000 1.307
@@ -1,6 +1,10 @@
# ChangeLog for mail-client/evolution
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.306 2010/09/11 18:52:47 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.307 2010/09/30 18:52:28 ssuominen Exp $
+
+ 30 Sep 2010; Samuli Suominen <ssuominen@gentoo.org>
+ evolution-2.28.3.1-r1.ebuild, evolution-2.30.3.ebuild:
+ Fix pinentry dependencies on latest 2.28 and 2.30 series wrt #339265.
11 Sep 2010; Joseph Jezak <josejx@gentoo.org> evolution-2.30.2-r1.ebuild:
Marked ppc for bug #324077.
1.5 mail-client/evolution/evolution-2.28.3.1-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/evolution/evolution-2.28.3.1-r1.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/evolution/evolution-2.28.3.1-r1.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/evolution/evolution-2.28.3.1-r1.ebuild?r1=1.4&r2=1.5
Index: evolution-2.28.3.1-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.28.3.1-r1.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- evolution-2.28.3.1-r1.ebuild 5 Aug 2010 16:54:14 -0000 1.4
+++ evolution-2.28.3.1-r1.ebuild 30 Sep 2010 18:52:28 -0000 1.5
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.28.3.1-r1.ebuild,v 1.4 2010/08/05 16:54:14 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.28.3.1-r1.ebuild,v 1.5 2010/09/30 18:52:28 ssuominen Exp $
EAPI="2"
GCONF_DEBUG="no"
@@ -19,6 +19,7 @@
# Pango dependency required to avoid font rendering problems
# We need a graphical pinentry frontend to be able to ask for the GPG
# password from inside evolution, bug 160302
+PINENTRY_DEPEND="|| ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pinentry[qt4] app-crypt/pinentry[qt3] )"
RDEPEND=">=dev-libs/glib-2.20
>=x11-libs/gtk+-2.16
>=gnome-extra/evolution-data-server-${PV}
@@ -52,7 +53,7 @@
>=gnome-base/orbit-2.9.8
crypt? ( || (
( >=app-crypt/gnupg-2.0.1-r2
- app-crypt/pinentry[gtk] )
+ ${PINENTRY_DEPEND} )
=app-crypt/gnupg-1.4* ) )
ldap? ( >=net-nds/openldap-2 )
mono? ( >=dev-lang/mono-1 )
1.2 mail-client/evolution/evolution-2.30.3.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/evolution/evolution-2.30.3.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/evolution/evolution-2.30.3.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/evolution/evolution-2.30.3.ebuild?r1=1.1&r2=1.2
Index: evolution-2.30.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.30.3.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- evolution-2.30.3.ebuild 8 Sep 2010 18:57:54 -0000 1.1
+++ evolution-2.30.3.ebuild 30 Sep 2010 18:52:28 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.30.3.ebuild,v 1.1 2010/09/08 18:57:54 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.30.3.ebuild,v 1.2 2010/09/30 18:52:28 ssuominen Exp $
EAPI="2"
GCONF_DEBUG="no"
@@ -18,8 +18,10 @@
# mono - disabled because it just crashes on startup :S
# Pango dependency required to avoid font rendering problems
-# We need a graphical pinentry frontend to be able to ask for the GPG
+# We need a graphical pinentry frontend to be able to ask for the GPG.
+# Note that separate pinenetry-qt is actually newer than USE=qt4 in pinentry.
# password from inside evolution, bug 160302
+PINENTRY_DEPEND="|| ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pinentry[qt4] app-crypt/pinentry[qt3] )"
RDEPEND=">=dev-libs/glib-2.22
>=x11-libs/gtk+-2.18
>=gnome-extra/evolution-data-server-$(get_version_component_range 1-2)
@@ -41,7 +43,7 @@
crypt? ( || (
( >=app-crypt/gnupg-2.0.1-r2
- || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt3] ) )
+ ${PINENTRY_DEPEND} )
=app-crypt/gnupg-1.4* ) )
gstreamer? (
>=media-libs/gstreamer-0.10
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2010-09-30 18:52 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-09-30 18:52 [gentoo-commits] gentoo-x86 commit in mail-client/evolution: ChangeLog evolution-2.28.3.1-r1.ebuild evolution-2.30.3.ebuild Samuli Suominen (ssuominen)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox