added fix for bug 147298 (filtering out O3)

Package-Manager: portage-2.1.1

3 files changed, 26 insertions, 21 deletions

diff --git a/app-doc/doxygen/ChangeLog b/app-doc/doxygen/ChangeLog
index 31672e7ea263..131a44b30365 100644
--- a/app-doc/doxygen/ChangeLog
+++ b/app-doc/doxygen/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-doc/doxygen
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.115 2006/09/14 00:30:53 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.116 2006/09/15 02:36:00 nerdboy Exp $
+
+  15 Sep 2006; Steve Arnold <nerdboy@gentoo.org> doxygen-1.4.7.ebuild:
+  added fix for bug 147298 (using flag-o-matic), since -O3 still produces
+  broken code...
 
   14 Sep 2006; Danny van Dyk <kugelfang@gentoo.org> doxygen-1.4.7.ebuild:
   Marked stable on amd64 wrt bug #138397.
diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index 8dacbf82776f..3cfa1cc76d4c 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1.4.6/01_all_cp1251.patch 683 RMD160 732924265c1ae02cb1d66ad8857e5969f2285751 SHA1 9dbaffced9b125258529fd8290c1aa33ad76f99f SHA256 782c207692ff691936d010f5c8e25858722e29a9a23ee940305aeb38f2b23e8e
 MD5 3eae39cd24982cc69c7ca5a767b1157c files/1.4.6/01_all_cp1251.patch 683
 RMD160 732924265c1ae02cb1d66ad8857e5969f2285751 files/1.4.6/01_all_cp1251.patch 683
@@ -80,14 +77,14 @@ EBUILD doxygen-1.4.6.ebuild 3857 RMD160 929a2800bfc24c70eeeda1e470a59115b358b448
 MD5 2cd0af2d0d09d81686ee6c41a8dbe5ac doxygen-1.4.6.ebuild 3857
 RMD160 929a2800bfc24c70eeeda1e470a59115b358b448 doxygen-1.4.6.ebuild 3857
 SHA256 c91a4632ee0792c02832d345f3489db29802d3f8f630d7bf80c699189b26f7ca doxygen-1.4.6.ebuild 3857
-EBUILD doxygen-1.4.7.ebuild 3598 RMD160 7c544a51f5036c25d4fdd094d651dc27a3d0bb1f SHA1 5255f861abf1fb7219860e2d92f89feac18809b1 SHA256 2131cf1e6cf6868d2b6f0bc9f353de7e808092fec350d152a8e6c1c939641a20
-MD5 2e055a0a5bcc566c6c430aaeda261e70 doxygen-1.4.7.ebuild 3598
-RMD160 7c544a51f5036c25d4fdd094d651dc27a3d0bb1f doxygen-1.4.7.ebuild 3598
-SHA256 2131cf1e6cf6868d2b6f0bc9f353de7e808092fec350d152a8e6c1c939641a20 doxygen-1.4.7.ebuild 3598
-MISC ChangeLog 18793 RMD160 91159d86920c4e173c59c50a379add6460a851bd SHA1 6c807e9c484f99032f22c49e2e340090686ad810 SHA256 aa40c0fab892c4f7cd71a6d67ed0e2cd0a2dfc0a5166265b4ae6c816eecb5629
-MD5 3f191daaea1a30e5b64220bbf3ea5f12 ChangeLog 18793
-RMD160 91159d86920c4e173c59c50a379add6460a851bd ChangeLog 18793
-SHA256 aa40c0fab892c4f7cd71a6d67ed0e2cd0a2dfc0a5166265b4ae6c816eecb5629 ChangeLog 18793
+EBUILD doxygen-1.4.7.ebuild 3874 RMD160 cdd0e79b0b9b428261d147077e9b56a3edce24f8 SHA1 b66b199bb3dfd94e1a9279ac2812c83d70c764e6 SHA256 7e46b03c48f86e1aca36e576e73b812d4d633fdc804b05c842255afdfee2b291
+MD5 33cf1acbf8272d5dd17b54c730e37000 doxygen-1.4.7.ebuild 3874
+RMD160 cdd0e79b0b9b428261d147077e9b56a3edce24f8 doxygen-1.4.7.ebuild 3874
+SHA256 7e46b03c48f86e1aca36e576e73b812d4d633fdc804b05c842255afdfee2b291 doxygen-1.4.7.ebuild 3874
+MISC ChangeLog 18954 RMD160 556f572a4b18e883d39d6e99cdc4e1e955e09ea6 SHA1 992a9db4fdf3034303fcbe798bbdbceb5b6e872e SHA256 e9e9f4c7a1505f00e8f5eb681ef26f044ec8c165cb0278e0e07e3fb828293f55
+MD5 e49413d4a4c0f92bfddbe064d20b8405 ChangeLog 18954
+RMD160 556f572a4b18e883d39d6e99cdc4e1e955e09ea6 ChangeLog 18954
+SHA256 e9e9f4c7a1505f00e8f5eb681ef26f044ec8c165cb0278e0e07e3fb828293f55 ChangeLog 18954
 MISC metadata.xml 649 RMD160 2c8cc604548cc64104c075ff64d33190efdce45d SHA1 bfc826f792595110c799a2658d07293b4ab3e0fd SHA256 57a845bfcc6988eabb61ab1da130aeb637be936c93d47e20e53a67676f57c26b
 MD5 b8f1156ac2d88a9982011ecd8ff2275b metadata.xml 649
 RMD160 2c8cc604548cc64104c075ff64d33190efdce45d metadata.xml 649
@@ -110,10 +107,3 @@ SHA256 9b9431d5b0d53d6f852c40914f9911c15d172b7f2aaa04429bac430b0193b347 files/di
 MD5 dd760d1b23e69682a20ed48883dd4204 files/digest-doxygen-1.4.7 256
 RMD160 50d904036a5ccbd95ea4dae13d627db5a5ab34bf files/digest-doxygen-1.4.7 256
 SHA256 db31a00fa3917c06ce3c6d294371cd36ae9ead0c9c0d4bf0c7e9c0079f36610a files/digest-doxygen-1.4.7 256
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
-
-iD8DBQFFCKWZ5mJXAu5GbtIRApaMAJ95ht/SwKf2rEGqHkpgHh327Lkd0QCfeNFu
-NsuUPWGo5wLz67nkyWj9Bl8=
-=z4gP
------END PGP SIGNATURE-----
diff --git a/app-doc/doxygen/doxygen-1.4.7.ebuild b/app-doc/doxygen/doxygen-1.4.7.ebuild
index 843ea7b6f68c..725569166072 100644
--- a/app-doc/doxygen/doxygen-1.4.7.ebuild
+++ b/app-doc/doxygen/doxygen-1.4.7.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.4.7.ebuild,v 1.12 2006/09/14 00:30:53 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.4.7.ebuild,v 1.13 2006/09/15 02:36:00 nerdboy Exp $
 
-inherit eutils toolchain-funcs qt3
+inherit eutils flag-o-matic toolchain-funcs qt3
 
 DESCRIPTION="documentation system for C++, C, Java, Objective-C, Python, IDL, and other languages"
 HOMEPAGE="http://www.doxygen.org/"
@@ -35,6 +35,17 @@ src_unpack() {
 	# Consolidate patches, apply FreeBSD configure patch, codepage patch,
 	# qtools stuff, and patches for bugs 129142, 121770, and 129560.
 	epatch ${FILESDIR}/${PV}
+
+	if is-flagq "-O3" ; then
+	    echo
+	    ewarn "Compiling with -O3 is known to produce incorrectly"
+	    ewarn "optimized code which breaks doxygen."
+	    echo
+	    epause 6
+	    einfo "Continuing with -O2 instead ..."
+	    echo
+	    replace-flags "-O3" "-O2"
+	fi
 }
 
 src_compile() {