revision bump

Package-Manager: portage-2.1_pre4-r1

5 files changed, 186 insertions, 4 deletions

diff --git a/x11-plugins/enigmail/ChangeLog b/x11-plugins/enigmail/ChangeLog
index 284baa318145..b00aadfc9f61 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.5 2006/02/06 15:18:51 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/enigmail/ChangeLog,v 1.6 2006/02/12 00:01:41 anarchy Exp $
+
+*enigmail-0.94.0 (11 Feb 2006)
+
+  11 Feb 2006; <anarchy@gentoo.org> +files/50_enigmail_no_upgrade-1.patch,
+  +enigmail-0.94.0.ebuild:
+  revision bump
 
   06 Feb 2006; <anarchy@gentoo.org> enigmail-0.93.1-r3.ebuild:
   revision to patchset to incude makeopts patch
diff --git a/x11-plugins/enigmail/Manifest b/x11-plugins/enigmail/Manifest
index 4287963e1278..eb73cbebb609 100644
--- a/x11-plugins/enigmail/Manifest
+++ b/x11-plugins/enigmail/Manifest
@@ -1,12 +1,18 @@
-MD5 ed919bfac264570ec605c9b3e788f080 ChangeLog 1190
-RMD160 30f7065e1e05392c61a58e9531356cf5ce1f279a ChangeLog 1190
-SHA256 67c3cf6f7c81f8c9f476932b790c9a180267435c9fb8b7d6016062b756640749 ChangeLog 1190
+MD5 428b43b841270b0a091c1c1b585747be ChangeLog 1341
+RMD160 ac02bb63a23c13f07318d855bcdd4f185482e784 ChangeLog 1341
+SHA256 a2f58e8891e8c16eef168babf23214e0a16ac5ba763377159b83ff04f1334d74 ChangeLog 1341
 MD5 3a81c3a2a15519a0ca30d43714275139 enigmail-0.93.1-r2.ebuild 4166
 RMD160 f7f0c4513818831c13d1192edf54ab26b685771e enigmail-0.93.1-r2.ebuild 4166
 SHA256 01c40f747d0ca4d3e47359cff6ac24ae5da22521c4e0be0122d19bed0cef722f enigmail-0.93.1-r2.ebuild 4166
 MD5 9135cffca87783cce3d9b07d3c484f9e enigmail-0.93.1-r3.ebuild 4324
 RMD160 016b1fde7d3c16438f19cd8afe04771e5f64f06e enigmail-0.93.1-r3.ebuild 4324
 SHA256 ac4b0d58e04ed470314d0f96dd8f6c38dd6f0bc2f8286ca399e48a9a0e161ee2 enigmail-0.93.1-r3.ebuild 4324
+MD5 890768679d53ca615ad03cea0f74f53c enigmail-0.94.0.ebuild 4495
+RMD160 7f915140f214bae5afa99a3072ab660ac049dad6 enigmail-0.94.0.ebuild 4495
+SHA256 2ddfe6bed741eed916a55ddef5a21a06881dd4537fdcaf6c528940e642c15f88 enigmail-0.94.0.ebuild 4495
+MD5 fd7ac5cd0e3e465ce1c03909671c4a16 files/50_enigmail_no_upgrade-1.patch 651
+RMD160 1631ce4cb6e2758d2fe475327b9665fbefbcbe56 files/50_enigmail_no_upgrade-1.patch 651
+SHA256 1dbbc22e22d4639c407b9690280cc37d9a86919fde694be10daa3eac6c44ada2 files/50_enigmail_no_upgrade-1.patch 651
 MD5 f6da2f617f170f8bbc915d81d7588fa1 files/50_enigmail_no_upgrade.patch 633
 RMD160 38d30cb7ac0b1fddea62224d60b209dbafe0a26e files/50_enigmail_no_upgrade.patch 633
 SHA256 db3cf07fb3acf18d31716b30f7b4d74c543b6acf304a3fc18686b7bcd91ececb files/50_enigmail_no_upgrade.patch 633
@@ -19,6 +25,9 @@ SHA256 fd9f57faf042401d2c78d28eec452f0930f0c77de7604401e9d47d70c5b8003c files/di
 MD5 c1b00e08ff8408b2c73c9b8d41e119eb files/digest-enigmail-0.93.1-r3 1060
 RMD160 9be39b7702d7a6f1521b487afbee8868b6718e9e files/digest-enigmail-0.93.1-r3 1060
 SHA256 e117bbe850a282dd870e0fe5ccfdd2935dab97fa633afc4834f7f9c8e501e851 files/digest-enigmail-0.93.1-r3 1060
+MD5 ae0343cdc7a6578cae9391954cefae59 files/digest-enigmail-0.94.0 831
+RMD160 dc81c6e71741f709cd8b1e1fcec418c546dabdec files/digest-enigmail-0.94.0 831
+SHA256 f7f94087eb0d4280bf6398026cea3cdd41db7f31352a3a571b4aac2aac777248 files/digest-enigmail-0.94.0 831
 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.ebuild b/x11-plugins/enigmail/enigmail-0.94.0.ebuild
new file mode 100644
index 000000000000..6e22199960dd
--- /dev/null
+++ b/x11-plugins/enigmail/enigmail-0.94.0.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.ebuild,v 1.1 2006/02/12 00:01:41 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"
+TBPVER="1.2"
+
+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 ~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/50_enigmail_no_upgrade-1.patch b/x11-plugins/enigmail/files/50_enigmail_no_upgrade-1.patch
new file mode 100644
index 000000000000..2b814a7cdae7
--- /dev/null
+++ b/x11-plugins/enigmail/files/50_enigmail_no_upgrade-1.patch
@@ -0,0 +1,17 @@
+This patch is from Debian's enigmail-0.91 patch set
+
+--- mozilla/mailnews/extensions/enigmail/ui/content/enigmailMessengerOverlay.xul.orig	2004-11-08 23:34:04.000000000 +0000
++++ mozilla/mailnews/extensions/enigmail/ui/content/enigmailMessengerOverlay.xul	2004-11-08 23:35:20.000000000 +0000
+@@ -159,10 +159,12 @@
+         </menu>
+         
+         <menuseparator/>
++	<!--
+         <menuitem id="enigmail_upgrade"
+              label="&enigmail.upgrade.label;"
+              accesskey="&enigmail.upgrade.accesskey;"
+              oncommand="EnigUpgrade();" />
++	-->
+ 
+         <menuitem id="enigmail_help"
+              label="&enigmail.help.label;"
diff --git a/x11-plugins/enigmail/files/digest-enigmail-0.94.0 b/x11-plugins/enigmail/files/digest-enigmail-0.94.0
new file mode 100644
index 000000000000..5d0f6397e4ff
--- /dev/null
+++ b/x11-plugins/enigmail/files/digest-enigmail-0.94.0
@@ -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 27d0d601a47a63a04c7391f6e50acdb0 mozilla-thunderbird-1.5-patches-1.2.tar.bz2 17165
+RMD160 9cb5c7f8d9da655a607f6abc52c3ab91e27c2423 mozilla-thunderbird-1.5-patches-1.2.tar.bz2 17165
+SHA256 0d55d239eb0edd95c6cd16b7a0d89e7cea374abf99292c01935e3396286385d4 mozilla-thunderbird-1.5-patches-1.2.tar.bz2 17165
+MD5 781c1cd1a01583d9b666d8c2fe4288e6 thunderbird-1.5-source.tar.bz2 35028308
+RMD160 5c3a8c42c1239144c8498a81a791a534345cda3c thunderbird-1.5-source.tar.bz2 35028308
+SHA256 f075c0a3f9cf714639eb26e9f370d50efbc72d4e02bd667404f7e1128543ee57 thunderbird-1.5-source.tar.bz2 35028308