use mozconfig.eclass instead of mozilla.eclass for building

4 files changed, 201 insertions, 15 deletions

diff --git a/net-www/mozilla-firefox/ChangeLog b/net-www/mozilla-firefox/ChangeLog
index df0b484bacf4..a65976547b8a 100644
--- a/net-www/mozilla-firefox/ChangeLog
+++ b/net-www/mozilla-firefox/ChangeLog
@@ -1,6 +1,11 @@
 # 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.76 2004/11/09 21:09:41 brad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firefox/ChangeLog,v 1.77 2004/11/13 23:27:13 agriffis Exp $
+
+*mozilla-firefox-1.0-r1 (13 Nov 2004)
+
+  13 Nov 2004; Aron Griffis <agriffis@gentoo.org> +mozilla-firefox-1.0-r1.ebuild:
+  use mozconfig.eclass instead of mozilla.eclass for building
 
 *mozilla-firefox-1.0 (09 Nov 2004)
 
diff --git a/net-www/mozilla-firefox/Manifest b/net-www/mozilla-firefox/Manifest
index 771d8995801e..f937e0bdfe98 100644
--- a/net-www/mozilla-firefox/Manifest
+++ b/net-www/mozilla-firefox/Manifest
@@ -1,22 +1,24 @@
-MD5 faaa52e819364f34c1b174f0c47a6d86 mozilla-firefox-1.0_pre-r2.ebuild 5073
-MD5 c543ce361b2035afbb9db4010f9f776e mozilla-firefox-0.9.3.ebuild 8425
-MD5 809453352ef124b51ec8e4c96fd23e69 mozilla-firefox-1.0_rc1.ebuild 5147
-MD5 7fad0ec6cfc3e4bc0093af2cfc524708 ChangeLog 12220
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
+MD5 809453352ef124b51ec8e4c96fd23e69 mozilla-firefox-1.0_rc1.ebuild 5147
 MD5 6c89295fc5264c6798ee06f9e2f5c936 mozilla-firefox-1.0_rc2.ebuild 5066
 MD5 1886b4b2093f8116f5f8639402dc8df1 mozilla-firefox-1.0.ebuild 5060
-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 7fad0ec6cfc3e4bc0093af2cfc524708 ChangeLog 12220
+MD5 c543ce361b2035afbb9db4010f9f776e mozilla-firefox-0.9.3.ebuild 8425
+MD5 faaa52e819364f34c1b174f0c47a6d86 mozilla-firefox-1.0_pre-r2.ebuild 5073
+MD5 2c747ccec2acccf5697be6bcbed818b6 mozilla-firefox-1.0-r1.ebuild 5188
 MD5 606e82226379fd5ae6cd1d0d1faff7ff files/10MozillaFirefox 31
-MD5 bef773177860190ef5d6cce7ec70c613 files/digest-mozilla-firefox-1.0_pre-r2 77
-MD5 c6308c086c87ed2e1e4f3d136efdd770 files/firefox-0.9-nsFormHistory-crash-fix.patch 1755
-MD5 3ad7410bd680964096c84eee3fa21abf files/firefox-0.8-gcc-3.4.patch 460
-MD5 f0e9adeb0454377ce019e8969e644efb files/mozilla-firebird-amd64.patch 35052
 MD5 fa885b490a3c76594784843a1c06ee3a files/digest-mozilla-firefox-1.0_rc1 76
 MD5 e5cc0a5838a73f3fdaf38f4e3c368c26 files/digest-mozilla-firefox-1.0_rc2 76
 MD5 47c899122e30bc898b5a899ed0e10129 files/digest-mozilla-firefox-1.0 73
-MD5 2cdd03eb2752bc01ba07ad837e926f39 files/icon/mozillafirefox.desktop 168
+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 47c899122e30bc898b5a899ed0e10129 files/digest-mozilla-firefox-1.0-r1 73
+MD5 48baf2f328e6478812c24e59037ff99c files/firefox-0.9-init.tar.bz2 3322
+MD5 c6308c086c87ed2e1e4f3d136efdd770 files/firefox-0.9-nsFormHistory-crash-fix.patch 1755
+MD5 0c7804fd13815f9a0e7a1ef0eab6a871 files/digest-mozilla-firefox-0.9.3 75
+MD5 bef773177860190ef5d6cce7ec70c613 files/digest-mozilla-firefox-1.0_pre-r2 77
 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-r1 b/net-www/mozilla-firefox/files/digest-mozilla-firefox-1.0-r1
new file mode 100644
index 000000000000..e6d2584b2eac
--- /dev/null
+++ b/net-www/mozilla-firefox/files/digest-mozilla-firefox-1.0-r1
@@ -0,0 +1 @@
+MD5 49c16a71f4de014ea471be81e46b1da8 firefox-1.0-source.tar.bz2 32686249
diff --git a/net-www/mozilla-firefox/mozilla-firefox-1.0-r1.ebuild b/net-www/mozilla-firefox/mozilla-firefox-1.0-r1.ebuild
new file mode 100644
index 000000000000..a77dd409c44e
--- /dev/null
+++ b/net-www/mozilla-firefox/mozilla-firefox-1.0-r1.ebuild
@@ -0,0 +1,178 @@
+# 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-r1.ebuild,v 1.1 2004/11/13 23:27:14 agriffis Exp $
+
+inherit makeedit flag-o-matic gcc nsplugins eutils mozconfig mozilla-launcher
+
+S=${WORKDIR}/mozilla
+
+DESCRIPTION="The Mozilla Firefox Web Browser"
+HOMEPAGE="http://www.mozilla.org/projects/firefox/"
+MY_PV=${PV/_rc/rc}
+SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${MY_PV}/source/firefox-${MY_PV}-source.tar.bz2"
+
+LICENSE="MPL-1.1 NPL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+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() {
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	mozconfig_init
+
+	# Bug 60668: Galeon doesn't build without oji enabled, so enable it
+	# regardless of java setting.
+	mozconfig_annotate '' --enable-oji --enable-mathml
+
+	# Other ff-specific settings
+	mozconfig_use_enable mozdevelop jsd
+	mozconfig_use_enable mozdevelop xpctools
+	mozconfig_use_extension mozdevelop venkman
+	mozconfig_use_enable gnome gnomevfs
+	mozconfig_use_extension gnome gnomevfs
+	mozconfig_annotate '' --with-default-mozilla-five-home=/usr/lib/MozillaFirefox
+
+	# Report settings
+	mozconfig_explain
+
+	# hardened GCC uses -fstack-protector-all by default, and this breaks
+	# firefox.
+	has_hardened && append-flags -fno-stack-protector-all
+	replace-flags -fstack-protector-all -fstack-protector
+
+	####################################
+	#
+	#  Configure and build Firefox
+	#
+	####################################
+
+	# ./configure picks up the mozconfig stuff
+	econf
+
+	# 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
+}