From 5a4f7a1c1363ac9df35cddf02094665f4c85f781 Mon Sep 17 00:00:00 2001
From: "Quentin \"Sardem FF7\" Glidic" <sardemff7.pub@gmail.com>
Date: Sun, 10 Jul 2011 22:59:24 +0200
Subject: mozilla-app.eclass: Adapt some code to the merge

---
 eclass/mozilla-app.eclass   | 20 ++++----------------
 www-client/firefox/Manifest |  3 ++-
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/eclass/mozilla-app.eclass b/eclass/mozilla-app.eclass
index d00e3fe..edb40e7 100644
--- a/eclass/mozilla-app.eclass
+++ b/eclass/mozilla-app.eclass
@@ -11,16 +11,11 @@ WANT_AUTOCONF="2.1"
 
 inherit base multilib toolchain-funcs autotools python flag-o-matic pax-utils mozilla-scm
 
-MAJ_XUL_PV="7.0"
-
 S="${WORKDIR}/${XULRUNNER_HG_MODULE}"
 
 #
 # Some per-application stuff
 #
-MOZLIBDIR="/usr/$(get_libdir)/xulrunner-${MAJ_XUL_PV}"
-MOZDEVELDIR="/usr/$(get_libdir)/xulrunner-devel-${MAJ_XUL_PV}"
-SDKDIR="${MOZDEVELDIR}/sdk"
 MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
 case "${PN}" in
 	firefox)
@@ -126,9 +121,8 @@ function mozilla-app_src_prepare() {
 	# Gentoo install dirs
 	sed -i \
 		-e 's:$(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION):$(includedir)/idl:' \
-		-e 's:$(MOZ_APP_NAME)-$(MOZ_APP_VERSION):firefox:' \
-		-e 's:$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION):firefox:' \
-		-e 's:$(MOZ_APP_VERSION):'"${MAJ_XUL_PV}:" \
+		-e 's:$(MOZ_APP_NAME)-$(MOZ_APP_VERSION):'${PN}':' \
+		-e 's:$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION):'${PN}':' \
 		config/autoconf.mk.in \
 		|| die "${MAJ_XUL_PV} sed failed!"
 
@@ -432,14 +426,8 @@ function mozilla-app_src_install() {
 		echo "StartupNotify=true" >> "${ED}"/usr/share/applications/${PN}.desktop
 	fi
 
-	rm "${ED}"/usr/bin/xulrunner
-
-	# env.d file for ld search path
-	dodir /etc/env.d
-	echo "LDPATH=${EPREFIX}/${MOZLIBDIR}" > "${ED}"/etc/env.d/08xulrunner || die "env.d failed"
-
-	pax-mark m "${ED}"/${MOZLIBDIR}/plugin-container
-	pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/firefox
+	pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/plugin-container
+	pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/${PN}
 
 	# Plugins dir
 	dosym ../nsbrowser/plugins "${MOZILLA_FIVE_HOME}"/plugins \
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index b056943..59299f9 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -1,3 +1,4 @@
 AUX default-prefs.js 186 RMD160 a81854c5f1e95d2ce80f48d609dfde038b8fdcd5 SHA1 45ecd4c42affc453359e4aa8f147c0793eb03928 SHA256 a01580ae8f1b9496ee42d94774340a6dfbcbfbc177e258031cdc9d71fcd4985f
 AUX firefox.desktop 296 RMD160 6603daba883dc5ba46ff07775123f87da3791c8b SHA1 57ab14487535d099a94a19a1e59aab074095116f SHA256 6a08e61c5c6be9d8be3cff4fe931f4ef9ac86b053948593a034e601e99b7dddd
-EBUILD firefox-9999.ebuild 1112 RMD160 753afdbe09b9fe2c9ec5051e78ae6bab1f8e6ca9 SHA1 bbb6d9ac30bfdb4abc6f220d7c102a98d7f3babf SHA256 1f6a268543da5174a977c11996a6dcb1460835d257794e005d62c194ab0a0c60
+AUX gcc46.patch 2958 RMD160 ec80f035023add28656daa1fc40f7df0121d42e9 SHA1 ea0598f786ee61c6cabe31585a47946608376769 SHA256 d31243c32b55a5c77d24c01463d069821cf4173f9014110db59b5b4578d646f1
+EBUILD firefox-9999.ebuild 282 RMD160 e006a205c700a9f329f67512783c7e1ced7ceb68 SHA1 04d4b03b5da7bea6b99c0ec1b74bcaf708d2c78f SHA256 e351752401fe64e5ce45e3a8293b7ed800b4ec5d3bff07e76206e25435052f8e
-- 
cgit v1.2.3-65-gdbad