[gentoo-commits] repo/gentoo:master commit in: www-client/chromium/files/, www-client/chromium/

["Paweł Hajdan" <phajdan.jr@gentoo.org>]

commit:     7c186f8f74d8aca1509b3f7d6a45ce51e6fd08ec
Author:     Pawel Hajdan, Jr <phajdan.jr <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  8 21:01:06 2015 +0000
Commit:     Paweł Hajdan <phajdan.jr <AT> gentoo <DOT> org>
CommitDate: Tue Sep  8 21:01:27 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c186f8f

www-client/chromium: fix build when dev-python/tracing is installed

This fixes bug #556812 by Helmut Jarausch.

Culprit has been identified by Guillaume ZITTA.

Package-Manager: portage-2.2.20.1

 www-client/chromium/chromium-45.0.2454.85.ebuild    |  1 +
 www-client/chromium/files/chromium-tracing-r0.patch | 10 ++++++++++
 2 files changed, 11 insertions(+)

diff --git a/www-client/chromium/chromium-45.0.2454.85.ebuild b/www-client/chromium/chromium-45.0.2454.85.ebuild
index 70baec6..2df11ca 100644
--- a/www-client/chromium/chromium-45.0.2454.85.ebuild
+++ b/www-client/chromium/chromium-45.0.2454.85.ebuild
@@ -187,6 +187,7 @@ src_prepare() {
 	# fi
 
 	epatch "${FILESDIR}/${PN}-system-jinja-r7.patch"
+	epatch "${FILESDIR}/${PN}-tracing-r0.patch"
 
 	epatch_user
 

diff --git a/www-client/chromium/files/chromium-tracing-r0.patch b/www-client/chromium/files/chromium-tracing-r0.patch
new file mode 100644
index 0000000..7312116
--- /dev/null
+++ b/www-client/chromium/files/chromium-tracing-r0.patch
@@ -0,0 +1,10 @@
+--- third_party/trace-viewer/tracing/build/generate_about_tracing_contents.orig	2015-09-08 13:14:21.048113295 +0000
++++ third_party/trace-viewer/tracing/build/generate_about_tracing_contents	2015-09-08 13:14:34.232384815 +0000
+@@ -8,6 +8,6 @@
+ 
+ if __name__ == '__main__':
+   top_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..'))
+-  sys.path.append(top_dir)
++  sys.path.insert(0, top_dir)
+   from tracing.build import generate_about_tracing_contents
+   sys.exit(generate_about_tracing_contents.main(sys.argv))