remove iceweasel support, only build system sqlite when sqlite useflag is enabled.

(Portage version: 2.1.7.1/cvs/Linux x86_64)

2 files changed, 38 insertions, 58 deletions

diff --git a/www-client/mozilla-firefox/ChangeLog b/www-client/mozilla-firefox/ChangeLog
index 7eafc64e30a5..23646c347472 100644
--- a/www-client/mozilla-firefox/ChangeLog
+++ b/www-client/mozilla-firefox/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for www-client/mozilla-firefox
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.555 2009/10/19 11:03:52 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.556 2009/10/25 16:27:46 anarchy Exp $
+
+  25 Oct 2009; Jory A. Pratt <anarchy@gentoo.org>
+  -mozilla-firefox-3.5.2-r3.ebuild, +mozilla-firefox-3.5.3-r1.ebuild:
+  remove old firefox-3.5 ebuild with security issues
+
+*mozilla-firefox-3.5.3-r1 (25 Oct 2009)
+
+  25 Oct 2009; Jory A. Pratt <anarchy@gentoo.org>
+  +mozilla-firefox-3.5.3-r1.ebuild:
+  remove iceweasel support in favor of icecat, do not build sqlite system
+  support if disabled in xulrunner
 
   19 Oct 2009; Samuli Suominen <ssuominen@gentoo.org>
   mozilla-firefox-3.5.2-r3.ebuild:
diff --git a/www-client/mozilla-firefox/mozilla-firefox-3.5.2-r3.ebuild b/www-client/mozilla-firefox/mozilla-firefox-3.5.3-r1.ebuild
index 66d0cf2b2941..6867e2f49f79 100644
--- a/www-client/mozilla-firefox/mozilla-firefox-3.5.2-r3.ebuild
+++ b/www-client/mozilla-firefox/mozilla-firefox-3.5.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-3.5.2-r3.ebuild,v 1.2 2009/10/19 11:03:52 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-3.5.3-r1.ebuild,v 1.1 2009/10/25 16:27:46 anarchy Exp $
 EAPI="2"
 WANT_AUTOCONF="2.1"
 
@@ -12,24 +12,24 @@ ka kk kn ko ku lt lv mk ml mn 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-LK ta te th tr uk vi zh-CN zh-TW"
 NOSHORTLANGS="en-GB es-AR es-CL es-MX pt-BR zh-CN zh-TW"
 
-XUL_PV="1.9.1.2"
+XUL_PV="1.9.1.3"
+MAJ_XUL_PV="1.9.1"
 MAJ_PV="${PV/_*/}" # Without the _rc and _beta stuff
 DESKTOP_PV="3.5"
 MY_PV="${PV/_beta/b}" # Handle betas for SRC_URI
 MY_PV="${PV/_/}" # Handle rcs for SRC_URI
-PATCH="${P}-patches-0.1"
+PATCH="${PN}-3.5.2-patches-0.1"
 
 DESCRIPTION="Firefox Web Browser"
 HOMEPAGE="http://www.mozilla.com/firefox"
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 -sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 -sparc ~x86"
 SLOT="0"
 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE="+alsa bindist iceweasel java mozdevelop restrict-javascript" # qt-experimental
+IUSE="+alsa bindist java mozdevelop restrict-javascript -sqlite iceweasel" # qt-experimental
 
 REL_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases"
-SRC_URI="${REL_URI}/${MY_PV}/source/firefox-${MY_PV}-source.tar.bz2
-	iceweasel? ( mirror://gentoo/iceweasel-icons-3.0.tar.bz2 )
+SRC_URI="${REL_URI}/${MY_PV}/source/firefox-${MY_PV}.source.tar.bz2
 	http://dev.gentoo.org/~anarchy/dist/${PATCH}.tar.bz2"
 
 for X in ${LANGS} ; do
@@ -59,8 +59,9 @@ RDEPEND="
 	>=dev-libs/nss-3.12.2
 	>=dev-libs/nspr-4.7.3
 	>=app-text/hunspell-1.2
+	sqlite? ( >=dev-db/sqlite-3.6.10 )
 	alsa? ( media-libs/alsa-lib )
-	>=net-libs/xulrunner-${XUL_PV}[java=]
+	>=net-libs/xulrunner-${XUL_PV}[java=,sqlite=]
 	>=x11-libs/cairo-1.8.8[X]
 	x11-libs/pango[X]"
 
@@ -100,23 +101,24 @@ linguas() {
 }
 
 pkg_setup() {
-	if ! use bindist && ! use iceweasel ; then
+	if ! use bindist ; then
 		elog "You are enabling official branding. You may not redistribute this build"
 		elog "to any users on your network or the internet. Doing so puts yourself into"
 		elog "a legal problem with Mozilla Foundation"
 		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
 	fi
+
+	if use iceweasel ; then
+		elog "You have enabled iceweasel useflag which does nothing in current ebuild."
+		elog "Please 'emerge -C mozilla-firefox; emerge icecat' if you wish to have same support"
+		elog "as you currently had with iceweasel useflag."
+		eerror "Please 'emerge -C mozilla-firefox; emerge icecat' to have a same support"
+	fi
 }
 
 src_unpack() {
 	unpack ${A}
 
-	if use iceweasel ; then
-		unpack iceweasel-icons-3.0.tar.bz2
-
-		cp -r iceweaselicons/browser "${WORKDIR}"
-	fi
-
 	linguas
 	for X in ${linguas}; do
 		# FIXME: Add support for unpacking xpis to portage
@@ -133,11 +135,6 @@ src_prepare() {
 	EPATCH_FORCE="yes" \
 	epatch "${WORKDIR}"
 
-	if use iceweasel ; then
-		sed -i -e "s:Minefield:Iceweasel:" browser/locales/en-US/chrome/branding/brand.* \
-			browser/branding/nightly/configure.sh || die "iceweasel sed failed!"
-	fi
-
 	eautoreconf
 
 	cd js/src
@@ -165,6 +162,7 @@ src_configure() {
 
 	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
 	mozconfig_annotate '' --enable-application=browser
+	mozconfig_annotate 'gtk' --enable-default-toolkit=cairo-gtk2
 	mozconfig_annotate '' --disable-mailnews
 	mozconfig_annotate 'broken' --disable-crashreporter
 	mozconfig_annotate '' --enable-image-encoder=all
@@ -184,38 +182,21 @@ src_configure() {
 	# Use system libraries
 	mozconfig_annotate '' --enable-system-cairo
 	mozconfig_annotate '' --enable-system-hunspell
-	# mozconfig_annotate '' --enable-system-sqlite
 	mozconfig_annotate '' --with-system-nspr
 	mozconfig_annotate '' --with-system-nss
 	mozconfig_annotate '' --enable-system-lcms
 	mozconfig_annotate '' --with-system-bz2
 	mozconfig_annotate '' --with-system-libxul
-	mozconfig_annotate '' --with-libxul-sdk=/usr/$(get_libdir)/xulrunner-devel-${XUL_PV}
+	mozconfig_annotate '' --with-libxul-sdk=/usr/$(get_libdir)/xulrunner-devel-${MAJ_XUL_PV}
 
-	# IUSE mozdevelop
+	# Enable/Disable based on useflag
+	mozconfig_use_enable sqlite system-sqlite
 	mozconfig_use_enable mozdevelop jsd
 	mozconfig_use_enable mozdevelop xpctools
-	#mozconfig_use_extension mozdevelop venkman
-
-	# IUSE qt-experimental
-#	if use qt-experimental ; then
-#		ewarn "You are enabling the EXPERIMENTAL qt toolkit"
-#		ewarn "Usage is at your own risk"
-#		ewarn "Known to be broken. DO NOT file bugs."
-#		mozconfig_annotate '' --disable-system-cairo
-#		mozconfig_annotate 'qt-experimental' --enable-default-toolkit=cairo-qt
-#	else
-		mozconfig_annotate 'gtk' --enable-default-toolkit=cairo-gtk2
-#	fi
-
-	# Other ff-specific settings
-	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
-
-	# Enable/Disable audio in firefox
 	mozconfig_use_enable alsa ogg
 	mozconfig_use_enable alsa wave
 
-	if ! use bindist && ! use iceweasel ; then
+	if ! use bindist ; then
 		mozconfig_annotate '' --enable-official-branding
 	fi
 
@@ -245,7 +226,6 @@ src_install() {
 	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
 
 	emake DESTDIR="${D}" install || die "emake install failed"
-	rm "${D}"/usr/bin/firefox
 
 	linguas
 	for X in ${linguas}; do
@@ -253,11 +233,7 @@ src_install() {
 	done
 
 	# Install icon and .desktop for menu entry
-	if use iceweasel ; then
-		newicon "${S}"/browser/base/branding/icon48.png iceweasel-icon.png
-		newmenu "${FILESDIR}"/icon/iceweasel.desktop \
-			${PN}-${DESKTOP_PV}.desktop
-	elif ! use bindist ; then
+	if ! use bindist ; then
 		newicon "${S}"/other-licenses/branding/firefox/content/icon48.png firefox-icon.png
 		newmenu "${FILESDIR}"/icon/mozilla-firefox-1.5.desktop \
 			${PN}-${DESKTOP_PV}.desktop
@@ -265,7 +241,7 @@ src_install() {
 		newicon "${S}"/browser/base/branding/icon48.png firefox-icon-unbranded.png
 		newmenu "${FILESDIR}"/icon/mozilla-firefox-1.5-unbranded.desktop \
 			${PN}-${DESKTOP_PV}.desktop
-		sed -i -e "s:Bon Echo:Minefield:" \
+		sed -i -e "s:Bon Echo:Shiretoko:" \
 			"${D}"/usr/share/applications/${PN}-${DESKTOP_PV}.desktop || die "sed failed!"
 	fi
 
@@ -274,14 +250,6 @@ src_install() {
 		echo "StartupNotify=true" >> "${D}"/usr/share/applications/${PN}-${DESKTOP_PV}.desktop
 	fi
 
-	# Create /usr/bin/firefox
-	cat <<EOF >"${D}"/usr/bin/firefox
-#!/bin/sh
-export LD_LIBRARY_PATH="${MOZILLA_FIVE_HOME}\${LD_LIBRARY_PATH+":\${LD_LIBRARY_PATH}"}"
-exec "${MOZILLA_FIVE_HOME}"/firefox "\$@"
-EOF
-
-	fperms 0755 /usr/bin/firefox
 	pax-mark m "${D}"/${MOZILLA_FIVE_HOME}/firefox
 
 	# Enable very specific settings not inherited from xulrunner
@@ -290,7 +258,8 @@ EOF
 		die "failed to cp xulrunner-default-prefs.js"
 
 	# Plugins dir
-	dosym ../nsbrowser/plugins "${MOZILLA_FIVE_HOME}"/plugins || die
+	dosym ../nsbrowser/plugins "${MOZILLA_FIVE_HOME}"/plugins \
+		|| die "failed to symlink"
 }
 
 pkg_postinst() {