revision for thunderbird 1.5.0.2

(Portage version: 2.1_pre7-r5)

4 files changed, 163 insertions, 1 deletions

diff --git a/x11-plugins/enigmail/ChangeLog b/x11-plugins/enigmail/ChangeLog
index 489f1a2dd9ba..a9265164f223 100644
--- a/x11-plugins/enigmail/ChangeLog
+++ b/x11-plugins/enigmail/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-plugins/enigmail
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/enigmail/ChangeLog,v 1.10 2006/03/23 21:53:31 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/enigmail/ChangeLog,v 1.11 2006/04/23 14:42:22 anarchy Exp $
+
+*enigmail-0.94.0-r2 (23 Apr 2006)
+
+  23 Apr 2006; Jory A. Pratt <anarchy@gentoo.org>
+  +enigmail-0.94.0-r2.ebuild:
+  revision for 1.5.0.2 thunderburd
 
   23 Mar 2006; Aron Griffis <agriffis@gentoo.org> enigmail-0.94.0-r1.ebuild:
   Mark 0.94.0-r1 ~ia64
diff --git a/x11-plugins/enigmail/Manifest b/x11-plugins/enigmail/Manifest
index 7546a87403c8..aebed618bae3 100644
--- a/x11-plugins/enigmail/Manifest
+++ b/x11-plugins/enigmail/Manifest
@@ -10,6 +10,9 @@ SHA256 ac4b0d58e04ed470314d0f96dd8f6c38dd6f0bc2f8286ca399e48a9a0e161ee2 enigmail
 MD5 84189a53046f96148bb6b9ab6ecdc036 enigmail-0.94.0-r1.ebuild 4505
 RMD160 0a7fac738883cd9f335a174a513b338cb09b75ce enigmail-0.94.0-r1.ebuild 4505
 SHA256 ead56f071b242b2e8f1f6208327b7598c8c7bf41adc3f06feaca811f4cd67598 enigmail-0.94.0-r1.ebuild 4505
+MD5 12e371838e72abafd35421c6edeceeb5 enigmail-0.94.0-r2.ebuild 4509
+RMD160 622d925d806a25d4a6fc2e215c2f433e52ebc308 enigmail-0.94.0-r2.ebuild 4509
+SHA256 dcd4a69bd21c246bfcde3bd5ca22bc460e2425e70e32586f9a55aad4d33675fb enigmail-0.94.0-r2.ebuild 4509
 MD5 c111242453fc272162407c13183200b4 enigmail-0.94.0.ebuild 4496
 RMD160 04c9d220422d8705db05418db9cb4c42f61d57bb enigmail-0.94.0.ebuild 4496
 SHA256 8a3c75a7ae8a428f01893d489d30892231a4c9212f8739187bd9a898067ac160 enigmail-0.94.0.ebuild 4496
@@ -34,6 +37,9 @@ SHA256 f7f94087eb0d4280bf6398026cea3cdd41db7f31352a3a571b4aac2aac777248 files/di
 MD5 cd5c51587cb3f4a8c22da638f90f61fe files/digest-enigmail-0.94.0-r1 831
 RMD160 68cab18950cc3d55a25dddf83d374588dc187465 files/digest-enigmail-0.94.0-r1 831
 SHA256 70db0ce5d932e655175328a44f99b916323abd5c2066f66e4c66d8ab90d9ca5e files/digest-enigmail-0.94.0-r1 831
+MD5 cc0822093be4a84f53376d34e684bbd2 files/digest-enigmail-0.94.0-r2 855
+RMD160 a9d05aaf3031c2714d06b6a689a64db420133ba3 files/digest-enigmail-0.94.0-r2 855
+SHA256 1d08b664beb1e337a85cf268b71f6cf90aee2d5417ba4760372cd0a923530eda files/digest-enigmail-0.94.0-r2 855
 MD5 c00ea2b2717491804ceababb4c14cc5b files/firefox-1.5-visibility-check.patch 10955
 RMD160 9a5db3a7d6f5539ca77e116aed276d833925a43a files/firefox-1.5-visibility-check.patch 10955
 SHA256 439355e899ea43fd2f82adae6fb4dc7363ca526ce307ce0faba76e533af1dc7c files/firefox-1.5-visibility-check.patch 10955
diff --git a/x11-plugins/enigmail/enigmail-0.94.0-r2.ebuild b/x11-plugins/enigmail/enigmail-0.94.0-r2.ebuild
new file mode 100644
index 000000000000..a472f8f478e1
--- /dev/null
+++ b/x11-plugins/enigmail/enigmail-0.94.0-r2.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/enigmail/enigmail-0.94.0-r2.ebuild,v 1.1 2006/04/23 14:42:22 anarchy Exp $
+
+unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
+inherit flag-o-matic toolchain-funcs eutils nsplugins mozcoreconf makeedit multilib autotools
+
+EMVER=${PV}
+TBVER="1.5.0.2"
+TBPVER="1.1"
+
+DESCRIPTION="Gnupg encryption plugin for thunderbird."
+HOMEPAGE="http://www.enigmail.mozdev.org"
+SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${TBVER}/source/thunderbird-${TBVER}-source.tar.bz2
+	mirror://gentoo/mozilla-thunderbird-${TBVER}-patches-${TBPVER}.tar.bz2
+	http://dev.gentoo.org/~anarchy/dist/mozilla-thunderbird-${TBVER}-patches-${TBPVER}.tar.bz2
+	http://www.mozilla-enigmail.org/downloads/src/enigmail-${EMVER}.tar.gz"
+
+KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
+SLOT="0"
+LICENSE="MPL-1.1 NPL-1.1"
+IUSE=""
+
+DEPEND=">=mail-client/mozilla-thunderbird-1.5"
+RDEPEND="${DEPEND}
+	>=app-crypt/gnupg-1.4
+	>=www-client/mozilla-launcher-1.37"
+
+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() {
+	unpack thunderbird-${TBVER}-source.tar.bz2 mozilla-thunderbird-${TBVER}-patches-${TBPVER}.tar.bz2 || die "unpack failed"
+	cd ${S} || die "cd failed"
+
+	# Apply our patches
+	EPATCH_FORCE="yes" epatch ${WORKDIR}/patch
+
+	# Unpack the enigmail plugin
+	cd ${S}/mailnews/extensions || die
+	unpack enigmail-${EMVER}.tar.gz
+	cd ${S}/mailnews/extensions/enigmail || die "cd failed"
+	typeset m topdir
+	for m in $(find ../ -name Makefile.in); do
+		topdir=$(echo "$m" | sed -r 's:[^/]+:..:g')
+		sed -e "s:@srcdir@:.:g" -e "s:@top_srcdir@:${topdir}:g" \
+			< ${m} > ${m%.in} || die "sed ${m} failed"
+	done
+
+	cd ${S}
+
+	# Use the right theme for thunderbird #45609
+	sed -i -ne '/^enigmail-skin.jar:$/ { :x; n; /^\t/bx; }; p' mailnews/extensions/enigmail/ui/jar.mn
+
+	# Don't allow upgrades via the browser
+	epatch ${FILESDIR}/50_enigmail_no_upgrade-1.patch
+
+	# Fix installation of enigmail.js
+	epatch ${FILESDIR}/70_enigmail-fix.patch
+
+	eautoreconf || die "failed running autoreconf"
+}
+
+src_compile() {
+	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/mozilla-thunderbird
+
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	mozconfig_init
+
+	# tb-specific settings
+	mozconfig_annotate '' \
+		--with-system-nspr \
+		--with-system-nss \
+		--with-default-mozilla-five-home=${MOZILLA_FIVE_HOME} \
+		--with-user-appdir=.thunderbird
+
+	# Finalize and report settings
+	mozconfig_final
+
+	# hardened GCC uses -fstack-protector-all by default, and this breaks
+	# thunderbird
+	has_hardened && append-flags -fno-stack-protector-all
+	replace-flags -fstack-protector-all -fstack-protector
+
+	####################################
+	#
+	#  Configure and build Thunderbird
+	#
+	####################################
+
+	econf  || die "econf failed"
+
+	# This removes extraneous CFLAGS from the Makefiles to reduce RAM
+	# requirements while compiling
+	edit_makefiles
+
+	# Only build the parts necessary to support building enigmail
+	emake -j1 export || die "make export failed"
+	emake -C modules/libreg || die "make modules/libreg failed"
+	emake -C xpcom/string || die "make xpcom/string failed"
+	emake -C xpcom || die "make xpcom failed"
+	emake -C 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}/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}/dist/bin/*.xpi
+
+	# these files will be picked up by mozilla-launcher -register
+	dodir ${MOZILLA_FIVE_HOME}/{chrome,extensions}.d
+	insinto ${MOZILLA_FIVE_HOME}/chrome.d
+	newins ${S}/dist/bin/chrome/installed-chrome.txt ${PN}
+	echo "extension,${emid}" > ${D}${MOZILLA_FIVE_HOME}/extensions.d/${PN}
+}
diff --git a/x11-plugins/enigmail/files/digest-enigmail-0.94.0-r2 b/x11-plugins/enigmail/files/digest-enigmail-0.94.0-r2
new file mode 100644
index 000000000000..980d05d086cc
--- /dev/null
+++ b/x11-plugins/enigmail/files/digest-enigmail-0.94.0-r2
@@ -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 25081844ca4292c4eeb8f55b1c8e3660 mozilla-thunderbird-1.5.0.2-patches-1.1.tar.bz2 29990
+RMD160 ad7078bf82757bc2503861ead0e64b83a579fe7b mozilla-thunderbird-1.5.0.2-patches-1.1.tar.bz2 29990
+SHA256 cb911773dba65fc17ccf55267dcc024c3da1a1b45424b575293bbdaa6ba309bf mozilla-thunderbird-1.5.0.2-patches-1.1.tar.bz2 29990
+MD5 3f32b847330c9d58297147be19714962 thunderbird-1.5.0.2-source.tar.bz2 35880369
+RMD160 8aaf02c205b131a38fa0384fe6126eec325c3e9e thunderbird-1.5.0.2-source.tar.bz2 35880369
+SHA256 d01a4edef782ea0d86e7ed5899ffdd48998211d5e134e3e93b1a0f9e56198151 thunderbird-1.5.0.2-source.tar.bz2 35880369