bump to 1.8.5. Close bug #220657, #215435 and #213430.

Package-Manager: portage-2.1.5_rc6

5 files changed, 1154 insertions, 3 deletions

diff --git a/app-misc/workrave/ChangeLog b/app-misc/workrave/ChangeLog
index bb0dda20c3cb..463ec86f64f4 100644
--- a/app-misc/workrave/ChangeLog
+++ b/app-misc/workrave/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-misc/workrave
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/ChangeLog,v 1.46 2007/07/22 09:50:08 omp Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/ChangeLog,v 1.47 2008/05/07 23:43:29 eva Exp $
+
+*workrave-1.8.5 (08 May 2008)
+
+  08 May 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/workrave-1.8.5-gcc43.patch,
+  +files/workrave-1.8.5-libsigc++-2.2.2.patch, +workrave-1.8.5.ebuild:
+  bump to 1.8.5. Close bug #220657, #215435 and #213430.
 
   22 Jul 2007; David Shakaryan <omp@gentoo.org> workrave-1.8.3.ebuild:
   Remove virtual/x11 from dependencies.
diff --git a/app-misc/workrave/Manifest b/app-misc/workrave/Manifest
index 9bc04f3479cd..1adf315add59 100644
--- a/app-misc/workrave/Manifest
+++ b/app-misc/workrave/Manifest
@@ -1,10 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX org.workrave.Workrave.service.in 75 RMD160 a0554af1c3638dfe2ae131862dc295e7dbf6035e SHA1 1ee7f455b9040bfdf9728455ce620d28af3794e0 SHA256 4ee93c57351873ef80b9b05a3ea4eb51a2587373548658da577712beecc26be4
 AUX workrave-1.6.2-nls_macros.patch 1875 RMD160 d08a0f1fe968b5f42db3c8527d4189d7f10155b7 SHA1 b1bd259cf1ee74c801e52c8471e16cecaacf4ce2 SHA256 5da8371b332c52eebc9997860a743f30e112f523a73e2ad46702d9bab6a31b3d
 AUX workrave-1.8.4-nls_macros.patch 1985 RMD160 a9334444d5aef1dd538139ee0ccae16b80dfe239 SHA1 8b64b52ab88201c91e9d77a14551f14c99568128 SHA256 7de293e74864c57a1833701aaaeb46b31ff7467cf6e91a95756eb6ce29530c54
 AUX workrave-1.8.4-no_gnome.patch 515 RMD160 affda3c725dcb99bf3b2d49c12c869eeec26f9d2 SHA1 a88ca76f52018805172d1a9d5f78bb0dcdcd0e90 SHA256 a0cf7b48a46643afee13e43e0967f1e066d5030fe98a7f74cbbc113a5fc0824e
+AUX workrave-1.8.5-gcc43.patch 3036 RMD160 92a9028684bfda7c33abae31cf3ec0bcaf8d0c59 SHA1 3b2d5e1dd0180da746cdeaf503a92f4ec9081bb4 SHA256 b622f82ec1f5d5f73bff1c4452a75df3bd6dbeab01ff588fdc4c992a25894599
+AUX workrave-1.8.5-libsigc++-2.2.2.patch 29752 RMD160 947acc5a73fc2ce9fcc31b12f9b304190db14e2b SHA1 7c00bc08f3c7ce9bba8f4c874662c09e252e3099 SHA256 794d284de40fcd6237ae92bf2a8c6931bf70f62837c2a3e0630bfe26832bd81b
 DIST workrave-1.8.3.tar.gz 1604897 RMD160 2bc139714323cb48a77977ccaeb4aaf50a8c9571 SHA1 276df08e69f5477cdfa66071eed138b2da3de97e SHA256 411487f55d7e15e68618d30f9931bffafb3154cac36d7ea15ea5f80c3bbac10f
 DIST workrave-1.8.4-2.tar.gz 1907721 RMD160 95498e202d4e4d848b61cfc93b3c8673f6edf4cb SHA1 890e186527e03afd1652934b2f01e0e0133055fe SHA256 af79f4b11e5a51fc5f0e4c32f92334b0a6f0c04b4d27b1dab40568eb09d016e8
+DIST workrave-1.8.5.tar.gz 1940651 RMD160 306364cbae2a1a4270cbd624864dc111b27ef388 SHA1 d40c3d536f1a37b849fcf8d1e7a6591e043cf19d SHA256 4a2f8f16f015fcec4446953421c8e12cdb41391a6da0e63d04d17b30534a0c56
 EBUILD workrave-1.8.3.ebuild 1825 RMD160 3a56b8900264c2d7e5c249b238b46bf25eab54a0 SHA1 fae9a53f1b5061c6a3fffc395f0b1a2ad61f402a SHA256 01aa9f5f09cb7e595022b793dbf105b8c4da68a66e7ca22f0071dbe838b0138d
 EBUILD workrave-1.8.4.ebuild 2018 RMD160 b19728cb258493bde03f4da10fcbb5ae582f7a66 SHA1 5844ce0ef9e168bae30790e476820ad854b4221d SHA256 18922399d5dab49da959a8d236b1c6ce3e5a122d32fe27477f45aae89e652bc6
-MISC ChangeLog 7004 RMD160 9261f37bb9c6f4c81a78ea6638aee28562258c1d SHA1 231c2ab56fb75723f898e8d5389b3168c22a3b9a SHA256 9ad2c2d0bb9957fb82c79adee9bd95e5202220d53c742b53642dad6a7457bd85
+EBUILD workrave-1.8.5.ebuild 1923 RMD160 e17dd19c1f497bbf65fdaf4e38dbc7027c3e2ae3 SHA1 b45403ac76b47f4985a325aa837f562b8af0a6da SHA256 b56436d632b5a100ff38d946c3d69bd1e23567a02f77bc9b8f5235189ccc32e6
+MISC ChangeLog 7255 RMD160 17007b015678eb09ed402860ea72d6e225ed6e4f SHA1 d98aaf24d408c6fe9ed452520cd6b6b517b45674 SHA256 78ccea18fc5928d71c6852ebec78f4fc5ca4d93d10065c54d94f22170a2c6155
 MISC metadata.xml 530 RMD160 6718f23491d41bd50b837451c2d0312993dccd55 SHA1 dfd3de105aa18aa27697bf04484da96c50a7f1f1 SHA256 ed4b48f812cc1fd9ef34b5cb60152112b052547e0b35860e475b5029554e461e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkgiWssACgkQ1fmVwcYIWAbIsgCgskPCMVi8GEa5woObGVIEyDSF
+Pl0An0/JxiD4mKTETGPG7UsimLTnXyEe
+=BlxO
+-----END PGP SIGNATURE-----
diff --git a/app-misc/workrave/files/workrave-1.8.5-gcc43.patch b/app-misc/workrave/files/workrave-1.8.5-gcc43.patch
new file mode 100644
index 000000000000..b16226589107
--- /dev/null
+++ b/app-misc/workrave/files/workrave-1.8.5-gcc43.patch
@@ -0,0 +1,91 @@
+diff -NrU5 workrave-1.8.5.orig/backend/src/DBus.cc workrave-1.8.5/backend/src/DBus.cc
+--- workrave-1.8.5.orig/backend/src/DBus.cc	2008-05-06 19:59:30.000000000 +0200
++++ workrave-1.8.5/backend/src/DBus.cc	2008-05-06 19:57:48.000000000 +0200
+@@ -17,10 +17,11 @@
+ static const char rcsid[] = "$Id: workrave-1.8.5-gcc43.patch,v 1.1 2008/05/07 23:43:30 eva Exp $";
+ 
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+ #endif
++#include <string.h>
+ 
+ #include "nls.h"
+ 
+ #define DBUS_API_SUBJECT_TO_CHANGE
+ #include <dbus/dbus.h>
+diff -NrU5 workrave-1.8.5.orig/backend/src/GlibIniConfigurator.cc workrave-1.8.5/backend/src/GlibIniConfigurator.cc
+--- workrave-1.8.5.orig/backend/src/GlibIniConfigurator.cc	2008-05-06 19:59:30.000000000 +0200
++++ workrave-1.8.5/backend/src/GlibIniConfigurator.cc	2008-05-06 19:57:48.000000000 +0200
+@@ -20,10 +20,11 @@
+ #include "config.h"
+ #endif
+ 
+ #include "debug.hh"
+ 
++#include <string.h>
+ #include <sstream>
+ #include <assert.h>
+ #include <iostream>
+ #include <fstream>
+ 
+diff -NrU5 workrave-1.8.5.orig/backend/src/Statistics.hh workrave-1.8.5/backend/src/Statistics.hh
+--- workrave-1.8.5.orig/backend/src/Statistics.hh	2007-09-14 20:50:38.000000000 +0200
++++ workrave-1.8.5/backend/src/Statistics.hh	2008-05-06 19:57:48.000000000 +0200
+@@ -21,10 +21,11 @@
+ 
+ #include <iostream>
+ #include <fstream>
+ #include <vector>
+ #include <time.h>
++#include <string.h>
+ 
+ class TimePred;
+ class IBreak;
+ class ITimer;
+ class PacketBuffer;
+diff -NrU5 workrave-1.8.5.orig/backend/src/XMLConfigurator.cc workrave-1.8.5/backend/src/XMLConfigurator.cc
+--- workrave-1.8.5.orig/backend/src/XMLConfigurator.cc	2008-05-06 19:59:30.000000000 +0200
++++ workrave-1.8.5/backend/src/XMLConfigurator.cc	2008-05-06 19:57:48.000000000 +0200
+@@ -21,10 +21,11 @@
+ #endif
+ 
+ #include "debug.hh"
+ #include <sstream>
+ #include <iostream>
++#include <stdlib.h>
+ 
+ #include "XMLConfigurator.hh"
+ 
+ using namespace std;
+ 
+diff -NrU5 workrave-1.8.5.orig/frontend/plugin/exercises/common/src/Exercise.cc workrave-1.8.5/frontend/plugin/exercises/common/src/Exercise.cc
+--- workrave-1.8.5.orig/frontend/plugin/exercises/common/src/Exercise.cc	2007-09-14 20:50:35.000000000 +0200
++++ workrave-1.8.5/frontend/plugin/exercises/common/src/Exercise.cc	2008-05-06 19:57:48.000000000 +0200
+@@ -27,10 +27,12 @@
+ #include "debug.hh"
+ 
+ #include <unistd.h>
+ #include <assert.h>
+ #include <stdio.h>
++#include <string.h>
++#include <stdlib.h>
+ 
+ #include <glib.h>
+ 
+ struct ExerciseParser
+ {
+diff -NrU5 workrave-1.8.5.orig/frontend/plugin/exercises/gtkmm/src/ExercisesPanel.cc workrave-1.8.5/frontend/plugin/exercises/gtkmm/src/ExercisesPanel.cc
+--- workrave-1.8.5.orig/frontend/plugin/exercises/gtkmm/src/ExercisesPanel.cc	2007-09-14 20:50:32.000000000 +0200
++++ workrave-1.8.5/frontend/plugin/exercises/gtkmm/src/ExercisesPanel.cc	2008-05-06 19:57:48.000000000 +0200
+@@ -20,10 +20,11 @@
+ 
+ #ifdef HAVE_EXERCISES
+ 
+ #include "preinclude.h"
+ 
++#include <string.h>
+ #include <gtkmm/stock.h>
+ 
+ #include "ExercisesPanel.hh"
+ #include "GtkUtil.hh"
+ #include "GUI.hh"
diff --git a/app-misc/workrave/files/workrave-1.8.5-libsigc++-2.2.2.patch b/app-misc/workrave/files/workrave-1.8.5-libsigc++-2.2.2.patch
new file mode 100644
index 000000000000..9b924e1625eb
--- /dev/null
+++ b/app-misc/workrave/files/workrave-1.8.5-libsigc++-2.2.2.patch
@@ -0,0 +1,954 @@
+diff -NrU5 workrave-1.8.5.orig/frontend/gtkmm/src/Dispatcher.cc workrave-1.8.5/frontend/gtkmm/src/Dispatcher.cc
+--- workrave-1.8.5.orig/frontend/gtkmm/src/Dispatcher.cc	2007-09-14 20:50:25.000000000 +0200
++++ workrave-1.8.5/frontend/gtkmm/src/Dispatcher.cc	2008-05-06 20:30:52.000000000 +0200
+@@ -22,13 +22,11 @@
+ #include "config.h"
+ #endif
+ 
+ #include "preinclude.h"
+ 
+-#ifdef HAVE_GTKMM24
+-#include <sigc++/compatibility.h>
+-#endif
++#include <sigc++/trackable.h>
+ 
+ #include "Dispatcher.hh"
+ 
+ #include "nls.h"
+ #include "debug.hh"
+@@ -169,11 +167,11 @@
+     send_fd  = filedes[1];
+ 
+     fd_set_close_on_exec(receive_fd);
+     fd_set_close_on_exec(send_fd);
+ 
+-    io_connection = Glib::signal_io().connect(SigC::slot_class(*this, &Dispatcher::io_handler),
++    io_connection = Glib::signal_io().connect(sigc::mem_fun(*this, &Dispatcher::io_handler),
+                                               (int)receive_fd,
+                                               Glib::IO_IN);
+ 
+     ret = true;
+   }
+@@ -240,11 +238,11 @@
+ }
+ 
+ #endif
+ 
+ 
+-SigC::Connection
+-Dispatcher::connect(const SigC::Slot0<void>& slot)
++sigc::connection
++Dispatcher::connect(const sigc::slot0<void>& slot)
+ {
+   return signal.connect(slot);
+ }
+ 
+diff -NrU5 workrave-1.8.5.orig/frontend/gtkmm/src/Dispatcher.hh workrave-1.8.5/frontend/gtkmm/src/Dispatcher.hh
+--- workrave-1.8.5.orig/frontend/gtkmm/src/Dispatcher.hh	2007-09-14 20:50:25.000000000 +0200
++++ workrave-1.8.5/frontend/gtkmm/src/Dispatcher.hh	2008-05-06 20:33:30.000000000 +0200
+@@ -17,13 +17,11 @@
+ //
+ 
+ #ifndef DISPATCHER_HH
+ #define DISPATCHER_HH
+ 
+-#ifdef HAVE_GTKMM24
+-#include <sigc++/compatibility.h>
+-#endif
++#include <sigc++/trackable.h>
+ 
+ #include <sigc++/object.h>
+ #include <sigc++/slot.h>
+ #include <sigc++/class_slot.h>
+ #include <glibmm.h>
+@@ -50,19 +48,19 @@
+   int receive_fd;
+ 
+ #endif
+ 
+   //! I/O Connection
+-  SigC::Connection io_connection;
++  sigc::connection io_connection;
+ 
+   //!
+-  SigC::Signal0<void> signal;
++  sigc::signal0<void> signal;
+ 
+ public:
+   Dispatcher();
+   ~Dispatcher();
+-  SigC::Connection connect(const SigC::Slot0<void>& slot);
++  sigc::connection connect(const sigc::slot0<void>& slot);
+   void send_notification();
+ 
+ private:
+ 
+ #ifndef WIN32
+diff -NrU5 workrave-1.8.5.orig/frontend/gtkmm/src/EventImage.cc workrave-1.8.5/frontend/gtkmm/src/EventImage.cc
+--- workrave-1.8.5.orig/frontend/gtkmm/src/EventImage.cc	2007-09-14 20:50:25.000000000 +0200
++++ workrave-1.8.5/frontend/gtkmm/src/EventImage.cc	2008-05-06 20:23:20.000000000 +0200
+@@ -96,11 +96,10 @@
+     }
+ 
+   return Gtk::Image::on_unmap_event(event);
+ }
+ 
+-#ifdef HAVE_GTKMM24
+ void
+ EventImage::on_size_allocate(Gtk::Allocation &allocation)
+ {
+   Gtk::Image::on_size_allocate(allocation);
+ 
+@@ -114,23 +113,5 @@
+                              allocation.get_width(),
+                              allocation.get_height());
+     }
+ }
+ 
+-#else
+-void
+-EventImage::on_size_allocate(GtkAllocation *allocation)
+-{
+-  Gtk::Image::on_size_allocate(allocation);
+-
+-  GtkWidget *widget = GTK_WIDGET(gobj());
+-
+-  if (GTK_WIDGET_REALIZED(widget))
+-    {
+-      gdk_window_move_resize(event_window,
+-                             allocation->x ,
+-                             allocation->y ,
+-                             allocation->width,
+-                             allocation->height);
+-    }
+-}
+-#endif
+diff -NrU5 workrave-1.8.5.orig/frontend/gtkmm/src/EventImage.hh workrave-1.8.5/frontend/gtkmm/src/EventImage.hh
+--- workrave-1.8.5.orig/frontend/gtkmm/src/EventImage.hh	2007-09-14 20:50:25.000000000 +0200
++++ workrave-1.8.5/frontend/gtkmm/src/EventImage.hh	2008-05-06 20:23:20.000000000 +0200
+@@ -37,15 +37,11 @@
+ private:
+   void on_realize();
+   void on_unrealize();
+   bool on_map_event(GdkEventAny *event);
+   bool on_unmap_event(GdkEventAny *event);
+-#ifdef HAVE_GTKMM24
+   void on_size_allocate(Gtk::Allocation &allocation);
+-#else
+-  void on_size_allocate(GtkAllocation *allocation);
+-#endif
+ 
+   GdkWindow *event_window;
+ };
+ 
+ 
+diff -NrU5 workrave-1.8.5.orig/frontend/gtkmm/src/EventLabel.cc workrave-1.8.5/frontend/gtkmm/src/EventLabel.cc
+--- workrave-1.8.5.orig/frontend/gtkmm/src/EventLabel.cc	2007-09-14 20:50:25.000000000 +0200
++++ workrave-1.8.5/frontend/gtkmm/src/EventLabel.cc	2008-05-06 20:23:20.000000000 +0200
+@@ -96,11 +96,10 @@
+     }
+ 
+   return Gtk::Label::on_unmap_event(event);
+ }
+ 
+-#ifdef HAVE_GTKMM24
+ void
+ EventLabel::on_size_allocate(Gtk::Allocation &allocation)
+ {
+   Gtk::Label::on_size_allocate(allocation);
+ 
+@@ -114,23 +113,5 @@
+                              allocation.get_width(),
+                              allocation.get_height());
+     }
+ }
+ 
+-#else
+-void
+-EventLabel::on_size_allocate(GtkAllocation *allocation)
+-{
+-  Gtk::Label::on_size_allocate(allocation);
+-
+-  GtkWidget *widget = GTK_WIDGET(gobj());
+-
+-  if (GTK_WIDGET_REALIZED(widget))
+-    {
+-      gdk_window_move_resize(event_window,
+-                             allocation->x ,
+-                             allocation->y ,
+-                             allocation->width,
+-                             allocation->height);
+-    }
+-}
+-#endif
+diff -NrU5 workrave-1.8.5.orig/frontend/gtkmm/src/EventLabel.hh workrave-1.8.5/frontend/gtkmm/src/EventLabel.hh
+--- workrave-1.8.5.orig/frontend/gtkmm/src/EventLabel.hh	2007-09-14 20:50:25.000000000 +0200
++++ workrave-1.8.5/frontend/gtkmm/src/EventLabel.hh	2008-05-06 20:23:20.000000000 +0200
+@@ -36,15 +36,11 @@
+ private:
+   void on_realize();
+   void on_unrealize();
+   bool on_map_event(GdkEventAny *event);
+   bool on_unmap_event(GdkEventAny *event);
+-#ifdef HAVE_GTKMM24
+   void on_size_allocate(Gtk::Allocation &allocation);
+-#else
+-  void on_size_allocate(GtkAllocation *allocation);
+-#endif
+ 
+   GdkWindow *event_window;
+ };
+ 
+ 
+diff -NrU5 workrave-1.8.5.orig/frontend/gtkmm/src/Frame.cc workrave-1.8.5/frontend/gtkmm/src/Frame.cc
+--- workrave-1.8.5.orig/frontend/gtkmm/src/Frame.cc	2007-09-14 20:50:25.000000000 +0200
++++ workrave-1.8.5/frontend/gtkmm/src/Frame.cc	2008-05-06 20:23:20.000000000 +0200
+@@ -135,33 +135,20 @@
+   color_map->alloc_color(color_black);
+ #endif
+   set_frame_color(frame_color);
+ }
+ 
+-#ifdef HAVE_GTKMM24
+ void
+ Frame::on_size_request(Gtk::Requisition *requisition)
+ {
+   Gtk::Widget *widget = get_child();
+   widget->size_request(*requisition);
+   guint d = 2*(get_border_width()+frame_width);
+   requisition->width += d;
+   requisition->height += d;
+ }
+-#else
+-void
+-Frame::on_size_request(GtkRequisition *requisition)
+-{
+-  Gtk::Widget *widget = get_child();
+-  widget->size_request(requisition);
+-  guint d = 2*(get_border_width()+frame_width);
+-  requisition->width += d;
+-  requisition->height += d;
+-}
+-#endif
+ 
+-#ifdef HAVE_GTKMM24
+ void
+ Frame::on_size_allocate(Gtk::Allocation &allocation)
+ {
+   Gtk::Bin::on_size_allocate(allocation);
+ 
+@@ -173,47 +160,26 @@
+   alloc.set_y(allocation.get_y() + b);
+   alloc.set_width(allocation.get_width() - 2*b);
+   alloc.set_height(allocation.get_height() - 2*b);
+   widget->size_allocate(alloc);
+ }
+-#else
+-void
+-Frame::on_size_allocate(GtkAllocation* allocation)
+-{
+-  Gtk::Bin::on_size_allocate(allocation);
+-
+-  Gtk::Widget *widget = get_child();
+-  guint b = get_border_width() + frame_width;
+-
+-  GtkAllocation alloc;
+-  alloc.x = allocation->x + b;
+-  alloc.y = allocation->y + b;
+-  alloc.width = allocation->width - 2*b;
+-  alloc.height = allocation->height - 2*b;
+-  widget->size_allocate(&alloc);
+-}
+-#endif
+ 
+ bool
+ Frame::on_expose_event(GdkEventExpose* e)
+ {
+   Glib::RefPtr<Gdk::Window> window = get_window();
+   Glib::RefPtr<Gtk::Style> style = get_style();
+ 
+   Gdk::Color bgCol = style->get_background(Gtk::STATE_NORMAL);
+ 
+   // FIXME:
+-#ifdef HAVE_GTKMM24
+   Gtk::Allocation gtkmmalloc = get_allocation();
+   GtkAllocation alloc;
+   alloc.x = gtkmmalloc.get_x();
+   alloc.y = gtkmmalloc.get_y();
+   alloc.width = gtkmmalloc.get_width();
+   alloc.height = gtkmmalloc.get_height();
+-#else
+-  GtkAllocation alloc = get_allocation();
+-#endif
+ 
+   switch (frame_style)
+     {
+     case STYLE_SOLID:
+       gc->set_foreground(frame_visible ? frame_color : bgCol);
+@@ -256,11 +222,11 @@
+   bool rc = Gtk::Bin::on_expose_event(e);
+ 
+   return rc;
+ }
+ 
+-SigC::Signal1<void,bool> &
++sigc::signal1<void,bool> &
+ Frame::signal_flash()
+ {
+   return flash_signal_src;
+ }
+ 
+diff -NrU5 workrave-1.8.5.orig/frontend/gtkmm/src/Frame.hh workrave-1.8.5/frontend/gtkmm/src/Frame.hh
+--- workrave-1.8.5.orig/frontend/gtkmm/src/Frame.hh	2007-09-14 20:50:25.000000000 +0200
++++ workrave-1.8.5/frontend/gtkmm/src/Frame.hh	2008-05-06 20:23:20.000000000 +0200
+@@ -35,11 +35,11 @@
+   void set_frame_width(guint width);
+   void set_frame_style(Style style);
+   void set_frame_color(const Gdk::Color &color);
+   void set_frame_flashing(int delay);
+   void set_frame_visible(bool visible);
+-  SigC::Signal1<void,bool> &signal_flash();
++  sigc::signal1<void,bool> &signal_flash();
+ 
+ protected:
+   bool on_timer();
+ #ifdef HAVE_GTKMM24
+   void on_size_request(Gtk::Requisition *requisition);
+@@ -76,11 +76,11 @@
+ 
+   //! Flash delay;
+   int flash_delay;
+ 
+   //! Flash timeout signal
+-  SigC::Connection flash_signal;
++  sigc::connection flash_signal;
+ 
+   //! Flash signal source
+-  SigC::Signal1<void,bool> flash_signal_src;
++  sigc::signal1<void,bool> flash_signal_src;
+ };
+ 
+diff -NrU5 workrave-1.8.5.orig/frontend/gtkmm/src/GnomeAppletWindow.hh workrave-1.8.5/frontend/gtkmm/src/GnomeAppletWindow.hh
+--- workrave-1.8.5.orig/frontend/gtkmm/src/GnomeAppletWindow.hh	2007-09-14 20:50:25.000000000 +0200
++++ workrave-1.8.5/frontend/gtkmm/src/GnomeAppletWindow.hh	2008-05-06 20:23:20.000000000 +0200
+@@ -22,13 +22,11 @@
+ #include "preinclude.h"
+ #include <stdio.h>
+ 
+ #include "AppletWindow.hh"
+ 
+-#ifdef HAVE_GTKMM24
+-#include <sigc++/compatibility.h>
+-#endif
++#include <sigc++/trackable.h>
+ 
+ #include <gnome.h>
+ #include <bonobo.h>
+ #include <bonobo/bonobo-xobject.h>
+ #include <string>
+@@ -43,11 +41,11 @@
+ 
+ class TimerBoxGtkView;
+ class AppletControl;
+ 
+ class GnomeAppletWindow :
+-  public SigC::Object,
++  public sigc::trackable,
+   public AppletWindow
+ {
+ public:
+   GnomeAppletWindow(AppletControl *control);
+   virtual ~GnomeAppletWindow();
+diff -NrU5 workrave-1.8.5.orig/frontend/gtkmm/src/GtkUtil.cc workrave-1.8.5/frontend/gtkmm/src/GtkUtil.cc
+--- workrave-1.8.5.orig/frontend/gtkmm/src/GtkUtil.cc	2007-09-14 20:50:25.000000000 +0200
++++ workrave-1.8.5/frontend/gtkmm/src/GtkUtil.cc	2008-05-06 20:23:20.000000000 +0200
+@@ -341,17 +341,12 @@
+ {
+   TRACE_ENTER("GtkUtil::center_window");
+ 
+   if (head.valid)
+     {
+-#ifdef HAVE_GTKMM24
+       Gtk::Requisition size;
+       window.size_request(size);
+-#else
+-      GtkRequisition size;
+-      window.size_request(&size);
+-#endif
+ 
+ #ifdef WIN32
+       TRACE_MSG(
+                 head.geometry.get_width() << "x" << head.geometry.get_height() << " +" <<
+                 head.geometry.get_x() << "+" << head.geometry.get_y() << " " <<
+diff -NrU5 workrave-1.8.5.orig/frontend/gtkmm/src/GUI.cc workrave-1.8.5/frontend/gtkmm/src/GUI.cc
+--- workrave-1.8.5.orig/frontend/gtkmm/src/GUI.cc	2007-09-14 20:50:25.000000000 +0200
++++ workrave-1.8.5/frontend/gtkmm/src/GUI.cc	2008-05-06 20:23:20.000000000 +0200
+@@ -673,29 +673,21 @@
+   if (num_screens >= 1)
+     {
+       for (int i = 0; i < num_screens; i++)
+         {
+           Glib::RefPtr<Gdk::Screen> screen = display->get_screen(i);
+-#ifdef HAVE_GTKMM24
+           if (screen)
+-#else
+-            if (!screen.is_null())
+-#endif
+               {
+                 new_num_heads += screen->get_n_monitors();
+                 TRACE_MSG("num monitors on screen " << i << " = " << screen->get_n_monitors());
+               }
+         }
+ 
+       for (int i = 0; i < num_screens; i++)
+         {
+           Glib::RefPtr<Gdk::Screen> screen = display->get_screen(i);
+-#ifdef HAVE_GTKMM24
+           if (screen)
+-#else
+-          if (!screen.is_null())
+-#endif
+               {
+                 TRACE_MSG("num monitors on screen " << i << " = " << screen->get_n_monitors());
+               }
+         }
+ 
+@@ -703,15 +695,11 @@
+ 
+       int count = 0;
+       for (int i = 0; i < num_screens; i++)
+         {
+           Glib::RefPtr<Gdk::Screen> screen = display->get_screen(i);
+-#ifdef HAVE_GTKMM24
+           if (screen)
+-#else
+-          if (!screen.is_null())
+-#endif
+               {
+                 int num_monitors = screen->get_n_monitors();
+                 TRACE_MSG("monitors = " << num_monitors);
+                 for (int j = 0; j < num_monitors && count < new_num_heads; j++)
+                   {
+diff -NrU5 workrave-1.8.5.orig/frontend/gtkmm/src/GUI.hh workrave-1.8.5/frontend/gtkmm/src/GUI.hh
+--- workrave-1.8.5.orig/frontend/gtkmm/src/GUI.hh	2007-09-14 20:50:25.000000000 +0200
++++ workrave-1.8.5/frontend/gtkmm/src/GUI.hh	2008-05-06 20:23:20.000000000 +0200
+@@ -19,11 +19,11 @@
+ #ifndef GUI_HH
+ #define GUI_HH
+ 
+ #include "preinclude.h"
+ 
+-#include <sigc++/object.h>
++#include <sigc++/trackable.h>
+ #include <glibmm.h>
+ 
+ #include <gdk/gdkevents.h>
+ #include <gtkmm/tooltips.h>
+ #include <gdkmm/types.h>
+@@ -63,11 +63,11 @@
+ class IConfigurator;
+ 
+ class GUI :
+   public IApp,
+   public CoreEventListener,
+-  public SigC::Object
++  public sigc::trackable
+ {
+ public:
+   GUI(int argc, char **argv);
+   virtual ~GUI();
+ 
+@@ -102,11 +102,11 @@
+   enum BlockMode { BLOCK_MODE_NONE = 0, BLOCK_MODE_INPUT, BLOCK_MODE_ALL };
+   BlockMode get_block_mode();
+   void set_block_mode(BlockMode mode);
+ 
+   // Misc
+-  SigC::Signal0<void> &signal_heartbeat();
++  sigc::signal0<void> &signal_heartbeat();
+   HeadInfo &get_head(int head);
+   int get_number_of_heads() const;
+   int map_to_head(int &x, int &y);
+   void map_from_head(int &x, int &y, int head);
+   bool bound_head(int &x, int &y, int width, int height, int head);
+@@ -212,11 +212,11 @@
+ 
+   //! Tooptip manager.
+   Gtk::Tooltips *tooltips;
+ 
+   //! Heartbeat signal
+-  SigC::Signal0<void> heartbeat_signal;
++  sigc::signal0<void> heartbeat_signal;
+ 
+   //! Destroy break window on next heartbeat?
+   bool break_window_destroy;
+ 
+   //! Destroy prelude window on next heartbeat?
+@@ -241,11 +241,11 @@
+ #ifdef HAVE_X
+   //! Do we want a keyboard/pointer grab
+   bool grab_wanted;
+ 
+   //! Connection to the grab retry timeout timer.
+-  SigC::Connection grab_retry_connection;
++  sigc::connection grab_retry_connection;
+ #endif
+ 
+   //! Grab
+   WindowHints::Grab *grab_handle;
+ 
+@@ -293,11 +293,11 @@
+ {
+   return sound_player;
+ }
+ 
+ //! Returns the GUI Heartbeat signal.
+-inline SigC::Signal0<void> &
++inline sigc::signal0<void> &
+ GUI::signal_heartbeat()
+ {
+   return heartbeat_signal;
+ }
+ 
+diff -NrU5 workrave-1.8.5.orig/frontend/gtkmm/src/IconListCellRenderer.cc workrave-1.8.5/frontend/gtkmm/src/IconListCellRenderer.cc
+--- workrave-1.8.5.orig/frontend/gtkmm/src/IconListCellRenderer.cc	2007-09-14 20:50:25.000000000 +0200
++++ workrave-1.8.5/frontend/gtkmm/src/IconListCellRenderer.cc	2008-05-06 20:23:20.000000000 +0200
+@@ -107,15 +107,11 @@
+ }
+ 
+ 
+ void
+ IconListCellRenderer::render_vfunc(
+-#ifdef HAVE_GTKMM24
+                                    const Glib::RefPtr<Gdk::Drawable>& window,
+-#else
+-                                   const Glib::RefPtr<Gdk::Window>& window,
+-#endif
+                                    Gtk::Widget& widget,
+                                    const Gdk::Rectangle& bg_area,
+                                    const Gdk::Rectangle& cell_area,
+                                    const Gdk::Rectangle& expose_area,
+                                    Gtk::CellRendererState flags)
+diff -NrU5 workrave-1.8.5.orig/frontend/gtkmm/src/IconListCellRenderer.hh workrave-1.8.5/frontend/gtkmm/src/IconListCellRenderer.hh
+--- workrave-1.8.5.orig/frontend/gtkmm/src/IconListCellRenderer.hh	2007-09-14 20:50:25.000000000 +0200
++++ workrave-1.8.5/frontend/gtkmm/src/IconListCellRenderer.hh	2008-05-06 20:23:20.000000000 +0200
+@@ -45,25 +45,16 @@
+   virtual void get_size_vfunc(Gtk::Widget& widget,
+                               const Gdk::Rectangle *cell_area,
+                               int* x_offset, int* y_offset,
+                               int* width,    int* height);
+ 
+-#ifdef HAVE_GTKMM24
+   virtual void render_vfunc(const Glib::RefPtr<Gdk::Drawable>& window,
+                             Gtk::Widget& widget,
+                             const Gdk::Rectangle& background_area,
+                             const Gdk::Rectangle& cell_area,
+                             const Gdk::Rectangle& expose_area,
+                             Gtk::CellRendererState flags);
+-#else
+-  virtual void render_vfunc(const Glib::RefPtr<Gdk::Window>& window,
+-                            Gtk::Widget& widget,
+-                            const Gdk::Rectangle& background_area,
+-                            const Gdk::Rectangle& cell_area,
+-                            const Gdk::Rectangle& expose_area,
+-                            Gtk::CellRendererState flags);
+-#endif
+ 
+ private:
+   void update_properties();
+ 
+   Gtk::CellRendererPixbuf pixbuf_renderer;
+diff -NrU5 workrave-1.8.5.orig/frontend/gtkmm/src/KdeAppletWindow.cc workrave-1.8.5/frontend/gtkmm/src/KdeAppletWindow.cc
+--- workrave-1.8.5.orig/frontend/gtkmm/src/KdeAppletWindow.cc	2007-09-14 20:50:25.000000000 +0200
++++ workrave-1.8.5/frontend/gtkmm/src/KdeAppletWindow.cc	2008-05-06 20:23:20.000000000 +0200
+@@ -210,17 +210,12 @@
+   TRACE_ENTER("KdeAppletWindow::update");
+   if (applet_active)
+     {
+       timer_box_control->update();
+ 
+-#ifdef HAVE_GTKMM24
+       Gtk::Requisition req;
+       container->size_request(req);
+-#else
+-      GtkRequisition req;
+-      container->size_request(&req);
+-#endif
+ 
+       TRACE_MSG("Size = " << req.width << " " << req.height << " " << applet_orientation);
+       if (req.width != last_size.width || req.height != last_size.height)
+         {
+           last_size = req;
+@@ -288,15 +283,11 @@
+ {
+   TRACE_ENTER("KdeAppletWindow::on_embedded");
+   if (applet_active)
+     {
+       container->set_size_request(-1,-1);
+-#ifdef HAVE_GTKMM24
+       container->size_request(last_size);
+-#else
+-      container->size_request(&last_size);
+-#endif
+ 
+       TRACE_MSG("Size = " << last_size.width << " " << last_size.height << " " << applet_orientation);
+       view->set_geometry(applet_orientation, applet_size);
+ 
+       TRACE_MSG(applet_size);
+diff -NrU5 workrave-1.8.5.orig/frontend/gtkmm/src/KdeAppletWindow.hh workrave-1.8.5/frontend/gtkmm/src/KdeAppletWindow.hh
+--- workrave-1.8.5.orig/frontend/gtkmm/src/KdeAppletWindow.hh	2007-09-14 20:50:25.000000000 +0200
++++ workrave-1.8.5/frontend/gtkmm/src/KdeAppletWindow.hh	2008-05-06 20:23:20.000000000 +0200
+@@ -22,13 +22,11 @@
+ #include "preinclude.h"
+ #include <stdio.h>
+ 
+ #include "AppletWindow.hh"
+ 
+-#ifdef HAVE_GTKMM24
+-#include <sigc++/compatibility.h>
+-#endif
++#include <sigc++/trackable.h>
+ 
+ #include <gtkmm/bin.h>
+ #include <gtkmm/menu.h>
+ #include <gtkmm/plug.h>
+ #include <gtkmm/eventbox.h>
+@@ -36,11 +34,11 @@
+ class TimerBoxControl;
+ class TimerBoxGtkView;
+ class AppletControl;
+ 
+ class KdeAppletWindow :
+-  public SigC::Object,
++  public sigc::trackable,
+   public AppletWindow
+ {
+ public:
+   KdeAppletWindow(AppletControl *control);
+   virtual ~KdeAppletWindow();
+@@ -65,15 +63,11 @@
+   Orientation applet_orientation;
+ 
+   //! Size of the applet
+   int applet_size;
+ 
+-#ifdef HAVE_GTKMM24
+   Gtk::Requisition last_size;
+-#else
+-  GtkRequisition last_size;
+-#endif
+ 
+   //!
+   AppletControl *control;
+ 
+   bool applet_active;
+diff -NrU5 workrave-1.8.5.orig/frontend/gtkmm/src/KdeWorkraveControl.cc workrave-1.8.5/frontend/gtkmm/src/KdeWorkraveControl.cc
+--- workrave-1.8.5.orig/frontend/gtkmm/src/KdeWorkraveControl.cc	2007-09-14 20:50:25.000000000 +0200
++++ workrave-1.8.5/frontend/gtkmm/src/KdeWorkraveControl.cc	2008-05-06 20:23:20.000000000 +0200
+@@ -22,11 +22,11 @@
+ 
+ #include "preinclude.h"
+ 
+ #include <stdio.h>
+ 
+-#include <sigc++/object.h>
++#include <sigc++/trackable.h>
+ 
+ #include "GUI.hh"
+ #include "KdeAppletWindow.hh"
+ #include "AppletControl.hh"
+ 
+diff -NrU5 workrave-1.8.5.orig/frontend/gtkmm/src/KdeWorkraveControl.hh workrave-1.8.5/frontend/gtkmm/src/KdeWorkraveControl.hh
+--- workrave-1.8.5.orig/frontend/gtkmm/src/KdeWorkraveControl.hh	2007-09-14 20:50:25.000000000 +0200
++++ workrave-1.8.5/frontend/gtkmm/src/KdeWorkraveControl.hh	2008-05-06 20:23:20.000000000 +0200
+@@ -21,17 +21,17 @@
+ 
+ #ifdef HAVE_CONFIG_H
+ #include <config.h>
+ #endif
+ 
+-#include <sigc++/object.h>
++#include <sigc++/trackable.h>
+ #include <glibmm.h>
+ #include "kde_applet/kworkravecontroliface.h"
+ 
+ class KWinModule;
+ 
+-class KdeWorkraveControl : public KWorkraveControlIface, public SigC::Object
++class KdeWorkraveControl : public KWorkraveControlIface, public sigc::trackable
+ {
+ public:
+   void fire();
+   static void init();
+ 
+diff -NrU5 workrave-1.8.5.orig/frontend/gtkmm/src/MainWindow.hh workrave-1.8.5/frontend/gtkmm/src/MainWindow.hh
+--- workrave-1.8.5.orig/frontend/gtkmm/src/MainWindow.hh	2007-09-14 20:50:25.000000000 +0200
++++ workrave-1.8.5/frontend/gtkmm/src/MainWindow.hh	2008-05-06 20:23:20.000000000 +0200
+@@ -146,11 +146,11 @@
+                                             WPARAM wParam, LPARAM lParam);
+ 
+   HWND win32_main_hwnd;
+   HINSTANCE win32_hinstance;
+ 
+-  SigC::Connection timeout_connection;
++  sigc::connection timeout_connection;
+ #endif
+ };
+ 
+ 
+ // inline bool
+diff -NrU5 workrave-1.8.5.orig/frontend/gtkmm/src/Menus.cc workrave-1.8.5/frontend/gtkmm/src/Menus.cc
+--- workrave-1.8.5.orig/frontend/gtkmm/src/Menus.cc	2007-09-14 20:50:25.000000000 +0200
++++ workrave-1.8.5/frontend/gtkmm/src/Menus.cc	2008-05-06 20:23:20.000000000 +0200
+@@ -302,15 +302,11 @@
+   // Rest break
+   string rb_icon = Util::complete_directory("timer-rest-break.png", Util::SEARCH_PATH_IMAGES);
+   Gtk::Image *img = manage(new Gtk::Image(rb_icon));
+   menulist.push_back(Gtk::Menu_Helpers::ImageMenuElem
+                      (_("_Rest break"),
+-#ifdef HAVE_GTKMM24
+                       Gtk::AccelKey("<control>r"),
+-#else
+-                      Gtk::Menu::AccelKey("<control>r"),
+-#endif
+                       *img,
+                       MEMBER_SLOT(*this, &Menus::on_menu_restbreak_now)));
+ 
+ #ifdef HAVE_EXERCISES
+   // Exercises
+diff -NrU5 workrave-1.8.5.orig/frontend/gtkmm/src/Menus.hh workrave-1.8.5/frontend/gtkmm/src/Menus.hh
+--- workrave-1.8.5.orig/frontend/gtkmm/src/Menus.hh	2007-09-14 20:50:25.000000000 +0200
++++ workrave-1.8.5/frontend/gtkmm/src/Menus.hh	2008-05-06 20:23:20.000000000 +0200
+@@ -19,13 +19,11 @@
+ #ifndef MENUS_HH
+ #define MENUS_HH
+ 
+ #include "config.h"
+ 
+-#ifdef HAVE_GTKMM24
+-#include <sigc++/compatibility.h>
+-#endif
++#include <sigc++/trackable.h>
+ 
+ #ifdef HAVE_GNOME
+ #include <gnome.h>
+ #endif
+ 
+@@ -43,11 +41,11 @@
+ class TimerBoxAppletView;
+ 
+ #include <gtkmm/checkmenuitem.h>
+ 
+ class Menus :
+-  public SigC::Object
++  public sigc::trackable
+ {
+ public:
+   Menus();
+   ~Menus();
+ 
+diff -NrU5 workrave-1.8.5.orig/frontend/gtkmm/src/preinclude.h workrave-1.8.5/frontend/gtkmm/src/preinclude.h
+--- workrave-1.8.5.orig/frontend/gtkmm/src/preinclude.h	2007-09-14 20:50:25.000000000 +0200
++++ workrave-1.8.5/frontend/gtkmm/src/preinclude.h	2008-05-06 20:23:20.000000000 +0200
+@@ -23,15 +23,11 @@
+ 
+ #ifndef NOMINMAX
+ #define NOMINMAX
+ #endif
+ 
+-#ifdef HAVE_GTKMM24
+ #define MEMBER_SLOT sigc::mem_fun
+-#else
+-#define MEMBER_SLOT SigC::slot
+-#endif
+ 
+ 
+ #undef THREAD_PRIORITY_NORMAL
+ #undef THREAD_PRIORITY_LOW
+ #undef THREAD_PRIORITY_HIGH
+diff -NrU5 workrave-1.8.5.orig/frontend/gtkmm/src/PreludeWindow.hh workrave-1.8.5/frontend/gtkmm/src/PreludeWindow.hh
+--- workrave-1.8.5.orig/frontend/gtkmm/src/PreludeWindow.hh	2007-09-14 20:50:25.000000000 +0200
++++ workrave-1.8.5/frontend/gtkmm/src/PreludeWindow.hh	2008-05-06 20:23:20.000000000 +0200
+@@ -62,11 +62,11 @@
+   void avoid_pointer(int x, int y);
+ 
+ private:
+ #ifdef WIN32
+   //! Avoid time signal
+-  SigC::Connection avoid_signal;
++  sigc::connection avoid_signal;
+ #endif
+ 
+   //! Avoid margin.
+   const int SCREEN_MARGIN;
+ 
+diff -NrU5 workrave-1.8.5.orig/frontend/gtkmm/src/TimeEntry.hh workrave-1.8.5/frontend/gtkmm/src/TimeEntry.hh
+--- workrave-1.8.5.orig/frontend/gtkmm/src/TimeEntry.hh	2007-09-14 20:50:25.000000000 +0200
++++ workrave-1.8.5/frontend/gtkmm/src/TimeEntry.hh	2008-05-06 20:23:20.000000000 +0200
+@@ -36,11 +36,11 @@
+   ~TimeEntry();
+ 
+   time_t get_value();
+   void set_value(time_t time);
+ 
+-  typedef SigC::Signal0<void> signal_value_changed_t;
++  typedef sigc::signal0<void> signal_value_changed_t;
+   signal_value_changed_t &signal_value_changed();
+ 
+ protected:
+   virtual void on_changed();
+   virtual void on_value_changed();
+diff -NrU5 workrave-1.8.5.orig/frontend/gtkmm/src/TimerBoxGtkView.cc workrave-1.8.5/frontend/gtkmm/src/TimerBoxGtkView.cc
+--- workrave-1.8.5.orig/frontend/gtkmm/src/TimerBoxGtkView.cc	2007-09-14 20:50:25.000000000 +0200
++++ workrave-1.8.5/frontend/gtkmm/src/TimerBoxGtkView.cc	2008-05-06 20:23:20.000000000 +0200
+@@ -234,21 +234,14 @@
+     {
+       // Show sheep.
+       rows = 1;
+     }
+ 
+-#ifdef HAVE_GTKMM24
+   Gtk::Requisition label_size;
+   Gtk::Requisition bar_size;
+ 
+   labels[0]->size_request(label_size);
+-#else
+-  GtkRequisition label_size;
+-  GtkRequisition bar_size;
+-
+-  labels[0]->size_request(&label_size);
+-#endif
+ 
+   Gtk::Requisition my_size;
+   size_request(my_size);
+ 
+   for (int i = 0; i < BREAK_ID_SIZEOF; i++)
+diff -NrU5 workrave-1.8.5.orig/frontend/gtkmm/src/X11SystrayAppletWindow.cc workrave-1.8.5/frontend/gtkmm/src/X11SystrayAppletWindow.cc
+--- workrave-1.8.5.orig/frontend/gtkmm/src/X11SystrayAppletWindow.cc	2007-09-14 20:50:25.000000000 +0200
++++ workrave-1.8.5/frontend/gtkmm/src/X11SystrayAppletWindow.cc	2008-05-06 20:23:20.000000000 +0200
+@@ -157,19 +157,13 @@
+       menus->create_menu(Menus::MENU_APPLET);
+ 
+       ret = AppletWindow::APPLET_STATE_VISIBLE;
+       applet_orientation = ORIENTATION_UP;
+ 
+-#ifdef HAVE_GTKMM24
+       Gtk::Requisition req;
+       plug->size_request(req);
+       applet_size = req.height;
+-#else
+-      GtkRequisition req;
+-      plug->size_request(&req);
+-      applet_size = req.height;
+-#endif
+       view->set_geometry(applet_orientation, 24);
+ 
+       applet_active = true;
+       ret = APPLET_STATE_VISIBLE;
+     }
+@@ -235,17 +229,12 @@
+ {
+   TRACE_ENTER("X11SystrayAppletWindow::on_embedded");
+ 
+   if (applet_active)
+     {
+-#ifdef HAVE_GTKMM24
+       Gtk::Requisition req;
+       plug->size_request(req);
+-#else
+-      GtkRequisition req;
+-      plug->size_request(&req);
+-#endif
+ 
+       GtkOrientation o = egg_tray_icon_get_orientation(tray_icon);
+       Orientation orientation;
+ 
+       if (o == GTK_ORIENTATION_VERTICAL)
+diff -NrU5 workrave-1.8.5.orig/frontend/gtkmm/src/X11SystrayAppletWindow.hh workrave-1.8.5/frontend/gtkmm/src/X11SystrayAppletWindow.hh
+--- workrave-1.8.5.orig/frontend/gtkmm/src/X11SystrayAppletWindow.hh	2007-09-14 20:50:25.000000000 +0200
++++ workrave-1.8.5/frontend/gtkmm/src/X11SystrayAppletWindow.hh	2008-05-06 20:23:20.000000000 +0200
+@@ -22,13 +22,11 @@
+ #include "preinclude.h"
+ #include <stdio.h>
+ 
+ #include "AppletWindow.hh"
+ 
+-#ifdef HAVE_GTKMM24
+-#include <sigc++/compatibility.h>
+-#endif
++#include <sigc++/trackable.h>
+ 
+ #include <gtkmm/bin.h>
+ #include <gtkmm/menu.h>
+ #include <gtkmm/plug.h>
+ #include <gtkmm/eventbox.h>
+@@ -38,11 +36,11 @@
+ class AppletControl;
+ 
+ #include "eggtrayicon.h"
+ 
+ class X11SystrayAppletWindow :
+-  public SigC::Object,
++  public sigc::trackable,
+   public AppletWindow
+ {
+ public:
+   X11SystrayAppletWindow(AppletControl *control);
+   virtual ~X11SystrayAppletWindow();
+diff -NrU5 workrave-1.8.5.orig/frontend/plugin/distribution/gtkmm/src/NetworkPreferencePage.cc workrave-1.8.5/frontend/plugin/distribution/gtkmm/src/NetworkPreferencePage.cc
+--- workrave-1.8.5.orig/frontend/plugin/distribution/gtkmm/src/NetworkPreferencePage.cc	2007-09-14 20:50:32.000000000 +0200
++++ workrave-1.8.5/frontend/plugin/distribution/gtkmm/src/NetworkPreferencePage.cc	2008-05-06 20:23:20.000000000 +0200
+@@ -351,18 +351,14 @@
+ NetworkPreferencePage::on_peer_remove()
+ {
+   TRACE_ENTER("NetworkPreferencePage::on_peer_remove");
+   Glib::RefPtr<Gtk::TreeSelection> selection = peers_list->get_selection();
+ 
+-#ifdef HAVE_GTKMM24
+   const Gtk::TreeSelection::SlotForeachIter& slot =
+     sigc::mem_fun(*this, &NetworkPreferencePage::remove_peer);
+ 
+   selection->selected_foreach_iter(slot);
+-#else
+-  selection->selected_foreach(SigC::slot(*this, &NetworkPreferencePage::remove_peer));
+-#endif
+ 
+   Glib::RefPtr<Gtk::ListStore> new_store = Gtk::ListStore::create(peers_columns);
+ 
+   typedef Gtk::TreeModel::Children type_children;
+   type_children children = peers_store->children();
+diff -NrU5 workrave-1.8.5.orig/frontend/plugin/exercises/gtkmm/src/ExercisesPanel.hh workrave-1.8.5/frontend/plugin/exercises/gtkmm/src/ExercisesPanel.hh
+--- workrave-1.8.5.orig/frontend/plugin/exercises/gtkmm/src/ExercisesPanel.hh	2007-09-14 20:50:32.000000000 +0200
++++ workrave-1.8.5/frontend/plugin/exercises/gtkmm/src/ExercisesPanel.hh	2008-05-06 20:23:20.000000000 +0200
+@@ -44,11 +44,11 @@
+ public:
+   ExercisesPanel(Gtk::HButtonBox *dialog_action_area);
+   ~ExercisesPanel();
+ 
+   void set_exercise_count(int num);
+-  SigC::Signal0<void> &signal_stop() { return stop_signal; }
++  sigc::signal0<void> &signal_stop() { return stop_signal; }
+ 
+ protected:
+   void on_realize();
+ 
+ private:
+@@ -86,16 +86,16 @@
+   Gtk::Tooltips *tooltips;
+   Glib::RefPtr<Gtk::SizeGroup> size_group;
+   const std::list<Exercise> exercises;
+   std::list<Exercise>::const_iterator exercise_iterator;
+   std::list<Exercise::Image>::const_iterator image_iterator;
+-  SigC::Connection heartbeat_signal;
++  sigc::connection heartbeat_signal;
+   int exercise_time;
+   int seq_time;
+   bool paused;
+   bool stopped;
+-  SigC::Signal0<void> stop_signal;
++  sigc::signal0<void> stop_signal;
+   bool standalone;
+   int exercise_num;
+   int exercise_count;
+   static int exercises_pointer;
+ };
diff --git a/app-misc/workrave/workrave-1.8.5.ebuild b/app-misc/workrave/workrave-1.8.5.ebuild
new file mode 100644
index 000000000000..a34271228aea
--- /dev/null
+++ b/app-misc/workrave/workrave-1.8.5.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/workrave-1.8.5.ebuild,v 1.1 2008/05/07 23:43:29 eva Exp $
+
+inherit eutils gnome2
+
+DESCRIPTION="Helpful utility to attack Repetitive Strain Injury (RSI)"
+HOMEPAGE="http://workrave.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="arts dbus distribution gnome kde nls xml"
+
+RDEPEND=">=dev-libs/glib-2
+	>=gnome-base/gconf-2
+	>=x11-libs/gtk+-2
+	>=dev-cpp/gtkmm-2.4
+	>=dev-cpp/glibmm-2.4
+	>=dev-libs/libsigc++-2
+	gnome? (
+		>=gnome-base/libgnomeui-2
+		>=dev-cpp/libgnomeuimm-2.6
+		>=gnome-base/gnome-panel-2.0.10
+		>=gnome-base/libbonobo-2
+		>=gnome-base/orbit-2.8.3 )
+	distribution? ( >=net-libs/gnet-2 )
+	dbus? (
+		>=sys-apps/dbus-0.92
+		dev-libs/dbus-glib )
+	xml? ( dev-libs/gdome2 )
+	kde? (
+		=x11-libs/qt-3*
+		=kde-base/kdelibs-3* )
+	arts? ( kde-base/arts )
+
+	x11-libs/libX11
+	x11-libs/libXtst
+	x11-libs/libXt
+	x11-libs/libXmu"
+
+DEPEND="${RDEPEND}
+	x11-proto/xproto
+	x11-proto/inputproto
+	x11-proto/recordproto
+
+	nls? ( sys-devel/gettext )
+	>=dev-util/pkgconfig-0.9"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+DOCS="AUTHORS NEWS README TODO"
+
+pkg_setup() {
+	G2CONF="--enable-gconf
+		$(use_enable dbus)
+		$(use_enable distribution)
+		$(use_enable gnome)
+		$(use_enable gnome gnomemm)
+		$(use_enable kde)
+		$(use_enable nls)
+		$(use_enable xml)
+		$(use_with arts)"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# Removes a few broken macros. See bug #86939.
+	epatch "${FILESDIR}/${PN}-1.8.4-nls_macros.patch"
+
+	# Fix compilation issues, bug #220657
+	epatch "${FILESDIR}/${P}-gcc43.patch"
+	epatch "${FILESDIR}/${P}-libsigc++-2.2.2.patch"
+}
+
+src_compile() {
+	if use kde; then
+		addwrite "/usr/qt/3/etc/settings"
+		export KDEDIR=$(kde-config --prefix)
+		einfo "KDEDIR set to ${KDEDIR}"
+	fi
+
+	gnome2_src_compile
+}