Version bump updates xmms with various bugfixes in upstream cvs. Also pulling in xmms-mpg123 even when we have USE=mad because it's just better...

(Portage version: 2.0.51.22-r1)

6 files changed, 195 insertions, 9 deletions

diff --git a/media-sound/xmms/ChangeLog b/media-sound/xmms/ChangeLog
index cde134e30d84..3a6e36982a33 100644
--- a/media-sound/xmms/ChangeLog
+++ b/media-sound/xmms/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/xmms
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/ChangeLog,v 1.174 2005/05/22 17:20:21 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/ChangeLog,v 1.175 2005/05/27 02:26:02 eradicator Exp $
+
+*xmms-1.2.10-r15 (27 May 2005)
+
+  27 May 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  xmms-1.2.10-r13.ebuild, xmms-1.2.10-r14.ebuild, +xmms-1.2.10-r15.ebuild:
+  Version bump updates xmms with various bugfixes in upstream cvs. Also
+  pulling in xmms-mpg123 even when we have USE=mad because it's just better...
 
   22 May 2005; Guy Martin <gmsoft@gentoo.org> :
   Stable on hppa.
diff --git a/media-sound/xmms/Manifest b/media-sound/xmms/Manifest
index 445bfa8ceddc..bd8a3ced5864 100644
--- a/media-sound/xmms/Manifest
+++ b/media-sound/xmms/Manifest
@@ -1,10 +1,12 @@
-MD5 88721eb885fa4e0a37746b5a5d2650bc ChangeLog 31021
 MD5 5a8290e44006ccff0dff3094555d6366 metadata.xml 257
-MD5 e4d14f561de2de3eb8614bebd8209ff6 xmms-1.2.10-r14.ebuild 4974
-MD5 62a24b5ad50302517fcf35e1156d66e5 xmms-1.2.10-r13.ebuild 4974
+MD5 16100b2c3d3ff409b564cdda081c65b1 xmms-1.2.10-r15.ebuild 4971
 MD5 90931843c4a3e65340dec9f9aa6e0ff0 xmms-1.2.8-r4.ebuild 5209
+MD5 15728784cd518bc0a3d23b85aab27b7e ChangeLog 31337
+MD5 8659596dd59529ad44fb70934e6e6379 xmms-1.2.10-r14.ebuild 4964
+MD5 6b1a91cf1589f9622348a4376de299c0 xmms-1.2.10-r13.ebuild 4964
+MD5 46c1f42d9a05a0484dbf8ed6935055be files/digest-xmms-1.2.10-r15 354
 MD5 f52f09b25da87c876de70b6177292f2e files/digest-xmms-1.2.8-r4 216
 MD5 7d2f3807ebbff435b909ecf0539cbf4f files/xmms.desktop 722
+MD5 4190322696afc5e46dac14804b8aef70 files/po-update.pl 10510
 MD5 b9dc01a8f53d43e1a63281b71376fcff files/digest-xmms-1.2.10-r14 354
 MD5 4414d53b65874ac2c610a3f2396654cd files/digest-xmms-1.2.10-r13 354
-MD5 4190322696afc5e46dac14804b8aef70 files/po-update.pl 10510
diff --git a/media-sound/xmms/files/digest-xmms-1.2.10-r15 b/media-sound/xmms/files/digest-xmms-1.2.10-r15
new file mode 100644
index 000000000000..b8b5380d6670
--- /dev/null
+++ b/media-sound/xmms/files/digest-xmms-1.2.10-r15
@@ -0,0 +1,5 @@
+MD5 03a85cfc5e1877a2e1f7be4fa1d3f63c xmms-1.2.10.tar.bz2 2418265
+MD5 41eababfa8bad11e9e34e467cdfb86be gentoo_ice-xmms-0.2.tar.bz2 51839
+MD5 28314147dec40dbeaf4665bf1a9854b9 xmms-1.2.10-gentoo-m4-1.1.tar.bz2 26978
+MD5 0ecda9da0e9a8b28f7a5fe71bf7334f1 xmms-1.2.10-gentoo-patches-2.3.0.tar.bz2 573370
+MD5 fe54f2ec779bc995176e63e3e77cca11 gnomexmms.xpm 7979
diff --git a/media-sound/xmms/xmms-1.2.10-r13.ebuild b/media-sound/xmms/xmms-1.2.10-r13.ebuild
index 3cb02cc11b83..53d74294bdb3 100644
--- a/media-sound/xmms/xmms-1.2.10-r13.ebuild
+++ b/media-sound/xmms/xmms-1.2.10-r13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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-r13.ebuild,v 1.11 2005/04/09 12:33:02 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.10-r13.ebuild,v 1.12 2005/05/27 02:26:02 eradicator Exp $
 
 inherit flag-o-matic eutils libtool gnuconfig
 
@@ -43,7 +43,7 @@ PDEPEND="lirc? ( media-plugins/xmms-lirc )
 	 flac? ( media-libs/flac )
 	 mikmod? ( media-plugins/xmms-mikmod )
 	 mp3? ( mad? ( >=media-plugins/xmms-mad-0.7 )
-	        !mad? ( >=media-plugins/xmms-mpg123-1.2.10-r1 ) )
+	        >=media-plugins/xmms-mpg123-1.2.10-r1 )
 	 oggvorbis? ( >=media-plugins/xmms-vorbis-1.2.10-r1 )
 	 sndfile? ( media-plugins/xmms-sndfile )
 
diff --git a/media-sound/xmms/xmms-1.2.10-r14.ebuild b/media-sound/xmms/xmms-1.2.10-r14.ebuild
index 88bbb9143f48..10c0d4eb54c8 100644
--- a/media-sound/xmms/xmms-1.2.10-r14.ebuild
+++ b/media-sound/xmms/xmms-1.2.10-r14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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-r14.ebuild,v 1.6 2005/05/25 04:00:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.10-r14.ebuild,v 1.7 2005/05/27 02:26:02 eradicator Exp $
 
 inherit flag-o-matic eutils libtool gnuconfig
 
@@ -43,7 +43,7 @@ PDEPEND="lirc? ( media-plugins/xmms-lirc )
 	 flac? ( media-libs/flac )
 	 mikmod? ( media-plugins/xmms-mikmod )
 	 mp3? ( mad? ( >=media-plugins/xmms-mad-0.7 )
-	        !mad? ( >=media-plugins/xmms-mpg123-1.2.10-r1 ) )
+	        >=media-plugins/xmms-mpg123-1.2.10-r1 )
 	 oggvorbis? ( >=media-plugins/xmms-vorbis-1.2.10-r1 )
 	 sndfile? ( media-plugins/xmms-sndfile )
 
diff --git a/media-sound/xmms/xmms-1.2.10-r15.ebuild b/media-sound/xmms/xmms-1.2.10-r15.ebuild
new file mode 100644
index 000000000000..26faa6f04590
--- /dev/null
+++ b/media-sound/xmms/xmms-1.2.10-r15.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2005 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-r15.ebuild,v 1.1 2005/05/27 02:26:02 eradicator Exp $
+
+inherit flag-o-matic eutils libtool gnuconfig
+
+PATCH_VER="2.3.0"
+M4_VER="1.1"
+
+PATCHDIR="${WORKDIR}/patches"
+
+DESCRIPTION="X MultiMedia System"
+HOMEPAGE="http://www.xmms.org/"
+SRC_URI="http://www.xmms.org/files/1.2.x/${P}.tar.bz2
+	mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2
+	http://dev.gentoo.org/~eradicator/xmms/${P}-gentoo-m4-${M4_VER}.tar.bz2
+	http://dev.gentoo.org/~eradicator/xmms/${P}-gentoo-patches-${PATCH_VER}.tar.bz2
+	http://dev.gentoo.org/~eradicator/xmms/gnomexmms.xpm"
+
+LICENSE="GPL-2"
+SLOT="0"
+# Testing still
+KEYWORDS="-*"
+#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="nls esd mmx oggvorbis 3dnow mikmod directfb alsa oss arts jack sndfile lirc flac mad mp3"
+
+DEPEND="=x11-libs/gtk+-1.2*"
+
+RDEPEND="${DEPEND}
+	directfb? ( dev-libs/DirectFB )
+	app-arch/unzip"
+
+#We want these things in DEPEND only
+DEPEND="${DEPEND}
+	>=sys-devel/automake-1.7
+	>=sys-devel/autoconf-2.5
+	sys-devel/libtool
+	nls? ( dev-util/intltool
+	       dev-lang/perl
+	       sys-devel/gettext )"
+
+# USE flags pull in xmms plugins
+PDEPEND="lirc? ( media-plugins/xmms-lirc )
+
+	 flac? ( media-libs/flac )
+	 mikmod? ( media-plugins/xmms-mikmod )
+	 mp3? ( mad? ( >=media-plugins/xmms-mad-0.7 )
+	        >=media-plugins/xmms-mpg123-1.2.10-r1 )
+	 oggvorbis? ( >=media-plugins/xmms-vorbis-1.2.10-r1 )
+	 sndfile? ( media-plugins/xmms-sndfile )
+
+	 alsa? ( media-plugins/xmms-alsa )
+	 arts? ( media-plugins/xmms-arts )
+	 jack? ( media-plugins/xmms-jack )
+	 esd? ( media-plugins/xmms-esd )
+	 oss? ( media-plugins/xmms-oss )"
+
+src_unpack() {
+	if ! has_version '>=sys-devel/gettext-0.14.1'; then
+		eerror "Sorry, you seem to have USE=-nls with an old version of gettext"
+		eerror "on your system.  Unfortunately, that will cause xmms to fail emerging."
+		eerror "Please either remove gettext or upgrade to version 0.14.1."
+	fi
+
+	unpack ${A}
+	cd ${S}
+
+	EPATCH_SUFFIX="patch"
+	epatch ${PATCHDIR}
+
+	export WANT_AUTOMAKE=1.7
+	export WANT_AUTOCONF=2.5
+
+	sed -i 's:Output Input Effect General Visualization::' Makefile.am
+
+	for dir in . libxmms; do
+		cd ${S}/${dir}
+		rm acinclude.m4
+		libtoolize --force --copy || die "libtoolize --force --copy failed"
+		[ ! -f ltmain.sh ] && ln -s ../ltmain.sh
+		aclocal -I ${WORKDIR}/m4 || die "aclocal failed"
+		autoheader || die "autoheader failed"
+		automake --gnu --add-missing --include-deps --force-missing --copy || die "automake failed"
+		autoconf || die "autoconf failed"
+	done
+
+	if use nls; then
+		cd ${S}/po
+		cp ${FILESDIR}/po-update.pl update.pl
+		perl update.pl --pot
+	fi
+
+	cd ${S}
+	gnuconfig_update
+}
+
+src_compile() {
+	export EGREP="grep -E"
+	filter-flags -fforce-addr -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
+
+	local myconf=""
+
+	if use !amd64 && { use 3dnow || use mmx; }; then
+		myconf="${myconf} --enable-simd"
+	else
+		myconf="${myconf} --disable-simd"
+	fi
+
+	# Please see Bug 58092 for details
+	use ppc64 && replace-flags "-O[2-9]" "-O1"
+
+	econf `use_enable nls` ${myconf} || die
+
+	# For some reason, gmake doesn't export this for libtool's consumption
+	emake -j1 || die
+}
+
+src_install() {
+	export EGREP="grep -E"
+	make DESTDIR="${D}" install || die
+
+	dodoc AUTHORS ChangeLog FAQ NEWS README TODO
+	newdoc ${PATCHDIR}/README README.patches
+	newdoc ${PATCHDIR}/ChangeLog ChangeLog.patches
+
+	keepdir /usr/share/xmms/Skins
+	insinto /usr/share/pixmaps/
+	newins ${DISTDIR}/gnomexmms.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/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
+
+	insinto /usr/include/xmms/libxmms
+	doins ${S}/libxmms/*.h
+
+	insinto /usr/include/xmms
+	doins ${S}/xmms/i18n.h
+}
+
+pkg_postinst() {
+	einfo "media-sound/xmms now just provides the xmms binary and libxmms."
+	einfo "All plugins that were packaged with xmms are now provided by other"
+	einfo "packages in media-plugins.  Some of these are automatically pulled in"
+	einfo "based on USE flags.  Others you will need to emerge manually.  The"
+	einfo "following is a list of packages which were previously provided by"
+	einfo "media-sound/xmms that are not automatically emerged:"
+	einfo "media-plugins/xmms-blur-scope"
+	einfo "media-plugins/xmms-cdaudio"
+	einfo "media-plugins/xmms-disk-writer"
+	einfo "media-plugins/xmms-echo"
+	einfo "media-plugins/xmms-ir"
+	einfo "media-plugins/xmms-joystick"
+	einfo "media-plugins/xmms-opengl-spectrum"
+	einfo "media-plugins/xmms-sanalyzer"
+	einfo "media-plugins/xmms-song-change"
+	einfo "media-plugins/xmms-stereo"
+	einfo "media-plugins/xmms-tonegen"
+	einfo "media-plugins/xmms-voice"
+	einfo "media-plugins/xmms-wav"
+}