Cleaning up version clutter.

7 files changed, 5 insertions, 595 deletions

diff --git a/media-sound/xmms/ChangeLog b/media-sound/xmms/ChangeLog
index 3211f747743b..aee4e30e9d64 100644
--- a/media-sound/xmms/ChangeLog
+++ b/media-sound/xmms/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/xmms
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/ChangeLog,v 1.131 2004/07/05 20:21:23 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/ChangeLog,v 1.132 2004/07/06 01:14:18 eradicator Exp $
+
+  05 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -xmms-1.2.10-r3.ebuild, -xmms-1.2.10-r4.ebuild, -xmms-1.2.9-r2.ebuild:
+  Cleaning up version clutter.
 
   05 Jul 2004; Lars Weiler <pylon@gentoo.org> xmms-1.2.10-r5.ebuild:
   Stable on ppc.
diff --git a/media-sound/xmms/files/digest-xmms-1.2.10-r3 b/media-sound/xmms/files/digest-xmms-1.2.10-r3
deleted file mode 100644
index a50839a91615..000000000000
--- a/media-sound/xmms/files/digest-xmms-1.2.10-r3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 03a85cfc5e1877a2e1f7be4fa1d3f63c xmms-1.2.10.tar.bz2 2418265
-MD5 41eababfa8bad11e9e34e467cdfb86be gentoo_ice-xmms-0.2.tar.bz2 51839
-MD5 88e01e4c009b761ee276adac8e1fcbc3 xmms-1.2.10-gentoo-patches-0.5.tar.bz2 144088
diff --git a/media-sound/xmms/files/digest-xmms-1.2.10-r4 b/media-sound/xmms/files/digest-xmms-1.2.10-r4
deleted file mode 100644
index 4adbdf5d5e03..000000000000
--- a/media-sound/xmms/files/digest-xmms-1.2.10-r4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 03a85cfc5e1877a2e1f7be4fa1d3f63c xmms-1.2.10.tar.bz2 2418265
-MD5 41eababfa8bad11e9e34e467cdfb86be gentoo_ice-xmms-0.2.tar.bz2 51839
-MD5 d4b73a78df3dc875da0350a9695c582b xmms-1.2.10-gentoo-patches-0.6.tar.bz2 144312
diff --git a/media-sound/xmms/files/digest-xmms-1.2.9-r2 b/media-sound/xmms/files/digest-xmms-1.2.9-r2
deleted file mode 100644
index 6341688ef726..000000000000
--- a/media-sound/xmms/files/digest-xmms-1.2.9-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 428084b80a6ee936f57a6703a610f039 xmms-1.2.9.tar.bz2 2414962
-MD5 41eababfa8bad11e9e34e467cdfb86be gentoo_ice-xmms-0.2.tar.bz2 51839
-MD5 6c1ffbe04891bf9c7dbe7a8dd7b529f4 xmms-1.2.9-gentoo-patches-0.5.tar.bz2 103013
diff --git a/media-sound/xmms/xmms-1.2.10-r3.ebuild b/media-sound/xmms/xmms-1.2.10-r3.ebuild
deleted file mode 100644
index ad49b2b0c800..000000000000
--- a/media-sound/xmms/xmms-1.2.10-r3.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.10-r3.ebuild,v 1.2 2004/06/25 00:29:52 agriffis Exp $
-
-inherit flag-o-matic eutils libtool
-
-PATCHVER="0.5"
-
-MY_P=${P/_pre/-pre}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="X MultiMedia System"
-HOMEPAGE="http://www.xmms.org/"
-SRC_URI="http://www.xmms.org/files/1.2.x/${MY_P}.tar.bz2
-	mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2
-	http://dev.gentoo.org/~eradicator/xmms/${P}-gentoo-patches-${PATCHVER}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64"
-IUSE="xml nls esd opengl mmx oggvorbis 3dnow mikmod directfb ipv6 cjk alsa oss"
-
-DEPEND="=x11-libs/gtk+-1.2*
-	mikmod? ( >=media-libs/libmikmod-3.1.10 )
-	esd? ( >=media-sound/esound-0.2.22 )
-	xml? ( >=dev-libs/libxml-1.8.15 )
-	opengl? ( virtual/opengl )
-	alsa? ( >=media-libs/alsa-lib-0.9.0 )
-	oggvorbis? ( >=media-libs/libvorbis-1.0 )"
-
-RDEPEND="${DEPEND}
-	directfb? ( dev-libs/DirectFB )
-	sys-devel/gettext
-	app-arch/unzip"
-
-#We want these things in DEPEND only
-DEPEND="${DEPEND}
-	nls? ( dev-util/intltool )
-	>=sys-devel/automake-1.7.8
-	>=sys-devel/autoconf-2.58"
-
-PATCHDIR=${WORKDIR}/patches
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# Add dynamic taste detection patch...
-	# goto http://bugs.xmms.org/show_bug.cgi?id=756 to vote for its inclusion in mainline xmms
-	# This patch is no longer included in gentoo xmms due to problems with later versions of glib.
-	# epatch ${PATCHDIR}/${P}-dtd.patch
-
-	# id3v2 editing support in mpg123 plugin
-	epatch ${PATCHDIR}/${P}-id3v2edit.patch
-
-	# Patch to allow external programmes to have the "jump to" dialog box
-	epatch ${PATCHDIR}/${P}-jump.patch
-
-	# Save playlist, etc on SIGTERM and SIGINT, bug #13604.
-	epatch ${PATCHDIR}/${P}-sigterm.patch
-
-	# Patch for mpg123 to convert Japanese character code of MP3 tag info
-	# the Japanese patch and the Russian one overlap, so its one or the other
-	if use cjk; then
-		epatch ${PATCHDIR}/${P}-mpg123j.patch
-	else
-		# add recode patch http://sourceforge.net/projects/rusxmms/
-		# epatch ${PATCHDIR}/${P}-recode-csa27.3.dtd.patch
-		epatch ${PATCHDIR}/${P}-recode-csa27.3.patch
-		epatch ${PATCHDIR}/${P}-recode-csa27.3.regressionFix.patch
-	fi
-
-	# Add /usr/local/share/xmms/Skins to the search path for skins
-	epatch ${PATCHDIR}/${P}-fhs-skinsdir.patch
-
-	# This patch passes audio output through the output plugin
-	# before recording via the diskwriter plugin
-	# http://forum.xmms.org/viewtopic.php?t=500&sid=c286e1c01fb924a2f81f519969f33764
-	epatch ${PATCHDIR}/${P}-diskwriter-audio.patch
-
-	# Patch to enable superior randomised playlists:
-	epatch ${PATCHDIR}/${P}-random.patch
-
-	# This patch changes the search-bar's behaviour when playing
-	# sid tunes using xmms-sid plugin. It enables you to select the
-	# different tunes that are sometimes included in a single .sid file
-	epatch ${PATCHDIR}/${P}-sid-songpos.patch
-
-	# Bug #45720 ... bugfix when unpausing with alsa
-	epatch ${PATCHDIR}/${P}-alsa-pause.patch
-
-	# Bug #47761 ... Patch to enable seeking in HTTP streams
-	epatch ${PATCHDIR}/${P}-stream-seek.patch
-
-	if [ ! -f ${S}/config.rpath ] ; then
-		touch ${S}/config.rpath
-		chmod +x ${S}/config.rpath
-	fi
-
-	# dtd updates Makefile.am, but not Makefile.in
-	export WANT_AUTOCONF=2.5
-	export WANT_AUTOMAKE=1.7
-	for subd in .; do
-		cd ${S}/${subd}
-
-		ebegin "Running aclocal in ${S}/${subd}"
-		aclocal
-		eend $?
-
-		ebegin "Running automake in ${S}/${subd}"
-		automake --gnu --add-missing --include-deps
-		retval=$?
-		eend $retval
-
-		if [ $retval -ne 0 ]; then
-			exit 1;
-		fi
-	done
-
-	elibtoolize
-}
-
-src_compile() {
-	filter-flags -fforce-addr -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
-
-	local myconf=""
-
-	# Allow configure to detect mipslinux systems
-	use mips && gnuconfig_update
-
-	if use amd64; then
-		myconf="${myconf} --disable-simd"
-	else
-	  	if use 3dnow || use mmx; then
-			myconf="${myconf} --enable-simd"
-		else
-			myconf="${myconf} --disable-simd"
-		fi
-	fi
-
-	use xml || myconf="${myconf} --disable-cdindex"
-
-	econf \
-		--with-dev-dsp=/dev/sound/dsp \
-		--with-dev-mixer=/dev/sound/mixer \
-		`use_enable oggvorbis vorbis` \
-		`use_enable oggvorbis oggtest` \
-		`use_enable oggvorbis vorbistest` \
-		`use_enable esd` \
-		`use_enable esd esdtest` \
-		`use_enable mikmod` \
-		`use_enable mikmod mikmodtest` \
-		`use_with mikmod libmikmod` \
-		`use_enable opengl` \
-		`use_enable nls` \
-		`use_enable ipv6` \
-		`use_enable oss oss` \
-		${myconf} \
-		|| die
-
-	emake -j1 || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS ChangeLog FAQ NEWS README TODO
-
-	keepdir /usr/share/xmms/Skins
-	insinto /usr/share/pixmaps/
-	donewins xmms/xmms_logo.xpm xmms.xpm
-	doins xmms/xmms_logo.xpm
-	insinto /usr/share/pixmaps/mini
-	doins xmms/xmms_mini.xpm
-
-	insinto /etc/X11/wmconfig
-	donewins xmms/xmms.wmconfig xmms
-
-	insinto /usr/share/gnome/apps/Multimedia
-	doins ${FILESDIR}/xmms.desktop
-	insinto /usr/share/applnk/Multimedia
-	doins ${FILESDIR}/xmms.desktop
-	insinto /usr/share/applications
-	doins ${FILESDIR}/xmms.desktop
-
-	# Add the sexy Gentoo Ice skin
-	insinto /usr/share/xmms/Skins/gentoo_ice
-	doins ${WORKDIR}/gentoo_ice/*
-	docinto gentoo_ice
-	dodoc ${WORKDIR}/README
-}
-
diff --git a/media-sound/xmms/xmms-1.2.10-r4.ebuild b/media-sound/xmms/xmms-1.2.10-r4.ebuild
deleted file mode 100644
index 27c348d4248f..000000000000
--- a/media-sound/xmms/xmms-1.2.10-r4.ebuild
+++ /dev/null
@@ -1,195 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.10-r4.ebuild,v 1.2 2004/06/25 00:29:52 agriffis Exp $
-
-inherit flag-o-matic eutils libtool
-
-PATCHVER="0.6"
-
-MY_P=${P/_pre/-pre}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="X MultiMedia System"
-HOMEPAGE="http://www.xmms.org/"
-SRC_URI="http://www.xmms.org/files/1.2.x/${MY_P}.tar.bz2
-	mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2
-	http://dev.gentoo.org/~eradicator/xmms/${P}-gentoo-patches-${PATCHVER}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64"
-IUSE="xml nls esd opengl mmx oggvorbis 3dnow mikmod directfb ipv6 cjk alsa oss"
-
-DEPEND="=x11-libs/gtk+-1.2*
-	mikmod? ( >=media-libs/libmikmod-3.1.10 )
-	esd? ( >=media-sound/esound-0.2.22 )
-	xml? ( >=dev-libs/libxml-1.8.15 )
-	opengl? ( virtual/opengl )
-	alsa? ( >=media-libs/alsa-lib-0.9.0 )
-	oggvorbis? ( >=media-libs/libvorbis-1.0 )"
-
-RDEPEND="${DEPEND}
-	directfb? ( dev-libs/DirectFB )
-	sys-devel/gettext
-	app-arch/unzip"
-
-#We want these things in DEPEND only
-DEPEND="${DEPEND}
-	nls? ( dev-util/intltool )
-	>=sys-devel/automake-1.7.8
-	>=sys-devel/autoconf-2.58"
-
-PATCHDIR=${WORKDIR}/patches
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# Add dynamic taste detection patch...
-	# goto http://bugs.xmms.org/show_bug.cgi?id=756 to vote for its inclusion in mainline xmms
-	# This patch is no longer included in gentoo xmms due to problems with later versions of glib.
-	# epatch ${PATCHDIR}/${P}-dtd.patch
-
-	# Fix gcc3.4 C++ problem. See bug #53125
-	epatch ${PATCHDIR}/${P}-gcc34.patch
-
-	# id3v2 editing support in mpg123 plugin
-	epatch ${PATCHDIR}/${P}-id3v2edit.patch
-
-	# Patch to allow external programmes to have the "jump to" dialog box
-	epatch ${PATCHDIR}/${P}-jump.patch
-
-	# Save playlist, etc on SIGTERM and SIGINT, bug #13604.
-	epatch ${PATCHDIR}/${P}-sigterm.patch
-
-	# Patch for mpg123 to convert Japanese character code of MP3 tag info
-	# the Japanese patch and the Russian one overlap, so its one or the other
-	if use cjk; then
-		epatch ${PATCHDIR}/${P}-mpg123j.patch
-	else
-		# add recode patch http://sourceforge.net/projects/rusxmms/
-		# epatch ${PATCHDIR}/${P}-recode-csa27.3.dtd.patch
-		epatch ${PATCHDIR}/${P}-recode-csa27.3.patch
-		epatch ${PATCHDIR}/${P}-recode-csa27.3.regressionFix.patch
-	fi
-
-	# Add /usr/local/share/xmms/Skins to the search path for skins
-	epatch ${PATCHDIR}/${P}-fhs-skinsdir.patch
-
-	# This patch passes audio output through the output plugin
-	# before recording via the diskwriter plugin
-	# http://forum.xmms.org/viewtopic.php?t=500&sid=c286e1c01fb924a2f81f519969f33764
-	epatch ${PATCHDIR}/${P}-diskwriter-audio.patch
-
-	# Patch to enable superior randomised playlists:
-	epatch ${PATCHDIR}/${P}-random.patch
-
-	# This patch changes the search-bar's behaviour when playing
-	# sid tunes using xmms-sid plugin. It enables you to select the
-	# different tunes that are sometimes included in a single .sid file
-	epatch ${PATCHDIR}/${P}-sid-songpos.patch
-
-	# Bug #45720 ... bugfix when unpausing with alsa
-	epatch ${PATCHDIR}/${P}-alsa-pause.patch
-
-	# Bug #47761 ... Patch to enable seeking in HTTP streams
-	epatch ${PATCHDIR}/${P}-stream-seek.patch
-
-	if [ ! -f ${S}/config.rpath ] ; then
-		touch ${S}/config.rpath
-		chmod +x ${S}/config.rpath
-	fi
-
-	# dtd updates Makefile.am, but not Makefile.in
-	export WANT_AUTOCONF=2.5
-	export WANT_AUTOMAKE=1.7
-	for subd in .; do
-		cd ${S}/${subd}
-
-		ebegin "Running aclocal in ${S}/${subd}"
-		aclocal
-		eend $?
-
-		ebegin "Running automake in ${S}/${subd}"
-		automake --gnu --add-missing --include-deps
-		retval=$?
-		eend $retval
-
-		if [ $retval -ne 0 ]; then
-			exit 1;
-		fi
-	done
-
-	elibtoolize
-}
-
-src_compile() {
-	filter-flags -fforce-addr -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
-
-	local myconf=""
-
-	# Allow configure to detect mipslinux systems
-	use mips && gnuconfig_update
-
-	if use amd64; then
-		myconf="${myconf} --disable-simd"
-	else
-	  	if use 3dnow || use mmx; then
-			myconf="${myconf} --enable-simd"
-		else
-			myconf="${myconf} --disable-simd"
-		fi
-	fi
-
-	use xml || myconf="${myconf} --disable-cdindex"
-
-	econf \
-		--with-dev-dsp=/dev/sound/dsp \
-		--with-dev-mixer=/dev/sound/mixer \
-		`use_enable oggvorbis vorbis` \
-		`use_enable oggvorbis oggtest` \
-		`use_enable oggvorbis vorbistest` \
-		`use_enable esd` \
-		`use_enable esd esdtest` \
-		`use_enable mikmod` \
-		`use_enable mikmod mikmodtest` \
-		`use_with mikmod libmikmod` \
-		`use_enable opengl` \
-		`use_enable nls` \
-		`use_enable ipv6` \
-		`use_enable oss oss` \
-		${myconf} \
-		|| die
-
-	emake -j1 || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS ChangeLog FAQ NEWS README TODO
-
-	keepdir /usr/share/xmms/Skins
-	insinto /usr/share/pixmaps/
-	donewins xmms/xmms_logo.xpm xmms.xpm
-	doins xmms/xmms_logo.xpm
-	insinto /usr/share/pixmaps/mini
-	doins xmms/xmms_mini.xpm
-
-	insinto /etc/X11/wmconfig
-	donewins xmms/xmms.wmconfig xmms
-
-	insinto /usr/share/gnome/apps/Multimedia
-	doins ${FILESDIR}/xmms.desktop
-	insinto /usr/share/applnk/Multimedia
-	doins ${FILESDIR}/xmms.desktop
-	insinto /usr/share/applications
-	doins ${FILESDIR}/xmms.desktop
-
-	# Add the sexy Gentoo Ice skin
-	insinto /usr/share/xmms/Skins/gentoo_ice
-	doins ${WORKDIR}/gentoo_ice/*
-	docinto gentoo_ice
-	dodoc ${WORKDIR}/README
-}
-
diff --git a/media-sound/xmms/xmms-1.2.9-r2.ebuild b/media-sound/xmms/xmms-1.2.9-r2.ebuild
deleted file mode 100644
index 00d74b802346..000000000000
--- a/media-sound/xmms/xmms-1.2.9-r2.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.9-r2.ebuild,v 1.11 2004/06/25 00:29:52 agriffis Exp $
-
-inherit flag-o-matic eutils
-
-PATCHVER="0.5"
-
-MY_P=${P/_pre/-pre}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="X MultiMedia System"
-HOMEPAGE="http://www.xmms.org/"
-SRC_URI="http://www.xmms.org/files/1.2.x/${MY_P}.tar.bz2
-	mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2
-	mirror://gentoo/${P}-gentoo-patches-${PATCHVER}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ~mips"
-IUSE="xml nls esd gnome opengl mmx oggvorbis 3dnow mikmod directfb ipv6 cjk alsa"
-
-DEPEND="=x11-libs/gtk+-1.2*
-	mikmod? ( >=media-libs/libmikmod-3.1.10 )
-	esd? ( >=media-sound/esound-0.2.22 )
-	xml? ( >=dev-libs/libxml-1.8.15 )
-	opengl? ( virtual/opengl )
-	alsa? ( >=media-libs/alsa-lib-0.9.0 )
-	oggvorbis? ( >=media-libs/libvorbis-1.0 )"
-
-RDEPEND="${DEPEND}
-	directfb? ( dev-libs/DirectFB )
-	sys-devel/gettext
-	app-arch/unzip"
-
-#We want these things in DEPEND only
-DEPEND="${DEPEND}
-	nls? ( dev-util/intltool )
-	>=sys-devel/automake-1.7.9
-	>=sys-devel/autoconf-2.58"
-
-PATCHDIR=${WORKDIR}/patches
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# Add dynamic taste detection patch...
-	# goto http://bugs.xmms.org/show_bug.cgi?id=756 to vote for its inclusion in mainline xmms
-	epatch ${PATCHDIR}/${P}-dtd.patch
-
-	# Fix ansi C fubar so that it compiles with less-forgiving gcc2
-	epatch ${PATCHDIR}/${P}-id3v2edit.patch
-
-	# Patch to allow external programmes to have the "jump to" dialog box
-	epatch ${PATCHDIR}/${P}-jump.patch
-
-	# Save playlist, etc on SIGTERM and SIGINT, bug #13604.
-	epatch ${PATCHDIR}/${P}-sigterm.patch
-
-	#shadow Patch, bug #30420.
-	#in mainline 1.2.9 now
-	#epatch ${PATCHDIR}/${P}-shadow.patch
-
-	# read_all patch, bug #39456
-	epatch ${PATCHDIR}/${P}-read_all_fix.patch
-
-	# Patch for mpg123 to convert Japanese character code of MP3 tag info
-	# the Japanese patch and the Russian one overlap, so its one or the other
-	if use cjk; then
-		epatch ${PATCHDIR}/${P}-mpg123j.patch
-	else
-		# add recode patch http://sourceforge.net/projects/rusxmms/
-		epatch ${PATCHDIR}/${P}-recode-csa27.patch
-		epatch ${PATCHDIR}/${P}-recode-csa27.gcc2.patch
-	fi
-
-	if [ ! -f ${S}/config.rpath ] ; then
-		touch ${S}/config.rpath
-		chmod +x ${S}/config.rpath
-	fi
-
-	# Add /usr/local/share/xmms/Skins to the search path for skins
-	epatch ${PATCHDIR}/${P}-fhs-skinsdir.patch
-
-	# This patch passes audio output through the output plugin
-	# before recording via the diskwriter plugin
-	# http://forum.xmms.org/viewtopic.php?t=500&sid=c286e1c01fb924a2f81f519969f33764
-	epatch ${PATCHDIR}/${P}-diskwriter-audio.patch
-
-	# Patch to enable superior randomised playlists:
-	epatch ${PATCHDIR}/${P}-random.patch
-
-	# This patch changes the search-bar's behaviour when playing
-	# sid tunes using xmms-sid plugin. It enables you to select the
-	# different tunes that are sometimes included in a single .sid file
-	epatch ${PATCHDIR}/${P}-sid-songpos.patch
-
-	export WANT_AUTOCONF=2.5
-	export WANT_AUTOMAKE=1.7
-	for x in . libxmms ; do
-		cd ${S}/${x}
-		aclocal
-		automake --gnu --add-missing --include-deps || die
-	done
-}
-
-src_compile() {
-	filter-flags -fforce-addr -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
-
-	local myconf=""
-
-	# Allow configure to detect mipslinux systems
-	use mips && gnuconfig_update
-
-	if use amd64; then
-		myconf="${myconf} --disable-simd"
-	else
-	  	if use 3dnow || use mmx; then
-			myconf="${myconf} --enable-simd"
-		else
-			myconf="${myconf} --disable-simd"
-		fi
-	fi
-
-	use xml || myconf="${myconf} --disable-cdindex"
-
-	econf \
-		--with-dev-dsp=/dev/sound/dsp \
-		--with-dev-mixer=/dev/sound/mixer \
-		`use_enable oggvorbis vorbis` \
-		`use_enable oggvorbis oggtest` \
-		`use_enable oggvorbis vorbistest` \
-		`use_enable esd` \
-		`use_enable esd esdtest` \
-		`use_enable mikmod` \
-		`use_enable mikmod mikmodtest` \
-		`use_with mikmod libmikmod` \
-		`use_enable opengl` \
-		`use_enable nls` \
-		`use_enable ipv6` \
-		${myconf} \
-		|| die
-
-	### emake seems to break some compiles, please keep @ make
-	make || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-#	einstall \
-#		incdir=${D}/usr/include \
-#		sysdir=${D}/usr/share/applets/Multimedia \
-#		GNOME_SYSCONFDIR=${D}/etc \
-#		install || die "make install failed"
-
-	dodoc AUTHORS ChangeLog FAQ NEWS README TODO
-
-	keepdir /usr/share/xmms/Skins
-	insinto /usr/share/pixmaps/
-#	donewins gnomexmms/gnomexmms.xpm xmms.xpm
-	donewins xmms/xmms_logo.xpm xmms.xpm
-	doins xmms/xmms_logo.xpm
-	insinto /usr/share/pixmaps/mini
-	doins xmms/xmms_mini.xpm
-
-	insinto /etc/X11/wmconfig
-	donewins xmms/xmms.wmconfig xmms
-
-	if use gnome ; then
-		insinto /usr/share/gnome/apps/Multimedia
-		doins xmms/xmms.desktop
-		dosed "s:xmms_mini.xpm:mini/xmms_mini.xpm:" \
-			/usr/share/gnome/apps/Multimedia/xmms.desktop
-#	else
-#		rm ${D}/usr/share/man/man1/gnomexmms*
-	fi
-
-	# Add the sexy Gentoo Ice skin
-	insinto /usr/share/xmms/Skins/gentoo_ice
-	doins ${WORKDIR}/gentoo_ice/*
-	docinto gentoo_ice
-	dodoc ${WORKDIR}/README
-}
-
-pkg_postinst() {
-	echo
-	einfo "If you have been using the xmms-sid plugin before,"
-	einfo "it would be a good idea to re-emerge it now, to have"
-	einfo "the additional features introduced by the xmms-songpos patch"
-	einfo "which let's you select one of several tunes sometimes included"
-	einfo "in a single .sid file using the song-position slider."
-	echo
-	einfo "If you enjoy the dtd (Dynamic Taste Detection) patch, please"
-	einfo "visit the url below and vote for this patch's inclusion in"
-	einfo "main-line xmms."
-	einfo "http://bugs.xmms.org/show_bug.cgi?id=756"
-}