protection against over optimisation

5 files changed, 22 insertions, 13 deletions

diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog
index 0bf1a2b46d33..6a3a5ceba488 100644
--- a/media-gfx/gimp/ChangeLog
+++ b/media-gfx/gimp/ChangeLog
@@ -1,6 +1,10 @@
 # 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.42 2003/07/04 05:39:54 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.43 2003/07/05 13:39:10 liquidx Exp $
+
+  05 Jul 2003; Alastair Tse <liquidx@gentoo.org> gimp-1.2.4.ebuild,
+  gimp-1.2.5.ebuild, gimp-1.3.15.ebuild:
+  protection against overoptimisations (#21787)
 
   04 Jul 2003; Alastair Tse <liquidx@gentoo.org> gimp-1.3.15.ebuild:
   fix menu entry link
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 0e476a4c3b27..0cd98fa03810 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,22 +1,22 @@
-MD5 b00e12bc44597089b2e8dc018ad1a82f ChangeLog 6817
+MD5 e71dd67245c0e38017352e8b78e927cd ChangeLog 6976
 MD5 6606255b200760d9524e19a95740a492 gimp-1.2.3-r2.ebuild 4080
 MD5 3ffcb6910a8be02857177f4179725ca8 gimp-1.2.3-r3.ebuild 4717
-MD5 16dfe255050f1caa71cd4eb086173e09 gimp-1.2.4.ebuild 3031
-MD5 2a1ae15b8f9a214efd053de793e98d7e gimp-1.2.5.ebuild 3139
+MD5 30ab5c31998dcd62647478535cd5a03e gimp-1.2.4.ebuild 3086
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 29551bea3b9848d4373c27f1b17fc039 gimp-1.3.13.ebuild 2356
+MD5 96f56a23292f1416ab2074951d66c233 gimp-1.3.15.ebuild 2273
 MD5 333c7a300975f264fb660cc0b65025fe gimp-1.3.14.ebuild 2492
-MD5 4fb6a351725b64ce3e624b4f58354caf gimp-1.3.15.ebuild 2216
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 8ee795b74f02fd43549afcb204ad833d gimp-1.2.5.ebuild 3194
 MD5 86617fa03849f2ba22c845a31ddf8958 files/digest-gimp-1.2.3-r2 65
 MD5 86617fa03849f2ba22c845a31ddf8958 files/digest-gimp-1.2.3-r3 65
-MD5 86551dc2402aaed28ccf3612e8fe7b7a files/digest-gimp-1.2.4 65
+MD5 ba7261fba402df352c9f7d8d496457db files/digest-gimp-1.3.15 66
 MD5 662e7b51f4c882429b73dea3263b39de files/digest-gimp-1.2.5 65
 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 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 edd3aa0572ed45191d25b99712a875d9 files/gimp-1.2.4-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.2.4.ebuild b/media-gfx/gimp/gimp-1.2.4.ebuild
index 267545fb7ba3..211af1aa1e1e 100644
--- a/media-gfx/gimp/gimp-1.2.4.ebuild
+++ b/media-gfx/gimp/gimp-1.2.4.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.2.4.ebuild,v 1.6 2003/07/04 05:39:54 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-1.2.4.ebuild,v 1.7 2003/07/05 13:39:10 liquidx Exp $
 
 inherit eutils flag-o-matic
 
@@ -42,6 +42,8 @@ src_compile() {
 	replace-flags -march=k6-2 -march=i586
 	replace-flags -march=k6-3 -march=i586
 	replace-flags -march=k6 -march=i586
+	# over optimisations (#21787)
+	replace-flags -Os -O2
 
 	local mymake=""
 
diff --git a/media-gfx/gimp/gimp-1.2.5.ebuild b/media-gfx/gimp/gimp-1.2.5.ebuild
index c35fc805e30b..ef793346240b 100644
--- a/media-gfx/gimp/gimp-1.2.5.ebuild
+++ b/media-gfx/gimp/gimp-1.2.5.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.2.5.ebuild,v 1.3 2003/06/19 23:45:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-1.2.5.ebuild,v 1.4 2003/07/05 13:39:10 liquidx Exp $
 
 inherit eutils flag-o-matic
 
@@ -42,6 +42,8 @@ src_compile() {
 	replace-flags -march=k6-2 -march=i586
 	replace-flags -march=k6-3 -march=i586
 	replace-flags -march=k6 -march=i586
+	# over-optimisations (#21787)
+	replace-flags -Os -O2
 	# gimp has inline functions (plug-ins/common/grid.c) (#23078)
 	filter-flags "-fno-inline"
 
diff --git a/media-gfx/gimp/gimp-1.3.15.ebuild b/media-gfx/gimp/gimp-1.3.15.ebuild
index 97c82c3c739d..df0091e87d77 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.7 2003/07/04 05:39:54 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-1.3.15.ebuild,v 1.8 2003/07/05 13:39:10 liquidx Exp $
 
 IUSE="doc python perl aalib png jpeg tiff gtkhtml"
 
@@ -14,6 +14,7 @@ SLOT="1.4"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc ~hppa"
 
+# protect against over optimisation (related to #21787)
 replace-flags -Os -O2
 MAKEOPTS="${MAKEOPTS} -j1"