Fix up broken python-2.6.6.

Package-Manager: portage-2.1.9.14/cvs/Linux x86_64

3 files changed, 19 insertions, 8 deletions

diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog
index f2b4b106c3a6..c5ea755cd9fc 100644
--- a/dev-lang/python/ChangeLog
+++ b/dev-lang/python/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-lang/python
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.496 2010/10/08 17:17:43 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.497 2010/10/12 20:40:50 djc Exp $
+
+*python-2.6.6-r1 (12 Oct 2010)
+
+  12 Oct 2010; Dirkjan Ochtman <djc@gentoo.org> -python-2.6.6.ebuild,
+  +python-2.6.6-r1.ebuild:
+  2.6.6-r1 actually has the rwx-mmap patch and the portage blocker.
+
+  11 Oct 2010; Dirkjan Ochtman <djc@gentoo.org> python-2.6.6.ebuild:
+  Block 2.6.6 on portage-2.1.9 (earlier portage suffers from bug 330937).
 
 *python-2.6.6 (08 Oct 2010)
 
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index af822b07a670..4360ab40adcd 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -17,7 +17,7 @@ DIST python-gentoo-patches-2.5.4-r3.tar.bz2 19473 RMD160 c3a807693103f9e26c3cce4
 DIST python-gentoo-patches-2.6.4-r1.tar.bz2 12570 RMD160 2a58eb651ce5adc68c4667fb0ddc42cc215ea342 SHA1 c5de0442890bc0753c445a88390d932e629c8648 SHA256 2fe6c8838df2c07d3232ebb26c128dab2787c43a76ddb0b55acec1bed657f9f2
 DIST python-gentoo-patches-2.6.5-r4.tar.bz2 68611 RMD160 63a67a772df32dcf1977c1060228f5282a332a41 SHA1 e29469ff9800ff3125d203eea152bfdf378b7234 SHA256 7497892864469a9ff8698dcd6467cb6ddadd3b8472e8847b9e27f738ff7962ab
 DIST python-gentoo-patches-2.6.5-r5.tar.bz2 1482491 RMD160 a7978912b8598a589a82746642fa5b676369c599 SHA1 26c983e79ac32b63a3bc6e411d96b9233524733b SHA256 6cb8cf0e1418cad035a243c08dfeee2e9395397dda74ada49667b3eba63bb76c
-DIST python-gentoo-patches-2.6.6.tar.bz2 14056 RMD160 d624e17dee63e16e9475b4cbd9ebb457864b4cd0 SHA1 1694a3fc518e3f8eb1a5532ee786af2ff10fdf3c SHA256 65d8a56b36b22d8862ac78c01979b19998b0c8c8c48858e1f7f889fd446541e3
+DIST python-gentoo-patches-2.6.6-r1.tar.bz2 15729 RMD160 9f0e1f5ead8b1ff1a3a3aedf2fb70d10fe4c6c3b SHA1 2a1fd29501c0f5a424e670e5d6a60c67007f23e7 SHA256 17d7fd6c4de686d41403322bc26bd306607f03843c4f9ab6365a985ded4f4ebb
 DIST python-gentoo-patches-2.7.tar.bz2 11803 RMD160 a4bef5c904859f530f6cf5009ac60d171c34af00 SHA1 06b3f6077febed0aa807cb81cd689215efc430c6 SHA256 c72446007ab1b4dd0d8702b0901a8b5e8eadb1ce6872e7f99e12f4eb97874b0f
 DIST python-gentoo-patches-3.1.2-r5.tar.bz2 67359 RMD160 0ee5576b7de728a0840c6020d8403b94a883eeaa SHA1 5900a751c7e6fea512f79e045aa2f7870e378595 SHA256 fa5eabe0cc84789e9ed2fd6140dfdf08ca29de00474b117b9998b0eefc2e850a
 DIST python-gentoo-patches-3.1.2-r6.tar.bz2 1285912 RMD160 a525679255b2dcb0a65d00792a8c247742e94923 SHA1 7ab91a40074f33b08b805b2cce54dc32c1f596b1 SHA256 45a4368f537b2d92ead296dd600207313a20a8027dcaeaa2a0c71dcf8ecb9899
@@ -26,9 +26,9 @@ EBUILD python-2.5.4-r4.ebuild 9645 RMD160 21881a4d1f0e8245b1821109ab26e775d55e94
 EBUILD python-2.6.4-r1.ebuild 9579 RMD160 192fa57b6aecb1220030f1333cdd3588ebdd27df SHA1 a9f3a808c04a974c1214c5c7014bf40ba474b495 SHA256 de57a0994b1b1754c3a95612f83c0dfae9e5f6aa4aae8bd0f54588d50dd4529d
 EBUILD python-2.6.5-r2.ebuild 9456 RMD160 1518fc885de1b67c0fc25344f64dbae89e7f879b SHA1 e332ce8d5cc817ab82b50c4baef4c2e69662bed4 SHA256 ca72ffa86fd43037230320b64820cdc52d893510f20125ad6384bca2101a3870
 EBUILD python-2.6.5-r3.ebuild 9438 RMD160 fe355aa53f17f66a8e8c2877f67479f669a3a4aa SHA1 d4f4720f71da21717ed4eccd626f46c4dab3e3fd SHA256 2cc36b8eeb1954f06ac4714000bb8c621aeeec6fbeb5a20160590db9908708d7
-EBUILD python-2.6.6.ebuild 9444 RMD160 77e365bd2f1bbbc69267d6a4a3fd9933b65a7a17 SHA1 8459fa6925f023c11786d0d2525f94c39bb21e02 SHA256 7f992c544761d097e062689cfb5b6a425a9427538fcab8f3af1b2cd3b8576ed0
+EBUILD python-2.6.6-r1.ebuild 9612 RMD160 07faeb7c1491e0e7c95a79930defe605fd655cdd SHA1 d495a4035594d73c11c5dead265b9e2f28ae27f0 SHA256 c9e66d8fe15657bc33a8f67d4ea2c581548ce466e81900cd151d449e403be34e
 EBUILD python-2.7.ebuild 9743 RMD160 f7df4eb4d393e2ec188ec37a31bf5d5805833525 SHA1 97d6610b195ea53f179ab980c5b46d2df407a697 SHA256 82a6ab3484118c2ee23784f24e868096cce7ec5351a7b6a1cd35f7f1e349d92a
 EBUILD python-3.1.2-r3.ebuild 9254 RMD160 8bf16f2c60592d84ffe549f2e3572692dea6b9db SHA1 1351a829379f38c7d4290760f1e9960b50e572e3 SHA256 f69b6e60d97c3bf19afdf5c62d54c3c45aacd79b72ff0685d4a09b15fe2b9a25
 EBUILD python-3.1.2-r4.ebuild 9527 RMD160 47c13d9cd0e29b53a0055a875852735df843b3d0 SHA1 3b1adc55aeee36c8436ac171f7e5efe2e641c3b5 SHA256 614b78ffa450f64278c714421198f99856d46e8c6af4a8fc7dfa6f19dd0a500a
-MISC ChangeLog 88232 RMD160 fe390c727b8d32136b8800a5a62966a45c77642c SHA1 68742038325b0ce2d1a4259d52bce6349913e27f SHA256 b8b8ae741302fda6b1c200054fe2ab0523d2207417de566aec9d13b32865e55d
+MISC ChangeLog 88574 RMD160 db9d5c0a7800c738d1e323ec81931cb09aef75ab SHA1 a13e1f4aef5882b12455cb2be7c4a8fc81e3254b SHA256 76d17d284c0b194af2c193b539ffa3f13b87827cfff47e421b47c805702dced9
 MISC metadata.xml 661 RMD160 54831d16b8807086bfabdbb3df9d33336b5d42a0 SHA1 9867c337fe9e6f4e967004fc9409763e0fedf43b SHA256 2c6c3407251f7ccd6501dee49494e539a9544f2fbae99a4373eefdf4e83e8908
diff --git a/dev-lang/python/python-2.6.6.ebuild b/dev-lang/python/python-2.6.6-r1.ebuild
index 5cd0fb2616f6..7f35bb532a17 100644
--- a/dev-lang/python/python-2.6.6.ebuild
+++ b/dev-lang/python/python-2.6.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.6.ebuild,v 1.1 2010/10/08 17:17:43 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.6-r1.ebuild,v 1.1 2010/10/12 20:40:50 djc Exp $
 
 EAPI="2"
 
@@ -8,12 +8,13 @@ inherit autotools eutils flag-o-matic multilib pax-utils python toolchain-funcs
 
 MY_P="Python-${PV}"
 
-PATCHSET_REVISION="0"
+PATCHSET_REVISION="1"
 
 DESCRIPTION="Python is an interpreted, interactive, object-oriented programming language."
 HOMEPAGE="http://www.python.org/"
 SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.bz2
-	mirror://gentoo/python-gentoo-patches-${PV}$([[ "${PATCHSET_REVISION}" != "0" ]] && echo "-r${PATCHSET_REVISION}").tar.bz2"
+	http://dev.gentoo.org/~djc/python-gentoo-patches-${PV}$([[ "${PATCHSET_REVISION}" != "0" ]] && echo "-r${PATCHSET_REVISION}").tar.bz2"
+#	mirror://gentoo/python-gentoo-patches-${PV}$([[ "${PATCHSET_REVISION}" != "0" ]] && echo "-r${PATCHSET_REVISION}").tar.bz2"
 
 LICENSE="PSF-2.2"
 SLOT="2.6"
@@ -21,7 +22,8 @@ PYTHON_ABI="${SLOT}"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="-berkdb build doc elibc_uclibc examples gdbm ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml"
 
-RDEPEND=">=app-admin/eselect-python-20091230
+RDEPEND="!!<sys-apps/portage-2.1.9
+		>=app-admin/eselect-python-20091230
 		>=sys-libs/zlib-1.1.3
 		virtual/libffi
 		virtual/libintl