Version bump.
authorBryan Østergaard <kloeri@gentoo.org>
Sat, 4 Nov 2006 16:23:40 +0000 (16:23 +0000)
committerBryan Østergaard <kloeri@gentoo.org>
Sat, 4 Nov 2006 16:23:40 +0000 (16:23 +0000)
Package-Manager: portage-2.1.2_rc1-r3

dev-lang/python/ChangeLog
dev-lang/python/Manifest
dev-lang/python/files/digest-python-2.4.4 [new file with mode: 0644]
dev-lang/python/python-2.4.4.ebuild [new file with mode: 0644]

index 20b3dbb8a8dff5225416db8fedc3724b2c7674bf..232f4baf5da1948e4ac9a760e495e07fc2893fa9 100644 (file)
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/python
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.222 2006/10/18 10:55:28 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.223 2006/11/04 16:23:40 kloeri Exp $
+
+*python-2.4.4 (04 Nov 2006)
+
+  04 Nov 2006; Bryan Østergaard <kloeri@gentoo.org> +python-2.4.4.ebuild:
+  Version bump.
 
   18 Oct 2006; Roy Marples <uberlord@gentoo.org> python-2.4.3-r4.ebuild,
   python-2.5-r1.ebuild:
index ad000dded189694d0921d78963b9e3d8f439c841..9de20ef2cabec73167076f84df0569f582e2e54c 100644 (file)
@@ -50,12 +50,14 @@ DIST Python-2.1.3.tgz 6194432 RMD160 d7216480cf884507d97bf7932767871977fc1ccc SH
 DIST Python-2.2.3.tgz 6709556 RMD160 3590f813582d65194b467f4ab450e360e35eb40e SHA1 177d587e77e0eaa14131ab0d0d0b470777de4400 SHA256 a8f92e6b89d47359fff0d1fbfe47f104afc77fd1cd5143e7332758b7bc100188
 DIST Python-2.3.5.tar.bz2 7230000 RMD160 2b1fa90393f517fe02d546c037996754f65f8c89 SHA1 98bfa6257f73a3826b244047c183d933d26f4322 SHA256 1b81787c3dcae3752cadaa6be80c24e247c239ba93d91538af39b4b717e29bf4
 DIST Python-2.4.3.tar.bz2 8005915 RMD160 c86247554975e6c44f91d05e44e68e280d5244dc SHA1 d6b81e1aec0045b5acff99676f2abe303da1b384 SHA256 c9b3bbc52fa18c6dba7a8c3481fa7de98187c9978749241395305f252134ba2c
+DIST Python-2.4.4.tar.bz2 8158073 RMD160 4c7b5b70178fe69881b62201ef0bab55037d8708 SHA1 9e0971f93df8acbd947378d0d16a32fcc8897ba2 SHA256 325fdc7351a08bd8d811e7fb53c41bff11764648ab1a671abd910afec946b38a
 DIST Python-2.5.tar.bz2 9357099 RMD160 f6977a6c3d3ca54c27ad9270918237a7e6521d0b SHA1 98ce9346cc4a7ef4621ecdcfc3957d595d97a078 SHA256 584fce420e39218312c86b6abb242a14b1b0c1d215e2667b0f491893e41cc236
 DIST python-gentoo-patches-2.2.3.tar.bz2 3141 RMD160 5d841c5e240eed36d0d87bb7006d1e04feffeec1 SHA1 f2363d961311a54a3ff456987565b4b9c2ee7a41 SHA256 c913f0d72a3bd0e210a1426e7f5f1b97e03e6e20ba3ed74665001d8a2aa9ac95
 DIST python-gentoo-patches-2.3.5-r1.tar.bz2 9239 RMD160 0afe928728c2cb5c306bff261e2fbe485a554c71 SHA1 1bfc2b79fe69bed59705b5c734fe8c4af264bf7e SHA256 35e1139aa91f0ac026017928df71b21da68d8470278852e700f0b32d6c638dbf
 DIST python-gentoo-patches-2.3.5.tar.bz2 8489 RMD160 aa2860d06e0aa387c91419ed1a2bb33de14fd393 SHA1 32349bd5e0f6c3859414b4a03643dd89538792f9 SHA256 f144c5488a55599a0d0614f7c687e43106f8b6da51738296aadcec374d567237
 DIST python-gentoo-patches-2.4.3-r1.tar.bz2 8594 RMD160 0a93e8b315eefa832db92398b3f5e8da83fe3ea3 SHA1 7f20fffc6ec4273b898cda394c87929ddd939419 SHA256 295d8131b1f6c0622d92133f6e612821c2af6e1ebefe527aec8d42de49b0b1e9
 DIST python-gentoo-patches-2.4.3-r4.tar.bz2 9386 RMD160 5515c58b626a21a19064a142a9b95e3085b20ad1 SHA1 d10654343754026e909c74111bd96f079879b0ec SHA256 06a00ae4944fae1f0920a5cb91d973bff24b5b37d609f3ef5daaacafa6bb35fb
+DIST python-gentoo-patches-2.4.4.tar.bz2 8841 RMD160 4652b5f3bba59b969816c00927453e0de058663e SHA1 a1b1e8d1b80e41b503e8f49e21ea6a554f23f046 SHA256 6b6b72cd25bc854f3841361d488ab74bdf0febd5a8b73c4a92054d731cd45321
 DIST python-gentoo-patches-2.5-r1.tar.bz2 5180 RMD160 88f7f49ccea043986d837962e3a7d463302b6055 SHA1 395dd562729911815d871bf6df638a96cfa3ae1f SHA256 e56145f22a8d1093a6004177ccd6ecef5e7f9b655633846ee753bd3b45eff4c6
 EBUILD python-2.1.3-r1.ebuild 2287 RMD160 8de40c8c4dcf46ab91458318eb347eb7a683062b SHA1 20928a32586d5aeac1b1c163a61b320c46c133ee SHA256 84381bce78263edac5a361f292ac6eca52c39752483a49beb40b033a0f9d322b
 MD5 0da2c091fdb69c2fc31c6ce46011e0f0 python-2.1.3-r1.ebuild 2287
@@ -81,14 +83,18 @@ EBUILD python-2.4.3-r4.ebuild 10474 RMD160 ab223ffa37a1aff82f3bd6c18425a061350bb
 MD5 d5ed359408a83b864111bb3fdbf700eb python-2.4.3-r4.ebuild 10474
 RMD160 ab223ffa37a1aff82f3bd6c18425a061350bb9b6 python-2.4.3-r4.ebuild 10474
 SHA256 9805d222bc169d238e431db80999ebc8caa31d3ed7b961231433327b98d1ca56 python-2.4.3-r4.ebuild 10474
+EBUILD python-2.4.4.ebuild 10402 RMD160 707932d8cbf544ddd44c203531db36932aadfed9 SHA1 9bc866293c4e597d699f15a9dfa84253a360df4e SHA256 6900a9cb10ae936951e20c3e88acabcee5d6290a6fed06d4979c7fb9a7885924
+MD5 41a4e50725c75ea28a7a15683ae84318 python-2.4.4.ebuild 10402
+RMD160 707932d8cbf544ddd44c203531db36932aadfed9 python-2.4.4.ebuild 10402
+SHA256 6900a9cb10ae936951e20c3e88acabcee5d6290a6fed06d4979c7fb9a7885924 python-2.4.4.ebuild 10402
 EBUILD python-2.5-r1.ebuild 10524 RMD160 0081cb8a86052d934e5f59bc3c4f92465527c3b6 SHA1 6b4e32b6fb385fd6740cd2321c2c2a8033b2f86f SHA256 d097d9af58f1e6d07675c69227b9e5317db9f3511255536626a971715aad76e3
 MD5 095510b9ef1c5996e01d2cbfb027c9eb python-2.5-r1.ebuild 10524
 RMD160 0081cb8a86052d934e5f59bc3c4f92465527c3b6 python-2.5-r1.ebuild 10524
 SHA256 d097d9af58f1e6d07675c69227b9e5317db9f3511255536626a971715aad76e3 python-2.5-r1.ebuild 10524
-MISC ChangeLog 37505 RMD160 501b5347b166a4a4e27b9e1117108c3a0c5122e9 SHA1 5981b2f9e9fa0265f3f2884e9368194100e5acff SHA256 1bd6cde4d6699bdb67ce0d6b33992a148946ea327ec7b51b51424ddb856fc278
-MD5 32439d3373a03c1425169bbe6750043b ChangeLog 37505
-RMD160 501b5347b166a4a4e27b9e1117108c3a0c5122e9 ChangeLog 37505
-SHA256 1bd6cde4d6699bdb67ce0d6b33992a148946ea327ec7b51b51424ddb856fc278 ChangeLog 37505
+MISC ChangeLog 37624 RMD160 db9965bb0bde93e0decccbff7bbfe23e537cf383 SHA1 0c9b548e7a5ddb254f12800d9decdbf057a55153 SHA256 5ca03d53cbaff32f19317a49e123ba7cecd2e1c973ae8492097e62777e7cb37d
+MD5 c4c81cf56da20fad365347d4c35b97a5 ChangeLog 37624
+RMD160 db9965bb0bde93e0decccbff7bbfe23e537cf383 ChangeLog 37624
+SHA256 5ca03d53cbaff32f19317a49e123ba7cecd2e1c973ae8492097e62777e7cb37d ChangeLog 37624
 MISC metadata.xml 221 RMD160 dd50f32b16d6c15330ae1ee711d8a6cf8f6e3bed SHA1 85903c4affc3a23dd37e4910eb9b198cd02b242e SHA256 c14b93d19008cbeeb3312ec60b97513eef18ccfe82b8e2303cb44977ca13e3bd
 MD5 8145ce0144332d6caca98fa5fb648741 metadata.xml 221
 RMD160 dd50f32b16d6c15330ae1ee711d8a6cf8f6e3bed metadata.xml 221
@@ -111,6 +117,9 @@ SHA256 accb145bcb3a651a5d68653dc2becc523343c152d45d66622a3ff6f62c1b26a8 files/di
 MD5 4e05cc5a387fc37c07e9379dc0cec714 files/digest-python-2.4.3-r4 533
 RMD160 8126c987ee9bbfb3be21a1b89398af6f4f3deeaf files/digest-python-2.4.3-r4 533
 SHA256 44c3a05dca66b707c93b758e641e5fb9bd0bd8bdd94dd507203ea223e9e4339c files/digest-python-2.4.3-r4 533
+MD5 157069b1bc43bab782ab6724a655d6dd files/digest-python-2.4.4 524
+RMD160 ad08b16ce248a22c306361fcf0497e1c5fac5b57 files/digest-python-2.4.4 524
+SHA256 62741d3520891774e48cab7c30ba3b788a8cbc512f6655042ddc46de91ee6bc7 files/digest-python-2.4.4 524
 MD5 f9b5c964d826b43c4c4e46c70c8be212 files/digest-python-2.5-r1 521
 RMD160 2d3bf90259ffdc91332550713cabf9a36b686aba files/digest-python-2.5-r1 521
 SHA256 dbc6e2a658c38209466d2a2cf898d619ffd50edbeabc749863af334397b8fe93 files/digest-python-2.5-r1 521
diff --git a/dev-lang/python/files/digest-python-2.4.4 b/dev-lang/python/files/digest-python-2.4.4
new file mode 100644 (file)
index 0000000..1b3321e
--- /dev/null
@@ -0,0 +1,6 @@
+MD5 0ba90c79175c017101100ebf5978e906 Python-2.4.4.tar.bz2 8158073
+RMD160 4c7b5b70178fe69881b62201ef0bab55037d8708 Python-2.4.4.tar.bz2 8158073
+SHA256 325fdc7351a08bd8d811e7fb53c41bff11764648ab1a671abd910afec946b38a Python-2.4.4.tar.bz2 8158073
+MD5 6afff79bf55000eb456f4482d0f26bb0 python-gentoo-patches-2.4.4.tar.bz2 8841
+RMD160 4652b5f3bba59b969816c00927453e0de058663e python-gentoo-patches-2.4.4.tar.bz2 8841
+SHA256 6b6b72cd25bc854f3841361d488ab74bdf0febd5a8b73c4a92054d731cd45321 python-gentoo-patches-2.4.4.tar.bz2 8841
diff --git a/dev-lang/python/python-2.4.4.ebuild b/dev-lang/python/python-2.4.4.ebuild
new file mode 100644 (file)
index 0000000..6a7b618
--- /dev/null
@@ -0,0 +1,321 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.4.ebuild,v 1.1 2006/11/04 16:23:40 kloeri 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.
+
+inherit eutils flag-o-matic python multilib versionator toolchain-funcs alternatives
+
+# 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-${PV}.tar.bz2"
+
+LICENSE="PSF-2.2"
+SLOT="2.4"
+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 doc nocxx"
+
+DEPEND=">=sys-libs/zlib-1.1.3
+       !dev-python/cjkcodecs
+       !build? (
+               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-${PV}* )
+               dev-libs/expat
+       )"
+
+# NOTE: The dev-python/python-fchksum RDEPEND is needed so that this python 
+#       provides the functionality expected from previous pythons.
+
+# NOTE: python-fchksum is only a RDEPEND and not a DEPEND since we don't need
+#       it to compile python. We just need to ensure that when we install
+#       python, we definitely have fchksum support. - liquidx
+
+# NOTE: changed RDEPEND to PDEPEND to resolve bug 88777. - kloeri
+
+PDEPEND="${DEPEND}     dev-python/python-fchksum"
+
+PROVIDE="virtual/python"
+
+# confcache breaks a dlopen check, causing python to not support
+# loading .so files - marienz
+RESTRICT="confcache"
+
+src_unpack() {
+       unpack ${A}
+       cd ${S}
+
+       # unnecessary termcap dep in readline (#79013)
+       epatch ${WORKDIR}/${PV}/2.4.2-readline.patch
+       # db4.2 support
+       epatch ${WORKDIR}/${PV}/2.4.3-db4.patch
+
+       # adds support for PYTHON_DONTCOMPILE shell environment to
+       # supress automatic generation of .pyc and .pyo files - liquidx (08 Oct 03)
+       epatch ${WORKDIR}/${PV}/2.4-gentoo_py_dontcompile.patch
+       epatch ${WORKDIR}/${PV}/2.4-disable_modules_and_ssl.patch
+       epatch ${WORKDIR}/${PV}/2.4-mimetypes_apache.patch
+
+       # prepends /usr/lib/portage/pym to sys.path
+       epatch ${WORKDIR}/${PV}/2.4-add_portage_search_path.patch
+
+       einfo $(pwd)
+       epatch ${WORKDIR}/${PV}/2.4.3-libdir.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
+
+       # add support for struct stat st_flags attribute (bug 94637)
+       epatch ${WORKDIR}/${PV}/2.4.1-st_flags.patch
+
+       # 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 tc-is-cross-compiler ; then
+               epatch ${WORKDIR}/${PV}/2.4.1-crosscompile.patch
+       fi
+
+       # fix gentoo/obsd problems (bug 117261)
+       epatch ${WORKDIR}/${PV}/2.4.3-gentoo_obsd.patch
+}
+
+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"
+               export PYTHON_DISABLE_SSL=1
+       else
+               use gdbm \
+                       || PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} gdbm"
+               use berkdb \
+                       || PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} dbm bsddb"
+               use readline \
+                       || PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} readline"
+               use tk \
+                       || PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _tkinter"
+               use ncurses \
+                       || PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _curses _curses_panel"
+               use ssl \
+                       || export PYTHON_DISABLE_SSL=1
+               export PYTHON_DISABLE_MODULES
+               echo $PYTHON_DISABLE_MODULES
+       fi
+}
+
+src_compile() {
+       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
+
+       export OPT="${CFLAGS}"
+
+       local myconf
+       #if we are creating a new build image, we remove the dependency on g++
+       if use build && ! use bootstrap || use nocxx ; then
+               myconf="--with-cxx=no"
+       fi
+
+       # 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"
+
+       src_configure
+
+       if tc-is-cross-compiler ; then
+               OPT="-O1" CFLAGS="" LDFLAGS="" CC="" \
+               ./configure --with-cxx=no || 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
+       fi
+
+       # export CXX so it ends up in /usr/lib/python2.x/config/Makefile
+       tc-export CXX
+       # set LINKCC to prevent python from being linked to libstdc++.so
+       export LINKCC="\$(PURIFY) \$(CC)"
+       econf \
+               --with-fpectl \
+               --enable-shared \
+               `use_enable ipv6` \
+               --infodir='${prefix}'/share/info \
+               --mandir='${prefix}'/share/man \
+               --with-threads \
+               --with-libc='' \
+               ${myconf} || die
+       emake || die "Parallel make failed"
+}
+
+src_install() {
+       dodir /usr
+       src_configure
+       make DESTDIR="${D}" altinstall maninstall || die
+
+       # install our own custom python-config
+       exeinto /usr/bin
+       doexe ${FILESDIR}/python-config-${PYVER}
+
+       # Use correct libdir in python-config
+       dosed "s:/usr/lib/:/usr/$(get_libdir)/:" /usr/bin/python-config-${PYVER}
+
+       # install python-updater in /usr/sbin
+       newsbin ${FILESDIR}/python-updater-r1 python-updater
+
+       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
+
+       # Fix slotted collisions
+       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
+
+       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
+
+       # 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
+
+}
+
+pkg_postrm() {
+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.gz" \
+                                                               "python[0-9].[0-9].1.gz"
+
+       python_mod_cleanup /usr/lib/python${PYVER}
+       [[ "$(get_libdir)" == "lib" ]] || \
+               python_mod_cleanup /usr/$(get_libdir)/python${PYVER}
+}
+
+pkg_postinst() {
+       local myroot
+       myroot=$(echo $ROOT | sed 's:/$::')
+
+       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.gz" \
+                                                               "python[0-9].[0-9].1.gz"
+
+       python_mod_optimize
+       python_mod_optimize -x site-packages \
+                                               -x test ${myroot}/usr/lib/python${PYVER}
+       [[ "$(get_libdir)" == "lib" ]] || \
+               python_mod_optimize -x site-packages \
+                                                       -x test ${myroot}/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 ${myroot}/usr/lib/portage/pym
+               fi
+       fi
+
+       echo
+       ewarn
+       ewarn "If you have just upgraded from an older version of python you"
+       ewarn "will 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() {
+       # PYTHON_DONTCOMPILE=1 breaks test_import
+       unset PYTHON_DONTCOMPILE
+
+       #skip all tests that fail during emerge but pass without emerge:
+       #(See bug# 67970)
+       local skip_tests="distutils global mimetools minidom mmap strptime subprocess syntax tcl time urllib urllib2"
+
+       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
+
+       einfo "Portage skipped the following tests which aren't able to run from emerge:"
+       for test in ${skip_tests} ; do
+               einfo "test_${test}.py"
+       done
+
+       einfo "If you'd like to run them, you may:"
+       einfo "cd /usr/lib/python${PYVER}/test"
+       einfo "and run the tests separately."
+}