Move pypy flag masks to arch profile since it is EAPI=5 now.

4 files changed, 52 insertions, 3 deletions

diff --git a/profiles/arch/x86/ChangeLog b/profiles/arch/x86/ChangeLog
index 76855e18420b..e2431ecca482 100644
--- a/profiles/arch/x86/ChangeLog
+++ b/profiles/arch/x86/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for Gentoo/x86 profile directory
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/ChangeLog,v 1.162 2014/03/30 21:32:11 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/ChangeLog,v 1.163 2014/03/30 21:38:45 mgorny Exp $
+
+  30 Mar 2014; Michał Górny <mgorny@gentoo.org> +package.use.stable.mask,
+  use.mask, use.stable.mask:
+  Move pypy flag masks to arch profile since it is EAPI=5 now.
 
   30 Mar 2014; Michał Górny <mgorny@gentoo.org> use.mask:
   Fix order of use.mask. Sorry for messing it up.
diff --git a/profiles/arch/x86/package.use.stable.mask b/profiles/arch/x86/package.use.stable.mask
new file mode 100644
index 000000000000..73c7825cadac
--- /dev/null
+++ b/profiles/arch/x86/package.use.stable.mask
@@ -0,0 +1,31 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/package.use.stable.mask,v 1.1 2014/03/30 21:38:45 mgorny Exp $
+
+# When you add an entry to the top of this file, add your name, the date, and
+# an explanation of why something is getting masked. Please be extremely
+# careful not to commit atoms that are not valid, as it can cause large-scale
+# breakage, especially if it ends up in the daily snapshot.
+#
+## Example:
+##
+## # Dev E. Loper <developer@gentoo.org> (28 Jun 2012)
+## # Masking foo USE flag until we can get the
+## # foo stuff to work properly again (bug 12345)
+## =media-video/mplayer-0.90_pre5 foo
+## =media-video/mplayer-0.90_pre5-r1 foo
+#
+
+#--- END OF EXAMPLES ---
+
+# Michał Górny <mgorny@gentoo.org> (30 Mar 2014)
+# Don't apply stable masks to python-exec since we're forcing every
+# impl there anyway. Please keep this in sync with use.stable.mask.
+dev-lang/python-exec -python_targets_pypy
+dev-lang/python-exec -python_single_target_pypy
+dev-python/python-exec -python_targets_pypy
+dev-python/python-exec -python_single_target_pypy
+dev-lang/python-exec -python_targets_pypy2_0
+dev-lang/python-exec -python_single_target_pypy2_0
+dev-python/python-exec -python_targets_pypy2_0
+dev-python/python-exec -python_single_target_pypy2_0
diff --git a/profiles/arch/x86/use.mask b/profiles/arch/x86/use.mask
index 599ae21c7385..a9c4a77e71fe 100644
--- a/profiles/arch/x86/use.mask
+++ b/profiles/arch/x86/use.mask
@@ -1,10 +1,17 @@
 # Copyright 1999-2014 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/use.mask,v 1.59 2014/03/30 21:32:11 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/use.mask,v 1.60 2014/03/30 21:38:45 mgorny Exp $
 
 # Unmask the flag which corresponds to ARCH.
 -x86
 
+# Michał Górny <mgorny@gentoo.org> (30 Mar 2014)
+# PyPy is keyworded on this arch.
+-python_targets_pypy
+-python_single_target_pypy
+-python_targets_pypy2_0
+-python_single_target_pypy2_0
+
 # Michał Górny <mgorny@gentoo.org> (4 May 2013)
 # Unmask systemd since it is keyworded here.
 -systemd
diff --git a/profiles/arch/x86/use.stable.mask b/profiles/arch/x86/use.stable.mask
index 8c4b53ab94a3..7e1cdfc8f9b8 100644
--- a/profiles/arch/x86/use.stable.mask
+++ b/profiles/arch/x86/use.stable.mask
@@ -1,10 +1,17 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/use.stable.mask,v 1.1 2014/03/30 09:30:18 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/use.stable.mask,v 1.2 2014/03/30 21:38:45 mgorny Exp $
 
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
+# Michał Górny <mgorny@gentoo.org> (30 Mar 2014)
+# PyPy is unstable on this arch.
+python_targets_pypy
+python_single_target_pypy
+python_targets_pypy2_0
+python_single_target_pypy2_0
+
 # Andrey Grozin <grozin@gentoo.org> (19 Mar 2014)
 # there is no stable dev-lisp/gcl
 gcl