Revision bump fixing bug 316637 and remove old testing

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

13 files changed, 53 insertions, 412 deletions

diff --git a/app-misc/workrave/ChangeLog b/app-misc/workrave/ChangeLog
index 65f4700d333a..1f86df7065ca 100644
--- a/app-misc/workrave/ChangeLog
+++ b/app-misc/workrave/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for app-misc/workrave
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/ChangeLog,v 1.61 2010/03/04 21:39:55 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/ChangeLog,v 1.62 2010/06/16 16:09:15 pacho Exp $
+
+*workrave-1.9.1-r1 (16 Jun 2010)
+
+  16 Jun 2010; Pacho Ramos <pacho@gentoo.org> -workrave-1.9.0.ebuild,
+  -files/workrave-1.9.0-compilation-fixes.patch,
+  -files/workrave-1.9.0-dbus-glib.xml, -files/workrave-1.9.0-gcc43.patch,
+  -files/workrave-1.9.0-gcc44.patch, -files/workrave-1.9.0-gui.xml,
+  -files/workrave-1.9.0-nosoundplayer.patch,
+  -files/workrave-1.9.0-parallel-make.patch,
+  -files/workrave-1.9.0-service.in, -workrave-1.9.1.ebuild,
+  +workrave-1.9.1-r1.ebuild, +files/workrave-1.9.1-nogst-crash.patch:
+  Revision bump to include a patch fixing crashes with USE=-gstreamer on
+  some systems (bug #316637; thanks to Joachim Bartosik, Christian
+  Faulhammer and Rob Caelers). Remove old testing.
 
 *workrave-1.9.1 (04 Mar 2010)
 
diff --git a/app-misc/workrave/Manifest b/app-misc/workrave/Manifest
index 9f56c9d7087a..78c42cfacf47 100644
--- a/app-misc/workrave/Manifest
+++ b/app-misc/workrave/Manifest
@@ -4,26 +4,17 @@ Hash: SHA1
 AUX workrave-1.8.4-nls_macros.patch 1985 RMD160 a9334444d5aef1dd538139ee0ccae16b80dfe239 SHA1 8b64b52ab88201c91e9d77a14551f14c99568128 SHA256 7de293e74864c57a1833701aaaeb46b31ff7467cf6e91a95756eb6ce29530c54
 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
-AUX workrave-1.9.0-compilation-fixes.patch 1095 RMD160 2af461b984ece7b73e825a30f2e42eb850e40e84 SHA1 a400d5c0e489561de2dd0988f3c128f9c9627239 SHA256 e5719ca47ace06cb3468d5c5ceb2206f1218024fb3c654c93f2c32b0f8ea898c
-AUX workrave-1.9.0-dbus-glib.xml 500 RMD160 bf569a817975d5e70110cf3841b0b47eb354a87f SHA1 3bde8a6c1cff93a15949c8b4a444f9b5cd4e44b9 SHA256 fc2465f6731e365085791576e201e4e84668060832d63b29e36d021588d8f070
-AUX workrave-1.9.0-gcc43.patch 1200 RMD160 4a2e94ebf7db7a24e0a8dcfcfa4ea8c3339863aa SHA1 0afe685af31f24b0ccdbd2fa8749d1fb6a6a74f4 SHA256 fc8f0e1160b53c06766986cfbeb2588460cae44467a5b7d5dac8dda7470fba90
-AUX workrave-1.9.0-gcc44.patch 582 RMD160 59b805d8c92bd6e4c5aad962d2b87beee4249c1b SHA1 0aad6e6db45ddf410d04062dc3fef05d0adcf6b1 SHA256 d566669c26dc4319edbe240bd9345511775bf700acb0d93c62a948a46ea27fa4
-AUX workrave-1.9.0-gui.xml 2682 RMD160 10a3529edec1308d50763f9324f7123368e2034b SHA1 89f0b56281104b78e256d0c904236c8e7a868fd6 SHA256 4e1245d5f379a52f7b7aa0cda2da49374dbcd83f6556d4520a971e9b7bfb41f0
-AUX workrave-1.9.0-nosoundplayer.patch 2161 RMD160 7bf47d0d310c7b1f5401e23939fcd7969dfc66df SHA1 3d11721a4a96e5d9cbd5abd2b66646dee88d24a3 SHA256 d61f5d0d7ce8d87af13c460d3449bc41dcd27b47a5729c1cc4e18a707f295b0e
-AUX workrave-1.9.0-parallel-make.patch 1404 RMD160 a45d30bbfcf5b910a6f792a68e1a5dd1dda22985 SHA1 7251471e6d45e4603d95fbd16019a4bfb70d8f52 SHA256 fcc8ad9171b86fc051eb9c785467426c4bc2640423fdae79ba3054c2b0bb4281
-AUX workrave-1.9.0-service.in 84 RMD160 70c6c250a58e48407f818e91e726f6e8f313a7b4 SHA1 ddd63c56530ae44947e849519868c0f494c870cb SHA256 0d6d93cedd6409404d4f4207b55cb744656f139de7361d4383435045a4892caa
+AUX workrave-1.9.1-nogst-crash.patch 581 RMD160 47cb28e0b754e29f4fdef5f4d6b01679ea990033 SHA1 166f906d0246e6ea391343f0fe4ae7488cb5394f SHA256 99df167e289fdd2d6fa8399fa03ac78abb46e3585e6aadc605c424563791eab9
 DIST workrave-1.8.5.tar.gz 1940651 RMD160 306364cbae2a1a4270cbd624864dc111b27ef388 SHA1 d40c3d536f1a37b849fcf8d1e7a6591e043cf19d SHA256 4a2f8f16f015fcec4446953421c8e12cdb41391a6da0e63d04d17b30534a0c56
-DIST workrave-1.9.0.tar.gz 6475352 RMD160 80da62dd8166428ce1236d8424da02fe941113d0 SHA1 5b8e697d33fa472cbe2e330ecf8ec70671ec61ed SHA256 ce110dd0b31c98e6fb34fc0cd63d69843a8e97933b9e75e54f173097c22f59ef
 DIST workrave-1.9.1.tar.gz 6594737 RMD160 1a1215358b0f47a6ab3535caa9aa746dcf071abf SHA1 aaf093bd4dbfaaf661b5ca277a01e915d3a33cfb SHA256 5c23af4b36fc6dd27b0f1b58373868d925fb91ec9ff40b7c7bbcec52a1b28ab9
 EBUILD workrave-1.8.5.ebuild 1975 RMD160 85cf144b9a2fc8819cccf71b34b5a0e42f7d1ce1 SHA1 a00880c0e5375bf48e9535c90c9aa673d502430a SHA256 50c59697ad81a3446d18783453deb2ca42859a168ec235e8b2309f3947b2af9c
-EBUILD workrave-1.9.0.ebuild 2372 RMD160 ae4e77a8ebd48e2ec1e8aaef4abd9b685873b1ff SHA1 de76443a5955c2707fbc8e69f7180dd10830bac1 SHA256 f3af21cd1e02ea97392d96b3337aa5969aec6831af3fc66b37e315a386e735ba
-EBUILD workrave-1.9.1.ebuild 1760 RMD160 47dc8ba4f0be0bbfb2ef7fe28a2b443b18a62cec SHA1 6bf332b7217f0451224114a3d967953807629aeb SHA256 3cc2396957f4f9c4df293804bbbb303cf5426749eba4253cece828a5177bfb36
-MISC ChangeLog 9476 RMD160 b818659a75d0120d71ae1b8674ba46f1f0746fa5 SHA1 04764f024901c63dab0606f7d6c98ee28e60c3e0 SHA256 0fd01e02898848db4ecf8f4f39d2a3642d7dba2341cfb09e454ec80cf4cfcef1
+EBUILD workrave-1.9.1-r1.ebuild 1877 RMD160 ebcc8f6e68467f396d20bcf2d30ee9674013abc1 SHA1 dc80570314e6eb61c7117e9cf5014266291a19f0 SHA256 5dcc8f55bd0b4a4fc229cab31b13d885e53738055de0887bd24537f3017a4dec
+MISC ChangeLog 10185 RMD160 9bfa272fcffe7d39e54576b7c55dc33139a76773 SHA1 8f3258efacacffdf2486cfbced1c0ad4287ce659 SHA256 a786ce06ca816a0238352ea0fed0a538a7b97676a6cc6b3f43248d29e5a854b5
 MISC metadata.xml 520 RMD160 36e3d789618562107f56faf8171d4c3adcd362ea SHA1 2a3ef0c57f60f739323f6422d9ebc443ed5514b6 SHA256 f614aee5f506fa3a49b3a4e9e8a20940c1b9795eca18c6d444b26048aa1c6fbc
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkuQKLcACgkQ1fmVwcYIWAbjZwCZAbeff7TzAvId83nxA53JDtlr
-j6gAoOgaAfEXsQFaeKL3KsDF0rGiwp4r
-=b9Sa
+iEYEARECAAYFAkwY9zEACgkQCaWpQKGI+9TpvgCeMba4sgvbsGkgUWjAMd5+H4FB
+q3cAnAzPQns6+g6MG05xBEQC/AI9c15p
+=8fzv
 -----END PGP SIGNATURE-----
diff --git a/app-misc/workrave/files/workrave-1.9.0-compilation-fixes.patch b/app-misc/workrave/files/workrave-1.9.0-compilation-fixes.patch
deleted file mode 100644
index 04ebafec4437..000000000000
--- a/app-misc/workrave/files/workrave-1.9.0-compilation-fixes.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Index: frontend/gtkmm/src/Menus.cc
-===================================================================
---- frontend/gtkmm/src/Menus.cc	(révision 1650)
-+++ frontend/gtkmm/src/Menus.cc	(copie de travail)
-@@ -461,7 +461,7 @@
- #endif
- }
- 
--
-+#ifdef HAVE_DISTRIBUTION
- void
- Menus::on_network_log_response(int response)
- {
-@@ -476,6 +476,7 @@
-   // done by gtkmm ??? delete network_log_dialog;
-   network_log_dialog = NULL;
- }
-+#endif
- 
- void
- Menus::on_statistics_response(int response)
-@@ -534,7 +535,11 @@
-       on_menu_network_leave();
-       break;
-     case MENU_COMMAND_NETWORK_LOG:
-+#ifdef HAVE_DISTRIBUTION
-       on_menu_network_log(network_log_dialog == NULL);
-+#else
-+      on_menu_network_log(true);
-+#endif
-       break;
-     case MENU_COMMAND_NETWORK_RECONNECT:
-       on_menu_network_reconnect();
-@@ -565,7 +570,12 @@
-           ICore *core = CoreFactory::get_core();
- 
-           menus[i]->resync(core->get_operation_mode(),
-+#ifdef HAVE_DISTRIBUTION
-                            network_log_dialog != NULL);
-+#else
-+                           false);
-+#endif
-+
-         }
-     }
- 
diff --git a/app-misc/workrave/files/workrave-1.9.0-dbus-glib.xml b/app-misc/workrave/files/workrave-1.9.0-dbus-glib.xml
deleted file mode 100644
index c1149888147a..000000000000
--- a/app-misc/workrave/files/workrave-1.9.0-dbus-glib.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<node name="/org/workrave/Workrave">
-
-#for interface in $model.interfaces
-  <interface name="$interface.name">
-
-#for method in $interface.methods
-    <method name="$method.qname">
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" 
-                  value="$method.csymbol"/>
-     #for p in method.params
-     <arg type="$p.sig()" name="$p.name" direction="$p.direction" />
-     #end for
-    </method>
-#end for
-  
-  </interface>
-
-#end for
-
-</node>
-
-  
diff --git a/app-misc/workrave/files/workrave-1.9.0-gcc43.patch b/app-misc/workrave/files/workrave-1.9.0-gcc43.patch
deleted file mode 100644
index af4783803ae5..000000000000
--- a/app-misc/workrave/files/workrave-1.9.0-gcc43.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: frontend/gtkmm/src/GnomeAppletWindow.cc
-===================================================================
---- frontend/gtkmm/src/GnomeAppletWindow.cc	(révision 1650)
-+++ frontend/gtkmm/src/GnomeAppletWindow.cc	(copie de travail)
-@@ -19,6 +19,8 @@
- 
- static const char rcsid[] = "$Id: workrave-1.9.0-gcc43.patch,v 1.1 2008/11/22 14:50:49 eva Exp $";
- 
-+using namespace std;
-+
- #include "preinclude.h"
- 
- #ifdef HAVE_CONFIG_H
-@@ -111,10 +113,14 @@
-               applet_orientation =  (Orientation) applet_control->GetOrientation();
- 
- #ifndef HAVE_EXERCISES
--              applet_control->SetMenuActive("/commands/Exercises", false);
-+              const std::string exercices_command("/commands/Exercises");
-+	      bool exercices_command_status(false);
-+              applet_control->SetMenuActive(exercices_command, exercices_command_status);
- #endif
- #ifndef HAVE_DISTRIBUTION
--              applet_control->SetMenuActive("/commands/Network", false);
-+              const std::string network_command("/commands/Network");
-+	      bool network_command_status(false);
-+              applet_control->SetMenuActive(network_command, network_command_status);
- #endif
-             }
-         }
diff --git a/app-misc/workrave/files/workrave-1.9.0-gcc44.patch b/app-misc/workrave/files/workrave-1.9.0-gcc44.patch
deleted file mode 100644
index f9f6deca2161..000000000000
--- a/app-misc/workrave/files/workrave-1.9.0-gcc44.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up workrave-1.9.0/backend/src/GlibIniConfigurator.cc.gcc44 workrave-1.9.0/backend/src/GlibIniConfigurator.cc
---- workrave-1.9.0/backend/src/GlibIniConfigurator.cc.gcc44	2008-03-07 22:38:26.000000000 +0100
-+++ workrave-1.9.0/backend/src/GlibIniConfigurator.cc	2009-02-25 23:40:01.000000000 +0100
-@@ -248,7 +248,7 @@ void
- GlibIniConfigurator::split_key(const string &key, string &group, string &out_key) const
- {
-   const char *s = key.c_str();
--  char *slash = strchr(s, '/');
-+  const char *slash = strchr(s, '/');
-   if (slash)
-     {
-       group = key.substr(0, slash-s);
diff --git a/app-misc/workrave/files/workrave-1.9.0-gui.xml b/app-misc/workrave/files/workrave-1.9.0-gui.xml
deleted file mode 100644
index 585657922b51..000000000000
--- a/app-misc/workrave/files/workrave-1.9.0-gui.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<unit name="DBusGUI">
-
-  <interface name="org.workrave.ControlInterface" csymbol="Menus">
-    <import>
-      <include name="Menus.hh"/>
-    </import>
-
-    <method name="OpenMain"              csymbol="on_menu_open_main_window"/>
-    <method name="Preferences"           csymbol="on_menu_preferences"/>
-    <method name="NetworkConnect"        csymbol="on_menu_network_join"/>
-    <method name="NetworkLog"            csymbol="on_menu_network_log">
-      <arg type="bool" name="show" direction="in"/>
-    </method>
-    <method name="NetworkReconnect"      csymbol="on_menu_network_reconnect"/>
-    <method name="NetworkDisconnect"     csymbol="on_menu_network_leave"/>
-    <method name="Statistics"            csymbol="on_menu_statistics"/>
-    <method name="Exercises"             csymbol="on_menu_exercises"
- 	                                 condition="defined(HAVE_EXERCISES)"/>
-    <method name="RestBreak"             csymbol="on_menu_restbreak_now"/>
-    <method name="Quit"                  csymbol="on_menu_quit"/>
-    <method name="About"                 csymbol="on_menu_about"/>
-  </interface>
-
-  <interface name="org.workrave.GnomeAppletSupportInterface" csymbol="GnomeAppletWindow"
-             condition="defined(HAVE_GNOME)">
-    <import>
-      <include name="gdk/gdkcolor.h"/>
-      <include name="GnomeAppletWindow.hh"/>
-      <include name="Orientation.hh"/>
-    </import>
-
-    <struct name="Color" csymbol="GdkColor">
-      <field type="uint32" name="pixel"/>
-      <field type="uint32" name="red"/>
-      <field type="uint32" name="green"/>
-      <field type="uint32" name="blue"/>
-    </struct>
-
-    <enum name="Orientation" csymbol="Orientation">
-      <value name="up"    csymbol="ORIENTATION_UP"/>
-      <value name="right" csymbol="ORIENTATION_RIGHT"/>
-      <value name="down"  csymbol="ORIENTATION_DOWN"/>
-      <value name="left"  csymbol="ORIENTATION_LEFT"/>
-    </enum>
-
-    <method name="SetOrientation" csymbol="set_applet_orientation">
-      <arg type="Orientation" name="orientation" direction="in"/>
-    </method>
-      
-    <method name="SetSize" csymbol="set_applet_size">
-      <arg type="uint32" name="size" direction="in"/>
-    </method>
-      
-    <method name="SetBackground" csymbol="set_applet_background">
-      <arg type="uint32" name="type" direction="in"/>
-      <arg type="Color" name="color" direction="in"/>
-      <arg type="uint32" name="xid" direction="in"/>
-    </method>
-
-    <method name="ButtonClicked" csymbol="button_clicked">
-      <arg type="uint32" name="button" direction="in"/>
-    </method>
-
-    <method name="EmbedRequest" csymbol="fire_gnome_applet"/>
-  </interface>
-</unit>
diff --git a/app-misc/workrave/files/workrave-1.9.0-nosoundplayer.patch b/app-misc/workrave/files/workrave-1.9.0-nosoundplayer.patch
deleted file mode 100644
index 40fdf28b1a2c..000000000000
--- a/app-misc/workrave/files/workrave-1.9.0-nosoundplayer.patch
+++ /dev/null
@@ -1,86 +0,0 @@
----
- frontend/common/src/SoundPlayer.cc |   43 +++++++++++++++++++------------------
- 1 file changed, 23 insertions(+), 20 deletions(-)
-
-Index: b/frontend/common/src/SoundPlayer.cc
-===================================================================
---- a/frontend/common/src/SoundPlayer.cc
-+++ b/frontend/common/src/SoundPlayer.cc
-@@ -26,37 +26,40 @@ static const char rcsid[] = "$Id: SoundP
- #include "debug.hh"
- #include "nls.h"
- 
-+#ifdef HAVE_REALPATH
-+#include <limits.h>
-+#include <stdlib.h>
-+#endif
-+
- #include <list>
- 
--#include "SoundPlayer.hh"
- #include "Thread.hh"
-+
- #include "Sound.hh"
-+#include "SoundPlayer.hh"
-+#include "ISoundDriver.hh"
- 
- #include "IConfigurator.hh"
- #include "CoreFactory.hh"
- #include "Util.hh"
- 
--#ifdef HAVE_GNOME
-+#if defined HAVE_GNOME
- #include <gdk/gdk.h>
- #include "GnomeSoundPlayer.hh"
--#endif
--#ifdef HAVE_KDE
-+#elif defined HAVE_KDE
- #include "KdeSoundPlayer.hh"
--#endif
--#ifdef PLATFORM_OS_UNIX
-+#elif defined PLATFORM_OS_UNIX
- #include <X11/Xlib.h>
--#endif
--#ifdef PLATFORM_OS_WIN32
-+#elif defined PLATFORM_OS_WIN32
- #include <windows.h>
- #include "W32SoundPlayer.hh"
--#endif
--#ifdef PLATFORM_OS_OSX
-+#elif defined PLATFORM_OS_OSX
- #include "OSXSoundPlayer.hh"
--#endif
--#ifdef HAVE_GSTREAMER
-+#elif defined HAVE_GSTREAMER
- #include "GstSoundPlayer.hh"
- #endif
- 
-+
- const char *SoundPlayer::CFG_KEY_SOUND_ENABLED = "sound/enabled";
- const char *SoundPlayer::CFG_KEY_SOUND_DEVICE = "sound/device";
- const char *SoundPlayer::CFG_KEY_SOUND_VOLUME = "sound/volume";
-@@ -296,16 +299,16 @@ SpeakerPlayer::run()
- SoundPlayer::SoundPlayer()
- {
-   driver =
--#if defined(PLATFORM_OS_WIN32)
--     new W32SoundPlayer()
--#elif defined(HAVE_KDE)
--     new KdeSoundPlayer()
--#elif defined(HAVE_GSTREAMER)
--     new GstSoundPlayer()
--#elif defined(HAVE_GNOME)
-+#if defined HAVE_GNOME
-      new GnomeSoundPlayer()
--#elif defined(PLATFORM_OS_OSX)
-+#elif defined HAVE_KDE
-+     new KdeSoundPlayer()
-+#elif defined PLATFORM_OS_WIN32
-+     new W32SoundPlayer()
-+#elif defined PLATFORM_OS_OSX
-      new OSXSoundPlayer()
-+#elif defined HAVE_GSTREAMER
-+     new GstSoundPlayer()
- #else
- #  warning Sound card support disabled.
-      NULL
diff --git a/app-misc/workrave/files/workrave-1.9.0-parallel-make.patch b/app-misc/workrave/files/workrave-1.9.0-parallel-make.patch
deleted file mode 100644
index 97b4320c9d92..000000000000
--- a/app-misc/workrave/files/workrave-1.9.0-parallel-make.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Index: frontend/gtkmm/src/Makefile.am
-===================================================================
---- frontend/gtkmm/src/Makefile.am	(révision 1650)
-+++ frontend/gtkmm/src/Makefile.am	(copie de travail)
-@@ -119,7 +119,7 @@
- 
- includesinput = 	-I$(top_srcdir)/common/win32/harpoon/include
- WIN32LIBS = 		-L$(top_builddir)/common/win32/harpoon/src/Release/ -lharpoon \
--			${top_srcdir}/frontend/gtkmm/src/win32/libworkrave-frontend-gtkmm-win32.la \
-+			$(top_builddir)/frontend/gtkmm/src/win32/libworkrave-frontend-gtkmm-win32.la \
- 			-lshell32 -lole32 -lwinmm -lshlwapi
- endif
- 
-@@ -130,7 +130,7 @@
- if PLATFORM_OS_OSX
- includesosx  = 		-I$(top_srcdir)/frontend/gtkmm/src/osx
- ldflags =	 	-L$(top_builddir)/frontend/gtkmm/src/osx
--OSXLIBS	=		${top_srcdir}/frontend/gtkmm/src/osx/libworkrave-frontend-gtkmm-osx.la
-+OSXLIBS	=		$(top_builddir)/frontend/gtkmm/src/osx/libworkrave-frontend-gtkmm-osx.la
- extrasources +=		
- endif
- 
-@@ -277,9 +277,9 @@
- 
- endif
- 
--$(bin_PROGRAMS):	${top_srcdir}/backend/src/libworkrave-backend.la \
--			${top_srcdir}/common/src/libworkrave-common.la \
--			${top_srcdir}/frontend/common/src/libworkrave-frontend-common.la
-+$(bin_PROGRAMS):	$(top_builddir)/backend/src/libworkrave-backend.la \
-+			$(top_builddir)/common/src/libworkrave-common.la \
-+			$(top_builddir)/frontend/common/src/libworkrave-frontend-common.la
- 
- workrave_LDFLAGS = 	@WR_LDFLAGS@ ${ldflags}
- 
diff --git a/app-misc/workrave/files/workrave-1.9.0-service.in b/app-misc/workrave/files/workrave-1.9.0-service.in
deleted file mode 100644
index 9a32690e8e2e..000000000000
--- a/app-misc/workrave/files/workrave-1.9.0-service.in
+++ /dev/null
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=org.workrave.Workrave.Activator
-Exec=@workravebindir@/workrave
diff --git a/app-misc/workrave/files/workrave-1.9.1-nogst-crash.patch b/app-misc/workrave/files/workrave-1.9.1-nogst-crash.patch
new file mode 100644
index 000000000000..95fc690dc1a0
--- /dev/null
+++ b/app-misc/workrave/files/workrave-1.9.1-nogst-crash.patch
@@ -0,0 +1,27 @@
+--- frontend/common/src/SoundPlayer.cc.orig	2010-06-16 10:49:11.000000000 +0200
++++ frontend/common/src/SoundPlayer.cc	2010-06-16 10:54:04.000000000 +0200
+@@ -334,8 +334,11 @@
+ void
+ SoundPlayer::init()
+ {
+-  driver->init();
+-  register_sound_events();
++  if (driver != NULL)
++  {
++    driver->init();
++    register_sound_events();
++  }
+ }
+ 
+ void
+@@ -405,6 +408,10 @@
+ void
+ SoundPlayer::sync_settings()
+ {
++  if (driver == NULL)
++    {
++      return;
++    }
+   if (driver != NULL)
+     {
+       for (unsigned int i = 0; i < sizeof(sound_registry)/sizeof(sound_registry[0]); i++)
diff --git a/app-misc/workrave/workrave-1.9.0.ebuild b/app-misc/workrave/workrave-1.9.0.ebuild
deleted file mode 100644
index de02b3240c38..000000000000
--- a/app-misc/workrave/workrave-1.9.0.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/workrave-1.9.0.ebuild,v 1.5 2009/11/20 17:04:13 ssuominen Exp $
-
-inherit autotools 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="dbus distribution gnome nls xml"
-
-RDEPEND=">=dev-libs/glib-2
-	>=gnome-base/gconf-2
-	>=x11-libs/gtk+-2.6
-	>=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-1.0
-		dev-libs/dbus-glib )
-	xml? ( dev-libs/gdome2 )
-	x11-libs/libX11
-	x11-libs/libXtst
-	x11-libs/libXt
-	x11-libs/libXmu"
-
-DEPEND="${RDEPEND}
-	x11-proto/xproto
-	x11-proto/inputproto
-	x11-proto/recordproto
-	dev-python/cheetah
-	nls? ( sys-devel/gettext )
-	>=dev-util/pkgconfig-0.9"
-# Currently freezes workrave
-#	gstreamer? (
-#		>=media-libs/gstreamer-0.10 )
-
-DOCS="AUTHORS NEWS README TODO"
-
-pkg_setup() {
-	G2CONF="--enable-gconf
-		--disable-gstreamer
-		$(use_enable dbus)
-		$(use_enable distribution)
-		$(use_enable gnome)
-		$(use_enable gnome gnomemm)
-		--disable-kde
-		$(use_enable nls)
-		$(use_enable xml)
-		--without-arts"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# Fix intltool tests
-	echo "frontend/gtkmm/src/gnome_applet/Workrave-Applet.server.in" >> po/POTFILES.skip
-	echo "intl/plural.c" >> po/POTFILES.skip
-
-	# Copy files missing from tarball
-	cp "${FILESDIR}/${P}-gui.xml" "${S}/frontend/gtkmm/src/workrave-gui.xml"
-	cp "${FILESDIR}/${P}-dbus-glib.xml" "${S}/common/bin/DBus-glib.xml"
-	cp "${FILESDIR}/${P}-service.in" "${S}/frontend/gtkmm/src/org.workrave.Workrave.service.in"
-
-	# Fix compilation with gcc-4
-	epatch "${FILESDIR}/${P}-gcc43.patch"
-	epatch "${FILESDIR}/${P}-gcc44.patch"
-
-	# Fix compilation with USE="-distribution"
-	epatch "${FILESDIR}/${P}-compilation-fixes.patch"
-
-	# Fix parallel make issues ?
-	epatch "${FILESDIR}/${P}-parallel-make.patch"
-
-	# Fix compilation with no sound framework enabled, bug #249683
-	epatch "${FILESDIR}/${P}-nosoundplayer.patch"
-
-	eautoreconf
-}
diff --git a/app-misc/workrave/workrave-1.9.1.ebuild b/app-misc/workrave/workrave-1.9.1-r1.ebuild
index 74656f0b6aa5..34ae063ed4e7 100644
--- a/app-misc/workrave/workrave-1.9.1.ebuild
+++ b/app-misc/workrave/workrave-1.9.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/workrave-1.9.1.ebuild,v 1.1 2010/03/04 21:39:55 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/workrave-1.9.1-r1.ebuild,v 1.1 2010/06/16 16:09:15 pacho Exp $
 
 EAPI="2"
 
@@ -73,4 +73,7 @@ src_prepare() {
 
 	# Fix intltool tests
 	echo "frontend/gtkmm/src/gnome_applet/Workrave-Applet.server.in" >> po/POTFILES.skip
+
+	# Fix crash when building without gstreamer support; bug #316637
+	epatch "${FILESDIR}/${P}-nogst-crash.patch"
 }