gentoo resync : 15.01.2020

4 files changed, 25 insertions, 34 deletions

diff --git a/profiles/arch/arm64/package.use.force b/profiles/arch/arm64/package.use.force
index 4648105ebeb2..357a73151c3a 100644
--- a/profiles/arch/arm64/package.use.force
+++ b/profiles/arch/arm64/package.use.force
@@ -1,6 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Aaron Bauman <bman@gentoo.org> (2019-12-27)
+# ffmpeg does support 64 bit neon
+media-video/ffmpeg cpu_flags_arm_neon
+
 # Luke Dashjr <luke-jr+gentoobugs@utopios.org> (2019-09-21)
 # iasl is keyworded ~arm64
 sys-firmware/seabios -binary
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index 0f3e6848e733..f454975229d7 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -1,6 +1,22 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Michał Górny <mgorny@gentoo.org> (2020-01-11)
+# Unkeyworded dep.
+kde-apps/cantor julia
+
+# Rick Farina <zerochaos@gentoo.com> (2020-01-03)
+# ubertooth needs net-libs/libbtbb and net-wireless/ubertooth which aren't keyworded
+net-wireless/kismet ubertooth
+
+# Aaron Bauman <bman@gentoo.org> (2019-12-27)
+# ffmpeg does support 64 bit neon
+media-video/ffmpeg -cpu_flags_arm_neon
+
+# Tomáš Mózes <hydrapolic@gmail.com> (2019-12-19)
+# dev-libs/criterion is not keyworded yet
+app-admin/syslog-ng test
+
 # Craig Andrews <candrews@gentoo.org> (2019-11-26)
 # net-misc/quiche is available on this arch
 net-misc/curl -quiche
@@ -70,7 +86,6 @@ kde-plasma/discover firmware
 app-emulation/qemu -sdl
 dev-libs/zziplib -sdl
 media-libs/libmpeg2 -sdl
-media-libs/mediastreamer -sdl
 media-libs/mlt -sdl
 media-libs/openal -sdl
 media-sound/mpg123 -sdl
@@ -255,19 +270,11 @@ media-sound/mumble g15
 # Required VIDEO_CARDS=i965/radeonsi, both masked in this profile.
 media-libs/mesa vulkan vulkan-overlay
 
-# Alexis Ballier <aballier@gentoo.org> (2017-07-31)
-# Passes -mfpu=neon with neon enabled
-mail-client/thunderbird neon
-
 # Alexis Ballier <aballier@gentoo.org> (2017-07-20)
 # media-libs/libemf fails with #error unknown CPU.
 media-gfx/pstoedit emf
 
 # Alexis Ballier <aballier@gentoo.org> (2017-07-14)
-# Appends -mfpu=neon and asm seems arm32
-net-misc/freerdp cpu_flags_arm_neon
-
-# Alexis Ballier <aballier@gentoo.org> (2017-07-14)
 # zfs does not build on arm64 (yet?)
 app-emulation/libvirt zfs
 sys-cluster/ceph zfs
@@ -311,28 +318,10 @@ app-crypt/libsecret test
 app-shells/bash-completion test
 
 # Alexis Ballier <aballier@gentoo.org> (2017-06-21)
-# Appends -mfpu=neon that doesnt work on arm64
-media-libs/speexdsp cpu_flags_arm_neon
-
-# Alexis Ballier <aballier@gentoo.org> (2017-06-21)
 # net-fs/openafs-kernel does not recognize arm64 properly
 # Need to check if this has a chance to work with in-kernel drivers
 app-crypt/heimdal afs
 
-# Alexis Ballier <aballier@gentoo.org> (2017-06-20)
-# Jory A. Pratt <anarchy@gentoo.org> (2019-11-29)
-# Appends -mfpu=neon which is only valid for arm32 and suggests this is arm32
-# only
-media-sound/pulseaudio neon cpu_flags_arm_neon
-
-# Alexis Ballier <aballier@gentoo.org> (2017-06-19)
-# This is for arm32 only neon asm
-media-libs/vo-aacenc cpu_flags_arm_neon
-
-# Alexis Ballier <aballier@gentoo.org> (2017-06-16)
-# pixman's neon code is armv7 only.
-x11-libs/pixman cpu_flags_arm_neon neon
-
 # James Le Cuirot <chewi@gentoo.org> (2017-05-22)
 # Only available on some architectures.
 dev-java/icedtea -shenandoah
diff --git a/profiles/arch/arm64/use.force b/profiles/arch/arm64/use.force
index ad4cb1b4c759..9747410d0417 100644
--- a/profiles/arch/arm64/use.force
+++ b/profiles/arch/arm64/use.force
@@ -9,7 +9,6 @@ cpu_flags_arm_v7
 cpu_flags_arm_v8
 
 cpu_flags_arm_edsp
-cpu_flags_arm_neon
 cpu_flags_arm_thumb
 cpu_flags_arm_thumb2
 cpu_flags_arm_vfp
diff --git a/profiles/arch/arm64/use.mask b/profiles/arch/arm64/use.mask
index 8f25ea517e3e..21d730d54cd3 100644
--- a/profiles/arch/arm64/use.mask
+++ b/profiles/arch/arm64/use.mask
@@ -4,9 +4,10 @@
 # Unmask the flag which corresponds to ARCH.
 -arm64
 
-# Matt Turner <mattst88@gentoo.org> (2019-12-05)
-# media-libs/libglvnd is not keyworded
-libglvnd
+# Aaron Bauman <bman@gentoo.org> (2019-12-27)
+# Mask cpu_flags_arm_neon for all of arm64
+# A neon64 USE is being discussed
+cpu_flags_arm_neon
 
 # Unmask arm specific USE flags
 -cpu_flags_arm_v4
@@ -19,7 +20,6 @@ libglvnd
 -cpu_flags_arm_aes
 -cpu_flags_arm_crc32
 -cpu_flags_arm_edsp
--cpu_flags_arm_neon
 -cpu_flags_arm_sha1
 -cpu_flags_arm_sha2
 -cpu_flags_arm_thumb
@@ -30,7 +30,6 @@ libglvnd
 -cpu_flags_arm_vfp-d32
 
 # Unmask [old] arm specific USE flags
--neon
 -armvfp
 
 # Mattéo Rossillol‑‑Laruelle <beatussum@protonmail.com> (2019‑08‑31)