Add pmasked development ebuild which will break enigmail out into its own

ebuild. Additionally this ebuild changes MOZILLA_FIVE_HOME to
/usr/lib/thunderbird and moves chromes to /var/lib/thunderbird. It's no
longer necessary to use a snapshot of initialization files since
mozilla-launcher-1.33 has a -register mechanism which is called in
pkg_postinst
(Portage version: 2.0.51.22-r1)

4 files changed, 158 insertions, 17 deletions

diff --git a/mail-client/mozilla-thunderbird/ChangeLog b/mail-client/mozilla-thunderbird/ChangeLog
index 4487caaea48d..57f4615e87e4 100644
--- a/mail-client/mozilla-thunderbird/ChangeLog
+++ b/mail-client/mozilla-thunderbird/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for mail-client/mozilla-thunderbird
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/ChangeLog,v 1.61 2005/06/24 22:29:18 smithj Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/ChangeLog,v 1.62 2005/06/29 13:34:37 agriffis Exp $
+
+*mozilla-thunderbird-1.0.2-r10 (29 Jun 2005)
+
+  29 Jun 2005; Aron Griffis <agriffis@gentoo.org>
+  +mozilla-thunderbird-1.0.2-r10.ebuild:
+  Add pmasked development ebuild which will break enigmail out into its own
+  ebuild. Additionally this ebuild changes MOZILLA_FIVE_HOME to
+  /usr/lib/thunderbird and moves chromes to /var/lib/thunderbird. It's no
+  longer necessary to use a snapshot of initialization files since
+  mozilla-launcher-1.33 has a -register mechanism which is called in
+  pkg_postinst
 
   24 Jun 2005; Jonathan Smith <smithj@gentoo.org>
   mozilla-thunderbird-1.0.2-r1.ebuild:
diff --git a/mail-client/mozilla-thunderbird/Manifest b/mail-client/mozilla-thunderbird/Manifest
index 33650566b2be..2d1887820335 100644
--- a/mail-client/mozilla-thunderbird/Manifest
+++ b/mail-client/mozilla-thunderbird/Manifest
@@ -1,22 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
 MD5 cd216f0b74621c41992dfcf451636054 mozilla-thunderbird-1.0.2.ebuild 6174
+MD5 8c2ae89620a719568d5e641bad763ee2 mozilla-thunderbird-1.0.2-r10.ebuild 6374
 MD5 0ddfdfdffb8b17d732f425fc1102fa17 ChangeLog 7026
-MD5 54b5b4f88eca9884412348311c2b4ecc mozilla-thunderbird-1.0.2-r1.ebuild 6284
-MD5 558a424a1a9905cedc4e7ef902e8c1c3 files/digest-mozilla-thunderbird-1.0.2 207
+MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
+MD5 a3ab6ae2213780c0e20c5b9aa8f018e9 files/mozilla-thunderbird-1.0.2-gcc4.patch 1818
 MD5 23d6b685fd5e49a07cc4a1786871bf47 files/mozilla-alpha-xpcom-subs-fix.patch 4953
 MD5 e79634ee1e611182b6c227daa362b20d files/mozilla-thunderbird-0.9-4ft2.patch 22360
-MD5 a3ab6ae2213780c0e20c5b9aa8f018e9 files/mozilla-thunderbird-1.0.2-gcc4.patch 1818
-MD5 f014f20584305e86670ed50e990745db files/thunderbird-0.7-init.tar.bz2 3345
 MD5 f904cce3be497c53c3ffd5373b7851b4 files/digest-mozilla-thunderbird-1.0.2-r1 207
-MD5 1c810870d0c92c730341e491c310e2d4 files/icon/mozillathunderbird.desktop 184
+MD5 f014f20584305e86670ed50e990745db files/thunderbird-0.7-init.tar.bz2 3345
+MD5 4554f1dd231571b9b1d8d16460d78adf files/digest-mozilla-thunderbird-1.0.2-r10 207
+MD5 558a424a1a9905cedc4e7ef902e8c1c3 files/digest-mozilla-thunderbird-1.0.2 207
 MD5 04115f0e204444eac76a092a63c89027 files/icon/thunderbird-icon.png 6499
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCvIlwl5AvwDPiUowRAo6SAKCS+K3hdpGvOxP+mPZtgZDkqBmLcwCg2g3t
-XgdjhQ3x2ApXgKxF3ljsafk=
-=U7ii
------END PGP SIGNATURE-----
+MD5 1c810870d0c92c730341e491c310e2d4 files/icon/mozillathunderbird.desktop 184
diff --git a/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.0.2-r10 b/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.0.2-r10
new file mode 100644
index 000000000000..9a0f875de613
--- /dev/null
+++ b/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.0.2-r10
@@ -0,0 +1,3 @@
+MD5 9e5b8a3edb3ced400e769dc2faa45317 thunderbird-1.0.2-source.tar.bz2 33354397
+MD5 50c369ce6d6fcb2d275cd30319a601ff enigmail-0.92.0.tar.gz 377123
+MD5 64ba4c6e3b52568468c4f6680ec7e679 ipc-1.1.3.tar.gz 102593
diff --git a/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.2-r10.ebuild b/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.2-r10.ebuild
new file mode 100644
index 000000000000..52ce6519f1a9
--- /dev/null
+++ b/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.2-r10.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.2-r10.ebuild,v 1.1 2005/06/29 13:34:37 agriffis Exp $
+
+unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
+inherit flag-o-matic toolchain-funcs eutils nsplugins mozconfig mozilla-launcher makeedit multilib
+
+EMVER="0.92.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"
+
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+SLOT="0"
+LICENSE="MPL-1.1 NPL-1.1"
+IUSE=""
+
+RDEPEND=">=www-client/mozilla-launcher-1.33"
+
+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_THUNDERBIRD=1
+
+src_unpack() {
+	unpack ${A} || die "unpack failed"
+	cd ${S} || die "cd failed"
+
+	if [[ $(gcc-major-version) -eq 3 ]]; then
+		# ABI Patch for alpha/xpcom for gcc-3.x
+		if [[ ${ARCH} == alpha ]]; then
+			epatch ${FILESDIR}/mozilla-alpha-xpcom-subs-fix.patch
+		fi
+	fi
+
+	# patch out ft caching code since the API changed between releases of
+	# freetype; this enables freetype-2.1.8+ compat.
+	# https://bugzilla.mozilla.org/show_bug.cgi?id=234035#c65
+	epatch ${FILESDIR}/mozilla-thunderbird-0.9-4ft2.patch
+
+	# GCC 4 compile patch ; bug #87800
+	epatch ${FILESDIR}/${P}-gcc4.patch
+}
+
+src_compile() {
+	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/thunderbird
+
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	mozconfig_init
+
+	# tb-specific settings
+	mozconfig_use_enable ldap
+	mozconfig_use_enable ldap ldap-experimental
+	mozconfig_annotate '' \
+		--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
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/thunderbird
+
+	# Most of the installation happens here
+	dodir ${MOZILLA_FIVE_HOME}
+	cp -RL --no-preserve=links ${S}/dist/bin/* ${D}${MOZILLA_FIVE_HOME}
+
+	# Chromes will live in /var, registered in pkg_postinst
+	keepdir ${MOZILLA_FIVE_HOME/usr/var}
+
+	# Create /usr/bin/thunderbird
+	install_mozilla_launcher_stub thunderbird $MOZILLA_FIVE_HOME
+
+	# Install icon and .desktop for menu entry
+	insinto /usr/share/pixmaps
+	doins ${FILESDIR}/icon/thunderbird-icon.png
+
+	# Fix bug 54179: Install .desktop file into /usr/share/applications
+	# instead of /usr/share/gnome/apps/Internet (18 Jun 2004 agriffis)
+	insinto /usr/share/applications
+	doins ${FILESDIR}/icon/mozillathunderbird.desktop
+}
+
+pkg_preinst() {
+	# Remove entire installed instance to solve various
+	# problems, for example see bug 27719
+	rm -rf ${ROOT}/usr/$(get_libdir)/thunderbird
+}
+
+pkg_postinst() {
+	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/thunderbird"
+
+	# Update the component registry
+	MOZILLA_LIBDIR=${ROOT}${MOZILLA_FIVE_HOME} MOZILLA_LAUNCHER=thunderbird \
+		/usr/libexec/mozilla-launcher -register
+
+	# This should be called in the postinst and postrm of all the
+	# mozilla, mozilla-bin, firefox, firefox-bin, thunderbird and
+	# thunderbird-bin ebuilds.
+	update_mozilla_launcher_symlinks
+}
+
+pkg_postrm() {
+	update_mozilla_launcher_symlinks
+}