Wipe out references to removed Python targets.

9 files changed, 23 insertions, 24 deletions

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index ac4425037179..e893cd2453c2 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for profile directory
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9356 2014/09/06 10:28:34 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9357 2014/09/06 10:31:59 mgorny Exp $
 #
 # This ChangeLog should include records for all changes in profiles directory.
 # Only typo fixes which don't affect portage/repoman behaviour could be avoided
@@ -8,6 +8,10 @@
 
   06 Sep 2014; Michał Górny <mgorny@gentoo.org>
   desc/python_single_target.desc, desc/python_targets.desc:
+  Wipe out references to removed Python targets.
+
+  06 Sep 2014; Michał Górny <mgorny@gentoo.org>
+  desc/python_single_target.desc, desc/python_targets.desc:
   Update Python target descriptions.
 
   05 Sep 2014; Michael Orlitzky <mjo@gentoo.org> package.mask:
diff --git a/profiles/arch/amd64-fbsd/ChangeLog b/profiles/arch/amd64-fbsd/ChangeLog
index 7028e7827454..61ed2dd65cb5 100644
--- a/profiles/arch/amd64-fbsd/ChangeLog
+++ b/profiles/arch/amd64-fbsd/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for Gentoo/x86-fbsd profile directory
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64-fbsd/ChangeLog,v 1.53 2014/07/01 07:49:04 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64-fbsd/ChangeLog,v 1.54 2014/09/06 10:31:30 mgorny Exp $
+
+  06 Sep 2014; Michał Górny <mgorny@gentoo.org> use.mask:
+  Wipe out references to removed Python targets.
 
   01 Jul 2014; Michał Górny <mgorny@gentoo.org> make.defaults:
   Set default ABI_X86 and IUSE_IMPLICIT.
diff --git a/profiles/arch/amd64-fbsd/use.mask b/profiles/arch/amd64-fbsd/use.mask
index 620c0f055974..e85407a0dfec 100644
--- a/profiles/arch/amd64-fbsd/use.mask
+++ b/profiles/arch/amd64-fbsd/use.mask
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation.
+# Copyright 1999-2014 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64-fbsd/use.mask,v 1.18 2013/09/05 10:08:25 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64-fbsd/use.mask,v 1.19 2014/09/06 10:31:30 mgorny Exp $
 
 # Unmask the flag which corresponds to ARCH.
 -amd64-fbsd
@@ -34,11 +34,6 @@
 # Orc optimisations work fine on amd64 and x86
 -orc
 
-# Alexandre Rostovtsev <tetromino@gmail.com> (16 Jul 2012)
-# Only python:2.7 and :3.2 are keyworded on this arch
-python_targets_python2_6
-python_single_target_python2_6
-
 # Diego Elio Pettenò <flameeyes@gentoo.org> (21 Aug 2012)
 # IPMI is only implemented for x86, amd64 and ia64
 -ipmi
diff --git a/profiles/arch/arm64/ChangeLog b/profiles/arch/arm64/ChangeLog
index 6a929cdae0ca..59c19ab426c3 100644
--- a/profiles/arch/arm64/ChangeLog
+++ b/profiles/arch/arm64/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for Gentoo/ARM profile directory
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/arm64/ChangeLog,v 1.3 2014/08/04 02:13:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/arm64/ChangeLog,v 1.4 2014/09/06 10:31:37 mgorny Exp $
+
+  06 Sep 2014; Michał Górny <mgorny@gentoo.org> use.mask:
+  Wipe out references to removed Python targets.
 
   04 Aug 2014; Mike Frysinger <vapier@gentoo.org> package.use.mask:
   Drop flashrom masks that are in base now.
diff --git a/profiles/arch/arm64/use.mask b/profiles/arch/arm64/use.mask
index 313e9813b681..30461b4d6248 100644
--- a/profiles/arch/arm64/use.mask
+++ b/profiles/arch/arm64/use.mask
@@ -231,11 +231,5 @@ clvm
 # virtual/opencl is not keyworded
 opencl
 
-# We don't care about older python versions.  Time to upgrade.
-python_targets_python2_6
-python_targets_python3_0
-python_targets_python3_1
-python_targets_python3_2
-
 # This one we need to test ...
 python_targets_python3_3
diff --git a/profiles/base/ChangeLog b/profiles/base/ChangeLog
index 02df0951905d..fb3730f6da46 100644
--- a/profiles/base/ChangeLog
+++ b/profiles/base/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for Gentoo base-profile
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.716 2014/09/06 10:27:35 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.717 2014/09/06 10:31:52 mgorny Exp $
+
+  06 Sep 2014; Michał Górny <mgorny@gentoo.org> package.use.mask:
+  Wipe out references to removed Python targets.
 
   06 Sep 2014; Michał Górny <mgorny@gentoo.org> package.use.force,
   package.use.mask, use.mask:
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 27e9506c12f8..2f92cb0908d0 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.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/base/package.use.mask,v 1.592 2014/09/06 10:27:35 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.593 2014/09/06 10:31:52 mgorny Exp $
 
 # This file requires >=portage-2.1.1
 # New entries go on top.
@@ -177,8 +177,7 @@ dev-libs/boost context
 
 # Gilles Dartiguelongue <eva@gentoo.org> (25 Dec 2013)
 # gjs: tests fail and support for it was purely and simply removed in master/1.9
-# python2_6: unit tests fail for this abi, must report usptream
->=dev-libs/libpeas-1.9 gjs python_targets_python2_6
+>=dev-libs/libpeas-1.9 gjs
 
 # Gilles Dartiguelongue <eva@gentoo.org> (23 Dec 2013)
 # Gstreamer support fails to build due to libtool shortcomings when using
diff --git a/profiles/desc/python_single_target.desc b/profiles/desc/python_single_target.desc
index e24cfa9a180b..e0d5208f0eeb 100644
--- a/profiles/desc/python_single_target.desc
+++ b/profiles/desc/python_single_target.desc
@@ -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/desc/python_single_target.desc,v 1.9 2014/09/06 10:28:34 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/desc/python_single_target.desc,v 1.10 2014/09/06 10:31:59 mgorny Exp $
 
 # This file contains descriptions of PYTHON_SINGLE_TARGET USE_EXPAND flags.
 
@@ -10,5 +10,4 @@ python3_3 - Build for Python 3.3 only
 python3_4 - Build for Python 3.4 only
 jython2_5 - Build for Jython 2.5 only
 jython2_7 - Build for Jython 2.7 only
-pypy2_0 - Build for PyPy 2.0 only
 pypy - Build for PyPy (Python 2 branch) only
diff --git a/profiles/desc/python_targets.desc b/profiles/desc/python_targets.desc
index bef77d289c14..f65fac8b5262 100644
--- a/profiles/desc/python_targets.desc
+++ b/profiles/desc/python_targets.desc
@@ -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/desc/python_targets.desc,v 1.12 2014/09/06 10:28:34 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/desc/python_targets.desc,v 1.13 2014/09/06 10:31:59 mgorny Exp $
 
 # This file contains descriptions of PYTHON_TARGETS USE_EXPAND flags.
 
@@ -10,5 +10,4 @@ python3_3 - Build with Python 3.3
 python3_4 - Build with Python 3.4
 jython2_5 - Build with Jython 2.5
 jython2_7 - Build with Jython 2.7
-pypy2_0 - Build with PyPy 2.0
 pypy - Build with PyPy (Python 2 branch)