Bump revision to carry out mozilla.eclass change: don't use typeaheadfind on 1.0PR #65623. Also depend on mozilla-launcher-1.20 which appropriately deletes compreg.dat when firefox is updated

4 files changed, 193 insertions, 16 deletions

diff --git a/net-www/mozilla-firefox/ChangeLog b/net-www/mozilla-firefox/ChangeLog
index e154f404173d..b340d051a911 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 Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firefox/ChangeLog,v 1.66 2004/09/19 12:36:09 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firefox/ChangeLog,v 1.67 2004/09/28 21:40:55 agriffis Exp $
+
+*mozilla-firefox-1.0_pre-r1 (28 Sep 2004)
+
+  28 Sep 2004; Aron Griffis <agriffis@gentoo.org>
+  +mozilla-firefox-1.0_pre-r1.ebuild:
+  Bump revision to carry out mozilla.eclass change: don't use typeaheadfind on
+  1.0PR #65623. Also depend on mozilla-launcher-1.20 which appropriately deletes
+  compreg.dat when firefox is updated
 
   19 Sep 2004; <kloeri@gentoo.org> mozilla-firefox-1.0_pre.ebuild:
   Stable on alpha, bug 63996.
diff --git a/net-www/mozilla-firefox/Manifest b/net-www/mozilla-firefox/Manifest
index da2b7afb0ece..4c1d1ad27219 100644
--- a/net-www/mozilla-firefox/Manifest
+++ b/net-www/mozilla-firefox/Manifest
@@ -1,30 +1,32 @@
+MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
+MD5 bf485edb7743e05d9da488cb79fda598 mozilla-firefox-0.8-r1.ebuild 7573
 MD5 c34f0afeb7aa8bc5bcb24ab079f95c37 mozilla-firefox-0.8-r2.ebuild 7666
+MD5 685aaef2ee7d53f1d524597b564c6952 mozilla-firefox-0.8-r3.ebuild 8504
 MD5 c1d874eee9769e073b715ffc0a4bb312 mozilla-firefox-0.8.ebuild 7599
-MD5 ebc5c2f952fe4b6b66b5fbd3cccb3c38 mozilla-firefox-0.9.3-r1.ebuild 5132
+MD5 5279f3e0a0e974c5e30ef47b1b04f47f ChangeLog 10848
 MD5 036f220a45ed58418f2c168cf00ad4b1 mozilla-firefox-0.9-r1.ebuild 8318
 MD5 5d91117e033e7e415a5ff88a95a73995 mozilla-firefox-0.9.1.ebuild 8428
 MD5 8c750111072f43bceea00348916cba92 mozilla-firefox-0.9.3.ebuild 8427
-MD5 bf485edb7743e05d9da488cb79fda598 mozilla-firefox-0.8-r1.ebuild 7573
-MD5 685aaef2ee7d53f1d524597b564c6952 mozilla-firefox-0.8-r3.ebuild 8504
-MD5 5279f3e0a0e974c5e30ef47b1b04f47f ChangeLog 10848
-MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
+MD5 ebc5c2f952fe4b6b66b5fbd3cccb3c38 mozilla-firefox-0.9.3-r1.ebuild 5132
 MD5 9dcae9fc6b19da1094e2a86791697546 mozilla-firefox-1.0_pre.ebuild 4856
-MD5 507a3d1338e85acc8828cec7c91d22df files/digest-mozilla-firefox-0.8 73
-MD5 91fb197b04b4e0d536270123dbd5ae04 files/digest-mozilla-firefox-0.9.1 75
-MD5 0c7804fd13815f9a0e7a1ef0eab6a871 files/digest-mozilla-firefox-0.9.3 75
-MD5 88371b8f812caf799a1ede2b1b07c079 files/mozilla-firefox-mousebuttons.patch 17099
-MD5 bd50631b47d20becbb5af21b605dfb5d files/firefox 4218
-MD5 23d1fbd03cc6dd346a4e4ce8f2d88ebf files/mozilla-1.3-alpha-stubs.patch 4646
-MD5 48baf2f328e6478812c24e59037ff99c files/firefox-0.9-init.tar.bz2 3322
+MD5 ab4e95d80e7b7d2c058cbf92c9cf5d21 mozilla-firefox-1.0_pre-r1.ebuild 4861
 MD5 606e82226379fd5ae6cd1d0d1faff7ff files/10MozillaFirefox 31
+MD5 507a3d1338e85acc8828cec7c91d22df files/digest-mozilla-firefox-0.8 73
 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 1616bcd357c0cbe601722dd6279bd21f files/digest-mozilla-firefox-0.9-r1 73
-MD5 c6308c086c87ed2e1e4f3d136efdd770 files/firefox-0.9-nsFormHistory-crash-fix.patch 1755
+MD5 bd50631b47d20becbb5af21b605dfb5d files/firefox 4218
 MD5 3ad7410bd680964096c84eee3fa21abf files/firefox-0.8-gcc-3.4.patch 460
+MD5 23d1fbd03cc6dd346a4e4ce8f2d88ebf files/mozilla-1.3-alpha-stubs.patch 4646
 MD5 f0e9adeb0454377ce019e8969e644efb files/mozilla-firebird-amd64.patch 35052
+MD5 88371b8f812caf799a1ede2b1b07c079 files/mozilla-firefox-mousebuttons.patch 17099
+MD5 1616bcd357c0cbe601722dd6279bd21f files/digest-mozilla-firefox-0.9-r1 73
+MD5 48baf2f328e6478812c24e59037ff99c files/firefox-0.9-init.tar.bz2 3322
+MD5 91fb197b04b4e0d536270123dbd5ae04 files/digest-mozilla-firefox-0.9.1 75
+MD5 c6308c086c87ed2e1e4f3d136efdd770 files/firefox-0.9-nsFormHistory-crash-fix.patch 1755
+MD5 0c7804fd13815f9a0e7a1ef0eab6a871 files/digest-mozilla-firefox-0.9.3 75
 MD5 0c7804fd13815f9a0e7a1ef0eab6a871 files/digest-mozilla-firefox-0.9.3-r1 75
 MD5 8ddd969c216f76b511b39679a8014eb9 files/digest-mozilla-firefox-1.0_pre 75
-MD5 2cdd03eb2752bc01ba07ad837e926f39 files/icon/mozillafirefox.desktop 168
+MD5 8ddd969c216f76b511b39679a8014eb9 files/digest-mozilla-firefox-1.0_pre-r1 75
 MD5 bff260036c5dcca45da3218517fb33d8 files/icon/firefox-icon.png 3979
+MD5 2cdd03eb2752bc01ba07ad837e926f39 files/icon/mozillafirefox.desktop 168
diff --git a/net-www/mozilla-firefox/files/digest-mozilla-firefox-1.0_pre-r1 b/net-www/mozilla-firefox/files/digest-mozilla-firefox-1.0_pre-r1
new file mode 100644
index 000000000000..f21d59e42ebf
--- /dev/null
+++ b/net-www/mozilla-firefox/files/digest-mozilla-firefox-1.0_pre-r1
@@ -0,0 +1 @@
+MD5 b81ebc5f01448313add23ed44c47cf5e firefox-1.0PR-source.tar.bz2 32396291
diff --git a/net-www/mozilla-firefox/mozilla-firefox-1.0_pre-r1.ebuild b/net-www/mozilla-firefox/mozilla-firefox-1.0_pre-r1.ebuild
new file mode 100644
index 000000000000..05f8f786798c
--- /dev/null
+++ b/net-www/mozilla-firefox/mozilla-firefox-1.0_pre-r1.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firefox/mozilla-firefox-1.0_pre-r1.ebuild,v 1.1 2004/09/28 21:40:55 agriffis Exp $
+
+inherit makeedit flag-o-matic gcc nsplugins eutils mozilla mozilla-launcher
+
+S=${WORKDIR}/mozilla
+
+DESCRIPTION="The Mozilla Firefox Web Browser"
+HOMEPAGE="http://www.mozilla.org/projects/firefox/"
+MY_PV=${PV/_pre/PR}
+SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/0.10/firefox-${MY_PV}-source.tar.bz2"
+
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~ia64"
+SLOT="0"
+LICENSE="MPL-1.1 | NPL-1.1"
+IUSE="java gtk2 ipv6 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* )
+	java?  ( virtual/jre )
+	>=net-www/mozilla-launcher-1.20"
+
+DEPEND="${RDEPEND}
+	virtual/libc
+	dev-util/pkgconfig
+	java? ( >=dev-java/java-config-0.2.0 )"
+
+# Needed by src_compile() and src_install().
+# Would do in pkg_setup but that loses the export attribute, they
+# become pure shell variables.
+export MOZ_PHOENIX=1
+
+src_unpack() {
+	unpack firefox-${MY_PV}-source.tar.bz2 || die "unpack failed"
+	cd ${S} || die "cd failed"
+
+	# alpha stubs patch from lfs project.
+	# <taviso@gentoo.org> (26 Jun 2003)
+	use alpha && epatch ${FILESDIR}/mozilla-1.3-alpha-stubs.patch
+}
+
+src_compile() {
+	local myconf
+
+	####################################
+	#
+	# myconf, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	# mozilla_conf comes from mozilla.eclass
+	mozilla_conf
+
+	# 1.0PR requires --enable-single-profile to build
+	# http://bugzilla.mozilla.org/show_bug.cgi?id=258831
+	myconf="${myconf} \
+		--with-default-mozilla-five-home=/usr/lib/MozillaFirefox \
+		--enable-single-profile"
+
+	####################################
+	#
+	#  Configure and build Firefox
+	#
+	####################################
+
+	econf ${myconf} || die
+
+	# This removes extraneous CFLAGS from the Makefiles to reduce RAM
+	# requirements while compiling
+	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 /usr/libexec/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
+	insinto /usr/share/pixmaps
+	doins ${FILESDIR}/icon/firefox-icon.png
+	# Fix bug 54179: Install .desktop file into /usr/share/applications
+	# instead of /usr/share/gnome/apps/Internet (18 Jun 2004 agriffis)
+	insinto /usr/share/applications
+	doins ${FILESDIR}/icon/mozillafirefox.desktop
+
+	# Normally firefox-0.9 must be run as root once before it can be
+	# run as a normal user.  Drop in some initialized files to avoid
+	# this.
+	einfo "Extracting firefox-${PV} initialization files"
+	tar xjpf ${FILESDIR}/firefox-0.9-init.tar.bz2 -C ${D}/usr/lib/MozillaFirefox
+}
+
+pkg_preinst() {
+	export MOZILLA_FIVE_HOME=${ROOT}/usr/lib/MozillaFirefox
+
+	# 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 "${MOZILLA_FIVE_HOME}"
+}
+
+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 {} \; || :
+
+	# This should be called in the postinst and postrm of all the
+	# mozilla, mozilla-bin, firefox, firefox-bin, thunderbird and
+	# thunderbird-bin ebuilds.
+	update_mozilla_launcher_symlinks
+}
+
+pkg_postrm() {
+	update_mozilla_launcher_symlinks
+}