Fix build failures with python 3, bug #344367 by pacho. Original patch by pacho.

Package-Manager: portage-2.1.8.3/cvs/Linux i686

4 files changed, 35 insertions, 20 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 59bfd492034b..03ccb975bd27 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.217 2010/11/05 03:11:09 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.218 2010/11/07 14:37:55 phajdan.jr Exp $
+
+  07 Nov 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  chromium-9.0.570.0.ebuild, chromium-9999.ebuild:
+  Fix build failures with python 3, bug #344367 by pacho. Original patch by
+  pacho.
 
   05 Nov 2010; Markos Chandras <hwoarang@gentoo.org>
   chromium-7.0.517.44.ebuild:
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 5fc4d7d24b23..4606d576f7e6 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX chromium-gecko-mediaplayer-r0.patch 590 RMD160 8b01e801ef4a8d3aaa842ab217929e71ebb70a87 SHA1 916ecd1c7a405fc12de579538c07c42cd9e84ecc SHA256 491cfaa353ad965a0cbfe2fc6370e4df5d1cd55398698b838996053f9e46f12c
 AUX chromium-gnome-keyring-r0.patch 2842 RMD160 1ac9a6e2785954a7a4f7f60988c8d7c101ad6db8 SHA1 44ee90f3c6632bcad9843cce22865c9c39fd6c8a SHA256 237d85599270b7cc1f83e58e27712f3d65609c325318b0b28ac277d630574c96
 AUX chromium-launcher.sh 1143 RMD160 3bc84b886104acdf993e27e1e05218b730bbead1 SHA1 505850d82b0aed48612c32ff36172c924d2debd0 SHA256 bdec73f460377a20c870cc2e8586cdc48183d2f2f6011b7a2573cb294dd08e28
@@ -21,14 +18,7 @@ DIST chromium-9.0.570.0.tar.bz2 136854856 RMD160 2aad862a16950ae25a5ed63b9ef0e3c
 EBUILD chromium-7.0.517.41.ebuild 6605 RMD160 3751c1f28930c71e442c7656ddede271e3230236 SHA1 a965c1c3d75831093b666b02b1d22d3847a73d4a SHA256 57c191137db6de2ab5ed0bd629524a060b71c936d37228bca41d8702ca11753b
 EBUILD chromium-7.0.517.44.ebuild 6693 RMD160 89e5f8ada3087c9f6dec2ecbf931633fae340eb9 SHA1 48aac6a8b05ed135f1c68ea7c519e8d06810adad SHA256 4b274ef1722d41c272b4afa4122cd696d8894663f8323b77298e2415728395db
 EBUILD chromium-8.0.552.28.ebuild 8116 RMD160 860bf1b6aa4aa4527422700230dce340a7d6a148 SHA1 53c7ecc1723f284360ebd1fa8004025fa52e76ee SHA256 568a2ce0579b4a2d6378457ea4cfc25b683141cf4ecdaac6c183ebcf326465c4
-EBUILD chromium-9.0.570.0.ebuild 7908 RMD160 e563c87ac38c9c80092bea1232977f55bff29ff0 SHA1 0a43fe78c8fbb14e1a9519b4295c856f3c1d7a77 SHA256 183125fdd8310d02d5aca1697f01df17300cb43c8ca820d1102427e792cfec66
-EBUILD chromium-9999.ebuild 9617 RMD160 fd0e9ecf46d329f033881b431400b1657ee6f29c SHA1 f8111a30420f961e37ff5a95981b9438b471a5da SHA256 127792a65a34e8cbf52fe306c9bfa5c9da305d72cac198532839c2b257d38949
-MISC ChangeLog 47776 RMD160 f7a7b401f60a3e1417eb374c0581bd3eed42afe5 SHA1 fd85e385ea95fd54f65c71a84df6059867922939 SHA256 341dce9373cd416a017786ce2924a97c31cd363a2d25dd1778a1a1a0b55c0357
+EBUILD chromium-9.0.570.0.ebuild 8241 RMD160 85d198688066f5628a9fc51b7b6bcbede436a6d6 SHA1 410fc32096118b4518793426ce521d906fddf671 SHA256 6dd375faff9f7f28891a0526a322461df682918743c734dea85296212e3a18c6
+EBUILD chromium-9999.ebuild 9950 RMD160 8800d4d537179abfe88477bb539b240e16bb4fca SHA1 af1dbe9843fa1b2dcc37e494450c986dae82a4d8 SHA256 ce4b596d3d1ddf49912a824ff8318f007a000589c7390fa1e27560fd4e97f1ae
+MISC ChangeLog 47970 RMD160 37ca238aeb05c41f469db2a2e994e6a9133b10af SHA1 327188212aede76f1233a340bac799e2ff1ef45e SHA256 0fdaf7a9fea7b2c63813787d96c678b489d5bf5fbda734fa8d6ac5aa81348de8
 MISC metadata.xml 607 RMD160 98f163b667c92c149e6ad82352ff5a1ea076361f SHA1 0d7d96013e31288c37a0e245cf2b538af1a46eaf SHA256 1d94b496c34342ce43cf7b1c6887d90930c0531e903e512d2d132e79e1d0d27d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkzTdeUACgkQ9/cejkQaxBCY7wCfYor9JLOXF+J4eYOaIRe791Ms
-fRQAnjIhTq+mFymuV4LH0K+bZcYSOdRg
-=Cj3j
------END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-9.0.570.0.ebuild b/www-client/chromium/chromium-9.0.570.0.ebuild
index c2ed9a19c9bf..dc650575324b 100644
--- a/www-client/chromium/chromium-9.0.570.0.ebuild
+++ b/www-client/chromium/chromium-9.0.570.0.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9.0.570.0.ebuild,v 1.3 2010/11/04 20:58:33 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9.0.570.0.ebuild,v 1.4 2010/11/07 14:37:55 phajdan.jr Exp $
 
-EAPI="2"
+EAPI="3"
+PYTHON_DEPEND="2:2.6"
 
-inherit eutils flag-o-matic multilib pax-utils toolchain-funcs
+inherit eutils flag-o-matic multilib pax-utils python toolchain-funcs
 
 DESCRIPTION="Open-source version of Google Chrome web browser"
 HOMEPAGE="http://chromium.org/"
@@ -67,6 +68,9 @@ pkg_setup() {
 
 	# Make sure the build system will use the right tools, bug #340795.
 	tc-export AR CC CXX RANLIB
+
+	# Make sure the build system will use the right python, bug #344367.
+	python_set_active_version 2
 }
 
 src_prepare() {
@@ -112,6 +116,12 @@ src_prepare() {
 		rmdir v8/include || die
 		ln -s /usr/include v8/include || die
 	fi
+
+	# Make sure the build system will use the right python, bug #344367.
+	# Only convert directories that need it, to save time.
+	for dir in build tools; do
+		python_convert_shebangs -q -r 2 "${dir}"
+	done
 }
 
 src_configure() {
diff --git a/www-client/chromium/chromium-9999.ebuild b/www-client/chromium/chromium-9999.ebuild
index 3800d0ffa0cb..59d330082a38 100644
--- a/www-client/chromium/chromium-9999.ebuild
+++ b/www-client/chromium/chromium-9999.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.101 2010/11/04 20:58:33 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.102 2010/11/07 14:37:55 phajdan.jr Exp $
 
-EAPI="2"
+EAPI="3"
+PYTHON_DEPEND="2:2.6"
 
-inherit eutils flag-o-matic multilib pax-utils subversion toolchain-funcs
+inherit eutils flag-o-matic multilib pax-utils python subversion toolchain-funcs
 
 DESCRIPTION="Open-source version of Google Chrome web browser"
 HOMEPAGE="http://chromium.org/"
@@ -112,6 +113,9 @@ pkg_setup() {
 
 	# Make sure the build system will use the right tools, bug #340795.
 	tc-export AR CC CXX RANLIB
+
+	# Make sure the build system will use the right python, bug #344367.
+	python_set_active_version 2
 }
 
 src_prepare() {
@@ -157,6 +161,12 @@ src_prepare() {
 		rmdir v8/include || die
 		ln -s /usr/include v8/include || die
 	fi
+
+	# Make sure the build system will use the right python, bug #344367.
+	# Only convert directories that need it, to save time.
+	for dir in build tools; do
+		python_convert_shebangs -q -r 2 "${dir}"
+	done
 }
 
 src_configure() {