Fix building of Python 2.6.2-r1 with USE=-threads (bug #282518). Fix building with USE=build or USE=-xml (bug #282259). Small updates.

(Portage version: 14154-svn/cvs/Linux x86_64)

3 files changed, 21 insertions, 14 deletions

diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog
index 2c6d47ba3352..aa813b76661f 100644
--- a/dev-lang/python/ChangeLog
+++ b/dev-lang/python/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/python
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.404 2009/08/21 01:53:28 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.405 2009/08/25 01:26:59 arfrever Exp $
+
+  25 Aug 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  python-2.6.2-r1.ebuild, python-3.1.1.ebuild:
+  Fix building of Python 2.6.2-r1 with USE=-threads (bug #282518). Fix
+  building with USE=build or USE=-xml (bug #282259). Small updates.
 
   21 Aug 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   python-2.5.4-r3.ebuild, python-2.6.2-r1.ebuild, python-3.1.1.ebuild:
diff --git a/dev-lang/python/python-2.6.2-r1.ebuild b/dev-lang/python/python-2.6.2-r1.ebuild
index 3f4b07874790..de7968db7f05 100644
--- a/dev-lang/python/python-2.6.2-r1.ebuild
+++ b/dev-lang/python/python-2.6.2-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.6.2-r1.ebuild,v 1.7 2009/08/21 01:53:28 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.2-r1.ebuild,v 1.8 2009/08/25 01:26:59 arfrever Exp $
 
 # NOTE about python-portage interactions :
 # - Do not add a pkg_setup() check for a certain version of portage
@@ -19,7 +19,7 @@ PYVER="${PYVER_MAJOR}.${PYVER_MINOR}"
 MY_P="Python-${PV}"
 S="${WORKDIR}/${MY_P}"
 
-PATCHSET_REVISION="2"
+PATCHSET_REVISION="3"
 
 DESCRIPTION="Python is an interpreted, interactive, object-oriented programming language."
 HOMEPAGE="http://www.python.org/"
@@ -94,7 +94,7 @@ src_prepare() {
 src_configure() {
 	# Disable extraneous modules with extra dependencies.
 	if use build; then
-		export PYTHON_DISABLE_MODULES="dbm bsddb gdbm _curses _curses_panel readline _sqlite3 _tkinter pyexpat"
+		export PYTHON_DISABLE_MODULES="dbm bsddb gdbm _curses _curses_panel readline _sqlite3 _tkinter _elementtree pyexpat"
 		export PYTHON_DISABLE_SSL="1"
 	else
 		# dbm module can be linked against berkdb or gdbm.
@@ -108,7 +108,7 @@ src_configure() {
 		use sqlite   || disable+=" _sqlite3"
 		use ssl      || export PYTHON_DISABLE_SSL="1"
 		use tk       || disable+=" _tkinter"
-		use xml      || disable+=" pyexpat"
+		use xml      || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
 		export PYTHON_DISABLE_MODULES="${disable}"
 
 		if ! use xml; then
@@ -235,14 +235,15 @@ src_install() {
 	sed -e "s:^OPT=.*:OPT=-DNDEBUG:" -i "${D}usr/$(get_libdir)/python${PYVER}/config/Makefile"
 
 	if use build; then
-		rm -fr "${D}usr/$(get_libdir)/python${PYVER}/"{bsddb/test,email,encodings,lib-tk,test}
+		rm -fr "${D}usr/$(get_libdir)/python${PYVER}/"{bsddb,email,encodings,lib-tk,sqlite3,test}
 	else
 		use elibc_uclibc && rm -fr "${D}usr/$(get_libdir)/python${PYVER}/"{bsddb/test,test}
-		use berkdb || rm -fr "${D}usr/$(get_libdir)/python${PYVER}/bsddb"
+		use berkdb || rm -fr "${D}usr/$(get_libdir)/python${PYVER}/"{bsddb,test/test_bsddb*}
+		use sqlite || rm -fr "${D}usr/$(get_libdir)/python${PYVER}/"{sqlite3,test/test_sqlite*}
 		use tk || rm -fr "${D}usr/$(get_libdir)/python${PYVER}/lib-tk"
 	fi
 
-	use sqlite || rm -fr "${D}usr/$(get_libdir)/python${PYVER}/"{sqlite3,test/test_sqlite.py*}
+	use threads || rm -fr "${D}usr/$(get_libdir)/python${PYVER}/multiprocessing"
 
 	prep_ml_includes usr/include/python${PYVER}
 
diff --git a/dev-lang/python/python-3.1.1.ebuild b/dev-lang/python/python-3.1.1.ebuild
index 7aeb5653e238..db92b298cfdc 100644
--- a/dev-lang/python/python-3.1.1.ebuild
+++ b/dev-lang/python/python-3.1.1.ebuild
@@ -1,6 +1,6 @@
 # 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-3.1.1.ebuild,v 1.3 2009/08/21 01:53:29 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.1.1.ebuild,v 1.4 2009/08/25 01:27:00 arfrever Exp $
 
 EAPI="2"
 
@@ -81,7 +81,7 @@ src_prepare() {
 src_configure() {
 	# Disable extraneous modules with extra dependencies.
 	if use build; then
-		export PYTHON_DISABLE_MODULES="gdbm _curses _curses_panel readline _sqlite3 _tkinter pyexpat"
+		export PYTHON_DISABLE_MODULES="gdbm _curses _curses_panel readline _sqlite3 _tkinter _elementtree pyexpat"
 		export PYTHON_DISABLE_SSL="1"
 	else
 		local disable
@@ -91,7 +91,7 @@ src_configure() {
 		use sqlite   || disable+=" _sqlite3"
 		use ssl      || export PYTHON_DISABLE_SSL="1"
 		use tk       || disable+=" _tkinter"
-		use xml      || disable+=" pyexpat"
+		use xml      || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
 		export PYTHON_DISABLE_MODULES="${disable}"
 
 		if ! use xml; then
@@ -219,13 +219,14 @@ src_install() {
 	sed -e "s:^OPT=.*:OPT=-DNDEBUG:" -i "${D}usr/$(get_libdir)/python${PYVER}/config/Makefile"
 
 	if use build; then
-		rm -fr "${D}usr/$(get_libdir)/python${PYVER}/"{email,encodings,test,tkinter}
+		rm -fr "${D}usr/$(get_libdir)/python${PYVER}/"{email,encodings,sqlite3,test,tkinter}
 	else
 		use elibc_uclibc && rm -fr "${D}usr/$(get_libdir)/python${PYVER}/test"
-		use tk || rm -fr "${D}usr/$(get_libdir)/python${PYVER}/"{tkinter,test/test_tk.py*}
+		use sqlite || rm -fr "${D}usr/$(get_libdir)/python${PYVER}/"{sqlite3,test/test_sqlite*}
+		use tk || rm -fr "${D}usr/$(get_libdir)/python${PYVER}/"{tkinter,test/test_tk*}
 	fi
 
-	use sqlite || rm -fr "${D}usr/$(get_libdir)/python${PYVER}/"{sqlite3,test/test_sqlite.py*}
+	use threads || rm -fr "${D}usr/$(get_libdir)/python${PYVER}/multiprocessing"
 
 	prep_ml_includes usr/include/python${PYVER}