cleanup

14 files changed, 44 insertions, 617 deletions

diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog
index 8de8f4b6715c..415929ff16fb 100644
--- a/dev-lang/python/ChangeLog
+++ b/dev-lang/python/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/python
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.49 2003/11/12 15:37:56 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.50 2003/11/12 18:49:57 liquidx Exp $
+
+  12 Nov 2003; Alastair Tse <liquidx@gentoo.org> python-2.2.2-r1.ebuild,
+  python-2.2.3-r2.ebuild, python-2.2.3-r3.ebuild, python-2.2.3-r4.ebuild,
+  python-2.3.2-r1.ebuild, python-2.3.2.ebuild, files/python-updater:
+  cleanup and add warning on python-updated or PORTDIR is not set
 
   12 Nov 2003; Daniel Ahlberg <aliz@gentoo.org> python-2.2.3-r5.ebuild :
   Add a patch that adds CFLAGSFORSHARED variable to some extra modules defined in the Makefile.
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 1e54c40180b2..92fd76c3eb5e 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -1,41 +1,31 @@
-MD5 48d3de450107a8702bbd30ddfdceeed2 python-2.2.3-r3.ebuild 3488
-MD5 b5ce70d94f27185e138e67267ff416fe python-2.2.2-r1.ebuild 3123
-MD5 789d8555967a31cc0de2126fa6468fc2 python-2.2.3.ebuild 2999
-MD5 77b761a177b5943e0a0893fcbd8b0e3a python-2.2.3-r5.ebuild 4472
-MD5 a5eec23c78d6a0923c477e34ce969392 python-2.3.2-r1.ebuild 4812
-MD5 0a274212a2a49a52600b617a38bafa09 python-2.2.3-r2.ebuild 3441
-MD5 c70d578ef0b3e6358108691e8b88d458 python-2.2.2.ebuild 3027
+MD5 e28e4b722c7dc60efee9dd2ca6a85c6a ChangeLog 9705
+MD5 8145ce0144332d6caca98fa5fb648741 metadata.xml 221
 MD5 58b06d58bccd371fcbf1b781164c75a9 python-2.1.3-r1.ebuild 2345
-MD5 5806acebfc91d925f328a751fd5503e5 python-2.2.3-r4.ebuild 3491
 MD5 f7959cf61958991a7e25f83a4e8b2ff8 python-2.2.1-r5.ebuild 2912
-MD5 7c0dcd5a1aa1ec0db97cd0847faab0d7 python-2.3.2.ebuild 3675
+MD5 c70d578ef0b3e6358108691e8b88d458 python-2.2.2.ebuild 3027
 MD5 58ed89f3cc48f16f8bc96b76490e5b6a python-2.2.3-r1.ebuild 3293
-MD5 e12392431d48506d39dd55068bd3c1af ChangeLog 9419
-MD5 8145ce0144332d6caca98fa5fb648741 metadata.xml 221
-MD5 b0e12c8b4f21bea05842149e9bd5ac94 files/python-updater 7397
-MD5 5f2361b3e770981b737a9ad3d2863931 files/python-2.2.1-r5-gentoo.diff 4152
+MD5 77b761a177b5943e0a0893fcbd8b0e3a python-2.2.3-r5.ebuild 4472
+MD5 789d8555967a31cc0de2126fa6468fc2 python-2.2.3.ebuild 2999
+MD5 f56f13c053cacbd629ff8f9b3480a478 python-2.3.2-r1.ebuild 4814
+MD5 3dbbf5dfb3660eb003061a0c59f6e758 files/depreorder.py 1947
+MD5 f3f370c8d1382c1a7571cfc1cbb196d9 files/digest-python-2.1.3-r1 62
+MD5 aa73c4258e3be099345a929ad6e01665 files/digest-python-2.2.1-r5 62
 MD5 b7a6b00d8dede1534e7a5180a14542b1 files/digest-python-2.2.2 62
 MD5 f11f5d528c570ef739ea10806cebfa9f files/digest-python-2.2.3 62
-MD5 aafa57d90e8894592bdf346eedc77faa files/digest-python-2.3.2 62
+MD5 f11f5d528c570ef739ea10806cebfa9f files/digest-python-2.2.3-r1 62
+MD5 f11f5d528c570ef739ea10806cebfa9f files/digest-python-2.2.3-r5 62
+MD5 aafa57d90e8894592bdf346eedc77faa files/digest-python-2.3.2-r1 62
+MD5 5f2361b3e770981b737a9ad3d2863931 files/python-2.2.1-r5-gentoo.diff 4152
 MD5 11aa066154fe2e0a4c306124c7e5dd4a files/python-2.2.2-tk-8.4.x.patch 2997
-MD5 07398060a831f18193315973df204cbf files/python-2.2.3-gentoo_py_dontcompile.patch 732
 MD5 96d4207fb41391c70d5f02e1785c9527 files/python-2.2.3-db4.patch 1220
+MD5 7480e63a1ff3aff7eaf8718424add7f8 files/python-2.2.3-disable_modules_and_ssl.patch 1212
 MD5 9fe31aedbbc7e8ea1847ed6dd70bf15b files/python-2.2.3-fPIC.patch 767
-MD5 b530d6f9dbcf30239061be3de80932cc files/python-config-2.2 178
-MD5 201acd1cfd5124f25c58a8db3f78a502 files/python-config-2.3 178
-MD5 7808762bbf53647c7cd597be4044e9f7 files/python-2.3-gentoo_py_dontcompile.patch 478
+MD5 07398060a831f18193315973df204cbf files/python-2.2.3-gentoo_py_dontcompile.patch 732
 MD5 46588eb4b2cfdd8277153e8e6f728eca files/python-2.3-add_portage_search_path.patch 607
-MD5 7480e63a1ff3aff7eaf8718424add7f8 files/python-2.2.3-disable_modules_and_ssl.patch 1212
+MD5 7808762bbf53647c7cd597be4044e9f7 files/python-2.3-gentoo_py_dontcompile.patch 478
+MD5 2b953054102d344834597bc73b209e12 files/python-2.3.2-disable_modules_and_ssl.patch 1285
+MD5 b530d6f9dbcf30239061be3de80932cc files/python-config-2.2 178
 MD5 b530d6f9dbcf30239061be3de80932cc files/python-config-2.2.1 178
 MD5 b530d6f9dbcf30239061be3de80932cc files/python-config-2.2.2 178
-MD5 2b953054102d344834597bc73b209e12 files/python-2.3.2-disable_modules_and_ssl.patch 1285
-MD5 f3f370c8d1382c1a7571cfc1cbb196d9 files/digest-python-2.1.3-r1 62
-MD5 aa73c4258e3be099345a929ad6e01665 files/digest-python-2.2.1-r5 62
-MD5 b7a6b00d8dede1534e7a5180a14542b1 files/digest-python-2.2.2-r1 62
-MD5 f11f5d528c570ef739ea10806cebfa9f files/digest-python-2.2.3-r1 62
-MD5 f11f5d528c570ef739ea10806cebfa9f files/digest-python-2.2.3-r2 62
-MD5 f11f5d528c570ef739ea10806cebfa9f files/digest-python-2.2.3-r3 62
-MD5 f11f5d528c570ef739ea10806cebfa9f files/digest-python-2.2.3-r4 62
-MD5 f11f5d528c570ef739ea10806cebfa9f files/digest-python-2.2.3-r5 62
-MD5 aafa57d90e8894592bdf346eedc77faa files/digest-python-2.3.2-r1 62
-MD5 3dbbf5dfb3660eb003061a0c59f6e758 files/depreorder.py 1947
+MD5 201acd1cfd5124f25c58a8db3f78a502 files/python-config-2.3 178
+MD5 5179879c392872e491a5be1b97c08a85 files/python-updater 7753
diff --git a/dev-lang/python/files/digest-python-2.2.2-r1 b/dev-lang/python/files/digest-python-2.2.2-r1
deleted file mode 100644
index 39bd384a93cf..000000000000
--- a/dev-lang/python/files/digest-python-2.2.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1c1067396e5aa0299978486eb5bd1a5c Python-2.2.2.tgz 6669400
diff --git a/dev-lang/python/files/digest-python-2.2.3-r2 b/dev-lang/python/files/digest-python-2.2.3-r2
deleted file mode 100644
index 283c3d783859..000000000000
--- a/dev-lang/python/files/digest-python-2.2.3-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 169f89f318e252dac0c54dd1b165d229 Python-2.2.3.tgz 6709556
diff --git a/dev-lang/python/files/digest-python-2.2.3-r3 b/dev-lang/python/files/digest-python-2.2.3-r3
deleted file mode 100644
index 283c3d783859..000000000000
--- a/dev-lang/python/files/digest-python-2.2.3-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 169f89f318e252dac0c54dd1b165d229 Python-2.2.3.tgz 6709556
diff --git a/dev-lang/python/files/digest-python-2.2.3-r4 b/dev-lang/python/files/digest-python-2.2.3-r4
deleted file mode 100644
index 283c3d783859..000000000000
--- a/dev-lang/python/files/digest-python-2.2.3-r4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 169f89f318e252dac0c54dd1b165d229 Python-2.2.3.tgz 6709556
diff --git a/dev-lang/python/files/digest-python-2.3.2 b/dev-lang/python/files/digest-python-2.3.2
deleted file mode 100644
index 416c04df6929..000000000000
--- a/dev-lang/python/files/digest-python-2.3.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f54d7a529d444994b4b33429bbb45479 Python-2.3.2.tgz 8459427
diff --git a/dev-lang/python/files/python-updater b/dev-lang/python/files/python-updater
index 0f55929ce0aa..d0e2e8842820 100644
--- a/dev-lang/python/files/python-updater
+++ b/dev-lang/python/files/python-updater
@@ -71,6 +71,22 @@ elog() {
 }
 
 
+#
+# Sanity check
+#
+
+if [ -z "${PORTDIR}" ]; then
+	eerror "Unable to proceed. Can not find PORTDIR. Make sure the command:"
+	eerror " "
+	eerror "  portageq portdir"
+	eerror " "
+	eerror "returns a value. If it doesn't, make sure you have updated to"
+	eerror "latest portage version."
+	eerror " "
+	eerror "Report bugs to http://bugs.gentoo.org/"
+	exit 1
+fi	
+
 
 # 
 #
diff --git a/dev-lang/python/python-2.2.2-r1.ebuild b/dev-lang/python/python-2.2.2-r1.ebuild
deleted file mode 100644
index dd89f7e230a4..000000000000
--- a/dev-lang/python/python-2.2.2-r1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.2.2-r1.ebuild,v 1.3 2003/09/06 22:27:51 msterret Exp $
-
-IUSE="readline tcltk berkdb bootstrap"
-
-PYVER_MAJOR="`echo ${PV} | cut -d '.' -f 1`"
-PYVER_MINOR="`echo ${PV} | cut -d '.' -f 2`"
-PYVER="${PYVER_MAJOR}.${PYVER_MINOR}"
-
-S="${WORKDIR}/Python-${PV}"
-DESCRIPTION="A really great language"
-SRC_URI="http://www.python.org/ftp/python/${PV}/Python-${PV}.tgz"
-
-HOMEPAGE="http://www.python.org"
-LICENSE="PSF-2.2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~arm"
-
-DEPEND="virtual/glibc >=sys-libs/zlib-1.1.3
-	readline? ( >=sys-libs/readline-4.1 >=sys-libs/ncurses-5.2 )
-	berkdb? ( >=sys-libs/db-3 )
-	tcltk? ( >=dev-lang/tk-8.0 )
-	|| ( dev-libs/expat
-	     ( !build?     ( dev-libs/expat ) )
-	     ( !bootstrap? ( dev-libs/expat ) )
-	    )"
-# This is a hairy one.  Basically depend on dev-libs/expat
-# if "build" or "bootstrap" not in USE.
-
-RDEPEND="${DEPEND} dev-python/python-fchksum"
-
-# The dev-python/python-fchksum RDEPEND is needed to that this python provides
-# the functionality expected from previous pythons.
-
-PROVIDE="virtual/python"
-
-SLOT="2.2"
-
-inherit flag-o-matic
-
-src_unpack() {
-	unpack ${A}
-	einfo "Applying python-2.2.2-tk8.4.x.patch .."
-	cd ${S}; patch -p4 < ${FILESDIR}/${P}-tk-8.4.x.patch
-}
-
-src_compile() {
-	filter-flags -malign-double
-
-	[ "${ARCH}" = "hppa" ] && append-flags -fPIC
-	[ "${ARCH}" = "alpha" ] && append-flags -fPIC
-	export OPT="${CFLAGS}"
-
-	# adjust makefile to install pydoc into ${D} correctly
-	t="${S}/Makefile.pre.in"
-	cp ${t} ${t}.orig || die
-	sed 's:install-platlib.*:& --install-scripts=$(BINDIR):' ${t}.orig > ${t}
-
-	local myopts
-	#if we are creating a new build image, we remove the dependency on g++
-	if [ "`use build`" -a ! "`use bootstrap`" ]
-	then
-		myopts="--with-cxx=no"
-	fi
-
-	econf --with-fpectl \
-		--infodir='${prefix}'/share/info \
-		--mandir='${prefix}'/share/man \
-		${myopts} || die
-	emake || die "Parallel make failed"
-}
-
-src_install() {
-	dodir /usr
-	make install prefix=${D}/usr || die
-	rm -f ${D}/usr/bin/python
-	dosym python${PYVER_MAJOR} /usr/bin/python
-	dosym python${PYVER_MAJOR}.${PYVER_MINOR} /usr/bin/python${PYVER_MAJOR}
-	dodoc README
-
-	# install our own custom python-config
-	exeinto /usr/bin
-	newexe ${FILESDIR}/python-config-${PYVER} python-config
-
-	# seems like the build do not install Makefile.pre.in anymore
-	# it probably shouldn't - use DistUtils, people!
-	insinto /usr/lib/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/lib/python${PYVER}/config/Makefile
-
-	# If USE tcltk lets install idle
-	# Need to script the python version in the path
-	if use tcltk; then
-		dodir /usr/lib/python${PYVER}/tools
-		mv "${S}/Tools/idle" "${D}/usr/lib/python${PYVER}/tools/"
-		dosym /usr/lib/python${PYVER}/tools/idle/idle.py /usr/bin/idle.py
-	fi
-}
-
diff --git a/dev-lang/python/python-2.2.3-r2.ebuild b/dev-lang/python/python-2.2.3-r2.ebuild
deleted file mode 100644
index 8fdc6a0da838..000000000000
--- a/dev-lang/python/python-2.2.3-r2.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.2.3-r2.ebuild,v 1.1 2003/10/07 21:29:09 liquidx Exp $
-
-inherit flag-o-matic eutils alternatives
-
-IUSE="readline tcltk berkdb bootstrap build doc"
-
-PYVER_MAJOR="`echo ${PV%_*} | cut -d '.' -f 1`"
-PYVER_MINOR="`echo ${PV%_*} | cut -d '.' -f 2`"
-PYVER="${PYVER_MAJOR}.${PYVER_MINOR}"
-
-S="${WORKDIR}/Python-${PV}"
-DESCRIPTION="A really great language"
-SRC_URI="http://www.python.org/ftp/python/${PV%_*}/Python-${PV}.tgz"
-
-HOMEPAGE="http://www.python.org"
-LICENSE="PSF-2.2"
-KEYWORDS="~amd64 ~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~arm ~ia64"
-
-DEPEND="virtual/glibc >=sys-libs/zlib-1.1.3
-	doc? ( =dev-python/python-docs-${PV}* )
-	readline? ( >=sys-libs/readline-4.1 >=sys-libs/ncurses-5.2 )
-	berkdb? ( >=sys-libs/db-3 )
-	tcltk? ( >=dev-lang/tk-8.0 )
-	|| ( dev-libs/expat
-	     ( !build?     ( dev-libs/expat ) )
-	     ( !bootstrap? ( dev-libs/expat ) )
-	    )"
-# This is a hairy one.  Basically depend on dev-libs/expat
-# if "build" or "bootstrap" not in USE.
-
-RDEPEND="${DEPEND} dev-python/python-fchksum"
-
-# The dev-python/python-fchksum RDEPEND is needed to that this python provides
-# the functionality expected from previous pythons.
-
-PROVIDE="virtual/python"
-
-SLOT="2.2"
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/${P}-db4.patch
-	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${PN}-2.3-add_portage_search_path.patch
-}
-
-src_compile() {
-	filter-flags -malign-double
-
-	[ "${ARCH}" = "hppa" ] && append-flags -fPIC
-	[ "${ARCH}" = "alpha" ] && append-flags -fPIC
-	export OPT="${CFLAGS}"
-
-	# adjust makefile to install pydoc into ${D} correctly
-	t="${S}/Makefile.pre.in"
-	cp ${t} ${t}.orig || die
-	sed 's:install-platlib.*:& --install-scripts=$(BINDIR):' ${t}.orig > ${t}
-
-	local myopts
-	#if we are creating a new build image, we remove the dependency on g++
-	if [ "`use build`" -a ! "`use bootstrap`" ]
-	then
-		myopts="--with-cxx=no"
-	fi
-
-	# build python with threads support
-	myopts="${myopts} --with-threads"
-
-	econf --with-fpectl \
-		--infodir='${prefix}'/share/info \
-		--mandir='${prefix}'/share/man \
-		${myopts} || die
-	emake || die "Parallel make failed"
-}
-
-src_install() {
-	dodir /usr
-	make install prefix=${D}/usr || die
-
-	rm -f ${D}/usr/bin/python
-	dodoc README
-
-	# install our own custom python-config
-	exeinto /usr/bin
-	newexe ${FILESDIR}/python-config-${PYVER} python-config
-
-	# seems like the build do not install Makefile.pre.in anymore
-	# it probably shouldn't - use DistUtils, people!
-	insinto /usr/lib/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/lib/python${PYVER}/config/Makefile
-
-	# If USE tcltk lets install idle
-	# Need to script the python version in the path
-	if [ -n "`use tcltk`" ]; then
-		dodir /usr/lib/python${PYVER}/tools
-		cp -r "${S}/Tools/idle" "${D}/usr/lib/python${PYVER}/tools/"
-		dosym /usr/bin/idle.py /usr/lib/python${PYVER}/tools/idle/idle.py
-	fi
-}
-
-python_makesym() {
-	alternatives_auto_makesym "/usr/bin/python" "/usr/bin/python[0-9].[0-9]"
-	alternatives_auto_makesym "/usr/bin/python2" "/usr/bin/python[0-9].[0-9]"
-}
-
-pkg_postinst() {
-	python_makesym
-}
-
-pkg_postrm() {
-	python_makesym
-}
diff --git a/dev-lang/python/python-2.2.3-r3.ebuild b/dev-lang/python/python-2.2.3-r3.ebuild
deleted file mode 100644
index df3afae66f5a..000000000000
--- a/dev-lang/python/python-2.2.3-r3.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.2.3-r3.ebuild,v 1.1 2003/10/17 07:22:21 liquidx Exp $
-
-inherit flag-o-matic eutils python
-
-IUSE="readline tcltk berkdb bootstrap build doc"
-
-PYVER_MAJOR="`echo ${PV%_*} | cut -d '.' -f 1`"
-PYVER_MINOR="`echo ${PV%_*} | cut -d '.' -f 2`"
-PYVER="${PYVER_MAJOR}.${PYVER_MINOR}"
-
-S="${WORKDIR}/Python-${PV}"
-DESCRIPTION="A really great language"
-SRC_URI="http://www.python.org/ftp/python/${PV%_*}/Python-${PV}.tgz"
-
-HOMEPAGE="http://www.python.org"
-LICENSE="PSF-2.2"
-KEYWORDS="~amd64 ~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~arm ~ia64"
-
-DEPEND="virtual/glibc >=sys-libs/zlib-1.1.3
-	doc? ( =dev-python/python-docs-${PV}* )
-	readline? ( >=sys-libs/readline-4.1 >=sys-libs/ncurses-5.2 )
-	berkdb? ( >=sys-libs/db-3 )
-	tcltk? ( >=dev-lang/tk-8.0 )
-	|| ( dev-libs/expat
-	     ( !build?     ( dev-libs/expat ) )
-	     ( !bootstrap? ( dev-libs/expat ) )
-	    )"
-# This is a hairy one.  Basically depend on dev-libs/expat
-# if "build" or "bootstrap" not in USE.
-
-RDEPEND="${DEPEND} dev-python/python-fchksum"
-
-# The dev-python/python-fchksum RDEPEND is needed to that this python provides
-# the functionality expected from previous pythons.
-
-PROVIDE="virtual/python"
-
-SLOT="2.2"
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/${P}-db4.patch
-	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${PN}-2.3-add_portage_search_path.patch
-	epatch ${FILESDIR}/${PN}-2.2.3-gentoo_py_dontcompile.patch
-}
-
-src_compile() {
-	filter-flags -malign-double
-
-	[ "${ARCH}" = "hppa" ] && append-flags -fPIC
-	[ "${ARCH}" = "alpha" ] && append-flags -fPIC
-	export OPT="${CFLAGS}"
-
-	# adjust makefile to install pydoc into ${D} correctly
-	t="${S}/Makefile.pre.in"
-	cp ${t} ${t}.orig || die
-	sed 's:install-platlib.*:& --install-scripts=$(BINDIR):' ${t}.orig > ${t}
-
-	local myopts
-	#if we are creating a new build image, we remove the dependency on g++
-	if [ "`use build`" -a ! "`use bootstrap`" ]
-	then
-		myopts="--with-cxx=no"
-	fi
-
-	# build python with threads support
-	myopts="${myopts} --with-threads"
-
-	econf --with-fpectl \
-		--infodir='${prefix}'/share/info \
-		--mandir='${prefix}'/share/man \
-		${myopts} || die
-	emake || die "Parallel make failed"
-}
-
-src_install() {
-	dodir /usr
-	make install prefix=${D}/usr || die
-
-	rm -f ${D}/usr/bin/python
-	dodoc README
-
-	# install our own custom python-config
-	exeinto /usr/bin
-	newexe ${FILESDIR}/python-config-${PYVER} python-config
-
-	# seems like the build do not install Makefile.pre.in anymore
-	# it probably shouldn't - use DistUtils, people!
-	insinto /usr/lib/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/lib/python${PYVER}/config/Makefile
-
-	# If USE tcltk lets install idle
-	# Need to script the python version in the path
-	if [ -n "`use tcltk`" ]; then
-		dodir /usr/lib/python${PYVER}/tools
-		cp -r "${S}/Tools/idle" "${D}/usr/lib/python${PYVER}/tools/"
-		dosym /usr/bin/idle.py /usr/lib/python${PYVER}/tools/idle/idle.py
-	fi
-}
-
-pkg_postinst() {
-	python_makesym
-	PYTHON_OVERRIDE_PYVER="2.2" python_mod_optimize
-	PYTHON_OVERRIDE_PYVER="2.2" python_mod_optimize -x site-packages ${ROOT}usr/lib/python${SLOT}
-}
-
-pkg_postrm() {
-	python_makesym
-	python_mod_cleanup
-}
diff --git a/dev-lang/python/python-2.2.3-r4.ebuild b/dev-lang/python/python-2.2.3-r4.ebuild
deleted file mode 100644
index b439179d2298..000000000000
--- a/dev-lang/python/python-2.2.3-r4.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.2.3-r4.ebuild,v 1.2 2003/10/26 15:58:01 pythonhead Exp $
-
-inherit flag-o-matic eutils python
-
-IUSE="readline tcltk berkdb bootstrap build doc"
-
-PYVER_MAJOR="`echo ${PV%_*} | cut -d '.' -f 1`"
-PYVER_MINOR="`echo ${PV%_*} | cut -d '.' -f 2`"
-PYVER="${PYVER_MAJOR}.${PYVER_MINOR}"
-
-S="${WORKDIR}/Python-${PV}"
-DESCRIPTION="A really great language"
-SRC_URI="http://www.python.org/ftp/python/${PV%_*}/Python-${PV}.tgz"
-
-HOMEPAGE="http://www.python.org"
-LICENSE="PSF-2.2"
-KEYWORDS="~amd64 ~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~arm ~ia64"
-
-DEPEND="virtual/glibc >=sys-libs/zlib-1.1.3
-	doc? ( =dev-python/python-docs-${PV}* )
-	readline? ( >=sys-libs/readline-4.1 >=sys-libs/ncurses-5.2 )
-	berkdb? ( >=sys-libs/db-3 )
-	tcltk? ( >=dev-lang/tk-8.0 )
-	|| ( dev-libs/expat
-	     ( !build?     ( dev-libs/expat ) )
-	     ( !bootstrap? ( dev-libs/expat ) )
-	    )"
-# This is a hairy one.  Basically depend on dev-libs/expat
-# if "build" or "bootstrap" not in USE.
-
-RDEPEND="${DEPEND} dev-python/python-fchksum"
-
-# The dev-python/python-fchksum RDEPEND is needed to that this python provides
-# the functionality expected from previous pythons.
-
-PROVIDE="virtual/python"
-
-SLOT="2.2"
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/${P}-db4.patch
-	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${PN}-2.3-add_portage_search_path.patch
-	epatch ${FILESDIR}/${PN}-2.2.3-gentoo_py_dontcompile.patch
-}
-
-src_compile() {
-	filter-flags -malign-double
-
-	[ "${ARCH}" = "hppa" ] && append-flags -fPIC
-	[ "${ARCH}" = "alpha" ] && append-flags -fPIC
-	export OPT="${CFLAGS}"
-
-	# adjust makefile to install pydoc into ${D} correctly
-	t="${S}/Makefile.pre.in"
-	cp ${t} ${t}.orig || die
-	sed 's:install-platlib.*:& --install-scripts=$(BINDIR):' ${t}.orig > ${t}
-
-	local myopts
-	#if we are creating a new build image, we remove the dependency on g++
-	if [ "`use build`" -a ! "`use bootstrap`" ]
-	then
-		myopts="--with-cxx=no"
-	fi
-
-	# build python with threads support
-	myopts="${myopts} --with-threads"
-
-	econf --with-fpectl \
-		--infodir='${prefix}'/share/info \
-		--mandir='${prefix}'/share/man \
-		${myopts} || die
-	emake || die "Parallel make failed"
-}
-
-src_install() {
-	dodir /usr
-	make install prefix=${D}/usr || die
-
-	rm -f ${D}/usr/bin/python
-	dodoc README
-
-	# install our own custom python-config
-	exeinto /usr/bin
-	newexe ${FILESDIR}/python-config-${PYVER} python-config
-
-	# seems like the build do not install Makefile.pre.in anymore
-	# it probably shouldn't - use DistUtils, people!
-	insinto /usr/lib/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/lib/python${PYVER}/config/Makefile
-
-	# If USE tcltk lets install idle
-	# Need to script the python version in the path
-	if [ -n "`use tcltk`" ]; then
-		dodir /usr/lib/python${PYVER}/tools
-		cp -r "${S}/Tools/idle" "${D}/usr/lib/python${PYVER}/tools/"
-		dosym /usr/lib/python${PYVER}/tools/idle/idle.py /usr/bin/idle.py
-	fi
-}
-
-pkg_postinst() {
-	python_makesym
-	PYTHON_OVERRIDE_PYVER="2.2" python_mod_optimize
-	PYTHON_OVERRIDE_PYVER="2.2" python_mod_optimize -x site-packages ${ROOT}usr/lib/python${SLOT}
-}
-
-pkg_postrm() {
-	python_makesym
-	python_mod_cleanup
-}
diff --git a/dev-lang/python/python-2.3.2-r1.ebuild b/dev-lang/python/python-2.3.2-r1.ebuild
index c3013da1b909..607ad9921cff 100644
--- a/dev-lang/python/python-2.3.2-r1.ebuild
+++ b/dev-lang/python/python-2.3.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.3.2-r1.ebuild,v 1.7 2003/11/03 20:57:50 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.3.2-r1.ebuild,v 1.8 2003/11/12 18:49:57 liquidx Exp $
 
 inherit flag-o-matic python
 
@@ -26,7 +26,7 @@ DEPEND="virtual/glibc
 	>=sys-libs/zlib-1.1.3
 	!build? ( 	tcltk? ( >=dev-lang/tk-8.0 )
 				ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) )
-				berkdb? ( >=sys-libs/db-3 )
+				berkdb? ( >=sys-libs/db-3.1 )
 				dev-libs/expat
 				sys-libs/gdbm
 				ssl? ( dev-libs/openssl )
diff --git a/dev-lang/python/python-2.3.2.ebuild b/dev-lang/python/python-2.3.2.ebuild
deleted file mode 100644
index c5fbf8008d34..000000000000
--- a/dev-lang/python/python-2.3.2.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.3.2.ebuild,v 1.1 2003/10/07 21:29:09 liquidx Exp $
-
-inherit flag-o-matic alternatives
-
-MY_PV=${PV/_rc/c}
-PYVER_MAJOR="`echo ${PV%_*} | cut -d '.' -f 1`"
-PYVER_MINOR="`echo ${PV%_*} | cut -d '.' -f 2`"
-PYVER="${PYVER_MAJOR}.${PYVER_MINOR}"
-
-S="${WORKDIR}/Python-${MY_PV}"
-DESCRIPTION="A really great language"
-SRC_URI="http://www.python.org/ftp/python/${PV%_*}/Python-${MY_PV}.tgz"
-HOMEPAGE="http://www.python.org"
-
-IUSE="readline tcltk berkdb bootstrap ipv6 cjk"
-LICENSE="PSF-2.2"
-SLOT="2.3"
-
-KEYWORDS="~x86"
-# "~ppc ~sparc ~alpha ~mips ~hppa ~arm"
-
-DEPEND="virtual/glibc
-	>=sys-libs/zlib-1.1.3
-	readline? ( >=sys-libs/readline-4.1 >=sys-libs/ncurses-5.2 )
-	berkdb? ( >=sys-libs/db-3 )
-	tcltk? ( >=dev-lang/tk-8.0 )
-	||	( dev-libs/expat
-	     ( !build?     ( dev-libs/expat ) )
-	     ( !bootstrap? ( dev-libs/expat ) )
-		)"
-# This is a hairy one.  Basically depend on dev-libs/expat
-# if "build" or "bootstrap" not in USE.
-
-RDEPEND="${DEPEND} dev-python/python-fchksum"
-
-# The dev-python/python-fchksum RDEPEND is needed to that this python provides
-# the functionality expected from previous pythons.
-
-PROVIDE="virtual/python"
-
-
-src_unpack() {
-	unpack ${A}
-	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${PN}-2.3-add_portage_search_path.patch
-}
-
-src_compile() {
-	filter-flags -malign-double
-
-	[ "${ARCH}" = "hppa" ] && append-flags -fPIC
-	[ "${ARCH}" = "alpha" ] && append-flags -fPIC
-	export OPT="${CFLAGS}"
-
-	local myconf
-	#if we are creating a new build image, we remove the dependency on g++
-	if [ "`use build`" -a ! "`use bootstrap`" ]
-	then
-		myconf="--with-cxx=no"
-	fi
-
-	# FIXME: (need to verify the consequences of this, probably breaks tkinter?)
-	# use unicode ucs4 if cjk, otherwise use ucs2.
-	use cjk \
-		&& myconf="${myconf} --enable-unicode=ucs4" \
-		|| myconf="${myconf} --enable-unicode=ucs2"
-
-	econf --with-fpectl \
-		--enable-shared \
-		`use_enable ipv6` \
-		--infodir='${prefix}'/share/info \
-		--mandir='${prefix}'/share/man \
-		--with-threads \
-		${myconf} || die
-	emake || die "Parallel make failed"
-}
-
-src_install() {
-	dodir /usr
-	make DESTDIR="${D}" altinstall  || die
-
-	# install our own custom python-config
-	exeinto /usr/bin
-	newexe ${FILESDIR}/python-config-${PV} python-config
-
-	# This stuff below 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/lib/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/lib/python${PYVER}/config/Makefile
-
-}
-
-python_makesym() {
-	alternatives_auto_makesym "/usr/bin/python" "/usr/bin/python[0-9].[0-9]"
-	alternatives_auto_makesym "/usr/bin/python2" "/usr/bin/python[0-9].[0-9]"
-}
-
-pkg_postrm() {
-	python_makesym
-}
-
-pkg_postinst() {
-	python_makesym
-
-	ewarn "If you have just upgraded from python-2.2.x you will need to run:"
-	ewarn
-	ewarn "${PORTDIR}/dev-lang/python/files/python-updater"
-	ewarn
-	ewarn "This will automatically rebuild all the python dependent modules"
-	ewarn "to run with python-2.3."
-	ewarn
-	ewarn "Python 2.2 is still installed and can be accessed via /usr/bin/python2.2."
-	ewarn "Portage-2.0.49-r8 and below will continue to use python-2.2.x, so"
-	ewarn "think twice about uninstalling it otherwise your system will break."
-}