try to fix the autoconf/automake errors

3 files changed, 180 insertions, 1 deletions

diff --git a/media-sound/xmms/ChangeLog b/media-sound/xmms/ChangeLog
index 9509aa81d915..f8f553d50103 100644
--- a/media-sound/xmms/ChangeLog
+++ b/media-sound/xmms/ChangeLog
@@ -1,7 +1,13 @@
 # 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.20 2002/06/28 02:11:38 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/ChangeLog,v 1.21 2002/06/30 15:21:07 azarah Exp $
 
+xmms-1.2.7-r11 (30 Jun 2002)
+
+  30 Jun 2002; Martin Schlemmer <azarah@gentoo.org> :
+  This revision tries to fix all the automake/autoconf warning, etc.
+  I have tested it with gcc-2.95.3 and gcc-3.1, so hopefully it will
+  be the last revision for some time.
 
 xmms-1.2.7-r10 (28 Jun 2002)
   28 Jun 2002; Spider <spider@gentoo.org> xmms-1.2.7-r9.ebuild :
diff --git a/media-sound/xmms/files/digest-xmms-1.2.7-r11 b/media-sound/xmms/files/digest-xmms-1.2.7-r11
new file mode 100644
index 000000000000..52a743c50769
--- /dev/null
+++ b/media-sound/xmms/files/digest-xmms-1.2.7-r11
@@ -0,0 +1,3 @@
+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/xmms-1.2.7-r11.ebuild b/media-sound/xmms/xmms-1.2.7-r11.ebuild
new file mode 100644
index 000000000000..09be3fba0f94
--- /dev/null
+++ b/media-sound/xmms/xmms-1.2.7-r11.ebuild
@@ -0,0 +1,170 @@
+# 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
+
+inherit libtool
+
+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-panel-1.4.1 
+			  <gnome-base/gnome-panel-1.5.0 )
+	opengl? ( virtual/opengl )
+	oggvorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
+	
+
+DEPEND="${RDEPEND}
+	nls? ( dev-util/intltool )"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+
+	cd ${S}
+
+	# For plugins such as avi4xmms, xmms needs to be linked to libavifile
+	# and libstdcxx.
+	#
+	# NOTE: because we change a Makefile.am here, we run auto* at the
+	#       bottom.
+	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
+		#
+		#
+		# 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!!!!
+		#
+		# Azarah - 30 Jun 2002
+		#
+		( 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
+#	)
+
+	[ ! -f ${S}/config.rpath ] && ( \
+		touch ${S}/config.rpath
+		chmod +x ${S}/config.rpath
+	)
+
+	# 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
+	for x in ${S} ${S}/libxmms
+	do
+		cd ${x}
+		aclocal
+		export WANT_AUTOCONF_2_5=1
+		automake --gnu --include-deps Makefile || die
+		autoconf || die
+	done
+}
+
+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
+
+	use gnome && ( \
+		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
+	) || ( \
+		rm ${D}/usr/share/man/man1/gnomexmms*
+	)
+}
+
+pkg_postrm() {
+
+	if [ -x ${ROOT}/usr/bin/xmms ] && [ ! -d ${ROOT}/usr/share/xmms/Skins ]
+	then
+		mkdir -p ${ROOT}/usr/share/xmms/Skins
+	fi
+}
+