Fix posix subprocess module on x32.

Package-Manager: portage-2.2.0_alpha108/cvs/Linux x86_64

4 files changed, 44 insertions, 8 deletions

diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog
index 3e43e38d6c90..62a185658759 100644
--- a/dev-lang/python/ChangeLog
+++ b/dev-lang/python/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/python
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.600 2012/05/26 17:27:12 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.601 2012/06/04 18:09:52 vapier Exp $
+
+  04 Jun 2012; Mike Frysinger <vapier@gentoo.org> +files/python-3.2.3-x32.patch,
+  python-3.2.3-r1.ebuild:
+  Fix posix subprocess module on x32.
 
   26 May 2012; Raúl Porcel <armin76@gentoo.org> python-2.6.8.ebuild,
   python-2.7.3-r1.ebuild:
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 187046855359..e0536cfa0ee4 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -10,6 +10,7 @@ AUX python-2.6-chflags-cross.patch 1716 RMD160 b0ec772a41a24d51f4c7430b19bcc6251
 AUX python-2.6-test-cross.patch 914 RMD160 1f421b5565d39a24b887e85cbecaf3857741f756 SHA1 9c05fbe28aac6373f24317db5c277bc4549dde0c SHA256 8264f6ffe5aedcce67bea00b0346e5416a5486da2229bf82fe748d87ec65c4de
 AUX python-3-distutils-egg-utf8.patch 1636 RMD160 840d7fea399df295cbba1124fb8fcb797a7011ed SHA1 4697d7d737101ad3f1d9c4a0c6ff848fd7114823 SHA256 81d66620f0774aa2fb6c9664670862eb1b666ba15874b5498af28360f2e1aa52
 AUX python-3.2-soname_typo.patch 1724 RMD160 1b112382152731768b655279145c7caa31d1094f SHA1 808fdab3b1d1664fc20c67dce008e7ea48134a4e SHA256 776366c3cc67c7d66883846acee8cc1b795c25f6e35e927793be8c54162491e2
+AUX python-3.2.3-x32.patch 654 RMD160 00b234bc13e4de9ea8517554b89210ff81fc8942 SHA1 bde780726a6bc26cd023984907f0f166d775b78e SHA256 dd957a8ff5d861c0b8f88f068c8bd4eebb84c58ec6b12466d15812e666f08913
 AUX python-config-2.4-r1 1624 RMD160 e4e6893c9e8414289c0c70c0f4be58835911e376 SHA1 addf9a6eb81e636364264a6abb3d96f01ea0cf90 SHA256 923a9e896f99cca5aa4ccbb02f981c6e26a2b1aa42326de2359d3c884bde2a9f
 DIST Python-2.5.4.tar.bz2 9821313 RMD160 3a76c83464c3b1c38a60351ab054e33ac7195663 SHA1 0f2e819d6381f72f26c734e00a6780b3933ea404 SHA256 bc8d896a2bfe5523ba93b8d89b71017b74e8e6cb21dc676a0ccff668c8780110
 DIST Python-2.6.6.tar.bz2 11080872 RMD160 2d63f4f0ad3c124a8e62215ca94bd0231350e912 SHA1 a1daf2c2c7cffe0939c015260447572fe75c7e50 SHA256 134c5e0736bae2e5570d0b915693374f11108ded63c35a23a35d282737d2ce83
@@ -46,15 +47,25 @@ EBUILD python-3.1.4-r4.ebuild 10608 RMD160 95e0d4d1850ef27b32455fbbd4c2e0f7921b1
 EBUILD python-3.1.5.ebuild 8096 RMD160 eab8933f258725dca1960089bec508975348e41e SHA1 e6b4df059d36dc163edf2e3877825ec159392d78 SHA256 efa2eeee6ee2ea322b662824dcfeead0444dc88f95f2332a8ddea1e9db6ec2b6
 EBUILD python-3.2.2-r1.ebuild 10945 RMD160 11491a14b1c0d33d3b4c448a0381d005da6e8b79 SHA1 ec345ce788e6bef0d359cab50d7973e06f2b076e SHA256 d687ec73cd82d72d2cd6b76e53a2881d9ae1c8ff9e04a6b5d1bbe08c837ed55a
 EBUILD python-3.2.2.ebuild 10818 RMD160 e2b1487a9561ebf33de311b3eefd89aecd6ac733 SHA1 5913115f95a37e124ddec145c2ca508e52c0b6da SHA256 0c938836347d01bf4d6968ee25d87a10d761da737021311d707b4816c98472d0
-EBUILD python-3.2.3-r1.ebuild 8532 RMD160 6ffa80b029dbdc1283210d871b493dd67cab2708 SHA1 bb34611deed8640a517b347463b30ea5948a3d48 SHA256 038a186740d1f1e17c75249f0b52263617db5d9acbf39fe7746ae0718c3e6da8
+EBUILD python-3.2.3-r1.ebuild 8576 RMD160 51fb7d1e8156e0f18a0f9bf9d83d14cd66aa92e2 SHA1 21b70a40b7682d3323bfc7cf18dabc2c5365c40d SHA256 1127fcca419ff3571ecfc803f3b4c592303ebf06fef1e698ecb5c8da498636a0
 EBUILD python-3.2.3.ebuild 8526 RMD160 25880c3a51418c1903675780c8c81dee8f50dd25 SHA1 035915855699e5056f15f78a402e7700dbd621dc SHA256 944e57106e47605fc22ccecd2b69cbfe0e72264dfe23e62ee1da95bdcbf45208
-MISC ChangeLog 6401 RMD160 bf092980019d07aa452821683b0cb7458bd5a847 SHA1 df3df9906dff738ed4163787ed117c3444a5c5ed SHA256 060d0b00a57d3e53c93f4b016d537a05f02c481eb7465b865e375666934cd354
+MISC ChangeLog 6546 RMD160 20ce0801b9fb408a9abfe6d6f04fea5c20d42afc SHA1 b1f6958e628dabb01086fb13639becfde8a1c14e SHA256 51c079da653d0b28801ecff432e457fcd3a3f834acec24328aebb4230c25b86d
 MISC ChangeLog-2011 100599 RMD160 2b79c394a837d8d321a2750084da3fe0835e1d3b SHA1 3dbff45b51526c994fa3aa85f4eed7b962bdd09f SHA256 23129cb47321b2a6b1cb9323f1815d0cd11d6f30c3893908ed51575c270a0cc8
 MISC metadata.xml 661 RMD160 54831d16b8807086bfabdbb3df9d33336b5d42a0 SHA1 9867c337fe9e6f4e967004fc9409763e0fedf43b SHA256 2c6c3407251f7ccd6501dee49494e539a9544f2fbae99a4373eefdf4e83e8908
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk/BEncACgkQuQc30/atMkCfSACgrzqMJNvjfe9Da1QwA8b2UcYA
-80oAn0B+l7MY5GneVOx/9BaktHJTWiaH
-=/iOJ
+iQIcBAEBAgAGBQJPzPoHAAoJELEHsLL7fEFWRt0P/RflqV60mf41q9q4PpzIJXZS
+kbwRTohkQGCmOYSpSO20ETO8V2vEJ7XE7mdUklpLZSfmFJa6nBCiJKQbD2qSsHvg
+jbbPY9dnCZCjsXKhAKaEkoRmHbKiJqb4h6+2h9SGGN7WOyvlABXEBKrMnxwnzT0l
+yyfah+M0jc5BScMHqTNvPVKpty43UBllbvzivIst0Aqf3WXPLLtx95Rh89U71Amt
+LUe2Zf4fefaOTeebtimQulv4kGKI+25wjQah8SDvDGztFWCT5Q++2vpBHcakcdNp
+fqVQmzQlKFSJHXhovkpzbkmne5aPyr/LGrSjgoi6j8qQZ1oBXE+NHLujjuPRbar4
+IrPBwFfHlOgE70B7JmAGN91Cl/HaWd3Cl1foG1ffPW5JyFOp3vRxnE5iJSXjsyXP
+WFbx71uWgRhpNKTNaEDzipQFE7hDWnRLPIwxt8/zP3lFrRSzDP5HipqJBWEOyPWz
+r4sG5NZrlvmQxp9iH1LbAe+M1MFDGo9l29mZkSSGcFkR1dqEKsPuZ0dD5nifr4Zs
+klqAkaHhj07ZaWLD72jED3sjX1hhpkKc7BCk/HX/zgVfr190E4LwcjHNIHuZw5r8
+mf6neSKLFQHwaMF0BLn1Re57rSxrZwvBZkTLE6i6Qj7HhRqvbU5M6O4laN529uxv
+j17a0GobJlWA2bXeo16L
+=hAPw
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/python/files/python-3.2.3-x32.patch b/dev-lang/python/files/python-3.2.3-x32.patch
new file mode 100644
index 000000000000..42262a28803a
--- /dev/null
+++ b/dev-lang/python/files/python-3.2.3-x32.patch
@@ -0,0 +1,20 @@
+http://bugs.python.org/issue15000
+
+x32 has 64bit values for the first two args
+
+--- a/Modules/_posixsubprocess.c
++++ b/Modules/_posixsubprocess.c
+@@ -175,8 +175,13 @@
+  * chooses to break compatibility with all existing binaries.  Highly Unlikely.
+  */
+ struct linux_dirent {
++#if defined(__x86_64__) && defined(__ILP32__)
++   unsigned long long d_ino;
++   unsigned long long d_off;
++#else
+    unsigned long  d_ino;        /* Inode number */
+    unsigned long  d_off;        /* Offset to next linux_dirent */
++#endif
+    unsigned short d_reclen;     /* Length of this linux_dirent */
+    char           d_name[256];  /* Filename (null-terminated) */
+ };
diff --git a/dev-lang/python/python-3.2.3-r1.ebuild b/dev-lang/python/python-3.2.3-r1.ebuild
index 75b2ea35e52e..fde77236836d 100644
--- a/dev-lang/python/python-3.2.3-r1.ebuild
+++ b/dev-lang/python/python-3.2.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.2.3-r1.ebuild,v 1.5 2012/05/03 02:41:39 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.2.3-r1.ebuild,v 1.6 2012/06/04 18:09:52 vapier Exp $
 
 EAPI="3"
 WANT_AUTOMAKE="none"
@@ -72,6 +72,7 @@ src_prepare() {
 
 	EPATCH_EXCLUDE="${excluded_patches}" EPATCH_SUFFIX="patch" \
 		epatch "${WORKDIR}/${PV}-${PATCHSET_REVISION}"
+	epatch "${FILESDIR}"/${PN}-3.2.3-x32.patch
 
 	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
 		Lib/distutils/command/install.py \