--- mozilla-thunderbird-1.5.0.7.ebuild.old	2006-09-16 22:24:24.000000000 +0200
+++ mozilla-thunderbird-1.5.0.7.ebuild	2006-09-17 11:58:02.000000000 +0200
@@ -3,7 +3,7 @@
 # $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.5.0.7.ebuild,v 1.1 2006/09/16 14:08:28 redhatter Exp $
 
 unset ALLOWED_FLAGS	 # stupid extra-functions.sh ... bug 49179
-inherit flag-o-matic toolchain-funcs eutils mozconfig-2 mozilla-launcher makeedit multilib autotools
+inherit flag-o-matic toolchain-funcs eutils mozconfig-2 mozilla-launcher makeedit multilib autotools mozextension
 
 LANGS="bg ca cs da de el en-GB es-AR es-ES eu fi fr ga-IE gu-IN he hu it ja ko lt mk nb-NO nl pa-IN pl pt-BR ru sk sl sv-SE tr zh-CN"
 SHORTLANGS="es-ES ga-IE nb-NO sv-SE"
@@ -72,14 +72,14 @@
 }
 
 src_unpack() {
-	unpack ${A}
-	cd ${S} || die "cd failed"
-
+	unpack thunderbird-${PV}-source.tar.bz2 ${P}-patches-${PVER}.tar.bz2
+	
 	linguas
 	for X in ${linguas}; do
 		[[ ${X} != en ]] && xpi_unpack thunderbird-${X}-${PV}.xpi
 	done
 
+	cd ${S} || die "cd failed"
 	# Apply our patches
 	EPATCH_SUFFIX="patch" \
 	EPATCH_FORCE="yes" \
@@ -184,8 +184,8 @@
 	if [[ ${LANG} != "" && ${LANG} != "en" ]]; then
 		ebegin "Setting default locale to ${LANG}"
 		sed -i "s:pref(\"general.useragent.locale\", \"en-US\"):pref(\"general.useragent.locale\", \"${LANG}\"):" \
-			${D}${MOZILLA_FIVE_HOME}/defaults/pref/thunderbird.js \
-			${D}${MOZILLA_FIVE_HOME}/defaults/pref/thunderbird-l10n.js
+			${D}${MOZILLA_FIVE_HOME}/defaults/pref/all-thunderbird.js \
+			${D}${MOZILLA_FIVE_HOME}/defaults/pref/all-l10n.js
 		eend $? || die "sed failed to change locale"
 	fi