3 files changed, 8 insertions, 344 deletions
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 15e9a68..da31959 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -1,30 +1,21 @@
+AUX python-config-2.4 179 RMD160 087417fb7080be00cf62381d5e16fb4e4cb4538f SHA1 3ffffc6e4f4c7b774135f2635601b92a5b13e259 SHA256 86b87546be79ee6027df70046b33808b64921eea71618c81810e6b1280604221
+MD5 d74e7f0fd47f00e8b3fe7ca36b7eb629 files/python-config-2.4 179
+RMD160 087417fb7080be00cf62381d5e16fb4e4cb4538f files/python-config-2.4 179
+SHA256 86b87546be79ee6027df70046b33808b64921eea71618c81810e6b1280604221 files/python-config-2.4 179
 AUX python-updater-r1 8780 RMD160 e4e11a2f39d704bd91d6c78be1dd1cce024575af SHA1 4a7871d51f0d3c3dfafc823d26c46105573e3fb4 SHA256 5c2479244ebf6521d6ff833923058d56c793d55b60a3fcc3e5264b0b71119d46
 MD5 cfed36069ba81aebdae8f7e547b65d0a files/python-updater-r1 8780
 RMD160 e4e11a2f39d704bd91d6c78be1dd1cce024575af files/python-updater-r1 8780
 SHA256 5c2479244ebf6521d6ff833923058d56c793d55b60a3fcc3e5264b0b71119d46 files/python-updater-r1 8780
-DIST Python-2.4.3.tar.bz2 8005915 RMD160 c86247554975e6c44f91d05e44e68e280d5244dc SHA1 d6b81e1aec0045b5acff99676f2abe303da1b384 SHA256 c9b3bbc52fa18c6dba7a8c3481fa7de98187c9978749241395305f252134ba2c
 DIST Python-2.5c1.tar.bz2 9355537 RMD160 664f132bfa442657737c8ae3360160c05e748e3f SHA1 ad487ae0917f1f02ce492ca2ad7e12f5795fd53f SHA256 f54e9ed517f7015737547db3188701e0384d9b4c4b59723073b164a3f2873908
-DIST python-gentoo-patches-2.4.3.tar.bz2 8440 RMD160 3ac6277af81d95c011d3b0177c80a617c4a4951e SHA1 c4e9b752ad2ab456309b9baaf16e0b8e1db433b7 SHA256 c57ed86ab6657469c87080015bcba62d955619e882e53b6d75d7df4fc7e9973f
 DIST python-gentoo-patches-2.5.tar.bz2 5183 RMD160 89098f891a76a1ada98352b275d46e4c53086fe3 SHA1 983496edff67af25cb522103f56026ba3a4392bb SHA256 4ea6e5e6a4c43e7e550dbe363d0a3486e74259875b3079a73452f12791d9349f
-EBUILD python-2.4.3-r2.ebuild 10386 RMD160 3b148cf4794025b42b9e13544325922ea31b0627 SHA1 666b7a0968b65842bd42f511ee169482d83423b7 SHA256 e1f32ddaaf9c8c50e77933d0c9613a7bf784c2a335c687d5b98f4d0a1ce679cc
-MD5 8dc5db78f3a9c48a56bdfc812c078ed2 python-2.4.3-r2.ebuild 10386
-RMD160 3b148cf4794025b42b9e13544325922ea31b0627 python-2.4.3-r2.ebuild 10386
-SHA256 e1f32ddaaf9c8c50e77933d0c9613a7bf784c2a335c687d5b98f4d0a1ce679cc python-2.4.3-r2.ebuild 10386
-EBUILD python-2.5_rc1.ebuild 10516 RMD160 cc58c81b086f4f2a95b7218a1b455a0a3c74ce18 SHA1 13f9bbb13f8657f5009c8523d6484628bd00dd1f SHA256 295faa8e12869f7418f159cee2799a1a9eca9dfb0fa7bbb15e0ea28a7643831d
-MD5 8999557aef2929089ffbcee248039b93 python-2.5_rc1.ebuild 10516
-RMD160 cc58c81b086f4f2a95b7218a1b455a0a3c74ce18 python-2.5_rc1.ebuild 10516
-SHA256 295faa8e12869f7418f159cee2799a1a9eca9dfb0fa7bbb15e0ea28a7643831d python-2.5_rc1.ebuild 10516
+EBUILD python-2.5_rc1.ebuild 10525 RMD160 5bbeaa3b20bbcc851986c2087fd0ac642ab71353 SHA1 3fc45a0505d81228b66dc1891c842d2c333a7593 SHA256 6681906bdbb7f5c3ded2d5f3b2c0bed11d4565e049defe81e189e28cf31b2b42
+MD5 cf6625bf6da01e3fbb18a7cb9b782942 python-2.5_rc1.ebuild 10525
+RMD160 5bbeaa3b20bbcc851986c2087fd0ac642ab71353 python-2.5_rc1.ebuild 10525
+SHA256 6681906bdbb7f5c3ded2d5f3b2c0bed11d4565e049defe81e189e28cf31b2b42 python-2.5_rc1.ebuild 10525
 MISC ChangeLog 211 RMD160 77886c696f38431ca65222471d628e94ae12ae11 SHA1 756e398275bb53d8eb725c9608b068595643a54a SHA256 4652602442c2b23d1d4c43b4bb142d67828e5f24db2b70a42d40b71f0e457f95
 MD5 248a8252a6fd542dc45bf366f34393de ChangeLog 211
 RMD160 77886c696f38431ca65222471d628e94ae12ae11 ChangeLog 211
 SHA256 4652602442c2b23d1d4c43b4bb142d67828e5f24db2b70a42d40b71f0e457f95 ChangeLog 211
-MISC python-2.5_rc1.ebuild~ 10515 RMD160 61afe130978cc898c9de4e58155f5d4c2ac97611 SHA1 14794f5b126303d1cbfe683db0fa863c92782747 SHA256 87acb507b2276ec9adbca490cb2ffcbd475103387a4e19ba50f3b088364aac20
-MD5 13fb5fc63abd83cec882566c522972fa python-2.5_rc1.ebuild~ 10515
-RMD160 61afe130978cc898c9de4e58155f5d4c2ac97611 python-2.5_rc1.ebuild~ 10515
-SHA256 87acb507b2276ec9adbca490cb2ffcbd475103387a4e19ba50f3b088364aac20 python-2.5_rc1.ebuild~ 10515
-MD5 d3a76a6022ab5c6d40ae0ef9ff922a52 files/digest-python-2.4.3-r2 524
-RMD160 f1cea1edb417f82b066c689678182a3eb324bb83 files/digest-python-2.4.3-r2 524
-SHA256 8a0e91bf588722007cfcd8d902ac7d2f3a7468cf011c5045b479ec6a9ade6a24 files/digest-python-2.4.3-r2 524
 MD5 85f90f241285cf7235887ee97ba01a40 files/digest-python-2.5_rc1 518
 RMD160 9ca0c5c113e8532ef98265057c8e4f1250d8b50a files/digest-python-2.5_rc1 518
 SHA256 90e07d345ac2c58e919434d059e0fce8166426a370500f83c8de9603aa82bcee files/digest-python-2.5_rc1 518
diff --git a/dev-lang/python/files/digest-python-2.4.3-r2 b/dev-lang/python/files/digest-python-2.4.3-r2
deleted file mode 100644
index dd13414..0000000
--- a/dev-lang/python/files/digest-python-2.4.3-r2
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 141c683447d5e76be1d2bd4829574f02 Python-2.4.3.tar.bz2 8005915
-RMD160 c86247554975e6c44f91d05e44e68e280d5244dc Python-2.4.3.tar.bz2 8005915
-SHA256 c9b3bbc52fa18c6dba7a8c3481fa7de98187c9978749241395305f252134ba2c Python-2.4.3.tar.bz2 8005915
-MD5 4a9f21f4e0819dd040ccd38f57f69a94 python-gentoo-patches-2.4.3.tar.bz2 8440
-RMD160 3ac6277af81d95c011d3b0177c80a617c4a4951e python-gentoo-patches-2.4.3.tar.bz2 8440
-SHA256 c57ed86ab6657469c87080015bcba62d955619e882e53b6d75d7df4fc7e9973f python-gentoo-patches-2.4.3.tar.bz2 8440
diff --git a/dev-lang/python/python-2.4.3-r2.ebuild b/dev-lang/python/python-2.4.3-r2.ebuild
deleted file mode 100644
index dc3c4af..0000000
--- a/dev-lang/python/python-2.4.3-r2.ebuild
+++ /dev/null
@@ -1,321 +0,0 @@
-# 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.3-r1.ebuild,v 1.12 2006/07/20 17:25:17 blubb 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 x86 ~x86-fbsd"
-KEYWORDS="~x86 -amd64"
-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
-
-	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."
-}