Define OF macro in minizip headers instead of each individual source file. Bug 417219 by jlec.

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

4 files changed, 17 insertions, 14 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index f6a49166a891..a51be898b82a 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,11 @@
 # 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.642 2012/05/22 19:49:43 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.643 2012/05/23 18:09:11 floppym Exp $
+
+  23 May 2012; Mike Gilbert <floppym@gentoo.org> chromium-21.0.1145.0.ebuild,
+  chromium-9999-r1.ebuild:
+  Define OF macro in minizip headers instead of each individual source file. Bug
+  417219 by jlec.
 
 *chromium-21.0.1145.0 (22 May 2012)
 
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 8b27c1835ec5..2d3d11a96a11 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-browser.xml 407 RMD160 457374ff72561648d9777ffb3270ad10d864a6be SHA1 65543bfff7d0350d40ba258e61061b0c5579e1f2 SHA256 bc039012f8677468e9ce5df825f9d8096be6deb5813031c86a087c88105096ff
 AUX chromium-glib-r0.patch 451 RMD160 8b410994406b930c6befc3aed0f4dc958ddf5609 SHA1 594e0508c098cf43c6af86983db966ec537f7f56 SHA256 42469853c5cb1d4376567419f78af848b0f4a1b9f68ce9b5c8ce8c0b3d506193
@@ -23,15 +23,15 @@ DIST chromium-21.0.1145.0.tar.bz2 191263151 RMD160 676179ba1d50ca49d8b4d59e12362
 EBUILD chromium-19.0.1084.46-r2.ebuild 13754 RMD160 58304234194999adb43efc138fa3b40437b0dacf SHA1 e3929b91af842e4c4bd737af3fdda47780ecce09 SHA256 69f786c53790ab5f35d60aa3b87d16f44a900538a54910ba816e8f337de7a05d
 EBUILD chromium-20.0.1132.11.ebuild 13604 RMD160 59abaf6ebafcca50e6224303ea292eeec6440edf SHA1 3cc1756d31ca72c521e153a6c33733d2d2e1902e SHA256 2c0b0403246e118e5ae969d763ae6569f2871aad6862871c2c6df5116f4690ae
 EBUILD chromium-20.0.1132.8.ebuild 13480 RMD160 a6a309bcbc2e6dc956e1e965fe562cbcabd25259 SHA1 62ef124ac69d73502047c1d1d230e9980a5c2deb SHA256 c1d3ec89089452a755bccd929b2dd4d941719fd644ea40c8ae163fb8e24b03d8
-EBUILD chromium-21.0.1145.0.ebuild 13520 RMD160 ec159ee66ba54dd68a2e96c62ea769fbc9d709e6 SHA1 6103ace830e319bc98b13f78f931bebf98fae80e SHA256 edab71bd58362a8cbf639365a1d2a7af4e2fe6c49a810a1d47d51c1967eab5c4
-EBUILD chromium-9999-r1.ebuild 15066 RMD160 1ec7d33f50978e31a4f1c3a5baeeb77ee838cfa8 SHA1 035511c0b79542b95eca90599df680456002338b SHA256 6c13b744a55b554210299f546010bd307623680b51c6a45b5f7ce0075db1e1ae
-MISC ChangeLog 23198 RMD160 1fb69a7ed422d652e425ad06f24ec758957424dd SHA1 d3630f0adaf567e8e511f9d2730f1b318234427d SHA256 a71235abf10ea574d61274ebe15ae82cee6382ef13fcb1e2b88a82c5c3c0c45b
+EBUILD chromium-21.0.1145.0.ebuild 13491 RMD160 3b554525231808785b42394ed603e73e18704d2b SHA1 72b8dc620b3f9a2ffaf1cefd86acda714cd16e14 SHA256 28db1d8aff75006ba5f664cba27e9bdb9ef6082e9e4f46ac7a2ac5cdc1ae0199
+EBUILD chromium-9999-r1.ebuild 15037 RMD160 5f275e2ad13ea9ea2b696617630d2a2c9ee1bb62 SHA1 9513c0ecd5c0da4be5355aa4d3428df6c8897cce SHA256 8004bd36dca00b1cf4b8abeb3b48502d13292edd68c8cdc2b297da575706e10e
+MISC ChangeLog 23400 RMD160 cf7179aa3fa07fae3ba6e03e908c600da2b7d5a8 SHA1 335c370c381af53199646d070087241de1f49c6a SHA256 dca8a13f83b02a658fce1cbea2f341218a6017460247728ab471c819b77e47fb
 MISC ChangeLog-2011 114031 RMD160 819d2187b876e03ba1a5f23369eca56e554bcfe6 SHA1 c449259648a4f2633b8812e7761e8cdeaea7f948 SHA256 e2c2c75785c5eaf78b6efe01e357279cbb7be0c89d00b4053f475e963916fa54
 MISC metadata.xml 267 RMD160 3a166415fec415d539c1b7c32ed40b188488b9fb SHA1 5c3d71a9cea27175cbe8c98369b42b79c8643c6c SHA256 4e6afae33f60d6752cacf2785f7f9a396b8711cce605b73d0d752a4af7d01fc8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREKAAYFAk+77eMACgkQuUQtlDBCeQKgNwCggZOjaZQlKwEFCp3OyQjvvCGw
-IukAn3XcuKHTzh5lQApDKT2bwGLKZ2L5
-=S+f3
+iF4EAREIAAYFAk+9J80ACgkQC77qH+pIQ6TK4QD6A+k2WpUqzo3Q3K0DRD8XJ/u/
+NiHeO1bA00r+NiMUywoA/1uuEJwp9XOfcRuOzY5UUQv9AhH9xGzBU11h5/N+WWCD
+=/xWy
 -----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-21.0.1145.0.ebuild b/www-client/chromium/chromium-21.0.1145.0.ebuild
index 3772ed561766..86ac0abe315c 100644
--- a/www-client/chromium/chromium-21.0.1145.0.ebuild
+++ b/www-client/chromium/chromium-21.0.1145.0.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-21.0.1145.0.ebuild,v 1.1 2012/05/22 19:49:43 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-21.0.1145.0.ebuild,v 1.2 2012/05/23 18:09:11 floppym Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -104,8 +104,7 @@ src_prepare() {
 
 	# zlib-1.2.5.1-r1 renames the OF macro in zconf.h, bug 383371.
 	sed -i '1i#define OF(x) x' \
-		third_party/zlib/contrib/minizip/{ioapi,{,un}zip}.c \
-		chrome/common/zip*.cc || die
+		third_party/zlib/contrib/minizip/{ioapi,{,un}zip}.h || die
 
 	epatch "${FILESDIR}/${PN}-svnversion-r0.patch"
 
diff --git a/www-client/chromium/chromium-9999-r1.ebuild b/www-client/chromium/chromium-9999-r1.ebuild
index 2807db353944..ba6fec481898 100644
--- a/www-client/chromium/chromium-9999-r1.ebuild
+++ b/www-client/chromium/chromium-9999-r1.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-9999-r1.ebuild,v 1.115 2012/05/22 19:49:43 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.116 2012/05/23 18:09:11 floppym Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -160,8 +160,7 @@ src_prepare() {
 
 	# zlib-1.2.5.1-r1 renames the OF macro in zconf.h, bug 383371.
 	sed -i '1i#define OF(x) x' \
-		third_party/zlib/contrib/minizip/{ioapi,{,un}zip}.c \
-		chrome/common/zip*.cc || die
+		third_party/zlib/contrib/minizip/{ioapi,{,un}zip}.h || die
 
 	epatch_user