--- /usr/portage/mail-client/mozilla-thunderbird/mozilla-thunderbird-2.0.0.21.ebuild	2009-05-02 02:07:23.000000000 +0200
+++ /usr/portage/mail-client/mozilla-thunderbird/mozilla-thunderbird-2.0.0.21.ebuild	2009-05-27 14:58:07.000000000 +0200
@@ -16,11 +16,12 @@ 
 KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 SLOT="0"
 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE="ldap crypt bindist mozdom replytolist"
+IUSE="ldap crypt bindist mozdom replytolist swiftdove"
 
 MOZ_URI="http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/${PV}"
 SRC_URI="${MOZ_URI}/source/thunderbird-${PV}-source.tar.bz2
-	mirror://gentoo/${PATCH}.tar.bz2"
+	mirror://gentoo/${PATCH}.tar.bz2
+	swiftdove? ( http://switch.dl.sourceforge.net/sourceforge/swiftweasel/swiftdove-2.0.0.21_source.tar.gz )"
 
 # These are in
 #
@@ -107,6 +108,12 @@ 
 src_unpack() {
 	unpack thunderbird-${PV}-source.tar.bz2  ${PATCH}.tar.bz2
 
+	if use swiftdove; then
+		unpack swiftdove-2.0.0.21_source.tar.gz
+		cp -r Source/Graphics/* mozilla/
+		EPATCH_SOURCE="${PWD}" epatch Source/sd20021.patch	# FIXME
+	fi
+
 	linguas
 	for X in ${linguas}; do
 		[[ ${X} != "en" ]] && xpi_unpack "${P}-${X}.xpi"
@@ -157,7 +164,7 @@ 
 		mozconfig_annotate '' --enable-extensions=default
 	fi
 
-	if ! use bindist; then
+	if ! use bindist && ! use swiftdove; then
 		mozconfig_annotate '' --enable-official-branding
 	fi
 
@@ -216,10 +223,11 @@ 
 	# Create /usr/bin/thunderbird
 	install_mozilla_launcher_stub thunderbird ${MOZILLA_FIVE_HOME}
 
-	if ! use bindist; then
+	if ! use bindist && ! use swiftdove; then
 		doicon "${FILESDIR}"/icon/thunderbird-icon.png
 		domenu "${FILESDIR}"/icon/${PN}.desktop
 	else
+		newicon "${S}"/mail/base/content/icon48.png "${FILESDIR}"/icon/thunderbird-icon-unbranded.png	
 		doicon "${FILESDIR}"/icon/thunderbird-icon-unbranded.png
 		newmenu "${FILESDIR}"/icon/${PN}-unbranded.desktop \
 			${PN}.desktop