Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-testing/clementine/PKGBUILD
	community-testing/gedit-plugins/PKGBUILD
	community-testing/giggle/PKGBUILD
	community-testing/gimmie/PKGBUILD
	community-testing/glipper/PKGBUILD
	community-testing/gnome-system-tools/PKGBUILD
	community-testing/gnote/PKGBUILD
	community-testing/gnubiff/PKGBUILD
	community-testing/google-gadgets/PKGBUILD
	community-testing/gphpedit/PKGBUILD
	community-testing/ibus/PKGBUILD
	community-testing/inputattach/PKGBUILD
	community-testing/liboobs/PKGBUILD
	community-testing/perl-gtk2-webkit/PKGBUILD
	community-testing/shotwell/PKGBUILD
	community-testing/surf/PKGBUILD
	community-testing/system-tools-backends/PKGBUILD
	community-testing/uzbl/PKGBUILD
	community-testing/workrave/PKGBUILD
	community/cherrypy/PKGBUILD
	community/llvm/PKGBUILD
	community/xonotic/PKGBUILD
	extra/ntfs-3g/PKGBUILD
	extra/ntfsprogs/PKGBUILD
	extra/rhino/PKGBUILD
	testing/accountsservice/PKGBUILD
	testing/anjuta/PKGBUILD
	testing/ardour/PKGBUILD
	testing/at-spi/PKGBUILD
	testing/at-spi2-atk/PKGBUILD
	testing/at-spi2-core/PKGBUILD
	testing/atk/PKGBUILD
	testing/atkmm/PKGBUILD
	testing/avahi/PKGBUILD
	testing/banshee/PKGBUILD
	testing/brasero/PKGBUILD
	testing/cairomm/PKGBUILD
	testing/cheese/PKGBUILD
	testing/claws-mail-extra-plugins/PKGBUILD
	testing/clutter-gst/PKGBUILD
	testing/clutter-gtk/PKGBUILD
	testing/clutter-gtk2/PKGBUILD
	testing/clutter/PKGBUILD
	testing/cups-pk-helper/PKGBUILD
	testing/dconf/PKGBUILD
	testing/devhelp/PKGBUILD
	testing/ekiga/PKGBUILD
	testing/empathy/PKGBUILD
	testing/eog-plugins/PKGBUILD
	testing/eog/PKGBUILD
	testing/epiphany-extensions/PKGBUILD
	testing/epiphany/PKGBUILD
	testing/evince/PKGBUILD
	testing/evolution-data-server/PKGBUILD
	testing/evolution-exchange/PKGBUILD
	testing/evolution/PKGBUILD
	testing/farsight2/PKGBUILD
	testing/file-roller/PKGBUILD
	testing/folks/PKGBUILD
	testing/gcalctool/PKGBUILD
	testing/gconf-editor/PKGBUILD
	testing/gconf/PKGBUILD
	testing/gdk-pixbuf2/PKGBUILD
	testing/gdl/PKGBUILD
	testing/gdm/PKGBUILD
	testing/gedit/PKGBUILD
	testing/gimp-devel/PKGBUILD
	testing/gimp/PKGBUILD
	testing/gjs/PKGBUILD
	testing/glade/PKGBUILD
	testing/glib-networking/PKGBUILD
	testing/glib2/PKGBUILD
	testing/glibmm/PKGBUILD
	testing/gnome-applets/PKGBUILD
	testing/gnome-bluetooth/PKGBUILD
	testing/gnome-color-manager/PKGBUILD
	testing/gnome-control-center/PKGBUILD
	testing/gnome-desktop/PKGBUILD
	testing/gnome-disk-utility/PKGBUILD
	testing/gnome-games/PKGBUILD
	testing/gnome-keyring/PKGBUILD
	testing/gnome-media/PKGBUILD
	testing/gnome-menus/PKGBUILD
	testing/gnome-nettool/PKGBUILD
	testing/gnome-panel/PKGBUILD
	testing/gnome-pilot/PKGBUILD
	testing/gnome-power-manager/PKGBUILD
	testing/gnome-screensaver/PKGBUILD
	testing/gnome-session/PKGBUILD
	testing/gnome-settings-daemon/PKGBUILD
	testing/gnome-sharp/PKGBUILD
	testing/gnome-shell/PKGBUILD
	testing/gnome-system-monitor/PKGBUILD
	testing/gnome-terminal/PKGBUILD
	testing/gnome-themes-standard/PKGBUILD
	testing/gnome-user-share/PKGBUILD
	testing/gnome-utils/PKGBUILD
	testing/gobject-introspection/PKGBUILD
	testing/gthumb/PKGBUILD
	testing/gtk-vnc/PKGBUILD
	testing/gtk2/PKGBUILD
	testing/gtk3/PKGBUILD
	testing/gtkhtml4/PKGBUILD
	testing/gtkmm/PKGBUILD
	testing/gtkmm3/PKGBUILD
	testing/gtksourceview3/PKGBUILD
	testing/gucharmap/PKGBUILD
	testing/gvfs/PKGBUILD
	testing/kdeplasma-applets-networkmanagement/PKGBUILD
	testing/kismet/PKGBUILD
	testing/lcms2/PKGBUILD
	testing/libcanberra/PKGBUILD
	testing/libchamplain/PKGBUILD
	testing/libdmapsharing/PKGBUILD
	testing/libgda/PKGBUILD
	testing/libgdata/PKGBUILD
	testing/libgnome-keyring/PKGBUILD
	testing/libgnome-media-profiles/PKGBUILD
	testing/libgnomekbd/PKGBUILD
	testing/libgpod/PKGBUILD
	testing/libgweather/PKGBUILD
	testing/libimobiledevice/PKGBUILD
	testing/liblrdf/PKGBUILD
	testing/libnice/PKGBUILD
	testing/libnotify/PKGBUILD
	testing/libpeas/PKGBUILD
	testing/librsvg/PKGBUILD
	testing/libsocialweb/PKGBUILD
	testing/libsoup/PKGBUILD
	testing/libunique/PKGBUILD
	testing/libunique3/PKGBUILD
	testing/libwebkit/PKGBUILD
	testing/libwnck/PKGBUILD
	testing/libwnck3/PKGBUILD
	testing/libxklavier/PKGBUILD
	testing/liferea/PKGBUILD
	testing/mail-notification/PKGBUILD
	testing/metacity/PKGBUILD
	testing/midori/PKGBUILD
	testing/miro/PKGBUILD
	testing/mousetweaks/PKGBUILD
	testing/mpd/PKGBUILD
	testing/mutter/PKGBUILD
	testing/mx/PKGBUILD
	testing/nautilus-open-terminal/PKGBUILD
	testing/nautilus-sendto/PKGBUILD
	testing/nautilus/PKGBUILD
	testing/network-manager-applet/PKGBUILD
	testing/networkmanager-openvpn/PKGBUILD
	testing/networkmanager-pptp/PKGBUILD
	testing/networkmanager-vpnc/PKGBUILD
	testing/networkmanager/PKGBUILD
	testing/notification-daemon/PKGBUILD
	testing/opal/PKGBUILD
	testing/pangomm/PKGBUILD
	testing/pidgin/PKGBUILD
	testing/polkit-gnome/PKGBUILD
	testing/polkit/PKGBUILD
	testing/ptlib/PKGBUILD
	testing/pygobject/PKGBUILD
	testing/pygtk/PKGBUILD
	testing/pywebkitgtk/PKGBUILD
	testing/raptor/PKGBUILD
	testing/raptor1/PKGBUILD
	testing/rasqal/PKGBUILD
	testing/redland/PKGBUILD
	testing/rest/PKGBUILD
	testing/rhythmbox/PKGBUILD
	testing/seahorse/PKGBUILD
	testing/slv2/PKGBUILD
	testing/soprano/PKGBUILD
	testing/sound-juicer/PKGBUILD
	testing/telepathy-gabble/PKGBUILD
	testing/telepathy-glib/PKGBUILD
	testing/telepathy-logger/PKGBUILD
	testing/telepathy-mission-control/PKGBUILD
	testing/tomboy/PKGBUILD
	testing/totem-plparser/PKGBUILD
	testing/totem/PKGBUILD
	testing/udisks/PKGBUILD
	testing/upower/PKGBUILD
	testing/vinagre/PKGBUILD
	testing/vino/PKGBUILD
	testing/vte/PKGBUILD
	testing/yelp/PKGBUILD
	testing/zenity/PKGBUILD

2 files changed, 0 insertions, 113 deletions

diff --git a/extra/mail-notification/evolution-gtkhtml.patch b/extra/mail-notification/evolution-gtkhtml.patch
deleted file mode 100644
index fe9b0ddf8..000000000
--- a/extra/mail-notification/evolution-gtkhtml.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mail-notification-5.4/jbsrc/lib/src/extras/jb-evolution-plugin.c.orig	2009-10-12 23:15:03.000000000 +0200
-+++ mail-notification-5.4/jbsrc/lib/src/extras/jb-evolution-plugin.c	2009-10-12 23:17:26.000000000 +0200
-@@ -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-3.14", minversion);
-   result = jb_check_packages("Evolution", "evolution-plugin", packages);
-   g_free(packages);
- 
diff --git a/extra/mail-notification/evolution.patch b/extra/mail-notification/evolution.patch
deleted file mode 100644
index 073818afe..000000000
--- a/extra/mail-notification/evolution.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;