ABI fix for third party extensions

(Portage version: 2.1_pre7-r3)

8 files changed, 42 insertions, 360 deletions

diff --git a/mail-client/mozilla-thunderbird/ChangeLog b/mail-client/mozilla-thunderbird/ChangeLog
index 57a4edadb220..aab6755241c2 100644
--- a/mail-client/mozilla-thunderbird/ChangeLog
+++ b/mail-client/mozilla-thunderbird/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for mail-client/mozilla-thunderbird
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/ChangeLog,v 1.103 2006/03/23 21:21:51 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/ChangeLog,v 1.104 2006/03/31 19:13:05 anarchy Exp $
+
+*mozilla-thunderbird-1.5-r3 (31 Mar 2006)
+
+  31 Mar 2006; Jory A. Pratt <anarchy@gentoo.org>
+  -mozilla-thunderbird-1.5.ebuild, -mozilla-thunderbird-1.5-r1.ebuild,
+  -mozilla-thunderbird-1.5-r2.ebuild, +mozilla-thunderbird-1.5-r3.ebuild:
+  ABI fix for third party extensions
 
   23 Mar 2006; Aron Griffis <agriffis@gentoo.org>
   mozilla-thunderbird-1.5-r2.ebuild:
diff --git a/mail-client/mozilla-thunderbird/Manifest b/mail-client/mozilla-thunderbird/Manifest
index ec5de48099ba..da7cb5af4929 100644
--- a/mail-client/mozilla-thunderbird/Manifest
+++ b/mail-client/mozilla-thunderbird/Manifest
@@ -22,6 +22,9 @@ SHA256 e431304d186fbdbd9ccea6562b0dd20656b619e82b6579745059e335bbb3751d files/di
 MD5 f0f916254c9b6da339d546adc7aa3a9d files/digest-mozilla-thunderbird-1.5-r2 584
 RMD160 cb4e254822c407f35ed98f8842bcf167515736e3 files/digest-mozilla-thunderbird-1.5-r2 584
 SHA256 bee30da8770ef38141b2338e69ab762cd8b1749a219156e4c794a062d8fedba2 files/digest-mozilla-thunderbird-1.5-r2 584
+MD5 5748e9c3b3cf0e8667d9177fba436388 files/digest-mozilla-thunderbird-1.5-r3 584
+RMD160 525130f7c3a06c3b0fef26cc581f9f654c3b80da files/digest-mozilla-thunderbird-1.5-r3 584
+SHA256 9f414b8ba38ca26a507f74a62c8991410cdf976e0074cfa38c4c2874203d8728 files/digest-mozilla-thunderbird-1.5-r3 584
 MD5 b92734c051b7734d459e23f7c4a01b63 files/firefox-1.1-uriloader-1.patch 13902
 RMD160 cb816967a91e0a60a238ad11736eec5ac5da3754 files/firefox-1.1-uriloader-1.patch 13902
 SHA256 ac9ef7ec790856d35609a051596579b0cc5a327542614ab420505a2669b388bb files/firefox-1.1-uriloader-1.patch 13902
@@ -88,6 +91,9 @@ SHA256 c422bf730c084c2fd2d91369122ea9c26503d9d6bd587ca1c37d2c33c7e2f63a mozilla-
 MD5 9475f31723c262f32ccf93510505fd22 mozilla-thunderbird-1.5-r2.ebuild 4886
 RMD160 f4bd37afa220af8d0858ffb1ef2ee18658849dfa mozilla-thunderbird-1.5-r2.ebuild 4886
 SHA256 c03d6ba2db8db02df900b0c21bea410d6f0c8618906189e929a43ec64435ed64 mozilla-thunderbird-1.5-r2.ebuild 4886
+MD5 e8d3c106cad03856d818f313f27a5db1 mozilla-thunderbird-1.5-r3.ebuild 5769
+RMD160 275308477dcad55edf0caa01b9bac8fce3153511 mozilla-thunderbird-1.5-r3.ebuild 5769
+SHA256 08af0f9a92f6a10c7834c2151f6248466e9998d082607b988e974545023b840e mozilla-thunderbird-1.5-r3.ebuild 5769
 MD5 51c5ba513cf3d2726c09d6981e922299 mozilla-thunderbird-1.5.ebuild 5760
 RMD160 f532d9a7838e3310b85ac19720b5979adaf181ab mozilla-thunderbird-1.5.ebuild 5760
 SHA256 65edb632fc9feb8c6fe6668564ccf1f18422f2e948da0f5c585d6c24cd8a59e9 mozilla-thunderbird-1.5.ebuild 5760
diff --git a/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.5 b/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.5
deleted file mode 100644
index bc868fbd00de..000000000000
--- a/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1d6205bf7449fcdcae08cc1db524760d mozilla-firefox-1.0-4ft2.patch.bz2 5601
-MD5 7960994910bda4c14a52bc119f9ceefc mozilla-jslibmath-alpha.patch 625
-MD5 781c1cd1a01583d9b666d8c2fe4288e6 thunderbird-1.5-source.tar.bz2 35028308
diff --git a/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.5-r1 b/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.5-r1
deleted file mode 100644
index 3818063a2fd1..000000000000
--- a/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.5-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 27d0d601a47a63a04c7391f6e50acdb0 mozilla-thunderbird-1.5-patches-1.2.tar.bz2 17165
-RMD160 9cb5c7f8d9da655a607f6abc52c3ab91e27c2423 mozilla-thunderbird-1.5-patches-1.2.tar.bz2 17165
-SHA256 0d55d239eb0edd95c6cd16b7a0d89e7cea374abf99292c01935e3396286385d4 mozilla-thunderbird-1.5-patches-1.2.tar.bz2 17165
-MD5 781c1cd1a01583d9b666d8c2fe4288e6 thunderbird-1.5-source.tar.bz2 35028308
-RMD160 5c3a8c42c1239144c8498a81a791a534345cda3c thunderbird-1.5-source.tar.bz2 35028308
-SHA256 f075c0a3f9cf714639eb26e9f370d50efbc72d4e02bd667404f7e1128543ee57 thunderbird-1.5-source.tar.bz2 35028308
diff --git a/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.5-r2 b/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.5-r3
index 18a7cbb0a42b..6aa5f5cbff1a 100644
--- a/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.5-r2
+++ b/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.5-r3
@@ -1,6 +1,6 @@
 MD5 443f58aa6f9d56b2d044a27c5cc782cf mozilla-thunderbird-1.5-patches-1.3.tar.bz2 19535
 RMD160 fe7fab0318edb79d02d2d62aef983dedd8e9c905 mozilla-thunderbird-1.5-patches-1.3.tar.bz2 19535
 SHA256 0dc0e056337e85ddae8b103cb7a759c9147cdd25887263312f22f78aeb280127 mozilla-thunderbird-1.5-patches-1.3.tar.bz2 19535
+MD5 781c1cd1a01583d9b666d8c2fe4288e6 thunderbird-1.5-source.tar.bz2 35028308
 RMD160 5c3a8c42c1239144c8498a81a791a534345cda3c thunderbird-1.5-source.tar.bz2 35028308
 SHA256 f075c0a3f9cf714639eb26e9f370d50efbc72d4e02bd667404f7e1128543ee57 thunderbird-1.5-source.tar.bz2 35028308
-MD5 781c1cd1a01583d9b666d8c2fe4288e6 thunderbird-1.5-source.tar.bz2 35028308
diff --git a/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.5-r1.ebuild b/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.5-r1.ebuild
deleted file mode 100644
index 8a6a3fb6bfa7..000000000000
--- a/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.5-r1.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.5-r1.ebuild,v 1.4 2006/02/06 15:17:47 anarchy Exp $
-
-unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
-inherit flag-o-matic toolchain-funcs eutils mozconfig-2 mozilla-launcher makeedit multilib autotools
-
-PVER="1.2"
-
-DESCRIPTION="Thunderbird Mail Client"
-HOMEPAGE="http://www.mozilla.org/projects/thunderbird/"
-SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${PV}/source/thunderbird-${PV}-source.tar.bz2
-	mirror://gentoo/${P}-patches-${PVER}.tar.bz2
-	http://dev.gentoo.org/~anarchy/dist/${P}-patches-${PVER}.tar.bz2"
-
-KEYWORDS="~amd64 ~ppc ~x86"
-SLOT="0"
-LICENSE="MPL-1.1 NPL-1.1"
-IUSE="ldap crypt"
-
-RDEPEND=">=www-client/mozilla-launcher-1.39
-	>=dev-libs/nss-3.10
-	>=dev-libs/nspr-4.6.1"
-
-PDEPEND="crypt? ( x11-plugins/enigmail ) "
-
-S=${WORKDIR}/mozilla
-
-# Needed by src_compile() and src_install().
-# Would do in pkg_setup but that loses the export attribute, they
-# become pure shell variables.
-export BUILD_OFFICIAL=1
-export MOZILLA_OFFICIAL=1
-export MOZ_CO_PROJECT=mail
-
-src_unpack() {
-	declare x
-
-	for x in ${A}; do
-		[[ $x == *.tar.* ]] || continue
-		unpack $x || die "unpack failed"
-	done
-	cd ${S} || die "cd failed"
-
-	# Apply our patches
-	EPATCH_FORCE="yes" epatch ${WORKDIR}/patch
-
-	# Fix a compilation issue using the 32-bit userland with 64-bit kernel on
-	# PowerPC, because with that configuration, it detects a ppc64 system.
-	# -- hansmi, 2005-11-13
-	if use ppc && [[ "${PROFILE_ARCH}" == ppc64 ]]; then
-		sed -i -e "s#OS_TEST=\`uname -m\`\$#OS_TEST=${ARCH}#" \
-			${S}/configure
-		sed -i -e "s#OS_TEST :=.*uname -m.*\$#OS_TEST:=${ARCH}#" \
-			${S}/security/coreconf/arch.mk
-	fi
-
-	WANT_AUTOCONF="2.13" \
-		WANT_AUTOMAKE="2.13" \
-		eautoreconf || die "failed running autoreconf"
-}
-
-src_compile() {
-	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
-
-	####################################
-	#
-	# mozconfig, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	mozconfig_init
-	mozconfig_config
-
-	# tb-specific settings
-	mozconfig_use_enable ldap
-	mozconfig_use_enable ldap ldap-experimental
-	mozconfig_annotate '' --enable-extensions=default
-	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
-	mozconfig_annotate '' --with-user-appdir=.thunderbird
-	mozconfig_annotate '' --with-system-nspr
-	mozconfig_annotate '' --with-system-nss
-
-	# Finalize and report settings
-	mozconfig_final
-
-	# hardened GCC uses -fstack-protector-all by default, which breaks us
-	has_hardened && append-flags -fno-stack-protector-all
-	replace-flags -fstack-protector-all -fstack-protector
-
-	####################################
-	#
-	#  Configure and build
-	#
-	####################################
-	append-flags -freorder-blocks -fno-reorder-functions
-
-	CPPFLAGS="${CPPFLAGS}" \
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-	econf || die
-
-	# This removes extraneous CFLAGS from the Makefiles to reduce RAM
-	# requirements while compiling
-	edit_makefiles
-
-	emake || die
-}
-
-pkg_preinst() {
-	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
-
-	echo ""
-	einfo "We are removing old install before we continue. This is to help"
-	einfo "eliminate any problems during the install, sorry for those of you"
-	einfo "who disagree with this but this will ensure a sane build for everyone"
-	einfo "Comments and suggestion should be addressed to mozilla@gentoo.org"
-	rm -rf ${ROOT}${MOZILLA_FIVE_HOME}
-}
-
-src_install() {
-	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
-
-	# Most of the installation happens here
-	dodir ${MOZILLA_FIVE_HOME}
-	cp -RL --no-preserve=links ${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/thunderbird
-	install_mozilla_launcher_stub thunderbird ${MOZILLA_FIVE_HOME}
-
-	# Install icon and .desktop for menu entry
-	insinto /usr/share/pixmaps
-	doins ${FILESDIR}/icon/thunderbird-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/mozillathunderbird.desktop
-}
-
-pkg_postinst() {
-	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
-
-	# 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_mozilla_launcher_symlinks
-}
diff --git a/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.5-r2.ebuild b/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.5-r3.ebuild
index 7e08afbeacd5..71257ccef52c 100644
--- a/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.5-r2.ebuild
+++ b/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.5-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.5-r2.ebuild,v 1.2 2006/03/23 21:21:51 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.5-r3.ebuild,v 1.1 2006/03/31 19:13:05 anarchy Exp $
 
 unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
 inherit flag-o-matic toolchain-funcs eutils mozconfig-2 mozilla-launcher makeedit multilib autotools
@@ -95,6 +95,16 @@ src_compile() {
 	####################################
 	append-flags -freorder-blocks -fno-reorder-functions
 
+	# Export CPU_ARCH_TEST  as it is not exported by default.
+	case $(tc-arch) in
+	amd64) [[ ${ABI} == "x86" ]] && CPU_ARCH_TEST="x86" || CPU_ARCH_TEST="x86_64" ;;
+	ia64) CPU_ARCH_TEST="ia64" ;;
+	ppc) CPU_ARCH_TEST="ppc" ;;
+	*) CPU_ARCH_TEST=$(tc-arch) ;;
+	esac
+
+	export CPU_ARCH_TEST
+
 	CPPFLAGS="${CPPFLAGS}" \
 	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
 	econf || die
@@ -142,6 +152,22 @@ src_install() {
 	# instead of /usr/share/gnome/apps/Internet (18 Jun 2004 agriffis)
 	insinto /usr/share/applications
 	doins ${FILESDIR}/icon/mozillathunderbird.desktop
+
+	####################################
+	#
+	# Install files necessary for applications to build against firefox
+	#
+	####################################
+
+	ewarn "Installing includes and idl files..."
+	dodir ${MOZILLA_FIVE_HOME}/idl ${MOZILLA_FIVE_HOME}/include
+	cd ${S}/dist
+	cp -LfR include/* ${D}${MOZILLA_FIVE_HOME}/include || die "failed to copy"
+	cp -LfR idl/* ${D}${MOZILLA_FIVE_HOME}/idl || die "failed to copy"
+
+	# Dirty hack to get some applications using this header running
+	dosym ${MOZILLA_FIVE_HOME}/include/necko/nsIURI.h \
+		/usr/$(get_libdir)/${MOZILLA_FIVE_HOME##*/}/include/nsIURI.h
 }
 
 pkg_postinst() {
diff --git a/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.5.ebuild b/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.5.ebuild
deleted file mode 100644
index aef85d5572bd..000000000000
--- a/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.5.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.5.ebuild,v 1.3 2006/02/01 21:39:00 anarchy Exp $
-
-unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
-inherit flag-o-matic toolchain-funcs eutils mozconfig-2 mozilla-launcher makeedit multilib autotools
-
-DESCRIPTION="Thunderbird Mail Client"
-HOMEPAGE="http://www.mozilla.org/projects/thunderbird/"
-SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${PV}/source/thunderbird-${PV}-source.tar.bz2
-	mirror://gentoo/mozilla-firefox-1.0-4ft2.patch.bz2
-	mirror://gentoo/mozilla-jslibmath-alpha.patch"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="MPL-1.1 NPL-1.1"
-IUSE="ldap"
-
-RDEPEND=">=www-client/mozilla-launcher-1.39"
-
-S=${WORKDIR}/mozilla
-
-# Needed by src_compile() and src_install().
-# Would do in pkg_setup but that loses the export attribute, they
-# become pure shell variables.
-export BUILD_OFFICIAL=1
-export MOZILLA_OFFICIAL=1
-export MOZ_CO_PROJECT=mail
-
-src_unpack() {
-	declare x
-
-	for x in ${A}; do
-		[[ $x == *.tar.* ]] || continue
-		unpack $x || die "unpack failed"
-	done
-	cd ${S} || die "cd failed"
-
-	####################################
-	#
-	# architecture patches
-	#
-	####################################
-
-	# addresses visibility issues on ppc and amd64
-	# will not hurt to apply on other archs as well.
-	epatch ${FILESDIR}/firefox-1.5-visibility-check.patch
-	epatch ${FILESDIR}/firefox-1.5-visibility-fix.patch
-
-	# patch to fix math operations on alpha, makes maps.google.com work!
-	epatch ${DISTDIR}/mozilla-jslibmath-alpha.patch
-
-	####################################
-	#
-	# general compilation and run-time fixes
-	#
-	####################################
-
-	# patch from fedora to remove the pangoxft things
-	epatch ${FILESDIR}/pango-cairo-1.patch
-	#cairo-canvas patch
-	# epatch ${FILESDIR}/thunderbird-cairo-canvas.patch
-
-	# rpath fix
-	epatch ${FILESDIR}/thunderbird-rpath-1.patch
-	epatch ${FILESDIR}/firefox-1.1-uriloader-1.patch
-
-	# Fix a compilation issue using the 32-bit userland with 64-bit kernel on
-	# PowerPC, because with that configuration, it detects a ppc64 system.
-	# -- hansmi, 2005-11-13
-	if use ppc && [[ "${PROFILE_ARCH}" == ppc64 ]]; then
-		sed -i -e "s#OS_TEST=\`uname -m\`\$#OS_TEST=${ARCH}#" \
-			${S}/configure
-		sed -i -e "s#OS_TEST :=.*uname -m.*\$#OS_TEST:=${ARCH}#" \
-			${S}/security/coreconf/arch.mk
-	fi
-
-	WANT_AUTOCONF="2.13" \
-		WANT_AUTOMAKE="2.13" \
-		eautoreconf || die "failed running autoreconf"
-}
-
-src_compile() {
-	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
-
-	####################################
-	#
-	# mozconfig, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	mozconfig_init
-	mozconfig_config
-
-	# tb-specific settings
-	mozconfig_use_enable ldap
-	mozconfig_use_enable ldap ldap-experimental
-	mozconfig_annotate '' --enable-extensions=default
-	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
-	mozconfig_annotate '' --with-user-appdir=.thunderbird
-	mozconfig_annotate ''  --without-system-nspr
-
-	# Finalize and report settings
-	mozconfig_final
-
-	# hardened GCC uses -fstack-protector-all by default, which breaks us
-	has_hardened && append-flags -fno-stack-protector-all
-	replace-flags -fstack-protector-all -fstack-protector
-
-	####################################
-	#
-	#  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
-
-	# Fixup the RPATH
-	sed -i -e \
-		's|#RPATH_FIXER|'"${MOZILLA_FIVE_HOME}"'|' \
-		${S}/config/rules.mk \
-		${S}/nsprpub/config/rules.mk \
-		${S}/security/coreconf/rules.mk \
-		${S}/security/coreconf/rules.mk
-
-
-	# This removes extraneous CFLAGS from the Makefiles to reduce RAM
-	# requirements while compiling
-	edit_makefiles
-
-	emake || die
-}
-
-src_install() {
-	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
-
-	# Most of the installation happens here
-	dodir ${MOZILLA_FIVE_HOME}
-	cp -RL --no-preserve=links ${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/thunderbird
-	install_mozilla_launcher_stub thunderbird ${MOZILLA_FIVE_HOME}
-
-	# Install icon and .desktop for menu entry
-	insinto /usr/share/pixmaps
-	doins ${FILESDIR}/icon/thunderbird-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/mozillathunderbird.desktop
-}
-
-pkg_postinst() {
-	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
-
-	# 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
-
-	echo  ""
-	einfo "enigmail support is in the tree, simply emerge enigmail"
-	einfo "for all your crypto needs!"
-}
-
-pkg_postrm() {
-	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
-
-	update_mozilla_launcher_symlinks
-}