Version bump with a fix for bug 160302. Punt a redundant version

(Portage version: 2.1.2-r9)

3 files changed, 24 insertions, 10 deletions

diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index ce3e99199b67..a58936659c0f 100644
--- a/mail-client/evolution/ChangeLog
+++ b/mail-client/evolution/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-client/evolution
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.160 2007/01/30 19:05:05 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.161 2007/02/08 12:26:36 leio Exp $
+
+*evolution-2.8.3 (08 Feb 2007)
+
+  08 Feb 2007; Mart Raudsepp <leio@gentoo.org> -evolution-2.8.1.1.ebuild,
+  +evolution-2.8.3.ebuild:
+  Version bump with a fix for bug 160302. Punt a redundant version
 
 *evolution-2.8.2.1-r1 (30 Jan 2007)
 
diff --git a/mail-client/evolution/evolution-2.8.1.1.ebuild b/mail-client/evolution/evolution-2.8.3.ebuild
index 55a326b7035d..42d4d132ff01 100644
--- a/mail-client/evolution/evolution-2.8.1.1.ebuild
+++ b/mail-client/evolution/evolution-2.8.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.8.1.1.ebuild,v 1.3 2006/11/21 01:40:57 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.8.3.ebuild,v 1.1 2007/02/08 12:26:36 leio Exp $
 
 inherit eutils flag-o-matic alternatives gnome2 autotools
 
@@ -11,7 +11,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="GPL-2 FDL-1.1"
 SLOT="2.0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 # gstreamer for audio-inline, when it uses 0.10
 IUSE="bogofilter crypt dbus debug doc hal ipv6 kerberos krb4 ldap mono nntp pda profile spell ssl"
 
@@ -42,7 +42,7 @@ RDEPEND=">=x11-themes/gnome-icon-theme-1.2
 		>=app-pda/gnome-pilot-2
 		>=app-pda/gnome-pilot-conduits-2 )
 	spell? ( >=app-text/gnome-spell-1.0.5 )
-	crypt? ( >=app-crypt/gnupg-1.2.2 )
+	crypt? ( || ( =app-crypt/gnupg-1.4* >=app-crypt/gnupg-2.0.1-r2  ) )
 	ssl? (
 		>=dev-libs/nspr-4.6.1
 		>=dev-libs/nss-3.11 )
@@ -85,6 +85,14 @@ pkg_setup() {
 		$(use_with ldap openldap)        \
 		$(use_with kerberos krb5 /usr)"
 
+	# We need a graphical pinentry frontend to be able to ask for the GPG
+	# password from inside evolution, bug 160302
+	if use crypt && has_version '>=app-crypt/gnupg-2.0.1-r2'; then
+		if ! built_with_use -o app-crypt/pinentry gtk qt3; then
+			die "You must build app-crypt/pinentry with GTK or QT3 support"
+		fi
+	fi
+
 	if use krb4 && ! built_with_use virtual/krb5 krb4; then
 		ewarn
 		ewarn "In order to add kerberos 4 support, you have to emerge"
@@ -153,10 +161,10 @@ src_unpack() {
 	epatch ${FILESDIR}/${PN}-2.8.0-uri.patch.gz
 
 	# Fix 64-bit warnings
-	epatch ${FILESDIR}/${P}-64-bit.patch
+	epatch ${FILESDIR}/${PN}-2.8.1.1-64-bit.patch
 
 	# Add bogofilter junk plugin source
-	use bogofilter && epatch ${FILESDIR}/${PN}-2.7.3-bf-junk.patch.gz
+	use bogofilter && epatch ${FILESDIR}/${PN}-2.8.2.1-bf-junk.patch.gz
 
 
 	eaclocal || die
diff --git a/mail-client/evolution/files/digest-evolution-2.8.1.1 b/mail-client/evolution/files/digest-evolution-2.8.3
index 8d8313d6b79e..4d2af2ebbaa9 100644
--- a/mail-client/evolution/files/digest-evolution-2.8.1.1
+++ b/mail-client/evolution/files/digest-evolution-2.8.3
@@ -1,6 +1,6 @@
 MD5 31456188591167083628df719adc8f22 evolution-2.5.5.1-bf-junk.tar.bz2 10771
 RMD160 7ae764761607d50024fbec32680bc57e04ac7879 evolution-2.5.5.1-bf-junk.tar.bz2 10771
 SHA256 b8988b28836a201606d8fa651f48722ebac8c984dcc171f7f7a3b860d0f7a045 evolution-2.5.5.1-bf-junk.tar.bz2 10771
-MD5 dcf3a8cc527a7d8b5ae0ac56d66fff64 evolution-2.8.1.1.tar.bz2 12897409
-RMD160 f8a457e816372ee869092a9c33b0a03a81a85a85 evolution-2.8.1.1.tar.bz2 12897409
-SHA256 0eeedf3808949772603bef4d54c879437dbc08d08dacba19f5994acc6ba60cb0 evolution-2.8.1.1.tar.bz2 12897409
+MD5 099876b347b114ec08ce6998b4a48d8c evolution-2.8.3.tar.bz2 12931527
+RMD160 cbf86ecbee7619f54ea6e60780d5c182208c5bf3 evolution-2.8.3.tar.bz2 12931527
+SHA256 08819f459185de7f36ac43702bb5314d1b2a9fae33db9ac4c5d9dfb3aaabca90 evolution-2.8.3.tar.bz2 12931527