remove stale version, fix bug #409747

Package-Manager: portage-2.1.10.51/cvs/Linux x86_64

4 files changed, 19 insertions, 313 deletions

diff --git a/mail-client/thunderbird/ChangeLog b/mail-client/thunderbird/ChangeLog
index 59a586fa5514..0cd420b488fd 100644
--- a/mail-client/thunderbird/ChangeLog
+++ b/mail-client/thunderbird/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-client/thunderbird
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v 1.132 2012/03/25 15:31:32 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v 1.133 2012/03/28 01:01:40 anarchy Exp $
+
+  28 Mar 2012; Jory A. Pratt <anarchy@gentoo.org> -thunderbird-11.0.ebuild,
+  thunderbird-11.0-r1.ebuild:
+  remove stale version, fix bug #409747
 
   25 Mar 2012; Thomas Kahle <tomka@gentoo.org> thunderbird-10.0.3.ebuild:
   marked x86 per bug 408161
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index 37364e7b13b3..ec513a24bc4d 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX 1001-xulrunner_fix_jemalloc_vs_aslr.patch 1936 RMD160 4edd9e5ab5082f86cb66ad1fc158e4c105f861ce SHA1 20df285bac8e0704559c0479f7dfe02f030afa8a SHA256 0beb08f2b3fc504897b1024caabcf2887b55fae31c021341c66d3491dc63e32b
 AUX 1002_fix-system-hunspell-dict-detections.patch 3466 RMD160 f8fa846e5d7c80a15d0abf0c6aedb7302ead1f83 SHA1 091febd913c09c86c9242b1be8960fb012ee7c8d SHA256 7ce51cae6bbd6655c8bc543365370627e37d2fc5aa7f7e1270671f7482df344a
@@ -31,8 +31,7 @@ DIST firefox-10.0-patches-0.4.tar.xz 14044 RMD160 4ed929b42bc272606a67783ea31b45
 DIST firefox-10.0-patches-0.5.tar.xz 16708 RMD160 40ccd212e16d4e5dd389db95aa7be0fe68361073 SHA1 3ca7cb54cdc2b704fe468cc26e1818648635b514 SHA256 981f40b1f2f12439d1301a0f7f4171aee4b84b16fe6b926344b63750efb21158
 DIST firefox-10.0-patches-0.6.tar.xz 17400 RMD160 aef02ec0471a0136a0f60ad08874f688afa66d15 SHA1 48d8a41370c052e7efaa9af25c9da95e03d38f2e SHA256 7cd959597a45fdbd6acbb8092c63d1fcf58beb32b99140f6c05109005a0db05d
 DIST firefox-10.0-patches-0.7.tar.xz 17792 RMD160 0944a903821af98617b29fda4fb0f6fcecf28040 SHA1 6d67d372b8f4935114a8d0c72e369e55114373a1 SHA256 81b78f4ee19a70b4190484be0b6938c05a799202b6de35cfcad66eb79dc44bf9
-DIST firefox-11.0-patches-0.1.tar.xz 12632 RMD160 2e579ed97910225eb42670b299177128374e9493 SHA1 c1a5a8cc3110406e7b1913cc99e7d1b601e88bf6 SHA256 0e073f0394d631346e273592e2c89879f6d47ecd58e7c8a25ff58d8510db4364
-DIST firefox-11.0-patches-0.3.tar.xz 15948 RMD160 f8e2a4e16800cc1c91812ca0f2bc7e1429f6d90d SHA1 a574bb5d39929ec7d78ae481af5c7bf5d2c6dcf3 SHA256 3be860dc7f82ef20814a259bdb731cc7c06956646b8de1fb48e88b0640dcf1f8
+DIST firefox-11.0-patches-0.4.tar.xz 16876 RMD160 2edf20116eee6c01153332cbcda2655860f53d9b SHA1 9a34c6e76b2590b1fa1791477b92cd054fa6bece SHA256 543cdba1fd9a75f41183b817b2fae44099bde52e503e34e130566d3ca51b3f49
 DIST firefox-7.0-patches-0.5.tar.xz 14652 RMD160 94593a3e01247b4e5fe9c01a80e902937ed3b32b SHA1 c9cfd5e46a18e4e6adfa8334936f854c3e14a687 SHA256 e2f1de9cfbb87cd982ed205b3b5f33e3bcd952b2093a9969281a761cc0a9e293
 DIST firefox-8.0-patches-0.2.tar.xz 8032 RMD160 221500ed4f56e9c139f563d598bf38df448e5652 SHA1 f41c04c659a253d464ab9bb2c169c1b99b22d443 SHA256 52d351133187dfb7b367950f4da543b06b9f0666f6c07b8bbb5b21cd3d40b0c3
 DIST firefox-9.0-patches-0.5.tar.xz 18580 RMD160 66870e2e194454cda309458d3793bfbe659d0598 SHA1 9f1f60e68330462e24eb81b27f2e3348689321ef SHA256 dc88f027f73bc6352da0dc873bc5ed63e72ea4d7db0aebfc44834f0b967ecd4f
@@ -532,20 +531,23 @@ EBUILD thunderbird-10.0.1-r1.ebuild 8719 RMD160 575ebccbf5e7ee6117a9b43be1ec03d8
 EBUILD thunderbird-10.0.1.ebuild 8687 RMD160 7e24d672729e02959e1a450ec7c65864fe3bd944 SHA1 1769acd84e719bf5f337cad59b3b46c210c4a646 SHA256 789c1a73032ab0c8ae3cde18b24bd9aeaef3c2d24cef52ea54b45a937840eb8f
 EBUILD thunderbird-10.0.3.ebuild 8905 RMD160 41b0161025c79f87e270c9dc07ce3cb6b3651ed1 SHA1 d5ebbae95d61cb07c104a8a7c46a3eb724e9987f SHA256 aed0cbaff86ef05a15ba86771695667ff7104b03f449a7f5d0b2db4c10a4ee93
 EBUILD thunderbird-10.0.ebuild 8419 RMD160 dd148c2893f674aae743b65c330bb7a84e9717d1 SHA1 e53d2578017924b1d16b94d1ec5012e83e2a2767 SHA256 1195d363de82246f850db10da02b147c3f1ddc74590d6582552d9249a6e80601
-EBUILD thunderbird-11.0-r1.ebuild 9046 RMD160 3cbdb8459d9d3b1540e6abdb1038c645a922884a SHA1 60576461e199bd1a554f0b03ffeb27bea794156c SHA256 7d2c05f2f69ac25b79001d546306deb0a6a72a08284b7bfeb247e7edfba1526d
-EBUILD thunderbird-11.0.ebuild 9055 RMD160 441f9b6cb60c24f2879ccfbbb64cd0510fa4b92b SHA1 8c5f400119b45de52a3ee1f97336d3d627ea8eed SHA256 f60a078d2de78a21975f3783a467826b657a959c2032569dd275833f856ddf5a
+EBUILD thunderbird-11.0-r1.ebuild 9045 RMD160 c43333ab3038633da84457bce0d313c47fdeaf84 SHA1 b24f4c2a8ed15fcf01f4e479baefdbb5e6d7ec64 SHA256 c577e23cc14b3714478f46cb59947b4d21b06735f5f42b8cff177f4f7c720240
 EBUILD thunderbird-3.1.12.ebuild 8075 RMD160 2d883f455650b5c1d1a5388241b36b5b4ac28e87 SHA1 2e335bd19fe7205ebfe2f7020bb0db42431b5b08 SHA256 2f234bf655d1b533104e2fb46cedea9c9b61b5f4f5df8ea27d754c83aa8ec385
 EBUILD thunderbird-3.1.13.ebuild 8082 RMD160 f56e2d3259289ecb2c5cf5b646f90b69bd10b27d SHA1 c3b072a6d9233c7feaf66d92734516b2b60555d9 SHA256 5603fe37594e4e8a3c74e1393e244550e3711cfa78d60197baf9add37b17429e
 EBUILD thunderbird-3.1.14.ebuild 8082 RMD160 140c386b6ee48b9526fc4dfcc7b556752a0dda84 SHA1 604f1e3b5cf1cf5c2698154cf502e93d8027527f SHA256 a4a9cae459778071add091cca28a853b53958a0f9167d1f5b163d6510602d47c
 EBUILD thunderbird-7.0.1-r1.ebuild 9078 RMD160 08b11d7d9b9b766909f81864e207723743090f8c SHA1 12da3854d321a5ea859ae12bcbd4b93cfb6ea272 SHA256 3ec97264dbe0beabe991632b58c0cd3b42de119d2643bcbbc1a6c74c70029410
 EBUILD thunderbird-8.0-r1.ebuild 9921 RMD160 5ef83da31f3d2379d90f201addb63d0cd38ac17f SHA1 8d4659616eddcdd70892a69d414e3ee86dc7359f SHA256 b832be0c528a9a0a4fa966c2bcb8b0e3d672daf59b5f46ef0e0961de0062b562
 EBUILD thunderbird-9.0.ebuild 10036 RMD160 0c5c7cd574cc2aba2bcf337bd8889425f20ec415 SHA1 2b417849aa917ed14985555e120c69f9203fb849 SHA256 bf90243ddf17364798e3dc7203a442463a5d090731dfe999048daeab0fefaf00
-MISC ChangeLog 70952 RMD160 1bf990f2f1448abff75e41c564d1280716af392d SHA1 ed85581afd53dc3872ad0479f4a0901bd664573d SHA256 4fd3c2b286faba1bbec1f2f6c3f789abac88e29373f2f16903c45449febb132e
+MISC ChangeLog 71101 RMD160 eb8a2af359a15195ba3289d065665aaf69b06c44 SHA1 35a722707f8353229883a192d3f2d6d55e171023 SHA256 46029ac99b3b963d26821ef3ae08034bacadbaa55c64e4b42e5970775843019f
 MISC metadata.xml 1115 RMD160 b5671b22eef5dc7eb948a98ff32144d0edbff008 SHA1 a566c73c286e01fcc59c6c6ee1117b4df891671f SHA256 08f047bd344a5e947e84e794a20c2d0bddcb476edb5ca4867ab26dd865d682b5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk9vOloACgkQodBTJSDyo65LqgD/TLrmbCaUAMxtJSLmoUA0UGqR
-lBVTjCZmPODY4KDBKm4A/RTgZ1vKgHJVoR1EEDU6TaQXu0Q+ALG+ZKut+HSkr5TN
-=9Hlv
+iQEcBAEBAgAGBQJPcmLfAAoJEIXV9xahDnCooNIH/ieIBo59xMJbHy6UzYp2TVbS
+oXNqU6amszQBZRvvUUKKq3EH2+Fyj4Icjo20Gmn5/hYZleeHzm47robzjaavAKCj
+7l5S+8qUBX9EwJngUt5SFM84Y9eNFcULO491M7HThEj+skDHfs17UjCkp84tNPme
+X5GJ+pEoARRH9xBh0Kx/F1fV2RU0pfmfKelLlcK0hyimFbazW6k4SWLfrZv6zCAe
+ecMIY38lbJ3EGwcMX+xtxN3AJjhqv/2b4NiOLI+J3yMdUTKgxIwIKLO41YSRp3y9
+w051E7A9KSKzGnoXpdLBVTMyWpI5sydKhFiI+nXQSDKoWMotOx7h/EEKwGP+xBU=
+=JggP
 -----END PGP SIGNATURE-----
diff --git a/mail-client/thunderbird/thunderbird-11.0-r1.ebuild b/mail-client/thunderbird/thunderbird-11.0-r1.ebuild
index b187fccd38f5..8fccc37d1c0d 100644
--- a/mail-client/thunderbird/thunderbird-11.0-r1.ebuild
+++ b/mail-client/thunderbird/thunderbird-11.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-11.0-r1.ebuild,v 1.1 2012/03/24 23:57:36 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-11.0-r1.ebuild,v 1.2 2012/03/28 01:01:40 anarchy Exp $
 
 EAPI="3"
 WANT_AUTOCONF="2.1"
@@ -36,7 +36,7 @@ LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
 IUSE="bindist gconf +crashreporter +crypt +ipc +lightning +minimal mozdom +webm"
 
 PATCH="thunderbird-10.0-patches-0.1"
-PATCHFF="firefox-11.0-patches-0.3"
+PATCHFF="firefox-11.0-patches-0.4"
 
 SRC_URI="${SRC_URI}
 	${MOZ_FTP_URI}${MOZ_PV}/source/${MOZ_P}.source.tar.bz2
diff --git a/mail-client/thunderbird/thunderbird-11.0.ebuild b/mail-client/thunderbird/thunderbird-11.0.ebuild
deleted file mode 100644
index 839eca88d548..000000000000
--- a/mail-client/thunderbird/thunderbird-11.0.ebuild
+++ /dev/null
@@ -1,300 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-11.0.ebuild,v 1.2 2012/03/21 05:24:43 nirbheek Exp $
-
-EAPI="3"
-WANT_AUTOCONF="2.1"
-MOZ_ESR="0"
-
-# This list can be updated using scripts/get_langs.sh from the mozilla overlay
-MOZ_LANGS=(ar ast be bg bn-BD br ca cs da de el en en-GB en-US es-AR es-ES et eu fi
-fr fy-NL ga-IE gd gl he hu id is it ja ko lt nb-NO nl nn-NO pa-IN pl pt-BR pt-PT
-rm ro ru si sk sl sq sr sv-SE ta-LK tr uk vi zh-CN zh-TW)
-
-# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
-MOZ_PV="${PV/_beta/b}"
-# ESR releases have slightly version numbers
-if [[ ${MOZ_ESR} == 1 ]]; then
-	MOZ_PV="${MOZ_PV}esr"
-fi
-MOZ_P="${PN}-${MOZ_PV}"
-
-# Enigmail version
-EMVER="1.4"
-# Upstream ftp release URI that's used by mozlinguas.eclass
-# We don't use the http mirror because it deletes old tarballs.
-MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/${PN}/releases/"
-
-inherit flag-o-matic toolchain-funcs mozconfig-3 makeedit multilib autotools pax-utils python check-reqs nsplugins mozlinguas
-
-DESCRIPTION="Thunderbird Mail Client"
-HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/"
-
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-SLOT="0"
-LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE="bindist gconf +crashreporter +crypt +ipc +lightning +minimal mozdom +webm"
-
-PATCH="thunderbird-10.0-patches-0.1"
-PATCHFF="firefox-11.0-patches-0.1"
-
-SRC_URI="${SRC_URI}
-	${MOZ_FTP_URI}${MOZ_PV}/source/${MOZ_P}.source.tar.bz2
-	crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-${EMVER}.tar.gz )
-	http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.xz
-	http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCHFF}.tar.xz"
-
-ASM_DEPEND=">=dev-lang/yasm-1.1"
-
-RDEPEND=">=sys-devel/binutils-2.16.1
-	>=dev-libs/nss-3.13.3
-	>=dev-libs/nspr-4.9
-	>=dev-libs/glib-2.26
-	crashreporter? ( net-misc/curl )
-	gconf? ( >=gnome-base/gconf-1.2.1:2 )
-	media-libs/libpng[apng]
-	>=x11-libs/cairo-1.10
-	>=x11-libs/pango-1.14.0
-	>=x11-libs/gtk+-2.14
-	webm? ( >=media-libs/libvpx-1.0.0
-		media-libs/alsa-lib )
-	virtual/libffi
-	!x11-plugins/enigmail
-	system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,unlock-notify,debug=] )
-	crypt?  ( || (
-		( >=app-crypt/gnupg-2.0
-			|| (
-				app-crypt/pinentry[gtk]
-				app-crypt/pinentry[qt4]
-			)
-		)
-		=app-crypt/gnupg-1.4*
-	) )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	webm? ( x86? ( ${ASM_DEPEND} )
-		amd64? ( ${ASM_DEPEND} )
-		virtual/opengl )"
-
-if [[ ${PV} =~ beta ]]; then
-	S="${WORKDIR}/comm-beta"
-else
-	if [[ ${MOZ_ESR} == 1 ]]; then
-		S="${WORKDIR}/comm-esr${PV%%.*}"
-	else
-		S="${WORKDIR}/comm-release"
-	fi
-fi
-
-pkg_setup() {
-	moz_pkgsetup
-
-	export MOZILLA_DIR="${S}/mozilla"
-
-	if ! use bindist ; then
-		elog "You are enabling official branding. You may not redistribute this build"
-		elog "to any users on your network or the internet. Doing so puts yourself into"
-		elog "a legal problem with Mozilla Foundation"
-		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
-		elog
-	fi
-
-	# Ensure we have enough disk space to compile
-	CHECKREQS_DISK_BUILD="4G"
-	check-reqs_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# Unpack language packs
-	mozlinguas_src_unpack
-}
-
-src_prepare() {
-	# Apply our Thunderbird patchset
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}/thunderbird"
-
-	# Apply our patchset from firefox to thunderbird as well
-	pushd "${S}"/mozilla &>/dev/null || die
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}/firefox"
-	popd &>/dev/null || die
-
-	if use crypt ; then
-		mv "${WORKDIR}"/enigmail "${S}"/mailnews/extensions/enigmail
-		cd "${S}"
-	fi
-
-	#Fix compilation with curl-7.21.7 bug 376027
-	sed -e '/#include <curl\/types.h>/d'  \
-		-i "${S}"/mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc \
-		-i "${S}"/mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc \
-		-i "${S}"/mozilla/config/system-headers \
-		-i "${S}"/mozilla/js/src/config/system-headers || die "Sed failed"
-
-	# Allow user to apply any additional patches without modifing ebuild
-	epatch_user
-
-	eautoreconf
-	# Ensure we run eautoreconf in mozilla to regenerate configure
-	cd "${S}"/mozilla
-	eautoconf
-}
-
-src_configure() {
-	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-	MEXTENSIONS="default"
-
-	####################################
-	#
-	# mozconfig, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	mozconfig_init
-	mozconfig_config
-
-	# It doesn't compile on alpha without this LDFLAGS
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	mozconfig_annotate '' --prefix="${EPREFIX}"/usr
-	mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
-	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
-	mozconfig_annotate '' --with-default-mozilla-five-home="${EPREFIX}${MOZILLA_FIVE_HOME}"
-	mozconfig_annotate '' --with-user-appdir=.thunderbird
-	mozconfig_annotate '' --with-system-png
-	mozconfig_annotate '' --enable-system-ffi
-	mozconfig_annotate '' --target="${CTARGET:-${CHOST}}"
-
-	# Use enable features
-	mozconfig_use_enable lightning calendar
-	mozconfig_use_enable gconf
-
-	# Bug #72667
-	if use mozdom; then
-		MEXTENSIONS="${MEXTENSIONS},inspector"
-	fi
-
-	# Use an objdir to keep things organized.
-	echo "mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/tbird" >> "${S}"/.mozconfig
-
-	# Finalize and report settings
-	mozconfig_final
-
-	####################################
-	#
-	#  Configure and build
-	#
-	####################################
-
-	# Disable no-print-directory
-	MAKEOPTS=${MAKEOPTS/--no-print-directory/}
-
-	if [[ $(gcc-major-version) -lt 4 ]]; then
-		append-cxxflags -fno-stack-protector
-	elif [[ $(gcc-major-version) -gt 4 || $(gcc-minor-version) -gt 3 ]]; then
-		if use amd64 || use x86; then
-			append-flags -mno-avx
-		fi
-	fi
-}
-
-src_compile() {
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-	MOZ_MAKE_FLAGS="${MAKEOPTS}" \
-	emake -f client.mk || die
-
-	# Only build enigmail extension if crypt enabled.
-	if use crypt ; then
-		cd "${S}"/mailnews/extensions/enigmail || die
-		./makemake -r 2&> /dev/null
-		cd "${S}"/tbird/mailnews/extensions/enigmail
-		emake || die "make enigmail failed"
-		emake xpi || die "make enigmail xpi failed"
-	fi
-}
-
-src_install() {
-	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-	declare emid
-	local obj_dir="tbird"
-	cd "${S}/${obj_dir}"
-
-	# Copy our preference before omnijar is created.
-	cp "${FILESDIR}"/thunderbird-gentoo-default-prefs-1.js-1 \
-		"${S}/${obj_dir}/mozilla/dist/bin/defaults/pref/all-gentoo.js" || die
-
-	# Pax mark xpcshell for hardened support, only used for startupcache creation.
-	pax-mark m "${S}"/${obj_dir}/mozilla/dist/bin/xpcshell
-
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	# Install language packs
-	mozlinguas_src_install
-
-	if ! use bindist; then
-		newicon "${S}"/other-licenses/branding/thunderbird/content/icon48.png thunderbird-icon.png
-		domenu "${FILESDIR}"/icon/${PN}.desktop
-	else
-		newicon "${S}"/mail/branding/aurora/content/icon48.png thunderbird-icon-unbranded.png
-		newmenu "${FILESDIR}"/icon/${PN}-unbranded.desktop \
-			${PN}.desktop
-
-		sed -i -e "s:Mozilla\ Thunderbird:EarlyBird:g" \
-			"${ED}"/usr/share/applications/${PN}.desktop
-	fi
-
-	if use crypt ; then
-		cd "${T}" || die
-		unzip "${S}"/${obj_dir}/mozilla/dist/bin/enigmail*.xpi install.rdf || die
-		emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' install.rdf)
-
-		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid} || die
-		cd "${D}"${MOZILLA_FIVE_HOME}/extensions/${emid} || die
-		unzip "${S}"/${obj_dir}/mozilla/dist/bin/enigmail*.xpi || die
-	fi
-
-	if use lightning ; then
-		emid="{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}"
-		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
-		cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid}
-		unzip "${S}"/${obj_dir}/mozilla/dist/xpi-stage/gdata-provider.xpi
-
-		emid="calendar-timezones@mozilla.org"
-		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
-		cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid}
-		unzip "${S}"/${obj_dir}/mozilla/dist/xpi-stage/calendar-timezones.xpi
-
-		emid="{e2fda1a4-762b-4020-b5ad-a41df1933103}"
-		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
-		cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid}
-		unzip "${S}"/${obj_dir}/mozilla/dist/xpi-stage/lightning.xpi
-
-		# Fix mimetype so it shows up as a calendar application in GNOME 3
-		# This requires that the .desktop file was already installed earlier
-		sed -e "s:^\(MimeType=\):\1text/calendar;:" \
-			-e "s:^\(Categories=\):\1Calendar;:" \
-			-i "${ED}"/usr/share/applications/${PN}.desktop
-	fi
-
-	pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/thunderbird-bin
-
-	share_plugins_dir
-
-	if use minimal; then
-		rm -rf "${ED}"/usr/include "${ED}${MOZILLA_FIVE_HOME}"/{idl,include,lib,sdk} || \
-			die "Failed to remove sdk and headers"
-	fi
-}
-
-pkg_postinst() {
-	elog
-	elog "If you are experience problems with plugins please issue the"
-	elog "following command : rm \${HOME}/.thunderbird/*/extensions.sqlite ,"
-	elog "then restart thunderbird"
-}