summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2014-11-23 15:55:19 +0000
committerMike Gilbert <floppym@gentoo.org>2014-11-23 15:55:19 +0000
commit64d4b82fa0bdf76697cf53c1b24c29f6167f9466 (patch)
tree6906004595d413b7c044486dcd4d32dab32c5289 /profiles/arch
parentDisable python3_4 default for this arch. (diff)
downloadgentoo-2-64d4b82fa0bdf76697cf53c1b24c29f6167f9466.tar.gz
gentoo-2-64d4b82fa0bdf76697cf53c1b24c29f6167f9466.tar.bz2
gentoo-2-64d4b82fa0bdf76697cf53c1b24c29f6167f9466.zip
Disable python3_4 default for this arch.
Diffstat (limited to 'profiles/arch')
-rw-r--r--profiles/arch/alpha/ChangeLog5
-rw-r--r--profiles/arch/alpha/make.defaults6
2 files changed, 9 insertions, 2 deletions
diff --git a/profiles/arch/alpha/ChangeLog b/profiles/arch/alpha/ChangeLog
index 40cc1f5907cd..d02a1ae973c7 100644
--- a/profiles/arch/alpha/ChangeLog
+++ b/profiles/arch/alpha/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for Gentoo/Alpha profile directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/alpha/ChangeLog,v 1.206 2014/11/20 01:49:38 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/alpha/ChangeLog,v 1.207 2014/11/23 15:55:19 floppym Exp $
+
+ 23 Nov 2014; Mike Gilbert <floppym@gentoo.org> make.defaults:
+ Disable python3_4 default for this arch.
20 Nov 2014; Davide Pesavento <pesa@gentoo.org> package.mask:
Move Qt 4.8.6 mask from global package.mask to arch profiles.
diff --git a/profiles/arch/alpha/make.defaults b/profiles/arch/alpha/make.defaults
index a5ff4bc7e598..880e5834999e 100644
--- a/profiles/arch/alpha/make.defaults
+++ b/profiles/arch/alpha/make.defaults
@@ -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/arch/alpha/make.defaults,v 1.7 2014/07/01 14:18:07 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/alpha/make.defaults,v 1.8 2014/11/23 15:55:19 floppym Exp $
ARCH="alpha"
ACCEPT_KEYWORDS="alpha"
@@ -11,6 +11,10 @@ CXXFLAGS="${CFLAGS}"
FFLAGS="${CFLAGS}"
FCFLAGS="${CFLAGS}"
+# Mike Gilbert <floppym@gentoo.org> (23 Nov 2014)
+# Remove when bug 525510 is resolved.
+USE="python_targets_python3_3 -python_targets_python3_4"
+
# Michał Górny <mgorny@gentoo.org> (01 Jul 2014)
# Set ABI & DEFAULT_ABI consistently with ${ARCH}, to make ebuild
# checks simpler.