--- mozilla-thunderbird-1.0.7-r2.ebuild.orig	2005-11-27 21:07:59.000000000 +0100
+++ mozilla-thunderbird-1.0.7-r2.ebuild	2005-11-27 22:02:34.000000000 +0100
@@ -5,18 +5,24 @@
 unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
 inherit flag-o-matic toolchain-funcs eutils mozconfig mozilla-launcher makeedit multilib
 
+EMVER="0.93.0"
+IPCVER="1.1.3"
+
 DESCRIPTION="Thunderbird Mail Client"
 HOMEPAGE="http://www.mozilla.org/projects/thunderbird/"
 SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${PV}/source/thunderbird-${PV}-source.tar.bz2
 	mirror://gentoo/mozilla-firefox-1.0-4ft2.patch.bz2
-	mirror://gentoo/mozilla-jslibmath-alpha.patch"
+	mirror://gentoo/mozilla-jslibmath-alpha.patch
+	crypt? (  http://www.mozilla-enigmail.org/downloads/src/enigmail-${EMVER}.tar.gz
+		  http://www.mozilla-enigmail.org/downloads/src/ipc-${IPCVER}.tar.gz )"
 
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
 SLOT="0"
 LICENSE="MPL-1.1 NPL-1.1"
-IUSE="mozcalendar ldap"
+IUSE="crypt mozcalendar ldap"
 
-RDEPEND=">=www-client/mozilla-launcher-1.39"
+RDEPEND=">=www-client/mozilla-launcher-1.39
+	crypt? ( >=app-crypt/gnupg-1.4 )"
 
 S=${WORKDIR}/mozilla
 
@@ -78,6 +84,16 @@
 		sed -i -e "s#OS_TEST :=.*uname -m.*\$#OS_TEST:=${ARCH}#" \
 			${S}/security/coreconf/arch.mk
 	fi
+
+	# Unpack the enigmail plugin
+	if use crypt; then
+		for x in ipc enigmail; do
+			mv ${WORKDIR}/${x} ${S}/extensions || die "mv failed"
+			cd ${S}/extensions/${x} || die "cd failed"
+			makemake        # from mozilla.eclass
+		done
+	fi
+
 }
 
 src_compile() {
@@ -137,6 +153,16 @@
 	edit_makefiles
 
 	emake || die
+
+	# Build the enigmail plugin
+	if use crypt; then
+		einfo "Building Enigmail plugin..."
+		cd ${S}/extensions/ipc || die "cd ipc failed"
+		make || die "make ipc failed"
+
+		cd ${S}/extensions/enigmail || die "cd enigmail failed"
+		make || die "make enigmail failed"
+	fi
 }
 
 src_install() {
@@ -178,10 +204,6 @@
 	# thunderbird-bin ebuilds.
 	update_mozilla_launcher_symlinks
 
-	ewarn "Enigmail Support has been dropped since it doesn't work on fresh install."
-	ewarn "The Gentoo Mozilla team is working on making enigmail its own build,"
-	ewarn "sorry for the inconvenience.  For now, you can download enigmail from"
-	ewarn "http://enigmail.mozdev.org"
 }
 
 pkg_postrm() {