Reduce diff against main tree for dev-lang/python

4 files changed, 80 insertions, 71 deletions

diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 642355ea3..04eb0f6a9 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -12,6 +12,6 @@ DIST Python-2.6.2.tar.bz2 11156901 RMD160 85fa3540cbacf4d0547d2381eb3aa76bef35c2
 DIST python-gentoo-patches-2.5.4-r1.tar.bz2 20485 RMD160 f8e2d19fe0ad7b2176795c159768c406d3a08801 SHA1 62565a95ab46e9bf8ac20318d1c662ce44230949 SHA256 0d502be02d16c2acdf82aba14909d8c1201091bb696456ec3542fc58466e8655
 DIST python-gentoo-patches-2.5.4.tar.bz2 19474 RMD160 00bb0918414db251b11b7f19a9f8a112c9e49fbd SHA1 fd4955f7da3049abecc4df0e203e783a90390cf8 SHA256 6e050dd8e8a90655bf935af99ad1ae6456bc072f075ddb9bcd532201bbb37274
 DIST python-gentoo-patches-2.6.2-r1.tar.bz2 9706 RMD160 8868231a1759cfeb4497c409f4aaf71329c1675f SHA1 0c48800969cf50fa93fc2657f5106d332b9d4c05 SHA256 13b40e4f9ef89b7440606d437daed8617c39219e73aa3605c5157e0f09c703df
-EBUILD python-2.5.4-r2.ebuild 10879 RMD160 7b6c6cf457995a87c35a1b099391fdca0b94dd59 SHA1 8e2e25d0d7acbca8584c72bb6761be11e51aa15d SHA256 70b58fcc55db7e66e5944e2361b9fb585a1879b722acc76b749f19649d523807
-EBUILD python-2.5.4-r3.ebuild 8774 RMD160 bbc737a3969e48a53321b27c6e098af9c514b4b5 SHA1 374429cc1912f8c88b55d88bad1b6689a9a6593b SHA256 4348cac7ddbc81c876b7a978a0c52144fc045d5a810534e753b703059faba428
-EBUILD python-2.6.2-r1.ebuild 9001 RMD160 2e1e5ed2a0bd932b04a4744aa17e0d9998c24413 SHA1 33de9b41541f67fb32a6fdbdb7d6dd4673846f70 SHA256 8155ad6c08cdac0d49383cc13a153965985dc0832cb04cb80096560195825081
+EBUILD python-2.5.4-r2.ebuild 10899 RMD160 3003905556323bdc66fe13f41515e7af99f4bcf5 SHA1 bc69076432f1169699a0a30470e86760b8b5e777 SHA256 ab9ab5d6036b23beda8cb12feb0def3d83319d6d087952e7bfe2e4d950b246ed
+EBUILD python-2.5.4-r3.ebuild 8561 RMD160 13b88af1deee9455212669fa51662ec1aeff0395 SHA1 c454d70506da4681a86e131bc7bd85ba068ce3a4 SHA256 c7cdcb73a9099cda48cc46b2a746b64157991df3c7731d6e4a23bffda238fbd1
+EBUILD python-2.6.2-r1.ebuild 8751 RMD160 4b9a0a0622826041bebd3b0647cb9f54565cfb14 SHA1 05a9ab2cc81007b4aff925a9e89184e02661fb53 SHA256 38407a1522c69df386470740876095aface506be024b54a0cb2eac15d81a33df
diff --git a/dev-lang/python/python-2.5.4-r2.ebuild b/dev-lang/python/python-2.5.4-r2.ebuild
index be6f2a0ab..ebf564e46 100644
--- a/dev-lang/python/python-2.5.4-r2.ebuild
+++ b/dev-lang/python/python-2.5.4-r2.ebuild
@@ -7,11 +7,9 @@
 #   in dev-lang/python. It _WILL_ stop people installing from
 #   Gentoo 1.4 images.
 
-EAPI=2
+EAPI=1
 
-MULTILIB_IN_SOURCE_BUILD="yes"
-
-inherit eutils autotools flag-o-matic python versionator toolchain-funcs libtool multilib-native
+inherit eutils autotools flag-o-matic python multilib versionator toolchain-funcs alternatives libtool
 
 # we need this so that we don't depends on python.eclass
 PYVER_MAJOR=$(get_major_version)
@@ -34,18 +32,18 @@ IUSE="+xml ncurses gdbm ssl readline tk berkdb ipv6 build ucs2 sqlite doc +threa
 # 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[lib32?]
+DEPEND=">=sys-libs/zlib-1.1.3
 		!build? (
-			sqlite? ( >=dev-db/sqlite-3[lib32?] )
-			tk? ( >=dev-lang/tk-8.0[lib32?] )
-			ncurses? ( >=sys-libs/ncurses-5.2[lib32?]
-						readline? ( >=sys-libs/readline-4.1[lib32?] ) )
-			berkdb? ( || ( sys-libs/db:4.5[lib32?] sys-libs/db:4.4[lib32?] sys-libs/db:4.3[lib32?]
-							sys-libs/db:4.2[lib32?] ) )
-			gdbm? ( sys-libs/gdbm[lib32?] )
-			ssl? ( dev-libs/openssl[lib32?] )
+			sqlite? ( >=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:4.5 sys-libs/db:4.4 sys-libs/db:4.3
+							sys-libs/db:4.2 ) )
+			gdbm? ( sys-libs/gdbm )
+			ssl? ( dev-libs/openssl )
 			doc? ( dev-python/python-docs:2.5 )
-		xml? ( dev-libs/expat[lib32?] )
+		xml? ( dev-libs/expat )
 	)"
 
 # NOTE: changed RDEPEND to PDEPEND to resolve bug 88777. - kloeri
@@ -54,7 +52,9 @@ DEPEND=">=sys-libs/zlib-1.1.3[lib32?]
 PDEPEND="${DEPEND} app-admin/python-updater"
 PROVIDE="virtual/python"
 
-multilib-native_src_prepare_internal() {
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
 
 	if tc-is-cross-compiler ; then
 		epatch "${FILESDIR}"/python-2.4.4-test-cross.patch \
@@ -63,7 +63,7 @@ multilib-native_src_prepare_internal() {
 		rm "${WORKDIR}/${PV}"/*_all_crosscompile.patch
 	fi
 
-	epatch "${FILESDIR}"/${P}-distutils-multilib.patch
+	#epatch "${FILESDIR}"/${P}-distutils-multilib.patch
 
 	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/${PV}"
 	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
@@ -88,7 +88,7 @@ multilib-native_src_prepare_internal() {
 	eautoreconf
 }
 
-multilib-native_src_configure_internal() {
+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"
@@ -116,7 +116,9 @@ multilib-native_src_configure_internal() {
 	fi
 
 	einfo "Disabled modules: $PYTHON_DISABLE_MODULES"
+}
 
+src_compile() {
 	filter-flags -malign-double
 
 	# Seems to no longer be necessary
@@ -145,6 +147,12 @@ multilib-native_src_configure_internal() {
 		&& myconf="${myconf} --enable-unicode=ucs2" \
 		|| myconf="${myconf} --enable-unicode=ucs4"
 
+	use threads \
+		&& myconf="${myconf} --with-threads" \
+		|| myconf="${myconf} --without-threads"
+
+	src_configure
+
 	if tc-is-cross-compiler ; then
 		OPT="-O1" CFLAGS="" LDFLAGS="" CC="" \
 		./configure --{build,host}=${CBUILD} || die "cross-configure failed"
@@ -169,20 +177,22 @@ multilib-native_src_configure_internal() {
 	econf \
 		--with-fpectl \
 		--enable-shared \
-		$(use_enable ipv6) \
-		$(use_with threads) \
+		`use_enable ipv6` \
 		--infodir='${prefix}'/share/info \
 		--mandir='${prefix}'/share/man \
 		--with-libc='' \
-		${myconf}
+		${myconf} || die
+	emake || die "Parallel make failed"
 }
 
-multilib-native_src_install_internal() {
+src_install() {
 	dodir /usr
-	emake DESTDIR="${D}" altinstall maninstall || die
+	src_configure
+	make DESTDIR="${D}" altinstall maninstall || die
 
-	mv "${D}"/usr/bin/python${PYVER}-config "${D}"/usr/bin/python-config-${PYVER}
-	if [[ $(number_abis) -gt 1 ]] && ! is_final_abi; then
+	mv "${D}"/usr/bin/python${PYVER}-config \
+		"${D}"/usr/bin/python-config-${PYVER}
+	if use lib32 && ( [[ "${ABI}" == "x86" ]] || [[ "${ABI}" == "ppc" ]] ); then
 		mv "${D}"/usr/bin/python${PYVER} "${D}"/usr/bin/python${PYVER}-${ABI}
 	fi
 
diff --git a/dev-lang/python/python-2.5.4-r3.ebuild b/dev-lang/python/python-2.5.4-r3.ebuild
index c7808592e..9174d5ded 100644
--- a/dev-lang/python/python-2.5.4-r3.ebuild
+++ b/dev-lang/python/python-2.5.4-r3.ebuild
@@ -1,19 +1,17 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.4-r3.ebuild,v 1.1 2009/05/25 17:11:18 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.4-r3.ebuild,v 1.3 2009/06/26 06:08:32 jer 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.
 
-EAPI=2
+EAPI="1"
 
-MULTILIB_IN_SOURCE_BUILD="yes"
+inherit autotools eutils flag-o-matic libtool multilib python toolchain-funcs versionator
 
-inherit eutils autotools flag-o-matic python versionator toolchain-funcs libtool multilib-native
-
-# We need this so that we don't depend on python.eclass
+# 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}"
@@ -28,32 +26,34 @@ SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.bz2
 
 LICENSE="PSF-2.2"
 SLOT="2.5"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="berkdb build doc elibc_uclibc examples gdbm ipv6 ncurses readline sqlite ssl +threads tk ucs2 wininst +xml"
 
 # NOTE: dev-python/{elementtree,celementtree,pysqlite,ctypes,cjkcodecs}
 #       do not conflict with the ones in python proper. - liquidx
 
 DEPEND=">=app-admin/eselect-python-20080925
-		>=sys-libs/zlib-1.1.3[lib32?]
+		>=sys-libs/zlib-1.1.3
 		!build? (
-			sqlite? ( >=dev-db/sqlite-3[lib32?] )
-			tk? ( >=dev-lang/tk-8.0[lib32?] )
-			ncurses? ( >=sys-libs/ncurses-5.2[lib32?]
-						readline? ( >=sys-libs/readline-4.1[lib32?] ) )
-			berkdb? ( || ( sys-libs/db:4.5[lib32?] sys-libs/db:4.4[lib32?] sys-libs/db:4.3[lib32?]
-							sys-libs/db:4.2[lib32?] ) )
-			gdbm? ( sys-libs/gdbm[lib32?] )
-			ssl? ( dev-libs/openssl[lib32?] )
+			sqlite? ( >=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:4.5 sys-libs/db:4.4 sys-libs/db:4.3
+							sys-libs/db:4.2 ) )
+			gdbm? ( sys-libs/gdbm )
+			ssl? ( dev-libs/openssl )
 			doc? ( dev-python/python-docs:${SLOT} )
-			xml? ( dev-libs/expat[lib32?] )
+			xml? ( dev-libs/expat )
 	)"
 RDEPEND="${DEPEND}"
 PDEPEND="${DEPEND} app-admin/python-updater"
 
 PROVIDE="virtual/python"
 
-multilib-native_src_prepare_internal() {
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
 
 	if tc-is-cross-compiler; then
 		epatch "${FILESDIR}"/python-2.4.4-test-cross.patch \
@@ -85,7 +85,7 @@ multilib-native_src_prepare_internal() {
 	eautoreconf
 }
 
-multilib-native_src_configure_internal() {
+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"
@@ -131,8 +131,8 @@ multilib-native_src_configure_internal() {
 
 	# 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
+	   is-flag -fstack-protector-all && replace-flags -O3 -O2
+	   use hardened && replace-flags -O3 -O2
 	fi
 
 	if tc-is-cross-compiler; then
@@ -167,12 +167,12 @@ multilib-native_src_configure_internal() {
 		${myconf}
 }
 
-multilib-native_src_compile_internal() {
+src_compile() {
 	src_configure
 	emake || die "emake failed"
 }
 
-multilib-native_src_test_internal() {
+src_test() {
 	# Tests won't work when cross compiling.
 	if tc-is-cross-compiler; then
 		elog "Disabling tests due to crosscompiling."
@@ -213,11 +213,11 @@ multilib-native_src_test_internal() {
 	elog "and run the tests separately."
 }
 
-multilib-native_src_install_internal() {
+src_install() {
 	emake DESTDIR="${D}" altinstall maninstall || die "emake altinstall maninstall failed"
 
 	mv "${D}"/usr/bin/python${PYVER}-config "${D}"/usr/bin/python-config-${PYVER}
-	if [[ $(number_abis) -gt 1 ]] && ! is_final_abi; then
+	if use lib32 && ( [[ "${ABI}" == "x86" ]] || [[ "${ABI}" == "ppc" ]] ); then
 		mv "${D}"/usr/bin/python${PYVER} "${D}"/usr/bin/python${PYVER}-${ABI}
 	fi
 
diff --git a/dev-lang/python/python-2.6.2-r1.ebuild b/dev-lang/python/python-2.6.2-r1.ebuild
index 21294c053..a56767873 100644
--- a/dev-lang/python/python-2.6.2-r1.ebuild
+++ b/dev-lang/python/python-2.6.2-r1.ebuild
@@ -9,8 +9,7 @@
 
 EAPI="2"
 
-inherit autotools eutils flag-o-matic libtool multilib python toolchain-funcs versionator multilib-native
-MULTILIB_IN_SOURCE_BUILD="yes"
+inherit autotools eutils flag-o-matic libtool multilib python toolchain-funcs versionator
 
 # We need this so that we don't depends on python.eclass
 PYVER_MAJOR=$(get_major_version)
@@ -34,24 +33,24 @@ IUSE="berkdb build doc elibc_uclibc examples gdbm ipv6 ncurses readline sqlite s
 #       do not conflict with the ones in python proper. - liquidx
 
 DEPEND=">=app-admin/eselect-python-20080925
-		>=sys-libs/zlib-1.1.3[lib32?]
+		>=sys-libs/zlib-1.1.3
 		!build? (
-			sqlite? ( >=dev-db/sqlite-3[lib32?] )
-			tk? ( >=dev-lang/tk-8.0[lib32?] )
-			ncurses? ( >=sys-libs/ncurses-5.2[lib32?]
-						readline? ( >=sys-libs/readline-4.1[lib32?] ) )
-			berkdb? ( >=sys-libs/db-3.1[lib32?] )
-			gdbm? ( sys-libs/gdbm[lib32?] )
-			ssl? ( dev-libs/openssl[lib32?] )
+			sqlite? ( >=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:${SLOT} )
-			xml? ( dev-libs/expat[lib32?] )
+			xml? ( dev-libs/expat )
 	)"
 RDEPEND="${DEPEND}"
 PDEPEND="${DEPEND} app-admin/python-updater"
 
 PROVIDE="virtual/python"
 
-multilib-native_src_prepare_internal() {
+src_prepare() {
 	if tc-is-cross-compiler; then
 		epatch "${FILESDIR}"/python-2.5-cross-printf.patch
 		epatch "${FILESDIR}"/python-2.6-chflags-cross.patch
@@ -83,7 +82,7 @@ multilib-native_src_prepare_internal() {
 	eautoreconf
 }
 
-multilib-native_src_configure_internal() {
+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"
@@ -165,7 +164,7 @@ multilib-native_src_configure_internal() {
 		${myconf}
 }
 
-multilib-native_src_test_internal() {
+src_test() {
 	# Tests won't work when cross compiling.
 	if tc-is-cross-compiler; then
 		elog "Disabling tests due to crosscompiling."
@@ -206,14 +205,14 @@ multilib-native_src_test_internal() {
 	elog "and run the tests separately."
 }
 
-multilib-native_src_install_internal() {
+src_install() {
 	# ahuemer, 20090529:
 	# -j1 was removed from python-2.6.2-r1.ebuild in portage
 	# we seem to still need it, because otherwise building fails!
-	emake -j1 DESTDIR="${D}" altinstall maninstall || die "emake altinstall maninstall failed"
+	emake DESTDIR="${D}" altinstall maninstall || die "emake altinstall maninstall failed"
 
 	mv "${D}"/usr/bin/python${PYVER}-config "${D}"/usr/bin/python-config-${PYVER}
-	if [[ $(number_abis) -gt 1 ]] && ! is_final_abi; then
+	if use lib32 && ( [[ "${ABI}" == "x86" ]] || [[ "${ABI}" == "ppc" ]] ); then
 		mv "${D}"/usr/bin/python${PYVER} "${D}"/usr/bin/python${PYVER}-${ABI}
 	fi
 
@@ -250,14 +249,14 @@ multilib-native_src_install_internal() {
 	rmdir "${D}"/usr/$(get_libdir)/${PN}${PYVER}/lib-old
 }
 
-multilib-native_pkg_postrm_internal() {
+pkg_postrm() {
 	eselect python update --ignore 3.0 --ignore 3.1
 
 	python_mod_cleanup /usr/lib/python${PYVER}
 	[[ "$(get_libdir)" != "lib" ]] && python_mod_cleanup /usr/$(get_libdir)/python${PYVER}
 }
 
-multilib-native_pkg_postinst_internal() {
+pkg_postinst() {
 	eselect python update --ignore 3.0 --ignore 3.1
 
 	python_mod_optimize -x "(site-packages|test)" /usr/lib/python${PYVER}