Revision Bump to update to the new gentoo patchset that fixes several bugs.

(Portage version: 2.1_pre7-r4)

4 files changed, 198 insertions, 12 deletions

diff --git a/media-sound/xmms/ChangeLog b/media-sound/xmms/ChangeLog
index 3791a538a3cd..3256d4199a94 100644
--- a/media-sound/xmms/ChangeLog
+++ b/media-sound/xmms/ChangeLog
@@ -1,6 +1,11 @@
 # 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.191 2005/11/06 03:19:07 metalgod Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/ChangeLog,v 1.192 2006/04/06 15:28:41 metalgod Exp $
+
+*xmms-1.2.10-r16 (06 Apr 2006)
+
+  06 Apr 2006; Luis Medinas <metalgod@gentoo.org> +xmms-1.2.10-r16.ebuild:
+  Revision Bump to update to the new gentoo patchset that fixes several bugs.
 
   06 Nov 2005; Luis Medinas <metalgod@gentoo.org> files/xmms.desktop:
   Fixing xmms.desktop file in order to use it on gnome 2.12.
diff --git a/media-sound/xmms/Manifest b/media-sound/xmms/Manifest
index af3dc6e5abb8..2624953524c2 100644
--- a/media-sound/xmms/Manifest
+++ b/media-sound/xmms/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 1cbaca9fbda49c1678a98a6a74e2d22d ChangeLog 33245
 RMD160 dcf26987439f8181184ff69fa0e0c28121f01bb6 ChangeLog 33245
 SHA256 187c55a20e06278d9c97b3143761d23ae1293dad358785ebe6457d71770e01b6 ChangeLog 33245
@@ -10,6 +7,9 @@ SHA256 2c036a1973d45a0064d312e3e3b8cedde446d673b697210f8038334663f6e2a4 files/di
 MD5 46c1f42d9a05a0484dbf8ed6935055be files/digest-xmms-1.2.10-r15 354
 RMD160 d5001e7690a5717141017b40bea73f984b9eaf57 files/digest-xmms-1.2.10-r15 354
 SHA256 3248322308d5d95a8fffda7589dc3d34758043ea8119c095942fef79134c699f files/digest-xmms-1.2.10-r15 354
+MD5 bf00f6ecc458831d2b469a6bca3805d5 files/digest-xmms-1.2.10-r16 1292
+RMD160 d648af38522481ac81f0fc66175e466b430502af files/digest-xmms-1.2.10-r16 1292
+SHA256 8e930819492cf68222e4e0c37d8126145c687ec46328a76104fad1aa73365551 files/digest-xmms-1.2.10-r16 1292
 MD5 4190322696afc5e46dac14804b8aef70 files/po-update.pl 10510
 RMD160 ceb1c28e314e51bc502a45e31d67f56da4d8d79f files/po-update.pl 10510
 SHA256 c6258dd3b39e36a4307d76fbfe0e5d36af7a5aae1bffefc3746a2ddf4b8e5712 files/po-update.pl 10510
@@ -25,10 +25,6 @@ SHA256 12ec689656ce4f46af4da0e04da39ab7615358958db73915e0b2dcbe955b240e xmms-1.2
 MD5 895c6e3e95ce081046c32001c483a558 xmms-1.2.10-r15.ebuild 4950
 RMD160 e6c9367ab24806fca970f225ce79c4fb3a54a857 xmms-1.2.10-r15.ebuild 4950
 SHA256 e911dcdbe3b101c6cddfbf85a9032d4aa3fac13f1dd553df7b451741d45f4211 xmms-1.2.10-r15.ebuild 4950
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFENT4GwUpWvClEHQoRAih+AJ9KVhKyIqvVsZDQKRVgVX8EAg95TACeL6Xi
-oXdMsKLr9qUlYEg0mJbvj1M=
-=qzrz
------END PGP SIGNATURE-----
+MD5 052c38e8ef5baae5f07bc53f003afd74 xmms-1.2.10-r16.ebuild 5010
+RMD160 0ade97795898b7171c278335f321754c393f48ff xmms-1.2.10-r16.ebuild 5010
+SHA256 8d831442de98987e13f8377a2d8c4baebca7c78f59ef3a8342bfdf01e2cc7c35 xmms-1.2.10-r16.ebuild 5010
diff --git a/media-sound/xmms/files/digest-xmms-1.2.10-r16 b/media-sound/xmms/files/digest-xmms-1.2.10-r16
new file mode 100644
index 000000000000..f5de1229b9e7
--- /dev/null
+++ b/media-sound/xmms/files/digest-xmms-1.2.10-r16
@@ -0,0 +1,15 @@
+MD5 41eababfa8bad11e9e34e467cdfb86be gentoo_ice-xmms-0.2.tar.bz2 51839
+RMD160 11439cbebf8c6dc5745c8593a79e88303d094544 gentoo_ice-xmms-0.2.tar.bz2 51839
+SHA256 d1be63368b76f4a8b1d5b0e955cd7a77177f56a7f0b828c6603d8fd2836422b1 gentoo_ice-xmms-0.2.tar.bz2 51839
+MD5 fe54f2ec779bc995176e63e3e77cca11 gnomexmms.xpm 7979
+RMD160 4b5eab1734333ec4031a37c9ef740ba35f8fb84e gnomexmms.xpm 7979
+SHA256 6cb7f07ffe47d51bf4483a57812b7c8cb7e35ca5be9d8f0c33512646097f1a71 gnomexmms.xpm 7979
+MD5 28314147dec40dbeaf4665bf1a9854b9 xmms-1.2.10-gentoo-m4-1.1.tar.bz2 26978
+RMD160 63ce094969f33205420f9823a970eb3faabf2e3e xmms-1.2.10-gentoo-m4-1.1.tar.bz2 26978
+SHA256 e253fb2a515d3c7881617172f14fccad6a42cea660b8eaaeef9657114288e46f xmms-1.2.10-gentoo-m4-1.1.tar.bz2 26978
+MD5 5ddc532690fbeaa7b6d1db0b19a493e5 xmms-1.2.10-gentoo-patches-2.3.1.tar.bz2 576830
+RMD160 f8e9227d4d3a1947b636f13ec68e75f06c93ad29 xmms-1.2.10-gentoo-patches-2.3.1.tar.bz2 576830
+SHA256 d2c5a2cc5b02f5295b2e2eb83e5a33e6361e284f3ffc07a76cd2b3a201c994b6 xmms-1.2.10-gentoo-patches-2.3.1.tar.bz2 576830
+MD5 03a85cfc5e1877a2e1f7be4fa1d3f63c xmms-1.2.10.tar.bz2 2418265
+RMD160 0360cbb8c326b3325bd8ebb3343c69a9788d7084 xmms-1.2.10.tar.bz2 2418265
+SHA256 ff9eabae2074043294a19ec7beaf0959bd076f6cd60558264faeec08f4a0eb6a xmms-1.2.10.tar.bz2 2418265
diff --git a/media-sound/xmms/xmms-1.2.10-r16.ebuild b/media-sound/xmms/xmms-1.2.10-r16.ebuild
new file mode 100644
index 000000000000..121235546224
--- /dev/null
+++ b/media-sound/xmms/xmms-1.2.10-r16.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2006 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-r16.ebuild,v 1.1 2006/04/06 15:28:41 metalgod Exp $
+
+inherit flag-o-matic eutils libtool gnuconfig
+
+PATCH_VER="2.3.1"
+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/~metalgod/xmms/${P}-gentoo-m4-${M4_VER}.tar.bz2
+	http://dev.gentoo.org/~metalgod/xmms/${P}-gentoo-patches-${PATCH_VER}.tar.bz2
+	http://dev.gentoo.org/~metalgod/xmms/gnomexmms.xpm"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="nls esd mmx vorbis 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.9
+	>=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 )
+	 vorbis? ( >=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_SOURCE="${WORKDIR}/patches" EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" epatch
+
+	export WANT_AUTOMAKE=1.9
+	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
+	newins 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"
+}