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

4 files changed, 6 insertions, 26 deletions

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: