Add missing file and die if cp failed, proxy commit for mozilla team

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

4 files changed, 24 insertions, 5 deletions

diff --git a/net-libs/xulrunner/ChangeLog b/net-libs/xulrunner/ChangeLog
index 73c01069fb04..d6489eb3fa77 100644
--- a/net-libs/xulrunner/ChangeLog
+++ b/net-libs/xulrunner/ChangeLog
@@ -1,6 +1,10 @@
 # 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.224 2009/07/31 15:02:26 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.225 2009/08/01 00:31:41 darkside Exp $
+
+  01 Aug 2009; Jeremy Olexa <darkside@gentoo.org>
+  +files/xulrunner-default-prefs.js, xulrunner-1.9.1.1.ebuild:
+  Add missing file and die if cp failed, proxy commit for mozilla team
 
   31 Jul 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   xulrunner-1.9.1-r1.ebuild, xulrunner-1.9.1.1.ebuild:
diff --git a/net-libs/xulrunner/Manifest b/net-libs/xulrunner/Manifest
index 8d76d0f49712..7f981bc72bb3 100644
--- a/net-libs/xulrunner/Manifest
+++ b/net-libs/xulrunner/Manifest
@@ -1,5 +1,6 @@
 AUX 066-fix-includedir-mozilla-js.patch 747 RMD160 39c4430f77e42f5f5ad5f8038c036fccac1a7bb0 SHA1 9a1a09ee9bdca8ab9aeec6408baf207da9abe88a SHA256 069f6b1a43662e417e7f0194ceb039941c209409f8fb788914f862595cdf52f4
 AUX xulrunner-1.8-gcc-4.4.patch 310 RMD160 9d8f402aa66752b7d61fc47b6f4a1526f1f8a4e5 SHA1 741a8679bb6d65d83dfdc1ea0cd277c08b3bcc7e SHA256 2bb5b927e11307daf14b4cdab381fba27c6fcb0ba8631e7952d38821282e2c6f
+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.1-source.tar.bz2 46438473 RMD160 a7fe7bba679160b1b6c995acbc1cb69b4dcad334 SHA1 8659dd873e8a82a9f39fcb1f0add8afb39cb7274 SHA256 935a84aa07e40e342e178c31287cfa7d314db882b23997bffc220222f0b5e883
 DIST xulrunner-1.8.1.19-patches-0.1.tar.bz2 62219 RMD160 ecc59c5204090c6aa9c475bc181f745a6be84e98 SHA1 1b19bb5b4203a582d990175189b11f0215531327 SHA256 621a9e7abdfd667b05d0c8cee7b3cc284decd3ee50958ea849969f9ac3475f73
@@ -16,6 +17,6 @@ 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.12.ebuild 4824 RMD160 6e4d98d2c292a68127819340f2756167ea4411a7 SHA1 a43a4f7d8c2664c01f1edeca689bd3dfd2f9fa29 SHA256 260e1f5bb66b2cc796d89d983ec6be78f6beba626ab0384c5e3c9871f5ace69f
 EBUILD xulrunner-1.9.1-r1.ebuild 6546 RMD160 0e921100a62e192a3bf1f532a66fc8281b9d867c SHA1 1413406be60c1a4a668ee4a96dee8db425b0600c SHA256 cfa8a752ef9c842402fd73be21673f7194b88751f549b0193ab0517388c9811e
-EBUILD xulrunner-1.9.1.1.ebuild 7068 RMD160 72da772f84a5ee6958e49a9b70a0360471430c5e SHA1 5bc5710e3b477b3b117cbafd7ce60d7dd4b302c4 SHA256 dc10b76fddcb23ebd6dd7fc9d6eff71c4eaa59fcad9a91a99b52550567f4298b
-MISC ChangeLog 29455 RMD160 631279b070d4fc3153de6add24d32c80b4cf415e SHA1 d0f4a2422a45ce5e921a47970c98cb8818cb167c SHA256 136852f90b1bb2947e2e5cd5cd316b6b6dcc974e42e19961fcfc4ebff4a66ae9
+EBUILD xulrunner-1.9.1.1.ebuild 7087 RMD160 ff0478b602410a9cb135aea6ea9d4f3aebb37ce4 SHA1 ddeddef74f5b3d6194781ff300afd88b62f3b57c SHA256 c7cbe2a7dd9ad58b5659e9910657d651e63bb0783941716a5daf84458d194e6e
+MISC ChangeLog 29640 RMD160 7cd5dcfb55e05e63d957c04e0604aaed4da3567d SHA1 e9116cd3071a40a9584d1adaf69328e1fee195e1 SHA256 db55791fd253c75f46675d85b5824196cf882f31517b3d0c9c6b2a12ed174bbb
 MISC metadata.xml 263 RMD160 9ed9d79d17d0a991e88c31ae6342996519ffef5b SHA1 0de183203298ce0f1c2ecc3fc8149842c4a0ec60 SHA256 64bfc93c4ab02ef2fe9b61b8157eb722d6cca5d552eecc18eaaf8e95980d2550
diff --git a/net-libs/xulrunner/files/xulrunner-default-prefs.js b/net-libs/xulrunner/files/xulrunner-default-prefs.js
new file mode 100644
index 000000000000..4546d3f80ea7
--- /dev/null
+++ b/net-libs/xulrunner/files/xulrunner-default-prefs.js
@@ -0,0 +1,14 @@
+pref("app.update.enabled",                 false);
+pref("app.update.autoInstallEnabled",      false);
+pref("browser.display.use_system_colors",  true);
+pref("browser.link.open_external",         3);
+pref("general.smoothScroll",               true);
+pref("general.autoScroll",                 false);
+pref("browser.tabs.tabMinWidth",           15);
+pref("browser.backspace_action",           0);
+pref("browser.urlbar.hideGoButton",        true);
+pref("accessibility.typeaheadfind",        true);
+pref("browser.shell.checkDefaultBrowser",  false); 
+pref("browser.EULA.override",              true); 
+pref("general.useragent.vendor", "Gentoo");
+pref("intl.locale.matchOS", true);
diff --git a/net-libs/xulrunner/xulrunner-1.9.1.1.ebuild b/net-libs/xulrunner/xulrunner-1.9.1.1.ebuild
index 54aecea764fa..29153c8a8cf1 100644
--- a/net-libs/xulrunner/xulrunner-1.9.1.1.ebuild
+++ b/net-libs/xulrunner/xulrunner-1.9.1.1.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.1.ebuild,v 1.2 2009/07/31 15:02:26 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.1.1.ebuild,v 1.3 2009/08/01 00:31:41 darkside Exp $
 
 EAPI="2"
 WANT_AUTOCONF="2.1"
@@ -202,7 +202,7 @@ src_install() {
 	echo "LDPATH=${MOZLIBDIR}" > "${D}"/etc/env.d/08xulrunner || die "env.d failed"
 
 	# Add our defaults to xulrunner and out of firefox
-	cp "${FILESDIR}"/xulrunner-default-prefs.js "${D}/${MOZLIBDIR}/defaults/pref/all-gentoo.js"
+	cp "${FILESDIR}"/xulrunner-default-prefs.js	"${D}/${MOZLIBDIR}/defaults/pref/all-gentoo.js" || die "cp failed"
 
 	if use java ; then
 		java-pkg_regjar "${D}/${MOZLIBDIR}/javaxpcom.jar"