From 677b7ba5c317778df2ad7e70df94b9b7eec4adbc Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 10 Sep 2021 04:21:55 +0100 Subject: gentoo resync : 10.09.2021 --- profiles/arch/amd64/no-multilib/package.mask | 4 ++++ profiles/arch/amd64/x32/make.defaults | 6 +++++- profiles/arch/amd64/x32/package.mask | 7 ++++++- 3 files changed, 15 insertions(+), 2 deletions(-) (limited to 'profiles/arch/amd64') diff --git a/profiles/arch/amd64/no-multilib/package.mask b/profiles/arch/amd64/no-multilib/package.mask index be0cafe42b36..d753dcd3504a 100644 --- a/profiles/arch/amd64/no-multilib/package.mask +++ b/profiles/arch/amd64/no-multilib/package.mask @@ -1,6 +1,10 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# James Le Cuirot (2021-09-04) +# This code assumes 32-bit longs and must therefore be built as a 32-bit binary. +sys-fs/atari-fdisk + # David Seifert (2018-01-03) # Requires 32-bit multilib compatibility sys-block/megamgr diff --git a/profiles/arch/amd64/x32/make.defaults b/profiles/arch/amd64/x32/make.defaults index b509b305b008..0c9b008c9fd7 100644 --- a/profiles/arch/amd64/x32/make.defaults +++ b/profiles/arch/amd64/x32/make.defaults @@ -1,10 +1,14 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 DEFAULT_ABI="x32" ABI="x32" MULTILIB_ABIS="amd64 x86 x32" +# Mike Gilbert (2021-09-06) +# x32 userspace runs on amd64 kernels. +KERNEL_ABI="amd64" + # Michał Górny (2014-07-01) # Default to abi_x86_x32 for packages that don't have it forced. ABI_X86="x32" diff --git a/profiles/arch/amd64/x32/package.mask b/profiles/arch/amd64/x32/package.mask index ee7ea189a2a5..a0232eb6ec61 100644 --- a/profiles/arch/amd64/x32/package.mask +++ b/profiles/arch/amd64/x32/package.mask @@ -1,6 +1,11 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Andrew Ammerlaan (2021-09-09) +# Jupyterlab and friends require net-libs/nodejs +dev-python/jupyterlab +dev-python/jupyterlab-lsp + # Bernd Waibel (2021-02-13) # Is reverse-dependency of dev-qt/qtwebengine media-gfx/freecad @@ -81,7 +86,7 @@ media-gfx/digikam:5 media-gfx/luminance-hdr media-sound/frescobaldi media-sound/teamspeak-client:3 ->=media-video/openshot-2.5.1_p20210103 +>=media-video/openshot-2.6.0 media-video/vidify media-video/vidify-audiosync net-analyzer/nmapsi -- cgit v1.2.3