Bumping to stable for gcc3.3 fix. --disable-alsa since it needs 0.5. Closes bug #38996.

4 files changed, 17 insertions, 72 deletions

diff --git a/media-sound/xmp/ChangeLog b/media-sound/xmp/ChangeLog
index aa098ef0d38e..6d62f30720c3 100644
--- a/media-sound/xmp/ChangeLog
+++ b/media-sound/xmp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/xmp
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmp/ChangeLog,v 1.4 2004/03/11 12:13:27 karltk Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmp/ChangeLog,v 1.5 2004/03/21 04:12:50 eradicator Exp $
+
+  20 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  xmp-2.0.5_pre3-r1.ebuild, xmp-2.0.5_pre3.ebuild:
+  Bumping to stable for gcc3.3 fix. --disable-alsa since it needs 0.5. Closes
+  bug #38996.
 
 *xmp-2.0.5_pre3-r1 (11 Mar 2004)
 
diff --git a/media-sound/xmp/files/digest-xmp-2.0.5_pre3 b/media-sound/xmp/files/digest-xmp-2.0.5_pre3
deleted file mode 100644
index 3198e4ee7d7a..000000000000
--- a/media-sound/xmp/files/digest-xmp-2.0.5_pre3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 749db9c8da956b403a959b4c8b909447 xmp-2.0.5pre3.tar.bz2 318375
diff --git a/media-sound/xmp/xmp-2.0.5_pre3-r1.ebuild b/media-sound/xmp/xmp-2.0.5_pre3-r1.ebuild
index a2b5f2d1d246..405b5cedc721 100644
--- a/media-sound/xmp/xmp-2.0.5_pre3-r1.ebuild
+++ b/media-sound/xmp/xmp-2.0.5_pre3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmp/xmp-2.0.5_pre3-r1.ebuild,v 1.1 2004/03/11 12:13:27 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmp/xmp-2.0.5_pre3-r1.ebuild,v 1.2 2004/03/21 04:12:50 eradicator Exp $
 
 IUSE="xmms arts esd nas X oss alsa"
 
@@ -11,26 +11,29 @@ HOMEPAGE="http://xmp.sf.net"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
 DEPEND="X? ( virtual/x11 )
 	esd? ( media-sound/esound )
 	nas? ( media-libs/nas )
-	alsa? ( =media-libs/alsa-lib-0.5* )
 	arts? ( kde-base/arts )
 	xmms? ( media-sound/xmms )"
 
+#	Nobody uses alsa5, but if they do, they can hand edit this...
+#	alsa? ( =media-libs/alsa-lib-0.5* )
+
+
 src_unpack() {
 	unpack ${A}
 	epatch ${FILESDIR}/${P}-gcc3.3.diff
 }
 
 src_compile() {
-	local myconf
+	local myconf="--disable-alsa"
 
-	use alsa \
-		&& myconf="${myconf} --enable-alsa" \
-		|| myconf="${myconf} --disable-alsa"
+#	use alsa \
+#		&& myconf="${myconf} --enable-alsa" \
+#		|| myconf="${myconf} --disable-alsa"
 
 	use arts \
 		&& myconf="${myconf} --enable-arts" \
diff --git a/media-sound/xmp/xmp-2.0.5_pre3.ebuild b/media-sound/xmp/xmp-2.0.5_pre3.ebuild
deleted file mode 100644
index fd6e0286a060..000000000000
--- a/media-sound/xmp/xmp-2.0.5_pre3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmp/xmp-2.0.5_pre3.ebuild,v 1.8 2004/03/01 05:37:16 eradicator Exp $
-
-IUSE="xmms arts esd nas X oss alsa"
-
-S="${WORKDIR}/${PN}-2.0.5-pre3"
-DESCRIPTION="Extended Module Player"
-SRC_URI="mirror://sourceforge/xmp/${PN}-2.0.5pre3.tar.bz2"
-HOMEPAGE="http://xmp.sf.net"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-
-DEPEND="X? ( virtual/x11 )
-	esd? ( media-sound/esound )
-	nas? ( media-libs/nas )
-	alsa? ( =media-libs/alsa-lib-0.5* )
-	arts? ( kde-base/arts )
-	xmms? ( media-sound/xmms )"
-
-src_compile() {
-	local myconf
-
-	use alsa \
-		&& myconf="${myconf} --enable-alsa" \
-		|| myconf="${myconf} --disable-alsa"
-
-	use arts \
-		&& myconf="${myconf} --enable-arts" \
-		|| myconf="${myconf} --disable-arts"
-
-	use esd \
-		&& myconf="${myconf} --enable-esd" \
-		|| myconf="${myconf} --disable-esd"
-
-	use nas \
-		&& myconf="${myconf} --enable-nas" \
-		|| myconf="${myconf} --disable-nas"
-
-	use oss \
-		&& myconf="${myconf} --enable-oss" \
-		|| myconf="${myconf} --disable-oss"
-
-	use xmms \
-		&& myconf="${myconf} --enable-xmms" \
-		|| myconf="${myconf} --disable-xmms"
-
-	use X \
-		&& myconf="${myconf} --with-x" \
-		|| myconf="${myconf} --with-x"
-
-	econf ${myconf} || die
-
-	make || die
-}
-
-src_install () {
-	make DEST_DIR=${D} MAN_DIR=${D}/usr/share/man/man1 install || die
-	dodoc INSTALL README
-}