--- /usr/portage/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.6-r4.ebuild	2005-08-03 14:05:43.000000000 +0000
+++ /usr/portage/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.6-r4.ebuild	2005-08-14 05:34:47.000000000 +0000
@@ -1,6 +1,6 @@ 
 # 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-r4.ebuild,v 1.2 2005/08/03 13:55:55 agriffis Exp $
+# $Header: $
 
 unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
 inherit flag-o-matic toolchain-funcs eutils mozconfig mozilla-launcher makeedit multilib
@@ -69,11 +69,18 @@ 
 
 	# look in /usr/lib/nsplugins for plugins, in addition to the usual places
 	epatch ${DISTDIR}/mozilla-1.7.10-nsplugins-v2.patch
+
+	#rpath patch
+	epatch ${FILESDIR}/mozilla-rpath-1.patch
+
 }
 
 src_compile() {
 	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
 
+	grep -Flr "#RPATH_FIXER" --include=*.mk . | xargs sed -i -e \
+		's|#RPATH_FIXER|'"${MOZILLA_FIVE_HOME}"'|'
+
 	####################################
 	#
 	# mozconfig, CFLAGS and CXXFLAGS setup