Fix system-sqlite useage for current xulrunner, bug #308949

(Portage version: 2.1.8.3/cvs/Linux x86_64)

3 files changed, 11 insertions, 6 deletions

diff --git a/www-client/icecat/ChangeLog b/www-client/icecat/ChangeLog
index c6dbd0df086f..ed528531a47e 100644
--- a/www-client/icecat/ChangeLog
+++ b/www-client/icecat/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-client/icecat
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/icecat/ChangeLog,v 1.16 2010/02/20 00:31:42 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/icecat/ChangeLog,v 1.17 2010/03/13 14:40:42 anarchy Exp $
+
+  13 Mar 2010; <anarchy@gentoo.org> icecat-3.6-r1.ebuild, metadata.xml:
+  Fix system-sqlite useage for current xulrunner, bug #308949
 
   20 Feb 2010; <anarchy@gentoo.org> -icecat-3.5.4.ebuild,
   -icecat-3.5.5.ebuild:
diff --git a/www-client/icecat/icecat-3.6-r1.ebuild b/www-client/icecat/icecat-3.6-r1.ebuild
index d455ddcf09c5..56ab9a1c5a1c 100644
--- a/www-client/icecat/icecat-3.6-r1.ebuild
+++ b/www-client/icecat/icecat-3.6-r1.ebuild
@@ -1,6 +1,6 @@
 # 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-r1.ebuild,v 1.1 2010/02/13 12:35:56 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/icecat/icecat-3.6-r1.ebuild,v 1.2 2010/03/13 14:40:42 anarchy Exp $
 EAPI="2"
 WANT_AUTOCONF="2.1"
 
@@ -29,7 +29,7 @@ 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 java libnotify wifi"
+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
@@ -57,13 +57,13 @@ RDEPEND="
 	>=dev-libs/nss-3.12.4
 	>=dev-libs/nspr-4.8
 	>=app-text/hunspell-1.2
-	>=dev-db/sqlite-3.6.22-r2[fts3,secure-delete]
+	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 )
-	~net-libs/xulrunner-${XUL_PV}[java=,wifi=,libnotify=]"
+	~net-libs/xulrunner-${XUL_PV}[java=,wifi=,libnotify=,system-sqlite=]"
 
 DEPEND="${RDEPEND}
 	java? ( >=virtual/jdk-1.4 )
@@ -174,7 +174,6 @@ src_configure() {
 	mozconfig_annotate '' --enable-oji --enable-mathml
 	mozconfig_annotate 'places' --enable-storage --enable-places
 	mozconfig_annotate '' --enable-safe-browsing
-	mozconfig_annotate 'sqlite' --enable-system-sqlite
 
 	# Build mozdevelop permately
 	mozconfig_annotate ''  --enable-jsd --enable-xpctools
@@ -200,6 +199,7 @@ src_configure() {
 	mozconfig_use_enable wifi necko-wifi
 	mozconfig_use_enable alsa ogg
 	mozconfig_use_enable alsa wave
+	mozconfig_use_enable system-sqlite
 
 	# Other browser-specific settings
 	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
diff --git a/www-client/icecat/metadata.xml b/www-client/icecat/metadata.xml
index a26ffdd161aa..9a14da41dcb9 100644
--- a/www-client/icecat/metadata.xml
+++ b/www-client/icecat/metadata.xml
@@ -8,5 +8,7 @@
 	<flag name='mozdevelop'>Enable features for web developers (e.g.
 		Venkman)</flag>
 	<flag name='sqlite'>Enable/Disable system sqlite support</flag>
+	<flag name='system-sqlite'>Use the system-wide <pkg>dev-db/sqlite</pkg>
+		installation with secure-delete enabled</flag>
 </use>
 </pkgmetadata>