bug fixes, nss/nspr system changes

Package-Manager: portage-2.1_pre4-r1

3 files changed, 168 insertions, 0 deletions

diff --git a/mail-client/mozilla-thunderbird/Manifest b/mail-client/mozilla-thunderbird/Manifest
index 529270061067..8227059636a4 100644
--- a/mail-client/mozilla-thunderbird/Manifest
+++ b/mail-client/mozilla-thunderbird/Manifest
@@ -16,6 +16,9 @@ SHA256 bd23e6fbbb4a6af5dfc758cbece7ddc501f9c8f72f9ed19763e5c19650c4bdc0 files/di
 MD5 9766549a184a8638b6c01f717801b294 files/digest-mozilla-thunderbird-1.5 225
 RMD160 37ae1a2b45f1edb5d67ded69adfae69892084f55 files/digest-mozilla-thunderbird-1.5 225
 SHA256 196dcbb0ab9b7355dc11ff0e1462894fbaeb8305f984b88467a5364fa64788b5 files/digest-mozilla-thunderbird-1.5 225
+MD5 2bf2b04612a51fae7782fd2619b709e2 files/digest-mozilla-thunderbird-1.5-r1 584
+RMD160 ad6d9a1991d5607beb1496bfaa55d17cd33864bf files/digest-mozilla-thunderbird-1.5-r1 584
+SHA256 e3b0a1010b23e1e203d0a9817ac548768223d473d44c9b5cd09fed34e3002547 files/digest-mozilla-thunderbird-1.5-r1 584
 MD5 b92734c051b7734d459e23f7c4a01b63 files/firefox-1.1-uriloader-1.patch 13902
 RMD160 cb816967a91e0a60a238ad11736eec5ac5da3754 files/firefox-1.1-uriloader-1.patch 13902
 SHA256 ac9ef7ec790856d35609a051596579b0cc5a327542614ab420505a2669b388bb files/firefox-1.1-uriloader-1.patch 13902
@@ -76,6 +79,9 @@ SHA256 ac325d486022d7dda7b935b55288725659b36ceda2b71ea7fb8869aab790ac7a mozilla-
 MD5 55697b53bd932c2ea9c20d3d5e3b771e mozilla-thunderbird-1.0.7.ebuild 5632
 RMD160 8bd50c2ff4f286eb3d8712bfe438ec9c9ef17864 mozilla-thunderbird-1.0.7.ebuild 5632
 SHA256 72668acde3d6f126b387f99b6ec45e23721618b4d1cd96dc728165d2f9a288c0 mozilla-thunderbird-1.0.7.ebuild 5632
+MD5 3761b06a46cbdf3e3121b85e80d42072 mozilla-thunderbird-1.5-r1.ebuild 4747
+RMD160 bb97ecfab818cf48b520e3965a706fca04969e07 mozilla-thunderbird-1.5-r1.ebuild 4747
+SHA256 4407d4eeb131edeffd041af4ba5f887b054bdb38b8d6be15b390fb5d117d844e mozilla-thunderbird-1.5-r1.ebuild 4747
 MD5 51c5ba513cf3d2726c09d6981e922299 mozilla-thunderbird-1.5.ebuild 5760
 RMD160 f532d9a7838e3310b85ac19720b5979adaf181ab mozilla-thunderbird-1.5.ebuild 5760
 SHA256 65edb632fc9feb8c6fe6668564ccf1f18422f2e948da0f5c585d6c24cd8a59e9 mozilla-thunderbird-1.5.ebuild 5760
diff --git a/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.5-r1 b/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.5-r1
new file mode 100644
index 000000000000..8d3416085166
--- /dev/null
+++ b/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.5-r1
@@ -0,0 +1,6 @@
+MD5 0a8963d56683dca895a9c616478fa1b3 mozilla-thunderbird-1.5-patches-1.1.tar.bz2 16934
+RMD160 9060f61691d7b88d93fc3a51692001dfaf845689 mozilla-thunderbird-1.5-patches-1.1.tar.bz2 16934
+SHA256 1553059e5a494208a7bc51ceb606c06261b4dac8b0706b880bef3382d4244433 mozilla-thunderbird-1.5-patches-1.1.tar.bz2 16934
+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
diff --git a/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.5-r1.ebuild b/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.5-r1.ebuild
new file mode 100644
index 000000000000..c9c7ca017f09
--- /dev/null
+++ b/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.5-r1.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2006 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-r1.ebuild,v 1.1 2006/02/01 22:21:18 anarchy Exp $
+
+unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
+inherit flag-o-matic toolchain-funcs eutils mozconfig-2 mozilla-launcher makeedit multilib autotools
+
+PVER="1.1"
+
+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/${P}-patches-${PVER}.tar.bz2
+	http://dev.gentoo.org/~anarchy/dist/${P}-patches-${PVER}.tar.bz2"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+LICENSE="MPL-1.1 NPL-1.1"
+IUSE="ldap crypt"
+
+RDEPEND=">=www-client/mozilla-launcher-1.39"
+
+PDEPEND="crypt? ( x11-plugins/enigmail ) "
+
+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() {
+	declare x
+
+	for x in ${A}; do
+		[[ $x == *.tar.* ]] || continue
+		unpack $x || die "unpack failed"
+	done
+	cd ${S} || die "cd failed"
+
+	# Apply our patches
+	EPATCH_FORCE="yes" epatch ${WORKDIR}/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
+
+	WANT_AUTOCONF="2.13" \
+		WANT_AUTOMAKE="2.13" \
+		eautoreconf || die "failed running autoreconf"
+}
+
+src_compile() {
+	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
+
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	mozconfig_init
+	mozconfig_config
+
+	# 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
+	#
+	####################################
+	append-flags -freorder-blocks -fno-reorder-functions
+
+	CPPFLAGS="${CPPFLAGS}" \
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
+	econf || die
+
+	# This removes extraneous CFLAGS from the Makefiles to reduce RAM
+	# requirements while compiling
+	edit_makefiles
+
+	emake || die
+}
+
+pkg_preinst() {
+	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
+
+	echo ""
+	einfo "We are removing old install before we continue. This is to help"
+	einfo "eliminate any problems during the install, sorry for those of you"
+	einfo "who disagree with this but this will ensure a sane build for everyone"
+	einfo "Comments and suggestion should be addressed to mozilla@gentoo.org"
+	rm -rf ${ROOT}${MOZILLA_FIVE_HOME}
+}
+
+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
+}
+
+pkg_postrm() {
+	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
+
+	update_mozilla_launcher_symlinks
+}