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

16 files changed, 98 insertions, 59 deletions

diff --git a/profiles/arch/amd64/ChangeLog b/profiles/arch/amd64/ChangeLog
index 4bea4eac2c4a..7a9249d2299f 100644
--- a/profiles/arch/amd64/ChangeLog
+++ b/profiles/arch/amd64/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for Gentoo/AMD64 profile directory
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/ChangeLog,v 1.251 2014/03/30 21:31:36 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/ChangeLog,v 1.252 2014/03/30 21:38:38 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/amd64/package.use.stable.mask b/profiles/arch/amd64/package.use.stable.mask
index 0a9184616495..1c89dd11b54e 100644
--- a/profiles/arch/amd64/package.use.stable.mask
+++ b/profiles/arch/amd64/package.use.stable.mask
@@ -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/profiles/arch/amd64/package.use.stable.mask,v 1.1 2014/03/22 17:26:53 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/package.use.stable.mask,v 1.2 2014/03/30 21:38:38 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
@@ -18,6 +18,18 @@
 
 #--- 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
+
 # Mike Gilbert <floppym@gentoo.org> (22 Mar 2014)
 # sys-fs/zfs is not stable.
 sys-boot/grub libzfs
diff --git a/profiles/arch/amd64/use.mask b/profiles/arch/amd64/use.mask
index d55f96d7031b..c7de89b22c7b 100644
--- a/profiles/arch/amd64/use.mask
+++ b/profiles/arch/amd64/use.mask
@@ -1,12 +1,19 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/use.mask,v 1.58 2014/03/30 21:31:36 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/use.mask,v 1.59 2014/03/30 21:38:38 mgorny Exp $
 
 # Unmask the flag which corresponds to ARCH.
 -amd64
 
 # SECTION: Unmask
 
+# 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/amd64/use.stable.mask b/profiles/arch/amd64/use.stable.mask
index 60b96f9c81ee..eb17cc35ab33 100644
--- a/profiles/arch/amd64/use.stable.mask
+++ b/profiles/arch/amd64/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/amd64/use.stable.mask,v 1.1 2014/03/30 09:28:17 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/use.stable.mask,v 1.2 2014/03/30 21:38:38 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
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
diff --git a/profiles/default/linux/amd64/13.0/package.use.stable.mask b/profiles/default/linux/amd64/13.0/package.use.stable.mask
index 347759fe5339..c30c0f41609b 100644
--- a/profiles/default/linux/amd64/13.0/package.use.stable.mask
+++ b/profiles/default/linux/amd64/13.0/package.use.stable.mask
@@ -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/profiles/default/linux/amd64/13.0/package.use.stable.mask,v 1.12 2014/03/30 19:53:30 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/amd64/13.0/package.use.stable.mask,v 1.13 2014/03/30 21:39:52 mgorny Exp $
 
 # Tom Wijsman <TomWij@gentoo.org (16 Mar 2014)
 # Mask unstable USE flags on media-video/vlc, see security bug #499806.
@@ -10,14 +10,6 @@ media-video/vlc gnutls opus vdpau
 # [QA] Masked jit USE flag on www-apps/cgit as dev-lang/luajit is not stable.
 www-apps/cgit jit
 
-# Michał Górny <mgorny@gentoo.org> (16 Nov 2013)
-# 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_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
-
 # Ian Stakenvicius <axs@gentoo.org> (20 Sep 2013)
 # on behalf of gx86-multilib project <multilib@gentoo.org>
 # Mask abi_x86_32 on stable until emul-* packages are made
diff --git a/profiles/default/linux/amd64/13.0/use.mask b/profiles/default/linux/amd64/13.0/use.mask
deleted file mode 100644
index 6af1398774b7..000000000000
--- a/profiles/default/linux/amd64/13.0/use.mask
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/amd64/13.0/use.mask,v 1.2 2013/08/07 22:11:07 mgorny Exp $
-
-# Michał Górny <mgorny@gentoo.org> (19 Jan 2013)
-# PyPy is keyworded on this arch.
--python_targets_pypy2_0
--python_single_target_pypy2_0
diff --git a/profiles/default/linux/amd64/13.0/use.stable.mask b/profiles/default/linux/amd64/13.0/use.stable.mask
deleted file mode 100644
index de86ef4e55d9..000000000000
--- a/profiles/default/linux/amd64/13.0/use.stable.mask
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/amd64/13.0/use.stable.mask,v 1.4 2014/01/18 08:13:15 vapier Exp $
-
-# Michał Górny <mgorny@gentoo.org> (19 Jan 2013)
-# PyPy is unstable on this arch.
-python_targets_pypy2_0
-python_single_target_pypy2_0
diff --git a/profiles/default/linux/amd64/ChangeLog b/profiles/default/linux/amd64/ChangeLog
index 771ffbc49d61..ea4625c38ca9 100644
--- a/profiles/default/linux/amd64/ChangeLog
+++ b/profiles/default/linux/amd64/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for the default/linux/amd64 profile directory
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/amd64/ChangeLog,v 1.16 2014/03/30 19:53:30 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/amd64/ChangeLog,v 1.17 2014/03/30 21:39:52 mgorny Exp $
+
+  30 Mar 2014; Michał Górny <mgorny@gentoo.org> 13.0/package.use.stable.mask,
+  -13.0/use.mask, -13.0/use.stable.mask:
+  Move pypy flag masks to arch profile since it is EAPI=5 now.
 
   30 Mar 2014; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
   13.0/package.use.stable.mask:
diff --git a/profiles/default/linux/x86/13.0/package.use.stable.mask b/profiles/default/linux/x86/13.0/package.use.stable.mask
index 15d8f8e2a409..727b4c72bcc7 100644
--- a/profiles/default/linux/x86/13.0/package.use.stable.mask
+++ b/profiles/default/linux/x86/13.0/package.use.stable.mask
@@ -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/profiles/default/linux/x86/13.0/package.use.stable.mask,v 1.3 2014/03/16 22:40:58 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/x86/13.0/package.use.stable.mask,v 1.4 2014/03/30 21:40:40 mgorny Exp $
 
 # Tom Wijsman <TomWij@gentoo.org (16 Mar 2014)
 # Mask unstable USE flags on media-video/vlc, see security bug #499806.
@@ -9,11 +9,3 @@ media-video/vlc gnutls opus vdpau
 # Tom Wijsman <TomWij@gentoo.org> (06 Feb 2014)
 # [QA] Masked jit USE flag on www-apps/cgit as dev-lang/luajit is not stable.
 www-apps/cgit jit
-
-# Michał Górny <mgorny@gentoo.org> (16 Nov 2013)
-# 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_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/default/linux/x86/13.0/use.mask b/profiles/default/linux/x86/13.0/use.mask
deleted file mode 100644
index fd1805ab5499..000000000000
--- a/profiles/default/linux/x86/13.0/use.mask
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/x86/13.0/use.mask,v 1.2 2013/08/07 22:11:08 mgorny Exp $
-
-# Michał Górny <mgorny@gentoo.org> (19 Jan 2013)
-# PyPy is keyworded on this arch.
--python_targets_pypy2_0
--python_single_target_pypy2_0
diff --git a/profiles/default/linux/x86/13.0/use.stable.mask b/profiles/default/linux/x86/13.0/use.stable.mask
deleted file mode 100644
index 76a34dc3963d..000000000000
--- a/profiles/default/linux/x86/13.0/use.stable.mask
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/x86/13.0/use.stable.mask,v 1.4 2014/01/18 08:13:46 vapier Exp $
-
-# Michał Górny <mgorny@gentoo.org> (19 Jan 2013)
-# PyPy is unstable on this arch.
-python_targets_pypy2_0
-python_single_target_pypy2_0
diff --git a/profiles/default/linux/x86/ChangeLog b/profiles/default/linux/x86/ChangeLog
index 5470cedeebfe..b51bf2316c8e 100644
--- a/profiles/default/linux/x86/ChangeLog
+++ b/profiles/default/linux/x86/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for the default/linux/x86 profile directory
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/x86/ChangeLog,v 1.14 2014/03/19 22:19:26 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/x86/ChangeLog,v 1.15 2014/03/30 21:40:40 mgorny Exp $
+
+  30 Mar 2014; Michał Górny <mgorny@gentoo.org> 13.0/package.use.stable.mask,
+  -13.0/use.mask, -13.0/use.stable.mask:
+  Move pypy flag masks to arch profile since it is EAPI=5 now.
 
   19 Mar 2014; Andreas K. Huettel <dilfridge@gentoo.org> 13.0/desktop/eapi,
   13.0/desktop/gnome/eapi, +13.0/desktop/gnome/systemd/eapi,