allow system sqlite to be disabled, misc fixes.

(Portage version: 2.1.7.1/cvs/Linux x86_64)

2 files changed, 38 insertions, 12 deletions

diff --git a/net-libs/xulrunner/ChangeLog b/net-libs/xulrunner/ChangeLog
index 3b744a09b7c2..a8315122670c 100644
--- a/net-libs/xulrunner/ChangeLog
+++ b/net-libs/xulrunner/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-libs/xulrunner
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.255 2009/10/19 11:00:42 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.256 2009/10/25 16:25:57 anarchy Exp $
+
+*xulrunner-1.9.1.3-r1 (25 Oct 2009)
+
+  25 Oct 2009; Jory A. Pratt <anarchy@gentoo.org>
+  -xulrunner-1.9.1.2-r2.ebuild, +xulrunner-1.9.1.3-r1.ebuild:
+  update xulrunner-1.9.1.3 to support disabling sqlite, also allows icecat
+  to be introduced to the tree.
 
   19 Oct 2009; Samuli Suominen <ssuominen@gentoo.org>
   xulrunner-1.9.1.2-r2.ebuild:
diff --git a/net-libs/xulrunner/xulrunner-1.9.1.2-r2.ebuild b/net-libs/xulrunner/xulrunner-1.9.1.3-r1.ebuild
index 4022b4eaca38..74babbb1515b 100644
--- a/net-libs/xulrunner/xulrunner-1.9.1.2-r2.ebuild
+++ b/net-libs/xulrunner/xulrunner-1.9.1.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/net-libs/xulrunner/xulrunner-1.9.1.2-r2.ebuild,v 1.2 2009/10/19 11:00:42 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.1.3-r1.ebuild,v 1.1 2009/10/25 16:25:57 anarchy Exp $
 
 EAPI="2"
 WANT_AUTOCONF="2.1"
@@ -9,42 +9,43 @@ inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib java-p
 
 MY_PV="${PV/_beta/b}" # Handle betas
 MY_PV="${PV/_/}" # Handle rc1, rc2 etc
-MY_PV="${MY_PV/1.9.1.2/3.5.2}"
-MAJ_PV="${PV/_*/}"
-PATCH="${PN}-${MAJ_PV}-patches-0.3"
+MY_PV="${MY_PV/1.9.1.3/3.5.3}"
+MAJ_PV="1.9.1" # from mozilla-* branch name
+PATCH="${PN}-1.9.1.2-patches-0.3"
 
 DESCRIPTION="Mozilla runtime package that can be used to bootstrap XUL+XPCOM applications"
 HOMEPAGE="http://developer.mozilla.org/en/docs/XULRunner"
-SRC_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${MY_PV}/source/firefox-${MY_PV}-source.tar.bz2
+SRC_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${MY_PV}/source/firefox-${MY_PV}.source.tar.bz2
 	http://dev.gentoo.org/~anarchy/dist/${PATCH}.tar.bz2"
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 -sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 -sparc ~x86"
 SLOT="1.9"
 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE="+alsa debug python" # qt-experimental
+IUSE="+alsa debug python sqlite" # qt-experimental
 
 #	qt-experimental? (
 #		x11-libs/qt-gui
 #		x11-libs/qt-core )
 
 # nspr-4.8 due to BMO #499144
-# Disable sqlite temporarily  	>=dev-db/sqlite-3.6.7
 RDEPEND="java? ( >=virtual/jre-1.4 )
 	>=dev-lang/python-2.3[threads]
 	>=sys-devel/binutils-2.16.1
 	>=dev-libs/nss-3.12.3
 	>=dev-libs/nspr-4.8
+	sqlite? ( >=dev-db/sqlite-3.6.10 )
 	alsa? ( media-libs/alsa-lib )
 	>=app-text/hunspell-1.2
 	>=media-libs/lcms-1.17
 	>=x11-libs/cairo-1.8.8[X]
-	x11-libs/pango[X]"
+	x11-libs/pango[X]
+	x11-libs/libXt"
 
 DEPEND="java? ( >=virtual/jdk-1.4 )
 	${RDEPEND}
 	dev-util/pkgconfig"
 
-S="${WORKDIR}/mozilla-1.9.1"
+S="${WORKDIR}/mozilla-${MAJ_PV}"
 
 # Needed by src_compile() and src_install().
 # Would do in pkg_setup but that loses the export attribute, they
@@ -54,6 +55,15 @@ export MOZILLA_OFFICIAL=1
 
 pkg_setup() {
 	java-pkg-opt-2_pkg_setup
+
+	if use sqlite ; then
+		elog "You are enabling system sqlite. Do not file a bug with gentoo if you have"
+		elog "issues that arise from enabling system sqlite. All bugs will be concidered"
+		elog  "invalid. All patches are welcomed to fix any issues that might be found with"
+		elog "system sqlite. If you are starting with a fresh profile you can enable sqlite"
+		elog  "without any major issues."
+		epause 10
+	fi
 }
 
 src_prepare() {
@@ -127,12 +137,17 @@ 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
 
+	if use sqlite ; then
+		mozconfig_annotate 'sqlite' --enable-system-sqlite
+	else
+		mozconfig_annotate '-sqlite' --disable-system-sqlite
+	fi
+
 	# IUSE qt-experimental
 #	if use qt-experimental ; then
 #		ewarn "You are enabling the EXPERIMENTAL qt toolkit"
@@ -235,6 +250,10 @@ pkg_postinst() {
 	einfo "All prefs can be overridden by the user. The preferences are to make"
 	einfo "use of xulrunner out of the box on an average system without the user"
 	einfo "having to go through and enable the basics."
+
+	einfo
+	ewarn "Please remember to rebuild your browser(s) after update to prevent an xpcom error."
+	ewarn "This bump is needed in order to bring iceat to the tree to replace iceweasel useflag."
 }
 
 pkg_postrm() {