From 8ccfad3e9800f3079fe54faa66a22f5dc9704e28 Mon Sep 17 00:00:00 2001
From: Sardem FF7 <sardemff7.pub@gmail.com>
Date: Wed, 9 Mar 2011 14:00:05 +0100
Subject: Some fixes

Fix the fdo-mime inherit (ugly but working)

It's safer to inform apps we use shared-js
---
 eclass/mozilla-config.eclass | 6 +++---
 eclass/mozilla-scm.eclass    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/eclass/mozilla-config.eclass b/eclass/mozilla-config.eclass
index 3a95fe4..76dd9aa 100644
--- a/eclass/mozilla-config.eclass
+++ b/eclass/mozilla-config.eclass
@@ -178,6 +178,8 @@ function mozconfig_configure {
 		--disable-profilesharing \
 		--disable-profilelocking
 
+	mozconfig_annotate 'Provide and use libmozjs' --enable-shared-js
+
 	sed -i \
 		-e '/--enable-application=/d' \
 		-e '/--enable-extensions=/d'\
@@ -200,9 +202,7 @@ function mozconfig_configure {
 	# jemalloc won't build with older glibc
 	! has_version ">=sys-libs/glibc-2.4" && mozconfig_annotate 'old glibc' --disable-jemalloc
 
-	if ${IS_LIBXUL}; then
-		mozconfig_annotate 'Provide libmozjs' --enable-shared-js
-	else
+	if ! ${IS_LIBXUL}; then
 		mozconfig_annotate 'libxul application' \
 			--enable-official-branding \
 			--with-system-libxul \
diff --git a/eclass/mozilla-scm.eclass b/eclass/mozilla-scm.eclass
index b11870b..19ddd45 100644
--- a/eclass/mozilla-scm.eclass
+++ b/eclass/mozilla-scm.eclass
@@ -40,7 +40,6 @@ case "${PN}" in
 		MOZ_APPLICATION=mail
 	;;
 esac
-${IS_LIXBUL} || inherit fdo-mime
 
 EXPORT_FUNCTIONS pkg_setup src_unpack src_configure src_install pkg_postinst
 
@@ -223,6 +222,7 @@ function mozilla-scm_pkg_postinst {
 		ewarn "any package that fails to build warrants a bug report."
 		einfo "You should build xulrunner first to update the mercurial repository"
 
+		inherit fdo-mime
 		# Update mimedb for the new .desktop file
 		fdo-mime_desktop_database_update
 	fi
-- 
cgit v1.2.3-65-gdbad