Cleanup autotools stuff.

Package-Manager: portage-2.0.51-r15

4 files changed, 31 insertions, 21 deletions

diff --git a/media-sound/xmms/ChangeLog b/media-sound/xmms/ChangeLog
index 48f72e917d10..2c45fb9d532b 100644
--- a/media-sound/xmms/ChangeLog
+++ b/media-sound/xmms/ChangeLog
@@ -1,6 +1,10 @@
 # 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.155 2005/01/23 00:55:45 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/ChangeLog,v 1.156 2005/01/31 22:34:34 eradicator Exp $
+
+  31 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  xmms-1.2.10-r10.ebuild:
+  Cleanup autotools stuff.
 
 *xmms-1.2.10-r10 (22 Jan 2005)
 
diff --git a/media-sound/xmms/Manifest b/media-sound/xmms/Manifest
index 53c206e18943..06a2ba77301f 100644
--- a/media-sound/xmms/Manifest
+++ b/media-sound/xmms/Manifest
@@ -1,10 +1,20 @@
-MD5 01f2a46fd3f3d31235e082d49f141706 ChangeLog 28364
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 5a8290e44006ccff0dff3094555d6366 metadata.xml 257
-MD5 f4d655036591a43be3d94bde34be2ef9 xmms-1.2.10-r10.ebuild 4227
 MD5 33b564ef94a980547348ae5478c6fd24 xmms-1.2.10-r5.ebuild 5545
 MD5 1f4aab1f3653bb6e5fb441d038160e52 xmms-1.2.8-r4.ebuild 5246
+MD5 f3ab9edb5300c1301f23535182971953 xmms-1.2.10-r10.ebuild 4026
+MD5 3c062358fc810bc801b85595424a4003 ChangeLog 28475
 MD5 aa46b23a1cf0655c7f09adbdd623d49f files/digest-xmms-1.2.10-r5 219
 MD5 f52f09b25da87c876de70b6177292f2e files/digest-xmms-1.2.8-r4 216
 MD5 7d2f3807ebbff435b909ecf0539cbf4f files/xmms.desktop 722
-MD5 1b2710ba8cf8fb008cc9f3aa40d021ae files/digest-xmms-1.2.10-r10 277
+MD5 0840246b248f49e6250508cf020a4df1 files/digest-xmms-1.2.10-r10 277
 MD5 4190322696afc5e46dac14804b8aef70 files/po-update.pl 10510
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFB/rK0ArHZZzCEUG0RAkSCAJ9hZ+ycbxHK6ykBe0CcN94Vk40HRQCfSAJ5
+qRJ84+WIbl8riuJXNI8lMzY=
+=RKTB
+-----END PGP SIGNATURE-----
diff --git a/media-sound/xmms/files/digest-xmms-1.2.10-r10 b/media-sound/xmms/files/digest-xmms-1.2.10-r10
index bdfd24dc8bbf..4d822d714d98 100644
--- a/media-sound/xmms/files/digest-xmms-1.2.10-r10
+++ b/media-sound/xmms/files/digest-xmms-1.2.10-r10
@@ -1,4 +1,4 @@
 MD5 03a85cfc5e1877a2e1f7be4fa1d3f63c xmms-1.2.10.tar.bz2 2418265
 MD5 41eababfa8bad11e9e34e467cdfb86be gentoo_ice-xmms-0.2.tar.bz2 51839
-MD5 71df70d2815115b1cc3262fcdeb3b4d4 xmms-1.2.10-gentoo-patches-2.1.7.tar.bz2 561430
+MD5 c471d830d9140007b40f26ebd4047f79 xmms-1.2.10-gentoo-patches-2.1.8.tar.bz2 554306
 MD5 fe54f2ec779bc995176e63e3e77cca11 gnomexmms.xpm 7979
diff --git a/media-sound/xmms/xmms-1.2.10-r10.ebuild b/media-sound/xmms/xmms-1.2.10-r10.ebuild
index a36a6bea1b1f..866e82a67940 100644
--- a/media-sound/xmms/xmms-1.2.10-r10.ebuild
+++ b/media-sound/xmms/xmms-1.2.10-r10.ebuild
@@ -1,10 +1,10 @@
 # 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-r10.ebuild,v 1.3 2005/01/29 07:47:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.10-r10.ebuild,v 1.4 2005/01/31 22:34:34 eradicator Exp $
 
 inherit flag-o-matic eutils libtool gnuconfig
 
-PATCHVER="2.1.7"
+PATCHVER="2.1.8"
 
 PATCHDIR="${WORKDIR}/patches"
 
@@ -61,20 +61,16 @@ src_unpack() {
 	export WANT_AUTOMAKE=1.7
 	export WANT_AUTOCONF=2.5
 
-	cd ${S}
-	libtoolize --force --copy || die "libtoolize --force --copy failed"
-	aclocal || die "aclocal failed"
-	autoheader || die "autoheader failed"
-	automake --gnu --add-missing --include-deps --force-missing --copy || die "automake failed"
-	autoconf || die "autoconf failed"
-
-	cd ${S}/libxmms
-	libtoolize --force --copy || die "libtoolize --force --copy failed"
-	[ ! -f ltmain.sh ] && ln -s ../ltmain.sh
-	aclocal || die "aclocal failed"
-	autoheader || die "autoheader failed"
-	automake --gnu --add-missing --include-deps --force-missing --copy || die "automake failed"
-	autoconf || die "autoconf failed"
+	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 ${PATCHDIR}/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