punt, fails to compile with recent audacious (including stable) wrt 298134

9 files changed, 0 insertions, 481 deletions

diff --git a/media-plugins/audacious-g15-spectrum/ChangeLog b/media-plugins/audacious-g15-spectrum/ChangeLog
deleted file mode 100644
index 8de764314627..000000000000
--- a/media-plugins/audacious-g15-spectrum/ChangeLog
+++ /dev/null
@@ -1,40 +0,0 @@
-# ChangeLog for media-plugins/audacious-g15-spectrum
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-g15-spectrum/ChangeLog,v 1.9 2010/01/18 15:55:17 rbu Exp $
-
-  18 Jan 2010; Robert Buchholz <rbu@gentoo.org> metadata.xml:
-  Dropping maintenance
-
-*audacious-g15-spectrum-2.5.5 (13 Sep 2008)
-
-  13 Sep 2008; Robin H. Johnson <robbat2@gentoo.org>
-  +files/audacious-g15-spectrum-2.5.5-audacious-1.5.patch,
-  +audacious-g15-spectrum-2.5.5.ebuild:
-  Version bump and include patch to support Audacious 1.5.
-
-  31 Dec 2007; Markus Ullmann <jokey@gentoo.org>
-  +files/audacious-g15-spectrum-2.5.2-audacious-1.4.patch,
-  audacious-g15-spectrum-2.5.2.ebuild:
-  Add audacious-1.4 build patch from bug #203853
-
-*audacious-g15-spectrum-2.5.2 (25 Dec 2007)
-
-  25 Dec 2007; Markus Ullmann <jokey@gentoo.org>
-  +audacious-g15-spectrum-2.5.2.ebuild:
-  Version bump wrt bug #197587 thanks to Barry Gear for the notify
-
-  01 May 2007; Markus Rothe <corsair@gentoo.org>
-  audacious-g15-spectrum-1.0_pre.ebuild:
-  Added ~ppc64; bug #175120
-
-  15 Mar 2007; Robert Buchholz <rbu@gentoo.org>
-  audacious-g15-spectrum-1.0_pre.ebuild:
-  Added ~x86, thanks to Alex Maclean (monkeh) for testing
-
-*audacious-g15-spectrum-1.0_pre (15 Mar 2007)
-
-  15 Mar 2007; Robert Buchholz <rbu@gentoo.org>
-  +files/audacious-g15-spectrum-1.0_pre-audacious-1.3.patch, +metadata.xml,
-  +audacious-g15-spectrum-1.0_pre.ebuild:
-  Initial version
-
diff --git a/media-plugins/audacious-g15-spectrum/Manifest b/media-plugins/audacious-g15-spectrum/Manifest
deleted file mode 100644
index 5dfee868a090..000000000000
--- a/media-plugins/audacious-g15-spectrum/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-AUX audacious-g15-spectrum-1.0_pre-audacious-1.3.patch 975 RMD160 cb3dd26ea3ccaa3165a14078a8da9b97e1725bfe SHA1 6f09b42788818cb076d81d996c2eb7713ac360e0 SHA256 d1496ced831da91952881b3451f51370e65baf30eb0c94e41bf37dc034830c3b
-AUX audacious-g15-spectrum-2.5.2-audacious-1.4.patch 6241 RMD160 ba585c930fa43d9608d21e3590b3cc5a47e47ef9 SHA1 7eb62e426e75d4bbf6d4b7c7d05f91fc10106d8c SHA256 af81edd6730764bcb9612f50e8790268692ba080aeda98ccd98d3a8732285878
-AUX audacious-g15-spectrum-2.5.5-audacious-1.5.patch 6431 RMD160 531b522c3da3ed6772df667a98be51bcaa7753c2 SHA1 2ebb41253adc749e812c8a64d01b8a1441b5e52e SHA256 8afe2caf66ceed902cafb1fe40800ae578aa69cb789594e210e2546f1c134a81
-DIST g15daemon-audacious-2.5.2.tar.bz2 234010 RMD160 9effb50b03ed7e4652cdff46dd48a979fce1a1ee SHA1 6c2be4e7c70a30d8270ef8ed989dadd19c66e53e SHA256 be2065b2fded807632e1ca3f0b19de70d8beebf38bad8a88cd9b44e4e8a6f956
-DIST g15daemon-audacious-2.5.5.tar.bz2 238143 RMD160 89fe5762a752efbfc8297887c49dfd00c2323ecb SHA1 c4a2566bab6c47b54c75376356a014be111b7d54 SHA256 438ad6c766855ab2ce3abaf995a1649e466cd6a15afa213197db86cfea6d9ab8
-DIST g15daemon_audacious_spectrum-1.0pre.tar.bz2 222311 RMD160 1b714dc3ccef503e1b66de12b8b03b0085e0e11d SHA1 b25b92bdf6c99c8984ae1569028c67d3f1405738 SHA256 738ee693da0b7dfdd9bbc337ffe4173a05fda2cac2b8bfde5cc7b098f461eb5b
-EBUILD audacious-g15-spectrum-1.0_pre.ebuild 1002 RMD160 78934b38c0f0c5e336004a0bb06e4cac36173e2d SHA1 149aaabae034d7e5053d48dfeabaf2b19c3b368e SHA256 bf99da937906d27e80849dd6626ae9fd4529709b5dcf5c07b5462816cd2f6420
-EBUILD audacious-g15-spectrum-2.5.2.ebuild 1004 RMD160 42d6970746b5045d02a09a8772552e64e27e1e75 SHA1 c1b82f057f96a09b7f2314560361252e02740354 SHA256 635c303fc0628667373efde132f1bc5c39b54c0f3c2a793a7af3383b8a3cc7d8
-EBUILD audacious-g15-spectrum-2.5.5.ebuild 946 RMD160 25de4d55b5e2f9395c50fd2d28235f88cfcd688d SHA1 03c1be792d0043014865bdefefca59fda2fa21b3 SHA256 0588769dc26d2b4a98c3c0c17e566e2b8cc86ef297f7dc119e0b4df0613653bf
-MISC ChangeLog 1483 RMD160 d46cab33b5a83ea9d98e84730ea190bdb6aa11bc SHA1 10725c2dd6a1ae75efc1d46a81e3ff06502548e3 SHA256 c50ffe24b98d8a1e4d4a2a13ebf4f2846100720ea777500f0c5f1ecc67c42fdc
-MISC metadata.xml 157 RMD160 e5cd56d383b6eb43713966ab5215a2e69d59abd7 SHA1 7e7895f5a9733298a33b7d7f5324c82523926b1b SHA256 64f66841884087f013ebf9bd830904ed01e5a4bbfa8530156364be91e5580a38
diff --git a/media-plugins/audacious-g15-spectrum/audacious-g15-spectrum-1.0_pre.ebuild b/media-plugins/audacious-g15-spectrum/audacious-g15-spectrum-1.0_pre.ebuild
deleted file mode 100644
index 293e5361a59f..000000000000
--- a/media-plugins/audacious-g15-spectrum/audacious-g15-spectrum-1.0_pre.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-g15-spectrum/audacious-g15-spectrum-1.0_pre.ebuild,v 1.3 2007/05/01 10:20:50 corsair Exp $
-
-inherit eutils versionator
-
-MY_PV=$(replace_version_separator 2 '' )
-MY_PN="g15daemon_audacious_spectrum"
-
-DESCRIPTION="Audacious Spectrum plugin to G15daemon"
-HOMEPAGE="http://g15daemon.sourceforge.net/"
-SRC_URI="mirror://sourceforge/g15daemon/${MY_PN}-${MY_PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND=">=app-misc/g15daemon-1.9.0
-	dev-libs/libg15
-	>=dev-libs/libg15render-1.2
-	>=media-sound/audacious-1.3
-	>=x11-libs/gtk+-2.6.0
-	dev-libs/glib
-	x11-libs/pango"
-
-RDEPEND="${DEPEND}"
-
-S="$WORKDIR/${MY_PN}-${MY_PV}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-audacious-1.3.patch"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS README
-}
diff --git a/media-plugins/audacious-g15-spectrum/audacious-g15-spectrum-2.5.2.ebuild b/media-plugins/audacious-g15-spectrum/audacious-g15-spectrum-2.5.2.ebuild
deleted file mode 100644
index 132ef7458b4f..000000000000
--- a/media-plugins/audacious-g15-spectrum/audacious-g15-spectrum-2.5.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-g15-spectrum/audacious-g15-spectrum-2.5.2.ebuild,v 1.4 2008/01/18 11:56:42 chainsaw Exp $
-
-inherit eutils versionator
-
-MY_PN="g15daemon-audacious"
-DESCRIPTION="Audacious Spectrum plugin to G15daemon"
-HOMEPAGE="http://g15daemon.sourceforge.net/"
-SRC_URI="mirror://sourceforge/g15daemon/${MY_PN}-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND=">=app-misc/g15daemon-1.9.0
-	dev-libs/libg15
-	>=dev-libs/libg15render-1.2
-	>=media-sound/audacious-1.3
-	>=x11-libs/gtk+-2.6.0
-	dev-libs/glib
-	x11-libs/pango"
-
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	if has_version '>=media-sound/audacious-1.4'; then
-		epatch "${FILESDIR}"/${P}-audacious-1.4.patch
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS README
-}
diff --git a/media-plugins/audacious-g15-spectrum/audacious-g15-spectrum-2.5.5.ebuild b/media-plugins/audacious-g15-spectrum/audacious-g15-spectrum-2.5.5.ebuild
deleted file mode 100644
index 4c00aeef6041..000000000000
--- a/media-plugins/audacious-g15-spectrum/audacious-g15-spectrum-2.5.5.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-g15-spectrum/audacious-g15-spectrum-2.5.5.ebuild,v 1.1 2008/09/13 23:07:11 robbat2 Exp $
-
-inherit eutils versionator
-
-MY_PN="g15daemon-audacious"
-DESCRIPTION="Audacious Spectrum plugin to G15daemon"
-HOMEPAGE="http://g15daemon.sourceforge.net/"
-SRC_URI="mirror://sourceforge/g15daemon/${MY_PN}-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND=">=app-misc/g15daemon-1.9.0
-	dev-libs/libg15
-	>=dev-libs/libg15render-1.2
-	>=media-sound/audacious-1.5
-	>=x11-libs/gtk+-2.6.0
-	dev-libs/glib
-	x11-libs/pango"
-
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-audacious-1.5.patch
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS README
-}
diff --git a/media-plugins/audacious-g15-spectrum/files/audacious-g15-spectrum-1.0_pre-audacious-1.3.patch b/media-plugins/audacious-g15-spectrum/files/audacious-g15-spectrum-1.0_pre-audacious-1.3.patch
deleted file mode 100644
index 73782eca5a14..000000000000
--- a/media-plugins/audacious-g15-spectrum/files/audacious-g15-spectrum-1.0_pre-audacious-1.3.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Add audacious-1.3 support to g15daemon_audacious_spectrum-1.0pre
-
-Via
-Alex Maclean <monkeh@monkeh.net>
-
---- g15daemon_audacious_spectrum.c.orig	2007-03-11 18:48:14.000000000 +0000
-+++ g15daemon_audacious_spectrum.c	2007-03-11 18:50:15.000000000 +0000
-@@ -195,15 +195,16 @@
-     TitleInput *tuple;
-     char *strtok_ptr;
-     static int vol_timeout=0;
-+	Playlist *current = playlist_get_active();
- 
-         pthread_mutex_lock (&g15buf_mutex);
- 	g15r_clearScreen (canvas, G15_COLOR_WHITE);
- 
--	if (playlist_get_length() > 0)
-+	if (playlist_get_length(current) > 0)
- 	  {
--	        playlist_pos = playlist_get_position();
-+	        playlist_pos = playlist_get_position(current);
- 		
--	        tuple = playlist_get_tuple(playlist_pos);
-+	        tuple = playlist_get_tuple(current,playlist_pos);
- 		title = xmms_get_titlestring("%p - %t", tuple);
- 	        if(title!=NULL){ //amarok doesnt support providing title info via xmms interface :(
- 	            if(strlen(title)>32) {
diff --git a/media-plugins/audacious-g15-spectrum/files/audacious-g15-spectrum-2.5.2-audacious-1.4.patch b/media-plugins/audacious-g15-spectrum/files/audacious-g15-spectrum-2.5.2-audacious-1.4.patch
deleted file mode 100644
index 3c973a533ff5..000000000000
--- a/media-plugins/audacious-g15-spectrum/files/audacious-g15-spectrum-2.5.2-audacious-1.4.patch
+++ /dev/null
@@ -1,179 +0,0 @@
---- g15daemon-audacious-2.5.2/g15daemon_audacious_spectrum.c	2007-09-15 06:48:10.000000000 -0400
-+++ g15daemon-audacious-2.5.2-new/g15daemon_audacious_spectrum.c	2007-12-31 00:01:24.000000000 -0500
-@@ -39,10 +39,9 @@
- 
- #include <audacious/plugin.h>
- #include <audacious/util.h>
--#include <audacious/beepctrl.h>
-+#include <audacious/auddrct.h>
- #include <audacious/configdb.h>
- #include <audacious/playlist.h>
--#include <audacious/titlestring.h>
- 
- #include <libg15.h>
- #include <libg15render.h>
-@@ -197,23 +196,23 @@
- 
- 
- VisPlugin g15analyser_vp = {
--  NULL,
--  NULL,
--  0,
--  PLUGIN_NAME " " PLUGIN_VERSION,
--  1,
--  1,
--  g15analyser_init,           /* init           */
--  g15analyser_cleanup,        /* cleanup        */
--  g15analyser_about,          /* about          */
--  g15analyser_conf,           /* configure      */
--  NULL,                       /* disable_plugin */
--  g15analyser_playback_start, /* playback_start */
--  g15analyser_playback_stop,  /* playback_stop  */
--  g15analyser_render_pcm,     /* render_pcm     */
--  g15analyser_render_freq     /* render_freq    */
-+  .description =    PLUGIN_NAME " " PLUGIN_VERSION,
-+  .num_pcm_chs_wanted = 1,
-+  .num_freq_chs_wanted = 1,
-+  .init =           g15analyser_init,           /* init           */
-+  .cleanup =        g15analyser_cleanup,        /* cleanup        */
-+  .about =          g15analyser_about,          /* about          */
-+  .configure =      g15analyser_conf,           /* configure      */
-+  .playback_start = g15analyser_playback_start, /* playback_start */
-+  .playback_stop =  g15analyser_playback_stop,  /* playback_stop  */
-+  .render_pcm =     g15analyser_render_pcm,     /* render_pcm     */
-+  .render_freq =    g15analyser_render_freq     /* render_freq    */
- };
- 
-+VisPlugin *g15_vp[] = { &g15analyser_vp, NULL };
-+
-+SIMPLE_VISUAL_PLUGIN(g15, g15_vp);
-+
- gint g15analyser_disable(gpointer data){
-   g15analyser_vp.disable_plugin (&g15analyser_vp); /* disable if unusable */
-   return FALSE;
-@@ -223,6 +222,11 @@
-   return &g15analyser_vp;
- }
- 
-+int get_main_volume() {
-+	int tmpvol;
-+	audacious_drct_get_main_volume(&tmpvol);
-+	return tmpvol;
-+}
- 
- void g15spectrum_read_config(void)
- {
-@@ -725,52 +729,52 @@
-     if(event.xkey.keycode==XKeysymToKeycode(dpy, XF86XK_AudioPlay)) {
-       if(playing) {
- 	if (paused)  {
--	  xmms_remote_play(g15analyser_vp.xmms_session);
-+	  audacious_drct_play();
- 	  paused = 0;
- 	} else {
--	  xmms_remote_pause(g15analyser_vp.xmms_session);
-+	  audacious_drct_pause();
- 	  paused = 1;
- 	}
-       } else
--	xmms_remote_play(g15analyser_vp.xmms_session);
-+	audacious_drct_play();
-     }
-     
-     if(event.xkey.keycode==XKeysymToKeycode(dpy, XF86XK_AudioStop))
--      xmms_remote_stop(g15analyser_vp.xmms_session);
-+      audacious_drct_stop();
-     
-     if(event.xkey.keycode==XKeysymToKeycode(dpy, XF86XK_AudioLowerVolume)){
--      volume = xmms_remote_get_main_volume(g15analyser_vp.xmms_session);
-+      volume = get_main_volume();
-       if(volume<1)
- 	volume=1;
--      xmms_remote_set_main_volume(g15analyser_vp.xmms_session, --volume);
-+      audacious_drct_set_main_volume(--volume);
-     }
-     
-     if(event.xkey.keycode==XKeysymToKeycode(dpy, XF86XK_AudioRaiseVolume)){
--      volume = xmms_remote_get_main_volume(g15analyser_vp.xmms_session);
-+      volume = get_main_volume();
-       if(volume>99)
- 	volume=99;
--      xmms_remote_set_main_volume(g15analyser_vp.xmms_session, ++volume);
-+      audacious_drct_set_main_volume(++volume);
-     }
-     
-     if(event.xkey.keycode==XKeysymToKeycode(dpy, XF86XK_AudioMute)){
--      if(xmms_remote_get_main_volume(g15analyser_vp.xmms_session)!=0){
--	lastvolume = xmms_remote_get_main_volume(g15analyser_vp.xmms_session);
-+      if(get_main_volume()!=0){
-+	volume = get_main_volume();
- 	volume = 0;
-       }
-       else {
- 	volume = lastvolume;
-       }
-       
--      xmms_remote_set_main_volume(g15analyser_vp.xmms_session, volume);
-+      audacious_drct_set_main_volume(volume);
-     }
-     
-     if(event.xkey.keycode==XKeysymToKeycode(dpy, XF86XK_AudioNext))
-       if (playing)
--	xmms_remote_playlist_next(g15analyser_vp.xmms_session);
-+	audacious_drct_playlist_next();
-     
-     if(event.xkey.keycode==XKeysymToKeycode(dpy, XF86XK_AudioPrev))
-       if (playing)
--	xmms_remote_playlist_prev(g15analyser_vp.xmms_session);
-+	audacious_drct_playlist_prev();
-     
-   }
-   return TRUE;
-@@ -790,11 +794,11 @@
-   pthread_mutex_lock (&g15buf_mutex);
-   g15r_clearScreen (canvas, G15_COLOR_WHITE);
-   
--  if (xmms_remote_get_playlist_length(g15analyser_vp.xmms_session) > 0)
-+  if (audacious_drct_get_playlist_length() > 0)
-     {
--      playlist_pos = xmms_remote_get_playlist_pos(g15analyser_vp.xmms_session);
-+      playlist_pos = audacious_drct_get_playlist_pos();
-       
--      title = xmms_remote_get_playlist_title(g15analyser_vp.xmms_session, playlist_pos);
-+      title = audacious_drct_get_playlist_title(playlist_pos);
-       if(title!=NULL && show_title){
- 	if (rownum != 1) {
- 	  /*
-@@ -891,8 +895,8 @@
- 	}
-       }
-       if (show_pbar){
--	int output_time = xmms_remote_get_output_time(g15analyser_vp.xmms_session)/1000;
--	int playlist_time = xmms_remote_get_playlist_time(g15analyser_vp.xmms_session,playlist_pos)/1000;
-+	int output_time = audacious_drct_get_output_time()/1000;
-+	int playlist_time = audacious_drct_get_playlist_time(playlist_pos)/1000;
- 	/* bugfix: Sometimes xmms don't get the output time */
- 	if (playlist_time == 0){
- 	  playlist_time = 1000;
-@@ -974,13 +978,13 @@
-   else
-     g15r_renderString (canvas, (unsigned char *)"Playlist Empty", 0, G15_TEXT_LARGE, 24, 16);
-   
--  if(lastvolume!=xmms_remote_get_main_volume(g15analyser_vp.xmms_session) || vol_timeout>=0) {
--    if(lastvolume!=xmms_remote_get_main_volume(g15analyser_vp.xmms_session))
-+  if(lastvolume!=get_main_volume() || vol_timeout>=0) {
-+    if(lastvolume!=get_main_volume())
-       vol_timeout=10;
-     else
-       vol_timeout--;
-     /* render volume */
--    lastvolume = xmms_remote_get_main_volume(g15analyser_vp.xmms_session);
-+    lastvolume = get_main_volume();
-     if (lastvolume >= 0)	
-       g15r_drawBar (canvas, 10, 15, 149, 28, G15_COLOR_BLACK, lastvolume, 100, 1);
-     canvas->mode_xor=1;
-@@ -1193,4 +1197,3 @@
-   return;
-   
- }
--
diff --git a/media-plugins/audacious-g15-spectrum/files/audacious-g15-spectrum-2.5.5-audacious-1.5.patch b/media-plugins/audacious-g15-spectrum/files/audacious-g15-spectrum-2.5.5-audacious-1.5.patch
deleted file mode 100644
index 3f07d28b8678..000000000000
--- a/media-plugins/audacious-g15-spectrum/files/audacious-g15-spectrum-2.5.5-audacious-1.5.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-As of Audacious-1.5, the old bmp_cfg* functions all have new names, leading to
-undefined symbols or compile failures.
-
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
-diff -Nuar --exclude '*~' g15daemon-audacious-2.5.5.orig/g15daemon_audacious_spectrum.c g15daemon-audacious-2.5.5/g15daemon_audacious_spectrum.c
---- g15daemon-audacious-2.5.5.orig/g15daemon_audacious_spectrum.c	2008-05-24 05:58:01.000000000 -0700
-+++ g15daemon-audacious-2.5.5/g15daemon_audacious_spectrum.c	2008-09-13 15:50:50.635729491 -0700
-@@ -287,28 +287,28 @@
- {
-   ConfigDb *cfg;
-   
--  cfg = bmp_cfg_db_open();
-+  cfg = aud_cfg_db_open();
-   pthread_mutex_lock (&g15buf_mutex);
-   if (cfg)
-     {
--      bmp_cfg_db_get_int(cfg, "G15Daemon Spectrum", "visualisation_type", (int*)&vis_type);
--      bmp_cfg_db_get_float(cfg, "G15Daemon Spectrum", "linearity", (float*)&linearity);
--      bmp_cfg_db_get_int(cfg, "G15Daemon Spectrum", "amplification", (int*)&amplification);
--      bmp_cfg_db_get_int(cfg, "G15Daemon Spectrum", "bars_limit", (int*)&limit);
--      bmp_cfg_db_get_int(cfg, "G15Daemon Spectrum", "num_bars", (int*)&num_bars);
--      bmp_cfg_db_get_int(cfg, "G15Daemon Spectrum", "enable_peak", (int*)&enable_peak);
--      bmp_cfg_db_get_int(cfg, "G15Daemon Spectrum", "detached_peak", (int*)&detached_peak);
--      bmp_cfg_db_get_int(cfg, "G15Daemon Spectrum", "line_mode", (int*)&line_mode);
--      bmp_cfg_db_get_int(cfg, "G15Daemon Spectrum", "analog_mode", (int*)&analog_mode);
--      bmp_cfg_db_get_int(cfg, "G15Daemon Spectrum", "analog_step", (int*)&analog_step);
--      bmp_cfg_db_get_int(cfg, "G15Daemon Spectrum", "enable_keybindings", (int*)&enable_keybindings);
--      bmp_cfg_db_get_int(cfg, "G15Daemon Spectrum", "show_title", (int*)&show_title);
--      bmp_cfg_db_get_int(cfg, "G15Daemon Spectrum", "show_pbar", (int*)&show_pbar);
--      bmp_cfg_db_get_int(cfg, "G15Daemon Spectrum", "show_time", (int*)&show_time);
--      bmp_cfg_db_get_int(cfg, "G15Daemon Spectrum", "rownum", (int*)&rownum);
--      bmp_cfg_db_get_int(cfg, "G15Daemon Spectrum", "title_overlay", (int*)&title_overlay);
-+      aud_cfg_db_get_int(cfg, "G15Daemon Spectrum", "visualisation_type", (int*)&vis_type);
-+      aud_cfg_db_get_float(cfg, "G15Daemon Spectrum", "linearity", (float*)&linearity);
-+      aud_cfg_db_get_int(cfg, "G15Daemon Spectrum", "amplification", (int*)&amplification);
-+      aud_cfg_db_get_int(cfg, "G15Daemon Spectrum", "bars_limit", (int*)&limit);
-+      aud_cfg_db_get_int(cfg, "G15Daemon Spectrum", "num_bars", (int*)&num_bars);
-+      aud_cfg_db_get_int(cfg, "G15Daemon Spectrum", "enable_peak", (int*)&enable_peak);
-+      aud_cfg_db_get_int(cfg, "G15Daemon Spectrum", "detached_peak", (int*)&detached_peak);
-+      aud_cfg_db_get_int(cfg, "G15Daemon Spectrum", "line_mode", (int*)&line_mode);
-+      aud_cfg_db_get_int(cfg, "G15Daemon Spectrum", "analog_mode", (int*)&analog_mode);
-+      aud_cfg_db_get_int(cfg, "G15Daemon Spectrum", "analog_step", (int*)&analog_step);
-+      aud_cfg_db_get_int(cfg, "G15Daemon Spectrum", "enable_keybindings", (int*)&enable_keybindings);
-+      aud_cfg_db_get_int(cfg, "G15Daemon Spectrum", "show_title", (int*)&show_title);
-+      aud_cfg_db_get_int(cfg, "G15Daemon Spectrum", "show_pbar", (int*)&show_pbar);
-+      aud_cfg_db_get_int(cfg, "G15Daemon Spectrum", "show_time", (int*)&show_time);
-+      aud_cfg_db_get_int(cfg, "G15Daemon Spectrum", "rownum", (int*)&rownum);
-+      aud_cfg_db_get_int(cfg, "G15Daemon Spectrum", "title_overlay", (int*)&title_overlay);
-       
--      bmp_cfg_db_close(cfg);
-+      aud_cfg_db_close(cfg);
-       
-     }
-   /* check conf integrity */
-@@ -351,27 +351,27 @@
- {
-   ConfigDb *cfg;
-   
--  cfg = bmp_cfg_db_open();
-+  cfg = aud_cfg_db_open();
-   
-   if (cfg)
-     {
--      bmp_cfg_db_set_int(cfg, "G15Daemon Spectrum", "visualisation_type", vis_type);
--      bmp_cfg_db_set_float(cfg, "G15Daemon Spectrum", "linearity", linearity);
--      bmp_cfg_db_set_int(cfg, "G15Daemon Spectrum", "amplification", amplification);
--      bmp_cfg_db_set_int(cfg, "G15Daemon Spectrum", "bars_limit", limit);
--      bmp_cfg_db_set_int(cfg, "G15Daemon Spectrum", "num_bars", num_bars);
--      bmp_cfg_db_set_int(cfg, "G15Daemon Spectrum", "enable_peak", enable_peak);
--      bmp_cfg_db_set_int(cfg, "G15Daemon Spectrum", "detached_peak", detached_peak);
--      bmp_cfg_db_set_int(cfg, "G15Daemon Spectrum", "analog_mode", analog_mode);
--      bmp_cfg_db_set_int(cfg, "G15Daemon Spectrum", "line_mode", line_mode);
--      bmp_cfg_db_set_int(cfg, "G15Daemon Spectrum", "analog_step", analog_step);
--      bmp_cfg_db_set_int(cfg, "G15Daemon Spectrum", "enable_keybindings", enable_keybindings);
--      bmp_cfg_db_set_int(cfg, "G15Daemon Spectrum", "show_title", show_title);
--      bmp_cfg_db_set_int(cfg, "G15Daemon Spectrum", "show_pbar", show_pbar);
--      bmp_cfg_db_set_int(cfg, "G15Daemon Spectrum", "show_time", show_time);
--      bmp_cfg_db_set_int(cfg, "G15Daemon Spectrum", "rownum", rownum);
--      bmp_cfg_db_set_int(cfg, "G15Daemon Spectrum", "title_overlay", title_overlay);
--      bmp_cfg_db_close(cfg);
-+      aud_cfg_db_set_int(cfg, "G15Daemon Spectrum", "visualisation_type", vis_type);
-+      aud_cfg_db_set_float(cfg, "G15Daemon Spectrum", "linearity", linearity);
-+      aud_cfg_db_set_int(cfg, "G15Daemon Spectrum", "amplification", amplification);
-+      aud_cfg_db_set_int(cfg, "G15Daemon Spectrum", "bars_limit", limit);
-+      aud_cfg_db_set_int(cfg, "G15Daemon Spectrum", "num_bars", num_bars);
-+      aud_cfg_db_set_int(cfg, "G15Daemon Spectrum", "enable_peak", enable_peak);
-+      aud_cfg_db_set_int(cfg, "G15Daemon Spectrum", "detached_peak", detached_peak);
-+      aud_cfg_db_set_int(cfg, "G15Daemon Spectrum", "analog_mode", analog_mode);
-+      aud_cfg_db_set_int(cfg, "G15Daemon Spectrum", "line_mode", line_mode);
-+      aud_cfg_db_set_int(cfg, "G15Daemon Spectrum", "analog_step", analog_step);
-+      aud_cfg_db_set_int(cfg, "G15Daemon Spectrum", "enable_keybindings", enable_keybindings);
-+      aud_cfg_db_set_int(cfg, "G15Daemon Spectrum", "show_title", show_title);
-+      aud_cfg_db_set_int(cfg, "G15Daemon Spectrum", "show_pbar", show_pbar);
-+      aud_cfg_db_set_int(cfg, "G15Daemon Spectrum", "show_time", show_time);
-+      aud_cfg_db_set_int(cfg, "G15Daemon Spectrum", "rownum", rownum);
-+      aud_cfg_db_set_int(cfg, "G15Daemon Spectrum", "title_overlay", title_overlay);
-+      aud_cfg_db_close(cfg);
-     }
-   
- }
diff --git a/media-plugins/audacious-g15-spectrum/metadata.xml b/media-plugins/audacious-g15-spectrum/metadata.xml
deleted file mode 100644
index ea35c2748773..000000000000
--- a/media-plugins/audacious-g15-spectrum/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>lcd</herd>
-</pkgmetadata>