[intel/portage] reorder vaapi and vdpau use flags, enable vaapi for all

This includes USE=vaapi for media-tv/xbmc, watch for segfaults

conf/intel/portage/package.use/00-sabayon.package.use

@@ -278,7 +278,7 @@ media-libs/libsdl aalib
 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 vdpau xorg 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/mlt melt frei0r kdenlive quicktime python
 media-libs/openexr -video_cards_nvidia
 media-libs/sdl-mixer midi timidity mod mikmod
@@ -319,31 +319,29 @@ media-sound/kid3 -mp4
 
 media-tv/freevo lirc matrox
 media-tv/xawtv aalib
-# Disabling vaapi for now, see bug #2221, #4069
-media-tv/xbmc airplay bluray css goom mysql pvr rtmp upnp vdpau webserver xrandr sftp nfs
+media-tv/xbmc airplay bluray css goom mysql pvr rtmp upnp webserver xrandr sftp nfs
 
-# 32bit plugin is unwanted, enabling vdpau doesn't change anything actually
+# 32bit plugin is unwanted
 www-plugins/adobe-flash -32bit sse2
 
 # Disable MMX due to compile failures
 media-tv/mythtv fftw
 
 media-video/blinkensim aalib
-# To enable vdpau, video_cards_nvidia USE flag must be enabled
-virtual/ffmpeg threads ogg vhook faac faad vdpau video_cards_nvidia amr cpudetection vaapi vpx jpeg2k
-media-video/ffmpeg threads ogg vhook faac faad vdpau video_cards_nvidia amr cpudetection vaapi vpx
-media-video/libav amr cpudetection faac faad ogg rtmp threads vaapi vdpau vhook video_cards_nvidia vpx jpeg2k
-media-video/mplayer 3dnow 3dnowext aalib amr ass bl cddb cdparanoia cpudetection dvdnav -dxr3 faac rtmp ftp ladspa lirc -live md5sum mmxext mng mp2 openal pnm radio rar rtc sse sse2 ssse3 tga tivo vdpau vidix vpx x264 zoran
+virtual/ffmpeg threads ogg vhook faac faad video_cards_nvidia amr cpudetection vpx jpeg2k
+media-video/ffmpeg threads ogg vhook faac faad video_cards_nvidia amr cpudetection vpx
+media-video/libav amr cpudetection faac faad ogg rtmp threads vhook video_cards_nvidia vpx jpeg2k
+media-video/mplayer 3dnow 3dnowext aalib amr ass bl cddb cdparanoia cpudetection dvdnav -dxr3 faac rtmp ftp ladspa lirc -live md5sum mmxext mng mp2 openal pnm radio rar rtc sse sse2 ssse3 tga tivo vidix vpx x264 zoran
 # testing mplayer flags
 media-video/mplayer fbcon bs2b
 # Drop dead code, doesn't work with libav
-media-video/mplayer2 -xvmc vdpau
+media-video/mplayer2 -xvmc
 # we have media-video/mkvtoolnix-gui
 media-video/mkvtoolnix -qt4 -wxwidgets
 media-video/ogmrip ogm mp4 srt
 media-video/totem xulrunner iplayer galago
 media-video/vdr SetGroupSep-Patch atsc cmdsubmenu dvbsetup dxr3 graphtft iptv menuorg pinplugin rotor submenu subtitles ttxtsubs ttxtsubs yaepg
-media-video/vlc aalib egl fontconfig httpd libass live lua rtsp samba skins taglib upnp vaapi vlm vdpau
+media-video/vlc aalib egl fontconfig httpd libass live lua rtsp samba skins taglib upnp vlm
 media-video/xine-ui aalib
 
 # Drop xine-ui from dvdrip, since
@@ -526,7 +524,7 @@ www-client/firefox-bin linguas_be linguas_id linguas_ka linguas_ku linguas_pa_IN
 www-client/rekonq semantic-desktop
 www-client/seamonkey -linguas_en_GB -linguas_es_AR -linguas_es_ES -linguas_fy -linguas_fy_NL -linguas_ga -linguas_ga_IE -linguas_gu_IN -linguas_ka -linguas_ku -linguas_nb -linguas_nb_NO -linguas_nn -linguas_nn_NO -linguas_pl -linguas_pt -linguas_pt_BR -linguas_pt_PT -linguas_sv_SE -linguas_zh_CN -linguas_zh_TW -pa_IN
 
-www-plugins/gnash vaapi egl openvg ffmpeg -python -cairo -sdl -kde
+www-plugins/gnash egl openvg ffmpeg -python -cairo -sdl -kde
 
 x11-apps/fusion-icon -qt4
 
@@ -1148,3 +1146,20 @@ media-sound/rhythmbox python_single_target_python3_3 python_targets_python3_3
 
 # Better support for xmobar, add xft USE flag
 x11-misc/xmobar xft
+
+# VAAPI/VDPAU support
+media-libs/avidemux-core vaapi vdpau
+media-libs/mesa vdpau
+# Disabling vaapi for now, see bug #2221, #4069
+# 2013-11-15: retry with USE=vaapi
+media-tv/xbmc vaapi vdpau
+media-tv/mythtv vaapi vdpau
+media-video/avidemux vaapi vdpau
+media-video/hwdecode-demos vaapi vdpau
+media-video/libav vaapi vdpau
+media-video/mplayer vaapi vdpau
+media-video/mplayer2 vaapi vdpau
+media-video/ffmpeg vaapi vdpau
+media-video/vlc vaapi vdpau
+virtual/ffmpeg vaapi vdpau
+www-plugins/gnash vaapi vdpau