--- /usr/portage/www-client/icecat/icecat-3.6-r1.ebuild	2010-03-13 16:07:16.000000000 +0100
+++ icecat-3.6.2.ebuild	2010-03-26 01:50:06.800501455 +0100
@@ -14,10 +14,11 @@
 
 NOSHORTLANGS="en-GB es-AR es-CL es-MX pt-BR zh-CN zh-TW"
 
-XUL_PV="1.9.2"
+XUL_PV="1.9.2.2"
 MAJ_XUL_PV="1.9.2"
 MAJ_PV="${PV/_*/}" # Without the _rc and _beta stuff
-DESKTOP_PV="3.6"
+DESKTOP_PV="3.6.2"
+LANGPACK_PV="3.6"
 MY_PV="${PV/_rc/rc}" # Handle beta for SRC_URI
 FIREFOX_PN="mozilla-firefox"
 FIREFOX_P="${FIREFOX_PN}-${PV}"
@@ -31,22 +32,22 @@
 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
 IUSE="+alsa java libnotify system-sqlite wifi"
 
-SRC_URI="mirror://gnu/gnuzilla/${MY_PV}/${PN}-${MY_PV}.tar.bz2
-	http://dev.gentoo.org/~anarchy/dist/${PATCH}.tar.bz2
-	http://svn.savannah.gnu.org/viewvc/trunk/icecat/browser/app/profile/firefox.js?root=gnuzilla&r1=86&r2=94&view=patch -> icecat-3.6-prefs.patch"
+SRC_URI="mirror://gnu/gnuzilla/${MY_PV}/${PN}-${MY_PV}.tar.xz
+	mirror://gnu/gnuzilla/${MY_PV}/privacy_ext.xpi
+	http://dev.gentoo.org/~anarchy/dist/${PATCH}.tar.bz2"
 LANGPACK_URI="http://gnuzilla.gnu.org/download/langpacks/"
 
 for X in ${LANGS} ; do
 	if [ "${X}" != "en" ] && [ "${X}" != "en-US" ]; then
 		SRC_URI="${SRC_URI}
-			linguas_${X/-/_}? ( ${LANGPACK_URI}/${MY_PV}/${X}.xpi -> ${P}-${X}.xpi )"
+			linguas_${X/-/_}? ( ${LANGPACK_URI}/${LANGPACK_PV}/${X}.xpi -> ${P}-${X}.xpi )"
 	fi
 	IUSE="${IUSE} linguas_${X/-/_}"
 	# english is handled internally
 	if [ "${#X}" == 5 ] && ! has ${X} ${NOSHORTLANGS}; then
 		if [ "${X}" != "en-US" ]; then
 			SRC_URI="${SRC_URI}
-				linguas_${X%%-*}? ( ${LANGPACK_URI}/${MY_PV}/${X}.xpi -> ${P}-${X}.xpi )"
+				linguas_${X%%-*}? ( ${LANGPACK_URI}/${LANGPACK_PV}/${X}.xpi -> ${P}-${X}.xpi )"
 		fi
 		IUSE="${IUSE} linguas_${X%%-*}"
 	fi
@@ -96,7 +97,10 @@
 }
 
 src_unpack() {
-	unpack icecat-${MY_PV}.tar.bz2 ${PATCH}.tar.bz2
+	xz -dc -- "${DISTDIR}/icecat-${MY_PV}.tar.xz" | tar xof - ||
+	die "Unpacking icecat-${MY_PV}.tar.xz failed"
+
+	xpi_unpack privacy_ext.xpi || die "Unpacking privacy_ext.xpi failed"
 
 	linguas
 	for X in ${linguas}; do
@@ -106,10 +110,6 @@
 }
 
 src_prepare() {
-	# Integrate rebranding
-	sed -i "s|/mozilla-firefox|/icecat|" \
-		"${WORKDIR}"/001-firefox_gentoo_install_dirs.patch
-
 	# Fix preferences location
 	sed -i 's|defaults/pref/|defaults/preferences/|' browser/installer/packages-static || die "sed failed"
 
@@ -122,7 +122,7 @@
 	epatch "${FILESDIR}/xulrunner-1.9.2-noalsa-fixup.patch"
 
 	# Fix prefs
-	epatch "${DISTDIR}/icecat-3.6-prefs.patch"
+	#epatch "${DISTDIR}/icecat-3.6-prefs.patch"
 
 	# Fix rebranding
 	sed -i 's|\$(DIST)/bin/firefox|\$(DIST)/bin/icecat|' browser/app/Makefile.in
@@ -221,6 +221,17 @@
 }
 
 src_compile() {
+	mkdir -p dist/idl
+	ln -s ../../xpcom/base/nsISupports.idl dist/idl
+	ln -s ../../xpcom/base/nsrootidl.idl dist/idl
+	ln -s ../../netwerk/mime/public/nsIMIMEInfo.idl dist/idl
+	ln -s ../../dom/interfaces/sidebar/nsIWebContentHandlerRegistrar.idl dist/idl
+	ln -s ../../editor/txmgr/idl/nsITransactionManager.idl dist/idl
+	ln -s ../../editor/txmgr/idl/nsITransaction.idl dist/idl
+	ln -s ../../editor/txmgr/idl/nsITransactionList.idl dist/idl
+	ln -s ../../editor/txmgr/idl/nsITransactionListener.idl dist/idl
+	ln -s ../.././toolkit/components/exthelper/extIApplication.idl dist/idl
+
 	# Should the build use multiprocessing? Not enabled by default, as it tends to break
 	[ "${WANT_MP}" = "true" ] && jobs=${MAKEOPTS} || jobs="-j1"
 	emake ${jobs} || die
@@ -248,12 +259,12 @@
 	pax-mark m "${D}"/${MOZILLA_FIVE_HOME}/${PN}
 
 	# Enable very specific settings not inherited from xulrunner
-	cp "${FILESDIR}"/firefox-default-prefs.js \
-		"${D}/${MOZILLA_FIVE_HOME}/defaults/preferences/all-gentoo.js" || \
-		die "failed to cp icecat-default-prefs.js"
+	#cp "${FILESDIR}"/firefox-default-prefs.js \
+	#	"${D}/${MOZILLA_FIVE_HOME}/defaults/preferences/all-gentoo.js" || \
+	#	die "failed to cp icecat-default-prefs.js"
 
 	# Plugins dir
-	dosym ../nsbrowser/plugins "${MOZILLA_FIVE_HOME}"/plugins \
+	dosym ../nsbrowser/plugins "${MOZILLA_FIVE_HOME}-${DESKTOP_PV}"/plugins \
 		|| die "failed to symlink"
 }