Use -fwrapv (bug #297276). Install email module with USE="build".

Package-Manager: portage-15835-svn/cvs/Linux x86_64

6 files changed, 35 insertions, 24 deletions

diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog
index 9bbd4dda46ef..bd48de9bcb3a 100644
--- a/dev-lang/python/ChangeLog
+++ b/dev-lang/python/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/python
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.459 2010/03/10 10:09:02 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.460 2010/03/20 20:33:28 arfrever Exp $
+
+  20 Mar 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  python-2.4.6.ebuild, python-2.5.4-r4.ebuild, python-2.6.4-r1.ebuild,
+  python-3.1.1-r1.ebuild:
+  Use -fwrapv (bug #297276). Install email module with USE="build".
 
   10 Mar 2010; Joseph Jezak <josejx@gentoo.org> python-2.6.4-r1.ebuild:
   Marked ppc/ppc64 stable for bug #306793.
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 74f943336c82..6778b0f57519 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX pydoc.conf 330 RMD160 0cd619ec251597e0fcadc05bfd249915e73baa17 SHA1 a56100d45378c554b9822f6ed512a6cb7841ef50 SHA256 a45ebba2de5f2b0e963db4101507203d095c5ff667ae5002c4897a9c87786fa1
 AUX pydoc.init 666 RMD160 11caf3a78bce4cdaebacaf21eaf26cc1ce30282e SHA1 88c5cb6d5bf737c74e1be93118cf157630af9ad7 SHA256 0d25c71232b74adb87dc709cc7cd8f8b13c452c0fe82fa33808f907f7a96d628
 AUX python-2.4.4-test-cross.patch 977 RMD160 8fdcd45dc202993988f7a1c2b3d918068883b99e SHA1 96f25777150ba05765282a43f08da6b6fab3cb73 SHA256 ff2a131776d560d188ec5069e17fea3eb09c26fdd02124ae5ff34d791c9fd9f6
@@ -17,17 +14,10 @@ DIST python-gentoo-patches-2.5.4-r3.tar.bz2 19473 RMD160 c3a807693103f9e26c3cce4
 DIST python-gentoo-patches-2.6.4-r1.tar.bz2 12570 RMD160 2a58eb651ce5adc68c4667fb0ddc42cc215ea342 SHA1 c5de0442890bc0753c445a88390d932e629c8648 SHA256 2fe6c8838df2c07d3232ebb26c128dab2787c43a76ddb0b55acec1bed657f9f2
 DIST python-gentoo-patches-2.6.4.tar.bz2 11032 RMD160 83903892ef18880f876e7a140c803c1e8a67e24b SHA1 51d4174b2a4136a11c64ae0007b59e4c2f0e13f2 SHA256 19a66a0855df270c030438f21c29260e7ff69b299830409f6aa9140611b721e2
 DIST python-gentoo-patches-3.1.1-r4.tar.bz2 10200 RMD160 418852c54bf7169eb7bab078e78997e22799139e SHA1 0c063cd446a22833e267710f59351cb157098b21 SHA256 c065659242df3e921290ff044aee6f543c8b5cd2290db5bf668065cf97fcbbbe
-EBUILD python-2.4.6.ebuild 8899 RMD160 a1654e346c8c1fb0c3cfa8b06ac9c703dc1b5d53 SHA1 89cf995ec9ca7d033e1674ee9d7723cb061fc186 SHA256 b835a8098d6ab9ff858b702be00a16ce1af02ac59f6085b7b566b48fc380af96
-EBUILD python-2.5.4-r4.ebuild 9239 RMD160 5538f514d9dee8857a2a8463c1cee9cf6bab7840 SHA1 c5690b0383ff0dffef85c3bec3f7efccff1058cf SHA256 14e5a2661378ee15483a817f7913ca89d71ef0563d117ed28cdcd1f6e05e9758
-EBUILD python-2.6.4-r1.ebuild 9490 RMD160 54a044358101c3a3006a85b30d55d87a494b69f0 SHA1 7d45364dd5ac41ff69acec70e25fc72109de8115 SHA256 0f29d7820d01c6238ea094a5d85190d124baddb710cc87c1358453cc7226ee57
+EBUILD python-2.4.6.ebuild 8966 RMD160 d48e302f289834896434b38113d1d98e7c0a4dbd SHA1 08004c836e1fa10401689ae2455b3790503ae0fc SHA256 f26f980b2d3697e8842dd36ca06b44f7eba921bca06b2388d8621d95065fcfc2
+EBUILD python-2.5.4-r4.ebuild 9306 RMD160 c11c7d75f4298228e5f1164b7315fb8d00294833 SHA1 36bae88672be35eb877f9b3ad0b1fd5dbf491a48 SHA256 30c8f1f29d2af9565e9b97f1ec266bf1aff283018f882ee9dbfbe02e175e48a2
+EBUILD python-2.6.4-r1.ebuild 9559 RMD160 99a85580a38955be98e2217dc65cb48d84082080 SHA1 d9620d4205f605d38d4058416b93f997b4313578 SHA256 3b968bae7990af61dc74a1c98c60f60e0fd711a444bdfbfd43dfe165688e3fc2
 EBUILD python-2.6.4.ebuild 9491 RMD160 a297ff0934fd2df2aca38db02fb21e8c8e839772 SHA1 3eaced72f6b57c5978c925223d27adb4ea82a0e4 SHA256 97ebe170095882d2dc1eb6d723b771787d2c3cabf2ec30ce3d8ae8138b4df054
-EBUILD python-3.1.1-r1.ebuild 9067 RMD160 190c707a9d249e58578b21de237c9ffcbd71b36f SHA1 be9e503071f8f3f7cf8131bc9d4c2754f8c67750 SHA256 7accd9174f3a84f313ef6df3dbe9cc9b53a1b36742823969580de1324b6eb94b
-MISC ChangeLog 80396 RMD160 bff39c96f4b4af07acdef2af34021e167c917cd7 SHA1 906ba830d0f9de7ccc8729eebc740521819b30d5 SHA256 cf675c3f0d33cf0a51d310819831c50b77940fe0256d1970defd45ce72b253a5
+EBUILD python-3.1.1-r1.ebuild 9134 RMD160 7ff62378f1c80f92ec9ca3c8106558e2705a9987 SHA1 ddb6cfa8e905c24f85afc6efff5168187523443d SHA256 e5ab994e0a2fa74e8c801fe629773c81ec50ec2d6316eac1d899ee88c8ec71f1
+MISC ChangeLog 80637 RMD160 e233a2d508b271a8576b672968ef4a092db7906c SHA1 0841ef3f62ff5ba8959bcd5f56013d139cbb5bc8 SHA256 87d281724c9d4d0c1a1601db6c6aa24fb3d605b99b49bd364cef0b12022def85
 MISC metadata.xml 661 RMD160 54831d16b8807086bfabdbb3df9d33336b5d42a0 SHA1 9867c337fe9e6f4e967004fc9409763e0fedf43b SHA256 2c6c3407251f7ccd6501dee49494e539a9544f2fbae99a4373eefdf4e83e8908
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkuXb6oACgkQcsIHjyDViGSRvwCgp05/GJHIWWc85rtQpjqfZpuU
-OXYAn1urxSBLXR3KE9xJCHx20O1y763v
-=mCiM
------END PGP SIGNATURE-----
diff --git a/dev-lang/python/python-2.4.6.ebuild b/dev-lang/python/python-2.4.6.ebuild
index d1d39d224737..ca96aa1fddc4 100644
--- a/dev-lang/python/python-2.4.6.ebuild
+++ b/dev-lang/python/python-2.4.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.6.ebuild,v 1.31 2010/03/07 11:31:55 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.6.ebuild,v 1.32 2010/03/20 20:33:28 arfrever Exp $
 
 EAPI="1"
 
@@ -118,6 +118,10 @@ src_configure() {
 		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
 	fi
 
+	if [[ "$(gcc-major-version)" -ge 4 ]]; then
+		append-flags -fwrapv
+	fi
+
 	export OPT="${CFLAGS}"
 
 	local myconf
@@ -230,7 +234,7 @@ src_install() {
 
 	# Python 2.4 partially doesn't respect $(get_libdir).
 	if use build; then
-		rm -fr "${D}usr/bin/idle${SLOT}" "${D}"usr/lib*/python${SLOT}/{bsddb,email,idlelib,lib-tk,test}
+		rm -fr "${D}usr/bin/idle${SLOT}" "${D}"usr/lib*/python${SLOT}/{bsddb,idlelib,lib-tk,test}
 	else
 		use elibc_uclibc && rm -fr "${D}"usr/lib*/python${SLOT}/{bsddb/test,test}
 		use berkdb || rm -fr "${D}"usr/lib*/python${SLOT}/{bsddb,test/test_bsddb*}
diff --git a/dev-lang/python/python-2.5.4-r4.ebuild b/dev-lang/python/python-2.5.4-r4.ebuild
index b5db8a64f622..d3990f123b18 100644
--- a/dev-lang/python/python-2.5.4-r4.ebuild
+++ b/dev-lang/python/python-2.5.4-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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-r4.ebuild,v 1.14 2010/03/07 11:31:55 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.4-r4.ebuild,v 1.15 2010/03/20 20:33:28 arfrever Exp $
 
 EAPI="1"
 
@@ -134,6 +134,10 @@ src_configure() {
 		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
 	fi
 
+	if [[ "$(gcc-major-version)" -ge 4 ]]; then
+		append-flags -fwrapv
+	fi
+
 	export OPT="${CFLAGS}"
 
 	filter-flags -malign-double
@@ -242,7 +246,7 @@ src_install() {
 	sed -e "s:^OPT=.*:OPT=\t\t-DNDEBUG:" -i "${D}$(python_get_libdir)/config/Makefile"
 
 	if use build; then
-		rm -fr "${D}usr/bin/idle${SLOT}" "${D}$(python_get_libdir)/"{bsddb,email,idlelib,lib-tk,sqlite3,test}
+		rm -fr "${D}usr/bin/idle${SLOT}" "${D}$(python_get_libdir)/"{bsddb,idlelib,lib-tk,sqlite3,test}
 	else
 		use elibc_uclibc && rm -fr "${D}$(python_get_libdir)/"{bsddb/test,test}
 		use berkdb || rm -fr "${D}$(python_get_libdir)/"{bsddb,test/test_bsddb*}
diff --git a/dev-lang/python/python-2.6.4-r1.ebuild b/dev-lang/python/python-2.6.4-r1.ebuild
index a9ec0c6f6efa..d35cabea53b1 100644
--- a/dev-lang/python/python-2.6.4-r1.ebuild
+++ b/dev-lang/python/python-2.6.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.4-r1.ebuild,v 1.8 2010/03/10 10:09:02 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.4-r1.ebuild,v 1.9 2010/03/20 20:33:28 arfrever Exp $
 
 EAPI="2"
 
@@ -136,6 +136,10 @@ src_configure() {
 		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
 	fi
 
+	if [[ "$(gcc-major-version)" -ge 4 ]]; then
+		append-flags -fwrapv
+	fi
+
 	export OPT="${CFLAGS}"
 
 	filter-flags -malign-double
@@ -239,7 +243,7 @@ src_install() {
 	sed -e "s:^OPT=.*:OPT=\t\t-DNDEBUG:" -i "${D}$(python_get_libdir)/config/Makefile"
 
 	if use build; then
-		rm -fr "${D}usr/bin/idle${SLOT}" "${D}$(python_get_libdir)/"{bsddb,email,idlelib,lib-tk,sqlite3,test}
+		rm -fr "${D}usr/bin/idle${SLOT}" "${D}$(python_get_libdir)/"{bsddb,idlelib,lib-tk,sqlite3,test}
 	else
 		use elibc_uclibc && rm -fr "${D}$(python_get_libdir)/"{bsddb/test,test}
 		use berkdb || rm -fr "${D}$(python_get_libdir)/"{bsddb,test/test_bsddb*}
diff --git a/dev-lang/python/python-3.1.1-r1.ebuild b/dev-lang/python/python-3.1.1-r1.ebuild
index 04c376c2d00e..cf175d5df5bb 100644
--- a/dev-lang/python/python-3.1.1-r1.ebuild
+++ b/dev-lang/python/python-3.1.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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-r1.ebuild,v 1.29 2010/03/04 17:55:42 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.1.1-r1.ebuild,v 1.30 2010/03/20 20:33:28 arfrever Exp $
 
 EAPI="2"
 
@@ -110,6 +110,10 @@ src_configure() {
 		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
 	fi
 
+	if [[ "$(gcc-major-version)" -ge 4 ]]; then
+		append-flags -fwrapv
+	fi
+
 	export OPT="${CFLAGS}"
 
 	filter-flags -malign-double
@@ -224,7 +228,7 @@ src_install() {
 	sed -e "s:^OPT=.*:OPT=\t\t-DNDEBUG:" -i "${D}$(python_get_libdir)/config/Makefile"
 
 	if use build; then
-		rm -fr "${D}usr/bin/idle${SLOT}" "${D}$(python_get_libdir)/"{email,idlelib,sqlite3,test,tkinter}
+		rm -fr "${D}usr/bin/idle${SLOT}" "${D}$(python_get_libdir)/"{idlelib,sqlite3,test,tkinter}
 	else
 		use elibc_uclibc && rm -fr "${D}$(python_get_libdir)/test"
 		use sqlite || rm -fr "${D}$(python_get_libdir)/"{sqlite3,test/test_sqlite*}