| 1 |
floppym 11/08/30 23:41:45 |
| 2 |
|
| 3 |
Modified: ChangeLog chromium-9999-r1.ebuild |
| 4 |
Log: |
| 5 |
Add workaround for bug 380801 |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha51/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.425 www-client/chromium/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?rev=1.425&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?rev=1.425&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?r1=1.424&r2=1.425 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v |
| 19 |
retrieving revision 1.424 |
| 20 |
retrieving revision 1.425 |
| 21 |
diff -u -r1.424 -r1.425 |
| 22 |
--- ChangeLog 30 Aug 2011 21:13:33 -0000 1.424 |
| 23 |
+++ ChangeLog 30 Aug 2011 23:41:44 -0000 1.425 |
| 24 |
@@ -1,6 +1,9 @@ |
| 25 |
# ChangeLog for www-client/chromium |
| 26 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.424 2011/08/30 21:13:33 floppym Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.425 2011/08/30 23:41:44 floppym Exp $ |
| 29 |
+ |
| 30 |
+ 30 Aug 2011; Mike Gilbert <floppym@g.o> chromium-9999-r1.ebuild: |
| 31 |
+ Add workaround for bug 380801 |
| 32 |
|
| 33 |
30 Aug 2011; Mike Gilbert <floppym@g.o> chromium-15.0.865.0.ebuild, |
| 34 |
chromium-9999-r1.ebuild: |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.48 www-client/chromium/chromium-9999-r1.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild?rev=1.48&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild?rev=1.48&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild?r1=1.47&r2=1.48 |
| 43 |
|
| 44 |
Index: chromium-9999-r1.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v |
| 47 |
retrieving revision 1.47 |
| 48 |
retrieving revision 1.48 |
| 49 |
diff -u -r1.47 -r1.48 |
| 50 |
--- chromium-9999-r1.ebuild 30 Aug 2011 21:13:33 -0000 1.47 |
| 51 |
+++ chromium-9999-r1.ebuild 30 Aug 2011 23:41:44 -0000 1.48 |
| 52 |
@@ -1,6 +1,6 @@ |
| 53 |
# Copyright 1999-2011 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.47 2011/08/30 21:13:33 floppym Exp $ |
| 56 |
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.48 2011/08/30 23:41:44 floppym Exp $ |
| 57 |
|
| 58 |
EAPI="3" |
| 59 |
PYTHON_DEPEND="2:2.6" |
| 60 |
@@ -68,6 +68,17 @@ |
| 61 |
x11-misc/xdg-utils |
| 62 |
virtual/ttf-fonts" |
| 63 |
|
| 64 |
+gclient_runhooks() { |
| 65 |
+ # Run all hooks except gyp_chromium |
| 66 |
+ # Moved from src_unpack to avoid repoman warning about sed |
| 67 |
+ cp src/DEPS src/DEPS.orig || die |
| 68 |
+ sed -e 's:"python", "src/build/gyp_chromium":"true":' -i src/DEPS || die |
| 69 |
+ "${WORKDIR}/depot_tools/gclient" runhooks |
| 70 |
+ local ret=$? |
| 71 |
+ mv src/DEPS.orig src/DEPS || die |
| 72 |
+ [[ ${ret} -eq 0 ]] || die "gclient runhooks failed" |
| 73 |
+} |
| 74 |
+ |
| 75 |
src_unpack() { |
| 76 |
subversion_src_unpack |
| 77 |
mv "${S}" "${WORKDIR}"/depot_tools || die |
| 78 |
@@ -81,7 +92,7 @@ |
| 79 |
|
| 80 |
einfo "gclient sync start -->" |
| 81 |
"${WORKDIR}/depot_tools/gclient" sync --force --nohooks || die |
| 82 |
- "$(PYTHON)" src/build/download_nacl_irt.py || die # bug #366413 |
| 83 |
+ gclient_runhooks |
| 84 |
einfo " working copy: ${ESVN_STORE_DIR}/${PN}" |
| 85 |
|
| 86 |
mkdir -p "${S}" || die |
Archives