Remove entire installed instance from /usr/lib/MozillaFirefox 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. Bumping the rev and marking ~arch so that testers will try this before it hits the general population

4 files changed, 288 insertions, 8 deletions

diff --git a/net-www/mozilla-firefox/ChangeLog b/net-www/mozilla-firefox/ChangeLog
index 52469a5980eb..50c36daf81a9 100644
--- a/net-www/mozilla-firefox/ChangeLog
+++ b/net-www/mozilla-firefox/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-www/mozilla-firefox
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firefox/ChangeLog,v 1.26 2004/04/16 17:33:29 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firefox/ChangeLog,v 1.27 2004/04/26 04:11:21 agriffis Exp $
+
+  26 Apr 2004; Aron Griffis <agriffis@gentoo.org>
+  +mozilla-firefox-0.8-r3.ebuild:
+  Remove entire installed instance from /usr/lib/MozillaFirefox 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.  Bumping the rev and marking ~arch so that testers will try
+  this before it hits the general population
 
   16 Apr 2004; Jason Wever <weeve@gentoo.org> mozilla-firefox-0.8-r2.ebuild:
   Stable on sparc.
diff --git a/net-www/mozilla-firefox/Manifest b/net-www/mozilla-firefox/Manifest
index 5f770cf11c2d..cefa5bca850e 100644
--- a/net-www/mozilla-firefox/Manifest
+++ b/net-www/mozilla-firefox/Manifest
@@ -1,13 +1,16 @@
-MD5 f4634677a58c0598567031b704692585 ChangeLog 4142
-MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
-MD5 7eec2b27a51c55f06d60487bb24e33be mozilla-firefox-0.8-r1.ebuild 7594
-MD5 6577d9ffb39c6cc66a8a8fb41307e1c6 mozilla-firefox-0.8.ebuild 7672
+MD5 4eb8881a1f559d76bf981ce2d4055b6c inspector.patch 1482
 MD5 65040a1928b2cbd4d6cdd1d7712d0a20 mozilla-firefox-0.8-r2.ebuild 7661
-MD5 606e82226379fd5ae6cd1d0d1faff7ff files/10MozillaFirefox 31
+MD5 6577d9ffb39c6cc66a8a8fb41307e1c6 mozilla-firefox-0.8.ebuild 7672
+MD5 7eec2b27a51c55f06d60487bb24e33be mozilla-firefox-0.8-r1.ebuild 7594
+MD5 70c6af704f61ced8acf62c90cd7c010b mozilla-firefox-0.8-r3.ebuild 7804
+MD5 5d5742efabe0f16e83d2570cf531d481 ChangeLog 4565
+MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
 MD5 507a3d1338e85acc8828cec7c91d22df files/digest-mozilla-firefox-0.8 73
-MD5 507a3d1338e85acc8828cec7c91d22df files/digest-mozilla-firefox-0.8-r1 73
 MD5 0d736b3e74f9a70202a80b22d6bdf8fc files/firefox 4227
 MD5 23d1fbd03cc6dd346a4e4ce8f2d88ebf files/mozilla-1.3-alpha-stubs.patch 4646
-MD5 f0e9adeb0454377ce019e8969e644efb files/mozilla-firebird-amd64.patch 35052
+MD5 606e82226379fd5ae6cd1d0d1faff7ff files/10MozillaFirefox 31
+MD5 507a3d1338e85acc8828cec7c91d22df files/digest-mozilla-firefox-0.8-r1 73
 MD5 507a3d1338e85acc8828cec7c91d22df files/digest-mozilla-firefox-0.8-r2 73
+MD5 507a3d1338e85acc8828cec7c91d22df files/digest-mozilla-firefox-0.8-r3 73
+MD5 f0e9adeb0454377ce019e8969e644efb files/mozilla-firebird-amd64.patch 35052
 MD5 bff260036c5dcca45da3218517fb33d8 files/icon/firefox-icon.png 3979
diff --git a/net-www/mozilla-firefox/files/digest-mozilla-firefox-0.8-r3 b/net-www/mozilla-firefox/files/digest-mozilla-firefox-0.8-r3
new file mode 100644
index 000000000000..23be07a3e957
--- /dev/null
+++ b/net-www/mozilla-firefox/files/digest-mozilla-firefox-0.8-r3
@@ -0,0 +1 @@
+MD5 cdc85152f4219bf3e3f1a8dc46e04654 firefox-source-0.8.tar.bz2 31102943
diff --git a/net-www/mozilla-firefox/mozilla-firefox-0.8-r3.ebuild b/net-www/mozilla-firefox/mozilla-firefox-0.8-r3.ebuild
new file mode 100644
index 000000000000..011d86232895
--- /dev/null
+++ b/net-www/mozilla-firefox/mozilla-firefox-0.8-r3.ebuild
@@ -0,0 +1,268 @@
+# 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-firefox/mozilla-firefox-0.8-r3.ebuild,v 1.1 2004/04/26 04:11:22 agriffis Exp $
+
+inherit makeedit flag-o-matic gcc nsplugins eutils
+
+S=${WORKDIR}/mozilla
+
+DESCRIPTION="The Mozilla Firefox Web Browser"
+HOMEPAGE="http://www.mozilla.org/projects/firefox/"
+SRC_URI="http://ftp.mozilla.org/pub/firefox/releases/${PV}/firefox-source-${PV}.tar.bz2"
+
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~ia64"
+SLOT="0"
+LICENSE="MPL-1.1 | NPL-1.1"
+IUSE="java gtk2 ipv6 gnome moznoxft truetype xinerama"
+
+RDEPEND="virtual/x11
+	!moznoxft ( virtual/xft )
+	>=sys-libs/zlib-1.1.4
+	>=media-libs/jpeg-6b
+	>=media-libs/libmng-1.0.0
+	>=media-libs/libpng-1.2.1
+	>=sys-apps/portage-2.0.36
+	dev-libs/expat
+	app-arch/zip
+	app-arch/unzip
+	gtk2?  ( >=x11-libs/gtk+-2.1.1 >=dev-libs/libIDL-0.8.0 )
+	!gtk2? ( =x11-libs/gtk+-1.2* >=gnome-base/ORBit-0.5.10-r1 )
+	java?  ( virtual/jre )
+	net-www/mozilla-launcher
+	!net-www/mozilla-firefox-bin"
+
+DEPEND="${RDEPEND}
+	virtual/glibc
+	dev-util/pkgconfig
+	dev-lang/perl
+	java? ( >=dev-java/java-config-0.2.0 )"
+
+# needed by src_compile() and src_install()
+export MOZ_PHOENIX=1
+export MOZ_CALENDAR=0
+export MOZ_ENABLE_XFT=1
+
+src_unpack() {
+	unpack firefox-source-${PV}.tar.bz2
+
+	# alpha stubs patch from lfs project.
+	# <taviso@gentoo.org> (26 Jun 2003)
+	use alpha && epatch ${FILESDIR}/mozilla-1.3-alpha-stubs.patch
+	use amd64 && epatch ${FILESDIR}/mozilla-firebird-amd64.patch
+
+}
+
+src_compile() {
+	local enable_optimize
+	local myconf="--disable-composer \
+		--with-x \
+		--with-system-jpeg \
+		--with-system-zlib \
+		--with-system-png \
+		--with-system-mng \
+		--disable-mailnews \
+		--disable-calendar \
+		--disable-pedantic \
+		--disable-svg \
+		--enable-mathml \
+		--without-system-nspr \
+		--enable-nspr-autoconf \
+		--enable-xsl \
+		$(use_enable ipv6) \
+		--enable-crypto \
+		--with-java-supplement \
+		--with-pthreads \
+		--with-default-mozilla-five-home=/usr/lib/MozillaFirefox \
+		--with-user-appdir=.phoenix \
+		--disable-jsd \
+		--disable-accessibility \
+		--disable-tests \
+		--disable-debug \
+		--disable-dtd-debug \
+		--disable-logging \
+		--enable-reorder \
+		--enable-strip \
+		--enable-strip-libs \
+		--enable-cpp-rtti \
+		--enable-xterm-updates \
+		--disable-ldap \
+		--disable-toolkit-qt \
+		--disable-toolkit-xlib \
+		--enable-extensions=default,-irc,-venkman,-content-packs,-help"
+
+	if use gtk2; then
+		myconf="${myconf} \
+			--enable-toolkit-gtk2 \
+			--enable-default-toolkit=gtk2 \
+			--disable-toolkit-gtk"
+	else
+		myconf="${myconf} \
+			--enable-toolkit-gtk \
+			--enable-default-toolkit=gtk \
+			--disable-toolkit-gtk2"
+	fi
+
+	if use moznoxft; then
+		myconf="${myconf} --disable-xft $(use_enable truetype freetype2)"
+	elif use gtk2; then
+		local pango_version
+
+		# We need Xft2.0 localy installed
+		if [[ -x /usr/bin/pkg-config ]] && pkg-config xft; then
+			pango_version="$(pkg-config --modversion pango | cut -d. -f1,2)"
+
+			# We also need pango-1.1, else Mozilla links to both
+			# Xft1.1 *and* Xft2.0, and segfault...
+			if [[ ${pango_version//.} -gt 10 ]]; then
+				einfo "Building with Xft2.0 (Gtk+-2.0) support!"
+				myconf="${myconf} --enable-xft --disable-freetype2"
+				touch ${WORKDIR}/.xft
+			else
+				ewarn "Building without Xft2.0 support!"
+				myconf="${myconf} --disable-xft $(use_enable truetype freetype2)"
+			fi
+		else
+			ewarn "Building without Xft2.0 support!"
+			myconf="${myconf} --disable-xft $(use_enable truetype freetype2)"
+		fi
+	else
+		einfo "Building with Xft2.0 (Gtk+-1.0) support!"
+		myconf="${myconf} --enable-xft --disable-freetype2"
+		touch ${WORKDIR}/.xft
+	fi
+
+	# Check for xinerama - closes #19369
+	if use xinerama; then
+		myconf="${myconf} --enable-xinerama=yes"
+	else
+		myconf="${myconf} --enable-xinerama=no"
+	fi
+
+	# Per-architecture flags
+	case "${ARCH}" in
+		alpha|amd64|ia64)
+			# 64-bit needs -fPIC
+			append-flags -fPIC
+			;;
+		sparc)
+			# Added to get MozillaFirebird to compile on sparc
+			replace-sparc64-flags
+			;;
+		ppc)
+			# Fix to avoid gcc-3.3.x miscompilation issues.
+			if [[ "$(gcc-major-version).$(gcc-minor-version)" == 3.3 ]]; then
+				append-flags -fno-strict-aliasing
+			fi
+			;;
+	esac
+
+	# 32-bit vs. 64-bit optimization
+	case "${ARCH}" in
+		alpha|amd64|ia64)
+			# Allow -O0 or -O1: Anything more than this causes
+			# segfaults on startup on 64-bit (bug 33767)
+			enable_optimize=$(echo "$CFLAGS" | grep -Eoe '-O[01]|-O\>')
+			enable_optimize=${enable_optimize:--O1}
+			filter-flags -O -O?
+			;;
+		*)
+			# -O2 and below allowed on 32-bit
+			enable_optimize=$(echo "$CFLAGS" | grep -Eoe '-O[012]|-O\>')
+			enable_optimize=${enable_optimize:--O2}
+			filter-flags -O -O?
+			;;
+	esac
+
+	# Crashes on start when compiled with -fomit-frame-pointer
+	filter-flags -fomit-frame-pointer -mpowerpc-gfxopt
+	filter-flags -ffast-math
+	append-flags -s -fforce-addr
+
+	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
+			replace-flags -march=pentium4 -march=pentium3
+			filter-flags -msse2
+		fi
+
+		# Enable us to use flash, etc plugins compiled with gcc-2.95.3
+		if [[ ${ARCH} == x86 ]]; then
+			myconf="${myconf} --enable-old-abi-compat-wrappers"
+		fi
+	fi
+
+	econf --enable-optimize="${enable_optimize}" ${myconf} || die
+
+	edit_makefiles
+	emake MOZ_PHOENIX=1 || die
+}
+
+src_install() {
+	# Plugin path creation
+	PLUGIN_DIR="/usr/lib/nsbrowser/plugins"
+	dodir ${PLUGIN_DIR}
+
+	dodir /usr/lib
+	dodir /usr/lib/MozillaFirefox
+	cp -RL --no-preserve=links ${S}/dist/bin/* ${D}/usr/lib/MozillaFirefox
+
+	#fix permissions
+	chown -R root:root ${D}/usr/lib/MozillaFirefox
+
+	# Plugin path setup (rescuing the existent plugins)
+	src_mv_plugins /usr/lib/MozillaFirefox/plugins
+
+	dodir /usr/bin
+	dosym mozilla-launcher /usr/bin/firefox
+	insinto /etc/env.d
+	doins ${FILESDIR}/10MozillaFirefox
+
+	# Fix icons to look the same everywhere
+	insinto /usr/lib/MozillaFirefox/icons
+	doins ${S}/build/package/rpm/SOURCES/mozicon16.xpm
+	doins ${S}/build/package/rpm/SOURCES/mozicon50.xpm
+
+	# Install icon and .desktop for menu entry
+	if use gnome; then
+		insinto /usr/share/pixmaps
+		doins ${FILESDIR}/icon/firefox-icon.png
+		# Fix comment of menu entry
+		cd ${S}/build/package/rpm/SOURCES
+		cp mozilla.desktop mozillafirefox.desktop
+		perl -pi -e 's:Name=Mozilla:Name=Mozilla Firefox:' mozillafirefox.desktop
+		perl -pi -e 's:Comment=Mozilla:Comment=Mozilla Firefox Web Browser:' mozillafirefox.desktop
+		perl -pi -e 's:Exec=/usr/bin/mozilla:Exec=/usr/bin/firefox:' mozillafirefox.desktop
+		perl -pi -e 's:Icon=mozilla-icon.png:Icon=firefox-icon.png:' mozillafirefox.desktop
+		cd ${S}
+		insinto /usr/share/gnome/apps/Internet
+		doins ${S}/build/package/rpm/SOURCES/mozillafirefox.desktop
+	fi
+}
+
+pkg_preinst() {
+	# Remove the old plugins dir
+	pkg_mv_plugins /usr/lib/MozillaFirefox/plugins
+
+	# Remove entire installed instance to prevent all kinds of
+	# problems... see bug 44772 for example
+	rm -rf ${ROOT}/usr/lib/MozillaFirefox
+}
+
+pkg_postinst() {
+	export MOZILLA_FIVE_HOME="${ROOT}/usr/lib/MozillaFirefox"
+
+	# Needed to update the run time bindings for REGXPCOM
+	# (do not remove next line!)
+	env-update
+	# Register Components and Chrome
+	einfo "Registering Components and Chrome..."
+	LD_LIBRARY_PATH=/usr/lib/MozillaFirefox ${MOZILLA_FIVE_HOME}/regxpcom
+	LD_LIBRARY_PATH=/usr/lib/MozillaFirefox ${MOZILLA_FIVE_HOME}/regchrome
+	# Fix permissions of component registry
+	chmod 0644 ${MOZILLA_FIVE_HOME}/components/compreg.dat
+	# Fix directory permissions
+	find ${MOZILLA_FIVE_HOME}/ -type d -perm 0700 -exec chmod 0755 {} \; || :
+	# Fix permissions on chrome files
+	find ${MOZILLA_FIVE_HOME}/chrome/ -name '*.rdf' -exec chmod 0644 {} \; || :
+}