Bump icecat to 3.6.9-r1

4 files changed, 378 insertions, 0 deletions

diff --git a/www-client/icecat/ChangeLog b/www-client/icecat/ChangeLog
new file mode 100644
index 0000000..f36e0a4
--- /dev/null
+++ b/www-client/icecat/ChangeLog
@@ -0,0 +1,10 @@
+# ChangeLog for www-client/icecat
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*icecat-3.6.9-r1 (20 Sep 2010)
+
+  20 Sep 2010; Daniel Solano Gómez <gentoo@sattvik.com>
+  +icecat-3.6.9-r1.ebuild, +files/fix_blocklist_support.patch:
+  Version bump.
+
diff --git a/www-client/icecat/Manifest b/www-client/icecat/Manifest
index 533ba69..2c62935 100644
--- a/www-client/icecat/Manifest
+++ b/www-client/icecat/Manifest
@@ -1,6 +1,7 @@
 AUX 137-bz460917_reload_new_plugins-gentoo-update-3.6.4.patch 2473 RMD160 cfbed88e1813f4880dabb18b6a9540cf3747f7f4 SHA1 5e0d98b3e3bf3ffb5f88eef30b1af095a6f0057d SHA256 be069b468eff7f06bb0fe160dea947c081cb00e1a8cbde2bd39c52ebf9aa2984
 AUX 801-enable-x86_64-tracemonkey.patch 501 RMD160 e8341671a9ab7f05cf58735a2b862ded55d82829 SHA1 d0c194c79993c3c47a8c46726d3f024e044766a0 SHA256 20f558efbf4ed1960b390c353c7eeb94108fcdb8aaf33f1fea6caf44468aeb7c
 AUX firefox-default-prefs.js 95 RMD160 805cdfec6fb31c224322cb71125547ad7a515f49 SHA1 7fab69d85b12a9f1b0c87fbb1821bdafd7485ac9 SHA256 8bc4cb870bc402db1f20b135a689f8c5dbfa5de8f1755b1926198d627c12c5f1
+AUX fix_blocklist_support.patch 3194 RMD160 87254cfdbd7fae1ed5704ecfff4ad5c691b44dba SHA1 3da1bb6544bb1b07548faa1b94bbe9fd7350dcb6 SHA256 4e0de29d5dc65b3bd9a5bb7ad1adee92056af78da66c5c1c7153dec3026931f3
 AUX icon/icecat.desktop 245 RMD160 3cef06f5a0280d91ce56b3d1e29ac931c88b9cc2 SHA1 245a7edffd6d3a78f0d4f90269adbfa1076f467c SHA256 3797d3c1ceafe3951a8cd0c1c06520efabb4b38b6da1e6977b470a4b971ac909
 AUX xulrunner-1.9.2-noalsa-fixup.patch 1031 RMD160 6eae45ee3e29fa47a7b31688cfcbfb594fcdd79b SHA1 845d4962708281bbd0cba45db82335739a50897b SHA256 1c4e017b6a8d81267a9d4b29b10cc4cfe69b090f8f8903a663f25b5e300eddd5
 DIST firefox-3.6-patches-0.2.tar.bz2 6335 RMD160 1f8297ad4279af70348a848349e75aa1a94c7372 SHA1 4c47c76fbdab937850558751ac73fe71e3269ece SHA256 1dc4278c143fa67c373a090f5698c4174d00aaa91ea63a444c2eca1cc328a523
@@ -77,5 +78,7 @@ DIST icecat-3.6.9-vi.xpi 129789 RMD160 6d2c92a073b3e148264d40785330a2f377415a7f
 DIST icecat-3.6.9-zh-CN.xpi 127506 RMD160 cde246ac17ddc8ab7e4dfce43c6e70425832a6e0 SHA1 385e06768695b3191913c89c9d32c8e4029ca583 SHA256 0d335514e9f1ffb7960f53b93f952e2a2f920b51a2f3189f0d533059c1ee107f
 DIST icecat-3.6.9-zh-TW.xpi 128870 RMD160 431187eadf614b238328860bcfcbfae1b0fde04d SHA1 008449d4124e9f0e2497de0a622eb7d72b60321f SHA256 55417825e555b996276aff3f9a6bbbcaf19749ae8953d5e1d43dc884cc00332b
 DIST icecat-3.6.9.tar.bz2 48106577 RMD160 588be6a5b91f40fc96315afda79a0f3e1b867062 SHA1 037b4ed519ca462af956fd7e27643ae1234c06e6 SHA256 9be65001827a0ef9e5b4720a9fc2b83038d7ea44832102c37ba870de663f3d84
+EBUILD icecat-3.6.9-r1.ebuild 8436 RMD160 b0e3f4a03404f4154fbdc6fc1a9d905b19274799 SHA1 4c29dbb8f0563c5c02f8cc6495bb5673629cc390 SHA256 7859b1808b775d8d24ab11bd8fc04f2c704b0d70e66f08434d9121a1658495d1
 EBUILD icecat-3.6.9.ebuild 8372 RMD160 d702f5cdd794b614c54dc8180b657c67e42557b0 SHA1 b672cea4f7d165f18fc979850ed86b17f03dea93 SHA256 e802c4711eabd743163e5ac31521f30d76d581999672121b95425232f3dd3aa8
+MISC ChangeLog 287 RMD160 afbce7fd94e086c52589f2698946407af3af53e3 SHA1 2c05a8464ce785bcbec1d6e8bf0792491016f6e5 SHA256 3736597001c295534d111c8da867a76afe898759378e1d401230490b5bfb1f0a
 MISC metadata.xml 539 RMD160 1c03f865d6541dd4dcf565c5da2d9ff64675d8e5 SHA1 6007bf5a10fff04ae371bf625b855ddf9ab677bd SHA256 c7f2acb59cf5194b0c1d9215056765b908e2d71000ca3019bbf735be7d0c2f65
diff --git a/www-client/icecat/files/fix_blocklist_support.patch b/www-client/icecat/files/fix_blocklist_support.patch
new file mode 100644
index 0000000..a6d1bb1
--- /dev/null
+++ b/www-client/icecat/files/fix_blocklist_support.patch
@@ -0,0 +1,92 @@
+diff --git a/browser/app/blocklist.xml b/browser/app/blocklist.xml
+--- a/browser/app/blocklist.xml
++++ b/browser/app/blocklist.xml
+@@ -1,4 +1,4 @@
+-<?xml version="1.0" encoding="UTF-8"?>
++<?xml version="1.0"?>
+ <blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist">
+   <emItems>
+     <emItem id="fdm_ffext@freedownloadmanager.org">
+@@ -11,16 +11,38 @@
+     <emItem id="langpack-vi-VN@firefox.mozilla.org">
+       <versionRange minVersion="2.0" maxVersion="2.0"/>
+     </emItem>
++    <emItem id="masterfiler@gmail.com">
++      <versionRange severity="3"/>
++    </emItem>
+     <emItem id="mozilla_cc@internetdownloadmanager.com">
++      <versionRange minVersion=" " maxVersion="6.9.8">
++        <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
++           <versionRange minVersion="3.7a1pre" maxVersion="*"/>
++        </targetApplication>
++      </versionRange>
+       <versionRange minVersion="2.1" maxVersion="3.3">
+         <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
+            <versionRange minVersion="3.0a1" maxVersion="*"/>
+         </targetApplication>
+       </versionRange>
+     </emItem>
++    <emItem id="personas@christopher.beard">
++      <versionRange minVersion="1.6" maxVersion="1.6">
++        <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
++           <versionRange minVersion="3.6" maxVersion="3.6.*"/>
++        </targetApplication>
++      </versionRange>
++    </emItem>
+     <emItem id="support@daemon-tools.cc">
+       <versionRange minVersion=" " maxVersion="1.0.0.5"/>
+     </emItem>
++    <emItem id="yslow@yahoo-inc.com">
++      <versionRange minVersion="2.0.5" maxVersion="2.0.5">
++        <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
++           <versionRange minVersion="3.5.7" maxVersion="*"/>
++        </targetApplication>
++      </versionRange>
++    </emItem>
+     <emItem id="{2224e955-00e9-4613-a844-ce69fccaae91}"/>
+     <emItem id="{3f963a5b-e555-4543-90e2-c3908898db71}">
+       <versionRange minVersion=" " maxVersion="8.5"/>
+@@ -32,9 +54,11 @@
+         </targetApplication>
+       </versionRange>
+     </emItem>
++    <emItem id="{8CE11043-9A15-4207-A565-0C94C42D590D}"/>
+     <emItem id="{B13721C7-F507-4982-B2E5-502A71474FED}">
+       <versionRange minVersion=" " maxVersion="3.3.0.3970" severity="1"/>
+     </emItem>
++    <emItem id="{E8E88AB0-7182-11DF-904E-6045E0D72085}"/>
+   </emItems>
+ <pluginItems>
+   <pluginItem>
+@@ -61,5 +85,24 @@
+     <versionRange>
+     </versionRange>
+   </pluginItem>
++  <pluginItem>
++    <match name="filename" exp="NPMySrch.dll"/>
++    <versionRange>
++    </versionRange>
++  </pluginItem>
++  <pluginItem>
++    <match name="filename" exp="npViewpoint.dll"/>
++    <versionRange>
++      <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
++        <versionRange minVersion="3.0" maxVersion="*"/>
++      </targetApplication>
++    </versionRange>
++  </pluginItem>
++  <pluginItem>
++    <match name="name" exp="[0-6]\.0\.[01]\d{2}\.\d+"/>
++    <match name="filename" exp="npdeploytk.dll"/>
++    <versionRange severity="1">
++    </versionRange>
++  </pluginItem>
+ </pluginItems>
+-</blocklist>
+\ No newline at end of file
++</blocklist>
+
+
+
+
+
diff --git a/www-client/icecat/icecat-3.6.9-r1.ebuild b/www-client/icecat/icecat-3.6.9-r1.ebuild
new file mode 100644
index 0000000..22e954d
--- /dev/null
+++ b/www-client/icecat/icecat-3.6.9-r1.ebuild
@@ -0,0 +1,273 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/icecat/icecat-3.6.9-r1.ebuild,v 1.1 2010/09/19 20:17:13 polynomial-c Exp $
+EAPI="2"
+WANT_AUTOCONF="2.1"
+
+inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib pax-utils fdo-mime autotools mozextension java-pkg-opt-2
+
+LANGS="af ar as be bg bn-BD bn-IN ca cs cy da de el en en-GB en-US eo es-AR
+es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gl gu-IN he hi-IN hr hu id is it ja
+ka kk kn ko ku lt lv mk ml mr nb-NO nl nn-NO oc or pa-IN pl pt-BR pt-PT rm ro
+ru si sk sl sq sr sv-SE ta te th tr uk vi zh-CN zh-TW"
+# Malformed install.rdf: ta-LK
+
+NOSHORTLANGS="en-GB es-AR es-CL es-MX pt-BR zh-CN zh-TW"
+
+MAJ_XUL_PV="1.9.2"
+MAJ_PV="${PV/_*/}" # Without the _rc and _beta stuff
+DESKTOP_PV="3.6"
+MY_PV="${PV/_rc/rc}" # Handle beta for SRC_URI
+XUL_PV="${MAJ_XUL_PV}${MAJ_PV/${DESKTOP_PV}/}" # Major + Minor version no.s
+FIREFOX_PN="firefox"
+FIREFOX_P="${FIREFOX_PN}-${PV}"
+PATCH="${FIREFOX_PN}-3.6-patches-0.2"
+
+DESCRIPTION="GNU project's edition of Mozilla Firefox"
+HOMEPAGE="http://www.gnu.org/software/gnuzilla/"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+SLOT="0"
+LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
+IUSE="+alsa +cups +ipc java libnotify system-sqlite wifi"
+
+SRC_URI="mirror://gnu/gnuzilla/${MY_PV}/${PN}-${MY_PV}.tar.bz2
+	http://dev.gentoo.org/~anarchy/mozilla/patchsets/${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 )"
+	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 )"
+		fi
+		IUSE="${IUSE} linguas_${X%%-*}"
+	fi
+done
+
+RDEPEND="
+	>=sys-devel/binutils-2.16.1
+	>=dev-libs/nss-3.12.7
+	>=dev-libs/nspr-4.8.6
+	>=app-text/hunspell-1.2
+	system-sqlite? ( >=dev-db/sqlite-3.6.22-r2[fts3,secure-delete] )
+	alsa? ( media-libs/alsa-lib )
+	>=x11-libs/cairo-1.8.8[X]
+	x11-libs/pango[X]
+	wifi? ( net-wireless/wireless-tools )
+	libnotify? ( >=x11-libs/libnotify-0.4 )
+	cups? ( net-print/cups )
+	~net-libs/xulrunner-${XUL_PV}[ipc=,java=,wifi=,libnotify=,system-sqlite=]"
+
+DEPEND="${RDEPEND}
+	java? ( >=virtual/jdk-1.4 )
+	dev-util/pkgconfig"
+
+RDEPEND="${RDEPEND} java? ( >=virtual/jre-1.4 )"
+
+# This is a copy of the launcher program installed as part of xulrunner, so has
+# already been stripped. Bug #332071 for details.
+QA_PRESTRIPPED="usr/$(get_libdir)/${PN}/${PN}"
+
+linguas() {
+	local LANG SLANG
+	for LANG in ${LINGUAS}; do
+		if has ${LANG} en en_US; then
+			has en ${linguas} || linguas="${linguas:+"${linguas} "}en"
+			continue
+		elif has ${LANG} ${LANGS//-/_}; then
+			has ${LANG//_/-} ${linguas} || linguas="${linguas:+"${linguas} "}${LANG//_/-}"
+			continue
+		elif [[ " ${LANGS} " == *" ${LANG}-"* ]]; then
+			for X in ${LANGS}; do
+				if [[ "${X}" == "${LANG}-"* ]] && \
+					[[ " ${NOSHORTLANGS} " != *" ${X} "* ]]; then
+					has ${X} ${linguas} || linguas="${linguas:+"${linguas} "}${X}"
+					continue 2
+				fi
+			done
+		fi
+		ewarn "Sorry, but ${PN} does not support the ${LANG} LINGUA"
+	done
+}
+
+pkg_setup() {
+	# Ensure we always build with C locale.
+	export LANG="C"
+	export LC_ALL="C"
+	export LC_MESSAGES="C"
+	export LC_CTYPE="C"
+
+	java-pkg-opt-2_pkg_setup
+}
+
+src_unpack() {
+	#xz -dc -- "${DISTDIR}/icecat-${MY_PV}.tar.xz" | tar xof - || die "failed to unpack"
+	unpack ${A} #${PATCH}.tar.bz2
+
+	linguas
+	for X in ${linguas}; do
+		# FIXME: Add support for unpacking xpis to portage
+		[[ ${X} != "en" ]] && xpi_unpack "${P}-${X}.xpi"
+	done
+}
+
+src_prepare() {
+	# Integrate rebranding
+	sed -i "s|/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"
+
+	# Apply our patches
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}"
+
+	epatch "${FILESDIR}/fix_blocklist_support.patch"
+
+	# Fix rebranding
+	sed -i 's|\$(DIST)/bin/firefox|\$(DIST)/bin/icecat|' browser/app/Makefile.in
+
+	eautoreconf
+
+	cd js/src
+	eautoreconf
+}
+
+src_configure() {
+	# We will build our own .mozconfig
+	rm "${S}"/.mozconfig
+
+	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+	MEXTENSIONS="default"
+
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	mozconfig_init
+	mozconfig_config
+
+	# It doesn't compile on alpha without this LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# Specific settings for icecat
+	echo "export MOZ_PHOENIX=1" >> "${S}"/.mozconfig
+	echo "mk_add_options MOZ_PHOENIX=1" "${S}"/.mozconfig
+	mozconfig_annotate '' --with-branding=browser/branding/unofficial
+	mozconfig_annotate '' --disable-official-branding
+	mozconfig_annotate '' --with-user-appdir=.icecat
+
+	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
+	mozconfig_annotate '' --enable-application=browser
+	mozconfig_annotate '' --disable-mailnews
+	mozconfig_annotate 'broken' --disable-crashreporter
+	mozconfig_annotate '' --enable-image-encoder=all
+	mozconfig_annotate '' --enable-canvas
+	mozconfig_annotate 'gtk' --enable-default-toolkit=cairo-gtk2
+	# Bug 60668: Galeon doesn't build without oji enabled, so enable it
+	# regardless of java setting.
+	mozconfig_annotate '' --enable-oji --enable-mathml
+	mozconfig_annotate 'places' --enable-storage --enable-places
+	mozconfig_annotate '' --enable-safe-browsing
+
+	# Build mozdevelop permately
+	mozconfig_annotate ''  --enable-jsd --enable-xpctools
+
+	# System-wide install specs
+	mozconfig_annotate '' --disable-installer
+	mozconfig_annotate '' --disable-updater
+	mozconfig_annotate '' --disable-strip
+	mozconfig_annotate '' --disable-install-strip
+
+	# Use system libraries
+	mozconfig_annotate '' --enable-system-cairo
+	mozconfig_annotate '' --enable-system-hunspell
+	mozconfig_annotate '' --with-system-nspr
+	mozconfig_annotate '' --with-system-nss
+	mozconfig_annotate '' --with-system-bz2
+	mozconfig_annotate '' --with-system-libxul
+	mozconfig_annotate '' --with-libxul-sdk=/usr/$(get_libdir)/xulrunner-devel-${MAJ_XUL_PV}
+
+	mozconfig_use_enable ipc # +ipc, upstream default
+	mozconfig_use_enable libnotify
+	mozconfig_use_enable java javaxpcom
+	mozconfig_use_enable wifi necko-wifi
+	mozconfig_use_enable alsa ogg
+	mozconfig_use_enable alsa wave
+	mozconfig_use_enable system-sqlite
+	mozconfig_use_enable cups printing
+
+	# Other browser-specific settings
+	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
+
+	# Finalize and report settings
+	mozconfig_final
+
+	if [[ $(gcc-major-version) -lt 4 ]]; then
+		append-cxxflags -fno-stack-protector
+	fi
+
+	####################################
+	#
+	#  Configure and build
+	#
+	####################################
+
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" econf
+}
+
+src_compile() {
+	# Should the build use multiprocessing? Not enabled by default, as it tends to break
+	[ "${WANT_MP}" = "true" ] && jobs=${MAKEOPTS} || jobs="-j1"
+	emake ${jobs} || die
+}
+
+src_install() {
+	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	linguas
+	for X in ${linguas}; do
+		[[ ${X} != "en" ]] && xpi_install "${WORKDIR}"/"${P}-${X}"
+	done
+
+	# Install icon and .desktop for menu entry
+	newicon "${S}"/browser/branding/unofficial/default48.png icecat-icon.png
+	newmenu "${FILESDIR}"/icon/icecat.desktop ${PN}-${DESKTOP_PV}.desktop
+
+	# Add StartupNotify=true bug 237317
+	if use startup-notification ; then
+		echo "StartupNotify=true" >> "${D}"/usr/share/applications/${PN}-${DESKTOP_PV}.desktop
+	fi
+
+	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"
+	# Plugins dir
+	dosym ../nsbrowser/plugins "${MOZILLA_FIVE_HOME}"/plugins \
+		|| die "failed to symlink"
+}
+
+pkg_postinst() {
+	ewarn "All the packages built against ${PN} won't compile,"
+	ewarn "any package that fails to build warrants a bug report."
+	elog
+
+	# Update mimedb for the new .desktop file
+	fdo-mime_desktop_database_update
+}