From 536c3711867ec947c1738f2c4b96f22e4863322d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 18 Nov 2018 09:38:27 +0000 Subject: gentoo resync : 18.11.2018 --- profiles/arch/powerpc/ppc64/32ul/package.mask | 6 ------ profiles/arch/powerpc/ppc64/64le/package.mask | 5 +++++ profiles/arch/powerpc/ppc64/64ul/package.mask | 1 + profiles/arch/powerpc/ppc64/make.defaults | 4 ++++ profiles/arch/powerpc/ppc64/use.stable.mask | 4 ++++ 5 files changed, 14 insertions(+), 6 deletions(-) delete mode 100644 profiles/arch/powerpc/ppc64/32ul/package.mask (limited to 'profiles/arch/powerpc/ppc64') diff --git a/profiles/arch/powerpc/ppc64/32ul/package.mask b/profiles/arch/powerpc/ppc64/32ul/package.mask deleted file mode 100644 index 1fc0ad794669..000000000000 --- a/profiles/arch/powerpc/ppc64/32ul/package.mask +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright 2012-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# James Le Cuirot (19 Oct 2018) -# AdoptOpenJDK's ppc64 build is little-endian only. -dev-java/openjdk-bin diff --git a/profiles/arch/powerpc/ppc64/64le/package.mask b/profiles/arch/powerpc/ppc64/64le/package.mask index 539351b0911a..962a4dd5bfb2 100644 --- a/profiles/arch/powerpc/ppc64/64le/package.mask +++ b/profiles/arch/powerpc/ppc64/64le/package.mask @@ -1,6 +1,11 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 +# James Le Cuirot (19 Oct 2018) +# AdoptOpenJDK's ppc64 build is little-endian only. +-dev-java/openjdk +-dev-java/openjdk-bin + # Sergei Trofimovich (11 Apr 2018) # ltrace is not ported to powerpc64le yet. dev-util/ltrace diff --git a/profiles/arch/powerpc/ppc64/64ul/package.mask b/profiles/arch/powerpc/ppc64/64ul/package.mask index def9c263cb79..6954fae21350 100644 --- a/profiles/arch/powerpc/ppc64/64ul/package.mask +++ b/profiles/arch/powerpc/ppc64/64ul/package.mask @@ -3,6 +3,7 @@ # James Le Cuirot (19 Oct 2018) # AdoptOpenJDK's ppc64 build is little-endian only. +dev-java/openjdk dev-java/openjdk-bin # =gcc-4 on ppc64 diff --git a/profiles/arch/powerpc/ppc64/make.defaults b/profiles/arch/powerpc/ppc64/make.defaults index 7f43ef6c4888..ee493e24c302 100644 --- a/profiles/arch/powerpc/ppc64/make.defaults +++ b/profiles/arch/powerpc/ppc64/make.defaults @@ -39,3 +39,7 @@ VIDEO_CARDS="fbdev mga nv r128 radeon" # Enable abi_ppc_64 for packages that don't have it forced. ABI_PPC="64" + +# Hans de Graaff (12 Nov 2018) +# Temporary entry to support stable bug 661262 +RUBY_TARGETS="ruby23 -ruby24" diff --git a/profiles/arch/powerpc/ppc64/use.stable.mask b/profiles/arch/powerpc/ppc64/use.stable.mask index a47ca75152f7..dadeeb17b0e0 100644 --- a/profiles/arch/powerpc/ppc64/use.stable.mask +++ b/profiles/arch/powerpc/ppc64/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 (12 Nov 2018) +# Temporary mask for ruby:2.4, bug 661262 +ruby_targets_ruby24 + # Mike Gilbert (08 Jun 2017) # dev-lang/python:3.7 is not stable. python_targets_python3_7 -- cgit v1.2.3