summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaweł Hajdan <phajdan.jr@gentoo.org>2011-07-21 03:07:43 +0000
committerPaweł Hajdan <phajdan.jr@gentoo.org>2011-07-21 03:07:43 +0000
commitb30261c75103d75539e253a045bf3563a08f7f06 (patch)
tree007cd8a914dead7a7231e380706be8960fe97114 /www-client
parentStable for HPPA (bug #374465). (diff)
downloadgentoo-2-b30261c75103d75539e253a045bf3563a08f7f06.tar.gz
gentoo-2-b30261c75103d75539e253a045bf3563a08f7f06.tar.bz2
gentoo-2-b30261c75103d75539e253a045bf3563a08f7f06.zip
Version bump for beta channel release. Remove old.
(Portage version: 2.1.10.3/cvs/Linux i686)
Diffstat (limited to 'www-client')
-rw-r--r--www-client/chromium/ChangeLog8
-rw-r--r--www-client/chromium/chromium-13.0.782.99.ebuild (renamed from www-client/chromium/chromium-13.0.782.41.ebuild)19
2 files changed, 22 insertions, 5 deletions
diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index cf68bdc8abf6..dd0f291303a0 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for www-client/chromium
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.404 2011/07/20 21:39:37 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.405 2011/07/21 03:07:43 phajdan.jr Exp $
+
+*chromium-13.0.782.99 (21 Jul 2011)
+
+ 21 Jul 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+ -chromium-13.0.782.41.ebuild, +chromium-13.0.782.99.ebuild:
+ Version bump for beta channel release. Remove old.
*chromium-14.0.825.0-r1 (20 Jul 2011)
diff --git a/www-client/chromium/chromium-13.0.782.41.ebuild b/www-client/chromium/chromium-13.0.782.99.ebuild
index 453d75648c10..65effe30fbed 100644
--- a/www-client/chromium/chromium-13.0.782.41.ebuild
+++ b/www-client/chromium/chromium-13.0.782.99.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-13.0.782.41.ebuild,v 1.2 2011/07/18 17:12:11 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-13.0.782.99.ebuild,v 1.1 2011/07/21 03:07:43 phajdan.jr Exp $
EAPI="3"
PYTHON_DEPEND="2:2.6"
@@ -286,8 +286,18 @@ src_install() {
doexe out/Release/chrome_sandbox || die
fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox"
+ # Install Native Client files on platforms that support it.
insinto "${CHROMIUM_HOME}"
- doins out/Release/libppGoogleNaClPluginChrome.so || die
+ case "$(tc-arch)" in
+ amd64)
+ doins native_client/irt_binaries/nacl_irt_x86_64.nexe || die
+ doins out/Release/libppGoogleNaClPluginChrome.so || die
+ ;;
+ x86)
+ doins native_client/irt_binaries/nacl_irt_x86_32.nexe || die
+ doins out/Release/libppGoogleNaClPluginChrome.so || die
+ ;;
+ esac
newexe "${FILESDIR}"/chromium-launcher-r2.sh chromium-launcher.sh || die
@@ -368,8 +378,9 @@ src_install() {
local mime_types="text/html;text/xml;application/xhtml+xml;"
mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
make_desktop_entry chromium-browser "Chromium" chromium-browser \
- "Network;WebBrowser" "MimeType=${mime_types}"
- sed -e "/^Exec/s/$/ %U/" -i "${D}"/usr/share/applications/*.desktop || die
+ "Network;WebBrowser"
+ "MimeType=${mime_types}\nStartupWMClass=chromium-browser"
+ sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
# Install GNOME default application entry (bug #303100).
if use gnome; then