-r9 removed due to autoconf/automake issues

4 files changed, 5 insertions, 363 deletions

diff --git a/media-sound/xmms/ChangeLog b/media-sound/xmms/ChangeLog
index 666b0ec60485..8a696e238595 100644
--- a/media-sound/xmms/ChangeLog
+++ b/media-sound/xmms/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for media-sound/xmms
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/ChangeLog,v 1.17 2002/06/06 05:58:57 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/ChangeLog,v 1.18 2002/06/06 22:07:57 blocke Exp $
 
 *xmms-1.2.7-r9 (06 June 2002)
 
@@ -10,6 +10,10 @@
   was happening at compile time, also hopefully closes 3431, but waiting on
   confirmation of that.
 
+  06 June 2002; Bruce A. Locke <blocke@shivan.org> xmms-1.2.7-r9.ebuild files/xmms-1.2.7-gentoo.patch:
+
+  Removed due to automake/autoconf issues.
+
 *xmms-1.2.7-r8 (02 June 2002)
 
   02 June 2002; Gabriele Giorgetti <stroke@gentoo.org> xmms-1.2.7-r8.ebuild:
diff --git a/media-sound/xmms/files/digest-xmms-1.2.7-r9 b/media-sound/xmms/files/digest-xmms-1.2.7-r9
deleted file mode 100644
index 52a743c50769..000000000000
--- a/media-sound/xmms/files/digest-xmms-1.2.7-r9
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 8aa14a305d1eeb1bb53dba2197ba695a xmms-1.2.7.tar.gz 2860908
-MD5 a1adac3e8c4430e735d763c1ef242e9d plover-xmms127.tar.gz 32804
-MD5 daea40648c3ae296597dcd3e78500279 xmms-1.2.7-mmx.patch.gz 14990
diff --git a/media-sound/xmms/files/xmms-1.2.7-gentoo.patch b/media-sound/xmms/files/xmms-1.2.7-gentoo.patch
deleted file mode 100644
index e3512f5d0a99..000000000000
--- a/media-sound/xmms/files/xmms-1.2.7-gentoo.patch
+++ /dev/null
@@ -1,230 +0,0 @@
-diff -Nru xmms-1.2.7/xmms.spec xmms-1.2.7-distclean/xmms.spec
---- xmms-1.2.7/xmms.spec	Mon Mar  4 15:57:42 2002
-+++ xmms-1.2.7-distclean/xmms.spec	Wed Dec 31 18:00:00 1969
-@@ -1,226 +0,0 @@
--%define	name	xmms
--%define	version	1.2.7
--%define	release	1
--%define	serial	1
--%define	prefix	/usr
--
--## Check to see if libGL is installed. Build xmms-gl if it is.
--%define withGL	%(if [ -z "`rpm -q --whatprovides libGL.so.1 2>/dev/null`" ]; then echo 0; else echo 1; fi)
--
--## Check to see if libmikmod is installed. Build xmms-mikmod if it is.
--%define withmm	%(if [ -z "`rpm -q --whatprovides libmikmod.so.2 2>/dev/null`" ]; then echo 0; else echo 1; fi)
--%define wmmdev	%(if [ -z "`rpm -q --whatprovides $(/usr/bin/which libmikmod-config) 2>/dev/null`" ]; then echo 0; else echo 1; fi)
--
--## Check to see if libvorbisfile is installed.  Build xmms-vorbis if it is.
--%define withvorbis %(if [ -z "`rpm -q --whatprovides libvorbisfile.so.0 2>/dev/null`" ]; then echo 0; else echo 1; fi)
--
--## Funky hack to get package names that provide libmikmod and libmikmod-config
--## Becuase of the differing package names between redhat, mandrake, etc.
--%if %{withmm} == 1
--%define mikmod	%(rpm -q --qf '%{NAME}' --whatprovides libmikmod.so.2)
--%if %{wmmdev} == 1
--%define mmdev	%(rpm -q --qf '%{NAME}' --whatprovides $(/usr/bin/which libmikmod-config))
--%endif
--%endif
--
--%define gnomedatadir %(gnome-config --datadir 2> /dev/null || echo "/usr/share")
--%define gnomesysconfdir %(gnome-config --sysconfdir 2> /dev/null || echo "/etc")
--
--Summary:	XMMS - Multimedia player for the X Window System.
--Name:		%{name}
--Version:	%{version}
--Release:	%{release}
--Serial:		%{serial}
--Copyright:	GPL
--Group:		Applications/Multimedia
--Vendor:		XMMS Development Team <bugs@xmms.org>
--Url:		http://www.xmms.org/
--Source:		%{name}-%{version}.tar.gz
--BuildRoot:	%{_tmppath}/%{name}-%{version}-root
--Obsoletes:	x11amp, x11amp0.7-1-1
--Requires:	gtk+ >= 1.2.2
--
--%description
--X MultiMedia System is a sound player written from scratch. Since it 
--uses the WinAmp GUI, it can use WinAmp skins. It can play mp3s, mods, s3ms,
--and other formats. It now has support for input, output, general, and
--visualization plugins.
--
--%package	devel
--Summary:	XMMS - Static libraries and header files.
--Group:		Applications/Multimedia
--Obsoletes:	x11amp-devel
--Requires:	%{name} = %{version}, glib-devel >= 1.2.2, gtk+-devel >= 1.2.2
--
--%description	devel
--Static libraries and header files required for compiling xmms plugins.
--
--%package	esd
--Summary:	XMMS - Output plugin for use with the esound package.
--Group:		Applications/Multimedia
--Requires:	%{name} = %{version}
--Obsoletes:	x11amp-esd
--Requires:	esound >= 0.2.8
--
--%description	esd
--Output plugin for xmms for use with the esound package
--
--%package	gnome
--Summary:	XMMS - applet for controlling xmms from the GNOME panel.
--Group:		Applications/Multimedia
--Requires:	%{name} = %{version}
--Obsoletes:	x11amp-gnome
--Requires:	gnome-libs >= 1.0.0
--
--%description	gnome
--GNOME applet for controlling xmms from the GNOME panel
--
--%if %{withmm} == 1
--%package	mikmod
--Summary:	XMMS - Input plugin to play MODs.
--Group:		Applications/Multimedia
--Obsoletes:	x11amp-mikmod
--Requires:	%{name} = %{version}
--Requires:	%{mikmod} >= 3.1.6
--%if %{wmmdev} == 1
--BuildPrereq:	%{mmdev}
--%else
--BuildPrereq:	/usr/bin/libmikmod-config
--%endif
--
--%description	mikmod
--Input plugin for XMMS to play MODs (.MOD,.XM,.S3M, etc)
--%endif
--
--%if %{withvorbis} == 1
--%package	vorbis
--Summary:	XMMS - Input plugin to play OGGs
--Group:		Applications/Multimedia
--Requires:	%{name} = %{version}
--Requires:	libogg >= 1.0rc3
--Requires:	libvorbis >= 1.0rc3
--BuildPrereq:	libogg-devel
--BuildPrereq:	libvorbis-devel
--
--%description	vorbis
--Input plugin for XMMS to play Ogg Vorbis files (.ogg).
--%endif
--
--%if %{withGL} == 1
--%package 	gl
--Summary:	XMMS - Visualization plugins that use the Mesa3d library.
--Group:		Applications/Multimedia
--Requires:	%{name} = %{version}
--Obsoletes:	xmms-mesa
--
--%description	gl
--Visualization plugins that use the Mesa3d library.
--%endif
--
--%prep
--%setup -q
--
--%build
--export CFLAGS="${RPM_OPT_FLAGS}" CPPFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}";
--unset LINGUAS || :;
--
--./configure --prefix=%{prefix};
--make
--
--%install
--[ "${RPM_BUILD_ROOT}" != "/" ] && [ -d ${RPM_BUILD_ROOT} ] && rm -rf ${RPM_BUILD_ROOT};
--mkdir -p ${RPM_BUILD_ROOT}
--make prefix=${RPM_BUILD_ROOT}%{prefix} \
--	sysconfdir=${RPM_BUILD_ROOT}/etc \
--	GNOME_DATADIR=${RPM_BUILD_ROOT}%{gnomedatadir} \
--	GNOME_SYSCONFDIR=${RPM_BUILD_ROOT}%{gnomesysconfdir} install
--
--# Strip binaries. But, not plugins.
--strip --strip-unneeded ${RPM_BUILD_ROOT}%{prefix}/bin/*xmms;
--
--# Install icons.
--mkdir -p ${RPM_BUILD_ROOT}/usr/share/pixmaps/mini
--install -m 644 xmms/xmms_logo.xpm \
--	${RPM_BUILD_ROOT}/usr/share/pixmaps/xmms_logo.xpm
--install -m 644 xmms/xmms_mini.xpm \
--	${RPM_BUILD_ROOT}/usr/share/pixmaps/mini/xmms_mini.xpm
--
--# Install wmconfig file
--mkdir -p ${RPM_BUILD_ROOT}/etc/X11/wmconfig
--install -m 644 xmms/xmms.wmconfig \
--	${RPM_BUILD_ROOT}/etc/X11/wmconfig/xmms
--
--# Install applnk file
--mkdir -p ${RPM_BUILD_ROOT}/etc/X11/applnk/Multimedia/                             
--install -m 644 xmms/xmms.desktop \
--	${RPM_BUILD_ROOT}/etc/X11/applnk/Multimedia/ 
--
--%post	-p /sbin/ldconfig
--%postun -p /sbin/ldconfig
--
--%clean
--[ "${RPM_BUILD_ROOT}" != "/" ] && [ -d ${RPM_BUILD_ROOT} ] && rm -rf ${RPM_BUILD_ROOT};
--
--%files
--%defattr(-, root, root)
--%doc AUTHORS COPYING ChangeLog INSTALL NEWS README
--/etc/X11/wmconfig/xmms
--/etc/X11/applnk/Multimedia/xmms.desktop
--%{prefix}/bin/xmms
--%{prefix}/bin/wmxmms
--%{prefix}/lib/libxmms.so.*
--%{prefix}/lib/xmms/Input/libcdaudio*
--%{prefix}/lib/xmms/Input/libidcin*
--%{prefix}/lib/xmms/Input/libmpg123*
--%{prefix}/lib/xmms/Input/libtonegen*
--%{prefix}/lib/xmms/Input/libwav*
--%{prefix}/lib/xmms/Output/libOSS*
--%{prefix}/lib/xmms/Output/libdisk_writer*
--%{prefix}/lib/xmms/General/*
--%{prefix}/lib/xmms/Effect/*
--%{prefix}/lib/xmms/Visualization/libbscope*
--%{prefix}/lib/xmms/Visualization/libsanalyzer*
--%{prefix}/share/xmms/*
--%{prefix}/man/man1/*
--/usr/share/locale/*/LC_MESSAGES/xmms.mo
--/usr/share/pixmaps/xmms_logo.xpm
--/usr/share/pixmaps/mini/xmms_mini.xpm
--
--%files devel
--%defattr(-, root, root)
--%{prefix}/bin/xmms-config
--%{prefix}/lib/lib*.so
--%{prefix}/lib/lib*.a
--%{prefix}/include/*
--%{prefix}/share/aclocal/xmms.m4
--
--%files esd
--%defattr(-, root, root)
--%{prefix}/lib/xmms/Output/libesdout*
--
--%files gnome
--%defattr(-, root, root)
--%{prefix}/bin/gnomexmms
--%{gnomesysconfdir}/CORBA/servers/gnomexmms.gnorba
--%{gnomedatadir}/applets/Multimedia/gnomexmms.desktop
--
--%if %{withmm} == 1
--%files mikmod
--%defattr(-, root, root)
--%{prefix}/lib/xmms/Input/libmikmod*
--%endif
--
--%if %{withvorbis} == 1
--%files vorbis
--%defattr(-, root, root)
--%{prefix}/lib/xmms/Input/libvorbis*
--%endif
--
--%if %{withGL} == 1
--%files gl
--%defattr(-, root, root)
--%{prefix}/lib/xmms/Visualization/libogl_spectrum*
--%endif
--
--%changelog
--
diff --git a/media-sound/xmms/xmms-1.2.7-r9.ebuild b/media-sound/xmms/xmms-1.2.7-r9.ebuild
deleted file mode 100644
index 3b3315dd812c..000000000000
--- a/media-sound/xmms/xmms-1.2.7-r9.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Achim Gottinger <achim@gentoo.org>
-# /space/gentoo/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.7-r7.ebuild,v 1.2 2002/05/31 14:34:51 seemant Exp
-
-PLO_VER="$(echo ${PV} | sed -e "s:\.::g")"
-S=${WORKDIR}/${P}
-DESCRIPTION="X MultiMedia System"
-XMMS_URI="ftp://ftp.xmms.org/xmms/1.2.x/${P}.tar.gz
-	avi?( http://www.openface.ca/~nephtes/plover-${PN}${PLO_VER}.tar.gz )"
-MMX_URI="http://members.jcom.home.ne.jp/jacobi/linux/etc/${P}-mmx.patch.gz"
-use mmx || use 3dnow \
-	&& SOURCE_HTTP="${XMMS_URI} ${MMX_URI}" \
-	|| SOURCE_HTTP="${XMMS_URI}"
-SRC_URI="${SOURCE_HTTP}"
-HOMEPAGE="http://www.xmms.org/"
-
-RDEPEND="=x11-libs/gtk+-1.2*
-	>=media-libs/libmikmod-3.1.9
-	avi? ( >=media-video/avifile-0.7.4.20020426-r2 )
-	esd? ( >=media-sound/esound-0.2.22 )
-	xml? ( >=dev-libs/libxml-1.8.15 )
-	gnome? ( >=gnome-base/gnome-core-1.4.0.4-r1 )
-	opengl? ( virtual/opengl )
-	oggvorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
-	
-
-DEPEND="${RDEPEND}
-	nls? ( dev-util/intltool )"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-
-	cd ${S}
-
-	patch -p1 < ${FILESDIR}/${P}-gentoo.patch
-
-	# For plugins such as avi4xmms, xmms needs to be linked to libavifile
-	# and libstdcxx.
-	use avi && ( \
-		patch -p1 <${FILESDIR}/${P}-enable-avifile-plugins.patch || die
-	)
-	
-	# The following code prevents a correct unpack on PPC, so let's
-	# exclude the code on that platform. Olivier Reisch <doctomoe@gentoo.org>
-	if [ ${ARCH} != "ppc" ]
-	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
-	fi
-
-# This is for the Plover patch
-#	use avi	&& (\
-#		tar -zxf ${DISTDIR}/plover-xmms${PLO_VER}.tar.gz || die
-#		cp plover-xmms${PLO_VER}.diff plover-xmms${PLO_VER}.diff.orig || die
-#		sed -e "s:avifile-config:avifile-config0.7:g" \
-#			plover-xmms${PLO_VER}.diff.orig >plover-xmms${PLO_VER}.diff
-#		patch -p1 <plover-xmms${PLO_VER}.diff || die
-#	)
-}
-
-src_compile() {
-	local myopts
-
-	use gnome \
-		&& myopts="${myopts} --with-gnome" \
-		|| myopts="${myopts} --without-gnome"
-
-	use 3dnow \
-		&& myopts="${myopts} --enable-3dnow" \
-		|| myopts="${myopts} --disable-3dnow"
-
-	use esd \
-		&& myopts="${myopts} --enable-esd" \
-		|| myopts="${myopts} --disable-esd"
-
-	use opengl \
-		&& myopts="${myopts} --enable-opengl" \
-		|| myopts="${myopts} --disable-opengl"
-	
-	use oggvorbis \
-		&& myopts="${myopts} --with-ogg --with-vorbis" \
-		|| myopts="${myopts} --disable-ogg-test --disable-vorbis-test"
-
-	use xml \
-		|| myopts="${myopts} --disable-cdindex"
-
-	use nls \
-		|| myopts="${myopts} --disable-nls"
-
-	
-	./configure --host=${CHOST} \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		${myopts} || die
-
-	emake || die
-}
-
-src_install() {                               
-	make prefix=${D}/usr \
-	     mandir=${D}/usr/share/man \
-	     sysconfdir=${D}/etc \
-	     sysdir=${D}/usr/share/applets/Multimedia \
-	     GNOME_SYSCONFDIR=${D}/etc \
-	     install || die
-
-	dodoc AUTHORS ChangeLog COPYING FAQ NEWS README TODO 
-	
-	mkdir -p ${D}/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
-	fi
-}
-