New snapshot - adds enigmail too

7 files changed, 182 insertions, 28 deletions

diff --git a/net-mail/mozilla-thunderbird/ChangeLog b/net-mail/mozilla-thunderbird/ChangeLog
index b604bce774a8..ef4f8eb8515e 100644
--- a/net-mail/mozilla-thunderbird/ChangeLog
+++ b/net-mail/mozilla-thunderbird/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-mail/mozilla-thunderbird
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mozilla-thunderbird/ChangeLog,v 1.6 2003/08/17 16:43:48 brad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mozilla-thunderbird/ChangeLog,v 1.7 2003/09/01 19:55:18 brad Exp $
+
+*mozilla-thunderbird-0.2_alpha20030826 (01 Sep 2003)
+
+  01 Sep 2003; Brad Laue <brad@gentoo.org>
+  mozilla-thunderbird-0.2_alpha20030826.ebuild,
+  files/enigmail/Makefile-enigmail, files/enigmail/Makefile-ipc:
+  New snapshot - now featuring enigmail support, at long last.
 
 *mozilla-thunderbird-0.2_alpha20030813 (17 Aug 2003)
 
diff --git a/net-mail/mozilla-thunderbird/Manifest b/net-mail/mozilla-thunderbird/Manifest
index 1c8d5e830e2c..46931115b078 100644
--- a/net-mail/mozilla-thunderbird/Manifest
+++ b/net-mail/mozilla-thunderbird/Manifest
@@ -1,11 +1,13 @@
-MD5 1adb062c6ed356e75ec53d1e35c9d350 files/MozillaThunderbird 302
-MD5 31f0d7553ef92beffbe53b0b4c722e3b files/digest-mozilla-thunderbird-0.2_alpha20030813 89
-MD5 19a56f7ab2746cd4df5428040c7c7ae6 files/digest-mozilla-thunderbird-0.1_alpha20030723 89
-MD5 fdede59cd75244a953f882f5c3ac4b3b files/digest-mozilla-thunderbird-0.1_alpha20030727 89
-MD5 442b4b9da283205c20408669cf14e687 files/digest-mozilla-thunderbird-0.2_alpha20030807 89
-MD5 619493d0b33d8390ca714975d0e05f58 ChangeLog 1711
 MD5 5dd0418c191830dfcfd74400e3f9608c metadata.xml 182
 MD5 f1c76394356bdca2a0982c583044943d mozilla-thunderbird-0.2_alpha20030813.ebuild 5151
-MD5 d9be5721d81413daf4304639e65e0951 mozilla-thunderbird-0.1_alpha20030723.ebuild 4429
+MD5 021ce52c1c9f6c03af1b1d7e29e45125 mozilla-thunderbird-0.2_alpha20030826.ebuild 5894
 MD5 e9792150421ace3fe4721d4b7116929b mozilla-thunderbird-0.1_alpha20030727.ebuild 4440
 MD5 02c3718083744ac4796fa7f44ceb8816 mozilla-thunderbird-0.2_alpha20030807.ebuild 4424
+MD5 902e53fd1b12747b7d28d18358e699ea ChangeLog 1985
+MD5 1adb062c6ed356e75ec53d1e35c9d350 files/MozillaThunderbird 302
+MD5 fdede59cd75244a953f882f5c3ac4b3b files/digest-mozilla-thunderbird-0.1_alpha20030727 89
+MD5 442b4b9da283205c20408669cf14e687 files/digest-mozilla-thunderbird-0.2_alpha20030807 89
+MD5 31f0d7553ef92beffbe53b0b4c722e3b files/digest-mozilla-thunderbird-0.2_alpha20030813 89
+MD5 3504be1c559d52704982ed5392c95aba files/digest-mozilla-thunderbird-0.2_alpha20030826 89
+MD5 e30291e992d71bccac5937cca9696da0 files/enigmail/Makefile-enigmail 1560
+MD5 68a7617a6d3f0f37904cd6aaa90fe1ba files/enigmail/Makefile-ipc 1596
diff --git a/net-mail/mozilla-thunderbird/files/digest-mozilla-thunderbird-0.1_alpha20030723 b/net-mail/mozilla-thunderbird/files/digest-mozilla-thunderbird-0.1_alpha20030723
deleted file mode 100644
index 09f2355b74fb..000000000000
--- a/net-mail/mozilla-thunderbird/files/digest-mozilla-thunderbird-0.1_alpha20030723
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2bb070f09b2d9576dbfe9496582e8c81 MozillaThunderbird-20030723-source.tar.bz2 29975590
diff --git a/net-mail/mozilla-thunderbird/files/digest-mozilla-thunderbird-0.2_alpha20030826 b/net-mail/mozilla-thunderbird/files/digest-mozilla-thunderbird-0.2_alpha20030826
new file mode 100644
index 000000000000..c2e0bf7b1ae4
--- /dev/null
+++ b/net-mail/mozilla-thunderbird/files/digest-mozilla-thunderbird-0.2_alpha20030826
@@ -0,0 +1 @@
+MD5 ed91d526d6fe305efe560eb712a2ce47 MozillaThunderbird-20030826-source.tar.bz2 30555476
diff --git a/net-mail/mozilla-thunderbird/files/enigmail/Makefile-enigmail b/net-mail/mozilla-thunderbird/files/enigmail/Makefile-enigmail
new file mode 100644
index 000000000000..c6a95caba45d
--- /dev/null
+++ b/net-mail/mozilla-thunderbird/files/enigmail/Makefile-enigmail
@@ -0,0 +1,45 @@
+#!gmake
+#
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "MPL"); you may not use this file
+# except in compliance with the MPL. You may obtain a copy of
+# the MPL at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the MPL is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the MPL for the specific language governing
+# rights and limitations under the MPL.
+# 
+# The Original Code is Enigmail.
+# 
+# The Initial Developer of the Original Code is Ramalingam Saravanan.
+# Portions created by Ramalingam Saravanan <svn@xmlterm.org> are
+# Copyright (C) 2001 Ramalingam Saravanan. All Rights Reserved.
+# 
+# Contributor(s):
+# 
+# Alternatively, the contents of this file may be used under the
+# terms of the GNU General Public License (the "GPL"), in which case
+# the provisions of the GPL are applicable instead of
+# those above. If you wish to allow use of your version of this
+# file only under the terms of the GPL and not to allow
+# others to use your version of this file under the MPL, indicate
+# your decision by deleting the provisions above and replace them
+# with the notice and other provisions required by the GPL.
+# If you do not delete the provisions above, a recipient
+# may use your version of this file under either the MPL or the
+# GPL.
+#
+
+DEPTH		= ../..
+topsrcdir	= ../..
+srcdir		= .
+VPATH		= .
+
+include $(DEPTH)/config/autoconf.mk
+
+DIRS = public src build ui package
+
+include $(topsrcdir)/config/config.mk
+
+include $(topsrcdir)/config/rules.mk
diff --git a/net-mail/mozilla-thunderbird/files/enigmail/Makefile-ipc b/net-mail/mozilla-thunderbird/files/enigmail/Makefile-ipc
new file mode 100644
index 000000000000..99c2231f3d0c
--- /dev/null
+++ b/net-mail/mozilla-thunderbird/files/enigmail/Makefile-ipc
@@ -0,0 +1,51 @@
+#!gmake
+#
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "MPL"); you may not use this file
+# except in compliance with the MPL. You may obtain a copy of
+# the MPL at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the MPL is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the MPL for the specific language governing
+# rights and limitations under the MPL.
+# 
+# The Original Code is protoZilla.
+# 
+# The Initial Developer of the Original Code is Ramalingam Saravanan.
+# Portions created by Ramalingam Saravanan <svn@xmlterm.org> are
+# Copyright (C) 2001 Ramalingam Saravanan. All Rights Reserved.
+# 
+# Contributor(s):
+# 
+# Alternatively, the contents of this file may be used under the
+# terms of the GNU General Public License (the "GPL"), in which case
+# the provisions of the GPL are applicable instead of
+# those above. If you wish to allow use of your version of this
+# file only under the terms of the GPL and not to allow
+# others to use your version of this file under the MPL, indicate
+# your decision by deleting the provisions above and replace them
+# with the notice and other provisions required by the GPL.
+# If you do not delete the provisions above, a recipient
+# may use your version of this file under either the MPL or the
+# GPL.
+#
+
+DEPTH		= ../..
+topsrcdir	= ../..
+srcdir		= .
+VPATH		= .
+
+include $(DEPTH)/config/autoconf.mk
+
+DIRS            = public src
+
+ifdef BUILD_IPC
+DIRS		+= build
+endif
+
+ifdef ENABLE_TESTS
+DIRS		+= tests
+endif
+
+include $(topsrcdir)/config/rules.mk
diff --git a/net-mail/mozilla-thunderbird/mozilla-thunderbird-0.1_alpha20030723.ebuild b/net-mail/mozilla-thunderbird/mozilla-thunderbird-0.2_alpha20030826.ebuild
index 26e391d47fdd..00c8fdef83af 100644
--- a/net-mail/mozilla-thunderbird/mozilla-thunderbird-0.1_alpha20030723.ebuild
+++ b/net-mail/mozilla-thunderbird/mozilla-thunderbird-0.2_alpha20030826.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mozilla-thunderbird/mozilla-thunderbird-0.1_alpha20030723.ebuild,v 1.2 2003/08/01 15:35:43 brad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mozilla-thunderbird/mozilla-thunderbird-0.2_alpha20030826.ebuild,v 1.1 2003/09/01 19:55:18 brad Exp $
 
 inherit makeedit flag-o-matic gcc nsplugins
 
@@ -8,35 +8,41 @@ inherit makeedit flag-o-matic gcc nsplugins
 replace-sparc64-flags
 
 S=${WORKDIR}/mozilla
-MOZ_CO_DATE="20030723"
+MOZ_CO_DATE="20030826"
+
+EMVER="0.81.latest"
+IPCVER="1.0.4"
 
 DESCRIPTION="Thunderbird Mail Client"
 HOMEPAGE="http://www.mozilla.org/projects/thunderbird/"
-SRC_URI="mirror://gentoo/MozillaThunderbird-${MOZ_CO_DATE}-source.tar.bz2"
+SRC_URI="mirror://gentoo/MozillaThunderbird-${MOZ_CO_DATE}-source.tar.bz2
+	 crypt? ( http://downloads.mozdev.org/enigmail/src/enigmail-${EMVER}.tar.gz
+	   		  http://downloads.mozdev.org/enigmail/src/ipc-${IPCVER}.tar.gz )"
 
 KEYWORDS="~x86 ~ppc ~sparc ~alpha"
 SLOT="0"
 LICENSE="MPL-1.1 | NPL-1.1"
-IUSE="gtk2 ipv6 gnome"
+IUSE="gtk2 ipv6 crypt"
 
 RDEPEND="virtual/x11
-   >=dev-libs/libIDL-0.8.0
-   >=gnome-base/ORBit-0.5.10-r1
-   virtual/xft
-   >=sys-libs/zlib-1.1.4
-   >=media-libs/jpeg-6b
-   >=media-libs/libmng-1.0.0
-   >=media-libs/libpng-1.2.1
-   >=sys-apps/portage-2.0.36
-   dev-libs/expat
-   app-arch/zip
-   app-arch/unzip
-   ( gtk2? >=x11-libs/gtk+-2.1.1 :
-     =x11-libs/gtk+-1.2* ) "
+	>=dev-libs/libIDL-0.8.0
+	>=gnome-base/ORBit-0.5.10-r1
+	virtual/xft
+	>=sys-libs/zlib-1.1.4
+	>=media-libs/jpeg-6b
+	>=media-libs/libmng-1.0.0
+	>=media-libs/libpng-1.2.1
+	>=sys-apps/portage-2.0.36
+	dev-libs/expat
+	app-arch/zip
+	app-arch/unzip
+	( gtk2? >=x11-libs/gtk+-2.1.1 :
+     =x11-libs/gtk+-1.2* )
+	crypt? ( >=app-crypt/gnupg-1.2.1 )"
 
 DEPEND="${RDEPEND}
-   virtual/glibc
-   dev-lang/perl"
+	virtual/glibc
+	dev-lang/perl"
    
 # needed by src_compile() and src_install()
 export MOZ_THUNDERBIRD=1
@@ -46,6 +52,18 @@ src_unpack() {
 
 	unpack MozillaThunderbird-${MOZ_CO_DATE}-source.tar.bz2
 
+	# Unpack the enigmail plugin
+	if use crypt
+		then
+			unpack ipc-${IPCVER}.tar.gz
+			unpack enigmail-${EMVER}.tar.gz
+
+			mv -f ${WORKDIR}/ipc ${S}/extensions/
+			mv -f ${WORKDIR}/enigmail ${S}/extensions/
+			cp ${FILESDIR}/enigmail/Makefile-ipc ${S}/extensions/ipc/Makefile
+			cp ${FILESDIR}/enigmail/Makefile-enigmail ${S}/extensions/enigmail/Makefile
+	fi
+
 }
 
 src_compile() {
@@ -123,6 +141,18 @@ src_compile() {
 
    edit_makefiles
    emake MOZ_THUNDERBIRD=1 || die
+
+	# Build the enigmail plugin
+	if use crypt
+	then
+		einfo "Building Enigmail plugin..."
+		cd ${S}/extensions/ipc
+		make || die
+           
+		cd ${S}/extensions/enigmail
+		make || die
+	fi
+
 }
 
 src_install() {
@@ -155,3 +185,22 @@ src_install() {
 
 }
 
+pkg_postinst() {
+
+	export MOZILLA_FIVE_HOME="${ROOT}/usr/lib/MozillaThunderbird"
+
+	# Needed to update the run time bindings for REGXPCOM 
+	# (do not remove next line!)
+	env-update
+	# Register Components and Chrome
+	einfo "Registering Components and Chrome..."
+	LD_LIBRARY_PATH=/usr/lib/MozillaThunderbird ${MOZILLA_FIVE_HOME}/regxpcom
+	LD_LIBRARY_PATH=/usr/lib/MozillaThunderbird ${MOZILLA_FIVE_HOME}/regchrome
+	# Fix permissions of component registry
+	chmod 0644 ${MOZILLA_FIVE_HOME}/components/compreg.dat
+	# Fix directory permissions
+	find ${MOZILLA_FIVE_HOME}/ -type d -perm 0700 -exec chmod 0755 {} \; || :
+	# Fix permissions on chrome files
+	find ${MOZILLA_FIVE_HOME}/chrome/ -name '*.rdf' -exec chmod 0644 {} \; || :
+
+}