initial 1.5 import for preperations of final release

(Portage version: 2.0.53_rc7)

7 files changed, 267 insertions, 1 deletions

diff --git a/mail-client/mozilla-thunderbird/ChangeLog b/mail-client/mozilla-thunderbird/ChangeLog
index 9359c52d09c4..ad7d29f52f18 100644
--- a/mail-client/mozilla-thunderbird/ChangeLog
+++ b/mail-client/mozilla-thunderbird/ChangeLog
@@ -1,6 +1,13 @@
 # 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.92 2005/11/13 20:15:21 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/ChangeLog,v 1.93 2005/11/15 02:26:33 anarchy Exp $
+
+*mozilla-thunderbird-1.5_rc1 (15 Nov 2005)
+
+  15 Nov 2005; <anarchy@gentoo.org> +files/thunderbird-cairo-canvas.patch,
+  +files/thunderbird-nopangoxft.patch, +files/thunderbird-visibility.patch,
+  +mozilla-thunderbird-1.5_rc1.ebuild:
+  initial import for 1.5 testing and preparations, not intended for users
 
   13 Nov 2005; Michael Hanselmann <hansmi@gentoo.org>
   mozilla-thunderbird-1.0.7-r2.ebuild:
diff --git a/mail-client/mozilla-thunderbird/Manifest b/mail-client/mozilla-thunderbird/Manifest
index a59dc576e031..b43ab840ea5b 100644
--- a/mail-client/mozilla-thunderbird/Manifest
+++ b/mail-client/mozilla-thunderbird/Manifest
@@ -2,13 +2,18 @@ MD5 3c0c85cd4b91a631e0e7b2e167073c61 ChangeLog 13641
 MD5 b84b32e9963589c0f2f76d98019b44d7 files/digest-mozilla-thunderbird-1.0.7 303
 MD5 34fc13a505bfb805c539a3b4f0b1bcbf files/digest-mozilla-thunderbird-1.0.7-r1 303
 MD5 106701e2f4e5e9e73301f95dd92c3306 files/digest-mozilla-thunderbird-1.0.7-r2 227
+MD5 ed1976eae02ff1d7ea4409be6be9be78 files/digest-mozilla-thunderbird-1.5_rc1 228
 MD5 1c810870d0c92c730341e491c310e2d4 files/icon/mozillathunderbird.desktop 184
 MD5 04115f0e204444eac76a092a63c89027 files/icon/thunderbird-icon.png 6499
 MD5 23d6b685fd5e49a07cc4a1786871bf47 files/mozilla-alpha-xpcom-subs-fix.patch 4953
 MD5 07a5a1ce0146f1badc4e04849a9b1830 files/mozilla-thunderbird-1.0.6-gcc4.patch 6131
 MD5 1783f8e4678fb4731ccc67b4bfba1981 files/mozilla-thunderbird-1.0.7-gcc-4.0.2.patch 6861
+MD5 7847d262e628dcac303586fe02f2e8c4 files/thunderbird-cairo-canvas.patch 446
+MD5 91661761f2f232b08b74f5adc4f1eff0 files/thunderbird-nopangoxft.patch 839
 MD5 07f9a980afa2dde67554657c00b8be18 files/thunderbird-rpath-1.patch 1716
+MD5 362f9e0b0f25b964f7120b68fb629ee0 files/thunderbird-visibility.patch 689
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
 MD5 2896cc99ffbb38fe463d98feb1e954f0 mozilla-thunderbird-1.0.7-r1.ebuild 5640
 MD5 0ef89d2954584a386d1d201ebecb465c mozilla-thunderbird-1.0.7-r2.ebuild 6095
 MD5 55697b53bd932c2ea9c20d3d5e3b771e mozilla-thunderbird-1.0.7.ebuild 5632
+MD5 8f14bc42c78bba421f07fc55411f632d mozilla-thunderbird-1.5_rc1.ebuild 6192
diff --git a/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.5_rc1 b/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.5_rc1
new file mode 100644
index 000000000000..5e7545aa5c90
--- /dev/null
+++ b/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.5_rc1
@@ -0,0 +1,3 @@
+MD5 1d6205bf7449fcdcae08cc1db524760d mozilla-firefox-1.0-4ft2.patch.bz2 5601
+MD5 7960994910bda4c14a52bc119f9ceefc mozilla-jslibmath-alpha.patch 625
+MD5 0df70073cc6ac9f6772f82bc9e024543 thunderbird-1.5rc1-source.tar.bz2 35022501
diff --git a/mail-client/mozilla-thunderbird/files/thunderbird-cairo-canvas.patch b/mail-client/mozilla-thunderbird/files/thunderbird-cairo-canvas.patch
new file mode 100644
index 000000000000..fdcb7e7a95b6
--- /dev/null
+++ b/mail-client/mozilla-thunderbird/files/thunderbird-cairo-canvas.patch
@@ -0,0 +1,14 @@
+--- content/canvas/src/Makefile.in.orig	2005-08-23 01:46:46.000000000 +0000
++++ content/canvas/src/Makefile.in	2005-08-23 01:49:49.000000000 +0000
+@@ -77,6 +77,11 @@
+ 		libpixman \
+ 		$(NULL)
+ 
++ifndef MOZ_TREE_CAIRO
++LOCAL_INCLUDES          += $(MOZ_CAIRO_CFLAGS)
++EXTRA_DSO_LDOPTS        += $(MOZ_CAIRO_LIBS)
++endif
++
+ # XXX some platforms can't handle building
+ # an empty .a/lib.  Remove this dummy.cpp
+ # whenever w have a rendering context
diff --git a/mail-client/mozilla-thunderbird/files/thunderbird-nopangoxft.patch b/mail-client/mozilla-thunderbird/files/thunderbird-nopangoxft.patch
new file mode 100644
index 000000000000..608e803a1083
--- /dev/null
+++ b/mail-client/mozilla-thunderbird/files/thunderbird-nopangoxft.patch
@@ -0,0 +1,20 @@
+--- mozilla/gfx/src/gtk/mozilla-decoder.cpp.noxft	2005-08-18 22:41:26.000000000 -0400
++++ mozilla/gfx/src/gtk/mozilla-decoder.cpp	2005-08-18 22:38:01.000000000 -0400
+@@ -40,7 +40,7 @@
+ #define PANGO_ENABLE_ENGINE
+ 
+ #include "mozilla-decoder.h"
+-#include <pango/pangoxft.h>
++#include <pango/pangocairo.h>
+ #include <pango/pangofc-fontmap.h>
+ #include <pango/pangofc-font.h>
+ #include <gdk/gdkx.h>
+@@ -208,7 +208,7 @@
+         }
+     }
+ 
+-    pango_fc_font_map_add_decoder_find_func(PANGO_FC_FONT_MAP(pango_xft_get_font_map(GDK_DISPLAY(),gdk_x11_get_default_screen())),
++    pango_fc_font_map_add_decoder_find_func(PANGO_FC_FONT_MAP(pango_cairo_font_map_get_default()),
+                                             mozilla_find_decoder,
+                                             NULL,
+                                             NULL);
diff --git a/mail-client/mozilla-thunderbird/files/thunderbird-visibility.patch b/mail-client/mozilla-thunderbird/files/thunderbird-visibility.patch
new file mode 100644
index 000000000000..698c8770770a
--- /dev/null
+++ b/mail-client/mozilla-thunderbird/files/thunderbird-visibility.patch
@@ -0,0 +1,20 @@
+ --- configure   2 Mar 2005 16:57:17 -0000   1.1395
++++ configure   3 Mar 2005 17:50:31 -0000
+@@ -7042,7 +7042,7 @@
+
+ fi
+
+-if test "$GNU_CC"; then
++if /bin/false; then
+   echo $ac_n "checking for visibility(hidden) attribute""... $ac_c" 1>&6
+ echo "configure:7048: checking for visibility(hidden) attribute" >&5
+ if eval "test \"`echo '$''{'ac_cv_visibility_hidden'+set}'`\" = set"; then
+
+diff -u -r1.1.2.1 gcc_hidden.h
+--- nsprpub/config/gcc_hidden.h 15 Dec 2004 05:52:39 -0000  1.1.2.1
++++ nsprpub/config/gcc_hidden.h 3 Mar 2005 17:51:06 -0000
+@@ -1,2 +1,3 @@
+-/* Begin all files as hidden visibility */
++/* Begin all files as hidden visibility
+ #pragma GCC visibility push(hidden)
++*/ 
diff --git a/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.5_rc1.ebuild b/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.5_rc1.ebuild
new file mode 100644
index 000000000000..6eefa721bfd3
--- /dev/null
+++ b/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.5_rc1.ebuild
@@ -0,0 +1,197 @@
+# 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.5_rc1.ebuild,v 1.1 2005/11/15 02:26:33 anarchy Exp $
+
+unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
+inherit flag-o-matic toolchain-funcs eutils mozconfig-2 mozilla-launcher makeedit multilib versionator
+
+MY_P="$(replace_version_separator 2 '')"
+TV=${MY_P/beta/b}
+
+DESCRIPTION="Thunderbird Mail Client"
+HOMEPAGE="http://www.mozilla.org/projects/thunderbird/"
+SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${TV}/source/thunderbird-${TV}-source.tar.bz2
+	mirror://gentoo/mozilla-firefox-1.0-4ft2.patch.bz2
+	mirror://gentoo/mozilla-jslibmath-alpha.patch"
+
+KEYWORDS="-*"
+SLOT="0"
+LICENSE="MPL-1.1 NPL-1.1"
+IUSE="ldap"
+
+RDEPEND=">=www-client/mozilla-launcher-1.39"
+
+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() {
+	declare x
+
+	for x in ${A}; do
+		[[ $x == *.tar.* ]] || continue
+		unpack $x || die "unpack failed"
+	done
+	cd ${S} || die "cd failed"
+
+	####################################
+	#
+	# architecture patches
+	#
+	####################################
+
+	# amd64 visibility patch
+	if [[ ${ARCH} == amd64 ]] && [[ $(gcc-major-version) -ge 3 ]]; then
+		epatch ${FILESDIR}/thunderbird-visibility.patch
+	fi
+
+	# patch to fix math operations on alpha, makes maps.google.com work!
+	epatch ${DISTDIR}/mozilla-jslibmath-alpha.patch
+
+	####################################
+	#
+	# general compilation and run-time fixes
+	#
+	####################################
+
+	# patch from fedora to remove the pangoxft things
+	epatch ${FILESDIR}/thunderbird-nopangoxft.patch
+	#cairo-canvas patch
+	epatch ${FILESDIR}/thunderbird-cairo-canvas.patch
+
+	# Fix a compilation issue using the 32-bit userland with 64-bit kernel on
+	# PowerPC, because with that configuration, it detects a ppc64 system.
+	# -- hansmi, 2005-11-13
+	if use ppc && [[ "${PROFILE_ARCH}" == ppc64 ]]; then
+		sed -i -e "s#OS_TEST=\`uname -m\`\$#OS_TEST=${ARCH}#" \
+			${S}/configure
+		sed -i -e "s#OS_TEST :=.*uname -m.*\$#OS_TEST:=${ARCH}#" \
+			${S}/security/coreconf/arch.mk
+	fi
+
+	echo  ""
+	ewarn "This thunderbird-1.5rc1 ebuild is provided for your convenience,"
+	ewarn "the use of this ebuild is not supported by gentoo developers. "
+	ewarn "Please file bugs related to firefox-1.5 with upstream developers."
+	ewarn "Bugs should be filed @ https://bugzilla.mozilla.org."
+	ewarn "Thank you Anarchy"
+}
+
+src_compile() {
+	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
+
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	mozconfig_init
+
+	# tb-specific settings
+	mozconfig_use_enable ldap
+	mozconfig_use_enable ldap ldap-experimental
+	mozconfig_annotate '' --enable-extensions=default
+	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
+	mozconfig_annotate '' --with-user-appdir=.thunderbird
+
+	# Finalize and report settings
+	mozconfig_final
+
+	# hardened GCC uses -fstack-protector-all by default, which breaks us
+	has_hardened && append-flags -fno-stack-protector-all
+	replace-flags -fstack-protector-all -fstack-protector
+
+	####################################
+	#
+	#  Configure and build
+	#
+	####################################
+
+	CPPFLAGS="${CPPFLAGS} -DARON_WAS_HERE" \
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
+	econf || die
+
+	# It would be great if we could pass these in via CPPFLAGS or CFLAGS prior
+	# to econf, but the quotes cause configure to fail.
+	sed -i -e \
+		's|-DARON_WAS_HERE|-DGENTOO_NSPLUGINS_DIR=\\\"/usr/'"$(get_libdir)"'/nsplugins\\\" -DGENTOO_NSBROWSER_PLUGINS_DIR=\\\"/usr/'"$(get_libdir)"'/nsbrowser/plugins\\\"|' \
+		${S}/config/autoconf.mk \
+		${S}/nsprpub/config/autoconf.mk \
+		${S}/xpfe/global/buildconfig.html
+
+	# Fixup the RPATH
+	sed -i -e \
+		's|#RPATH_FIXER|'"${MOZILLA_FIVE_HOME}"'|' \
+		${S}/config/rules.mk \
+		${S}/nsprpub/config/rules.mk \
+		${S}/security/coreconf/rules.mk \
+		${S}/security/coreconf/rules.mk
+
+
+	# This removes extraneous CFLAGS from the Makefiles to reduce RAM
+	# requirements while compiling
+	edit_makefiles
+
+	emake || die
+}
+
+src_install() {
+	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
+
+	# Most of the installation happens here
+	dodir ${MOZILLA_FIVE_HOME}
+	cp -RL --no-preserve=links ${S}/dist/bin/* ${D}${MOZILLA_FIVE_HOME}
+
+	# Create directory structure to support portage-installed extensions.
+	# See update_chrome() in mozilla-launcher
+	keepdir ${MOZILLA_FIVE_HOME}/chrome.d
+	keepdir ${MOZILLA_FIVE_HOME}/extensions.d
+	cp ${D}${MOZILLA_FIVE_HOME}/chrome/installed-chrome.txt \
+		${D}${MOZILLA_FIVE_HOME}/chrome.d/0_base-chrome.txt
+
+	# 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_postinst() {
+	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
+
+	# 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
+
+	echo  ""
+	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"
+
+	echo  ""
+	ewarn "This thunderbird-1.5rc1 ebuild is provided for your convenience,"
+	ewarn "the use of this ebuild is not supported by gentoo developers. "
+	ewarn "Please file bugs related to firefox-1.5 with upstream developers."
+	ewarn "Bugs should be filed @ https://bugzilla.mozilla.org."
+	ewarn "Thank you Anarchy"
+}
+
+pkg_postrm() {
+	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
+
+	update_mozilla_launcher_symlinks
+}