--- mozilla-thunderbird-0.8.ebuild.orig	2004-09-21 11:37:28.855003424 +0200
+++ mozilla-thunderbird-0.8.ebuild	2004-09-21 11:39:50.202515336 +0200
@@ -29,10 +29,28 @@
 # become pure shell variables.
 export MOZ_THUNDERBIRD=1
 
+
+# Part of bug #64607, uniforming Thunderbird profile dir to Firefox one
+function checkuserdirs() {
+	for i in /home/* root; do
+		if [ -d "${i}/.thunderbird" ]; then
+			einfo -n "   Trying to automatically move thunderbird profile for $i"
+			if [ ! -d "${i}/.mozilla" ]; then
+				mkdir -p "${i}/.mozilla"
+				chown `echo "${i}" | sed -r 's/^(\/home\/|\/)//'`:users "${i}/.mozilla"
+			fi
+			mv "${i}/.thunderbird" "${i}/.mozilla/thunderbird"
+		fi;
+	done;
+}
+
 src_unpack() {
 	unpack ${A} || die "unpack failed"
 	cd ${S} || die
 
+	# As per bug #64607
+	epatch ${FILESDIR}/thunderbird-base-userdir.patch
+
 	if [[ $(gcc-major-version) -eq 3 ]]; then
 		# ABI Patch for alpha/xpcom for gcc-3.x
 		if [[ ${ARCH} == alpha ]]; then
@@ -162,6 +180,16 @@
 	einfo "Please note that the binary name has changed from MozillaThunderbird"
 	einfo "to simply thunderbird"
 	einfo
+	
+	echo
+	
+	einfo
+	einfo "If you're upgrading from an earlier version of Thunderbird, your profile "
+	einfo "dir relative to user should be moved from ~/.thunderbird to ~/.mozilla/thunderbird. "
+	einfo "I'll made an attempt to automatically do so for some users I found: "
+	checkuserdirs
+	ewarn "You may have to move the others manually!"
+	einfo 
 }
 
 pkg_postrm() {