--- /usr/portage/mail-client/mozilla-thunderbird/mozilla-thunderbird-2.0_alpha1-r1.ebuild	2006-11-10 18:51:57.000000000 -0600
+++ ../gentoo/mail-client/mozilla-thunderbird/mozilla-thunderbird-2.0_beta1.ebuild	2006-12-09 15:49:34.817584673 -0600
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/mozilla-thunderbird-2.0_alpha1-r1.ebuild,v 1.2 2006/11/11 00:51:57 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.5.0.7.ebuild,v 1.8 2006/10/10 21:49:27 kloeri Exp $
 
 #
 # There are no linguas supported in alpha builds
@@ -13,12 +13,12 @@
 #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"
 PVER="1.1"
-MY_PV=${PV/_alpha1/a1}
+MY_PV=${PV/_beta1/b1}
 
 DESCRIPTION="Thunderbird Mail Client"
 HOMEPAGE="http://www.mozilla.org/projects/thunderbird/"
 SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${MY_PV}/source/thunderbird-${MY_PV}-source.tar.bz2
-	mirror://gentoo/${P}-patches-${PVER}.tar.bz2"
+	mirror://gentoo/${PN}-2.0_alpha1-patches-${PVER}.tar.bz2"
 
 KEYWORDS="~amd64 ~ia64 ~mips ~ppc ~sparc ~x86 ~x86-fbsd"
 SLOT="0"
@@ -41,7 +41,7 @@
 	~sys-devel/autoconf-2.13"
 
 PDEPEND="crypt? ( x11-plugins/enigmail )
-		replytolist? ( x11-plugins/replytolist )"
+	replytolist? ( x11-plugins/replytolist )"
 
 S=${WORKDIR}/mozilla
 
@@ -78,12 +78,8 @@
 #	done
 #}
 
-pkg_setup() {
-	use moznopango && warn_mozilla_launcher_stub
-}
-
 src_unpack() {
-	unpack thunderbird-${MY_PV}-source.tar.bz2 ${P}-patches-${PVER}.tar.bz2
+	unpack thunderbird-${MY_PV}-source.tar.bz2 ${PN}-2.0_alpha1-patches-${PVER}.tar.bz2
 
 #	linguas
 #	for X in ${linguas}; do
@@ -162,7 +158,7 @@
 	# requirements while compiling
 	edit_makefiles
 
-	emake -j1 || die
+	emake || die
 }
 
 pkg_preinst() {
@@ -232,10 +228,6 @@
 	# Dirty hack to get some applications using this header running
 	dosym ${MOZILLA_FIVE_HOME}/include/necko/nsIURI.h \
 		/usr/$(get_libdir)/${MOZILLA_FIVE_HOME##*/}/include/nsIURI.h
-
-	# Warn user that remerging enigmail is neccessary on USE=crypt
-	use crypt && ewarn "Please remerge x11-plugins/enigmail after updating mozilla-thunderbird."
-
 }
 
 pkg_postinst() {