diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-01-21 19:03:35 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-01-21 19:03:35 +0000 |
commit | 0ebf740b9c9bc7c10ac41bea315ecc6c01c79166 (patch) | |
tree | 15bb76d57cfb8652fd2627a24007e0bb92ec4a99 /profiles/arch/arm | |
parent | 5b5df25227111ef465caf5c52bcfb66dac3219cd (diff) |
gentoo resync : 21.01.2018
Diffstat (limited to 'profiles/arch/arm')
-rw-r--r-- | profiles/arch/arm/make.defaults | 3 | ||||
-rw-r--r-- | profiles/arch/arm/package.use.mask | 6 | ||||
-rw-r--r-- | profiles/arch/arm/use.stable.mask | 4 |
3 files changed, 12 insertions, 1 deletions
diff --git a/profiles/arch/arm/make.defaults b/profiles/arch/arm/make.defaults index c0a917b65d74..410843f5d636 100644 --- a/profiles/arch/arm/make.defaults +++ b/profiles/arch/arm/make.defaults @@ -23,3 +23,6 @@ VIDEO_CARDS="exynos fbdev omap" # Unhide the ARM-specific USE_EXPANDs. USE_EXPAND_HIDDEN="-CPU_FLAGS_ARM" +# Hans de Graaff <graaff@gentoo.org> (21 Jan 2018) +# Temporary entry to support stable bug 639476 +RUBY_TARGETS="ruby22" diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask index 7b7ae26d1c3e..c06510394fc2 100644 --- a/profiles/arch/arm/package.use.mask +++ b/profiles/arch/arm/package.use.mask @@ -1,6 +1,10 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 +# Amy Liffey <amynka@gentoo.org (21 Jan 2018) +# dev-libs/cereal not keyworded for arm +media-libs/opencv contrib_dnn + # Michał Górny <mgorny@gentoo.org> (30 Dec 2017) # Moved from use.mask since they are flags local to one package. dev-cpp/xsd ace diff --git a/profiles/arch/arm/use.stable.mask b/profiles/arch/arm/use.stable.mask index 71be5d31fbc5..34affefc969d 100644 --- a/profiles/arch/arm/use.stable.mask +++ b/profiles/arch/arm/use.stable.mask @@ -4,6 +4,10 @@ # This file requires eapi 5 or later. New entries go on top. # Please use the same syntax as in use.mask +# Hans de Graaff <graaff@gentoo.org> (21 Jan 2018) +# Temporary mask to support stable bug 639476 +ruby_targets_ruby23 + # Brian Evans <grknight@gentoo.org> (16 Dec 2017) # Needs dev-lang/php:7.1 stable php_targets_php7-1 |