| 1 |
phajdan.jr 10/11/07 14:37:55 |
| 2 |
|
| 3 |
Modified: ChangeLog chromium-9999.ebuild |
| 4 |
chromium-9.0.570.0.ebuild |
| 5 |
Log: |
| 6 |
Fix build failures with python 3, bug #344367 by pacho. Original patch by pacho. |
| 7 |
(Portage version: 2.1.8.3/cvs/Linux i686) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.218 www-client/chromium/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?rev=1.218&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?rev=1.218&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?r1=1.217&r2=1.218 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v |
| 19 |
retrieving revision 1.217 |
| 20 |
retrieving revision 1.218 |
| 21 |
diff -u -r1.217 -r1.218 |
| 22 |
--- ChangeLog 5 Nov 2010 03:11:09 -0000 1.217 |
| 23 |
+++ ChangeLog 7 Nov 2010 14:37:55 -0000 1.218 |
| 24 |
@@ -1,6 +1,11 @@ |
| 25 |
# ChangeLog for www-client/chromium |
| 26 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.217 2010/11/05 03:11:09 hwoarang Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.218 2010/11/07 14:37:55 phajdan.jr Exp $ |
| 29 |
+ |
| 30 |
+ 07 Nov 2010; Pawel Hajdan jr <phajdan.jr@g.o> |
| 31 |
+ chromium-9.0.570.0.ebuild, chromium-9999.ebuild: |
| 32 |
+ Fix build failures with python 3, bug #344367 by pacho. Original patch by |
| 33 |
+ pacho. |
| 34 |
|
| 35 |
05 Nov 2010; Markos Chandras <hwoarang@g.o> |
| 36 |
chromium-7.0.517.44.ebuild: |
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
1.102 www-client/chromium/chromium-9999.ebuild |
| 41 |
|
| 42 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-9999.ebuild?rev=1.102&view=markup |
| 43 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-9999.ebuild?rev=1.102&content-type=text/plain |
| 44 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-9999.ebuild?r1=1.101&r2=1.102 |
| 45 |
|
| 46 |
Index: chromium-9999.ebuild |
| 47 |
=================================================================== |
| 48 |
RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v |
| 49 |
retrieving revision 1.101 |
| 50 |
retrieving revision 1.102 |
| 51 |
diff -u -r1.101 -r1.102 |
| 52 |
--- chromium-9999.ebuild 4 Nov 2010 20:58:33 -0000 1.101 |
| 53 |
+++ chromium-9999.ebuild 7 Nov 2010 14:37:55 -0000 1.102 |
| 54 |
@@ -1,10 +1,11 @@ |
| 55 |
# Copyright 1999-2010 Gentoo Foundation |
| 56 |
# Distributed under the terms of the GNU General Public License v2 |
| 57 |
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.101 2010/11/04 20:58:33 phajdan.jr Exp $ |
| 58 |
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.102 2010/11/07 14:37:55 phajdan.jr Exp $ |
| 59 |
|
| 60 |
-EAPI="2" |
| 61 |
+EAPI="3" |
| 62 |
+PYTHON_DEPEND="2:2.6" |
| 63 |
|
| 64 |
-inherit eutils flag-o-matic multilib pax-utils subversion toolchain-funcs |
| 65 |
+inherit eutils flag-o-matic multilib pax-utils python subversion toolchain-funcs |
| 66 |
|
| 67 |
DESCRIPTION="Open-source version of Google Chrome web browser" |
| 68 |
HOMEPAGE="http://chromium.org/" |
| 69 |
@@ -112,6 +113,9 @@ |
| 70 |
|
| 71 |
# Make sure the build system will use the right tools, bug #340795. |
| 72 |
tc-export AR CC CXX RANLIB |
| 73 |
+ |
| 74 |
+ # Make sure the build system will use the right python, bug #344367. |
| 75 |
+ python_set_active_version 2 |
| 76 |
} |
| 77 |
|
| 78 |
src_prepare() { |
| 79 |
@@ -157,6 +161,12 @@ |
| 80 |
rmdir v8/include || die |
| 81 |
ln -s /usr/include v8/include || die |
| 82 |
fi |
| 83 |
+ |
| 84 |
+ # Make sure the build system will use the right python, bug #344367. |
| 85 |
+ # Only convert directories that need it, to save time. |
| 86 |
+ for dir in build tools; do |
| 87 |
+ python_convert_shebangs -q -r 2 "${dir}" |
| 88 |
+ done |
| 89 |
} |
| 90 |
|
| 91 |
src_configure() { |
| 92 |
|
| 93 |
|
| 94 |
|
| 95 |
1.4 www-client/chromium/chromium-9.0.570.0.ebuild |
| 96 |
|
| 97 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-9.0.570.0.ebuild?rev=1.4&view=markup |
| 98 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-9.0.570.0.ebuild?rev=1.4&content-type=text/plain |
| 99 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-9.0.570.0.ebuild?r1=1.3&r2=1.4 |
| 100 |
|
| 101 |
Index: chromium-9.0.570.0.ebuild |
| 102 |
=================================================================== |
| 103 |
RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9.0.570.0.ebuild,v |
| 104 |
retrieving revision 1.3 |
| 105 |
retrieving revision 1.4 |
| 106 |
diff -u -r1.3 -r1.4 |
| 107 |
--- chromium-9.0.570.0.ebuild 4 Nov 2010 20:58:33 -0000 1.3 |
| 108 |
+++ chromium-9.0.570.0.ebuild 7 Nov 2010 14:37:55 -0000 1.4 |
| 109 |
@@ -1,10 +1,11 @@ |
| 110 |
# Copyright 1999-2010 Gentoo Foundation |
| 111 |
# Distributed under the terms of the GNU General Public License v2 |
| 112 |
-# $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 $ |
| 113 |
+# $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 $ |
| 114 |
|
| 115 |
-EAPI="2" |
| 116 |
+EAPI="3" |
| 117 |
+PYTHON_DEPEND="2:2.6" |
| 118 |
|
| 119 |
-inherit eutils flag-o-matic multilib pax-utils toolchain-funcs |
| 120 |
+inherit eutils flag-o-matic multilib pax-utils python toolchain-funcs |
| 121 |
|
| 122 |
DESCRIPTION="Open-source version of Google Chrome web browser" |
| 123 |
HOMEPAGE="http://chromium.org/" |
| 124 |
@@ -67,6 +68,9 @@ |
| 125 |
|
| 126 |
# Make sure the build system will use the right tools, bug #340795. |
| 127 |
tc-export AR CC CXX RANLIB |
| 128 |
+ |
| 129 |
+ # Make sure the build system will use the right python, bug #344367. |
| 130 |
+ python_set_active_version 2 |
| 131 |
} |
| 132 |
|
| 133 |
src_prepare() { |
| 134 |
@@ -112,6 +116,12 @@ |
| 135 |
rmdir v8/include || die |
| 136 |
ln -s /usr/include v8/include || die |
| 137 |
fi |
| 138 |
+ |
| 139 |
+ # Make sure the build system will use the right python, bug #344367. |
| 140 |
+ # Only convert directories that need it, to save time. |
| 141 |
+ for dir in build tools; do |
| 142 |
+ python_convert_shebangs -q -r 2 "${dir}" |
| 143 |
+ done |
| 144 |
} |
| 145 |
|
| 146 |
src_configure() { |
Archives