Fix build by unsetting AA like in 2.3.11, bug 151946

Package-Manager: portage-2.1.2_pre3-r6

3 files changed, 16 insertions, 20 deletions

diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog
index ff5deae00076..afd23f0f16f8 100644
--- a/media-gfx/gimp/ChangeLog
+++ b/media-gfx/gimp/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-gfx/gimp
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.179 2006/10/19 11:16:18 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.180 2006/10/21 19:59:27 genstef Exp $
+
+  21 Oct 2006; Stefan Schweizer <genstef@gentoo.org> gimp-2.3.12.ebuild:
+  Fix build by unsetting AA like in 2.3.11, bug 151946
 
 *gimp-2.3.12 (19 Oct 2006)
 
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 92c3d3ca437b..781d6b294745 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX gimp-2.2.11-libpng-1.2.10.patch 483 RMD160 0449ce96b44330847c16fd75086e0e13b501c789 SHA1 eb4bad47ea63b08009f2c7b964be3d60f5416640 SHA256 6f2614b24e91d7f7b645b14778c2c935f965ddfa6087b7086652b8bc70002df6
 MD5 13fb5cd8091e7f21d4be92dc8e2f63a3 files/gimp-2.2.11-libpng-1.2.10.patch 483
 RMD160 0449ce96b44330847c16fd75086e0e13b501c789 files/gimp-2.2.11-libpng-1.2.10.patch 483
@@ -39,18 +36,18 @@ EBUILD gimp-2.3.11.ebuild 3324 RMD160 45045f9bdb4a2954b4c4679c3aaa5b9097eaa82b S
 MD5 bc93132d5d90d775c5686529aef96699 gimp-2.3.11.ebuild 3324
 RMD160 45045f9bdb4a2954b4c4679c3aaa5b9097eaa82b gimp-2.3.11.ebuild 3324
 SHA256 bd6a01a3072f5f9290d97412808bbd76c8d632f295ffee194f1e5f5283b4c11f gimp-2.3.11.ebuild 3324
-EBUILD gimp-2.3.12.ebuild 3039 RMD160 bf5b77fb3ffd664a6380d24f6a54ae61f5b47e33 SHA1 cb6cef60d4c76c769cf292076a851db2ca0fedf0 SHA256 c100e4ad9ce88db1a8d646a060f4742b054cb49d02712e69d323fae2e1a05fe1
-MD5 5d9002de4d0a3f682199cd1555458402 gimp-2.3.12.ebuild 3039
-RMD160 bf5b77fb3ffd664a6380d24f6a54ae61f5b47e33 gimp-2.3.12.ebuild 3039
-SHA256 c100e4ad9ce88db1a8d646a060f4742b054cb49d02712e69d323fae2e1a05fe1 gimp-2.3.12.ebuild 3039
+EBUILD gimp-2.3.12.ebuild 3092 RMD160 4afedcb767ff6e025719faa0d9347b689c1f4c89 SHA1 3e2c2f16dbfffe2454b953085d6e75bfb97d4f00 SHA256 44b4be2e0510fda98bfc99375ad6a6e1f2f2b036f1749c2dfce3c18b003c2736
+MD5 4ca32ac27fc2a8643f3f1aa119178194 gimp-2.3.12.ebuild 3092
+RMD160 4afedcb767ff6e025719faa0d9347b689c1f4c89 gimp-2.3.12.ebuild 3092
+SHA256 44b4be2e0510fda98bfc99375ad6a6e1f2f2b036f1749c2dfce3c18b003c2736 gimp-2.3.12.ebuild 3092
 EBUILD gimp-9999.ebuild 3632 RMD160 517f291825842229964b3a6dbbabea7ac007f640 SHA1 09e1629d318a00ca47fa20e556e87e3461cf84df SHA256 c629881baf6f63d2ca19bc4ad472b7f561b74b818e9c96fbdc1bbccedca12572
 MD5 32810f821112d60d5d0b9ff89fec94ec gimp-9999.ebuild 3632
 RMD160 517f291825842229964b3a6dbbabea7ac007f640 gimp-9999.ebuild 3632
 SHA256 c629881baf6f63d2ca19bc4ad472b7f561b74b818e9c96fbdc1bbccedca12572 gimp-9999.ebuild 3632
-MISC ChangeLog 25740 RMD160 4b1ae0ecf02c7a25c9d7ac31a6113133630bfece SHA1 d5ec9e27b8790449e1e6f79cae0901c70b6a05f3 SHA256 5ffff08cd1119cdb370bf5e68c87e704ab97bdc0bdb32cec49f23701014d3356
-MD5 e254b7cdee17db2f2e07ef3735f76edc ChangeLog 25740
-RMD160 4b1ae0ecf02c7a25c9d7ac31a6113133630bfece ChangeLog 25740
-SHA256 5ffff08cd1119cdb370bf5e68c87e704ab97bdc0bdb32cec49f23701014d3356 ChangeLog 25740
+MISC ChangeLog 25871 RMD160 ed26e2b21a2e0596326288f8cd563b6c48eded3e SHA1 4e64bf09353da81fae621a8654847ced3e56dbc6 SHA256 73782e8b38a7e3ff73ee2bef276e6b42cc18ac48fec68347d0d29eaac8738811
+MD5 16c980e0351ac2f9e4af892de01ef425 ChangeLog 25871
+RMD160 ed26e2b21a2e0596326288f8cd563b6c48eded3e ChangeLog 25871
+SHA256 73782e8b38a7e3ff73ee2bef276e6b42cc18ac48fec68347d0d29eaac8738811 ChangeLog 25871
 MISC metadata.xml 284 RMD160 5583a06df7da2f9196a05c90054269a2769fbe00 SHA1 3965e8264fd894c6df4e27036a98ebaf8a9d29c1 SHA256 6fe2017bdb9accfeba7f66092d8b0f859244865f9cdaf54c2888b212702a2f0b
 MD5 ff2544c9183e73f0c6c7422f18e144b1 metadata.xml 284
 RMD160 5583a06df7da2f9196a05c90054269a2769fbe00 metadata.xml 284
@@ -73,10 +70,3 @@ SHA256 de35a43b18c67bf361b97797618ebf2f3f0f10e0eb4ffd2113b148d2313a7e89 files/di
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gimp-9999 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-gimp-9999 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-gimp-9999 0
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFN5XooeSe8B0zEfwRAn7qAJ9fp7ADIpHArNF8O45AYENsM+rhUgCfcL6G
-GEI7t//jP+UK+P7Ot3XAW0c=
-=e2X1
------END PGP SIGNATURE-----
diff --git a/media-gfx/gimp/gimp-2.3.12.ebuild b/media-gfx/gimp/gimp-2.3.12.ebuild
index d2479d4e9730..4933944e1a82 100644
--- a/media-gfx/gimp/gimp-2.3.12.ebuild
+++ b/media-gfx/gimp/gimp-2.3.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.3.12.ebuild,v 1.1 2006/10/19 11:16:18 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.3.12.ebuild,v 1.2 2006/10/21 19:59:27 genstef Exp $
 
 inherit fdo-mime flag-o-matic
 
@@ -58,6 +58,9 @@ pkg_setup() {
 }
 
 src_compile() {
+	# workaround portage variable leakage
+	local AA=
+
 	# gimp uses inline functions (e.g. plug-ins/common/grid.c) (#23078)
 	# gimp uses floating point math, needs accuracy (#98685)
 	filter-flags "-fno-inline" "-ffast-math"