add same fix to python-2.3

3 files changed, 24 insertions, 19 deletions

diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 76ca32dccf7f..bd4228e01654 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -8,9 +8,9 @@ MD5 58ed89f3cc48f16f8bc96b76490e5b6a python-2.2.3-r1.ebuild 3293
 MD5 0a274212a2a49a52600b617a38bafa09 python-2.2.3-r2.ebuild 3441
 MD5 48d3de450107a8702bbd30ddfdceeed2 python-2.2.3-r3.ebuild 3488
 MD5 5806acebfc91d925f328a751fd5503e5 python-2.2.3-r4.ebuild 3491
-MD5 95fff3a43254a9f6a6958dedc1bf6911 python-2.2.3-r5.ebuild 4243
+MD5 e86255b53d02856c0cdc7246cf8fe6ad python-2.2.3-r5.ebuild 4242
 MD5 789d8555967a31cc0de2126fa6468fc2 python-2.2.3.ebuild 2999
-MD5 4873f7a83ccc1983bc8020aa5ead0425 python-2.3.2-r1.ebuild 4745
+MD5 2eaad101b70fbb9ba84c57908ecbab1b python-2.3.2-r1.ebuild 4794
 MD5 7c0dcd5a1aa1ec0db97cd0847faab0d7 python-2.3.2.ebuild 3675
 MD5 3dbbf5dfb3660eb003061a0c59f6e758 files/depreorder.py 1947
 MD5 f3f370c8d1382c1a7571cfc1cbb196d9 files/digest-python-2.1.3-r1 62
diff --git a/dev-lang/python/python-2.2.3-r5.ebuild b/dev-lang/python/python-2.2.3-r5.ebuild
index c365626118e4..d64f79ebf25b 100644
--- a/dev-lang/python/python-2.2.3-r5.ebuild
+++ b/dev-lang/python/python-2.2.3-r5.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.3-r5.ebuild,v 1.3 2003/11/03 20:21:47 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.2.3-r5.ebuild,v 1.4 2003/11/03 20:30:45 liquidx Exp $
 
 inherit flag-o-matic eutils python
 
@@ -86,7 +86,7 @@ src_compile() {
 	fi
 
 	src_configure
-	
+
 	# build python with threads support
 	myopts="${myopts} --with-threads"
 
diff --git a/dev-lang/python/python-2.3.2-r1.ebuild b/dev-lang/python/python-2.3.2-r1.ebuild
index c4b85c7c1d93..9e63508f43e7 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.5 2003/11/03 03:31:19 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.3.2-r1.ebuild,v 1.6 2003/11/03 20:30:45 liquidx Exp $
 
 inherit flag-o-matic python
 
@@ -51,20 +51,7 @@ src_unpack() {
 	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${PN}-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}"
-
-	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
-
+src_configure() {
 	# disable extraneous modules with extra dependencies
 	if [ -n "`use build`" ]; then
 		export PYTHON_DISABLE_MODULES="readline pyexpat dbm gdbm bsddb _socket _curses _curses_panel _tkinter"
@@ -82,6 +69,23 @@ src_compile() {
 			|| export PYTHON_DISABLE_SSL=1
 		export PYTHON_DISABLE_MODULES
 	fi
+}
+
+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
+
+	src_configure
 
 	# FIXME: (need to verify the consequences of this, probably breaks tkinter?)
 	# use unicode ucs4 if cjk, otherwise use ucs2.
@@ -101,6 +105,7 @@ src_compile() {
 
 src_install() {
 	dodir /usr
+	src_configure
 	make DESTDIR="${D}" altinstall  || die
 
 	# install our own custom python-config