Python 2.5 series. Added +xml use flag to standarize.

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.27-gentoo-r7 i686

5 files changed, 37 insertions, 19 deletions

diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog
index eb4386b677dd..302baf384793 100644
--- a/dev-lang/python/ChangeLog
+++ b/dev-lang/python/ChangeLog
@@ -1,6 +1,10 @@
 # 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.363 2009/02/10 16:03:34 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.364 2009/02/10 16:11:57 neurogeek Exp $
+
+  10 Feb 2009; <neurogeek@gentoo.org> python-2.5.2-r7.ebuild,
+  python-2.5.2-r8.ebuild, python-2.5.4-r2.ebuild:
+  Python 2.5 series. Added +xml use flag to standarize.
 
   10 Feb 2009; <neurogeek@gentoo.org> python-2.4.4-r5.ebuild,
   python-2.4.4-r6.ebuild, python-2.4.4-r14.ebuild, python-2.4.4-r15.ebuild:
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 5335b846fd0a..2ecb010dce53 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -32,17 +32,17 @@ EBUILD python-2.4.4-r14.ebuild 10841 RMD160 ef7b763a9e4e2ebddfc6a51a4693dd5899b3
 EBUILD python-2.4.4-r15.ebuild 10838 RMD160 d088f924a5e709c1af0142b14945f7d90e823166 SHA1 7830e5cb800c40bfe8f13a8a7b5e9944753ef30e SHA256 d5d3778fe0c9149326b9d24d877058919e6795d47469d76f66d10033468a9f40
 EBUILD python-2.4.4-r5.ebuild 10672 RMD160 408c56205e74ccbb5411d9b9ad89044a4fdcc424 SHA1 b7bee7d4baabe7900dfe9b18d279b39cff7798a4 SHA256 fa39dd6b2df6d16b11e749287943b2210c717e5f6478e6a052cf10f79aef0a85
 EBUILD python-2.4.4-r6.ebuild 10673 RMD160 6df191884e31990645adbc0c9639b40dedc1ddcf SHA1 623b9bf0c962b41dde3fed1c76c3ac44fbb27e2c SHA256 9d9f1a2088bd4a9346e6bea7a8e35f94d3bfc4d16cd2564f92f96ece2ca497f0
-EBUILD python-2.5.2-r7.ebuild 10378 RMD160 f17304fa00ab72221f66061c812d2de92cf0446a SHA1 c5d7af3140b8531a4690298922827de762a861b3 SHA256 aceb0c8da6e23042b9ee599c5c35939792092676c1a6fc5127aae1853922e500
-EBUILD python-2.5.2-r8.ebuild 10570 RMD160 1a86f3b548b7cad795ad1be3696b1c3c6056c827 SHA1 34cf3268088e56dfb04a94d88b9e704c1946cbcf SHA256 1557a080890d24f64d4749323741cd313c05bcde5cf6347442fb06c200e05589
-EBUILD python-2.5.4-r2.ebuild 10734 RMD160 c5dc01e2eec904042be8f232f6146c343e5b7f67 SHA1 2cfbf7c29e1073d0cd54318bcf50a2a6f44562ca SHA256 c10ad665b357e6da43e3348d3c9463dc58f751b25c87684449b173c4593ef255
+EBUILD python-2.5.2-r7.ebuild 10637 RMD160 e295deb84bb9d1073ade2468f21a4a6762600941 SHA1 c0bcf913bd9d7139e8ef20fb72c15f08bcea05f2 SHA256 96c33dfa068b6932d0b4ab3ce22ac4560f8cd359563348e9de2de02c0fb12a74
+EBUILD python-2.5.2-r8.ebuild 10764 RMD160 71431e1a68a7ac349dade1474ec9a75fc15319ce SHA1 7974d555d440182e3761e2651f6fb0e4906f0531 SHA256 7b62176d252a1a58e17af1b8ea2e89d8f36776d2325e3c653b2ed3016faccd84
+EBUILD python-2.5.4-r2.ebuild 10670 RMD160 b65c470ce198c6ee8306acadf89b296e1b296233 SHA1 41232e3ffc51d26df930f6eac0aa3d918272e391 SHA256 11d68798169e02113382be3a05599321e5de9a3266d8c7aab525bba0567c7dba
 EBUILD python-2.6-r5.ebuild 8456 RMD160 c1e2c4c597318d36a47b1f089001de29b1e64645 SHA1 991049269f4ee57749d17a9f049e42d3bf96baf7 SHA256 b5a446068ded5c40d85cf76b0751e33912234670761a46cea717e6867a10a786
 EBUILD python-2.6.1.ebuild 8506 RMD160 3b61561c7c954c3593eb16c20ba86e10ae9d8ae2 SHA1 9060e87693b5951271d1deb3562d478096296541 SHA256 572b0c9853d59b16d452452a62a3806cabc28fc300aac17838b9ddd574496ee2
-MISC ChangeLog 64248 RMD160 0f01f4906315173d8a722881262001635933d92b SHA1 8806457aa1aa250c0b94e1706b9f87644f7b3d0e SHA256 a119f21e101447bd305ed91ecb6c090eaa69ca2e2682bc4e22227bbd62e92bb4
+MISC ChangeLog 64417 RMD160 8bb057e73e9cb893491cb4b9c46943a6a666a911 SHA1 7ed2c395731b410c734e273e77a7a658f4188e7d SHA256 05892732cf8ca484830510700c9288da63178be9417c27806be77f38eaf89f2e
 MISC metadata.xml 490 RMD160 b919b92704616b974d1da46bfea1f03c7ea50330 SHA1 d1901bc18d0aa431b05fccfe13f2f87ab2aa9e18 SHA256 765be0142679faeeaf01cfa489424c3af08ad38ed627e6a7246b4a6f96f2dffa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkmRpWkACgkQdIssYB9vBoN3IgCeP5KOGrvKTGnbyfRdak9d+774
-H+0An3oGR3cpkFZoeJDccapKQ3Bofz9e
-=KpaM
+iEYEARECAAYFAkmRp10ACgkQdIssYB9vBoMiXwCdH88xDjIG28JlyhdUuFLs2okK
+DW0An2J7dJBTEa4ArPfKdvaFT19joaPJ
+=B2BO
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/python/python-2.5.2-r7.ebuild b/dev-lang/python/python-2.5.2-r7.ebuild
index bfe780e09b0e..063b18434bee 100644
--- a/dev-lang/python/python-2.5.2-r7.ebuild
+++ b/dev-lang/python/python-2.5.2-r7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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.2-r7.ebuild,v 1.11 2008/11/04 03:27:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.2-r7.ebuild,v 1.12 2009/02/10 16:11:57 neurogeek Exp $
 
 # NOTE about python-portage interactions :
 # - Do not add a pkg_setup() check for a certain version of portage
@@ -27,7 +27,7 @@ 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"
-IUSE="ncurses gdbm ssl readline tk berkdb ipv6 build ucs2 sqlite doc +threads examples elibc_uclibc wininst"
+IUSE="ncurses gdbm ssl readline tk berkdb ipv6 build ucs2 sqlite doc +threads examples elibc_uclibc wininst +xml"
 
 # NOTE: dev-python/{elementtree,celementtree,pysqlite,ctypes,cjkcodecs}
 #       do not conflict with the ones in python proper. - liquidx
@@ -43,7 +43,7 @@ DEPEND=">=sys-libs/zlib-1.1.3
 		gdbm? ( sys-libs/gdbm )
 		ssl? ( dev-libs/openssl )
 		doc? ( dev-python/python-docs:2.5 )
-		dev-libs/expat
+		xml? ( dev-libs/expat )
 	)"
 
 # NOTE: changed RDEPEND to PDEPEND to resolve bug 88777. - kloeri
@@ -103,8 +103,16 @@ src_configure() {
 		use sqlite   || disable="${disable} _sqlite3"
 		use ssl      || export PYTHON_DISABLE_SSL=1
 		use tk       || disable="${disable} _tkinter"
+		use xml      || disable="${disable} pyexpat"
 		export PYTHON_DISABLE_MODULES="${disable}"
 	fi
+
+	if use !xml; then
+		ewarn "You have configured Python without XML support."
+		ewarn "This is NOT a recommended configuration as you"
+		ewarn "may face problems parsing any XML documents."
+	fi
+
 	einfo "Disabled modules: $PYTHON_DISABLE_MODULES"
 }
 
diff --git a/dev-lang/python/python-2.5.2-r8.ebuild b/dev-lang/python/python-2.5.2-r8.ebuild
index 118a0800a871..021eff1b8583 100644
--- a/dev-lang/python/python-2.5.2-r8.ebuild
+++ b/dev-lang/python/python-2.5.2-r8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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.2-r8.ebuild,v 1.6 2008/12/09 18:46:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.2-r8.ebuild,v 1.7 2009/02/10 16:11:57 neurogeek Exp $
 
 # NOTE about python-portage interactions :
 # - Do not add a pkg_setup() check for a certain version of portage
@@ -27,7 +27,7 @@ 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"
-IUSE="+expat ncurses gdbm ssl readline tk berkdb ipv6 build ucs2 sqlite doc +threads examples elibc_uclibc wininst"
+IUSE="+xml ncurses gdbm ssl readline tk berkdb ipv6 build ucs2 sqlite doc +threads examples elibc_uclibc wininst"
 
 # NOTE: dev-python/{elementtree,celementtree,pysqlite,ctypes,cjkcodecs}
 #       do not conflict with the ones in python proper. - liquidx
@@ -43,7 +43,7 @@ DEPEND=">=sys-libs/zlib-1.1.3
 		gdbm? ( sys-libs/gdbm )
 		ssl? ( dev-libs/openssl )
 		doc? ( dev-python/python-docs:2.5 )
-		expat? ( dev-libs/expat )
+		xml? ( dev-libs/expat )
 	)"
 
 # NOTE: changed RDEPEND to PDEPEND to resolve bug 88777. - kloeri
@@ -101,7 +101,7 @@ src_configure() {
 		local disable
 		use berkdb   || use gdbm || disable="${disable} dbm"
 		use berkdb   || disable="${disable} bsddb"
-		use expat    || disable="${disable} pyexpat"
+		use xml      || disable="${disable} pyexpat"
 		use gdbm     || disable="${disable} gdbm"
 		use ncurses  || disable="${disable} _curses _curses_panel"
 		use readline || disable="${disable} readline"
@@ -110,6 +110,13 @@ src_configure() {
 		use tk       || disable="${disable} _tkinter"
 		export PYTHON_DISABLE_MODULES="${disable}"
 	fi
+
+	if use !xml; then
+		ewarn "You have configured Python without XML support."
+		ewarn "This is NOT a recommended configuration as you"
+		ewarn "may face problems parsing any XML documents."
+	fi
+
 	einfo "Disabled modules: $PYTHON_DISABLE_MODULES"
 }
 
diff --git a/dev-lang/python/python-2.5.4-r2.ebuild b/dev-lang/python/python-2.5.4-r2.ebuild
index 2ad63531b863..5619f1e0964a 100644
--- a/dev-lang/python/python-2.5.4-r2.ebuild
+++ b/dev-lang/python/python-2.5.4-r2.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.5.4-r2.ebuild,v 1.1 2009/01/24 01:58:57 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.4-r2.ebuild,v 1.2 2009/02/10 16:11:57 neurogeek Exp $
 
 # NOTE about python-portage interactions :
 # - Do not add a pkg_setup() check for a certain version of portage
@@ -109,7 +109,6 @@ src_configure() {
 	fi
 
 	if use !xml; then
-		${PYTHON_DISABLE_MODULES}="${PYTHON_DISABLE_MODULES} pyexpat"
 		ewarn "You have configured Python without XML support."
 		ewarn "This is NOT a recommended configuration as you"
 		ewarn "may face problems parsing any XML documents."