From eab5731cdf11d4ae8cdf111461d46fd96c5bdd37 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 4 May 2019 12:02:00 +0100 Subject: gentoo resync : 04.05.2019 --- profiles/arch/alpha/package.use.mask | 4 +++ profiles/arch/alpha/package.use.stable.mask | 4 --- profiles/arch/arm/package.use.mask | 5 +++ profiles/arch/arm/package.use.stable.mask | 5 --- profiles/arch/arm/use.stable.mask | 4 --- profiles/arch/base/make.defaults | 2 +- profiles/arch/base/use.mask | 3 ++ profiles/arch/hppa/package.use.stable.mask | 4 +++ profiles/arch/ia64/package.use.stable.mask | 4 +++ profiles/arch/ia64/use.mask | 4 --- profiles/arch/ia64/use.stable.mask | 4 +++ profiles/arch/powerpc/ppc64/package.mask | 7 ---- profiles/arch/riscv/eapi | 1 + profiles/arch/riscv/make.defaults | 25 ++++++++++++++ profiles/arch/riscv/package.accept_keywords | 10 ++++++ profiles/arch/riscv/package.use.mask | 11 ++++++ profiles/arch/riscv/packages.build | 7 ++++ profiles/arch/riscv/parent | 1 + profiles/arch/riscv/rv64gc/eapi | 1 + profiles/arch/riscv/rv64gc/lp64/eapi | 1 + profiles/arch/riscv/rv64gc/lp64/make.defaults | 15 ++++++++ profiles/arch/riscv/rv64gc/lp64/package.use.force | 5 +++ profiles/arch/riscv/rv64gc/lp64/use.mask | 8 +++++ profiles/arch/riscv/rv64gc/lp64d/eapi | 1 + profiles/arch/riscv/rv64gc/lp64d/make.defaults | 15 ++++++++ profiles/arch/riscv/rv64gc/lp64d/package.use.force | 5 +++ profiles/arch/riscv/rv64gc/lp64d/use.mask | 8 +++++ profiles/arch/riscv/rv64gc/make.defaults | 40 ++++++++++++++++++++++ profiles/arch/riscv/rv64gc/package.mask | 5 +++ profiles/arch/riscv/rv64gc/parent | 2 ++ profiles/arch/riscv/rv64gc/use.force | 9 +++++ profiles/arch/riscv/rv64gc/use.mask | 14 ++++++++ profiles/arch/riscv/use.force | 5 +++ profiles/arch/riscv/use.mask | 11 ++++++ profiles/arch/sparc/package.use.stable.mask | 4 +++ 35 files changed, 229 insertions(+), 25 deletions(-) create mode 100644 profiles/arch/riscv/eapi create mode 100644 profiles/arch/riscv/make.defaults create mode 100644 profiles/arch/riscv/package.accept_keywords create mode 100644 profiles/arch/riscv/package.use.mask create mode 100644 profiles/arch/riscv/packages.build create mode 100644 profiles/arch/riscv/parent create mode 100644 profiles/arch/riscv/rv64gc/eapi create mode 100644 profiles/arch/riscv/rv64gc/lp64/eapi create mode 100644 profiles/arch/riscv/rv64gc/lp64/make.defaults create mode 100644 profiles/arch/riscv/rv64gc/lp64/package.use.force create mode 100644 profiles/arch/riscv/rv64gc/lp64/use.mask create mode 100644 profiles/arch/riscv/rv64gc/lp64d/eapi create mode 100644 profiles/arch/riscv/rv64gc/lp64d/make.defaults create mode 100644 profiles/arch/riscv/rv64gc/lp64d/package.use.force create mode 100644 profiles/arch/riscv/rv64gc/lp64d/use.mask create mode 100644 profiles/arch/riscv/rv64gc/make.defaults create mode 100644 profiles/arch/riscv/rv64gc/package.mask create mode 100644 profiles/arch/riscv/rv64gc/parent create mode 100644 profiles/arch/riscv/rv64gc/use.force create mode 100644 profiles/arch/riscv/rv64gc/use.mask create mode 100644 profiles/arch/riscv/use.force create mode 100644 profiles/arch/riscv/use.mask (limited to 'profiles/arch') diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask index 158c4fdff843..99f29e6cb0de 100644 --- a/profiles/arch/alpha/package.use.mask +++ b/profiles/arch/alpha/package.use.mask @@ -1,6 +1,10 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Lars Wendler (29 Apr 2019) +# Requires net-libs/webkit-gtk which has no keywords on alpha +dev-util/geany-plugins markdown + # Tobias Klausmann (23/Nov/2018) # Requires sys-cluster/ceph, which is unlikely to be used on Alpha # and a rather large dependency. diff --git a/profiles/arch/alpha/package.use.stable.mask b/profiles/arch/alpha/package.use.stable.mask index d764cf9c87ac..f0f66811f81b 100644 --- a/profiles/arch/alpha/package.use.stable.mask +++ b/profiles/arch/alpha/package.use.stable.mask @@ -21,10 +21,6 @@ # gnome-base/nautilus is not stable media-sound/easytag nautilus -# Virgil Dupras (18 Aug 2018) -# app-text/mupdf stable alpha keyword was dropped in bug #658618 -net-print/cups-filters pdf - # Ulrich Müller (09 Aug 2018) # Needs net-mail/mailutils and net-libs/webkit-gtk which are not # stable (yet?), bug #663248 diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask index c5a95f877b11..28130b98e01e 100644 --- a/profiles/arch/arm/package.use.mask +++ b/profiles/arch/arm/package.use.mask @@ -1,6 +1,11 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Lars Wendler (29 Apr 2019) +# Requires app-text/discount and net-libs/webkit-gtk which both have +# no keywords on arm +dev-util/geany-plugins markdown + # Patrick McLean (15 Apr 2019) # deps not available on platform sys-cluster/ceph babeltrace lttng diff --git a/profiles/arch/arm/package.use.stable.mask b/profiles/arch/arm/package.use.stable.mask index 6444d0683144..747e71d461bd 100644 --- a/profiles/arch/arm/package.use.stable.mask +++ b/profiles/arch/arm/package.use.stable.mask @@ -36,11 +36,6 @@ app-text/dblatex inkscape dev-python/wsgiproxy2 test dev-python/pyquery test -# Andreas Sturmlechner (07 May 2018) -# Requires not stabilised Qt5 -app-i18n/ibus kde -dev-qt/qtchooser test - # Andreas Sturmlechner (07 May 2018) # Requires not stabilised dev-python/matplotlib dev-python/numpydoc test diff --git a/profiles/arch/arm/use.stable.mask b/profiles/arch/arm/use.stable.mask index 120f9a73381f..00124b594bbc 100644 --- a/profiles/arch/arm/use.stable.mask +++ b/profiles/arch/arm/use.stable.mask @@ -9,10 +9,6 @@ python_targets_python3_7 python_single_target_python3_7 -# Andreas Sturmlechner (06 May 2018) -# Not stable, bug #642822 -qt5 - # Andrey Grozin (16 May 2014) # No stable gcl gcl diff --git a/profiles/arch/base/make.defaults b/profiles/arch/base/make.defaults index e6c80707fdee..5dc717cefd49 100644 --- a/profiles/arch/base/make.defaults +++ b/profiles/arch/base/make.defaults @@ -3,6 +3,6 @@ USE_EXPAND_UNPREFIXED="ARCH" USE_EXPAND_IMPLICIT="ARCH" -USE_EXPAND_VALUES_ARCH="alpha amd64 amd64-fbsd amd64-linux arm arm64 hppa ia64 m68k m68k-mint mips ppc ppc64 ppc64-linux ppc-aix ppc-macos s390 sh sparc sparc64-solaris sparc-solaris x64-cygwin x64-macos x64-solaris x86 x86-cygwin x86-fbsd x86-linux x86-macos x86-solaris x86-winnt" +USE_EXPAND_VALUES_ARCH="alpha amd64 amd64-fbsd amd64-linux arm arm64 hppa ia64 m68k m68k-mint mips ppc ppc64 ppc64-linux ppc-aix ppc-macos riscv s390 sh sparc sparc64-solaris sparc-solaris x64-cygwin x64-macos x64-solaris x86 x86-cygwin x86-fbsd x86-linux x86-macos x86-solaris x86-winnt" PROFILE_ONLY_VARIABLES="${PROFILE_ONLY_VARIABLES} ARCH USE_EXPAND_VALUES_ARCH" diff --git a/profiles/arch/base/use.mask b/profiles/arch/base/use.mask index f1ee795b436e..67f844eba9af 100644 --- a/profiles/arch/base/use.mask +++ b/profiles/arch/base/use.mask @@ -198,6 +198,8 @@ abi_mips_n32 abi_mips_n64 abi_ppc_32 abi_ppc_64 +abi_riscv_lp64d +abi_riscv_lp64 abi_s390_32 abi_s390_64 @@ -231,6 +233,7 @@ m68k mips ppc ppc64 +riscv s390 sh sparc diff --git a/profiles/arch/hppa/package.use.stable.mask b/profiles/arch/hppa/package.use.stable.mask index f0bc4b53d240..c39a53b28c2c 100644 --- a/profiles/arch/hppa/package.use.stable.mask +++ b/profiles/arch/hppa/package.use.stable.mask @@ -17,6 +17,10 @@ #--- END OF EXAMPLES --- +# Sergei Trofimovich (03 May 2019) +# net-wireless/bluez has no stable keywords, bug #676430 +app-pda/pilot-link bluetooth + # Sergei Trofimovich (17 Mar 2019) # net-analyzer/nagios (or icinga) has no stable keywords, bug #676222 sys-libs/freeipmi nagios diff --git a/profiles/arch/ia64/package.use.stable.mask b/profiles/arch/ia64/package.use.stable.mask index e8785d27da76..f732955c5e9a 100644 --- a/profiles/arch/ia64/package.use.stable.mask +++ b/profiles/arch/ia64/package.use.stable.mask @@ -17,6 +17,10 @@ #--- END OF EXAMPLES --- +# Sergei Trofimovich (03 May 2019) +# Requires net-libs/webkit-gtk. Not stable on ia64. +dev-util/geany-plugins markdown + # Ulrich Müller (09 Aug 2018) # Needs net-mail/mailutils and net-libs/webkit-gtk which are not # stable (yet?), bug #663248 diff --git a/profiles/arch/ia64/use.mask b/profiles/arch/ia64/use.mask index de1c3b6cc180..99163c252009 100644 --- a/profiles/arch/ia64/use.mask +++ b/profiles/arch/ia64/use.mask @@ -3,10 +3,6 @@ # This is a list of USE flags that should not be used on ia64. -# Andreas Sturmlechner (31 Mar 2019) -# sys-auth/elogind is not yet keyworded here. bug #681200 -elogind - # Michał Górny (16 Jul 2018) # Python 3.7 support requires fresh versions of packages which are stuck # at keywordreqs. diff --git a/profiles/arch/ia64/use.stable.mask b/profiles/arch/ia64/use.stable.mask index 7b9d312ba398..9cc60234182e 100644 --- a/profiles/arch/ia64/use.stable.mask +++ b/profiles/arch/ia64/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 +# Andreas Sturmlechner (29 Apr 2019) +# sys-auth/elogind is not yet stable here. bug #682158 +elogind + # Mike Gilbert (08 Jun 2017) # dev-lang/python:3.7 is not stable. python_targets_python3_7 diff --git a/profiles/arch/powerpc/ppc64/package.mask b/profiles/arch/powerpc/ppc64/package.mask index c42283edd845..333c0ac220cb 100644 --- a/profiles/arch/powerpc/ppc64/package.mask +++ b/profiles/arch/powerpc/ppc64/package.mask @@ -1,13 +1,6 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# Virgil Dupras (12 Aug 2018) -# ppc64 stabilization is too long and make us miss our security target delay -# on bug #662780. Masking app-emulation/lxc and revdeps until it is stabilized. -app-emulation/lxc -app-emulation/lxc-templates -dev-python/python3-lxc - # Arfrever Frehtes Taifersar Arahesis (21 Feb 2018) # Mozc supports only little-endian architectures. app-i18n/mozc diff --git a/profiles/arch/riscv/eapi b/profiles/arch/riscv/eapi new file mode 100644 index 000000000000..7ed6ff82de6b --- /dev/null +++ b/profiles/arch/riscv/eapi @@ -0,0 +1 @@ +5 diff --git a/profiles/arch/riscv/make.defaults b/profiles/arch/riscv/make.defaults new file mode 100644 index 000000000000..bae66d7316cc --- /dev/null +++ b/profiles/arch/riscv/make.defaults @@ -0,0 +1,25 @@ +# Copyright 2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Main RISC-V profile directory. + +# This is not a complete profile. Use the subdirectories! + +ARCH="riscv" +ACCEPT_KEYWORDS="riscv ~riscv" + +CHOST="riscv64-unknown-linux-gnu" + +# Since many people will want to test this in qemu... +FEATURES="-pid-sandbox -network-sandbox -ipc-sandbox" + +# The following stuff is, e.g., defined in subdirs: +# CFLAGS +# CXXFLAGS +# FFLAGS +# FCFLAGS +# ABI +# DEFAULT_ABI +# MULTILIB_ABIS +# CHOST_riscv +# LIBDIR_riscv diff --git a/profiles/arch/riscv/package.accept_keywords b/profiles/arch/riscv/package.accept_keywords new file mode 100644 index 000000000000..ba134491c30e --- /dev/null +++ b/profiles/arch/riscv/package.accept_keywords @@ -0,0 +1,10 @@ +# Copyright 2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Even if someone makes Portage accept other keywords, here +# we need specific versions / patches for riscv! +sys-devel/gcc -amd64 -~amd64 +sys-libs/glibc -amd64 -~amd64 + +# For the stages and qemu, we need static qemu *from* ~amd64 +app-emulation/qemu-riscv64-bin ~amd64 diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask new file mode 100644 index 000000000000..4d5ef800bff1 --- /dev/null +++ b/profiles/arch/riscv/package.use.mask @@ -0,0 +1,11 @@ +# Copyright 2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# This doesn't work for (any) riscv yet. +dev-libs/libpcre2 jit +dev-libs/libpcre jit +dev-vcs/git pcre-jit + +# Not yet tested + +sys-devel/make guile diff --git a/profiles/arch/riscv/packages.build b/profiles/arch/riscv/packages.build new file mode 100644 index 000000000000..c85897cb6cac --- /dev/null +++ b/profiles/arch/riscv/packages.build @@ -0,0 +1,7 @@ +# Copyright 2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# For now we add the x86-64 qemu-riscv64 static binary to all +# stages. This makes life somewhat simpler when working without +# real hardware. +app-emulation/qemu-riscv64-bin diff --git a/profiles/arch/riscv/parent b/profiles/arch/riscv/parent new file mode 100644 index 000000000000..eb001c6e8ab8 --- /dev/null +++ b/profiles/arch/riscv/parent @@ -0,0 +1 @@ +../base diff --git a/profiles/arch/riscv/rv64gc/eapi b/profiles/arch/riscv/rv64gc/eapi new file mode 100644 index 000000000000..7ed6ff82de6b --- /dev/null +++ b/profiles/arch/riscv/rv64gc/eapi @@ -0,0 +1 @@ +5 diff --git a/profiles/arch/riscv/rv64gc/lp64/eapi b/profiles/arch/riscv/rv64gc/lp64/eapi new file mode 100644 index 000000000000..7ed6ff82de6b --- /dev/null +++ b/profiles/arch/riscv/rv64gc/lp64/eapi @@ -0,0 +1 @@ +5 diff --git a/profiles/arch/riscv/rv64gc/lp64/make.defaults b/profiles/arch/riscv/rv64gc/lp64/make.defaults new file mode 100644 index 000000000000..8c6534c6999a --- /dev/null +++ b/profiles/arch/riscv/rv64gc/lp64/make.defaults @@ -0,0 +1,15 @@ +# Copyright 2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# RISC-V rv64gc/lp64 no-multilib profile + +CFLAGS="-O2 -pipe -march=rv64gc -mabi=lp64" +CXXFLAGS="${CFLAGS}" +FFLAGS="${CFLAGS}" +FCFLAGS="${CFLAGS}" + +# We have only one ABI +MULTILIB_ABIS="lp64" + +# We hide the useflags for the ABIs +USE_EXPAND_HIDDEN="ABI_RISCV" diff --git a/profiles/arch/riscv/rv64gc/lp64/package.use.force b/profiles/arch/riscv/rv64gc/lp64/package.use.force new file mode 100644 index 000000000000..e25bb13182b5 --- /dev/null +++ b/profiles/arch/riscv/rv64gc/lp64/package.use.force @@ -0,0 +1,5 @@ +# Copyright 2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Undo multilib forcing. +sys-apps/sandbox -abi_riscv_lp64d diff --git a/profiles/arch/riscv/rv64gc/lp64/use.mask b/profiles/arch/riscv/rv64gc/lp64/use.mask new file mode 100644 index 000000000000..9f26ae637a8a --- /dev/null +++ b/profiles/arch/riscv/rv64gc/lp64/use.mask @@ -0,0 +1,8 @@ +# Copyright 2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Mask multilib, since we do not want to use it. +multilib + +# Mask the other multilib flags back for non-multilib profile. +abi_riscv_lp64d diff --git a/profiles/arch/riscv/rv64gc/lp64d/eapi b/profiles/arch/riscv/rv64gc/lp64d/eapi new file mode 100644 index 000000000000..7ed6ff82de6b --- /dev/null +++ b/profiles/arch/riscv/rv64gc/lp64d/eapi @@ -0,0 +1 @@ +5 diff --git a/profiles/arch/riscv/rv64gc/lp64d/make.defaults b/profiles/arch/riscv/rv64gc/lp64d/make.defaults new file mode 100644 index 000000000000..85372ab59289 --- /dev/null +++ b/profiles/arch/riscv/rv64gc/lp64d/make.defaults @@ -0,0 +1,15 @@ +# Copyright 2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# RISC-V rv64gc/lp64d no-multilib profile + +CFLAGS="-O2 -pipe -march=rv64gc -mabi=lp64d" +CXXFLAGS="${CFLAGS}" +FFLAGS="${CFLAGS}" +FCFLAGS="${CFLAGS}" + +# We have only one ABI +MULTILIB_ABIS="lp64d" + +# We hide the useflags for the ABIs +USE_EXPAND_HIDDEN="ABI_RISCV" diff --git a/profiles/arch/riscv/rv64gc/lp64d/package.use.force b/profiles/arch/riscv/rv64gc/lp64d/package.use.force new file mode 100644 index 000000000000..73fe93666cc9 --- /dev/null +++ b/profiles/arch/riscv/rv64gc/lp64d/package.use.force @@ -0,0 +1,5 @@ +# Copyright 2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Undo multilib forcing. +sys-apps/sandbox -abi_riscv_lp64 diff --git a/profiles/arch/riscv/rv64gc/lp64d/use.mask b/profiles/arch/riscv/rv64gc/lp64d/use.mask new file mode 100644 index 000000000000..fd1d1445c965 --- /dev/null +++ b/profiles/arch/riscv/rv64gc/lp64d/use.mask @@ -0,0 +1,8 @@ +# Copyright 2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Mask multilib, since we do not want to use it. +multilib + +# Mask the other multilib flags back for non-multilib profile. +abi_riscv_lp64 diff --git a/profiles/arch/riscv/rv64gc/make.defaults b/profiles/arch/riscv/rv64gc/make.defaults new file mode 100644 index 000000000000..a98e8e97dd6e --- /dev/null +++ b/profiles/arch/riscv/rv64gc/make.defaults @@ -0,0 +1,40 @@ +# Copyright 2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# RISC-V profile for rv64gc multilib + +CFLAGS="-O2 -pipe -march=rv64gc" +CXXFLAGS="${CFLAGS}" +FFLAGS="${CFLAGS}" +FCFLAGS="${CFLAGS}" + +# Multilib ABIs +MULTILIB_ABIS="lp64d lp64" +DEFAULT_ABI="lp64d" +ABI="lp64d" + +# Library directories +LIBDIR_lp64d="lib64/lp64d" +LIBDIR_lp64="lib64/lp64" +SYMLINK_LIB="no" + +# Flags for lp64d +CFLAGS_lp64d="-mabi=lp64d" +# LDFLAGS_lp64d + +# Flags for lp64 +CFLAGS_lp64="-mabi=lp64" +# LDFLAGS_lp64 + +# Enable lp64d by default +ABI_RISCV="lp64d" + +# Unhide the riscv/rv64gc-specific USE_EXPANDs +USE_EXPAND_HIDDEN="-ABI_RISCV" + +# Implicitly enable lp64d in ebuilds without multilib support +IUSE_IMPLICIT="abi_riscv_lp64d" + +# Enable Python 3.7 since we can't use earlier versions +PYTHON_TARGETS="python3_7" +PYTHON_SINGLE_TARGET="python3_7" diff --git a/profiles/arch/riscv/rv64gc/package.mask b/profiles/arch/riscv/rv64gc/package.mask new file mode 100644 index 000000000000..43580b7b49a0 --- /dev/null +++ b/profiles/arch/riscv/rv64gc/package.mask @@ -0,0 +1,5 @@ +# Copyright 2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Doesnt work properly with the two-level libdirs + (03 May 2019) +# Requires net-libs/webkit-gtk. Not stable on sparc. +dev-util/geany-plugins markdown + # Sergei Trofimovich (27 Apr 2019) # No stable dev-lang/spidermonkey on sparc, bug #668558. dev-python/nevow test -- cgit v1.2.3