new version for python with many bugfixes

6 files changed, 118 insertions, 6 deletions

diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog
index 1bd92c8986c5..a3d32f9a2dc0 100644
--- a/dev-lang/python/ChangeLog
+++ b/dev-lang/python/ChangeLog
@@ -1,6 +1,13 @@
 # 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.26 2003/05/08 11:50:24 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.27 2003/06/02 13:03:23 liquidx Exp $
+
+*python-2.2.3 (02 Jun 2003)
+
+  02 Jun 2003; Alastair Tse <liquidx@gentoo.org> python-2.2.2-r1.ebuild,
+  python-2.2.3.ebuild, files/python-config-2.2:
+  version bump to new bugfix release. fixed python-config location for unstable
+  versions
 
 *python-2.2.2-r1 (08 May 2003)
 
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index c0f08dd460d3..d930dcd335f9 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -1,12 +1,15 @@
-MD5 77b3c329bc0bdf4ae8180eaa76a56542 ChangeLog 4827
+MD5 dc4b1d61146a0843e534756ab01aea95 ChangeLog 5069
 MD5 067b51e93b48ce7877df67399883c842 python-2.1.3-r1.ebuild 2345
-MD5 34b9eed0a2276490dbe1bf42e01b4b5d python-2.2.2-r1.ebuild 3122
+MD5 1197270783d184d8abb7d7c5e81ecaea python-2.2.2-r1.ebuild 3125
 MD5 4acba90247dbf1f810e372bbb8f11cb9 python-2.2.1-r5.ebuild 2919
+MD5 fd761cbeb4b7f9ed71ad4fb0b19a64ea python-2.2.3.ebuild 3001
 MD5 81969a1011c98f45f1996ca956156d77 python-2.2.2.ebuild 3027
 MD5 b7a6b00d8dede1534e7a5180a14542b1 files/digest-python-2.2.2-r1 62
 MD5 f3f370c8d1382c1a7571cfc1cbb196d9 files/digest-python-2.1.3-r1 62
 MD5 aa73c4258e3be099345a929ad6e01665 files/digest-python-2.2.1-r5 62
-MD5 8f455a90c3fcabda33ce44fe9c030534 files/python-2.2.2-tk-8.4.x.patch 3148
+MD5 11aa066154fe2e0a4c306124c7e5dd4a files/python-2.2.2-tk-8.4.x.patch 2997
+MD5 f11f5d528c570ef739ea10806cebfa9f files/digest-python-2.2.3 62
+MD5 b530d6f9dbcf30239061be3de80932cc files/python-config-2.2 178
 MD5 b7a6b00d8dede1534e7a5180a14542b1 files/digest-python-2.2.2 62
 MD5 5f2361b3e770981b737a9ad3d2863931 files/python-2.2.1-r5-gentoo.diff 4152
 MD5 b530d6f9dbcf30239061be3de80932cc files/python-config-2.2.1 178
diff --git a/dev-lang/python/files/digest-python-2.2.3 b/dev-lang/python/files/digest-python-2.2.3
new file mode 100644
index 000000000000..283c3d783859
--- /dev/null
+++ b/dev-lang/python/files/digest-python-2.2.3
@@ -0,0 +1 @@
+MD5 169f89f318e252dac0c54dd1b165d229 Python-2.2.3.tgz 6709556
diff --git a/dev-lang/python/files/python-config-2.2 b/dev-lang/python/files/python-config-2.2
new file mode 100644
index 000000000000..056b27125ae9
--- /dev/null
+++ b/dev-lang/python/files/python-config-2.2
@@ -0,0 +1,3 @@
+#!/usr/bin/python
+import distutils.sysconfig, string
+print "-lpython2.2 -lm -L/usr/lib/python2.2/config",string.join(string.split(distutils.sysconfig.get_config_var("MODLIBS")))
diff --git a/dev-lang/python/python-2.2.2-r1.ebuild b/dev-lang/python/python-2.2.2-r1.ebuild
index 4526106438f7..eb3130a1b510 100644
--- a/dev-lang/python/python-2.2.2-r1.ebuild
+++ b/dev-lang/python/python-2.2.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.2.2-r1.ebuild,v 1.1 2003/05/08 11:50:24 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.2.2-r1.ebuild,v 1.2 2003/06/02 13:03:23 liquidx Exp $
 
 IUSE="readline tcltk berkdb bootstrap"
 
@@ -80,7 +80,7 @@ src_install() {
 
 	# install our own custom python-config
 	exeinto /usr/bin
-	newexe ${FILESDIR}/python-config-${PV} python-config
+	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!
diff --git a/dev-lang/python/python-2.2.3.ebuild b/dev-lang/python/python-2.2.3.ebuild
new file mode 100644
index 000000000000..3f1f56d8126f
--- /dev/null
+++ b/dev-lang/python/python-2.2.3.ebuild
@@ -0,0 +1,98 @@
+# 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.ebuild,v 1.1 2003/06/02 13:03:23 liquidx 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_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}.${PYVER_MINOR} /usr/bin/python${PYVER_MAJOR}
+	dosym python${PYVER_MAJOR} /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 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
+}
+