summaryrefslogtreecommitdiff
path: root/profiles/arch/arm64/package.use.mask
diff options
context:
space:
mode:
Diffstat (limited to 'profiles/arch/arm64/package.use.mask')
-rw-r--r--profiles/arch/arm64/package.use.mask13
1 files changed, 5 insertions, 8 deletions
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index 92213a34744d..901d17e9c137 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -1,17 +1,18 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-<<<<<<< HEAD
-=======
# Georgy Yakovlev <gyakovlev@gentoo.org> (2019-09-27)
# some testsuite deps are not keyworded
sys-fs/zfs test-suite
->>>>>>> next
# Luke Dashjr <luke-jr+gentoobugs@utopios.org> (2019-09-21)
# iasl is keyworded ~arm64
sys-firmware/seabios -debug
+# Eugene Bright <eugene@bright.gdn> (2019-09-09)
+# Missing keyword on dev-embedded/libjaylink
+sys-apps/flashrom jlink-spi
+
# Aaron Bauman <bman@gentoo.org> (2019-08-05)
# dep not keyworded here
media-gfx/gnome-photos upnp-av
@@ -197,10 +198,6 @@ dev-python/networkx scipy
sys-libs/libblockdev dmraid
# Mart Raudsepp <leio@gentoo.org> (2018-02-13)
-# USE=sofalizer requires sci-libs/netcdf that is not keyworded yet.
-media-video/ffmpeg sofalizer
-
-# Mart Raudsepp <leio@gentoo.org> (2018-02-13)
# USE=upnp-av requires net-misc/dleyna-server that is not keyworded yet.
>=media-plugins/grilo-plugins-0.3.5 upnp-av
@@ -260,7 +257,7 @@ media-gfx/pstoedit emf
# Alexis Ballier <aballier@gentoo.org> (2017-07-14)
# Appends -mfpu=neon and asm seems arm32
-net-misc/freerdp neon
+net-misc/freerdp cpu_flags_arm_neon
# Alexis Ballier <aballier@gentoo.org> (2017-07-14)
# zfs does not build on arm64 (yet?)