Add missing dependency on >=dev-libs/expat-2 and non-zero exit status of setup.py when building of extensions has failed (bug #281968).

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

5 files changed, 22 insertions, 17 deletions

diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog
index 34ca122a846c..2c6d47ba3352 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.403 2009/08/18 00:54:54 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.404 2009/08/21 01:53:28 arfrever Exp $
+
+  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:
+  Add missing dependency on >=dev-libs/expat-2 and non-zero exit status of
+  setup.py when building of extensions has failed (bug #281968).
 
 *python-3.1.1 (17 Aug 2009)
 
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index bb8901e3d672..b00a6ca47bce 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -12,14 +12,14 @@ DIST Python-2.6.2.tar.bz2 11156901 RMD160 85fa3540cbacf4d0547d2381eb3aa76bef35c2
 DIST Python-3.1.1.tar.bz2 9757032 RMD160 d60b64e1346b2ff15d65b032ea35fb3ad8b0dc66 SHA1 42eb37bf75fae5731f6df1b195902960ae1789e0 SHA256 d87cc2578abade3ac1124b2b8e63146b1201726279d44cdde37fdd59553b51fd
 DIST Python-3.1.tar.bz2 9510460 RMD160 e41d8fd9c24d567f05835a1f9de6ba679ce2fd38 SHA1 f8c610f47e6c9420314e48871b9c697a93ed2e42 SHA256 81621be3c850190f386ddb3d8fbd4c3154bfc095eee6755ca52773fe5075ce3d
 DIST python-gentoo-patches-2.4.6.tar.bz2 10983 RMD160 c06dc76edec86d708a0c0e37126ae50f49f61bd3 SHA1 bbc04083fe74cff8c723c5c3cab70b1b814c987f SHA256 0508a66408f218c655823303833599344d2edeec1ffc683c6ada3fc33731590d
-DIST python-gentoo-patches-2.5.4-r1.tar.bz2 20485 RMD160 f8e2d19fe0ad7b2176795c159768c406d3a08801 SHA1 62565a95ab46e9bf8ac20318d1c662ce44230949 SHA256 0d502be02d16c2acdf82aba14909d8c1201091bb696456ec3542fc58466e8655
-DIST python-gentoo-patches-2.6.2-r1.tar.bz2 9706 RMD160 8868231a1759cfeb4497c409f4aaf71329c1675f SHA1 0c48800969cf50fa93fc2657f5106d332b9d4c05 SHA256 13b40e4f9ef89b7440606d437daed8617c39219e73aa3605c5157e0f09c703df
-DIST python-gentoo-patches-3.1.1.tar.bz2 8301 RMD160 8434afc20f3adbf4e6372bef4f095aa0e30560c2 SHA1 c47020210b3dd94d1930f21310338aff8b4e2179 SHA256 6c598bb8bda1ac6f77a9b81c5a503426449fdd8bb45c9a09471f43ab7fda35e9
+DIST python-gentoo-patches-2.5.4-r2.tar.bz2 20722 RMD160 86c25ad3647b7a3ca44c8e781a4572187d6c1934 SHA1 a859d75092303ee445cebd7af4221beeed58b74d SHA256 54236f25147bb26e15f6f204975513515410292a343b6dfb2116806aa9123afc
+DIST python-gentoo-patches-2.6.2-r2.tar.bz2 9911 RMD160 8e007e4524c312151f83775eedaf2994e81590a6 SHA1 b483814959f54ee798426d95b0044b10d4a835eb SHA256 28adcfdc86c42f326bcfa5c8880974ed5416d98f3bd4a67f069864883fa44a1a
+DIST python-gentoo-patches-3.1.1-r1.tar.bz2 8545 RMD160 9893c8bab409790548e2e88658ce8a49fb49e3f9 SHA1 3423bf03e5e08af1747cfa2e7173f9ae55cdc521 SHA256 2e4f6b3bb13b1658314ebf165e8b82948d33314539a0f1ef0e102f86716f7962
 DIST python-gentoo-patches-3.1.tar.bz2 8306 RMD160 ca4a52978de74d7175fe54ebdaec5b9ed05ce6da SHA1 f3a33485bef8c51f9c1214ee179b869a4fb44004 SHA256 ab68c9bd6d9991b6e4ae45d0d1551c8189c027c20aedf0e6b54c889e11eebf83
 EBUILD python-2.4.6.ebuild 9181 RMD160 f254a7207bc7951a06e4d8dddb4f56fbc1f130e8 SHA1 f78897d9001bbe0dd804deae16e1db6997c5b83b SHA256 6a333b03408e3c80b936c4f0310554616a4111b7f9d77d7966e1114b20a9e24a
-EBUILD python-2.5.4-r3.ebuild 9198 RMD160 068bcf35739fafb6b6a8c7fb9381f1e2d964fa65 SHA1 ed818e99f24d4f89d5f239894f07caae7a83eb41 SHA256 1cb23429d117d543cc1152b7ff8681f6e612443e272f9f4b0668b9783d1a55ce
-EBUILD python-2.6.2-r1.ebuild 9535 RMD160 a51290e767f0cb1922c1f44abaaf90e7b2b2ea9e SHA1 0929ecc5ced82006443cfb58aa92e8cc03fd4ec8 SHA256 bda709727baccced01c1c7a6c83941911e224a1731bd4fa307570500a2851280
-EBUILD python-3.1.1.ebuild 8227 RMD160 1ed3bec2584d0d5da36ec2e5b8e91a9fd8ee3ea1 SHA1 a683dc08fdbe2d8d8242e8b91dde60130ef40386 SHA256 97574a8d07e0206f6e5aafc42cea39a20538c4166c8eb9fd28c6a1e5cded9f78
+EBUILD python-2.5.4-r3.ebuild 9202 RMD160 e68ff2b9053cc0570bbba2cb5c6f2180dcec5095 SHA1 04f131b7b78cba39f97d5d42bb6c5f94863eb2fc SHA256 b5c3bebce18f8c26f8c3db3527f4ccfa8c2490e94a20777cf2e6cfd91b439265
+EBUILD python-2.6.2-r1.ebuild 9539 RMD160 d252f53bdbd1643ce4c9ee8ca5c0c0b7d8dcda9a SHA1 efe0443f2d6007e349c2db4113db31f2e92b3d91 SHA256 f48aeaf367c9d2e83509751ec67c9b6f8270940e17d68336d85d99da19ea1253
+EBUILD python-3.1.1.ebuild 8231 RMD160 dbaaa9fb38d65c688604f07d043daa4be2900bf2 SHA1 8cc0226f7b22edd764de4ceaa438c8f0db6ce98f SHA256 e3845382a75b9645b000f06467dca1e5ecf8b324d79a8cbbb0dbf28ccf7dcb1c
 EBUILD python-3.1.ebuild 7988 RMD160 e737a483e87a3d169a8787f68433af36132e9696 SHA1 fc0f8ca3ec1e282b6d3e030a0af1c5269b4edc20 SHA256 5af6bef348b5f62c88a0f95d7e5b2fda20268acb44a8de50bad632ac9866e81d
-MISC ChangeLog 70409 RMD160 6db733de5e2a00843e4349791ce19e491917db65 SHA1 0fc0598e3b7a65560bbd49abd39d170047aaff03 SHA256 2553c0c885f70355d0d12f13f5b3f72d592d0f6acbf223adc44e398861ef9e36
+MISC ChangeLog 70694 RMD160 314e660d6116cd1962ea5b81e249ead9002805c1 SHA1 808d1b1fe011e6aeab2836700da6f764619292fb SHA256 f2455b69a226a8be4accc536609e8ec44bbfb1a6760ecff276176e0f3429750b
 MISC metadata.xml 501 RMD160 0cc2c851a7c59ed77809c1f3ac2130710f0700e9 SHA1 59bfd447cf15419f68077913de7228f3556ce6e3 SHA256 51c09ee221463f34722a6c655db605a7d6d683069453d173947e4416a43a071c
diff --git a/dev-lang/python/python-2.5.4-r3.ebuild b/dev-lang/python/python-2.5.4-r3.ebuild
index 3893b8bf907f..e64a82e5d750 100644
--- a/dev-lang/python/python-2.5.4-r3.ebuild
+++ b/dev-lang/python/python-2.5.4-r3.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-r3.ebuild,v 1.11 2009/08/21 00:10:48 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.4-r3.ebuild,v 1.12 2009/08/21 01:53:28 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="1"
+PATCHSET_REVISION="2"
 
 DESCRIPTION="Python is an interpreted, interactive, object-oriented programming language."
 HOMEPAGE="http://www.python.org/"
@@ -46,7 +46,7 @@ DEPEND=">=app-admin/eselect-python-20080925
 			gdbm? ( sys-libs/gdbm )
 			ssl? ( dev-libs/openssl )
 			doc? ( dev-python/python-docs:${SLOT} )
-			xml? ( dev-libs/expat )
+			xml? ( >=dev-libs/expat-2 )
 	)"
 RDEPEND="${DEPEND}"
 PDEPEND="${DEPEND} app-admin/python-updater"
diff --git a/dev-lang/python/python-2.6.2-r1.ebuild b/dev-lang/python/python-2.6.2-r1.ebuild
index b6a4cbc2bf79..3f4b07874790 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.6 2009/08/21 00:10:48 arfrever Exp $
+# $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 $
 
 # 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="1"
+PATCHSET_REVISION="2"
 
 DESCRIPTION="Python is an interpreted, interactive, object-oriented programming language."
 HOMEPAGE="http://www.python.org/"
@@ -45,7 +45,7 @@ DEPEND=">=app-admin/eselect-python-20080925
 			gdbm? ( sys-libs/gdbm )
 			ssl? ( dev-libs/openssl )
 			doc? ( dev-python/python-docs:${SLOT} )
-			xml? ( dev-libs/expat )
+			xml? ( >=dev-libs/expat-2 )
 	)"
 RDEPEND="${DEPEND}"
 PDEPEND="${DEPEND} app-admin/python-updater"
diff --git a/dev-lang/python/python-3.1.1.ebuild b/dev-lang/python/python-3.1.1.ebuild
index abe28697af0f..7aeb5653e238 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.2 2009/08/21 00:10:48 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.1.1.ebuild,v 1.3 2009/08/21 01:53:29 arfrever Exp $
 
 EAPI="2"
 
@@ -14,7 +14,7 @@ PYVER="${PYVER_MAJOR}.${PYVER_MINOR}"
 MY_P="Python-${PV}"
 S="${WORKDIR}/${MY_P}"
 
-PATCHSET_REVISION="0"
+PATCHSET_REVISION="1"
 
 DESCRIPTION="Python is an interpreted, interactive, object-oriented programming language."
 HOMEPAGE="http://www.python.org/"
@@ -36,7 +36,7 @@ DEPEND=">=app-admin/eselect-python-20080925
 			gdbm? ( sys-libs/gdbm )
 			ssl? ( dev-libs/openssl )
 			doc? ( dev-python/python-docs:${SLOT} )
-			xml? ( dev-libs/expat )
+			xml? ( >=dev-libs/expat-2 )
 	)"
 RDEPEND="${DEPEND}"
 PDEPEND="${DEPEND} app-admin/python-updater"