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

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

4 files changed, 14 insertions, 9 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/Manifest b/www-client/icecat/Manifest
index 32aba03832a0..f470b59368b5 100644
--- a/www-client/icecat/Manifest
+++ b/www-client/icecat/Manifest
@@ -154,7 +154,7 @@ DIST mozilla-firefox-3.5.6-zh-CN.xpi 126369 RMD160 04299b8de045da6dbb68730ffed41
 DIST mozilla-firefox-3.5.6-zh-TW.xpi 127857 RMD160 9c0a230b2f84503c89b4f11294740b0e7f1fc737 SHA1 11313dabc764594bb87a5715a4be8bbbedfca065 SHA256 d0912cf65a9c5fabc1217dfa794d7cd39e75e6ffd535f086f68f02ccd7f2a01e
 DIST mozilla-firefox-3.6-patches-0.6.tar.bz2 5201 RMD160 d721f5b7070b978e61b27c1d138dd8f464cfa9a4 SHA1 00e9e6955fb405e462598e500f48b937d5085b41 SHA256 3ccc057da61bf6d174fe0e3fcb1f213c27813d78b09cc8526a86d95b043a5c64
 EBUILD icecat-3.5.6.ebuild 8407 RMD160 d6c47cbfa490f6bf3e7eaa02cd6d7fe2d9431e4a SHA1 257c74b816bf90564ec1e041c1bc73f284b568a7 SHA256 7a03e71d1fb65aaa98811fcd5e33b2d3d71d670bf2c3a6cba53c6fa5f2a3c48b
-EBUILD icecat-3.6-r1.ebuild 8238 RMD160 b34ccf777a965bcaef7698d31de037e8dd72b65c SHA1 be9dc336a6dfe4406d0ccd7a27a905c54196f07e SHA256 2fa9d996c98b8aca84bde1405b5791fd8ee3ef12a743ada5b6540becf848e121
+EBUILD icecat-3.6-r1.ebuild 8270 RMD160 5fe61a86e981c31904ca86d8131059782c7fb88c SHA1 1d77d74fa57fcdc0e83856c844d821d6624c13e8 SHA256 6b327cd4153ffb6d6cdaea3ac916efae55c2bf0c893284971329e92d41f2b3cd
 EBUILD icecat-3.6.ebuild 8169 RMD160 b6687d14d27b547349508e7a4cbc5c0b77fe10df SHA1 82797f7a04108f5f26cf5a617fac01cdd3afd811 SHA256 e6497a25e97763a05a3dac132a4247b6a91551b34888127ff7653682dd2ce2e0
-MISC ChangeLog 2424 RMD160 4fbbc2d44bfd094560ae6ff38b6aa38ef2ee44e2 SHA1 48895d9d6d338e689f14330b23adfb19794166c9 SHA256 ba7be1cb9f08abf4f8f7ca2217e0565520d37d581b394568ba7dadecb44b9d20
-MISC metadata.xml 405 RMD160 d3ea06a6e4ec92d2db4e724421a2273fee5f72f8 SHA1 c665dbc60b28903da61d9a02b8fed0bc10c545d7 SHA256 41ae022f421f7c7ad2b4a42a57db5f9cb84537afc181cba0bb23fa0888c1d239
+MISC ChangeLog 2559 RMD160 55c2e1767925410a94f98dc9ff2e223a21763f0b SHA1 bbf417f5e3ed18ccfe21448ab0a23e7036b7c963 SHA256 7603935532788980f345140f291bdef63bb35b7cb5cc958190cf3696dc18f77a
+MISC metadata.xml 527 RMD160 5932cc3ce68faf363fe48875391e10f7cf3ea18f SHA1 910ff5dd5bd7b19ad05c37e5d21c28cf10b59ead SHA256 f78de368d921e7fd8a5ed00f40caf8789aeba9c377877626ef2135ea6ad5ee3a
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>