Version bump (bug #266596).

Package-Manager: portage-13355-svn/cvs/Linux x86_64

3 files changed, 278 insertions, 2 deletions

diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog
index 39ddb3d680f5..83e1ead42b9d 100644
--- a/dev-lang/python/ChangeLog
+++ b/dev-lang/python/ChangeLog
@@ -1,6 +1,12 @@
 # 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.372 2009/04/18 17:05:06 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.373 2009/04/18 19:57:15 arfrever Exp $
+
+*python-2.6.2 (18 Apr 2009)
+
+  18 Apr 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  +python-2.6.2.ebuild:
+  Version bump (bug #266596).
 
   18 Apr 2009; Tobias Klausmann <klausman@gentoo.org>
   python-2.5.4-r2.ebuild:
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index ea24cf7f6821..2c221cd4052d 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -19,6 +19,7 @@ DIST Python-2.4.4.tar.bz2 8158073 RMD160 4c7b5b70178fe69881b62201ef0bab55037d870
 DIST Python-2.5.2.tar.bz2 9807597 RMD160 b23b02739833e6730799c5866e2b77aae884b63f SHA1 4755d212f50af704c20224a6966e23acc5aea60f SHA256 f2f80e2a62a039e9a1ffa0fdf58707b2d12b3ff33c56472b46bb6d53f45e083e
 DIST Python-2.5.4.tar.bz2 9821313 RMD160 3a76c83464c3b1c38a60351ab054e33ac7195663 SHA1 0f2e819d6381f72f26c734e00a6780b3933ea404 SHA256 bc8d896a2bfe5523ba93b8d89b71017b74e8e6cb21dc676a0ccff668c8780110
 DIST Python-2.6.1.tar.bz2 10960385 RMD160 497dafaca9c150fca611b0175eeb13c2fc4d3e2d SHA1 419f0cb29e9713ea861dde8c43d107c51329e57b SHA256 cf153f10ba6312a8303ceb01bed834a2786d28aa89c7d73dba64714f691628f6
+DIST Python-2.6.2.tar.bz2 11156901 RMD160 85fa3540cbacf4d0547d2381eb3aa76bef35c2e1 SHA1 125d4ed90f82de1d44f288150bbbda23a6cd27a4 SHA256 a1cdc4a8f6c1f947ea3b87d097af2db4371019bac941d92c3844124c5694328b
 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
@@ -28,6 +29,7 @@ DIST python-gentoo-patches-2.5.2-r7.tar.bz2 28160 RMD160 c2a8c71f464f1cf0cd8e3d1
 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 19474 RMD160 00bb0918414db251b11b7f19a9f8a112c9e49fbd SHA1 fd4955f7da3049abecc4df0e203e783a90390cf8 SHA256 6e050dd8e8a90655bf935af99ad1ae6456bc072f075ddb9bcd532201bbb37274
 DIST python-gentoo-patches-2.6-r5.tar.bz2 7431 RMD160 dbfc0715773446614843b45818d4152ca133140a SHA1 495cbfbf333052faf6860cf2d682f249a787557c SHA256 ef81eac97d933c77afcfd2434f44132717cd0a1550d1092e388e3c2f3dd5f3cf
+DIST python-gentoo-patches-2.6.2.tar.bz2 8848 RMD160 e3cf700fd8966a6bd6e3e4b64534b72e56863819 SHA1 e073af86f27db77d2eb396ff78814f2b8920811b SHA256 9178be1a77893dc2c74e40073095bbc560d02e5456f1e6be6da20930470950f7
 EBUILD python-2.4.4-r14.ebuild 10746 RMD160 4c5e1215ad1756eeab64bbe52ef88ffdcb0479e2 SHA1 11632c551e32b0e7bce17b8dfc4eb7b3a5785b53 SHA256 4061e0b5b64ee751e2e97d5a60e274e3834151d764f7d3a88a3aae4a90e9b0bf
 EBUILD python-2.4.4-r15.ebuild 10743 RMD160 1df6ba576dfd3b0a5eb25b5b29a0dbedf53c483e SHA1 8c43ac03cdbbf6e91b7a9e7eec766cbf4f2f59ae SHA256 1a4515d15197601c56f27a0f9b4d206dff67ed8a02472b5c046dd04e6977a24a
 EBUILD python-2.4.4-r5.ebuild 10577 RMD160 9beeae06b88a2fb12d55a8a3e40e0444b4d7c382 SHA1 91c46a25e45ef7d87c69426cfeee1f4b4ac28287 SHA256 cf164d816a56fdc6ebd9f4482a03cc574e1c7429f4cab4a2002796d678576899
@@ -37,5 +39,6 @@ EBUILD python-2.5.2-r8.ebuild 10797 RMD160 8f30ee723f9371f4fe228a188248d6aa8140a
 EBUILD python-2.5.4-r2.ebuild 10702 RMD160 e2f70fef54761f3f13949712b4907ae4e4f00e45 SHA1 480c617512bec0b8a7b271c208e21821b3b73547 SHA256 de8ba777756e301a92c197a36ca6b4ef779d09e452c53ef65e5b6f105f253ce1
 EBUILD python-2.6-r5.ebuild 8673 RMD160 a31253b0e9d63b26efddca049735d4f6c397e278 SHA1 7eacac6e7bddec1cd006a7325786017b2f96c055 SHA256 f0af14b61269f6e107b8ace0d4bc6e4a45a9d11db7ad1ffb23b0e939c9e2621f
 EBUILD python-2.6.1-r1.ebuild 8892 RMD160 2bcba3f34cd70c0c437b1aab1a9467460e5fcbd6 SHA1 b0eb25add1739c64fc8ccee9336d5b57648a54d7 SHA256 ec9be9ecf92198948ab745af808da55af1dee935d7e79813a7d73004f1ae6a3d
-MISC ChangeLog 66381 RMD160 cdfe82c07f8a3de53d8b565e622396e1b75479fc SHA1 84c884393d6dbdd44bfdd73a1331790b3a911951 SHA256 aa16738513fb40b4a9f9a932ab2c405dcda35e3fffca82760561208b85c34998
+EBUILD python-2.6.2.ebuild 8434 RMD160 5316ce9620302704cbe61059a192d22e1f2ad7c5 SHA1 7be851d906745eea0c9b3dc5f86767151aea2b1a SHA256 221d09d6a988ce01158aa53d7d04ff37462f1341b8dfe0d7ad39f1a1bc64ecc5
+MISC ChangeLog 66538 RMD160 1d0afacb3cd386e3848767d31ec5c6c93255ca56 SHA1 c6f2732811055c3cfb897ba82713eda6367af677 SHA256 be177dee6048894251a78459cd9e9cb3c441c6dd7923da7ff093c3a10ccca3b9
 MISC metadata.xml 490 RMD160 b919b92704616b974d1da46bfea1f03c7ea50330 SHA1 d1901bc18d0aa431b05fccfe13f2f87ab2aa9e18 SHA256 765be0142679faeeaf01cfa489424c3af08ad38ed627e6a7246b4a6f96f2dffa
diff --git a/dev-lang/python/python-2.6.2.ebuild b/dev-lang/python/python-2.6.2.ebuild
new file mode 100644
index 000000000000..d151c9dd6da4
--- /dev/null
+++ b/dev-lang/python/python-2.6.2.ebuild
@@ -0,0 +1,267 @@
+# 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.6.2.ebuild,v 1.1 2009/04/18 19:57:15 arfrever Exp $
+
+# NOTE about python-portage interactions :
+# - Do not add a pkg_setup() check for a certain version of portage
+#   in dev-lang/python. It _WILL_ stop people installing from
+#   Gentoo 1.4 images.
+
+EAPI=2
+
+inherit eutils autotools flag-o-matic python versionator toolchain-funcs libtool
+
+# we need this so that we don't depends on python.eclass
+PYVER_MAJOR=$(get_major_version)
+PYVER_MINOR=$(get_version_component_range 2)
+PYVER="${PYVER_MAJOR}.${PYVER_MINOR}"
+
+MY_P="Python-${PV}"
+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-2.6.2.tar.bz2"
+
+LICENSE="PSF-2.2"
+SLOT="2.6"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="berkdb build doc elibc_uclibc examples gdbm ipv6 ncurses readline sqlite ssl +threads tk ucs2 wininst +xml"
+
+# NOTE: dev-python/{elementtree,celementtree,pysqlite,ctypes,cjkcodecs}
+#       do not conflict with the ones in python proper. - liquidx
+
+DEPEND=">=app-admin/eselect-python-20080925
+	>=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-3.1 )
+		gdbm? ( sys-libs/gdbm )
+		ssl? ( dev-libs/openssl )
+		doc? ( dev-python/python-docs:2.6 )
+		xml? ( dev-libs/expat )
+	)"
+RDEPEND="${DEPEND}"
+
+# NOTE: changed RDEPEND to PDEPEND to resolve bug 88777. - kloeri
+# NOTE: added blocker to enforce correct merge order for bug 88777. - zmedico
+
+PDEPEND="${DEPEND} app-admin/python-updater"
+PROVIDE="virtual/python"
+
+src_prepare() {
+	default
+
+	if tc-is-cross-compiler ; then
+		epatch "${FILESDIR}"/python-2.5-cross-printf.patch
+		epatch "${FILESDIR}"/python-2.6-chflags-cross.patch
+		epatch "${FILESDIR}"/python-2.6-test-cross.patch
+	else
+		rm "${WORKDIR}/${PV}"/*_all_crosscompile.patch
+	fi
+
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/${PV}"
+
+	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
+		Lib/distutils/command/install.py \
+		Lib/distutils/sysconfig.py \
+		Lib/site.py \
+		Makefile.pre.in \
+		Modules/Setup.dist \
+		Modules/getpath.c \
+		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
+
+	# fix os.utime() on hppa. utimes it not supported but unfortunately reported as working - gmsoft (22 May 04)
+	# PLEASE LEAVE THIS FIX FOR NEXT VERSIONS AS IT'S A CRITICAL FIX !!!
+	[ "${ARCH}" = "hppa" ] && sed -e 's/utimes //' -i "${S}"/configure
+
+	if ! use wininst; then
+		# remove microsoft windows executables
+		rm Lib/distutils/command/wininst-*.exe
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	# disable extraneous modules with extra dependencies
+	if use build; then
+		export PYTHON_DISABLE_MODULES="readline pyexpat dbm gdbm bsddb _curses _curses_panel _tkinter _sqlite3"
+		export PYTHON_DISABLE_SSL=1
+	else
+		# dbm module can link to berkdb or gdbm
+		# defaults to gdbm when both are enabled, #204343
+		local disable
+		use berkdb   || use gdbm || disable="${disable} dbm"
+		use berkdb   || disable="${disable} bsddb"
+		use xml      || disable="${disable} pyexpat"
+		use gdbm     || disable="${disable} gdbm"
+		use ncurses  || disable="${disable} _curses _curses_panel"
+		use readline || disable="${disable} readline"
+		use sqlite   || disable="${disable} _sqlite3"
+		use ssl      || export PYTHON_DISABLE_SSL=1
+		use tk       || disable="${disable} _tkinter"
+		export PYTHON_DISABLE_MODULES="${disable}"
+	fi
+
+	if use !xml; then
+		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"
+
+	export OPT="${CFLAGS}"
+
+	local myconf
+
+	# super-secret switch. don't use this unless you know what you're
+	# doing. enabling UCS2 support will break your existing python
+	# modules
+	use ucs2 \
+		&& myconf="${myconf} --enable-unicode=ucs2" \
+		|| myconf="${myconf} --enable-unicode=ucs4"
+
+	filter-flags -malign-double
+
+	# Seems to no longer be necessary
+	#[ "${ARCH}" = "amd64" ] && append-flags -fPIC
+	[ "${ARCH}" = "alpha" ] && append-flags -fPIC
+
+	# http://bugs.gentoo.org/show_bug.cgi?id=50309
+	if is-flag -O3; then
+	   is-flag -fstack-protector-all && replace-flags -O3 -O2
+	   use hardened && replace-flags -O3 -O2
+	fi
+
+	if tc-is-cross-compiler ; then
+		OPT="-O1" CFLAGS="" LDFLAGS="" CC="" \
+		./configure --{build,host}=${CBUILD} || die "cross-configure failed"
+		emake python Parser/pgen || die "cross-make failed"
+		mv python hostpython
+		mv Parser/pgen Parser/hostpgen
+		make distclean
+		sed -i \
+			-e '/^HOSTPYTHON/s:=.*:=./hostpython:' \
+			-e '/^HOSTPGEN/s:=.*:=./Parser/hostpgen:' \
+			Makefile.pre.in || die "sed failed"
+	fi
+
+	# export CXX so it ends up in /usr/lib/python2.x/config/Makefile
+	tc-export CXX
+
+	# set LDFLAGS so we link modules with -lpython2.6 correctly.
+	# Needed on FreeBSD unless python2.6 is already installed.
+	# Please query BSD team before removing this!
+	append-ldflags "-L."
+
+	econf \
+		--with-fpectl \
+		--enable-shared \
+		$(use_enable ipv6) \
+		$(use_with threads) \
+		--infodir='${prefix}'/share/info \
+		--mandir='${prefix}'/share/man \
+		--with-libc='' \
+		${myconf}
+}
+
+src_install() {
+	dodir /usr
+	emake DESTDIR="${D}" altinstall maninstall || die
+
+	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 \
+		"${D}"/usr/share/man/man1/python${PYVER}.1
+	rm -f "${D}"/usr/bin/smtpd.py
+
+	# Fix the OPT variable so that it doesn't have any flags listed in it.
+	# Prevents the problem with compiling things with conflicting flags later.
+	dosed -e 's:^OPT=.*:OPT=-DNDEBUG:' \
+			/usr/$(get_libdir)/python${PYVER}/config/Makefile
+
+	if use build ; then
+		rm -rf "${D}"/usr/$(get_libdir)/python${PYVER}/{test,encodings,email,lib-tk,bsddb/test}
+	else
+		use elibc_uclibc && rm -rf "${D}"/usr/$(get_libdir)/python${PYVER}/{test,bsddb/test}
+		use berkdb || rm -rf "${D}"/usr/$(get_libdir)/python${PYVER}/bsddb
+		use tk || rm -rf "${D}"/usr/$(get_libdir)/python${PYVER}/lib-tk
+	fi
+
+	prep_ml_includes usr/include/python${PYVER}
+
+	if use examples ; then
+		insinto /usr/share/doc/${PF}/examples
+		doins -r "${S}"/Tools || die "doins failed"
+	fi
+
+	newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT}
+	newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT}
+
+	# Installs empty directory.
+	rmdir "${D}"/usr/$(get_libdir)/${PN}${PYVER}/lib-old
+}
+
+pkg_postrm() {
+	eselect python update --ignore 3.0
+	python_mod_cleanup /usr/$(get_libdir)/python${PYVER}
+}
+
+pkg_postinst() {
+	eselect python update --ignore 3.0
+	python_version
+
+	python_mod_optimize -x "(site-packages|test)" \
+						/usr/$(get_libdir)/python${PYVER}
+}
+
+src_test() {
+	# Tests won't work when cross compiling
+	if tc-is-cross-compiler ; then
+		elog "Disabling tests due to crosscompiling."
+		return
+	fi
+
+	# Byte compiling should be enabled here.
+	# Otherwise test_import fails.
+	python_enable_pyc
+
+	#skip all tests that fail during emerge but pass without emerge:
+	#(See bug# 67970)
+	local skip_tests="distutils global httpservers mimetools minidom mmap posix pyexpat sax strptime subprocess syntax tcl time urllib urllib2 xml_etree"
+
+	# test_pow fails on alpha.
+	# http://bugs.python.org/issue756093
+	[[ ${ARCH} == "alpha" ]] && skip_tests="${skip_tests} pow"
+
+	for test in ${skip_tests} ; do
+		mv "${S}"/Lib/test/test_${test}.py "${T}"
+	done
+
+	# Redirect stdin from /dev/tty as a workaround for bug #248081.
+	# rerun failed tests in verbose mode (regrtest -w)
+	EXTRATESTOPTS="-w" make test < /dev/tty || die "make test failed"
+
+	for test in ${skip_tests} ; do
+		mv "${T}"/test_${test}.py "${S}"/Lib/test/test_${test}.py
+	done
+
+	elog "Portage skipped the following tests which aren't able to run from emerge:"
+	for test in ${skip_tests} ; do
+		elog "test_${test}.py"
+	done
+
+	elog "If you'd like to run them, you may:"
+	elog "cd /usr/lib/python${PYVER}/test"
+	elog "and run the tests separately."
+}