--- trunk/include/mozilla_i18n.sminc	2012/01/14 01:48:34	9880
+++ trunk/include/mozilla_i18n.sminc	2013/11/26 11:58:46	20235
@@ -1,24 +1,28 @@
 # $Id$
 # functions for mozilla i18n
 #
-# MOZ_SUITE, MOZ_LANG, STATE, PVER and PBUILD must be given
+# MOZ_SUITE, MOZ_LANG, STATE, PNAME, PVER and PBUILD must be given
 #
 
-MOZ_HOME="/usr/$(mlibdir)/mozilla-firefox"
-PNAME="mozilla-${MOZ_SUITE}-i18n-${MOZ_LANG}"
+# check for esr releases
+case ${PNAME} in
+	*-esr-*) DEP_PNAME="${MOZ_SUITE}-esr"; DEP_DESCRIPTION="Firefox ESR" ;;
+	*) DEP_PNAME="${MOZ_SUITE}"; DEP_DESCRIPTION="Firefox" ;;
+esac
+
+MOZ_HOME="/usr/$(mlibdir)/${DEP_PNAME}"
+PNAME="${MOZ_SUITE}-lang-${MOZ_LANG}"
 
+PCAT="app-lang"
 case ${MOZ_SUITE} in
-	firefox) PCAT="net-www" ;;
-	thunderbird) PCAT="net-mail" ;;
+	firefox) DEP_PCAT="net-www"; MOZ_APP_DIR="${MOZ_HOME}/browser" ;;
+	thunderbird) DEP_PCAT="net-mail"; MOZ_APP_DIR="${MOZ_HOME}" ;;
 esac
 
-DESCRIPTION="Mozilla ${MOZ_SUITE} ${PVER} - ${MOZ_LANG} language files."
+DESCRIPTION="Mozilla ${DEP_DESCRIPTION} ${PVER} - ${MOZ_LANG} language files."
 HOMEPAGE="http://www.mozilla.org/products/${MOZ_SUITE}/"
 
-DEPEND="== ${PCAT}/mozilla-${MOZ_SUITE}-${PVER}"
-
-SDEPEND=">= app-arch/unzip-5
-	>= sys-apps/sed-4"
+DEPEND="== ${DEP_PCAT}/${DEP_PNAME}-${PVER}"
 
 SRCFILE="${MOZ_LANG}.xpi"
 SRCDIR="${BUILDDIR}/${PNAME}-${PVER}"
@@ -26,29 +30,25 @@
 sminclude mtools
 
 SRC_URI=(
-	ftp://ftp.mozilla.org/pub/mozilla.org/${MOZ_SUITE}/releases/${PVER}/linux-i686/xpi/${SRCFILE}
+	http://ftp.mozilla.org/pub/mozilla.org/${MOZ_SUITE}/releases/${PVER}/linux-i686/xpi/${SRCFILE}
 	mirror://${PNAME/-${MOZ_LANG}/}/${PVER}/${SRCFILE}
 )
 
 mozilla_i18n_src_prepare()
 {
-	install -d ${SRCDIR}
-	munpack ${SRCFILE} ${SRCDIR} || die
+	install -d ${SRCDIR} || die
 	cd ${SRCDIR}
-
-	# fix location in manifest file
-	sed -i "s|jar:chrome/${MOZ_LANG}.jar|jar:${MOZ_LANG}.jar|" chrome.manifest || die
+	cp ${SOURCEDIR}/$(mpname)/${SRCFILE} ${SRCDIR}/ || die
 }
 
 mozilla_i18n_src_install()
 {
-	cd ${SRCDIR}
+	# get install id for the extension
+	local id="langpack-${MOZ_LANG}@firefox.mozilla.org"
 
 	# needed directories
-	minstalldir ${MOZ_HOME}/chrome || die
-
-	minstallfile chrome/${MOZ_LANG}.jar ${MOZ_HOME}/chrome/ || die
-	minstallfile chrome.manifest ${MOZ_HOME}/chrome/${MOZ_LANG}.manifest || die
+	minstalldir ${MOZ_APP_DIR}/extensions || die
+	minstallfile ${SRCDIR}/${SRCFILE} ${MOZ_APP_DIR}/extensions/${id}.xpi || die
 }
 
 export_inherits mozilla_i18n src_prepare src_install