From 199db344b2bbd01cf493c3794c56dd74c0945b99 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
Date: Mon, 22 Dec 2014 11:16:37 +0000
Subject: [PATCH] Update the comment not to support python-mhash in new stable
 too, bug #533190.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!
---
 sys-apps/portage/ChangeLog             |  5 +++-
 sys-apps/portage/Manifest              | 32 +++++++++++++-------------
 sys-apps/portage/portage-2.2.14.ebuild |  4 ++--
 3 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index e3463fc65f06..58fee690a667 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/portage
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1424 2014/12/22 11:14:55 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1425 2014/12/22 11:16:36 mgorny Exp $
+
+  22 Dec 2014; Michał Górny <mgorny@gentoo.org> portage-2.2.14.ebuild:
+  Update the comment not to support python-mhash in new stable too, bug #533190.
 
   22 Dec 2014; Michał Górny <mgorny@gentoo.org> portage-2.2.15.ebuild,
   portage-9999.ebuild:
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 93e1ca092f8a..2536b6c50564 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -5,29 +5,29 @@ AUX README.RESCUE 137 SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd1
 DIST portage-2.2.14.tar.bz2 896674 SHA256 8dd65971e0f1c31dca922b0f7be06e622aabbed8d012d056ff25a169fc9946d8 SHA512 c8724b42d9932adf6065ff9f9c3bb3d22ec3258dcdb23e041ce704f2c7b634d459a36764f3ec5aa4613843733c70725025af10439816c538ec12837db50dc1ab WHIRLPOOL 82bb660fcc1f0bb4639b53829cf8207fc40ee01a0cb9935ad46fb5039f0558fbbbb3af3d12d208289e9701e0874d77a7990911fd50fe04806948c6c6955625fc
 DIST portage-2.2.15.tar.bz2 907786 SHA256 be62ee5e104272f9e6472a60db7e05136e6acf212003159b500fa3132a9a68d7 SHA512 4e0ca51ddbe94ce0595e56f549c8cdff68d3d2f7d0d7fdece78adc10a9657ed848f084672840f2533bc7c87c6aaa06e02861c7f9d92bdcc1647c9b40b7a3a5a1 WHIRLPOOL 689e62a261b8fa404c8aedfcc825135ba3005ab920db6cb2ce1040ec252f24f67a5d5c01a84db908598390fc97f6df9d9ba78a106ee16aa748a049bf425bf28d
 DIST portage-2.2.8.tar.bz2 874672 SHA256 c1074e01173df5384e003598dbc5f64f09e92f83fd26faab2f88f9f0bc64aa7e SHA512 acc47d94ff8c08e5a7bf2d4c4e600863430dd1e7d0bb8b4254d6477a498933cae663db84debf9487d2243c2cba689629ef8e8b6cf108e10d40e89e8e8d7e1257 WHIRLPOOL d54290ede8d3d85e5211cda7e86ed740178121ef2f47cf0858c27941d8679d29c11445befff962986d40a47ded50d0d4654de19e7d4aef3fdf2546655a0d6fe2
-EBUILD portage-2.2.14.ebuild 11369 SHA256 ca20dab7550e321ad3f96e4d14071a3da7095a9ac2aee02e5e25cd5fb12f6011 SHA512 be192751d08ea8fde5227c812af8e0391ee0b1b088368f8691a43d696f732d909823807ffab47fc0e8a944cbbd7ffae63790f4e35272e19590e24747bdf02fb8 WHIRLPOOL 1d09b3a95ae8af72d9937f3d4f253b8d35863c491350b31fa01fa5bb3056f1d507d76a36c6e38873da9bb89c723a2370a9f890b51b19b5b1e0e7cf01feae7758
+EBUILD portage-2.2.14.ebuild 11352 SHA256 cbec181d14a1f82d0e5d74e3c986fbf48412aaac2edaa93b1e6add6d2c857f5a SHA512 86526ee07c64e2cb61106d14677cb50601cdef882e13e09d21842e943d13732155a346a28d3d4c921858b04e266c910ed20ea218d53c1564adfd9c23e7d3b084 WHIRLPOOL 1cbc40791f9347c2f9345fd428a9395ef526d891248a38593dcad25c7f6d3d904411d3390cb09d92bcbdc59363c2d29daa2327b33867d5d0d8c49d3c01d1cf07
 EBUILD portage-2.2.15.ebuild 11355 SHA256 2aa97a2e3ec8e4b5df74d66566e64cc164e3e59829411f35ced9961f3b766504 SHA512 46427c710b064613df744af82c6ff2ef7ca59e8c6a2fa048347cf6fd1c6b59bd147227f68787ea4d25452cc43c74f4d819d8de7fe43998d67564e7a71105f1b1 WHIRLPOOL 1f995c48c05c291e2ae3e64950e5afef606529e79ebb18ebd64cec430d4a2f14406bfe1206c279c4dc201e63235d629174c4e5e59a693cd52ad59cb1f147e162
 EBUILD portage-2.2.8-r2.ebuild 19246 SHA256 e5117305e6132b0460e73b6f05de6f0c408a7ecb7d3303f3ea19c65d37e485cf SHA512 64bb817cb9467335117c96b69aa533b7e34edb0f0c3d50b87278f2c35c49d7074d3b702447cd18a646c66fc512a163b584bb1d5ec023a8077123ffde171785c7 WHIRLPOOL 99fcf94232e0de66fa33e0f0150a56b085cf67bf1a2c1434f8cc773561e5390cdbe33ca4a8d3d940c80f5209a94b9803d27503d4152420b8e1f3127a590a8666
 EBUILD portage-9999.ebuild 8356 SHA256 f4cc53024d0e6a352050ac5a0fb119b979c8623383ddbce7e5e2b8f1e44b2401 SHA512 1f66e43964f1040acf7b3653d5f355b822b8c08579c1f9032a03769b79319d3eb6bd444355627e7f0de29ca498dbadc7fab73e0d6dbb184e0b679592adf0e674 WHIRLPOOL 806a6c2172b69277c083457d5698f779381fe3e609e5071dd4089e1161054af64ab6824b2b9bd5c04ed020fee0ddae223c440a90cabe98cd937fdea079cf11c0
-MISC ChangeLog 61734 SHA256 383fcf441d537ed360eedf496315c5b08b6d77565fbb2fd0978bd3863618ea6a SHA512 5f5313aedbccb3a0c0a407d1860d592cb8ec587fcc70b74dc92544bd45f25c7fd8fc7417812e3d7f38ca7ea73957e8f2d69ff1cd1083d29891dc97a8681a0604 WHIRLPOOL 882fb6ff75df8033b17377b015086b3a5adcae309ae245b4f9c0af0c2dea44674c8559bf956a3502a7a0a2ee2d6029f4b083a0341ff8050ff8bb908e1ba3ec41
+MISC ChangeLog 61889 SHA256 c45b52c6f697ddd35a7e30923a5149872d42305e385123739db8587ee71867ca SHA512 e85ad9a0ff13b2872528b4736506bf3f8a98e2cc3c0a9ddf6d5af10d33b61f693b3e0f039259a951d43ba87beac66a0b83c49b78944be9fdf46ada26c2ddcfaf WHIRLPOOL a2d744f51e381d1aa2c81f8d637613a02b374f810264bc7edbae02cf431aaee83b31bcd7c0ac1736ea3d3e0ffa103a8c1f8191f4026b1534c72fe992ae65dab9
 MISC ChangeLog-2012 133873 SHA256 157a7eb13d4cf2e2c94bfcb7e91f218af1ea88f5ff20c24a50546950a9839c94 SHA512 1241f4ccd7b31bdd340649417257b0e95202992feb66e0cd4d41fc2d35bf0baeac19680f34a831d2fefce0c0fec03aa6e7a191f783e59cf9b93aaf266f010a3f WHIRLPOOL b027bdba0f5ccc1b3a2dc18df92d82b473af5e55536816b7177071c1ae1a89e4d50d42c2093fa1bbe28b92a42014fbefbfc9e7daa4e6426ebecbd5bffc3d479f
 MISC metadata.xml 1028 SHA256 c3c8eaafc55327db46f7851b816118637c3f81ba908fb7c536036122a807a874 SHA512 287af0b907a1890ad8ab53cf33001ad1cb6f2c2c8efc022ffa27647afa0e0fc75060e7268d2b7f0932258e12204ac23f927f49d99130714d025e5610e2526e83 WHIRLPOOL a332c3d7208a4bf6bb5caa155331956f6123e73d999200c09e3a477136f9090de492f6455e2b19e49d7d6782a2bfe1aafd147df382db7927bbb12ae553a2d3bb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJUl/02XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJUl/2VXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOWo8QAIKdSgrsbnKYkCu4pDEqYYl5
-GdPE9Ic/NhHKCTKB8KnmTwMF6NZlVozB0F353kybDx2V7Ple3LxI8XXqY5AnYEfL
-S0/BYB19GjsBSG4IxLAfW+E5763J5wzApyJpJd3qwBiJ0EXHWqR0FL4S5YwhSwO3
-rQzEEmrqkNDZS8R47NXSXG3WyTS0MguGiI5svt7H/6Mdf9xXoOKXqdhSpBu3TBEM
-JnIejgPtZRn9g0BRgQvjaVy/+o9aow/fBtfvVbwGEICNfb3rcgQS6zuxaBwYo/aE
-86hBx0dbkT2orjkz3jISJRyzpMYknggDv+RqWaERxcCa2DcOt3IzIuGl0khS/RQh
-D0V2k/l+vXDqzurq8UuUSu4mTb+ZBgm+gw0u78oXbQV46/5tT4p9zgy6potcfz9w
-Sr/DR9845OOwqd8hp0iTTGYWFE48/HPkUPTjNy142y6lX6Nt6VDz4I1Ze1mb4KLe
-vnQahUhhYs1Zjv+WuFLWgGKGpVDdPof2UX2amAPgU7Y/YbxhBOTIycGsZxAlZAo6
-uK9zVEhoRO2naO0aAJRrrnlj6ZV+XIdKVFOwacAfkQYgc0oGqLM/MOa7+EyLIGjN
-qd1hl5ARty/W5/uyoPbAnC46dd7g0rhxZ/RrtQUG+RifdT1CrVTBRzMsaZT1QifF
-sQ8gd5Hrx7Q8rvwYqBhq
-=JpNf
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOvrEQAIzy0StOKMaDYzD3JIjdr3r4
+DEI8yyx0sm/XgNN9ZG9Nz/MnDSDJXqzzZuSjmithi91CptCZEKZSQxUjiJrswGoE
+wxBT+dLZ4grFjXhlurTFXqGhWsql2WyNipk/axvPOXQD6jsc6MZJyGdAlg/Coy7+
+wILevXg2ibdgD96ueumVNVDN2fJEQ4nAessud5AteHoW+Dq0tdMxp4hKAFCmV36r
+ID1o7hgA1tad4A5aJS8/YcP++/Ih+oeFNmF9tIvxEIDRkwKaF/2JdVmpcEAOaqim
+LvmerKAM/NG33UxV6h8yxwmJ3yW6M92/5aXDsrGAYav8YANZVGlKGObcaA8Owv0p
+mvagic2KQcxK0uMzuat/AgxGl83PbpdCOwX6xZ0BQ4uHipt4+MVzlmkrQP/c+1HM
+S5xJxa52OkUtY7eT9qnH+ixiK1kkKA4PgCOE/S5TvXzotj8c72pNIYBFRmDhNFXr
+ONaHM39qtySzJQExeRt3g8TIn5g7DESIS8Nr+/4j7Cd2vLks1i5kbZHdKttJZ6h0
+xd9z/lLFoTXUc3vl482gY/jlTMJ1oIcZI/r+3zqydjSXP7z4ARa1XfmQ9qEhxulT
+Xk2dSbq9rdYKnFWNlLvwTbbGh/amP6UoN9SAAD1ZG4XSHn7795+iqVEGxJu7bQDY
+y1Tb6vz0x4OVEx56gbcB
+=PHYP
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/portage-2.2.14.ebuild b/sys-apps/portage/portage-2.2.14.ebuild
index 2a51fa7d5f9c..fb2a0fe0debf 100644
--- a/sys-apps/portage/portage-2.2.14.ebuild
+++ b/sys-apps/portage/portage-2.2.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.14.ebuild,v 1.6 2014/12/20 15:17:14 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.14.ebuild,v 1.7 2014/12/22 11:16:36 mgorny Exp $
 
 EAPI=5
 
@@ -32,7 +32,7 @@ DEPEND="!build? ( ${PYTHON_DEPS//bzip2(+)/ssl(+),bzip2(+)} )
 # quite slow, so it's not considered in the dependencies as an alternative to
 # to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
 # for now, don't pull in xattr deps for other kernels.
-# For whirlpool hash, require python[ssl] or python-mhash (bug #425046).
+# For whirlpool hash, require python[ssl] (bug #425046).
 # For compgen, require bash[readline] (bug #445576).
 RDEPEND="
 	dev-lang/python-exec:2
-- 
2.26.2