From de49812990871e1705b64051c35161d5e6400269 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 24 Dec 2018 14:11:38 +0000 Subject: gentoo resync : 24.12.2018 --- profiles/arch/s390/make.defaults | 6 +----- profiles/arch/s390/package.use.mask | 8 +------- profiles/arch/s390/use.mask | 10 +++------- 3 files changed, 5 insertions(+), 19 deletions(-) (limited to 'profiles/arch/s390') diff --git a/profiles/arch/s390/make.defaults b/profiles/arch/s390/make.defaults index ec35f09d1146..7b0fad9d6489 100644 --- a/profiles/arch/s390/make.defaults +++ b/profiles/arch/s390/make.defaults @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 ARCH="s390" -ACCEPT_KEYWORDS="s390 ~s390" +ACCEPT_KEYWORDS="s390" MULTILIB_ABIS="s390" DEFAULT_ABI="s390" @@ -31,7 +31,3 @@ ABI_S390="32" # While multilib is available, we don't default it to on. BOOTSTRAP_USE="${BOOTSTRAP_USE} -multilib" USE="-multilib" - -# Hans de Graaff (12 Nov 2018) -# Temporary entry to support stable bug 661262 -RUBY_TARGETS="ruby23 -ruby24" diff --git a/profiles/arch/s390/package.use.mask b/profiles/arch/s390/package.use.mask index 5894d1bd8a81..63c2777bb3d2 100644 --- a/profiles/arch/s390/package.use.mask +++ b/profiles/arch/s390/package.use.mask @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Mikle Kolyada (03 Jun 2018) @@ -11,8 +11,6 @@ app-text/ghostscript-gpl cups # VCS for oberlays yet. app-portage/layman bazaar darcs mercurial dev-python/setuptools_scm mercurial test -# no practical use of zsh completion here (at least now) -dev-util/ninja zsh-completion # no nmap gui net-analyzer/nmap zenmap # no lua support for vim @@ -76,10 +74,6 @@ dev-libs/libpcre jit # No media-sound/lilypond here, yet (bug #356069) app-text/asciidoc test -# Mike Frysinger (10 Feb 2011) -# Waiting for keywording #354309 -net-firewall/iptables netlink - # Raúl Porcel (27 Mar 2008) # Needs gtk USE-flag net-dns/avahi python diff --git a/profiles/arch/s390/use.mask b/profiles/arch/s390/use.mask index 087b0c6aeb4a..6ecedee6837b 100644 --- a/profiles/arch/s390/use.mask +++ b/profiles/arch/s390/use.mask @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Unmask the flag which corresponds to ARCH. @@ -55,8 +55,10 @@ alsa apm directfb lirc +llvm java hardened +vaapi qt5 # Needs java @@ -84,11 +86,6 @@ sdl lm_sensors wxwidgets -# Samuli Suominen (18 Jan 2013) -# libdlm and cman are not keyworded -cman -clvm - # Many X drivers make no sense on this platform. input_devices_elographics input_devices_evdev @@ -97,7 +94,6 @@ input_devices_keyboard input_devices_mouse input_devices_vmmouse input_devices_synaptics -input_devices_tslib input_devices_wacom video_cards_amdgpu video_cards_fbdev -- cgit v1.2.3