autoconf fixes, move unzip out of DEPEND as it isn't needed for building

6 files changed, 54 insertions, 30 deletions

diff --git a/media-sound/xmms/Manifest b/media-sound/xmms/Manifest
index 30857e8075c4..3d0da4c733fc 100644
--- a/media-sound/xmms/Manifest
+++ b/media-sound/xmms/Manifest
@@ -1,9 +1,9 @@
-MD5 ef3fc0126200e867724a6c6f4c2e087f xmms-1.2.7-r23.ebuild 5339
-MD5 04e8c9d9fb8df023f71e36ab40d60adc xmms-1.2.9.ebuild 5362
-MD5 83abc24f7b47580b7ed599383ac8f146 xmms-1.2.9_pre1.ebuild 5323
-MD5 39caf829a97dd7341d3177a6f20073e3 xmms-1.2.7-r25.ebuild 5748
+MD5 7d9504a08cc0a15e2a6d311b4825dda6 xmms-1.2.7-r23.ebuild 5452
+MD5 661b1812d121f8264539ba0b08d1d232 xmms-1.2.9.ebuild 5445
+MD5 8bb6739cf67d49556bb0d4a2cab6ad3b xmms-1.2.9_pre1.ebuild 5409
+MD5 2231175147ef4afa4c01c7bc949848c5 xmms-1.2.7-r25.ebuild 5861
 MD5 a8c2a8c0040125cc18d17c395fa58c3a ChangeLog 17930
-MD5 4d4b12e3f3a98628b3c5bdf6c03dc6c5 xmms-1.2.8-r3.ebuild 4819
+MD5 8e407c3df7454cdc42fb3fcbf4ed7b6e xmms-1.2.8-r3.ebuild 4928
 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 785e181dd715..2356ce3ea94b 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.12 2004/01/29 04:15:00 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.7-r23.ebuild,v 1.13 2004/01/30 06:37:22 drobbins Exp $
 
 inherit libtool flag-o-matic eutils
 filter-flags -fforce-addr -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
@@ -18,8 +18,7 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 ~ppc sparc alpha hppa ia64"
 
-DEPEND="app-arch/unzip
-	=x11-libs/gtk+-1.2*
+DEPEND="=x11-libs/gtk+-1.2*
 	mikmod? ( >=media-libs/libmikmod-3.1.6 )
 	esd? ( >=media-sound/esound-0.2.22 )
 	xml? ( >=dev-libs/libxml-1.8.15 )
@@ -29,7 +28,13 @@ DEPEND="app-arch/unzip
 
 RDEPEND="${DEPEND}
 	directfb? ( dev-libs/DirectFB )
-	nls? ( dev-util/intltool )"
+	nls? ( dev-util/intltool )
+	app-arch/unzip"
+	
+#We want these things in DEPEND only
+DEPEND="$DEPEND 
+	>=sys-devel/automake-1.7.7 
+	>=sys-devel/autoconf-2.58"
 
 PATCHDIR=${WORKDIR}/patches
 
diff --git a/media-sound/xmms/xmms-1.2.7-r25.ebuild b/media-sound/xmms/xmms-1.2.7-r25.ebuild
index 4eeb8e3851bd..7a8d318ad4f1 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.8 2004/01/29 04:15:00 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.7-r25.ebuild,v 1.9 2004/01/30 06:37:22 drobbins Exp $
 
 IUSE="xml nls esd gnome opengl mmx oggvorbis 3dnow mikmod directfb ipv6 cjk"
 
@@ -19,18 +19,23 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc ~sparc alpha ~hppa ~mips ~ia64"
 
-DEPEND="app-arch/unzip
-	=x11-libs/gtk+-1.2*
+DEPEND="=x11-libs/gtk+-1.2*
 	mikmod? ( >=media-libs/libmikmod-3.1.6 )
 	esd? ( >=media-sound/esound-0.2.22 )
 	xml? ( >=dev-libs/libxml-1.8.15 )
 	gnome? ( <gnome-base/gnome-panel-1.5.0 )
 	opengl? ( virtual/opengl )
 	oggvorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
+
 RDEPEND="${DEPEND}
 	directfb? ( dev-libs/DirectFB )
-	nls? ( dev-util/intltool )"
-
+	nls? ( dev-util/intltool )
+	app-arch/unzip"
+	
+#We want these things in DEPEND only
+DEPEND="$DEPEND 
+	>=sys-devel/automake-1.7.8 
+	>=sys-devel/autoconf-2.58"
 
 PATCHDIR=${WORKDIR}/patches
 
diff --git a/media-sound/xmms/xmms-1.2.8-r3.ebuild b/media-sound/xmms/xmms-1.2.8-r3.ebuild
index c6654beba261..fa5b1c991e64 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.9 2004/01/29 04:15:00 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.8-r3.ebuild,v 1.10 2004/01/30 06:37:22 drobbins Exp $
 
 IUSE="xml nls esd gnome opengl mmx oggvorbis 3dnow mikmod directfb ipv6 cjk"
 
@@ -19,18 +19,23 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ppc ~sparc ~alpha ~hppa ~mips amd64 ~ia64"
 
-DEPEND="app-arch/unzip
-	=x11-libs/gtk+-1.2*
-	mikmod? ( >=media-libs/libmikmod-3.1.6 )
+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 )
 	gnome? ( <gnome-base/gnome-panel-1.5.0 )
 	opengl? ( virtual/opengl )
-	oggvorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
+	oggvorbis? ( >=media-libs/libvorbis-1.0 )"
 
 RDEPEND="${DEPEND}
 	directfb? ( dev-libs/DirectFB )
-	nls? ( dev-util/intltool )"
+	nls? ( dev-util/intltool )
+	app-arch/unzip"
+	
+#We want these things in DEPEND only
+DEPEND="$DEPEND 
+	>=sys-devel/automake-1.7.8 
+	>=sys-devel/autoconf-2.58"
 
 PATCHDIR=${WORKDIR}/patches
 
diff --git a/media-sound/xmms/xmms-1.2.9.ebuild b/media-sound/xmms/xmms-1.2.9.ebuild
index 24444235fd15..cd9dbb8abb6e 100644
--- a/media-sound/xmms/xmms-1.2.9.ebuild
+++ b/media-sound/xmms/xmms-1.2.9.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.ebuild,v 1.3 2004/01/29 19:50:51 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.9.ebuild,v 1.4 2004/01/30 06:37:22 drobbins Exp $
 
 inherit flag-o-matic eutils
 
@@ -20,9 +20,7 @@ SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~mips ~amd64 ~ia64"
 IUSE="xml nls esd gnome opengl mmx oggvorbis 3dnow mikmod directfb ipv6 cjk"
 
-DEPEND=">=sys-devel/automake-1.7.8
-	app-arch/unzip
-	=x11-libs/gtk+-1.2*
+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 )
@@ -32,7 +30,13 @@ DEPEND=">=sys-devel/automake-1.7.8
 
 RDEPEND="${DEPEND}
 	directfb? ( dev-libs/DirectFB )
-	nls? ( dev-util/intltool )"
+	nls? ( dev-util/intltool )
+	app-arch/unzip"
+	
+#We want these things in DEPEND only
+DEPEND="$DEPEND 
+	>=sys-devel/automake-1.7.8 
+	>=sys-devel/autoconf-2.58"
 
 PATCHDIR=${WORKDIR}/patches
 
diff --git a/media-sound/xmms/xmms-1.2.9_pre1.ebuild b/media-sound/xmms/xmms-1.2.9_pre1.ebuild
index 8a6e4ea7da35..c0bcc7f2176d 100644
--- a/media-sound/xmms/xmms-1.2.9_pre1.ebuild
+++ b/media-sound/xmms/xmms-1.2.9_pre1.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_pre1.ebuild,v 1.4 2004/01/29 04:15:00 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.9_pre1.ebuild,v 1.5 2004/01/30 06:37:22 drobbins Exp $
 
 inherit flag-o-matic eutils
 
@@ -20,18 +20,23 @@ SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~mips ~amd64 ~ia64"
 IUSE="xml nls esd gnome opengl mmx oggvorbis 3dnow mikmod directfb ipv6 cjk"
 
-DEPEND=">=sys-devel/automake-1.7.8
-	app-arch/unzip
-	=x11-libs/gtk+-1.2*
+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 )
 	gnome? ( <gnome-base/gnome-panel-1.5.0 )
 	opengl? ( virtual/opengl )
 	oggvorbis? ( >=media-libs/libvorbis-1.0 )"
+
 RDEPEND="${DEPEND}
 	directfb? ( dev-libs/DirectFB )
-	nls? ( dev-util/intltool )"
+	nls? ( dev-util/intltool )
+	app-arch/unzip"
+	
+#We want these things in DEPEND only
+DEPEND="$DEPEND 
+	>=sys-devel/automake-1.7.8 
+	>=sys-devel/autoconf-2.58"
 
 PATCHDIR=${WORKDIR}/patches