From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QREtD-0001S7-V4 for garchives@archives.gentoo.org; Tue, 31 May 2011 02:41:04 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 167CF1C016; Tue, 31 May 2011 02:40:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C48BD1C016 for ; Tue, 31 May 2011 02:40:56 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 46B401B4006 for ; Tue, 31 May 2011 02:40:56 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 52F1780508 for ; Tue, 31 May 2011 02:40:52 +0000 (UTC) From: "Donnie Berkholz" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Donnie Berkholz" Message-ID: <7a0405e77257d021e90ccda892427e62db75f864.dberkholz@gentoo> Subject: [gentoo-commits] dev/dberkholz:master commit in: www-client/chromium/files/ X-VCS-Repository: dev/dberkholz X-VCS-Files: www-client/chromium/files/chromium-launcher-r2.sh www-client/chromium/files/chromium.default X-VCS-Directories: www-client/chromium/files/ X-VCS-Committer: dberkholz X-VCS-Committer-Name: Donnie Berkholz X-VCS-Revision: 7a0405e77257d021e90ccda892427e62db75f864 Date: Tue, 31 May 2011 02:40:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 0c41681b34e434dec895f59cff63e0c0 commit: 7a0405e77257d021e90ccda892427e62db75f864 Author: Donnie Berkholz gentoo org> AuthorDate: Tue May 31 02:40:36 2011 +0000 Commit: Donnie Berkholz gentoo org> CommitDate: Tue May 31 02:40:36 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/dberkholz.git;= a=3Dcommit;h=3D7a0405e7 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-clie= nt/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=3D${CHROMIUM_USER_FLAGS:-"$CHROMIUM_FLAGS"} + +# Let the wrapped binary know that it has been run through the wrapper +export CHROME_WRAPPER=3D"`readlink -f "$0"`" + +PROGDIR=3D"`dirname "$CHROME_WRAPPER"`" + +case ":$PATH:" in + *:$PROGDIR:*) + # $PATH already contains $PROGDIR + ;; + *) + # Append $PROGDIR to $PATH + export PATH=3D"$PATH:$PROGDIR" + ;; +esac + +# Set the .desktop file name +export CHROME_DESKTOP=3D"chromium-browser-chromium.desktop" + +exec -a "chromium-browser" "$PROGDIR/chrome" --extra-plugin-dir=3D/usr/l= ib/nsbrowser/plugins ${CHROMIUM_FLAGS} "$@" diff --git a/www-client/chromium/files/chromium.default b/www-client/chro= mium/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=3D""