--- mozilla-thunderbird-1.5.0.8.ebuild	2006-12-09 19:17:59.037987450 -0600
+++ mozilla-thunderbird-1.5.0.9.ebuild	2006-12-19 12:40:07.128657992 -0600
@@ -2,17 +2,19 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.5.0.8.ebuild,v 1.8 2006/12/09 23:21:54 kloeri Exp $
 
+WANT_AUTOCONF="2.1"
+
 unset ALLOWED_FLAGS	 # stupid extra-functions.sh ... bug 49179
 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"
-PVER="0.1"
+PATCH="${PN}-1.5.0.8-patches-0.1"
 
 DESCRIPTION="Thunderbird Mail Client"
 HOMEPAGE="http://www.mozilla.org/projects/thunderbird/"
 SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${PV}/source/thunderbird-${PV}-source.tar.bz2
-	mirror://gentoo/${P}-patches-${PVER}.tar.bz2"
+	mirror://gentoo/${PATCH}.tar.bz2"
 
 KEYWORDS="~alpha amd64 ia64 ~mips ppc sparc x86 ~x86-fbsd"
 SLOT="0"
@@ -20,19 +22,18 @@
 IUSE="ldap crypt"
 
 for X in ${LANGS} ; do
-	SRC_URI="${SRC_URI} linguas_${X/-/_}? ( mirror://gentoo/thunderbird-${X}-${PV}.xpi )"
+	SRC_URI="${SRC_URI} linguas_${X/-/_}? ( http://dev.gentooexperimental.org/~anarchy/${P}-xpi/${P}-${X}.xpi )"
 	IUSE="${IUSE} linguas_${X/-/_}"
 done
 
 for X in ${SHORTLANGS} ; do
-	SRC_URI="${SRC_URI} linguas_${X%%-*}? ( mirror://gentoo/thunderbird-${X}-${PV}.xpi )"
+	SRC_URI="${SRC_URI} linguas_${X%%-*}? ( http://dev.gentooexperimental.org/~anarchy/${P}-xpi//${P}-${X}.xpi )"
 	IUSE="${IUSE} linguas_${X%%-*}"
 done
 
 RDEPEND=">=www-client/mozilla-launcher-1.39
 	>=dev-libs/nss-3.10
-	>=dev-libs/nspr-4.6.1
-	~sys-devel/autoconf-2.13"
+	>=dev-libs/nspr-4.6.1"
 
 PDEPEND="crypt? ( x11-plugins/enigmail )"
 
@@ -76,11 +77,11 @@
 }
 
 src_unpack() {
-	unpack thunderbird-${PV}-source.tar.bz2 ${P}-patches-${PVER}.tar.bz2
+	unpack ${A}
 
 	linguas
 	for X in ${linguas}; do
-		[[ ${X} != en ]] && xpi_unpack thunderbird-${X}-${PV}.xpi
+		[[ ${X} != en ]] && xpi_unpack ${P}-${X}.xpi
 	done
 
 	cd ${S} || die "cd failed"
@@ -99,8 +100,7 @@
 			${S}/security/coreconf/arch.mk
 	fi
 
-	WANT_AUTOCONF="2.1" \
-		eautoreconf || die "failed running autoreconf"
+	eautoreconf || die "failed running autoreconf"
 }
 
 src_compile() {
@@ -181,7 +181,7 @@
 
 	linguas
 	for X in ${linguas}; do
-		[[ ${X} != en ]] && xpi_install ${WORKDIR}/thunderbird-${X}-${PV}
+		[[ ${X} != en ]] && xpi_install ${WORKDIR}/${P}-${X}
 	done
 
 	local LANG=${linguas%% *}