From ccabf93ceb7de064c249f57d93cdf73ee3f560aa Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 10 Nov 2011 16:18:28 +0000
Subject: [PATCH] Reference bug #330937 for the python-2.6.6 blocker in old
 portage. This blocker breaks the upgrade path from <python-2.6 since
 python-2.6.5 is no longer in the tree.

Package-Manager: portage-2.2.0_alpha73/cvs/Linux i686
---
 sys-apps/portage/ChangeLog               |  8 +++++++-
 sys-apps/portage/Manifest                | 12 ++++++------
 sys-apps/portage/portage-2.1.6.13.ebuild |  3 ++-
 sys-apps/portage/portage-2.1.6.7.ebuild  |  3 ++-
 4 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index bbd488125529..feda66395a77 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/portage
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.901 2011/11/10 06:07:09 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.902 2011/11/10 16:18:28 zmedico Exp $
+
+  10 Nov 2011; Zac Medico <zmedico@gentoo.org> portage-2.1.6.13.ebuild,
+  portage-2.1.6.7.ebuild:
+  Reference bug #330937 for the python-2.6.6 blocker in old portage. This
+  blocker breaks the upgrade path from <python-2.6 since python-2.6.5 is no
+  longer in the tree.
 
 *portage-2.2.0_alpha73 (10 Nov 2011)
 
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 369866457857..cf5c6b45cf8a 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -16,19 +16,19 @@ DIST portage-man-pl-2.1.2.tar.bz2 53893 RMD160 46c3656b40bf4ad2530ab2b5fbc563708
 EBUILD portage-2.1.10.11.ebuild 11660 RMD160 4d52b4ce74bc553ec0f3502bdc03ebfa0d953825 SHA1 7767202cb8ecca952a31c2d5db89734a94561d61 SHA256 14b7bc6fd709f7a1f00de22bc8dfb3288e3cdfde561ff412d56621fc7a8126b5
 EBUILD portage-2.1.10.32.ebuild 11641 RMD160 08c8ed272d69469ef793f66a27fb32f3d59e6271 SHA1 945f6f0c76f7dccc5a377349ed4bec73f5f86925 SHA256 c2515e82c1e7947b2d6440449d81950d5a2b9c28f529d5f5adbd9004868d2815
 EBUILD portage-2.1.10.33.ebuild 11641 RMD160 770a40af2d391b08009f6619f834a77ad49d52ae SHA1 6ce8e2763fb6c9afa791f3631dda1a3b5a32a87d SHA256 17c1d094b21781900563a6efc1c133440e448f1bedc76969e66bd08c36990d2a
-EBUILD portage-2.1.6.13.ebuild 10038 RMD160 a40e576c31f07f89387bda834607e62708b47e79 SHA1 ecbd0bae4ca5f340627f1dca792d137870be4d5e SHA256 c507d206aa08c39b387f464f1fe973d15b1b39baadd2a8feafc4867f8856e1a9
-EBUILD portage-2.1.6.7.ebuild 8689 RMD160 a04a6f87a6ded5b3c20413c79cc5d854f4083574 SHA1 1782ad24f77a56d2c8cbd88828d50451a1254f7e SHA256 a3f0e6639db74003108c933fcd4557bd4dccbfd913fc6fde7546dbec3987797a
+EBUILD portage-2.1.6.13.ebuild 10084 RMD160 63d739515373e5535beb8dc325c934c64d713a3a SHA1 ba95493af4cc94e8d4a84db95d5fcd0e453aa364 SHA256 c0c3f9c3665bc51a599615f8e58d03246a8e77447aa234135fbca7cba2c96d1c
+EBUILD portage-2.1.6.7.ebuild 8735 RMD160 24a4e2901f34cc9e6163759d386f74d644020cb8 SHA1 4d5a52aa90da31a65ace19fbe792ff9d65a6e9c5 SHA256 3953088ecfbc137ebeaeeda89fae22898c01430901473bfc014e6afd8a2b47f3
 EBUILD portage-2.1.9.42.ebuild 10283 RMD160 60ac7fd535e83626095d2ef11466da8e8aa9b209 SHA1 b204bf62ad13b3c3d116fff53bc7a482eb89b7d8 SHA256 1b7968c34b0fc83aa1b388540a155340fdeb93df19de4515826af205fbcb9a3e
 EBUILD portage-2.2.0_alpha51.ebuild 12928 RMD160 72acaaa06c2d1c170b17ae9449ed9f9bceeb0735 SHA1 195fc5ef71c91f86ec3329833e56543d482c7b7d SHA256 486a6a78bae63337695a134af3f6ff6462a01613b1f1848663cd2ca79cd59292
 EBUILD portage-2.2.0_alpha72.ebuild 12906 RMD160 c367bedf3afe792184f9f0ebedd844cb227a805e SHA1 d6eae77a17c34b4e84e4c43375e8d6290373ab29 SHA256 cee4246dc475570466107c40d647b04dad0f0e0574d6b0d23f904813e40b4f77
 EBUILD portage-2.2.0_alpha73.ebuild 12906 RMD160 c2c5a22004a5cfa8e1fb49b186cce66f33fa0b2b SHA1 f1f5c0f2c8b62ab2623e63d9f979b570ae4f912b SHA256 34da0d5ef74a608c1e936f4a6bf8d3abf438f83c876de9f35f6af8fcef94567d
 EBUILD portage-9999.ebuild 12118 RMD160 db216891c223daaa99a2dacb7dd49d7325ff3752 SHA1 47475472bfe9fa7261a445d6126e21843a15a3e5 SHA256 3663cbf53222b4183f7bd2ff870ff107a90f0bfc6d4c03542d8ef5195432817c
-MISC ChangeLog 62688 RMD160 f811590c27a74901bb893fdbba3b80d5af74237c SHA1 7242f76b64e553970175f75f2d3555d5c9b580a8 SHA256 69aff9c58e5830d87269eb8a958361c9603556e069682085211ad10a13f647d3
+MISC ChangeLog 62959 RMD160 3fd4133e3937f523cbc5c9499aac79ed1b0b1fd4 SHA1 7b568e442cc8f1120260a8ca8e37421ced0a8010 SHA256 259f79a3c2d49fb7c560f00bb041d0ef489fb1df510e1ae43f965c966766442b
 MISC metadata.xml 784 RMD160 ed548c07d0a96be62f1854b92abb4ebc0ae2f281 SHA1 338c4eb3cbb626b8830eddb2f0ef23a48b1c9e12 SHA256 3ec8e42f1532859a3697a5870febeb90c635740da85cdf8f913c7529dfc767f2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk67ahQACgkQ/ejvha5XGaOpTQCfR7ehJDQt55SzJghrpZKdKEQj
-01QAoOsAnwj414nn2sQVcsXcrzHIae7u
-=iGJO
+iEYEARECAAYFAk67+VsACgkQ/ejvha5XGaMBlACdHDUJbc9ZB8BMQpO7bR/q+2v9
+8NEAoMlVcjJJuUJElPIeZOuZUVzR5Nrf
+=SnqY
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/portage-2.1.6.13.ebuild b/sys-apps/portage/portage-2.1.6.13.ebuild
index 86dd75f91623..ef8115894b2b 100644
--- a/sys-apps/portage/portage-2.1.6.13.ebuild
+++ b/sys-apps/portage/portage-2.1.6.13.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/sys-apps/portage/portage-2.1.6.13.ebuild,v 1.24 2011/06/08 07:59:07 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.6.13.ebuild,v 1.25 2011/11/10 16:18:28 zmedico Exp $
 
 # EAPI 1 since python-2.5 is also EAPI 1.
 EAPI=1
@@ -20,6 +20,7 @@ DEPEND="${python_dep}
 	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
 	epydoc? ( >=dev-python/epydoc-2.0 )"
 # the debugedit blocker is for bug #289967
+# the python-2.6.6 blocker is for bug #330937
 RDEPEND="${python_dep}
 	!>=dev-lang/python-2.6.6:2.6 !dev-lang/python:2.7
 	!build? ( >=sys-apps/sed-4.0.5
diff --git a/sys-apps/portage/portage-2.1.6.7.ebuild b/sys-apps/portage/portage-2.1.6.7.ebuild
index 96cd29d4882e..f6274cc4f7fa 100644
--- a/sys-apps/portage/portage-2.1.6.7.ebuild
+++ b/sys-apps/portage/portage-2.1.6.7.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/sys-apps/portage/portage-2.1.6.7.ebuild,v 1.23 2011/06/08 07:59:07 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.6.7.ebuild,v 1.24 2011/11/10 16:18:28 zmedico Exp $
 
 inherit eutils multilib python
 
@@ -18,6 +18,7 @@ DEPEND="${python_dep}
 	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
 	epydoc? ( >=dev-python/epydoc-2.0 )"
 # the debugedit blocker is for bug #289967
+# the python-2.6.6 blocker is for bug #330937
 RDEPEND="${python_dep}
 	!>=dev-lang/python-2.6.6
 	!build? ( >=sys-apps/sed-4.0.5
-- 
2.26.2