Rev bump. Patch bundle updated to fix turkish locale patch. Updated older patches too and removed previous version.

Package-Manager: portage-2.2_rc16/cvs/Linux 2.6.18-gentoo-r3 i686

5 files changed, 41 insertions, 20 deletions

diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog
index 5a30696633c8..980aa9f228fc 100644
--- a/dev-lang/python/ChangeLog
+++ b/dev-lang/python/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-lang/python
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.360 2009/01/21 14:12:32 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.361 2009/01/22 01:13:20 neurogeek Exp $
+
+*python-2.5.4-r1 (22 Jan 2009)
+
+  22 Jan 2009; Jesus Rivero <neurogeek@gentoo.org>
+  files/python-2.5.2_turkish.patch, files/python-2.6_turkish.patch,
+  -python-2.5.4.ebuild, +python-2.5.4-r1.ebuild:
+  Rev bump. Patch bundle updated to fix turkish locale patch. Updated older
+  patches too and removed previous version.
 
 *python-2.5.4 (21 Jan 2009)
 
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 5d888f333afb..2b3dc4054c82 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX depreorder-topsort.py 1958 RMD160 4192ad9ed14064a9da42ce1faedcf28996094da3 SHA1 2c900abeb6cfcc4327f0e9418b5abd7761ce5879 SHA256 7406f639d17b8acab6a1db7e398e74379b44950d4821bc36901abd3455d63b3d
 AUX depreorder.py 2235 RMD160 a6da5f336bdf8c370861c7922a5fa79ce4ab89cb SHA1 3b8590d7fbece2367088c646a792a9618d786dec SHA256 93920120e596f34e4222e8686e6283b03cdd517f89f2dba3eda90d79fa016aba
 AUX pydoc.conf 330 RMD160 0cd619ec251597e0fcadc05bfd249915e73baa17 SHA1 a56100d45378c554b9822f6ed512a6cb7841ef50 SHA256 a45ebba2de5f2b0e963db4101507203d095c5ff667ae5002c4897a9c87786fa1
@@ -5,9 +8,9 @@ AUX pydoc.init 666 RMD160 11caf3a78bce4cdaebacaf21eaf26cc1ce30282e SHA1 88c5cb6d
 AUX python-2.4.2-gentoo_obsd-r1.patch 1630 RMD160 77c7c13be17f7dcf1abccab2a0fb5818f4f7c261 SHA1 ba795d0aeba9986ed6077217848fd8ba1eb0d39c SHA256 b96f687a18cdfd75090a7401298568ee5819046a54eb58c1527126dd36596d47
 AUX python-2.4.2-gentoo_obsd.patch 1554 RMD160 c93e34df155440e68e7db283d709c3ef301933d2 SHA1 83ef3e0f43f2d6100d2416f5c47776af5f643fab SHA256 89a870d045246c66a67e7931afd38260c8b1e3d0c8f2db9b73e36cf014e98dee
 AUX python-2.4.4-test-cross.patch 977 RMD160 8fdcd45dc202993988f7a1c2b3d918068883b99e SHA1 96f25777150ba05765282a43f08da6b6fab3cb73 SHA256 ff2a131776d560d188ec5069e17fea3eb09c26fdd02124ae5ff34d791c9fd9f6
-AUX python-2.5.2_turkish.patch 4866 RMD160 f8b7f4ea3496150400e0ec8840ec89374df97691 SHA1 a6b7f327ffceca1eda5ab8c8309f13ef27df9d9f SHA256 db973eedb649023d837de19269a20d7955eb9ace7a459e6643ca47f62ea57463
+AUX python-2.5.2_turkish.patch 4882 RMD160 69486e369849e0706f4261410f231649397cf793 SHA1 1dc369bdfb10bc9ddb63a5672fa561acf8dee32c SHA256 bf4019ae2acd4b6868db0b625910f668f857711ae00b29f638d038611444b169
 AUX python-2.6-test-cross.patch 914 RMD160 1f421b5565d39a24b887e85cbecaf3857741f756 SHA1 9c05fbe28aac6373f24317db5c277bc4549dde0c SHA256 8264f6ffe5aedcce67bea00b0346e5416a5486da2229bf82fe748d87ec65c4de
-AUX python-2.6_turkish.patch 4590 RMD160 8a5ee60e0b9684f885ef27695cca7bc83ec07c28 SHA1 6aa7deff6ae48c64019542dc3a967f4e32d30129 SHA256 912c9350e19901eea8138abcf2e17accc0ee8bab17bd1a7e5730bed80ff84e76
+AUX python-2.6_turkish.patch 4606 RMD160 e8a12a537fd81e8a4de0f29ce57ebf48cf786e69 SHA1 9ae0d969f34513da90b87bed966d48ea91b46bf2 SHA256 1f90030a415a5395b14677dce1bd07fbaa56d235aecd4fdfae086d09f756c138
 AUX python-config-2.4 179 RMD160 087417fb7080be00cf62381d5e16fb4e4cb4538f SHA1 3ffffc6e4f4c7b774135f2635601b92a5b13e259 SHA256 86b87546be79ee6027df70046b33808b64921eea71618c81810e6b1280604221
 AUX python-config-2.4-r1 1624 RMD160 e4e6893c9e8414289c0c70c0f4be58835911e376 SHA1 addf9a6eb81e636364264a6abb3d96f01ea0cf90 SHA256 923a9e896f99cca5aa4ccbb02f981c6e26a2b1aa42326de2359d3c884bde2a9f
 AUX python-updater 8777 RMD160 f177c5ae1f1d5dabffd9c52da10704999284af0c SHA1 91719ec53bd5e128042fedaed68d40fcb4abd65b SHA256 25d24778518f33e24e735e2319b1f6aa6a94137afe30b55cfeb974a74cf3873a
@@ -23,7 +26,7 @@ DIST python-gentoo-patches-2.4.4-r3.tar.bz2 8348 RMD160 e9b59a7cd1469668d43a41d3
 DIST python-gentoo-patches-2.4.4-r4.tar.bz2 9569 RMD160 2e618e2bf8d0d9d1e722f60b6b781af8906b1750 SHA1 f2253df5b52350fdfbd06054597814d705c088c5 SHA256 a5e9783a4ad57c60f91e3f943f4ff60dcb9b2eb64aa9226598bff9658473781e
 DIST python-gentoo-patches-2.5.2-r7.tar.bz2 28160 RMD160 c2a8c71f464f1cf0cd8e3d142a3f3454de46bc55 SHA1 b64fc90f331e42ea2c364fd61d13b515300fdcbf SHA256 8afff4ed12c3c5ca4418da657617317a8c646a69ae341a3d494747659825355f
 DIST python-gentoo-patches-2.5.2-r8.tar.bz2 28376 RMD160 c4e02a5ed947b253781ec11fd9f5f26498e41c81 SHA1 92e359402e7b6751b28671e19ad7ea0736b62614 SHA256 c008abb01c40057facf3d7fa8ad3a31e792f1b7d41bba96e0084e7476e05a0e3
-DIST python-gentoo-patches-2.5.4.tar.bz2 19483 RMD160 6e34afbd3b7a077604dbf1ea71c9f55e969ef3b2 SHA1 489aff7bb9175245c2b45a5cc426f1671acdc119 SHA256 f6b94979558785b76ecc16074da1c26fc339564ba23a932fa9df943fd34d7a20
+DIST python-gentoo-patches-2.5.4.tar.bz2 19474 RMD160 00bb0918414db251b11b7f19a9f8a112c9e49fbd SHA1 fd4955f7da3049abecc4df0e203e783a90390cf8 SHA256 6e050dd8e8a90655bf935af99ad1ae6456bc072f075ddb9bcd532201bbb37274
 DIST python-gentoo-patches-2.6-r5.tar.bz2 7431 RMD160 dbfc0715773446614843b45818d4152ca133140a SHA1 495cbfbf333052faf6860cf2d682f249a787557c SHA256 ef81eac97d933c77afcfd2434f44132717cd0a1550d1092e388e3c2f3dd5f3cf
 EBUILD python-2.4.4-r14.ebuild 10526 RMD160 bb39fa52c38f0484d9c2b6fb5b5dab797e0a7a4c SHA1 11ea5e2a565f04723ac1ed671fd63868df94dd85 SHA256 b0c7d1de9edf6c308232c483644f7fd522ac27792184c9788c28fd93554a89b5
 EBUILD python-2.4.4-r15.ebuild 10523 RMD160 6fce91d413d08b33475d2d84f53ca0c26ef638a0 SHA1 44ed1d37e9bf99bb8f2cb82721d053c1d7f44650 SHA256 aac8bf1ce07ba5d4d5b43de92ce374cb8f3d6f5eee414ba912e008dc6e345158
@@ -31,8 +34,15 @@ EBUILD python-2.4.4-r5.ebuild 10350 RMD160 78336696a0641eeadc52af46f921b89d9cbd3
 EBUILD python-2.4.4-r6.ebuild 10351 RMD160 82482481fce6d802c5ff55dd3582acd33771115b SHA1 85c075d7626f8bc684b83419e9747a616f34f2ed SHA256 6b474f6320d13d3cbaecd9d785dd9a9fe980c626a7fd10d3c1478b0314905f7e
 EBUILD python-2.5.2-r7.ebuild 10378 RMD160 f17304fa00ab72221f66061c812d2de92cf0446a SHA1 c5d7af3140b8531a4690298922827de762a861b3 SHA256 aceb0c8da6e23042b9ee599c5c35939792092676c1a6fc5127aae1853922e500
 EBUILD python-2.5.2-r8.ebuild 10570 RMD160 1a86f3b548b7cad795ad1be3696b1c3c6056c827 SHA1 34cf3268088e56dfb04a94d88b9e704c1946cbcf SHA256 1557a080890d24f64d4749323741cd313c05bcde5cf6347442fb06c200e05589
-EBUILD python-2.5.4.ebuild 10636 RMD160 72b75a9099db16bb44ce61e3704e58e6b5fd82fb SHA1 15582f18ed6e036c5113a62832810ffefcb6d034 SHA256 a3fc99cb697a7024784ddb449bf8d007f51a80cbbbb14046b8567fd260fe17f1
+EBUILD python-2.5.4-r1.ebuild 10710 RMD160 7bccac3225d875586233d2d85fb94d9c33792ad1 SHA1 63a0c97fc041583c846ef1701c50696faf9643b2 SHA256 e9b68d49e1a00fb0eee1a5f8796bd0be5a6c2f96ef920792c4323ce322e6b726
 EBUILD python-2.6-r5.ebuild 8456 RMD160 c1e2c4c597318d36a47b1f089001de29b1e64645 SHA1 991049269f4ee57749d17a9f049e42d3bf96baf7 SHA256 b5a446068ded5c40d85cf76b0751e33912234670761a46cea717e6867a10a786
 EBUILD python-2.6.1.ebuild 8506 RMD160 3b61561c7c954c3593eb16c20ba86e10ae9d8ae2 SHA1 9060e87693b5951271d1deb3562d478096296541 SHA256 572b0c9853d59b16d452452a62a3806cabc28fc300aac17838b9ddd574496ee2
-MISC ChangeLog 63475 RMD160 23144287a1ff6518715c17bce21223899ed06f11 SHA1 110c6ab5150fc6b5b1b0cb07e6c81bc476ba46d1 SHA256 7a1e1cfe2b5904b8e366f387471b7cf1432211e45d20dfc4e40e3c780cfb9d0f
+MISC ChangeLog 63796 RMD160 1afb80238794e35589f8f367f6f3fccf7541a267 SHA1 3177ee5d0ec7c203d20ea0d94067346eee4026bc SHA256 adafb2d9c154ee84ea06a5574397b43403b27692d68b409ee7aeee06f846abb0
 MISC metadata.xml 490 RMD160 b919b92704616b974d1da46bfea1f03c7ea50330 SHA1 d1901bc18d0aa431b05fccfe13f2f87ab2aa9e18 SHA256 765be0142679faeeaf01cfa489424c3af08ad38ed627e6a7246b4a6f96f2dffa
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkl3yEEACgkQdIssYB9vBoOyAACfd5bDPvq8i3xi6pPcpqsiorpC
+FasAn2W/0UGphsKuFAhyuxPjOeg2+jF/
+=+Dmc
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/python/files/python-2.5.2_turkish.patch b/dev-lang/python/files/python-2.5.2_turkish.patch
index 684a223e8bcb..2685e87a3851 100644
--- a/dev-lang/python/files/python-2.5.2_turkish.patch
+++ b/dev-lang/python/files/python-2.5.2_turkish.patch
@@ -79,7 +79,7 @@ diff -uNr Python-2.5.2.orig/Lib/locale.py Python-2.5.2/Lib/locale.py
      """
      # Normalize the locale name and extract the encoding
 -    fullname = localename.lower()
-+    fullname = localename.translate(_ascii_lower_map)
++    fullname = localename.encode('ascii').translate(_ascii_lower_map)
      if ':' in fullname:
          # ':' is sometimes used as encoding delimiter.
          fullname = fullname.replace(':', '.')
diff --git a/dev-lang/python/files/python-2.6_turkish.patch b/dev-lang/python/files/python-2.6_turkish.patch
index 2eb50527eed7..479c3c3738ef 100644
--- a/dev-lang/python/files/python-2.6_turkish.patch
+++ b/dev-lang/python/files/python-2.6_turkish.patch
@@ -72,7 +72,7 @@ diff -uNr Python-2.6.1.orig/Lib/locale.py Python-2.6.1/Lib/locale.py
      """
      # Normalize the locale name and extract the encoding
 -    fullname = localename.lower()
-+    fullname = localename.translate(_ascii_lower_map)
++    fullname = localename.encode('ascii').translate(_ascii_lower_map)
      if ':' in fullname:
          # ':' is sometimes used as encoding delimiter.
          fullname = fullname.replace(':', '.')
diff --git a/dev-lang/python/python-2.5.4.ebuild b/dev-lang/python/python-2.5.4-r1.ebuild
index c5736c7cba03..926a83ed2eaa 100644
--- a/dev-lang/python/python-2.5.4.ebuild
+++ b/dev-lang/python/python-2.5.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.4.ebuild,v 1.2 2009/01/21 17:27:02 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.4-r1.ebuild,v 1.1 2009/01/22 01:13:20 neurogeek Exp $
 
 # NOTE about python-portage interactions :
 # - Do not add a pkg_setup() check for a certain version of portage
@@ -23,7 +23,7 @@ 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}.tar.bz2"
+		 mirror://gentoo/python-gentoo-patches-${PV}.tar.bz2"
 
 LICENSE="PSF-2.2"
 SLOT="2.5"
@@ -37,15 +37,15 @@ IUSE="+xml ncurses gdbm ssl readline tk berkdb ipv6 build ucs2 sqlite doc
 
 DEPEND=">=sys-libs/zlib-1.1.3
 		!build? (
-				sqlite? ( >=dev-db/sqlite-3 )
-				tk? ( >=dev-lang/tk-8.0 )
-				ncurses? ( >=sys-libs/ncurses-5.2
-					readline? ( >=sys-libs/readline-4.1 ) )
-				berkdb? ( || ( sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3
-								sys-libs/db:4.2 ) )
-				gdbm? ( sys-libs/gdbm )
-				ssl? ( dev-libs/openssl )
-				doc? ( dev-python/python-docs:2.5 )
+			sqlite? ( >=dev-db/sqlite-3 )
+			tk? ( >=dev-lang/tk-8.0 )
+			ncurses? ( >=sys-libs/ncurses-5.2
+						readline? ( >=sys-libs/readline-4.1 ) )
+			berkdb? ( || ( sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3
+							sys-libs/db:4.2 ) )
+			gdbm? ( sys-libs/gdbm )
+			ssl? ( dev-libs/openssl )
+			doc? ( dev-python/python-docs:2.5 )
 		xml? ( dev-libs/expat )
 	)"
 
@@ -112,10 +112,12 @@ _curses_panel _tkinter _sqlite3"
 		export PYTHON_DISABLE_MODULES="${disable}"
 	fi
 
-	use xml ||
+	if use !xml; then
+		${PYTHON_DISABLE_MODULES}="${PYTHON_DISABLE_MODULES} pyexpat"
 		ewarn "You have configured Python without XML support."
 		ewarn "This is NOT a recommended configuration as you"
 		ewarn "may face problems parsing any XML documents."
+	fi
 
 	einfo "Disabled modules: $PYTHON_DISABLE_MODULES"
 }
@@ -342,3 +344,4 @@ emerge:"
 	elog "cd /usr/lib/python${PYVER}/test"
 	elog "and run the tests separately."
 }
+