glibc-2.4 support wrt bug #125832

Package-Manager: portage-2.1_pre6-r3

4 files changed, 182 insertions, 4 deletions

diff --git a/mail-client/mozilla-thunderbird/ChangeLog b/mail-client/mozilla-thunderbird/ChangeLog
index c946e617cf02..541e733a959c 100644
--- a/mail-client/mozilla-thunderbird/ChangeLog
+++ b/mail-client/mozilla-thunderbird/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-client/mozilla-thunderbird
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/ChangeLog,v 1.101 2006/02/06 15:17:46 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/ChangeLog,v 1.102 2006/03/19 02:28:26 anarchy Exp $
+
+*mozilla-thunderbird-1.5-r2 (19 Mar 2006)
+
+  19 Mar 2006; Jory A. Pratt <anarchy@gentoo.org>
+  +mozilla-thunderbird-1.5-r2.ebuild:
+  glibc-2.4 support wrt bug #125832
 
   06 Feb 2006; <anarchy@gentoo.org> mozilla-thunderbird-1.5-r1.ebuild:
   revision to patchset to incude makeopts patch
diff --git a/mail-client/mozilla-thunderbird/Manifest b/mail-client/mozilla-thunderbird/Manifest
index a26622733f2b..87ff93b35ba8 100644
--- a/mail-client/mozilla-thunderbird/Manifest
+++ b/mail-client/mozilla-thunderbird/Manifest
@@ -1,6 +1,6 @@
-MD5 6267d4b646fdef8ab12d0cdf822050fb ChangeLog 15597
-RMD160 b3908101340122544b4b07a8c8ab86a58c4653c4 ChangeLog 15597
-SHA256 c2e7a38ae5c637f4651b0f2aebafa34ddb50ca0a9576ae5a8fb4b396568b3605 ChangeLog 15597
+MD5 56ce732dca80e9384994fbaa172a8d58 ChangeLog 15765
+RMD160 8d8df36f4ea797be3f561d8d90af38ec9402afd8 ChangeLog 15765
+SHA256 ded2489b7ff70dba22c7ebffeb97c59724da08c79b4bfcc3d1dfccc570436dbd ChangeLog 15765
 MD5 b84b32e9963589c0f2f76d98019b44d7 files/digest-mozilla-thunderbird-1.0.7 303
 RMD160 8d65b90bc9cbd304906877f4524efb44db8357be files/digest-mozilla-thunderbird-1.0.7 303
 SHA256 2190c4173d91d183ed761438b9ef316b5ce25dc0061d48d298a98a6ee85edb0c files/digest-mozilla-thunderbird-1.0.7 303
@@ -19,6 +19,9 @@ SHA256 196dcbb0ab9b7355dc11ff0e1462894fbaeb8305f984b88467a5364fa64788b5 files/di
 MD5 7667a25763ba275630130c28f9ea8f7d files/digest-mozilla-thunderbird-1.5-r1 584
 RMD160 d935f486b26bf0941da308129918f2b2d310aed0 files/digest-mozilla-thunderbird-1.5-r1 584
 SHA256 e431304d186fbdbd9ccea6562b0dd20656b619e82b6579745059e335bbb3751d files/digest-mozilla-thunderbird-1.5-r1 584
+MD5 5748e9c3b3cf0e8667d9177fba436388 files/digest-mozilla-thunderbird-1.5-r2 584
+RMD160 525130f7c3a06c3b0fef26cc581f9f654c3b80da files/digest-mozilla-thunderbird-1.5-r2 584
+SHA256 9f414b8ba38ca26a507f74a62c8991410cdf976e0074cfa38c4c2874203d8728 files/digest-mozilla-thunderbird-1.5-r2 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
@@ -82,6 +85,9 @@ SHA256 72668acde3d6f126b387f99b6ec45e23721618b4d1cd96dc728165d2f9a288c0 mozilla-
 MD5 344267287036fb0d7241d273988e99ae mozilla-thunderbird-1.5-r1.ebuild 4879
 RMD160 37ca6f79adf7b330b17d8028e2de30297d00d4d3 mozilla-thunderbird-1.5-r1.ebuild 4879
 SHA256 c422bf730c084c2fd2d91369122ea9c26503d9d6bd587ca1c37d2c33c7e2f63a mozilla-thunderbird-1.5-r1.ebuild 4879
+MD5 855801d580a70484fd9ba5212b346d68 mozilla-thunderbird-1.5-r2.ebuild 4879
+RMD160 f6cb939137c8ffa511ffccd2b769797b2b85ce75 mozilla-thunderbird-1.5-r2.ebuild 4879
+SHA256 2901f66bfe07e521e59132ec30b683f8b697581de8565da3f11a1622d2ad3944 mozilla-thunderbird-1.5-r2.ebuild 4879
 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-r2 b/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.5-r2
new file mode 100644
index 000000000000..6aa5f5cbff1a
--- /dev/null
+++ b/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.5-r2
@@ -0,0 +1,6 @@
+MD5 443f58aa6f9d56b2d044a27c5cc782cf mozilla-thunderbird-1.5-patches-1.3.tar.bz2 19535
+RMD160 fe7fab0318edb79d02d2d62aef983dedd8e9c905 mozilla-thunderbird-1.5-patches-1.3.tar.bz2 19535
+SHA256 0dc0e056337e85ddae8b103cb7a759c9147cdd25887263312f22f78aeb280127 mozilla-thunderbird-1.5-patches-1.3.tar.bz2 19535
+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-r2.ebuild b/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.5-r2.ebuild
new file mode 100644
index 000000000000..55843aed244b
--- /dev/null
+++ b/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.5-r2.ebuild
@@ -0,0 +1,160 @@
+# 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-r2.ebuild,v 1.1 2006/03/19 02:28:27 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.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/${P}-patches-${PVER}.tar.bz2
+	http://dev.gentoo.org/~anarchy/dist/${P}-patches-${PVER}.tar.bz2"
+
+KEYWORDS="~amd64 ~ppc ~x86"
+SLOT="0"
+LICENSE="MPL-1.1 NPL-1.1"
+IUSE="ldap crypt"
+
+RDEPEND=">=www-client/mozilla-launcher-1.39
+	>=dev-libs/nss-3.10
+	>=dev-libs/nspr-4.6.1"
+
+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
+	mozconfig_annotate '' --with-system-nspr
+	mozconfig_annotate '' --with-system-nss
+
+	# 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
+}