Bump to 2.8.3-r1

 -  Fix settings OK button.  Bug #166740

Package-Manager: portage-2.1.2-r11

5 files changed, 41 insertions, 16 deletions

diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index ac5a852ae244..cf46c98bbd1f 100644
--- a/mail-client/evolution/ChangeLog
+++ b/mail-client/evolution/ChangeLog
@@ -1,6 +1,14 @@
 # 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.162 2007/02/17 17:25:33 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.163 2007/02/26 17:56:29 dang Exp $
+
+*evolution-2.8.3-r1 (26 Feb 2007)
+
+  26 Feb 2007; Daniel Gryniewicz <dang@gentoo.org>
+  +files/evolution-2.8.3-missing-groupwise-feature.patch,
+  -evolution-2.8.3.ebuild, +evolution-2.8.3-r1.ebuild:
+  Bump to 2.8.3-r1
+   -  Fix settings OK button.  Bug #166740
 
   17 Feb 2007; Daniel Gryniewicz <dang@gentoo.org>
   +files/evolution-2.8.2.1-pilot-link-as-needed.patch,
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index e1cb85ea4199..125df826cec8 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -37,6 +37,10 @@ AUX evolution-2.8.2.1-sig-handlers.patch 1357 RMD160 cd50a106b1e05831f21ac1aece2
 MD5 7b85e3ca755762e4c060557cfd2124b9 files/evolution-2.8.2.1-sig-handlers.patch 1357
 RMD160 cd50a106b1e05831f21ac1aece2aa7a0e568738b files/evolution-2.8.2.1-sig-handlers.patch 1357
 SHA256 e983f8705959f2d52cb4259cbda4cc6892280265b29a0192189dec38e7e03fc6 files/evolution-2.8.2.1-sig-handlers.patch 1357
+AUX evolution-2.8.3-missing-groupwise-feature.patch 429 RMD160 2ca3bfa4bce41eb1e7fa4f298dfd000fe6f4cb6b SHA1 ccb5ba7fcd0a1fc71c965674355b4b0122956eb3 SHA256 88a4e262ef67d3465e4a06b11be2f23e7872b445f85a3c4e9ef41436b20182b4
+MD5 4431d899b1e6fff9d8ea9e3b23f33af7 files/evolution-2.8.3-missing-groupwise-feature.patch 429
+RMD160 2ca3bfa4bce41eb1e7fa4f298dfd000fe6f4cb6b files/evolution-2.8.3-missing-groupwise-feature.patch 429
+SHA256 88a4e262ef67d3465e4a06b11be2f23e7872b445f85a3c4e9ef41436b20182b4 files/evolution-2.8.3-missing-groupwise-feature.patch 429
 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.2.1.tar.bz2 12921518 RMD160 9198236aded4c8b905eb990b725d01d399308491 SHA1 ccd38cddd96a0ed0375b315eb1e8dc536ef8bc90 SHA256 4fb4b7b987a8e0677b270b44d567e7821007f2b1c4af236c66d81f35a5b4c144
@@ -53,14 +57,14 @@ EBUILD evolution-2.8.2.1.ebuild 6159 RMD160 459ee0470de24aeab8106314b1416f5562f4
 MD5 9b36e03873213743c6804e164ed78d24 evolution-2.8.2.1.ebuild 6159
 RMD160 459ee0470de24aeab8106314b1416f5562f489ba evolution-2.8.2.1.ebuild 6159
 SHA256 43ccc84cf00769f79f6f24064c2044bd3b96e25fd5178a0fb8dd6a5b38cce904 evolution-2.8.2.1.ebuild 6159
-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 40861 RMD160 12d4db57f9781b75df0a7a168c03b11f2bd8fa49 SHA1 b4b23bf2f7c5356b9d7b1468198204f0e600a1ef SHA256 7c539f96d9d8d8bd664e86c02112794162cdd4257376da596d122056ed3b0b73
-MD5 7806feafd3757194ae13729d9b2e5e64 ChangeLog 40861
-RMD160 12d4db57f9781b75df0a7a168c03b11f2bd8fa49 ChangeLog 40861
-SHA256 7c539f96d9d8d8bd664e86c02112794162cdd4257376da596d122056ed3b0b73 ChangeLog 40861
+EBUILD evolution-2.8.3-r1.ebuild 6497 RMD160 36e42b38cecd67164a409fbc9b39ac1f95c51344 SHA1 f73ea70deae5642fa07f4c0c49f677649fff6494 SHA256 74a71ea02e387a9cdf23313c9e74c14928afe04ce02c775c9f5107447ea8575c
+MD5 cf00254ea1cb1a3d136cce6ff5eb3f00 evolution-2.8.3-r1.ebuild 6497
+RMD160 36e42b38cecd67164a409fbc9b39ac1f95c51344 evolution-2.8.3-r1.ebuild 6497
+SHA256 74a71ea02e387a9cdf23313c9e74c14928afe04ce02c775c9f5107447ea8575c evolution-2.8.3-r1.ebuild 6497
+MISC ChangeLog 41123 RMD160 db52e2a0edc0842b7864aed4a84df8219e6c7c07 SHA1 d7769ca16b659a7450da46d39e5f074f71577a52 SHA256 b579e5a6fbf66dae35b54431fb0e4801c8f69999954bdce594f43675aa9bbb64
+MD5 9b9e61bdc75a507d93aecf88ac9b91a9 ChangeLog 41123
+RMD160 db52e2a0edc0842b7864aed4a84df8219e6c7c07 ChangeLog 41123
+SHA256 b579e5a6fbf66dae35b54431fb0e4801c8f69999954bdce594f43675aa9bbb64 ChangeLog 41123
 MISC metadata.xml 228 RMD160 56f093a5237fbe1d26c6914d47d4092d9de0cbcf SHA1 a7000d8d92e63e8b0bcb2531adea06af0fb4ceac SHA256 2f477aca2b0940f4b8d5a5817f1def0daa79846e5d3cb9b6c832a02ee7be298a
 MD5 adc1e2cec38f3e23b706de11a2ac0d92 metadata.xml 228
 RMD160 56f093a5237fbe1d26c6914d47d4092d9de0cbcf metadata.xml 228
@@ -74,13 +78,13 @@ SHA256 d973eab10ec33eb05052ae144c088a0a9ee7c983c5c9d62a9096c1dcbc780561 files/di
 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
+MD5 4baf69f8a0985f0b493a39c1e5f2920e files/digest-evolution-2.8.3-r1 533
+RMD160 0aca45717cdcb1e57839b1826d465c3f96ebd8b5 files/digest-evolution-2.8.3-r1 533
+SHA256 4a580168c5f139e4e65dec026d9c27358a0caad314d78b403d51b38e6fb7a424 files/digest-evolution-2.8.3-r1 533
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFF1zp9omPajV0RnrERAoZ9AJ9qfsY2YH4IGY6X1AV0PYlH4xopegCdHvNd
-Tdd5xphkEP/djazIjJ/ISeA=
-=FWhO
+iD8DBQFF4x6/omPajV0RnrERAsm0AJsFVTQJMmcWpRd7SOQs+Uvlra2wKQCfZIGd
+jgzAkDrPEBjYB78gk9zGSqw=
+=5iUk
 -----END PGP SIGNATURE-----
diff --git a/mail-client/evolution/evolution-2.8.3.ebuild b/mail-client/evolution/evolution-2.8.3-r1.ebuild
index 42d4d132ff01..63b20cfe5934 100644
--- a/mail-client/evolution/evolution-2.8.3.ebuild
+++ b/mail-client/evolution/evolution-2.8.3-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.3.ebuild,v 1.1 2007/02/08 12:26:36 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.8.3-r1.ebuild,v 1.1 2007/02/26 17:56:29 dang Exp $
 
 inherit eutils flag-o-matic alternatives gnome2 autotools
 
@@ -163,6 +163,9 @@ src_unpack() {
 	# Fix 64-bit warnings
 	epatch ${FILESDIR}/${PN}-2.8.1.1-64-bit.patch
 
+	# Fix settings OK button.  Bug #166740
+	epatch "${FILESDIR}"/${P}-missing-groupwise-feature.patch
+
 	# Add bogofilter junk plugin source
 	use bogofilter && epatch ${FILESDIR}/${PN}-2.8.2.1-bf-junk.patch.gz
 
diff --git a/mail-client/evolution/files/digest-evolution-2.8.3 b/mail-client/evolution/files/digest-evolution-2.8.3-r1
index 4d2af2ebbaa9..4d2af2ebbaa9 100644
--- a/mail-client/evolution/files/digest-evolution-2.8.3
+++ b/mail-client/evolution/files/digest-evolution-2.8.3-r1
diff --git a/mail-client/evolution/files/evolution-2.8.3-missing-groupwise-feature.patch b/mail-client/evolution/files/evolution-2.8.3-missing-groupwise-feature.patch
new file mode 100644
index 000000000000..cd3df66fe627
--- /dev/null
+++ b/mail-client/evolution/files/evolution-2.8.3-missing-groupwise-feature.patch
@@ -0,0 +1,10 @@
+--- plugins/groupwise-features/junk-settings.c.orig	2007-02-18 15:47:00.000000000 -0800
++++ plugins/groupwise-features/junk-settings.c	2007-02-18 15:36:18.000000000 -0800
+@@ -37,6 +37,7 @@
+ #include <gtk/gtkcellrenderertext.h>
+ #include <libgnomeui/gnome-ui-init.h>
+ #include <libgnome/gnome-init.h>
++#include <libgnome/gnome-i18n.h>
+ #include <e-util/e-error.h>
+ #include <e-util/e-util-private.h>
+ #include <e-gw-connection.h>