Version bump

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

4 files changed, 412 insertions, 5 deletions

diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog
index ffde3ee2c781..3b4a4524ba6c 100644
--- a/dev-lang/python/ChangeLog
+++ b/dev-lang/python/ChangeLog
@@ -1,6 +1,12 @@
 # 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.357 2008/12/09 18:46:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.358 2008/12/13 20:54:39 neurogeek Exp $
+
+*python-2.6.1 (13 Dec 2008)
+
+  13 Dec 2008; Jesus Rivero <neurogeek@gentoo.org>
+  +files/python-2.6_turkish.patch, +python-2.6.1.ebuild:
+  Version bump
 
   09 Dec 2008; Mike Frysinger <vapier@gentoo.org> python-2.5.2-r8.ebuild,
   python-2.6-r5.ebuild:
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 52f0423d98c1..d82f292f81f3 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -10,12 +10,14 @@ AUX python-2.4.2-gentoo_obsd.patch 1554 RMD160 c93e34df155440e68e7db283d709c3ef3
 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.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-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.1.tar.bz2 10960385 RMD160 497dafaca9c150fca611b0175eeb13c2fc4d3e2d SHA1 419f0cb29e9713ea861dde8c43d107c51329e57b SHA256 cf153f10ba6312a8303ceb01bed834a2786d28aa89c7d73dba64714f691628f6
 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
@@ -31,12 +33,13 @@ EBUILD python-2.4.4-r6.ebuild 10351 RMD160 82482481fce6d802c5ff55dd3582acd337711
 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.6-r5.ebuild 8453 RMD160 00cae5b31d61b9b7aa1c922d7157372185f1c930 SHA1 e95fb404f92209856a5c1965f27dd989ca688978 SHA256 74cfd7d045d7017755fa2a964c445c27a8d61f4ddec7c11b5b231c7d98c54dec
-MISC ChangeLog 63004 RMD160 35d3dc71f6db888ab9b667b0bebf22fdce6ceb04 SHA1 044205a23f55174d3c1667ccf8cec5c1ceaa483a SHA256 ceeb452990c3b1ac4069d025bb5dfd0cb61aa34d53175647e1dcb39027e77d9e
+EBUILD python-2.6.1.ebuild 8506 RMD160 7d3da31342f6eedfb52d7c18322b5d8abe9f7792 SHA1 40e756f9cc464f9354eb1abc203a9df359b66c64 SHA256 bff87457b36a217becf03260266c6a86d7d02aa9a53b4d69dfb34babd30007ec
+MISC ChangeLog 63160 RMD160 7c8bdcc3929e03f3c4f6e9a32d8f47bee87ed87a SHA1 994712f8ef0f7226ff062d8845fd4366fd357010 SHA256 2c3844978beca5d34616b8b7bef24412bbdd61d99f3780d108327fdcdcb8bb5d
 MISC metadata.xml 490 RMD160 b919b92704616b974d1da46bfea1f03c7ea50330 SHA1 d1901bc18d0aa431b05fccfe13f2f87ab2aa9e18 SHA256 765be0142679faeeaf01cfa489424c3af08ad38ed627e6a7246b4a6f96f2dffa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkk+vQ4ACgkQ67wieSYcaxeN8QCggeLkHigTHBMw+Q9oOf9375r6
-oGkAn3MRlFhh5tgSytACfbZZ8BhVSktT
-=Jc/6
+iEYEARECAAYFAklEIRwACgkQdIssYB9vBoOA1QCeLKrXse0dqSFweODXUg3cwGU3
+KuYAoINpTBDbnp9I/Zy3mkbbm64Qj7sS
+=fN+e
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/python/files/python-2.6_turkish.patch b/dev-lang/python/files/python-2.6_turkish.patch
new file mode 100644
index 000000000000..2eb50527eed7
--- /dev/null
+++ b/dev-lang/python/files/python-2.6_turkish.patch
@@ -0,0 +1,130 @@
+diff -uNr Python-2.6.1.orig/Lib/decimal.py Python-2.6.1/Lib/decimal.py
+--- Python-2.6.1.orig/Lib/decimal.py	2008-12-13 14:30:59.000000000 -0430
++++ Python-2.6.1/Lib/decimal.py	2008-12-13 14:32:59.000000000 -0430
+@@ -152,6 +152,13 @@
+ ROUND_HALF_DOWN = 'ROUND_HALF_DOWN'
+ ROUND_05UP = 'ROUND_05UP'
+ 
++import string
++
++def ascii_upper(s):
++    trans_table = string.maketrans(string.ascii_lowercase, string.ascii_uppercase)
++    return s.translate(trans_table)
++
++
+ # Errors
+ 
+ class DecimalException(ArithmeticError):
+@@ -3563,7 +3570,7 @@
+                                     if name.startswith('_round_')]
+ for name in rounding_functions:
+     # name is like _round_half_even, goes to the global ROUND_HALF_EVEN value.
+-    globalname = name[1:].upper()
++    globalname = ascii_upper(name[1:])
+     val = globals()[globalname]
+     Decimal._pick_rounding_function[val] = name
+ 
+diff -uNr Python-2.6.1.orig/Lib/email/__init__.py Python-2.6.1/Lib/email/__init__.py
+--- Python-2.6.1.orig/Lib/email/__init__.py	2008-12-13 14:30:59.000000000 -0430
++++ Python-2.6.1/Lib/email/__init__.py	2008-12-13 14:34:13.000000000 -0430
+@@ -109,15 +109,19 @@
+     'Text',
+     ]
+ 
++import string
++lower_map = string.maketrans(string.ascii_uppercase, string.ascii_lowercase)
++
++
+ for _name in _LOWERNAMES:
+-    importer = LazyImporter(_name.lower())
++    importer = LazyImporter(_name.translate(lower_map))
+     sys.modules['email.' + _name] = importer
+     setattr(sys.modules['email'], _name, importer)
+ 
+ 
+ import email.mime
+ for _name in _MIMENAMES:
+-    importer = LazyImporter('mime.' + _name.lower())
++    importer = LazyImporter('mime.' + _name.translate(lower_map))
+     sys.modules['email.MIME' + _name] = importer
+     setattr(sys.modules['email'], 'MIME' + _name, importer)
+     setattr(sys.modules['email.mime'], _name, importer)
+diff -uNr Python-2.6.1.orig/Lib/locale.py Python-2.6.1/Lib/locale.py
+--- Python-2.6.1.orig/Lib/locale.py	2008-12-13 14:30:59.000000000 -0430
++++ Python-2.6.1/Lib/locale.py	2008-12-13 14:57:18.000000000 -0430
+@@ -294,6 +294,14 @@
+ # overridden below)
+ _setlocale = setlocale
+ 
++# Avoid relying on the locale-dependent .lower() method
++# (see bug #1813).
++_ascii_lower_map = ''.join(
++    chr(x + 32 if x >= ord('A') and x <= ord('Z') else x)
++    for x in range(256)
++)
++
++
+ def normalize(localename):
+ 
+     """ Returns a normalized locale code for the given locale
+@@ -311,7 +319,7 @@
+ 
+     """
+     # Normalize the locale name and extract the encoding
+-    fullname = localename.lower()
++    fullname = localename.translate(_ascii_lower_map)
+     if ':' in fullname:
+         # ':' is sometimes used as encoding delimiter.
+         fullname = fullname.replace(':', '.')
+diff -uNr Python-2.6.1.orig/Lib/test/test_codecs.py Python-2.6.1/Lib/test/test_codecs.py
+--- Python-2.6.1.orig/Lib/test/test_codecs.py	2008-12-13 14:30:59.000000000 -0430
++++ Python-2.6.1/Lib/test/test_codecs.py	2008-12-13 14:58:33.000000000 -0430
+@@ -1,5 +1,6 @@
+ from test import test_support
+ import unittest
++import locale
+ import codecs
+ import sys, StringIO, _testcapi
+ 
+@@ -1078,6 +1079,16 @@
+         self.assertRaises(LookupError, codecs.lookup, "__spam__")
+         self.assertRaises(LookupError, codecs.lookup, " ")
+ 
++    def test_lookup_with_locale(self):
++        # Bug #1813: when normalizing codec name, lowercasing must be locale
++        # agnostic, otherwise the looked up codec name might end up wrong.
++        try:
++            locale.setlocale(locale.LC_CTYPE, 'tr')
++        except locale.Error:
++            # SKIPped test
++            return
++        codecs.lookup('ISO8859_1')
++
+     def test_getencoder(self):
+         self.assertRaises(TypeError, codecs.getencoder)
+         self.assertRaises(LookupError, codecs.getencoder, "__spam__")
+diff -uNr Python-2.6.1.orig/Python/codecs.c Python-2.6.1/Python/codecs.c
+--- Python-2.6.1.orig/Python/codecs.c	2008-12-13 14:31:00.000000000 -0430
++++ Python-2.6.1/Python/codecs.c	2008-12-13 14:59:43.000000000 -0430
+@@ -45,6 +45,12 @@
+     return -1;
+ }
+ 
++/* isupper() forced into the ASCII Locale */
++#define ascii_isupper(x) (((x) >= 0x41) && ((x) <= 0x5A))
++/* tolower() forced into the ASCII Locale */
++#define ascii_tolower(x) (ascii_isupper(x) ? ((x) + 0x20) : (x))
++
++
+ /* Convert a string to a normalized Python string: all characters are
+    converted to lower case, spaces are replaced with underscores. */
+ 
+@@ -70,7 +76,7 @@
+         if (ch == ' ')
+             ch = '-';
+         else
+-            ch = tolower(Py_CHARMASK(ch));
++            ch = ascii_tolower(Py_CHARMASK(ch));
+ 	p[i] = ch;
+     }
+     return v;
diff --git a/dev-lang/python/python-2.6.1.ebuild b/dev-lang/python/python-2.6.1.ebuild
new file mode 100644
index 000000000000..601a0b1d985d
--- /dev/null
+++ b/dev-lang/python/python-2.6.1.ebuild
@@ -0,0 +1,268 @@
+# 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.6.1.ebuild,v 1.1 2008/12/13 20:54:39 neurogeek 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/2.6.1/${MY_P}.tar.bz2
+	mirror://gentoo/python-gentoo-patches-2.6-r5.tar.bz2"
+
+LICENSE="PSF-2.2"
+SLOT="2.6"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="berkdb build doc elibc_uclibc examples +expat gdbm ipv6 ncurses readline sqlite ssl +threads tk ucs2 wininst"
+
+# 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.5 )
+		expat? ( dev-libs/expat )
+	)"
+
+# 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
+		[[ $(python -V 2>&1) != "Python ${PV}" ]] && \
+			die "Crosscompiling requires the same host and build versions."
+		epatch "${FILESDIR}"/python-2.6-test-cross.patch
+	else
+		rm "${WORKDIR}/${PYVER}"/*_all_crosscompile.patch
+	fi
+
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/${PYVER}"
+
+	epatch "${FILESDIR}/${PN}-${PYVER}_turkish.patch"
+
+	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 expat    || 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
+
+	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 || 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.5 correctly.
+	# Needed on FreeBSD unless python2.5 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
+
+	# While we're working on the config stuff... Let's fix the OPT var
+	# so that it doesn't have any opts listed in it. Prevents the problem
+	# with compiling things with conflicting opts 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}
+
+	# The stuff below this line extends from 2.1, and should be deprecated
+	# in 2.3, or possibly can wait till 2.4
+
+	# seems like the build do not install Makefile.pre.in anymore
+	# it probably shouldn't - use DistUtils, people!
+	insinto /usr/$(get_libdir)/python${PYVER}/config
+	doins "${S}"/Makefile.pre.in
+
+	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}${PV}/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 webbrowser 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
+
+	# rerun failed tests in verbose mode (regrtest -w)
+	EXTRATESTOPTS="-w" make test || 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."
+}