Initial import

70 files changed, 2503 insertions, 0 deletions

diff --git a/media-plugins/eq-xmms/Manifest b/media-plugins/eq-xmms/Manifest
new file mode 100644
index 0000000..cdda268
--- /dev/null
+++ b/media-plugins/eq-xmms/Manifest
@@ -0,0 +1,3 @@
+AUX eq-xmms-0.7-amd64_support.patch 1363 RMD160 665e434867da613e400b27c8bc518a99b08922df SHA1 27191438bc3b77a1c05ca723b7eb2e5856f4ce7c SHA256 2ed37439d5ad47daaaf8bd8da34619921420f92a28f7f96efe8bc9784a0965f9
+DIST eq-xmms-0.7.tar.gz 632130 RMD160 4befac780189d9eeceb3c54e840f8367ed31d8dc SHA1 8c4e19fe4a7b55bd975644d4fe493ec6698315ea SHA256 158a51c7ffe89ce5d8c8f25ee8f3ac65efb1ad2d1ba91262824b3def2e0a7dc2
+EBUILD eq-xmms-0.7.ebuild 1105 RMD160 9a7d1edc4bf8101053700d8c94b37639a5b50be0 SHA1 f5f3df35b3d8de5aa2eee58b21fbabed4df7609d SHA256 42bc0fa15a21b33ee7c62345255f7715f88a909c3bec9b927da7adf3698e8b5f
diff --git a/media-plugins/eq-xmms/eq-xmms-0.7.ebuild b/media-plugins/eq-xmms/eq-xmms-0.7.ebuild
new file mode 100644
index 0000000..6de487b
--- /dev/null
+++ b/media-plugins/eq-xmms/eq-xmms-0.7.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/eq-xmms/eq-xmms-0.7.ebuild,v 1.1 2006/01/16 17:42:39 voxus Exp $
+
+IUSE="sse-filters"
+
+inherit eutils autotools
+
+DESCRIPTION="EQU is a realtime graphical equalizer effect plugin that will equalize almost everything that you play through XMMS, not just the MP3s"
+HOMEPAGE="http://equ.sourceforge.net/"
+SRC_URI="mirror://sourceforge/equ/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 amd64 ~sparc ~ppc"
+
+RDEPEND="media-sound/xmms"
+DEPEND="${RDEPEND}
+	>=sys-devel/automake-1.7"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${P}-amd64_support.patch
+	eautoreconf
+}
+
+src_compile() {
+	local myconf
+
+	use sse-filters && {
+		myconf="--enable-sse-filters"
+
+		use amd64 && myconf="${myconf} --enable-sse2"
+	}
+
+	econf ${myconf} || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" libdir=`xmms-config --effect-plugin-dir` install || die
+
+	dodoc AUTHORS BUGS ChangeLog NEWS README README.BSD SKINS TODO
+}
diff --git a/media-plugins/eq-xmms/files/eq-xmms-0.7-amd64_support.patch b/media-plugins/eq-xmms/files/eq-xmms-0.7-amd64_support.patch
new file mode 100644
index 0000000..7c1fd65
--- /dev/null
+++ b/media-plugins/eq-xmms/files/eq-xmms-0.7-amd64_support.patch
@@ -0,0 +1,45 @@
+--- configure.in	2006-01-16 20:04:58.268962424 +0300
++++ configure.in	2006-01-16 20:07:43.681815848 +0300
+@@ -155,6 +155,9 @@
+               XF_CFLAGS="$XF_CFLAGS -DBENCHMARK"
+             fi
+           ;;
++	  x86_64-*-*)
++	    autodetect=no
++	    ARCH_DEFINES="-DARCH_X86_64 -march=k8"
+         esac  
+       ;;
+       *)
+--- src/iir.c	2006-01-16 20:01:23.000000000 +0300
++++ src/iir.c	2006-01-16 20:09:50.580524312 +0300
+@@ -60,7 +60,7 @@
+   clean_history();
+ }
+ 
+-#ifdef ARCH_X86
++#if defined(ARCH_X86) || defined(ARCH_X86_64)
+ /* Round function provided by Frank Klemm which saves around 100K
+  * CPU cycles in my PIII for each call to the IIR function with 4K samples
+  */
+--- src/iir_fpu.c	2006-01-15 03:26:32.000000000 +0300
++++ src/iir_fpu.c	2006-01-16 20:10:22.492672928 +0300
+@@ -163,7 +163,7 @@
+ #ifdef ARCH_PPC
+       tempgint = round_ppc(out[channel]);
+ #else
+-#ifdef ARCH_X86
++#if defined(ARCH_X86) || defined(ARCH_X86_64)
+       tempgint = round_trick(out[channel]);
+ #else
+       tempgint = (int)out[channel];
+--- src/iir.h	2006-01-15 03:26:32.000000000 +0300
++++ src/iir.h	2006-01-16 20:15:35.987014544 +0300
+@@ -58,7 +58,7 @@
+ 
+ __inline__ int iir(gpointer * d, gint length, gint srate, gint nch);
+ 
+-#ifdef ARCH_X86
++#if defined(ARCH_X86) || defined(ARCH_X86_64)
+ __inline__ int round_trick(float floatvalue_to_round);
+ #endif
+ #ifdef ARCH_PPC
diff --git a/media-plugins/xmmplayer/Manifest b/media-plugins/xmmplayer/Manifest
new file mode 100644
index 0000000..3c58be8
--- /dev/null
+++ b/media-plugins/xmmplayer/Manifest
@@ -0,0 +1,2 @@
+DIST xmmplayer-0.3.3.tar.gz 315346 RMD160 8c74c5f89522106c3a7c10b677d40ad67b630fb5 SHA1 68b7580fa17ee296ee57cb3d074117c003dfd93c SHA256 760e86d27924e3251e23c3cf9e50ff868191a45a3205dbe41b0311c0a421752e
+EBUILD xmmplayer-0.3.3.ebuild 758 RMD160 fb47e75cb399f587b7df978a23c395711b01642a SHA1 ca112e13628212a3aa204892b450f2393aa61beb SHA256 f2f2f6f7a2f44634274f11cbb2f19e36ec04b0c60162a9f66825dcce08ecd13a
diff --git a/media-plugins/xmmplayer/xmmplayer-0.3.3.ebuild b/media-plugins/xmmplayer/xmmplayer-0.3.3.ebuild
new file mode 100644
index 0000000..4c694fb
--- /dev/null
+++ b/media-plugins/xmmplayer/xmmplayer-0.3.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmmplayer/xmmplayer-0.3.3.ebuild,v 1.7 2005/09/14 05:26:33 agriffis Exp $
+
+IUSE=""
+
+DESCRIPTION="XMMPlayer is an input plugin for XMMS"
+HOMEPAGE="http://thegraveyard.org/xmmplayer.php"
+SRC_URI="http://thegraveyard.org/files/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="alpha amd64 ~ppc ~sparc x86"
+
+DEPEND="media-sound/xmms
+	media-video/mplayer"
+
+src_install() {
+	make DESTDIR=${D} libdir=`xmms-config --input-plugin-dir` install || die
+	dodoc AUTHORS README
+}
+
+pkg_postinst() {
+	einfo "*** WARNING: XMMS will play all mplayer supported file"
+	einfo "once the mplayer input plugin is configured"
+}
diff --git a/media-plugins/xmms-alsa/Manifest b/media-plugins/xmms-alsa/Manifest
new file mode 100644
index 0000000..675ead9
--- /dev/null
+++ b/media-plugins/xmms-alsa/Manifest
@@ -0,0 +1,12 @@
+DIST RusXMMS2-csa35.tar.bz2 128165 RMD160 047782f64bfbcc8119d584f9f3dc9680d324519a SHA1 9c167e33b36e6e35917dd7eca9435f3408d6a9c9 SHA256 3bb63e9ce6fd2bca289ebfbde13c7dd3c0b0ca734e676b647acac1ef293312b4
+DIST RusXMMS2-csa41.tar.bz2 96642 RMD160 7ead4de64156b20682e90f8fc4c85112cf9b2cdc SHA1 034b2264a17977f614c91809bc4ee9ee7c07ecaf SHA256 e64df1956502e48c09ca60262efb7f1953a76d82a70c801e4797ca81e130e8d0
+DIST RusXMMS2-csa43.tar.bz2 104507 RMD160 4f609b588e5cdef4b4190c09f11c85a3f590913d SHA1 51a73494ebee0676a7a8f04dc1fc190d9c742b57 SHA256 b2c0ac09a481b2d77c6e4750a19497f550d93eb961839df3db5ce5da714e6caf
+DIST xmms-1.2.10-gentoo-m4-1.1.tar.bz2 26978 RMD160 63ce094969f33205420f9823a970eb3faabf2e3e SHA1 4ef6fb75370861201161adf8f65ec5db735516f4 SHA256 e253fb2a515d3c7881617172f14fccad6a42cea660b8eaaeef9657114288e46f
+DIST xmms-1.2.10-gentoo-patches-2.2.6.tar.bz2 545931 RMD160 6d376e2edadc1ac69a704575dd04775364c9ed1f SHA1 1a5a2ae2b744d5e1ae1ba72d3cb0bb078963aae0 SHA256 b9a8633fe22af156ca1af65ac35d369242ce8016619d87647ba8389b8d52ba96
+DIST xmms-1.2.10.tar.bz2 2418265 RMD160 0360cbb8c326b3325bd8ebb3343c69a9788d7084 SHA1 a3c3d3756d5263183c27b3c50a7f5404cba8bfaf SHA256 ff9eabae2074043294a19ec7beaf0959bd076f6cd60558264faeec08f4a0eb6a
+DIST xmms-1.2.11-gentoo-patches-2.3.0.1.tar.bz2 16946 RMD160 49e3cd7eaac251c086cff3976e5be6e75bd33938 SHA1 29977700765aaf5ed860e3cccbb958f61f574f34 SHA256 fdfec6f54b65a8a17d4f6342cadc8c9b1f503f1d0672761c1bab963da6a86a91
+DIST xmms-1.2.11-gentoo-patches-2.3.0.tar.bz2 16739 RMD160 d45430baccccad600b3f0a37e4fd0b40e8d8bfca SHA1 9e0eb1b39e4c7385112637412ada7bc186e1b3b9 SHA256 9aebef51507f49b25f771ed380c652950a1f04e9105fb7029ef3a1889ea19abd
+DIST xmms-1.2.11.tar.bz2 2581032 RMD160 466a624572574c56595ef34f42c43d0b74857b0a SHA1 9d1eae4baab25fd35c9ddfb49321ca60222f672d SHA256 7ec15c56632b6c82e61ccddeaefd372359af2f005708a58cdf3951c574b20390
+EBUILD xmms-alsa-1.2.10-r3.ebuild 504 RMD160 3376141e1a6b49cc75ec87e62df3d987fad93e50 SHA1 6379db1476205d4997b97689ccd9094c0b17e5bb SHA256 aea371637a7bec6bd4a9f0ad9880f77a215d62de76f23210355f364306c05eb8
+EBUILD xmms-alsa-1.2.11-r2.ebuild 506 RMD160 e796568a73f615d38e2532587b8bd473dc70f81f SHA1 33fa88fa419ee6e2cd7ddeead947230855ae33b3 SHA256 656fb1272fe7ea5d8f0f6cf118c478d23363ede2caece68c799e93ae9348a858
+EBUILD xmms-alsa-1.2.11.ebuild 504 RMD160 f9d8b8b6bd50f9eb819a4caae75378fe92701a70 SHA1 c8b9dded75e105bc0eb254e5bfc47229800140a6 SHA256 c072ab9fce326434bda4893a6d4cd34fd2f873754365cc7ac7ce26ffeb926496
diff --git a/media-plugins/xmms-alsa/xmms-alsa-1.2.10-r3.ebuild b/media-plugins/xmms-alsa/xmms-alsa-1.2.10-r3.ebuild
new file mode 100644
index 0000000..ecbd25d
--- /dev/null
+++ b/media-plugins/xmms-alsa/xmms-alsa-1.2.10-r3.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-alsa/xmms-alsa-1.2.10-r3.ebuild,v 1.4 2006/07/05 06:10:22 vapier Exp $
+
+M4_VER="1.1"
+PATCH_VER="2.2.6"
+RUSXMMS_VER="35"
+inherit rusxmms-plugin
+
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86"
+IUSE=""
+
+DEPEND=">=media-sound/xmms-1.2.10
+	media-libs/alsa-lib"
+
+PLUGIN_PATH="Output/alsa"
+
+myconf="--enable-alsa"
diff --git a/media-plugins/xmms-alsa/xmms-alsa-1.2.11-r2.ebuild b/media-plugins/xmms-alsa/xmms-alsa-1.2.11-r2.ebuild
new file mode 100644
index 0000000..171c5de
--- /dev/null
+++ b/media-plugins/xmms-alsa/xmms-alsa-1.2.11-r2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-alsa/xmms-alsa-1.2.10-r3.ebuild,v 1.4 2006/07/05 06:10:22 vapier Exp $
+
+M4_VER="1.1"
+PATCH_VER="2.3.0.1"
+RUSXMMS_VER="43"
+inherit rusxmms-plugin
+
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86"
+IUSE=""
+
+DEPEND=">=media-sound/xmms-1.2.10
+	media-libs/alsa-lib"
+
+PLUGIN_PATH="Output/alsa"
+
+myconf="--enable-alsa"
diff --git a/media-plugins/xmms-alsa/xmms-alsa-1.2.11.ebuild b/media-plugins/xmms-alsa/xmms-alsa-1.2.11.ebuild
new file mode 100644
index 0000000..35b82c5
--- /dev/null
+++ b/media-plugins/xmms-alsa/xmms-alsa-1.2.11.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-alsa/xmms-alsa-1.2.10-r3.ebuild,v 1.4 2006/07/05 06:10:22 vapier Exp $
+
+M4_VER="1.1"
+PATCH_VER="2.3.0"
+RUSXMMS_VER="41"
+inherit rusxmms-plugin
+
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86"
+IUSE=""
+
+DEPEND=">=media-sound/xmms-1.2.10
+	media-libs/alsa-lib"
+
+PLUGIN_PATH="Output/alsa"
+
+myconf="--enable-alsa"
diff --git a/media-plugins/xmms-arts/Manifest b/media-plugins/xmms-arts/Manifest
new file mode 100644
index 0000000..3e4b89c
--- /dev/null
+++ b/media-plugins/xmms-arts/Manifest
@@ -0,0 +1,3 @@
+AUX xmms-arts-0.7.1-eintr.patch 377 RMD160 7196d846df614fc8a9b222c208a4460d215d1fd4 SHA1 ea8e025c6365612fcb2d4229674e4280900e4c90 SHA256 fd0f6e3ec925494cc0c8603008bffebf60584416516864a53b6b2984e0dbb177
+DIST arts_output-0.7.1.tar.gz 236839 RMD160 3784f2ef5f99c61123477ce03ee6bcb1ffdf3214 SHA1 026b7b0be459cfff75557c04e54425c4d21dacaf SHA256 912295b0509ed1befc4de8cf2c9e47ed0318963dabe244579452a2296660db96
+EBUILD xmms-arts-0.7.1-r2.ebuild 832 RMD160 64e2168b5a130965df7e96d151e4406681c0064b SHA1 6777fb5078c8e950f46ca794df7751fb28976e03 SHA256 62b212b585e505754130f2b0790396334821f67c7f4a214e38f1cc7829d3fc41
diff --git a/media-plugins/xmms-arts/files/xmms-arts-0.7.1-eintr.patch b/media-plugins/xmms-arts/files/xmms-arts-0.7.1-eintr.patch
new file mode 100644
index 0000000..96a28d5
--- /dev/null
+++ b/media-plugins/xmms-arts/files/xmms-arts-0.7.1-eintr.patch
@@ -0,0 +1,15 @@
+--- audio.c.old	2005-01-09 13:32:09.629042808 +0100
++++ audio.c	2005-01-09 13:32:59.646439008 +0100
+@@ -86,8 +86,12 @@
+ 	timeout.tv_sec = 10;
+ 	timeout.tv_usec = 0;
+ 
++again:
+ 	sr = select(fd + 1, &rdfs, NULL, NULL, &timeout);
+ 	if (sr < 0) {
++		if(errno==EINTR) {
++			goto again;
++		}
+ 		g_message("wait_for_helper(): select failed: %s",
+ 			  strerror(errno));
+ 		return -1;
diff --git a/media-plugins/xmms-arts/xmms-arts-0.7.1-r2.ebuild b/media-plugins/xmms-arts/xmms-arts-0.7.1-r2.ebuild
new file mode 100644
index 0000000..9556a0f
--- /dev/null
+++ b/media-plugins/xmms-arts/xmms-arts-0.7.1-r2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-arts/xmms-arts-0.7.1-r2.ebuild,v 1.14 2006/08/28 18:29:29 jer Exp $
+
+inherit eutils
+
+MY_P=arts_output-${PV}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="This output plugin allows xmms to work with arts, KDE's sound system"
+HOMEPAGE="http://www.xmms.org/plugins.php"
+SRC_URI="http://havardk.xmms.org/plugins/arts_output/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+IUSE=""
+
+DEPEND=">=media-sound/xmms-1.2.7
+	kde-base/arts"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-eintr.patch
+}
+
+src_install() {
+	make DESTDIR=${D} libdir=`xmms-config --output-plugin-dir` install || die
+
+	dodoc AUTHORS ChangeLog NEWS README
+}
diff --git a/media-plugins/xmms-crossfade/ChangeLog b/media-plugins/xmms-crossfade/ChangeLog
new file mode 100644
index 0000000..ae7917e
--- /dev/null
+++ b/media-plugins/xmms-crossfade/ChangeLog
@@ -0,0 +1,123 @@
+# ChangeLog for media-plugins/xmms-crossfade
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-crossfade/ChangeLog,v 1.26 2006/09/24 09:05:58 hansmi Exp $
+
+  24 Sep 2006; Michael Hanselmann <hansmi@gentoo.org>
+  xmms-crossfade-0.3.11.ebuild:
+  Stable on ppc.
+
+  07 Sep 2006; Gustavo Zacarias <gustavoz@gentoo.org>
+  xmms-crossfade-0.3.11.ebuild:
+  Stable on sparc
+
+  06 Sep 2006; Joshua Jackson <tsunam@gentoo.org>
+  xmms-crossfade-0.3.11.ebuild:
+  Stable x86; bug #146451
+
+  06 Sep 2006; Luis Medinas <metalgod@gentoo.org>
+  xmms-crossfade-0.3.11.ebuild:
+  Stable on amd64. Bug #146451.
+
+*xmms-crossfade-0.3.11 (26 Jul 2006)
+
+  26 Jul 2006; Luis Medinas <metalgod@gentoo.org>
+  +xmms-crossfade-0.3.11.ebuild:
+  Version Bump.
+
+*xmms-crossfade-0.3.10 (06 Dec 2005)
+
+  06 Dec 2005; Luis Medinas <metalgod@gentoo.org>
+  +xmms-crossfade-0.3.10.ebuild:
+  Version Bump. Drop gcc4 patches since the upstream fix those issues.
+
+*xmms-crossfade-0.3.9 (02 Dec 2005)
+
+  02 Dec 2005; Luis Medinas <metalgod@gentoo.org>
+  +files/xmms-crossfade-0.3.9-gcc4.patch, +xmms-crossfade-0.3.9.ebuild:
+  Version Bump. Added a patch to fix build on gcc4 made by me.
+
+  30 Oct 2005; Luis Medinas <metalgod@gentoo.org>
+  xmms-crossfade-0.3.8.ebuild:
+  Added info about arts output plugin on the ebuild to warn users about how to
+  use it. Thanks to Ricardo Cordeiro <Ricardo.Cordeiro@iscte.pt>.
+
+  17 Jun 2005; Michael Hanselmann <hansmi@gentoo.org>
+  xmms-crossfade-0.3.8.ebuild:
+  Stable on ppc.
+
+  11 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  xmms-crossfade-0.3.8.ebuild:
+  Stable amd64, sparc, x86.
+
+*xmms-crossfade-0.3.8 (24 Sep 2004)
+
+  24 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -xmms-crossfade-0.3.6.ebuild, +xmms-crossfade-0.3.8.ebuild:
+  Version bump.  See bug #65205.
+
+*xmms-crossfade-0.3.6 (24 Sep 2004)
+
+  24 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -xmms-crossfade-0.2.9.ebuild, -xmms-crossfade-0.3.1.ebuild,
+  -xmms-crossfade-0.3.2.ebuild, +xmms-crossfade-0.3.6.ebuild:
+  Version bump.  Removing old versions.  Directly into stable on amd64 as it
+  fixes problems with --libdir installing the plugin to an incorrect location
+  in previous versions.
+
+  16 Aug 2004; <frank@gentoo.org> :
+  Version bump to 0.3.5. Closes bug #59780.
+
+  03 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  xmms-crossfade-0.3.4.ebuild:
+  Stable sparc.
+
+  21 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  xmms-crossfade-0.3.2.ebuild:
+  Removed explicit S=
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  xmms-crossfade-0.2.9.ebuild, xmms-crossfade-0.3.1.ebuild,
+  xmms-crossfade-0.3.2.ebuild:
+  Added IUSE.
+
+  14 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  xmms-crossfade-0.3.4.ebuild:
+  Stable x86.
+
+  04 Apr 2004; Lars Weiler <pylon@gentoo.org> xmms-crossfade-0.3.4.ebuild:
+  stable on ppc
+
+  15 Feb 2004; David Holm <dholm@gentoo.org> xmms-crossfade-0.3.4.ebuild:
+  Added to ~ppc.
+
+*xmms-crossfade-0.3.4 (16 Oct 2003)
+
+  16 Oct 2003; Nick Hadaway <raker@gentoo.org> xmms-crossfade-0.3.4.ebuild:
+  Version bump.  Minor cosmetic changes to the ebuild.
+
+  29 Aug 2003; root <root@gentoo.org> xmms-crossfade-0.3.2.ebuild:
+  Add ~sparc to keywords, closes #27521.
+
+*xmms-crossfade-0.3.2 (12 May 2003)
+
+  12 May 2003; Martin Holzer <mholzer@gentoo.org> xmms-crossfade-0.3.2.ebuild:
+  Version bumped. Closes #20521.
+
+*xmms-crossfade-0.3.1 (31 Mar 2003)
+
+  31 Mar 2003; Martin Holzer <mholzer@gentoo.org> xmms-crossfade-0.3.1.ebuild:
+  Version bumped.
+
+*xmms-crossfade-0.2.9 (1 Feb 2002)
+
+  30 Aug 2002; Seemant Kulleen <seemant@gentoo.org> * :
+
+  Relocated to media-plugins
+
+  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/media-plugins/xmms-crossfade/Manifest b/media-plugins/xmms-crossfade/Manifest
new file mode 100644
index 0000000..58bca5d
--- /dev/null
+++ b/media-plugins/xmms-crossfade/Manifest
@@ -0,0 +1,4 @@
+DIST xmms-crossfade-0.3.11.tar.gz 494334 RMD160 a42b319fc8cdfb8cce4d011c5d3818efd8b34bd7 SHA1 e9f2f92a30910afe08570e6af69ed14ed24b1ac5 SHA256 2229fc32e96293e213d8a5d60a7f95225dfc25cec4be8a4a9702cac5defcb33b
+EBUILD xmms-crossfade-0.3.11.ebuild 968 RMD160 d7801a64d24bc97e651414df50ddcbba1849a079 SHA1 15fccfbddf1fffd930667a1fa30bdca594530f42 SHA256 21d6a4216249717453c03c39beb6ea3d1aef53f83be6d62115db56e1fc0f8a24
+MISC ChangeLog 4117 RMD160 ca4273fb5c278ab749ed9aa1ae4a870cfc663477 SHA1 6ae2035f7ec50031c3cb14a86bb4b0142c3ef219 SHA256 5d049c1f440dbe5ee406c4db375617e0115ae8323848d9cf1c1a1fe6a5b11736
+MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
diff --git a/media-plugins/xmms-crossfade/metadata.xml b/media-plugins/xmms-crossfade/metadata.xml
new file mode 100644
index 0000000..e1774e3
--- /dev/null
+++ b/media-plugins/xmms-crossfade/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</pkgmetadata>
diff --git a/media-plugins/xmms-crossfade/xmms-crossfade-0.3.11.ebuild b/media-plugins/xmms-crossfade/xmms-crossfade-0.3.11.ebuild
new file mode 100644
index 0000000..e984174
--- /dev/null
+++ b/media-plugins/xmms-crossfade/xmms-crossfade-0.3.11.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-crossfade/xmms-crossfade-0.3.11.ebuild,v 1.5 2006/09/24 09:05:58 hansmi Exp $
+
+inherit eutils
+
+IUSE=""
+
+DESCRIPTION="XMMS Plugin for crossfading, and continuous output."
+HOMEPAGE="http://www.eisenlohr.org/${PN}/index.html"
+SRC_URI="http://www.eisenlohr.org/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64 ppc sparc x86"
+
+DEPEND="media-sound/xmms"
+
+src_compile() {
+	econf --libdir=`xmms-config --output-plugin-dir` || die
+	emake || die
+}
+
+src_install () {
+	make DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog README TODO
+}
+pkg_postinst () {
+	ewarn "If you're using the ARTS output plugin, set the 'Limit OP buffer"
+	ewarn "usage' to 400ms in the 'Advanced' tab of XMMS-crossfade's"
+	ewarn "configuration dialog. This will eliminate the worst"
+	ewarn "of the distorted/skipped output."
+}
diff --git a/media-plugins/xmms-flac/Manifest b/media-plugins/xmms-flac/Manifest
new file mode 100644
index 0000000..1777a74
--- /dev/null
+++ b/media-plugins/xmms-flac/Manifest
@@ -0,0 +1,6 @@
+AUX flac-1.2.1-asm.patch 2844 RMD160 7e2f1dbdf1dbe7c019089f5359f794123cb388f9 SHA1 9cf5708bcc181b66632868e95e23a84b0a1644af SHA256 b9a6d2011b9902924372316f3544e94cb066fe202e256b9696bf6cd6ee8a490b
+AUX flac-1.2.1-asneeded.patch 840 RMD160 42570f0d4c8bb6ff2f188e81952ac774fa9cfd0d SHA1 a87abf76cbc9db5cf65d6282cdfcf3b5cfcd329c SHA256 cb112fcc85fa57fb68e9fb0d1f735225132fb25b3cd41bb08febfc2d2154bb63
+AUX flac-1.2.1-cflags.patch 435 RMD160 49cb14f8c107fada76252a67e6ef693dcc0f82b1 SHA1 5698376e901679398b6dac850d8015b1386f1983 SHA256 cc9397825c966839edcd4a30406ff3590a21c825d4e1cb043bd35145a608bc21
+AUX xmms-flac-ds-gcc4.patch 425 RMD160 699534306928d800c9be88c30731a076f1c26099 SHA1 95a6ebfad9e306712f9918e80594b2476a3b42ee SHA256 f23edbb110b9ce5481fe27723ee6244117b1236c113f257c0f2f6da79ca3f62d
+DIST flac-1.2.1.tar.gz 2009217 RMD160 bd3223c848054f0a75d11200b30f903bdd375bfc SHA1 bd54354900181b59db3089347cc84ad81e410b38 SHA256 9635a44bceb478bbf2ee8a785cf6986fba525afb5fad1fd4bba73cf71f2d3edf
+EBUILD xmms-flac-1.2.1-r2.ebuild 1699 RMD160 2930a015964555afd108e3eb66f7f2901970e630 SHA1 cc4a6bb348513a685562d39d9318a923be9e7855 SHA256 44a6ec8ed299d75a0837b4b8875fd3f29500d89ba28974fa81b62da0225b95ba
diff --git a/media-plugins/xmms-flac/files/flac-1.2.1-asm.patch b/media-plugins/xmms-flac/files/flac-1.2.1-asm.patch
new file mode 100644
index 0000000..cc832ee
--- /dev/null
+++ b/media-plugins/xmms-flac/files/flac-1.2.1-asm.patch
@@ -0,0 +1,80 @@
+diff -urp flac-1.2.1-old/src/libFLAC/ia32/bitreader_asm.nasm flac-1.2.1/src/libFLAC/ia32/bitreader_asm.nasm
+--- flac-1.2.1-old/src/libFLAC/ia32/bitreader_asm.nasm	2007-03-30 02:54:53.000000000 +0200
++++ flac-1.2.1/src/libFLAC/ia32/bitreader_asm.nasm	2007-09-27 21:39:45.000000000 +0200
+@@ -140,8 +140,13 @@ cident FLAC__bitreader_read_rice_signed_
+ %ifdef FLAC__PUBLIC_NEEDS_UNDERSCORE
+ 	mov	edi, _FLAC__crc16_table
+ %else
++%ifdef OBJ_FORMAT_elf
++	mov	edi, [esp + 16]		;		saved ebx (GOT base)
++	lea	edi, [edi + FLAC__crc16_table wrt ..gotoff]
++%else
+ 	mov	edi, FLAC__crc16_table
+ %endif
++%endif
+ 	;; eax (ax)	crc a.k.a. br->read_crc
+ 	;; ebx (bl)	intermediate result index into FLAC__crc16_table[]
+ 	;; ecx		br->crc16_align
+@@ -216,8 +221,13 @@ cident FLAC__bitreader_read_rice_signed_
+ %ifdef FLAC__PUBLIC_NEEDS_UNDERSCORE
+ 	mov	edi, _FLAC__crc16_table
+ %else
++%ifdef OBJ_FORMAT_elf
++	mov	edi, [esp + 16]		;		saved ebx (GOT base)
++	lea	edi, [edi + FLAC__crc16_table wrt ..gotoff]
++%else
+ 	mov	edi, FLAC__crc16_table
+ %endif
++%endif
+ 	;; eax (ax)	crc a.k.a. br->read_crc
+ 	;; ebx (bl)	intermediate result index into FLAC__crc16_table[]
+ 	;; ecx		br->crc16_align
+@@ -315,8 +325,13 @@ cident FLAC__bitreader_read_rice_signed_
+ %ifdef FLAC__PUBLIC_NEEDS_UNDERSCORE
+ 	call	_bitreader_read_from_client_
+ %else
++%ifdef OBJ_FORMAT_elf
++	mov	ebx, [esp + 20]		;		saved ebx (GOT base)
++	call	bitreader_read_from_client_ wrt ..plt
++%else
+ 	call	bitreader_read_from_client_
+ %endif
++%endif
+ 	pop	edx			;     /* discard, unused */
+ 	pop	ecx			;     /* restore */
+ 	mov	esi, [ebp + 16]		;     cwords = br->consumed_words;
+@@ -362,13 +377,20 @@ cident FLAC__bitreader_read_rice_signed_
+ 	mov	[ebp + 16], esi		;       br->consumed_words = cwords;
+ 	mov	[ebp + 20], ecx		;       br->consumed_bits = cbits;
+ 	push	ecx			;       /* save */
++	push	ebx			;       /* save */
+ 	push	ebp			;       /* push br argument */
+ %ifdef FLAC__PUBLIC_NEEDS_UNDERSCORE
+ 	call	_bitreader_read_from_client_
+ %else
++%ifdef OBJ_FORMAT_elf
++	mov	ebx, [esp + 24]		;		saved ebx (GOT base)
++	call	bitreader_read_from_client_ wrt ..plt
++%else
+ 	call	bitreader_read_from_client_
+ %endif
++%endif
+ 	pop	edx			;       /* discard, unused */
++	pop	ebx			;       /* restore */
+ 	pop	ecx			;       /* restore */
+ 	mov	esi, [ebp + 16]		;       cwords = br->consumed_words;
+ 					;       ucbits = (br->words-cwords)*FLAC__BITS_PER_WORD + br->bytes*8 - cbits;
+@@ -437,8 +459,13 @@ cident FLAC__bitreader_read_rice_signed_
+ %ifdef FLAC__PUBLIC_NEEDS_UNDERSCORE
+ 	mov	edi, _FLAC__crc16_table
+ %else
++%ifdef OBJ_FORMAT_elf
++	mov	edi, [esp + 24]		;		saved ebx (GOT base)
++	lea	edi, [edi + FLAC__crc16_table wrt ..gotoff]
++%else
+ 	mov	edi, FLAC__crc16_table
+ %endif
++%endif
+ 	;; eax (ax)	crc a.k.a. br->read_crc
+ 	;; ebx (bl)	intermediate result index into FLAC__crc16_table[]
+ 	;; ecx		br->crc16_align
diff --git a/media-plugins/xmms-flac/files/flac-1.2.1-asneeded.patch b/media-plugins/xmms-flac/files/flac-1.2.1-asneeded.patch
new file mode 100644
index 0000000..0d6ffb9
--- /dev/null
+++ b/media-plugins/xmms-flac/files/flac-1.2.1-asneeded.patch
@@ -0,0 +1,22 @@
+diff -ur flac-1.2.1.orig/src/flac/Makefile.am flac-1.2.1/src/flac/Makefile.am
+--- flac-1.2.1.orig/src/flac/Makefile.am	2007-09-11 20:56:51.000000000 +0300
++++ flac-1.2.1/src/flac/Makefile.am	2007-09-20 19:38:09.000000000 +0300
+@@ -53,6 +53,6 @@
+ 	$(top_builddir)/src/share/utf8/libutf8.la \
+ 	$(top_builddir)/src/libFLAC/libFLAC.la \
+ 	@OGG_LIBS@ \
+-	@LIBICONV@ \
++	@LTLIBICONV@ \
+ 	@MINGW_WINSOCK_LIBS@ \
+ 	-lm
+diff -ur flac-1.2.1.orig/src/metaflac/Makefile.am flac-1.2.1/src/metaflac/Makefile.am
+--- flac-1.2.1.orig/src/metaflac/Makefile.am	2007-09-11 20:59:25.000000000 +0300
++++ flac-1.2.1/src/metaflac/Makefile.am	2007-09-20 19:38:25.000000000 +0300
+@@ -49,6 +49,6 @@
+ 	$(top_builddir)/src/share/utf8/libutf8.la \
+ 	$(top_builddir)/src/libFLAC/libFLAC.la \
+ 	@OGG_LIBS@ \
+-	@LIBICONV@ \
++	@LTLIBICONV@ \
+ 	@MINGW_WINSOCK_LIBS@ \
+ 	-lm
diff --git a/media-plugins/xmms-flac/files/flac-1.2.1-cflags.patch b/media-plugins/xmms-flac/files/flac-1.2.1-cflags.patch
new file mode 100644
index 0000000..3910604
--- /dev/null
+++ b/media-plugins/xmms-flac/files/flac-1.2.1-cflags.patch
@@ -0,0 +1,12 @@
+diff -ur flac-1.2.1.orig/configure.in flac-1.2.1/configure.in
+--- flac-1.2.1.orig/configure.in	2007-09-13 18:48:42.000000000 +0300
++++ flac-1.2.1/configure.in	2007-09-20 19:26:05.000000000 +0300
+@@ -301,7 +301,7 @@
+ 	CPPFLAGS="-DNDEBUG $CPPFLAGS"
+ 	if test "x$GCC" = xyes; then
+ 		CPPFLAGS="-DFLaC__INLINE=__inline__ $CPPFLAGS"
+-		CFLAGS="-O3 -funroll-loops -finline-functions -Wall -W -Winline $CFLAGS"
++		CFLAGS="$CFLAGS"
+ 	fi
+ fi
+ 
diff --git a/media-plugins/xmms-flac/files/xmms-flac-ds-gcc4.patch b/media-plugins/xmms-flac/files/xmms-flac-ds-gcc4.patch
new file mode 100644
index 0000000..0507c95
--- /dev/null
+++ b/media-plugins/xmms-flac/files/xmms-flac-ds-gcc4.patch
@@ -0,0 +1,11 @@
+diff -dPNur flac-1.2.1-orig/examples/cpp/encode/file/main.cpp flac-1.2.1/examples/cpp/encode/file/main.cpp
+--- flac-1.2.1-orig/examples/cpp/encode/file/main.cpp	2007-09-13 17:58:03.000000000 +0200
++++ flac-1.2.1/examples/cpp/encode/file/main.cpp	2011-02-08 17:30:56.000000000 +0100
+@@ -30,6 +30,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include "FLAC++/metadata.h"
+ #include "FLAC++/encoder.h"
+ 
diff --git a/media-plugins/xmms-flac/xmms-flac-1.2.1-r2.ebuild b/media-plugins/xmms-flac/xmms-flac-1.2.1-r2.ebuild
new file mode 100644
index 0000000..90899cf
--- /dev/null
+++ b/media-plugins/xmms-flac/xmms-flac-1.2.1-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.2.1-r1.ebuild,v 1.10 2007/11/01 19:07:17 armin76 Exp $
+
+inherit autotools eutils
+
+DESCRIPTION="free lossless audio encoder and decoder plugin for xmms"
+HOMEPAGE="http://flac.sourceforge.net"
+SRC_URI="mirror://sourceforge/flac/flac-${PV}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd"
+IUSE="3dnow altivec debug doc ogg sse"
+
+RDEPEND="ogg? ( >=media-libs/libogg-1.1.3 )"
+DEPEND="${RDEPEND}
+	x86? ( dev-lang/nasm )
+	sys-apps/gawk
+	sys-devel/gettext
+	dev-util/pkgconfig
+	media-libs/flac
+	media-sound/xmms"
+
+S="${WORKDIR}/flac-${PV}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Stop using upstream CFLAGS. Fix building with
+	# ldflag asneeded on non glibc systems. Fix
+	# broken asm causing text relocations.
+	epatch "${FILESDIR}"/flac-${PV}-asneeded.patch || die
+	epatch "${FILESDIR}"/flac-${PV}-cflags.patch || die 
+	epatch "${FILESDIR}"/flac-${PV}-asm.patch || die
+	epatch "${FILESDIR}"/xmms-flac-ds-gcc4.patch || die
+
+	#AT_M4DIR="m4" eautoreconf
+	./autogen.sh
+}
+
+src_compile() {
+	econf $(use_enable ogg) \
+		$(use_enable sse) \
+		$(use_enable 3dnow) \
+		$(use_enable altivec) \
+		$(use_enable debug) \
+		--disable-doxygen-docs \
+		--disable-dependency-tracking \
+		--enable-xmms-plugin
+
+	emake || die "emake failed."
+}
+
+src_install() {
+    mkdir -p "${D}/usr/lib/xmms/Input"
+    install -c -m 755 src/plugin_xmms/.libs/libxmms-flac.so "${D}/usr/lib/xmms/Input" || die
+    install -c -m 755 src/plugin_xmms/.libs/libxmms-flac.la "${D}/usr/lib/xmms/Input" || die
+}
diff --git a/media-plugins/xmms-jack/Manifest b/media-plugins/xmms-jack/Manifest
new file mode 100644
index 0000000..4f54c23
--- /dev/null
+++ b/media-plugins/xmms-jack/Manifest
@@ -0,0 +1,2 @@
+DIST xmms-jack-0.17.tar.gz 527149 RMD160 c08ebbda0669a2104d9d02a1cbf5d9f1529dc36c SHA1 9df8b5b12aa6a3eb7c2185dac0da6044cd9c7c91 SHA256 2fbf6205fdfe08d01e57cd31c11efb677acb43e0fb50a8ffe2f2430720c5c176
+EBUILD xmms-jack-0.17.ebuild 1046 RMD160 355c43d5940e8a2ea9588d0e437c73c6418ed310 SHA1 95944d6ba9e8058e1da4c9218c00093357c79b5b SHA256 5940deb93794a8c36aa4a564ad166801c6fce0f33b10236b30ea50d5c0ff8dad
diff --git a/media-plugins/xmms-jack/xmms-jack-0.17.ebuild b/media-plugins/xmms-jack/xmms-jack-0.17.ebuild
new file mode 100644
index 0000000..fdebf5d
--- /dev/null
+++ b/media-plugins/xmms-jack/xmms-jack-0.17.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-jack/xmms-jack-0.17.ebuild,v 1.2 2006/07/05 06:13:05 vapier Exp $
+
+inherit eutils libtool autotools
+
+DESCRIPTION="a jack audio output plugin for XMMS"
+HOMEPAGE="http://xmms-jack.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sh ~sparc x86"
+IUSE=""
+
+RDEPEND="media-sound/xmms
+	>=media-libs/bio2jack-0.7
+	media-libs/libsamplerate
+	media-sound/jack-audio-connection-kit"
+DEPEND="${RDEPEND}
+	=sys-devel/automake-1.8*
+	>=sys-devel/autoconf-2.59"
+
+S=${WORKDIR}/${PN}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	#quick endianess fix
+	sed -i -e "s:FMT_S16_LE:FMT_S16_NE:g" jack.c
+	export WANT_AUTOMAKE=1.8
+	export WANT_AUTOCONF=2.5
+	eautoreconf
+	elibtoolize
+}
+
+src_compile() {
+	econf --disable-static || die
+	emake || die
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README
+}
diff --git a/media-plugins/xmms-lirc/Manifest b/media-plugins/xmms-lirc/Manifest
new file mode 100644
index 0000000..22662a9
--- /dev/null
+++ b/media-plugins/xmms-lirc/Manifest
@@ -0,0 +1,2 @@
+DIST lirc-xmms-plugin-1.4.tar.gz 205687 RMD160 dadca43af8d5b1eb40b656755004ab47371dd6b5 SHA1 a4300a96c04aba1b9de4e3cfc582f1e304bc3688 SHA256 61720049d1afe7a8a66489e9865d8e4964b83bd94c2e319c6407f92e94deadcb
+EBUILD xmms-lirc-1.4.ebuild 855 RMD160 5fdb717219d0b0b6aa373a896ae619b7a7cc5140 SHA1 16f9162f584c45c2289f898e0d2793ddcd83f840 SHA256 463a2385afb3744f37e69be3d270a17cf0b12580e0048e90510c3f15553d0416
diff --git a/media-plugins/xmms-lirc/xmms-lirc-1.4.ebuild b/media-plugins/xmms-lirc/xmms-lirc-1.4.ebuild
new file mode 100644
index 0000000..e48f2cf
--- /dev/null
+++ b/media-plugins/xmms-lirc/xmms-lirc-1.4.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-lirc/xmms-lirc-1.4.ebuild,v 1.13 2005/04/08 17:41:38 hansmi Exp $
+
+IUSE=""
+
+MY_P=${P/xmms-lirc/lirc-xmms-plugin}
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="LIRC plugin for xmms to control xmms with your favorite remote control."
+HOMEPAGE="http://www.lirc.org"
+SRC_URI="mirror://sourceforge/lirc/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ppc x86 ppc64"
+
+DEPEND="media-sound/xmms
+	app-misc/lirc"
+
+src_install () {
+	make DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog lircrc NEWS README
+}
+
+pkg_postinst () {
+	einfo
+	einfo "You have to edit your .lircrc. You can find an example file at"
+	einfo "/usr/share/doc/${PF}."
+	einfo "And take a look at the README there."
+	einfo
+}
diff --git a/media-plugins/xmms-mac/Manifest b/media-plugins/xmms-mac/Manifest
new file mode 100644
index 0000000..ecd375e
--- /dev/null
+++ b/media-plugins/xmms-mac/Manifest
@@ -0,0 +1,3 @@
+AUX xmms-mac-ds-gcc44.patch 504 RMD160 911bb61420583350fae135854445fab4f2cb5d09 SHA1 af32898920817aa6d8cc1ea39a0ba0894049bc23 SHA256 e067fea7d2fe2901a8f0adc590ad307a9ef9a580867a087bb4435f1934e98abe
+DIST xmms-mac-0.3.1.tar.gz 299783 RMD160 a7b22cdf0a8196480016f02314a0f60dfcab9984 SHA1 68a75ca93d76fa7deffceac4994b3c2c54518159 SHA256 c1c12231dd6d679dc458bca2e18b65dfb9d4fad1427ca6569e1cbeeb9650ab02
+EBUILD xmms-mac-0.3.1-r2.ebuild 860 RMD160 fffbf05bf29acbd7bf9fef7ae4d9db14ef3153ab SHA1 ebb05f7eb15c5eae0e58b5018a371c64f78943bf SHA256 3deb910452936219f67895550d02739d04f51eabb2f51f209a9219fc9650a8f1
diff --git a/media-plugins/xmms-mac/files/xmms-mac-ds-gcc44.patch b/media-plugins/xmms-mac/files/xmms-mac-ds-gcc44.patch
new file mode 100644
index 0000000..66580e8
--- /dev/null
+++ b/media-plugins/xmms-mac/files/xmms-mac-ds-gcc44.patch
@@ -0,0 +1,18 @@
+diff -dPNur xmms-mac-0.3.1-orig/src/mac.cpp xmms-mac-0.3.1/src/mac.cpp
+--- xmms-mac-0.3.1-orig/src/mac.cpp	2005-04-15 11:05:46.000000000 +0200
++++ xmms-mac-0.3.1/src/mac.cpp	2011-02-08 17:24:17.000000000 +0100
+@@ -45,12 +45,12 @@
+ 
+ static char *get_file_extname(const char *filename)
+ {
+-	char *ext = strrchr(filename, '.');
++	const char *ext = strrchr(filename, '.');
+ 
+ 	if (ext != NULL)
+ 		++ext;
+ 
+-	return ext;
++	return (char*)ext;
+ }
+ 
+ static char *get_tag_info(CAPETag *tag, wchar_t *fieldname)
diff --git a/media-plugins/xmms-mac/xmms-mac-0.3.1-r2.ebuild b/media-plugins/xmms-mac/xmms-mac-0.3.1-r2.ebuild
new file mode 100644
index 0000000..83f5122
--- /dev/null
+++ b/media-plugins/xmms-mac/xmms-mac-0.3.1-r2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: current version of ebuild http://atrey.karlin.mff.cuni.cz/~sanda/mac/$
+inherit eutils
+
+IUSE=""
+
+DESCRIPTION="Plugin to listen ape files (monkey audio codec) files on xmms"
+HOMEPAGE="http://sourceforge.net/projects/mac-port/"
+SRC_URI="http://dside.dyndns.org/files/darklin/${P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="x86 amd64"
+LICENSE="MAC"
+
+DEPEND="media-sound/xmms media-libs/mac"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/xmms-mac-ds-gcc44.patch || die
+}
+
+src_compile () {
+	econf --with-prefix=`xmms-config --prefix` --with-exec-prefix=`xmms-config --exec-prefix`|| die 'Configure failed'
+	emake || die "Error compiling"
+}
+
+src_install()
+{
+	einstall DESTDIR="${D}" || die
+	dodoc AUTHORS BUGS ChangeLog NEWS README TODO COPYING
+}
diff --git a/media-plugins/xmms-mad/Manifest b/media-plugins/xmms-mad/Manifest
new file mode 100644
index 0000000..0562d46
--- /dev/null
+++ b/media-plugins/xmms-mad/Manifest
@@ -0,0 +1,4 @@
+AUX xmms-mad-0.8-mp3-header.patch 1547 RMD160 832fb7bced8ba9f92fe37d9ba50ed5c994d356cd SHA1 a0dd37e3df23daf981a5b63c796fcab7539f7332 SHA256 89e7b29bf258cc0fbc44a7d6b0a171c20c763bb3586fedd67cc13c604b10a129
+AUX xmms-mad-0.8-song_change.patch 472 RMD160 c3a09b76ad064fd5d508719eb0eb1cb719b39922 SHA1 d34c0ee09839ead27f203d9fe0c349de55d35a34 SHA256 bdf10fe9b4bbcfe8b612e29068df7a46b9f2c7361261370d8dac881968bcee51
+DIST xmms-mad-0.8.tar.gz 315069 RMD160 19fe42c13c24ad6f55af066435c3faee7c2f8ff6 SHA1 4de4fa9d6db919968276f9a185b0cb3c96c1e097 SHA256 85774ead2c2d31a3c211ab24fdd03844bc624078abe47bbb92d28844061f3822
+EBUILD xmms-mad-0.8-r2.ebuild 879 RMD160 d22bd873040a31ead60f4dc2ea7774f744a9eaa3 SHA1 61db9b2ff5373f521c610a1ebe44c2f16f7a794d SHA256 a53c5ff71653fc03c7d386ab007a7e189455254dcefef5666728ff9622801a15
diff --git a/media-plugins/xmms-mad/files/xmms-mad-0.8-mp3-header.patch b/media-plugins/xmms-mad/files/xmms-mad-0.8-mp3-header.patch
new file mode 100644
index 0000000..bea8e11
--- /dev/null
+++ b/media-plugins/xmms-mad/files/xmms-mad-0.8-mp3-header.patch
@@ -0,0 +1,47 @@
+diff -urp xmms-mad-0.8-org/src/xmms-mad.c xmms-mad-0.8/src/xmms-mad.c
+--- xmms-mad-0.8-org/src/xmms-mad.c	2005-12-04 23:18:21.000000000 +0200
++++ xmms-mad-0.8/src/xmms-mad.c	2005-12-04 23:34:53.000000000 +0200
+@@ -76,6 +76,31 @@ xmmsmad_set_eq (int on, float preamp, fl
+   //printf("set_eq\n");
+ }
+ 
++
++/* Following mp3 header check has been copied from XMMS mp3 input plugin. */
++static int mpg123_head_check(unsigned char *buffer)
++{
++  unsigned int head = (buffer[0] << 24) + (buffer[1] << 16) + (buffer[2] << 8) + buffer[3];
++  if ((head & 0xffe00000) != 0xffe00000)
++    return FALSE;
++  if (!((head >> 17) & 3))
++    return FALSE;
++  if (((head >> 12) & 0xf) == 0xf)
++    return FALSE;
++  if (!((head >> 12) & 0xf))
++    return FALSE;
++  if (((head >> 10) & 0x3) == 0x3)
++    return FALSE;
++  if (((head >> 19) & 1) == 1 &&
++      ((head >> 17) & 3) == 3 &&
++      ((head >> 16) & 1) == 1)
++    return FALSE;
++  if ((head & 0xffff0000) == 0xfffe0000)
++    return FALSE;
++  return TRUE;
++}
++
++
+ static int
+ xmmsmad_is_our_file (char *filename)
+ {
+@@ -96,9 +121,8 @@ xmmsmad_is_our_file (char *filename)
+       fin = open (filename, O_RDONLY);
+       if (fin >= 0 && read (fin, check, 4) == 4)
+ 	{
+-	  /* If first two bytes are a sync header or three bytes are "ID3" */
+-	  if ( (check[0] == 0xff && (check[1] & 0x70) == 0x70) 
+-	       || memcmp (check, "ID3", 3) == 0) 
++	  /* If first 4 bytes are a sync header or three bytes are "ID3" */
++	  if (mpg123_head_check(check) || memcmp (check, "ID3", 3) == 0) 
+ 	    {
+ 	      rtn = 1;
+ 	    }
diff --git a/media-plugins/xmms-mad/files/xmms-mad-0.8-song_change.patch b/media-plugins/xmms-mad/files/xmms-mad-0.8-song_change.patch
new file mode 100644
index 0000000..b38fc24
--- /dev/null
+++ b/media-plugins/xmms-mad/files/xmms-mad-0.8-song_change.patch
@@ -0,0 +1,12 @@
+diff -urN xmms-mad-0.8.orig/src/decoder.c xmms-mad-0.8/src/decoder.c
+--- xmms-mad-0.8.orig/src/decoder.c	2006-04-03 22:07:29.000000000 -0400
++++ xmms-mad-0.8/src/decoder.c	2006-04-03 22:33:46.000000000 -0400
+@@ -493,7 +493,7 @@
+     {
+       mad_plugin.output->buffer_free ();
+       mad_plugin.output->buffer_free ();
+-      while (mad_plugin.output->buffer_playing ())
++      while (mad_plugin.output->buffer_playing () && !info->stop)
+         usleep (10000);
+     }
+ 
diff --git a/media-plugins/xmms-mad/xmms-mad-0.8-r2.ebuild b/media-plugins/xmms-mad/xmms-mad-0.8-r2.ebuild
new file mode 100644
index 0000000..336dfe7
--- /dev/null
+++ b/media-plugins/xmms-mad/xmms-mad-0.8-r2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-mad/xmms-mad-0.8-r2.ebuild,v 1.2 2006/07/05 06:09:38 vapier Exp $
+
+inherit eutils
+
+DESCRIPTION="A XMMS plugin for MAD"
+HOMEPAGE="http://xmms-mad.sourceforge.net/"
+SRC_URI="mirror://sourceforge/xmms-mad/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 -mips ~ppc ~ppc64 ~sh ~sparc x86"
+IUSE=""
+
+RDEPEND="media-sound/xmms
+	 media-libs/libid3tag
+	 media-libs/libmad"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-mp3-header.patch
+	epatch "${FILESDIR}"/${P}-song_change.patch
+	touch configure
+}
+
+src_install() {
+	exeinto `xmms-config --input-plugin-dir`
+	doexe src/.libs/libxmmsmad.so || die
+	dodoc AUTHORS ChangeLog NEWS README
+}
diff --git a/media-plugins/xmms-mikmod/Manifest b/media-plugins/xmms-mikmod/Manifest
new file mode 100644
index 0000000..22bcf33
--- /dev/null
+++ b/media-plugins/xmms-mikmod/Manifest
@@ -0,0 +1,12 @@
+DIST RusXMMS2-csa35.tar.bz2 128165 RMD160 047782f64bfbcc8119d584f9f3dc9680d324519a SHA1 9c167e33b36e6e35917dd7eca9435f3408d6a9c9 SHA256 3bb63e9ce6fd2bca289ebfbde13c7dd3c0b0ca734e676b647acac1ef293312b4
+DIST RusXMMS2-csa41.tar.bz2 96642 RMD160 7ead4de64156b20682e90f8fc4c85112cf9b2cdc SHA1 034b2264a17977f614c91809bc4ee9ee7c07ecaf SHA256 e64df1956502e48c09ca60262efb7f1953a76d82a70c801e4797ca81e130e8d0
+DIST RusXMMS2-csa43.tar.bz2 104507 RMD160 4f609b588e5cdef4b4190c09f11c85a3f590913d SHA1 51a73494ebee0676a7a8f04dc1fc190d9c742b57 SHA256 b2c0ac09a481b2d77c6e4750a19497f550d93eb961839df3db5ce5da714e6caf
+DIST xmms-1.2.10-gentoo-m4-1.1.tar.bz2 26978 RMD160 63ce094969f33205420f9823a970eb3faabf2e3e SHA1 4ef6fb75370861201161adf8f65ec5db735516f4 SHA256 e253fb2a515d3c7881617172f14fccad6a42cea660b8eaaeef9657114288e46f
+DIST xmms-1.2.10-gentoo-patches-2.2.6.tar.bz2 545931 RMD160 6d376e2edadc1ac69a704575dd04775364c9ed1f SHA1 1a5a2ae2b744d5e1ae1ba72d3cb0bb078963aae0 SHA256 b9a8633fe22af156ca1af65ac35d369242ce8016619d87647ba8389b8d52ba96
+DIST xmms-1.2.10.tar.bz2 2418265 RMD160 0360cbb8c326b3325bd8ebb3343c69a9788d7084 SHA1 a3c3d3756d5263183c27b3c50a7f5404cba8bfaf SHA256 ff9eabae2074043294a19ec7beaf0959bd076f6cd60558264faeec08f4a0eb6a
+DIST xmms-1.2.11-gentoo-patches-2.3.0.1.tar.bz2 16946 RMD160 49e3cd7eaac251c086cff3976e5be6e75bd33938 SHA1 29977700765aaf5ed860e3cccbb958f61f574f34 SHA256 fdfec6f54b65a8a17d4f6342cadc8c9b1f503f1d0672761c1bab963da6a86a91
+DIST xmms-1.2.11-gentoo-patches-2.3.0.tar.bz2 16739 RMD160 d45430baccccad600b3f0a37e4fd0b40e8d8bfca SHA1 9e0eb1b39e4c7385112637412ada7bc186e1b3b9 SHA256 9aebef51507f49b25f771ed380c652950a1f04e9105fb7029ef3a1889ea19abd
+DIST xmms-1.2.11.tar.bz2 2581032 RMD160 466a624572574c56595ef34f42c43d0b74857b0a SHA1 9d1eae4baab25fd35c9ddfb49321ca60222f672d SHA256 7ec15c56632b6c82e61ccddeaefd372359af2f005708a58cdf3951c574b20390
+EBUILD xmms-mikmod-1.2.10.ebuild 526 RMD160 f64f64c6f7c0ea3fcddee84fdb016bb95c45840c SHA1 2b9d75ecb6bde5585cb7000d585e59190d3d2693 SHA256 6653714a38bb4058212e3f790c68411baadcb0c884036a67bed6fc92103b5fb8
+EBUILD xmms-mikmod-1.2.11-r2.ebuild 528 RMD160 fccaa367bce6a6ae611b861d865e207f5c877c85 SHA1 33db715b5fee0447579afe49db0fb98e9d1faed9 SHA256 c6506fd283a5be7a74d44d9e4d4bcd41ada84f28cb18d3565c34dedde9c4d6ae
+EBUILD xmms-mikmod-1.2.11.ebuild 526 RMD160 301875c7750fee7758fb535e2b1c21d7c1c0a819 SHA1 e93c84dea516aded6118a63b4403b07f631d4c7e SHA256 382d64bd2d89f5a4dec805445d7e5af37a99c9ac92d75e2805069b0f3e4a41f6
diff --git a/media-plugins/xmms-mikmod/xmms-mikmod-1.2.10.ebuild b/media-plugins/xmms-mikmod/xmms-mikmod-1.2.10.ebuild
new file mode 100644
index 0000000..f077af9
--- /dev/null
+++ b/media-plugins/xmms-mikmod/xmms-mikmod-1.2.10.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-mikmod/xmms-mikmod-1.2.10.ebuild,v 1.9 2006/07/05 06:07:56 vapier Exp $
+
+M4_VER="1.1"
+PATCH_VER="2.2.6"
+RUSXMMS_VER="35"
+inherit rusxmms-plugin
+
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86"
+IUSE=""
+
+DEPEND=">=media-sound/xmms-1.2.10
+	>=media-libs/libmikmod-3.1.10"
+
+PLUGIN_PATH="Input/mikmod"
+
+myconf="--enable-mikmod --with-libmikmod"
diff --git a/media-plugins/xmms-mikmod/xmms-mikmod-1.2.11-r2.ebuild b/media-plugins/xmms-mikmod/xmms-mikmod-1.2.11-r2.ebuild
new file mode 100644
index 0000000..ca297b8
--- /dev/null
+++ b/media-plugins/xmms-mikmod/xmms-mikmod-1.2.11-r2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-mikmod/xmms-mikmod-1.2.10.ebuild,v 1.9 2006/07/05 06:07:56 vapier Exp $
+
+M4_VER="1.1"
+PATCH_VER="2.3.0.1"
+RUSXMMS_VER="43"
+inherit rusxmms-plugin
+
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86"
+IUSE=""
+
+DEPEND=">=media-sound/xmms-1.2.10
+	>=media-libs/libmikmod-3.1.10"
+
+PLUGIN_PATH="Input/mikmod"
+
+myconf="--enable-mikmod --with-libmikmod"
diff --git a/media-plugins/xmms-mikmod/xmms-mikmod-1.2.11.ebuild b/media-plugins/xmms-mikmod/xmms-mikmod-1.2.11.ebuild
new file mode 100644
index 0000000..e677ac0
--- /dev/null
+++ b/media-plugins/xmms-mikmod/xmms-mikmod-1.2.11.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-mikmod/xmms-mikmod-1.2.10.ebuild,v 1.9 2006/07/05 06:07:56 vapier Exp $
+
+M4_VER="1.1"
+PATCH_VER="2.3.0"
+RUSXMMS_VER="41"
+inherit rusxmms-plugin
+
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86"
+IUSE=""
+
+DEPEND=">=media-sound/xmms-1.2.10
+	>=media-libs/libmikmod-3.1.10"
+
+PLUGIN_PATH="Input/mikmod"
+
+myconf="--enable-mikmod --with-libmikmod"
diff --git a/media-plugins/xmms-mpg123/Manifest b/media-plugins/xmms-mpg123/Manifest
new file mode 100644
index 0000000..3ce8862
--- /dev/null
+++ b/media-plugins/xmms-mpg123/Manifest
@@ -0,0 +1,13 @@
+AUX xmms-ds-id3v2fix.patch 498 RMD160 4b8d43659126cbf1de0fd7d03eb6f3b4dac07bfb SHA1 09461c2e8c3a0259953c10f24d854beec5ff303a SHA256 4f87ed0a7cd660b0526f52fab90e37c31ea3566cf5f3d46bea3d8a2a559eecfa
+DIST RusXMMS2-csa35.tar.bz2 128165 RMD160 047782f64bfbcc8119d584f9f3dc9680d324519a SHA1 9c167e33b36e6e35917dd7eca9435f3408d6a9c9 SHA256 3bb63e9ce6fd2bca289ebfbde13c7dd3c0b0ca734e676b647acac1ef293312b4
+DIST RusXMMS2-csa41.tar.bz2 96642 RMD160 7ead4de64156b20682e90f8fc4c85112cf9b2cdc SHA1 034b2264a17977f614c91809bc4ee9ee7c07ecaf SHA256 e64df1956502e48c09ca60262efb7f1953a76d82a70c801e4797ca81e130e8d0
+DIST RusXMMS2-csa43.tar.bz2 104507 RMD160 4f609b588e5cdef4b4190c09f11c85a3f590913d SHA1 51a73494ebee0676a7a8f04dc1fc190d9c742b57 SHA256 b2c0ac09a481b2d77c6e4750a19497f550d93eb961839df3db5ce5da714e6caf
+DIST xmms-1.2.10-gentoo-m4-1.1.tar.bz2 26978 RMD160 63ce094969f33205420f9823a970eb3faabf2e3e SHA1 4ef6fb75370861201161adf8f65ec5db735516f4 SHA256 e253fb2a515d3c7881617172f14fccad6a42cea660b8eaaeef9657114288e46f
+DIST xmms-1.2.10-gentoo-patches-2.2.6.tar.bz2 545931 RMD160 6d376e2edadc1ac69a704575dd04775364c9ed1f SHA1 1a5a2ae2b744d5e1ae1ba72d3cb0bb078963aae0 SHA256 b9a8633fe22af156ca1af65ac35d369242ce8016619d87647ba8389b8d52ba96
+DIST xmms-1.2.10.tar.bz2 2418265 RMD160 0360cbb8c326b3325bd8ebb3343c69a9788d7084 SHA1 a3c3d3756d5263183c27b3c50a7f5404cba8bfaf SHA256 ff9eabae2074043294a19ec7beaf0959bd076f6cd60558264faeec08f4a0eb6a
+DIST xmms-1.2.11-gentoo-patches-2.3.0.1.tar.bz2 16946 RMD160 49e3cd7eaac251c086cff3976e5be6e75bd33938 SHA1 29977700765aaf5ed860e3cccbb958f61f574f34 SHA256 fdfec6f54b65a8a17d4f6342cadc8c9b1f503f1d0672761c1bab963da6a86a91
+DIST xmms-1.2.11-gentoo-patches-2.3.0.tar.bz2 16739 RMD160 d45430baccccad600b3f0a37e4fd0b40e8d8bfca SHA1 9e0eb1b39e4c7385112637412ada7bc186e1b3b9 SHA256 9aebef51507f49b25f771ed380c652950a1f04e9105fb7029ef3a1889ea19abd
+DIST xmms-1.2.11.tar.bz2 2581032 RMD160 466a624572574c56595ef34f42c43d0b74857b0a SHA1 9d1eae4baab25fd35c9ddfb49321ca60222f672d SHA256 7ec15c56632b6c82e61ccddeaefd372359af2f005708a58cdf3951c574b20390
+EBUILD xmms-mpg123-1.2.10-r6.ebuild 648 RMD160 c3a637779006339b63cced3fadbcb7dbb46aa767 SHA1 f872dca531c5741698b9662cdec779ebf6208712 SHA256 04097a509f767a4cdc1be9fe9139cd52fbb1f8049589b78f6eea2c831851fca9
+EBUILD xmms-mpg123-1.2.11-r2.ebuild 650 RMD160 1d79503756915cb72a261666443727c323f782de SHA1 02119d3a7eb0dc90fe04d8481b29f33bd3ed67c9 SHA256 0ba864151c24e2855160c91f4aba26e85c47a4a8c838963e53295d42f46e8e71
+EBUILD xmms-mpg123-1.2.11.ebuild 648 RMD160 5e560fad13c2fe06dfafc27afa0ed70ed595faf1 SHA1 e68796f0b225154d16ad0cb670a418b694bb3ec1 SHA256 ea1f0ac3163909daa15152b2015414fb48fc2795d690c8cfc09e5dedc62d156b
diff --git a/media-plugins/xmms-mpg123/files/xmms-ds-id3v2fix.patch b/media-plugins/xmms-mpg123/files/xmms-ds-id3v2fix.patch
new file mode 100644
index 0000000..483ba57
--- /dev/null
+++ b/media-plugins/xmms-mpg123/files/xmms-ds-id3v2fix.patch
@@ -0,0 +1,12 @@
+diff -dPNur xmms-1.2.10/Input/mpg123/id3_frame_content.c xmms-1.2.10-new/Input/mpg123/id3_frame_content.c
+--- xmms-1.2.10/Input/mpg123/id3_frame_content.c	2006-11-23 10:09:31.000000000 +0400
++++ xmms-1.2.10-new/Input/mpg123/id3_frame_content.c	2006-11-23 10:10:28.000000000 +0400
+@@ -48,6 +48,8 @@
+ 	text_beg = text = id3_string_decode(ID3_TEXT_FRAME_ENCODING(frame),
+ 					    ID3_TEXT_FRAME_PTR(frame));
+ 
++	if (!text_beg) return NULL;
++
+ 	/*
+ 	 * If content is just plain text, return it.
+ 	 */
diff --git a/media-plugins/xmms-mpg123/xmms-mpg123-1.2.10-r6.ebuild b/media-plugins/xmms-mpg123/xmms-mpg123-1.2.10-r6.ebuild
new file mode 100644
index 0000000..6069426
--- /dev/null
+++ b/media-plugins/xmms-mpg123/xmms-mpg123-1.2.10-r6.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: 
+
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
+IUSE="ipv6 ssl mmx 3dnow"
+
+DEPEND=">=media-sound/xmms-1.2.10-r12
+	ssl? ( dev-libs/openssl )"
+
+PLUGIN_PATH="Input/mpg123"
+
+M4_VER="1.1"
+PATCH_VER="2.2.6"
+RUSXMMS_VER="35"
+inherit rusxmms-plugin
+
+src_compile() {
+	myconf="${myconf} --enable-mpg123 $(use_enable ipv6) $(use_enable ssl)"
+	
+	if use x86 && ! has_pic && { use mmx || use 3dnow; }; then
+		myconf="${myconf} --enable-simd"
+	else
+		myconf="${myconf} --disable-simd"
+	fi
+
+	rusxmms-plugin_src_compile
+}
diff --git a/media-plugins/xmms-mpg123/xmms-mpg123-1.2.11-r2.ebuild b/media-plugins/xmms-mpg123/xmms-mpg123-1.2.11-r2.ebuild
new file mode 100644
index 0000000..e0ba109
--- /dev/null
+++ b/media-plugins/xmms-mpg123/xmms-mpg123-1.2.11-r2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: 
+
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
+IUSE="ipv6 ssl mmx 3dnow"
+
+DEPEND=">=media-sound/xmms-1.2.10-r12
+	ssl? ( dev-libs/openssl )"
+
+PLUGIN_PATH="Input/mpg123"
+
+M4_VER="1.1"
+PATCH_VER="2.3.0.1"
+RUSXMMS_VER="43"
+inherit rusxmms-plugin
+
+src_compile() {
+	myconf="${myconf} --enable-mpg123 $(use_enable ipv6) $(use_enable ssl)"
+	
+	if use x86 && ! has_pic && { use mmx || use 3dnow; }; then
+		myconf="${myconf} --enable-simd"
+	else
+		myconf="${myconf} --disable-simd"
+	fi
+
+	rusxmms-plugin_src_compile
+}
diff --git a/media-plugins/xmms-mpg123/xmms-mpg123-1.2.11.ebuild b/media-plugins/xmms-mpg123/xmms-mpg123-1.2.11.ebuild
new file mode 100644
index 0000000..0bc98a5
--- /dev/null
+++ b/media-plugins/xmms-mpg123/xmms-mpg123-1.2.11.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: 
+
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
+IUSE="ipv6 ssl mmx 3dnow"
+
+DEPEND=">=media-sound/xmms-1.2.10-r12
+	ssl? ( dev-libs/openssl )"
+
+PLUGIN_PATH="Input/mpg123"
+
+M4_VER="1.1"
+PATCH_VER="2.3.0"
+RUSXMMS_VER="41"
+inherit rusxmms-plugin
+
+src_compile() {
+	myconf="${myconf} --enable-mpg123 $(use_enable ipv6) $(use_enable ssl)"
+	
+	if use x86 && ! has_pic && { use mmx || use 3dnow; }; then
+		myconf="${myconf} --enable-simd"
+	else
+		myconf="${myconf} --disable-simd"
+	fi
+
+	rusxmms-plugin_src_compile
+}
diff --git a/media-plugins/xmms-oss/Manifest b/media-plugins/xmms-oss/Manifest
new file mode 100644
index 0000000..2ec23b8
--- /dev/null
+++ b/media-plugins/xmms-oss/Manifest
@@ -0,0 +1,12 @@
+DIST RusXMMS2-csa35.tar.bz2 128165 RMD160 047782f64bfbcc8119d584f9f3dc9680d324519a SHA1 9c167e33b36e6e35917dd7eca9435f3408d6a9c9 SHA256 3bb63e9ce6fd2bca289ebfbde13c7dd3c0b0ca734e676b647acac1ef293312b4
+DIST RusXMMS2-csa41.tar.bz2 96642 RMD160 7ead4de64156b20682e90f8fc4c85112cf9b2cdc SHA1 034b2264a17977f614c91809bc4ee9ee7c07ecaf SHA256 e64df1956502e48c09ca60262efb7f1953a76d82a70c801e4797ca81e130e8d0
+DIST RusXMMS2-csa43.tar.bz2 104507 RMD160 4f609b588e5cdef4b4190c09f11c85a3f590913d SHA1 51a73494ebee0676a7a8f04dc1fc190d9c742b57 SHA256 b2c0ac09a481b2d77c6e4750a19497f550d93eb961839df3db5ce5da714e6caf
+DIST xmms-1.2.10-gentoo-m4-1.1.tar.bz2 26978 RMD160 63ce094969f33205420f9823a970eb3faabf2e3e SHA1 4ef6fb75370861201161adf8f65ec5db735516f4 SHA256 e253fb2a515d3c7881617172f14fccad6a42cea660b8eaaeef9657114288e46f
+DIST xmms-1.2.10-gentoo-patches-2.2.6.tar.bz2 545931 RMD160 6d376e2edadc1ac69a704575dd04775364c9ed1f SHA1 1a5a2ae2b744d5e1ae1ba72d3cb0bb078963aae0 SHA256 b9a8633fe22af156ca1af65ac35d369242ce8016619d87647ba8389b8d52ba96
+DIST xmms-1.2.10.tar.bz2 2418265 RMD160 0360cbb8c326b3325bd8ebb3343c69a9788d7084 SHA1 a3c3d3756d5263183c27b3c50a7f5404cba8bfaf SHA256 ff9eabae2074043294a19ec7beaf0959bd076f6cd60558264faeec08f4a0eb6a
+DIST xmms-1.2.11-gentoo-patches-2.3.0.1.tar.bz2 16946 RMD160 49e3cd7eaac251c086cff3976e5be6e75bd33938 SHA1 29977700765aaf5ed860e3cccbb958f61f574f34 SHA256 fdfec6f54b65a8a17d4f6342cadc8c9b1f503f1d0672761c1bab963da6a86a91
+DIST xmms-1.2.11-gentoo-patches-2.3.0.tar.bz2 16739 RMD160 d45430baccccad600b3f0a37e4fd0b40e8d8bfca SHA1 9e0eb1b39e4c7385112637412ada7bc186e1b3b9 SHA256 9aebef51507f49b25f771ed380c652950a1f04e9105fb7029ef3a1889ea19abd
+DIST xmms-1.2.11.tar.bz2 2581032 RMD160 466a624572574c56595ef34f42c43d0b74857b0a SHA1 9d1eae4baab25fd35c9ddfb49321ca60222f672d SHA256 7ec15c56632b6c82e61ccddeaefd372359af2f005708a58cdf3951c574b20390
+EBUILD xmms-oss-1.2.10-r2.ebuild 479 RMD160 53dd20b6016ce460c89f1841f384e4f96c95d02a SHA1 2d0950c291b160ceb10a5d58239a7685c1f75261 SHA256 f2c2cad07c897216810d2b010af128607908d7cf6b928b408af6892c4bade677
+EBUILD xmms-oss-1.2.11-r2.ebuild 481 RMD160 35a16ae600c33f1a6c52eb4839e78b91838c9789 SHA1 ac31a20afe33dc25d097db41d6d3393764ee1215 SHA256 c85ac2c727b1b7398119fd126acb0470b513dc093f9e4ff22061bbe8327e9d86
+EBUILD xmms-oss-1.2.11.ebuild 479 RMD160 10bd8d0b70d308f4f4a055375d2b2c4341b9a212 SHA1 4683e3012543e4084e1ec710cfb3bbbe9db977e9 SHA256 a528aed8f86477a82dc88fb620d42c68afdfbcfe7f6f4bb22a57fa97f108b20f
diff --git a/media-plugins/xmms-oss/xmms-oss-1.2.10-r2.ebuild b/media-plugins/xmms-oss/xmms-oss-1.2.10-r2.ebuild
new file mode 100644
index 0000000..7fd1068
--- /dev/null
+++ b/media-plugins/xmms-oss/xmms-oss-1.2.10-r2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-oss/xmms-oss-1.2.10-r2.ebuild,v 1.2 2006/07/05 06:10:56 vapier Exp $
+
+M4_VER="1.1"
+PATCH_VER="2.2.6"
+RUSXMMS_VER="35"
+inherit rusxmms-plugin
+
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86"
+IUSE=""
+
+DEPEND=">=media-sound/xmms-1.2.10"
+
+PLUGIN_PATH="Output/OSS"
+
+myconf="--enable-oss"
diff --git a/media-plugins/xmms-oss/xmms-oss-1.2.11-r2.ebuild b/media-plugins/xmms-oss/xmms-oss-1.2.11-r2.ebuild
new file mode 100644
index 0000000..0449d7c
--- /dev/null
+++ b/media-plugins/xmms-oss/xmms-oss-1.2.11-r2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-oss/xmms-oss-1.2.10-r2.ebuild,v 1.2 2006/07/05 06:10:56 vapier Exp $
+
+M4_VER="1.1"
+PATCH_VER="2.3.0.1"
+RUSXMMS_VER="43"
+inherit rusxmms-plugin
+
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86"
+IUSE=""
+
+DEPEND=">=media-sound/xmms-1.2.10"
+
+PLUGIN_PATH="Output/OSS"
+
+myconf="--enable-oss"
diff --git a/media-plugins/xmms-oss/xmms-oss-1.2.11.ebuild b/media-plugins/xmms-oss/xmms-oss-1.2.11.ebuild
new file mode 100644
index 0000000..e91706f
--- /dev/null
+++ b/media-plugins/xmms-oss/xmms-oss-1.2.11.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-oss/xmms-oss-1.2.10-r2.ebuild,v 1.2 2006/07/05 06:10:56 vapier Exp $
+
+M4_VER="1.1"
+PATCH_VER="2.3.0"
+RUSXMMS_VER="41"
+inherit rusxmms-plugin
+
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86"
+IUSE=""
+
+DEPEND=">=media-sound/xmms-1.2.10"
+
+PLUGIN_PATH="Output/OSS"
+
+myconf="--enable-oss"
diff --git a/media-plugins/xmms-pulse/Manifest b/media-plugins/xmms-pulse/Manifest
new file mode 100644
index 0000000..966df85
--- /dev/null
+++ b/media-plugins/xmms-pulse/Manifest
@@ -0,0 +1,2 @@
+DIST xmms-pulse-0.9.4.tar.gz 329661 RMD160 f050f043c0215d2fedf0673c9c9fea8aff9a0a27 SHA1 0ffbde03452b5f90d22f72b7a6a88a696cda5ca6 SHA256 962caae8be68a02e99d01988848d937f811c1ce2db223d75c62b37da40733194
+EBUILD xmms-pulse-0.9.4.ebuild 739 RMD160 4e6624eddf63814bb18f0c338a0a012ca30a2e3a SHA1 a39928a3f2ed981789b014d92914049f70462227 SHA256 a82eebd2a31f5663621709419c504a9cc3af0bf2d125f072e9ac5dcdd7cfe32e
diff --git a/media-plugins/xmms-pulse/xmms-pulse-0.9.4.ebuild b/media-plugins/xmms-pulse/xmms-pulse-0.9.4.ebuild
new file mode 100644
index 0000000..8c971e8
--- /dev/null
+++ b/media-plugins/xmms-pulse/xmms-pulse-0.9.4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-mad/xmms-mad-0.8-r2.ebuild,v 1.2 2006/07/05 06:09:38 vapier Exp $
+
+inherit eutils
+
+DESCRIPTION="A XMMS plugin for MAD"
+HOMEPAGE="http://xmms-mad.sourceforge.net/"
+SRC_URI="http://0pointer.de/lennart/projects/xmms-pulse/xmms-pulse-0.9.4.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 -mips ~ppc ~ppc64 ~sh ~sparc x86"
+IUSE=""
+
+RDEPEND="media-sound/xmms
+	 media-sound/pulseaudio"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+}
+
+src_install() {
+	exeinto `xmms-config --input-plugin-dir`
+	doexe src/.libs/libxmms-pulse.so || die
+	dodoc ChangeLog NEWS README
+}
diff --git a/media-plugins/xmms-rva/ChangeLog b/media-plugins/xmms-rva/ChangeLog
new file mode 100644
index 0000000..e88e06e
--- /dev/null
+++ b/media-plugins/xmms-rva/ChangeLog
@@ -0,0 +1,108 @@
+# ChangeLog for media-sound/normalize
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/normalize/ChangeLog,v 1.28 2007/10/15 14:39:12 corsair Exp $
+
+  15 Oct 2007; Markus Rothe <corsair@gentoo.org> normalize-0.7.7.ebuild:
+  Stable on ppc64
+
+  13 Aug 2007; Tobias Scherbaum <dertobi123@gentoo.org>
+  normalize-0.7.7.ebuild:
+  ppc. stable
+
+  12 Jul 2007; Gustavo Zacarias <gustavoz@gentoo.org>
+  normalize-0.7.7.ebuild:
+  Stable on sparc
+
+  13 May 2007; Steve Dibb <beandog@gentoo.org> normalize-0.7.7.ebuild:
+  amd64 stable
+
+  24 Apr 2007; Timothy Redaelli <drizzt@gentoo.org> normalize-0.7.7.ebuild:
+  Add ~x86-fbsd keyword and a fix for tests under BSD userland.
+
+  24 Apr 2007; Raúl Porcel <armin76@gentoo.org> normalize-0.7.7.ebuild:
+  x86 stable
+
+  26 Nov 2006; Alexis Ballier <aballier@gentoo.org> -normalize-0.7.4.ebuild,
+  -normalize-0.7.6-r1.ebuild:
+  Removing old versions
+
+  26 Nov 2006; Alexis Ballier <aballier@gentoo.org> normalize-0.7.4.ebuild,
+  normalize-0.7.6-r1.ebuild, normalize-0.7.6-r2.ebuild:
+  Updating homepage
+
+  13 Nov 2006; Diego Pettenò <flameeyes@gentoo.org> normalize-0.7.4.ebuild,
+  normalize-0.7.6-r1.ebuild, normalize-0.7.6-r2.ebuild:
+  Remove xmms useflag.
+
+*normalize-0.7.7 (12 Nov 2006)
+
+  12 Nov 2006; Alexis Ballier <aballier@gentoo.org> +normalize-0.7.7.ebuild:
+  Version bump, thanks to Stefan Nickl <snickl@snickl.freaks.de>, bug #129208
+
+  11 Feb 2006; Markus Rothe <corsair@gentoo.org> normalize-0.7.6-r2.ebuild:
+  Stable on ppc64
+
+  05 Feb 2005; Michael Hanselmann <hansmi@gentoo.org>
+  normalize-0.7.6-r2.ebuild:
+  Stable on ppc.
+
+  25 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  normalize-0.7.6-r2.ebuild:
+  Added nls USE flag and fixed mad dependency.  Closes bug #72187.
+
+  01 Sep 2004; Tom Gall <tgall@gentoo.org> normalize-0.7.6-r2.ebuild:
+  stable on ppc64, bug #61787
+
+  03 May 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  normalize-0.7.4.ebuild, normalize-0.7.6-r1.ebuild,
+  normalize-0.7.6-r2.ebuild:
+  Changing mad dep to madplay.
+
+  28 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  normalize-0.7.6-r2.ebuild:
+  Stable x86.
+
+*normalize-0.7.6-r2 (28 Mar 2004)
+
+  28 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  normalize-0.7.6-r2.ebuild, normalize-0.7.6.ebuild:
+  Fixed USE flag support.  Closes bug #45944.
+
+  14 Mar 2004; Jason Wever <weeve@gentoo.org> normalize-0.7.6-r1.ebuild:
+  Stable on sparc.
+
+  28 Jan 2004; Brad House <brad_mssw@gentoo.org> normalize-0.7.6-r1.ebuild:
+  mark stable on amd64
+
+  05 Dec 2003; Jason Wever <weeve@gentoo.org> normalize-0.7.6-r1.ebuild:
+  Added ~sparc keyword.
+
+  19 Jul 2003; Nick Hadaway <raker@gentoo.org> normalize-0.7.6-r1.ebuild:
+  Added mad use variable and marked stable for x86.
+
+*normalize-0.7.6-r1 (17 Jul 2003)
+
+  17 Jul 2003; Nick Hadaway <raker@gentoo.org> normalize-0.7.6-r1.ebuild:
+  Now depends on media-libs/{libmad,libid3tag} instead of 
+  media-sound/mad
+
+  07 Jul 2003; Caleb Tennis <caleb@gentoo.org> normalize-0.7.6.ebuild:
+  Made it stable x86
+
+*normalize-0.7.6 (05 Nov 2002)
+
+  05 Nov 2002; Daniel Ahlberg <aliz@gentoo.org> :
+  Version bump.
+
+*normalize-0.7.4 (5 May 2002)
+  14 Aug 2002; Pieter Van den Abeele <pvdabeel@gentoo.org> :
+
+  Added ppc keyword
+
+  5 May 2002; Bardur Arantsson <bardur-gta@odense.kollegienet.dk> 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/media-plugins/xmms-rva/Manifest b/media-plugins/xmms-rva/Manifest
new file mode 100644
index 0000000..e81a1bd
--- /dev/null
+++ b/media-plugins/xmms-rva/Manifest
@@ -0,0 +1,4 @@
+DIST normalize-0.7.7.tar.bz2 388777 RMD160 cfb47808816da4196b7d87033921716bf13f212d SHA1 1d84a9e1cd50b24ebb99428452604dd1fb78be9d SHA256 ef9d8558515cc942518981d3db8fa2490fba6d6b5b74e0a3b75336fbc66c6bd8
+EBUILD xmms-rva-0.7.7.ebuild 1141 RMD160 8ebe220c56bd59beea1a26347341842315a96604 SHA1 32f5208032d72057d19a16d0a28dcc0216e27a7b SHA256 703a563f77d1623f956e6f811530c2a1c97bce91dd7a1ddee5449d269f53f737
+MISC ChangeLog 3729 RMD160 f98e9b27e85addacc7fa285b64897e95a8b055f9 SHA1 f767466dad85d0af01da1b01c8e7415df71b2d31 SHA256 2dacdef4d18372623967dc3f27d40328af4b516002bc97add6e73c1a8a99b341
+MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
diff --git a/media-plugins/xmms-rva/metadata.xml b/media-plugins/xmms-rva/metadata.xml
new file mode 100644
index 0000000..e1774e3
--- /dev/null
+++ b/media-plugins/xmms-rva/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</pkgmetadata>
diff --git a/media-plugins/xmms-rva/xmms-rva-0.7.7.ebuild b/media-plugins/xmms-rva/xmms-rva-0.7.7.ebuild
new file mode 100644
index 0000000..741b510
--- /dev/null
+++ b/media-plugins/xmms-rva/xmms-rva-0.7.7.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/normalize/normalize-0.7.7.ebuild,v 1.8 2007/10/15 14:39:12 corsair Exp $
+
+DESCRIPTION="Audio file volume normalizer plugin for XMMS"
+HOMEPAGE="http://normalize.nongnu.org/"
+SRC_URI="http://savannah.nongnu.org/download/normalize/normalize-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE="mad audiofile nls userland_BSD"
+
+RDEPEND="mad? ( media-libs/libmad )
+	 audiofile? ( >=media-libs/audiofile-0.2.3-r1 )
+	 media-sound/xmms"
+DEPEND="${RDEPEND}
+	nls? ( dev-util/intltool )"
+
+S="${WORKDIR}/normalize-${PV}"
+
+src_unpack() {
+	unpack ${A}
+	use userland_BSD && sed -i -e 's/md5sum/md5/' "${S}"/test/*.sh
+}
+
+src_compile() {
+	econf \
+		$(use_enable nls) \
+		$(use_with mad) \
+		$(use_with audiofile) \
+		|| die
+
+	emake || die "emake failed"
+}
+
+src_install() {
+    mkdir -p "${D}/usr/lib/xmms/Effect"
+    install -c -m 755 xmms-rva/.libs/librva.so "${D}/usr/lib/xmms/Effect"
+    install -c -m 755 xmms-rva/.libs/librva.la "${D}/usr/lib/xmms/Effect"
+}
diff --git a/media-plugins/xmms-sndfile/Manifest b/media-plugins/xmms-sndfile/Manifest
new file mode 100644
index 0000000..0e00802
--- /dev/null
+++ b/media-plugins/xmms-sndfile/Manifest
@@ -0,0 +1,2 @@
+DIST xmms_sndfile-1.2.tar.gz 226848 RMD160 e3a3233b8a72056360c0d605cd8d6f4dc7cbb7ad SHA1 3d0d38eefa8a421a53c49c51ca22f56fc944d59f SHA256 6e48faac8cc7714849a7115a717c56d2aa5c6eefc0cd6069f7adb7b4e8948a9f
+EBUILD xmms-sndfile-1.2.ebuild 777 RMD160 38315c9e2f207a49af8fcd742a6f91d0cf1e630a SHA1 815161356b31b7d59a5bf4f41f7f9ae09df23adc SHA256 34ee41437cd3a0fdfb9de6c1bd182013aba463ec61991fc061006736b4f55f97
diff --git a/media-plugins/xmms-sndfile/xmms-sndfile-1.2.ebuild b/media-plugins/xmms-sndfile/xmms-sndfile-1.2.ebuild
new file mode 100644
index 0000000..6c2a585
--- /dev/null
+++ b/media-plugins/xmms-sndfile/xmms-sndfile-1.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-sndfile/xmms-sndfile-1.2.ebuild,v 1.16 2006/07/05 06:08:34 vapier Exp $
+
+MY_PN=${PN/-/_}
+MY_P=${MY_PN}-${PV}
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="a libsndfile plugin for XMMS"
+HOMEPAGE="http://www.mega-nerd.com/xmms_sndfile/"
+SRC_URI="http://www.mega-nerd.com/xmms_sndfile/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86"
+IUSE=""
+
+RDEPEND="media-libs/libsndfile
+	media-sound/xmms"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_install() {
+	make DESTDIR="${D}" libdir="$(xmms-config --input-plugin-dir)" install || die
+	dodoc AUTHORS NEWS README ChangeLog TODO
+}
diff --git a/media-plugins/xmms-vorbis/Manifest b/media-plugins/xmms-vorbis/Manifest
new file mode 100644
index 0000000..03f2824
--- /dev/null
+++ b/media-plugins/xmms-vorbis/Manifest
@@ -0,0 +1,12 @@
+DIST RusXMMS2-csa35.tar.bz2 128165 RMD160 047782f64bfbcc8119d584f9f3dc9680d324519a SHA1 9c167e33b36e6e35917dd7eca9435f3408d6a9c9 SHA256 3bb63e9ce6fd2bca289ebfbde13c7dd3c0b0ca734e676b647acac1ef293312b4
+DIST RusXMMS2-csa41.tar.bz2 96642 RMD160 7ead4de64156b20682e90f8fc4c85112cf9b2cdc SHA1 034b2264a17977f614c91809bc4ee9ee7c07ecaf SHA256 e64df1956502e48c09ca60262efb7f1953a76d82a70c801e4797ca81e130e8d0
+DIST RusXMMS2-csa43.tar.bz2 104507 RMD160 4f609b588e5cdef4b4190c09f11c85a3f590913d SHA1 51a73494ebee0676a7a8f04dc1fc190d9c742b57 SHA256 b2c0ac09a481b2d77c6e4750a19497f550d93eb961839df3db5ce5da714e6caf
+DIST xmms-1.2.10-gentoo-m4-1.1.tar.bz2 26978 RMD160 63ce094969f33205420f9823a970eb3faabf2e3e SHA1 4ef6fb75370861201161adf8f65ec5db735516f4 SHA256 e253fb2a515d3c7881617172f14fccad6a42cea660b8eaaeef9657114288e46f
+DIST xmms-1.2.10-gentoo-patches-2.2.6.tar.bz2 545931 RMD160 6d376e2edadc1ac69a704575dd04775364c9ed1f SHA1 1a5a2ae2b744d5e1ae1ba72d3cb0bb078963aae0 SHA256 b9a8633fe22af156ca1af65ac35d369242ce8016619d87647ba8389b8d52ba96
+DIST xmms-1.2.10.tar.bz2 2418265 RMD160 0360cbb8c326b3325bd8ebb3343c69a9788d7084 SHA1 a3c3d3756d5263183c27b3c50a7f5404cba8bfaf SHA256 ff9eabae2074043294a19ec7beaf0959bd076f6cd60558264faeec08f4a0eb6a
+DIST xmms-1.2.11-gentoo-patches-2.3.0.1.tar.bz2 16946 RMD160 49e3cd7eaac251c086cff3976e5be6e75bd33938 SHA1 29977700765aaf5ed860e3cccbb958f61f574f34 SHA256 fdfec6f54b65a8a17d4f6342cadc8c9b1f503f1d0672761c1bab963da6a86a91
+DIST xmms-1.2.11-gentoo-patches-2.3.0.tar.bz2 16739 RMD160 d45430baccccad600b3f0a37e4fd0b40e8d8bfca SHA1 9e0eb1b39e4c7385112637412ada7bc186e1b3b9 SHA256 9aebef51507f49b25f771ed380c652950a1f04e9105fb7029ef3a1889ea19abd
+DIST xmms-1.2.11.tar.bz2 2581032 RMD160 466a624572574c56595ef34f42c43d0b74857b0a SHA1 9d1eae4baab25fd35c9ddfb49321ca60222f672d SHA256 7ec15c56632b6c82e61ccddeaefd372359af2f005708a58cdf3951c574b20390
+EBUILD xmms-vorbis-1.2.10-r1.ebuild 637 RMD160 668b0440e901dc6837f0251c46fb11d420d9a76c SHA1 3b6d933fbe09f02e4b6591433fc3be0a317c8217 SHA256 c8a597be074dd85cae250874de2e82bb9d94ea431da1f94ee0c3e0db8168532a
+EBUILD xmms-vorbis-1.2.11-r2.ebuild 639 RMD160 be947b953a856f70ab412b7a0e5334e0a3622495 SHA1 d332e52079417bb0f0c619824ddd649e21d427f1 SHA256 b1f17434a2d44efe630bc0f91306560289fe4b436e6328e849a1af30c693175c
+EBUILD xmms-vorbis-1.2.11.ebuild 637 RMD160 eb8911ad2526aa7d9b67ef77782a63bf2ae21673 SHA1 a93e93f625fb2c8f89edb4d2b1a894320e8bea5b SHA256 4e4bc353824ed9624e5b3fbb1844b62f21fe972def11734ade0485ba43c8d67d
diff --git a/media-plugins/xmms-vorbis/xmms-vorbis-1.2.10-r1.ebuild b/media-plugins/xmms-vorbis/xmms-vorbis-1.2.10-r1.ebuild
new file mode 100644
index 0000000..477ad2b
--- /dev/null
+++ b/media-plugins/xmms-vorbis/xmms-vorbis-1.2.10-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-vorbis/xmms-vorbis-1.2.10-r1.ebuild,v 1.13 2006/07/05 06:11:25 vapier Exp $
+
+M4_VER="1.1"
+PATCH_VER="2.2.6"
+RUSXMMS_VER="35"
+inherit rusxmms-plugin
+
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86"
+IUSE="ipv6 ssl"
+
+DEPEND=">=media-sound/xmms-1.2.10-r12
+	media-libs/libvorbis
+	ssl? ( dev-libs/openssl )"
+
+PLUGIN_PATH="Input/vorbis"
+
+src_compile() {
+	myconf="${myconf} --enable-vorbis $(use_enable ipv6) $(use_enable ssl)"
+	rusxmms-plugin_src_compile
+}
diff --git a/media-plugins/xmms-vorbis/xmms-vorbis-1.2.11-r2.ebuild b/media-plugins/xmms-vorbis/xmms-vorbis-1.2.11-r2.ebuild
new file mode 100644
index 0000000..d4e4463
--- /dev/null
+++ b/media-plugins/xmms-vorbis/xmms-vorbis-1.2.11-r2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-vorbis/xmms-vorbis-1.2.10-r1.ebuild,v 1.13 2006/07/05 06:11:25 vapier Exp $
+
+M4_VER="1.1"
+PATCH_VER="2.3.0.1"
+RUSXMMS_VER="43"
+inherit rusxmms-plugin
+
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86"
+IUSE="ipv6 ssl"
+
+DEPEND=">=media-sound/xmms-1.2.10-r12
+	media-libs/libvorbis
+	ssl? ( dev-libs/openssl )"
+
+PLUGIN_PATH="Input/vorbis"
+
+src_compile() {
+	myconf="${myconf} --enable-vorbis $(use_enable ipv6) $(use_enable ssl)"
+	rusxmms-plugin_src_compile
+}
diff --git a/media-plugins/xmms-vorbis/xmms-vorbis-1.2.11.ebuild b/media-plugins/xmms-vorbis/xmms-vorbis-1.2.11.ebuild
new file mode 100644
index 0000000..7fbc228
--- /dev/null
+++ b/media-plugins/xmms-vorbis/xmms-vorbis-1.2.11.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-vorbis/xmms-vorbis-1.2.10-r1.ebuild,v 1.13 2006/07/05 06:11:25 vapier Exp $
+
+M4_VER="1.1"
+PATCH_VER="2.3.0"
+RUSXMMS_VER="41"
+inherit rusxmms-plugin
+
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86"
+IUSE="ipv6 ssl"
+
+DEPEND=">=media-sound/xmms-1.2.10-r12
+	media-libs/libvorbis
+	ssl? ( dev-libs/openssl )"
+
+PLUGIN_PATH="Input/vorbis"
+
+src_compile() {
+	myconf="${myconf} --enable-vorbis $(use_enable ipv6) $(use_enable ssl)"
+	rusxmms-plugin_src_compile
+}
diff --git a/media-plugins/xmms-wavpack/Manifest b/media-plugins/xmms-wavpack/Manifest
new file mode 100644
index 0000000..b8343e2
--- /dev/null
+++ b/media-plugins/xmms-wavpack/Manifest
@@ -0,0 +1,2 @@
+DIST xmms-wavpack-1.0.3.tar.bz2 228330 RMD160 48e6059407e2849650b01d77783443a0fe760297 SHA1 3f45695b5921dc60f8c91f9c73585bd93504bd47 SHA256 5f8b7c27e1f45590a210ca43dbeea6ef0ce091b185a70cd23ad86875214d30ba
+EBUILD xmms-wavpack-1.0.3.ebuild 538 RMD160 ab37d693aa9bfa6819e18d0e25c734f9a541cef4 SHA1 0ad50e176cb6fda5159fd01fd52188fad22bcb72 SHA256 38239b1bc3f9f15858af7497a75bd1537884ecb38f2d023d7e7c66c3ccf4684c
diff --git a/media-plugins/xmms-wavpack/xmms-wavpack-1.0.3.ebuild b/media-plugins/xmms-wavpack/xmms-wavpack-1.0.3.ebuild
new file mode 100644
index 0000000..f76509a
--- /dev/null
+++ b/media-plugins/xmms-wavpack/xmms-wavpack-1.0.3.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: current version of ebuild http://atrey.karlin.mff.cuni.cz/~sanda/mac/$
+
+IUSE=""
+
+DESCRIPTION="Plugin to listen WavPack (wv) files using xmms"
+HOMEPAGE="http://www.wavpack.com"
+SRC_URI="http://www.wavpack.com/${P}.tar.bz2"
+
+SLOT="0"
+KEYWORDS="x86 amd64"
+LICENSE="GPL"
+
+DEPEND="media-sound/xmms >=media-sound/wavpack-4.40"
+
+src_install() {
+	exeinto `xmms-config --input-plugin-dir`
+	doexe src/.libs/libwavpack.so || die
+}
diff --git a/media-plugins/xmms-wma/Manifest b/media-plugins/xmms-wma/Manifest
new file mode 100644
index 0000000..838690b
--- /dev/null
+++ b/media-plugins/xmms-wma/Manifest
@@ -0,0 +1,10 @@
+AUX xmms-wma-ds-ffmpeg.patch 5513 SHA256 55c237964f680bcfb5fe3b3f8a05410162328dfc77ba42af184745b813dffcf8 SHA512 f788b87ae76bc3262bba494b8def1e46e6fa094e221502ec32dd0e257629534f754c9b360778a7e1eb46e76225f18a363c0082ef65d28dd6af3846b1d1302db1 WHIRLPOOL 863e01d96fcbc733daa535ba5e6ba8309a6aeb55e9a363dfd3697d9592884ad8bd302bbb24bdfbd2e23f1c2cdffada06430e95d84df7be817d8891e9768f9141
+AUX xmms-wma-ds-ffmpeg0.10.patch 11445 SHA256 52434b819de3c3a521f48c8debe043e0d36aa5068c8fd4a02f94942e2d6eed32 SHA512 e2ced39d21e3efaea1de25c4c2430d686c9e6e0af21ad5dd4be04d4b38298bbae33155e69fbbc1304b6e01d4fa72cc1da577161798d13782f2ce564e5983a87c WHIRLPOOL 4b78156916d0680c5777a70bdf3a1164a6d5b3506272e2330a92f70e728c0e0311da1018d104b0426b4a887c2a024a6b759af8ed4b9b74bbbc1038828d4a3ae9
+AUX xmms-wma-ds-ffmpeg20081014.patch 5967 SHA256 b49b2147aebc510836260f1c8ef2f6aebe4312b1de380fd5bca82ff860ec7eb7 SHA512 c694c2ee179dbf9f52319ce480ed8dd02d9db87080e5f4dcde9cbac297ab672f91c3f1361a5c0d1b02c23c7c9ec150316e249bc78860f0a5859dbbe52e36a18e WHIRLPOOL 7416211e79eff19703223d4aa94875aa81bd5468e3e1b1155507d6abaa88ccf011d008bca5e92de8895071ecf23b15c7d51395ba05177875b0e3dcbb9a1dd887
+AUX xmms-wma-ds-fifo_init.patch 1041 SHA256 18deaa25c857559360a1c8b79015d56ea5ad5bfaf9670285ea108af78fd77d09 SHA512 1f877f72ee25ca3f29b0bbbb3f2edb7301341f0ecfce8ace9c921214a27118869e5971f65f9ecabaa0a6e7af1360a632b09378b7a076b7a9b53b110412121b8a WHIRLPOOL 683426d914eab0be18ce658b7ff3f53454eb1b6ece9ffe62d6d2bb8b7dad28f8c290d2db54574814af6a60fcf3a4121e0fe9499fe83e865de723192055730100
+AUX xmms-wma-ds-rcc.patch 2772 SHA256 e5cf2f4dd6b3353378c63b7176d13444bb42183f234b87d2a18d81e559b13e38 SHA512 bba9c02b7632d5977606ae069c2b039032342e81efe242c71420e55c3875b4af55295ff370b25cb87ca22efcbe0f260316b776647c8b21dbd897c39688d2ab19 WHIRLPOOL b7ada528a7da6182764d56a71e1978d8f4d5073681bbf3c7fb6562fd051e619c28c8288095e256095a6a2997b108f3e57b93058d8ae268c70131a2b571ad2f7f
+DIST xmms-wma-1.0.5.tar.bz2 146687 SHA256 61ab13363e52707b02b422589bfdbdf49c08ad398c2237c2000c8a4c9181b183 SHA512 9a1c649e0c36ecd6ff1bdb4462c0a8609785cc92355da642933993520814cd5868443e77aa06fbdb84161166864649ca77507a79428ac1c613f1620dff264f99 WHIRLPOOL d5c6eceee0d19bdd84b4d93526544afd992c9e425e2f9e395cb517015a75f98718144bedad7c32fd83f99f33ec15fe79932919a225f3df5c626c6708323b1cbd
+EBUILD xmms-wma-1.0.5-r1.ebuild 891 SHA256 8c7176da3a4b9d97e1c87c865d788fba4ac7cb4a3e92bdf51f4491171d64f059 SHA512 41a3965694e3ded80b9ce443d81e1983a6f3c2aaf316810922627c649543777d21fac8ca17995b52ba0bd920d56861187213a7c94eb1d73bb9f3b360c67013f1 WHIRLPOOL b49dd6632c4718ca7ec26f500b01a9072b3b837dd8b770301bc9c4cd96c90e87ba236c078c643320caae48a641ff95124c1b60dfbf0a5ddf27c8431c3e72b5c8
+EBUILD xmms-wma-1.0.5-r2.ebuild 901 SHA256 beb4b9efef5d26cea15b719641dfad5d73bfaea1cb7f1b803f36818a61d9f117 SHA512 62607136782ccc149b7f528f632e34cc5a56a9e4d3c39efd516347ed1c9a1b1bdd0524920bcd51659c215d342bdbb19760255d6d87fa2bef1cbb6604143d9fa6 WHIRLPOOL 14fc2db33bdf47fcb0504f6b654bee21d4fb7cd3270c489206a0d9542476d475177e59b677ddd0eb67c670af750e50dc8e5bad99f285907d522bf3707a5da061
+EBUILD xmms-wma-1.0.5-r3.ebuild 953 SHA256 c38e4539311b0701d45c4e92e6cb71831b351e6a7fe4be106ef949a96e2e8639 SHA512 1ad9ae94779248c2bf4841d25517b7a21b4d54e3c609a558bf0aaf4cad1c8ddbd6aeabab076181ab8e4cef17d4ec17c7dde67513c07e6ce92b21776a93917aff WHIRLPOOL 90e9e614454d5e9d3b9825847e4b36612d3e9d38a62ced263a7ed60bbc107190dc4cc48b1185b8640965fe17ac35804b91a4feb19488f485ef79cd7b8d4b42fa
+EBUILD xmms-wma-1.0.5-r4.ebuild 817 SHA256 26b6870653e0bc4c7e3891f7853c573d1f7b1b0e007c6276dde6829760b2fa0b SHA512 ba0ec81755d23e5f5230b5f3e6a557f3f5bba9d15d34dcf47192f17ecf0b922eab6262c0e45fc9e0f960a065b1b7a9a090dbf4f586ea69f2b83e3e44080166d7 WHIRLPOOL 33f3b4440384d058bb0a60c320b4beed782e0605118489da38390f0406df365e8e3a511973e1ffd82dca167f013b351ac5804bf4c104c1e90a641b45f440f201
diff --git a/media-plugins/xmms-wma/files/xmms-wma-ds-ffmpeg.patch b/media-plugins/xmms-wma/files/xmms-wma-ds-ffmpeg.patch
new file mode 100644
index 0000000..3ad7ced
--- /dev/null
+++ b/media-plugins/xmms-wma/files/xmms-wma-ds-ffmpeg.patch
@@ -0,0 +1,193 @@
+diff -dPNur xmms-wma-1.0.5/Makefile xmms-wma-1.0.5-new/Makefile
+--- xmms-wma-1.0.5/Makefile	2004-03-03 15:47:58.000000000 +0100
++++ xmms-wma-1.0.5-new/Makefile	2007-04-21 22:51:51.000000000 +0200
+@@ -11,7 +11,7 @@
+ export DEPS := $(SOURCES:%.c=$(DEPDIR)/%.d)
+ 
+ all:
+-	@cd ffmpeg-strip-wma; make; cd ..
++	#@cd ffmpeg-strip-wma; make; cd ..
+ 	@$(MAKE) --no-print-directory -f Makefile.inc
+ 	@strip $(PLUGIN_FILE)
+ 	@echo "The plug-in has been compiled. Run one of the following:"
+@@ -40,5 +40,5 @@
+ 	@echo "The plug-in has been uninstalled."
+ 
+ clean:
+-	cd ffmpeg-strip-wma; make clean; cd ..
++	#cd ffmpeg-strip-wma; make clean; cd ..
+ 	rm -f $(OBJECTS) $(DEPS)
+diff -dPNur xmms-wma-1.0.5/Makefile.inc xmms-wma-1.0.5-new/Makefile.inc
+--- xmms-wma-1.0.5/Makefile.inc	2005-09-05 14:48:20.000000000 +0200
++++ xmms-wma-1.0.5-new/Makefile.inc	2007-04-21 22:51:51.000000000 +0200
+@@ -1,16 +1,18 @@
+ CC := gcc
+-CFLAGS := -O2 -ffast-math -fomit-frame-pointer -fPIC
+-#CFLAGS := -Wall -g -O3
+-CFLAGS += -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
+-CFLAGS += -I ffmpeg-strip-wma
+-CFLAGS += `xmms-config --cflags`
+-LIBS := `xmms-config --libs` -L ffmpeg-strip-wma -lffwma
++MYCFLAGS := $(CFLAGS) -fPIC
++#MYCFLAGS := -Wall -g -O3
++MYCFLAGS += -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -fPIC
++#MYCFLAGS += -I ffmpeg-strip-wma
++MYCFLAGS += `xmms-config --cflags`
++MYCFLAGS += -I/usr/include/ffmpeg
++#LIBS := `xmms-config --libs` -L ffmpeg-strip-wma -lffwma
++LIBS := `xmms-config --libs` -lavcodec -lavformat
+ 
+ $(PLUGIN_FILE): $(OBJECTS)
+ 	$(CC) -o $@ $^ $(LIBS) -shared
+ 
+ $(OBJDIR)/%.o: %.c
+-	$(CC) -c -o $@ $(CFLAGS) $<
++	$(CC) -c -o $@ $(MYCFLAGS) $<
+ 
+ $(DEPDIR)/%.d: %.c
+ 	$(CC) -MM $(CFLAGS) $< | sed "s/^$*\.o:/$(OBJDIR)\/$*\.o $(DEPDIR)\/$*\.d:/" > $@
+diff -dPNur xmms-wma-1.0.5/xmms-wma.c xmms-wma-1.0.5-new/xmms-wma.c
+--- xmms-wma-1.0.5/xmms-wma.c	2005-09-05 22:19:00.000000000 +0200
++++ xmms-wma-1.0.5-new/xmms-wma.c	2007-04-22 00:47:20.000000000 +0200
+@@ -42,8 +42,9 @@
+ #undef HAVE_AV_CONFIG_H
+ #endif
+ 
+-#include "avcodec.h"
+-#include "avformat.h"
++#include "ffmpeg/avcodec.h"
++#include "ffmpeg/avformat.h"
++#include "ffmpeg/fifo.h"
+ #include "iir.h"
+ 
+ #define ABOUT_TXT "Copyright (C) 2004,2005 Mokrushin I.V. aka McMCC (mcmcc@mail.ru).\n \
+@@ -190,8 +191,6 @@
+ 
+ static void wma_init(void)
+ {
+-    avcodec_init();
+-    avcodec_register_all();
+     av_register_all();
+     init_iir();
+ }
+@@ -200,9 +199,14 @@
+ {
+     gchar *ext;
+     ext = strrchr(filename, '.');
+-    if(ext)
++    if(ext) {
+         if(!strcasecmp(ext, ".wma"))
+             return 1;
++        if(!strcasecmp(ext, ".m4a"))
++            return 1;
++        if(!strcasecmp(ext, ".aac"))
++            return 1;
++    }
+     return 0;
+ }
+ 
+@@ -337,20 +341,21 @@
+ 	return;
+ #endif
+ 	
+-    av_find_stream_info(in);
+-    (*len_real) = get_song_time(in);
+-    (*title_real) = get_song_title(in, filename);
++    if (!av_find_stream_info(in)) {
++	(*len_real) = get_song_time(in);
++	(*title_real) = get_song_title(in, filename);
++    }
+     av_close_input_file(in);
+ }
+ 
+ static void wma_playbuff(int out_size)
+ {
+-    FifoBuffer f;
++    AVFifoBuffer f;
+     int sst_buff;
+     
+-    fifo_init(&f, out_size*2);
+-    fifo_write(&f, wma_outbuf, out_size, &f.wptr);
+-    while(!fifo_read(&f, wma_s_outbuf, wma_st_buff, &f.rptr) && wma_decode)
++    av_fifo_init(&f, out_size*2);
++    av_fifo_write(&f, wma_outbuf, out_size);
++    while(!av_fifo_read(&f, wma_s_outbuf, wma_st_buff) && wma_decode)
+     {
+         if(wma_eq_on)
+             sst_buff = iir((gpointer)&wma_s_outbuf, wma_st_buff);
+@@ -364,7 +369,7 @@
+ 	wma_ip.output->write_audio((short *)wma_s_outbuf, sst_buff);
+ 	memset(wma_s_outbuf, 0, sst_buff);
+     }
+-    fifo_free(&f);
++    av_fifo_free(&f);
+     return;
+ }
+ 
+@@ -373,18 +378,29 @@
+     uint8_t *inbuf_ptr;
+     int out_size, size, len;
+     AVPacket pkt;
++    int64_t seek_target;
+     
+     pthread_mutex_lock(&wma_mutex);
+     while(wma_decode){
+-
+ 	if(wma_seekpos != -1)
+ 	{
+-	    av_seek_frame(ic, wma_idx, wma_seekpos * 1000000LL);
++	    if (wma_idx>=0) {
++		seek_target = av_rescale_q(wma_seekpos * 1000000LL, AV_TIME_BASE_Q, ic->streams[wma_idx]->time_base);
++	    } else {
++		seek_target = wma_seekpos * 1000000LL;
++	    }
++	    av_seek_frame(ic, wma_idx, seek_target, AVSEEK_FLAG_BACKWARD);
+ 	    wma_ip.output->flush(wma_seekpos * 1000);
+ 	    wma_seekpos = -1;
+ 	}
+ 
+-        if(av_read_frame(ic, &pkt) < 0) break;
++        if(av_read_frame(ic, &pkt) < 0) {
++	    /*if (url_ferror(&ic->pb) == 0) {
++		usleep(100000);
++		continue;
++	    }*/
++	    break;
++	}
+ 
+         size = pkt.size;
+         inbuf_ptr = pkt.data;
+@@ -427,10 +443,13 @@
+ #endif
+     
+     for(wma_idx = 0; wma_idx < ic->nb_streams; wma_idx++) {
+-        c = &ic->streams[wma_idx]->codec;
++        c = ic->streams[wma_idx]->codec;
+         if(c->codec_type == CODEC_TYPE_AUDIO) break;
+     }
+ 
++    if(!c || c->codec_type != CODEC_TYPE_AUDIO)
++	    return;
++
+     av_find_stream_info(ic);
+ 
+     codec = avcodec_find_decoder(c->codec_id);
+@@ -459,7 +478,8 @@
+ {
+     wma_decode = 0;
+     if(wma_pause) wma_do_pause(0);
+-    pthread_join(wma_decode_thread, NULL);
++    if(wma_decode_thread)
++	    pthread_join(wma_decode_thread, NULL);
+     wma_ip.output->close_audio();
+ }	
+ 
+@@ -482,7 +502,7 @@
+ #endif
+ 
+     for(i = 0; i < in->nb_streams; i++) {
+-        s = &in->streams[i]->codec;
++        s = in->streams[i]->codec;
+         if(s->codec_type == CODEC_TYPE_AUDIO) break;
+     }
+ 	
diff --git a/media-plugins/xmms-wma/files/xmms-wma-ds-ffmpeg0.10.patch b/media-plugins/xmms-wma/files/xmms-wma-ds-ffmpeg0.10.patch
new file mode 100644
index 0000000..922eb9a
--- /dev/null
+++ b/media-plugins/xmms-wma/files/xmms-wma-ds-ffmpeg0.10.patch
@@ -0,0 +1,411 @@
+diff -dPNur xmms-wma-1.0.5/Makefile xmms-wma-1.0.5-ds/Makefile
+--- xmms-wma-1.0.5/Makefile	2004-03-03 15:47:58.000000000 +0100
++++ xmms-wma-1.0.5-ds/Makefile	2012-11-17 08:49:25.000000000 +0100
+@@ -11,7 +11,7 @@
+ export DEPS := $(SOURCES:%.c=$(DEPDIR)/%.d)
+ 
+ all:
+-	@cd ffmpeg-strip-wma; make; cd ..
++	#@cd ffmpeg-strip-wma; make; cd ..
+ 	@$(MAKE) --no-print-directory -f Makefile.inc
+ 	@strip $(PLUGIN_FILE)
+ 	@echo "The plug-in has been compiled. Run one of the following:"
+@@ -40,5 +40,5 @@
+ 	@echo "The plug-in has been uninstalled."
+ 
+ clean:
+-	cd ffmpeg-strip-wma; make clean; cd ..
++	#cd ffmpeg-strip-wma; make clean; cd ..
+ 	rm -f $(OBJECTS) $(DEPS)
+diff -dPNur xmms-wma-1.0.5/Makefile.inc xmms-wma-1.0.5-ds/Makefile.inc
+--- xmms-wma-1.0.5/Makefile.inc	2005-09-05 14:48:20.000000000 +0200
++++ xmms-wma-1.0.5-ds/Makefile.inc	2012-11-17 08:49:25.000000000 +0100
+@@ -1,16 +1,18 @@
+ CC := gcc
+-CFLAGS := -O2 -ffast-math -fomit-frame-pointer -fPIC
+-#CFLAGS := -Wall -g -O3
+-CFLAGS += -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
+-CFLAGS += -I ffmpeg-strip-wma
+-CFLAGS += `xmms-config --cflags`
+-LIBS := `xmms-config --libs` -L ffmpeg-strip-wma -lffwma
++MYCFLAGS := $(CFLAGS) -fPIC
++#MYCFLAGS := -Wall -g -O3
++MYCFLAGS += -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -fPIC
++#MYCFLAGS += -I ffmpeg-strip-wma
++MYCFLAGS += `xmms-config --cflags`
++MYCFLAGS += -I/usr/include/ffmpeg
++#LIBS := `xmms-config --libs` -L ffmpeg-strip-wma -lffwma
++LIBS := `xmms-config --libs` -lavcodec -lavformat
+ 
+ $(PLUGIN_FILE): $(OBJECTS)
+ 	$(CC) -o $@ $^ $(LIBS) -shared
+ 
+ $(OBJDIR)/%.o: %.c
+-	$(CC) -c -o $@ $(CFLAGS) $<
++	$(CC) -c -o $@ $(MYCFLAGS) $<
+ 
+ $(DEPDIR)/%.d: %.c
+ 	$(CC) -MM $(CFLAGS) $< | sed "s/^$*\.o:/$(OBJDIR)\/$*\.o $(DEPDIR)\/$*\.d:/" > $@
+diff -dPNur xmms-wma-1.0.5/xmms-wma.c xmms-wma-1.0.5-ds/xmms-wma.c
+--- xmms-wma-1.0.5/xmms-wma.c	2005-09-05 22:19:00.000000000 +0200
++++ xmms-wma-1.0.5-ds/xmms-wma.c	2012-11-17 08:40:11.000000000 +0100
+@@ -36,14 +36,16 @@
+ #include <xmms/configfile.h>
+ #include <xmms/util.h>
+ #include <xmms/titlestring.h>
++#include <libxmms/rcc.h>
+ #endif
+ 
+ #ifdef HAVE_AV_CONFIG_H
+ #undef HAVE_AV_CONFIG_H
+ #endif
+ 
+-#include "avcodec.h"
+-#include "avformat.h"
++#include "libavcodec/avcodec.h"
++#include "libavformat/avformat.h"
++#include "libavutil/fifo.h"
+ #include "iir.h"
+ 
+ #define ABOUT_TXT "Copyright (C) 2004,2005 Mokrushin I.V. aka McMCC (mcmcc@mail.ru).\n \
+@@ -190,8 +192,6 @@
+ 
+ static void wma_init(void)
+ {
+-    avcodec_init();
+-    avcodec_register_all();
+     av_register_all();
+     init_iir();
+ }
+@@ -200,9 +200,14 @@
+ {
+     gchar *ext;
+     ext = strrchr(filename, '.');
+-    if(ext)
++    if(ext) {
+         if(!strcasecmp(ext, ".wma"))
+             return 1;
++        if(!strcasecmp(ext, ".m4a"))
++            return 1;
++        if(!strcasecmp(ext, ".aac"))
++            return 1;
++    }
+     return 0;
+ }
+ 
+@@ -262,12 +267,24 @@
+     return splitname;
+ }
+ 
+-static char* w_getstr(char* str)
++static char* w_getstr(AVFormatContext *in, char* str)
+ {
+-    if(str && strlen(str) > 0) return str;
++    AVDictionaryEntry *entry = av_dict_get(in->metadata, str, NULL, 0);
++    if (!entry) return NULL;
++    
++    
++    if(entry && strlen(entry->value) > 0) {
++	return entry->value;
++    }
+     return NULL;
+ }
+ 
++static int w_getnum(AVFormatContext *in, char* str) {
++    char *res = w_getstr(in, str);
++    if (res) return atoi(res);
++    return 0;
++}
++
+ static gchar *get_song_title(AVFormatContext *in, gchar * filename)
+ {
+     gchar *ret = NULL;
+@@ -279,17 +296,14 @@
+     XMMS_NEW_TITLEINPUT(input);
+ #endif
+     
+-    if((in->title[0] != '\0') || (in->author[0] != '\0') || (in->album[0] != '\0') ||
+-       (in->comment[0] != '\0') || (in->genre[0] != '\0') || (in->year != 0) || (in->track != 0))
+-    {	
+-	input->performer = w_getstr(in->author);
+-	input->album_name = w_getstr(in->album);
+-	input->track_name = w_getstr(in->title);
+-	input->year = in->year;
+-	input->track_number = in->track;
+-	input->genre = w_getstr(in->genre);
+-	input->comment = w_getstr(in->comment);
+-    }
++    input->performer = w_getstr(in, "artist");
++    input->album_name = w_getstr(in, "album");
++    input->track_name = w_getstr(in, "title");
++    input->year = 0;//in->year;
++    input->track_number = w_getnum(in, "track");
++    input->genre = w_getstr(in, "genre");
++    input->comment = w_getstr(in, "comment");
++
+ #ifdef BMP
+     input->file_name = g_path_get_basename(filename);
+     input->file_path = g_path_get_dirname(filename);
+@@ -298,7 +312,7 @@
+     input->file_path = filename;
+ #endif
+     input->file_ext = extname(filename);
+-    ret = xmms_get_titlestring(xmms_get_gentitle_format(), input);
++    ret = xmms_charset_get_titlestring(xmms_get_gentitle_format(), input, XMMS_RCC_UTF8);
+     if(input) g_free(input);
+ 
+     if(!ret)
+@@ -337,21 +351,23 @@
+ 	return;
+ #endif
+ 	
+-    av_find_stream_info(in);
+-    (*len_real) = get_song_time(in);
+-    (*title_real) = get_song_title(in, filename);
++    if (!av_find_stream_info(in)) {
++	(*len_real) = get_song_time(in);
++	(*title_real) = get_song_title(in, filename);
++    }
+     av_close_input_file(in);
+ }
+-
+ static void wma_playbuff(int out_size)
+ {
+-    FifoBuffer f;
++    AVFifoBuffer *f;
+     int sst_buff;
+-    
+-    fifo_init(&f, out_size*2);
+-    fifo_write(&f, wma_outbuf, out_size, &f.wptr);
+-    while(!fifo_read(&f, wma_s_outbuf, wma_st_buff, &f.rptr) && wma_decode)
+-    {
++
++    f = av_fifo_alloc(out_size*2);
++    av_fifo_generic_write(f, wma_outbuf, out_size, NULL);
++
++    while ((av_fifo_size(f) > 0) && wma_decode) {
++	if (av_fifo_generic_read(f, wma_s_outbuf, wma_st_buff, NULL)) break;
++	
+         if(wma_eq_on)
+             sst_buff = iir((gpointer)&wma_s_outbuf, wma_st_buff);
+         else
+@@ -364,7 +380,7 @@
+ 	wma_ip.output->write_audio((short *)wma_s_outbuf, sst_buff);
+ 	memset(wma_s_outbuf, 0, sst_buff);
+     }
+-    fifo_free(&f);
++    av_fifo_free(f);
+     return;
+ }
+ 
+@@ -373,18 +389,29 @@
+     uint8_t *inbuf_ptr;
+     int out_size, size, len;
+     AVPacket pkt;
++    int64_t seek_target;
+     
+     pthread_mutex_lock(&wma_mutex);
+     while(wma_decode){
+-
+ 	if(wma_seekpos != -1)
+ 	{
+-	    av_seek_frame(ic, wma_idx, wma_seekpos * 1000000LL);
++	    if (wma_idx>=0) {
++		seek_target = av_rescale_q(wma_seekpos * 1000000LL, AV_TIME_BASE_Q, ic->streams[wma_idx]->time_base);
++	    } else {
++		seek_target = wma_seekpos * 1000000LL;
++	    }
++	    av_seek_frame(ic, wma_idx, seek_target, AVSEEK_FLAG_BACKWARD);
+ 	    wma_ip.output->flush(wma_seekpos * 1000);
+ 	    wma_seekpos = -1;
+ 	}
+ 
+-        if(av_read_frame(ic, &pkt) < 0) break;
++        if(av_read_frame(ic, &pkt) < 0) {
++	    /*if (url_ferror(&ic->pb) == 0) {
++		usleep(100000);
++		continue;
++	    }*/
++	    break;
++	}
+ 
+         size = pkt.size;
+         inbuf_ptr = pkt.data;
+@@ -392,8 +419,9 @@
+         if(size == 0) break;
+ 	
+         while(size > 0){
+-            len = avcodec_decode_audio(c, (short *)wma_outbuf, &out_size,
+-                                       inbuf_ptr, size);
++	    out_size = AVCODEC_MAX_AUDIO_FRAME_SIZE;
++	    
++            len = avcodec_decode_audio3(c, (short *)wma_outbuf, &out_size, &pkt);
+ 	    if(len < 0) break;
+ 	    
+             if(out_size <= 0) continue;
+@@ -427,10 +455,13 @@
+ #endif
+     
+     for(wma_idx = 0; wma_idx < ic->nb_streams; wma_idx++) {
+-        c = &ic->streams[wma_idx]->codec;
+-        if(c->codec_type == CODEC_TYPE_AUDIO) break;
++        c = ic->streams[wma_idx]->codec;
++        if(c->codec_type == AVMEDIA_TYPE_AUDIO) break;
+     }
+ 
++    if(!c || c->codec_type != AVMEDIA_TYPE_AUDIO)
++	    return;
++
+     av_find_stream_info(ic);
+ 
+     codec = avcodec_find_decoder(c->codec_id);
+@@ -459,7 +490,8 @@
+ {
+     wma_decode = 0;
+     if(wma_pause) wma_do_pause(0);
+-    pthread_join(wma_decode_thread, NULL);
++    if(wma_decode_thread)
++	    pthread_join(wma_decode_thread, NULL);
+     wma_ip.output->close_audio();
+ }	
+ 
+@@ -468,6 +500,8 @@
+     char *title;
+     char *tmp;
+     char *message;
++    char *recoded;
++    char *msg;
+     AVFormatContext *in = NULL;
+     AVCodecContext *s = NULL;
+     AVCodec *codec;
+@@ -482,8 +516,8 @@
+ #endif
+ 
+     for(i = 0; i < in->nb_streams; i++) {
+-        s = &in->streams[i]->codec;
+-        if(s->codec_type == CODEC_TYPE_AUDIO) break;
++        s = in->streams[i]->codec;
++        if(s->codec_type == AVMEDIA_TYPE_AUDIO) break;
+     }
+ 	
+     av_find_stream_info(in);
+@@ -498,6 +532,11 @@
+ 
+     strcpy(message, "\n\n\n");
+     strcat(message, "File Name: ");
++    recoded = xmms_rcc_recode(XMMS_RCC_FS, XMMS_RCC_OUT, slashkill(filename));
++    if (recoded) {
++	strcat(message, recoded);
++	free(recoded);
++    } else 
+     strcat(message, slashkill(filename));
+     strcat(message, "\n\n");
+     strcat(message, "Audio Info:\n");
+@@ -535,56 +574,85 @@
+     }
+     strcat(message, "\n");
+     strcat(message, "Text Info:\n");
+-    if (in->title[0] != '\0')
++    msg = w_getstr(in, "title");
++    if (msg)
+     {
+ 	strcat(message, "Title: ");
+-	strcat(message, in->title);
++	recoded = xmms_rcc_recode(XMMS_RCC_UTF8, XMMS_RCC_OUT, msg);
++	if (recoded) {
++	    strcat(message, recoded);
++	    free(recoded);
++        } else 
++	strcat(message, msg);
+ 	strcat(message, "\n");
+-    }	
+-    if (in->author[0] != '\0')
++    }
++    msg = w_getstr(in, "artist");
++    if (msg)
+     {
+ 	strcat(message, "Author: ");
+-	strcat(message, in->author);
++	recoded = xmms_rcc_recode(XMMS_RCC_UTF8, XMMS_RCC_OUT, msg);
++	if (recoded) {
++	    strcat(message, recoded);
++	    free(recoded);
++        } else 
++	strcat(message, msg);
+ 	strcat(message, "\n");
+     }	
+-    if (in->album[0] != '\0')
++    msg = w_getstr(in, "album");
++    if (msg)
+     {
+ 	strcat(message, "Album: ");
+-	strcat(message, in->album);
++	recoded = xmms_rcc_recode(XMMS_RCC_UTF8, XMMS_RCC_OUT, msg);
++	if (recoded) {
++	    strcat(message, recoded);
++	    free(recoded);
++        } else 
++	strcat(message, msg);
+ 	strcat(message, "\n");
+     }
+-    if (in->year != 0)
++    msg = w_getstr(in, "date");
++    if (msg)
+     {
+-	strcat(message, "Year: ");
+-	sprintf(tmp, "%d", in->year);
+-	strcat(message, tmp);
+-	memset(tmp, 0, 256);
++	strcat(message, "Date: ");
++	strcat(message, msg);
+ 	strcat(message, "\n");
+     }
+-    if (in->track != 0)
++    msg = w_getstr(in, "track");
++    if (msg)
+     {
+ 	strcat(message, "Track: ");
+-	sprintf(tmp, "%d", in->track);
+-	strcat(message, tmp);
+-	memset(tmp, 0, 256);
++	strcat(message, msg);
+ 	strcat(message, "\n");
+     }
+-    if (in->genre[0] != '\0')
++    msg = w_getstr(in, "genre");
++    if (msg)
+     {
+ 	strcat(message, "Genre: ");
+-	strcat(message, in->genre);
++	strcat(message, msg);
+ 	strcat(message, "\n");
+     }
+-    if (in->comment[0] != '\0')
++    msg = w_getstr(in, "comment");
++    if (msg)
+     {
+ 	strcat(message, "Comments: ");
+-	strcat(message, in->comment);
++	recoded = xmms_rcc_recode(XMMS_RCC_UTF8, XMMS_RCC_OUT, msg);
++	if (recoded) {
++	    strcat(message, recoded);
++	    free(recoded);
++        } else 
++	strcat(message, msg);
+ 	strcat(message, "\n");
+     }
+-    if (in->copyright[0] != '\0')
++    msg = w_getstr(in, "copyright");
++    if (msg)
+     {
+ 	strcat(message, "Copyright: ");
+-	strcat(message, in->copyright);
++	recoded = xmms_rcc_recode(XMMS_RCC_UTF8, XMMS_RCC_OUT, msg);
++	if (recoded) {
++	    strcat(message, recoded);
++	    free(recoded);
++        } else 
++	strcat(message, msg);
+ 	strcat(message, "\n");
+     }
+     strcat(message, "\n\n");
diff --git a/media-plugins/xmms-wma/files/xmms-wma-ds-ffmpeg20081014.patch b/media-plugins/xmms-wma/files/xmms-wma-ds-ffmpeg20081014.patch
new file mode 100644
index 0000000..23c0b1a
--- /dev/null
+++ b/media-plugins/xmms-wma/files/xmms-wma-ds-ffmpeg20081014.patch
@@ -0,0 +1,209 @@
+diff -dPNur xmms-wma-1.0.5/Makefile xmms-wma-1.0.5-ds/Makefile
+--- xmms-wma-1.0.5/Makefile	2004-03-03 15:47:58.000000000 +0100
++++ xmms-wma-1.0.5-ds/Makefile	2008-11-27 01:33:03.000000000 +0100
+@@ -11,7 +11,7 @@
+ export DEPS := $(SOURCES:%.c=$(DEPDIR)/%.d)
+ 
+ all:
+-	@cd ffmpeg-strip-wma; make; cd ..
++	#@cd ffmpeg-strip-wma; make; cd ..
+ 	@$(MAKE) --no-print-directory -f Makefile.inc
+ 	@strip $(PLUGIN_FILE)
+ 	@echo "The plug-in has been compiled. Run one of the following:"
+@@ -40,5 +40,5 @@
+ 	@echo "The plug-in has been uninstalled."
+ 
+ clean:
+-	cd ffmpeg-strip-wma; make clean; cd ..
++	#cd ffmpeg-strip-wma; make clean; cd ..
+ 	rm -f $(OBJECTS) $(DEPS)
+diff -dPNur xmms-wma-1.0.5/Makefile.inc xmms-wma-1.0.5-ds/Makefile.inc
+--- xmms-wma-1.0.5/Makefile.inc	2005-09-05 14:48:20.000000000 +0200
++++ xmms-wma-1.0.5-ds/Makefile.inc	2008-11-27 01:35:01.000000000 +0100
+@@ -1,16 +1,18 @@
+ CC := gcc
+-CFLAGS := -O2 -ffast-math -fomit-frame-pointer -fPIC
+-#CFLAGS := -Wall -g -O3
+-CFLAGS += -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
+-CFLAGS += -I ffmpeg-strip-wma
+-CFLAGS += `xmms-config --cflags`
+-LIBS := `xmms-config --libs` -L ffmpeg-strip-wma -lffwma
++MYCFLAGS := $(CFLAGS) -fPIC
++#MYCFLAGS := -Wall -g -O3
++MYCFLAGS += -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -fPIC
++#MYCFLAGS += -I ffmpeg-strip-wma
++MYCFLAGS += `xmms-config --cflags`
++MYCFLAGS += -I/usr/include/ffmpeg
++#LIBS := `xmms-config --libs` -L ffmpeg-strip-wma -lffwma
++LIBS := `xmms-config --libs` -lavcodec -lavformat
+ 
+ $(PLUGIN_FILE): $(OBJECTS)
+ 	$(CC) -o $@ $^ $(LIBS) -shared
+ 
+ $(OBJDIR)/%.o: %.c
+-	$(CC) -c -o $@ $(CFLAGS) $<
++	$(CC) -c -o $@ $(MYCFLAGS) $<
+ 
+ $(DEPDIR)/%.d: %.c
+ 	$(CC) -MM $(CFLAGS) $< | sed "s/^$*\.o:/$(OBJDIR)\/$*\.o $(DEPDIR)\/$*\.d:/" > $@
+diff -dPNur xmms-wma-1.0.5/xmms-wma.c xmms-wma-1.0.5-ds/xmms-wma.c
+--- xmms-wma-1.0.5/xmms-wma.c	2008-11-27 02:58:02.000000000 +0100
++++ xmms-wma-1.0.5-ds/xmms-wma.c	2008-11-27 02:54:38.000000000 +0100
+@@ -43,8 +43,9 @@
+ #undef HAVE_AV_CONFIG_H
+ #endif
+ 
+-#include "avcodec.h"
+-#include "avformat.h"
++#include "libavcodec/avcodec.h"
++#include "libavformat/avformat.h"
++#include "libavutil/fifo.h"
+ #include "iir.h"
+ 
+ #define ABOUT_TXT "Copyright (C) 2004,2005 Mokrushin I.V. aka McMCC (mcmcc@mail.ru).\n \
+@@ -191,8 +192,6 @@
+ 
+ static void wma_init(void)
+ {
+-    avcodec_init();
+-    avcodec_register_all();
+     av_register_all();
+     init_iir();
+ }
+@@ -201,9 +200,14 @@
+ {
+     gchar *ext;
+     ext = strrchr(filename, '.');
+-    if(ext)
++    if(ext) {
+         if(!strcasecmp(ext, ".wma"))
+             return 1;
++        if(!strcasecmp(ext, ".m4a"))
++            return 1;
++        if(!strcasecmp(ext, ".aac"))
++            return 1;
++    }
+     return 0;
+ }
+ 
+@@ -338,21 +342,23 @@
+ 	return;
+ #endif
+ 	
+-    av_find_stream_info(in);
+-    (*len_real) = get_song_time(in);
+-    (*title_real) = get_song_title(in, filename);
++    if (!av_find_stream_info(in)) {
++	(*len_real) = get_song_time(in);
++	(*title_real) = get_song_title(in, filename);
++    }
+     av_close_input_file(in);
+ }
+-
+ static void wma_playbuff(int out_size)
+ {
+-    FifoBuffer f;
++    AVFifoBuffer f;
+     int sst_buff;
+-    
+-    fifo_init(&f, out_size*2);
+-    fifo_write(&f, wma_outbuf, out_size, &f.wptr);
+-    while(!fifo_read(&f, wma_s_outbuf, wma_st_buff, &f.rptr) && wma_decode)
+-    {
++
++    av_fifo_init(&f, out_size*2);
++    av_fifo_generic_write(&f, wma_outbuf, out_size, NULL);
++
++    while ((av_fifo_size(&f) > 0) && wma_decode) {
++	if (av_fifo_read(&f, wma_s_outbuf, wma_st_buff)) break;
++	
+         if(wma_eq_on)
+             sst_buff = iir((gpointer)&wma_s_outbuf, wma_st_buff);
+         else
+@@ -365,7 +371,7 @@
+ 	wma_ip.output->write_audio((short *)wma_s_outbuf, sst_buff);
+ 	memset(wma_s_outbuf, 0, sst_buff);
+     }
+-    fifo_free(&f);
++    av_fifo_free(&f);
+     return;
+ }
+ 
+@@ -374,18 +380,29 @@
+     uint8_t *inbuf_ptr;
+     int out_size, size, len;
+     AVPacket pkt;
++    int64_t seek_target;
+     
+     pthread_mutex_lock(&wma_mutex);
+     while(wma_decode){
+-
+ 	if(wma_seekpos != -1)
+ 	{
+-	    av_seek_frame(ic, wma_idx, wma_seekpos * 1000000LL);
++	    if (wma_idx>=0) {
++		seek_target = av_rescale_q(wma_seekpos * 1000000LL, AV_TIME_BASE_Q, ic->streams[wma_idx]->time_base);
++	    } else {
++		seek_target = wma_seekpos * 1000000LL;
++	    }
++	    av_seek_frame(ic, wma_idx, seek_target, AVSEEK_FLAG_BACKWARD);
+ 	    wma_ip.output->flush(wma_seekpos * 1000);
+ 	    wma_seekpos = -1;
+ 	}
+ 
+-        if(av_read_frame(ic, &pkt) < 0) break;
++        if(av_read_frame(ic, &pkt) < 0) {
++	    /*if (url_ferror(&ic->pb) == 0) {
++		usleep(100000);
++		continue;
++	    }*/
++	    break;
++	}
+ 
+         size = pkt.size;
+         inbuf_ptr = pkt.data;
+@@ -393,7 +410,9 @@
+         if(size == 0) break;
+ 	
+         while(size > 0){
+-            len = avcodec_decode_audio(c, (short *)wma_outbuf, &out_size,
++	    out_size = AVCODEC_MAX_AUDIO_FRAME_SIZE;
++	    
++            len = avcodec_decode_audio2(c, (short *)wma_outbuf, &out_size,
+                                        inbuf_ptr, size);
+ 	    if(len < 0) break;
+ 	    
+@@ -428,10 +447,13 @@
+ #endif
+     
+     for(wma_idx = 0; wma_idx < ic->nb_streams; wma_idx++) {
+-        c = &ic->streams[wma_idx]->codec;
++        c = ic->streams[wma_idx]->codec;
+         if(c->codec_type == CODEC_TYPE_AUDIO) break;
+     }
+ 
++    if(!c || c->codec_type != CODEC_TYPE_AUDIO)
++	    return;
++
+     av_find_stream_info(ic);
+ 
+     codec = avcodec_find_decoder(c->codec_id);
+@@ -460,7 +482,8 @@
+ {
+     wma_decode = 0;
+     if(wma_pause) wma_do_pause(0);
+-    pthread_join(wma_decode_thread, NULL);
++    if(wma_decode_thread)
++	    pthread_join(wma_decode_thread, NULL);
+     wma_ip.output->close_audio();
+ }	
+ 
+@@ -484,7 +507,7 @@
+ #endif
+ 
+     for(i = 0; i < in->nb_streams; i++) {
+-        s = &in->streams[i]->codec;
++        s = in->streams[i]->codec;
+         if(s->codec_type == CODEC_TYPE_AUDIO) break;
+     }
+ 	
diff --git a/media-plugins/xmms-wma/files/xmms-wma-ds-fifo_init.patch b/media-plugins/xmms-wma/files/xmms-wma-ds-fifo_init.patch
new file mode 100644
index 0000000..b2e1d82
--- /dev/null
+++ b/media-plugins/xmms-wma/files/xmms-wma-ds-fifo_init.patch
@@ -0,0 +1,32 @@
+diff -dPNur xmms-wma-1.0.5/xmms-wma.c xmms-wma-1.0.5-ds/xmms-wma.c
+--- xmms-wma-1.0.5/xmms-wma.c	2010-02-07 15:46:56.000000000 +0100
++++ xmms-wma-1.0.5-ds/xmms-wma.c	2010-02-07 15:58:23.000000000 +0100
+@@ -350,14 +350,14 @@
+ }
+ static void wma_playbuff(int out_size)
+ {
+-    AVFifoBuffer f;
++    AVFifoBuffer *f;
+     int sst_buff;
+ 
+-    av_fifo_init(&f, out_size*2);
+-    av_fifo_generic_write(&f, wma_outbuf, out_size, NULL);
++    f = av_fifo_alloc(out_size*2);
++    av_fifo_generic_write(f, wma_outbuf, out_size, NULL);
+ 
+-    while ((av_fifo_size(&f) > 0) && wma_decode) {
+-	if (av_fifo_read(&f, wma_s_outbuf, wma_st_buff)) break;
++    while ((av_fifo_size(f) > 0) && wma_decode) {
++	if (av_fifo_generic_read(f, wma_s_outbuf, wma_st_buff, NULL)) break;
+ 	
+         if(wma_eq_on)
+             sst_buff = iir((gpointer)&wma_s_outbuf, wma_st_buff);
+@@ -371,7 +371,7 @@
+ 	wma_ip.output->write_audio((short *)wma_s_outbuf, sst_buff);
+ 	memset(wma_s_outbuf, 0, sst_buff);
+     }
+-    av_fifo_free(&f);
++    av_fifo_free(f);
+     return;
+ }
+ 
diff --git a/media-plugins/xmms-wma/files/xmms-wma-ds-rcc.patch b/media-plugins/xmms-wma/files/xmms-wma-ds-rcc.patch
new file mode 100644
index 0000000..fcdc82a
--- /dev/null
+++ b/media-plugins/xmms-wma/files/xmms-wma-ds-rcc.patch
@@ -0,0 +1,98 @@
+diff -dPNur xmms-wma-1.0.5-new/xmms-wma.c xmms-wma-1.0.5-new-rcc/xmms-wma.c
+--- xmms-wma-1.0.5-new/xmms-wma.c	2007-04-22 00:47:20.000000000 +0200
++++ xmms-wma-1.0.5-new-rcc/xmms-wma.c	2007-04-22 01:13:08.000000000 +0200
+@@ -36,6 +36,7 @@
+ #include <xmms/configfile.h>
+ #include <xmms/util.h>
+ #include <xmms/titlestring.h>
++#include <libxmms/rcc.h>
+ #endif
+ 
+ #ifdef HAVE_AV_CONFIG_H
+@@ -302,7 +303,7 @@
+     input->file_path = filename;
+ #endif
+     input->file_ext = extname(filename);
+-    ret = xmms_get_titlestring(xmms_get_gentitle_format(), input);
++    ret = xmms_charset_get_titlestring(xmms_get_gentitle_format(), input, XMMS_RCC_UTF8);
+     if(input) g_free(input);
+ 
+     if(!ret)
+@@ -488,6 +489,7 @@
+     char *title;
+     char *tmp;
+     char *message;
++    char *recoded;
+     AVFormatContext *in = NULL;
+     AVCodecContext *s = NULL;
+     AVCodec *codec;
+@@ -518,6 +520,11 @@
+ 
+     strcpy(message, "\n\n\n");
+     strcat(message, "File Name: ");
++    recoded = xmms_rcc_recode(XMMS_RCC_FS, XMMS_RCC_OUT, slashkill(filename));
++    if (recoded) {
++	strcat(message, recoded);
++	free(recoded);
++    } else 
+     strcat(message, slashkill(filename));
+     strcat(message, "\n\n");
+     strcat(message, "Audio Info:\n");
+@@ -558,18 +565,33 @@
+     if (in->title[0] != '\0')
+     {
+ 	strcat(message, "Title: ");
++	recoded = xmms_rcc_recode(XMMS_RCC_UTF8, XMMS_RCC_OUT, in->title);
++	if (recoded) {
++	    strcat(message, recoded);
++	    free(recoded);
++        } else 
+ 	strcat(message, in->title);
+ 	strcat(message, "\n");
+     }	
+     if (in->author[0] != '\0')
+     {
+ 	strcat(message, "Author: ");
++	recoded = xmms_rcc_recode(XMMS_RCC_UTF8, XMMS_RCC_OUT, in->author);
++	if (recoded) {
++	    strcat(message, recoded);
++	    free(recoded);
++        } else 
+ 	strcat(message, in->author);
+ 	strcat(message, "\n");
+     }	
+     if (in->album[0] != '\0')
+     {
+ 	strcat(message, "Album: ");
++	recoded = xmms_rcc_recode(XMMS_RCC_UTF8, XMMS_RCC_OUT, in->album);
++	if (recoded) {
++	    strcat(message, recoded);
++	    free(recoded);
++        } else 
+ 	strcat(message, in->album);
+ 	strcat(message, "\n");
+     }
+@@ -598,12 +620,23 @@
+     if (in->comment[0] != '\0')
+     {
+ 	strcat(message, "Comments: ");
++	recoded = xmms_rcc_recode(XMMS_RCC_UTF8, XMMS_RCC_OUT, in->comment);
++	if (recoded) {
++	    strcat(message, recoded);
++	    free(recoded);
++        } else 
+ 	strcat(message, in->comment);
+ 	strcat(message, "\n");
+     }
+     if (in->copyright[0] != '\0')
+     {
+ 	strcat(message, "Copyright: ");
++	strcat(message, "Comments: ");
++	recoded = xmms_rcc_recode(XMMS_RCC_UTF8, XMMS_RCC_OUT, in->copyright);
++	if (recoded) {
++	    strcat(message, recoded);
++	    free(recoded);
++        } else 
+ 	strcat(message, in->copyright);
+ 	strcat(message, "\n");
+     }
diff --git a/media-plugins/xmms-wma/xmms-wma-1.0.5-r1.ebuild b/media-plugins/xmms-wma/xmms-wma-1.0.5-r1.ebuild
new file mode 100644
index 0000000..1eb20f1
--- /dev/null
+++ b/media-plugins/xmms-wma/xmms-wma-1.0.5-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-wma/xmms-wma-1.0.5.ebuild,v 1.1 2005/10/24 00:46:58 metalgod Exp $
+
+IUSE=""
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="XMMS plugin to play wma"
+HOMEPAGE="http://mcmcc.bat.ru/xmms-wma/"
+SRC_URI="http://mcmcc.bat.ru/xmms-wma/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+
+#~sparc: 1.0.4: Plays a little staticy, x86/adm64 is clear...
+
+KEYWORDS="amd64 ~ppc ~sparc x86"
+
+DEPEND="media-sound/xmms
+	>=media-video/ffmpeg-0.4.9_p20070129"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+# Patches for system ffmpeg, broken
+	epatch ${FILESDIR}/${PN}-ds-ffmpeg.patch || die
+	epatch ${FILESDIR}/${PN}-ds-rcc.patch || die
+}
+
+src_compile () {
+	emake CC="$(tc-getCC)" || die
+}
+
+src_install () {
+	exeinto `xmms-config --input-plugin-dir`
+	doexe libwma.so
+}
diff --git a/media-plugins/xmms-wma/xmms-wma-1.0.5-r2.ebuild b/media-plugins/xmms-wma/xmms-wma-1.0.5-r2.ebuild
new file mode 100644
index 0000000..a03e1b7
--- /dev/null
+++ b/media-plugins/xmms-wma/xmms-wma-1.0.5-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-wma/xmms-wma-1.0.5.ebuild,v 1.1 2005/10/24 00:46:58 metalgod Exp $
+
+IUSE=""
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="XMMS plugin to play wma"
+HOMEPAGE="http://mcmcc.bat.ru/xmms-wma/"
+SRC_URI="http://mcmcc.bat.ru/xmms-wma/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+
+#~sparc: 1.0.4: Plays a little staticy, x86/adm64 is clear...
+
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+DEPEND="media-sound/xmms
+	>=media-video/ffmpeg-0.4.9_p20081014"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+# Patches for system ffmpeg, broken
+	epatch ${FILESDIR}/${PN}-ds-ffmpeg20081014.patch || die
+	epatch ${FILESDIR}/${PN}-ds-rcc.patch || die
+}
+
+src_compile () {
+	emake CC="$(tc-getCC)" || die
+}
+
+src_install () {
+	exeinto `xmms-config --input-plugin-dir`
+	doexe libwma.so
+}
diff --git a/media-plugins/xmms-wma/xmms-wma-1.0.5-r3.ebuild b/media-plugins/xmms-wma/xmms-wma-1.0.5-r3.ebuild
new file mode 100644
index 0000000..471a0e9
--- /dev/null
+++ b/media-plugins/xmms-wma/xmms-wma-1.0.5-r3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-wma/xmms-wma-1.0.5.ebuild,v 1.1 2005/10/24 00:46:58 metalgod Exp $
+
+IUSE=""
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="XMMS plugin to play wma"
+HOMEPAGE="http://mcmcc.bat.ru/xmms-wma/"
+SRC_URI="http://mcmcc.bat.ru/xmms-wma/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+
+#~sparc: 1.0.4: Plays a little staticy, x86/adm64 is clear...
+
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+DEPEND="media-sound/xmms
+	>=media-video/ffmpeg-0.4.9_p20081014"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+# Patches for system ffmpeg, broken
+	epatch ${FILESDIR}/${PN}-ds-ffmpeg20081014.patch || die
+	epatch ${FILESDIR}/${PN}-ds-rcc.patch || die
+	epatch ${FILESDIR}/${PN}-ds-fifo_init.patch || die
+}
+
+src_compile () {
+	emake CC="$(tc-getCC)" || die
+}
+
+src_install () {
+	exeinto `xmms-config --input-plugin-dir`
+	doexe libwma.so
+}
diff --git a/media-plugins/xmms-wma/xmms-wma-1.0.5-r4.ebuild b/media-plugins/xmms-wma/xmms-wma-1.0.5-r4.ebuild
new file mode 100644
index 0000000..08c63ca
--- /dev/null
+++ b/media-plugins/xmms-wma/xmms-wma-1.0.5-r4.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-wma/xmms-wma-1.0.5.ebuild,v 1.1 2005/10/24 00:46:58 metalgod Exp $
+
+IUSE=""
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="XMMS plugin to play wma"
+HOMEPAGE="http://mcmcc.bat.ru/xmms-wma/"
+SRC_URI="http://mcmcc.bat.ru/xmms-wma/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+
+#~sparc: 1.0.4: Plays a little staticy, x86/adm64 is clear...
+
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+DEPEND="media-sound/xmms
+	>=media-video/ffmpeg-0.4.9_p20081014"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch "${FILESDIR}"/${PN}-ds-ffmpeg0.10.patch || die
+}
+
+src_compile () {
+	emake CC="$(tc-getCC)" || die
+}
+
+src_install () {
+	exeinto `xmms-config --input-plugin-dir`
+	doexe libwma.so
+}