stop using old WANT_AUTOTOOL_#_# syntax

9 files changed, 70 insertions, 68 deletions

diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 46f4f56f9053..1ed349253a06 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -1,25 +1,35 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 54be67541f9e9759c04a64ef69f353a6 ChangeLog 11666
 MD5 c93943ad91a4f4d68ccbed3cba86d848 metadata.xml 261
-MD5 455853c508aea8cd6096de365a0bf417 vlc-0.6.0-r1.ebuild 5637
-MD5 91872f800783fd6e01dc0eb628b6f8a2 vlc-0.6.1.ebuild 6116
-MD5 14cd606f4ab9526863d2a98240df803e vlc-0.6.2-r1.ebuild 6508
-MD5 52cc3aeaba8a9ec8f23804361038a824 vlc-0.6.2.ebuild 5547
-MD5 1c3b1d2b37e13362061c1b2c0ddcb286 vlc-0.7.1.ebuild 6769
-MD5 fcd14dd61ea3c39c4520c96fdf60ec15 vlc-0.7.1-r1.ebuild 5973
-MD5 b2057a09e89577fff6068ab65f9f19e8 vlc-0.7.2.ebuild 6005
-MD5 669f82269132e508a33fbcd0ff97758f vlc-0.7.2-r1.ebuild 6476
+MD5 423953afdbd3580e3a59dbfa8144d339 vlc-0.6.0-r1.ebuild 5636
+MD5 df5613e3375e65e035074cf14ab16580 vlc-0.6.1.ebuild 6115
+MD5 5a84187d74df6cfa3862e6ee353c2e09 vlc-0.6.2-r1.ebuild 6497
+MD5 9875c8a84a82a3f9c2afe28ae9a9dd49 vlc-0.6.2.ebuild 5546
+MD5 78e878ad48ba022cb9956e5c6df6e873 vlc-0.7.1.ebuild 6760
+MD5 8c3383febd88bc338feb7fac18de11ec vlc-0.7.1-r1.ebuild 5969
+MD5 daf7a6111506c3eb8ef2ae06ee77a542 vlc-0.7.2.ebuild 6000
+MD5 bce2684d4488e4674e07923c07905eb4 vlc-0.7.2-r1.ebuild 6472
 MD5 09c124e45049f615519ded3278a97376 files/0.6.2-mozilla-fix.patch 1261
 MD5 80aeaf3595979e8e16dd382c50dfd275 files/buildorder.patch 590
 MD5 5f5a12e2d124384eb5d129e60879202d files/digest-vlc-0.6.0-r1 63
 MD5 f3095908d6d0b8fb2fbceb3362574761 files/digest-vlc-0.6.1 63
 MD5 cc5d4fb953ad7bd0ee3e14076811a1d4 files/digest-vlc-0.6.2 202
 MD5 cc5d4fb953ad7bd0ee3e14076811a1d4 files/digest-vlc-0.6.2-r1 202
-MD5 d0a16a05f6983059df4b1b07c0a47bdd files/digest-vlc-0.7.1 130
 MD5 c5c0f3cdd6b2afd05a3090dfc55074e0 files/glide.patch 744
-MD5 20de936c17c2ab1c4767bcbce0d2e972 files/live-gcc3-3.patch 828
 MD5 5cf5ab60ab2619db091501d7acc50284 files/mozplugin.patch 5995
 MD5 0ee383795d543048e4d47eb58f6d36bb files/mpeg2dec-20030612-configure.in-fpic.patch 1065
+MD5 d0a16a05f6983059df4b1b07c0a47bdd files/digest-vlc-0.7.1 130
+MD5 20de936c17c2ab1c4767bcbce0d2e972 files/live-gcc3-3.patch 828
 MD5 f031efc738d255e8b7b893aaeb5ca30c files/digest-vlc-0.7.1-r1 63
 MD5 ed198b2a917f7be36174f7b05dcad8a3 files/digest-vlc-0.7.2 63
 MD5 ed198b2a917f7be36174f7b05dcad8a3 files/digest-vlc-0.7.2-r1 63
 MD5 310366968813598e8b0cae64b5dbd19a files/vlc-0.7.2-live.patch 1287
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFBhY3bHTu7gpaalycRAqfLAKCzpzZCdoryFyD1jxtDBZwzZHXKjACfQjbx
+52Sp3GFh54IT1ulVsBSLAQw=
+=ZHid
+-----END PGP SIGNATURE-----
diff --git a/media-video/vlc/vlc-0.6.0-r1.ebuild b/media-video/vlc/vlc-0.6.0-r1.ebuild
index b8ed62eb3754..a87c690d9c0d 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-2004 Gentoo Foundation
 # 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.14 2004/07/14 22:26:13 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.6.0-r1.ebuild,v 1.15 2004/11/01 01:13:31 vapier Exp $
 
 # Missing support for...
 #	tarkin - package not in portage yet
@@ -12,12 +12,12 @@
 inherit eutils
 
 DESCRIPTION="VideoLAN Client - DVD/video player and more"
+HOMEPAGE="http://www.videolan.org/vlc/"
 SRC_URI="http://www.videolan.org/pub/${PN}/${PV}/${P}.tar.bz2"
-HOMEPAGE="http://www.videolan.org/vlc"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ~alpha"
+SLOT="0"
+KEYWORDS="~alpha x86"
 IUSE="3dfx X aalib alsa arts debug dvb dvd esd fbcon ggi gnome gtk imlib kde
 	lirc mad mozilla ncurses nls oggvorbis oss qt sdl slp svga truetype v4l
 	wxwindows xv xvid"
diff --git a/media-video/vlc/vlc-0.6.1.ebuild b/media-video/vlc/vlc-0.6.1.ebuild
index 53c106a9120b..09fe306ca091 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-2004 Gentoo Foundation
 # 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.11 2004/07/14 22:26:13 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.6.1.ebuild,v 1.12 2004/11/01 01:13:31 vapier Exp $
 
 # Missing support for...
 #	tarkin - package not in portage yet - experimental
@@ -10,12 +10,12 @@
 inherit eutils
 
 DESCRIPTION="VideoLAN Client - DVD/video player and more"
+HOMEPAGE="http://www.videolan.org/vlc/"
 SRC_URI="http://www.videolan.org/pub/${PN}/${PV}/${P}.tar.bz2"
-HOMEPAGE="http://www.videolan.org/vlc"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~alpha"
+SLOT="0"
+KEYWORDS="~alpha ~x86"
 IUSE="3dfx X aalib alsa arts debug dvb dvd esd faad fbcon ggi gnome gtk imlib
 	joystick kde lirc mad matroska mozilla ncurses nls oggvorbis oss qt sdl slp svga
 	truetype v4l wxwindows xosd xv xvid"
diff --git a/media-video/vlc/vlc-0.6.2-r1.ebuild b/media-video/vlc/vlc-0.6.2-r1.ebuild
index 48a874dc093c..b4b8644f5aa8 100644
--- a/media-video/vlc/vlc-0.6.2-r1.ebuild
+++ b/media-video/vlc/vlc-0.6.2-r1.ebuild
@@ -1,15 +1,13 @@
 # Copyright 1999-2004 Gentoo Foundation
 # 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.14 2004/07/14 22:26:13 agriffis Exp $
-
-inherit libtool
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.6.2-r1.ebuild,v 1.15 2004/11/01 01:13:31 vapier Exp $
 
 # Missing support for...
 #	tarkin - package not in portage yet - experimental
 #	theora - package not in portage yet - experimental
 #	tremor - package not in portage yet - experimental
 
-inherit gcc eutils
+inherit gcc eutils libtool
 
 PFFM=ffmpeg-20030813
 PMPG=mpeg2dec-20030612
@@ -17,14 +15,14 @@ PMPG=mpeg2dec-20030612
 SFFM=${WORKDIR}/${PFFM}
 SMPG=${WORKDIR}/${PMPG}
 DESCRIPTION="VideoLAN Client - DVD/video player and more"
-HOMEPAGE="http://www.videolan.org/vlc"
+HOMEPAGE="http://www.videolan.org/vlc/"
 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"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~alpha"
+KEYWORDS="~alpha ~x86"
 IUSE="3dfx X aalib alsa altivec arts debug dvb dvd dvdread esd faad fbcon flac
 	ggi gnome gtk imlib joystick kde lirc mad matroska mmx mozilla ncurses nls
 	oggvorbis oss qt sdl slp svga truetype v4l wxwindows xosd xv xvid"
@@ -64,7 +62,6 @@ RDEPEND="X? ( virtual/x11 )
 	flac? ( >=media-libs/flac-1.1.0 )
 	>=media-libs/libdv-0.98
 	>=media-libs/libdvbpsi-0.1.3"
-
 DEPEND="$RDEPEND >=sys-devel/autoconf-2.58"
 
 # mplayer is a required dependancy until the libpostproc code becomes
diff --git a/media-video/vlc/vlc-0.6.2.ebuild b/media-video/vlc/vlc-0.6.2.ebuild
index e69786f1528d..938de529d441 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-2004 Gentoo Foundation
 # 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.19 2004/07/14 22:26:13 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.6.2.ebuild,v 1.20 2004/11/01 01:13:31 vapier Exp $
 
 # Missing support for...
 #	tarkin - package not in portage yet - experimental
@@ -10,12 +10,12 @@
 inherit gcc eutils
 
 DESCRIPTION="VideoLAN Client - DVD/video player and more"
+HOMEPAGE="http://www.videolan.org/vlc/"
 SRC_URI="http://www.videolan.org/pub/${PN}/${PV}/${P}.tar.bz2"
-HOMEPAGE="http://www.videolan.org/vlc"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ~alpha"
+SLOT="0"
+KEYWORDS="~alpha x86"
 IUSE="3dfx X aalib alsa altivec arts debug dvb dvd dvdread esd faad fbcon ggi
 	gnome gtk imlib joystick kde lirc mad matroska mozilla ncurses nls oggvorbis oss
 	qt sdl slp svga truetype v4l wxwindows xosd xv xvid"
diff --git a/media-video/vlc/vlc-0.7.1-r1.ebuild b/media-video/vlc/vlc-0.7.1-r1.ebuild
index 85de22dc12d2..046c4d407776 100644
--- a/media-video/vlc/vlc-0.7.1-r1.ebuild
+++ b/media-video/vlc/vlc-0.7.1-r1.ebuild
@@ -1,22 +1,21 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.7.1-r1.ebuild,v 1.8 2004/07/28 20:03:44 kanaka Exp $
-
-inherit libtool gcc eutils
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.7.1-r1.ebuild,v 1.9 2004/11/01 01:13:31 vapier Exp $
 
 # Missing support for...
 #	tarkin - package not in portage yet - experimental
 #	theora - package not in portage yet - experimental
 #	tremor - package not in portage yet - experimental
 
+inherit libtool gcc eutils
+
 DESCRIPTION="VLC media player - Video player and streamer"
+HOMEPAGE="http://www.videolan.org/vlc/"
 SRC_URI="http://download.videolan.org/pub/${PN}/${PV}/${P}.tar.bz2"
 
-HOMEPAGE="http://www.videolan.org/vlc"
-
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc amd64"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="3dfx X aalib alsa arts bidi debug dvb dvd esd faad fbcon ggi gnome gtk
 	imlib joystick lirc mad matroska mozilla ncurses nls oggvorbis oss png sdl slp
 	speex svga truetype v4l wxwindows xosd xv"
@@ -123,8 +122,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
 
 	# Avoid timestamp skews with autotools
 	touch configure.ac
diff --git a/media-video/vlc/vlc-0.7.1.ebuild b/media-video/vlc/vlc-0.7.1.ebuild
index 356bb4d5bac7..6b4e07fb05e1 100644
--- a/media-video/vlc/vlc-0.7.1.ebuild
+++ b/media-video/vlc/vlc-0.7.1.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.7.1.ebuild,v 1.7 2004/07/14 22:26:13 agriffis Exp $
-
-inherit libtool gcc eutils
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.7.1.ebuild,v 1.8 2004/11/01 01:13:31 vapier Exp $
 
 # Missing support for...
 #	tarkin - package not in portage yet - experimental
 #	theora - package not in portage yet - experimental
 #	tremor - package not in portage yet - experimental
 
+inherit libtool gcc eutils
+
 # Change these to correspond with the
 # unpacked dirnames of the CVS snapshots.
 PLIVE=live
@@ -18,12 +18,11 @@ SLIVE=${WORKDIR}/${PLIVE}
 DESCRIPTION="VLC media player - Video player and streamer"
 HOMEPAGE="http://www.videolan.org/vlc"
 SRC_URI="http://download.videolan.org/pub/${PN}/${PV}/${P}.tar.bz2
-		 http://download.videolan.org/pub/${PN}/${PV}/contrib/live.2004.02.26.tar.gz"
-
+	http://download.videolan.org/pub/${PN}/${PV}/contrib/live.2004.02.26.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 -ppc"
+KEYWORDS="-ppc ~x86"
 IUSE="3dfx X aalib alsa altivec arts bidi debug dvb dvd dvdread esd faad fbcon
 	ggi gnome gtk imlib joystick kde lirc mad matroska mozilla ncurses nls oggvorbis
 	oss png qt sdl slp speex svga truetype v4l wxwindows xosd xv xvid"
@@ -163,8 +162,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
 
 	myconf="${myconf} --enable-ffmpeg \
 		--with-ffmpeg-mp3lame \
diff --git a/media-video/vlc/vlc-0.7.2-r1.ebuild b/media-video/vlc/vlc-0.7.2-r1.ebuild
index 91ffd56a9013..838e243cf526 100644
--- a/media-video/vlc/vlc-0.7.2-r1.ebuild
+++ b/media-video/vlc/vlc-0.7.2-r1.ebuild
@@ -1,26 +1,24 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.7.2-r1.ebuild,v 1.5 2004/10/23 23:34:18 weeve Exp $
-
-inherit libtool gcc eutils
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.7.2-r1.ebuild,v 1.6 2004/11/01 01:13:31 vapier Exp $
 
 # Missing support for...
 #	tarkin - package not in portage yet - experimental
 #	tremor - package not in portage yet - experimental
 
-IUSE="arts ncurses dvd gtk nls 3dfx svga fbcon esd X alsa ggi speex
-	oggvorbis gnome xv oss sdl aalib slp bidi truetype v4l lirc
-	wxwindows imlib matroska dvb mozilla debug faad theora
-	xosd altivec png dts"
+inherit libtool gcc eutils
 
 DESCRIPTION="VLC media player - Video player and streamer"
+HOMEPAGE="http://www.videolan.org/vlc/"
 SRC_URI="http://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.bz2"
 
-HOMEPAGE="http://www.videolan.org/vlc"
-
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="arts ncurses dvd gtk nls 3dfx svga fbcon esd X alsa ggi speex
+	oggvorbis gnome xv oss sdl aalib slp bidi truetype v4l lirc
+	wxwindows imlib matroska dvb mozilla debug faad theora
+	xosd altivec png dts"
 
 RDEPEND="X? ( virtual/x11 )
 	aalib? ( >=media-libs/aalib-1.4_rc4-r2
@@ -135,8 +133,8 @@ src_compile() {
 
 	# vlc uses its own ultraoptimizaed CXXFLAGS
 	# and forcing custom ones generally fails building
-	export WANT_AUTOCONF_2_5=1
-	export WANT_AUTOMAKE_1_6=1
+	export WANT_AUTOCONF=2.5
+	export WANT_AUTOMAKE=1.6
 
 	# Avoid timestamp skews with autotools
 	touch configure.ac
diff --git a/media-video/vlc/vlc-0.7.2.ebuild b/media-video/vlc/vlc-0.7.2.ebuild
index 40dd84eb3bd1..5410a3852616 100644
--- a/media-video/vlc/vlc-0.7.2.ebuild
+++ b/media-video/vlc/vlc-0.7.2.ebuild
@@ -1,21 +1,20 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.7.2.ebuild,v 1.7 2004/09/01 16:23:52 mholzer Exp $
-
-inherit libtool gcc eutils
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.7.2.ebuild,v 1.8 2004/11/01 01:13:31 vapier Exp $
 
 # Missing support for...
 #	tarkin - package not in portage yet - experimental
 #	tremor - package not in portage yet - experimental
 
+inherit libtool gcc eutils
+
 DESCRIPTION="VLC media player - Video player and streamer"
+HOMEPAGE="http://www.videolan.org/vlc/"
 SRC_URI="http://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.bz2"
 
-HOMEPAGE="http://www.videolan.org/vlc"
-
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc amd64"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="arts ncurses dvd gtk nls 3dfx svga fbcon esd X alsa ggi speex
 	oggvorbis gnome xv oss sdl aalib slp bidi truetype v4l lirc
 	wxwindows imlib matroska dvb mozilla debug faad theora
@@ -125,8 +124,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
 
 	# Avoid timestamp skews with autotools
 	touch configure.ac