dont use old WANT_AUTOCONF #35111

8 files changed, 51 insertions, 69 deletions

diff --git a/media-video/avidemux/avidemux-0.9-r1.ebuild b/media-video/avidemux/avidemux-0.9-r1.ebuild
index 7955ee8f85ce..920d07fae891 100644
--- a/media-video/avidemux/avidemux-0.9-r1.ebuild
+++ b/media-video/avidemux/avidemux-0.9-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/avidemux/avidemux-0.9-r1.ebuild,v 1.3 2003/09/10 22:34:15 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-0.9-r1.ebuild,v 1.4 2004/01/26 00:49:35 vapier Exp $
 
 inherit eutils
 
@@ -8,8 +8,8 @@ DESCRIPTION="Great Video editing/encoding tool"
 HOMEPAGE="http://fixounet.free.fr/avidemux/"
 SRC_URI="http://fixounet.free.fr/avidemux/${P}.tgz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86"
 IUSE="debug nls oggvorbis arts truetype alsa"
 
@@ -29,9 +29,6 @@ DEPEND="virtual/x11
 	truetype? ( >=media-libs/freetype-2.1.2 )
 	alsa? ( >=media-libs/alsa-lib-0.9.1 )"
 
-
-S=${WORKDIR}/${P}
-
 src_compile() {
 
 	cd ${S}
@@ -47,7 +44,7 @@ src_compile() {
 
 	# Fixes a possible automake error due to clock skew
 	touch -r *
-	export WANT_AUTOCONF_2_5=1
+	export WANT_AUTOCONF=2.5
 	autoconf
 
 	local myconf
@@ -69,7 +66,6 @@ src_compile() {
 	make || die "make failed"
 }
 
-
 src_install() {
 	make DESTDIR=${D} install || die
 	dodoc AUTHORS COPYING ChangeLog History INSTALL README TODO
diff --git a/media-video/avidemux/avidemux-2.0.18.ebuild b/media-video/avidemux/avidemux-2.0.18.ebuild
index 214cf603cfee..1fcd8ce6b8f8 100644
--- a/media-video/avidemux/avidemux-2.0.18.ebuild
+++ b/media-video/avidemux/avidemux-2.0.18.ebuild
@@ -1,22 +1,18 @@
-# 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/avidemux/avidemux-2.0.18.ebuild,v 1.5 2003/11/27 18:00:08 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.0.18.ebuild,v 1.6 2004/01/26 00:49:35 vapier Exp $
 
-IUSE="debug nls oggvorbis arts truetype alsa"
-filter-flags "-funroll-loops"
-filter-flags "-maltivec -mabi=altivec"
-inherit eutils
+inherit eutils flag-o-matic
 
 MY_P=${P}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="Great Video editing/encoding tool. New, gtk2 version"
+DESCRIPTION="Great Video editing/encoding tool"
 HOMEPAGE="http://fixounet.free.fr/avidemux/"
 SRC_URI="http://fixounet.free.fr/avidemux/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="2"
 KEYWORDS="x86 ~ppc"
+IUSE="debug nls oggvorbis arts truetype alsa"
 
 DEPEND="virtual/x11
 	media-sound/mad
@@ -36,6 +32,7 @@ DEPEND="virtual/x11
 	alsa? ( >=media-libs/alsa-lib-0.9.1 )"
 # media-sound/toolame is supported as well
 
+S=${WORKDIR}/${MY_P}
 
 src_compile() {
 	# Fixes a possible automake error due to clock skew
@@ -44,15 +41,14 @@ src_compile() {
 	cd ${S}/avidemux/mpeg2enc; epatch ${FILESDIR}/gcc2.patch; cd ${S}
 	cd ${S}/avidemux/ADM_dialog; epatch ${FILESDIR}/resize_crash.patch; cd ${S}
 
-	export WANT_AUTOCONF_2_5=1
+	export WANT_AUTOCONF=2.5
 	autoconf
 
 	# invalid cast
 	use ppc \
 		&& sed -i -e '188s/const//g' avidemux/ADM_video/ADM_vidFont.cpp
 
-	local myconf
-	myconf="--with-gnu-ld --disable-warnings"
+	local myconf="--disable-warnings"
 
 	# --enable-profile        creates profiling infos default=no
 	# --enable-pch            enables precompiled header support
@@ -64,6 +60,9 @@ src_compile() {
 	use debug && myconf="${myconf} --enable-debug=full"
 	use nls || myconf="${myconf} --disable-nls"
 
+	filter-flags -funroll-loops
+	filter-flags -maltivec -mabi=altivec
+
 	econf ${myconf} || die "configure failed"
 
 	make || die "make failed"
@@ -75,9 +74,7 @@ src_install() {
 }
 
 pkg_postinst() {
-
-	if [ -n "`use pcc`" ]
-	then
+	if [ `use pcc` ] ; then
 		echo
 		einfo "OSS sound output may not work on ppc"
 		einfo "If your hear only static noise, try"
diff --git a/media-video/avidemux/avidemux-2.0.20.ebuild b/media-video/avidemux/avidemux-2.0.20.ebuild
index daaf2588508a..c2ec6ae4b5cd 100644
--- a/media-video/avidemux/avidemux-2.0.20.ebuild
+++ b/media-video/avidemux/avidemux-2.0.20.ebuild
@@ -1,22 +1,18 @@
-# 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/avidemux/avidemux-2.0.20.ebuild,v 1.1 2003/12/21 11:10:33 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.0.20.ebuild,v 1.2 2004/01/26 00:49:35 vapier Exp $
 
-IUSE="debug nls oggvorbis arts truetype alsa"
-filter-flags "-funroll-loops"
-filter-flags "-maltivec -mabi=altivec"
-inherit eutils
+inherit eutils flag-o-matic
 
 MY_P=${P}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="Great Video editing/encoding tool. New, gtk2 version"
+DESCRIPTION="Great Video editing/encoding tool"
 HOMEPAGE="http://fixounet.free.fr/avidemux/"
 SRC_URI="http://fixounet.free.fr/avidemux/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="2"
 KEYWORDS="~x86 ~ppc"
+IUSE="debug nls oggvorbis arts truetype alsa"
 
 DEPEND="virtual/x11
 	media-sound/mad
@@ -36,12 +32,13 @@ DEPEND="virtual/x11
 	alsa? ( >=media-libs/alsa-lib-0.9.1 )"
 # media-sound/toolame is supported as well
 
+S=${WORKDIR}/${MY_P}
 
 src_compile() {
 	# Fixes a possible automake error due to clock skew
 	touch -r *
 
-	export WANT_AUTOCONF_2_5=1
+	export WANT_AUTOCONF=2.5
 	autoconf
 
 	# invalid cast
@@ -61,6 +58,9 @@ src_compile() {
 	use debug && myconf="${myconf} --enable-debug=full"
 	use nls || myconf="${myconf} --disable-nls"
 
+	filter-flags -funroll-loops
+	filter-flags -maltivec -mabi=altivec
+
 	econf ${myconf} || die "configure failed"
 
 	make || die "make failed"
@@ -72,9 +72,7 @@ src_install() {
 }
 
 pkg_postinst() {
-
-	if [ -n "`use pcc`" ]
-	then
+	if [ `use pcc` ] ; then
 		echo
 		einfo "OSS sound output may not work on ppc"
 		einfo "If your hear only static noise, try"
diff --git a/media-video/totem/totem-0.99.8-r2.ebuild b/media-video/totem/totem-0.99.8-r2.ebuild
index 78bb8d745f26..1fae9d92e104 100644
--- a/media-video/totem/totem-0.99.8-r2.ebuild
+++ b/media-video/totem/totem-0.99.8-r2.ebuild
@@ -1,16 +1,16 @@
-# 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/totem/totem-0.99.8-r2.ebuild,v 1.1 2003/12/08 14:30:06 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-0.99.8-r2.ebuild,v 1.2 2004/01/26 00:50:33 vapier Exp $
 
 inherit gnome2
 
-IUSE="gstreamer lirc curl"
 DESCRIPTION="Movie player for GNOME"
 HOMEPAGE="http://www.hadess.net/totem.php3"
 
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc"
-LICENSE="GPL-2"
+IUSE="gstreamer lirc curl"
 
 # specific gtk dep is needed for a certain xfree patch (#21336)
 RDEPEND=">=dev-libs/glib-2.1
@@ -38,7 +38,6 @@ DEPEND="${RDEPEND}
 DOCS="AUTHORS ChangeLog COPYING README INSTALL NEWS TODO"
 
 src_unpack() {
-
 	unpack ${A}
 	cd ${S}
 
@@ -48,12 +47,11 @@ src_unpack() {
 	# Disables a videodriver that doesn't work with all nvidia drivers
 	# you can override it by putting xvmc in ~/.gnome2/totem_config
 	epatch ${FILESDIR}/${P}-nvidia.patch
-	export WANT_AUTOCONF_2_5=1
+	export WANT_AUTOCONF=2.5
 	autoconf
 
 	#fixes sandbox violations
 	gnome2_omf_fix
-
 }
 
 
@@ -68,6 +66,3 @@ use gstreamer && G2CONF="${G2CONF} --enable-gstreamer --disable-curl"
 use lirc \
 	&& G2CONF="${G2CONF} --enable-lirc" \
 	|| G2CONF="${G2CONF} --disable-lirc"
-
-
-
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` \