weird variable contaimination fix

3 files changed, 34 insertions, 54 deletions

diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog
index 305e7a7f5684..3d419dcdd6ee 100644
--- a/media-gfx/gimp/ChangeLog
+++ b/media-gfx/gimp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/gimp
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.36 2003/06/10 18:38:30 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.37 2003/06/12 09:17:34 liquidx Exp $
+
+  12 Jun 2003; Alastair Tse <liquidx@gentoo.org> gimp-1.3.15.ebuild:
+  if aalib is not present, variable $AA will override the values in ./configure
+  causing ${P}.tar.bz2 to become a make target, which is obviously wrong
+  (#22616). also cleaned up the ebuild with respect to econf.
 
 *gimp-1.3.15 (10 Jun 2003)
 
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 4cd29882115c..9821e9ad6bd3 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,19 +1,19 @@
-MD5 333c7a300975f264fb660cc0b65025fe gimp-1.3.14.ebuild 2492
+MD5 2a43094e9f263113b4cff1cf9535481c ChangeLog 5928
+MD5 6606255b200760d9524e19a95740a492 gimp-1.2.3-r2.ebuild 4080
 MD5 3ffcb6910a8be02857177f4179725ca8 gimp-1.2.3-r3.ebuild 4717
-MD5 29551bea3b9848d4373c27f1b17fc039 gimp-1.3.13.ebuild 2356
 MD5 58d7b7167b6d8d6e9e476fbf6a7ed542 gimp-1.2.4.ebuild 2978
-MD5 5b77429ca4f8de45e4a2d4979bcd1ec7 ChangeLog 5643
-MD5 333c7a300975f264fb660cc0b65025fe gimp-1.3.15.ebuild 2492
-MD5 6606255b200760d9524e19a95740a492 gimp-1.2.3-r2.ebuild 4080
-MD5 edd3aa0572ed45191d25b99712a875d9 files/gimp-1.2.3-r3-gentoo.diff 427
+MD5 29551bea3b9848d4373c27f1b17fc039 gimp-1.3.13.ebuild 2356
+MD5 dd81df89076fc17de574c9c01b2241c0 gimp-1.3.15.ebuild 1886
+MD5 333c7a300975f264fb660cc0b65025fe gimp-1.3.14.ebuild 2492
 MD5 86617fa03849f2ba22c845a31ddf8958 files/digest-gimp-1.2.3-r2 65
 MD5 86617fa03849f2ba22c845a31ddf8958 files/digest-gimp-1.2.3-r3 65
-MD5 f2b58299eceabecfe5df955198c267d6 files/psd_save.c 49151
-MD5 edd3aa0572ed45191d25b99712a875d9 files/gimp-1.2.4-gentoo.diff 427
-MD5 9696bde4a1b70dd2816d46bed477ebc0 files/gimp.desktop 2404
-MD5 cdda0b1cc179cf75eabb63945efdae0e files/gimp-1.2.3-libgimpi-libtool.diff 1365
-MD5 13e882e38fccf991bbea8677bedca67e files/digest-gimp-1.3.13 66
-MD5 89fee7931deb88ed771f5ec2ec28aea4 files/digest-gimp-1.3.14 66
 MD5 ba7261fba402df352c9f7d8d496457db files/digest-gimp-1.3.15 66
+MD5 13e882e38fccf991bbea8677bedca67e files/digest-gimp-1.3.13 66
+MD5 cdda0b1cc179cf75eabb63945efdae0e files/gimp-1.2.3-libgimpi-libtool.diff 1365
 MD5 edd3aa0572ed45191d25b99712a875d9 files/gimp-1.2.3-r2-gentoo.diff 427
+MD5 edd3aa0572ed45191d25b99712a875d9 files/gimp-1.2.3-r3-gentoo.diff 427
+MD5 9696bde4a1b70dd2816d46bed477ebc0 files/gimp.desktop 2404
+MD5 f2b58299eceabecfe5df955198c267d6 files/psd_save.c 49151
+MD5 89fee7931deb88ed771f5ec2ec28aea4 files/digest-gimp-1.3.14 66
 MD5 86551dc2402aaed28ccf3612e8fe7b7a files/digest-gimp-1.2.4 65
+MD5 edd3aa0572ed45191d25b99712a875d9 files/gimp-1.2.4-gentoo.diff 427
diff --git a/media-gfx/gimp/gimp-1.3.15.ebuild b/media-gfx/gimp/gimp-1.3.15.ebuild
index beed9407d956..214f97e0f913 100644
--- a/media-gfx/gimp/gimp-1.3.15.ebuild
+++ b/media-gfx/gimp/gimp-1.3.15.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-gfx/gimp/gimp-1.3.15.ebuild,v 1.1 2003/06/10 18:38:30 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-1.3.15.ebuild,v 1.2 2003/06/12 09:17:34 liquidx Exp $
 
 IUSE="doc python perl aalib png jpeg tiff gtkhtml"
 
@@ -15,6 +15,7 @@ LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc"
 
 replace-flags -Os -O2
+MAKEOPTS="${MAKEOPTS} -j1"
 
 RDEPEND=">=x11-libs/gtk+-2.2
 	>=x11-libs/pango-1.2
@@ -39,55 +40,29 @@ DEPEND="${RDEPEND}
 	doc? ( >=dev-util/gtk-doc-1 )"
 
 src_compile() {
+	# workaround portage variable leakage
+	local AA
+	local myconf
 
 	# Strip out -fomit-frame-pointer for k6's
 	is-flag "-march=k6*" && filter-flags "-fomit-frame-pointer"
 
-
-	local myconf
-
-	use doc \
-		&& myconf="${myconf} --enable-gtk-doc" \
-		|| myconf="${myconf} --disable-gtk-doc"
-	use python \
-		&& myconf="${myconf} --enable-python" \
-		|| myconf="${myconf} --disable-python"
-	use perl \
-		&& myconf="${myconf} --enable-perl" \
-		|| myconf="${myconf} --disable-perl"
-	use png \
-		&& myconf="${myconf} --with-libpng" \
-		|| myconf="${myconf} --without-libpng"
-	use jpeg \
-		&& myconf="${myconf} --with-libjpeg" \
-		|| myconf="${myconf} --without-libjpeg"
-	use tiff \
-		&& myconf="${myconf} --with-libtiff" \
-		|| myconf="${myconf} --without-libtiff"
-	use gtkhtml \
-		&& myconf="${myconf} --with-libtiff" \
-		|| myconf="${myconf} --without-libtiff"
-
-	myconf="${myconf} --disable-print"
-
-	econf ${myconf} || die
-
-
-	# hack for odd make break
-	touch plug-ins/common/${P}.tar.bz2
-
+	econf ${myconf} \
+		`use_enable doc gtk-doc` \
+		`use_enable python` \
+		`use_enable perl` \
+		`use_with png libpng` \
+		`use_with jpeg libjpeg` \
+		`use_with tiff libtiff` || die
 
 	emake || die
 }
 
 src_install() {
-	make DESTDIR=${D} prefix=/usr \
-		sysconfdir=/etc \
-		infodir=/usr/share/info \
-		mandir=/usr/share/man \
-		localstatedir=/var/lib \
-		install || die
-
+	# workaround portage variable leakage
+	local AA
+	
+	make DESTDIR=${D} install || die
 	dodoc AUTHORS COPYING ChangeL* HACKING INSTALL MAINTAINERS NEWS PLUGIN_MAINTAINERS README* TODO*
 }