--- trunk/include/mozilla_i18n.sminc	2013/10/09 08:02:31	19654
+++ trunk/include/mozilla_i18n.sminc	2013/10/09 08:06:12	19655
@@ -18,6 +18,9 @@
 
 DEPEND="== ${DEP_PCAT}/${MOZ_SUITE}-${PVER}"
 
+SDEPEND=">= app-arch/unzip-5
+	>= virtual/sed"
+
 SRCFILE="${MOZ_LANG}.xpi"
 SRCDIR="${BUILDDIR}/${PNAME}-${PVER}"
 
@@ -28,16 +31,22 @@
 	mirror://${PNAME/-${MOZ_LANG}/}/${PVER}/${SRCFILE}
 )
 
+mozilla_i18n_src_prepare()
+{
+	install -d ${SRCDIR}
+	munpack ${SRCFILE} ${SRCDIR} || die
+}
+
 mozilla_i18n_src_install()
 {
 	cd ${SRCDIR}
 
 	# get install id for the extension
-	local id="langpack-${MOZ_LANG}@firefox.mozilla.org"
+	local id="$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' install.rdf)"
 
 	# needed directories
 	minstalldir ${MOZ_HOME}/extensions/${id} || die
-	minstallfile ${SOURCESDIR}/${PNAME}/${SRCFILE} ${BINDIR}/${MOZ_HOME}/extensions/${id}.xpi || die
+	cp -Rv ${SRCDIR}/* ${BINDIR}/${MOZ_HOME}/extensions/${id} || die
 }
 
-export_inherits mozilla_i18n src_install
+export_inherits mozilla_i18n src_prepare src_install