version bump to xmms 1.2.9_pre1. Hopefully fixes dtd bug discussed on IRC and removing 1.2.7-r20 since it is no longer neccessary...

6 files changed, 197 insertions, 182 deletions

diff --git a/media-sound/xmms/ChangeLog b/media-sound/xmms/ChangeLog
index 3dc26e705872..77346a86058a 100644
--- a/media-sound/xmms/ChangeLog
+++ b/media-sound/xmms/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/xmms
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/ChangeLog,v 1.84 2004/01/17 03:49:00 darkspecter Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/ChangeLog,v 1.85 2004/01/25 10:19:34 eradicator Exp $
+
+*xmms-1.2.9_pre1 (24 Jan 2004)
+
+  24 Jan 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  xmms-1.2.7-r20.ebuild, xmms-1.2.9_pre1.ebuild:
+  Removing crusty ebuild 1.2.7-r20 to close bug #31928. Bumping to latest xmms
+  version.
 
   17 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org> xmms-1.2.8-r3.ebuild:
   manifest fix
diff --git a/media-sound/xmms/Manifest b/media-sound/xmms/Manifest
index 44c93a9a8cd0..54f7363a81d8 100644
--- a/media-sound/xmms/Manifest
+++ b/media-sound/xmms/Manifest
@@ -1,11 +1,9 @@
 MD5 411d5319b6036bd7c00dd132a9a855b3 xmms-1.2.7-r23.ebuild 5336
-MD5 84cb603f01d57cd8074b497270d510d2 xmms-1.2.9_pre1.ebuild 5103
+MD5 288db3982364d2f70356278cfa8fecae xmms-1.2.9_pre1.ebuild 5202
 MD5 ce0dc3b9f4e3f210a8216e606c14df62 xmms-1.2.7-r25.ebuild 5744
-MD5 cd660fd444bfe12407b742b54514d31a xmms-1.2.7-r20.ebuild 5027
-MD5 1b3215a1fb38177b6bc80cf916310e16 ChangeLog 16656
+MD5 2d4718e21d3e5c99f989af60bc257d4d ChangeLog 16884
 MD5 ad11502b641ce7df48f6441954239cde xmms-1.2.8-r3.ebuild 4819
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 20b60b9c94a35974970dafd0bbd050c4 files/digest-xmms-1.2.7-r20 211
 MD5 20b60b9c94a35974970dafd0bbd050c4 files/digest-xmms-1.2.7-r23 211
 MD5 20b60b9c94a35974970dafd0bbd050c4 files/digest-xmms-1.2.7-r25 211
 MD5 924d785f5c63c99d5c20c0853c1a719b files/digest-xmms-1.2.8-r3 216
diff --git a/media-sound/xmms/files/digest-xmms-1.2.7-r20 b/media-sound/xmms/files/digest-xmms-1.2.7-r20
deleted file mode 100644
index cbca5a363618..000000000000
--- a/media-sound/xmms/files/digest-xmms-1.2.7-r20
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 8aa14a305d1eeb1bb53dba2197ba695a xmms-1.2.7.tar.gz 2860908
-MD5 7c2ff3f528f3e5d20300ae1efb64f41f xmms-1.2.7-gentoo-patches-0.1.tar.bz2 29236
-MD5 daea40648c3ae296597dcd3e78500279 xmms-1.2.7-mmx.patch.gz 14990
diff --git a/media-sound/xmms/files/digest-xmms-1.2.9_pre1 b/media-sound/xmms/files/digest-xmms-1.2.9_pre1
new file mode 100644
index 000000000000..70ad0d142917
--- /dev/null
+++ b/media-sound/xmms/files/digest-xmms-1.2.9_pre1
@@ -0,0 +1,3 @@
+MD5 6427625f618b8f7a3b5dfa8ff268d330 xmms-1.2.9-pre1.tar.bz2 2408754
+MD5 41eababfa8bad11e9e34e467cdfb86be gentoo_ice-xmms-0.2.tar.bz2 51839
+MD5 396214a074ac6258ec47293b7435a5be xmms-1.2.9_pre1-gentoo-patches-0.1.tar.bz2 80801
diff --git a/media-sound/xmms/xmms-1.2.7-r20.ebuild b/media-sound/xmms/xmms-1.2.7-r20.ebuild
deleted file mode 100644
index a958c7630d6e..000000000000
--- a/media-sound/xmms/xmms-1.2.7-r20.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2003 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-r20.ebuild,v 1.10 2003/12/18 22:44:37 mholzer Exp $
-
-inherit libtool flag-o-matic eutils
-filter-flags -fforce-addr -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
-
-PATCHVER=0.1
-
-DESCRIPTION="X MultiMedia System"
-HOMEPAGE="http://www.xmms.org/"
-SRC_URI="http://www.xmms.org/files/1.2.x/${P}.tar.gz
-	mirror://gentoo/${P}-gentoo-patches-${PATCHVER}.tar.bz2
-	( mmx?||3dnow? ) ( http://members.jcom.home.ne.jp/jacobi/linux/etc/${P}-mmx.patch.gz )"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc alpha amd64"
-IUSE="xml nls esd gnome opengl mmx oggvorbis 3dnow mikmod directfb ipv6 cjk"
-
-DEPEND="app-arch/unzip
-	=x11-libs/gtk+-1.2*
-	mikmod? ( >=media-libs/libmikmod-3.1.6 )
-	esd? ( >=media-sound/esound-0.2.22 )
-	xml? ( >=dev-libs/libxml-1.8.15 )
-	gnome? ( <gnome-base/gnome-panel-1.5.0 )
-	opengl? ( virtual/opengl )
-	oggvorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
-RDEPEND="${DEPEND}
-	directfb? ( dev-libs/DirectFB )
-	nls? ( dev-util/intltool )"
-
-PATCHDIR=${WORKDIR}/patches
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# Patch to allow external programmes to have the "jump to" dialog box
-	epatch ${PATCHDIR}/xmms-jump.patch
-
-	# Save playlist, etc on SIGTERM and SIGINT, bug #13604.
-	epatch ${PATCHDIR}/xmms-sigterm.patch
-
-	# The following optimisations are ONLY for x86 platform
-	if [ `use x86` ] ; then
-		# For mmx/3dnow enabled CPUs, this patch adds mmx/3dnow optimisations
-		#
-		# ( use mmx || use 3dnow ) && \
-		# 	cat ${DISTDIR}/${P}-mmx.patch.gz | gunzip -c | patch -p1 || die
-		#
-		# For you guys who favour this kind of USE flag checking ... this
-		# is exactly why I do NOT like it, because the actual
-		# "cat ${DISTDIR}/${P}-mmx.patch.gz | gunzip -c | patch -p1 || die"
-		# was not in a subshell, it would ALWAYS fail to build if "mmx" or
-		# "3dnow" was not in USE, because of the || die at the end.  So
-		# PLEASE, PLEASE test things with all possible USE flags if you use
-		# this style!!!!  Then, if in a subshell, it do not detect if the
-		# command fails :/
-		#
-		# Azarah - 30 Jun 2002
-		#
-		if use mmx || use 3dnow
-		then
-			epatch ${DISTDIR}/${P}-mmx.patch.gz
-			use ipv6 && epatch ${PATCHDIR}/xmms-ipv6-20020408-mmx.patch
-		else
-			use ipv6 && epatch ${PATCHDIR}/xmms-ipv6-20020408-nommx.patch
-		fi
-	fi
-
-	# Patch for mpg123 to convert Japanese character code of MP3 tag info
-	# the Japanese patch and the Russian one overlap, so its one of the other
-	if use cjk; then
-		epatch ${PATCHDIR}/${P}-mpg123j.patch
-	else
-		# add russian charset support
-		epatch ${PATCHDIR}/xmms-russian-charset.patch
-	fi
-
-	if [ ! -f ${S}/config.rpath ] ; then
-		touch ${S}/config.rpath
-		chmod +x ${S}/config.rpath
-	fi
-
-	# We run automake and autoconf here else we get a lot of warning/errors.
-	# I have tested this with gcc-2.95.3 and gcc-3.1.
-	elibtoolize
-	echo ">>> Reconfiguring..."
-	for x in ${S} ${S}/libxmms
-	do
-		cd ${x}
-		aclocal
-		export WANT_AUTOCONF_2_5=1
-		automake --gnu --add-missing --include-deps Makefile || die
-		autoconf || die
-	done
-}
-
-src_compile() {
-	local myconf=""
-
-	use 3dnow || use mmx \
-		&& myconf="${myconf} --enable-simd" \
-		|| myconf="${myconf} --disable-simd"
-
-	use xml \
-		|| myconf="${myconf} --disable-cdindex"
-
-	econf \
-		--with-dev-dsp=/dev/sound/dsp \
-		--with-dev-mixer=/dev/sound/mixer \
-		`use_with gnome` \
-		`use_enable oggvorbis vorbis` \
-		`use_enable oggvorbis oggtest` \
-		`use_enable oggvorbis vorbistest` \
-		`use_with oggvorbis ogg` \
-		`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 prefix=${D}/usr \
-		datadir=${D}/usr/share \
-		incdir=${D}/usr/include \
-		infodir=${D}/usr/share/info \
-		localstatedir=${D}/var/lib \
-		mandir=${D}/usr/share/man \
-		sysconfdir=${D}/etc \
-		sysdir=${D}/usr/share/applets/Multimedia \
-		GNOME_SYSCONFDIR=${D}/etc install || die "FOO"
-
-	dodoc AUTHORS ChangeLog COPYING FAQ NEWS README TODO
-
-	dodir /usr/share/xmms/Skins
-	insinto /usr/share/pixmaps/
-	donewins gnomexmms/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
-
-	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
-
-	# causes segfaults for ppc users #10309 and after talking
-	# to xmms dev's, they've punted this from the src tree anyways ...
-	rm -rf ${D}/usr/lib/xmms/Input/libidcin.so
-}
-
-pkg_postrm() {
-	if [ -x ${ROOT}/usr/bin/xmms ] && [ ! -d ${ROOT}/usr/share/xmms/Skins ]
-	then
-		mkdir -p ${ROOT}/usr/share/xmms/Skins
-	fi
-}
diff --git a/media-sound/xmms/xmms-1.2.9_pre1.ebuild b/media-sound/xmms/xmms-1.2.9_pre1.ebuild
new file mode 100644
index 000000000000..8dd99131d130
--- /dev/null
+++ b/media-sound/xmms/xmms-1.2.9_pre1.ebuild
@@ -0,0 +1,184 @@
+# 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_pre1.ebuild,v 1.1 2004/01/25 10:19:34 eradicator Exp $
+
+IUSE="xml nls esd gnome opengl mmx oggvorbis 3dnow mikmod directfb ipv6 cjk"
+
+inherit flag-o-matic eutils
+filter-flags -fforce-addr -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+
+PATCHVER="0.1"
+
+DESCRIPTION="X MultiMedia System"
+HOMEPAGE="http://www.xmms.org/"
+
+MY_P=${P/_pre/-pre}
+S=${WORKDIR}/${MY_P}
+
+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"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~mips ~amd64"
+
+DEPEND=">=sys-devel/automake-1.7.8
+	app-arch/unzip
+	=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 )
+	gnome? ( <gnome-base/gnome-panel-1.5.0 )
+	opengl? ( virtual/opengl )
+	oggvorbis? ( >=media-libs/libvorbis-1.0 )"
+
+RDEPEND="${DEPEND}
+	directfb? ( dev-libs/DirectFB )
+	nls? ( dev-util/intltool )"
+
+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
+
+	# 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
+
+	# 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 russian charset support
+		epatch ${PATCHDIR}/${P}-russian-charset-csa20.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=1
+	export WANT_AUTOMAKE=1.7
+	for x in . libxmms ; do
+		cd ${S}/${x}
+		automake --gnu --add-missing --include-deps || die
+	done
+}
+
+src_compile() {
+	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_with gnome` \
+		`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() {
+	einstall \
+		incdir=${D}/usr/include \
+		sysdir=${D}/usr/share/applets/Multimedia \
+		GNOME_SYSCONFDIR=${D}/etc \
+		install || die "make install failed"
+
+	dodoc AUTHORS ChangeLog COPYING FAQ NEWS README TODO
+
+	keepdir /usr/share/xmms/Skins
+	insinto /usr/share/pixmaps/
+	donewins gnomexmms/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
+
+	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"
+}