Version bump. Drop old.

Package-Manager: portage--svn/cvs/Linux 2.6.26-gentoo x86_64

4 files changed, 52 insertions, 68 deletions

diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog
index 2e5c8262bdcb..b06810ad3c69 100644
--- a/dev-lang/python/ChangeLog
+++ b/dev-lang/python/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lang/python
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.346 2008/09/19 16:44:09 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.347 2008/10/05 00:55:31 hawking Exp $
+
+*python-2.6 (05 Oct 2008)
+
+  05 Oct 2008; Ali Polatel <hawking@gentoo.org>
+  +files/python-2.6-test-cross.patch, -python-2.5.2-r6.ebuild,
+  +python-2.6.ebuild:
+  Version bump. Drop old.
 
 *python-2.5.2-r8 (19 Sep 2008)
 *python-2.4.4-r15 (19 Sep 2008)
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 7c684e2cb3fb..8095ac398368 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -8,32 +8,34 @@ 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.6-test-cross.patch 914 RMD160 1f421b5565d39a24b887e85cbecaf3857741f756 SHA1 9c05fbe28aac6373f24317db5c277bc4549dde0c SHA256 8264f6ffe5aedcce67bea00b0346e5416a5486da2229bf82fe748d87ec65c4de
 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
 AUX python-updater-r1 8785 RMD160 a395283fc17565fc9bc68e59928c74aafe3f19e5 SHA1 6d6f2d44bf20a528693d017b99f45541ae535bf5 SHA256 850bce6c25b33fbc05da98387bf7bd8652d4d6af4c8a7c11b4956e26a84a86b6
 DIST Python-2.4.4.tar.bz2 8158073 RMD160 4c7b5b70178fe69881b62201ef0bab55037d8708 SHA1 9e0971f93df8acbd947378d0d16a32fcc8897ba2 SHA256 325fdc7351a08bd8d811e7fb53c41bff11764648ab1a671abd910afec946b38a
 DIST Python-2.5.2.tar.bz2 9807597 RMD160 b23b02739833e6730799c5866e2b77aae884b63f SHA1 4755d212f50af704c20224a6966e23acc5aea60f SHA256 f2f80e2a62a039e9a1ffa0fdf58707b2d12b3ff33c56472b46bb6d53f45e083e
+DIST Python-2.6.tar.bz2 10957859 RMD160 68c8867b10bd547e78a27825132570d96aa850f2 SHA1 1a7d60009e72605ddd638f35a5bfe99b4ede6823 SHA256 12e0b278af0f4d741949d2567c8627ae99739be544e510e30dce3f9acbb5a6ff
 DIST python-gentoo-patches-2.4.4-r11.tar.bz2 22397 RMD160 d805a16f1e719c06f0d9b81482e126a4e266fbc5 SHA1 3270e797c8dfb84aa5bf564de63523552e14f821 SHA256 84ea076ad06e20578e1c97337d98afe3abb0e69518a7cc814841fd34f29ec71c
 DIST python-gentoo-patches-2.4.4-r12.tar.bz2 22595 RMD160 ec9a60d0ddaa1ad5e971d6d57d672f61e41611ca SHA1 b27188459902e055c79a59f16aea9803fb5e5a8c SHA256 267bebdcdb9446b4943c6a745cf437ff585ca8fac0c2706ab16ef8175029cc23
 DIST python-gentoo-patches-2.4.4-r3.tar.bz2 8348 RMD160 e9b59a7cd1469668d43a41d396d7a275bef78270 SHA1 16373b922895d1c14ccfa9d6b39079f2d5a2bcb6 SHA256 1c81397312136625fc220db660f701d4eccbde75e74bb40a0d77015b4d5d4f9f
 DIST python-gentoo-patches-2.4.4-r4.tar.bz2 9569 RMD160 2e618e2bf8d0d9d1e722f60b6b781af8906b1750 SHA1 f2253df5b52350fdfbd06054597814d705c088c5 SHA256 a5e9783a4ad57c60f91e3f943f4ff60dcb9b2eb64aa9226598bff9658473781e
-DIST python-gentoo-patches-2.5.2-r6.tar.bz2 27737 RMD160 1b2a6bb3e913941dec3c5d9e3af0b1a8ffe29ac5 SHA1 5888108a36ea55e911486a8407c26e61c12b0ec8 SHA256 d86531a671a41a65663f8b26c2cd2f8757badd365ecbac9836bb2a6022b546d3
 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.6.tar.bz2 7164 RMD160 c852e0d0c40c86d4971ef8805587abd59662e51f SHA1 1019d46f0fa2f96fad43d0314a627161549c4804 SHA256 093be2499fe5adc2591b5d7c1eeb9cdd5863cd6454461297110018e8229218ca
 EBUILD python-2.4.4-r14.ebuild 10535 RMD160 2ffd582459366ed94366ee2398f03482082d1f1b SHA1 2a02a4188ea4afd2b64a365446b15456219f18f9 SHA256 924509ba7408b306d4b97b5285f5be27e5748197e3d05fb3fe306e93f4aa300a
 EBUILD python-2.4.4-r15.ebuild 10526 RMD160 d6db686fade20f364e3ed0b938dcaab4061f8986 SHA1 41331f2aa675b2c6b60032b8977a176d2c54aa86 SHA256 8c6ea644c7ff3dc667cfe3de1a7f31517c651d14214f013407624a1ee410bd54
 EBUILD python-2.4.4-r5.ebuild 10353 RMD160 2e84fa53221be1417bcbfac063fadb8177f7997f SHA1 457badd502adf3e2e82454dde04902e9f930829e SHA256 c2fd3fb136d0855ebf4e92fec8487770b4d1ee1c1f9a93c7a59e012487d45ea4
 EBUILD python-2.4.4-r6.ebuild 10354 RMD160 4237041263cf6516bb1d62b070d92d47dc53fd87 SHA1 392f2af04382fe8db2ea674d54f40a3e5703c48d SHA256 dfae0111133299b0ad1665aeeb9d1b59ef72ad0ba38c1242b600cf709cbea9b6
-EBUILD python-2.5.2-r6.ebuild 10396 RMD160 9c22f554b8d57c682aa7253ca3177c3c71c96e7b SHA1 82358065e50458b79193fd01d40ef26d9b641a74 SHA256 5064c0d590e3869db6af2af6779b667afc5bca28c38693c4921151663e794c7a
 EBUILD python-2.5.2-r7.ebuild 10394 RMD160 51d68b1aeeb6708a5ee6806d6dc826a8d905d5be SHA1 cc08331d6e7a376aea74ac13f3b0d93c53de80d9 SHA256 af0fb9858660a2cb6bbaa42b785b7400832e5a4aa76e25f9453f98254e84c673
 EBUILD python-2.5.2-r8.ebuild 10387 RMD160 499b986533d9487dcff8c362ad5784df69cbaf29 SHA1 fb2f0250e7887f9d9331ec358daea791b871b350 SHA256 696b6fc1b31d491d76a14450af4f91e0124379704a8670a9d62ccdd757a69809
-MISC ChangeLog 60895 RMD160 f24e39588c52ef3e9c7488a931486e79a2eeb685 SHA1 d181f590831072b80c71340e54726c50fbc7e31b SHA256 e74264779338c87f2f0cf820675ab0f42345b881893a7b0336bbbf75b67909d7
+EBUILD python-2.6.ebuild 8761 RMD160 84f8a849de5a835e1f6b2b0476ee438c36ffc84c SHA1 d9169b5a0c6b6f6aef840f03c13ce279805b6c25 SHA256 eae6cd55d497e65e89f927c28fe7b66fb176ee6dabf77a3157873b0e0065fcef
+MISC ChangeLog 61082 RMD160 bdf4b04b311d9cd0f19819316a789a3f762d7b60 SHA1 b0e8b59cbb6deae101ed8625d3a70ac6d5a40822 SHA256 333ba78314f5a313c69f53a52492bcc649fca168b9d6be00138d34bf57b9e7c2
 MISC metadata.xml 490 RMD160 b919b92704616b974d1da46bfea1f03c7ea50330 SHA1 d1901bc18d0aa431b05fccfe13f2f87ab2aa9e18 SHA256 765be0142679faeeaf01cfa489424c3af08ad38ed627e6a7246b4a6f96f2dffa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkjUqGUACgkQQU4yORhF8iAsfACfSV+CHXALBEtgOKc9IyesFowI
-pYsAoKLb6YglDXDY9uVmDvBzWln7CFs9
-=Tu+K
+iEYEARECAAYFAkjoEI0ACgkQQU4yORhF8iAeFwCgkWByBBuXjBopm4/trX43fbi4
+h2AAniybKvZK2lIzv0vupDvYqIGvn+UB
+=3NyQ
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/python/files/python-2.6-test-cross.patch b/dev-lang/python/files/python-2.6-test-cross.patch
new file mode 100644
index 000000000000..0ff41939ad72
--- /dev/null
+++ b/dev-lang/python/files/python-2.6-test-cross.patch
@@ -0,0 +1,19 @@
+--- Lib/test/test_multibytecodec.py.orig	2008-04-19 18:48:59.000000000 +0300
++++ Lib/test/test_multibytecodec.py	2008-04-19 18:49:44.000000000 +0300
+@@ -212,11 +212,11 @@
+         uni = u':hu4:unit\xe9 de famille'
+         self.assertEqual(iso2022jp2.decode('iso2022-jp-2'), uni)
+ 
+-    def test_iso2022_jp_g0(self):
+-        self.failIf('\x0e' in u'\N{SOFT HYPHEN}'.encode('iso-2022-jp-2'))
+-        for encoding in ('iso-2022-jp-2004', 'iso-2022-jp-3'):
+-            e = u'\u3406'.encode(encoding)
+-            self.failIf(filter(lambda x: x >= '\x80', e))
++    #def test_iso2022_jp_g0(self):
++    #    self.failIf('\x0e' in u'\N{SOFT HYPHEN}'.encode('iso-2022-jp-2'))
++    #    for encoding in ('iso-2022-jp-2004', 'iso-2022-jp-3'):
++    #        e = u'\u3406'.encode(encoding)
++    #        self.failIf(filter(lambda x: x >= '\x80', e))
+ 
+     def test_bug1572832(self):
+         if sys.maxunicode >= 0x10000:
diff --git a/dev-lang/python/python-2.5.2-r6.ebuild b/dev-lang/python/python-2.6.ebuild
index cf1bdcef0963..306000b1198e 100644
--- a/dev-lang/python/python-2.5.2-r6.ebuild
+++ b/dev-lang/python/python-2.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.2-r6.ebuild,v 1.3 2008/09/14 14:01:28 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.ebuild,v 1.1 2008/10/05 00:55:31 hawking Exp $
 
 # NOTE about python-portage interactions :
 # - Do not add a pkg_setup() check for a certain version of portage
@@ -9,7 +9,7 @@
 
 EAPI=1
 
-inherit eutils autotools flag-o-matic python multilib versionator toolchain-funcs alternatives libtool
+inherit eutils autotools flag-o-matic python multilib versionator toolchain-funcs libtool
 
 # we need this so that we don't depends on python.eclass
 PYVER_MAJOR=$(get_major_version)
@@ -21,25 +21,25 @@ S="${WORKDIR}/${MY_P}"
 
 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}-r6.tar.bz2"
+SRC_URI="http://www.python.org/ftp/python/2.6/${MY_P}.tar.bz2
+	mirror://gentoo/python-gentoo-patches-${PV}.tar.bz2"
 
 LICENSE="PSF-2.2"
-SLOT="2.5"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~sparc-fbsd x86 ~x86-fbsd"
+SLOT="2.6"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
 IUSE="ncurses gdbm ssl readline tk berkdb bootstrap ipv6 build ucs2 sqlite doc +threads examples elibc_uclibc wininst"
 
 # NOTE: dev-python/{elementtree,celementtree,pysqlite,ctypes,cjkcodecs}
 #       do not conflict with the ones in python proper. - liquidx
 
-DEPEND=">=sys-libs/zlib-1.1.3
+DEPEND=">=app-admin/eselect-python-20080630
+	>=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 ) )
+		berkdb? ( >=sys-libs/db-3.1 )
 		gdbm? ( sys-libs/gdbm )
 		ssl? ( dev-libs/openssl )
 		doc? ( dev-python/python-docs:2.5 )
@@ -59,7 +59,7 @@ src_unpack() {
 	if tc-is-cross-compiler ; then
 		[[ $(python -V 2>&1) != "Python ${PV}" ]] && \
 			die "Crosscompiling requires the same host and build versions."
-		epatch "${FILESDIR}"/python-2.4.4-test-cross.patch
+		epatch "${FILESDIR}"/python-2.6-test-cross.patch
 	else
 		rm "${WORKDIR}/${PV}"/*_all_crosscompile.patch
 	fi
@@ -100,7 +100,7 @@ src_configure() {
 		use gdbm     || disable="${disable} gdbm"
 		use ncurses  || disable="${disable} _curses _curses_panel"
 		use readline || disable="${disable} readline"
-		use sqlite   || disable="${disable} _sqlite3"
+		use sqlite   || disable="${disable} sqlite3"
 		use ssl      || export PYTHON_DISABLE_SSL=1
 		use tk       || disable="${disable} _tkinter"
 		export PYTHON_DISABLE_MODULES="${disable}"
@@ -121,11 +121,6 @@ src_compile() {
 	   use hardened && replace-flags -O3 -O2
 	fi
 
-	# See #228905
-	if [[ $(gcc-major-version) -ge 4 ]]; then
-		append-flags -fwrapv
-	fi
-
 	export OPT="${CFLAGS}"
 
 	local myconf
@@ -183,6 +178,7 @@ src_install() {
 	mv "${D}"/usr/bin/python${PYVER}-config "${D}"/usr/bin/python-config-${PYVER}
 
 	# Fix slotted collisions
+	mv "${D}"/usr/bin/2to3 "${D}"/usr/bin/2to3-${PYVER}
 	mv "${D}"/usr/bin/pydoc "${D}"/usr/bin/pydoc${PYVER}
 	mv "${D}"/usr/bin/idle "${D}"/usr/bin/idle${PYVER}
 	mv "${D}"/usr/share/man/man1/python.1 \
@@ -223,15 +219,7 @@ src_install() {
 }
 
 pkg_postrm() {
-	local mansuffix=$(ecompress --suffix)
-	python_makesym
-	alternatives_auto_makesym "/usr/bin/idle" "idle[0-9].[0-9]"
-	alternatives_auto_makesym "/usr/bin/pydoc" "pydoc[0-9].[0-9]"
-	alternatives_auto_makesym "/usr/bin/python-config" \
-								"python-config-[0-9].[0-9]"
-
-	alternatives_auto_makesym "/usr/share/man/man1/python.1${mansuffix}" \
-								"python[0-9].[0-9].1${mansuffix}"
+	eselect python update --ignore 3.0
 
 	python_mod_cleanup /usr/lib/python${PYVER}
 	[[ "$(get_libdir)" == "lib" ]] || \
@@ -240,17 +228,10 @@ pkg_postrm() {
 
 pkg_postinst() {
 	local myroot
-	myroot=$(echo $ROOT | sed 's:/$::')
-	local mansuffix=$(ecompress --suffix)
-
-	python_makesym
-	alternatives_auto_makesym "/usr/bin/idle" "idle[0-9].[0-9]"
-	alternatives_auto_makesym "/usr/bin/pydoc" "pydoc[0-9].[0-9]"
-	alternatives_auto_makesym "/usr/bin/python-config" \
-								"python-config-[0-9].[0-9]"
+	myroot="$(echo "${ROOT}" | sed 's:/$::')"
 
-	alternatives_auto_makesym "/usr/share/man/man1/python.1${mansuffix}" \
-								"python[0-9].[0-9].1${mansuffix}"
+	eselect python update --ignore 3.0
+	python_version
 
 	python_mod_optimize
 	python_mod_optimize -x "(site-packages|test)" \
@@ -258,31 +239,6 @@ pkg_postinst() {
 	[[ "$(get_libdir)" == "lib" ]] || \
 		python_mod_optimize -x "(site-packages|test)" \
 							/usr/$(get_libdir)/python${PYVER}
-
-	# workaround possible python-upgrade-breaks-portage situation
-	if [ ! -f ${myroot}/usr/lib/portage/pym/portage.py ]; then
-		if [ -f ${myroot}/usr/lib/python2.3/site-packages/portage.py ]; then
-			einfo "Working around possible python-portage upgrade breakage"
-			mkdir -p ${myroot}/usr/lib/portage/pym
-			cp ${myroot}/usr/lib/python2.4/site-packages/{portage,xpak,output,cvstree,getbinpkg,emergehelp,dispatch_conf}.py ${myroot}/usr/lib/portage/pym
-			python_mod_optimize /usr/lib/portage/pym
-		fi
-	fi
-
-	echo
-	ewarn
-	ewarn "If you have just upgraded from an older version of python you will"
-	ewarn "need to run:"
-	ewarn
-	ewarn "/usr/sbin/python-updater"
-	ewarn
-	ewarn "This will automatically rebuild all the python dependent modules"
-	ewarn "to run with python-${PYVER}."
-	ewarn
-	ewarn "Your original Python is still installed and can be accessed via"
-	ewarn "/usr/bin/python2.x."
-	ewarn
-	ebeep 5
 }
 
 src_test() {
@@ -297,7 +253,7 @@ src_test() {
 
 	#skip all tests that fail during emerge but pass without emerge:
 	#(See bug# 67970)
-	local skip_tests="distutils global mimetools minidom mmap posix pyexpat sax strptime subprocess syntax tcl time urllib urllib2 webbrowser xml_etree"
+	local skip_tests="distutils global httpservers mimetools minidom mmap posix pyexpat sax strptime subprocess syntax tcl time urllib urllib2 webbrowser xml_etree"
 
 	# test_pow fails on alpha.
 	# http://bugs.python.org/issue756093