ebuild cleanup

Package-Manager: portage-2.1.1

5 files changed, 4 insertions, 669 deletions

diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index e6c19a804364..c85fe8ceb632 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -58,7 +58,6 @@ DIST python-gentoo-patches-2.2.3.tar.bz2 3141 RMD160 5d841c5e240eed36d0d87bb7006
 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-r2.tar.bz2 8596 RMD160 30b67d5dff65bbfbadd20a618e64e18b4d02abfe SHA1 56cc14224ca836c7c2bbd092ca1cebadd9361357 SHA256 b985d49cf09538183ea2e00dd85da583bd6b9f841983483548b580d63b0d35bb
 DIST python-gentoo-patches-2.4.3-r4.tar.bz2 9386 RMD160 5515c58b626a21a19064a142a9b95e3085b20ad1 SHA1 d10654343754026e909c74111bd96f079879b0ec SHA256 06a00ae4944fae1f0920a5cb91d973bff24b5b37d609f3ef5daaacafa6bb35fb
 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
@@ -81,10 +80,6 @@ EBUILD python-2.4.3-r1.ebuild 9605 RMD160 4f13c1093fae5226a58396ccc7ad61499661c8
 MD5 6921c681ff1bcf0d976d52cd003f8286 python-2.4.3-r1.ebuild 9605
 RMD160 4f13c1093fae5226a58396ccc7ad61499661c806 python-2.4.3-r1.ebuild 9605
 SHA256 2d8930b03179c4e04968d85397f14f67bb9338699a67a8f172c5e02cde43821f python-2.4.3-r1.ebuild 9605
-EBUILD python-2.4.3-r3.ebuild 10382 RMD160 469f51c7deeb9449707baf3f012a6eb3b80e47b4 SHA1 d8d28c91aa10ed8823e68566e4ae6a7c20584402 SHA256 d0afb252e6513aecae8ae5f4412c0d5b91b1df62a48f2fc8971be4c70dd07e20
-MD5 21d56db5d0ad69912feea6f8b39535fe python-2.4.3-r3.ebuild 10382
-RMD160 469f51c7deeb9449707baf3f012a6eb3b80e47b4 python-2.4.3-r3.ebuild 10382
-SHA256 d0afb252e6513aecae8ae5f4412c0d5b91b1df62a48f2fc8971be4c70dd07e20 python-2.4.3-r3.ebuild 10382
 EBUILD python-2.4.3-r4.ebuild 10460 RMD160 4030fb37fcb64a9b5a697338236145b1f9258119 SHA1 668b706aa6f2bf9f007134f1c097bf54ebe3a0fe SHA256 13ebfc4c319c0897bcf6d1080643d00f8585a09f27f6204cc91176542696b1dc
 MD5 dcb50d50595edf54fa153571c5ed9bd7 python-2.4.3-r4.ebuild 10460
 RMD160 4030fb37fcb64a9b5a697338236145b1f9258119 python-2.4.3-r4.ebuild 10460
@@ -93,10 +88,6 @@ EBUILD python-2.5-r1.ebuild 10511 RMD160 9ce1354cb0c508955c26a7914af54ec42471ab4
 MD5 5e795c0d222fbc679a6d5d7d8ca18b88 python-2.5-r1.ebuild 10511
 RMD160 9ce1354cb0c508955c26a7914af54ec42471ab41 python-2.5-r1.ebuild 10511
 SHA256 f64edf3e4a0b5238389b8b7770e73aa6579954801047db4f97e2d8ceca521bea python-2.5-r1.ebuild 10511
-EBUILD python-2.5.ebuild 10515 RMD160 03c02c8a5fb63b1e8332c0ed66ce262e83d70e7b SHA1 086ea0c897ab72db07725d250bddc5b93afbaa7a SHA256 8d4add08f179fda6d465577aeff78bb165405de9a268c68a0ee280b0b6463860
-MD5 a01cc70e9c618e90782f62f9007f1409 python-2.5.ebuild 10515
-RMD160 03c02c8a5fb63b1e8332c0ed66ce262e83d70e7b python-2.5.ebuild 10515
-SHA256 8d4add08f179fda6d465577aeff78bb165405de9a268c68a0ee280b0b6463860 python-2.5.ebuild 10515
 MISC ChangeLog 37376 RMD160 0bce0e6adc45ed8b6ff2ddd76214c5e363e0c6a5 SHA1 efe332856ffad637c9ded2ad24867b9ec1066d4a SHA256 ea88072c614943196754b68e73a6437d17da9abe6ecd6fadfe40a44825d845c3
 MD5 c586e19ee72285c6689d7564a6e8ce82 ChangeLog 37376
 RMD160 0bce0e6adc45ed8b6ff2ddd76214c5e363e0c6a5 ChangeLog 37376
@@ -120,22 +111,16 @@ SHA256 84a1604cd3068dbb64b089081655d703fdf811eab8c3530f15002dc6e1891f63 files/di
 MD5 663468af5f8542bf2da855f7b1440b57 files/digest-python-2.4.3-r1 533
 RMD160 83a784ec07529078f043e42567d6abd582c90ce1 files/digest-python-2.4.3-r1 533
 SHA256 accb145bcb3a651a5d68653dc2becc523343c152d45d66622a3ff6f62c1b26a8 files/digest-python-2.4.3-r1 533
-MD5 4a9be526f58df49b3ae08c7ceef43ec5 files/digest-python-2.4.3-r3 533
-RMD160 8862a23e28c03eee3f70a81ab965ded027216a5e files/digest-python-2.4.3-r3 533
-SHA256 5d035e55a4a83d7a4a7a1fc43cee5790fee0a0229de20856893e75e395a15c64 files/digest-python-2.4.3-r3 533
 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 f9b5c964d826b43c4c4e46c70c8be212 files/digest-python-2.5 521
-RMD160 2d3bf90259ffdc91332550713cabf9a36b686aba files/digest-python-2.5 521
-SHA256 dbc6e2a658c38209466d2a2cf898d619ffd50edbeabc749863af334397b8fe93 files/digest-python-2.5 521
 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
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD4DBQFFHr0ZamhnQswr0vIRAp8lAKCRJPG838PwJB3KjDg/ivTtH4TNrACYnnWB
-UdC0hDehg60vPuA8HypgZw==
-=jzqP
+iD8DBQFFIoIzuB6ZT1m7QRERAkKJAJ9pxmtWilnPAIcNQQnaH5alKsUcMACeLkpd
+lR2CkN74uNwc5Y3Tm8iRJS0=
+=MVwW
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/python/files/digest-python-2.4.3-r3 b/dev-lang/python/files/digest-python-2.4.3-r3
deleted file mode 100644
index 57db69b4803d..000000000000
--- a/dev-lang/python/files/digest-python-2.4.3-r3
+++ /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 d7f626f4fbe220ca3d48de0568cf5e55 python-gentoo-patches-2.4.3-r2.tar.bz2 8596
-RMD160 30b67d5dff65bbfbadd20a618e64e18b4d02abfe python-gentoo-patches-2.4.3-r2.tar.bz2 8596
-SHA256 b985d49cf09538183ea2e00dd85da583bd6b9f841983483548b580d63b0d35bb python-gentoo-patches-2.4.3-r2.tar.bz2 8596
diff --git a/dev-lang/python/files/digest-python-2.5 b/dev-lang/python/files/digest-python-2.5
deleted file mode 100644
index f11f8c8adb45..000000000000
--- a/dev-lang/python/files/digest-python-2.5
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 ddb7401e711354ca83b7842b733825a3 Python-2.5.tar.bz2 9357099
-RMD160 f6977a6c3d3ca54c27ad9270918237a7e6521d0b Python-2.5.tar.bz2 9357099
-SHA256 584fce420e39218312c86b6abb242a14b1b0c1d215e2667b0f491893e41cc236 Python-2.5.tar.bz2 9357099
-MD5 e14887f4fe7ac70906410f3511f76c95 python-gentoo-patches-2.5-r1.tar.bz2 5180
-RMD160 88f7f49ccea043986d837962e3a7d463302b6055 python-gentoo-patches-2.5-r1.tar.bz2 5180
-SHA256 e56145f22a8d1093a6004177ccd6ecef5e7f9b655633846ee753bd3b45eff4c6 python-gentoo-patches-2.5-r1.tar.bz2 5180
diff --git a/dev-lang/python/python-2.4.3-r3.ebuild b/dev-lang/python/python-2.4.3-r3.ebuild
deleted file mode 100644
index 2f34132517cb..000000000000
--- a/dev-lang/python/python-2.4.3-r3.ebuild
+++ /dev/null
@@ -1,320 +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-r3.ebuild,v 1.2 2006/09/12 21:10:32 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}-r2.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"
-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."
-}
diff --git a/dev-lang/python/python-2.5.ebuild b/dev-lang/python/python-2.5.ebuild
deleted file mode 100644
index ea0e38e2c3fd..000000000000
--- a/dev-lang/python/python-2.5.ebuild
+++ /dev/null
@@ -1,318 +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.5.ebuild,v 1.2 2006/09/20 00:21:07 liquidx 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 autotools 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/${PYVER}/${MY_P}.tar.bz2
-	http://dev.gentoo.org/~liquidx/files/python-gentoo-patches-${PV}-r1.tar.bz2"
-
-LICENSE="PSF-2.2"
-SLOT="2.5"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="ncurses gdbm ssl readline tk berkdb bootstrap ipv6 build ucs2 sqlite doc nocxx"
-
-# 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
-	!build? (
-		sqlite? ( !=dev-python/pysqlite-2*
-				  >=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-${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}/${PYVER}/2.5-readline.patch"
-	# db4.2 support
-	epatch "${WORKDIR}/${PYVER}/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}/${PYVER}/2.4-gentoo_py_dontcompile.patch"
-	epatch "${WORKDIR}/${PYVER}/2.4-disable_modules_and_ssl.patch"
-	epatch "${WORKDIR}/${PYVER}/2.5-mimetypes_gentoo_apache.patch"
-
-	# prepends /usr/lib/portage/pym to sys.path
-	epatch "${WORKDIR}/${PYVER}/2.4-add_portage_search_path.patch"
-
-	epatch "${WORKDIR}/${PYVER}/2.5-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
-
-	# 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}/${PYVER}/2.4.1-crosscompile.patch"
-	fi
-
-	# fix gentoo/obsd problems (bug 117261)
-	epatch "${WORKDIR}/${PYVER}/2.4.3-gentoo_obsd.patch"
-
-	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
-		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 sqlite \
-			|| PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _sqlite3"
-		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
-
-	mv ${D}/usr/bin/python${PYVER}-config ${D}/usr/bin/python-config-${PYVER}
-
-	# 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
-
-	# install python-updater in /usr/sbin
-	newsbin ${FILESDIR}/python-updater-r1 python-updater
-
-	# 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
-}
-
-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/share/man/man1/python.1.gz" \
-								"python[0-9].[0-9].1.gz"
-	alternatives_auto_makesym "/usr/bin/python-config" \
-								"python-config-[0-9].[0-9]"
-
-	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 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() {
-	# 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 webbrowser"
-
-	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."
-}