Updated ebuilds to request correct automake versions. Closes bug #40348. Updated russian patch (now called recode patch) in 1.2.9-r2 to version csa27. See bug #40103. Added patch from http://bugs.xmms.org/show_bug.cgi?id=1583 to close bug #39456.

8 files changed, 218 insertions, 17 deletions

diff --git a/media-sound/xmms/Manifest b/media-sound/xmms/Manifest
index e2b8b8a263c6..d80efa5c01a1 100644
--- a/media-sound/xmms/Manifest
+++ b/media-sound/xmms/Manifest
@@ -1,10 +1,10 @@
-MD5 ebbd8bf1035bdcb45b8cdedc68ac886a xmms-1.2.9-r2.ebuild 5435
-MD5 098cf94c1939610a33de20a0e4ae7bc1 xmms-1.2.7-r23.ebuild 5467
-MD5 0ea7c6cc662efde38e1d62c154939246 xmms-1.2.7-r25.ebuild 5877
-MD5 307e3924e2195cfc4def01d56413a01b xmms-1.2.9-r1.ebuild 5443
-MD5 022dec0cd7576e1c5a63875ab4b3b51a xmms-1.2.8-r4.ebuild 5229
-MD5 c9314b710565bd911034b4e25eeb674e ChangeLog 19409
-MD5 a0011d7219177fcc0961d78915a23f7c xmms-1.2.8-r3.ebuild 4943
+MD5 4c49ed93da64e30b99513c20185609e1 xmms-1.2.9-r2.ebuild 5539
+MD5 1f3e56e1bd01d70a23efdb5efbd31638 xmms-1.2.7-r23.ebuild 5486
+MD5 f917a6df3bcc0a37c6eee8c47f13508e xmms-1.2.7-r25.ebuild 5896
+MD5 5ae97196b04e84379894e3e88641b2dd xmms-1.2.9-r1.ebuild 5443
+MD5 637569bad503e3a81bee82145f05f2b4 xmms-1.2.8-r4.ebuild 5247
+MD5 7516a5fe1b76550289e38255e59d1cf3 ChangeLog 19890
+MD5 b9a22ec996f0baa117360ca727772d41 xmms-1.2.8-r3.ebuild 4961
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 20b60b9c94a35974970dafd0bbd050c4 files/digest-xmms-1.2.7-r23 211
 MD5 20b60b9c94a35974970dafd0bbd050c4 files/digest-xmms-1.2.7-r25 211
diff --git a/media-sound/xmms/files/digest-xmms-1.2.9-r2 b/media-sound/xmms/files/digest-xmms-1.2.9-r2
new file mode 100644
index 000000000000..809358a0f086
--- /dev/null
+++ b/media-sound/xmms/files/digest-xmms-1.2.9-r2
@@ -0,0 +1,3 @@
+MD5 428084b80a6ee936f57a6703a610f039 xmms-1.2.9.tar.bz2 2414962
+MD5 41eababfa8bad11e9e34e467cdfb86be gentoo_ice-xmms-0.2.tar.bz2 51839
+MD5 d96f30351f8aa73a4de32b05e4760aa3 xmms-1.2.9-gentoo-patches-0.4.tar.bz2 102798
diff --git a/media-sound/xmms/xmms-1.2.7-r23.ebuild b/media-sound/xmms/xmms-1.2.7-r23.ebuild
index add5239e41bb..45acba2faee2 100644
--- a/media-sound/xmms/xmms-1.2.7-r23.ebuild
+++ b/media-sound/xmms/xmms-1.2.7-r23.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/xmms/xmms-1.2.7-r23.ebuild,v 1.17 2004/02/04 05:11:41 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.7-r23.ebuild,v 1.18 2004/02/04 07:50:39 eradicator Exp $
 
 inherit libtool flag-o-matic eutils
 filter-flags -fforce-addr -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
@@ -33,7 +33,7 @@ RDEPEND="${DEPEND}
 #We want these things in DEPEND only
 DEPEND="$DEPEND
 	nls? ( dev-util/intltool )
-	>=sys-devel/automake-1.7.7
+	sys-devel/automake
 	>=sys-devel/autoconf-2.58"
 
 PATCHDIR=${WORKDIR}/patches
@@ -110,6 +110,7 @@ src_unpack() {
 		cd ${x}
 		aclocal
 		export WANT_AUTOCONF=2.5
+		export WANT_AUTOMAKE=1.4
 		automake --gnu --add-missing --include-deps Makefile || die
 		autoconf || die
 	done
diff --git a/media-sound/xmms/xmms-1.2.7-r25.ebuild b/media-sound/xmms/xmms-1.2.7-r25.ebuild
index 73cdf63481df..9efb19809798 100644
--- a/media-sound/xmms/xmms-1.2.7-r25.ebuild
+++ b/media-sound/xmms/xmms-1.2.7-r25.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/xmms/xmms-1.2.7-r25.ebuild,v 1.13 2004/02/04 05:11:41 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.7-r25.ebuild,v 1.14 2004/02/04 07:50:39 eradicator Exp $
 
 IUSE="xml nls esd gnome opengl mmx oggvorbis 3dnow mikmod directfb ipv6 cjk gtk2"
 
@@ -34,7 +34,7 @@ RDEPEND="${DEPEND}
 #We want these things in DEPEND only
 DEPEND="$DEPEND
 	nls? ( dev-util/intltool )
-	>=sys-devel/automake-1.7.8
+	sys-devel/automake
 	>=sys-devel/autoconf-2.58"
 
 PATCHDIR=${WORKDIR}/patches
@@ -119,6 +119,7 @@ src_unpack() {
 		cd ${x}
 		aclocal
 		export WANT_AUTOCONF=2.5
+		export WANT_AUTOMAKE=1.4
 		automake --gnu --add-missing --include-deps Makefile || die
 		autoconf || die
 	done
diff --git a/media-sound/xmms/xmms-1.2.8-r3.ebuild b/media-sound/xmms/xmms-1.2.8-r3.ebuild
index c4d311b9f221..a99090099cd2 100644
--- a/media-sound/xmms/xmms-1.2.8-r3.ebuild
+++ b/media-sound/xmms/xmms-1.2.8-r3.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/xmms/xmms-1.2.8-r3.ebuild,v 1.14 2004/02/04 05:11:41 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.8-r3.ebuild,v 1.15 2004/02/04 07:50:39 eradicator Exp $
 
 IUSE="xml nls esd gnome opengl mmx oggvorbis 3dnow mikmod directfb ipv6 cjk gtk2"
 
@@ -34,7 +34,7 @@ RDEPEND="${DEPEND}
 #We want these things in DEPEND only
 DEPEND="$DEPEND
 	nls? ( dev-util/intltool )
-	>=sys-devel/automake-1.7.8
+	sys-devel/automake
 	>=sys-devel/autoconf-2.58"
 
 PATCHDIR=${WORKDIR}/patches
@@ -86,6 +86,7 @@ src_unpack() {
 	epatch ${PATCHDIR}/${P}-sid-songpos.patch
 
 	export WANT_AUTOCONF=2.5
+	export WANT_AUTOMAKE=1.4
 	for x in . libxmms ; do
 		cd ${S}/${x}
 		automake --gnu --add-missing --include-deps || die
diff --git a/media-sound/xmms/xmms-1.2.8-r4.ebuild b/media-sound/xmms/xmms-1.2.8-r4.ebuild
index 7c3baf538c70..9b18ba10506c 100644
--- a/media-sound/xmms/xmms-1.2.8-r4.ebuild
+++ b/media-sound/xmms/xmms-1.2.8-r4.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/xmms/xmms-1.2.8-r4.ebuild,v 1.4 2004/02/04 05:11:41 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.8-r4.ebuild,v 1.5 2004/02/04 07:50:39 eradicator Exp $
 
 IUSE="xml nls esd gnome opengl mmx oggvorbis 3dnow mikmod directfb ipv6 cjk gtk2"
 
@@ -34,7 +34,7 @@ RDEPEND="${DEPEND}
 #We want these things in DEPEND only
 DEPEND="$DEPEND
 	nls? ( dev-util/intltool )
-	>=sys-devel/automake-1.7.8
+	sys-devel/automake
 	>=sys-devel/autoconf-2.58"
 
 PATCHDIR=${WORKDIR}/patches
@@ -89,6 +89,7 @@ src_unpack() {
 	epatch ${PATCHDIR}/${P}-sid-songpos.patch
 
 	export WANT_AUTOCONF=2.5
+	export WANT_AUTOMAKE=1.4
 	for x in . libxmms ; do
 		cd ${S}/${x}
 		automake --gnu --add-missing --include-deps || die
diff --git a/media-sound/xmms/xmms-1.2.9-r1.ebuild b/media-sound/xmms/xmms-1.2.9-r1.ebuild
index 8ae9c8d990d7..2a3323486796 100644
--- a/media-sound/xmms/xmms-1.2.9-r1.ebuild
+++ b/media-sound/xmms/xmms-1.2.9-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/xmms/xmms-1.2.9-r1.ebuild,v 1.4 2004/02/04 05:11:41 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.9-r1.ebuild,v 1.5 2004/02/04 07:50:39 eradicator Exp $
 
 inherit flag-o-matic eutils
 
@@ -34,7 +34,7 @@ RDEPEND="${DEPEND}
 #We want these things in DEPEND only
 DEPEND="${DEPEND}
 	nls? ( dev-util/intltool )
-	>=sys-devel/automake-1.7.8
+	>=sys-devel/automake-1.7.9
 	>=sys-devel/autoconf-2.58"
 
 PATCHDIR=${WORKDIR}/patches
diff --git a/media-sound/xmms/xmms-1.2.9-r2.ebuild b/media-sound/xmms/xmms-1.2.9-r2.ebuild
new file mode 100644
index 000000000000..3c5f2bd4b69d
--- /dev/null
+++ b/media-sound/xmms/xmms-1.2.9-r2.ebuild
@@ -0,0 +1,194 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# 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.1 2004/02/04 07:50:39 eradicator Exp $
+
+inherit flag-o-matic eutils
+
+PATCHVER="0.4"
+
+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 ~mips ~amd64 ~ia64"
+IUSE="xml nls esd gnome opengl mmx oggvorbis 3dnow mikmod directfb ipv6 cjk"
+
+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 )
+	oggvorbis? ( >=media-libs/libvorbis-1.0 )"
+
+RDEPEND="${DEPEND}
+	directfb? ( dev-libs/DirectFB )
+	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.
+	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
+	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"
+}