Fix 'Old POP3 mails can be removed before getting them, upstream bug #705446', drop old

Package-Manager: portage-2.1.13.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 97 insertions, 22 deletions

diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index e97a6b5422cd..7b5e3aae2cdc 100644
--- a/mail-client/evolution/ChangeLog
+++ b/mail-client/evolution/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for mail-client/evolution
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.401 2013/08/04 08:48:48 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.402 2013/08/09 17:35:13 pacho Exp $
+
+*evolution-3.8.4-r1 (09 Aug 2013)
+
+  09 Aug 2013; Pacho Ramos <pacho@gentoo.org> +evolution-3.8.4-r1.ebuild,
+  +files/evolution-3.8.4-pop3-removal.patch, -evolution-3.8.3.ebuild:
+  Fix 'Old POP3 mails can be removed before getting them, upstream bug #705446',
+  drop old
 
   04 Aug 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
   evolution-3.8.3.ebuild, evolution-3.8.4.ebuild:
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index 64520450280c..70d82ff0f3e6 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -9,25 +9,21 @@ AUX evolution-2.32.3-g_thread_init.patch 2810 SHA256 2162851b365ceb0bf3f7963d219
 AUX evolution-2.32.3-gmodule-explicit.patch 808 SHA256 92e12766bcbe6e9dc46720c93ece116c4abd28a15798eb976ad0deb96da6e29c SHA512 853bd8c1da4c36cd19ecb2fba289576dac2ed150d23e038af53579e64258e2d35b1f8fabf6b9cd7736d4a7835cd59cb0eab395da8c84bfb94826bd579b59a5ab WHIRLPOOL a662c1b0237fefeff2c93b7f048b8374d35e8447e0e3ae2a862097dddaef39f771eb5b611abf44670b7184e1b2078f5d04d26ea868772b53d9f63f1cc2cef4b5
 AUX evolution-2.32.3-libxml2-2.9.patch 1649 SHA256 1c9551df454b3fd824c8b9e1e0e0c6ef155d77b8b0a92a1f417aa219648363d8 SHA512 f9037337ada708a45820d08385989f55e115189fa779aad52b4a6e7358b480b855e803ea9b58f09304268267f6593838ba526f0653e549a06757140070be9a3f WHIRLPOOL 453e60c595ff4cfec59b7f3ccaddb77b625025f49946d17e561e5604c59cad056b9193345ef78957a113ea880cc3b894881446d68707b572029b82692722f1e0
 AUX evolution-3.3.91-spamassassin-paths.patch 2223 SHA256 9f2ea27193ff299dd130f562c5b9eb44ddf7825c357db11c72e49bf792f97680 SHA512 9878295882d80d8933fdd8456aed9bd03d118a20b2cff5f364b412337ecd8dd1c4788de5b84db5d35d1ba97097d54b137fc07740764ccc136b2ea7a68687a045 WHIRLPOOL aa6db1419a2516f885ef3bce64723ee03079eb8f3f4a1da35bfed0787ffebfbb37afa66dab534be6885e9759c513ab2e7c5d2729348b8c22d9410cd40de0d5b4
+AUX evolution-3.8.4-pop3-removal.patch 2337 SHA256 e352078e0c75930b8372401b5e87f866a775fdf5c2185af845d9caed5b122ac9 SHA512 fdca180ed552c9c2729bfa8d8cef2cb19c69026340e5f156baf4ff8254dee6484514946e8322ac6c3a3f37525d0c1305db33b23218345d1005ee45bd03d687ec WHIRLPOOL c2bdb1401dd471814fd9bc5e787ba67cfdc75bcca9d63f8541b7e68d316afaba46de95b44d7a89540e0830f76e592ce446be7a506ab3105cfe1477f1e6f112f0
 DIST evolution-2.32.3-patches.tar.xz 11784 SHA256 eadfcd9d1663206f1d15457358afa7901f095894d782d4043ffd762b242eded6 SHA512 f8514ffc5079ba91448277365fadcec3f4ec949fdef8a5eebd1d529aaa73736721c405088eea363bbf5fc9cac6f8799ed329b53c5369e6acf93ac16eb8d2e7ac WHIRLPOOL 1a9fb503c921705d58ab89aa24495cb85cbd00df8ff6f2fd1f79750213759ee4d4856efe5bf7bd927eff3e250b2c06c0aec448d69fc974bc17a47fb67a49f8bc
 DIST evolution-2.32.3.tar.bz2 31966138 SHA256 33ab38780e9abb71506230e331e9c3534444b5ed3f17046f0b6371a00df686fb SHA512 7241954f4e6ab87151e2c4af0bd33d5f428ab5e01f935aafbfaf50714a495fe01fe54c3f3c6498d514880bf1c5271d491a523d79b2928827490204b9eee4c0d3 WHIRLPOOL 982ca39ff6c02adbd168a8c82a164636eaf908e0e4905195d321187199339a8e9725fa91b7d8d95b3ff5d32a9b7faf0a4a9da8d651915b4d1581788f722fb8c9
 DIST evolution-3.6.4.tar.xz 12401324 SHA256 7bf7054d85b7d1bd0e62d69f15ef80dbe781f57359bf91e7c427cd93378ba4a1 SHA512 a7e162289ac7b29f748c3f3bb65b17b1362831131b5b5aed32f763259b6b54ba7d38d7a59f4df778384fbf2c90e2d4807299c0dc05f576df19ae6a9abf72e4e2 WHIRLPOOL bd86b79c45b8d01557999729b1dc12ab49e5791651c2ae885b30a0ef50a3e78670ca055eb0e242f8aa40f78c1edf8beab3f33a49d57532f0912c48cc58349123
-DIST evolution-3.8.3.tar.xz 12322284 SHA256 b0ee1eae5f4752eeb0b62c3be2daa08195ab4fd19092bfe6e75d02ac457ebe3a SHA512 97a6a3229bf1c3f08ec66f164dc90ca4550b25090c66f13da79452884c4eb63943cd45fd443c1cf6cd727329a5230b010be75c643a5a5a0d8bcd3b9c125308f2 WHIRLPOOL 0bf24497db13de28f27aa3364b34878d62e8346424d6bc45a992e952ccb0d6642b8577df9cce41877bc8aee42453472f7d0c17dd24ded2799c0698a1a9cd4dc4
 DIST evolution-3.8.4.tar.xz 12324844 SHA256 d5cfd0cb68ed8bf6e9515a5a44f566e3d26d3813a22ee6e5b0f86029039b1766 SHA512 3d074ad1678067a673ff715090b9543c4a108ff571d28c08e10936d4572648327dc1d6cd5d0eb10133202a589e407e8e9c535247921c699792899ceabeaa678b WHIRLPOOL 15cad220f5a130ff1a95c10492b07c3aec82f82c9f5948b9e8b8f8593496aa17e46bd505641d002a1611d16d2c575cb959c1776c91d7b9896cea536489251598
 EBUILD evolution-2.32.3-r1.ebuild 6164 SHA256 eccfbb24f84fdee7528af0973e475f92e7049b85e59bfbbcc4e58b67747e8e49 SHA512 4f84b8ab0e6188a4162199d7ed1e319702f2831cb1907452d7d02b82e5eaf19f439d99e39f05852ff81ffcdd75b6da5036c04e3d177afd45bdb475ad4ec5de33 WHIRLPOOL 95416087ca1f2677f145d2bbabfb2c6d4d7a0497d03d0fa76aa7a1d5abadb0136d796a7c6c5048745c4fb33448dea5fd744b8eda22a0a7e2b99c5076a0c5401c
 EBUILD evolution-3.6.4.ebuild 4808 SHA256 e837f9e98a03f439e51ac8008556162b1afa08ae4e3721e038b8b42843bf24ac SHA512 14261f40501d3bce54c619dba3312ffa06f3bf7c84ace06e6b76952349bf999596eb40f9260e0523c25f92a238c4547c641de04aa150496b081186a756cde55c WHIRLPOOL 51e1750f0f18bf0de00264965724c3f483e7bedb2c24b2bb2d64777341391eaab2213bf8d8898c9910bb9bcb34d58f3c2fe37f6c1210e98a3769fe87c03733cc
-EBUILD evolution-3.8.3.ebuild 4557 SHA256 7604e659c8b9d7c9c687c4e2592600840639002474d52d032e4db54edffb2c15 SHA512 d267ad6ac7b26805cb465699b7681d7fc024bbb85019c8b6cc5e5d385a9ae352219e2b3f29c6f18b976c8a12a01250cb55a899228f50ff888e434db8006cc394 WHIRLPOOL 4efbfc3a0d491ab5a9872cf7cdc2d0f595cc374a7756638b0c14068feec113b4346764d862dacdc83638131b6b50cf7597998c8e2c2e6c7c929535f32bc9f627
+EBUILD evolution-3.8.4-r1.ebuild 4612 SHA256 2ecd5b0e7b0206584deae6af49fd01b2f9739c20f33d1a7c20d0d044d7514f47 SHA512 109d296874c41dd58f4dd0e68ac346fe98292af1591172d3ecdc2d0276857c542112b970b07e9cc73a6ad54753a16c233064835cd4d9bf657206458035aba54a WHIRLPOOL bfdce8834c53dd141a6962e2aafc7c6060aa7cf45e864590351c390e6001a27c11f7faeb5c100f48139d9e7761b6251b6382d36a0ddd42204ddb1401f53aa96c
 EBUILD evolution-3.8.4.ebuild 4491 SHA256 33e548fd105f850ed2a891f95f290badec992f954886fb8bf43665a0e1a82186 SHA512 f5faa878a9dc48e96a752e8ac117d5563beec2055b60cfb2a0dc9289d5da62e7cede6c76c744da21167b7a1708b6d3bb3173ef0b8b867b9fa54a5091963b11e2 WHIRLPOOL d5bcc1dbcf8e5a6a2751473baa05b0955cba749fa6291bdad5e6fb8501d3ed0c4edfdd33ff195ab2e4e7dfc22803c84eb829d1be11e2bb7ee4816a6bd617fdd8
-MISC ChangeLog 89016 SHA256 60b3d67273ea8f2df03affc106f8d7ae21cb30888be34ff3099044cb772c438e SHA512 7b38480cf442e6cdf3fc9fa78e36d53bb5c8360890eb4b880ce084a462919d1d6acf9b352dd7e8b6fedff4de3ecdf36d6a2935f99bddc110582fcda873a1f0a1 WHIRLPOOL ab2a058c4151c33e0cf97de6168335fc3a3c080ccf01f7a6479e16d819c390d579c6865d5647d9bad0119d256de2ac958fc74980db6e108363b9a596c4a91eca
+MISC ChangeLog 89284 SHA256 f8fbeb79db9550ac06e52889043a5fccba3c8e7f62693c91960f7919b406283e SHA512 8b6d0e139fba8b8f921588712d006ca93f1fc2097bedb7c64b5d2e2b5559ff3bc64d8511a6ba63b6e0f1ba57a70225eef7e797ec9fab0472c3225debabc73512 WHIRLPOOL a64508737dd311293a77d92f5e9a10c769231755c19f47c901278b2f0d269cc9b579448b03055943779eaecf83336bf6f5cf7e4484f3845f3881cfae913c307f
 MISC metadata.xml 1273 SHA256 57d501a14b07828c2c839e5fe5c97f7bcf765e507b2d1a264c104eab4819215f SHA512 856175453a5f7c376c687ed229ff0dcc9c2dd840d3b6f5c1617f58d227fdfeabe944dcc8229d2fc1fa32f698337368fe1d3e76fe6d7c841d4fe68a5afbe8db8c WHIRLPOOL ef128b4d25b0e2b02cfd76105409e60ca2fa0ca89ccf1c08f088e202dcc1b780452b70c6e7e5363b8157eef39785285945c796de99a09d4547c5a13ba7d9c36d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJR/hVwAAoJEJ0WA1zPCt1hYk4IAJVsxxWfcV5mv4MD9fbfPSqe
-AmZcswgVpxjMIHjxhXnPcPOiEJChKXH4J3Uv94ovYfoSxZWxxXM8L+nwXqe1HQfU
-5cqCgDlkNmB/Dsdp1uGuFXLrR19EIXG4V44sUNtMf/IJaxR9yOkb0lJu9N7N8ZGT
-SpDzT558anf3ztuhucj+QelANm7zYupWc+urjWHbDkOmpXEihDjhEm9Xn9rJKq79
-7AHfnNWaFMscZy4xMVKdiJsmFuVY4uFaX75zOaxmZAU7mmcNCwjvChZdfSZOTsZj
-fxgs7dg0TSPRumTXAZYjS4kBVlcXBX7PoSBNavfY52NMxhItK7ciGE6kENLXLTI=
-=/t3M
+iEYEAREIAAYFAlIFKFIACgkQCaWpQKGI+9SSMACeO0h4kVH/6oX37rCAbwjS1Wy5
+kgAAn0Wy1EK3NjSaoV1YAQlVecFO5Cld
+=Qz3I
 -----END PGP SIGNATURE-----
diff --git a/mail-client/evolution/evolution-3.8.3.ebuild b/mail-client/evolution/evolution-3.8.4-r1.ebuild
index c32d9b1eff4c..39a2f15ddb44 100644
--- a/mail-client/evolution/evolution-3.8.3.ebuild
+++ b/mail-client/evolution/evolution-3.8.4-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-3.8.3.ebuild,v 1.3 2013/08/04 08:48:48 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-3.8.4-r1.ebuild,v 1.1 2013/08/09 17:35:13 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit autotools eutils flag-o-matic readme.gentoo gnome2
+inherit eutils flag-o-matic readme.gentoo gnome2 #autotools
 
 DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
 HOMEPAGE="https://live.gnome.org/Evolution http://projects.gnome.org/evolution/"
@@ -40,7 +40,7 @@ COMMON_DEPEND="
 	>=x11-misc/shared-mime-info-0.22
 	>=x11-themes/gnome-icon-theme-2.30.2.1
 	>=dev-libs/libgdata-0.10:=
-	>=net-libs/webkit-gtk-1.10.0
+	>=net-libs/webkit-gtk-1.10.0:3
 
 	x11-libs/libSM
 	x11-libs/libICE
@@ -50,18 +50,15 @@ COMMON_DEPEND="
 		=app-crypt/gnupg-1.4* ) )
 	map? (
 		>=app-misc/geoclue-0.12.0
-		>=media-libs/libchamplain-0.12:0.12
+		>=media-libs/libchamplain-0.12:0.12[gtk]
 		>=media-libs/clutter-1.0.0:1.0
 		>=media-libs/clutter-gtk-0.90:1.0
 		~sci-geosciences/geocode-glib-0.99.0
 		x11-libs/mx:1.0 )
 	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.2 )
-	gstreamer? ( || (
-		 ( media-libs/gstreamer:1.0
-		   media-libs/gst-plugins-base:1.0 )
-		 ( media-libs/gstreamer:0.10
-		   media-libs/gst-plugins-base:0.10 )
-	) )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0 )
 	kerberos? ( virtual/krb5:= )
 	ldap? ( >=net-nds/openldap-2:= )
 	ssl? (
@@ -98,10 +95,15 @@ x-scheme-handler/https=firefox.desktop
 file from /usr/share/applications if you use a different browser)."
 
 src_prepare() {
+	# Reason?
 	ELTCONF="--reverse-deps"
+
 	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
 
-	eautoreconf # See https://bugzilla.gnome.org/701904
+	# Old POP3 mails can be removed before getting them, upstream bug #705446
+	epatch "${FILESDIR}/${P}-pop3-removal.patch"
+
+	#eautoreconf # See https://bugzilla.gnome.org/701904
 
 	gnome2_src_prepare
 
diff --git a/mail-client/evolution/files/evolution-3.8.4-pop3-removal.patch b/mail-client/evolution/files/evolution-3.8.4-pop3-removal.patch
new file mode 100644
index 000000000000..052f1d5b7f4a
--- /dev/null
+++ b/mail-client/evolution/files/evolution-3.8.4-pop3-removal.patch
@@ -0,0 +1,70 @@
+From 8b8ddbd16eeb3217a7a15b59e8f966b61d989977 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha@redhat.com>
+Date: Thu, 08 Aug 2013 05:48:49 +0000
+Subject: Bug #705446 - Old POP3 mails can be removed before getting them
+
+---
+diff --git a/libemail-engine/mail-ops.c b/libemail-engine/mail-ops.c
+index dccd001..643b82c 100644
+--- a/libemail-engine/mail-ops.c
++++ b/libemail-engine/mail-ops.c
+@@ -348,7 +348,7 @@ fetch_mail_exec (struct _fetch_mail_msg *m,
+ 			g_object_ref (fm->destination);
+ 		}
+ 
+-		if (!local_error) {
++		if (!local_error && !g_cancellable_is_cancelled (cancellable)) {
+ 			folder_uids = camel_folder_get_uids (folder);
+ 			cache_uids = camel_uid_cache_get_new_uids (cache, folder_uids);
+ 
+@@ -373,11 +373,26 @@ fetch_mail_exec (struct _fetch_mail_msg *m,
+ 					g_cancellable_reset (m->cancellable);
+ 
+ 				if (!success) {
++					GPtrArray *uncached_uids;
++					GHashTable *uncached_hash;
++
++					uncached_uids = camel_folder_get_uncached_uids (folder, cache_uids, NULL);
++					uncached_hash = g_hash_table_new (g_str_hash, g_str_equal);
++
++					for (i = 0; uncached_uids && i < uncached_uids->len; i++) {
++						g_hash_table_insert (uncached_hash, uncached_uids->pdata[i], uncached_uids->pdata[i]);
++					}
++
+ 					/* re-enter known UIDs, thus they are not
+ 					 * re-fetched next time */
+ 					for (i = 0; i < cache_uids->len; i++) {
+-						camel_uid_cache_save_uid (cache, cache_uids->pdata[i]);
++						/* skip uncached UIDs */
++						if (!g_hash_table_lookup (uncached_hash, cache_uids->pdata[i]))
++							camel_uid_cache_save_uid (cache, cache_uids->pdata[i]);
+ 					}
++
++					g_hash_table_destroy (uncached_hash);
++					camel_folder_free_uids (folder, uncached_uids);
+ 				}
+ 
+ 				/* save the cache of uids that we've just downloaded */
+@@ -433,9 +448,18 @@ exit:
+ 
+ 	/* also disconnect if not a local delivery mbox;
+ 	 * there is no need to keep the connection alive forever */
+-	if (!is_local_delivery)
++	if (!is_local_delivery) {
++		gboolean was_cancelled;
++
++		was_cancelled = g_cancellable_is_cancelled (cancellable);
++
++		/* pity, but otherwise it doesn't disconnect */
++		if (was_cancelled)
++			g_cancellable_reset (cancellable);
++
+ 		camel_service_disconnect_sync (
+-			service, TRUE, cancellable, NULL);
++			service, !was_cancelled, cancellable, NULL);
++	}
+ 
+ 	g_object_unref (session);
+ }
+--
+cgit v0.9.2