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

Package-Manager: portage-2.1.2-r9

4 files changed, 40 insertions, 26 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/Manifest b/mail-client/evolution/Manifest
index 1001451fd5d5..2ed0eab08fdd 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -35,16 +35,12 @@ RMD160 cd50a106b1e05831f21ac1aece2aa7a0e568738b files/evolution-2.8.2.1-sig-hand
 SHA256 e983f8705959f2d52cb4259cbda4cc6892280265b29a0192189dec38e7e03fc6 files/evolution-2.8.2.1-sig-handlers.patch 1357
 DIST evolution-2.5.5.1-bf-junk.tar.bz2 10771 RMD160 7ae764761607d50024fbec32680bc57e04ac7879 SHA1 465205cf50770b72641995ec59617010dadaf204 SHA256 b8988b28836a201606d8fa651f48722ebac8c984dcc171f7f7a3b860d0f7a045
 DIST evolution-2.6.2.tar.bz2 12394719 RMD160 72133312fb9cceae74d9f0e570dd898d5119a10b SHA1 08a6a9bf3754fff71cbdf82857337b1edc13ef46 SHA256 a69c45e9deae3a2eea06af08eacb9266e6cdcd452dd600ad96c2de23effa56f5
-DIST evolution-2.8.1.1.tar.bz2 12897409 RMD160 f8a457e816372ee869092a9c33b0a03a81a85a85 SHA1 13fd219e15efce9522e871943ef157e9dbdc3a57 SHA256 0eeedf3808949772603bef4d54c879437dbc08d08dacba19f5994acc6ba60cb0
 DIST evolution-2.8.2.1.tar.bz2 12921518 RMD160 9198236aded4c8b905eb990b725d01d399308491 SHA1 ccd38cddd96a0ed0375b315eb1e8dc536ef8bc90 SHA256 4fb4b7b987a8e0677b270b44d567e7821007f2b1c4af236c66d81f35a5b4c144
+DIST evolution-2.8.3.tar.bz2 12931527 RMD160 cbf86ecbee7619f54ea6e60780d5c182208c5bf3 SHA1 afde414298d65ec344f52648c1915629bf7b79c3 SHA256 08819f459185de7f36ac43702bb5314d1b2a9fae33db9ac4c5d9dfb3aaabca90
 EBUILD evolution-2.6.2-r1.ebuild 6101 RMD160 f5acd83e1712b26c8c762f68f80aafe94532ebaa SHA1 e7a7e90e2b0eeeecd267a359d21ed7b36c08c4b9 SHA256 f4aa7497d9cc6ad88352a9b7ad8607ad2788249e70cb3874995265147a3f4bc5
 MD5 5e81f8102e75b4b27c4cfbe856f2b30d evolution-2.6.2-r1.ebuild 6101
 RMD160 f5acd83e1712b26c8c762f68f80aafe94532ebaa evolution-2.6.2-r1.ebuild 6101
 SHA256 f4aa7497d9cc6ad88352a9b7ad8607ad2788249e70cb3874995265147a3f4bc5 evolution-2.6.2-r1.ebuild 6101
-EBUILD evolution-2.8.1.1.ebuild 6035 RMD160 90ae806d781eb0406db923fe4da58fb8be07e81e SHA1 18137a300b716b74a9031870573714fca0900546 SHA256 bf5f58aee7ff6c8136444cfdbc8a5fc4e70912ffff07f6174ae4aaea23477545
-MD5 c2e74fd4f2583fffe511e32f7e0e7ddc evolution-2.8.1.1.ebuild 6035
-RMD160 90ae806d781eb0406db923fe4da58fb8be07e81e evolution-2.8.1.1.ebuild 6035
-SHA256 bf5f58aee7ff6c8136444cfdbc8a5fc4e70912ffff07f6174ae4aaea23477545 evolution-2.8.1.1.ebuild 6035
 EBUILD evolution-2.8.2.1-r1.ebuild 6145 RMD160 50c2dc70a347c0d0168c96b2e2e88c310d111f95 SHA1 3213e98e99bd80baa173b39061470bf0b9c0e72f SHA256 73b3606ef4519dd31eb59815ce0cd81a1ba783cd7407e57657573e244f0edad7
 MD5 bd5f29241daa16ab809461bc6ccf2c14 evolution-2.8.2.1-r1.ebuild 6145
 RMD160 50c2dc70a347c0d0168c96b2e2e88c310d111f95 evolution-2.8.2.1-r1.ebuild 6145
@@ -53,10 +49,14 @@ EBUILD evolution-2.8.2.1.ebuild 6041 RMD160 4b927787f5e5d0b4fe69d4ca6c5797b840da
 MD5 1b90d5eac078bc2bed7afd1ed27be3d9 evolution-2.8.2.1.ebuild 6041
 RMD160 4b927787f5e5d0b4fe69d4ca6c5797b840da1a78 evolution-2.8.2.1.ebuild 6041
 SHA256 8cc87d6817c6f26c5b0e9ef3539af34ebd74a5af2f61577b1b77a504b2165702 evolution-2.8.2.1.ebuild 6041
-MISC ChangeLog 40433 RMD160 b1787860f1db4a6a8c0b3482ef6d5d22179eb7e6 SHA1 5d5c49457b0d297e7342b08e6659d0144a8caa95 SHA256 6d118be76d98110e1afaa7e6943d1b1d3b161e056f8c7873844d59885eca2b32
-MD5 93410d98b197a8b23f4fae369efbb7e0 ChangeLog 40433
-RMD160 b1787860f1db4a6a8c0b3482ef6d5d22179eb7e6 ChangeLog 40433
-SHA256 6d118be76d98110e1afaa7e6943d1b1d3b161e056f8c7873844d59885eca2b32 ChangeLog 40433
+EBUILD evolution-2.8.3.ebuild 6394 RMD160 ceac5e19c8f51cd9e62634adf277f3fb36b22b77 SHA1 32fe606b4e398efba5b7897a7cfad94dcfaeb9df SHA256 408d66d42a3dab96e74e987526c05031261a3832e59642f6d2ebb72a6d1ca4c7
+MD5 4fd2eb6453c01104999b3adff65e54a3 evolution-2.8.3.ebuild 6394
+RMD160 ceac5e19c8f51cd9e62634adf277f3fb36b22b77 evolution-2.8.3.ebuild 6394
+SHA256 408d66d42a3dab96e74e987526c05031261a3832e59642f6d2ebb72a6d1ca4c7 evolution-2.8.3.ebuild 6394
+MISC ChangeLog 40634 RMD160 b78326837b2a964fe905e9e329ac05015d964452 SHA1 4dd9d8cc0e4e931eacdfd140a73a49222d37ceca SHA256 6e4d07c6c9947d263158baffe7ea7f529c8f4e5b4898c50b08c9d0e64f8e6366
+MD5 7bc6502002b43431f4c3dfb7d4b35f9f ChangeLog 40634
+RMD160 b78326837b2a964fe905e9e329ac05015d964452 ChangeLog 40634
+SHA256 6e4d07c6c9947d263158baffe7ea7f529c8f4e5b4898c50b08c9d0e64f8e6366 ChangeLog 40634
 MISC metadata.xml 228 RMD160 56f093a5237fbe1d26c6914d47d4092d9de0cbcf SHA1 a7000d8d92e63e8b0bcb2531adea06af0fb4ceac SHA256 2f477aca2b0940f4b8d5a5817f1def0daa79846e5d3cb9b6c832a02ee7be298a
 MD5 adc1e2cec38f3e23b706de11a2ac0d92 metadata.xml 228
 RMD160 56f093a5237fbe1d26c6914d47d4092d9de0cbcf metadata.xml 228
@@ -64,19 +64,19 @@ SHA256 2f477aca2b0940f4b8d5a5817f1def0daa79846e5d3cb9b6c832a02ee7be298a metadata
 MD5 f58ca96f6e0006d63acada5e98d62982 files/digest-evolution-2.6.2-r1 533
 RMD160 94fb86de744f42bcae39b6f5a0d6276ed559014e files/digest-evolution-2.6.2-r1 533
 SHA256 730a2ffe0655db234cb17adecb91357a37e42064f41dc64cccfb7ab2fda0614d files/digest-evolution-2.6.2-r1 533
-MD5 991ee8e9fdc3debf58b6a2a5bc4e18fd files/digest-evolution-2.8.1.1 539
-RMD160 3c8e00d6bf32184f164a7d0a93bbe848fb8b4fe4 files/digest-evolution-2.8.1.1 539
-SHA256 6bcce6b1bfc47b5afa122918e98dd88789e4820a5f45f0804d17398e46c9dcf3 files/digest-evolution-2.8.1.1 539
 MD5 69f24fe63512a4a3c5568d92cc01df88 files/digest-evolution-2.8.2.1 539
 RMD160 bc777ef9751d4b4bf1b3d795245872dbcd8f878f files/digest-evolution-2.8.2.1 539
 SHA256 d973eab10ec33eb05052ae144c088a0a9ee7c983c5c9d62a9096c1dcbc780561 files/digest-evolution-2.8.2.1 539
 MD5 69f24fe63512a4a3c5568d92cc01df88 files/digest-evolution-2.8.2.1-r1 539
 RMD160 bc777ef9751d4b4bf1b3d795245872dbcd8f878f files/digest-evolution-2.8.2.1-r1 539
 SHA256 d973eab10ec33eb05052ae144c088a0a9ee7c983c5c9d62a9096c1dcbc780561 files/digest-evolution-2.8.2.1-r1 539
+MD5 4baf69f8a0985f0b493a39c1e5f2920e files/digest-evolution-2.8.3 533
+RMD160 0aca45717cdcb1e57839b1826d465c3f96ebd8b5 files/digest-evolution-2.8.3 533
+SHA256 4a580168c5f139e4e65dec026d9c27358a0caad314d78b403d51b38e6fb7a424 files/digest-evolution-2.8.3 533
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
+Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFFv5bkomPajV0RnrERAjgYAJ46o+9osV6RGJfTOQ5bGeV/vH8zGQCeKZOn
-jb7Y+rNpSnAGjgCT9+4G4TU=
-=oYev
+iD8DBQFFyxbqkeYb6olFHJcRAg38AJ0dGAVCO2Qf/oE7TLZDsB1YmbaskwCePKpo
+aj0F9hozThvPhfZupO/60Hc=
+=7dTE
 -----END PGP SIGNATURE-----
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