summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2011-08-30 23:41:44 +0000
committerMike Gilbert <floppym@gentoo.org>2011-08-30 23:41:44 +0000
commitba72bc03ceba6ce174d33792d17c48c58be677f4 (patch)
tree1d45525723ff0bab00f0e5bcf1da21b6d9071678 /www-client
parentVersion bump to 3.0.2 (uses Gtk+ 3); add ncurses USE flag; remove static libr... (diff)
downloadgentoo-2-ba72bc03ceba6ce174d33792d17c48c58be677f4.tar.gz
gentoo-2-ba72bc03ceba6ce174d33792d17c48c58be677f4.tar.bz2
gentoo-2-ba72bc03ceba6ce174d33792d17c48c58be677f4.zip
Add workaround for bug 380801
(Portage version: 2.2.0_alpha51/cvs/Linux x86_64)
Diffstat (limited to 'www-client')
-rw-r--r--www-client/chromium/ChangeLog5
-rw-r--r--www-client/chromium/chromium-9999-r1.ebuild15
2 files changed, 17 insertions, 3 deletions
diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index e27b0fdff34f..a87d2f3e2ca3 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,9 @@
# 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.424 2011/08/30 21:13:33 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.425 2011/08/30 23:41:44 floppym Exp $
+
+ 30 Aug 2011; Mike Gilbert <floppym@gentoo.org> chromium-9999-r1.ebuild:
+ Add workaround for bug 380801
30 Aug 2011; Mike Gilbert <floppym@gentoo.org> chromium-15.0.865.0.ebuild,
chromium-9999-r1.ebuild:
diff --git a/www-client/chromium/chromium-9999-r1.ebuild b/www-client/chromium/chromium-9999-r1.ebuild
index d7b587c62adc..b1d6fb3d09f6 100644
--- a/www-client/chromium/chromium-9999-r1.ebuild
+++ b/www-client/chromium/chromium-9999-r1.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-9999-r1.ebuild,v 1.47 2011/08/30 21:13:33 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.48 2011/08/30 23:41:44 floppym Exp $
EAPI="3"
PYTHON_DEPEND="2:2.6"
@@ -68,6 +68,17 @@ RDEPEND+="
x11-misc/xdg-utils
virtual/ttf-fonts"
+gclient_runhooks() {
+ # Run all hooks except gyp_chromium
+ # Moved from src_unpack to avoid repoman warning about sed
+ cp src/DEPS src/DEPS.orig || die
+ sed -e 's:"python", "src/build/gyp_chromium":"true":' -i src/DEPS || die
+ "${WORKDIR}/depot_tools/gclient" runhooks
+ local ret=$?
+ mv src/DEPS.orig src/DEPS || die
+ [[ ${ret} -eq 0 ]] || die "gclient runhooks failed"
+}
+
src_unpack() {
subversion_src_unpack
mv "${S}" "${WORKDIR}"/depot_tools || die
@@ -81,7 +92,7 @@ src_unpack() {
einfo "gclient sync start -->"
"${WORKDIR}/depot_tools/gclient" sync --force --nohooks || die
- "$(PYTHON)" src/build/download_nacl_irt.py || die # bug #366413
+ gclient_runhooks
einfo " working copy: ${ESVN_STORE_DIR}/${PN}"
mkdir -p "${S}" || die