diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2013-12-08 09:30:16 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2013-12-08 09:30:16 +0000 |
| commit | cdc2c15f9c349cc3c9fdc2c744c2f487ebb36998 (patch) | |
| tree | f285ce488803d865671aebd13fd298006e0f8575 /profiles | |
| parent | x86 stable, bug #474128 (diff) | |
| download | gentoo-2-cdc2c15f9c349cc3c9fdc2c744c2f487ebb36998.tar.gz gentoo-2-cdc2c15f9c349cc3c9fdc2c744c2f487ebb36998.tar.bz2 gentoo-2-cdc2c15f9c349cc3c9fdc2c744c2f487ebb36998.zip | |
Prepare for python-3.3 going to stable on x86 (#474128)
Diffstat (limited to 'profiles')
| -rw-r--r-- | profiles/ChangeLog | 6 | ||||
| -rw-r--r-- | profiles/arch/x86/make.defaults | 9 | ||||
| -rw-r--r-- | profiles/default/linux/x86/13.0/use.stable.mask | 7 | ||||
| -rw-r--r-- | profiles/hardened/linux/x86/use.stable.mask | 8 |
4 files changed, 26 insertions, 4 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog index 7ee6fb1c8995..815dbb008889 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.8413 2013/12/07 18:55:30 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.8414 2013/12/08 09:30:15 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! + 08 Dec 2013; Pacho Ramos <pacho@gentoo.org> arch/x86/make.defaults, + default/linux/x86/13.0/use.stable.mask, +hardened/linux/x86/use.stable.mask: + Prepare for python-3.3 going to stable on x86 (#474128) + 07 Dec 2013; Justin Lecher <jlec@gentoo.org> arch/amd64/package.use.mask, arch/x86/package.use.mask, base/package.use.mask: Mask USE=cuda for sci-libs/flann on all unsupported arches diff --git a/profiles/arch/x86/make.defaults b/profiles/arch/x86/make.defaults index 53c0be23d275..4ec2865eb15c 100644 --- a/profiles/arch/x86/make.defaults +++ b/profiles/arch/x86/make.defaults @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/make.defaults,v 1.10 2012/11/12 15:36:54 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/make.defaults,v 1.11 2013/12/08 09:30:16 pacho Exp $ # All extra USE/etc should be specified in sub-profiles. # DO NOT POLLUTE USE ON THIS PROFILE. @@ -14,6 +14,11 @@ CXXFLAGS="${CFLAGS}" FFLAGS="${CFLAGS}" FCFLAGS="${CFLAGS}" +# Pacho Ramos <pacho@gentoo.org> (08 Dec 2013) +# Python 3.3 is going to stable, bug #474128 +USE="${USE} -python_targets_python3_2 python_targets_python3_3" +BOOTSTRAP_USE="${BOOTSTRAP_USE} -python_targets_python3_2 python_targets_python3_3" + # 2006/08/18 - Donnie Berkholz <dberkholz@gentoo.org> # Defaults for video drivers VIDEO_CARDS="fbdev glint intel mach64 mga nouveau nv r128 radeon savage sis tdfx trident vesa via vmware voodoo" diff --git a/profiles/default/linux/x86/13.0/use.stable.mask b/profiles/default/linux/x86/13.0/use.stable.mask index d64fd69bcfa2..6e62ce3434a4 100644 --- a/profiles/default/linux/x86/13.0/use.stable.mask +++ b/profiles/default/linux/x86/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/x86/13.0/use.stable.mask,v 1.2 2013/08/07 22:11:08 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/x86/13.0/use.stable.mask,v 1.3 2013/12/08 09:30:16 pacho Exp $ + +# Pacho Ramos <pacho@gentoo.org> (08 Dec 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. diff --git a/profiles/hardened/linux/x86/use.stable.mask b/profiles/hardened/linux/x86/use.stable.mask new file mode 100644 index 000000000000..8a8273c4c08f --- /dev/null +++ b/profiles/hardened/linux/x86/use.stable.mask @@ -0,0 +1,8 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/x86/use.stable.mask,v 1.1 2013/12/08 09:30:16 pacho Exp $ + +# Pacho Ramos <pacho@gentoo.org> (08 Dec 2013) +# Python 3.3 is going to stable, bug #474128 +-python_targets_python3_3 +-python_single_target_python3_3 |