Don't use external sqlite, since it seems to give some problems, bug #228305, and fix bindist icon, bug #228317

Package-Manager: portage-2.1.4.4

3 files changed, 15 insertions, 9 deletions

diff --git a/www-client/mozilla-firefox/ChangeLog b/www-client/mozilla-firefox/ChangeLog
index 59b2964f588e..7d83db48d6f2 100644
--- a/www-client/mozilla-firefox/ChangeLog
+++ b/www-client/mozilla-firefox/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-client/mozilla-firefox
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.414 2008/06/18 18:49:27 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.415 2008/06/20 09:03:39 armin76 Exp $
+
+*mozilla-firefox-3.0-r1 (20 Jun 2008)
+
+  20 Jun 2008; Raúl Porcel <armin76@gentoo.org>
+  -mozilla-firefox-3.0.ebuild, +mozilla-firefox-3.0-r1.ebuild:
+  Don't use external sqlite, since it seems to give some problems, bug
+  #228305, and fix bindist icon, bug #228317
 
   18 Jun 2008; Raúl Porcel <armin76@gentoo.org> mozilla-firefox-3.0.ebuild:
   Bump patchset to fix bug #219444
diff --git a/www-client/mozilla-firefox/Manifest b/www-client/mozilla-firefox/Manifest
index b3f67697b817..81a43715cc8b 100644
--- a/www-client/mozilla-firefox/Manifest
+++ b/www-client/mozilla-firefox/Manifest
@@ -149,6 +149,6 @@ DIST mozilla-firefox-3.0.tar.bz2 11530763 RMD160 1c814957d36b12414d45f8432b3dbe2
 DIST xulrunner-1.9.tar.bz2 34035285 RMD160 0cbc3e76c1ac43858375ab88610e5b68b2620d62 SHA1 091a1bf39c8b57b579fadb01c6377f357427cd90 SHA256 5a17a5e138fe5f3a39d6ad44eb9cba076360b7e1809e4b647c4ae4f316d8a2ee
 EBUILD mozilla-firefox-2.0.0.11.ebuild 9932 RMD160 fb61c475c0ceecc05b618f5e43d2e18ff38daef7 SHA1 f21f55d6dace4dc7e0f1f39624dd7996d766900b SHA256 52cb6783ddb30c4f0e9951d584b77e53797cfa23d80aaa059c1990ea53589b23
 EBUILD mozilla-firefox-2.0.0.14.ebuild 10393 RMD160 73fc1259fb9bdd0316d3daabf9903b5287ad23d8 SHA1 efc6ac8086a3f14d39d87e02b106ae7d5c9c5a42 SHA256 3d5586ab7e7c807253bb5086b26eda9334f5f8b1277e12f3316643bcd7585363
-EBUILD mozilla-firefox-3.0.ebuild 9737 RMD160 90cecd5fd22e60ed58b4a5e113426754f4ec9f44 SHA1 7458c162d38e2207cfc4827f2d6ef5310fca12e1 SHA256 4959d055239f5d50cc6fbc2d9ba22c4c509db439106dc2e2c943ee78e16d2b64
-MISC ChangeLog 84230 RMD160 109d7f5a8ae998475267b70168a4fabce9b0206a SHA1 d245e8667094a89ed1bde60a945a7c62e49599f5 SHA256 cbbce8be6ba31c7ce1981a75b5b1923e229db6712500b760775834b05ab639c4
+EBUILD mozilla-firefox-3.0-r1.ebuild 9707 RMD160 8ebf711d312588384d8a14e5cf8c7524f88f498b SHA1 d0089e9bc86898a5fa7526210504b45ba6e49126 SHA256 0705ad80128c01243198e58eb1f48367441fd5c569523a6bc1f2e5b0c77ff0df
+MISC ChangeLog 84498 RMD160 08889d42ff2e0fd31f99faf6497c7b4b44e3f532 SHA1 8dd89f8eda9043f799e39d4a78291e700737f3d2 SHA256 d8dff8bea6f56372e187b0aec7db6ffdab42fb536e966706dbee014e236a6f88
 MISC metadata.xml 160 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 SHA1 5015c07af2083f20f9552d7fb11afb5ea69af345 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b
diff --git a/www-client/mozilla-firefox/mozilla-firefox-3.0.ebuild b/www-client/mozilla-firefox/mozilla-firefox-3.0-r1.ebuild
index 0540227e0a7f..2a337c0d0537 100644
--- a/www-client/mozilla-firefox/mozilla-firefox-3.0.ebuild
+++ b/www-client/mozilla-firefox/mozilla-firefox-3.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.0.ebuild,v 1.5 2008/06/18 18:49:27 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-3.0-r1.ebuild,v 1.1 2008/06/20 09:03:39 armin76 Exp $
 EAPI="1"
 WANT_AUTOCONF="2.1"
 
@@ -52,8 +52,7 @@ RDEPEND="java? ( virtual/jre )
 	>=dev-libs/nspr-4.7.1
 	>=media-libs/lcms-1.17
 	>=app-text/hunspell-1.1.9
-	>=dev-db/sqlite-3.5.6
-	xulrunner? ( >=net-libs/xulrunner-1.9${MY_PV} )"
+	xulrunner? ( >=net-libs/xulrunner-1.9${MY_PV}-r2 )"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
@@ -156,7 +155,7 @@ src_compile() {
 	mozconfig_annotate 'broken' --disable-mochitest
 	mozconfig_annotate 'broken' --disable-crashreporter
 	mozconfig_annotate '' --enable-system-hunspell
-	mozconfig_annotate '' --enable-system-sqlite
+	#mozconfig_annotate '' --enable-system-sqlite
 	mozconfig_annotate '' --enable-image-encoder=all
 	mozconfig_annotate '' --enable-canvas
 	mozconfig_annotate '' --with-system-nspr
@@ -255,7 +254,7 @@ src_install() {
 		newmenu "${FILESDIR}"/icon/mozilla-firefox-1.5.desktop \
 			mozilla-firefox-3.0.desktop
 	else
-		newicon "${S}"/browser/base/branding/firefox/content/icon48.png firefox-icon-unbranded.png
+		newicon "${S}"/browser/base/branding/icon48.png firefox-icon-unbranded.png
 		newmenu "${FILESDIR}"/icon/mozilla-firefox-1.5-unbranded.desktop \
 			mozilla-firefox-3.0.desktop
 	fi
@@ -270,7 +269,7 @@ src_install() {
 		sed -i -e "s|MinVersion=.*$|MinVersion=${XULRUNNER_VERSION}|" "${D}"${MOZILLA_FIVE_HOME}/application.ini
 		sed -i -e "s|MaxVersion=.*$|MaxVersion=${XULRUNNER_VERSION}|" "${D}"${MOZILLA_FIVE_HOME}/application.ini
 		# Create /usr/bin/firefox
-		cat <<EOF >${D}/usr/bin/firefox
+		cat <<EOF >"${D}"/usr/bin/firefox
 #!/bin/sh
 export LD_LIBRARY_PATH="/usr/$(get_libdir)/mozilla-firefox"
 exec /usr/$(get_libdir)/mozilla-firefox/firefox "\$@"