Upstream bump to fix regressions in 3.1 thunderbird mimetypes

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

3 files changed, 164 insertions, 2 deletions

diff --git a/x11-plugins/enigmail/ChangeLog b/x11-plugins/enigmail/ChangeLog
index c8c78a9dbf38..db146c2df611 100644
--- a/x11-plugins/enigmail/ChangeLog
+++ b/x11-plugins/enigmail/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-plugins/enigmail
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/enigmail/ChangeLog,v 1.187 2010/06/21 15:16:54 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/enigmail/ChangeLog,v 1.188 2010/06/26 14:44:05 anarchy Exp $
+
+*enigmail-1.1.1 (26 Jun 2010)
+
+  26 Jun 2010; <anarchy@gentoo.org> +enigmail-1.1.1.ebuild:
+  Fix for decrypting messages
 
   21 Jun 2010; <anarchy@gentoo.org> enigmail-1.1.ebuild:
   Update to build with rc2 source
diff --git a/x11-plugins/enigmail/Manifest b/x11-plugins/enigmail/Manifest
index 3b60ddc28398..79bd69216608 100644
--- a/x11-plugins/enigmail/Manifest
+++ b/x11-plugins/enigmail/Manifest
@@ -1,11 +1,14 @@
 AUX 70_enigmail-fix.patch 343 RMD160 a81caaa4cb6507b5a41b2593e26b984c8748a8b8 SHA1 7028cd7cf09c60325887fd0fb68a20ba3bb98b12 SHA256 895c5ffec6aa321290115f2c995658ae87f9bde027ac0414e5d76a7c9d451165
 DIST enigmail-1.0.1.tar.gz 1201945 RMD160 2abd8e70fcfcd2e75e71a97a5a3c7d1e0c292666 SHA1 334e70723fffc0631dadb6fd4449afffdeafc3f2 SHA256 7bc8541eef483d67246f3d83682ba13263f001fa94b5982c0cfbe54e5bdfd32a
+DIST enigmail-1.1.1.tar.gz 1280598 RMD160 ea8daa4715957e59c5d39e3ced3a29edf61a15dd SHA1 1310e2569e65a384eea1605653cca6562a941129 SHA256 8e67c45f52ab858f78f6d13c00f312b6d4db97eeae4963aeba1f7cad8648824c
 DIST enigmail-1.1.tar.gz 1278216 RMD160 d9dc3a0f131516bb0b3aad4c3c69eea8eff23724 SHA1 4d0d13913092dfd3f2600040d53d4d13edf4e555 SHA256 6a2daf57571bf698cfa49b0722149ed45dc4580f6a9dccb3896d9928643b14ed
 DIST mozilla-thunderbird-3.0-patches-0.3.tar.bz2 3241 RMD160 bc3b163b9c5bd7c7fb497786b2dc2da4e0a4bd28 SHA1 0182b73d48cd21204504f3bb8e17f0d9a7289464 SHA256 a430c71a12fe63662d43b4eeb5b185841a4788cbbbbd7178a3c73056ba94c5cd
 DIST mozilla-thunderbird-3.1-patches-0.1.tar.bz2 2451 RMD160 31b5126836b4fb6b5e62f4d1772fab2e4111320e SHA1 b86c3e93edc632801f3e331884404332b458d7b1 SHA256 79c6a48cdcf322226e39c0d8b5136506d6fb9c939c7ce531ac7f5c6ad3588d28
 DIST thunderbird-3.0.4.source.tar.bz2 61094371 RMD160 ed8c905e3a6061c0ff896857fda3d96146bbc6a8 SHA1 5a6e89096da61a520e5cecb61f8afeb981f90412 SHA256 fdf28d6a9ea42c98557554ba28d0a3a8db11475eee49f16aa4a3aaf2ca1f1343
+DIST thunderbird-3.1.source.tar.bz2 65633518 RMD160 bc55cf89dfe1f2c946fff8f5ec21b0377229afe7 SHA1 89e9d8099a5437ce401577fc4d526eb0dd9e51da SHA256 494090fd47944c15e3906847931d7efe77ec0e05f56dbae3a8c36d0a48616a86
 DIST thunderbird-3.1rc2.source.tar.bz2 65626643 RMD160 e5112079166ad1b38f08a761587dc9d398efae88 SHA1 49bd4be60cfa584c12ec1f188b0aa9ff54112929 SHA256 02adf7b3b2c8e5db750cf94b6e518693b8ac1c2ea438dc6eaa976e37a38ede5d
 EBUILD enigmail-1.0.1-r3.ebuild 4108 RMD160 8706883241129e832b007eb466322083f3eef350 SHA1 cd04496787dd88196e12b289b5193759b4581015 SHA256 3202a5485200e9fa86adbbcabfdda1c08274a723a1243b7a92d62ee566c29550
+EBUILD enigmail-1.1.1.ebuild 4123 RMD160 48dd9c27216ca015b3c1c593a342e5ff7e2c58de SHA1 61cc16337859a64e8eb16411804282247368b967 SHA256 48db033a86ebb337ceece298b8c813af0050c048e9997d7ef857c365497d49ba
 EBUILD enigmail-1.1.ebuild 4124 RMD160 35b6c98f46e4592d7e1880f47425e885a1a864e7 SHA1 df0d5b118b31b7b9d0472d22e16b5ce16a021eb4 SHA256 778d03960494b17498301611eb6e32afd4101e5c1c810481d24ac66a58a6d230
-MISC ChangeLog 25919 RMD160 2371e88a5fa2acca879b9790415a8be31ca3c6a0 SHA1 89dc5180842022a6fc9e86f46d335ae992148bb4 SHA256 af5159d54cfaa493c1365091431b457fb0bf6b7a700ec930021223610d51d188
+MISC ChangeLog 26041 RMD160 bd70413c06c34ed60c1b995033cdb3912fc33ac3 SHA1 8e9560fcb3eabc3e9b420f4ad6adec22d17d5497 SHA256 0b018dc47b30517c288ec6be7cccdf79711fde186cebf68cb1db032d376974f0
 MISC metadata.xml 442 RMD160 a82cb8621928aa2ddb0dc98514764c8f105393ae SHA1 f86b5de607060bfdaab09b902f7a33379b6afceb SHA256 50b3622a408b9c241a2c6139b0eb6d1dc6bec95aa420aa60fe6eebeac36be4dd
diff --git a/x11-plugins/enigmail/enigmail-1.1.1.ebuild b/x11-plugins/enigmail/enigmail-1.1.1.ebuild
new file mode 100644
index 000000000000..e8551bc14e98
--- /dev/null
+++ b/x11-plugins/enigmail/enigmail-1.1.1.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/enigmail/enigmail-1.1.1.ebuild,v 1.1 2010/06/26 14:44:05 anarchy Exp $
+
+WANT_AUTOCONF="2.1"
+EAPI="2"
+
+inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib mozextension autotools
+MY_P="${P/_beta/b}"
+EMVER="${PV}"
+TBVER="3.1"
+PATCH="mozilla-thunderbird-3.1-patches-0.1"
+
+DESCRIPTION="GnuPG encryption plugin for thunderbird."
+HOMEPAGE="http://enigmail.mozdev.org"
+REL_URI="ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/nightly/"
+SRC_URI="http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/${TBVER}/source/thunderbird-${TBVER}.source.tar.bz2
+	http://www.mozilla-enigmail.org/download/source/${PN}-${EMVER}.tar.gz
+	http://dev.gentoo.org/~anarchy/dist/${PATCH}.tar.bz2"
+
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+SLOT="0"
+LICENSE="MPL-1.1 GPL-2"
+IUSE="system-sqlite"
+
+DEPEND=">=mail-client/thunderbird-3.1_beta1[system-sqlite=]"
+RDEPEND="${DEPEND}
+	system-sqlite? ( >=dev-db/sqlite-3.6.22-r2[fts3,secure-delete] )
+	|| (
+		(
+			>=app-crypt/gnupg-2.0
+			|| (
+				app-crypt/pinentry[gtk]
+				app-crypt/pinentry[qt4]
+			)
+		)
+		=app-crypt/gnupg-1.4*
+	)"
+
+S="${WORKDIR}"/comm-1.9.2
+
+pkg_setup() {
+	# EAPI=2 ensures they are set properly.
+	export BUILD_OFFICIAL=1
+	export MOZILLA_OFFICIAL=1
+	export MOZ_CO_PROJECT=mail
+}
+
+src_unpack() {
+	unpack thunderbird-${TBVER}.source.tar.bz2 ${PATCH}.tar.bz2 || die "unpack failed"
+}
+
+src_prepare(){
+	# Apply our patches
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}"
+
+	cd mozilla
+	eautoreconf
+	cd js/src
+	eautoreconf
+
+	# Unpack the enigmail plugin
+	cd "${S}"/mailnews/extensions || die
+	unpack enigmail-${EMVER}.tar.gz
+	cd "${S}"/mailnews/extensions/enigmail || die "cd failed"
+	makemake2
+
+	cd "${S}"
+
+	# Fix installation of enigmail.js
+	epatch "${FILESDIR}"/70_enigmail-fix.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/mozilla-thunderbird"
+
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	touch mail/config/mozconfig
+	mozconfig_init
+	mozconfig_config
+
+	# tb-specific settings
+	mozconfig_annotate '' \
+		--with-system-nspr \
+		--with-system-nss \
+		--with-default-mozilla-five-home=${MOZILLA_FIVE_HOME} \
+		--with-user-appdir=.thunderbird \
+		--enable-application=mail \
+		--disable-necko-wifi \
+		--disable-libnotify
+
+	mozconfig_use_enable system-sqlite
+
+	# Finalize and report settings
+	mozconfig_final
+
+	# Disable no-print-directory
+	MAKEOPTS=${MAKEOPTS/--no-print-directory/}
+
+	if [[ $(gcc-major-version) -lt 4 ]]; then
+		append-cxxflags -fno-stack-protector
+	fi
+
+	####################################
+	#
+	#  Configure and build Thunderbird
+	#
+	####################################
+	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
+}
+
+src_compile() {
+	# Only build the parts necessary to support building enigmail
+	emake -j1 export || die "make export failed"
+	emake -C mozilla/modules/libreg || die "make modules/libreg failed"
+	emake -C mozilla/xpcom/string || die "make xpcom/string failed"
+	emake -C mozilla/xpcom || die "make xpcom failed"
+	emake -C mozilla/xpcom/obsolete || die "make xpcom/obsolete failed"
+
+	# Build the enigmail plugin
+	einfo "Building Enigmail plugin..."
+	emake -C "${S}"/mailnews/extensions/enigmail || die "make enigmail failed"
+
+	# Package the enigmail plugin; this may be the easiest way to collect the
+	# necessary files
+	emake -j1 -C "${S}"/mailnews/extensions/enigmail xpi || die "make xpi failed"
+}
+
+src_install() {
+	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/mozilla-thunderbird"
+	declare emid
+
+	cd "${T}"
+	unzip "${S}"/mozilla/dist/bin/*.xpi install.rdf
+	emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' install.rdf)
+
+	dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
+	cd "${D}"${MOZILLA_FIVE_HOME}/extensions/${emid}
+	unzip "${S}"/mozilla/dist/bin/*.xpi
+}