[gentoo-commits] dev/dberkholz:master commit in: www-client/chromium/files/

[gentoo-commits] dev/dberkholz:master commit in: www-client/chromium/files/

[Donnie Berkholz]

commit:     7a0405e77257d021e90ccda892427e62db75f864
Author:     Donnie Berkholz <dberkholz <AT> gentoo <DOT> org>
AuthorDate: Tue May 31 02:40:36 2011 +0000
Commit:     Donnie Berkholz <dberkholz <AT> gentoo <DOT> org>
CommitDate: Tue May 31 02:40:36 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/dberkholz.git;a=commit;h=7a0405e7

chromium: pull in missing files from main tree.

---
 www-client/chromium/files/chromium-launcher-r2.sh |   32 +++++++++++++++++++++
 www-client/chromium/files/chromium.default        |    5 +++
 2 files changed, 37 insertions(+), 0 deletions(-)

diff --git a/www-client/chromium/files/chromium-launcher-r2.sh b/www-client/chromium/files/chromium-launcher-r2.sh
new file mode 100644
index 0000000..e20bcea
--- /dev/null
+++ b/www-client/chromium/files/chromium-launcher-r2.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+# Allow the user to override command-line flags, bug #357629.
+# This is based on Debian's chromium-browser package, and is intended
+# to be consistent with Debian.
+if [ -f /etc/chromium/default ] ; then
+	. /etc/chromium/default
+fi
+
+# Prefer user defined CHROMIUM_USER_FLAGS (from env) over system
+# default CHROMIUM_FLAGS (from /etc/chromium/default).
+CHROMIUM_FLAGS=${CHROMIUM_USER_FLAGS:-"$CHROMIUM_FLAGS"}
+
+# Let the wrapped binary know that it has been run through the wrapper
+export CHROME_WRAPPER="`readlink -f "$0"`"
+
+PROGDIR="`dirname "$CHROME_WRAPPER"`"
+
+case ":$PATH:" in
+  *:$PROGDIR:*)
+    # $PATH already contains $PROGDIR
+    ;;
+  *)
+    # Append $PROGDIR to $PATH
+    export PATH="$PATH:$PROGDIR"
+    ;;
+esac
+
+# Set the .desktop file name
+export CHROME_DESKTOP="chromium-browser-chromium.desktop"
+
+exec -a "chromium-browser" "$PROGDIR/chrome" --extra-plugin-dir=/usr/lib/nsbrowser/plugins ${CHROMIUM_FLAGS} "$@"

diff --git a/www-client/chromium/files/chromium.default b/www-client/chromium/files/chromium.default
new file mode 100644
index 0000000..45f1f38
--- /dev/null
+++ b/www-client/chromium/files/chromium.default
@@ -0,0 +1,5 @@
+# Default settings for chromium. This file is sourced by /bin/bash from
+# the chromium launcher.
+
+# Options to pass to chromium.
+CHROMIUM_FLAGS=""