Moved intltool out of RDEPEND (into DEPEND). Updated 1.2.9-r1 to run aclocal before automake to close bug #40341.

7 files changed, 24 insertions, 17 deletions

diff --git a/media-sound/xmms/ChangeLog b/media-sound/xmms/ChangeLog
index 3b901c1667d5..1c8654a22db3 100644
--- a/media-sound/xmms/ChangeLog
+++ b/media-sound/xmms/ChangeLog
@@ -1,6 +1,12 @@
 # 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.95 2004/02/03 09:48:55 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/ChangeLog,v 1.96 2004/02/04 05:11:41 eradicator Exp $
+
+  03 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  xmms-1.2.7-r23.ebuild, xmms-1.2.7-r25.ebuild, xmms-1.2.8-r3.ebuild,
+  xmms-1.2.8-r4.ebuild, xmms-1.2.9-r1.ebuild:
+  Moved intltool out of RDEPEND (into DEPEND). Updated 1.2.9-r1 to run aclocal
+  before automake to close bug #40341.
 
   03 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org>
   xmms-1.2.7-r23.ebuild, xmms-1.2.7-r25.ebuild, xmms-1.2.8-r3.ebuild,
diff --git a/media-sound/xmms/Manifest b/media-sound/xmms/Manifest
index 3d14d33341e9..3d57a91d7877 100644
--- a/media-sound/xmms/Manifest
+++ b/media-sound/xmms/Manifest
@@ -1,9 +1,9 @@
-MD5 aac64463525d6a2e923dad8ac455d290 xmms-1.2.7-r23.ebuild 5467
-MD5 9426db79dd105275df25e8dad96a1201 xmms-1.2.7-r25.ebuild 5877
-MD5 6e132d7c2863547a42912815455bf387 xmms-1.2.9-r1.ebuild 5433
-MD5 60420c29d272bda83949cc93f9d86299 xmms-1.2.8-r4.ebuild 5229
-MD5 e8ab07020594bf3e3146e2e52705f296 ChangeLog 19117
-MD5 3d734878e632cfa42f94b197d0cf16f8 xmms-1.2.8-r3.ebuild 4943
+MD5 098cf94c1939610a33de20a0e4ae7bc1 xmms-1.2.7-r23.ebuild 5467
+MD5 0ea7c6cc662efde38e1d62c154939246 xmms-1.2.7-r25.ebuild 5877
+MD5 307e3924e2195cfc4def01d56413a01b xmms-1.2.9-r1.ebuild 5443
+MD5 022dec0cd7576e1c5a63875ab4b3b51a xmms-1.2.8-r4.ebuild 5229
+MD5 c9314b710565bd911034b4e25eeb674e ChangeLog 19409
+MD5 a0011d7219177fcc0961d78915a23f7c xmms-1.2.8-r3.ebuild 4943
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 20b60b9c94a35974970dafd0bbd050c4 files/digest-xmms-1.2.7-r23 211
 MD5 20b60b9c94a35974970dafd0bbd050c4 files/digest-xmms-1.2.7-r25 211
diff --git a/media-sound/xmms/xmms-1.2.7-r23.ebuild b/media-sound/xmms/xmms-1.2.7-r23.ebuild
index 3894189200d5..add5239e41bb 100644
--- a/media-sound/xmms/xmms-1.2.7-r23.ebuild
+++ b/media-sound/xmms/xmms-1.2.7-r23.ebuild
@@ -1,6 +1,6 @@
 # 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.7-r23.ebuild,v 1.16 2004/02/03 10:10:08 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.7-r23.ebuild,v 1.17 2004/02/04 05:11:41 eradicator Exp $
 
 inherit libtool flag-o-matic eutils
 filter-flags -fforce-addr -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
@@ -28,11 +28,11 @@ DEPEND="=x11-libs/gtk+-1.2*
 
 RDEPEND="${DEPEND}
 	directfb? ( dev-libs/DirectFB )
-	nls? ( dev-util/intltool )
 	app-arch/unzip"
 
 #We want these things in DEPEND only
 DEPEND="$DEPEND
+	nls? ( dev-util/intltool )
 	>=sys-devel/automake-1.7.7
 	>=sys-devel/autoconf-2.58"
 
diff --git a/media-sound/xmms/xmms-1.2.7-r25.ebuild b/media-sound/xmms/xmms-1.2.7-r25.ebuild
index e2ea28ed8e25..73cdf63481df 100644
--- a/media-sound/xmms/xmms-1.2.7-r25.ebuild
+++ b/media-sound/xmms/xmms-1.2.7-r25.ebuild
@@ -1,6 +1,6 @@
 # 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.7-r25.ebuild,v 1.12 2004/02/03 10:10:08 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.7-r25.ebuild,v 1.13 2004/02/04 05:11:41 eradicator Exp $
 
 IUSE="xml nls esd gnome opengl mmx oggvorbis 3dnow mikmod directfb ipv6 cjk gtk2"
 
@@ -29,11 +29,11 @@ DEPEND="=x11-libs/gtk+-1.2*
 
 RDEPEND="${DEPEND}
 	directfb? ( dev-libs/DirectFB )
-	nls? ( dev-util/intltool )
 	app-arch/unzip"
 
 #We want these things in DEPEND only
 DEPEND="$DEPEND
+	nls? ( dev-util/intltool )
 	>=sys-devel/automake-1.7.8
 	>=sys-devel/autoconf-2.58"
 
diff --git a/media-sound/xmms/xmms-1.2.8-r3.ebuild b/media-sound/xmms/xmms-1.2.8-r3.ebuild
index a03f915334e2..c4d311b9f221 100644
--- a/media-sound/xmms/xmms-1.2.8-r3.ebuild
+++ b/media-sound/xmms/xmms-1.2.8-r3.ebuild
@@ -1,6 +1,6 @@
 # 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.8-r3.ebuild,v 1.13 2004/02/03 10:10:08 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.8-r3.ebuild,v 1.14 2004/02/04 05:11:41 eradicator Exp $
 
 IUSE="xml nls esd gnome opengl mmx oggvorbis 3dnow mikmod directfb ipv6 cjk gtk2"
 
@@ -29,11 +29,11 @@ DEPEND="=x11-libs/gtk+-1.2*
 
 RDEPEND="${DEPEND}
 	directfb? ( dev-libs/DirectFB )
-	nls? ( dev-util/intltool )
 	app-arch/unzip"
 
 #We want these things in DEPEND only
 DEPEND="$DEPEND
+	nls? ( dev-util/intltool )
 	>=sys-devel/automake-1.7.8
 	>=sys-devel/autoconf-2.58"
 
diff --git a/media-sound/xmms/xmms-1.2.8-r4.ebuild b/media-sound/xmms/xmms-1.2.8-r4.ebuild
index ae07362139c3..7c3baf538c70 100644
--- a/media-sound/xmms/xmms-1.2.8-r4.ebuild
+++ b/media-sound/xmms/xmms-1.2.8-r4.ebuild
@@ -1,6 +1,6 @@
 # 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.8-r4.ebuild,v 1.3 2004/02/03 10:10:08 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.8-r4.ebuild,v 1.4 2004/02/04 05:11:41 eradicator Exp $
 
 IUSE="xml nls esd gnome opengl mmx oggvorbis 3dnow mikmod directfb ipv6 cjk gtk2"
 
@@ -29,11 +29,11 @@ DEPEND="=x11-libs/gtk+-1.2*
 
 RDEPEND="${DEPEND}
 	directfb? ( dev-libs/DirectFB )
-	nls? ( dev-util/intltool )
 	app-arch/unzip"
 
 #We want these things in DEPEND only
 DEPEND="$DEPEND
+	nls? ( dev-util/intltool )
 	>=sys-devel/automake-1.7.8
 	>=sys-devel/autoconf-2.58"
 
diff --git a/media-sound/xmms/xmms-1.2.9-r1.ebuild b/media-sound/xmms/xmms-1.2.9-r1.ebuild
index 648f8463fe13..8ae9c8d990d7 100644
--- a/media-sound/xmms/xmms-1.2.9-r1.ebuild
+++ b/media-sound/xmms/xmms-1.2.9-r1.ebuild
@@ -1,6 +1,6 @@
 # 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-r1.ebuild,v 1.3 2004/02/02 19:24:55 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.9-r1.ebuild,v 1.4 2004/02/04 05:11:41 eradicator Exp $
 
 inherit flag-o-matic eutils
 
@@ -29,11 +29,11 @@ DEPEND="=x11-libs/gtk+-1.2*
 
 RDEPEND="${DEPEND}
 	directfb? ( dev-libs/DirectFB )
-	nls? ( dev-util/intltool )
 	app-arch/unzip"
 
 #We want these things in DEPEND only
 DEPEND="${DEPEND}
+	nls? ( dev-util/intltool )
 	>=sys-devel/automake-1.7.8
 	>=sys-devel/autoconf-2.58"
 
@@ -93,6 +93,7 @@ src_unpack() {
 	export WANT_AUTOMAKE=1.7
 	for x in . libxmms ; do
 		cd ${S}/${x}
+		aclocal
 		automake --gnu --add-missing --include-deps || die
 	done
 }