Generate ctypes cache in src_compile() to diverge less from the remaining ebuilds.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 27 insertions, 21 deletions

diff --git a/dev-python/pypy-bin/ChangeLog b/dev-python/pypy-bin/ChangeLog
index cf73fc5b0160..f75d1e53e479 100644
--- a/dev-python/pypy-bin/ChangeLog
+++ b/dev-python/pypy-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/pypy-bin
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy-bin/ChangeLog,v 1.28 2014/11/08 23:08:57 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy-bin/ChangeLog,v 1.29 2014/11/09 08:33:11 mgorny Exp $
+
+  09 Nov 2014; Michał Górny <mgorny@gentoo.org> pypy-bin-2.4.0.ebuild:
+  Generate ctypes cache in src_compile() to diverge less from the remaining
+  ebuilds.
 
   08 Nov 2014; Michał Górny <mgorny@gentoo.org>
   -files/2.0.2-distutils-fix_handling_of_executables_and_flags.patch,
diff --git a/dev-python/pypy-bin/Manifest b/dev-python/pypy-bin/Manifest
index a53b04f94ded..3ee022275240 100644
--- a/dev-python/pypy-bin/Manifest
+++ b/dev-python/pypy-bin/Manifest
@@ -21,25 +21,25 @@ DIST pypy-bin-2.4.0-x86+bzip2+jit+ncurses+sse2.tar.xz 9511800 SHA256 5178ce53d9d
 DIST pypy-bin-2.4.0-x86+bzip2+ncurses+sse2.tar.xz 5655980 SHA256 fcfbd71b903e9c6a26cd6590090d8d0c2f8c507e9f4650f7972f36a8ef86fcc6 SHA512 45d71f2d785a65091c9f25376bcb2f7f7e02cf1f00111fcb4b0a3bf0fc5e56947be7f66f5281744de31424f9e0b7249523a4bcd5fec7bf4f3c829b66598b02af WHIRLPOOL a9fef84296f9e77062b0e0cb17537615a02f3ba7d0ed804cf63cce9baf7c1ab843b326301bde5e5a33744b716ea0efd4619e9ba55c0387acfa1622aa11b875de
 DIST pypy-bin-2.4.0-x86+bzip2+ncurses.tar.xz 5634780 SHA256 2d0494fdab270c26efbe84fa42118b822b3fc021940e2d260a5c39938dcbed8d SHA512 672468e436646ed0334352addeda824ddd76a4cf1ad46231983aec7b697ae6ef2cc2b9072ae5149b4b0987b06caade65ab8bf67ca1dea10219030a9b3fd5b4b4 WHIRLPOOL 003bf4ef085b01c6625f43d34bdcfc2fa035e93373197c67540548856b160db39aed8f0a319ff3f77063dbb8abd2b6a4b412dccbab8c6a70689cf701cf98c4cc
 EBUILD pypy-bin-2.3.1-r2.ebuild 5590 SHA256 9e7304be8c769be51a69c7e95025b262ccf3baea9bb106aca1e720a2dcc453b9 SHA512 2e50f087513f1b1ee5a15c701c20ad59bf267ce4ecfa506addcc88d5e15556367baba689427ad6ed5d412871216209f9ff6d6fc63c53e68c1b7918c0bacd3498 WHIRLPOOL a6eb1d6bb73d305da286524502de6ad6c42ce52fb1e145253499a6ba11dd7b5ed1a3ef99c38b28ef6ab2f0dae11d78d7a083e536b470fee9d3a02ab1c88cde27
-EBUILD pypy-bin-2.4.0.ebuild 5194 SHA256 444f66f3bccfc3c922a4fc16bfb85b4292d73d8d31dfd41c9bc0e9d5644526d1 SHA512 cca13e6caa6e6064b6e63ca0332a96b4f8404eeba61cf68bd3a84eb67db3aea686802c6fb3ef72bc8d0bb43b0f41893a022003498b62ac8cb9d5b504d2e48ea4 WHIRLPOOL fe58022011b6006522d8fb393d5954d9ea03d6b3efec8e8e5924a1088a20cceead5f8f2f25200972a9d6a7f105b39454654ecfe962542529505b6b21ebf920ea
-MISC ChangeLog 6108 SHA256 ad835e82864e47e849cca0835dae1e507ec936a8039866d807fb765887c84067 SHA512 cee79c59a6562987eb055be9e6236a62f9a69d6b5b9371d399e486bf7cf3b48118593c5adeb51e699d1fb7fadf6eb0b9c269034d4833e98de1c8c0366cb03a6f WHIRLPOOL 69bf9335bc471b258c409373a4d45e950f9b31c0ec8e5a6cce5b12d28991bc7b62a173f91c7bda6a816d4d0d0f5eaa296a84d433fd5afcca7a9f28d4de09b9b0
+EBUILD pypy-bin-2.4.0.ebuild 5250 SHA256 f8d75e951ddc12bbb428468abb30f978b637414842ebe1f55c86d51546802ce1 SHA512 87c3396eb5fb5af29479b30ec32265ccea39b2eefa0e9686b1bbe7e960ce86a56e4ca1266ba4444c036379be08172ba7ee75ea4ef825c091397e017a713b1b83 WHIRLPOOL 20e738e3ede3ee6cb2fe51c25c7db47ff943305f4da7f673b4c88a94a95a346340b2f232f14a43a61a584271b719a17daea5595adbda41c1cd2b5eb4003d8387
+MISC ChangeLog 6269 SHA256 c3a6a91790a6bbc7b106f9835afcc1cb0e0a0152352d6f72920143f667e2632c SHA512 e862f5558093118f3aac6efe2edce25ce9d4c332b0b80b5bb4ef2e6e928cf44ef2ff41ab105100271b8a64f454fa720949f07b471e1d159fac433fed1c624760 WHIRLPOOL 75085e01687f4ddcd97ba95f2bc5e7230d04af869c844965fa88bfc196b560aa05644a383bd20b5089b749b1b6941a641e538122c4339550fd3a02f049682b01
 MISC metadata.xml 428 SHA256 99cbecab117f387c279567957835aa68a397906b2309e9c9b8feb80d10812899 SHA512 fda6cede1be6fe8c7d1cbaceebe3193cd16102ad2a570afb1a2269c02ee3021ed9130fc8b09e9f6c5cf742afa95af6864577030b3eaeb41ea29a500826bf7260 WHIRLPOOL 2d765c32b3534dd8fedeee10ea0e3cfcf22fd51121046009a5196ce206dbaf1625f363e8b6dcf3798c6a185de90f27fe06e73b755ad27723ecd8c8bf3ff13ca8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJUXqKKXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJUXybIXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOVe4P/ipNlMjE+BPYvMT5/E3gvyl7
-/XzM+JqKHAWMzCl+/GDs8B53rRhM4juOqwEU+fn0UuXwUiyZ1Ewlppukc2/Kjfpz
-1pCQHiUw94KWDStV+B0Xt4B4awykhM7iD+fRN4PkVbDUv0q6g7ZpxIDYDWx92NcA
-Nt1it54RsBHUeLXGKTB6WBulzT07io2t5tWx51/yX6z2GHS/f13H8GKUujY1g+A3
-Z8sffYbQezo9PYVtpFUpcXWZd8cZeRNopJpZNMEd8Ap7URDO+s7s7FsYkPMN5lZB
-fXN1PWYQOm9qyYhNqwGN5MATGGVdKtR8fuBpjH3lXqpe8Fstl8wjxd6zi6cRcUUM
-m4Gt9YcD7fLJlVATeGCkdocD3UTYFFjafsKevKoLXd7BPBT12SDRU1nQMmnjXRxg
-1UwS4sz5FNR6GtveYtcibcDK2cdAD4rwwTCApzHMHWVML5Idi74fKzma0ptD1czo
-JfAnCThIQppS+ioalTAa+ISQqtBxxxoFet10SC12ewuDbBbkvIiFszZufMo6DIA7
-puHmysy528eUiWqACW8zaw8ycSvEM94eIOeHt2iNsFx925kq/UZZu0yIYVomzdEh
-8Harb3lwwlGxViOissXUyNzT+I4O8COtZ8oTbJyidvj3HNwgQw1zIDub60CuFVR7
-NNDHpwifMS2cxvHZBl++
-=ulzV
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOZm4QAMgC40hcTyEPiReK9VZkE0Gp
+tHT9viBUE7lMmTahexynUSYwQeZQg+GHRO1ilSeDgeATA3fJDlEp9eqecy8TnJNA
+Bq6jnHbecl8q2X2FDCab8Bd07v7uSEegiqdUccPzPw3h7mpeBl+LLtkmBeddr6Qq
+YPv1Sj5amvA6HrVjG2iYDjfRzEtdFm1cAN4NkTF2p13cOa5y93+uqijyK/dc5LuV
+vkKSxx0gitRshx6U+94q+p/mp+dKBVEFv+Pn5xXGFHc2DnzlvReI4hzTjjCLnd8x
+eycigdpHW5s/OINeTuw8j5FDfZy7TW/LclxdeA8eOyzahhTrbXCjBlOxUH0Chz0w
+li7AHJX2T9m5oa/qXCBP6dneH5oZDd6USUqixo3wy6tkoCMR8RU4A2AVVCei9G1n
+HEUAlzSRGKHfK4pQps6/ZZll71/9H6CFCxapQOQ1wlO+ELYQIjxkpk+A5dBtPJ3B
+LtJnhBWd8igixA3JWS5AywpaGiTKsjmpbXaEUI+t4NZZAlSybc5XQJB1MwoWgz3/
+cEIYkaBFQLEZEIFyaczOIDC6ztmcVsOYZZPfCaBFrOiduIwSNjJBc2VScn56NxQu
+CLJlppuEJHpeJ/Rr30/tM2lNeHPW3FKPb7BF5qq3oxv03ihCiWgYO35CC1hfgmQ3
+ZQwr6clWAOOvOR7f2pJx
+=IQha
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pypy-bin/pypy-bin-2.4.0.ebuild b/dev-python/pypy-bin/pypy-bin-2.4.0.ebuild
index 3e6a96a60a5e..9ed64d7931ed 100644
--- a/dev-python/pypy-bin/pypy-bin-2.4.0.ebuild
+++ b/dev-python/pypy-bin/pypy-bin-2.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy-bin/pypy-bin-2.4.0.ebuild,v 1.6 2014/11/08 23:04:06 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy-bin/pypy-bin-2.4.0.ebuild,v 1.7 2014/11/09 08:33:11 mgorny Exp $
 
 EAPI=5
 
@@ -100,6 +100,11 @@ src_compile() {
 	use doc && emake -C pypy/doc/ html
 	#needed even without jit :( also needed in both compile and install phases
 	pax-mark m pypy-c
+
+	# ctypes config cache
+	# this one we need to do with python2 too...
+	./pypy-c lib_pypy/ctypes_config_cache/rebuild.py \
+		|| die "Failed to rebuild ctypes config cache"
 }
 
 # Doesn't work - pypy missing its own libs
@@ -150,9 +155,6 @@ src_install() {
 	"${PYTHON}" -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
 		|| die "Generation of Grammar and PatternGrammar pickles failed"
 
-	# ctypes config cache
-	"${PYTHON}" -m ctypes_config_cache.rebuild || die "Failed to rebuild ctypes config cache"
-
 	# Generate cffi cache
 	# Please keep in sync with pypy/tool/release/package.py!
 	"${PYTHON}" -c "import _curses" || die "Failed to import _curses (cffi)"