From 07b7b134158edf906bed323a2bdd88297228d87f Mon Sep 17 00:00:00 2001
From: Jory Pratt <anarchy@gentoo.org>
Date: Sun, 28 Oct 2012 00:58:27 +0000
Subject: Fix bugs #433960, #439818, #439348, #439278

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Manifest-Sign-Key: 0x9019241D
---
 mail-client/thunderbird/ChangeLog                  |   8 +-
 mail-client/thunderbird/Manifest                   |  18 +-
 .../thunderbird/thunderbird-16.0.1-r1.ebuild       | 336 +++++++++++++++++++++
 mail-client/thunderbird/thunderbird-16.0.1.ebuild  | 334 --------------------
 4 files changed, 359 insertions(+), 337 deletions(-)
 create mode 100644 mail-client/thunderbird/thunderbird-16.0.1-r1.ebuild
 delete mode 100644 mail-client/thunderbird/thunderbird-16.0.1.ebuild

(limited to 'mail-client')

diff --git a/mail-client/thunderbird/ChangeLog b/mail-client/thunderbird/ChangeLog
index f80a9e2d85bf..597bd947680e 100644
--- a/mail-client/thunderbird/ChangeLog
+++ b/mail-client/thunderbird/ChangeLog
@@ -1,6 +1,12 @@
 # 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.171 2012/10/23 15:57:21 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v 1.172 2012/10/28 00:58:16 anarchy Exp $
+
+*thunderbird-16.0.1-r1 (28 Oct 2012)
+
+  28 Oct 2012; <anarchy@gentoo.org> -thunderbird-16.0.1.ebuild,
+  +thunderbird-16.0.1-r1.ebuild:
+  Fix bugs #433960, #439818, #439348, #439278
 
   23 Oct 2012; <ago@gentoo.org> thunderbird-10.0.9.ebuild:
   Stable for amd64, wrt bug #437780
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index 7a8d8b210e18..892b9c1ad50a 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX icon/thunderbird-unbranded.desktop 228 SHA256 9c3486c4944c7a7471ae5d5f6ab8b716a9e51ad677d140b7ef58de99b9a7f334 SHA512 adb886d443fbd01c3c0b34ef4ad8eb7e790eb81dd8c6bee347a03061742dfa1a4ffb5137e0451253ed60a28eea5a752175a51e41c21ae0bff6a0673d056b3c70 WHIRLPOOL 851d5428ab36bd0622529f7ac9c54ab22ff1729d78a2ba185d80efd2f8ee105401c3db26229cc55bc7e28cd5f63c21e62703e94b60396e8c61575d514a6d5567
 AUX icon/thunderbird.desktop 218 SHA256 5fd4cd2b2a41cf8e526e16fa26a1b17292a9df9ef314bbb768057e921679898f SHA512 0ab09379603c90f53fabf7b41a4e3281191b7ceb8f8c2f64cada5ddc83d72a9032534c9a39fa9b63f5945f89d277b41ff15f7e20e44bb3e8fcb0348ddd450828 WHIRLPOOL 0dd5f139c30f0b5b18b853d5781ad55e775db6367dff393ab8984ff76a2bb5533b34fc4d2088cb750420178d85dfa2d7ce3710fdff95f3b932258a3e4267beaf
 AUX thunderbird-gentoo-default-prefs-1.js-1 426 SHA256 b5aba51045c700ae4d465e079f3e776600d4950806212f7c2fe1841fa25cf9d6 SHA512 b40e7b4789b7f43c382589f7d0eaa6043072bce86ab79fb3dda4800e9ab6a43af11f43b0cb3b6ab1c71d887aa1cf9356ac858f0a81dad013cef5b8a4b2107983 WHIRLPOOL cc3535e9a710d55c5386db51d7bd6ca24f6b36685a54e42d049a806fe99fd0b08afe7998d1478036bfa306129616778b8ac1386e14649646fc0a7ae4d37b830d
@@ -279,6 +282,17 @@ EBUILD thunderbird-10.0.5.ebuild 9228 SHA256 cd5d486983d66255a883b47e2d5845854ad
 EBUILD thunderbird-10.0.6.ebuild 9223 SHA256 b10e10190e51db30a18e0b11a6dda4b28fe3b5c16fb8ff9cbca28b48c310316a SHA512 ce9c2416c3a35ddf18c665ce0bd4cabcf1b478a0eb7d58dc48dee2d49af800daca9f2a2f3bdca25c08740c1cbbef0524e6f2c328e114260c9d717d1a40b7df8a WHIRLPOOL d9ceb7ccf75f5994f4de3db42a0db4433ee57da038b3ad01520bc68890dbc19b49e35dec1fdb3d8cb38181617085575a5f3d642e5186d6edfc24201379d0f4ab
 EBUILD thunderbird-10.0.7.ebuild 9277 SHA256 527fa998e67ffff8f0e1ad4d1792a37cac0734510cd3c857071b3bc2378a6b56 SHA512 45e19df14ae25d5b506ab52d72ebbcac46897c74edb564e1dd4ddb6a9614b6f1c73dce88f920b5d2249af5fcf08586d205ffa4a0e9ed4632b3e5391f69ec541d WHIRLPOOL 99247c8db572551dfb53908fcb83ff57cadac480b77f1b9e47b020bf14ffbef1329f671205a62bd83c7c502e71d064f53854cd5492ada381c0cbc2b6466532ec
 EBUILD thunderbird-10.0.9.ebuild 9272 SHA256 f449d6fb799062669595e37f841112b329b075c5e323e86efb4c3d42a136561d SHA512 2c95a68854adc8ba8b2d87c1773b29cb554fe4b28803bcc1df1b4e98f0747c24781a42cf44af672ae45c25a617bfee7bacfde58f01dd488f43d64a6d3740c0ba WHIRLPOOL 0bfe8c97b0c681fd9426d2ecaa72dae21c98169c2cd380af92bb476a5c211a989c5c84fa7f2491a62530f53b1d47497913d809df8af0db8d0c7c743f4e1ca491
-EBUILD thunderbird-16.0.1.ebuild 10333 SHA256 15a573b7c081aabc3f785d3bc177739ab7f04a7ed2ab93279a3298763a68fb86 SHA512 4c12d982b590d2d2060cc294285c74d5c9b88666d86adf9994329dc0533a1e2738a2e893f2588f8fbe587ede09b5491aed02bb85624b5323711564e43adf9274 WHIRLPOOL f7aeba6cffb5a0b227513c22856838818e37ae0c59ddd374dc5b4a235daf0b087fe1635d8a3decf567b0fd864312aca89c0b8afe696950511488ed0d2f0b7cac
-MISC ChangeLog 77723 SHA256 cae71d5047e4823748a5b8086ff8f1029ef8b64a723db05e9572491c05e85348 SHA512 3687f49866ee15cac45baa8c5ff9c7ee79d70113cf35528511f2b09c57d598940404b7045fb910df6440b6253dbdca0988c5815c4d0ca65a6d199da2dc6f9973 WHIRLPOOL fb91ecd192c2e3852311960aa42922f9745250f74aa02e2d7d9313e7f1ccd7a996b5cd441de3103bfbbb8556b9e4607d7ce1ef8d0ad509676e66c49f14bc6ff3
+EBUILD thunderbird-16.0.1-r1.ebuild 10390 SHA256 bc76e4f449d01973baf45439bfcad2e2564d231a6ce3a61f67e72540dfa64993 SHA512 7871185074edc3489ff6c592a12e31110bf203ce48be5d63fce60ed00eab1dea5b1d1c6af3ecdffb4c6441914219a16a8955530b748cd9c524fef20f508e7587 WHIRLPOOL 4b18e140a30e3dcc3639ed16595c1a0ff538697ba8dfb78ec77ca18821fb41043f56ec3f2abc4eedc6ba08120a939993ddf83b755b93be4bcd151bc61ba90331
+MISC ChangeLog 77909 SHA256 acbe91bfaec37ebb919da367f85a43e8b2b4cd7445c6f7c794c5c93d3160edb0 SHA512 2ee48a5a16bbc1030a0b87ac2ad962280dbda75b5ba752a80c320579a0b95c368dc61d7e769eec325853693fd864d0d6ffd9d729c671c3f76e092fc6f7e32689 WHIRLPOOL 0d72c7b119d3a9c35ccb9d68628e0e8bb4a22de1bbd22be580c09d9857c69c7cea2ad33c62c22bf2946d59145328a2e4712e6c451a1b3683f58c472fe5943d84
 MISC metadata.xml 1115 SHA256 08f047bd344a5e947e84e794a20c2d0bddcb476edb5ca4867ab26dd865d682b5 SHA512 4e20ec9e8434f97eb2bd16f4adbd9b91ff9d9e8dc6784e850fe3b2563d15bbeb9c932839081681a40444512369066d6b6425c0e00447f505e32ef8ce5457c394 WHIRLPOOL 4c2e25b68269a03c613928703240483f592d9fb0556dade8b0a5791a53a4defb8857e24f0f844c49a47bd93b9b9585df463dafda40c9aa307e9866bc5ee13158
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQjIMmAAoJEIu/f0CQGSQdRwQH/iRX+QVdm4kjz7PgLCvJ5HC6
+/v6g2lwdaVxqkvlHiw6MpmLwCQMzj/kEdvlMmoWZU/7nQtmw439yJsYhLlXTzK5M
+5Mem9+1CV8E/og9GPMk+Q2cemqmK7yqnGfVcl82BhWHoMgX5YwN+t5Kn5tyjDAfA
+CWq+NUzCMjTQ58rmn8PBr7JUY/V1r0TRaW0vH2zqJO1SAFYtiWuiD2ufiy1osAHG
+iA1EdccuRpT4APEwm+z3Ecdh3GrodZ+Pq8xPtQs5b3tTCvpPmVKH8bD28WPOn7ev
+q6RfPj0QPL7dwxkwUOVGxm3rWf4AKZlnDPopWSQa09BA48Uv8XuDhvzs/DL79tA=
+=QfRn
+-----END PGP SIGNATURE-----
diff --git a/mail-client/thunderbird/thunderbird-16.0.1-r1.ebuild b/mail-client/thunderbird/thunderbird-16.0.1-r1.ebuild
new file mode 100644
index 000000000000..5cc1221171b8
--- /dev/null
+++ b/mail-client/thunderbird/thunderbird-16.0.1-r1.ebuild
@@ -0,0 +1,336 @@
+# 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-16.0.1-r1.ebuild,v 1.1 2012/10/28 00:58:16 anarchy Exp $
+
+EAPI="3"
+WANT_AUTOCONF="2.1"
+MOZ_ESR=""
+
+# 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 hr hu hy-AM 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.5"
+# 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-2.0 GPL-2 LGPL-2.1"
+IUSE="bindist gconf +crypt +ipc +jit ldap +lightning +minimal mozdom +webm selinux"
+
+PATCH="thunderbird-13.0-patches-0.1"
+PATCHFF="firefox-16.0-patches-0.4"
+
+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
+	http://dev.gentoo.org/~nirbheek/mozilla/patchsets/${PATCHFF}.tar.xz"
+
+ASM_DEPEND=">=dev-lang/yasm-1.1"
+
+RDEPEND=">=sys-devel/binutils-2.16.1
+	>=dev-libs/nss-3.13.6
+	>=dev-libs/nspr-4.9.2
+	>=dev-libs/glib-2.26
+	gconf? ( >=gnome-base/gconf-1.2.1:2 )
+	>=media-libs/libpng-1.5.11[apng]
+	>=x11-libs/cairo-1.10
+	>=x11-libs/pango-1.14.0
+	>=x11-libs/gtk+-2.14
+	webm? ( >=media-libs/libvpx-1.0.0
+		kernel_linux? ( media-libs/alsa-lib ) )
+	virtual/libffi
+	!x11-plugins/enigmail
+	system-sqlite? ( >=dev-db/sqlite-3.7.13[fts3,secure-delete,threadsafe,unlock-notify,debug=] )
+	selinux? ( sec-policy/selinux-thunderbird )
+	crypt?  ( || (
+		( >=app-crypt/gnupg-2.0
+			|| (
+				app-crypt/pinentry[gtk]
+				app-crypt/pinentry[qt4]
+			)
+		)
+		=app-crypt/gnupg-1.4*
+	) )"
+
+DEPEND="${RDEPEND}
+	dev-python/pysqlite
+	!elibc_glibc? ( dev-libs/libexecinfo )
+	virtual/pkgconfig
+	webm? ( x86? ( ${ASM_DEPEND} )
+		amd64? ( ${ASM_DEPEND} )
+		virtual/opengl )"
+
+if [[ ${PV} =~ beta ]]; then
+	S="${WORKDIR}/comm-beta"
+elif [[ ${MOZ_ESR} == 1 ]]; then
+	S="${WORKDIR}/comm-esr${PV%%.*}"
+else
+	S="${WORKDIR}/comm-release"
+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
+
+	# Disable gnomevfs extension
+	sed -i -e "s:gnomevfs::" "${S}/"mozilla/browser/confvars.sh \
+		-e "s:gnomevfs::" "${S}/"mozilla/xulrunner/confvars.sh \
+		|| die "Failed to remove gnomevfs extension"
+
+	#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"
+
+	# Don't error out when there's no files to be removed:
+	sed 's@\(xargs rm\)$@\1 -f@' \
+		-i "${S}"/mozilla/toolkit/mozapps/installer/packager.mk || die
+
+	# Shell scripts sometimes contain DOS line endings; bug 391889
+	grep -rlZ --include="*.sh" $'\r$' . |
+	while read -r -d $'\0' file ; do
+		einfo edos2unix "${file}"
+		edos2unix "${file}"
+	done
+
+	# 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"
+
+	# We must force enable jemalloc 3 threw .mozconfig
+	echo "export MOZ_JEMALLOC=1" >> ${S}/.mozconfig
+
+	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}}"
+	mozconfig_annotate '' --build="${CTARGET:-${CHOST}}"
+
+	# Use enable features
+	mozconfig_use_enable lightning calendar
+	mozconfig_use_enable gconf
+	mozconfig_use_enable ldap
+	# Both methodjit and tracejit conflict with PaX
+	mozconfig_use_enable jit methodjit
+	mozconfig_use_enable jit tracejit
+
+	# 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
+
+	# Without methodjit and tracejit there's no conflict with PaX
+	if use jit; then
+		# Pax mark xpcshell for hardened support, only used for startupcache creation.
+		pax-mark m "${S}"/${obj_dir}/mozilla/dist/bin/xpcshell
+	fi
+
+	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
+
+	if use jit ; then
+		pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/thunderbird-bin
+	fi
+
+	# Plugin-container needs to be pax-marked for hardened to ensure plugins such as flash
+	# continue to work as expected.
+	pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/plugin-container
+
+	# Plugins dir
+	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"
+}
diff --git a/mail-client/thunderbird/thunderbird-16.0.1.ebuild b/mail-client/thunderbird/thunderbird-16.0.1.ebuild
deleted file mode 100644
index e632cf202adb..000000000000
--- a/mail-client/thunderbird/thunderbird-16.0.1.ebuild
+++ /dev/null
@@ -1,334 +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-16.0.1.ebuild,v 1.2 2012/10/21 19:35:30 anarchy Exp $
-
-EAPI="3"
-WANT_AUTOCONF="2.1"
-MOZ_ESR=""
-
-# 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 hr hu hy-AM 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.5"
-# 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-2.0 GPL-2 LGPL-2.1"
-IUSE="bindist gconf +crypt +ipc +jit +lightning +minimal mozdom +webm selinux"
-
-PATCH="thunderbird-13.0-patches-0.1"
-PATCHFF="firefox-16.0-patches-0.4"
-
-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
-	http://dev.gentoo.org/~nirbheek/mozilla/patchsets/${PATCHFF}.tar.xz"
-
-ASM_DEPEND=">=dev-lang/yasm-1.1"
-
-RDEPEND=">=sys-devel/binutils-2.16.1
-	>=dev-libs/nss-3.13.6
-	>=dev-libs/nspr-4.9.2
-	>=dev-libs/glib-2.26
-	gconf? ( >=gnome-base/gconf-1.2.1:2 )
-	>=media-libs/libpng-1.5.9[apng]
-	>=x11-libs/cairo-1.10
-	>=x11-libs/pango-1.14.0
-	>=x11-libs/gtk+-2.14
-	webm? ( >=media-libs/libvpx-1.0.0
-		kernel_linux? ( media-libs/alsa-lib ) )
-	virtual/libffi
-	!x11-plugins/enigmail
-	system-sqlite? ( >=dev-db/sqlite-3.7.10[fts3,secure-delete,threadsafe,unlock-notify,debug=] )
-	selinux? ( sec-policy/selinux-thunderbird )
-	crypt?  ( || (
-		( >=app-crypt/gnupg-2.0
-			|| (
-				app-crypt/pinentry[gtk]
-				app-crypt/pinentry[qt4]
-			)
-		)
-		=app-crypt/gnupg-1.4*
-	) )"
-
-DEPEND="${RDEPEND}
-	!elibc_glibc? ( dev-libs/libexecinfo )
-	virtual/pkgconfig
-	webm? ( x86? ( ${ASM_DEPEND} )
-		amd64? ( ${ASM_DEPEND} )
-		virtual/opengl )"
-
-if [[ ${PV} =~ beta ]]; then
-	S="${WORKDIR}/comm-beta"
-elif [[ ${MOZ_ESR} == 1 ]]; then
-	S="${WORKDIR}/comm-esr${PV%%.*}"
-else
-	S="${WORKDIR}/comm-release"
-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
-
-	# Disable gnomevfs extension
-	sed -i -e "s:gnomevfs::" "${S}/"mozilla/browser/confvars.sh \
-		-e "s:gnomevfs::" "${S}/"mozilla/xulrunner/confvars.sh \
-		|| die "Failed to remove gnomevfs extension"
-
-	#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"
-
-	# Don't error out when there's no files to be removed:
-	sed 's@\(xargs rm\)$@\1 -f@' \
-		-i "${S}"/mozilla/toolkit/mozapps/installer/packager.mk || die
-
-	# Shell scripts sometimes contain DOS line endings; bug 391889
-	grep -rlZ --include="*.sh" $'\r$' . |
-	while read -r -d $'\0' file ; do
-		einfo edos2unix "${file}"
-		edos2unix "${file}"
-	done
-
-	# 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"
-
-	# We must force enable jemalloc 3 threw .mozconfig
-	echo "export MOZ_JEMALLOC=1" >> ${S}/.mozconfig
-
-	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}}"
-	mozconfig_annotate '' --build="${CTARGET:-${CHOST}}"
-
-	# Use enable features
-	mozconfig_use_enable lightning calendar
-	mozconfig_use_enable gconf
-	# Both methodjit and tracejit conflict with PaX
-	mozconfig_use_enable jit methodjit
-	mozconfig_use_enable jit tracejit
-
-	# 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
-
-	# Without methodjit and tracejit there's no conflict with PaX
-	if use jit; then
-		# Pax mark xpcshell for hardened support, only used for startupcache creation.
-		pax-mark m "${S}"/${obj_dir}/mozilla/dist/bin/xpcshell
-	fi
-
-	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
-
-	if use jit ; then
-		pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/thunderbird-bin
-	fi
-
-	# Plugin-container needs to be pax-marked for hardened to ensure plugins such as flash
-	# continue to work as expected.
-	pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/plugin-container
-
-	# Plugins dir
-	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"
-}
-- 
cgit v1.2.3-65-gdbad