From 0f558761aa2dee1017b4751e4017205e015a9560 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 29 Jun 2022 12:04:12 +0100 Subject: gentoo resync : 29.12.2022 --- profiles/arch/s390/s390x/make.defaults | 4 ++-- profiles/arch/s390/s390x/package.mask | 18 ------------------ profiles/arch/s390/s390x/package.use.force | 4 ++++ profiles/arch/s390/s390x/package.use.mask | 9 +++++++++ profiles/arch/s390/s390x/parent | 1 + profiles/arch/s390/s390x/use.force | 3 +-- profiles/arch/s390/s390x/use.mask | 14 ++++---------- 7 files changed, 21 insertions(+), 32 deletions(-) delete mode 100644 profiles/arch/s390/s390x/package.mask create mode 100644 profiles/arch/s390/s390x/parent (limited to 'profiles/arch/s390/s390x') diff --git a/profiles/arch/s390/s390x/make.defaults b/profiles/arch/s390/s390x/make.defaults index 1cb8ff7551a4..b02ae878cf6e 100644 --- a/profiles/arch/s390/s390x/make.defaults +++ b/profiles/arch/s390/s390x/make.defaults @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 MULTILIB_ABIS="s390x" @@ -10,7 +10,7 @@ CHOST="s390x-ibm-linux-gnu" # Michał Górny (2014-07-01) # Make the native ABI implicit so that MULTILIB_USEDEP can be satisfied # by non-multilib ebuilds when non-native ABIs are disabled. -IUSE_IMPLICIT="abi_s390_64 -abi_s390_32" +IUSE_IMPLICIT="abi_s390_64" # Enable abi_s390_64 for packages that don't have it forced. ABI_S390="64" diff --git a/profiles/arch/s390/s390x/package.mask b/profiles/arch/s390/s390x/package.mask deleted file mode 100644 index 9313987677b5..000000000000 --- a/profiles/arch/s390/s390x/package.mask +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Sam James (2022-04-25) -# Rust is available for s390x, but not s390. -# bug #769446 --app-eselect/eselect-rust --dev-lang/rust --dev-lang/rust-bin -->=dev-python/cryptography-36 -->=dev-python/pyopenssl-22 --dev-python/setuptools-rust --dev-python/watchfiles --virtual/rust - -# Arthur Zamarin (2022-03-20) -# sys-libs/libunwind works on s390x --sys-libs/libunwind diff --git a/profiles/arch/s390/s390x/package.use.force b/profiles/arch/s390/s390x/package.use.force index 54d9b2d19c6f..a91fe713a600 100644 --- a/profiles/arch/s390/s390x/package.use.force +++ b/profiles/arch/s390/s390x/package.use.force @@ -1,6 +1,10 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Michał Górny (2022-06-18) +# dev-lang/spidermonkey not keyworded yet. +sys-auth/polkit duktape + # Michał Górny (2016-11-11) # Force the host target to avoid dependency hell dev-ml/llvm-ocaml llvm_targets_SystemZ diff --git a/profiles/arch/s390/s390x/package.use.mask b/profiles/arch/s390/s390x/package.use.mask index 9af431104cb5..2db48ad88c12 100644 --- a/profiles/arch/s390/s390x/package.use.mask +++ b/profiles/arch/s390/s390x/package.use.mask @@ -1,7 +1,16 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Michał Górny (2022-06-18) +# media-libs/librsvg not keyworded yet. +media-libs/freetype svg +media-libs/imlib2 svg + # Sam James (2021-02-05) # libpcre2 has JIT support for s390x (not s390) # but it doesn't seem to build right now? dev-libs/libpcre2 jit + +# Andreas K. Hüttel (2022-06-28) +# Fails to build +=dev-libs/nettle-3.8* asm diff --git a/profiles/arch/s390/s390x/parent b/profiles/arch/s390/s390x/parent new file mode 100644 index 000000000000..f3229c5b9876 --- /dev/null +++ b/profiles/arch/s390/s390x/parent @@ -0,0 +1 @@ +.. diff --git a/profiles/arch/s390/s390x/use.force b/profiles/arch/s390/s390x/use.force index adf5b7184416..d7fa48c83ab9 100644 --- a/profiles/arch/s390/s390x/use.force +++ b/profiles/arch/s390/s390x/use.force @@ -1,6 +1,5 @@ -# Copyright 1999-2014 Gentoo Foundation. +# Copyright 1999-2022 Gentoo Authors. # Distributed under the terms of the GNU General Public License, v2 # Force the flag corresponding to the only ABI. --abi_s390_32 abi_s390_64 diff --git a/profiles/arch/s390/s390x/use.mask b/profiles/arch/s390/s390x/use.mask index fe2cac38c232..b7a7f1dac69b 100644 --- a/profiles/arch/s390/s390x/use.mask +++ b/profiles/arch/s390/s390x/use.mask @@ -1,11 +1,5 @@ -# Switch ABI flags for this arch. -abi_s390_32 --abi_s390_64 - -# Sam James (2022-05-02) -# Rust is available for s390x (but not s390) --rust +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 -# sys-libs/libunwind is keyworded on s390x --unwind --libunwind +# Unmask ABI flags for this arch. +-abi_s390_64 -- cgit v1.2.3