Version bump for dev channel release. This version builds with gcc-4.7.1, resolving bug 412615.

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

3 files changed, 20 insertions, 14 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 303a474a5369..2d0a01518024 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.682 2012/08/01 11:15:58 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.683 2012/08/02 22:52:35 floppym Exp $
+
+*chromium-22.0.1221.1 (02 Aug 2012)
+
+  02 Aug 2012; Mike Gilbert <floppym@gentoo.org> +chromium-22.0.1221.1.ebuild,
+  -chromium-22.0.1207.1.ebuild:
+  Version bump for dev channel release. This version builds with gcc-4.7.1,
+  resolving bug 412615.
 
   01 Aug 2012; Agostino Sarubbo <ago@gentoo.org> chromium-21.0.1180.57.ebuild:
   Stable for AMD64, wrt bug #429174
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index b622a4396e88..e2903cb4af7d 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX chromium-alignment-r0.patch 565 SHA256 c679dd4ea0ac6e8ac330372da63a5c821ec54ed704287c392195a4a60db41062 SHA512 a3c7626f8335fcb5b2fe4664916fa07bbd717b57088dafc7092fa11e9873a911162a146f3f5b8531c0ae338d794c669854d8672ee31f00ccf2313b4e663bb6e8 WHIRLPOOL 30003851a02fff863ae01a174cad95280a89fe866fc5af6e6c8cb8f66bdee3e5ad4f1def2b813a77430744b41ff8a753c23b5c1c1bae86e7c1dbe0e0ce23f8de
 AUX chromium-bison-2.6-r0.patch 15135 SHA256 b016abb0ff68fc7d1fe153fe7e4a4395809363bb6c310a5c921a4e30175fd854 SHA512 e16539855cd43d063a9b504b8f08a76b57b5110b3ad1f56dff164cea06b33ca7a62adb37267d37d8c5992a9258108280ffebb2121308e2546f7b5f2606822f25 WHIRLPOOL d8f80adf1b5038891479519d85076f98110a0865b9cd4cae4ed77f7d4f0a3294e76ad6f94153cea5ac39105e8251e9f69f5257c9e6dbfcb9950da7670c928492
@@ -23,24 +23,20 @@ AUX chromium.default 147 SHA256 de16d72d77ac9fe04f781df4f50dfb714ba33574755932df
 AUX dot-gclient 253 SHA256 8c5750251ff681044cc584ef3768fe39c56c7877ade5fb9107298734126e62cf SHA512 96d4ffd01fec2773d7beaf2bc82b8eb969556f6e859e39136b4044521c5b8bfd36c13a7f2fcc64613935d4703d8ede8a56c7ce581a7732642cb8ee71039c801e WHIRLPOOL 6a65521487fa353a22f192c567b487c77a405e068c88898e0d8045b3de26bdd54ed736f104e495598e0cc8703d3f6abc80f8b2ea1e254007dfb18f50294e8c07
 DIST chromium-20.0.1132.57.tar.bz2 184791674 SHA256 1225c6b6306e89c8892bc0d18e94567d6081d777dee9b8c90efd0da9f6f2641b SHA512 be621e5fc82399bb174d7896f86ccd59ddabb18f98662016f2b01bd7bb0d642d05f1c5b0771f0295b3f25b71f3145eee51565b373b13d4df37745931d87839cc WHIRLPOOL 9b2f3b0cd56083fe71b9836da5b279f82dc2aeabc540b76ecd6bf7d593e76181a87a4a0f60b0b303dc30079c670b4587c11b6afab928810de64f75166a9624a3
 DIST chromium-21.0.1180.57.tar.bz2 192416785 SHA256 311ba95249ea994747355596885c9ad583e55bcbe7220a47ea096898e7aeb145 SHA512 7ae15bc00c9c215694cbe7aafeade34f295c669c9945f9e59804f7faf591ff717bb1dccf3c45334924d672366e1e3d7b8e30640f87cf5a016a97f3cb8314e9b1 WHIRLPOOL cfc82517caaccafbc2a208ab46b4e91135aae07e42273e8d0e7af941fecb2e0b3de7b64c96a41ab0f7c7ec7438ec97b61cf5180792960ba466d00329e3a43e54
-DIST chromium-22.0.1207.1.tar.bz2 193255393 SHA256 97c6eaa00ca046cf1f5eeafa338ae742534fa051145977b8d3bc86ff9952ffcf SHA512 90a83db412d93a71a8a060003e823f8fdb51af4a040b2c235fd8e8ce1495e77ac06cf692e0300fec4091e87fd56357dbc778551c02cd9b3b862766dcead5514d WHIRLPOOL 562117e5a8e6caa92f39ee5a2fcf53bbb45f4f2b2b1e8e07007e7b30c016369ca389d7d9c623a163174346667745b5f81dbdb62309eb2cff70daa465a1567d24
 DIST chromium-22.0.1215.0.tar.bz2 193757702 SHA256 ab0643419ecde9128a8472276d2178972d9480029e2459a0e8c4c91c85f8b389 SHA512 a74ff3d19428a783f774b3df68e64d38fd79df9e8eb64130152d9c6686a28059694116d912aae18016e74cef3888c607a51ca95d330988332c495ef0337b7c96 WHIRLPOOL 24219d0d2ee27fd52514d6427a39424bc54f3c056f7a23c816cbe346b114f1b24dc517c4e333b4342d74917cdb1f437fce3426d3725547831a0b9a9bed796c3a
+DIST chromium-22.0.1221.1.tar.bz2 199214754 SHA256 3a0c7818104b0a1141a351f8e4f42e0eed6323e954a259077a2d3c0b6a149d21 SHA512 1fd0502ffaf3009219b04aa81b67d334eeb509a6748caeeb520468fa0f73d73f40c337ed1f936ead5fdc34b0123904de64360f64f006a2921da06a9f64a48fdf WHIRLPOOL 3b0563c93c975e355461a62a5df2dec4d18227252d420657585d69b31711eb6fbbd8ba8ccfae993368b373ca24f336430a5ab917c82b5adad80867992f43ba52
 EBUILD chromium-20.0.1132.57.ebuild 13721 SHA256 b20c6082323eb69ba07bc8efb29d11211461cf9d3f23c926056bce414c705c65 SHA512 3f7374aa30e8880b061153b95cf0e268ee921ae0a168af210460f5881743bf259f001ced768c112d635882d34aa5840e7ff44c99387765a08eef19ac8e967b20 WHIRLPOOL fde252cafd43fb4cc414f19425b39303459e3d3a40a909bb723bd4b182da7667621f5015efe5ec2f564029abac0e5630a43366c804fea6f625313ce5f12cf570
 EBUILD chromium-21.0.1180.57.ebuild 13961 SHA256 7bdb998788bd073a00d49f1ac625dce1be8e9ad12d355f22e7a4a24fbdbefde8 SHA512 1b1c9ee47030d3676649e64aa856aa356f9d9e4601374f85098e7af15ba14559901d45cfedab9f6ca681d682b07ff08b3c58a92ba6f67e243ac9fc192046268e WHIRLPOOL b0c83a57ed85acd2bd2c7ec79b0fb9f0f64128c45d4896d5637de35dba2ff77018279c54352e8b592e55889016b7bdf0faf99c5c8aeef99a33e82826041267de
-EBUILD chromium-22.0.1207.1.ebuild 13786 SHA256 748b459b1475aefb51806fccc84d5be23fb9c9d92e77e48d8b0e4e6f827c0b0a SHA512 21dbb277a0cc39c468e90cbb5c704f24b6de447f6db198ca0452eb11e98ccc9a232f50da495cbbcefce40fdf27f5478b50bd210dafa59f5a37efdcfd72257318 WHIRLPOOL 5acb5302c795f1bbb7be34364587e09c15045bee029082dfa64ba38da03f6db1fa55e665c671c5feac2200f40cc53d680b4d903af0ee578e97ec4702ed00ee4e
 EBUILD chromium-22.0.1215.0.ebuild 13923 SHA256 fbeab22d74d66de784b0d13950d036b8a6a5d107cc78e3764cd484915c20f4d8 SHA512 9e2ba8eb92cae68ee517adf89157a548afc8fff8e041a0b7dc6954f497275d0e3226b3a9f4e6b3220e964ac03884f69b8b0af115b066373d39dcb8ae70d664c0 WHIRLPOOL cb69cfb587463fca92405cdbe41c771c3c60d5766e0d2f1901d96ffcbb000f3df398aef9bfcc6d4734e8dff50687663a434759bd702f0af9f09ec1e21e9385f4
+EBUILD chromium-22.0.1221.1.ebuild 13863 SHA256 f584e3b4e35c7d00ff1ea886369bf64be838445d6d30886c47746b926ba013fd SHA512 98aa83b1d03cf2a06b9a231a5cf4c23f4d791c9fb2f55ba4641db1448cd2f411004d23b147011281914172b5b6880dba286084c57264a1f6a7d09b274ee53fd1 WHIRLPOOL 5df01c7b5b8c9d64f222905e34e719e0b9b43ba6c050ac4f5a8bc2889a8b34f273ba0b973e2c858242fc45d8788a6891c6bc01bd81811a684e528a8af017174b
 EBUILD chromium-9999-r1.ebuild 15366 SHA256 7a32392b9cf2c40ccbac67616921b986d4eecd290d81e7d991cf7ac92a0688b7 SHA512 9c4013312bd5a384783dc8b064e4beecddcadf072b952950dcac178b6981696f8226674a1842c5f4e83c41c9ed84fee6f534424c7ea0a6e8aed8aa968a8cab26 WHIRLPOOL 6bd0ab83ef4cd6cb73005da6056abb7216c43cb17c56054eae1aaee28e94d70e14a2feb248856edb4264210c81b0d85cba1f9600cc2de68432cfad786977e994
-MISC ChangeLog 30819 SHA256 cad6a6e26dc6ad2a002fd1852d7b86fe75a55ad36e8a34ee8abdeeab2040385c SHA512 0898e0b4d4b96186778583be20721884c74ef4a1d1f4f8f74df20c0a68590465eb7acbd6074ddd4ce22bead1fd279e0cbbd4ed706755abee994927f799588432 WHIRLPOOL 34579eb24e5eaff4730a90515bb449b3ac85a6a230774f6697f253d7de5357468c3dbb805a04463b0e61a7969be8587fea8ed80e18fb859980cd699b9d090717
+MISC ChangeLog 31072 SHA256 feb6b8ab1b9b887fedbaac4a7a322f938d5091cf3a6aab1751c93cd1ac3dc9ab SHA512 23172c489bc94388f45ea990c4598ab149f83a2689c75178f9695f8835234a0cb3aea13dd611f7ec4a4cdfbbf52f0f3455830efc7ba056152bcb4b1548598d90 WHIRLPOOL 3ce3f2eee1efe61889e114353c9faadc5e851397d44711545087426d07b52fb3c19621f6b53c5ebdb6e0424fef6d6730485874092f520de8b356366ea2b1346c
 MISC ChangeLog-2011 114031 SHA256 e2c2c75785c5eaf78b6efe01e357279cbb7be0c89d00b4053f475e963916fa54 SHA512 8e14759348333bdbd7c338080472789d7bbb1ece1ca5817bac6306bdcb33dda1e23bf3055cbb3b7bcee9362b6900bba1ace7ba73f353570a74d3ed761c9198cc WHIRLPOOL 810b6423c53f892a4b0964380b8190dec2a8783d560a9cb0baec93a77d879186201055382ca05975ae242e16728529ae85445db003fdd425355292d17817157b
 MISC metadata.xml 267 SHA256 4e6afae33f60d6752cacf2785f7f9a396b8711cce605b73d0d752a4af7d01fc8 SHA512 f6d64d50bfbfad74db0ca0454fcba335a1744d11a44f921f19545c478219c507994cfcaba13160215cbb5a77d0bc82cdbf64a90a4b1b169184e404e404f9029e WHIRLPOOL 66a5cdeac3a86b910040d4c601fef50465fb0e0a0805e6b1c22cde2a83a63a2a1d441643af5454775becdfc65c71116d00b27703a7dd15ced183fb223c32f075
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCgAGBQJQGQ/zAAoJEOTDgjZ80txdO3YH/RnFnL/kwO/GOHkE8ejDqRW0
-kLijm9VETDSP40OVcYfE6WhO3mkWP0WYO/X7E7pTSjWGqwh4PCn9eyhhMY6zRlKh
-uinw1eZ7qH052hdDbMTbLDvcj5W3VQ7rOg4ScOMWbOOy+/avmIevG2c7ggSYBaR1
-pv/TafgN+Tj+/zrIPNhQg1uytu+ogZbJwwDkj16g+i0HleHA01q/Ywqx4p8e+ul6
-lq3plTCQ1a8uaq76xV9hiT0whff5wucky+kp14spu9Cv63wHmhb5LMUWq2BAFwj3
-jpHbkz1y+4lb0MPA/smoNrY2+zzEG1H/Vwb7q2V/0KjQoO3FibHbnm3wcanWdHk=
-=8bPE
+iF4EAREIAAYFAlAbBLkACgkQC77qH+pIQ6QXvwEAquabtF/I9VHuhFcx/xDVPdaP
+FTQCklNGp0WT3YTaVvQA/1BQW5xehlYtSJH7i61JxHZScIskC24XHaa66hj1VQtP
+=+WFH
 -----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-22.0.1207.1.ebuild b/www-client/chromium/chromium-22.0.1221.1.ebuild
index cba7c13db1cb..b06705350bf0 100644
--- a/www-client/chromium/chromium-22.0.1207.1.ebuild
+++ b/www-client/chromium/chromium-22.0.1221.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-22.0.1207.1.ebuild,v 1.2 2012/07/22 16:52:26 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-22.0.1221.1.ebuild,v 1.1 2012/08/02 22:52:35 floppym Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -60,7 +60,6 @@ DEPEND="${RDEPEND}
 	dev-python/simplejson
 	>=dev-util/gperf-3.0.3
 	>=sys-devel/bison-2.4.3
-	<sys-devel/bison-2.6
 	sys-devel/flex
 	>=sys-devel/make-3.81-r2
 	virtual/pkgconfig
@@ -113,6 +112,9 @@ src_prepare() {
 	# Fix build without NaCl glibc toolchain.
 	epatch "${FILESDIR}/${PN}-ppapi-r0.patch"
 
+	# Bug 427438.
+	epatch "${FILESDIR}/${PN}-bison-2.6-r0.patch"
+
 	epatch_user
 
 	# Remove most bundled libraries. Some are still needed.
@@ -126,6 +128,7 @@ src_prepare() {
 		\! -path 'third_party/gpsd/*' \
 		\! -path 'third_party/harfbuzz/*' \
 		\! -path 'third_party/hunspell/*' \
+		\! -path 'third_party/hyphen/*' \
 		\! -path 'third_party/iccjpeg/*' \
 		\! -path 'third_party/jsoncpp/*' \
 		\! -path 'third_party/khronos/*' \