summaryrefslogtreecommitdiff
path: root/profiles/base
diff options
context:
space:
mode:
Diffstat (limited to 'profiles/base')
-rw-r--r--profiles/base/package.use.force2
-rw-r--r--profiles/base/package.use.mask8
-rw-r--r--profiles/base/package.use.stable.mask4
-rw-r--r--profiles/base/use.mask2
-rw-r--r--profiles/base/use.stable.mask5
5 files changed, 16 insertions, 5 deletions
diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index 9ecd214b54..14abfe82ea 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -34,7 +34,7 @@ app-shells/bash:0 readline
# Michał Górny <mgorny@gentoo.org> (14 Oct 2012)
# Force-enable all PYTHON_TARGETS for python-exec to avoid using private
# API. Please remember to keep it in sync with python_targets.desc.
-dev-lang/python-exec python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_jython2_5 python_targets_jython2_7 python_targets_pypy python_targets_pypy3
+dev-lang/python-exec python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 python_targets_jython2_5 python_targets_jython2_7 python_targets_pypy python_targets_pypy3
# Zac Medico <zmedico@gentoo.org> (20 Oct 2010)
# Force ipc USE flag since it should remain enabled unless
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index cc2e9338f4..4d49b915e6 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -5,6 +5,10 @@
# This file requires >=portage-2.1.1
# New entries go on top.
+# Rick Farina <zerochaos@gentoo.org> (06 Oct 2015)
+# forward porting this patch is non-trivial, mask for now
+=net-wireless/wpa_supplicant-2.5 wimax
+
# Nathan Phillip Brink <binki@gentoo.org> (26 Sep 2015)
# git useflag requires dev-libs/libgit2 which few arches support
dev-util/geany-plugins git
@@ -445,10 +449,6 @@ net-proxy/swiftiply ruby_targets_ruby19
# gentoo bugs.
media-libs/libsdl2 custom-cflags
-# Mike Gilbert <floppym@gentoo.org> (23 Aug 2013)
-# Requires hard-masked ffmpeg.
->=www-client/chromium-30 system-ffmpeg
-
# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (22 Aug 2013)
# Causes build to fail, issue is being discussed with upstream
>=www-plugins/gnash-0.8.10_p20130822 openvg
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index 72a22f64b3..159c181243 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -5,6 +5,10 @@
# This file requires eapi 5 or later. New entries go on top.
# Please use the same syntax as in package.use.mask
+# Mike Gilbert <floppym@gentoo.org> (03 Oct 2015)
+# Unmask python3.5 for python-exec
+dev-lang/python-exec -python_targets_python3_5
+
# Andreas Huettel <dilfridge@gentoo.org> (26 Sep 2015)
# Not stable enough for stable (Debian and SuSE disable it completely)
=app-office/libreoffice-5.0* gtk3
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index f93ee4d662..4abfbedd0d 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -15,6 +15,7 @@ cuda
ruby_targets_ruby18
ruby_targets_jruby
ruby_targets_ree18
+ruby_targets_ruby19
# masking here and unmasking in default/linux/
kmod
@@ -194,6 +195,7 @@ psyco
userland_BSD
elibc_AIX
+elibc_bionic
elibc_Cygwin
elibc_Darwin
elibc_DragonFly
diff --git a/profiles/base/use.stable.mask b/profiles/base/use.stable.mask
index 955e697625..ea8f6ebf76 100644
--- a/profiles/base/use.stable.mask
+++ b/profiles/base/use.stable.mask
@@ -5,6 +5,11 @@
# This file requires eapi 5 or later. New entries go on top.
# Please use the same syntax as in use.mask
+# Mike Gilbert <floppym@gentoo.org> (02 Oct 2015)
+# Needs dev-lang/python:3.5 stable
+python_targets_python3_5
+python_single_target_python3_5
+
# Justin Lecher <jlec@gentoo.org> (30 Sep 2015)
# No stable libressl yet
libressl