From: Martin Schlemmer <azarah@gentoo.org>
Date: Sun, 2 Oct 2005 19:51:54 +0000 (+0000)
Subject: Fix flag replacement, bug #107917.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0cae0f8a8e9a1d743830a0933cdfe34f63f48371;p=gentoo.git

Fix flag replacement, bug #107917.
Package-Manager: portage-2.0.52-r1
---

diff --git a/www-client/mozilla-firefox/ChangeLog b/www-client/mozilla-firefox/ChangeLog
index 9bf58df54146..71abfbf96892 100644
--- a/www-client/mozilla-firefox/ChangeLog
+++ b/www-client/mozilla-firefox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/mozilla-firefox
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.94 2005/10/02 15:04:48 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.95 2005/10/02 19:51:54 azarah Exp $
+
+  02 Oct 2005; Martin Schlemmer <azarah@gentoo.org>
+  mozilla-firefox-1.0.7-r3.ebuild:
+  Fix flag replacement, bug #107917.
 
 *mozilla-firefox-1.0.7-r3 (02 Oct 2005)
 
diff --git a/www-client/mozilla-firefox/Manifest b/www-client/mozilla-firefox/Manifest
index ac141e51a98b..1cd9976466c2 100644
--- a/www-client/mozilla-firefox/Manifest
+++ b/www-client/mozilla-firefox/Manifest
@@ -3,8 +3,8 @@ Hash: SHA1
 
 MD5 27212c3bfc3d15dc4bb42454380c533b mozilla-firefox-1.0.6-r5.ebuild 9631
 MD5 7f073b544e7967d3453ab8579292ef3e mozilla-firefox-1.0.6-r4.ebuild 9543
-MD5 8ed924c1a96288fb9c96659318d13af7 mozilla-firefox-1.0.7-r3.ebuild 9328
-MD5 1238dfbe6e657a418a3c2efeddba608a ChangeLog 33443
+MD5 a3cec6a265f7dde388b8ada806f0b1e1 mozilla-firefox-1.0.7-r3.ebuild 9324
+MD5 29fcc59acb8b3fca8819b43fe02b20f6 ChangeLog 33568
 MD5 8a30120dc035d60c58db0a9dc8c3b91b mozilla-firefox-1.0.6-r7.ebuild 9771
 MD5 06023401dbf9f17149696616a240647d mozilla-firefox-1.0.6-r3.ebuild 9154
 MD5 6d3af6331c1b75d7991a5680fc9602c7 mozilla-firefox-1.0.6-r2.ebuild 8318
@@ -46,7 +46,7 @@ MD5 fc5e3a5d794abcb431bafdbc80c89103 files/icon/mozillafirefox.desktop 341
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDP/eZ1ZcsMnZjRyIRAud7AJ0S0TEbdJ/kqGfRGCqnr6CP0RSJZgCfX/Fk
-X4wYNzVWc40ZYckA6vawdOY=
-=71Na
+iD8DBQFDQDro1ZcsMnZjRyIRAs8aAKClDLBJRoCwCfJDOGG4M7cVqt55KwCeMwXR
+98bNGmceAOjGfavLdEW7O2g=
+=HL1B
 -----END PGP SIGNATURE-----
diff --git a/www-client/mozilla-firefox/mozilla-firefox-1.0.7-r3.ebuild b/www-client/mozilla-firefox/mozilla-firefox-1.0.7-r3.ebuild
index b204a37034cc..2606aedfa60f 100644
--- a/www-client/mozilla-firefox/mozilla-firefox-1.0.7-r3.ebuild
+++ b/www-client/mozilla-firefox/mozilla-firefox-1.0.7-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-1.0.7-r3.ebuild,v 1.1 2005/10/02 15:04:48 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-1.0.7-r3.ebuild,v 1.2 2005/10/02 19:51:54 azarah Exp $
 
 unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
 MOZ_FREETYPE2="no"   # Need to disable for newer .. remove here and in mozconfig
@@ -112,10 +112,10 @@ src_compile() {
 	# hardened GCC uses -fstack-protector-all by default, which breaks us
 	has_hardened && append-flags -fno-stack-protector-all
 	# remove -fstack-protector because now it borks firefox
-	CFLAGS=${CFLAGS/-fstack-protector-all//}
-	CFLAGS=${CFLAGS/-fstack-protector//}
-	CXXFLAGS=${CXXFLAGS/-fstack-protector-all//}
-	CXXFLAGS=${CXXFLAGS/-fstack-protector//}
+	CFLAGS=${CFLAGS/-fstack-protector-all/}
+	CFLAGS=${CFLAGS/-fstack-protector/}
+	CXXFLAGS=${CXXFLAGS/-fstack-protector-all/}
+	CXXFLAGS=${CXXFLAGS/-fstack-protector/}
 
 	####################################
 	#