From 8f6f904e1fe6fa36a4a5a511ffaa10f577a980c8 Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Thu, 15 Sep 2011 06:19:48 +0000 Subject: [PATCH] Keep third_party/smhasher, bug 382941 by Julien Sanchez. Package-Manager: portage-2.2.0_alpha57_p7/cvs/Linux x86_64 --- www-client/chromium/ChangeLog | 5 ++++- www-client/chromium/Manifest | 10 +++++----- www-client/chromium/chromium-9999-r1.ebuild | 3 ++- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog index c96a794ffe40..c4bdbaae6edb 100644 --- a/www-client/chromium/ChangeLog +++ b/www-client/chromium/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for www-client/chromium # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.442 2011/09/15 00:27:18 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.443 2011/09/15 06:19:48 floppym Exp $ + + 15 Sep 2011; Mike Gilbert chromium-9999-r1.ebuild: + Keep third_party/smhasher, bug 382941 by Julien Sanchez. 15 Sep 2011; Mike Gilbert chromium-14.0.835.163.ebuild, chromium-15.0.874.12.ebuild: diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index fd04057b211d..91db3d4ef40a 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -33,13 +33,13 @@ EBUILD chromium-14.0.835.162.ebuild 13179 RMD160 953ee6bd24599f27194859050fe65ad EBUILD chromium-14.0.835.163.ebuild 13193 RMD160 91d78009eddf4f4149420d95350f4d22863fa8ab SHA1 17610e753548bf2f3643ba6ac41a91b0c4366096 SHA256 909154f3199695bd912d6ac5e3ac9cf726c6bfcb210abe96fd8ddcf0c33705ea EBUILD chromium-15.0.874.12.ebuild 13564 RMD160 c5625ac4580905770e3108fddb3afc5cabd63245 SHA1 5958207921faf35cdf4f541085d9fc59eb546638 SHA256 6ee2cc26e572b0675791837bef7b19defd540324dbd4df9915152539c79448b0 EBUILD chromium-15.0.874.5.ebuild 13552 RMD160 15f1a04a5da4805cc4ca9786bb49e28ba3ea7288 SHA1 ea408155a8f0892b41ab20b8370903677adc9b17 SHA256 3d2aeaa23a2ad41836947356379fbd7b81535307dc4ffad7a46f6bb12badaa26 -EBUILD chromium-9999-r1.ebuild 16111 RMD160 b50ec92adcf8af4825b414ca1a3828e9dcdea8da SHA1 d62323d6646de9809e9f7551df3805e33af3b034 SHA256 b727cbd373b7ded569f88756cc0f97d7da6c5b0c0aa73703bd1bfbac8e35eee0 -MISC ChangeLog 97987 RMD160 80a0dfa78a39410818fb919cdf4709740dd9c2a8 SHA1 0281436d4f8f8ecb6e8a459a2d82435c2dd7b21b SHA256 77ce4b1539206b488635a8bef1586926dd4ce0d0a9fb8dabcb7fa806ef4dbd3e +EBUILD chromium-9999-r1.ebuild 16149 RMD160 a312f63119081040137af223684e7d3454cd769b SHA1 55e7336d4eb492d4abf13ed6d1cc8e3f75de8d20 SHA256 ad2bb21fa5a1be5354c32ab6936a6cc0a68cf2baf91044863290aa7e34bc8800 +MISC ChangeLog 98121 RMD160 d5197061b949e9e4c673ab3a46daa18a69b64da9 SHA1 9b96d5e7dec09bbad7354dd6c15758d4e04c0fec SHA256 fb456af9e80f0947a3c8f383411b20f4f5c6a2f4a91157e3195e910b2d789f23 MISC metadata.xml 495 RMD160 91f2c4344cde85374523c8c16f5987ad0320b607 SHA1 5e97c7979fac0de374958532e38fcbca1191963b SHA256 375fb24d5d647728a58b3a7d0d552bf7d8eb5f26eef3c249dcf9a2dcb9e5bb37 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iF4EAREIAAYFAk5xRm0ACgkQC77qH+pIQ6S1WwD/fqnBSm4jTmpC2Ur2H4vTZHrn -bXviSU0byEKYgt+jHwsA/0RvMB0CF1Mxm01wzffY36hhkvhDFfQ9bWoE+CcPYQda -=CpsR +iF4EAREIAAYFAk5xmQ0ACgkQC77qH+pIQ6RvdAEAtDyWOOasVS8T96FLUQjEhbg7 +0BccOIo7oS4dChewyakBAIfZ0vmR4CZrdrVSq3cTuiMTCbRu1mrgpT6fdxzcGh47 +=sHeu -----END PGP SIGNATURE----- diff --git a/www-client/chromium/chromium-9999-r1.ebuild b/www-client/chromium/chromium-9999-r1.ebuild index 73de72592027..20e2d7d6be60 100644 --- a/www-client/chromium/chromium-9999-r1.ebuild +++ b/www-client/chromium/chromium-9999-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 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.51 2011/09/14 01:50:03 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.52 2011/09/15 06:19:48 floppym Exp $ EAPI="3" PYTHON_DEPEND="2:2.6" @@ -198,6 +198,7 @@ src_prepare() { \! -path 'third_party/protobuf/*' \ \! -path 'third_party/sfntly/*' \ \! -path 'third_party/skia/*' \ + \! -path 'third_party/smhasher/*' \ \! -path 'third_party/speex/speex.h' \ \! -path 'third_party/sqlite/*' \ \! -path 'third_party/tcmalloc/*' \ -- 2.26.2