dont use old WANT_AUTOCONF #35111

5 files changed, 34 insertions, 49 deletions

diff --git a/media-gfx/gimp/gimp-1.2.3-r3.ebuild b/media-gfx/gimp/gimp-1.2.3-r3.ebuild
index 3de1ac7fd5ef..9313e1a36b64 100644
--- a/media-gfx/gimp/gimp-1.2.3-r3.ebuild
+++ b/media-gfx/gimp/gimp-1.2.3-r3.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/gimp/gimp-1.2.3-r3.ebuild,v 1.12 2003/11/20 02:27:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-1.2.3-r3.ebuild,v 1.13 2004/01/26 00:27:10 vapier Exp $
 
 inherit eutils flag-o-matic
 
@@ -52,8 +52,8 @@ src_unpack() {
 	fi
 
 	echo ">>> Reconfiguring package..."
-	export WANT_AUTOMAKE_1_4=1
-	export WANT_AUTOCONF_2_1=1
+	export WANT_AUTOMAKE=1.4
+	export WANT_AUTOCONF=2.1
 	aclocal -I . -I ${S}/plug-ins/perl
 	automake --add-missing --gnu
 # Do not run autoreconf, or even autoconf, as it (autoreconf at least)
diff --git a/media-gfx/gnome-iconedit/gnome-iconedit-1.2.0-r5.ebuild b/media-gfx/gnome-iconedit/gnome-iconedit-1.2.0-r5.ebuild
index eb7637585199..5005eb8fab00 100644
--- a/media-gfx/gnome-iconedit/gnome-iconedit-1.2.0-r5.ebuild
+++ b/media-gfx/gnome-iconedit/gnome-iconedit-1.2.0-r5.ebuild
@@ -1,14 +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/gnome-iconedit/gnome-iconedit-1.2.0-r5.ebuild,v 1.14 2003/12/12 15:54:54 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gnome-iconedit/gnome-iconedit-1.2.0-r5.ebuild,v 1.15 2004/01/26 00:28:16 vapier Exp $
+
+inherit flag-o-matic
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Edits icons, what more can you say?"
 HOMEPAGE="http://www.advogato.org/proj/GNOME-Iconedit/"
 SRC_URI="http://210.77.60.218/ftp/ftp.debian.org/pool/main/g/${PN}/${PN}_${PV}.orig.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ppc sparc ~amd64"
 
 DEPEND=">=gnome-base/gnome-libs-1.4.1.2-r1
@@ -30,27 +31,23 @@ src_unpack() {
 	epatch ${FILESDIR}/gnome-iconedit.diff
 
 	# Update the Makefiles.
-	export WANT_AUTOMAKE_1_4=1
-	export WANT_AUTOCONF_2_1=1
+	export WANT_AUTOMAKE=1.4
+	export WANT_AUTOCONF=2.1
 	automake --add-missing
 	autoconf
 }
 
 src_compile() {
-	local myconf
-	use nls || myconf="--disable-nls"
-
-	CFLAGS="${CFLAGS} `gnome-config --cflags print` -I/usr/include/gdk-pixbuf-1.0"
-
+	append-flags `gnome-config --cflags print` -I/usr/include/gdk-pixbuf-1.0
 	econf \
 		--without-gnome-print \
-		${myconf} || die
+		`use_enable nls` \
+		|| die
 
 	emake || die
 }
 
 src_install() {
 	einstall || die
-
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
+	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
 }
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"