summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2014-04-26 11:03:58 +0000
committerMichał Górny <mgorny@gentoo.org>2014-04-26 11:03:58 +0000
commit76b30ae2d3a80d887d5ce424f8fef0892c6b16f1 (patch)
tree48fdb18bf7b0e42351924f21bc075a733a52b0de /profiles
parentbump; add py3 support (diff)
downloadhistorical-76b30ae2d3a80d887d5ce424f8fef0892c6b16f1.tar.gz
historical-76b30ae2d3a80d887d5ce424f8fef0892c6b16f1.tar.bz2
historical-76b30ae2d3a80d887d5ce424f8fef0892c6b16f1.zip
Mask USE flags for Python 2.6 to prepare for the removal.
Diffstat (limited to 'profiles')
-rw-r--r--profiles/base/ChangeLog5
-rw-r--r--profiles/base/package.use.mask8
-rw-r--r--profiles/base/use.mask10
3 files changed, 20 insertions, 3 deletions
diff --git a/profiles/base/ChangeLog b/profiles/base/ChangeLog
index fc5766facf9f..7db501623226 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.681 2014/04/26 09:43:12 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.682 2014/04/26 11:03:58 mgorny Exp $
+
+ 26 Apr 2014; Michał Górny <mgorny@gentoo.org> package.use.mask, use.mask:
+ Mask USE flags for Python 2.6 to prepare for the removal.
26 Apr 2014; Tim Harder <radhermit@gentoo.org> package.use.mask:
Mask qt5 use flag on >=media-video/mkvtoolnix-6.9.0 until qt5 pkgs are added
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index d74874ac55a1..61c9714ab26e 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -1,11 +1,17 @@
# 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.565 2014/04/26 09:43:12 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.566 2014/04/26 11:03:58 mgorny Exp $
# This file requires >=portage-2.1.1
# New entries go on top.
#
+# Michał Górny <mgorny@gentoo.org> (26 Apr 2014)
+# (on behalf of Python team)
+# Keep 2.6 enabled to ease the migration.
+dev-lang/python-exec -python_targets_python2_6 -python_single_target_python2_6
+dev-python/python-exec -python_targets_python2_6 -python_single_target_python2_6
+
# Tim Harder <radhermit@gentoo.org> (26 Apr 2014)
# Masked until qt5 is in the tree
>=media-video/mkvtoolnix-6.9.0 qt5
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index b71897828205..ee5baeb94c04 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/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/use.mask,v 1.195 2014/04/08 09:43:46 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/use.mask,v 1.196 2014/04/26 11:03:58 mgorny Exp $
# cuda only works on amd64/x86
cuda
@@ -368,3 +368,11 @@ qt5
# Enabling this you will get a fully unsupported Gnome setup that
# could suffer unexpected problem, don't expect support for it then.
openrc-force
+
+# Michał Górny <mgorny@gentoo.org> (26 Apr 2014)
+# (on behalf of Python team)
+# Python 2.6 is no longer supported upstream and security issue fixes
+# are not provided anymore. Python 2.7 is almost drop-in replacement.
+# The support for implementations will be disabled in 30 days.
+python_targets_python2_6
+python_single_target_python2_6