audacious patch updated and eerror added to check if audacious is built with dbus support, fixes bugs #199620 (thanks to Sascha Hlusiak <bugs at saschahlusiak dot de>) and #212016 (thanks to Federico Moro <zayer at frikis dot org>).

Package-Manager: portage-2.1.4.4

4 files changed, 33 insertions, 378 deletions

diff --git a/x11-plugins/gkrellmms/ChangeLog b/x11-plugins/gkrellmms/ChangeLog
index a40044b3ba4e..517a993afbc5 100644
--- a/x11-plugins/gkrellmms/ChangeLog
+++ b/x11-plugins/gkrellmms/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-plugins/gkrellmms
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellmms/ChangeLog,v 1.53 2007/02/05 15:54:39 gustavoz Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellmms/ChangeLog,v 1.54 2008/03/01 23:09:57 coldwind Exp $
+
+  01 Mar 2008; Santiago M. Mola <coldwind@gentoo.org>
+  -files/gkrellmms-2.1.22-audacious.patch, gkrellmms-2.1.22-r1.ebuild:
+  audacious patch updated and eerror added to check if audacious is built with
+  dbus support, fixes bugs #199620 (thanks to Sascha Hlusiak <bugs at
+  saschahlusiak dot de>) and #212016 (thanks to Federico Moro <zayer at frikis
+  dot org>).
 
   05 Feb 2007; Gustavo Zacarias <gustavoz@gentoo.org>
   gkrellmms-2.1.22-r1.ebuild:
diff --git a/x11-plugins/gkrellmms/Manifest b/x11-plugins/gkrellmms/Manifest
index 9d000134468b..b3e85f6222e7 100644
--- a/x11-plugins/gkrellmms/Manifest
+++ b/x11-plugins/gkrellmms/Manifest
@@ -1,6 +1,6 @@
-AUX gkrellmms-2.1.22-audacious.patch 15275 RMD160 814efb3a674f05fea1ee3999ef2aa7461c31e366 SHA1 6f95b9e9e41725ba969849532441105c421ba8ac SHA256 93b037b0b5a1a2275f8d89ef2f0d944810d603945b3092cf21edafdb6ffc8617
 AUX gkrellmms-2.1.22-ldflags.patch 342 RMD160 c1c5e77ce9345c31bb80c610afced7b610dfce57 SHA1 36d923e14535ef598317b97b57c47b9a1b458f95 SHA256 6a417081ba7129f2a022aa43da193f30125edcf0ec0627d56d821342c560405e
+DIST gkrellmms-2.1.22-audacious.patch.gz 8274 RMD160 27a4d87dd6c462fef67d776b416531678456ddfd SHA1 c28afd6f84ea2c95d8b9b8b89bbf1961b22f2d73 SHA256 9a436be0064dbc13ca1213466638521934a987c6c75f228c85e09a184767adef
 DIST gkrellmms-2.1.22.tar.gz 46903 RMD160 9e7791c9922d319f523e9460b365cb5c4468fcdc SHA1 f7ea788e4420cf714f9ab49025b1d172c4a37304 SHA256 cd84d6678740374567b01b69a095fc99ec7a96e10d7315c4416a8de590770e7f
-EBUILD gkrellmms-2.1.22-r1.ebuild 903 RMD160 10138bbec33a02b2b8dd67f548eb5a17b9041de1 SHA1 8b60a34b68b5b463dd03078c457e74fb05cb0bda SHA256 4886179434b36871fea8ba306903906420b872e488ae9d5b74fe28f423303b05
-MISC ChangeLog 7418 RMD160 e10557018babe1d15833c86edfaa377acbb04509 SHA1 2a5534f6f55ae5b103b78df09763b808fd12e22f SHA256 d13562068e18b51f95a26743f91763ce5264072d65d40b608dd5b1dd6b0e2929
+EBUILD gkrellmms-2.1.22-r1.ebuild 1306 RMD160 111f228078779f1802c9a82a382467cc2a9a1698 SHA1 a0ade3b15ac513c82a3a05b50930f87d6b7006c4 SHA256 29b0d7c4664283530424a56b4224cff4ec2f90586a0e76c564d614b4cdbb23b1
+MISC ChangeLog 7785 RMD160 b07c5a8380a3a5f80f4083a02ad566339165caec SHA1 cc94b88a378c4bae944c7b9a1fbe455d553b9ff7 SHA256 3d1e2f45421e8b3568476a81b24b16b5ccb1ef2010ce4d1738e2985f3fe244b9
 MISC metadata.xml 222 RMD160 c0fe8198bb72a6bed198a1dd7005ed607711db2a SHA1 a3b2631fffe918fa2b814a269297dfc9e6c355cb SHA256 35319607d0186f4c2b026c636392c56bafa68c71a17a67364e5c530156eb22b4
diff --git a/x11-plugins/gkrellmms/files/gkrellmms-2.1.22-audacious.patch b/x11-plugins/gkrellmms/files/gkrellmms-2.1.22-audacious.patch
deleted file mode 100644
index e7a4a6c55a59..000000000000
--- a/x11-plugins/gkrellmms/files/gkrellmms-2.1.22-audacious.patch
+++ /dev/null
@@ -1,367 +0,0 @@
-diff -aur ../gkrellmms/Makefile ./Makefile
---- ../gkrellmms/Makefile	2005-01-21 18:02:17.000000000 +0100
-+++ ./Makefile	2006-10-24 23:05:48.000000000 +0200
-@@ -12,9 +12,14 @@
-    XMMS_INCLUDE ?= `pkg-config bmp --cflags`
-    XMMS_LIB ?= `pkg-config bmp --libs`
- else
-+ifdef USE_AUDACIOUS
-+    XMMS_INCLUDE ?= `pkg-config audacious --cflags`
-+    XMMS_LIB ?= `pkg-config audacious --libs`
-+else
-    XMMS_INCLUDE ?= `xmms-config --cflags`
-    XMMS_LIB ?= `xmms-config --libs`
- endif
-+endif
- 
- PLUGIN_DIR ?= /usr/local/lib/gkrellm2/plugins
- 
-@@ -25,6 +30,9 @@
- ifdef USE_BMP
-    FLAGS += -DUSE_BMP
- endif
-+ifdef USE_AUDACIOUS
-+   FLAGS += -DUSE_AUDACIOUS
-+endif
- 
- LOCALEDIR ?= /usr/share/locale
- ifeq ($(enable_nls),1)
-diff -aur ../gkrellmms/gkrellmms.c ./gkrellmms.c
---- ../gkrellmms/gkrellmms.c	2005-01-21 18:02:17.000000000 +0100
-+++ ./gkrellmms.c	2006-10-24 23:49:58.000000000 +0200
-@@ -860,7 +860,13 @@
- 
-     if (scrolling_tooltip == NULL) {
- 		scrolling_tooltip = gtk_tooltips_new();
-+#ifdef USE_AUDACIOUS
-+		scrolling_tooltip_text = g_strdup("audacious");
-+#elif USE_BMP
-+		scrolling_tooltip_text = g_strdup("bmp");
-+#else
- 		scrolling_tooltip_text = g_strdup("xmms");
-+#endif
- 		gtk_tooltips_set_tip(scrolling_tooltip, scroll_panel->drawing_area,
- 					scrolling_tooltip_text, NULL);
- 		gtk_tooltips_set_delay(scrolling_tooltip, 750);
-@@ -1033,13 +1039,21 @@
- 
-   playlist_dir = g_strdup(gkrellm_homedir());
-   files_directory = g_strdup("/");
-+#ifdef USE_BMP
-+  gkrellmms_label = g_strdup("bmp");
-+#elif USE_AUDACIOUS
-+  gkrellmms_label = g_strdup("audacious");
-+#else
-   gkrellmms_label = g_strdup("xmms");
-+#endif
-   xmms_session = 0;
-   scroll_enable = TRUE;
-   scroll_separator = g_strdup(SCROLL_SEPARATOR);
-   draw_time = 1;
- #ifdef USE_BMP
-   xmms_exec_command = g_strdup("beep-media-player");
-+#elif USE_AUDACIOUS
-+  xmms_exec_command = g_strdup("audacious");
- #else
-   xmms_exec_command = g_strdup("xmms");
- #endif
-diff -aur ../gkrellmms/gkrellmms.h ./gkrellmms.h
---- ../gkrellmms/gkrellmms.h	2005-01-21 18:02:17.000000000 +0100
-+++ ./gkrellmms.h	2006-10-24 23:49:09.000000000 +0200
-@@ -27,6 +27,8 @@
- 
- #ifdef USE_BMP
- #include <bmp/beepctrl.h>
-+#elif USE_AUDACIOUS
-+#include <audacious/beepctrl.h>
- #else
- #include <xmms/xmmsctrl.h>
- #endif
-diff -aur ../gkrellmms/options.c ./options.c
---- ../gkrellmms/options.c	2005-01-21 18:02:17.000000000 +0100
-+++ ./options.c	2006-10-24 23:57:47.000000000 +0200
-@@ -44,6 +44,15 @@
- static gint time_fmt_thing;
- static gint always_load_thing;
- 
-+#ifdef USE_BMP
-+  #define PROG_NAME "BMP"
-+#elif USE_AUDACIOUS
-+  #define PROG_NAME "Audacious"
-+#else
-+  #define PROG_NAME "XMMS"
-+#endif
-+
-+
- void toggles_func (GtkWidget *w, gpointer what)
- {
-   gint type;
-@@ -178,28 +187,28 @@
-   {N_("/Toggles.../Always on top on"),  NULL, aot_func,      ON,       "<Item>"},
-   {N_("/Toggles.../Always on top off"), NULL, aot_func,      OFF,      "<Item>"},
-   {"/-",                                NULL, NULL,          0,        "<Separator>"},
--  {"/Xmms...",                          NULL, NULL,          0,        "<Branch>"},
--  {N_("/Xmms.../Previous"),             NULL, toggles_func,  gkrellmms_prev,     "<Item>"},
--  {N_("/Xmms.../Play"),                 NULL, toggles_func,  gkrellmms_play,     "<Item>"},
--  {N_("/Xmms.../Pause"),                NULL, toggles_func,  gkrellmms_paus,     "<Item>"},
--  {N_("/Xmms.../Stop"),                 NULL, toggles_func,  gkrellmms_stop,     "<Item>"},
--  {N_("/Xmms.../Next"),                 NULL, toggles_func,  gkrellmms_next,     "<Item>"},
-+  {"/"PROG_NAME"...",                          NULL, NULL,          0,        "<Branch>"},
-+  {N_("/"PROG_NAME".../Previous"),             NULL, toggles_func,  gkrellmms_prev,     "<Item>"},
-+  {N_("/"PROG_NAME".../Play"),                 NULL, toggles_func,  gkrellmms_play,     "<Item>"},
-+  {N_("/"PROG_NAME".../Pause"),                NULL, toggles_func,  gkrellmms_paus,     "<Item>"},
-+  {N_("/"PROG_NAME".../Stop"),                 NULL, toggles_func,  gkrellmms_stop,     "<Item>"},
-+  {N_("/"PROG_NAME".../Next"),                 NULL, toggles_func,  gkrellmms_next,     "<Item>"},
-   {"/-",                                NULL, NULL,          0,        "<Separator>"},
-   {N_("/Playlist Editor"),              NULL, open_playlist_cb, 0,        "<Item>"},
-   {N_("/GKrellMMS Options"),            NULL, open_options_cb, 0,        "<Item>"},
-   {"/-",                                NULL, NULL,          0,        "<Separator>"},
-   {N_("/Open file(s)"),                 NULL, toggles_func,  gkrellmms_eject,    "<Item>"},
-   {N_("/Open Playlist"),                NULL, load_playlist_cb,  0,        "<Item>"},
--  {N_("/XMMS Prefs"),                   NULL, toggles_func,  gkrellmms_prefs,    "<Item>"},
-+  {N_("/"PROG_NAME" Prefs"),                   NULL, toggles_func,  gkrellmms_prefs,    "<Item>"},
-   {"/-",                                NULL, NULL,          0,        "<Separator>"},
--  {N_("/Quit XMMS"),                    NULL, quit_func,     0,        "<Item>"},
-+  {N_("/Quit "PROG_NAME),                    NULL, quit_func,     0,        "<Item>"},
-   {"/-",                                NULL, NULL,          0,        "<Separator>"},
- };
- 
- static GtkItemFactoryEntry gkrellmms_factory_norun[] =
- {
-   {"/-",                           NULL, NULL,          0,    "<Separator>"},
--  {N_("/Launch XMMS"),                 NULL, start_func,    0,    "<Item>"},
-+  {N_("/Launch "PROG_NAME),                 NULL, start_func,    0,    "<Item>"},
-   {"/-",                           NULL, NULL,          0,    "<Separator>"},
- };
- 
-@@ -423,19 +432,19 @@
-   gint i;
-   static gchar *gkrellmms_help_text[] =
-   {
--    N_("GKrellMMS is a GKrellM XMMS-plugin which allows you to control \n" \
--    "XMMS from within GKrellM. It features some cool things, such as: \n" \
-+    N_("GKrellMMS is a GKrellM "PROG_NAME"-plugin which allows you to control \n" \
-+    PROG_NAME" from within GKrellM. It features some cool things, such as: \n" \
-     "\n" \
-     "- A scrolling title. \n" \
-     "- A Krell which indicates where you are in a song. \n" \
--    "- Themeable buttons for controlling XMMS. \n" \
-+    "- Themeable buttons for controlling "PROG_NAME". \n" \
-     "- A playlist editor. \n" \
--    "- A gtk-popup-menu with misc. XMMS-functions. \n" \
-+    "- A gtk-popup-menu with misc. "PROG_NAME"-functions. \n" \
-     "\n"),
- 
-     N_("<b>How to use GKrellMMS: \n"),
-     N_("\n" \
--    "You can do some cool stuff with the XMMS-Krell, by using your mouse. \n" \
-+    "You can do some cool stuff with the "PROG_NAME"-Krell, by using your mouse. \n" \
-     "\n"),
- 
-     N_("<b>Mouse actions: \n" \
-@@ -443,8 +452,8 @@
-     N_("Jump through song. \n"),
- 
-     N_("<b>\tMiddle mouse-button: "),
--    N_("Pause/stop/play XMMS (configurable), \n" \
--    "\t  or launch XMMS if it's not running. \n"),
-+    N_("Pause/stop/play "PROG_NAME" (configurable), \n" \
-+    "\t  or launch "PROG_NAME" if it's not running. \n"),
- 
-     N_("<b>\tRight mouse-button: "),
-     N_("Popup-menu. \n" \
-@@ -453,16 +462,16 @@
-     "\n"),
- 
-     N_("<b>\tConstant red: "),
--    N_("XMMS is turned off. \n"),
-+    N_(PROG_NAME" is turned off. \n"),
- 
-     N_("<b>\tConstant green: "),
--    N_("XMMS is playing. \n"),
-+    N_(PROG_NAME" is playing. \n"),
- 
-     N_("<b>\tRed, blinking green: "),
--    N_("XMMS is stopped. \n"),
-+    N_(PROG_NAME" is stopped. \n"),
- 
-     N_("<b>\tGreen, blinking red: "),
--    N_("XMMS is paused. \n" \
-+    N_(PROG_NAME" is paused. \n" \
-     "\n"),
- 
-     N_("<b>Configurabilities:\n"),
-@@ -473,15 +482,15 @@
- 
-     N_("<b>Configs tab: \n" \
-     "\n" \
--    "\tXMMS Executable: \n"),
-+    "\t"PROG_NAME" Executable: \n"),
- 
--    N_("\tHow the XMMS-executable (+ eventually path) \n" \
-+    N_("\tHow the "PROG_NAME"-executable (+ eventually path) \n" \
-     "\tis called on your computer. Default is xmms\n" \
-     "\n"),
- 
-     N_("<b>\tFiles Directory: \n"),
-     N_("\tThe directory where your mp3's/xm's/whatever \n" \
--    "\tare stored in. When starting XMMS from GKrellM, it will go to this \n" \
-+    "\tare stored in. When starting "PROG_NAME" from GKrellM, it will go to this \n" \
-     "\tdirectory when ejecting. \n" \
-     "\n"),
-   
-@@ -490,7 +499,7 @@
-     "\n"),
- 
-     N_("<b>\tKrell label: \n"),
--    N_("\tThe text-label you want in the krell when xmms isn't running/playing. \n" \
-+    N_("\tThe text-label you want in the krell when "PROG_NAME" isn't running/playing. \n" \
-     "\n"),
-   
-     N_("<b>\tScroll separator: \n"),
-@@ -498,9 +507,9 @@
-     "\tIt defaults to '   ***   ' (that's 3 spaces, 3 *'s and 3 spaces). \n" \
-     "\n"),
- 
--    N_("<b>\tXMMS Session to use: \n"),
--    N_("\tThe XMMS-session you want to use with GKrellMMS. \n" \
--    "\tUse 0 if you only have 1 XMMS running. \n" \
-+    N_("<b>\t"PROG_NAME" Session to use: \n"),
-+    N_("\tThe "PROG_NAME"-session you want to use with GKrellMMS. \n" \
-+    "\tUse 0 if you only have 1 "PROG_NAME" running. \n" \
-     "\n"),
-   
-     N_("<b>Toggles tab: \n" \
-@@ -510,23 +519,23 @@
-     N_("\tDraw a minus (-) before the remaining time, when you have \n" \
-     "\tthe output-time displaying remaining time. \n\n"),
- 
--    N_("<b>\tXMMS Auto Launch: \n"),
--    N_("\tAuto launch XMMS when starting GKrellMMS. \n" \
-+    N_("<b>\t"PROG_NAME" Auto Launch: \n"),
-+    N_("\tAuto launch "PROG_NAME" when starting GKrellMMS. \n" \
-     "\n"),
-   
-     N_("<b>\tAuto Mainwindow Close: \n"),
--    N_("\tAutomatically close the XMMS-mainwindow \n" \
--    "\twhen GKrellMMS starts, and XMMS is already running, or when \n" \
--    "\tlaunching XMMS while GKrellMMS runs. This option also enables the \n" \
-+    N_("\tAutomatically close the "PROG_NAME"-mainwindow \n" \
-+    "\twhen GKrellMMS starts, and "PROG_NAME" is already running, or when \n" \
-+    "\tlaunching "PROG_NAME" while GKrellMMS runs. This option also enables the \n" \
-     "\tmainwindow back when you quit gkrellm (some people really do). \n" \
-     "\n"),
- 
--    N_("<b>\tAuto hide all XMMS windows: \n"),
--    N_("\tAutomatically hide all XMMS windows when GKrellMMS starts. \n" \
-+    N_("<b>\tAuto hide all "PROG_NAME" windows: \n"),
-+    N_("\tAutomatically hide all "PROG_NAME" windows when GKrellMMS starts. \n" \
-      "\n"),
- 
-     N_("<b>\tAuto start playing: \n"),
--    N_("\tAutomatically start playing when launching XMMS. \n\n"),
-+    N_("\tAutomatically start playing when launching "PROG_NAME". \n\n"),
- 
-     N_("<b>\tEnable scrolling title: \n"),
-     N_("\tEnable/disable the scrolling title-panel. \n" \
-@@ -537,13 +546,13 @@
-     "\tEject opens: \n"),
- 
-     N_("\tCheck whether the eject-button on the button-bar opens a \n" \
--    "\tplaylist or an other XMMS-file. \n" \
-+    "\tplaylist or an other "PROG_NAME"-file. \n" \
-     "\n"),
-   
-     N_("<b>\tMMB on krell click: \n"),
-     N_("\tCheck whether GKrellMMS should pause/continue or \n" \
-     "\tstop/play the current song on a MMB-click on the krell. MMB Click will \n" \
--    "\talways start playing the song if XMMS isn't playing. \n" \
-+    "\talways start playing the song if "PROG_NAME" isn't playing. \n" \
-     "\n"),
- 
-     N_("<b>\tLoad file-info: \n"),
-@@ -553,7 +562,7 @@
-     "\tplaylist editor, or are playing on a slow network/cdrom. \n\n"),
- 
-     N_("<b>\tDraw in time bar: \n"),
--    N_("\tCheck whether to draw the output time or 'xmms' in \n" \
-+    N_("\tCheck whether to draw the output time or '"PROG_NAME"' in \n" \
-     "\tthe time-krell panel. \n" \
-     "\n"),
- 
-@@ -577,7 +586,7 @@
-   hbox = gtk_hbox_new(FALSE, 5);
- 
-   zbox = gtk_vbox_new(FALSE, 0);
--  label = gtk_label_new(_("XMMS Executable:"));
-+  label = gtk_label_new(_(PROG_NAME" Executable:"));
-   gtk_box_pack_start(GTK_BOX(zbox), label, TRUE, FALSE, 0);
-   label = gtk_label_new(_("Files Directory:"));
-   gtk_box_pack_start(GTK_BOX(zbox), label, TRUE, FALSE, 0);
-@@ -625,7 +634,7 @@
-   gtk_spin_button_set_digits(GTK_SPIN_BUTTON(session_entry), (guint) 0);
-   gtk_spin_button_set_value(GTK_SPIN_BUTTON(session_entry), xmms_session);
-   gtk_box_pack_start(GTK_BOX(hbox), session_entry, FALSE, FALSE, 0);
--  label = gtk_label_new(_("XMMS Session to use"));
-+  label = gtk_label_new(_(PROG_NAME" Session to use"));
-   gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
-   gtk_container_add(GTK_CONTAINER(vbox), hbox);
- 
-@@ -644,19 +653,19 @@
-   gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(draw_minus_entry), draw_minus);  
-   gtk_container_add(GTK_CONTAINER(vbox), draw_minus_entry);
- 
--  xmms_start_entry = gtk_check_button_new_with_label(_("Auto launch XMMS on GKrellMMS startup"));
-+  xmms_start_entry = gtk_check_button_new_with_label(_("Auto launch "PROG_NAME" on GKrellMMS startup"));
-   gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(xmms_start_entry), xmms_autostart);
-   gtk_container_add(GTK_CONTAINER(vbox), xmms_start_entry);
- 
--  main_close_entry = gtk_check_button_new_with_label(_("Auto close (and open) XMMS Mainwin"));
-+  main_close_entry = gtk_check_button_new_with_label(_("Auto close (and open) "PROG_NAME" Mainwin"));
-   gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(main_close_entry), auto_main_close);
-   gtk_container_add(GTK_CONTAINER(vbox), main_close_entry);
- 
--  hide_all_entry = gtk_check_button_new_with_label(_("Auto hide all XMMS windows on XMMS startup"));
-+  hide_all_entry = gtk_check_button_new_with_label(_("Auto hide all "PROG_NAME" windows on "PROG_NAME" startup"));
-   gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(hide_all_entry), auto_hide_all);
-   gtk_container_add(GTK_CONTAINER(vbox), hide_all_entry);
- 
--  auto_play_entry = gtk_check_button_new_with_label(_("Auto start playing on XMMS launch"));
-+  auto_play_entry = gtk_check_button_new_with_label(_("Auto start playing on "PROG_NAME" launch"));
-   gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(auto_play_entry), auto_play_start);
-   gtk_container_add(GTK_CONTAINER(vbox), auto_play_entry);
- 
-@@ -720,7 +729,7 @@
-   gtk_signal_connect(GTK_OBJECT(time_draw_entry), "pressed",
-                      (GtkSignalFunc) time_type_set, GINT_TO_POINTER(1));
- 
--  time_draw_entry = gtk_radio_button_new_with_label(time_draw_group, _("XMMS-text"));
-+  time_draw_entry = gtk_radio_button_new_with_label(time_draw_group, _(PROG_NAME"-text"));
-   gtk_box_pack_start(GTK_BOX(zbox), time_draw_entry, FALSE, FALSE, 0);
-   gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(time_draw_entry), !draw_time);
-   gtk_signal_connect(GTK_OBJECT(time_draw_entry), "pressed",
-@@ -840,10 +849,11 @@
-   /* About */
-   gkrellmms_info_text = g_strdup_printf(
-     _("GKrellMMS %d.%d.%d\n" \
--    "GKrellM XMMS Plugin\n" \
-+    "GKrellM XMMS/BMP/Audacious Plugin\n" \
-     "\n" \
-     "Copyright (C) 2000-2002 Sander Klein Lebbink <sander@cerberus.demon.nl>\n"\
-     "Current Maintainer: Sjoerd Simons <sjoerd@luon.net>\n" \
-+    "Audacious Patch: Sascha Hlusiak <mail@saschahlusiak.de>\n" \
-     "http://gkrellm.luon.net/\n" \
-     "\n" \
-     "Released under the GNU Public License\n"),
-diff -aur ../gkrellmms/playlist.h ./playlist.h
---- ../gkrellmms/playlist.h	2005-01-21 18:02:17.000000000 +0100
-+++ ./playlist.h	2006-10-24 23:49:32.000000000 +0200
-@@ -26,6 +26,8 @@
- 
- #ifdef USE_BMP
- #include <bmp/beepctrl.h>
-+#elif USE_AUDACIOUS
-+#include <audacious/beepctrl.h>
- #else
- #include <xmms/xmmsctrl.h>
- #endif
diff --git a/x11-plugins/gkrellmms/gkrellmms-2.1.22-r1.ebuild b/x11-plugins/gkrellmms/gkrellmms-2.1.22-r1.ebuild
index d69661b87f6d..396f420e5d08 100644
--- a/x11-plugins/gkrellmms/gkrellmms-2.1.22-r1.ebuild
+++ b/x11-plugins/gkrellmms/gkrellmms-2.1.22-r1.ebuild
@@ -1,27 +1,42 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellmms/gkrellmms-2.1.22-r1.ebuild,v 1.5 2007/02/05 15:54:39 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellmms/gkrellmms-2.1.22-r1.ebuild,v 1.6 2008/03/01 23:09:57 coldwind Exp $
 
 inherit eutils multilib toolchain-funcs
 
 DESCRIPTION="A sweet plugin to control Audacious from GKrellM2"
-SRC_URI="http://gkrellm.luon.net/files/${P}.tar.gz"
+SRC_URI="http://gkrellm.luon.net/files/${P}.tar.gz
+	mirror://gentoo/${P}-audacious.patch.gz"
 HOMEPAGE="http://gkrellm.luon.net/gkrellmms.phtml"
-IUSE=""
+
 DEPEND=">=app-admin/gkrellm-2
-	media-sound/audacious"
+	media-sound/audacious
+	sys-apps/dbus"
+# dbus dependency is because of audacious patch
+
+RDEPEND="${DEPEND}"
 
+IUSE=""
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~ppc sparc x86"
 
 S="${WORKDIR}"/${PN}
 
+pkg_setup() {
+	if ! built_with_use media-sound/audacious dbus ; then
+		eerror "${PN} needs media-sound/audacious built with"
+		eerror "USE='dbus'. Please, reinstall it with dbus enabled"
+		eerror "and try again."
+		die "media-sound/audacious built without dbus USE flag"
+	fi
+}
+
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${FILESDIR}"/${P}-audacious.patch
+	epatch "${WORKDIR}"/${P}-audacious.patch
 	epatch "${FILESDIR}"/${P}-ldflags.patch
 }