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

5 files changed, 49 insertions, 25 deletions

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