allow system sqlite to be disabled, misc fixes.

Package-Manager: portage-2.1.7.1/cvs/Linux x86_64

3 files changed, 40 insertions, 15 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/Manifest b/net-libs/xulrunner/Manifest
index ce8535bd214c..2276370503ca 100644
--- a/net-libs/xulrunner/Manifest
+++ b/net-libs/xulrunner/Manifest
@@ -4,7 +4,6 @@ AUX xulrunner-1.8-gcc-4.4.patch 310 RMD160 9d8f402aa66752b7d61fc47b6f4a1526f1f8a
 AUX xulrunner-1.8.1.19-glibc-2.10-support.patch 696 RMD160 171629110f94ecf974e7d0ac71ac842f16786b27 SHA1 316f3f325ed219643362a1837dd8451000945393 SHA256 1cf9a4c0dd54a537886dff05be9e996fc25e63518f5eaef5781492a2a21150b2
 AUX xulrunner-default-prefs.js 677 RMD160 73ec130da332c1d6517a6f838d5fab0cc134289a SHA1 b9efc3ef5e95ad3081f6b68d771e32e848b4b9ac SHA256 53493080276f221f1619153c114caf268206a6fa107972b33a4eb7f1c1cf6fe8
 AUX xulrunner.conf 113 RMD160 8be48cf5040eb5753c8eb35c048cc6b2c1a8a057 SHA1 62cce7ee5b1e51343c3dbc388894011da913d9d4 SHA256 9ac56b42cfb48854d23c299330ad327af5f0815140dcb7fdee905b660cd9a8a3
-DIST firefox-3.5.2-source.tar.bz2 46787928 RMD160 d5e0b5f0e8b19b216394584ccabf37d776b89a39 SHA1 6439923ff9d316297926ebe193bac3ac1a41b494 SHA256 d68b5988907e06cc37793489589f5545487a9b1bbe6444b7e2e16450bd1cb9ae
 DIST firefox-3.5.3.source.tar.bz2 46766383 RMD160 c2487c90b4a9490840817c7b00dcccd68a0c4422 SHA1 83b2625eb74e81b473ac40ac52505e5fc9a497eb SHA256 e6327807ed1dd0c0685f7c2fba1427e7e38b5c92f36811f243861fbd9b7ad2d2
 DIST xulrunner-1.8.1.19-patches-0.1.tar.bz2 62219 RMD160 ecc59c5204090c6aa9c475bc181f745a6be84e98 SHA1 1b19bb5b4203a582d990175189b11f0215531327 SHA256 621a9e7abdfd667b05d0c8cee7b3cc284decd3ee50958ea849969f9ac3475f73
 DIST xulrunner-1.8.1.19-source.tar.bz2 38110248 RMD160 2b742243c6370a2790f48d2ceae2be756b4737ce SHA1 fb1b85088000142e24609d5ab9e6e483a82f8917 SHA256 3c1873b3e6c660acdae9e102391bbc64274cea3ed6238d9d693ab09fcf2b53ee
@@ -20,7 +19,7 @@ EBUILD xulrunner-1.9.0.10.ebuild 4704 RMD160 4c9c1bd079a72df2da35ce654d42b4a8ef2
 EBUILD xulrunner-1.9.0.11-r1.ebuild 4829 RMD160 bab59a48bda5b5e98d4353309bf8d5c777374734 SHA1 9d3f2170975d30c9356a6f47d81c7e8a540ac7e3 SHA256 ebc9495cdeac42cca8d288ac8d8771732e36e5ef1e561e4860e271d2018fe750
 EBUILD xulrunner-1.9.0.13.ebuild 4831 RMD160 018e5a2a043e516287f83a00e934d6a87f1fd78c SHA1 ca9fde2e47938528d42b679b30be7e903f93bba4 SHA256 f3eea35efa8a236b9594fb8b54d6976c5ef4b2c3b519187a72d96dc60574790f
 EBUILD xulrunner-1.9.0.14.ebuild 4825 RMD160 be352abdf1873f3a0f609000a5842f6f60d1fb42 SHA1 78311a474cd983b47c55ecd47371611ebd30a39a SHA256 2411d833e40ed9ebee13a6b4a8e95a4dfdc6cb7de1607b9dd522f1f03e6d4bf4
-EBUILD xulrunner-1.9.1.2-r2.ebuild 7344 RMD160 be28accb592eb5ae44c19a382187bb533d8ed7ae SHA1 3cbed5f092de4db39a0a4f6ee529f5a5e1581a6d SHA256 93256f62eb61d722e90e38948b4917293ce1330c9aded9e8798f97b464fa7348
+EBUILD xulrunner-1.9.1.3-r1.ebuild 8080 RMD160 809d2c941a3c039c567cb55d122e3b84ac4918e8 SHA1 30a4be6e94069b943fa524b7348809c6d00900f6 SHA256 ddbcabef28a473433d520a80c76708bc89c60aa36b61fe60cf9998febeca8afa
 EBUILD xulrunner-1.9.1.3.ebuild 7383 RMD160 d7809a938b402eb57e8763d2a19d6d0392339441 SHA1 98fb097fe48622cd0a1afa5ff5ab9d64c525214c SHA256 75d1f2c1e9512adfcf8e71fcf096056496b5376bd32cc6c8f57c540f5c58c27e
-MISC ChangeLog 34001 RMD160 4748efb83041126fc3ad9a4cbc19ea9cd31bd4fb SHA1 0e661f788b0f93bc945ca8047faebaca1f5f5d18 SHA256 418bb68ffbbdd949f1ee342deab7aa5698bedee942ca8e79af8afefad02949cd
+MISC ChangeLog 34256 RMD160 5416abfc76dcfbcb167916a1a382476e0afafc0a SHA1 629dc0b2304c6d9f9fed79fe768f2e436b7ad5a7 SHA256 0c60a751fa419db5cf564cecfcd3648b9cb425ca10839489468b65514fa00016
 MISC metadata.xml 263 RMD160 9ed9d79d17d0a991e88c31ae6342996519ffef5b SHA1 0de183203298ce0f1c2ecc3fc8149842c4a0ec60 SHA256 64bfc93c4ab02ef2fe9b61b8157eb722d6cca5d552eecc18eaaf8e95980d2550
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() {