dont use old WANT_AUTOCONF #35111

4 files changed, 19 insertions, 23 deletions

diff --git a/media-video/vlc/vlc-0.6.0-r1.ebuild b/media-video/vlc/vlc-0.6.0-r1.ebuild
index ee5b0b876631..52c3af6eb39e 100644
--- a/media-video/vlc/vlc-0.6.0-r1.ebuild
+++ b/media-video/vlc/vlc-0.6.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.6.0-r1.ebuild,v 1.7 2004/01/25 04:38:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.6.0-r1.ebuild,v 1.8 2004/01/26 00:52:12 vapier Exp $
 
 # Missing support for...
 #	tarkin - package not in portage yet
@@ -183,8 +183,8 @@ src_compile(){
 	# and forcing custom ones generally fails building
 	export CXXFLAGS=""
 	export CFLAGS=""
-	export WANT_AUTOCONF_2_5=1
-	export WANT_AUTOMAKE_1_6=1
+	export WANT_AUTOCONF=2.5
+	export WANT_AUTOMAKE=1.6
 
 	econf ${myconf} || die "configure of VLC failed"
 
diff --git a/media-video/vlc/vlc-0.6.1.ebuild b/media-video/vlc/vlc-0.6.1.ebuild
index e05d90e49751..ffbd1ed415ae 100644
--- a/media-video/vlc/vlc-0.6.1.ebuild
+++ b/media-video/vlc/vlc-0.6.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.6.1.ebuild,v 1.4 2004/01/25 04:38:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.6.1.ebuild,v 1.5 2004/01/26 00:52:12 vapier Exp $
 
 # Missing support for...
 #	tarkin - package not in portage yet - experimental
@@ -188,8 +188,8 @@ src_compile(){
 
 	export CXXFLAGS=""
 	export CFLAGS=""
-	export WANT_AUTOCONF_2_5=1
-	export WANT_AUTOMAKE_1_6=1
+	export WANT_AUTOCONF=2.5
+	export WANT_AUTOMAKE=1.6
 
 	# The buildorder.patch changes Makefile.am, so we need to
 	# run automake so the change is propogated
diff --git a/media-video/vlc/vlc-0.6.2-r1.ebuild b/media-video/vlc/vlc-0.6.2-r1.ebuild
index 698481f75fde..ed4625e24838 100644
--- a/media-video/vlc/vlc-0.6.2-r1.ebuild
+++ b/media-video/vlc/vlc-0.6.2-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-video/vlc/vlc-0.6.2-r1.ebuild,v 1.6 2004/01/25 04:38:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.6.2-r1.ebuild,v 1.7 2004/01/26 00:52:12 vapier Exp $
 
 inherit libtool
 
@@ -11,14 +11,9 @@ inherit libtool
 
 inherit gcc eutils
 
-IUSE="arts qt ncurses dvd gtk nls 3dfx svga fbcon esd kde X alsa ggi
-	oggvorbis gnome xv oss sdl aalib slp truetype v4l xvid lirc
-	wxwindows imlib mozilla dvb debug faad xosd matroska altivec"
-
 PFFM=ffmpeg-20030813
 PMPG=mpeg2dec-20030612
 
-S=${WORKDIR}/${P}
 SFFM=${WORKDIR}/${PFFM}
 SMPG=${WORKDIR}/${PMPG}
 DESCRIPTION="VideoLAN Client - DVD/video player and more"
@@ -27,9 +22,12 @@ SRC_URI="http://www.videolan.org/pub/${PN}/${PV}/${P}.tar.bz2
 	http://www.videolan.org/pub/${PN}/${PV}/contrib/${PMPG}.tar.bz2
 	http://www.videolan.org/pub/${PN}/${PV}/contrib/${PFFM}.tar.bz2"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~mips ~amd64 ~ia64"
+IUSE="arts qt ncurses dvd gtk nls 3dfx svga fbcon esd kde X alsa ggi
+	oggvorbis gnome xv oss sdl aalib slp truetype v4l xvid lirc
+	wxwindows imlib mozilla dvb debug faad xosd matroska altivec"
 
 DEPEND="X? ( virtual/x11 )
 	aalib? ( >=media-libs/aalib-1.4_rc4-r2 )
@@ -67,12 +65,10 @@ DEPEND="X? ( virtual/x11 )
 	>=media-libs/libdv-0.98
 	>=media-libs/libdvbpsi-0.1.3"
 
-
 # mplayer is a required dependancy until the libpostproc code becomes
 # a separate packages or until ffmpeg gets support for installing
 # the library.
 
-
 # get kde and arts paths
 if [ -n "`use kde`" -o -n "`use arts`" ]; then
 	inherit kde-functions
@@ -178,8 +174,8 @@ src_compile() {
 
 	export CXXFLAGS=""
 	export CFLAGS=""
-	export WANT_AUTOCONF_2_5=1
-	export WANT_AUTOMAKE_1_6=1
+	export WANT_AUTOCONF=2.5
+	export WANT_AUTOMAKE=1.6
 
 	myconf="${myconf} --enable-ffmpeg \
 		--with-ffmpeg-tree=${SFFM} \
diff --git a/media-video/vlc/vlc-0.6.2.ebuild b/media-video/vlc/vlc-0.6.2.ebuild
index 23def22f26d2..42a6c9e282f9 100644
--- a/media-video/vlc/vlc-0.6.2.ebuild
+++ b/media-video/vlc/vlc-0.6.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.6.2.ebuild,v 1.12 2004/01/25 04:38:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.6.2.ebuild,v 1.13 2004/01/26 00:52:12 vapier Exp $
 
 # Missing support for...
 #	tarkin - package not in portage yet - experimental
@@ -133,8 +133,8 @@ src_compile(){
 
 	export CXXFLAGS=""
 	export CFLAGS=""
-	export WANT_AUTOCONF_2_5=1
-	export WANT_AUTOMAKE_1_6=1
+	export WANT_AUTOCONF=2.5
+	export WANT_AUTOMAKE=1.6
 
 	econf \
 		`use_enable nls` \