dont use old WANT_AUTOCONF #35111

14 files changed, 78 insertions, 108 deletions

diff --git a/media-libs/aalib/aalib-1.4_rc4-r2.ebuild b/media-libs/aalib/aalib-1.4_rc4-r2.ebuild
index b219a0a205af..e1fc8d58159b 100644
--- a/media-libs/aalib/aalib-1.4_rc4-r2.ebuild
+++ b/media-libs/aalib/aalib-1.4_rc4-r2.ebuild
@@ -1,41 +1,37 @@
-# 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-libs/aalib/aalib-1.4_rc4-r2.ebuild,v 1.14 2003/09/06 23:59:48 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/aalib/aalib-1.4_rc4-r2.ebuild,v 1.15 2004/01/26 00:31:47 vapier Exp $
 
-IUSE="X slang gpm"
-
-inherit libtool
+inherit eutils libtool
 
 MY_P="${P/_/}"
 S="${WORKDIR}/${PN}-1.4.0"
 DESCRIPTION="A ASCII-Graphics Library"
-SRC_URI="mirror://sourceforge/aa-project/${MY_P}.tar.gz"
 HOMEPAGE="http://aa-project.sourceforge.net/aalib/"
+SRC_URI="mirror://sourceforge/aa-project/${MY_P}.tar.gz"
 
-DEPEND=">=sys-libs/ncurses-5.1
-	X?	 ( virtual/x11 )
-	gpm?   ( sys-libs/gpm )
-	slang? ( >=sys-libs/slang-1.4.2 )"
-
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ppc sparc alpha hppa amd64"
+IUSE="X slang gpm"
 
-pkg_setup() {
+DEPEND=">=sys-libs/ncurses-5.1
+	X? ( virtual/x11 )
+	gpm? ( sys-libs/gpm )
+	slang? ( >=sys-libs/slang-1.4.2 )"
 
+pkg_setup() {
 	# We need autoconf-2.5
-	export WANT_AUTOCONF_2_5=1
+	export WANT_AUTOCONF=2.5
 }
 
 src_unpack() {
-
 	unpack ${A}
-	patch -p0 < ${FILESDIR}/${P}-gentoo.diff || die
+	epatch ${FILESDIR}/${P}-gentoo.diff
 	touch *
 }
 
 src_compile() {
-
 	local myconf=""
 	use slang \
 		&& myconf="--with-slang-driver=yes" \
@@ -55,7 +51,6 @@ src_compile() {
 }
 
 src_install() {
-
 	einstall || die
 	dodoc ANNOUNCE AUTHORS ChangeLog COPYING NEWS README*
 }
diff --git a/media-libs/faad2/faad2-1.1.ebuild b/media-libs/faad2/faad2-1.1.ebuild
index 155a8062f8d3..6df4ba7c3a3c 100644
--- a/media-libs/faad2/faad2-1.1.ebuild
+++ b/media-libs/faad2/faad2-1.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-libs/faad2/faad2-1.1.ebuild,v 1.8 2003/09/29 12:14:50 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/faad2-1.1.ebuild,v 1.9 2004/01/26 00:33:21 vapier Exp $
 
 inherit eutils
 
diff --git a/media-libs/faad2/faad2-2.0_rc1.ebuild b/media-libs/faad2/faad2-2.0_rc1.ebuild
index 0272ecdc93ca..108f5c3ac6c4 100644
--- a/media-libs/faad2/faad2-2.0_rc1.ebuild
+++ b/media-libs/faad2/faad2-2.0_rc1.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-libs/faad2/faad2-2.0_rc1.ebuild,v 1.3 2003/10/02 16:11:29 darkspecter Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/faad2-2.0_rc1.ebuild,v 1.4 2004/01/26 00:33:21 vapier Exp $
 
 inherit eutils libtool
 
diff --git a/media-libs/faad2/faad2-2.0_rc3.ebuild b/media-libs/faad2/faad2-2.0_rc3.ebuild
index 6b6aec434385..7c3fb48a34dd 100644
--- a/media-libs/faad2/faad2-2.0_rc3.ebuild
+++ b/media-libs/faad2/faad2-2.0_rc3.ebuild
@@ -1,34 +1,30 @@
-# 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-libs/faad2/faad2-2.0_rc3.ebuild,v 1.3 2003/12/30 17:37:03 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/faad2-2.0_rc3.ebuild,v 1.4 2004/01/26 00:33:21 vapier Exp $
 
 inherit eutils libtool flag-o-matic
 
-# see #34392
-filter-flags "-mfpmath=sse"
-
-HOMEPAGE="http://faac.sourceforge.net/"
 DESCRIPTION="The fastest ISO AAC audio decoder available, correctly decodes all MPEG-4 and MPEG-2 MAIN, LOW, LTP, LD and ER object type AAC files"
-LICENSE="GPL-2"
-
+HOMEPAGE="http://faac.sourceforge.net/"
 SRC_URI="mirror://sourceforge/faac/${PN}-${PV/_/-}.tar.gz"
-IUSE=""
-S=${WORKDIR}/${PN}
 
+LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ~ppc ~sparc ~amd64"
 
 DEPEND="virtual/glibc
 	sys-devel/automake
 	sys-devel/autoconf"
-
 #	xmms? ( >=media-sound/xmms-1.2.7
 #		media-libs/id3lib )"
 
-SLOT="0"
+S=${WORKDIR}/${PN}
 
 src_compile() {
+	# see #34392
+	filter-flags -mfpmath=sse
 
-	WANT_AUTOCONF_2_5=1 WANT_AUTOMAKE=1.7 sh ./bootstrap
+	WANT_AUTOCONF=2.5 WANT_AUTOMAKE=1.7 sh ./bootstrap
 
 	# mp4v2 needed for rhythmbox
 	# drm needed for nothing but doesn't hurt
@@ -40,17 +36,14 @@ src_compile() {
 		|| die
 
 	emake || die
-
 }
 
 src_install() {
-
-	einstall
+	einstall || die
 
 	# unneeded include, breaks building of apps
 	# <foser@gentoo.org>
 	dosed "s:#include <systems.h>::" /usr/include/mpeg4ip.h
 
 	dodoc AUTHORS ChangeLog INSTALL NEWS README README.linux TODO
-
 }
diff --git a/media-libs/imlib2/imlib2-1.0.6-r1.ebuild b/media-libs/imlib2/imlib2-1.0.6-r1.ebuild
index 716df6082331..d73071c2f113 100644
--- a/media-libs/imlib2/imlib2-1.0.6-r1.ebuild
+++ b/media-libs/imlib2/imlib2-1.0.6-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-libs/imlib2/imlib2-1.0.6-r1.ebuild,v 1.23 2003/11/27 02:49:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.0.6-r1.ebuild,v 1.24 2004/01/26 00:34:32 vapier Exp $
 
 inherit libtool flag-o-matic gcc
 
diff --git a/media-libs/imlib2/imlib2-1.1.0.20040103.ebuild b/media-libs/imlib2/imlib2-1.1.0.20040103.ebuild
index fb0e20d1a6df..dda57bff94f6 100644
--- a/media-libs/imlib2/imlib2-1.1.0.20040103.ebuild
+++ b/media-libs/imlib2/imlib2-1.1.0.20040103.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-libs/imlib2/imlib2-1.1.0.20040103.ebuild,v 1.2 2004/01/12 23:31:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.1.0.20040103.ebuild,v 1.3 2004/01/26 00:34:32 vapier Exp $
 
 inherit enlightenment flag-o-matic gcc
 
diff --git a/media-libs/imlib2/imlib2-1.1.0.ebuild b/media-libs/imlib2/imlib2-1.1.0.ebuild
index c833e3c87993..59a4531b4def 100644
--- a/media-libs/imlib2/imlib2-1.1.0.ebuild
+++ b/media-libs/imlib2/imlib2-1.1.0.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-libs/imlib2/imlib2-1.1.0.ebuild,v 1.4 2004/01/12 23:31:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.1.0.ebuild,v 1.5 2004/01/26 00:34:32 vapier Exp $
 
 inherit enlightenment flag-o-matic gcc
 
@@ -21,18 +21,9 @@ DEPEND="=media-libs/freetype-2*
 	tiff? ( >=media-libs/tiff-3.5.5 )
 	virtual/x11"
 
-#S=${WORKDIR}/${PN}		# cvs
-S=${WORKDIR}/${P}		# release
+S=${WORKDIR}/${P}
 
 src_compile() {
-	# cvs only stuff
-#	cp autogen.sh{,.old}
-#	sed -e 's:.*configure.*::' autogen.sh.old > autogen.sh
-#	env USER=blah WANT_AUTOCONF_2_5=1 ./autogen.sh || die "could not autogen"
-#	cd libltdl
-#	env WANT_AUTOCONF_2_5=1 autoconf || die
-#	cd ${S}
-
 	replace-flags k6-3 i586
 	replace-flags k6-2 i586
 	replace-flags k6 i586
diff --git a/media-libs/imlib2_loaders/imlib2_loaders-1.0.4.20031225.ebuild b/media-libs/imlib2_loaders/imlib2_loaders-1.0.4.20031225.ebuild
index be9b26f9301e..e728ff4fc1c4 100644
--- a/media-libs/imlib2_loaders/imlib2_loaders-1.0.4.20031225.ebuild
+++ b/media-libs/imlib2_loaders/imlib2_loaders-1.0.4.20031225.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2_loaders/imlib2_loaders-1.0.4.20031225.ebuild,v 1.1 2003/12/25 05:29:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2_loaders/imlib2_loaders-1.0.4.20031225.ebuild,v 1.2 2004/01/26 00:35:06 vapier Exp $
 
 inherit enlightenment flag-o-matic
 
@@ -17,8 +17,8 @@ DEPEND="${DEPEND}
 src_compile() {
 	cp autogen.sh{,.old}
 	sed -e 's:.*configure.*::' autogen.sh.old > autogen.sh
-	env WANT_AUTOCONF_2_5=1 ./autogen.sh || die "could not autogen"
-	cd libltdl && env WANT_AUTOCONF_2_5=1 autoconf && cd ..
+	env WANT_AUTOCONF=2.5 ./autogen.sh || die "could not autogen"
+	cd libltdl && env WANT_AUTOCONF=2.5 autoconf && cd ..
 
 	use alpha && append-flags '-fPIC'
 
diff --git a/media-libs/libao/libao-0.8.4-r1.ebuild b/media-libs/libao/libao-0.8.4-r1.ebuild
index 1afb0e9709f9..f035c666d2d6 100644
--- a/media-libs/libao/libao-0.8.4-r1.ebuild
+++ b/media-libs/libao/libao-0.8.4-r1.ebuild
@@ -1,18 +1,15 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libao/libao-0.8.4-r1.ebuild,v 1.3 2004/01/21 11:03:24 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libao/libao-0.8.4-r1.ebuild,v 1.4 2004/01/26 00:35:57 vapier Exp $
 
-IUSE="alsa arts esd nas"
-
-S=${WORKDIR}/${P}
 DESCRIPTION="the audio output library"
-SRC_URI="http://www.xiph.org/ao/src/${P}.tar.gz"
 HOMEPAGE="http://www.xiph.org/ao/"
+SRC_URI="http://www.xiph.org/ao/src/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64"
-# removing "mips" because of dependency breakage
+IUSE="alsa arts esd nas"
 
 DEPEND="virtual/glibc
 	alsa? ( media-libs/alsa-lib )
@@ -26,7 +23,7 @@ src_unpack() {
 	epatch ${FILESDIR}/alsa-1.0.patch
 	cd ${S}
 	epatch ${FILESDIR}/${P}-esd.patch
-	WANT_AUTOCONF_2_5=1 autoconf || die
+	WANT_AUTOCONF=2.5 autoconf || die
 }
 
 src_compile() {
diff --git a/media-libs/libhydrogen/libhydrogen-0.8.0.ebuild b/media-libs/libhydrogen/libhydrogen-0.8.0.ebuild
index 733759f183c9..79d2500b3c6c 100644
--- a/media-libs/libhydrogen/libhydrogen-0.8.0.ebuild
+++ b/media-libs/libhydrogen/libhydrogen-0.8.0.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-libs/libhydrogen/libhydrogen-0.8.0.ebuild,v 1.6 2003/12/10 07:24:32 torbenh Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libhydrogen/libhydrogen-0.8.0.ebuild,v 1.7 2004/01/26 00:36:47 vapier Exp $
 
 inherit libtool
 
@@ -21,7 +21,7 @@ DEPEND="virtual/x11 \
 
 src_compile() {
 	einfo "Reconfiguring..."
-	export WANT_AUTOCONF_2_5=1
+	export WANT_AUTOCONF=2.5
 	aclocal
 	autoconf
 	automake
diff --git a/media-libs/libhydrogen/libhydrogen-0.8.1_beta5.ebuild b/media-libs/libhydrogen/libhydrogen-0.8.1_beta5.ebuild
index ed76b3cbae36..0b956355d7bc 100644
--- a/media-libs/libhydrogen/libhydrogen-0.8.1_beta5.ebuild
+++ b/media-libs/libhydrogen/libhydrogen-0.8.1_beta5.ebuild
@@ -1,29 +1,28 @@
-# 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-libs/libhydrogen/libhydrogen-0.8.1_beta5.ebuild,v 1.1 2003/12/10 07:24:32 torbenh Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libhydrogen/libhydrogen-0.8.1_beta5.ebuild,v 1.2 2004/01/26 00:36:47 vapier Exp $
 
 inherit libtool
 
 MY_P=${P/_/}
-
 DESCRIPTION="Linux Drum Machine - Libary"
-HOMEPAGE="http://hydrogen.sourceforge.net"
+HOMEPAGE="http://hydrogen.sourceforge.net/"
 SRC_URI="mirror://sourceforge/hydrogen/${MY_P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86"
 
-S="${WORKDIR}/${MY_P}"
-
 DEPEND="virtual/x11 \
 	>=media-libs/audiofile-0.2.3 \
 	alsa? ( media-libs/alsa-lib ) \
 	virtual/jack"
 
+S=${WORKDIR}/${MY_P}
+
 src_compile() {
 	einfo "Reconfiguring..."
-	export WANT_AUTOCONF_2_5=1
+	export WANT_AUTOCONF=2.5
 	aclocal
 	autoconf
 	automake
diff --git a/media-libs/musicbrainz/musicbrainz-2.0.1.ebuild b/media-libs/musicbrainz/musicbrainz-2.0.1.ebuild
index 331224e970f7..85747d823306 100644
--- a/media-libs/musicbrainz/musicbrainz-2.0.1.ebuild
+++ b/media-libs/musicbrainz/musicbrainz-2.0.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-libs/musicbrainz/musicbrainz-2.0.1.ebuild,v 1.6 2003/09/06 23:59:48 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/musicbrainz/musicbrainz-2.0.1.ebuild,v 1.7 2004/01/26 00:37:44 vapier Exp $
 
 IUSE=""
 
@@ -31,7 +31,7 @@ src_unpack() {
 	# remove .. if there are any issues, let me know.
 	# <azarah@gentoo.org> (30 Mar 2003)
 	einfo "Reconfiguring..."
-	export WANT_AUTOCONF_2_5=1
+	export WANT_AUTOCONF=2.5
 	aclocal
 	autoconf
 	automake
diff --git a/media-libs/musicbrainz/musicbrainz-2.0.2.ebuild b/media-libs/musicbrainz/musicbrainz-2.0.2.ebuild
index 7c274b5846fa..d0f20942eeab 100644
--- a/media-libs/musicbrainz/musicbrainz-2.0.2.ebuild
+++ b/media-libs/musicbrainz/musicbrainz-2.0.2.ebuild
@@ -1,34 +1,29 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/musicbrainz/musicbrainz-2.0.2.ebuild,v 1.1 2003/08/17 09:55:58 g2boojum Exp $
-
-IUSE=""
+# $Header: /var/cvsroot/gentoo-x86/media-libs/musicbrainz/musicbrainz-2.0.2.ebuild,v 1.2 2004/01/26 00:37:44 vapier Exp $
 
 inherit libtool
 
-S="${WORKDIR}/lib${P}"
-
 DESCRIPTION="Client library to access metadata of mp3/vorbis/CD media"
-SRC_URI="ftp://ftp.musicbrainz.org/pub/musicbrainz/lib${P}.tar.gz"
 HOMEPAGE="http://www.musicbrainz.org/"
+SRC_URI="ftp://ftp.musicbrainz.org/pub/musicbrainz/lib${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~ppc ~alpha"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha"
 
 DEPEND="virtual/glibc
 	dev-libs/expat"
 RDEPEND="dev-util/pkgconfig"
 
-src_compile() {
-	local myconf="--enable-cpp-headers --with-gnu-ld"
-	econf ${myconf} || die "configure failed"
+S=${WORKDIR}/lib${P}
 
+src_compile() {
+	econf --enable-cpp-headers || die "configure failed"
 	emake || die "emake failed"
 }
 
 src_install() {
 	make DESTDIR=${D} install || die "make install failed"
-
 	dodoc AUTHORS ChangeLog INSTALL README TODO docs/mb_howto.txt
 }
diff --git a/media-libs/taglib/taglib-1.0_beta2.ebuild b/media-libs/taglib/taglib-1.0_beta2.ebuild
index eabb43713691..b3460d6b704a 100644
--- a/media-libs/taglib/taglib-1.0_beta2.ebuild
+++ b/media-libs/taglib/taglib-1.0_beta2.ebuild
@@ -1,30 +1,30 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/taglib/taglib-1.0_beta2.ebuild,v 1.6 2004/01/17 11:06:17 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/taglib/taglib-1.0_beta2.ebuild,v 1.7 2004/01/26 00:38:59 vapier Exp $
+
 inherit flag-o-matic
 
+MY_PV=0.96
+DESCRIPTION="A library for reading and editing audio meta data"
+HOMEPAGE="http://ktown.kde.org/~wheeler/taglib/"
+SRC_URI="http://ktown.kde.org/~wheeler/taglib/${PN}-${MY_PV}.tar.gz"
+
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ~sparc ~amd64"
-DESCRIPTION="A library for reading and editing audio meta data"
-HOMEPAGE="http://ktown.kde.org/~wheeler/taglib"
-SRC_URI="http://ktown.kde.org/~wheeler/${PN}/${PN}-0.96.tar.gz"
-S=${WORKDIR}/${PN}-0.96
-SLOT=0
 
-replace-flags "-O3 -O2"
+S=${WORKDIR}/${PN}-${MY_PV}
 
-src_compile()
-{
-	cd ${S}
+src_compile() {
+	replace-flags "-O3 -O2"
 	rm -rf autom4te.cache
-	export WANT_AUTOCONF_2_5=1
+	export WANT_AUTOCONF=2.5
 	export WANT_AUTOMAKE=1.7
 	aclocal && autoconf && automake
-	econf
-	emake
+	econf || die
+	emake || die
 }
 
-src_install()
-{
-	make install DESTDIR=${D} destdir=${D}
+src_install() {
+	make install DESTDIR=${D} destdir=${D} || die
 }