summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2013-11-30 13:18:57 +0000
committerPacho Ramos <pacho@gentoo.org>2013-11-30 13:18:57 +0000
commit6d08635724133512e4786e6c75228a6cef4aac48 (patch)
tree57f73596c57638a91c2adf816c5625b1e35c113f /profiles
parentamd64 stable, bug #474128 (diff)
downloadhistorical-6d08635724133512e4786e6c75228a6cef4aac48.tar.gz
historical-6d08635724133512e4786e6c75228a6cef4aac48.tar.bz2
historical-6d08635724133512e4786e6c75228a6cef4aac48.zip
Modify profile settings for python-3.3 going to stable, bug #474128
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog6
-rw-r--r--profiles/arch/amd64/make.defaults6
-rw-r--r--profiles/default/linux/amd64/13.0/use.stable.mask7
3 files changed, 16 insertions, 3 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index c78b6f9fcf51..1f78465f3ba0 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,15 @@
# ChangeLog for profile directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.8396 2013/11/30 12:21:07 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.8397 2013/11/30 13:18:56 pacho 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
# here. If in doubt put a record here!
+ 30 Nov 2013; Pacho Ramos <pacho@gentoo.org> arch/amd64/make.defaults,
+ default/linux/amd64/13.0/use.stable.mask:
+ Modify profile settings for python-3.3 going to stable, bug #474128
+
30 Nov 2013; Markos Chandras <hwoarang@gentoo.org> desc/input_devices.desc:
Add new roccat devices by Dmitry Pisklov. Bug #492810
diff --git a/profiles/arch/amd64/make.defaults b/profiles/arch/amd64/make.defaults
index c8756efede53..03c746052fee 100644
--- a/profiles/arch/amd64/make.defaults
+++ b/profiles/arch/amd64/make.defaults
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/make.defaults,v 1.18 2013/10/03 16:27:37 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/make.defaults,v 1.19 2013/11/30 13:18:57 pacho Exp $
ARCH="amd64"
ACCEPT_KEYWORDS="${ARCH}"
@@ -38,6 +38,10 @@ CHOST_x32="x86_64-pc-linux-gnux32"
# >=portage-2.1.2_pre3-r4
USE="mmx sse sse2"
+# Pacho Ramos <pacho@gentoo.org> (30 Nov 2013)
+# Python 3.3 is going to stable, bug #474128
+USE="${USE} -python_targets_python3_2 python_targets_python3_3"
+
# Michał Górny <mgorny@gentoo.org> (03 Sep 2013)
# Enable abi_x86_64 for packages that don't have it forced.
ABI_X86="64"
diff --git a/profiles/default/linux/amd64/13.0/use.stable.mask b/profiles/default/linux/amd64/13.0/use.stable.mask
index bd4ca1c12c67..e8376855c1ae 100644
--- a/profiles/default/linux/amd64/13.0/use.stable.mask
+++ b/profiles/default/linux/amd64/13.0/use.stable.mask
@@ -1,6 +1,11 @@
# 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.2 2013/08/07 22:11:07 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/amd64/13.0/use.stable.mask,v 1.3 2013/11/30 13:18:57 pacho Exp $
+
+# Pacho Ramos <pacho@gentoo.org> (30 Nov 2013)
+# Python 3.3 is going to stable, bug #474128
+-python_targets_python3_3
+-python_single_target_python3_3
# Michał Górny <mgorny@gentoo.org> (19 Jan 2013)
# PyPy is unstable on this arch.