Bump patches to match thunderbird-1.5.0.5. Patch provided by Joshua Baergen <joshuabaergen@gentoo.org>.

Package-Manager: portage-2.1.1_pre4

4 files changed, 167 insertions, 5 deletions

diff --git a/x11-plugins/enigmail/ChangeLog b/x11-plugins/enigmail/ChangeLog
index b95c64bfadc4..6aa42c742695 100644
--- a/x11-plugins/enigmail/ChangeLog
+++ b/x11-plugins/enigmail/ChangeLog
@@ -1,6 +1,13 @@
 # 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.26 2006/07/26 05:03:57 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/enigmail/ChangeLog,v 1.27 2006/07/30 11:12:09 kloeri Exp $
+
+*enigmail-0.94.0-r5 (30 Jul 2006)
+
+  30 Jul 2006; Bryan Østergaard <kloeri@gentoo.org>
+  +enigmail-0.94.0-r5.ebuild:
+  Bump patches to match thunderbird-1.5.0.5. Patch provided by Joshua Baergen
+  <joshuabaergen@gentoo.org>.
 
   26 Jul 2006; Joshua Kinard <kumba@gentoo.org> enigmail-0.94.0-r4.ebuild:
   Modified ebuild to use the 0.2 patchball from thunderbird, uses *.patch
diff --git a/x11-plugins/enigmail/Manifest b/x11-plugins/enigmail/Manifest
index 66c7b6f47a54..72fada2101fc 100644
--- a/x11-plugins/enigmail/Manifest
+++ b/x11-plugins/enigmail/Manifest
@@ -26,9 +26,11 @@ DIST mozilla-thunderbird-1.5-patches-1.3.tar.bz2 19535 RMD160 fe7fab0318edb79d02
 DIST mozilla-thunderbird-1.5.0.2-patches-1.2.tar.bz2 30310 RMD160 e4e0f2ccd314b58f8710bcc9ce45b927d7e8a2c6 SHA256 22c67ef7ec994aa6137a95e5cb844429f48ff743641c5fe40e891ef8921006e3
 DIST mozilla-thunderbird-1.5.0.2-patches-1.3.tar.bz2 31424 RMD160 a3e22fd8de4688e7e3ed513c86f6317cab9308b5 SHA256 25a6d47859303fd2c1e49d6d81bb1b6c3c729e37bde43d4f277ef75902dbaa17
 DIST mozilla-thunderbird-1.5.0.4-patches-0.2.tar.bz2 30684 RMD160 82a4da8cf5dad04c1bedc9425d31f33a8eedf31f SHA1 2fa562bbd2ad69a56af57e02e85c2bc697c29ec6 SHA256 6f707b64a4e1ca1b36287f45f018cb70b6e04d7e0580cba7805b403ae1092f93
+DIST mozilla-thunderbird-1.5.0.5-patches-0.1.tar.bz2 30684 RMD160 82a4da8cf5dad04c1bedc9425d31f33a8eedf31f SHA1 2fa562bbd2ad69a56af57e02e85c2bc697c29ec6 SHA256 6f707b64a4e1ca1b36287f45f018cb70b6e04d7e0580cba7805b403ae1092f93
 DIST thunderbird-1.5-source.tar.bz2 35028308 RMD160 5c3a8c42c1239144c8498a81a791a534345cda3c SHA256 f075c0a3f9cf714639eb26e9f370d50efbc72d4e02bd667404f7e1128543ee57
 DIST thunderbird-1.5.0.2-source.tar.bz2 35880369 RMD160 8aaf02c205b131a38fa0384fe6126eec325c3e9e SHA256 d01a4edef782ea0d86e7ed5899ffdd48998211d5e134e3e93b1a0f9e56198151
 DIST thunderbird-1.5.0.4-source.tar.bz2 35872600 RMD160 27e88578d8857e48b46ee4dff2900f27b8a0f447 SHA1 492dd76460fc14543a70349263b64b0a2803bee9 SHA256 b665c89bfc18a84c57d85370889973cfc547e1e942aba5798321ea34e4ddbca7
+DIST thunderbird-1.5.0.5-source.tar.bz2 35998778 RMD160 aa32d59efa7d55eb516d967c1fb4cc6cc13f874b SHA1 475ae30ead41847120c36f432b3359f0d60ea9da SHA256 b6fc27b79d0a4dabb30011cc6ba6161080f991ccadae12e5214cac86d009b005
 EBUILD enigmail-0.93.1-r2.ebuild 4166 RMD160 f7f0c4513818831c13d1192edf54ab26b685771e SHA1 0df765cde3e4eec50291bea2888ee873671252ad SHA256 01c40f747d0ca4d3e47359cff6ac24ae5da22521c4e0be0122d19bed0cef722f
 MD5 3a81c3a2a15519a0ca30d43714275139 enigmail-0.93.1-r2.ebuild 4166
 RMD160 f7f0c4513818831c13d1192edf54ab26b685771e enigmail-0.93.1-r2.ebuild 4166
@@ -53,14 +55,18 @@ EBUILD enigmail-0.94.0-r4.ebuild 4247 RMD160 d9719c3fad6a3f5ea34852b5304c69715b6
 MD5 4972cf5d6eda61963fb090a5ce350f21 enigmail-0.94.0-r4.ebuild 4247
 RMD160 d9719c3fad6a3f5ea34852b5304c69715b6fa57f enigmail-0.94.0-r4.ebuild 4247
 SHA256 0e31cea43a67bdf047a76a6aa2ad193f92b17290a306a4642b31f0272a16bd22 enigmail-0.94.0-r4.ebuild 4247
+EBUILD enigmail-0.94.0-r5.ebuild 4253 RMD160 fc375b0c16989fb183607e5ffcaab4eae68e2996 SHA1 2dea11d9255d3d1dfbed46a58933e3f4565aa0bc SHA256 864b4f4d4208af8646f5d648a0af2ab98a991b1b90a90966bfb19540deed5d26
+MD5 a5bab8faa8b50fdc043b1e69ef783b2f enigmail-0.94.0-r5.ebuild 4253
+RMD160 fc375b0c16989fb183607e5ffcaab4eae68e2996 enigmail-0.94.0-r5.ebuild 4253
+SHA256 864b4f4d4208af8646f5d648a0af2ab98a991b1b90a90966bfb19540deed5d26 enigmail-0.94.0-r5.ebuild 4253
 EBUILD enigmail-0.94.0.ebuild 4496 RMD160 04c9d220422d8705db05418db9cb4c42f61d57bb SHA1 b5a8cc3fe8d5f670433b6263a86e1ad5ceef0792 SHA256 8a3c75a7ae8a428f01893d489d30892231a4c9212f8739187bd9a898067ac160
 MD5 c111242453fc272162407c13183200b4 enigmail-0.94.0.ebuild 4496
 RMD160 04c9d220422d8705db05418db9cb4c42f61d57bb enigmail-0.94.0.ebuild 4496
 SHA256 8a3c75a7ae8a428f01893d489d30892231a4c9212f8739187bd9a898067ac160 enigmail-0.94.0.ebuild 4496
-MISC ChangeLog 3981 RMD160 5fae66ac940d3faf59aac6c32147fa4f259a200b SHA1 f8fa8305383b77e1f14b1e543cc93a90d1595d43 SHA256 e99e10d0c3b01816018d8e12800490d926357b59d5a2f7b03ef8da03bc13fef4
-MD5 c295ef10afc8ea5b4c7fc6837b26d3aa ChangeLog 3981
-RMD160 5fae66ac940d3faf59aac6c32147fa4f259a200b ChangeLog 3981
-SHA256 e99e10d0c3b01816018d8e12800490d926357b59d5a2f7b03ef8da03bc13fef4 ChangeLog 3981
+MISC ChangeLog 4209 RMD160 9dbb785783908547842d4a6d3844e105ec92c6e2 SHA1 cbb17378ae5d230d54a3b00501cc4d986427098e SHA256 fb409782b2afad596c8b50ce664628e34cee2e6d414d7e61c4ce07734819f712
+MD5 dd6f12d9a311dab2a969f310ac73b6e3 ChangeLog 4209
+RMD160 9dbb785783908547842d4a6d3844e105ec92c6e2 ChangeLog 4209
+SHA256 fb409782b2afad596c8b50ce664628e34cee2e6d414d7e61c4ce07734819f712 ChangeLog 4209
 MISC metadata.xml 238 RMD160 20be188d400f8ae54fb1eae8bfb243c43eed2395 SHA1 fb7dacf03f1ce8294d6d2f07d4c2d7ff69ee7525 SHA256 ef51e99b6b1ccee48a71906e90a4111f58793292fe1248934a811fcb02506036
 MD5 22a1feabf45dadbfa2268b7fff3ce66e metadata.xml 238
 RMD160 20be188d400f8ae54fb1eae8bfb243c43eed2395 metadata.xml 238
@@ -86,3 +92,6 @@ SHA256 c19d43a92503716eb54b76157efeb4d4a2f6e15119a6058ac3cf3eedd8aecd88 files/di
 MD5 a39dbe7871173deb32851a5112bc598c files/digest-enigmail-0.94.0-r4 855
 RMD160 9e786b4bbe66559cf1045f58c8b1e75653410cde files/digest-enigmail-0.94.0-r4 855
 SHA256 46c890cf8569e7b719709e4844e025057cc8762ee5161bcaa61b0ad3cb920193 files/digest-enigmail-0.94.0-r4 855
+MD5 510b90d90d5aa17b5612bb6b409adb39 files/digest-enigmail-0.94.0-r5 855
+RMD160 659a703e71d6853ad99718e778543dd27f6da84f files/digest-enigmail-0.94.0-r5 855
+SHA256 dffa6023cbb81b2a5810788ee8a7e8d5db0091329d28c4efa636477e35fcccd1 files/digest-enigmail-0.94.0-r5 855
diff --git a/x11-plugins/enigmail/enigmail-0.94.0-r5.ebuild b/x11-plugins/enigmail/enigmail-0.94.0-r5.ebuild
new file mode 100644
index 000000000000..c5f4296d5c4e
--- /dev/null
+++ b/x11-plugins/enigmail/enigmail-0.94.0-r5.ebuild
@@ -0,0 +1,137 @@
+# 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-r5.ebuild,v 1.1 2006/07/30 11:12:09 kloeri 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.5"
+TBPVER="0.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://www.mozilla-enigmail.org/downloads/src/enigmail-${EMVER}.tar.gz"
+
+KEYWORDS="~amd64 ~ia64 ~mips ~ppc ~sparc ~x86"
+SLOT="0"
+LICENSE="MPL-1.1 NPL-1.1"
+IUSE=""
+
+DEPEND=">=mail-client/mozilla-thunderbird-${TBVER}"
+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_SUFFIX="patch" \
+	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"
+	makemake2
+
+	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
+	gcc-specs-ssp && 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-r5 b/x11-plugins/enigmail/files/digest-enigmail-0.94.0-r5
new file mode 100644
index 000000000000..a1df7b944260
--- /dev/null
+++ b/x11-plugins/enigmail/files/digest-enigmail-0.94.0-r5
@@ -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 1a7192b65d270b4249558a1f32f191bf mozilla-thunderbird-1.5.0.5-patches-0.1.tar.bz2 30684
+RMD160 82a4da8cf5dad04c1bedc9425d31f33a8eedf31f mozilla-thunderbird-1.5.0.5-patches-0.1.tar.bz2 30684
+SHA256 6f707b64a4e1ca1b36287f45f018cb70b6e04d7e0580cba7805b403ae1092f93 mozilla-thunderbird-1.5.0.5-patches-0.1.tar.bz2 30684
+MD5 b09d29f912c2133a75b44f4801fc62b0 thunderbird-1.5.0.5-source.tar.bz2 35998778
+RMD160 aa32d59efa7d55eb516d967c1fb4cc6cc13f874b thunderbird-1.5.0.5-source.tar.bz2 35998778
+SHA256 b6fc27b79d0a4dabb30011cc6ba6161080f991ccadae12e5214cac86d009b005 thunderbird-1.5.0.5-source.tar.bz2 35998778