10 files changed, 12 insertions, 62 deletions
diff --git a/metadata/md5-cache/x11-base/Manifest.gz b/metadata/md5-cache/x11-base/Manifest.gz
new file mode 100644
index 000000000000..472d4a8b49ff
--- /dev/null
+++ b/metadata/md5-cache/x11-base/Manifest.gz
diff --git a/metadata/md5-cache/x11-base/xorg-drivers-1.12 b/metadata/md5-cache/x11-base/xorg-drivers-1.12
deleted file mode 100644
index 19b549e95e4d..000000000000
--- a/metadata/md5-cache/x11-base/xorg-drivers-1.12
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Meta package containing deps on all xorg drivers
-EAPI=4
-HOMEPAGE=https://www.gentoo.org/
-IUSE=video_cards_apm video_cards_ark video_cards_ast video_cards_cirrus video_cards_dummy video_cards_epson video_cards_fbdev video_cards_geode video_cards_glint video_cards_i128 video_cards_i740 video_cards_intel video_cards_mach64 video_cards_mga video_cards_modesetting video_cards_neomagic video_cards_newport video_cards_nouveau video_cards_nv video_cards_qxl video_cards_r128 video_cards_radeon video_cards_s3 video_cards_s3virge video_cards_savage video_cards_siliconmotion video_cards_sis video_cards_sunbw2 video_cards_suncg14 video_cards_suncg3 video_cards_suncg6 video_cards_sunffb video_cards_sunleo video_cards_suntcx video_cards_tdfx video_cards_tga video_cards_trident video_cards_vesa video_cards_via video_cards_virtualbox video_cards_vmware video_cards_voodoo video_cards_fglrx video_cards_nvidia input_devices_acecad input_devices_aiptek input_devices_elographics input_devices_evdev input_devices_fpit input_devices_hyperpen input_devices_joystick input_devices_keyboard input_devices_mouse input_devices_mutouch input_devices_penmount input_devices_tslib input_devices_vmmouse input_devices_void input_devices_synaptics input_devices_wacom
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=metapackage
-PDEPEND=input_devices_acecad? ( x11-drivers/xf86-input-acecad ) input_devices_aiptek? ( x11-drivers/xf86-input-aiptek ) input_devices_elographics? ( x11-drivers/xf86-input-elographics ) input_devices_evdev? ( x11-drivers/xf86-input-evdev ) input_devices_fpit? ( x11-drivers/xf86-input-fpit ) input_devices_hyperpen? ( x11-drivers/xf86-input-hyperpen ) input_devices_joystick? ( x11-drivers/xf86-input-joystick ) input_devices_keyboard? ( x11-drivers/xf86-input-keyboard ) input_devices_mouse? ( x11-drivers/xf86-input-mouse ) input_devices_mutouch? ( x11-drivers/xf86-input-mutouch ) input_devices_penmount? ( x11-drivers/xf86-input-penmount ) input_devices_tslib? ( x11-drivers/xf86-input-tslib ) input_devices_vmmouse? ( x11-drivers/xf86-input-vmmouse ) input_devices_void? ( x11-drivers/xf86-input-void ) input_devices_synaptics? ( x11-drivers/xf86-input-synaptics ) input_devices_wacom? ( x11-drivers/xf86-input-wacom ) video_cards_apm? ( x11-drivers/xf86-video-apm ) video_cards_ark? ( x11-drivers/xf86-video-ark ) video_cards_ast? ( x11-drivers/xf86-video-ast ) video_cards_cirrus? ( x11-drivers/xf86-video-cirrus ) video_cards_dummy? ( x11-drivers/xf86-video-dummy ) video_cards_fbdev? ( x11-drivers/xf86-video-fbdev ) video_cards_geode? ( x11-drivers/xf86-video-geode ) video_cards_glint? ( x11-drivers/xf86-video-glint ) video_cards_i128? ( x11-drivers/xf86-video-i128 ) video_cards_i740? ( x11-drivers/xf86-video-i740 ) video_cards_intel? ( x11-drivers/xf86-video-intel ) video_cards_mach64? ( x11-drivers/xf86-video-mach64 ) video_cards_mga? ( x11-drivers/xf86-video-mga ) video_cards_modesetting? ( x11-drivers/xf86-video-modesetting ) video_cards_neomagic? ( x11-drivers/xf86-video-neomagic ) video_cards_newport? ( x11-drivers/xf86-video-newport ) video_cards_nouveau? ( x11-drivers/xf86-video-nouveau ) video_cards_nv? ( x11-drivers/xf86-video-nv ) video_cards_qxl? ( x11-drivers/xf86-video-qxl ) video_cards_nvidia? ( x11-drivers/nvidia-drivers ) video_cards_fglrx? ( x11-drivers/ati-drivers ) video_cards_r128? ( x11-drivers/xf86-video-r128 ) video_cards_radeon? ( x11-drivers/xf86-video-ati ) video_cards_s3? ( x11-drivers/xf86-video-s3 ) video_cards_s3virge? ( x11-drivers/xf86-video-s3virge ) video_cards_savage? ( x11-drivers/xf86-video-savage ) video_cards_siliconmotion? ( x11-drivers/xf86-video-siliconmotion ) video_cards_sis? ( x11-drivers/xf86-video-sis ) video_cards_suncg14? ( x11-drivers/xf86-video-suncg14 ) video_cards_suncg3? ( x11-drivers/xf86-video-suncg3 ) video_cards_suncg6? ( x11-drivers/xf86-video-suncg6 ) video_cards_sunffb? ( x11-drivers/xf86-video-sunffb ) video_cards_sunleo? ( x11-drivers/xf86-video-sunleo ) video_cards_suntcx? ( x11-drivers/xf86-video-suntcx ) video_cards_tdfx? ( x11-drivers/xf86-video-tdfx ) video_cards_tga? ( x11-drivers/xf86-video-tga ) video_cards_trident? ( x11-drivers/xf86-video-trident ) video_cards_vesa? ( x11-drivers/xf86-video-vesa ) video_cards_via? ( x11-drivers/xf86-video-openchrome ) video_cards_virtualbox? ( x11-drivers/xf86-video-virtualbox ) video_cards_vmware? ( x11-drivers/xf86-video-vmware ) video_cards_voodoo? ( x11-drivers/xf86-video-voodoo ) !x11-drivers/xf86-input-citron !<=x11-drivers/xf86-video-chips-1.2.4 !x11-drivers/xf86-video-cyrix !x11-drivers/xf86-video-impact !x11-drivers/xf86-video-nsc !<=x11-drivers/xf86-video-rendition-4.2.4 !<=x11-drivers/xf86-video-sisusb-0.9.4 !x11-drivers/xf86-video-sunbw2 !<=x11-drivers/xf86-video-tseng-1.2.4
-SLOT=0
-_md5_=a3c5ebf89b96526dc46fd42b7d8c8e70
diff --git a/metadata/md5-cache/x11-base/xorg-drivers-1.15 b/metadata/md5-cache/x11-base/xorg-drivers-1.15
deleted file mode 100644
index 19947da39cd9..000000000000
--- a/metadata/md5-cache/x11-base/xorg-drivers-1.15
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Meta package containing deps on all xorg drivers
-EAPI=5
-HOMEPAGE=https://www.gentoo.org/
-IUSE=video_cards_apm video_cards_ast video_cards_chips video_cards_cirrus video_cards_dummy video_cards_epson video_cards_fbdev video_cards_freedreno video_cards_geode video_cards_glint video_cards_i128 video_cards_i740 video_cards_intel video_cards_mach64 video_cards_mga video_cards_modesetting video_cards_neomagic video_cards_nouveau video_cards_nv video_cards_omap video_cards_qxl video_cards_r128 video_cards_radeon video_cards_radeonsi video_cards_rendition video_cards_s3virge video_cards_savage video_cards_siliconmotion video_cards_sisusb video_cards_sunbw2 video_cards_suncg14 video_cards_suncg3 video_cards_suncg6 video_cards_sunffb video_cards_sunleo video_cards_suntcx video_cards_tdfx video_cards_tga video_cards_trident video_cards_tseng video_cards_vesa video_cards_via video_cards_virtualbox video_cards_vmware video_cards_voodoo video_cards_fglrx video_cards_nvidia input_devices_acecad input_devices_aiptek input_devices_elographics input_devices_evdev input_devices_fpit input_devices_hyperpen input_devices_joystick input_devices_keyboard input_devices_mouse input_devices_mutouch input_devices_penmount input_devices_tslib input_devices_vmmouse input_devices_void input_devices_synaptics input_devices_wacom
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
-LICENSE=metapackage
-PDEPEND=input_devices_acecad? ( x11-drivers/xf86-input-acecad ) input_devices_aiptek? ( x11-drivers/xf86-input-aiptek ) input_devices_elographics? ( x11-drivers/xf86-input-elographics ) input_devices_evdev? ( x11-drivers/xf86-input-evdev ) input_devices_fpit? ( x11-drivers/xf86-input-fpit ) input_devices_hyperpen? ( x11-drivers/xf86-input-hyperpen ) input_devices_joystick? ( x11-drivers/xf86-input-joystick ) input_devices_keyboard? ( x11-drivers/xf86-input-keyboard ) input_devices_mouse? ( x11-drivers/xf86-input-mouse ) input_devices_mutouch? ( x11-drivers/xf86-input-mutouch ) input_devices_penmount? ( x11-drivers/xf86-input-penmount ) input_devices_tslib? ( x11-drivers/xf86-input-tslib ) input_devices_vmmouse? ( x11-drivers/xf86-input-vmmouse ) input_devices_void? ( x11-drivers/xf86-input-void ) input_devices_synaptics? ( x11-drivers/xf86-input-synaptics ) input_devices_wacom? ( x11-drivers/xf86-input-wacom ) video_cards_apm? ( x11-drivers/xf86-video-apm ) video_cards_ast? ( x11-drivers/xf86-video-ast ) video_cards_chips? ( x11-drivers/xf86-video-chips ) video_cards_cirrus? ( x11-drivers/xf86-video-cirrus ) video_cards_dummy? ( x11-drivers/xf86-video-dummy ) video_cards_fbdev? ( x11-drivers/xf86-video-fbdev ) video_cards_freedreno? ( x11-drivers/xf86-video-freedreno ) video_cards_geode? ( x11-drivers/xf86-video-geode ) video_cards_glint? ( x11-drivers/xf86-video-glint ) video_cards_i128? ( x11-drivers/xf86-video-i128 ) video_cards_i740? ( x11-drivers/xf86-video-i740 ) video_cards_intel? ( x11-drivers/xf86-video-intel ) video_cards_mach64? ( x11-drivers/xf86-video-mach64 ) video_cards_mga? ( x11-drivers/xf86-video-mga ) video_cards_modesetting? ( x11-drivers/xf86-video-modesetting ) video_cards_neomagic? ( x11-drivers/xf86-video-neomagic ) video_cards_nouveau? ( x11-drivers/xf86-video-nouveau ) video_cards_nv? ( x11-drivers/xf86-video-nv ) video_cards_omap? ( x11-drivers/xf86-video-omap ) video_cards_qxl? ( x11-drivers/xf86-video-qxl ) video_cards_nvidia? ( x11-drivers/nvidia-drivers ) video_cards_fglrx? ( x11-drivers/ati-drivers ) video_cards_r128? ( x11-drivers/xf86-video-r128 ) video_cards_radeon? ( x11-drivers/xf86-video-ati ) video_cards_radeonsi? ( x11-drivers/xf86-video-ati[glamor] ) video_cards_rendition? ( x11-drivers/xf86-video-rendition ) video_cards_s3virge? ( x11-drivers/xf86-video-s3virge ) video_cards_savage? ( x11-drivers/xf86-video-savage ) video_cards_siliconmotion? ( x11-drivers/xf86-video-siliconmotion ) video_cards_sisusb? ( x11-drivers/xf86-video-sisusb ) video_cards_suncg14? ( x11-drivers/xf86-video-suncg14 ) video_cards_suncg3? ( x11-drivers/xf86-video-suncg3 ) video_cards_suncg6? ( x11-drivers/xf86-video-suncg6 ) video_cards_sunffb? ( x11-drivers/xf86-video-sunffb ) video_cards_sunleo? ( x11-drivers/xf86-video-sunleo ) video_cards_suntcx? ( x11-drivers/xf86-video-suntcx ) video_cards_tdfx? ( x11-drivers/xf86-video-tdfx ) video_cards_tga? ( x11-drivers/xf86-video-tga ) video_cards_trident? ( x11-drivers/xf86-video-trident ) video_cards_tseng? ( x11-drivers/xf86-video-tseng ) video_cards_vesa? ( x11-drivers/xf86-video-vesa ) video_cards_via? ( x11-drivers/xf86-video-openchrome ) video_cards_virtualbox? ( x11-drivers/xf86-video-virtualbox ) video_cards_vmware? ( x11-drivers/xf86-video-vmware ) video_cards_voodoo? ( x11-drivers/xf86-video-voodoo ) !x11-drivers/xf86-input-citron !x11-drivers/xf86-video-cyrix !x11-drivers/xf86-video-impact !x11-drivers/xf86-video-nsc !x11-drivers/xf86-video-sunbw2 !<=x11-drivers/xf86-video-ark-0.7.5 !<=x11-drivers/xf86-video-newport-0.2.4 !<=x11-drivers/xf86-video-s3-0.6.5 !<=x11-drivers/xf86-video-sis-0.10.7
-SLOT=0
-_md5_=cdaf21448fc2f65e8bb0764a9bcbe038
diff --git a/metadata/md5-cache/x11-base/xorg-drivers-1.19 b/metadata/md5-cache/x11-base/xorg-drivers-1.19
index 016bfa33a4ef..0aa8e286ed3c 100644
--- a/metadata/md5-cache/x11-base/xorg-drivers-1.19
+++ b/metadata/md5-cache/x11-base/xorg-drivers-1.19
@@ -2,9 +2,9 @@ DEFINED_PHASES=-
 DESCRIPTION=Meta package containing deps on all xorg drivers
 EAPI=5
 HOMEPAGE=https://www.gentoo.org/
-IUSE=video_cards_amdgpu video_cards_apm video_cards_ark video_cards_ast video_cards_chips video_cards_cirrus video_cards_dummy video_cards_epson video_cards_fbdev video_cards_freedreno video_cards_geode video_cards_glint video_cards_i128 video_cards_i740 video_cards_i915 video_cards_i965 video_cards_intel video_cards_mach64 video_cards_mga video_cards_neomagic video_cards_newport video_cards_nouveau video_cards_nv video_cards_omap video_cards_qxl video_cards_r128 video_cards_radeon video_cards_radeonsi video_cards_rendition video_cards_s3 video_cards_s3virge video_cards_savage video_cards_siliconmotion video_cards_sis video_cards_sisusb video_cards_sunbw2 video_cards_suncg14 video_cards_suncg3 video_cards_suncg6 video_cards_sunffb video_cards_sunleo video_cards_suntcx video_cards_tdfx video_cards_tegra video_cards_tga video_cards_trident video_cards_tseng video_cards_vesa video_cards_via video_cards_vc4 video_cards_virtualbox video_cards_vmware video_cards_voodoo video_cards_fglrx video_cards_nvidia input_devices_acecad input_devices_aiptek input_devices_elographics input_devices_evdev input_devices_fpit input_devices_hyperpen input_devices_joystick input_devices_keyboard input_devices_libinput input_devices_mouse input_devices_mutouch input_devices_penmount input_devices_tslib input_devices_vmmouse input_devices_void input_devices_synaptics input_devices_wacom
+IUSE=video_cards_amdgpu video_cards_apm video_cards_ark video_cards_ast video_cards_chips video_cards_cirrus video_cards_dummy video_cards_fbdev video_cards_freedreno video_cards_geode video_cards_glint video_cards_i128 video_cards_i740 video_cards_i915 video_cards_i965 video_cards_intel video_cards_mach64 video_cards_mga video_cards_neomagic video_cards_newport video_cards_nouveau video_cards_nv video_cards_omap video_cards_qxl video_cards_r128 video_cards_radeon video_cards_radeonsi video_cards_rendition video_cards_s3 video_cards_s3virge video_cards_savage video_cards_siliconmotion video_cards_sis video_cards_sisusb video_cards_sunbw2 video_cards_suncg14 video_cards_suncg3 video_cards_suncg6 video_cards_sunffb video_cards_sunleo video_cards_suntcx video_cards_tdfx video_cards_tegra video_cards_tga video_cards_trident video_cards_tseng video_cards_vesa video_cards_via video_cards_vc4 video_cards_virtualbox video_cards_vmware video_cards_voodoo video_cards_nvidia input_devices_acecad input_devices_aiptek input_devices_elographics input_devices_evdev input_devices_fpit input_devices_hyperpen input_devices_joystick input_devices_keyboard input_devices_libinput input_devices_mouse input_devices_mutouch input_devices_penmount input_devices_tslib input_devices_vmmouse input_devices_void input_devices_synaptics input_devices_wacom
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=metapackage
-PDEPEND=input_devices_acecad? ( x11-drivers/xf86-input-acecad ) input_devices_aiptek? ( x11-drivers/xf86-input-aiptek ) input_devices_elographics? ( x11-drivers/xf86-input-elographics ) input_devices_evdev? ( x11-drivers/xf86-input-evdev ) input_devices_fpit? ( x11-drivers/xf86-input-fpit ) input_devices_hyperpen? ( x11-drivers/xf86-input-hyperpen ) input_devices_joystick? ( x11-drivers/xf86-input-joystick ) input_devices_keyboard? ( x11-drivers/xf86-input-keyboard ) input_devices_libinput? ( x11-drivers/xf86-input-libinput ) input_devices_mouse? ( x11-drivers/xf86-input-mouse ) input_devices_mutouch? ( x11-drivers/xf86-input-mutouch ) input_devices_penmount? ( x11-drivers/xf86-input-penmount ) input_devices_tslib? ( x11-drivers/xf86-input-tslib ) input_devices_vmmouse? ( x11-drivers/xf86-input-vmmouse ) input_devices_void? ( x11-drivers/xf86-input-void ) input_devices_synaptics? ( x11-drivers/xf86-input-synaptics ) input_devices_wacom? ( x11-drivers/xf86-input-wacom ) video_cards_amdgpu? ( x11-drivers/xf86-video-amdgpu ) video_cards_apm? ( x11-drivers/xf86-video-apm ) video_cards_ark? ( x11-drivers/xf86-video-ark ) video_cards_ast? ( x11-drivers/xf86-video-ast ) video_cards_chips? ( x11-drivers/xf86-video-chips ) video_cards_cirrus? ( x11-drivers/xf86-video-cirrus ) video_cards_dummy? ( x11-drivers/xf86-video-dummy ) video_cards_fbdev? ( x11-drivers/xf86-video-fbdev ) video_cards_freedreno? ( >=x11-base/xorg-server-1.19[glamor] ) video_cards_geode? ( x11-drivers/xf86-video-geode ) video_cards_glint? ( x11-drivers/xf86-video-glint ) video_cards_i128? ( x11-drivers/xf86-video-i128 ) video_cards_i740? ( x11-drivers/xf86-video-i740 ) video_cards_i915? ( x11-drivers/xf86-video-intel ) video_cards_i965? ( >=x11-base/xorg-server-1.19[glamor] ) video_cards_intel? ( !video_cards_i965? ( x11-drivers/xf86-video-intel ) ) video_cards_mach64? ( x11-drivers/xf86-video-mach64 ) video_cards_mga? ( x11-drivers/xf86-video-mga ) video_cards_neomagic? ( x11-drivers/xf86-video-neomagic ) video_cards_newport? ( x11-drivers/xf86-video-newport ) video_cards_nouveau? ( x11-drivers/xf86-video-nouveau ) video_cards_nv? ( x11-drivers/xf86-video-nv ) video_cards_omap? ( x11-drivers/xf86-video-omap ) video_cards_qxl? ( x11-drivers/xf86-video-qxl ) video_cards_nvidia? ( x11-drivers/nvidia-drivers ) video_cards_fglrx? ( x11-drivers/ati-drivers ) video_cards_r128? ( x11-drivers/xf86-video-r128 ) video_cards_radeon? ( x11-drivers/xf86-video-ati ) video_cards_radeonsi? ( x11-drivers/xf86-video-ati[glamor] ) video_cards_rendition? ( x11-drivers/xf86-video-rendition ) video_cards_s3? ( x11-drivers/xf86-video-s3 ) video_cards_s3virge? ( x11-drivers/xf86-video-s3virge ) video_cards_savage? ( x11-drivers/xf86-video-savage ) video_cards_siliconmotion? ( x11-drivers/xf86-video-siliconmotion ) video_cards_sis? ( x11-drivers/xf86-video-sis ) video_cards_sisusb? ( x11-drivers/xf86-video-sisusb ) video_cards_suncg14? ( x11-drivers/xf86-video-suncg14 ) video_cards_suncg3? ( x11-drivers/xf86-video-suncg3 ) video_cards_suncg6? ( x11-drivers/xf86-video-suncg6 ) video_cards_sunffb? ( x11-drivers/xf86-video-sunffb ) video_cards_sunleo? ( x11-drivers/xf86-video-sunleo ) video_cards_suntcx? ( x11-drivers/xf86-video-suntcx ) video_cards_tdfx? ( x11-drivers/xf86-video-tdfx ) video_cards_tegra? ( >=x11-base/xorg-server-1.19[glamor] ) video_cards_tga? ( x11-drivers/xf86-video-tga ) video_cards_trident? ( x11-drivers/xf86-video-trident ) video_cards_tseng? ( x11-drivers/xf86-video-tseng ) video_cards_vc4? ( >=x11-base/xorg-server-1.19[glamor] ) video_cards_vesa? ( x11-drivers/xf86-video-vesa ) video_cards_via? ( x11-drivers/xf86-video-openchrome ) video_cards_virtualbox? ( x11-drivers/xf86-video-virtualbox ) video_cards_vmware? ( x11-drivers/xf86-video-vmware ) video_cards_voodoo? ( x11-drivers/xf86-video-voodoo ) !x11-drivers/xf86-input-citron !x11-drivers/xf86-video-cyrix !x11-drivers/xf86-video-impact !x11-drivers/xf86-video-ivtv !x11-drivers/xf86-video-nsc !x11-drivers/xf86-video-sunbw2 !<=x11-drivers/xf86-video-ark-0.7.5 !<=x11-drivers/xf86-video-newport-0.2.4 !<x11-drivers/xf86-input-evdev-2.10.4 !<x11-drivers/xf86-input-joystick-1.6.3 !<x11-drivers/xf86-input-libinput-0.20.0 !<x11-drivers/xf86-input-wacom-0.34.0 !<x11-drivers/xf86-video-amdgpu-1.2.0 !<x11-drivers/xf86-video-ati-7.8.0 !<x11-drivers/xf86-video-chips-1.2.7 !<x11-drivers/xf86-video-glint-1.2.9 !<x11-drivers/xf86-video-i740-1.3.6 !<x11-drivers/xf86-video-intel-2.99.917_p20160122 !<x11-drivers/xf86-video-mga-1.6.5 !<x11-drivers/xf86-video-nouveau-1.0.13 !<x11-drivers/xf86-video-nv-2.1.21 !<x11-drivers/xf86-video-omap-0.4.5 !<x11-drivers/xf86-video-r128-6.10.2 !<x11-drivers/xf86-video-savage-2.3.9 !<x11-drivers/xf86-video-siliconmotion-1.7.9 !<x11-drivers/xf86-video-sis-0.10.9 !<x11-drivers/xf86-video-sisusb-0.9.7 !<x11-drivers/xf86-video-sunleo-1.2.2 !<x11-drivers/xf86-video-tdfx-1.4.7 !<x11-drivers/xf86-video-trident-1.3.8 !<x11-drivers/xf86-video-virtualbox-5.1.14 !<x11-drivers/xf86-video-vmware-13.2.1
+PDEPEND=input_devices_acecad? ( x11-drivers/xf86-input-acecad ) input_devices_aiptek? ( x11-drivers/xf86-input-aiptek ) input_devices_elographics? ( x11-drivers/xf86-input-elographics ) input_devices_evdev? ( x11-drivers/xf86-input-evdev ) input_devices_fpit? ( x11-drivers/xf86-input-fpit ) input_devices_hyperpen? ( x11-drivers/xf86-input-hyperpen ) input_devices_joystick? ( x11-drivers/xf86-input-joystick ) input_devices_keyboard? ( x11-drivers/xf86-input-keyboard ) input_devices_libinput? ( x11-drivers/xf86-input-libinput ) input_devices_mouse? ( x11-drivers/xf86-input-mouse ) input_devices_mutouch? ( x11-drivers/xf86-input-mutouch ) input_devices_penmount? ( x11-drivers/xf86-input-penmount ) input_devices_tslib? ( x11-drivers/xf86-input-tslib ) input_devices_vmmouse? ( x11-drivers/xf86-input-vmmouse ) input_devices_void? ( x11-drivers/xf86-input-void ) input_devices_synaptics? ( x11-drivers/xf86-input-synaptics ) input_devices_wacom? ( x11-drivers/xf86-input-wacom ) video_cards_amdgpu? ( x11-drivers/xf86-video-amdgpu ) video_cards_apm? ( x11-drivers/xf86-video-apm ) video_cards_ark? ( x11-drivers/xf86-video-ark ) video_cards_ast? ( x11-drivers/xf86-video-ast ) video_cards_chips? ( x11-drivers/xf86-video-chips ) video_cards_cirrus? ( x11-drivers/xf86-video-cirrus ) video_cards_dummy? ( x11-drivers/xf86-video-dummy ) video_cards_fbdev? ( x11-drivers/xf86-video-fbdev ) video_cards_freedreno? ( >=x11-base/xorg-server-1.19[glamor] ) video_cards_geode? ( x11-drivers/xf86-video-geode ) video_cards_glint? ( x11-drivers/xf86-video-glint ) video_cards_i128? ( x11-drivers/xf86-video-i128 ) video_cards_i740? ( x11-drivers/xf86-video-i740 ) video_cards_i915? ( x11-drivers/xf86-video-intel ) video_cards_i965? ( >=x11-base/xorg-server-1.19[glamor] ) video_cards_intel? ( !video_cards_i965? ( x11-drivers/xf86-video-intel ) ) video_cards_mach64? ( x11-drivers/xf86-video-mach64 ) video_cards_mga? ( x11-drivers/xf86-video-mga ) video_cards_neomagic? ( x11-drivers/xf86-video-neomagic ) video_cards_newport? ( x11-drivers/xf86-video-newport ) video_cards_nouveau? ( x11-drivers/xf86-video-nouveau ) video_cards_nv? ( x11-drivers/xf86-video-nv ) video_cards_omap? ( x11-drivers/xf86-video-omap ) video_cards_qxl? ( x11-drivers/xf86-video-qxl ) video_cards_nvidia? ( x11-drivers/nvidia-drivers ) video_cards_r128? ( x11-drivers/xf86-video-r128 ) video_cards_radeon? ( x11-drivers/xf86-video-ati ) video_cards_radeonsi? ( x11-drivers/xf86-video-ati[glamor] ) video_cards_rendition? ( x11-drivers/xf86-video-rendition ) video_cards_s3? ( x11-drivers/xf86-video-s3 ) video_cards_s3virge? ( x11-drivers/xf86-video-s3virge ) video_cards_savage? ( x11-drivers/xf86-video-savage ) video_cards_siliconmotion? ( x11-drivers/xf86-video-siliconmotion ) video_cards_sis? ( x11-drivers/xf86-video-sis ) video_cards_sisusb? ( x11-drivers/xf86-video-sisusb ) video_cards_suncg14? ( x11-drivers/xf86-video-suncg14 ) video_cards_suncg3? ( x11-drivers/xf86-video-suncg3 ) video_cards_suncg6? ( x11-drivers/xf86-video-suncg6 ) video_cards_sunffb? ( x11-drivers/xf86-video-sunffb ) video_cards_sunleo? ( x11-drivers/xf86-video-sunleo ) video_cards_suntcx? ( x11-drivers/xf86-video-suntcx ) video_cards_tdfx? ( x11-drivers/xf86-video-tdfx ) video_cards_tegra? ( >=x11-base/xorg-server-1.19[glamor] ) video_cards_tga? ( x11-drivers/xf86-video-tga ) video_cards_trident? ( x11-drivers/xf86-video-trident ) video_cards_tseng? ( x11-drivers/xf86-video-tseng ) video_cards_vc4? ( >=x11-base/xorg-server-1.19[glamor] ) video_cards_vesa? ( x11-drivers/xf86-video-vesa ) video_cards_via? ( x11-drivers/xf86-video-openchrome ) video_cards_virtualbox? ( x11-drivers/xf86-video-virtualbox ) video_cards_vmware? ( x11-drivers/xf86-video-vmware ) video_cards_voodoo? ( x11-drivers/xf86-video-voodoo ) !x11-drivers/xf86-input-citron !x11-drivers/xf86-video-cyrix !x11-drivers/xf86-video-impact !x11-drivers/xf86-video-ivtv !x11-drivers/xf86-video-nsc !x11-drivers/xf86-video-sunbw2 !<=x11-drivers/xf86-video-ark-0.7.5 !<=x11-drivers/xf86-video-newport-0.2.4 !<x11-drivers/xf86-input-evdev-2.10.4 !<x11-drivers/xf86-input-joystick-1.6.3 !<x11-drivers/xf86-input-libinput-0.20.0 !<x11-drivers/xf86-input-wacom-0.34.0 !<x11-drivers/xf86-video-amdgpu-1.2.0 !<x11-drivers/xf86-video-ati-7.8.0 !<x11-drivers/xf86-video-chips-1.2.7 !<x11-drivers/xf86-video-glint-1.2.9 !<x11-drivers/xf86-video-i740-1.3.6 !<x11-drivers/xf86-video-intel-2.99.917_p20160122 !<x11-drivers/xf86-video-mga-1.6.5 !<x11-drivers/xf86-video-nouveau-1.0.13 !<x11-drivers/xf86-video-nv-2.1.21 !<x11-drivers/xf86-video-omap-0.4.5 !<x11-drivers/xf86-video-r128-6.10.2 !<x11-drivers/xf86-video-savage-2.3.9 !<x11-drivers/xf86-video-siliconmotion-1.7.9 !<x11-drivers/xf86-video-sis-0.10.9 !<x11-drivers/xf86-video-sisusb-0.9.7 !<x11-drivers/xf86-video-sunleo-1.2.2 !<x11-drivers/xf86-video-tdfx-1.4.7 !<x11-drivers/xf86-video-trident-1.3.8 !<x11-drivers/xf86-video-virtualbox-5.1.14 !<x11-drivers/xf86-video-vmware-13.2.1
 SLOT=0
-_md5_=9535c188a6aefc21420ee00bcac7175c
+_md5_=b10f3a2fb5df635ebc871110ce8cad38
diff --git a/metadata/md5-cache/x11-base/xorg-drivers-9999 b/metadata/md5-cache/x11-base/xorg-drivers-9999
index b37f5d800737..667cd8afeccb 100644
--- a/metadata/md5-cache/x11-base/xorg-drivers-9999
+++ b/metadata/md5-cache/x11-base/xorg-drivers-9999
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=Meta package containing deps on all xorg drivers
 EAPI=5
 HOMEPAGE=https://www.gentoo.org/
-IUSE=video_cards_amdgpu video_cards_ast video_cards_dummy video_cards_epson video_cards_fbdev video_cards_freedreno video_cards_geode video_cards_glint video_cards_i915 video_cards_i965 video_cards_intel video_cards_mga video_cards_nouveau video_cards_nv video_cards_omap video_cards_qxl video_cards_r128 video_cards_radeon video_cards_radeonsi video_cards_siliconmotion video_cards_tdfx video_cards_tegra video_cards_vc4 video_cards_vesa video_cards_via video_cards_virtualbox video_cards_vmware video_cards_voodoo video_cards_fglrx video_cards_nvidia input_devices_acecad input_devices_aiptek input_devices_elographics input_devices_evdev input_devices_fpit input_devices_hyperpen input_devices_joystick input_devices_keyboard input_devices_libinput input_devices_mouse input_devices_mutouch input_devices_penmount input_devices_tslib input_devices_vmmouse input_devices_void input_devices_synaptics input_devices_wacom
+IUSE=video_cards_amdgpu video_cards_ast video_cards_dummy video_cards_fbdev video_cards_freedreno video_cards_geode video_cards_glint video_cards_i915 video_cards_i965 video_cards_intel video_cards_mga video_cards_nouveau video_cards_nv video_cards_omap video_cards_qxl video_cards_r128 video_cards_radeon video_cards_radeonsi video_cards_siliconmotion video_cards_tdfx video_cards_tegra video_cards_vc4 video_cards_vesa video_cards_via video_cards_virtualbox video_cards_vmware video_cards_voodoo video_cards_nvidia input_devices_acecad input_devices_aiptek input_devices_elographics input_devices_evdev input_devices_fpit input_devices_hyperpen input_devices_joystick input_devices_keyboard input_devices_libinput input_devices_mouse input_devices_mutouch input_devices_penmount input_devices_tslib input_devices_vmmouse input_devices_void input_devices_synaptics input_devices_wacom
 LICENSE=metapackage
-PDEPEND=input_devices_acecad? ( x11-drivers/xf86-input-acecad ) input_devices_aiptek? ( x11-drivers/xf86-input-aiptek ) input_devices_elographics? ( x11-drivers/xf86-input-elographics ) input_devices_evdev? ( x11-drivers/xf86-input-evdev ) input_devices_fpit? ( x11-drivers/xf86-input-fpit ) input_devices_hyperpen? ( x11-drivers/xf86-input-hyperpen ) input_devices_joystick? ( x11-drivers/xf86-input-joystick ) input_devices_keyboard? ( x11-drivers/xf86-input-keyboard ) input_devices_libinput? ( x11-drivers/xf86-input-libinput ) input_devices_mouse? ( x11-drivers/xf86-input-mouse ) input_devices_mutouch? ( x11-drivers/xf86-input-mutouch ) input_devices_penmount? ( x11-drivers/xf86-input-penmount ) input_devices_tslib? ( x11-drivers/xf86-input-tslib ) input_devices_vmmouse? ( x11-drivers/xf86-input-vmmouse ) input_devices_void? ( x11-drivers/xf86-input-void ) input_devices_synaptics? ( x11-drivers/xf86-input-synaptics ) input_devices_wacom? ( x11-drivers/xf86-input-wacom ) video_cards_amdgpu? ( x11-drivers/xf86-video-amdgpu ) video_cards_ast? ( x11-drivers/xf86-video-ast ) video_cards_dummy? ( x11-drivers/xf86-video-dummy ) video_cards_fbdev? ( x11-drivers/xf86-video-fbdev ) video_cards_freedreno? ( >=x11-base/xorg-server-9999[glamor] ) video_cards_geode? ( x11-drivers/xf86-video-geode ) video_cards_glint? ( x11-drivers/xf86-video-glint ) video_cards_i915? ( x11-drivers/xf86-video-intel ) video_cards_i965? ( >=x11-base/xorg-server-9999[glamor] ) video_cards_intel? ( !video_cards_i965? ( x11-drivers/xf86-video-intel ) ) video_cards_mga? ( x11-drivers/xf86-video-mga ) video_cards_nouveau? ( x11-drivers/xf86-video-nouveau ) video_cards_nv? ( x11-drivers/xf86-video-nv ) video_cards_omap? ( x11-drivers/xf86-video-omap ) video_cards_qxl? ( x11-drivers/xf86-video-qxl ) video_cards_nvidia? ( x11-drivers/nvidia-drivers ) video_cards_fglrx? ( x11-drivers/ati-drivers ) video_cards_r128? ( x11-drivers/xf86-video-r128 ) video_cards_radeon? ( x11-drivers/xf86-video-ati ) video_cards_radeonsi? ( x11-drivers/xf86-video-ati[glamor] ) video_cards_siliconmotion? ( x11-drivers/xf86-video-siliconmotion ) video_cards_tdfx? ( x11-drivers/xf86-video-tdfx ) video_cards_tegra? ( >=x11-base/xorg-server-9999[glamor] ) video_cards_vc4? ( >=x11-base/xorg-server-9999[glamor] ) video_cards_vesa? ( x11-drivers/xf86-video-vesa ) video_cards_via? ( x11-drivers/xf86-video-openchrome ) video_cards_virtualbox? ( x11-drivers/xf86-video-virtualbox ) video_cards_vmware? ( x11-drivers/xf86-video-vmware ) video_cards_voodoo? ( x11-drivers/xf86-video-voodoo ) !x11-drivers/xf86-input-citron !x11-drivers/xf86-video-apm !x11-drivers/xf86-video-ark !x11-drivers/xf86-video-chips !x11-drivers/xf86-video-cirrus !x11-drivers/xf86-video-cyrix !x11-drivers/xf86-video-i128 !x11-drivers/xf86-video-i740 !x11-drivers/xf86-video-impact !x11-drivers/xf86-video-mach64 !x11-drivers/xf86-video-neomagic !x11-drivers/xf86-video-newport !x11-drivers/xf86-video-nsc !x11-drivers/xf86-video-rendition !x11-drivers/xf86-video-s3 !x11-drivers/xf86-video-s3virge !x11-drivers/xf86-video-savage !x11-drivers/xf86-video-sis !x11-drivers/xf86-video-sisusb !x11-drivers/xf86-video-sunbw2 !x11-drivers/xf86-video-suncg14 !x11-drivers/xf86-video-suncg3 !x11-drivers/xf86-video-suncg6 !x11-drivers/xf86-video-sunffb !x11-drivers/xf86-video-sunleo !x11-drivers/xf86-video-suntcx !x11-drivers/xf86-video-tga !x11-drivers/xf86-video-trident !x11-drivers/xf86-video-tseng !<x11-drivers/xf86-input-evdev-2.10.4 !<x11-drivers/xf86-input-joystick-1.6.3 !<x11-drivers/xf86-input-libinput-0.20.0 !<x11-drivers/xf86-input-wacom-0.34.0 !<x11-drivers/xf86-video-amdgpu-1.2.0 !<x11-drivers/xf86-video-ati-7.8.0 !<x11-drivers/xf86-video-glint-1.2.9 !<x11-drivers/xf86-video-intel-2.99.917_p20160122 !<x11-drivers/xf86-video-mga-1.6.5 !<x11-drivers/xf86-video-nouveau-1.0.13 !<x11-drivers/xf86-video-nv-2.1.21 !<x11-drivers/xf86-video-omap-0.4.5 !<x11-drivers/xf86-video-r128-6.10.2 !<x11-drivers/xf86-video-siliconmotion-1.7.9 !<x11-drivers/xf86-video-tdfx-1.4.7 !<x11-drivers/xf86-video-virtualbox-5.1.14 !<x11-drivers/xf86-video-vmware-13.2.1
+PDEPEND=input_devices_acecad? ( x11-drivers/xf86-input-acecad ) input_devices_aiptek? ( x11-drivers/xf86-input-aiptek ) input_devices_elographics? ( x11-drivers/xf86-input-elographics ) input_devices_evdev? ( x11-drivers/xf86-input-evdev ) input_devices_fpit? ( x11-drivers/xf86-input-fpit ) input_devices_hyperpen? ( x11-drivers/xf86-input-hyperpen ) input_devices_joystick? ( x11-drivers/xf86-input-joystick ) input_devices_keyboard? ( x11-drivers/xf86-input-keyboard ) input_devices_libinput? ( x11-drivers/xf86-input-libinput ) input_devices_mouse? ( x11-drivers/xf86-input-mouse ) input_devices_mutouch? ( x11-drivers/xf86-input-mutouch ) input_devices_penmount? ( x11-drivers/xf86-input-penmount ) input_devices_tslib? ( x11-drivers/xf86-input-tslib ) input_devices_vmmouse? ( x11-drivers/xf86-input-vmmouse ) input_devices_void? ( x11-drivers/xf86-input-void ) input_devices_synaptics? ( x11-drivers/xf86-input-synaptics ) input_devices_wacom? ( x11-drivers/xf86-input-wacom ) video_cards_amdgpu? ( x11-drivers/xf86-video-amdgpu ) video_cards_ast? ( x11-drivers/xf86-video-ast ) video_cards_dummy? ( x11-drivers/xf86-video-dummy ) video_cards_fbdev? ( x11-drivers/xf86-video-fbdev ) video_cards_freedreno? ( >=x11-base/xorg-server-9999[glamor] ) video_cards_geode? ( x11-drivers/xf86-video-geode ) video_cards_glint? ( x11-drivers/xf86-video-glint ) video_cards_i915? ( x11-drivers/xf86-video-intel ) video_cards_i965? ( >=x11-base/xorg-server-9999[glamor] ) video_cards_intel? ( !video_cards_i965? ( x11-drivers/xf86-video-intel ) ) video_cards_mga? ( x11-drivers/xf86-video-mga ) video_cards_nouveau? ( x11-drivers/xf86-video-nouveau ) video_cards_nv? ( x11-drivers/xf86-video-nv ) video_cards_omap? ( x11-drivers/xf86-video-omap ) video_cards_qxl? ( x11-drivers/xf86-video-qxl ) video_cards_nvidia? ( x11-drivers/nvidia-drivers ) video_cards_r128? ( x11-drivers/xf86-video-r128 ) video_cards_radeon? ( x11-drivers/xf86-video-ati ) video_cards_radeonsi? ( x11-drivers/xf86-video-ati[glamor] ) video_cards_siliconmotion? ( x11-drivers/xf86-video-siliconmotion ) video_cards_tdfx? ( x11-drivers/xf86-video-tdfx ) video_cards_tegra? ( >=x11-base/xorg-server-9999[glamor] ) video_cards_vc4? ( >=x11-base/xorg-server-9999[glamor] ) video_cards_vesa? ( x11-drivers/xf86-video-vesa ) video_cards_via? ( x11-drivers/xf86-video-openchrome ) video_cards_virtualbox? ( x11-drivers/xf86-video-virtualbox ) video_cards_vmware? ( x11-drivers/xf86-video-vmware ) video_cards_voodoo? ( x11-drivers/xf86-video-voodoo ) !x11-drivers/xf86-input-citron !x11-drivers/xf86-video-apm !x11-drivers/xf86-video-ark !x11-drivers/xf86-video-chips !x11-drivers/xf86-video-cirrus !x11-drivers/xf86-video-cyrix !x11-drivers/xf86-video-i128 !x11-drivers/xf86-video-i740 !x11-drivers/xf86-video-impact !x11-drivers/xf86-video-mach64 !x11-drivers/xf86-video-neomagic !x11-drivers/xf86-video-newport !x11-drivers/xf86-video-nsc !x11-drivers/xf86-video-rendition !x11-drivers/xf86-video-s3 !x11-drivers/xf86-video-s3virge !x11-drivers/xf86-video-savage !x11-drivers/xf86-video-sis !x11-drivers/xf86-video-sisusb !x11-drivers/xf86-video-sunbw2 !x11-drivers/xf86-video-suncg14 !x11-drivers/xf86-video-suncg3 !x11-drivers/xf86-video-suncg6 !x11-drivers/xf86-video-sunffb !x11-drivers/xf86-video-sunleo !x11-drivers/xf86-video-suntcx !x11-drivers/xf86-video-tga !x11-drivers/xf86-video-trident !x11-drivers/xf86-video-tseng !<x11-drivers/xf86-input-evdev-2.10.4 !<x11-drivers/xf86-input-joystick-1.6.3 !<x11-drivers/xf86-input-libinput-0.20.0 !<x11-drivers/xf86-input-wacom-0.34.0 !<x11-drivers/xf86-video-amdgpu-1.2.0 !<x11-drivers/xf86-video-ati-7.8.0 !<x11-drivers/xf86-video-glint-1.2.9 !<x11-drivers/xf86-video-intel-2.99.917_p20160122 !<x11-drivers/xf86-video-mga-1.6.5 !<x11-drivers/xf86-video-nouveau-1.0.13 !<x11-drivers/xf86-video-nv-2.1.21 !<x11-drivers/xf86-video-omap-0.4.5 !<x11-drivers/xf86-video-r128-6.10.2 !<x11-drivers/xf86-video-siliconmotion-1.7.9 !<x11-drivers/xf86-video-tdfx-1.4.7 !<x11-drivers/xf86-video-virtualbox-5.1.14 !<x11-drivers/xf86-video-vmware-13.2.1
 SLOT=0
-_md5_=817689c98d624106b69c9902ac0635f0
+_md5_=979b981ca8547547f28b1303e5b4a477
diff --git a/metadata/md5-cache/x11-base/xorg-server-1.12.4-r7 b/metadata/md5-cache/x11-base/xorg-server-1.12.4-r7
deleted file mode 100644
index c90386b4dfc1..000000000000
--- a/metadata/md5-cache/x11-base/xorg-server-1.12.4-r7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend test unpack
-DEPEND=>=app-eselect/eselect-opengl-1.3.0 dev-libs/openssl:0= >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont-1.4.2 <x11-libs/libXfont-1.5.0 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/pixman-0.21.8 >=x11-libs/xtrans-1.2.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-10.3.7-r2[nptl=] ) tslib? ( >=x11-libs/tslib-1.0 ) udev? ( >=virtual/udev-150 ) >=x11-apps/xinit-1.3 selinux? ( sec-policy/selinux-xserver ) sys-devel/flex >=x11-proto/bigreqsproto-1.1.0 >=x11-proto/compositeproto-0.4 >=x11-proto/damageproto-1.1 >=x11-proto/fixesproto-5.0 >=x11-proto/fontsproto-2.0.2 <x11-proto/fontsproto-2.1.3 >=x11-proto/glproto-1.4.17-r1 >=x11-proto/inputproto-2.1.99.3 >=x11-proto/kbproto-1.0.3 >=x11-proto/randrproto-1.2.99.3 >=x11-proto/recordproto-1.13.99.1 >=x11-proto/renderproto-0.11 >=x11-proto/resourceproto-1.0.2 >=x11-proto/scrnsaverproto-1.1 >=x11-proto/trapproto-3.4.3 >=x11-proto/videoproto-2.2.2 >=x11-proto/xcmiscproto-1.2.0 >=x11-proto/xextproto-7.1.99 >=x11-proto/xf86dgaproto-2.0.99.1 >=x11-proto/xf86rushproto-1.1.2 >=x11-proto/xf86vidmodeproto-2.2.99.1 >=x11-proto/xineramaproto-1.1.3 >=x11-proto/xproto-7.0.22 dmx? ( >=x11-proto/dmxproto-2.2.99.1 doc? ( || ( www-client/links www-client/lynx www-client/w3m ) ) ) !minimal? ( >=x11-proto/xf86driproto-2.1.0 >=x11-proto/dri2proto-2.6 >=x11-libs/libdrm-2.4.20 ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
-DESCRIPTION=X.Org X servers
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/
-IUSE=dmx kdrive xnest xorg xvfb ipv6 minimal nptl selinux tslib +udev static-libs doc
-KEYWORDS=~alpha amd64 arm ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=MIT
-PDEPEND=xorg? ( >=x11-base/xorg-drivers-1.12 )
-RDEPEND=>=app-eselect/eselect-opengl-1.3.0 dev-libs/openssl:0= >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont-1.4.2 <x11-libs/libXfont-1.5.0 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/pixman-0.21.8 >=x11-libs/xtrans-1.2.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-10.3.7-r2[nptl=] ) tslib? ( >=x11-libs/tslib-1.0 ) udev? ( >=virtual/udev-150 ) >=x11-apps/xinit-1.3 selinux? ( sec-policy/selinux-xserver )
-REQUIRED_USE=!minimal? ( || ( dmx kdrive xnest xorg xvfb ) )
-SLOT=0/1.12.4
-SRC_URI=https://www.x.org/releases/individual/xserver/xorg-server-1.12.4.tar.bz2 mirror://gentoo/xorg-server-1.12-cve-2014-8091..8103.patches.tar.xz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xorg-2	234cf45e2565fab7c0dff5bd8d1f9177
-_md5_=c8b5ffde3c63f2987d7d8c98844c03a5
diff --git a/metadata/md5-cache/x11-base/xorg-server-1.15.2-r4 b/metadata/md5-cache/x11-base/xorg-server-1.15.2-r4
deleted file mode 100644
index 5ed845833337..000000000000
--- a/metadata/md5-cache/x11-base/xorg-server-1.15.2-r4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend test unpack
-DEPEND=>=app-eselect/eselect-opengl-1.3.0 dev-libs/openssl:0= >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.20 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont-1.4.2 <x11-libs/libXfont-1.5.0 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-libs/xtrans-1.3.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-10.3.7-r2[nptl=] ) tslib? ( >=x11-libs/tslib-1.0 ) udev? ( >=virtual/udev-150 ) unwind? ( sys-libs/libunwind ) >=x11-apps/xinit-1.3 sys-devel/flex >=x11-proto/bigreqsproto-1.1.0 >=x11-proto/compositeproto-0.4 >=x11-proto/damageproto-1.1 >=x11-proto/fixesproto-5.0 >=x11-proto/fontsproto-2.0.2 <x11-proto/fontsproto-2.1.3 >=x11-proto/glproto-1.4.17-r1 >=x11-proto/inputproto-2.2.99.1 >=x11-proto/kbproto-1.0.3 >=x11-proto/randrproto-1.4.0 >=x11-proto/recordproto-1.13.99.1 >=x11-proto/renderproto-0.11 >=x11-proto/resourceproto-1.2.0 >=x11-proto/scrnsaverproto-1.1 >=x11-proto/trapproto-3.4.3 >=x11-proto/videoproto-2.2.2 >=x11-proto/xcmiscproto-1.2.0 >=x11-proto/xextproto-7.2.99.901 >=x11-proto/xf86dgaproto-2.0.99.1 >=x11-proto/xf86rushproto-1.1.2 >=x11-proto/xf86vidmodeproto-2.2.99.1 >=x11-proto/xineramaproto-1.1.3 >=x11-proto/xproto-7.0.22 >=x11-proto/presentproto-1.0 >=x11-proto/dri3proto-1.0 dmx? ( >=x11-proto/dmxproto-2.2.99.1 doc? ( || ( www-client/links www-client/lynx www-client/w3m ) ) ) !minimal? ( >=x11-proto/xf86driproto-2.1.0 >=x11-proto/dri2proto-2.8 ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
-DESCRIPTION=X.Org X servers
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/
-IUSE=dmx kdrive xnest xorg xvfb ipv6 minimal nptl selinux +suid tslib +udev unwind static-libs doc
-KEYWORDS=~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
-LICENSE=MIT
-PDEPEND=xorg? ( >=x11-base/xorg-drivers-1.15 )
-RDEPEND=>=app-eselect/eselect-opengl-1.3.0 dev-libs/openssl:0= >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.20 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont-1.4.2 <x11-libs/libXfont-1.5.0 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-libs/xtrans-1.3.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-10.3.7-r2[nptl=] ) tslib? ( >=x11-libs/tslib-1.0 ) udev? ( >=virtual/udev-150 ) unwind? ( sys-libs/libunwind ) >=x11-apps/xinit-1.3 selinux? ( sec-policy/selinux-xserver )
-REQUIRED_USE=!minimal? ( || ( dmx kdrive xnest xorg xvfb ) )
-SLOT=0/1.15.2
-SRC_URI=https://www.x.org/releases/individual/xserver/xorg-server-1.15.2.tar.bz2 mirror://gentoo/xorg-server-1.16-cve-2014-8091..8103.patches.tar.xz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xorg-2	234cf45e2565fab7c0dff5bd8d1f9177
-_md5_=772492d2821c9741ea411f661a0f6096
diff --git a/metadata/md5-cache/x11-base/xorg-server-1.19.5 b/metadata/md5-cache/x11-base/xorg-server-1.19.5
index 41476b2a9dac..45f9f33ced68 100644
--- a/metadata/md5-cache/x11-base/xorg-server-1.19.5
+++ b/metadata/md5-cache/x11-base/xorg-server-1.19.5
@@ -3,7 +3,7 @@ DEPEND=>=app-eselect/eselect-opengl-1.3.0 !libressl? ( dev-libs/openssl:0= ) lib
 DESCRIPTION=X.Org X servers
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/
-IUSE=dmx kdrive wayland xephyr xnest xorg xvfb debug glamor ipv6 libressl minimal selinux +suid systemd tslib +udev unwind xcsecurity static-libs doc
+IUSE=dmx kdrive wayland xephyr xnest xorg xvfb debug +glamor ipv6 libressl minimal selinux +suid systemd tslib +udev unwind xcsecurity static-libs doc
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=MIT
 PDEPEND=xorg? ( >=x11-base/xorg-drivers-1.19 )
@@ -12,4 +12,4 @@ REQUIRED_USE=!minimal? ( || ( dmx kdrive wayland xephyr xnest xorg xvfb ) ) xeph
 SLOT=0/1.19.5
 SRC_URI=https://www.x.org/releases/individual/xserver/xorg-server-1.19.5.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xorg-2	234cf45e2565fab7c0dff5bd8d1f9177
-_md5_=21245e7cf41cce2017bf8283d855ec0f
+_md5_=8c6f800f9dc25084041873f34e1af7b8
diff --git a/metadata/md5-cache/x11-base/xorg-server-1.19.5-r1 b/metadata/md5-cache/x11-base/xorg-server-1.19.5-r1
index 2b81b13108d9..9aecc6d3559f 100644
--- a/metadata/md5-cache/x11-base/xorg-server-1.19.5-r1
+++ b/metadata/md5-cache/x11-base/xorg-server-1.19.5-r1
@@ -3,7 +3,7 @@ DEPEND=>=app-eselect/eselect-opengl-1.3.0 !libressl? ( dev-libs/openssl:0= ) lib
 DESCRIPTION=X.Org X servers
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/
-IUSE=dmx kdrive wayland xephyr xnest xorg xvfb debug glamor ipv6 libressl minimal selinux systemd tslib +udev unwind xcsecurity static-libs doc
+IUSE=dmx kdrive wayland xephyr xnest xorg xvfb debug +glamor ipv6 libressl minimal selinux systemd tslib +udev unwind xcsecurity static-libs doc
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=MIT
 PDEPEND=xorg? ( >=x11-base/xorg-drivers-1.19 )
@@ -12,4 +12,4 @@ REQUIRED_USE=!minimal? ( || ( dmx kdrive wayland xephyr xnest xorg xvfb ) ) xeph
 SLOT=0/1.19.5
 SRC_URI=https://www.x.org/releases/individual/xserver/xorg-server-1.19.5.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xorg-2	234cf45e2565fab7c0dff5bd8d1f9177
-_md5_=aca29de7f3c6a18a072c010d65a0b6b6
+_md5_=96f1ae4341bc4f3b32ce9c58daa3cae8
diff --git a/metadata/md5-cache/x11-base/xorg-server-9999 b/metadata/md5-cache/x11-base/xorg-server-9999
index 497109c7eb5c..faaec43c9bfd 100644
--- a/metadata/md5-cache/x11-base/xorg-server-9999
+++ b/metadata/md5-cache/x11-base/xorg-server-9999
@@ -3,11 +3,11 @@ DEPEND=>=app-eselect/eselect-opengl-1.3.0 !libressl? ( dev-libs/openssl:0= ) lib
 DESCRIPTION=X.Org X servers
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/
-IUSE=dmx kdrive wayland xephyr xnest xorg xvfb debug glamor ipv6 libressl minimal selinux systemd +udev unwind xcsecurity static-libs doc
+IUSE=dmx kdrive wayland xephyr xnest xorg xvfb debug +glamor ipv6 libressl minimal selinux systemd +udev unwind xcsecurity static-libs doc
 LICENSE=MIT
 PDEPEND=xorg? ( >=x11-base/xorg-drivers-9999 )
 RDEPEND=>=app-eselect/eselect-opengl-1.3.0 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.46 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-libs/xtrans-1.3.5 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) glamor? ( media-libs/libepoxy[X] >=media-libs/mesa-10.3.4-r1[egl,gbm] !x11-libs/glamor ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) xephyr? ( x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-10.3.4-r1 ) udev? ( >=virtual/udev-150 ) unwind? ( sys-libs/libunwind ) wayland? ( >=dev-libs/wayland-1.3.0 media-libs/libepoxy >=dev-libs/wayland-protocols-1.1 ) >=x11-apps/xinit-1.3.3-r1 systemd? ( sys-apps/dbus sys-apps/systemd ) selinux? ( sec-policy/selinux-xserver ) !x11-drivers/xf86-video-modesetting
 REQUIRED_USE=!minimal? ( || ( dmx kdrive wayland xephyr xnest xorg xvfb ) ) xephyr? ( kdrive )
 SLOT=0/9999
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	git-r3	52a888802d25387c2c74cb845d1219bc	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xorg-2	234cf45e2565fab7c0dff5bd8d1f9177
-_md5_=8400963f8484d06133fd58e625fefab3
+_md5_=9d7863913836eed2f7314bb0a2728e64