- Fix bug 21667 (replacing -march=pentium4 in mozilla ebuilds outdated) by checking for gcc >= 3.2.3 - Fix bug 48878 (mozilla-1.7_rc1 pkg-config files say 1.7b) by overwriting milestone.txt in src_unpack

4 files changed, 21 insertions, 9 deletions

diff --git a/net-www/mozilla-firefox/Manifest b/net-www/mozilla-firefox/Manifest
index 2e451c828e4b..a8305e52c3f5 100644
--- a/net-www/mozilla-firefox/Manifest
+++ b/net-www/mozilla-firefox/Manifest
@@ -1,8 +1,8 @@
 MD5 65040a1928b2cbd4d6cdd1d7712d0a20 mozilla-firefox-0.8-r2.ebuild 7661
 MD5 6577d9ffb39c6cc66a8a8fb41307e1c6 mozilla-firefox-0.8.ebuild 7672
 MD5 7eec2b27a51c55f06d60487bb24e33be mozilla-firefox-0.8-r1.ebuild 7594
-MD5 8646b212bd6a3ef5da9f5f26ed23e422 mozilla-firefox-0.8-r3.ebuild 8268
-MD5 6cfab56ffbd68751185975dc24b1aa33 ChangeLog 5262
+MD5 0b99cd89de2e8017d95adcb2191e4df7 mozilla-firefox-0.8-r3.ebuild 8280
+MD5 26e786fa65c930f27b9afcc322fcc857 ChangeLog 5449
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
 MD5 507a3d1338e85acc8828cec7c91d22df files/digest-mozilla-firefox-0.8 73
 MD5 88371b8f812caf799a1ede2b1b07c079 files/mozilla-firefox-mousebuttons.patch 17099
diff --git a/net-www/mozilla/ChangeLog b/net-www/mozilla/ChangeLog
index 6f460a3a0400..a2e77fece34a 100644
--- a/net-www/mozilla/ChangeLog
+++ b/net-www/mozilla/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-www/mozilla
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/ChangeLog,v 1.163 2004/04/26 18:30:32 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/ChangeLog,v 1.164 2004/04/26 22:35:10 agriffis Exp $
+
+  26 Apr 2004; Aron Griffis <agriffis@gentoo.org> mozilla-1.7_rc1.ebuild:
+  - Fix bug 21667 (replacing -march=pentium4 in mozilla ebuilds
+    outdated) by checking for gcc >= 3.2.3
+  - Fix bug 48878 (mozilla-1.7_rc1 pkg-config files say 1.7b) by
+    overwriting milestone.txt in src_unpack
 
   26 Apr 2004; Aron Griffis <agriffis@gentoo.org>
   +files/mozilla-1.6-gcc-3.4.patch, mozilla-1.6-r1.ebuild:
diff --git a/net-www/mozilla/Manifest b/net-www/mozilla/Manifest
index 4903a4ee3a93..a314933bbbbb 100644
--- a/net-www/mozilla/Manifest
+++ b/net-www/mozilla/Manifest
@@ -1,7 +1,7 @@
 MD5 2078a4dd1a04cbc825ff7d3c827f0121 mozilla-1.7_beta-r1.ebuild 15917
 MD5 c908bcb957951df24e164b510db5dd3c mozilla-1.6-r1.ebuild 17204
-MD5 afc05734cc75f3184176c789051c64c9 mozilla-1.7_rc1.ebuild 16114
-MD5 56cebfbe0806c73cb1f0e79184313b15 ChangeLog 28451
+MD5 eda4ef8fc4c023b64e427c0fefd11ece mozilla-1.7_rc1.ebuild 16359
+MD5 a6a3322f1020343e5342f2d4a91285fc ChangeLog 28742
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
 MD5 e816a98fb3581a6d4a050aa4cdf12905 files/mozilla-1.7-amd64.patch 25433
 MD5 d0e52abf109fe61c4195f0cbf002ae18 files/google.src 706
diff --git a/net-www/mozilla/mozilla-1.7_rc1.ebuild b/net-www/mozilla/mozilla-1.7_rc1.ebuild
index 272c8a899a67..c71da49bb41e 100644
--- a/net-www/mozilla/mozilla-1.7_rc1.ebuild
+++ b/net-www/mozilla/mozilla-1.7_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.7_rc1.ebuild,v 1.4 2004/04/26 15:33:49 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.7_rc1.ebuild,v 1.5 2004/04/26 22:35:10 agriffis Exp $
 
 IUSE="java crypt ipv6 gtk2 ssl ldap gnome debug xinerama"
 # Internal USE flags that I do not really want to advertise ...
@@ -145,6 +145,11 @@ src_unpack() {
 	# <azarah@gentoo.org> (23 Feb 2003)
 	epatch ${FILESDIR}/1.3/${PN}-1.3-fix-RAW-target.patch
 
+	# Fix incorrect version in milestone.txt (1.7rc1 claims 1.7b)
+	einfo "Updating milestone.txt to ${MY_PV}"
+	sed -i -ne '/^#/p' config/milestone.txt   # maintain comments
+	echo "${MY_PV}" >> config/milestone.txt   # add version line
+
 	WANT_AUTOCONF_2_1=1 autoconf &> /dev/null
 
 	# Unpack the enigmail plugin
@@ -269,9 +274,10 @@ src_compile() {
 	fi
 
 	if [[ $(gcc-major-version) -eq 3 ]]; then
-		# Currently gcc-3.2 or older do not work well if we specify "-march"
-		# and other optimizations for pentium4.
-		if [[ $(gcc-minor-version) -lt 3 ]]; then
+		# gcc-3 prior to 3.2.3 doesn't work well for pentium4
+		if [[ $(gcc-minor-version) -lt 2 || 
+			( $(gcc-minor-version) -eq 2 && $(gcc-micro-version) -lt 3 ) ]]
+		then
 			replace-flags -march=pentium4 -march=pentium3
 			filter-flags -msse2
 		fi