rpath support, p.masked for testing

(Portage version: 2.0.51.22-r2)

5 files changed, 250 insertions, 20 deletions

diff --git a/mail-client/mozilla-thunderbird/ChangeLog b/mail-client/mozilla-thunderbird/ChangeLog
index a9108a8946f7..9f43910f384b 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/ChangeLog,v 1.81 2005/08/02 12:48:47 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/ChangeLog,v 1.82 2005/08/19 05:24:51 anarchy Exp $
+
+*mozilla-thunderbird-1.0.6-r5 (15 Aug 2005)
+
+  15 Aug 2005; Jory A. Pratt <anarchy@gentoo.org>
+  +files/thunderbird-rpath-1.patch, +mozilla-thunderbird-1.0.6-r5.ebuild:
+  rpath applied, p.masked for further testing
 
 *mozilla-thunderbird-1.0.6-r4 (02 Aug 2005)
 
diff --git a/mail-client/mozilla-thunderbird/Manifest b/mail-client/mozilla-thunderbird/Manifest
index 4ecf129b6b94..f26f40f9ac7d 100644
--- a/mail-client/mozilla-thunderbird/Manifest
+++ b/mail-client/mozilla-thunderbird/Manifest
@@ -1,28 +1,21 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 7af0edf12380cd3fe97d8d2ea3859b32 mozilla-thunderbird-1.0.6-r3.ebuild 5290
+MD5 c2897c34945f20ad053012fd0343de12 ChangeLog 11546
+MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
 MD5 9f8a30a5db14358d2dc4415696e127af mozilla-thunderbird-1.0.5-r1.ebuild 4322
 MD5 4bc9516d4d3a8f835aedb450aa72caf4 mozilla-thunderbird-1.0.5.ebuild 4259
 MD5 0de78038591c16287d68ca07e9336d1e mozilla-thunderbird-1.0.6-r2.ebuild 5292
+MD5 7af0edf12380cd3fe97d8d2ea3859b32 mozilla-thunderbird-1.0.6-r3.ebuild 5290
 MD5 b2a1a98869c68c2eb081a7705bc54d25 mozilla-thunderbird-1.0.6-r4.ebuild 5636
-MD5 c2897c34945f20ad053012fd0343de12 ChangeLog 11546
-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 188cbfa0d9fd2e20bef7532b6f9ac0ac mozilla-thunderbird-1.0.6-r5.ebuild 5711
+MD5 360f4688625a7f73f782b59d4b9575bd files/digest-mozilla-thunderbird-1.0.5 156
 MD5 360f4688625a7f73f782b59d4b9575bd files/digest-mozilla-thunderbird-1.0.5-r1 156
 MD5 7bb4144812a01ca4baebba3acc63b143 files/digest-mozilla-thunderbird-1.0.6-r2 307
+MD5 23d6b685fd5e49a07cc4a1786871bf47 files/mozilla-alpha-xpcom-subs-fix.patch 4953
+MD5 a3ab6ae2213780c0e20c5b9aa8f018e9 files/mozilla-thunderbird-1.0.2-gcc4.patch 1818
+MD5 f014f20584305e86670ed50e990745db files/thunderbird-0.7-init.tar.bz2 3345
+MD5 07a5a1ce0146f1badc4e04849a9b1830 files/mozilla-thunderbird-1.0.6-gcc4.patch 6131
 MD5 7bb4144812a01ca4baebba3acc63b143 files/digest-mozilla-thunderbird-1.0.6-r3 307
 MD5 211f98642c8ef130f420c3ee2242a3a0 files/digest-mozilla-thunderbird-1.0.6-r4 303
-MD5 07a5a1ce0146f1badc4e04849a9b1830 files/mozilla-thunderbird-1.0.6-gcc4.patch 6131
-MD5 f014f20584305e86670ed50e990745db files/thunderbird-0.7-init.tar.bz2 3345
-MD5 360f4688625a7f73f782b59d4b9575bd files/digest-mozilla-thunderbird-1.0.5 156
-MD5 04115f0e204444eac76a092a63c89027 files/icon/thunderbird-icon.png 6499
+MD5 07f9a980afa2dde67554657c00b8be18 files/thunderbird-rpath-1.patch 1716
+MD5 35ae2ae8c51e3f6bb3f48f8cc63e3627 files/digest-mozilla-thunderbird-1.0.6-r5 431
 MD5 1c810870d0c92c730341e491c310e2d4 files/icon/mozillathunderbird.desktop 184
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC8Mz/BXaUFmZvwyMRAtK0AKCYCvG0DyUlyd1koCzlfYC2VRxTKgCgwNRV
-/NkdHLZu5IakB7sVKhI+IKY=
-=lNrt
------END PGP SIGNATURE-----
+MD5 04115f0e204444eac76a092a63c89027 files/icon/thunderbird-icon.png 6499
diff --git a/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.0.6-r5 b/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.0.6-r5
new file mode 100644
index 000000000000..ae1a65a4783d
--- /dev/null
+++ b/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.0.6-r5
@@ -0,0 +1,6 @@
+MD5 a0ddcc8bd5ee2c9be724b6963ad27111 thunderbird-1.0.6-source.tar.bz2 33366077
+MD5 1d6205bf7449fcdcae08cc1db524760d mozilla-firefox-1.0-4ft2.patch.bz2 5601
+MD5 50c369ce6d6fcb2d275cd30319a601ff enigmail-0.92.0.tar.gz 377123
+MD5 64ba4c6e3b52568468c4f6680ec7e679 ipc-1.1.3.tar.gz 102593
+MD5 7960994910bda4c14a52bc119f9ceefc mozilla-jslibmath-alpha.patch 625
+MD5 a120cd14ade242622387f76875ca9c39 mozilla-1.7.10-nsplugins-v2.patch 1968
diff --git a/mail-client/mozilla-thunderbird/files/thunderbird-rpath-1.patch b/mail-client/mozilla-thunderbird/files/thunderbird-rpath-1.patch
new file mode 100644
index 000000000000..39969cd63ec1
--- /dev/null
+++ b/mail-client/mozilla-thunderbird/files/thunderbird-rpath-1.patch
@@ -0,0 +1,47 @@
+--- config/rules.mk.orig	2005-07-28 01:45:18.000000000 +0000
++++ config/rules.mk	2005-07-28 01:45:21.000000000 +0000
+@@ -507,5 +507,10 @@
+ # 
+ ifeq ($(OS_ARCH),Linux)
+ ifdef IS_COMPONENT
++DSO_LDOPTS += -Wl,-R#RPATH_FIXER
++OS_LDFLAGS += -Wl,-R#RPATH_FIXER
+ EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
++else
++DSO_LDOPTS += -Wl,-R#RPATH_FIXER
++OS_LDFLAGS += -Wl,-R#RPATH_FIXER
+ endif
+--- nsprpub/config/rules.mk.orig	2003-09-16 02:00:28.000000000 +0000
++++ nsprpub/config/rules.mk	2005-07-30 04:00:21.000000000 +0000
+@@ -87,6 +87,9 @@
+ endif
+ endif
+ 
++DSO_LDOPTS += -Wl,-R#RPATH_FIXER
++OS_LDFLAGS += -Wl,-R#RPATH_FIXER
++
+ #
+ # This makefile contains rules for building the following kinds of
+ # libraries:
+--- security/coreconf/rules.mk.orig	2005-07-31 16:31:37.000000000 +0000
++++ security/coreconf/rules.mk	2005-07-31 16:37:27.000000000 +0000
+@@ -349,7 +349,7 @@
+ ifdef XP_OS2_VACPP
+ 	$(MKSHLIB) $(DLLFLAGS) $(LDFLAGS) $(OBJS) $(SUB_SHLOBJS) $(LD_LIBS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS)
+ else
+-	$(MKSHLIB) -o $@ $(OBJS) $(SUB_SHLOBJS) $(LD_LIBS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS)
++	$(MKSHLIB) -Wl,-R#RPATH_FIXER -o $@ $(OBJS) $(SUB_SHLOBJS) $(LD_LIBS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS)
+ endif
+ 	chmod +x $@
+ ifeq ($(OS_TARGET),Darwin)
+--- security/coreconf/rules.mk.orig	2005-08-01 11:40:54.000000000 +0000
++++ security/coreconf/rules.mk	2005-08-01 11:50:31.000000000 +0000
+@@ -291,7 +291,7 @@
+ ifdef XP_OS2_VACPP
+ 	$(MKPROG) -Fe$@ $(CFLAGS) $(OBJS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS)
+ else
+-	$(MKPROG) -o $@ $(CFLAGS) $(OBJS) $(LDFLAGS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS)
++	$(MKPROG) -Wl,-R#RPATH_FIXER -o $@ $(CFLAGS) $(OBJS) $(LDFLAGS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS)
+ endif
+ endif
+ 
diff --git a/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.6-r5.ebuild b/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.6-r5.ebuild
new file mode 100644
index 000000000000..1f637699571b
--- /dev/null
+++ b/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.6-r5.ebuild
@@ -0,0 +1,178 @@
+# 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.6-r5.ebuild,v 1.1 2005/08/19 05:24:51 anarchy Exp $
+
+unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
+inherit flag-o-matic toolchain-funcs eutils mozconfig mozilla-launcher makeedit multilib
+
+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/mozilla-firefox-1.0-4ft2.patch.bz2
+	mirror://gentoo/mozilla-jslibmath-alpha.patch
+	http://dev.gentoo.org/~agriffis/dist/mozilla-1.7.10-nsplugins-v2.patch"
+
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+SLOT="0"
+LICENSE="MPL-1.1 NPL-1.1"
+IUSE="mozcalendar 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
+	#
+	####################################
+
+	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 to fix math operations on alpha, makes maps.google.com work!
+	epatch ${DISTDIR}/mozilla-jslibmath-alpha.patch
+
+	####################################
+	#
+	# general compilation and run-time fixes
+	#
+	####################################
+
+	# GCC4 compile fix, bug #87800
+	epatch ${FILESDIR}/${P}-gcc4.patch
+
+	# 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 ${DISTDIR}/mozilla-firefox-1.0-4ft2.patch.bz2
+
+	# look in /usr/lib/nsplugins for plugins, in addition to the usual places
+	epatch ${DISTDIR}/mozilla-1.7.10-nsplugins-v2.patch
+
+	# rpath inclusion
+	cd ${S}
+	epatch ${FILESDIR}/thunderbird-rpath-1.patch
+}
+
+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_use_enable mozcalendar calendar
+	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.
+	grep -Flre -DARON_WAS_HERE --exclude=config.\* . | xargs sed -i -e \
+	's|-DARON_WAS_HERE|-DGENTOO_NSPLUGINS_DIR=\\\"/usr/'"$(get_libdir)"'/nsplugins\\\" -DGENTOO_NSBROWSER_PLUGINS_DIR=\\\"/usr/'"$(get_libdir)"'/nsbrowser/plugins\\\"|'
+
+	# 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}
+
+	# 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
+
+	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"
+}
+
+pkg_postrm() {
+	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
+
+	# Update the component registry
+	MOZILLA_LIBDIR=${ROOT}${MOZILLA_FIVE_HOME} MOZILLA_LAUNCHER=thunderbird \
+		/usr/libexec/mozilla-launcher -register
+
+	update_mozilla_launcher_symlinks
+}