Port from libxfcegui4 to libxfce4ui usin.

Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64

4 files changed, 410 insertions, 9 deletions

diff --git a/xfce-extra/xfce4-mailwatch-plugin/ChangeLog b/xfce-extra/xfce4-mailwatch-plugin/ChangeLog
index 50a34b68274d..6a1d58cad92c 100644
--- a/xfce-extra/xfce4-mailwatch-plugin/ChangeLog
+++ b/xfce-extra/xfce4-mailwatch-plugin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for xfce-extra/xfce4-mailwatch-plugin
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-mailwatch-plugin/ChangeLog,v 1.7 2012/06/16 14:52:16 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-mailwatch-plugin/ChangeLog,v 1.8 2012/06/16 15:22:08 ssuominen Exp $
+
+*xfce4-mailwatch-plugin-1.1.0-r1 (16 Jun 2012)
+
+  16 Jun 2012; Samuli Suominen <ssuominen@gentoo.org>
+  +xfce4-mailwatch-plugin-1.1.0-r1.ebuild,
+  +files/xfce4-mailwatch-plugin-1.1.0-libxfce4ui.patch:
+  Port from libxfcegui4 to libxfce4ui usin.
 
   16 Jun 2012; Samuli Suominen <ssuominen@gentoo.org>
   xfce4-mailwatch-plugin-1.1.0.ebuild,
diff --git a/xfce-extra/xfce4-mailwatch-plugin/Manifest b/xfce-extra/xfce4-mailwatch-plugin/Manifest
index c58bfa5ab182..0374ceaa84a1 100644
--- a/xfce-extra/xfce4-mailwatch-plugin/Manifest
+++ b/xfce-extra/xfce4-mailwatch-plugin/Manifest
@@ -2,21 +2,23 @@
 Hash: SHA1
 
 AUX xfce4-mailwatch-plugin-1.1.0-gnutls-3.patch 615 RMD160 ae358e5794628cf17049eba701e8554c063f58dd SHA1 776eadf736534d849428690064776afe4b094cb5 SHA256 dafb2b665afdcd7c91a6f04afd97eb4ca46b09a371e38ecfb607d335592fc214
+AUX xfce4-mailwatch-plugin-1.1.0-libxfce4ui.patch 11207 RMD160 68bc509df4b7c9f6bc80ff2eab3c52857ae9444c SHA1 e7f2366a03671e389de5eae9e1ca7e93cdc876cd SHA256 01d6671d8da26e05bbf41f9f14e822b42374166c4b12e3a94d9c009646a56a91
 AUX xfce4-mailwatch-plugin-1.1.0-link_to_libgcrypt.patch 1201 RMD160 b1b312dcbc5777caa7b529c05ed6ed18bdbb08a3 SHA1 01c23a0c9688839fb4fa188e4a8e5ac3ec6c0871 SHA256 0f3aed2c16bb12682c6621f4ec5621cf6e0dc9c417d0ca546718b27dd5be8a44
 AUX xfce4-mailwatch-plugin-1.1.0-link_to_libxfcegui4.patch 811 RMD160 14d6a185d2ff724890a7b0c294a5f64bab849d5f SHA1 a75502fc77d064d263da77105ed04ea3c594b779 SHA256 482fa7e1e1e7d4cc7df96409ced8fe81dc89a1578169888aacc01550517adf18
 AUX xfce4-mailwatch-plugin-1.1.0-no-ssl.patch 918 RMD160 61403f8f7a4e4e35fcc97efe55f20330a3c7e854 SHA1 80c75c37f59f030a6b36bfcba75ddb0ed0196051 SHA256 632de0ae445eca63f5e66206beb47c2803f2cc4f3c6e1dd857ba03b2e1a3c465
 DIST xfce4-mailwatch-plugin-1.1.0.tar.bz2 662624 RMD160 81586a36f9da3509eb615b7e0ca033ed74812ded SHA1 fdca7a62a694146fc5cbe48dbaf4db4c60da5510 SHA256 ba6fe9fc8d20f317b968369bbc2802c91c4c7838823faee9304767db9f1a3799
+EBUILD xfce4-mailwatch-plugin-1.1.0-r1.ebuild 1224 RMD160 acf2fd5f6aae2633291b0838ff87c8470008be11 SHA1 ad998c58ea30cb84e1559d728be55ee16388b6ce SHA256 7482db9dbcca38f779a30f2cb5f9aa888f9bc840ec8e2c5cd5b56c4aba0a9c26
 EBUILD xfce4-mailwatch-plugin-1.1.0.ebuild 1222 RMD160 83905bbc9f6d371c8fed346a58555a17b061ff71 SHA1 375ebc6fc0b30a27942df05a1c7f80bb2918579b SHA256 e0ec8f62f7c8ed9bb866e29b8fcfe9efef2e5021ffd978ada21ff813ffb47be9
-MISC ChangeLog 1574 RMD160 7268feea33d463fc040aa63519f9ee8aadaa62f6 SHA1 e4f0f42b7fbbdb5ba5e597e15a62418b7c65db19 SHA256 8c1eeb9470004da5447b6a001116ec6f3d701572a806b096f3bde5c215960766
+MISC ChangeLog 1820 RMD160 ed588bfda09ab2f7fea1846e0306697cc93ca970 SHA1 47f13845d103148516cf746cd6be4a5625cb0632 SHA256 8ea91c102cb3de8635ee2aae0f756a66af135f144666b10897069a7630a88cb9
 MISC metadata.xml 159 RMD160 43722935bd7b4db7fe8db681054f2e53c4a5f7ce SHA1 15958ad72e234ba572c9534533c21532eb6bc0fd SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJP3JyeAAoJEEdUh39IaPFNR58H/2YRe1SXnX9tnaY+f3F5Pkky
-SqulTBAnyzCMYpEHrGunKTmbscE1RcM5yBsw9lFa+4gZJ9mHTXKR/Rv6DaI5j955
-xCx3hLdFPxTf0kOJ4B9tjHJl0gZAUjvaR4T32m+pEB9aS0M4gPMbqModkVLBeThz
-NgxD1yA6A7jgJO7TXV1wAXRbFapaQ13raniI7FvBELH8MHMW2Su29j4R61sJaWFn
-XWETvu//eAUltt6BxftREl/cOQ6eOU/cHq7LllHLZ9gopMgYWXzEOlUjbBvChXXR
-J+vFrsezqhD8o7NooAtvCgi93yIzNSLcqBQQPfBVTAspC0f0bcEOk3JWsoY81pY=
-=nQW5
+iQEcBAEBAgAGBQJP3KOfAAoJEEdUh39IaPFNMaQIAJy6paoTafq4rK7dwpbVEOJR
+98szV2L3lNxNCe/H2s4LOxAKXc6Aq0mtd9s12HSNloGEJ0mqAmahj8PgXk7/NDuh
+AP3nX+MC0w0xQSTutVn/C22FQhhtUAYfCZK9zOG0CmmKJKJwFvb27oJ5Epb4s2bJ
+Tc8kNTYx7zmT0kzZ6QUZIT1lPWau04E6ZbRFT9Qph84tLv/NdYk5auHSxn37yme6
+eQjFTsROxirYehZu9kt6xLAfapp2S0HidxdVKZf4Gv2vUAhf4V3Gf1UfS5yg6HCJ
+PY6MdKTbBhN8zP1hgq2jJdCejAxo0GMcyjGiGhXAzPfQufE/DgYoo2XmrvDQ174=
+=PFIg
 -----END PGP SIGNATURE-----
diff --git a/xfce-extra/xfce4-mailwatch-plugin/files/xfce4-mailwatch-plugin-1.1.0-libxfce4ui.patch b/xfce-extra/xfce4-mailwatch-plugin/files/xfce4-mailwatch-plugin-1.1.0-libxfce4ui.patch
new file mode 100644
index 000000000000..87dda3fef6a4
--- /dev/null
+++ b/xfce-extra/xfce4-mailwatch-plugin/files/xfce4-mailwatch-plugin-1.1.0-libxfce4ui.patch
@@ -0,0 +1,347 @@
+http://bugzilla.xfce.org/show_bug.cgi?id=9032
+http://cvs.pld-linux.org/cgi-bin/viewvc.cgi/cvs/packages/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-ui.patch?view=log
+
+--- config.h.in
++++ config.h.in
+@@ -139,12 +139,37 @@
+ /* Define to the one symbol short name of this package. */
+ #undef PACKAGE_TARNAME
+ 
++/* Define to the home page for this package. */
++#undef PACKAGE_URL
++
+ /* Define to the version of this package. */
+ #undef PACKAGE_VERSION
+ 
+ /* Define to 1 if you have the ANSI C header files. */
+ #undef STDC_HEADERS
+ 
++/* Enable extensions on AIX 3, Interix.  */
++#ifndef _ALL_SOURCE
++# undef _ALL_SOURCE
++#endif
++/* Enable GNU extensions on systems that have them.  */
++#ifndef _GNU_SOURCE
++# undef _GNU_SOURCE
++#endif
++/* Enable threading extensions on Solaris.  */
++#ifndef _POSIX_PTHREAD_SEMANTICS
++# undef _POSIX_PTHREAD_SEMANTICS
++#endif
++/* Enable extensions on HP NonStop.  */
++#ifndef _TANDEM_SOURCE
++# undef _TANDEM_SOURCE
++#endif
++/* Enable general extensions on Solaris.  */
++#ifndef __EXTENSIONS__
++# undef __EXTENSIONS__
++#endif
++
++
+ /* Version number of package */
+ #undef VERSION
+ 
+@@ -154,13 +179,6 @@
+ /* Define to 1 if the X Window System is missing or not being used. */
+ #undef X_DISPLAY_MISSING
+ 
+-/* Define to 1 if on AIX 3.
+-   System headers sometimes define this.
+-   We just want to avoid a redefinition error message.  */
+-#ifndef _ALL_SOURCE
+-# undef _ALL_SOURCE
+-#endif
+-
+ /* Define to 1 if on MINIX. */
+ #undef _MINIX
+ 
+--- configure.ac
++++ configure.ac
+@@ -57,7 +57,7 @@
+ XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.4.0])
+ XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.6.0])
+ XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.2.0])
+-XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.2.0])
++XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.8.0])
+ 
+ XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.20],
+                   [have_44_panel=yes], [
+--- libmailwatch-core/mailwatch.c
++++ libmailwatch-core/mailwatch.c
+@@ -41,7 +41,7 @@
+ #include <gtk/gtk.h>
+ 
+ #include <libxfce4util/libxfce4util.h>
+-#include <libxfcegui4/libxfcegui4.h>
++#include <libxfce4ui/libxfce4ui.h>
+ 
+ #include "mailwatch.h"
+ #include "mailwatch-utils.h"
+--- libmailwatch-core/mailwatch-mailbox-gmail.c
++++ libmailwatch-core/mailwatch-mailbox-gmail.c
+@@ -74,7 +74,7 @@
+ #include <gtk/gtk.h>
+ 
+ #include <libxfce4util/libxfce4util.h>
+-#include <libxfcegui4/libxfcegui4.h>
++#include <libxfce4ui/libxfce4ui.h>
+ 
+ #include "mailwatch-utils.h"
+ #include "mailwatch.h"
+--- libmailwatch-core/mailwatch-mailbox-imap.c
++++ libmailwatch-core/mailwatch-mailbox-imap.c
+@@ -58,7 +58,7 @@
+ #include <gtk/gtk.h>
+ 
+ #include <libxfce4util/libxfce4util.h>
+-#include <libxfcegui4/libxfcegui4.h>
++#include <libxfce4ui/libxfce4ui.h>
+ 
+ #include "mailwatch-net-conn.h"
+ #include "mailwatch-utils.h"
+--- libmailwatch-core/mailwatch-mailbox-maildir.c
++++ libmailwatch-core/mailwatch-mailbox-maildir.c
+@@ -48,7 +48,7 @@
+ #include <gtk/gtk.h>
+ 
+ #include <libxfce4util/libxfce4util.h>
+-#include <libxfcegui4/libxfcegui4.h>
++#include <libxfce4ui/libxfce4ui.h>
+ 
+ #include "mailwatch.h"
+ 
+--- libmailwatch-core/mailwatch-mailbox-mbox.c
++++ libmailwatch-core/mailwatch-mailbox-mbox.c
+@@ -48,7 +48,7 @@
+ #include <gtk/gtk.h>
+ 
+ #include <libxfce4util/libxfce4util.h>
+-#include <libxfcegui4/libxfcegui4.h>
++#include <libxfce4ui/libxfce4ui.h>
+ 
+ #include "mailwatch.h"
+ 
+--- libmailwatch-core/mailwatch-mailbox-mh.c
++++ libmailwatch-core/mailwatch-mailbox-mh.c
+@@ -48,7 +48,7 @@
+ #include <gtk/gtk.h>
+ 
+ #include <libxfce4util/libxfce4util.h>
+-#include <libxfcegui4/libxfcegui4.h>
++#include <libxfce4ui/libxfce4ui.h>
+ 
+ #include "mailwatch.h"
+ 
+--- libmailwatch-core/mailwatch-mailbox-pop3.c
++++ libmailwatch-core/mailwatch-mailbox-pop3.c
+@@ -42,7 +42,7 @@
+ #include <gtk/gtk.h>
+ 
+ #include <libxfce4util/libxfce4util.h>
+-#include <libxfcegui4/libxfcegui4.h>
++#include <libxfce4ui/libxfce4ui.h>
+ 
+ #include "mailwatch-utils.h"
+ #include "mailwatch.h"
+--- libmailwatch-core/mailwatch-utils.c
++++ libmailwatch-core/mailwatch-utils.c
+@@ -52,7 +52,7 @@
+ 
+ #include <gtk/gtk.h>
+ 
+-#include <libxfcegui4/libxfcegui4.h>
++#include <libxfce4ui/libxfce4ui.h>
+ 
+ #include "mailwatch-utils.h"
+ #include "mailwatch-common.h"
+@@ -78,7 +78,7 @@
+         img = gtk_image_new_from_stock(icon, GTK_ICON_SIZE_BUTTON);
+         if(!img || gtk_image_get_storage_type(GTK_IMAGE(img)) == GTK_IMAGE_EMPTY) {
+             gtk_icon_size_lookup(GTK_ICON_SIZE_BUTTON, &iw, &ih);
+-            pix = xfce_themed_icon_load(icon, iw);
++	    pix = gtk_icon_theme_load_icon ( gtk_icon_theme_get_default(), icon, iw, GTK_ICON_LOOKUP_GENERIC_FALLBACK, NULL);
+             if(pix) {
+                 if(img)
+                     gtk_image_set_from_pixbuf(GTK_IMAGE(img), pix);
+@@ -106,13 +106,7 @@
+ GtkWidget *
+ xfce_mailwatch_create_framebox(const gchar *title, GtkWidget **frame_bin)
+ {
+-#if LIBXFCEGUI4_CHECK_VERSION(4, 3, 4)
+-    return xfce_create_framebox(title, frame_bin);
+-#else
+-    GtkWidget *frame = xfce_framebox_new(title, TRUE);
+-    *frame_bin = XFCE_FRAMEBOX(frame)->hbox;
+-    return frame;
+-#endif
++    return xfce_gtk_frame_box_new(title, frame_bin);
+ }
+ 
+ #ifdef HAVE_SSL_SUPPORT
+--- libmailwatch-core/Makefile.am
++++ libmailwatch-core/Makefile.am
+@@ -27,7 +27,7 @@
+ libmailwatch_core_la_CFLAGS = \
+ 	@GTHREAD_CFLAGS@ \
+ 	@GTK_CFLAGS@ \
+-	@LIBXFCEGUI4_CFLAGS@ \
++	@LIBXFCE4UI_CFLAGS@ \
+ 	@GNUTLS_CFLAGS@ \
+ 	-DDATADIR=\"$(datadir)\" \
+ 	-DLOCALEDIR=\"$(localedir)\"
+--- panel-plugin/mailwatch-plugin-4.2.c
++++ panel-plugin/mailwatch-plugin-4.2.c
+@@ -23,7 +23,7 @@
+ #include <gtk/gtk.h>
+ 
+ #include <libxfce4util/libxfce4util.h>
+-#include <libxfcegui4/libxfcegui4.h>
++#include <libxfce4ui/libxfce4ui.h>
+ #include <libxfcegui4/xfce_scaled_image.h>
+ 
+ #include <panel/plugins.h>
+--- panel-plugin/mailwatch-plugin.c
++++ panel-plugin/mailwatch-plugin.c
+@@ -30,9 +30,8 @@
+ #include <gtk/gtk.h>
+ 
+ #include <libxfce4util/libxfce4util.h>
+-#include <libxfcegui4/libxfcegui4.h>
+-#include <libxfce4panel/xfce-panel-plugin.h>
+-#include <libxfce4panel/xfce-panel-convenience.h>
++#include <libxfce4ui/libxfce4ui.h>
++#include <libxfce4panel/libxfce4panel.h>
+ 
+ #include "mailwatch.h"
+ #include "mailwatch-mailbox.h"
+@@ -145,7 +144,7 @@
+             g_string_free(ttip_str, TRUE);
+             
+             if(mwp->new_messages_command)
+-                xfce_exec(mwp->new_messages_command, FALSE, FALSE, NULL);
++                xfce_spawn_command_line_on_screen(gdk_screen_get_default(), mwp->new_messages_command, FALSE, FALSE, NULL);
+         }
+     }
+ }
+@@ -175,7 +174,7 @@
+         switch(evt->button) {
+             case 1:  /* left */
+                 if(mwp->click_command && *mwp->click_command)
+-                    xfce_exec(mwp->click_command, FALSE, FALSE, NULL);
++                    xfce_spawn_command_line_on_screen(gdk_screen_get_default(), mwp->click_command, FALSE, FALSE, NULL);
+                 break;
+         
+             case 2:  /* middle */
+@@ -809,7 +808,7 @@
+ {
+     GError *err = NULL;
+     
+-    if(!xfce_exec("xfhelp4 xfce4-mailwatch-plugin.html", FALSE, FALSE, &err)) {
++    if(!xfce_spawn_command_line_on_screen(gdk_screen_get_default(), "xfhelp4 xfce4-mailwatch-plugin.html", FALSE, FALSE, &err)) {
+         gchar *secondary = g_strdup_printf(_("Help is unavailable because 'xfhelp4' could not be run: %s"),
+                                            err->message);
+         xfce_message_dialog(NULL, _("Help Unavailable"), GTK_STOCK_DIALOG_ERROR,
+@@ -1025,35 +1024,28 @@
+                      gpointer user_data)
+ {
+     XfceMailwatchPlugin *mwp = user_data;
+-    XfceAboutInfo *ainfo;
+     GdkPixbuf *icon;
+-
+-    if(G_UNLIKELY(mwp->about_dialog)) {
+-        gtk_window_present(GTK_WINDOW(mwp->about_dialog));
+-        return;
+-    }
+-
+-    ainfo = xfce_about_info_new(_("Xfce4 Mailwatch Plugin"),
+-                                VERSION,
+-                                _("A featureful mail-checker applet for the Xfce Panel"),
+-                                _("Copyright (c) 2005-2008 Brian Tarricone\n"
+-                                  "Copyright (c) 2005 Pasi Orovuo"),
+-                                  XFCE_LICENSE_GPL);
+-    xfce_about_info_set_homepage(ainfo, WEBSITE);
+-    xfce_about_info_add_credit(ainfo, "Brian J. Tarricone",
+-                               "bjt23@cornell.edu",
+-                               _("Maintainer, Original Author"));
+-    xfce_about_info_add_credit(ainfo, "Pasi Orovuo", "pasi.ov@gmail.com",
+-                               _("Developer"));
+-    
+-    icon = xfce_themed_icon_load("xfce-mail", 32);
+-    
+-    mwp->about_dialog = xfce_about_dialog_new_with_values(NULL, ainfo, icon);
+-    g_object_add_weak_pointer(G_OBJECT(mwp->about_dialog),
+-                              (gpointer)&mwp->about_dialog);
+-    gtk_widget_show_all(mwp->about_dialog);
+-    g_signal_connect(G_OBJECT(mwp->about_dialog), "response",
+-                     G_CALLBACK(gtk_widget_destroy), NULL);
++    const gchar *auth[] = { "Brian J. Tarricone bjt23@cornell.edu Maintainer, Original Author",
++                            "Pasi Orovuo pasi.ov@gmail.com Developer",
++			    NULL };
++
++    icon = xfce_panel_pixbuf_from_source("xfce-mail", NULL, 32);
++    
++#if !GTK_CHECK_VERSION (2, 18, 0)
++    gtk_about_dialog_set_email_hook (exo_gtk_url_about_dialog_hook, NULL, NULL);
++    gtk_about_dialog_set_url_hook (exo_gtk_url_about_dialog_hook, NULL, NULL);
++#endif
++    gtk_show_about_dialog(NULL,
++                          "logo", icon,
++                          "program-name", _("Xfce4 Mailwatch Plugin"),
++                          "license", xfce_get_license_text (XFCE_LICENSE_TEXT_GPL),
++                          "version", VERSION,
++                          "comments", _("A featureful mail-checker applet for the Xfce Panel"),
++                          "website", WEBSITE,
++                          "copyright", _("Copyright (c) 2005-2008 Brian Tarricone\n"
++                                         "Copyright (c) 2005 Pasi Orovuo"),
++                          "authors", auth, 
++                          NULL);
+ 
+     if(icon)
+         g_object_unref(G_OBJECT(icon));
+--- panel-plugin/Makefile.am
++++ panel-plugin/Makefile.am
+@@ -26,6 +26,7 @@
+ 	-I$(top_srcdir)/libmailwatch-core \
+ 	@GTHREAD_CFLAGS@ \
+ 	@XFCE4_PANEL_CFLAGS@ \
++	@LIBXFCE4UI_CFLAGS@ \
+ 	-DDATADIR=\"$(datadir)\" \
+ 	-DLOCALEDIR=\"$(localedir)\"
+ 
+@@ -36,6 +37,7 @@
+ 	$(top_builddir)/libmailwatch-core/libmailwatch-core.la \
+ 	@GTHREAD_LIBS@ \
+ 	@XFCE4_PANEL_LIBS@ \
++	@LIBXFCE4UI_LIBS@ \
+ 	@GNUTLS_LIBS@
+ 
+ else
+@@ -50,16 +52,18 @@
+ 	-I$(top_srcdir)/libmailwatch-core \
+ 	@GTHREAD_CFLAGS@ \
+ 	@LIBXFCE4PANEL_CFLAGS@ \
++	@LIBXFCE4UI_CFLAGS@ \
+ 	-DDATADIR=\"$(datadir)\" \
+ 	-DLOCALEDIR=\"$(localedir)\"
+ 
+ xfce4_mailwatch_plugin_DEPENDENCIES = \
+ 	$(top_builddir)/libmailwatch-core/libmailwatch-core.la
+ 
+-xfce4_mailwatch_plugin_LDFLAGS = \
++xfce4_mailwatch_plugin_LDADD = \
+ 	$(top_builddir)/libmailwatch-core/libmailwatch-core.la \
+ 	@GTHREAD_LIBS@ \
+ 	@LIBXFCE4PANEL_LIBS@ \
++	@LIBXFCE4UI_LIBS@ \
+ 	@GNUTLS_LIBS@
+ 
+ if HAVE_CYGWIN
+@@ -67,7 +67,7 @@
+ 	@GNUTLS_LIBS@
+ 
+ if HAVE_CYGWIN
+-  xfce4_mailwatch_plugin_LDFLAGS += \
++  xfce4_mailwatch_plugin_LDFLAGS = \
+ 	-no-undefined
+ endif
+ 
diff --git a/xfce-extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.1.0-r1.ebuild b/xfce-extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.1.0-r1.ebuild
new file mode 100644
index 000000000000..1e073186a42e
--- /dev/null
+++ b/xfce-extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.1.0-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.1.0-r1.ebuild,v 1.1 2012/06/16 15:22:08 ssuominen Exp $
+
+EAPI=4
+EAUTORECONF=yes
+inherit multilib xfconf
+
+DESCRIPTION="An mail notification panel plug-in for the Xfce desktop environment"
+HOMEPAGE="http://spuriousinterrupt.org/projects/mailwatch"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
+IUSE="debug ipv6 ssl"
+
+RDEPEND=">=xfce-base/libxfce4ui-4.8
+	>=xfce-base/libxfce4util-4.8
+	>=xfce-base/xfce4-panel-4.8
+	ssl? (
+		dev-libs/libgcrypt
+		>=net-libs/gnutls-2
+		)"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig"
+
+pkg_setup() {
+	PATCHES=(
+		"${FILESDIR}"/${P}-no-ssl.patch
+		"${FILESDIR}"/${P}-libxfce4ui.patch
+		"${FILESDIR}"/${P}-link_to_libgcrypt.patch
+		"${FILESDIR}"/${P}-gnutls-3.patch
+		)
+
+	XFCONF=(
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
+		$(use_enable ssl)
+		$(use_enable ipv6)
+		$(xfconf_use_debug)
+		)
+
+	DOCS=( AUTHORS ChangeLog NEWS README TODO )
+}