dont use old WANT_AUTOCONF #35111

7 files changed, 46 insertions, 70 deletions

diff --git a/media-gfx/sodipodi/sodipodi-0.28.ebuild b/media-gfx/sodipodi/sodipodi-0.28.ebuild
index b865b048d018..9103c33a5348 100644
--- a/media-gfx/sodipodi/sodipodi-0.28.ebuild
+++ b/media-gfx/sodipodi/sodipodi-0.28.ebuild
@@ -1,13 +1,15 @@
-# 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-gfx/sodipodi/sodipodi-0.28.ebuild,v 1.9 2003/09/11 01:18:39 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sodipodi/sodipodi-0.28.ebuild,v 1.10 2004/01/26 00:30:10 vapier Exp $
+
+inherit flag-o-matic
 
 DESCRIPTION="Vector illustration application for GNOME"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 HOMEPAGE="http://sodipodi.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ppc"
 IUSE="xml2 nls bonobo wmf"
 
@@ -24,34 +26,20 @@ src_unpack() {
 	unpack ${A}
 
 	cd ${S}
-	export WANT_AUTOCONF_2_5=1
+	export WANT_AUTOCONF=2.5
 	autoconf --force
 }
 
 src_compile() {
-	local myconf
-
-	use bonobo \
-		&& myconf="${myconf} --with-bonobo" \
-		|| myconf="${myconf} --without-bonobo"
-
-	use xml2 \
-		&& myconf="${myconf} --with-gnome-xml2" \
-		|| myconf="${myconf} --without-gnome-xml2"
-
-	use wmf \
-		&& myconf="${myconf} --with-libwmf" \
-		|| myconf="${myconf} --without-libwmf"
-
-	use nls || myconf="${myconf} --disable-nls"
-
-	CFLAGS="${CFLAGS} `gnome-config --cflags gdk_pixbuf`"
-
+	append-flags `gnome-config --cflags gdk_pixbuf`
 	econf \
 		--enable-gnome \
 		--enable-gnome-print \
-		${myconf} || die
-
+		`use_with bonobo` \
+		`use_with xml2 gnome-xml2` \
+		`use_with wmf libwmf` \
+		`use_enable nls` \
+		|| die
 	emake || die
 }
 
diff --git a/media-gfx/sodipodi/sodipodi-0.32.ebuild b/media-gfx/sodipodi/sodipodi-0.32.ebuild
index 9f3565862492..1c8a3f8e4dc2 100644
--- a/media-gfx/sodipodi/sodipodi-0.32.ebuild
+++ b/media-gfx/sodipodi/sodipodi-0.32.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-gfx/sodipodi/sodipodi-0.32.ebuild,v 1.3 2003/11/13 02:19:23 todd Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sodipodi/sodipodi-0.32.ebuild,v 1.4 2004/01/26 00:30:10 vapier Exp $
 
 inherit gnome2
 
@@ -30,4 +30,4 @@ DEPEND="${RDEPEND}
 G2CONF="${G2CONF} `use_enable mmx` `use_with gnome gnome-print`"
 G2CONF="${G2CONF} --with-xft --with-popt"
 
-DOCS="AUTHORS COPYING ChangeLog HACKING NEWS README TODO"
+DOCS="AUTHORS ChangeLog HACKING NEWS README TODO"
diff --git a/media-gfx/sodipodi/sodipodi-0.33.ebuild b/media-gfx/sodipodi/sodipodi-0.33.ebuild
index 0b44bf0760a8..373915ec93b0 100644
--- a/media-gfx/sodipodi/sodipodi-0.33.ebuild
+++ b/media-gfx/sodipodi/sodipodi-0.33.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-gfx/sodipodi/sodipodi-0.33.ebuild,v 1.2 2003/12/24 19:24:18 bazik Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sodipodi/sodipodi-0.33.ebuild,v 1.3 2004/01/26 00:30:10 vapier Exp $
 
 inherit gnome2
 
@@ -34,4 +34,4 @@ G2CONF="${G2CONF} --with-xft --with-popt"
 # disable experimental features for now
 G2CONF="${G2CONF} --without-mlview --without-kde"
 
-DOCS="AUTHORS COPYING ChangeLog HACKING NEWS README TODO"
+DOCS="AUTHORS ChangeLog HACKING NEWS README TODO"
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
-
 }