- Honor moznomail for enigmail, ipc and gnupg in SRC_URI. - Fix bug 45671 (mozilla 1.6-r1 compiled with -fstack-protector crashes on keyboard input) with filter-flags in both 1.6-r1 and 1.7_rc1 - Remove entire installed instance from /usr/lib/mozilla in pkg_preinst prior to merging new version. Hopefully this will solve many problems that people have had, and hopefully it won't break anything. Fixes bug 27719

4 files changed, 47 insertions, 21 deletions

diff --git a/net-www/mozilla/ChangeLog b/net-www/mozilla/ChangeLog
index 6f3c8c7d8031..d3ab5a13906b 100644
--- a/net-www/mozilla/ChangeLog
+++ b/net-www/mozilla/ChangeLog
@@ -1,6 +1,19 @@
 # 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.160 2004/03/30 05:18:16 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/ChangeLog,v 1.161 2004/04/26 04:38:59 agriffis Exp $
+
+*mozilla-1.7_rc1 (26 Apr 2004)
+
+  26 Apr 2004; Aron Griffis <agriffis@gentoo.org> mozilla-1.6-r1.ebuild,
+  mozilla-1.7_beta-r1.ebuild, mozilla-1.7_rc1.ebuild:
+  - Honor moznomail for enigmail, ipc and gnupg in SRC_URI.
+  - Fix bug 45671 (mozilla 1.6-r1 compiled with -fstack-protector
+    crashes on keyboard input) with filter-flags in both 1.6-r1 and
+    1.7_rc1
+  - Remove entire installed instance from /usr/lib/mozilla in pkg_preinst
+    prior to merging new version. Hopefully this will solve many
+    problems that people have had, and hopefully it won't break
+    anything. Fixes bug 27719
 
   30 Mar 2004; Donnie Berkholz <spyderous@gentoo.org>; mozilla-1.6-r1.ebuild,
   mozilla-1.7_alpha.ebuild, mozilla-1.7_beta-r1.ebuild,
diff --git a/net-www/mozilla/mozilla-1.6-r1.ebuild b/net-www/mozilla/mozilla-1.6-r1.ebuild
index 9d8742576dad..e617033d3aca 100644
--- a/net-www/mozilla/mozilla-1.6-r1.ebuild
+++ b/net-www/mozilla/mozilla-1.6-r1.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.6-r1.ebuild,v 1.8 2004/03/30 05:18:16 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.6-r1.ebuild,v 1.9 2004/04/26 04:38:59 agriffis Exp $
 
 IUSE="java crypt ipv6 gtk2 ssl ldap gnome debug xinerama"
 # Internal USE flags that I do not really want to advertise ...
@@ -13,6 +13,7 @@ inherit flag-o-matic gcc eutils nsplugins
 strip-flags
 
 # Strip flags which create more documented instability
+filter-flags -fstack-protector		# see bug 45671
 filter-flags "-fomit-frame-pointer"
 filter-flags -ffast-math
 append-flags -s -fforce-addr
diff --git a/net-www/mozilla/mozilla-1.7_beta-r1.ebuild b/net-www/mozilla/mozilla-1.7_beta-r1.ebuild
index a86234d0158f..3a24bdafb5cb 100644
--- a/net-www/mozilla/mozilla-1.7_beta-r1.ebuild
+++ b/net-www/mozilla/mozilla-1.7_beta-r1.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_beta-r1.ebuild,v 1.5 2004/03/30 05:18:16 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.7_beta-r1.ebuild,v 1.6 2004/04/26 04:38:59 agriffis Exp $
 
 IUSE="java crypt ipv6 gtk2 ssl ldap gnome debug xinerama"
 # Internal USE flags that I do not really want to advertise ...
@@ -59,11 +59,14 @@ PATCH_VER="1.0"
 # handle _rc versions
 MY_PV=${PV/_alpha/a} 	# handle alpha
 MY_PV=${MY_PV/_beta/b}	# handle beta
+MY_PV=${MY_PV/_rc/rc}	# handle rc
 S="${WORKDIR}/mozilla"
 DESCRIPTION="The Mozilla Web Browser"
 SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/${PN}${MY_PV}/src/${PN}-source-${MY_PV}-source.tar.bz2
-	crypt? ( http://downloads.mozdev.org/enigmail/src/enigmail-${EMVER}.tar.gz
-			 http://downloads.mozdev.org/enigmail/src/ipc-${IPCVER}.tar.gz )"
+	!moznomail? ( crypt? (
+		http://downloads.mozdev.org/enigmail/src/enigmail-${EMVER}.tar.gz
+		http://downloads.mozdev.org/enigmail/src/ipc-${IPCVER}.tar.gz 
+	) )"
 #	mirror://gentoo/${P}-patches-${PATCH_VER}.tar.bz2"
 HOMEPAGE="http://www.mozilla.org"
 
@@ -91,7 +94,7 @@ RDEPEND="virtual/x11
 		=dev-libs/glib-1.2*
 		>=gnome-base/ORBit-0.5.10-r1 )
 	java?  ( virtual/jre )
-	crypt? ( >=app-crypt/gnupg-1.2.1 )
+	crypt? ( !moznomail? ( >=app-crypt/gnupg-1.2.1 ) )
 	gnome? ( >=gnome-base/gnome-vfs-2.3.5 )
 	net-www/mozilla-launcher"
 
diff --git a/net-www/mozilla/mozilla-1.7_rc1.ebuild b/net-www/mozilla/mozilla-1.7_rc1.ebuild
index f86eb86694b0..e548af05a06a 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.1 2004/04/23 15:22:57 brad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.7_rc1.ebuild,v 1.2 2004/04/26 04:38:59 agriffis Exp $
 
 IUSE="java crypt ipv6 gtk2 ssl ldap gnome debug xinerama"
 # Internal USE flags that I do not really want to advertise ...
@@ -13,7 +13,8 @@ inherit flag-o-matic gcc eutils nsplugins
 strip-flags
 
 # Strip flags which create more documented instability
-filter-flags "-fomit-frame-pointer"
+filter-flags -fstack-protector		# see bug 45671
+filter-flags -fomit-frame-pointer
 filter-flags -ffast-math
 append-flags -s -fforce-addr
 
@@ -63,8 +64,10 @@ MY_PV=${MY_PV/_rc/rc}	# handle rc
 S="${WORKDIR}/mozilla"
 DESCRIPTION="The Mozilla Web Browser"
 SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/${PN}${MY_PV}/src/${PN}-source-${MY_PV}.tar.bz2
-	crypt? ( http://downloads.mozdev.org/enigmail/src/enigmail-${EMVER}.tar.gz
-			 http://downloads.mozdev.org/enigmail/src/ipc-${IPCVER}.tar.gz )"
+	crypt? ( !moznomail? (
+		http://downloads.mozdev.org/enigmail/src/enigmail-${EMVER}.tar.gz
+		http://downloads.mozdev.org/enigmail/src/ipc-${IPCVER}.tar.gz 
+	) )"
 #	mirror://gentoo/${P}-patches-${PATCH_VER}.tar.bz2"
 HOMEPAGE="http://www.mozilla.org"
 
@@ -92,7 +95,7 @@ RDEPEND="virtual/x11
 		=dev-libs/glib-1.2*
 		>=gnome-base/ORBit-0.5.10-r1 )
 	java?  ( virtual/jre )
-	crypt? ( >=app-crypt/gnupg-1.2.1 )
+	crypt? ( !moznomail ( >=app-crypt/gnupg-1.2.1 ) )
 	gnome? ( >=gnome-base/gnome-vfs-2.3.5 )
 	net-www/mozilla-launcher"
 
@@ -497,19 +500,25 @@ src_install() {
 }
 
 pkg_preinst() {
-	# Stale components and chrome files break when unmerging old
-	rm -rf ${ROOT}/usr/lib/mozilla/components
-	rm -rf ${ROOT}/usr/lib/mozilla/chrome
+	# Move old plugins dir
+	pkg_mv_plugins /usr/lib/mozilla/plugins
 
-	# Remove stale component registry.
-	rm -f ${ROOT}/usr/lib/mozilla/component.reg
-	rm -f ${ROOT}/usr/lib/mozilla/components/compreg.dat
+	if true; then
+		# Remove entire installed instance to solve various problems,
+		# for example see bug 27719
+		rm -rf ${ROOT}/usr/lib/mozilla
+	else
+		# Stale components and chrome files break when unmerging old
+		rm -rf ${ROOT}/usr/lib/mozilla/components
+		rm -rf ${ROOT}/usr/lib/mozilla/chrome
 
-	# Make sure these are removed.
-	rm -f ${ROOT}/usr/lib/mozilla/lib{Xft,Xrender}.so*
+		# Remove stale component registry.
+		rm -f ${ROOT}/usr/lib/mozilla/component.reg
+		rm -f ${ROOT}/usr/lib/mozilla/components/compreg.dat
 
-	# Move old plugins dir
-	pkg_mv_plugins /usr/lib/mozilla/plugins
+		# Make sure these are removed.
+		rm -f ${ROOT}/usr/lib/mozilla/lib{Xft,Xrender}.so*
+	fi
 }
 
 pkg_postinst() {