summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2013-12-17 20:08:52 +0000
committerFabian Groffen <grobian@gentoo.org>2013-12-17 20:08:52 +0000
commite78c5c978a19a6ea7ae3a7d744486783e421444f (patch)
treeaeead8d81ca35cdafb7a557133b32dd566c5153e /profiles
parentPatch header change (diff)
downloadgentoo-2-e78c5c978a19a6ea7ae3a7d744486783e421444f.tar.gz
gentoo-2-e78c5c978a19a6ea7ae3a7d744486783e421444f.tar.bz2
gentoo-2-e78c5c978a19a6ea7ae3a7d744486783e421444f.zip
Bump eapi to 5 to unmask python-3.3, bug #493836 and bug #474128
Diffstat (limited to 'profiles')
-rw-r--r--profiles/prefix/ChangeLog6
-rw-r--r--profiles/prefix/eapi2
-rw-r--r--profiles/prefix/make.defaults6
-rw-r--r--profiles/prefix/use.stable.mask8
4 files changed, 19 insertions, 3 deletions
diff --git a/profiles/prefix/ChangeLog b/profiles/prefix/ChangeLog
index adc0add8453c..80590d2dc105 100644
--- a/profiles/prefix/ChangeLog
+++ b/profiles/prefix/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for profiles/prefix
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/ChangeLog,v 1.401 2013/12/08 18:40:38 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/ChangeLog,v 1.402 2013/12/17 20:08:52 grobian Exp $
+
+ 17 Dec 2013; Fabian Groffen <grobian@gentoo.org> eapi, make.defaults,
+ +use.stable.mask:
+ Bump eapi to 5 to unmask python-3.3, bug #493836 and bug #474128
08 Dec 2013; Fabian Groffen <grobian@gentoo.org> use.mask:
Remove obsolete python3_3 unmasks
diff --git a/profiles/prefix/eapi b/profiles/prefix/eapi
index d00491fd7e5b..7ed6ff82de6b 100644
--- a/profiles/prefix/eapi
+++ b/profiles/prefix/eapi
@@ -1 +1 @@
-1
+5
diff --git a/profiles/prefix/make.defaults b/profiles/prefix/make.defaults
index 1825795187e8..43dd81c09f18 100644
--- a/profiles/prefix/make.defaults
+++ b/profiles/prefix/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/prefix/make.defaults,v 1.5 2013/04/20 14:46:13 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/make.defaults,v 1.6 2013/12/17 20:08:52 grobian Exp $
# Some USE-flags that only die-hards don't want:
# readline: to have some sane command line editing, e.g. in python
@@ -24,6 +24,10 @@ FEATURES="collision-protect"
# should be enabled on a per-profile basis only.
FEATURES="${FEATURES} -sandbox"
+# Fabian Groffen <grobian@gentoo.org> (17 Dec 2013)
+# Unmask/use Python 3.3, bug #474128
+USE="${USE} -python_targets_python3_2 python_targets_python3_3"
+
# this probably already is like this, but we assure that in prefix we
# have a GNU userland
USERLAND="GNU"
diff --git a/profiles/prefix/use.stable.mask b/profiles/prefix/use.stable.mask
new file mode 100644
index 000000000000..81725135c419
--- /dev/null
+++ b/profiles/prefix/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/prefix/use.stable.mask,v 1.1 2013/12/17 20:08:52 grobian Exp $
+
+# Fabian Groffen <grobian@gentoo.org> (17 Dec 2013)
+# Python 3.3 is better patched than 3.2 for us, gx86 goes too, bug #474128
+-python_targets_python3_3
+-python_single_target_python3_3