From 3fa0f3d96ae79c780192af658269da0167953492 Mon Sep 17 00:00:00 2001
From: Julian Ospald <hasufell@posteo.de>
Date: Sun, 28 Feb 2016 23:17:49 +0100
Subject: [PATCH] app-ergonomics/workrave: cleanup, rm obsolete patch

---
 .../workrave-1.10.6-automagic-gstreamer.patch | 25 --------------
 .../workrave/workrave-1.10.8.exheres-0        | 34 ++++++++-----------
 2 files changed, 15 insertions(+), 44 deletions(-)
 delete mode 100644 packages/app-ergonomics/workrave/files/workrave-1.10.6-automagic-gstreamer.patch

diff --git a/packages/app-ergonomics/workrave/files/workrave-1.10.6-automagic-gstreamer.patch b/packages/app-ergonomics/workrave/files/workrave-1.10.6-automagic-gstreamer.patch
deleted file mode 100644
index 4150f466..00000000
--- a/packages/app-ergonomics/workrave/files/workrave-1.10.6-automagic-gstreamer.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-# http://issues.workrave.org/show_bug.cgi?id=1179
-
---- configure.ac
-+++ configure.ac
-@@ -884,20 +884,12 @@
- if test "x$enable_gstreamer" != "xno";
- then
-     PKG_CHECK_MODULES([GSTREAMER],
--                      [gstreamer-0.10],
--                      [config_gstreamer=yes
--                       AC_DEFINE(HAVE_GSTREAMER, 1, [Use GStreamer for playing sounds])], [ ])
--		     
--    if test "x$config_gstreamer" != "xyes";
--    then
--        PKG_CHECK_MODULES([GSTREAMER],
-                       [gstreamer-1.0],
-                       [config_gstreamer=yes
-                        AC_DEFINE(HAVE_GSTREAMER, 1, [Use GStreamer for playing sounds])],
-                          [if test "x$enable_gstreamer" = "xyes"; then
-                            AC_MSG_ERROR([GStreamer development headers not found.])
-                        fi])
--    fi
- fi
- 
- 
diff --git a/packages/app-ergonomics/workrave/workrave-1.10.8.exheres-0 b/packages/app-ergonomics/workrave/workrave-1.10.8.exheres-0
index e6bc51fd..709d4e87 100644
--- a/packages/app-ergonomics/workrave/workrave-1.10.8.exheres-0
+++ b/packages/app-ergonomics/workrave/workrave-1.10.8.exheres-0
@@ -27,45 +27,41 @@ MYOPTIONS="
 "
 
 DEPENDENCIES="
+    build:
+        dev-python/Cheetah
+        dev-util/intltool
+        sys-devel/autoconf-archive
+        sys-devel/gettext
+        virtual/pkg-config
+        x11-proto/inputproto
+        x11-proto/recordproto
+        x11-proto/xproto
     build+run:
-        dev-libs/glib:2
         dev-cpp/libsigc++:2
-        gnome-desktop/gobject-introspection:=
-        gnome-bindings/gtkmm:3
+        dev-libs/glib:2
         gnome-bindings/glibmm:2.4
+        gnome-bindings/gtkmm:3
+        gnome-desktop/gobject-introspection:=
         media-libs/gstreamer:1.0[gobject-introspection]
         media-plugins/gst-plugins-base:1.0[gobject-introspection]
         media-plugins/gst-plugins-good:1.0
         x11-libs/gtk+:3[gobject-introspection]
-        x11-libs/libXScrnSaver
         x11-libs/libSM
         x11-libs/libX11
-        x11-libs/libXtst
-        x11-libs/libXt
+        x11-libs/libXScrnSaver
         x11-libs/libXmu
+        x11-libs/libXt
+        x11-libs/libXtst
         gnome? ( gnome-base/gnome-shell )
         pulseaudio? ( media-sound/pulseaudio )
         xfce? (
             x11-libs/gtk+:2[introspection?]
             xfce-base/xfce4-panel
         )
-    build:
-        dev-util/intltool
-        dev-python/Cheetah
-        x11-proto/xproto
-        x11-proto/inputproto
-        x11-proto/recordproto
-        virtual/pkg-config
-        sys-devel/autoconf-archive
-        sys-devel/gettext
 "
 
 WORK=${WORKBASE}/${PN}-${PV//./_}
 
-DEFAULT_SRC_PREPARE_PATCHES=(
-    -p0 "${FILES}"/${PN}-1.10.6-automagic-gstreamer.patch
-)
-
 DEFAULT_SRC_CONFIGURE_PARAMS=(
     --disable-dbus
     --disable-distribution