Correct subtle errors in make.conf

diff --git a/states/portage/files/make.conf b/states/portage/files/make.conf
index ae7a6ef31239e8e07ec34a2cf2952d04cd56ce6f..6b9e404e734616e38146b4a6c9a5857d6b612fd7 100644 (file)
--- a/states/portage/files/make.conf
+++ b/states/portage/files/make.conf
@@ -1,8 +1,11 @@
+{% if grains['host'] in useflags %}
+{% set use = useflags[grains['host']] %}
+{% endif %}
 # These settings were set by the catalyst build script that automatically
 # built this stage.
 # Please consult /usr/share/portage/config/make.conf.example for a more
 # detailed example.
-CFLAGS="-O2 -pipe -march=haswell -fomit-frame-pointer"
+CFLAGS="-O2 -pipe -march=native -fomit-frame-pointer"
 CXXFLAGS="${CFLAGS}"
 MAKEOPTS="-j{{ grains['num_cpus'] + 1 }}"
 
@@ -17,7 +20,7 @@ LC_MESSAGES=C
 
 GENTOO_MIRRORS="ftp://ftp.mirrorservice.org/sites/distfiles.gentoo.org/"
 
-USE="X alsa -pulseaudio pcsc-lite -bindist -cups -ldap libressl wayland unicode ipv6 ipv4"
+USE="-pulseaudio -bindist -cups -ldap pcsc-lite X alsa libressl wayland unicode ipv6 ipv4 {{ use }}"
 GRUB_PLATFORMS="efi-64"
 
 VIDEO_CARDS="{{ video_cards }}"

diff --git a/states/portage/init.sls b/states/portage/init.sls
index 347770e804d4fa7d7aa32b05dc38749e6daf9971..2bdc5a13f538e75e395202c0eb3b11941642696d 100644 (file)
--- a/states/portage/init.sls
+++ b/states/portage/init.sls
@@ -16,3 +16,5 @@
 {% else %}
       video_cards: intel
 {% endif %}
+      useflags:
+        magnesium: consolekit pulseaudio bluetooth dbus