summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2013-05-08 23:26:36 +0000
committerMike Gilbert <floppym@gentoo.org>2013-05-08 23:26:36 +0000
commit097c851f193e0318de0cf411cbf98f4c9a477ca0 (patch)
tree0355fb2fc7ca495aa5e9145443ce14b6f22ec224 /dev-python/pypy
parentBeta channel bump. (diff)
downloadhistorical-097c851f193e0318de0cf411cbf98f4c9a477ca0.tar.gz
historical-097c851f193e0318de0cf411cbf98f4c9a477ca0.tar.bz2
historical-097c851f193e0318de0cf411cbf98f4c9a477ca0.zip
Die in pkg_pretend if gcc-4.8 is selected.
Package-Manager: portage-2.2.0_alpha174/cvs/Linux x86_64 Manifest-Sign-Key: 0x0BBEEA1FEA4843A4
Diffstat (limited to 'dev-python/pypy')
-rw-r--r--dev-python/pypy/ChangeLog5
-rw-r--r--dev-python/pypy/Manifest10
-rw-r--r--dev-python/pypy/pypy-2.0_beta2.ebuild5
3 files changed, 13 insertions, 7 deletions
diff --git a/dev-python/pypy/ChangeLog b/dev-python/pypy/ChangeLog
index dbed385140d9..b0991cc958ab 100644
--- a/dev-python/pypy/ChangeLog
+++ b/dev-python/pypy/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-python/pypy
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/ChangeLog,v 1.36 2013/05/05 23:23:59 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/ChangeLog,v 1.37 2013/05/08 23:26:34 floppym Exp $
+
+ 08 May 2013; Mike Gilbert <floppym@gentoo.org> pypy-2.0_beta2.ebuild:
+ Die in pkg_pretend if gcc-4.8 is selected.
05 May 2013; Mike Gilbert <floppym@gentoo.org> pypy-2.0_beta2.ebuild:
Pregenerate cffi code for _curses and _sqlite3 modules.
diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest
index 35ac93322ac2..755a1ca7a52a 100644
--- a/dev-python/pypy/Manifest
+++ b/dev-python/pypy/Manifest
@@ -28,13 +28,13 @@ EBUILD pypy-1.9-r1.ebuild 3824 SHA256 28babbcc17d1b081558493c8b0bbf568b98367d301
EBUILD pypy-1.9-r2.ebuild 3897 SHA256 fa1f7192118019b73b6e1c399603cdc98fffc24e29018a9d2bbf2de6364761ca SHA512 920a6691835f8b7822e63b520f5b5d3ba367b55f56d61520552020154c3dd69c79d2b5fae155f3d29a99261f9643b5b12429d8fcf4c6e2f2d928d2f900652323 WHIRLPOOL a6552d90181c09eea456a37d9a253bbcdd29c96956d7113aaa38b5d050f03cc1068fbe2e8e72c6aa7468026ecf30abf6fd642a84d884c451339bb88b60dfab9e
EBUILD pypy-1.9.ebuild 3075 SHA256 4c49bc7e33ea8eccc5552e30cd2dab691ed579a5686b71ec97bccfa9336cc798 SHA512 3758cb3f6b0f34e45318e31a5765dffe369f0b63dbed1471f46c2c0c1948359026c413c19c77a95da5e16ebf96034186fc02a6bcf15f62dea5a034f6ccf13468 WHIRLPOOL 544d46da00f3e17c607cd284ac0413ccd565428e1d7a0217d1f2fd1bbb927433a9147b57957b293976c9eb26507e0365fedb26b58af0ad6bfdf6c16b27dd691e
EBUILD pypy-2.0_beta1.ebuild 3320 SHA256 6c0cf72ab9059a1d90b6c8eeda1d3c30e392f656fa1cf8616b32fce21f9d536b SHA512 54a68029d6fa41632597cfd402ce78cdde0906a3aba9ffbbe789fbf1b0196ac41cf391a3b7938edaf3a4c3c908047f6d642bb94c3812186849221204ea9b5715 WHIRLPOOL d6205a4cf9934415830a3f231ad9b12ff302cf8120092d62726367610fd94879b89d3ab7c40c4d9ba2418a80264ddc8e1c04ea0ee5836d141c5c154bb33a290c
-EBUILD pypy-2.0_beta2.ebuild 3681 SHA256 97f6fbbfa15e414a8cab73475a01d61801f7375fa141cad875daf1ff6d120820 SHA512 61314796a0566e8ba63be8fbba500fe6882bccff416dc3dfeac14bd866f942d179de8296d18a79e490fde4f40f005208c0c3e92be47a7211f0acfa2e5d3b274e WHIRLPOOL a57f069a5d278c86556ec29a347c94b2dbb835ee801f25f53442d8b0799a544982f4d04a9314a40c0ef35908841ff5a12782f0a16afef52c08cae92596e474df
-MISC ChangeLog 6926 SHA256 548ae4589271adec75efeb8c95a94cb054e32861998d060b080d15fb2d28c5d3 SHA512 0d83acf146fe6146db911d375bb2615bd65dfb42f492b96c84cf5e9fdc9a620af2dded19dde333b89ca4e4e6876f704bf26b96360237d55322cc93dd6ed5a758 WHIRLPOOL 16f79093b5de694098fbb9c7b88f8849087cae8f9a2f4d88fb55f797331ffc6effabcb61f3995590c5b4d24a651837a6f54b26710510f7f0cdc50db507ccad12
+EBUILD pypy-2.0_beta2.ebuild 3805 SHA256 857f3576426cc542499f62633af988f89a244721cab2f3cd295573eb0c2c7f44 SHA512 4d8036000f8205b4ebefb70b19839b8da12e7e70e4454d60de90e9ff08e2417c81eaf5bed5516de0c751e138f203237da6d0a468afa2c1eaf3adf5e86c61e7e8 WHIRLPOOL 2634d8491b86601ef35222fa61ef78b1bb938dce80ad6a9584ac040e009af593ee8746bc549362f227b8c4b510a57d0268c35e72c11fcd36869a75674e543807
+MISC ChangeLog 7044 SHA256 5daa0152aaa0769008faaf00a45f3c707be8c149e864bc53c0417b4b0f9daf77 SHA512 c8cfe2b0d706b87e1c2846a59ad4abba1c4441132a33a9d3158b06af38e78e41245eb2f1e91059ff4c607020937e40aaa1231d92afb7178ff38175a2bbb11d52 WHIRLPOOL 4db4877d9dac3dfd9581a47c3dec1309e6956857285fafb4d33cf7a3170e6f7db3142d94e776d6d94f44f8d9c296768f2ef944c5ee5da106c6c05a5f708e2a78
MISC metadata.xml 317 SHA256 cc6a42b7408bb6e6cebac0475a3419ff0f0e97c1301d5bdef029b3c24e278155 SHA512 87f0c04a0a10af65c51f587c3937995dcd5ddffe02caab1939a5562ddfbadd6baf5c8793c5f74717887d5779aaad6b7249a2a12d7f0f840cca6d79cdffa2ad7a WHIRLPOOL f5a509de1f99f97266128d34b79654a848c72d6a58caa19491874abe7c37fab047d6684c15397ed6f37f8b6e2ef35c0bc3e2831dd7d37739bc36116cc1b49284
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iF4EAREIAAYFAlGG6hIACgkQC77qH+pIQ6SZhQD/TxJptoY7BsblYCpo6MElNQH7
-IrlPuma6THPt48njqwwA/3vhd3KqstVzeBmv8om/y3J4eupAJ+jx5KIlAQXsv01x
-=0vHT
+iF4EAREIAAYFAlGK3ysACgkQC77qH+pIQ6SbiAD8DzpAfS+5FxWaznR/AhdxchRf
+Ee/onp+z3G8qdsS8540A/RS+KSW/6+ubm9ClRNqZ37yXOfz7kerAokbdBzVDn3Xt
+=BI/J
-----END PGP SIGNATURE-----
diff --git a/dev-python/pypy/pypy-2.0_beta2.ebuild b/dev-python/pypy/pypy-2.0_beta2.ebuild
index b3ce06684037..0c4065108cda 100644
--- a/dev-python/pypy/pypy-2.0_beta2.ebuild
+++ b/dev-python/pypy/pypy-2.0_beta2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-2.0_beta2.ebuild,v 1.2 2013/05/05 23:23:59 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-2.0_beta2.ebuild,v 1.3 2013/05/08 23:26:34 floppym Exp $
EAPI=5
@@ -33,6 +33,9 @@ pkg_pretend() {
CHECKREQS_MEMORY="2G"
use amd64 && CHECKREQS_MEMORY="4G"
check-reqs_pkg_pretend
+ if [[ ${MERGE_TYPE} != binary && "$(gcc_version)" == "4.8" ]]; then
+ die "PyPy does not build correctly with GCC 4.8"
+ fi
}
pkg_setup() {