Stable amd64, sparc, and x86. Using automake-1.9 to address bug #94821. Removing old versions.

Package-Manager: portage-2.0.51.22-r2

7 files changed, 24 insertions, 379 deletions

diff --git a/media-sound/xmms/ChangeLog b/media-sound/xmms/ChangeLog
index 1fc8e69cd747..384c109e486a 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.180 2005/07/12 05:07:35 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/ChangeLog,v 1.181 2005/07/24 22:09:09 eradicator Exp $
+
+  24 Jul 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -xmms-1.2.8-r4.ebuild, -xmms-1.2.10-r13.ebuild, xmms-1.2.10-r15.ebuild:
+  Stable amd64, sparc, and x86. Using automake-1.9 to address bug #94821.
+  Removing old versions.
 
   12 Jul 2005; Stephen P. Becker <geoman@gentoo.org> xmms-1.2.10-r14.ebuild:
   stable on mips
diff --git a/media-sound/xmms/Manifest b/media-sound/xmms/Manifest
index 28f4d6449e88..e4e272aeaa6c 100644
--- a/media-sound/xmms/Manifest
+++ b/media-sound/xmms/Manifest
@@ -1,12 +1,18 @@
-MD5 a2753e9127c2ba9f26cfbe1658b704e3 xmms-1.2.10-r14.ebuild 4956
-MD5 26c8a5e7b0f74097b63d7ff7d230a93e xmms-1.2.8-r4.ebuild 5194
-MD5 d25638bb4b39dc916d9d3e092f9af3ce xmms-1.2.10-r13.ebuild 4961
-MD5 99e27a7dd91a420f998bd80dab3e5fa0 ChangeLog 31960
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 5a8290e44006ccff0dff3094555d6366 metadata.xml 257
-MD5 c004692694fe8e03aa18c23b13b1411c xmms-1.2.10-r15.ebuild 4969
-MD5 f52f09b25da87c876de70b6177292f2e files/digest-xmms-1.2.8-r4 216
-MD5 4414d53b65874ac2c610a3f2396654cd files/digest-xmms-1.2.10-r13 354
-MD5 b9dc01a8f53d43e1a63281b71376fcff files/digest-xmms-1.2.10-r14 354
+MD5 f2c4a6f38f15d480753dbf401036921f xmms-1.2.10-r15.ebuild 4966
+MD5 200a582e61553c8805f1a82a778e511f ChangeLog 32195
+MD5 a2753e9127c2ba9f26cfbe1658b704e3 xmms-1.2.10-r14.ebuild 4956
 MD5 46c1f42d9a05a0484dbf8ed6935055be files/digest-xmms-1.2.10-r15 354
 MD5 7d2f3807ebbff435b909ecf0539cbf4f files/xmms.desktop 722
 MD5 4190322696afc5e46dac14804b8aef70 files/po-update.pl 10510
+MD5 b9dc01a8f53d43e1a63281b71376fcff files/digest-xmms-1.2.10-r14 354
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC5BGQArHZZzCEUG0RAjYUAJ9jA2kc5l2b8kaokonr8MICyx2MuwCeKXYY
+hFEe47k3HXUowGiMlJ8UdHE=
+=vugu
+-----END PGP SIGNATURE-----
diff --git a/media-sound/xmms/files/digest-xmms-1.2.10-r13 b/media-sound/xmms/files/digest-xmms-1.2.10-r13
deleted file mode 100644
index ae71b246835f..000000000000
--- a/media-sound/xmms/files/digest-xmms-1.2.10-r13
+++ /dev/null
@@ -1,5 +0,0 @@
-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 b5752105020d22fd4a5acbb76788bd86 xmms-1.2.10-gentoo-patches-2.2.2.tar.bz2 541016
-MD5 fe54f2ec779bc995176e63e3e77cca11 gnomexmms.xpm 7979
diff --git a/media-sound/xmms/files/digest-xmms-1.2.8-r4 b/media-sound/xmms/files/digest-xmms-1.2.8-r4
deleted file mode 100644
index 2e359bd3e544..000000000000
--- a/media-sound/xmms/files/digest-xmms-1.2.8-r4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d523735b59232f0eedd45dc2b7a4f5ad xmms-1.2.8.tar.bz2 2322808
-MD5 41eababfa8bad11e9e34e467cdfb86be gentoo_ice-xmms-0.2.tar.bz2 51839
-MD5 fa5e32f85ea39d181d825eb458c89099 xmms-1.2.8-gentoo-patches-0.2.tar.bz2 93889
diff --git a/media-sound/xmms/xmms-1.2.10-r13.ebuild b/media-sound/xmms/xmms-1.2.10-r13.ebuild
deleted file mode 100644
index e639b892b3af..000000000000
--- a/media-sound/xmms/xmms-1.2.10-r13.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# 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.13 2005/05/31 21:37:20 eradicator Exp $
-
-inherit flag-o-matic eutils libtool gnuconfig
-
-PATCH_VER="2.2.2"
-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"
-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.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 )
-	 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_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"
-}
diff --git a/media-sound/xmms/xmms-1.2.10-r15.ebuild b/media-sound/xmms/xmms-1.2.10-r15.ebuild
index 3ba7b872d166..623cc591353f 100644
--- a/media-sound/xmms/xmms-1.2.10-r15.ebuild
+++ b/media-sound/xmms/xmms-1.2.10-r15.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-r15.ebuild,v 1.3 2005/05/31 21:37:20 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.10-r15.ebuild,v 1.4 2005/07/24 22:09:09 eradicator Exp $
 
 inherit flag-o-matic eutils libtool gnuconfig
 
@@ -19,7 +19,7 @@ SRC_URI="http://www.xmms.org/files/1.2.x/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+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*"
@@ -30,7 +30,7 @@ RDEPEND="${DEPEND}
 
 #We want these things in DEPEND only
 DEPEND="${DEPEND}
-	>=sys-devel/automake-1.7
+	>=sys-devel/automake-1.9
 	>=sys-devel/autoconf-2.5
 	sys-devel/libtool
 	nls? ( dev-util/intltool
@@ -66,7 +66,7 @@ src_unpack() {
 	EPATCH_SUFFIX="patch"
 	epatch ${PATCHDIR}
 
-	export WANT_AUTOMAKE=1.7
+	export WANT_AUTOMAKE=1.9
 	export WANT_AUTOCONF=2.5
 
 	sed -i 's:Output Input Effect General Visualization::' Makefile.am
diff --git a/media-sound/xmms/xmms-1.2.8-r4.ebuild b/media-sound/xmms/xmms-1.2.8-r4.ebuild
deleted file mode 100644
index 7de7d76b9d53..000000000000
--- a/media-sound/xmms/xmms-1.2.8-r4.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# 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.8-r4.ebuild,v 1.23 2005/05/31 21:37:20 eradicator Exp $
-
-inherit flag-o-matic eutils gnuconfig
-
-PATCHVER="0.2"
-
-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
-	mirror://gentoo/${P}-gentoo-patches-${PATCHVER}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="mips"
-IUSE="xml nls esd gnome opengl mmx vorbis 3dnow mikmod directfb ipv6 cjk gtk2 alsa"
-
-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 )
-	!gtk2? ( gnome? ( <gnome-base/gnome-panel-1.5.0 ) )
-	opengl? ( virtual/opengl )
-	alsa? ( >=media-libs/alsa-lib-0.9.0 )
-	vorbis? ( >=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
-	sys-devel/gettext
-	>=sys-devel/autoconf-2.58"
-
-PATCHDIR=${WORKDIR}/patches
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# Add dynamic taste detection patch
-	epatch ${PATCHDIR}/${P}-dtd.patch
-
-	# Remove alsa debug messages
-	epatch ${PATCHDIR}/${P}-alsafix.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
-	export WANT_AUTOMAKE=1.4
-	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
-	gnuconfig_update
-	filter-flags -fforce-addr
-	filter-lfs-flags
-
-	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 vorbis vorbis` \
-		`use_enable vorbis oggtest` \
-		`use_enable vorbis 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"
-}