Fix building (#512206), drop evolution support as it requires a ton of different patches on nearly every evolution bump

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

13 files changed, 146 insertions, 362 deletions

diff --git a/mail-client/mail-notification/ChangeLog b/mail-client/mail-notification/ChangeLog
index 315e9a939a47..bc1c44efa084 100644
--- a/mail-client/mail-notification/ChangeLog
+++ b/mail-client/mail-notification/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for mail-client/mail-notification
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mail-notification/ChangeLog,v 1.121 2014/06/08 19:23:21 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mail-notification/ChangeLog,v 1.122 2014/12/11 11:28:50 pacho Exp $
+
+*mail-notification-5.4-r8 (11 Dec 2014)
+
+  11 Dec 2014; Pacho Ramos <pacho@gentoo.org>
+  +files/mail-notification-dont-link-against-bsd-compat.patch,
+  +mail-notification-5.4-r8.ebuild, -files/mail-notification-5.4-asneeded.patch,
+  -files/mail-notification-5.4-dont-update-cache.patch,
+  -files/mail-notification-5.4-e-d-s-2.24.patch,
+  -files/mail-notification-5.4-e-d-s.patch,
+  -files/mail-notification-5.4-evolution-gtkhtml.patch,
+  -files/mail-notification-5.4-fix-markup.patch,
+  -files/mail-notification-5.4-gmime.patch,
+  -files/mail-notification-5.4-icons.patch,
+  -files/mail-notification-5.4-sasl_encode64.patch:
+  Fix building (#512206), drop evolution support as it requires a ton of
+  different patches on nearly every evolution bump
 
   08 Jun 2014; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Move to maintainer needed as I am no longer taking care of it and noone from
diff --git a/mail-client/mail-notification/Manifest b/mail-client/mail-notification/Manifest
index c18ab7e75551..8f89c1049dc1 100644
--- a/mail-client/mail-notification/Manifest
+++ b/mail-client/mail-notification/Manifest
@@ -1,26 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX mail-notification-5.4-asneeded.patch 1104 SHA256 46d7d0a90e486c143fe6fc11709611de55920fe9a7ce24d54fa6984a72f174ec SHA512 4d8d8398498b268fb976a00abb6a7cbdcb117fe6483001538518fbc6bc839f2255a440825aa32d5c045ebf45eb828e739d58a90098b3194f71a847289503519c WHIRLPOOL ec92ed57d89bbd0a7642aba5856646c3c4ae4f11e5e22e329b8247988d5f14a9789d4118c28f59d6d4fd088ccfc141b54c87f00d4d355fc24ea294dccb330f1a
-AUX mail-notification-5.4-dont-update-cache.patch 888 SHA256 654b02200ac9ec60821dcd3b2baa268474055be2f7bd207b8ba9a2d7cb583c73 SHA512 3e36d6811bb543c01e6e1dec3ec059036bae5e8931bb822571b0e3fc14df916be855bfd874806547b659d67e0d40f6e22130a2e866770d31a5b0d61ac3885781 WHIRLPOOL 8c1a07a3050d208c811026507f6279dec68097319a9335c426386b2f71d3b50116e911a151a39925f5b391c4eff587918308ceeee5b16a12b6854e0c0f20a6ba
-AUX mail-notification-5.4-e-d-s-2.24.patch 521 SHA256 e8bde8df77a51b1b06846ac37e7df2b3f0d1ee28716ce171b21150bcfd75094b SHA512 91a872b5a41da002185f3ec80f6b798a14396857a6c50b28d6ab55972ea29e78ac0b416752d274ed275a62ba922a40320a96e12ef42aa2b260c0d797bfed64fb WHIRLPOOL 230b5e8fbb481f216ee027726238d8252259000650aef2d248bb694efdbbb243069054fcf23a867ae90b5e1214ff8dd5aabdc3561bf791c75258ad944bf97cb4
-AUX mail-notification-5.4-e-d-s.patch 3525 SHA256 95f506b595966609e35ba9db6a17631f8f3e31b82736f0dff16cdbae506cd96e SHA512 ab467e222e2685f18ad73957d716ab78a7341ba7bc87ea19ebe73907d9c1f9c7b2ace7767d4328668808eadc285bdc86e7c769eba2ade5fdd64d42b2d7bfaf65 WHIRLPOOL fb31f28825bedaaee282b9cbe3a11c972e89fa19d693e9866aa8831eafb39ebdec35014f0975461a54023e3682c3a9b2451f0583da66cbd7979ca88230d2b53d
-AUX mail-notification-5.4-evolution-gtkhtml.patch 690 SHA256 5c3d9004d03688e663c78045c101366ddc6e9f246947f7ab955a341d5693cb78 SHA512 7c2fa2a949b8714e1033014027e618de44e2e8dfe86997b05365bee0b90fa10eb434ccafbb38454319568cc31a6495b8b5e0b19ded624c54c70305934a42ba67 WHIRLPOOL b5de1a4ec3be60afd68c0f8893a320960a2b94e1efd91b85ea70006f138daf071706f2a5da91770d337151e21f26d3068448bdc6bf0d06b5f90d0b5589e29182
-AUX mail-notification-5.4-fix-markup.patch 1727 SHA256 c25984396bfa769aa437d0e912fd5a072a138d91206b312d02b2b9a28fa4f707 SHA512 5c1edf5372c56061b50385d818b169baa099a2dac276f6dd270ccfb8b59059aa1c0705ac49ec1ea36697276aa679d3e62f62299cf550c502cd1c5e2ef288e04b WHIRLPOOL 8322ce5589b2839bad2bb93cbdca163c7c2ca3dd380ed59d1fcd01848df7eb675c7fa2693767f3a28b9b7f08dcd9f8843c69cc9ed445b835df09bcd7dceaa204
-AUX mail-notification-5.4-gmime.patch 3110 SHA256 9d7d5b8d72023138f00050baaecf2cbdd3e9ba372c45b275ba0677d7118ed784 SHA512 552b76d93de084d645cf609b0f38e150baa7ec2c55bfcc1aab27394b8824fb5458b9079758c0cc0b94a6463107673243bbf783bf4d58ae8ade5ab4b824306f61 WHIRLPOOL 268731d563b3f35aaf8d5ec8fbd7023b022672b0c77771744610b29928bd8e87746bd9f98aebb9bd44e0c87197759de42375b1f71f53347ba5ae76511f1c533e
-AUX mail-notification-5.4-icons.patch 1484 SHA256 63e1c80a6bddf7381c1f490be61948455727bb4ea6b33009f32f2d02aaecfe7d SHA512 6eefab65a5b098220f1f62815fa3902a367265297caba213b0935b4af66e6ab26a75c0294acf4c1692ff19699dec3183a07aaa67b5f447a180df73c59d19fe2f WHIRLPOOL 3e3438e04f141fb9fe3d0945ae068e15c5633816f5e735e68eb46647d8ddd0e86072df2557774b9f03e20c2c9878413a634c7e807c329911b45b6a30d5cf79f2
 AUX mail-notification-5.4-remove-ubuntu-special-case.patch 948 SHA256 0b05f41072a859254b6dfb672f6654c630f116c80b86eac6fe1f39318a4a6050 SHA512 b028757398805bd0e23d45475704312621826e880c7da9f715ea6fbe89c053a8735ea63cdfba47bcc8b48590acf806e81f4128b4b5761331021e1b0e01738f5b WHIRLPOOL 6b5033dd28e3ead9b7bd70c04f00e6a15090252417f4bc3a70afcdae6b2658f74058096de0c591ccf4621b22fddcaf3342b840b85905d30f59fe634e63cebd55
-AUX mail-notification-5.4-sasl_encode64.patch 1298 SHA256 2d7b8132d6498d75d57cd44b1586ff9a9df74048a5e7724d96c05ed5c3cb079e SHA512 e331c3cb1f03af98a87b30066da47c245ff0b7c3250bbf571737de781d3ecbb9f899a4c730e5e76c9e0f5716fe88094424ee62601b979eb6abc496000bf09021 WHIRLPOOL 3f1d8f1115dba95d185745617e948975c2ea7c64167558dc2251f1e684f6a920a85512a6fdc067d764f26ef53e8a615d3d1a29bdc7a4be337b35220928498bfb
 AUX mail-notification-aarch64.patch 49364 SHA256 1276a61769121008f72381c6f6471999270364c8a86f9de3f04457e7f4fda9cc SHA512 fd70e55be488642ccaeaf79304f7c3bd77b07c12c0ae3a72cf609b22198db8c2de16efbfe224b13d742c97b7a9c42cd629630e94e40c292fbdfc7848907fd904 WHIRLPOOL 9eeea2cd58f640c0dd36fbe1b3ed84c5686c3333e247334f5767dfb968167cb4b4acb6b3a4e38ac5de1ce2f417cb5ff127cc08982f4d1ea2bd9169b990cb94a2
+AUX mail-notification-dont-link-against-bsd-compat.patch 473 SHA256 2340c6001ad9dfd071f80cf0cd9b45d3fa7efada6880a530b16a3b4d36a27444 SHA512 109e0f8cf1736a379be6b6a7fa2a4dad817897cda851842a63a6e22cc82e396e0a7c4f2f1707b3d2602c6e96fc0d1461587a101d9dce35b8bfd8f8ef37766a31 WHIRLPOOL 4d73dc950a77b6552eeaca0f5a5fbd12187bcdd47cc0bc904e450dd7586ba05b0dca226fb5e71aa1e09abbb2da7847425ffe94a8893ac236324a281ffb25406a
 AUX mail-notification-jb-gcc-format.patch 668 SHA256 a7646259ca72b58165e4e1c8cf12b197e32807459c4291867479ef3520d39732 SHA512 40bde5e2dbc5e2416bd36aaac2197d135bc2265dc0f24d7ac96ec34326c1a01caad740d88264a04d201d937f0d7590abf943ab5c4915bb0e81e2f484dfbca283 WHIRLPOOL b24a8e30d2cdb11938b942cb1b7ae51b9794be5fec411a6e3247c7b9c54da54299fea0716383e98c226791a758e3c10ccc499c0696a77876c8b886ab66506347
 DIST mail-notification-eab5c13.tar.gz 569791 SHA256 12f79cfaa6f5bbfa68e2a5e8dca651cfe19ed017741c21bec5b3b91bccecffe6 SHA512 fe4b5c7b04fe24950fcff0796dbe27c0172e9e8c1b1229f18064ae3720d12a669803e08796ac61d64912847eaaccc451363d69cecd55995274c5a0b2705a78f1 WHIRLPOOL 480179b855b7b86cb80b750c14c034e2f52b280a4b1b6e6aeed3c64b722808c7bd0086e75a9a0423d71424ffa37b3752da2b170c3b7af13697b77cafaceabb25
 EBUILD mail-notification-5.4-r7.ebuild 3320 SHA256 dfeefe2148b64414a2690efedecaf5366e0166ed7df01fbb9342275d656f7265 SHA512 c30b6b27de441898b6c52998f625f0090075312b752c30c515da18a4a7f58cf5b27f7ce68d8e89f9c67dfcd3de3d4e480a63baa64c202d88f26b42591b237574 WHIRLPOOL 6a1af1595ee1b883086567c61a5916b252bc6a32c2827d9f2744462872f2186aee79ac6bcedc624736d9c7052d87e6e04c21c5e02423c23164a66a6dd8ff6f62
-MISC ChangeLog 22987 SHA256 144421d0bdbbb3e0ed707d8df65b9ae536d3e8ba2792018d61c12ca1d54ccea8 SHA512 a6205e6c8b5c36f78490b0e560a65c8ce8ac407095bade0a8c95f740fbcf50124260545d00d4cd8b2185099375039cc9587908ab4cfdb420fbd09bdd66658154 WHIRLPOOL 264683aa4deae7f3db4e6090f4113b6daf17220c3290520c24b198983f9d1db15b910ecb82328cb0e97d60ac70c9abbda0c5f66c8f102416912eaded7c1cb5ae
+EBUILD mail-notification-5.4-r8.ebuild 3346 SHA256 44ddec5addc8c743218d4b7a44314deb61bc399b12e473765c82d18918172824 SHA512 134ef5075266e2f8c66fcc5d77f2b8932438b59e5509ceb760727f5f5b292eb3550dfb42f056970f8fc917fcb515815bd5ba475ae23d7e5cc761c7015f054fab WHIRLPOOL b1ce667ea0991cb392a140eda1e5ab53bd4e007b848d490338be4bfc5cd51b9ef9209432e9c4b893632ac6d00962c7fb0e8faa4045b44d0b32e6990ff1dee788
+MISC ChangeLog 23737 SHA256 fbfb66d269877da6842537be0ff441a4163a7363555f8a096c30b274260cd15e SHA512 141f5b3a6e6759f146049d4d511da69b714d4e1bb8527a732ce98e530a236f2c6aad9c6f5dafa3ca8aefd7fbef481596776fee438fd5f274d29df34ff9cdbfc6 WHIRLPOOL 1ea72a8f6c4ed60f3a665023c6ab6c8456a3b8f3a2ddcebfaf3047a3d80d6df0838491ef1248f9af232408eba8342e887db69d77c11d6cc25d84b7a1dc960ccf
 MISC metadata.xml 513 SHA256 e00f2ebbd35e7d1cf4f8da8340018ba767b7f12289a0170117ee1194b5d6be05 SHA512 0439895093e639b71a47bdaa10d2ba481a68696b5f0489b1e9f5ff5097a0b4e4428a021f5fa841b118c2c14ea019141ae35eae46dda9a9fac0e35c701e958ad8 WHIRLPOOL 4004f3dc18c417c6d851dfaed21d233973c52dc2e5332c884759ec63a677f8db86d05732129ec271c00d07668055029ea147d40e0be646ec79ffeb66b150cd73
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlOUuCoACgkQCaWpQKGI+9T7wACeKiDL7SRT2BVGL6OSuNU31LEP
-xEAAniFB1EK4FRdIV6DY0Ogelfv8+PTU
-=UH8G
+iEYEAREIAAYFAlSJf/MACgkQCaWpQKGI+9QoUQCfUWXaa6ulTPkTNZIAtk11pWXr
+uzEAn1HJH2zBuquAFZwLViXB47KRdzsM
+=UeKn
 -----END PGP SIGNATURE-----
diff --git a/mail-client/mail-notification/files/mail-notification-5.4-asneeded.patch b/mail-client/mail-notification/files/mail-notification-5.4-asneeded.patch
deleted file mode 100644
index 30d53002b08a..000000000000
--- a/mail-client/mail-notification/files/mail-notification-5.4-asneeded.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Fixing as-needed issues
-
-http://bugs.gentoo.org/show_bug.cgi?id=317905
-
-Patch written by Kacper Kowalik <xarthisius.kk@gmail.com>
-
---- jb
-+++ jb
-@@ -89,10 +89,11 @@
- 
- 		mkdir -p build/jbsrc || exit 1
- 
--		if ! gobject_cflags_libs=`pkg-config --cflags --libs 'gobject-2.0 >= 2.8.0' 2>/dev/null`; then
-+		if ! gobject_cflags=`pkg-config --cflags 'gobject-2.0 >= 2.8.0' 2>/dev/null`; then
- 			echo "ERROR: the GLib library was not found" >&2
- 			exit 1
- 		fi
-+		gobject_libs=`pkg-config --libs 'gobject-2.0 >= 2.8.0' 2>/dev/null`
- 
- 		sed -e 's|^#jb_include ["<]\(.*\)[">]|#include "\1.h"|' \
- 			jbsrc/jb.c > build/jbsrc/jb.c || exit 1
-@@ -103,14 +104,15 @@
- 			-DG_LOG_DOMAIN="\"jb\"" \
- 			-DJB_SOURCES="\"$jb_c_sources $jb_h_sources\"" \
- 			-DJB_PACKAGE_SOURCES="\"$jb_c_package_sources $jb_h_package_sources\"" \
--			$gobject_cflags_libs \
-+			$gobject_cflags \
- 			$jb_cflags \
- 			$jb_cppflags \
- 			$jb_ldflags \
- 			build/jbsrc/jb.c \
- 			$jb_c_sources \
- 			$jb_c_package_sources \
--			$jb_libs; then
-+			$jb_libs \
-+			$gobject_libs; then
- 			echo "ERROR: cannot build jb" >&2
- 			exit 1
- 		fi
diff --git a/mail-client/mail-notification/files/mail-notification-5.4-dont-update-cache.patch b/mail-client/mail-notification/files/mail-notification-5.4-dont-update-cache.patch
deleted file mode 100644
index 6cdade158a71..000000000000
--- a/mail-client/mail-notification/files/mail-notification-5.4-dont-update-cache.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Our gnome2 eclass takes care of proper rebuilding on the icon
-cache. We have to remove this also because it causes access
-violations.
---- jbsrc/jb.c.~1~	2008-03-20 16:53:02.000000000 +0100
-+++ jbsrc/jb.c	2008-03-26 20:51:45.641363619 +0100
-@@ -327,7 +327,6 @@
- jb_package_add_resources (void)
- {
-   JBGroup *group;
--  JBRule *rule;
-   JBObject *object;
- 
-   if (jb_variable_get_bool("compile-warnings"))
-@@ -362,11 +361,6 @@
-   if (jb_variable_get_bool("hotmail"))
-     jb_group_add_data_file(group, "hotmail.png", "$pkgdatadir");
- 
--  rule = jb_rule_new();
--  jb_rule_set_install_message(rule, "updating the GTK+ icon cache");
--  jb_rule_add_install_command(rule, "-gtk-update-icon-cache -f -t $datadir/icons/hicolor");
--  jb_group_add_resource(group, JB_GROUP_RESOURCE(rule));
--
-   jb_group_add(group);
- 
-   /*** data ******************************************************************/
diff --git a/mail-client/mail-notification/files/mail-notification-5.4-e-d-s-2.24.patch b/mail-client/mail-notification/files/mail-notification-5.4-e-d-s-2.24.patch
deleted file mode 100644
index ed40d4457b77..000000000000
--- a/mail-client/mail-notification/files/mail-notification-5.4-e-d-s-2.24.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- build/src/mn-evolution-server.c.~1~	2008-05-22 17:47:48.000000000 +0200
-+++ build/src/mn-evolution-server.c	2009-03-30 20:02:17.936196624 +0200
-@@ -595,7 +595,8 @@
- 
- 	for (i = 0; i < summary->len; i++)
- 	  {
--	    CamelMessageInfo *info = summary->pdata[i];
-+		char *uid = summary->pdata[i];
-+	    CamelMessageInfo *info = camel_folder_get_message_info(folder, uid);
- 
- 	    if ((camel_message_info_flags(info) & CAMEL_MESSAGE_SEEN) == 0)
- 	      g_ptr_array_add(*ret, self_camel_message_info_to_dbus_struct(info));
diff --git a/mail-client/mail-notification/files/mail-notification-5.4-e-d-s.patch b/mail-client/mail-notification/files/mail-notification-5.4-e-d-s.patch
deleted file mode 100644
index 073818afed2d..000000000000
--- a/mail-client/mail-notification/files/mail-notification-5.4-e-d-s.patch
+++ /dev/null
@@ -1,102 +0,0 @@
---- build/src/mn-evolution-server.c.orig	2008-09-30 15:30:07.756216978 +0200
-+++ build/src/mn-evolution-server.c	2008-09-30 15:30:49.950220711 +0200
-@@ -27,6 +27,7 @@
- #include <stdio.h>
- #include <libintl.h>
- #include <gobject/gvaluecollector.h>
-+#include <libedataserver/eds-version.h>
- #include <camel/camel-folder.h>
- #include <mail/em-folder-view.h>
- #include <mail/em-format.h>
-@@ -595,7 +596,12 @@
- 
- 	for (i = 0; i < summary->len; i++)
- 	  {
-+#if EDS_CHECK_VERSION(2,23,5)
-+	    char *uid = summary->pdata[i];
-+	    CamelMessageInfo *info = camel_folder_get_message_info(folder, uid);
-+#else
- 	    CamelMessageInfo *info = summary->pdata[i];
-+#endif
- 
- 	    if ((camel_message_info_flags(info) & CAMEL_MESSAGE_SEEN) == 0)
- 	      g_ptr_array_add(*ret, self_camel_message_info_to_dbus_struct(info));
---- build/src/mn-evolution-folder-tree-server.c.evolution	2010-02-01 10:00:12.128683776 -0500
-+++ build/src/mn-evolution-folder-tree-server.c	2010-02-01 10:02:32.809697243 -0500
-@@ -26,5 +26,8 @@
- #include <dbus/dbus.h>
-+#include <libedataserver/eds-version.h>
-+#if !EDS_CHECK_VERSION(2,29,0)
- #include <mail/mail-component.h>
-+#endif
- #include <mail/em-folder-tree.h>
- #include "mn-evolution-plugin.h"
- #include "mn-evolution.h"
-@@ -396,7 +399,11 @@ mn_evolution_folder_tree_server_construc
- 	
-+#if EDS_CHECK_VERSION(2,29,0)
-+    selfp->tree = em_folder_tree_new();
-+#else
-     EMFolderTreeModel *model;
-
-     model = mail_component_peek_tree_model(mail_component_peek());
-     selfp->tree = em_folder_tree_new_with_model(model);
-+#endif
- 
-     selfp->plug = gtk_plug_new((GdkNativeWindow) selfp->id);
---- build/src/mn-evolution-server.c.evolution	2010-02-01 10:06:36.484698060 -0500
-+++ build/src/mn-evolution-server.c	2010-02-01 10:09:01.946682081 -0500
-@@ -28,9 +28,14 @@
- #include <gobject/gvaluecollector.h>
- #include <libedataserver/eds-version.h>
- #include <camel/camel-folder.h>
-+#if EDS_CHECK_VERSION(2,29,0)
-+#include <shell/e-shell.h>
-+#include <mail/e-mail-browser.h>
-+#else
- #include <mail/em-folder-view.h>
- #include <mail/em-format.h>
- #include <mail/em-message-browser.h>
-+#endif
- #include <mail/em-utils.h>
- #include <mail/mail-session.h>
- #include <mail/mail-tools.h>
-@@ -568,6 +573,19 @@ mn_evolution_server_open_message (MNEvol
-     folder = self_lookup_folder(folder_uri, err);
-     if (folder)
-       {
-+#if EDS_CHECK_VERSION(2,29,0)
-+	EShell *shell;
-+	EShellBackend *shell_backend;
-+	GtkWidget *browser;
-+
-+	shell = e_shell_get_default ();
-+	shell_backend = e_shell_get_backend_by_name (shell, "mail");
-+
-+	browser = e_mail_browser_new (shell_backend);
-+	e_mail_reader_set_folder (E_MAIL_READER (browser), folder, folder_uri);
-+	e_mail_reader_set_message (E_MAIL_READER (browser), message_uid);
-+	gtk_widget_show (browser);
-+#else
- 	GtkWidget *browser;
- 
- 	/* modelled after Evolution's handleuri_got_folder() */
-@@ -578,6 +596,7 @@ mn_evolution_server_open_message (MNEvol
- 	em_folder_view_set_folder((EMFolderView *) browser, folder, folder_uri);
- 	em_folder_view_set_message((EMFolderView *) browser, message_uid, FALSE);
- 	gtk_widget_show(((EMMessageBrowser *) browser)->window);
-+#endif
- 
- 	camel_object_unref(folder);
-       }
---- src/mn-evolution-plugin.c.evolution	2008-05-22 11:45:35.000000000 -0400
-+++ src/mn-evolution-plugin.c	2010-02-01 11:52:06.141664757 -0500
-@@ -204,7 +204,7 @@ connect_to_session_bus (void)
- }
- 
- int
--e_plugin_lib_enable (EPluginLib *ep, int enable)
-+e_plugin_lib_enable (EPlugin *ep, int enable)
- {
-   static gboolean enabled = FALSE;
-   GError *err = NULL;
diff --git a/mail-client/mail-notification/files/mail-notification-5.4-evolution-gtkhtml.patch b/mail-client/mail-notification/files/mail-notification-5.4-evolution-gtkhtml.patch
deleted file mode 100644
index 1e7fa2b5305a..000000000000
--- a/mail-client/mail-notification/files/mail-notification-5.4-evolution-gtkhtml.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nrbu mail-notification-5.4/jbsrc/lib/src/extras/jb-evolution-plugin.c mail-notification-5.4-OK/jbsrc/lib/src/extras/jb-evolution-plugin.c
---- mail-notification-5.4/jbsrc/lib/src/extras/jb-evolution-plugin.c	2008-04-27 18:47:43.000000000 +0400
-+++ mail-notification-5.4-OK/jbsrc/lib/src/extras/jb-evolution-plugin.c	2009-08-21 19:48:22.000000000 +0400
-@@ -41,7 +41,7 @@
-   if (! minversion)
-     minversion = "2.12";
- 
--  packages = g_strdup_printf("evolution-plugin >= %s", minversion);
-+  packages = g_strdup_printf("evolution-plugin >= %s libgtkhtml-3.14 gtkhtml-editor", minversion);
-   result = jb_check_packages("Evolution", "evolution-plugin", packages);
-   g_free(packages);
- 
diff --git a/mail-client/mail-notification/files/mail-notification-5.4-fix-markup.patch b/mail-client/mail-notification/files/mail-notification-5.4-fix-markup.patch
deleted file mode 100644
index b5d826eb2808..000000000000
--- a/mail-client/mail-notification/files/mail-notification-5.4-fix-markup.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Fix markup to a format that is also supported by newer
-notification-daemon versions, e.g. the one used in Gnome 3.
-
-https://bugs.gentoo.org/show_bug.cgi?id=392599
-
-diff -urp mail-notification-5.4.orig/src/mn-popup.gob mail-notification-5.4/src/mn-popup.gob
---- mail-notification-5.4.orig/src/mn-popup.gob	2008-05-22 16:45:36.000000000 +0100
-+++ mail-notification-5.4/src/mn-popup.gob	2011-11-30 13:34:40.000000000 +0000
-@@ -136,7 +136,7 @@ class MN:Popup from Notify:Notification
-       if (*body->str)
- 	g_string_append_c(body, '\n');
- 
--      g_string_append_printf(body, "<span weight=\"bold\">%s</span>", name);
-+      g_string_append_printf(body, "<b>%s</b>", name);
- 
-       escaped = g_markup_escape_text(value, -1);
-       g_string_append_printf(body, " %s", escaped);
-diff -urp mail-notification-5.4.orig/build/src/mn-popup.c mail-notification-5.4/build/src/mn-popup.c
---- mail-notification-5.4.orig/build/src/mn-popup.c	2008-05-22 16:47:49.000000000 +0100
-+++ mail-notification-5.4/build/src/mn-popup.c	2011-11-30 13:35:37.000000000 +0000
-@@ -434,7 +434,7 @@ mn_popup_append_row (GString * body, con
-       if (*body->str)
- 	g_string_append_c(body, '\n');
- 
--      g_string_append_printf(body, "<span weight=\"bold\">%s</span>", name);
-+      g_string_append_printf(body, "<b>%s</b>", name);
- 
-       escaped = g_markup_escape_text(value, -1);
-       g_string_append_printf(body, " %s", escaped);
-diff -urp mail-notification-5.4.orig/build/src/mn-popup.gob.stamp mail-notification-5.4/build/src/mn-popup.gob.stamp
---- mail-notification-5.4.orig/build/src/mn-popup.gob.stamp	2008-05-22 16:47:49.000000000 +0100
-+++ mail-notification-5.4/build/src/mn-popup.gob.stamp	2011-11-30 13:38:09.000000000 +0000
-@@ -0,0 +1 @@
-+
diff --git a/mail-client/mail-notification/files/mail-notification-5.4-gmime.patch b/mail-client/mail-notification/files/mail-notification-5.4-gmime.patch
deleted file mode 100644
index 0d16357fbb6b..000000000000
--- a/mail-client/mail-notification/files/mail-notification-5.4-gmime.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -Nrbu mail-notification-5.4/build/src/mn-base-mbox-mailbox-backend.c mail-notification-5.4-OK/build/src/mn-base-mbox-mailbox-backend.c
---- mail-notification-5.4/build/src/mn-base-mbox-mailbox-backend.c	2008-12-23 14:48:49.000000000 +0300
-+++ mail-notification-5.4-OK/build/src/mn-base-mbox-mailbox-backend.c	2008-12-23 14:48:28.000000000 +0300
-@@ -265,7 +265,7 @@
- 	    mime_message = g_mime_parser_construct_message(parser);
- 	    if (mime_message)
- 	      {
--		if (g_mime_message_get_header(mime_message, "X-Mozilla-Status"))
-+		if (g_mime_object_get_header(mime_message, "X-Mozilla-Status"))
- 		  {
- #if WITH_MOZILLA
- 		    type = MN_TYPE_MOZILLA_MAILBOX_BACKEND;
-diff -Nrbu mail-notification-5.4/build/src/mn-mozilla-mailbox-backend.c mail-notification-5.4-OK/build/src/mn-mozilla-mailbox-backend.c
---- mail-notification-5.4/build/src/mn-mozilla-mailbox-backend.c	2008-12-23 14:48:49.000000000 +0300
-+++ mail-notification-5.4-OK/build/src/mn-mozilla-mailbox-backend.c	2008-12-23 14:46:47.000000000 +0300
-@@ -167,7 +167,7 @@
- 	
-     const char *header;
- 
--    header = g_mime_message_get_header(mime_message, header_name);
-+    header = g_mime_object_get_header(mime_message, header_name);
-     if (header && mn_str_ishex(header))
-       return strtol(header, NULL, 16);
-     else
-diff -Nrbu mail-notification-5.4/jbsrc/jb.c mail-notification-5.4-OK/jbsrc/jb.c
---- mail-notification-5.4/jbsrc/jb.c	2008-05-22 19:47:04.000000000 +0400
-+++ mail-notification-5.4-OK/jbsrc/jb.c	2008-12-23 14:43:09.000000000 +0300
-@@ -166,7 +166,7 @@
-   jb_require_packages("GNOME", "gnome", "glib-2.0 >= 2.14 gthread-2.0 gconf-2.0 >= 2.4.0 gtk+-2.0 >= 2.12 libgnomeui-2.0 >= 2.14.0 gnome-vfs-2.0 libglade-2.0 libxml-2.0 libnotify >= 0.4.1");
-   jb_require_packages("D-Bus", "dbus", "dbus-glib-1");
- 
--  jb_check_packages_for_options("GMime", "gmime", "gmime-2.0 >= 2.2.7",
-+  jb_check_packages_for_options("GMime", "gmime", "gmime-2.4",
- 				"hotmail",
- 				"imap",
- 				"maildir",
-diff -Nrbu mail-notification-5.4/src/mn-message-mime.c mail-notification-5.4-OK/src/mn-message-mime.c
---- mail-notification-5.4/src/mn-message-mime.c	2008-05-22 19:45:35.000000000 +0400
-+++ mail-notification-5.4-OK/src/mn-message-mime.c	2008-12-23 14:46:35.000000000 +0300
-@@ -33,12 +33,12 @@
-   g_return_val_if_fail(GMIME_IS_MESSAGE(mime_message), FALSE);
- 
-   /* SpamAssassin */
--  spam = g_mime_message_get_header(mime_message, "X-Spam-Status");
-+  spam = g_mime_object_get_header(mime_message, "X-Spam-Status");
-   if (spam && mn_ascii_str_case_has_prefix(spam, "yes"))
-     return TRUE;
- 
-   /* bogofilter */
--  spam = g_mime_message_get_header(mime_message, "X-Bogosity");
-+  spam = g_mime_object_get_header(mime_message, "X-Bogosity");
-   if (spam && mn_ascii_str_case_has_prefix(spam, "yes"))
-     return TRUE;
- 
-@@ -89,7 +89,7 @@
-     {
-       const char *status;
- 
--      status = g_mime_message_get_header(mime_message, "Status");
-+      status = g_mime_object_get_header(mime_message, "Status");
-       if (status && strchr(status, 'R'))
- 	return NULL;		/* the message was read */
-       else if (status && strchr(status, 'O'))
diff --git a/mail-client/mail-notification/files/mail-notification-5.4-icons.patch b/mail-client/mail-notification/files/mail-notification-5.4-icons.patch
deleted file mode 100644
index 66e09b2aa33e..000000000000
--- a/mail-client/mail-notification/files/mail-notification-5.4-icons.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Patch by Fedora to use icons that are available in Gnome 2.30+
-
-https://bugzilla.redhat.com/show_bug.cgi?id=573809
-
---- src/mn-stock.c.icons	2008-05-22 16:45:35.000000000 +0100
-+++ src/mn-stock.c	2010-05-20 21:53:20.306859177 +0100
-@@ -32,11 +32,11 @@
-     const char	*icon_name;
-     const char	*source_stock_id;
-   } icons[] = {
--    { MN_STOCK_MAIL,			NULL, "stock_mail" },
--    { MN_STOCK_NO_MAIL,			NULL, "stock_inbox" },
-+    { MN_STOCK_MAIL,			NULL, "mail-notification" },
-+    { MN_STOCK_NO_MAIL,			NULL, "mail-notification" },
-     { MN_STOCK_LOCAL,			NULL, "stock_folder" },
-     { MN_STOCK_REMOTE,			NULL, "stock_internet" },
--    { MN_STOCK_UNKNOWN,			NULL, "stock_unknown" },
-+    { MN_STOCK_UNKNOWN,			NULL, "unknown" },
-     { MN_STOCK_ERROR,			NULL, NULL, GTK_STOCK_DIALOG_ERROR },
- #if WITH_GMAIL
-     { MN_STOCK_GMAIL,			PKGDATADIR G_DIR_SEPARATOR_S "gmail.png" },
-@@ -51,11 +51,11 @@
-     { MN_STOCK_SYSTEM_MAILBOX,		NULL, "system" },
- #endif
- #if WITH_EVOLUTION
--    { MN_STOCK_EVOLUTION_MAILBOX,	NULL, "evolution" },
-+    { MN_STOCK_EVOLUTION_MAILBOX,	NULL, "stock_mail-unread" },
- #endif
--    { MN_STOCK_MAIL_READER,		NULL, "stock_mail-handling" },
-+    { MN_STOCK_MAIL_READER,		NULL, "stock_mail-compose" },
-     { MN_STOCK_OPEN_MESSAGE,		NULL, "stock_mail-open" },
--    { MN_STOCK_CONSIDER_NEW_MAIL_AS_READ, NULL, "stock_mark" }
-+    { MN_STOCK_CONSIDER_NEW_MAIL_AS_READ, NULL, "mail-mark-read" }
-   };
-   GtkIconFactory *factory;
-   GtkIconTheme *icon_theme;
diff --git a/mail-client/mail-notification/files/mail-notification-5.4-sasl_encode64.patch b/mail-client/mail-notification/files/mail-notification-5.4-sasl_encode64.patch
deleted file mode 100644
index 80a7304d10d1..000000000000
--- a/mail-client/mail-notification/files/mail-notification-5.4-sasl_encode64.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -up mail-notification-5.4/build/src/mn-pop3-mailbox.c mail-notification-5.4-OK/build/src/mn-pop3-mailbox.c
---- mail-notification-5.4/build/src/mn-pop3-mailbox.c	2009-05-19 10:29:58.448201837 +0200
-+++ mail-notification-5.4-OK/build/src/mn-pop3-mailbox.c	2009-05-19 10:23:29.356204287 +0200
-@@ -619,7 +619,7 @@ mn_pop3_mailbox_enter_auth_cb (MNClientS
- 
- 	if (initial_clientoutlen > 0)
- 	  {
--	    char buf64[initial_clientoutlen * 2]; /* Base64 is 33% larger than the data it encodes */
-+	    char buf64[initial_clientoutlen * 2 + 1]; /* Base64 is 33% larger than the data it encodes */
- 	    unsigned int outlen;
- 	    int result;
- 	    char *str;
-diff -up mail-notification-5.4/src/mn-client-session.c mail-notification-5.4-OK/src/mn-client-session.c
---- mail-notification-5.4/src/mn-client-session.c	2008-05-22 17:45:35.000000000 +0200
-+++ mail-notification-5.4-OK/src/mn-client-session.c	2009-05-19 10:29:09.112211055 +0200
-@@ -1030,7 +1030,7 @@ mn_client_session_write (MNClientSession
- static int
- write_base64 (MNClientSession *session, const char *buf, unsigned int len)
- {
--  char buf64[len * 2];		/* Base64 is 33% larger than the data it encodes */
-+  char buf64[len * 2 + 1];		/* Base64 is 33% larger than the data it encodes */
-   unsigned int outlen;
-   int result;
-   char *str;
diff --git a/mail-client/mail-notification/files/mail-notification-dont-link-against-bsd-compat.patch b/mail-client/mail-notification/files/mail-notification-dont-link-against-bsd-compat.patch
new file mode 100644
index 000000000000..e246a8cc9389
--- /dev/null
+++ b/mail-client/mail-notification/files/mail-notification-dont-link-against-bsd-compat.patch
@@ -0,0 +1,10 @@
+--- jbsrc/jb.c.orig	2014-01-19 20:06:48.525462981 +0100
++++ jbsrc/jb.c	2014-01-19 20:07:36.087934897 +0100
+@@ -425,7 +425,6 @@
+        */
+       jb_compile_options_add_cflags(object->compile_options, "-std=c99");
+       jb_compile_options_add_cppflags(object->compile_options, "-D_BSD_SOURCE -D_POSIX_C_SOURCE=199309L");
+-      jb_compile_options_add_libs(object->compile_options, "-lbsd-compat");
+     }
+ 
+   jb_compile_options_add_string_defines(object->compile_options,
diff --git a/mail-client/mail-notification/mail-notification-5.4-r8.ebuild b/mail-client/mail-notification/mail-notification-5.4-r8.ebuild
new file mode 100644
index 000000000000..a4621680f8d3
--- /dev/null
+++ b/mail-client/mail-notification/mail-notification-5.4-r8.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mail-notification/mail-notification-5.4-r8.ebuild,v 1.1 2014/12/11 11:28:49 pacho Exp $
+
+EAPI=5
+GCONF_DEBUG="no"
+
+inherit gnome2 eutils multilib flag-o-matic toolchain-funcs
+
+DESCRIPTION="Status icon informing about new mail"
+HOMEPAGE="http://www.nongnu.org/mailnotify/ https://github.com/epienbroek/mail-notification"
+
+GIT_REVISION="eab5c13" # Same as Fedora
+SRC_URI="https://github.com/epienbroek/${PN}/tarball/${GIT_REVISION} -> ${PN}-${GIT_REVISION}.tar.gz"
+S="${WORKDIR}/epienbroek-${PN}-${GIT_REVISION}"
+
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-linux"
+SLOT="0"
+LICENSE="GPL-3"
+IUSE="+gnome-keyring sasl +sound ssl sylpheed"
+
+LANGS="bg ca cs de es fr ja nl pl pt pt_BR ru sr sr@Latn sv"
+for lang in ${LANGS}; do
+	IUSE+=" linguas_${lang}"
+done
+
+# gmime is actually optional, but it's used by so much of the package
+# it's pointless making it optional. gnome-keyring is required for
+# several specific access methods, and thus linked to those USE flags
+# instead of adding a keyring USE flag.
+RDEPEND="
+	x11-libs/gtk+:3
+	>=dev-libs/glib-2.14:2
+	>=gnome-base/gconf-2.6
+	>=gnome-base/libgnomeui-2.14
+	dev-libs/dbus-glib
+	dev-libs/gmime:2.6
+	>=x11-libs/libnotify-0.4.1
+	gnome-keyring? ( gnome-base/libgnome-keyring )
+	ssl? ( >=dev-libs/openssl-0.9.6 )
+	sasl? ( >=dev-libs/cyrus-sasl-2 )
+	sound? ( media-libs/gstreamer:0.10 )
+	sylpheed? ( mail-client/sylpheed )
+"
+DEPEND="${RDEPEND}
+	app-text/scrollkeeper
+	dev-util/gob
+	sys-devel/gettext
+	virtual/pkgconfig
+	>=dev-util/intltool-0.35.0
+"
+# this now uses JB (the Jean-Yves Lefort's Build System) as a build system
+# instead of autotools, this is a little helper function that basically does
+# the same thing as use_enable
+use_var() {
+	echo "${2:-$1}=$(usex $1)"
+}
+
+src_prepare() {
+	sed -i	-e '/jb_rule_set_install_message/d' \
+		-e '/jb_rule_add_install_command/d' \
+		jbsrc/jb.c || die
+
+	# Ensure we never append -Werror
+	sed -i -e 's/ -Werror//' jb jbsrc/jb.c || die
+
+	# We are not Ubuntu, and this could be the cause of #215281
+	epatch "${FILESDIR}/${P}-remove-ubuntu-special-case.patch"
+
+	# Apply Fedora patches
+	# Fix gcc warning
+	epatch "${FILESDIR}/${PN}-jb-gcc-format.patch"
+	# Support aarch64
+	epatch "${FILESDIR}/${PN}-aarch64.patch"
+	# Fix build with latest libc
+	epatch "${FILESDIR}/${PN}-dont-link-against-bsd-compat.patch"
+}
+
+src_configure() {
+	set -- \
+	./jb configure destdir="${D}" prefix="${EPREFIX}/usr" libdir="${EPREFIX}/usr/$(get_libdir)" \
+		sysconfdir="${EPREFIX}/etc" localstatedir="${EPREFIX}/var" cc="$(tc-getCC)" \
+		cflags="${CFLAGS}" cppflags="${CXXFLAGS}" ldflags="${LDFLAGS}" \
+		scrollkeeper-dir="${EPREFIX}/var/lib/scrollkeeper" \
+		$(use_var gnome-keyring gmail) \
+		$(use_var gnome-keyring imap) \
+		$(use_var gnome-keyring pop3) \
+		$(use_var sasl) \
+		$(use_var ssl) \
+		$(use_var sylpheed)
+	echo "$@"
+	"$@" || die
+}
+
+src_compile() {
+	./jb build || die
+}
+
+src_install() {
+	GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1" ./jb install || die
+	dodoc NEWS README AUTHORS TODO TRANSLATING
+	rm -rf "${ED}/var/lib/scrollkeeper"
+
+	einfo "Cleaning up locales..."
+	for lang in ${LANGS}; do
+		use "linguas_${lang}" && {
+			einfo "- keeping ${lang}"
+			continue
+		}
+		rm -Rf "${D}"/usr/share/locale/"${lang}" || die
+	done
+}