revision bump, more security fixes

Package-Manager: portage-2.1.1_pre1

4 files changed, 310 insertions, 21 deletions

diff --git a/www-client/seamonkey/ChangeLog b/www-client/seamonkey/ChangeLog
index 6c65148af07d..7faff2166022 100644
--- a/www-client/seamonkey/ChangeLog
+++ b/www-client/seamonkey/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-client/seamonkey
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/ChangeLog,v 1.5 2006/05/21 18:03:46 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/ChangeLog,v 1.6 2006/06/18 19:16:21 anarchy Exp $
+
+*seamonkey-1.0.2 (18 Jun 2006)
+
+  18 Jun 2006; Jory A. Pratt <anarchy@gentoo.org> +seamonkey-1.0.2.ebuild:
+  revision bump, more security fixes
 
 *seamonkey-1.0.1 (21 May 2006)
 
diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index 568679e89ecc..14c4e03de33d 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -1,38 +1,38 @@
-AUX 10seamonkey 26 RMD160 156c113dfd25a106d5b72c4e6320bbf155d8775a SHA1 31aa4216dcb9140c625647c8654e2baefb3e9d1a SHA256 e3af11f2fefe5d7375b2ef136ab9f5de7d2f9a697b08f9a0744a49bac3fe2de7 size 26
+AUX 10seamonkey 26 RMD160 156c113dfd25a106d5b72c4e6320bbf155d8775a SHA1 31aa4216dcb9140c625647c8654e2baefb3e9d1a SHA256 e3af11f2fefe5d7375b2ef136ab9f5de7d2f9a697b08f9a0744a49bac3fe2de7
 MD5 31875e30fe2529920b56760ff1770317 files/10seamonkey 26
 RMD160 156c113dfd25a106d5b72c4e6320bbf155d8775a files/10seamonkey 26
 SHA256 e3af11f2fefe5d7375b2ef136ab9f5de7d2f9a697b08f9a0744a49bac3fe2de7 files/10seamonkey 26
-AUX google.src 706 RMD160 083b439d5aeb27cdf35345b043e7cf2cbf92d369 SHA1 462c353b64f8be172be7ca8778e1548ee339a934 SHA256 885e7a1a1ce41c3f199eca193277869d6634dd6fd5efae437d3e809d5b5ac80a size 706
+AUX google.src 706 RMD160 083b439d5aeb27cdf35345b043e7cf2cbf92d369 SHA1 462c353b64f8be172be7ca8778e1548ee339a934 SHA256 885e7a1a1ce41c3f199eca193277869d6634dd6fd5efae437d3e809d5b5ac80a
 MD5 d0e52abf109fe61c4195f0cbf002ae18 files/google.src 706
 RMD160 083b439d5aeb27cdf35345b043e7cf2cbf92d369 files/google.src 706
 SHA256 885e7a1a1ce41c3f199eca193277869d6634dd6fd5efae437d3e809d5b5ac80a files/google.src 706
-AUX icon/seamonkey.desktop 149 RMD160 d67c080ce6c4a6841f30c559e8a09b97c6b5e654 SHA1 35c868b48920a8a2b9add0a85fc2e210531a74da SHA256 9ee71b8b06738b6061ff400f6718f3bdc0c27240297de7839e79dd1c822af379 size 149
+AUX icon/seamonkey.desktop 149 RMD160 d67c080ce6c4a6841f30c559e8a09b97c6b5e654 SHA1 35c868b48920a8a2b9add0a85fc2e210531a74da SHA256 9ee71b8b06738b6061ff400f6718f3bdc0c27240297de7839e79dd1c822af379
 MD5 85a9dda9cebd7457fe7f5c0ca3775091 files/icon/seamonkey.desktop 149
 RMD160 d67c080ce6c4a6841f30c559e8a09b97c6b5e654 files/icon/seamonkey.desktop 149
 SHA256 9ee71b8b06738b6061ff400f6718f3bdc0c27240297de7839e79dd1c822af379 files/icon/seamonkey.desktop 149
-AUX icon/seamonkey.png 4172 RMD160 d296c4d4e0920e4476f4c6c607946434202ad521 SHA1 f76213195e2dc002ff2e411ed0247d2624ce7b09 SHA256 7ffc1911a62b526702f3c991365dd8f18b6427c7e173456a101db4fb4c43ae59 size 4172
+AUX icon/seamonkey.png 4172 RMD160 d296c4d4e0920e4476f4c6c607946434202ad521 SHA1 f76213195e2dc002ff2e411ed0247d2624ce7b09 SHA256 7ffc1911a62b526702f3c991365dd8f18b6427c7e173456a101db4fb4c43ae59
 MD5 433ea976f1e3017e49a49d65a74cae70 files/icon/seamonkey.png 4172
 RMD160 d296c4d4e0920e4476f4c6c607946434202ad521 files/icon/seamonkey.png 4172
 SHA256 7ffc1911a62b526702f3c991365dd8f18b6427c7e173456a101db4fb4c43ae59 files/icon/seamonkey.png 4172
-AUX seamonkey-rebuild-databases.pl 2344 RMD160 27ae162b4028d80faeb802e575b41590f6ab314e SHA1 678cec60179997d1957a0c8ecb50169985f0b4e2 SHA256 fde49923b949fc300040490e404a9f65b5777e8e7440fd8f0907d17b041fb2af size 2344
+AUX seamonkey-rebuild-databases.pl 2344 RMD160 27ae162b4028d80faeb802e575b41590f6ab314e SHA1 678cec60179997d1957a0c8ecb50169985f0b4e2 SHA256 fde49923b949fc300040490e404a9f65b5777e8e7440fd8f0907d17b041fb2af
 MD5 199e59a053b66e9c4d56d9ca1c41d09e files/seamonkey-rebuild-databases.pl 2344
 RMD160 27ae162b4028d80faeb802e575b41590f6ab314e files/seamonkey-rebuild-databases.pl 2344
 SHA256 fde49923b949fc300040490e404a9f65b5777e8e7440fd8f0907d17b041fb2af files/seamonkey-rebuild-databases.pl 2344
-DIST enigmail-0.94.0.tar.gz 508113 RMD160 0fa8f0384b74623c1b84a048bdbf04bfca8c1824 SHA256 db2b5fc014fe5efef95fc46804ac609616557b1696d5f355d2d7641e567904f3 size 508113
-DIST seamonkey-1.0.1-patches-0.2.tar.bz2 28161 RMD160 33da21b10def65c545a62cf0d9ccd2741f809d56 SHA256 d9eacb0630b37601fe2fb32756d8abbcc547bc3b1da5c639fdda9769743ade72 size 28161
-DIST seamonkey-1.0.1.source.tar.bz2 35644457 RMD160 40e2fa9dbc4d4829ea61abfd3bf81da31d1af180 SHA256 559bf5bcac21b98a5f3a3a09496413b6f730146d59620d55e1cbd26a3421193b size 35644457
-EBUILD seamonkey-1.0.1.ebuild 8578 RMD160 5e5d847e51938503fee20279bece2b68b1397ed3 SHA1 89a62048f351b71ef3192ea45bc32a11ebe6a4a5 SHA256 283ee01743c6cbf1bdd5d44b64492fb26ec41ea8e81e2b8cc9802bef31a46e89 size 8578
-MD5 7324264d673e8feea7086befe32d4e06 seamonkey-1.0.1.ebuild 8578
-RMD160 5e5d847e51938503fee20279bece2b68b1397ed3 seamonkey-1.0.1.ebuild 8578
-SHA256 283ee01743c6cbf1bdd5d44b64492fb26ec41ea8e81e2b8cc9802bef31a46e89 seamonkey-1.0.1.ebuild 8578
-MISC ChangeLog 1163 RMD160 09a68a474d89defcc39dd193f6c51ce8a59ef6b1 SHA1 d782cf9f49561b4057995629c79f9a4d74b34a9e SHA256 708bb46e0692eba038ba4780267b95c8dfbacd424a340149d5cedb848478f31f size 1163
-MD5 436e80a94b9031c70549cd9239681ee6 ChangeLog 1163
-RMD160 09a68a474d89defcc39dd193f6c51ce8a59ef6b1 ChangeLog 1163
-SHA256 708bb46e0692eba038ba4780267b95c8dfbacd424a340149d5cedb848478f31f ChangeLog 1163
-MISC metadata.xml 160 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 SHA1 5015c07af2083f20f9552d7fb11afb5ea69af345 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b size 160
+DIST enigmail-0.94.0.tar.gz 508113 RMD160 0fa8f0384b74623c1b84a048bdbf04bfca8c1824 SHA1 486c83b1dc2dc4965c95052b6fe235acbc9c3613 SHA256 db2b5fc014fe5efef95fc46804ac609616557b1696d5f355d2d7641e567904f3
+DIST seamonkey-1.0.2-patches-0.2.tar.bz2 24728 RMD160 4502a34180051c241ccff1ab51092d042850bf19 SHA1 7fc425aa02ef63a1e8c0f19ca388579d9e5fb115 SHA256 65019eaa4eab75964d1f1991ffcc5c061775738e92f09c7f1a2328589163f5ef
+DIST seamonkey-1.0.2.source.tar.bz2 35473635 RMD160 b6ff9bcb1289ae9190a1934dcc3f6eea3f6d716c SHA1 966e9a57269cd54f40312e5fdaa42e9f2c3fbcea SHA256 2ec3d89307db207cf06e12fe90f3da2e97290ff01c1c944f9c223339da066ed8
+EBUILD seamonkey-1.0.2.ebuild 8578 RMD160 5e5d847e51938503fee20279bece2b68b1397ed3 SHA1 89a62048f351b71ef3192ea45bc32a11ebe6a4a5 SHA256 283ee01743c6cbf1bdd5d44b64492fb26ec41ea8e81e2b8cc9802bef31a46e89
+MD5 7324264d673e8feea7086befe32d4e06 seamonkey-1.0.2.ebuild 8578
+RMD160 5e5d847e51938503fee20279bece2b68b1397ed3 seamonkey-1.0.2.ebuild 8578
+SHA256 283ee01743c6cbf1bdd5d44b64492fb26ec41ea8e81e2b8cc9802bef31a46e89 seamonkey-1.0.2.ebuild 8578
+MISC ChangeLog 1308 RMD160 b99b400ca595aea72c09d7ee5cc582b739854b14 SHA1 9dc1b19904221bfb6821b3e3b4183c0c16a115ca SHA256 374d378d63ed84fe522a24044adcb3e4bd3d8818acc3362c23ea7986d25324c3
+MD5 f85c64b49b44e92b2f8ac6c4926577ab ChangeLog 1308
+RMD160 b99b400ca595aea72c09d7ee5cc582b739854b14 ChangeLog 1308
+SHA256 374d378d63ed84fe522a24044adcb3e4bd3d8818acc3362c23ea7986d25324c3 ChangeLog 1308
+MISC metadata.xml 160 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 SHA1 5015c07af2083f20f9552d7fb11afb5ea69af345 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 metadata.xml 160
 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b metadata.xml 160
-MD5 158230da77af18146298466c632ee9c2 files/digest-seamonkey-1.0.1 807
-RMD160 b941c87f7bb4b75bf49b53a860a970da74c59b68 files/digest-seamonkey-1.0.1 807
-SHA256 5f5a5da2c7b7f9f07ec90b40a111a6cccbaa9245dba0e3da810876671120d957 files/digest-seamonkey-1.0.1 807
+MD5 8237dadbf2bebc8e0c9ff10c8832242c files/digest-seamonkey-1.0.2 807
+RMD160 ffe7862be638a42fa7cb004d335e39f8ac3e75ce files/digest-seamonkey-1.0.2 807
+SHA256 b1a47cbb4df9164bbff30cc4419c3addd9e7b0b1016bd03dd0f14050439197cd files/digest-seamonkey-1.0.2 807
diff --git a/www-client/seamonkey/files/digest-seamonkey-1.0.2 b/www-client/seamonkey/files/digest-seamonkey-1.0.2
new file mode 100644
index 000000000000..f42123143563
--- /dev/null
+++ b/www-client/seamonkey/files/digest-seamonkey-1.0.2
@@ -0,0 +1,9 @@
+MD5 d326c302c1d2d68217fffcaa01ca7632 enigmail-0.94.0.tar.gz 508113
+RMD160 0fa8f0384b74623c1b84a048bdbf04bfca8c1824 enigmail-0.94.0.tar.gz 508113
+SHA256 db2b5fc014fe5efef95fc46804ac609616557b1696d5f355d2d7641e567904f3 enigmail-0.94.0.tar.gz 508113
+MD5 89f91388d1c89c6fbb5752d62f78e15a seamonkey-1.0.2-patches-0.2.tar.bz2 24728
+RMD160 4502a34180051c241ccff1ab51092d042850bf19 seamonkey-1.0.2-patches-0.2.tar.bz2 24728
+SHA256 65019eaa4eab75964d1f1991ffcc5c061775738e92f09c7f1a2328589163f5ef seamonkey-1.0.2-patches-0.2.tar.bz2 24728
+MD5 967e0441183492b0ade4ab2a394deb71 seamonkey-1.0.2.source.tar.bz2 35473635
+RMD160 b6ff9bcb1289ae9190a1934dcc3f6eea3f6d716c seamonkey-1.0.2.source.tar.bz2 35473635
+SHA256 2ec3d89307db207cf06e12fe90f3da2e97290ff01c1c944f9c223339da066ed8 seamonkey-1.0.2.source.tar.bz2 35473635
diff --git a/www-client/seamonkey/seamonkey-1.0.2.ebuild b/www-client/seamonkey/seamonkey-1.0.2.ebuild
new file mode 100644
index 000000000000..dc0b5b281465
--- /dev/null
+++ b/www-client/seamonkey/seamonkey-1.0.2.ebuild
@@ -0,0 +1,275 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-1.0.2.ebuild,v 1.1 2006/06/18 19:16:21 anarchy Exp $
+
+unset ALLOWED_FLAGS  # Stupid extra-functions.sh ... bug 49179
+inherit flag-o-matic toolchain-funcs eutils mozcoreconf mozconfig-2 mozilla-launcher makeedit multilib autotools
+
+PVER="0.2"
+EMVER="0.94.0"
+
+DESCRIPTION="Mozilla Application Suite - web browser, email, HTML editor, IRC"
+HOMEPAGE="http://www.mozilla.org"
+SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/${PN}/releases/${PV}/${P}.source.tar.bz2
+	mirror://gentoo/${P}-patches-${PVER}.tar.bz2
+	http://dev.gentoo.org/~anarchy/dist/${P}-patches-${PVER}.tar.bz2
+	crypt? ( !moznomail? ( http://www.mozilla-enigmail.org/downloads/src/enigmail-${EMVER}.tar.gz ) )"
+
+KEYWORDS="~amd64 ~ppc ~x86"
+SLOT="0"
+LICENSE="MPL-1.1 NPL-1.1"
+IUSE="java ldap  mozcalendar mozdevelop moznocompose moznoirc moznomail moznoroaming postgres crypt"
+
+RDEPEND="java? ( virtual/jre )
+	>=www-client/mozilla-launcher-1.47
+	>=dev-libs/nss-3.10
+	>=dev-libs/nspr-4.6.1
+	crypt? ( !moznomail? ( >=app-crypt/gnupg-1.4 ) )"
+
+DEPEND="${RDEPEND}
+	~sys-devel/autoconf-2.13
+	java? ( >=dev-java/java-config-0.2.0 )
+	dev-lang/perl
+	postgres? ( >=dev-db/postgresql-7.2.0 )
+	!www-client/mozilla"
+
+S=${WORKDIR}/mozilla
+
+src_unpack() {
+	unpack ${P}.source.tar.bz2 ${P}-patches-${PVER}.tar.bz2
+
+	cd ${S} || die "cd failed"
+	EPATCH_FORCE="yes" epatch ${WORKDIR}/patch
+
+	# Unpack the enigmail plugin
+	if use crypt && ! use moznomail; then
+		cd ${S}/mailnews/extensions || die
+		unpack enigmail-${EMVER}.tar.gz
+		cd ${S}/mailnews/extensions/enigmail || die "cd failed"
+		makemake2
+	fi
+
+	# Fix scripts that call for /usr/local/bin/perl #51916
+	ebegin "Patching smime to call perl from /usr/bin"
+	sed -i -e '1s,usr/local/bin,usr/bin,' ${S}/security/nss/cmd/smimetools/smime
+	eend $? || die "sed failed"
+
+	# Fix a compilation issue using the 32-bit userland with 64-bit kernel on
+	# PowerPC, because with that configuration, mozilla detects a ppc64 system.
+	# -- hansmi, 2005-10-02
+	if use ppc && [[ "${PROFILE_ARCH}" == ppc64 ]]; then
+		sed -i -e "s#OS_TEST=\`uname -m\`\$#OS_TEST=${ARCH}#" \
+			${S}/configure.in
+		sed -i -e "s#OS_TEST :=.*uname -m.*\$#OS_TEST:=${ARCH}#" \
+			${S}/security/coreconf/arch.mk
+	fi
+
+	cd ${S}
+	# Needed by some of the patches
+	WANT_AUTOCONF=2.1 eautoreconf || die "Failed running eautoreconf"
+}
+
+src_compile() {
+	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
+
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+	mozconfig_init
+	mozconfig_config
+
+	mozconfig_annotate 'gentoo' --enable-canvas
+	mozconfig_annotate 'gentoo' --with-system-nspr
+	mozconfig_annotate 'gentoo' --with-system-nss
+
+	# Bug 60668: Galeon doesn't build without oji enabled, so enable it
+	# regardless of java setting.
+	mozconfig_annotate 'galeon' --enable-oji --enable-mathml
+
+	# Other moz-specific settings
+	mozconfig_use_enable mozdevelop jsd
+	mozconfig_use_enable mozdevelop xpctools
+	mozconfig_use_extension mozdevelop venkman
+
+	if use moznoirc; then
+		mozconfig_annotate '+moznocompose +moznoirc' --enable-extensions=-irc
+	fi
+
+	if use moznoroaming ; then
+		mozconfig_annotate '+moznoroaming' --enable-extensions=-sroaming
+	fi
+
+	if use postgres ; then
+		mozconfig_annotate '+postgres' --enable-extensions=sql
+		export MOZ_ENABLE_PGSQL=1
+		export MOZ_PGSQL_INCLUDES=/usr/include
+		export MOZ_PGSQL_LIBS=/usr/$(get_libdir)
+	fi
+
+	mozconfig_use_enable mozcalendar calendar
+	mozconfig_use_enable ldap
+	mozconfig_use_enable ldap ldap-experimental
+	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
+	mozconfig_annotate '' --with-user-appdir=.mozilla
+
+	if use moznomail && ! use mozcalendar; then
+		mozconfig_annotate "+moznomail -mozcalendar" --disable-mailnews
+	fi
+
+	if use moznocompose && ! use mozcalendar; then
+		if use moznoirc && use moznomail; then
+			mozconfig_annotate "+moznocompose" --disable-composer
+		fi
+	fi
+
+	# Finalize and report settings
+	mozconfig_final
+
+	# hardened GCC uses -fstack-protector-all by default, which breaks us
+	gcc-specs-ssp && append-flags -fno-stack-protector-all
+	replace-flags -fstack-protector-all -fstack-protector
+
+	append-flags -freorder-blocks -fno-reorder-functions
+
+	####################################
+	#
+	#  Configure and build
+	#
+	####################################
+
+	CPPFLAGS="${CPPFLAGS} -DARON_WAS_HERE" \
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
+	econf || die
+
+	# It would be great if we could pass these in via CPPFLAGS or CFLAGS prior
+	# to econf, but the quotes cause configure to fail.
+	sed -i -e \
+		's|-DARON_WAS_HERE|-DGENTOO_NSPLUGINS_DIR=\\\"/usr/'"$(get_libdir)"'/nsplugins\\\" -DGENTOO_NSBROWSER_PLUGINS_DIR=\\\"/usr/'"$(get_libdir)"'/nsbrowser/plugins\\\"|' \
+		${S}/config/autoconf.mk \
+		${S}/nsprpub/config/autoconf.mk \
+		${S}/xpfe/global/buildconfig.html
+
+	# This removes extraneous CFLAGS from the Makefiles to reduce RAM
+	# requirements while compiling
+	edit_makefiles
+
+	emake || die
+
+	####################################
+	#
+	#  Build Enigmail extension
+	#
+	####################################
+
+	if use crypt && ! use moznomail; then
+		emake -C  ${S}/mailnews/extensions/enigmail || die "make enigmail failed"
+	fi
+}
+
+src_install() {
+	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
+
+	# Most of the installation happens here
+	dodir ${MOZILLA_FIVE_HOME}
+	cp -RL ${S}/dist/bin/* ${D}${MOZILLA_FIVE_HOME}
+
+	# Create directory structure to support portage-installed extensions.
+	# See update_chrome() in mozilla-launcher
+	keepdir ${MOZILLA_FIVE_HOME}/chrome.d
+	keepdir ${MOZILLA_FIVE_HOME}/extensions.d
+	cp ${D}${MOZILLA_FIVE_HOME}/chrome/installed-chrome.txt \
+		${D}${MOZILLA_FIVE_HOME}/chrome.d/0_base-chrome.txt
+
+	# Create /usr/bin/mozilla
+	install_mozilla_launcher_stub seamonkey ${MOZILLA_FIVE_HOME}
+
+	# Install icon and .desktop for menu entry
+	insinto /usr/share/pixmaps
+	doins ${FILESDIR}/icon/${PN}.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/${PN}.desktop
+
+	# Fix icons to look the same everywhere
+	insinto ${MOZILLA_FIVE_HOME}/icons
+	doins ${S}/widget/src/gtk/mozicon16.xpm
+	doins ${S}/widget/src/gtk/mozicon50.xpm
+
+	####################################
+	#
+	# Install files necessary for applications to build against mozilla
+	#
+	####################################
+
+	einfo "Installing includes and idl files..."
+	dodir ${MOZILLA_FIVE_HOME}/{include,idl} /usr/include
+	cd ${S}/dist
+	cp -LfR include/* ${D}${MOZILLA_FIVE_HOME}/include
+	cp -LfR idl/* ${D}${MOZILLA_FIVE_HOME}/idl
+
+	# Fix mozilla-config and install it
+	exeinto ${MOZILLA_FIVE_HOME}
+	doexe ${S}/build/unix/${PN}-config
+
+	# Fix pkgconfig files and install them
+	insinto /usr/$(get_libdir)/pkgconfig
+	for x in ${S}/build/unix/*.pc; do
+		doins ${x}
+	done
+
+	# Install env.d snippet, which isn't necessary for running mozilla, but
+	# might be necessary for programs linked against firefox
+	insinto /etc/env.d
+	doins ${FILESDIR}/10${PN}
+	dosed "s|/usr/lib|/usr/$(get_libdir)|" /etc/env.d/10${PN}
+
+	# Install rebuild script since mozilla-bin doesn't support registration yet
+	exeinto ${MOZILLA_FIVE_HOME}
+	doexe ${FILESDIR}/${PN}-rebuild-databases.pl
+	dosed -e 's|/lib/|/'"$(get_libdir)"'/|g' \
+		${MOZILLA_FIVE_HOME}/${PN}-rebuild-databases.pl
+
+	# Install docs
+	dodoc ${S}/{LEGAL,LICENSE}
+
+	# Update Google search plugin to use UTF8 charset ...
+	insinto ${MOZILLA_FIVE_HOME}/searchplugins
+	doins ${FILESDIR}/google.src
+}
+
+pkg_preinst() {
+	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
+
+	# Remove entire installed instance to solve various problems,
+	# for example see bug 27719
+	rm -rf ${ROOT}${MOZILLA_FIVE_HOME}
+}
+
+pkg_postinst() {
+	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
+
+	# Update the component registry
+	MOZILLA_LIBDIR=${ROOT}${MOZILLA_FIVE_HOME} MOZILLA_LAUNCHER=${PN} \
+		/usr/libexec/mozilla-launcher -register
+
+	# 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() {
+	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
+
+	# Update the component registry
+	if [[ -x ${MOZILLA_FIVE_HOME}/${PN}-bin ]]; then
+		MOZILLA_LIBDIR=${ROOT}${MOZILLA_FIVE_HOME} MOZILLA_LAUNCHER=${PN} \
+			/usr/libexec/mozilla-launcher -register
+	fi
+
+	update_mozilla_launcher_symlinks
+}