drop openrc folders from config protect, move mesa video_cards use flags where they belong

3 files changed, 5 insertions, 5 deletions

diff --git a/conf/intel/portage/make.conf.amd64 b/conf/intel/portage/make.conf.amd64
index b941096..9d11c79 100644
--- a/conf/intel/portage/make.conf.amd64
+++ b/conf/intel/portage/make.conf.amd64
@@ -34,7 +34,7 @@ USE="${SAB_BAD} ${SAB_MEDIA} ${SAB_CODECS} ${SAB_SYSTEM} ${SAB_FILESYS} ${SAB_PR
 
 ## DEVICES ##
 INPUT_DEVICES="evdev void"
-VIDEO_CARDS="fbdev vesa radeonsi radeon"
+VIDEO_CARDS="fbdev intel i915 i965 nouveau r100 r200 r300 r600 vesa vmware radeonsi radeon"
 LIRC_DEVICES="audio audio_alsa serial pctv"
 ALSA_CARDS="emu10k1x darla20 darla24 emu10k1 gina20 gina24 hdsp hdspm ice1712 indigo indigoio layla20 layla24 mia mixart mona pcxhr rme32 rme96 sb16 sbawe sscape usbusx2y vx222 usb-usx2y"
 CAMERAS="agfa_cl20 casio_qv dimagev dimera3500 kodak_dc120 kodak_dc210 kodak_dc240 kodak_dc3200 kodak_ez200 konica_qm150 panasonic_coolshot panasonic_dc1000 panasonic_dc1580 panasonic_l859 polaroid_pdc320 polaroid_pdc640 polaroid_pdc700 ricoh_g3 sipix_blink sipix_blink2 sipix_web2 sony_dscf1 sony_dscf55 toshiba_pdrm11 adc65 aox barbie canon clicksmart310 digigr8 digita directory enigma13 fuji gsmart300 hp215 iclick jamcam jd11 konica largan lg_gsm mars mustek pccam300 pccam600 ptp2 ricoh samsung sierra smal sonix soundvision spca50x sq905 stv0674 stv0680 sx330z template"
@@ -49,7 +49,7 @@ QEMU_SOFTMMU_TARGETS="x86_64 arm cris i386 m68k microblaze mips mips64 mips64el
 ## PORTAGE CONFIG ##
 PORTDIR_OVERLAY="/usr/local/portage"
 source /var/lib/layman/make.conf
-CONFIG_PROTECT="/usr/share/config/kdm /etc /etc/conf.d /etc/init.d"
+CONFIG_PROTECT="/usr/share/config/kdm /etc"
 # /lib/modules mask is useful for our internal tinderbox
 CONFIG_PROTECT_MASK="/etc/skel /lib/modules"
 SYNC="rsync://rsync.europe.gentoo.org/gentoo-portage"
diff --git a/conf/intel/portage/make.conf.x86 b/conf/intel/portage/make.conf.x86
index 320bc64..701ffa5 100644
--- a/conf/intel/portage/make.conf.x86
+++ b/conf/intel/portage/make.conf.x86
@@ -36,7 +36,7 @@ USE="${SAB_BAD} ${SAB_MEDIA} ${SAB_CODECS} ${SAB_SYSTEM} ${SAB_FILESYS} ${SAB_PR
 
 ## DEVICES ##
 INPUT_DEVICES="evdev void"
-VIDEO_CARDS="fbdev vesa radeonsi radeon"
+VIDEO_CARDS="fbdev intel i915 i965 nouveau r100 r200 r300 r600 vesa vmware radeonsi radeon"
 LIRC_DEVICES="audio audio_alsa serial pctv"
 ALSA_CARDS="emu10k1x darla20 darla24 emu10k1 gina20 gina24 hdsp hdspm ice1712 indigo indigoio layla20 layla24 mia mixart mona pcxhr rme32 rme96 sb16 sbawe sscape usbusx2y vx222 usb-usx2y"
 CAMERAS="agfa_cl20 casio_qv dimagev dimera3500 kodak_dc120 kodak_dc210 kodak_dc240 kodak_dc3200 kodak_ez200 konica_qm150 panasonic_coolshot panasonic_dc1000 panasonic_dc1580 panasonic_l859 polaroid_pdc320 polaroid_pdc640 polaroid_pdc700 ricoh_g3 sipix_blink sipix_blink2 sipix_web2 sony_dscf1 sony_dscf55 toshiba_pdrm11 adc65 aox barbie canon clicksmart310 digigr8 digita directory enigma13 fuji gsmart300 hp215 iclick jamcam jd11 konica largan lg_gsm mars mustek pccam300 pccam600 ptp2 ricoh samsung sierra smal sonix soundvision spca50x sq905 stv0674 stv0680 sx330z template"
@@ -53,7 +53,7 @@ QEMU_SOFTMMU_TARGETS="x86_64 arm cris i386 m68k microblaze mips mips64 mips64el
 ## PORTAGE CONFIG ##
 PORTDIR_OVERLAY="/usr/local/portage"
 source /var/lib/layman/make.conf
-CONFIG_PROTECT="/usr/share/config/kdm /etc /etc/conf.d /etc/init.d"
+CONFIG_PROTECT="/usr/share/config/kdm /etc"
 # /lib/modules mask is useful for our internal tinderbox
 CONFIG_PROTECT_MASK="/etc/skel /lib/modules"
 SYNC="rsync://rsync.europe.gentoo.org/gentoo-portage"
diff --git a/conf/intel/portage/package.use/00-kogaion.package.use b/conf/intel/portage/package.use/00-kogaion.package.use
index b5f6361..f56650c 100644
--- a/conf/intel/portage/package.use/00-kogaion.package.use
+++ b/conf/intel/portage/package.use/00-kogaion.package.use
@@ -446,7 +446,7 @@ media-libs/libsoundtouch sse2
 media-libs/libxtract fftw
 media-libs/mediastreamer video
 # www-client/chromium wants media-libs/mesa[gles2]
-media-libs/mesa gbm g3dvl nptl openvg pic shared-dricore shared-glapi video_cards_i915 video_cards_i965 video_cards_intel video_cards_nouveau video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_via video_cards_vmware video_cards_radeonsi xa xorg gles2
+media-libs/mesa gbm g3dvl nptl openvg pic shared-dricore shared-glapi video_cards_via xa xorg gles2
 media-libs/ming php
 media-libs/mlt melt frei0r kdenlive quicktime python
 media-libs/openexr -video_cards_nvidia