Readded gkrellmms with patch to make it works with audacious,

thanks to Sascha Hlusiak for bug #152890.

Package-Manager: portage-2.1.2_rc2

7 files changed, 676 insertions, 0 deletions

diff --git a/x11-plugins/gkrellmms/ChangeLog b/x11-plugins/gkrellmms/ChangeLog
new file mode 100644
index 000000000000..1265ea8faf0f
--- /dev/null
+++ b/x11-plugins/gkrellmms/ChangeLog
@@ -0,0 +1,216 @@
+# ChangeLog for x11-plugins/gkrellmms
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellmms/ChangeLog,v 1.49 2006/11/21 22:06:39 drizzt Exp $
+
+*gkrellmms-2.1.22-r1 (21 Nov 2006)
+
+  21 Nov 2006; Timothy Redaelli <drizzt@gentoo.org>
+  +files/gkrellmms-2.1.22-audacious.patch,
+  +files/gkrellmms-2.1.22-ldflags.patch, metadata.xml,
+  +gkrellmms-2.1.22-r1.ebuild:
+  Readded gkrellmms with patch to make it works with audacious,
+  thanks to Sascha Hlusiak for bug #152890.
+
+  18 Aug 2006; Tobias Scherbaum <dertobi123@gentoo.org>
+  gkrellmms-2.1.22.ebuild:
+  ppc stable, bug #102121
+
+  11 Jun 2006; Tony Vroon <chainsaw@gentoo.org> gkrellmms-2.1.22.ebuild:
+  Remove references to beep-media-player, which is no longer in the tree.
+
+  17 Jun 2005; Michael Hanselmann <hansmi@gentoo.org>
+  gkrellmms-2.1.21.ebuild:
+  Stable on ppc.
+
+*gkrellmms-2.1.22 (18 May 2005)
+
+  18 May 2005; Martin Holzer <mholzer@gentoo.org> +gkrellmms-2.1.22.ebuild:
+  Version bumped. Closes 82738. Thx to <andrewdk@sbcglobal.net>
+
+  14 May 2005; Bryan Østergaard <kloeri@gentoo.org>
+  gkrellmms-2.1.21.ebuild:
+  Stable on alpha.
+
+  06 May 2005; Sven Wegener <swegener@gentoo.org> gkrellmms-2.1.15.ebuild,
+  gkrellmms-2.1.21.ebuild:
+  Removed * postfix from <, <=, >= and > dependencies.
+
+  27 Apr 2005; Herbie Hopkins <herbs@gentoo.org> gkrellmms-2.1.21.ebuild:
+  multilib fixes
+
+  07 Apr 2005; Simon Stelling <blubb@gentoo.org> gkrellmms-2.1.21.ebuild:
+  stable on amd64
+
+  30 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org> gkrellmms-2.1.21.ebuild:
+  Stable on sparc
+
+  28 Mar 2005; Martin Holzer <mholzer@gentoo.org> gkrellmms-2.1.21.ebuild:
+  x86 stable.
+
+*gkrellmms-2.1.21 (02 Jan 2005)
+
+  02 Jan 2005; Martin Holzer <mholzer@gentoo.org> +gkrellmms-2.1.21.ebuild:
+  Version bumped. Closes 74001
+
+  14 Nov 2004; Bryan Østergaard <kloeri@gentoo.org>
+  gkrellmms-2.1.15.ebuild:
+  Stable on alpha.
+
+  08 Aug 2004; Tom Martin <slarti@gentoo.org> gkrellmms-0.5.6.ebuild,
+  gkrellmms-0.5.8.ebuild:
+  Typo in DESCRIPTION: controll -> control. Bug 59717.
+
+*gkrellmms-2.1.20 (01 Jun 2004)
+
+  01 Jun 2004; Martin Holzer <mholzer@gentoo.org> gkrellmms-2.1.20.ebuild:
+  Version bumped. Closes 51471
+
+*gkrellmms-2.1.19 (09 May 2004)
+
+  09 May 2004; Martin Holzer <mholzer@gentoo.org> gkrellmms-2.1.19.ebuild:
+  Version bumped. Closes 49915
+
+*gkrellmms-2.1.18 (08 May 2004)
+
+  08 May 2004; Martin Holzer <mholzer@gentoo.org> gkrellmms-2.1.15.ebuild,
+  gkrellmms-2.1.17.ebuild, gkrellmms-2.1.18.ebuild:
+  Version bumped. Added missing IUSE.
+
+*gkrellmms-2.1.17 (02 May 2004)
+
+  02 May 2004; Martin Holzer <mholzer@gentoo.org> gkrellmms-2.1.17.ebuild:
+  verison bumped. closes 49605
+
+  29 Apr 2004; Jason Wever <weeve@gentoo.org> gkrellmms-2.1.15.ebuild:
+  Stable on sparc.
+
+*gkrellmms-2.1.16 (17 Apr 2004)
+
+  17 Apr 2004; Martin Holzer <mholzer@gentoo.org> gkrellmms-2.1.16.ebuild:
+  Version bumped. Closes 45762
+
+  17 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> gkrellmms-2.1.15.ebuild:
+  Added IUSE, stable on x86 and amd64.
+
+  12 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> gkrellmms-2.1.14.ebuild:
+  Stable on x86 and amd64, adding IUSE.
+
+*gkrellmms-2.1.15 (16 Mar 2004)
+
+  16 Mar 2004; Jon Portnoy <avenj@gentoo.org> gkrellmms-2.1.15.ebuild :
+  Version bump.
+
+  01 Mar 2004; Markus Nigbur <pyrania@gentoo.org> gkrellmms-2.1.13.ebuild:
+  Stable on x86.
+
+*gkrellmms-2.1.14 (28 Feb 2004)
+
+  28 Feb 2004; Martin Holzer <mholzer@gentoo.org> gkrellmms-2.1.14.ebuild:
+  Version bumped. Closes 42832
+
+  25 Feb 2004; Sven Blumenstein <bazik@gentoo.org> gkrellmms-2.1.13.ebuild:
+  Stable on sparc.
+
+  09 Jan 2004; Aron Griffis <agriffis@gentoo.org> gkrellmms-2.1.12.ebuild:
+  stable on alpha
+
+*gkrellmms-2.1.13 (06 Dec 2003)
+
+  06 Dec 2003; Martin Holzer <mholzer@gentoo.org> gkrellmms-2.1.13.ebuild:
+  Version bumped.
+
+  07 Oct 2003; Martin Holzer <mholzer@gentoo.org> gkrellmms-0.5.6.ebuild,
+  gkrellmms-0.5.8.ebuild:
+  changed depend to gkrellm fixed version. Closes #27060.
+
+  04 Sep 2003; Aron Griffis <agriffis@gentoo.org> gkrellmms-2.1.12.ebuild:
+  add ~alpha to KEYWORDS
+
+  17 Jul 2003; Martin Holzer <mholzer@gentoo.org> gkrellmms-2.1.12.ebuild,
+  gkrellmms-0.5.8.ebuild :
+  Marked x86 stable.
+
+*gkrellmms-2.1.12 (25 Jun 2003)
+
+  25 Jun 2003; Martin Holzer <mholzer@gentoo.org> gkrellmms-2.1.12.ebuild:
+  Version bumped. Closes #23155
+
+*gkrellmms-2.1.9 (23 Mar 2003)
+
+  23 Mar 2003; Martin Holzer <mholzer@gentoo.org> gkrellmms-2.1.9.ebuild:
+  Version bumped.
+
+*gkrellmms-2.1.8 (19 Feb 2003)
+
+  19 Feb 2003; Martin Holzer <mholzer@gentoo.org> gkrellmms-2.1.8.ebuild
+  files/digest-gkrellmms-2.1.8 :
+  Version bumped.
+
+*gkrellmms-2.1.6 (16 Jan 2003)
+
+  19 Feb 2003; Martin Holzer <mholzer@gentoo.org> gkrellmms-2.1.6.ebuild :
+  Marking as stable.
+
+  16 Jan 2003; Seemant Kulleen <seemant@gentoo.org> gkrellmms-2.1.6.ebuild
+  files/digest-gkrellmms-2.1.6 :
+
+  Version bump thanks to: mail@slysoft.de (Thomas Arnhold) in bug #13847.
+
+*gkrellmms-2.1.3 (14 Dec 2002)
+
+  14 Dec 2002; Seemant Kulleen <seemant@gentoo.org> gkrellmms-2.1.3.ebuild
+  files/digest-gkrellmms-2.1.3 :
+
+  Version bump.  Added to ~ppc profile as well.
+
+*gkrellmms-0.5.8 (16 Oct 2002)
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+  16 Oct 2002; Seemant Kulleen <seemant@gentoo.org> gkrellmms-0.5.8.ebuild
+  files/digest-gkrellmms-0.5.8 :
+
+  Version bump for the gtk+1 version.  both versions are SLOTified,
+  obviously.
+
+*gkrellmms-2.1.2 (15 Oct 2002)
+
+  15 Oct 2002; Seemant Kulleen <seemant@gentoo.org> gkrellmms-2.1.2.ebuild
+  files/digest-gkrellmms-2.1.2 :
+
+  New version for gkrellm2 (based on gtk2).  Thanks to:
+  43fcmm6rz001@sneakemail.com (Tobias Quinn) in bug #7362, though this one
+  is a more updated version.  Also, pazzop@wanadoo.nl (AlterEgo) had
+  submitted an ebuild in bug #7384.
+
+*gkrellmms-0.5.6 (27 May 2002)
+
+  11 Sep 2002; Owen Stampflee <owen@gentoo.org> :
+  Added PPC to KEYWORDS.
+
+  29 Aug 2002; Seemant Kulleen <seemant@gentoo.org> * :
+
+  Relocated to x11-plugins
+
+  27 May 2002; Seemant Kulleen <seemant@gentoo.org>
+
+  The patch was applied and upstream upped the version number.
+
+*gkrellmms-0.5.5-r1 (12 Mar 2002)
+
+  12 Mar 2002; Seemant Kulleen <seemant@gentoo.org>
+
+  Gkrellm 1.2.9 changed some things, which caused gkrellmms to not compile
+  against it.  The author has issued a patch for it.  The patch is in files/
+  and this revision of the ebuild applied that patch before compilation.
+
+
+*gkrellmms-0.5.5 (1 Feb 2002)
+
+  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
+  
+  Added initial ChangeLog which should be updated whenever the package is
+  updated in any way. This changelog is targetted to users. This means that the
+  comments should well explained and written in clean English. The details about
+  writing correct changelogs are explained in the skel.ChangeLog file which you
+  can find in the root directory of the portage repository.
diff --git a/x11-plugins/gkrellmms/Manifest b/x11-plugins/gkrellmms/Manifest
new file mode 100644
index 000000000000..eb568ca18a65
--- /dev/null
+++ b/x11-plugins/gkrellmms/Manifest
@@ -0,0 +1,34 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX gkrellmms-2.1.22-audacious.patch 15275 RMD160 814efb3a674f05fea1ee3999ef2aa7461c31e366 SHA1 6f95b9e9e41725ba969849532441105c421ba8ac SHA256 93b037b0b5a1a2275f8d89ef2f0d944810d603945b3092cf21edafdb6ffc8617
+MD5 401bafc058995e9a516c3ce14bf7ff85 files/gkrellmms-2.1.22-audacious.patch 15275
+RMD160 814efb3a674f05fea1ee3999ef2aa7461c31e366 files/gkrellmms-2.1.22-audacious.patch 15275
+SHA256 93b037b0b5a1a2275f8d89ef2f0d944810d603945b3092cf21edafdb6ffc8617 files/gkrellmms-2.1.22-audacious.patch 15275
+AUX gkrellmms-2.1.22-ldflags.patch 342 RMD160 c1c5e77ce9345c31bb80c610afced7b610dfce57 SHA1 36d923e14535ef598317b97b57c47b9a1b458f95 SHA256 6a417081ba7129f2a022aa43da193f30125edcf0ec0627d56d821342c560405e
+MD5 957513cbba3a5df4b83b282dc97722e2 files/gkrellmms-2.1.22-ldflags.patch 342
+RMD160 c1c5e77ce9345c31bb80c610afced7b610dfce57 files/gkrellmms-2.1.22-ldflags.patch 342
+SHA256 6a417081ba7129f2a022aa43da193f30125edcf0ec0627d56d821342c560405e files/gkrellmms-2.1.22-ldflags.patch 342
+DIST gkrellmms-2.1.22.tar.gz 46903 RMD160 9e7791c9922d319f523e9460b365cb5c4468fcdc SHA1 f7ea788e4420cf714f9ab49025b1d172c4a37304 SHA256 cd84d6678740374567b01b69a095fc99ec7a96e10d7315c4416a8de590770e7f
+EBUILD gkrellmms-2.1.22-r1.ebuild 898 RMD160 7e0344f9ee8894e0764d0babf4f028b9ef2c6b9c SHA1 0ed2422b44200e3e7d2fbdc56090f70dcc6d5b7b SHA256 09e612631e8bc3f8406bb2ad492ce3341ed0d1559fb4117fb95020077728cf30
+MD5 13200bd029bf66698823b0469a051a8c gkrellmms-2.1.22-r1.ebuild 898
+RMD160 7e0344f9ee8894e0764d0babf4f028b9ef2c6b9c gkrellmms-2.1.22-r1.ebuild 898
+SHA256 09e612631e8bc3f8406bb2ad492ce3341ed0d1559fb4117fb95020077728cf30 gkrellmms-2.1.22-r1.ebuild 898
+MISC ChangeLog 6932 RMD160 62484410f41a844dfde83fb98c8771f8735046cd SHA1 d0e0152fdff28760fb187e6ad7fb045cecea1f32 SHA256 c74957b84a2107cd707eb1013e96533faaf09ce57c599b75f8c4593a80d54e5a
+MD5 9d11a97cf1016569b98d880a2fb24056 ChangeLog 6932
+RMD160 62484410f41a844dfde83fb98c8771f8735046cd ChangeLog 6932
+SHA256 c74957b84a2107cd707eb1013e96533faaf09ce57c599b75f8c4593a80d54e5a ChangeLog 6932
+MISC metadata.xml 222 RMD160 c0fe8198bb72a6bed198a1dd7005ed607711db2a SHA1 a3b2631fffe918fa2b814a269297dfc9e6c355cb SHA256 35319607d0186f4c2b026c636392c56bafa68c71a17a67364e5c530156eb22b4
+MD5 99cf1c24b27d2fe42b99b95fadff0290 metadata.xml 222
+RMD160 c0fe8198bb72a6bed198a1dd7005ed607711db2a metadata.xml 222
+SHA256 35319607d0186f4c2b026c636392c56bafa68c71a17a67364e5c530156eb22b4 metadata.xml 222
+MD5 952f72e028be1357d411331c56243fd3 files/digest-gkrellmms-2.1.22-r1 247
+RMD160 91635808ff03944d5ca06a991f3fecf1102c7176 files/digest-gkrellmms-2.1.22-r1 247
+SHA256 3a222c23f8e2f9fda21872aaf2db20dd56139759a945c63737ee0d684b62e3f9 files/digest-gkrellmms-2.1.22-r1 247
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFY3h7GDyatLGpTbYRAgjJAJ9j7s+MzEGmw2MMCFvR3U+qX0VaNgCdE59u
+Kz3Q4P4/zKJ+PqOpjF3y2dA=
+=/Ogw
+-----END PGP SIGNATURE-----
diff --git a/x11-plugins/gkrellmms/files/digest-gkrellmms-2.1.22-r1 b/x11-plugins/gkrellmms/files/digest-gkrellmms-2.1.22-r1
new file mode 100644
index 000000000000..630c27cf2c1d
--- /dev/null
+++ b/x11-plugins/gkrellmms/files/digest-gkrellmms-2.1.22-r1
@@ -0,0 +1,3 @@
+MD5 2739eaf7047d7c8d203111a3c2e7eb17 gkrellmms-2.1.22.tar.gz 46903
+RMD160 9e7791c9922d319f523e9460b365cb5c4468fcdc gkrellmms-2.1.22.tar.gz 46903
+SHA256 cd84d6678740374567b01b69a095fc99ec7a96e10d7315c4416a8de590770e7f gkrellmms-2.1.22.tar.gz 46903
diff --git a/x11-plugins/gkrellmms/files/gkrellmms-2.1.22-audacious.patch b/x11-plugins/gkrellmms/files/gkrellmms-2.1.22-audacious.patch
new file mode 100644
index 000000000000..e7a4a6c55a59
--- /dev/null
+++ b/x11-plugins/gkrellmms/files/gkrellmms-2.1.22-audacious.patch
@@ -0,0 +1,367 @@
+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/files/gkrellmms-2.1.22-ldflags.patch b/x11-plugins/gkrellmms/files/gkrellmms-2.1.22-ldflags.patch
new file mode 100644
index 000000000000..d9191f5bbbce
--- /dev/null
+++ b/x11-plugins/gkrellmms/files/gkrellmms-2.1.22-ldflags.patch
@@ -0,0 +1,11 @@
+--- Makefile.old	2006-11-21 22:37:51.000000000 +0100
++++ Makefile	2006-11-21 22:38:25.000000000 +0100
+@@ -55,7 +55,7 @@
+ 	(cd po && ${MAKE} all )
+ 
+ $(BIN_FILENAME).so: $(OBJS)
+-	$(CC) $(OBJS) -o $(BIN_FILENAME).so $(LFLAGS) $(LIBS)
++	$(CC) $(LDFLAGS) $(OBJS) -o $(BIN_FILENAME).so $(LFLAGS) $(LIBS)
+ 
+ clean:
+ 	rm -f *.o core *.so* *.bak *~
diff --git a/x11-plugins/gkrellmms/gkrellmms-2.1.22-r1.ebuild b/x11-plugins/gkrellmms/gkrellmms-2.1.22-r1.ebuild
new file mode 100644
index 000000000000..1b2c28f944ed
--- /dev/null
+++ b/x11-plugins/gkrellmms/gkrellmms-2.1.22-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2006 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.1 2006/11/21 22:06:39 drizzt Exp $
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="A sweet plugin to control XMMS from GKrellM2"
+SRC_URI="http://gkrellm.luon.net/files/${P}.tar.gz"
+HOMEPAGE="http://gkrellm.luon.net/gkrellmms.phtml"
+IUSE=""
+DEPEND=">=app-admin/gkrellm-2
+	media-sound/audacious"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+
+S="${WORKDIR}"/${PN}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-audacious.patch
+	epatch "${FILESDIR}"/${P}-ldflags.patch
+}
+
+src_compile() {
+	tc-export CC
+	emake USE_AUDACIOUS=1 || die
+}
+
+src_install () {
+	exeinto /usr/"$(get_libdir)"/gkrellm2/plugins
+	doexe gkrellmms.so
+	dodoc README Changelog FAQ Themes
+}
diff --git a/x11-plugins/gkrellmms/metadata.xml b/x11-plugins/gkrellmms/metadata.xml
new file mode 100644
index 000000000000..baa93670abe7
--- /dev/null
+++ b/x11-plugins/gkrellmms/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>no-herd</herd>
+<maintainer>
+  <email>drizzt@gentoo.org</email>
+</maintainer>
+</pkgmetadata>